From 1bdb93c792cf7c218c74ec5cacda8bac1242f73b Mon Sep 17 00:00:00 2001
From: Jose Pereda <jpereda@openjdk.org>
Date: Thu, 25 Jul 2024 18:28:46 +0000
Subject: [PATCH 01/75] 8334874: Horizontal scroll events from touch pads
 should scroll the TabPane tabs

Reviewed-by: angorya, kcr
---
 .../scene/control/skin/TabPaneSkin.java       |  12 +-
 .../javafx/scene/control/TabPaneTest.java     | 103 +++++++++++++++++-
 2 files changed, 111 insertions(+), 4 deletions(-)

diff --git a/modules/javafx.controls/src/main/java/javafx/scene/control/skin/TabPaneSkin.java b/modules/javafx.controls/src/main/java/javafx/scene/control/skin/TabPaneSkin.java
index 49236076d5c..e17f447a466 100644
--- a/modules/javafx.controls/src/main/java/javafx/scene/control/skin/TabPaneSkin.java
+++ b/modules/javafx.controls/src/main/java/javafx/scene/control/skin/TabPaneSkin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -934,17 +934,23 @@ public TabHeaderArea() {
             // Scrolling the mouse wheel downwards results in the tabs scrolling left (i.e. exposing the right-most tabs)
             // Scrolling the mouse wheel upwards results in the tabs scrolling right (i.e. exposing th left-most tabs)
             addEventHandler(ScrollEvent.SCROLL, (ScrollEvent e) -> {
+                double dx = e.getDeltaX();
+                double dy = e.getDeltaY();
+
                 Side side = getSkinnable().getSide();
                 side = side == null ? Side.TOP : side;
                 switch (side) {
                     default:
                     case TOP:
                     case BOTTOM:
-                        setScrollOffset(scrollOffset + e.getDeltaY());
+                        // Consider vertical scroll events (dy > dx) from mouse wheel and trackpad,
+                        // and horizontal scroll events from a trackpad (dx > dy)
+                        dx = Math.abs(dy) > Math.abs(dx) ? dy : dx;
+                        setScrollOffset(scrollOffset + dx);
                         break;
                     case LEFT:
                     case RIGHT:
-                        setScrollOffset(scrollOffset - e.getDeltaY());
+                        setScrollOffset(scrollOffset - dy);
                         break;
                 }
 
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TabPaneTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TabPaneTest.java
index 7b624c425e8..76b8c0266ae 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TabPaneTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TabPaneTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,6 +38,7 @@
 import static org.junit.Assert.fail;
 
 import javafx.scene.control.SelectionModel;
+import javafx.scene.input.ScrollEvent;
 import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
 import javafx.application.Platform;
 import javafx.beans.property.BooleanProperty;
@@ -1241,4 +1242,104 @@ public void testSMLeakOnSwitchSkinAndSM() {
         attemptGC(10, weakSMRef);
         assertNull(weakSMRef.get());
     }
+
+    @Test
+    public void testVerticalScrollTopSide() {
+        scrollTabPane(Side.TOP, 0, -100);
+    }
+
+    @Test
+    public void testVerticalScrollRightSide() {
+        scrollTabPane(Side.RIGHT, 0, 100);
+    }
+
+    @Test
+    public void testVerticalScrollBottomSide() {
+        scrollTabPane(Side.BOTTOM, 0, -100);
+    }
+
+    @Test
+    public void testVerticalScrollLeftSide() {
+        scrollTabPane(Side.LEFT, 0, 100);
+    }
+
+    @Test
+    public void testHorizontalScrollTopSide() {
+        scrollTabPane(Side.TOP, -100, 0);
+    }
+
+    @Test
+    public void testHorizontalScrollRightSide() {
+        scrollTabPane(Side.RIGHT, 100, 0);
+    }
+
+    @Test
+    public void testHorizontalScrollBottomSide() {
+        scrollTabPane(Side.BOTTOM, -100, 0);
+    }
+
+    @Test
+    public void testHorizontalScrollLeftSide() {
+        scrollTabPane(Side.LEFT, 100, 0);
+    }
+
+    private void scrollTabPane(Side side, double deltaX, double deltaY) {
+        tabPane.setMaxSize(400, 100);
+        tabPane.setSide(side);
+        for (int i = 0; i < 40; i++) {
+            Tab tab = new Tab("Tab " + (1000 + i));
+            tabPane.getTabs().add(tab);
+        }
+        root.getChildren().add(tabPane);
+        stage.show();
+
+        Bounds firstTabBounds = tabPane.lookupAll(".tab-label")
+                .stream()
+                .findFirst()
+                .map(n -> n.localToScene(n.getLayoutBounds()))
+                .orElse(null);
+        assertNotNull(firstTabBounds);
+
+        Bounds layoutBounds = tabPane.getLayoutBounds();
+        double minX = tabPane.localToScene(layoutBounds).getMinX();
+        double minY = tabPane.localToScene(layoutBounds).getMinY();
+        double minScrX = tabPane.localToScreen(layoutBounds).getMinX();
+        double minScrY = tabPane.localToScreen(layoutBounds).getMinY();
+        double x = 50;
+        double y = 10;
+
+        SceneHelper.processMouseEvent(scene,
+                MouseEventGenerator.generateMouseEvent(MouseEvent.MOUSE_MOVED, minX + x, minY + y));
+        tk.firePulse();
+
+        StackPane tabHeaderArea = (StackPane) tabPane.lookup(".tab-header-area");
+        assertNotNull(tabHeaderArea);
+
+        Event.fireEvent(tabHeaderArea, new ScrollEvent(
+                ScrollEvent.SCROLL,
+                minX + x, minY + y,
+                minScrX + x, minScrY + y,
+                false, false, false, false, true, false,
+                deltaX, deltaY, deltaX, deltaY,
+                ScrollEvent.HorizontalTextScrollUnits.NONE, 0.0,
+                ScrollEvent.VerticalTextScrollUnits.NONE, 0.0,
+                0, null));
+        tk.firePulse();
+
+        Bounds newFirstTabBounds = tabPane.lookupAll(".tab-label")
+                .stream()
+                .findFirst()
+                .map(n -> n.localToScene(n.getLayoutBounds()))
+                .orElse(null);
+        assertNotNull(newFirstTabBounds);
+
+        if (side.equals(Side.TOP) || side.equals(Side.BOTTOM)) {
+            double delta = Math.abs(deltaY) > Math.abs(deltaX) ? deltaY : deltaX;
+            assertEquals(firstTabBounds.getMinX() + delta, newFirstTabBounds.getMinX(), 0);
+            assertEquals(firstTabBounds.getMinY(), newFirstTabBounds.getMinY(), 0);
+        } else {
+            assertEquals(firstTabBounds.getMinX(), newFirstTabBounds.getMinX(), 0);
+            assertEquals(firstTabBounds.getMinY() - deltaY, newFirstTabBounds.getMinY(), 0);
+        }
+    }
 }

From cb7127d4b5e0c230adced8d24e7f695c519e9082 Mon Sep 17 00:00:00 2001
From: Andy Goryachev <angorya@openjdk.org>
Date: Mon, 29 Jul 2024 15:14:49 +0000
Subject: [PATCH 02/75] 8337229: Missing @Overrides in GlassSystemMenuShim

Reviewed-by: kcr
---
 .../java/com/sun/javafx/tk/quantum/GlassSystemMenuShim.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/javafx.graphics/src/shims/java/com/sun/javafx/tk/quantum/GlassSystemMenuShim.java b/modules/javafx.graphics/src/shims/java/com/sun/javafx/tk/quantum/GlassSystemMenuShim.java
index 98b552374f2..232f1582605 100644
--- a/modules/javafx.graphics/src/shims/java/com/sun/javafx/tk/quantum/GlassSystemMenuShim.java
+++ b/modules/javafx.graphics/src/shims/java/com/sun/javafx/tk/quantum/GlassSystemMenuShim.java
@@ -40,10 +40,12 @@ public GlassSystemMenuShim() {
         super();
     }
 
+    @Override
     public void setMenus(List<MenuBase> menus) {
         super.setMenus(menus);
     }
 
+    @Override
     public void createMenuBar() {
         super.createMenuBar();
     }

From 686a396c6f1a5ee0733a69a046d2131f4649eca8 Mon Sep 17 00:00:00 2001
From: Andy Goryachev <angorya@openjdk.org>
Date: Mon, 29 Jul 2024 15:15:12 +0000
Subject: [PATCH 03/75] 8337228: Eclipse: missing dependencies in
 systemTests-test project

Reviewed-by: kcr, jhendrikx
---
 tests/system/src/test/.classpath | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/system/src/test/.classpath b/tests/system/src/test/.classpath
index 3887b5741c0..f5e67812870 100644
--- a/tests/system/src/test/.classpath
+++ b/tests/system/src/test/.classpath
@@ -14,7 +14,7 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/graphics">
 		<attributes>
 			<attribute name="module" value="true"/>
-			<attribute name="add-exports" value="javafx.graphics/com.sun.glass.ui=ALL-UNNAMED:javafx.graphics/com.sun.glass.ui.monocle=ALL-UNNAMED:javafx.graphics/com.sun.javafx.sg.prism=ALL-UNNAMED:javafx.graphics/com.sun.prism.impl=ALL-UNNAMED:javafx.graphics/com.sun.javafx.image.impl=ALL-UNNAMED:javafx.graphics/com.sun.glass.events=ALL-UNNAMED:javafx.graphics/com.sun.javafx.application=ALL-UNNAMED:javafx.graphics/com.sun.javafx.css=ALL-UNNAMED:javafx.graphics/com.sun.javafx.geom=ALL-UNNAMED:javafx.graphics/com.sun.javafx.tk=ALL-UNNAMED:javafx.graphics/com.sun.glass.ui.mac=ALL-UNNAMED:javafx.graphics/com.sun.glass.ui.win=ALL-UNNAMED:javafx.graphics/com.sun.javafx.scene.text=ALL-UNNAMED:javafx.graphics/com.sun.javafx.text=ALL-UNNAMED:javafx.graphics/com.sun.javafx.font=ALL-UNNAMED"/>
+			<attribute name="add-exports" value="javafx.graphics/com.sun.glass.ui=ALL-UNNAMED:javafx.graphics/com.sun.glass.ui.monocle=ALL-UNNAMED:javafx.graphics/com.sun.javafx.sg.prism=ALL-UNNAMED:javafx.graphics/com.sun.prism.impl=ALL-UNNAMED:javafx.graphics/com.sun.javafx.image.impl=ALL-UNNAMED:javafx.graphics/com.sun.glass.events=ALL-UNNAMED:javafx.graphics/com.sun.javafx.application=ALL-UNNAMED:javafx.graphics/com.sun.javafx.css=ALL-UNNAMED:javafx.graphics/com.sun.javafx.geom=ALL-UNNAMED:javafx.graphics/com.sun.javafx.tk=ALL-UNNAMED:javafx.graphics/com.sun.glass.ui.mac=ALL-UNNAMED:javafx.graphics/com.sun.glass.ui.win=ALL-UNNAMED:javafx.graphics/com.sun.javafx.scene.text=ALL-UNNAMED:javafx.graphics/com.sun.javafx.text=ALL-UNNAMED:javafx.graphics/com.sun.javafx.font=ALL-UNNAMED:javafx.graphics/com.sun.javafx.menu=ALL-UNNAMED:javafx.graphics/com.sun.javafx.tk.quantum=ALL-UNNAMED"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry combineaccessrules="false" kind="src" path="/controls">

From 41de02023571d146f392de012a55011a5f87fc9d Mon Sep 17 00:00:00 2001
From: Andy Goryachev <angorya@openjdk.org>
Date: Fri, 2 Aug 2024 18:00:02 +0000
Subject: [PATCH 04/75] 8336331: Doc: Clarification in AccessibleAttribute,
 AccessibleRole

Reviewed-by: arapte, kizune
---
 .../java/javafx/scene/AccessibleAction.java     |  2 +-
 .../java/javafx/scene/AccessibleAttribute.java  | 17 ++++++++++-------
 .../main/java/javafx/scene/AccessibleRole.java  |  3 ++-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/AccessibleAction.java b/modules/javafx.graphics/src/main/java/javafx/scene/AccessibleAction.java
index 0660f71f9fd..5213804cf5e 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/AccessibleAction.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/AccessibleAction.java
@@ -119,7 +119,7 @@ public enum AccessibleAction {
 
     /**
      * Request the node to show a text range, scrolling if required.
-     * <p>Used by TextField and TextArea. </p>
+     * <p>Used by TextArea. </p>
      *
      * Parameters:
      * <ul>
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/AccessibleAttribute.java b/modules/javafx.graphics/src/main/java/javafx/scene/AccessibleAttribute.java
index 92c1773377b..43628f3cf48 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/AccessibleAttribute.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/AccessibleAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -71,22 +71,23 @@ public enum AccessibleAttribute {
     ACCELERATOR(KeyCombination.class),
 
     /**
-     * Returns the bounds for the node.
+     * Returns the bounds for the node, in screen coordinates.
      * <ul>
      * <li>Used by: Node </li>
      * <li>Needs notify: no </li>
-     * <li>Return Type: {@link Bounds} </li>
+     * <li>Return Type: {@link Bounds} in screen coordinates</li>
      * <li>Parameters: </li>
      * </ul>
      */
     BOUNDS(Bounds.class),
 
     /**
-     * Returns the array of bounding rectangles for the given character range.
+     * Returns the array of bounding rectangles for the given character range,
+     * in screen coordinates.
      * <ul>
      * <li>Used by: TextField and TextArea </li>
      * <li>Needs notify: no </li>
-     * <li>Return Type: {@link Bounds}[] </li>
+     * <li>Return Type: {@link Bounds}[] in screen coordinates</li>
      * <li>Parameters:
      *   <ul>
      *    <li>{@link Integer} the start offset </li>
@@ -518,7 +519,7 @@ public enum AccessibleAttribute {
      * <li>Return Type: {@link Node} </li>
      * <li>Parameters:
      *   <ul>
-     *   <li> {@link javafx.geometry.Point2D} the point location </li>
+     *   <li> {@link javafx.geometry.Point2D} the point location, in screen coordinates </li>
      *   </ul>
      * </li>
      * </ul>
@@ -533,7 +534,7 @@ public enum AccessibleAttribute {
      * <li>Return Type: {@link Integer} </li>
      * <li>Parameters:
      *   <ul>
-     *   <li> {@link javafx.geometry.Point2D} the point location </li>
+     *   <li> {@link javafx.geometry.Point2D} the point location, in screen coordinates </li>
      *   </ul>
      * </li>
      * </ul>
@@ -678,6 +679,7 @@ public enum AccessibleAttribute {
 
     /**
      * Returns the text selection end offset for the node.
+     * Selection end corresponds to the larger position in the selection range.
      * <ul>
      * <li>Used by: TextField and TextArea </li>
      * <li>Needs notify: yes </li>
@@ -689,6 +691,7 @@ public enum AccessibleAttribute {
 
     /**
      * Returns the text selection start offset for the node.
+     * Selection start corresponds to the smaller position in the selection range.
      * <ul>
      * <li>Used by: TextField and TextArea </li>
      * <li>Needs notify: yes </li>
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/AccessibleRole.java b/modules/javafx.graphics/src/main/java/javafx/scene/AccessibleRole.java
index 709a21bc0b5..be02153dc9f 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/AccessibleRole.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/AccessibleRole.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -483,6 +483,7 @@ public enum AccessibleRole {
      * <ul>
      * <li> {@link AccessibleAction#SET_TEXT} </li>
      * <li> {@link AccessibleAction#SET_TEXT_SELECTION} </li>
+     * <li> {@link AccessibleAction#SHOW_TEXT_RANGE} </li>
      * </ul>
      */
     TEXT_AREA,

From 0fa50cbbd9878ca7ec0e1bfcc5567bf52e3b8db2 Mon Sep 17 00:00:00 2001
From: Kevin Rushforth <kcr@openjdk.org>
Date: Fri, 2 Aug 2024 20:13:20 +0000
Subject: [PATCH 05/75] 8337281: build.gradle assumes all modules are named
 "javafx.$project"

Reviewed-by: angorya, arapte
---
 build.gradle | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0885f064033..b1ab109d4e3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -967,7 +967,7 @@ List<String> computeLibraryPath(boolean working) {
     List<String> lp = []
 
     if (HAS_JAVAFX_MODULES) {
-        List<String> modsWithNative = [ 'graphics', 'media', 'web' ]
+        List<String> modsWithNative = [ 'javafx.graphics', 'javafx.media', 'javafx.web' ]
 
         // the build/modular-sdk area
         def platformPrefix = ""
@@ -976,7 +976,7 @@ List<String> computeLibraryPath(boolean working) {
         def modulesLibsDir = "${bundledSdkDir}/modules_libs"
 
         modsWithNative.each() { m ->
-            lp << cygpath("${modulesLibsDir}/javafx.${m}")
+            lp << cygpath("${modulesLibsDir}/${m}")
         }
     } else {
         def platformPrefix = ""
@@ -1710,6 +1710,16 @@ void addMavenPublication(Project project, List<String> projectDependencies) {
         return
     }
 
+    if (!project.hasProperty("moduleName")) {
+        fail("Project ${project} has no module name")
+    }
+    projectDependencies.each { projName ->
+        def dep = project.project(":$projName")
+        if (!dep.hasProperty("moduleName")) {
+            fail("${project} dependency ${dep} has no module name")
+        }
+    }
+
     project.apply plugin: 'maven-publish'
 
     project.group = MAVEN_GROUP_ID
@@ -1760,7 +1770,8 @@ void addMavenPublication(Project project, List<String> projectDependencies) {
         project.publishing {
             publications {
                 maven(MavenPublication) {
-                    artifactId = "javafx-${project.name}"
+                    def artifactName = project.moduleName.replace('.', '-')
+                    artifactId = artifactName
 
                     afterEvaluate {
                         artifact project.tasks."moduleEmptyPublicationJar$t.capital"
@@ -1779,15 +1790,17 @@ void addMavenPublication(Project project, List<String> projectDependencies) {
 
                         Node projectDependencyPlatform = dependencies.appendNode("dependency")
                         projectDependencyPlatform.appendNode("groupId", MAVEN_GROUP_ID)
-                        projectDependencyPlatform.appendNode("artifactId", "javafx-${project.name}")
+                        projectDependencyPlatform.appendNode("artifactId", artifactName)
                         projectDependencyPlatform.appendNode("version", MAVEN_VERSION)
                         projectDependencyPlatform.appendNode("classifier", "\${javafx.platform}")
 
                         if (!projectDependencies.empty) {
-                            projectDependencies.each { dep ->
+                            projectDependencies.each { projName ->
+                                def dep = project.project(":$projName")
+                                def depName = dep.moduleName.replace('.', '-')
                                 Node projectDependency = dependencies.appendNode("dependency")
                                 projectDependency.appendNode("groupId", MAVEN_GROUP_ID)
-                                projectDependency.appendNode("artifactId", "javafx-$dep")
+                                projectDependency.appendNode("artifactId", depName)
                                 projectDependency.appendNode("version", MAVEN_VERSION)
                            }
                         }

From 28e3ccc7331952b4d323941c8efc97509348b1e2 Mon Sep 17 00:00:00 2001
From: Marius Hanl <mhanl@openjdk.org>
Date: Sat, 3 Aug 2024 13:50:23 +0000
Subject: [PATCH 06/75] 8320232: Cells duplicated when table collapsed and
 expanded

Reviewed-by: angorya, kcr
---
 .../scene/control/skin/VirtualFlow.java       | 28 +++++--
 .../javafx/scene/control/TableViewTest.java   | 40 ++++++++++
 .../scene/control/TreeTableViewTest.java      | 47 +++++++++++-
 .../scene/control/skin/VirtualFlowTest.java   | 76 +++++++++++++++++++
 4 files changed, 184 insertions(+), 7 deletions(-)

diff --git a/modules/javafx.controls/src/main/java/javafx/scene/control/skin/VirtualFlow.java b/modules/javafx.controls/src/main/java/javafx/scene/control/skin/VirtualFlow.java
index bff161d6f69..7de0020f41b 100644
--- a/modules/javafx.controls/src/main/java/javafx/scene/control/skin/VirtualFlow.java
+++ b/modules/javafx.controls/src/main/java/javafx/scene/control/skin/VirtualFlow.java
@@ -805,6 +805,9 @@ public final BooleanProperty verticalProperty() {
         if (vertical == null) {
             vertical = new BooleanPropertyBase(true) {
                 @Override protected void invalidated() {
+                    resetIndex(cells);
+                    resetIndex(pile);
+
                     pile.clear();
                     sheetChildren.clear();
                     cells.clear();
@@ -1072,9 +1075,10 @@ void adjustPosition() {
             lastHeight = -1;
             releaseCell(accumCell);
             sheet.getChildren().clear();
-            for (int i = 0, max = cells.size(); i < max; i++) {
-                cells.get(i).updateIndex(-1);
-            }
+
+            resetIndex(cells);
+            resetIndex(pile);
+
             cells.clear();
             pile.clear();
             releaseAllPrivateCells();
@@ -1082,9 +1086,9 @@ void adjustPosition() {
             lastWidth = -1;
             lastHeight = -1;
             releaseCell(accumCell);
-            for (int i = 0, max = cells.size(); i < max; i++) {
-                cells.get(i).updateIndex(-1);
-            }
+
+            resetIndex(cells);
+
             addAllToPile();
             releaseAllPrivateCells();
         } else if (needsReconfigureCells) {
@@ -1345,6 +1349,18 @@ void adjustPosition() {
         cleanPile();
     }
 
+    /**
+     * Resets the index to -1 to all cells.
+     * This is to properly clean them up and ensure that no listeners are called because they retain their old index.
+     *
+     * @param cells the cells
+     */
+    private void resetIndex(ArrayLinkedList<T> cells) {
+        for (T cell : cells) {
+            cell.updateIndex(-1);
+        }
+    }
+
     /** {@inheritDoc} */
     @Override protected void setWidth(double value) {
         if (value != lastWidth) {
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableViewTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableViewTest.java
index b29261e02bb..55a95cad15c 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableViewTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableViewTest.java
@@ -45,6 +45,7 @@
 import javafx.collections.SetChangeListener;
 import javafx.css.PseudoClass;
 import javafx.scene.control.Slider;
+import javafx.scene.control.TitledPane;
 import javafx.scene.layout.Region;
 import org.junit.After;
 import test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils;
@@ -6265,4 +6266,43 @@ public void testChangeRowFactoryShouldRecreateRows() {
             assertEquals(secondRowKey, cell.getProperties().get(propertyKey));
         }
     }
+
+    /**
+     * The expansion change of a TitledPane triggered an event where the underlying VirtualFlow
+     * was adding cells to the pile and later cleaning them all up without resetting the index to -1.
+     * This led to a bug where two cells received an edit event, although just one should (and is visible).
+     * See also: <a href="https://bugs.openjdk.org/browse/JDK-8320232">JDK-8320232</a>
+     */
+    @Test
+    public void testTitledPaneExpansionShouldCleanupCellsInTableFlow() {
+        AtomicInteger startEditCounter = new AtomicInteger();
+
+        final TableColumn<String, String> col = new TableColumn<>("C");
+        col.setCellValueFactory(value -> new SimpleStringProperty(value.getValue()));
+        col.setCellFactory(eee -> new TableCell<>() {
+            @Override
+            public void startEdit() {
+                startEditCounter.incrementAndGet();
+                super.startEdit();
+            }
+        });
+        table.getColumns().add(col);
+
+        table.setEditable(true);
+        table.getItems().addAll("1", "2", "3");
+
+        TitledPane root = new TitledPane("title", table);
+        root.setAnimated(false);
+        stageLoader = new StageLoader(root);
+
+        root.setExpanded(false);
+        Toolkit.getToolkit().firePulse();
+
+        root.setExpanded(true);
+        Toolkit.getToolkit().firePulse();
+
+        table.edit(0, col);
+
+        assertEquals(1, startEditCounter.get());
+    }
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableViewTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableViewTest.java
index 92cdd04a9d2..6c9a9154ee9 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableViewTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableViewTest.java
@@ -89,6 +89,7 @@
 import javafx.scene.control.TableColumnBaseShim;
 import javafx.scene.control.TableSelectionModel;
 import javafx.scene.control.TextField;
+import javafx.scene.control.TitledPane;
 import javafx.scene.control.TreeItem;
 import javafx.scene.control.TreeTableCell;
 import javafx.scene.control.TreeTableCellShim;
@@ -7444,7 +7445,7 @@ public void testChangeRowFactoryShouldRecreateRows() {
         treeTableView.setRoot(new TreeItem<>("Root"));
         treeTableView.getRoot().setExpanded(true);
         for (int i = 0; i < 4; i++) {
-            TreeItem<String> parent = new TreeItem<String>("item - " + i);
+            TreeItem<String> parent = new TreeItem<>("item - " + i);
             treeTableView.getRoot().getChildren().add(parent);
         }
 
@@ -7479,4 +7480,48 @@ public void testChangeRowFactoryShouldRecreateRows() {
             assertEquals(secondRowKey, cell.getProperties().get(propertyKey));
         }
     }
+
+    /**
+     * The expansion change of a TitledPane triggered an event where the underlying VirtualFlow
+     * was adding cells to the pile and later cleaning them all up without resetting the index to -1.
+     * This led to a bug where two cells received an edit event, although just one should (and is visible).
+     * See also: <a href="https://bugs.openjdk.org/browse/JDK-8320232">JDK-8320232</a>
+     */
+    @Test
+    public void testTitledPaneExpansionShouldCleanupCellsInTableFlow() {
+        AtomicInteger startEditCounter = new AtomicInteger();
+
+        final TreeTableColumn<String, String> col = new TreeTableColumn<>("C");
+        col.setCellValueFactory(value -> new SimpleStringProperty(value.getValue().getValue()));
+        col.setCellFactory(eee -> new TreeTableCell<>() {
+            @Override
+            public void startEdit() {
+                startEditCounter.incrementAndGet();
+                super.startEdit();
+            }
+        });
+        treeTableView.getColumns().add(col);
+
+        treeTableView.setEditable(true);
+        treeTableView.setRoot(new TreeItem<>("Root"));
+        treeTableView.getRoot().setExpanded(true);
+        for (int i = 0; i < 4; i++) {
+            TreeItem<String> parent = new TreeItem<>("item - " + i);
+            treeTableView.getRoot().getChildren().add(parent);
+        }
+
+        TitledPane root = new TitledPane("title", treeTableView);
+        root.setAnimated(false);
+        stageLoader = new StageLoader(root);
+
+        root.setExpanded(false);
+        Toolkit.getToolkit().firePulse();
+
+        root.setExpanded(true);
+        Toolkit.getToolkit().firePulse();
+
+        treeTableView.edit(0, col);
+
+        assertEquals(1, startEditCounter.get());
+    }
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/VirtualFlowTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/VirtualFlowTest.java
index 7bfded553b0..33cefa73313 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/VirtualFlowTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/VirtualFlowTest.java
@@ -35,6 +35,7 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedList;
 
@@ -1328,6 +1329,81 @@ protected double computeMinHeight(double width) {
         pulse();
     }
 
+    @Test
+    public void testVerticalChangeShouldResetIndex() {
+        List<IndexedCell<?>> cells = new ArrayList<>();
+
+        flow = new VirtualFlowShim<>();
+        flow.setVertical(true);
+        flow.setCellFactory(p -> {
+            CellStub cellStub = new CellStub(flow);
+            cells.add(cellStub);
+            return cellStub;
+        });
+        flow.setCellCount(100);
+        flow.setViewportLength(100);
+        flow.resize(100, 100);
+        pulse();
+
+        flow.setVertical(false);
+
+        for (IndexedCell<?> cell : cells) {
+            assertEquals(-1, cell.getIndex());
+        }
+    }
+
+    @Test
+    public void testCellFactoryChangeShouldResetIndex() {
+        List<IndexedCell<?>> cells = new ArrayList<>();
+
+        flow = new VirtualFlowShim<>();
+        flow.setVertical(true);
+        flow.setCellFactory(p -> {
+            CellStub cellStub = new CellStub(flow);
+            cells.add(cellStub);
+            return cellStub;
+        });
+        flow.setCellCount(100);
+        flow.setViewportLength(100);
+        flow.resize(100, 100);
+        pulse();
+
+        flow.setCellFactory(p -> new CellStub(flow));
+
+        pulse();
+
+        for (IndexedCell<?> cell : cells) {
+            assertEquals(-1, cell.getIndex());
+        }
+    }
+
+    @Test
+    public void testRecreateCellsChangeShouldResetIndex() {
+        List<IndexedCell<?>> cells = new ArrayList<>();
+
+        flow = new VirtualFlowShim<>();
+        flow.setVertical(true);
+        flow.setCellFactory(p -> {
+            CellStub cellStub = new CellStub(flow);
+            cells.add(cellStub);
+            return cellStub;
+        });
+        flow.setCellCount(100);
+        flow.setViewportLength(100);
+        flow.resize(100, 100);
+        pulse();
+
+        flow.recreateCells();
+
+        List<IndexedCell<?>> currentCells = new ArrayList<>(cells);
+
+        pulse();
+
+        for (IndexedCell<?> cell : currentCells) {
+            assertEquals(-1, cell.getIndex());
+        }
+    }
+
     private ArrayLinkedListShim<GraphicalCellStub> circlelist = new ArrayLinkedListShim<>();
 
     private VirtualFlowShim createCircleFlow() {

From f7ad5cdccb03162dc19fffb8eed570d4fbef490c Mon Sep 17 00:00:00 2001
From: John Hendrikx <jhendrikx@openjdk.org>
Date: Sun, 4 Aug 2024 23:09:25 +0000
Subject: [PATCH 07/75] 8336389: Infinite loop occurs while resolving lookups

Reviewed-by: angorya, kcr
---
 .../java/javafx/scene/CssStyleHelper.java     |  18 +-
 .../test/javafx/scene/CssStyleHelperTest.java | 157 ++++++++++++++++++
 2 files changed, 162 insertions(+), 13 deletions(-)

diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/CssStyleHelper.java b/modules/javafx.graphics/src/main/java/javafx/scene/CssStyleHelper.java
index 4132c6455aa..510a90f8b1e 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/CssStyleHelper.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/CssStyleHelper.java
@@ -1336,26 +1336,22 @@ private ParsedValue resolveLookups(
                     resolveRef(styleable, sval, styleMap, states);
 
                 if (resolved != null) {
+                    ParsedValue<?, ?> resolvedParsedValue = resolved.getParsedValue();
 
-                    if (resolves.contains(resolved.getParsedValue())) {
-
+                    if (!resolves.add(resolvedParsedValue)) {
                         if (LOGGER.isLoggable(Level.WARNING)) {
                             LOGGER.warning("Loop detected in " + resolved.getRule().toString() + " while resolving '" + sval + "'");
                         }
-                        throw new IllegalArgumentException("Loop detected in " + resolved.getRule().toString() + " while resolving '" + sval + "'");
 
-                    } else {
-                        resolves.add(parsedValue);
+                        throw new IllegalArgumentException("Loop detected in " + resolved.getRule().toString() + " while resolving '" + sval + "'");
                     }
 
                     // the resolved value may itself need to be resolved.
                     // For example, if the value "color" resolves to "base",
                     // then "base" will need to be resolved as well.
-                    ParsedValue pv = resolveLookups(styleable, resolved.getParsedValue(), styleMap, states, resolves);
+                    ParsedValue<?, ?> pv = resolveLookups(styleable, resolvedParsedValue, styleMap, states, resolves);
 
-                    if (resolves != null) {
-                        resolves.remove(parsedValue);
-                    }
+                    resolves.remove(resolvedParsedValue);
 
                     return pv;
 
@@ -1384,8 +1380,6 @@ private ParsedValue resolveLookups(
                 }
             }
 
-            resolves.clear();
-
             return new ParsedValueImpl(resolved, parsedValue.getConverter(), false);
 
         } else if (val instanceof ParsedValueImpl[]) {
@@ -1399,8 +1393,6 @@ private ParsedValue resolveLookups(
                     resolveLookups(styleable, layer[l], styleMap, states, resolves);
             }
 
-            resolves.clear();
-
             return new ParsedValueImpl(resolved, parsedValue.getConverter(), false);
 
         }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/CssStyleHelperTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/CssStyleHelperTest.java
index 01808e3f6e6..2279753cbe4 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/CssStyleHelperTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/CssStyleHelperTest.java
@@ -31,6 +31,8 @@
 import javafx.stage.Stage;
 import com.sun.javafx.tk.Toolkit;
 import javafx.css.CssParser;
+import javafx.css.CssParser.ParseError;
+import javafx.css.CssParser.ParseError.PropertySetError;
 import javafx.css.PseudoClass;
 import javafx.css.Stylesheet;
 import javafx.geometry.Insets;
@@ -41,6 +43,7 @@
 import javafx.scene.paint.Color;
 import javafx.scene.paint.Paint;
 import javafx.scene.text.Text;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -72,6 +75,9 @@ public void setup() {
         stage = new Stage();
         stage.setScene(scene);
         resetStyleManager();
+
+        // Apparently, need to access this property first, or nothing will be appended at all.
+        CssParser.errorsProperty().clear();
     }
 
     @AfterAll
@@ -664,6 +670,157 @@ public void initialNodeWithUserSetValueShouldNotResetValuesOnOtherNodesWithoutOv
         assertEquals(new Insets(4), b.getPadding());
     }
 
+    @Test
+    public void shouldDetectSimpleInfiniteLoop() throws IOException {
+        Stylesheet stylesheet = new CssParser().parse(
+            "userAgentStyleSheet",
+            """
+                .root {
+                    -fx-base-fill: -fx-base;
+                    -fx-base: -fx-base-color;
+                    -fx-base-color: -fx-base-fill;
+                }
+
+                .pane {
+                    -fx-background-color: -fx-base;
+                }
+            """
+        );
+
+        StyleManager.getInstance().setDefaultUserAgentStylesheet(stylesheet);
+        Pane a = new Pane();
+
+        a.getStyleClass().add("pane");
+
+        root.getChildren().addAll(a);
+
+        assertDoesNotThrow(() -> stage.show());  // This should not result in a StackOverflowError
+        assertEquals(1, CssParser.errorsProperty().size());
+
+        ParseError error = CssParser.errorsProperty().getFirst();
+
+        assertEquals(PropertySetError.class, error.getClass());
+
+        // Note: on Windows, the message is using inconsistent line endings (sometimes Windows, sometimes Linux)
+        // so I've stripped it.
+        assertEquals(
+            """
+            Caught java.lang.IllegalArgumentException: Loop detected in *.root{
+            \t-fx-base-fill: <Value lookup="true">
+              <value>-fx-base</value>
+              <converter>null</converter>
+            </Value>
+            \t-fx-base: <Value lookup="true">
+              <value>-fx-base-color</value>
+              <converter>null</converter>
+            </Value>
+            \t-fx-base-color: <Value lookup="true">
+              <value>-fx-base-fill</value>
+              <converter>null</converter>
+            </Value>
+            } while resolving '-fx-base'' while calculating value for '-fx-background-color' from rule '*.pane' in stylesheet userAgentStyleSheet\
+            """,
+            error.getMessage().replace("\r", "")
+        );
+    }
+
+    @Test
+    public void shouldDetectNestedInfiniteLoop() throws IOException {
+        Stylesheet stylesheet = new CssParser().parse(
+            "userAgentStyleSheet",
+            """
+                .root {
+                    -fx-base-fill: ladder(-fx-base, white 49%, black 50%);
+                    -fx-base: ladder(-fx-base-fill, white 49%, black 50%);
+                }
+
+                .pane {
+                    -fx-background-color: -fx-base;
+                }
+            """
+        );
+
+        StyleManager.getInstance().setDefaultUserAgentStylesheet(stylesheet);
+        Pane a = new Pane();
+
+        a.getStyleClass().add("pane");
+
+        root.getChildren().addAll(a);
+
+        assertDoesNotThrow(() -> stage.show());  // This should not result in a StackOverflowError
+        assertEquals(1, CssParser.errorsProperty().size());
+
+        ParseError error = CssParser.errorsProperty().getFirst();
+
+        assertEquals(PropertySetError.class, error.getClass());
+
+        // Note: on Windows, the message is using inconsistent line endings (sometimes Windows, sometimes Linux)
+        // so I've stripped it.
+        assertEquals(
+            """
+            Caught java.lang.IllegalArgumentException: Loop detected in *.root{
+            \t-fx-base-fill: <Value>
+              <value values="3">
+                <Value lookup="true">
+                  <value>-fx-base</value>
+                  <converter>null</converter>
+                </Value>    <Value>
+                  <value values="2">
+                    <Value>
+                      <value>49.0%</value>
+                      <converter>null</converter>
+                    </Value>        <Value>
+                      <value>0xffffffff</value>
+                      <converter>null</converter>
+                    </Value>      </value>
+                  <converter>StopConverter</converter>
+                </Value>    <Value>
+                  <value values="2">
+                    <Value>
+                      <value>50.0%</value>
+                      <converter>null</converter>
+                    </Value>        <Value>
+                      <value>0x000000ff</value>
+                      <converter>null</converter>
+                    </Value>      </value>
+                  <converter>StopConverter</converter>
+                </Value>  </value>
+              <converter>LadderConverter</converter>
+            </Value>
+            \t-fx-base: <Value>
+              <value values="3">
+                <Value lookup="true">
+                  <value>-fx-base-fill</value>
+                  <converter>null</converter>
+                </Value>    <Value>
+                  <value values="2">
+                    <Value>
+                      <value>49.0%</value>
+                      <converter>null</converter>
+                    </Value>        <Value>
+                      <value>0xffffffff</value>
+                      <converter>null</converter>
+                    </Value>      </value>
+                  <converter>StopConverter</converter>
+                </Value>    <Value>
+                  <value values="2">
+                    <Value>
+                      <value>50.0%</value>
+                      <converter>null</converter>
+                    </Value>        <Value>
+                      <value>0x000000ff</value>
+                      <converter>null</converter>
+                    </Value>      </value>
+                  <converter>StopConverter</converter>
+                </Value>  </value>
+              <converter>LadderConverter</converter>
+            </Value>
+            } while resolving '-fx-base'' while calculating value for '-fx-background-color' from rule '*.pane' in stylesheet userAgentStyleSheet\
+            """,
+            error.getMessage().replace("\r", "")
+        );
+    }
+
     private static final String GRAY_STYLESHEET = ".my-pane {-fx-background-color: #808080}";
     private static final String GRAY_INDIRECT_STYLESHEET = ".root {-fx-base: #808080} .my-pane {-fx-background-color: -fx-base}";
     private static final String RED_STYLESHEET = ".my-pane {-fx-background-color: red}";

From 19d09e6c2e15683de1c69d0e841f32e337da2031 Mon Sep 17 00:00:00 2001
From: Martin Fox <mfox@openjdk.org>
Date: Mon, 5 Aug 2024 15:43:55 +0000
Subject: [PATCH 08/75] 8325445: [macOS] Colors are not displayed in sRGB color
 space

Reviewed-by: angorya, kcr
---
 .../src/main/native-glass/mac/GlassLayer3D.m  |   2 +
 .../main/native-glass/mac/GlassPasteboard.m   |   2 +-
 .../src/main/native-glass/mac/GlassPixels.m   |   2 +-
 .../src/main/native-glass/mac/GlassRobot.m    |  26 +-
 .../src/main/native-glass/mac/GlassView3D.m   |   4 +-
 .../src/main/native-glass/mac/GlassWindow.m   |   2 +-
 .../main/native-glass/mac/PlatformSupport.m   |   4 +-
 .../test/robot/javafx/scene/SRGBTest.java     | 267 ++++++++++++++++++
 8 files changed, 298 insertions(+), 11 deletions(-)
 create mode 100644 tests/system/src/test/java/test/robot/javafx/scene/SRGBTest.java

diff --git a/modules/javafx.graphics/src/main/native-glass/mac/GlassLayer3D.m b/modules/javafx.graphics/src/main/native-glass/mac/GlassLayer3D.m
index 5c51de9a19f..e0ec059f2d9 100644
--- a/modules/javafx.graphics/src/main/native-glass/mac/GlassLayer3D.m
+++ b/modules/javafx.graphics/src/main/native-glass/mac/GlassLayer3D.m
@@ -77,6 +77,8 @@ - (id)initWithSharedContext:(CGLContextObj)ctx
                                                   NSEventTrackingRunLoopMode,
                                                   NSModalPanelRunLoopMode, nil] retain];
         }
+
+        self.colorspace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB);
     }
     return self;
 }
diff --git a/modules/javafx.graphics/src/main/native-glass/mac/GlassPasteboard.m b/modules/javafx.graphics/src/main/native-glass/mac/GlassPasteboard.m
index 3bb6d2def52..b7181dfbb30 100644
--- a/modules/javafx.graphics/src/main/native-glass/mac/GlassPasteboard.m
+++ b/modules/javafx.graphics/src/main/native-glass/mac/GlassPasteboard.m
@@ -636,7 +636,7 @@ static inline jobject createUTF(JNIEnv *env, NSString *data) {
 
                     if (pixels != NULL)
                     {
-                        CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
+                        CGColorSpaceRef space = CGColorSpaceCreateWithName(kCGColorSpaceSRGB);
                         CGContextRef ctx = CGBitmapContextCreate(pixels, width, height, 8, 4*width, space, kCGImageAlphaPremultipliedFirst|kCGBitmapByteOrder32Little);
                         CGContextSetBlendMode(ctx, kCGBlendModeCopy);
                         CGContextDrawImage(ctx, CGRectMake(0, 0, width, height), cgImage);
diff --git a/modules/javafx.graphics/src/main/native-glass/mac/GlassPixels.m b/modules/javafx.graphics/src/main/native-glass/mac/GlassPixels.m
index a9113896335..0e4906ecb20 100644
--- a/modules/javafx.graphics/src/main/native-glass/mac/GlassPixels.m
+++ b/modules/javafx.graphics/src/main/native-glass/mac/GlassPixels.m
@@ -60,7 +60,7 @@
     NSImage* image = NULL;
     CGImageRef cgImage = NULL;
     if ((data != NULL) && (jWidth > 0) && (jHeight > 0)) {
-        CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
+        CGColorSpaceRef colorSpace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB);
         {
             size_t width = (size_t) jWidth;
             size_t height = (size_t) jHeight;
diff --git a/modules/javafx.graphics/src/main/native-glass/mac/GlassRobot.m b/modules/javafx.graphics/src/main/native-glass/mac/GlassRobot.m
index aa3e2032db6..4420e3f5da7 100644
--- a/modules/javafx.graphics/src/main/native-glass/mac/GlassRobot.m
+++ b/modules/javafx.graphics/src/main/native-glass/mac/GlassRobot.m
@@ -396,6 +396,7 @@ - (void)mouseRelease:(UInt32)buttons
     LOG("Java_com_sun_glass_ui_mac_MacRobot__1getPixelColor");
 
     jint color = 0;
+    CGColorRef origColor = NULL;
 
     GLASS_ASSERT_MAIN_JAVA_THREAD(env);
     GLASS_POOL_ENTER
@@ -411,10 +412,16 @@ - (void)mouseRelease:(UInt32)buttons
                 CFDataRef data = CGDataProviderCopyData(provider);
                 if (data != NULL)
                 {
-                    jint *pixels = (jint*)CFDataGetBytePtr(data);
+                    uint32_t *pixels = (uint32_t*)CFDataGetBytePtr(data);
                     if (pixels != NULL)
                     {
-                        color = *pixels;
+                        uint32_t pixel = *pixels;
+                        CGFloat components[4];
+                        components[0] = (CGFloat)((pixel & 0x00FF0000) >> 16) / 255.0;
+                        components[1] = (CGFloat)((pixel & 0x0000FF00) >> 8) / 255.0;
+                        components[2] = (CGFloat)((pixel & 0x000000FF)) / 255.0;
+                        components[3] = (CGFloat)((pixel & 0xFF000000) >> 24) / 255.0;
+                        origColor = CGColorCreate(CGImageGetColorSpace(screenImage), components);
                     }
                 }
                 CFRelease(data);
@@ -422,6 +429,19 @@ - (void)mouseRelease:(UInt32)buttons
             CGImageRelease(screenImage);
         }
     }
+
+    if (origColor != NULL) {
+        CGColorSpaceRef sRGBSpace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB);
+        CGColorRef correctedColor = CGColorCreateCopyByMatchingToColorSpace(sRGBSpace, kCGRenderingIntentAbsoluteColorimetric, origColor, NULL);
+        const CGFloat* components = CGColorGetComponents(correctedColor);
+        color  = ((jint)(round(components[3] * 255)) & 0xFF) << 24;
+        color |= ((jint)(round(components[0] * 255)) & 0xFF) << 16;
+        color |= ((jint)(round(components[1] * 255)) & 0xFF) << 8;
+        color |= ((jint)(round(components[2] * 255)) & 0xFF);
+        CGColorSpaceRelease(sRGBSpace);
+        CGColorRelease(correctedColor);
+        CGColorRelease(origColor);
+    }
     GLASS_POOL_EXIT;
 
     return color;
@@ -476,7 +496,7 @@ - (void)mouseRelease:(UInt32)buttons
                 {
                     // create a graphics context around the Java int array
                     CGColorSpaceRef picColorSpace = CGColorSpaceCreateWithName(
-                            kCGColorSpaceGenericRGB);
+                            kCGColorSpaceSRGB);
                     CGContextRef jPicContextRef = CGBitmapContextCreate(
                             javaPixels,
                             pixWidth, pixHeight,
diff --git a/modules/javafx.graphics/src/main/native-glass/mac/GlassView3D.m b/modules/javafx.graphics/src/main/native-glass/mac/GlassView3D.m
index 125e4b45514..3d3b4584c92 100644
--- a/modules/javafx.graphics/src/main/native-glass/mac/GlassView3D.m
+++ b/modules/javafx.graphics/src/main/native-glass/mac/GlassView3D.m
@@ -35,8 +35,6 @@
 #import "GlassLayer3D.h"
 #import "GlassApplication.h"
 
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
 //#define VERBOSE
 #ifndef VERBOSE
     #define LOG(MSG, ...)
@@ -330,7 +328,7 @@ - (void)viewDidMoveToWindow
     if ([self window] != nil)
     {
         GlassLayer3D *layer = (GlassLayer3D*)[self layer];
-        [[layer getPainterOffscreen] setBackgroundColor:[[[self window] backgroundColor] colorUsingColorSpaceName:NSDeviceRGBColorSpace]];
+        [[layer getPainterOffscreen] setBackgroundColor:[[[self window] backgroundColor] colorUsingColorSpace:NSColorSpace.sRGBColorSpace]];
     }
 
     [self->_delegate viewDidMoveToWindow];
diff --git a/modules/javafx.graphics/src/main/native-glass/mac/GlassWindow.m b/modules/javafx.graphics/src/main/native-glass/mac/GlassWindow.m
index 0496cacf51d..a054ac12c69 100644
--- a/modules/javafx.graphics/src/main/native-glass/mac/GlassWindow.m
+++ b/modules/javafx.graphics/src/main/native-glass/mac/GlassWindow.m
@@ -780,7 +780,7 @@ static jlong _createWindowCommonDo(JNIEnv *env, jobject jWindow, jlong jOwnerPtr
     GLASS_POOL_ENTER;
     {
         GlassWindow *window = getGlassWindow(env, jPtr);
-        [window->nsWindow setBackgroundColor:[NSColor colorWithCalibratedRed:r green:g blue:b alpha:1.0f]];
+        [window->nsWindow setBackgroundColor:[NSColor colorWithSRGBRed:r green:g blue:b alpha:1.0f]];
     }
     GLASS_POOL_EXIT;
     GLASS_CHECK_EXCEPTION(env);
diff --git a/modules/javafx.graphics/src/main/native-glass/mac/PlatformSupport.m b/modules/javafx.graphics/src/main/native-glass/mac/PlatformSupport.m
index 216dc219570..fb811139961 100644
--- a/modules/javafx.graphics/src/main/native-glass/mac/PlatformSupport.m
+++ b/modules/javafx.graphics/src/main/native-glass/mac/PlatformSupport.m
@@ -244,7 +244,7 @@ + (void)putColor:(jobject)preferences key:(const char*)colorName value:(NSColor*
     jobject prefKey = (*env)->NewStringUTF(env, colorName);
     GLASS_CHECK_NONNULL_EXCEPTION_RETURN(env, prefKey);
 
-    NSColor* c = [color colorUsingColorSpace:[NSColorSpace deviceRGBColorSpace]];
+    NSColor* c = [color colorUsingColorSpace:[NSColorSpace sRGBColorSpace]];
     jobject prefValue = (*env)->CallStaticObjectMethod(
         env, jColorClass, jColorRgbMethod,
         (int)([c redComponent] * 255.0f),
@@ -268,7 +268,7 @@ + (void)putColors:(jobject)preferences key:(const char*)colorName value:(NSArray
     GLASS_CHECK_NONNULL_EXCEPTION_RETURN(env, prefValue);
 
     for (int i = 0; i < count; ++i) {
-        NSColor* c = [colors[i] colorUsingColorSpace:[NSColorSpace deviceRGBColorSpace]];
+        NSColor* c = [colors[i] colorUsingColorSpace:[NSColorSpace sRGBColorSpace]];
         jobject fxcolor = (*env)->CallStaticObjectMethod(
             env, jColorClass, jColorRgbMethod,
             (int)([c redComponent] * 255.0f),
diff --git a/tests/system/src/test/java/test/robot/javafx/scene/SRGBTest.java b/tests/system/src/test/java/test/robot/javafx/scene/SRGBTest.java
new file mode 100644
index 00000000000..829cbdcdf4a
--- /dev/null
+++ b/tests/system/src/test/java/test/robot/javafx/scene/SRGBTest.java
@@ -0,0 +1,267 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+
+package test.robot.javafx.scene;
+
+import javafx.geometry.Bounds;
+import javafx.geometry.Point2D;
+import javafx.geometry.Rectangle2D;
+import javafx.scene.Scene;
+import javafx.scene.image.PixelReader;
+import javafx.scene.image.WritableImage;
+import javafx.scene.layout.HBox;
+import javafx.scene.paint.Color;
+import javafx.scene.robot.Robot;
+import javafx.scene.shape.Rectangle;
+import javafx.stage.Screen;
+import javafx.stage.Stage;
+
+import java.awt.color.ColorSpace;
+import java.awt.GraphicsEnvironment;
+import javax.swing.SwingUtilities;
+
+import com.sun.glass.ui.Application;
+import com.sun.glass.ui.Window;
+import com.sun.javafx.PlatformUtil;
+
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.junit.Test;
+import static org.junit.Assume.assumeTrue;
+
+import test.robot.testharness.VisualTestBase;
+
+public class SRGBTest extends VisualTestBase {
+
+    private static final int SWATCH_SIZE = 200;
+
+    // Avoid testing colors out near the edge of the gamut to avoid clipping
+    // when converting between spaces.
+    static final float LOW = 0.25f;
+    static final float MID = 0.50f;
+    static final float HIGH = 0.75f;
+
+    // The component tolerance allows one bit of rounding when writing a color
+    // out and another bit when reading it back in. The additional 0.0001
+    // accounts for floating point precision limitations.
+    static final double COMPONENT_TOLERANCE = 2.0001 / 255.0;
+
+    private enum TestColor {
+        COLOR_01(LOW, MID, HIGH),
+        COLOR_02(LOW, HIGH, MID),
+        COLOR_03(MID, LOW, HIGH),
+        COLOR_04(MID, HIGH, LOW),
+        COLOR_05(HIGH, LOW, MID),
+        COLOR_06(HIGH, MID, LOW);
+
+        public final float red;
+        public final float green;
+        public final float blue;
+
+        TestColor(float r, float g, float b) {
+            red = r;
+            green = g;
+            blue = b;
+        }
+    };
+
+    // We center windows in the visual bounds of the screen to make it easy
+    // for both JavaFX and AWT to sample from the same point.
+    private Point2D getJFXScreenCenter() {
+        Rectangle2D screenBounds = Screen.getPrimary().getVisualBounds();
+        double centerX = screenBounds.getMinX() + screenBounds.getWidth() / 2.0;
+        double centerY = screenBounds.getMinY() + screenBounds.getHeight() / 2.0;
+        return new Point2D(centerX, centerY);
+    }
+
+    // An AWT Robot is color space aware and will correctly convert from the
+    // screeen's color space to sRGB. We use one to verify that the JavaFX
+    // Robot is performing the same conversions.
+    private Color getSRGBColorAtScreenCenter() throws Exception {
+        float[] sRGB = {1.0f, 1,0f, 1.0f};
+        SwingUtilities.invokeAndWait(() -> {
+            try {
+                GraphicsEnvironment environment = GraphicsEnvironment.getLocalGraphicsEnvironment();
+                java.awt.Rectangle bounds = environment.getMaximumWindowBounds();
+                int centerX = (int) (bounds.getMinX() + bounds.getWidth() / 2.0);
+                int centerY = (int) (bounds.getMinY() + bounds.getHeight() / 2.0);
+
+                java.awt.Robot awtRobot = new java.awt.Robot();
+                java.awt.Color awtColor = awtRobot.getPixelColor(centerX, centerY);
+                ColorSpace colorSpace = ColorSpace.getInstance(ColorSpace.CS_sRGB);
+                awtColor.getColorComponents(colorSpace, sRGB);
+            }
+            catch (final Exception ex)
+            {
+                throw new RuntimeException(ex);
+            }
+        });
+        return new Color(sRGB[0], sRGB[1], sRGB[2], 1.0);
+    }
+
+    // Create a stage in the center of the visual bounds and return a swatch
+    // to hold the color.
+    private Rectangle prepareStage() {
+        AtomicReference<Rectangle> rectangle = new AtomicReference<>();
+
+        runAndWait(() -> {
+            Stage stage = getStage();
+
+            Rectangle swatch = new Rectangle(SWATCH_SIZE, SWATCH_SIZE);
+            rectangle.set(swatch);
+
+            HBox root = new HBox(swatch);
+            Scene scene = new Scene(root);
+            stage.setScene(scene);
+            stage.setOnShown(e -> {
+                stage.sizeToScene();
+                Point2D center = getJFXScreenCenter();
+                stage.setX(center.getX() - stage.getWidth() / 2.0);
+                stage.setY(center.getY() - stage.getHeight() / 2.0);
+            });
+            stage.show();
+        });
+
+        waitFirstFrame();
+        return rectangle.get();
+    }
+
+    // Change the color of the swatch and wait for it to be drawn.
+    private Color prepareSwatch(Rectangle swatch, TestColor testColor) {
+        float r = testColor.red;
+        float g = testColor.green;
+        float b = testColor.blue;
+        Color expected = new Color(r, g, b, 1.0);
+        runAndWait(() -> {
+            swatch.setFill(expected);
+        });
+        waitNextFrame();
+        return expected;
+    }
+
+    // Find the center of the swatch.
+    private Point2D findCenter(Rectangle swatch) {
+        Bounds screenBounds = swatch.localToScreen(swatch.getBoundsInLocal());
+        double centerX = screenBounds.getMinX() + screenBounds.getWidth() / 2.0;
+        double centerY = screenBounds.getMinY() + screenBounds.getHeight() / 2.0;
+        return new Point2D(centerX, centerY);
+    }
+
+    // Tests that a color can be written out and then retrieved using a JavaFX
+    // Robot's getPixelColor call. This can fail if the drawing code and the
+    // Robot have mismatched policies for handling color space conversions.
+    @Test
+    public void singlePixelTest() {
+        Rectangle swatch = prepareStage();
+        Robot robot = getRobot();
+
+        for (TestColor testColor : TestColor.values()) {
+            Color expected = prepareSwatch(swatch, testColor);
+            AtomicReference<Color> actual = new AtomicReference<>();
+            runAndWait(() -> {
+                Point2D center = findCenter(swatch);
+                actual.set(robot.getPixelColor(center));
+            });
+            assertColorEquals(expected, actual.get(), COMPONENT_TOLERANCE);
+        }
+    }
+
+    // Tests that a color can be written out and then retrieved using a JavaFX
+    // Robot's getScreenCapture call. This can fail if the drawing code and
+    // the Robot have mismatched policies for handling color space
+    // conversions.
+    @Test
+    public void screenCaptureTest() {
+        Rectangle swatch = prepareStage();
+        Robot robot = getRobot();
+
+        for (TestColor testColor : TestColor.values()) {
+            Color expected = prepareSwatch(swatch, testColor);
+            AtomicReference<Color> actual = new AtomicReference<>();
+            runAndWait(() -> {
+                Point2D center = findCenter(swatch);
+                WritableImage image = robot.getScreenCapture(null, center.getX(), center.getY(), 5, 5);
+                PixelReader reader = image.getPixelReader();
+                actual.set(reader.getColor(3, 3));
+            });
+            assertColorEquals(expected, actual.get(), COMPONENT_TOLERANCE);
+        }
+    }
+
+    // Tests that pixels are correctly written out as sRGB using an AWT Robot
+    // that is color space aware. The singlePixel and screenCapture tests
+    // only verify that the JavaFX renderer and JavaFX Robot can round-trip
+    // colors but they might both be working in the wrong space. We use an
+    // AWT Robot to verify that they are working in sRGB.
+    // Timeout for potential hang on XWayland, see JDK-8335468.
+    @Test(timeout = 15000)
+    public void sRGBPixelTest() throws Exception {
+        Rectangle swatch = prepareStage();
+
+        for (TestColor testColor : TestColor.values()) {
+            Color expected = prepareSwatch(swatch, testColor);
+            Color actual = getSRGBColorAtScreenCenter();
+            assertColorEquals(expected, actual, COMPONENT_TOLERANCE);
+        }
+    }
+
+    // Test that Glass is correctly interpreting the window's background
+    // color as sRGB (only applies to Mac).
+    @Test
+    public void windowBackgroundTest() throws Exception {
+        assumeTrue(PlatformUtil.isMac());
+        AtomicReference<Window> window = new AtomicReference<>();
+        runAndWait(() -> {
+            Point2D center = getJFXScreenCenter();
+            int positionX = (int)(center.getX() - SWATCH_SIZE / 2.0);
+            int positionY = (int)(center.getY() - SWATCH_SIZE / 2.0);
+            Application app = Application.GetApplication();
+            Window w = app.createWindow(null, com.sun.glass.ui.Screen.getMainScreen(), Window.UNTITLED);
+            w.setLevel(Window.Level.TOPMOST);
+            w.setSize(SWATCH_SIZE, SWATCH_SIZE);
+            w.setPosition(positionX, positionY);
+            w.setVisible(true);
+            window.set(w);
+        });
+
+        // Ensure the window gets cleaned up.
+        try {
+            for (TestColor testColor : TestColor.values()) {
+                runAndWait(() -> {
+                    window.get().setBackground(testColor.red, testColor.green, testColor.blue);
+                });
+                waitNextFrame();
+
+                Color expected = new Color(testColor.red, testColor.green, testColor.blue, 1.0f);
+                Color actual = getSRGBColorAtScreenCenter();
+                assertColorEquals(expected, actual, COMPONENT_TOLERANCE);
+            }
+        } finally {
+            runAndWait(() -> {
+                window.get().close();
+            });
+        }
+    }
+}

From 304704da06365b9878b1b556c5dc35fb618ae584 Mon Sep 17 00:00:00 2001
From: Thiago Milczarek Sayao <tsayao@openjdk.org>
Date: Tue, 6 Aug 2024 13:08:46 +0000
Subject: [PATCH 09/75] 8332222: Linux Debian: Maximized stage shrinks when
 opening another stage

Reviewed-by: jpereda, lkostyra
---
 .../main/native-glass/gtk/glass_window.cpp    | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/modules/javafx.graphics/src/main/native-glass/gtk/glass_window.cpp b/modules/javafx.graphics/src/main/native-glass/gtk/glass_window.cpp
index 196cf88d019..e11fc79991a 100644
--- a/modules/javafx.graphics/src/main/native-glass/gtk/glass_window.cpp
+++ b/modules/javafx.graphics/src/main/native-glass/gtk/glass_window.cpp
@@ -978,14 +978,6 @@ void WindowContextTop::process_configure(GdkEventConfigure* event) {
     int ww = event->width + geometry.extents.left + geometry.extents.right;
     int wh = event->height + geometry.extents.top + geometry.extents.bottom;
 
-    if (!is_maximized && !is_fullscreen) {
-        geometry.final_width.value = (geometry.final_width.type == BOUNDSTYPE_CONTENT)
-                ? event->width : ww;
-
-        geometry.final_height.value = (geometry.final_height.type == BOUNDSTYPE_CONTENT)
-                ? event->height : wh;
-    }
-
     // Do not report if iconified, because Java side would set the state to NORMAL
     if (jwindow && !is_iconified) {
         mainEnv->CallVoidMethod(jwindow, jWindowNotifyResize,
@@ -1001,6 +993,14 @@ void WindowContextTop::process_configure(GdkEventConfigure* event) {
         }
     }
 
+    if (!is_iconified && !is_fullscreen && !is_maximized) {
+        geometry.final_width.value = (geometry.final_width.type == BOUNDSTYPE_CONTENT)
+                ? event->width : ww;
+
+        geometry.final_height.value = (geometry.final_height.type == BOUNDSTYPE_CONTENT)
+                ? event->height : wh;
+    }
+
     int x, y;
     gdk_window_get_origin(gdk_window, &x, &y);
     if (frame_type == TITLED && !is_fullscreen) {
@@ -1027,6 +1027,13 @@ void WindowContextTop::process_configure(GdkEventConfigure* event) {
 }
 
 void WindowContextTop::update_window_constraints() {
+    bool is_floating = !is_iconified && !is_fullscreen && !is_maximized;
+
+    if (!is_floating) {
+        // window is not floating on the screen
+        return;
+    }
+
     GdkGeometry hints;
 
     if (resizable.value && !is_disabled) {

From 635a09c7855351eac8001b60e240c826db3a6bff Mon Sep 17 00:00:00 2001
From: Alexander Matveev <almatvee@openjdk.org>
Date: Tue, 6 Aug 2024 20:43:30 +0000
Subject: [PATCH 10/75] 8336277: Colors are incorrect when playing H.265/HEVC
 on Windows 11

Reviewed-by: kcr, arapte, angorya
---
 .../gstreamer/plugins/mfwrapper/mfwrapper.cpp | 706 ++++++++++++++----
 .../gstreamer/plugins/mfwrapper/mfwrapper.h   |  22 +-
 2 files changed, 567 insertions(+), 161 deletions(-)

diff --git a/modules/javafx.media/src/main/native/gstreamer/plugins/mfwrapper/mfwrapper.cpp b/modules/javafx.media/src/main/native/gstreamer/plugins/mfwrapper/mfwrapper.cpp
index 2013b43d3d2..1766cf36d06 100644
--- a/modules/javafx.media/src/main/native/gstreamer/plugins/mfwrapper/mfwrapper.cpp
+++ b/modules/javafx.media/src/main/native/gstreamer/plugins/mfwrapper/mfwrapper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,6 +39,7 @@
 #include "fxplugins_common.h"
 
 #define PTS_DEBUG 0
+#define MEDIA_FORMAT_DEBUG 0
 
 enum
 {
@@ -206,8 +207,11 @@ static void gst_mfwrapper_init(GstMFWrapper *decoder)
     decoder->pDecoder = NULL;
     decoder->pDecoderOutput = NULL;
 
-    decoder->pColorConvert = NULL;
-    decoder->pColorConvertOutput = NULL;
+    for (int i = 0; i < MAX_COLOR_CONVERT; i++)
+    {
+        decoder->pColorConvert[i] = NULL;
+        decoder->pColorConvertOutput[i] = NULL;
+    }
 
     decoder->header = NULL;
     decoder->header_size = 0;
@@ -216,6 +220,10 @@ static void gst_mfwrapper_init(GstMFWrapper *decoder)
     decoder->height = 1080;
     decoder->framerate_num = 2997;
     decoder->framerate_den = 100;
+
+    decoder->defaultStride = 0;
+    decoder->pixel_num = 0;
+    decoder->pixel_den = 0;
 }
 
 static void gst_mfwrapper_dispose(GObject* object)
@@ -225,8 +233,11 @@ static void gst_mfwrapper_dispose(GObject* object)
     SafeRelease(&decoder->pDecoderOutput);
     SafeRelease(&decoder->pDecoder);
 
-    SafeRelease(&decoder->pColorConvertOutput);
-    SafeRelease(&decoder->pColorConvert);
+    for (int i = 0; i < MAX_COLOR_CONVERT; i++)
+    {
+        SafeRelease(&decoder->pColorConvertOutput[i]);
+        SafeRelease(&decoder->pColorConvert[i]);
+    }
 
     if (decoder->hr_mfstartup == S_OK)
         MFShutdown();
@@ -357,6 +368,65 @@ static void mfwrapper_set_src_caps(GstMFWrapper *decoder)
     }
 }
 
+#if MEDIA_FORMAT_DEBUG
+static void mfwrapper_print_media_format(GUID format)
+{
+    if (IsEqualGUID(format, MFVideoFormat_I420))
+        g_print("JFXMEDIA MFVideoFormat_I420\n");
+    else if (IsEqualGUID(format, MFVideoFormat_IYUV))
+        g_print("JFXMEDIA MFVideoFormat_IYUV\n");
+    else if (IsEqualGUID(format, MFVideoFormat_NV12))
+        g_print("JFXMEDIA MFVideoFormat_NV12\n");
+    else if (IsEqualGUID(format, MFVideoFormat_YUY2))
+        g_print("JFXMEDIA MFVideoFormat_YUY2\n");
+    else if (IsEqualGUID(format, MFVideoFormat_YV12))
+        g_print("JFXMEDIA MFVideoFormat_YV12\n");
+    else if (IsEqualGUID(format, MFVideoFormat_P010))
+        g_print("JFXMEDIA MFVideoFormat_P010\n");
+    else if (IsEqualGUID(format, MFVideoFormat_ARGB32))
+        g_print("JFXMEDIA MFVideoFormat_ARGB32\n");
+    else if (IsEqualGUID(format, MFVideoFormat_RGB32))
+        g_print("JFXMEDIA MFVideoFormat_RGB32\n");
+    else if (IsEqualGUID(format, MFVideoFormat_A2R10G10B10))
+        g_print("JFXMEDIA MFVideoFormat_A2R10G10B10\n");
+    else if (IsEqualGUID(format, MFVideoFormat_A16B16G16R16F))
+        g_print("JFXMEDIA MFVideoFormat_A16B16G16R16F\n");
+    else if (IsEqualGUID(format, MFVideoFormat_RGB24))
+        g_print("JFXMEDIA MFVideoFormat_RGB24\n");
+    else if (IsEqualGUID(format, MFVideoFormat_AYUV))
+        g_print("JFXMEDIA MFVideoFormat_AYUV\n");
+    else
+        g_print("JFXMEDIA Unknown MF Format\n");
+}
+
+static void mfwrapper_print_output_media_formats(IMFTransform *pMFTrasnform, const char *name)
+{
+    HRESULT hr = S_OK;
+    GUID subType;
+    DWORD dwTypeIndex = 0;
+    IMFMediaType *pType = NULL;
+
+    g_print("JFXMEDIA MF Transform (%s) output formats:\n", name);
+    if (pMFTrasnform == NULL)
+    {
+        g_print("JFXMEDIA Error: pMFTrasnform == NULL\n");
+        return;
+    }
+
+    do
+    {
+        hr = pMFTrasnform->GetOutputAvailableType(0, dwTypeIndex, &pType);
+        if (SUCCEEDED(hr))
+        {
+            hr = pType->GetGUID(MF_MT_SUBTYPE, &subType);
+            mfwrapper_print_media_format(subType);
+            SafeRelease(&pType);
+            dwTypeIndex++;
+        }
+    } while (hr != MF_E_NO_MORE_TYPES && SUCCEEDED(hr));
+}
+#endif // MEDIA_FORMAT_DEBUG
+
 static void mfwrapper_nalu_to_start_code(BYTE *pbBuffer, gsize size)
 {
     gint leftSize = size;
@@ -493,198 +563,515 @@ static gboolean mfwrapper_process_input(GstMFWrapper *decoder, GstBuffer *buf)
         return FALSE;
 }
 
-static HRESULT mfwrapper_init_colorconvert(GstMFWrapper *decoder)
+static HRESULT mfwrapper_configure_colorconvert_input_type(GstMFWrapper *decoder,
+                                                           IMFTransform *pInput,
+                                                           IMFTransform *pColorConvert)
 {
-    DWORD dwStatus = 0;
-
-    IMFMediaType *pDecoderOutputType = NULL;
-    IMFMediaType *pInputType = NULL;
-    IMFMediaType *pConverterOutputType = NULL;
-    IMFMediaType *pOutputType = NULL;
+    HRESULT hr = S_OK;
+    IMFMediaType *pInputOutputType = NULL;
+    IMFMediaType *pColorConvertInputType = NULL;
     GUID subType;
-    UINT32 unDefaultStride = 0;
-    UINT32 unNumerator = 0;
-    UINT32 unDenominator = 0;
-    MFT_OUTPUT_STREAM_INFO outputStreamInfo;
 
-    HRESULT hr = CoCreateInstance(CLSID_VideoProcessorMFT, NULL, CLSCTX_ALL, IID_PPV_ARGS(&decoder->pColorConvert));
+    if (decoder == NULL || pInput == NULL || pColorConvert == NULL)
+        return E_POINTER;
 
-    // Set input type
-    DWORD dwTypeIndex = 0;
-    do
+    // Get decoder output type. It should be already configured.
+    if (SUCCEEDED(hr))
+        hr = pInput->GetOutputCurrentType(0, &pInputOutputType);
+
+    if (SUCCEEDED(hr))
+        hr = pInputOutputType->GetGUID(MF_MT_SUBTYPE, &subType);
+
+#if MEDIA_FORMAT_DEBUG
+    g_print("JFXMEDIA mfwrapper_configure_colorconvert_input_type() Input output type:\n");
+    mfwrapper_print_media_format(subType);
+#endif // MEDIA_FORMAT_DEBUG
+
+    // Set input type on color converter. Create new one with all information we know.
+    // Setting one from decoder will not work since it does not contain all information.
+    if (SUCCEEDED(hr))
+        hr = MFCreateMediaType(&pColorConvertInputType);
+
+    if (SUCCEEDED(hr))
+        hr = pColorConvertInputType->SetGUID(MF_MT_MAJOR_TYPE, MFMediaType_Video);
+
+    if (SUCCEEDED(hr))
+        hr = pColorConvertInputType->SetGUID(MF_MT_SUBTYPE, subType);
+
+    if (SUCCEEDED(hr))
     {
-        hr = decoder->pDecoder->GetOutputAvailableType(0, dwTypeIndex, &pDecoderOutputType);
-        dwTypeIndex++;
+        hr = MFSetAttributeSize(pColorConvertInputType, MF_MT_FRAME_SIZE,
+                decoder->width, decoder->height);
+    }
 
-        if (SUCCEEDED(hr))
-            hr = pDecoderOutputType->GetGUID(MF_MT_SUBTYPE, &subType);
+    if (SUCCEEDED(hr))
+    {
+        hr = MFSetAttributeRatio(pColorConvertInputType, MF_MT_FRAME_RATE,
+                decoder->framerate_num, decoder->framerate_den);
+    }
 
-        if (SUCCEEDED(hr) && !IsEqualGUID(subType, MFVideoFormat_NV12))
-        {
-            SafeRelease(&pDecoderOutputType);
-            hr = E_FAIL;
-            continue;
-        }
+    if (SUCCEEDED(hr) && decoder->defaultStride != 0)
+    {
+        hr = pColorConvertInputType->SetUINT32(MF_MT_DEFAULT_STRIDE,
+                (UINT32)decoder->defaultStride);
+    }
 
-        if (SUCCEEDED(hr))
-            hr = MFCreateMediaType(&pInputType);
+    if (SUCCEEDED(hr) && decoder->pixel_num != 0 && decoder->pixel_den != 0)
+    {
+        hr = MFSetAttributeRatio(pColorConvertInputType, MF_MT_PIXEL_ASPECT_RATIO,
+                (UINT32)decoder->pixel_num, (UINT32)decoder->pixel_den);
+    }
 
-        if (SUCCEEDED(hr))
-            hr = pInputType->SetGUID(MF_MT_MAJOR_TYPE, MFMediaType_Video);
+    if (SUCCEEDED(hr))
+        hr = pColorConvert->SetInputType(0, pColorConvertInputType, 0);
 
-        if (SUCCEEDED(hr))
-            hr = pInputType->SetGUID(MF_MT_SUBTYPE, subType);
+    SafeRelease(&pColorConvertInputType);
+    SafeRelease(&pInputOutputType);
 
-        if (SUCCEEDED(hr))
-            hr = MFSetAttributeSize(pInputType, MF_MT_FRAME_SIZE, decoder->width, decoder->height);
+    return hr;
+}
 
-        if (SUCCEEDED(hr))
-            hr = MFSetAttributeRatio(pInputType, MF_MT_FRAME_RATE, decoder->framerate_num, decoder->framerate_den);
+static HRESULT mfwrapper_set_colorconvert_output_type(GstMFWrapper *decoder,
+                                                      IMFMediaType *pOutputType,
+                                                      IMFTransform *pColorConvert)
+{
+    HRESULT hr = S_OK;
+    GUID subType;
+    IMFMediaType *pNewOutputType = NULL;
+    IMFMediaType *pCurrentOutputType = NULL;
+    GUID currentSubType;
+    guint width = 0;
+    guint height = 0;
 
-        if (SUCCEEDED(hr))
+    if (decoder == NULL || pOutputType == NULL || pColorConvert == NULL)
+    {
+        return E_POINTER;
+    }
+
+    // We only need subtype
+    hr = pOutputType->GetGUID(MF_MT_SUBTYPE, &subType);
+
+    // For color convert we need to re-create output type with more information
+    if (SUCCEEDED(hr))
+        hr = MFCreateMediaType(&pNewOutputType);
+
+    if (SUCCEEDED(hr))
+        hr = pNewOutputType->SetGUID(MF_MT_MAJOR_TYPE, MFMediaType_Video);
+
+    if (SUCCEEDED(hr))
+        hr = pNewOutputType->SetGUID(MF_MT_SUBTYPE, subType);
+
+    if (SUCCEEDED(hr))
+        hr = MFSetAttributeSize(pNewOutputType, MF_MT_FRAME_SIZE, decoder->width, decoder->height);
+
+    if (SUCCEEDED(hr))
+        hr = MFSetAttributeRatio(pNewOutputType, MF_MT_FRAME_RATE, decoder->framerate_num, decoder->framerate_den);
+
+    if (SUCCEEDED(hr))
+    {
+#if MEDIA_FORMAT_DEBUG
+        g_print("JFXMEDIA Setting color convert output type:\n");
+        mfwrapper_print_media_format(subType);
+#endif // MEDIA_FORMAT_DEBUG
+        hr = pColorConvert->SetOutputType(0, pNewOutputType, 0);
+        SafeRelease(&pNewOutputType);
+        if (hr != S_OK) // S_OK means format was set
         {
-            hr = pDecoderOutputType->GetUINT32(MF_MT_DEFAULT_STRIDE, &unDefaultStride);
-            if (SUCCEEDED(hr))
-                hr = pInputType->SetUINT32(MF_MT_DEFAULT_STRIDE, unDefaultStride);
+#if MEDIA_FORMAT_DEBUG
+            g_print("JFXMEDIA Failed setting color convert output type (hr=0x%X):\n", hr);
+            mfwrapper_print_media_format(subType);
+#endif // MEDIA_FORMAT_DEBUG
+            return E_FAIL;
         }
 
+        // Re-check format just in case
+        hr = pColorConvert->GetOutputCurrentType(0, &pCurrentOutputType);
         if (SUCCEEDED(hr))
+            hr = pCurrentOutputType->GetGUID(MF_MT_SUBTYPE, &currentSubType);
+
+        SafeRelease(&pCurrentOutputType);
+
+        if (SUCCEEDED(hr) && !IsEqualGUID(subType, currentSubType))
         {
-            hr = MFGetAttributeRatio(pDecoderOutputType, MF_MT_PIXEL_ASPECT_RATIO, &unNumerator, &unDenominator);
-            if (SUCCEEDED(hr))
-                hr = MFSetAttributeRatio(pInputType, MF_MT_PIXEL_ASPECT_RATIO, unNumerator, unDenominator);
+#if MEDIA_FORMAT_DEBUG
+            g_print("JFXMEDIA Error: unexpected sub type vs current sub type\n");
+            mfwrapper_print_media_format(subType);
+            mfwrapper_print_media_format(currentSubType);
+#endif // MEDIA_FORMAT_DEBUG
+            return E_FAIL;
         }
+    }
 
-        if (SUCCEEDED(hr))
-            hr = decoder->pColorConvert->SetInputType(0, pInputType, 0);
+    return hr;
+}
 
-        SafeRelease(&pInputType);
+static HRESULT mfwrapper_configure_colorconvert_output_type(GstMFWrapper *decoder,
+                                                            IMFTransform *pColorConvert,
+                                                            GUID *outputType)
+{
+    HRESULT hr = S_OK;
+    IMFMediaType *pOutputType = NULL;
+    GUID subType;
+    DWORD dwTypeIndex = 0;
 
-        if (SUCCEEDED(hr))
-            hr = decoder->pDecoder->SetOutputType(0, pDecoderOutputType, 0);
+    // We need following types:
+    // MFVideoFormat_IYUV (prefered)
+    // MFVideoFormat_NV12 (requires second converter)
+    IMFMediaType *pOutputTypeIYUV = NULL;
+    IMFMediaType *pOutputTypeNV12 = NULL;
 
-        SafeRelease(&pDecoderOutputType);
+    if (decoder == NULL || pColorConvert == NULL || outputType == NULL)
+        return E_POINTER;
 
-    } while (hr != MF_E_NO_MORE_TYPES && FAILED(hr));
+#if MEDIA_FORMAT_DEBUG
+    mfwrapper_print_output_media_formats(pColorConvert, "Color Converter");
+#endif // MEDIA_FORMAT_DEBUG
 
-    // Set output type
-    dwTypeIndex = 0;
     do
     {
-        hr = decoder->pColorConvert->GetOutputAvailableType(0, dwTypeIndex, &pConverterOutputType);
-        dwTypeIndex++;
+        hr = pColorConvert->GetOutputAvailableType(0, dwTypeIndex, &pOutputType);
+        if (hr == MF_E_NO_MORE_TYPES)
+            break;
 
         if (SUCCEEDED(hr))
-            hr = pConverterOutputType->GetGUID(MF_MT_SUBTYPE, &subType);
+            hr = pOutputType->GetGUID(MF_MT_SUBTYPE, &subType);
 
-        if (SUCCEEDED(hr) && !(IsEqualGUID(subType, MFVideoFormat_IYUV) || IsEqualGUID(subType, MFVideoFormat_I420)))
-        {
-            SafeRelease(&pConverterOutputType);
-            hr = E_FAIL;
-            continue;
-        }
+        if (SUCCEEDED(hr) && IsEqualGUID(subType, MFVideoFormat_IYUV))
+            pOutputTypeIYUV = pOutputType;
+        else if (SUCCEEDED(hr) && IsEqualGUID(subType, MFVideoFormat_NV12))
+            pOutputTypeNV12 = pOutputType;
+        else if (SUCCEEDED(hr))
+            SafeRelease(&pOutputType);
 
-        SafeRelease(&pConverterOutputType);
+        pOutputType = NULL;
 
-        if (SUCCEEDED(hr))
-            hr = MFCreateMediaType(&pOutputType);
+        dwTypeIndex++;
+    } while (hr != MF_E_NO_MORE_TYPES && SUCCEEDED(hr));
 
-        if (SUCCEEDED(hr))
-            hr = pOutputType->SetGUID(MF_MT_MAJOR_TYPE, MFMediaType_Video);
+    // Set hr to error code, it might be SUCCEEDED after loop
+    // and pOutputTypeIYUV can be NULL, so we will try other
+    // formats as well.
+    hr = E_FAIL;
 
+    // We should cache as much supported formats as possible.
+    // Try them in order we prefered.
+    if (pOutputTypeIYUV)
+    {
+        hr = mfwrapper_set_colorconvert_output_type(decoder, pOutputTypeIYUV,
+                                                    pColorConvert);
         if (SUCCEEDED(hr))
-            hr = pOutputType->SetGUID(MF_MT_SUBTYPE, subType);
+            (*outputType) = MFVideoFormat_IYUV;
+    }
 
+    // Try only if previous one failed
+    if (hr != S_OK && pOutputTypeNV12)
+    {
+        hr = mfwrapper_set_colorconvert_output_type(decoder, pOutputTypeNV12,
+                                                    pColorConvert);
         if (SUCCEEDED(hr))
-            hr = MFSetAttributeSize(pOutputType, MF_MT_FRAME_SIZE, decoder->width, decoder->height);
+            (*outputType) = MFVideoFormat_NV12;
+    }
 
-        if (SUCCEEDED(hr))
-            hr = MFSetAttributeRatio(pOutputType, MF_MT_FRAME_RATE, decoder->framerate_num, decoder->framerate_den);
+    SafeRelease(&pOutputTypeIYUV);
+    SafeRelease(&pOutputTypeNV12);
 
-        if (SUCCEEDED(hr))
-            hr = decoder->pColorConvert->SetOutputType(0, pOutputType, 0);
+    return hr;
+}
 
-        SafeRelease(&pOutputType);
+// pInput - Input transform for which mfwrapper_init_colorconvert() will create
+// color convert with best possible output type.
+// ppColorConvert - Receives pointer to color convert.
+// ppColorConvertOutput - Receives pointer to color convert output buffer.
+// outputType - Will be set to color convert output type (IYUV or NV12)
+static HRESULT mfwrapper_init_colorconvert(GstMFWrapper *decoder,
+                                           IMFTransform *pInput,
+                                           IMFTransform **ppColorConvert,
+                                           IMFSample **ppColorConvertOutput,
+                                           GUID *outputType)
+{
+    DWORD dwStatus = 0;
+    MFT_OUTPUT_STREAM_INFO outputStreamInfo;
 
-    } while (hr != MF_E_NO_MORE_TYPES && FAILED(hr));
+    if (pInput == NULL || ppColorConvert == NULL ||
+        ppColorConvertOutput == NULL || outputType == NULL)
+    {
+        return E_POINTER;
+    }
 
+    HRESULT hr = CoCreateInstance(CLSID_VideoProcessorMFT, NULL, CLSCTX_ALL, IID_PPV_ARGS(ppColorConvert));
     if (SUCCEEDED(hr))
-        hr = decoder->pColorConvert->GetOutputStreamInfo(0, &outputStreamInfo);
+        hr = mfwrapper_configure_colorconvert_input_type(decoder, pInput, (*ppColorConvert));
+
+    if (SUCCEEDED(hr))
+        hr = mfwrapper_configure_colorconvert_output_type(decoder, (*ppColorConvert), outputType);
+
+    if (SUCCEEDED(hr))
+        hr = (*ppColorConvert)->GetOutputStreamInfo(0, &outputStreamInfo);
 
     if (SUCCEEDED(hr))
     {
-        if (!((outputStreamInfo.dwFlags & MFT_OUTPUT_STREAM_PROVIDES_SAMPLES) || (outputStreamInfo.dwFlags & MFT_OUTPUT_STREAM_CAN_PROVIDE_SAMPLES)))
+        if (!((outputStreamInfo.dwFlags & MFT_OUTPUT_STREAM_PROVIDES_SAMPLES) ||
+              (outputStreamInfo.dwFlags & MFT_OUTPUT_STREAM_CAN_PROVIDE_SAMPLES)))
         {
-            hr = MFCreateSample(&decoder->pColorConvertOutput);
+            hr = MFCreateSample(ppColorConvertOutput);
             if (SUCCEEDED(hr))
             {
                 IMFMediaBuffer *pBuffer = NULL;
                 hr = MFCreateMemoryBuffer(outputStreamInfo.cbSize, &pBuffer);
                 if (SUCCEEDED(hr))
-                    hr = decoder->pColorConvertOutput->AddBuffer(pBuffer);
+                    hr = (*ppColorConvertOutput)->AddBuffer(pBuffer);
                 SafeRelease(&pBuffer);
             }
         }
     }
 
     if (SUCCEEDED(hr))
-        hr = decoder->pColorConvert->GetInputStatus(0, &dwStatus);
+        hr = (*ppColorConvert)->GetInputStatus(0, &dwStatus);
 
     if (FAILED(hr) || dwStatus != MFT_INPUT_STATUS_ACCEPT_DATA) {
         return hr;
     }
 
     if (SUCCEEDED(hr))
-        hr = decoder->pColorConvert->ProcessMessage(MFT_MESSAGE_COMMAND_FLUSH, NULL);
+        hr = (*ppColorConvert)->ProcessMessage(MFT_MESSAGE_COMMAND_FLUSH, NULL);
 
     if (SUCCEEDED(hr))
-        hr = decoder->pColorConvert->ProcessMessage(MFT_MESSAGE_NOTIFY_BEGIN_STREAMING, NULL);
+        hr = (*ppColorConvert)->ProcessMessage(MFT_MESSAGE_NOTIFY_BEGIN_STREAMING, NULL);
 
     if (SUCCEEDED(hr))
-        hr = decoder->pColorConvert->ProcessMessage(MFT_MESSAGE_NOTIFY_START_OF_STREAM, NULL);
+        hr = (*ppColorConvert)->ProcessMessage(MFT_MESSAGE_NOTIFY_START_OF_STREAM, NULL);
 
     return hr;
 }
 
-static gboolean mfwrapper_convert_output(GstMFWrapper *decoder)
+static HRESULT mfwrapper_set_decoder_output_type(GstMFWrapper *decoder,
+                                                 IMFMediaType *pOutputType,
+                                                 gboolean bInitColorConverter)
+{
+    HRESULT hr = S_OK;
+    GUID subType;
+    IMFMediaType *pCurrentOutputType = NULL;
+    GUID currentSubType;
+    guint width = 0;
+    guint height = 0;
+
+    if (decoder == NULL && pOutputType == NULL)
+        return E_POINTER;
+
+    hr = pOutputType->GetGUID(MF_MT_SUBTYPE, &subType);
+    if (SUCCEEDED(hr))
+    {
+#if MEDIA_FORMAT_DEBUG
+        g_print("JFXMEDIA Setting decoder output type:\n");
+        mfwrapper_print_media_format(subType);
+#endif // MEDIA_FORMAT_DEBUG
+        hr = decoder->pDecoder->SetOutputType(0, pOutputType, 0);
+        if (hr != S_OK) // S_OK means format was set
+        {
+#if MEDIA_FORMAT_DEBUG
+            g_print("JFXMEDIA Failed setting decoder output type (hr=0x%X):\n", hr);
+            mfwrapper_print_media_format(subType);
+#endif // MEDIA_FORMAT_DEBUG
+            return E_FAIL;
+        }
+
+        // Re-check format just in case
+        hr = decoder->pDecoder->GetOutputCurrentType(0, &pCurrentOutputType);
+        if (SUCCEEDED(hr))
+            hr = pCurrentOutputType->GetGUID(MF_MT_SUBTYPE, &currentSubType);
+
+        SafeRelease(&pCurrentOutputType);
+
+        if (SUCCEEDED(hr) && !IsEqualGUID(subType, currentSubType))
+        {
+#if MEDIA_FORMAT_DEBUG
+            g_print("JFXMEDIA Error: unexpected sub type vs current sub type\n");
+            mfwrapper_print_media_format(subType);
+            mfwrapper_print_media_format(currentSubType);
+#endif // MEDIA_FORMAT_DEBUG
+            return E_FAIL;
+        }
+    }
+
+    if (SUCCEEDED(hr))
+    {
+        // Update width and height from configured decoder output type.
+        // We need to do this before color convert, so we pass correct
+        // resolution to color convert and caps.
+        hr = MFGetAttributeSize(pOutputType, MF_MT_FRAME_SIZE, &width, &height);
+        if (SUCCEEDED(hr) && (decoder->width != width || decoder->height != height))
+        {
+            decoder->width = width;
+            decoder->height = height;
+        }
+        hr = S_OK; // Ok if we do not have above attribute
+
+        // Cache stride and pixel aspect ratio. Ok if we do not have it.
+        UINT32 unDefaultStride = 0;
+        hr = pOutputType->GetUINT32(MF_MT_DEFAULT_STRIDE, &unDefaultStride);
+        if (SUCCEEDED(hr))
+        {
+            decoder->defaultStride = unDefaultStride;
+        }
+        hr = S_OK;
+
+        UINT32 unNumerator = 0;
+        UINT32 unDenominator = 0;
+        hr = MFGetAttributeRatio(pOutputType, MF_MT_PIXEL_ASPECT_RATIO, &unNumerator, &unDenominator);
+        if (SUCCEEDED(hr))
+        {
+            decoder->pixel_num = unNumerator;
+            decoder->pixel_den = unDenominator;
+        }
+        hr = S_OK;
+    }
+
+    // Init color converter if needed
+    if (SUCCEEDED(hr) && bInitColorConverter)
+    {
+        IMFTransform *pColorConvert = NULL;
+        IMFSample *pColorConvertOutput = NULL;
+        GUID outputType;
+
+        hr = mfwrapper_init_colorconvert(decoder, decoder->pDecoder,
+                    &pColorConvert, &pColorConvertOutput, &outputType);
+        if (SUCCEEDED(hr) && IsEqualGUID(outputType, MFVideoFormat_NV12)) {
+            decoder->pColorConvert[COLOR_CONVERT_NV12] = pColorConvert;
+            decoder->pColorConvertOutput[COLOR_CONVERT_NV12] = pColorConvertOutput;
+
+            // We got NV12, so init second one for NV12->IYUV
+            hr = mfwrapper_init_colorconvert(decoder,
+                    decoder->pColorConvert[COLOR_CONVERT_NV12], &pColorConvert,
+                    &pColorConvertOutput, &outputType);
+        }
+
+        if (SUCCEEDED(hr) && IsEqualGUID(outputType, MFVideoFormat_IYUV)) {
+            decoder->pColorConvert[COLOR_CONVERT_IYUV] = pColorConvert;
+            decoder->pColorConvertOutput[COLOR_CONVERT_IYUV] = pColorConvertOutput;
+        }
+    }
+
+    // Update caps on src pad in case if something changed
+    if (SUCCEEDED(hr))
+        mfwrapper_set_src_caps(decoder);
+
+    return hr;
+}
+
+static HRESULT mfwrapper_configure_decoder_output_type(GstMFWrapper *decoder)
+{
+    HRESULT hr = S_OK;
+    IMFMediaType *pOutputType = NULL;
+    GUID subType;
+    DWORD dwTypeIndex = 0;
+
+    // Note: See JDK-8336277. Looks like "H.265 / HEVC Video Decoder" has
+    // a bug and if we succesfully called SetOutputType() on given media
+    // type it does not mean that decoder actually switch format. So, to
+    // consider format set succesfully we need to check return value of
+    // SetOutputType() and re-read back format via GetOutputCurrentType().
+
+    // We need to support following formats:
+    // MFVideoFormat_IYUV - Our prefered format, since we can render it directly.
+    // MFVideoFormat_NV12 - Decoder prefered, but requires color converter.
+    // MFVideoFormat_P010 - Decoder prefered, but requires color converter (10-bit video).
+    IMFMediaType *pOutputTypeIYUV = NULL;
+    IMFMediaType *pOutputTypeNV12 = NULL;
+    IMFMediaType *pOutputTypeP010 = NULL;
+
+#if MEDIA_FORMAT_DEBUG
+    mfwrapper_print_output_media_formats(decoder->pDecoder, "Video Decoder");
+#endif // MEDIA_FORMAT_DEBUG
+
+    do
+    {
+        hr = decoder->pDecoder->GetOutputAvailableType(0, dwTypeIndex, &pOutputType);
+        if (hr == MF_E_NO_MORE_TYPES)
+            break;
+
+        if (SUCCEEDED(hr))
+            hr = pOutputType->GetGUID(MF_MT_SUBTYPE, &subType);
+
+        if (SUCCEEDED(hr) && IsEqualGUID(subType, MFVideoFormat_IYUV))
+            pOutputTypeIYUV = pOutputType;
+        else if (SUCCEEDED(hr) && IsEqualGUID(subType, MFVideoFormat_NV12))
+            pOutputTypeNV12 = pOutputType;
+        else if (SUCCEEDED(hr) && IsEqualGUID(subType, MFVideoFormat_P010))
+            pOutputTypeP010 = pOutputType;
+        else if (SUCCEEDED(hr))
+            SafeRelease(&pOutputType);
+
+        pOutputType = NULL;
+
+        dwTypeIndex++;
+    } while (hr != MF_E_NO_MORE_TYPES && SUCCEEDED(hr));
+
+    // Set hr to error code, it might be SUCCEEDED after loop
+    // and pOutputTypeIYUV can be NULL, so we will try other
+    // formats as well.
+    hr = E_FAIL;
+
+    // We should cache as much supported formats as possible.
+    // Try them in order we prefered.
+    if (pOutputTypeIYUV)
+        hr = mfwrapper_set_decoder_output_type(decoder, pOutputTypeIYUV, false);
+
+    // Try only if previous one failed
+    if (hr != S_OK && pOutputTypeNV12)
+        hr = mfwrapper_set_decoder_output_type(decoder, pOutputTypeNV12, true);
+
+    if (hr != S_OK && pOutputTypeP010)
+        hr = mfwrapper_set_decoder_output_type(decoder, pOutputTypeP010, true);
+
+    SafeRelease(&pOutputTypeIYUV);
+    SafeRelease(&pOutputTypeNV12);
+    SafeRelease(&pOutputTypeP010);
+
+    return hr;
+}
+
+static gboolean mfwrapper_convert_output_helper(GstMFWrapper *decoder,
+                                                IMFSample *pInputSample,
+                                                IMFTransform *pColorConvert,
+                                                IMFSample *pColorConvertOutput)
 {
     DWORD dwFlags = 0;
     DWORD dwStatus = 0;
     MFT_OUTPUT_DATA_BUFFER outputDataBuffer;
     outputDataBuffer.dwStreamID = 0;
-    outputDataBuffer.pSample = decoder->pColorConvertOutput;
+    outputDataBuffer.pSample = pColorConvertOutput;
     outputDataBuffer.dwStatus = 0;
     outputDataBuffer.pEvents = NULL;
     IMFMediaType *pOutputType = NULL;
 
-    if (decoder->pColorConvert == NULL || decoder->pColorConvertOutput == NULL)
+    if (decoder == NULL || pColorConvert == NULL || pColorConvertOutput == NULL)
         return FALSE;
 
     // Extra call to unblock color converter, since it expects ProcessOutput to be called
     // until it returns MF_E_TRANSFORM_NEED_MORE_INPUT
-    HRESULT hr = decoder->pColorConvert->ProcessOutput(0, 1, &outputDataBuffer, &dwStatus);
+    HRESULT hr = pColorConvert->ProcessOutput(0, 1, &outputDataBuffer, &dwStatus);
 
-    hr = decoder->pColorConvert->ProcessInput(0, decoder->pDecoderOutput, 0);
+    hr = pColorConvert->ProcessInput(0, pInputSample, 0);
 
     if (SUCCEEDED(hr))
-        hr = decoder->pColorConvert->GetOutputStatus(&dwFlags);
+        hr = pColorConvert->GetOutputStatus(&dwFlags);
 
     if (SUCCEEDED(hr) && dwFlags != MFT_OUTPUT_STATUS_SAMPLE_READY)
         return FALSE;
 
-    hr = decoder->pColorConvert->ProcessOutput(0, 1, &outputDataBuffer, &dwStatus);
+    hr = pColorConvert->ProcessOutput(0, 1, &outputDataBuffer, &dwStatus);
     SafeRelease(&outputDataBuffer.pEvents);
     if (hr == MF_E_TRANSFORM_STREAM_CHANGE)
     {
         if (outputDataBuffer.dwStatus == MFT_OUTPUT_DATA_BUFFER_FORMAT_CHANGE)
         {
-            hr = decoder->pColorConvert->GetOutputAvailableType(0, 0, &pOutputType);
+            hr = pColorConvert->GetOutputAvailableType(0, 0, &pOutputType);
 
             if (SUCCEEDED(hr))
                 hr = pOutputType->SetGUID(MF_MT_SUBTYPE, MFVideoFormat_IYUV);
 
             if (SUCCEEDED(hr))
-                hr = decoder->pColorConvert->SetOutputType(0, pOutputType, 0);
+                hr = pColorConvert->SetOutputType(0, pOutputType, 0);
 
             SafeRelease(&pOutputType);
         }
@@ -700,6 +1087,39 @@ static gboolean mfwrapper_convert_output(GstMFWrapper *decoder)
     return FALSE;
 }
 
+static gboolean mfwrapper_convert_output(GstMFWrapper *decoder)
+{
+    gboolean result = TRUE;
+    // Sample to convert. Always start from decoder
+    IMFSample *pInputSample = decoder->pDecoderOutput;
+
+    if (decoder == NULL || pInputSample == NULL)
+        return FALSE;
+
+    if (decoder->pColorConvert[COLOR_CONVERT_NV12] &&
+        decoder->pColorConvertOutput[COLOR_CONVERT_NV12])
+    {
+        result = mfwrapper_convert_output_helper(decoder,
+                                                 pInputSample,
+                                                 decoder->pColorConvert[COLOR_CONVERT_NV12],
+                                                 decoder->pColorConvertOutput[COLOR_CONVERT_NV12]);
+        pInputSample = decoder->pColorConvertOutput[COLOR_CONVERT_NV12]; // Keep converting
+    }
+
+    if (result && pInputSample != NULL &&
+        decoder->pColorConvert[COLOR_CONVERT_IYUV] &&
+        decoder->pColorConvertOutput[COLOR_CONVERT_IYUV])
+    {
+        result = mfwrapper_convert_output_helper(decoder,
+                                                 pInputSample,
+                                                 decoder->pColorConvert[COLOR_CONVERT_IYUV],
+                                                 decoder->pColorConvertOutput[COLOR_CONVERT_IYUV]);
+
+    }
+
+    return result;
+}
+
 static GstFlowReturn mfwrapper_deliver_sample(GstMFWrapper *decoder, IMFSample *pSample)
 {
     GstFlowReturn ret = GST_FLOW_OK;
@@ -774,7 +1194,6 @@ static GstFlowReturn mfwrapper_deliver_sample(GstMFWrapper *decoder, IMFSample *
 
 static gint mfwrapper_process_output(GstMFWrapper *decoder)
 {
-    IMFMediaType *pOutputType = NULL;
     MFT_OUTPUT_DATA_BUFFER outputDataBuffer;
     outputDataBuffer.dwStreamID = 0;
     outputDataBuffer.pSample = decoder->pDecoderOutput;
@@ -804,53 +1223,7 @@ static gint mfwrapper_process_output(GstMFWrapper *decoder)
     {
         if (outputDataBuffer.dwStatus == MFT_OUTPUT_DATA_BUFFER_FORMAT_CHANGE)
         {
-            GUID subType;
-            guint width = 0; guint height = 0;
-            DWORD dwTypeIndex = 0;
-
-            do
-            {
-                hr = decoder->pDecoder->GetOutputAvailableType(0, dwTypeIndex, &pOutputType);
-
-                if (SUCCEEDED(hr))
-                    hr = pOutputType->GetGUID(MF_MT_SUBTYPE, &subType);
-
-                if (SUCCEEDED(hr))
-                    hr = MFGetAttributeSize(pOutputType, MF_MT_FRAME_SIZE, &width, &height);
-
-                if (SUCCEEDED(hr) && (decoder->width != width || decoder->height != height))
-                {
-                    decoder->width = width;
-                    decoder->height = height;
-                }
-
-                // If decoder prefers MFVideoFormat_P010, then it means we dealing with 10 or 12-bit
-                // HEVC, in this case setup color converter
-                if (SUCCEEDED(hr) && dwTypeIndex == 0 && IsEqualGUID(subType, MFVideoFormat_P010))
-                {
-                    hr = mfwrapper_init_colorconvert(decoder);
-                    break;
-                }
-
-                dwTypeIndex++;
-
-                // I420 and IYUV are same
-                if (SUCCEEDED(hr) && !IsEqualGUID(subType, MFVideoFormat_IYUV) && !IsEqualGUID(subType, MFVideoFormat_I420))
-                {
-                    SafeRelease(&pOutputType);
-                    hr = E_FAIL;
-                    continue;
-                }
-
-                if (SUCCEEDED(hr))
-                    hr = decoder->pDecoder->SetOutputType(0, pOutputType, 0);
-            } while (hr != MF_E_NO_MORE_TYPES && FAILED(hr));
-
-            // Update caps on src pad in case if something changed
-            if (SUCCEEDED(hr))
-                mfwrapper_set_src_caps(decoder);
-
-            SafeRelease(&pOutputType);
+            hr = mfwrapper_configure_decoder_output_type(decoder);
         }
     }
     else if (SUCCEEDED(hr))
@@ -858,11 +1231,14 @@ static gint mfwrapper_process_output(GstMFWrapper *decoder)
         if (outputDataBuffer.dwStatus == 0)
         {
             // Check if we need to convert output
-            if (decoder->pColorConvert && decoder->pColorConvertOutput)
+            if (decoder->pColorConvert[COLOR_CONVERT_IYUV] &&
+                decoder->pColorConvertOutput[COLOR_CONVERT_IYUV])
             {
                 if (mfwrapper_convert_output(decoder))
                 {
-                    ret = mfwrapper_deliver_sample(decoder, decoder->pColorConvertOutput);
+                    // Deliver from IYUV color converter
+                    ret = mfwrapper_deliver_sample(decoder,
+                                decoder->pColorConvertOutput[COLOR_CONVERT_IYUV]);
                 }
             }
             else
@@ -945,8 +1321,14 @@ static gboolean mfwrapper_sink_event(GstPad* pad, GstObject *parent, GstEvent *e
     case GST_EVENT_FLUSH_STOP:
     {
         decoder->pDecoder->ProcessMessage(MFT_MESSAGE_COMMAND_FLUSH, 0);
-        if (decoder->pColorConvert)
-            decoder->pColorConvert->ProcessMessage(MFT_MESSAGE_COMMAND_FLUSH, 0);
+        for (int i = 0; i < MAX_COLOR_CONVERT; i++)
+        {
+            if (decoder->pColorConvert[i])
+            {
+                decoder->pColorConvert[i]->
+                        ProcessMessage(MFT_MESSAGE_COMMAND_FLUSH, 0);
+            }
+        }
 
         ret = mfwrapper_push_sink_event(decoder, event);
 
@@ -958,11 +1340,15 @@ static gboolean mfwrapper_sink_event(GstPad* pad, GstObject *parent, GstEvent *e
         decoder->is_eos_received = TRUE;
 
         // Let decoder know that we got end of stream
-        hr = decoder->pDecoder->ProcessMessage(MFT_MESSAGE_NOTIFY_END_OF_STREAM, 0);
+        hr = decoder->pDecoder->
+                ProcessMessage(MFT_MESSAGE_NOTIFY_END_OF_STREAM, 0);
 
         // Ask decoder to produce all remaining data
         if (SUCCEEDED(hr))
-            decoder->pDecoder->ProcessMessage(MFT_MESSAGE_COMMAND_DRAIN, 0);
+        {
+            decoder->pDecoder->
+                    ProcessMessage(MFT_MESSAGE_COMMAND_DRAIN, 0);
+        }
 
         // Deliver remaining data
         gint po_ret;
@@ -971,11 +1357,16 @@ static gboolean mfwrapper_sink_event(GstPad* pad, GstObject *parent, GstEvent *e
             po_ret = mfwrapper_process_output(decoder);
         } while (po_ret == PO_DELIVERED);
 
-        if (decoder->pColorConvert)
+        for (int i = 0; i < MAX_COLOR_CONVERT; i++)
         {
-            hr = decoder->pColorConvert->ProcessMessage(MFT_MESSAGE_NOTIFY_END_OF_STREAM, 0);
-            if (SUCCEEDED(hr))
-                hr = decoder->pColorConvert->ProcessMessage(MFT_MESSAGE_COMMAND_FLUSH, 0);
+            if (decoder->pColorConvert[i])
+            {
+                hr = decoder->pColorConvert[i]->
+                        ProcessMessage(MFT_MESSAGE_NOTIFY_END_OF_STREAM, 0);
+                if (SUCCEEDED(hr))
+                    hr = decoder->pColorConvert[i]->
+                            ProcessMessage(MFT_MESSAGE_COMMAND_FLUSH, 0);
+            }
         }
 
         // We done pushing all frames. Deliver EOS.
@@ -991,7 +1382,10 @@ static gboolean mfwrapper_sink_event(GstPad* pad, GstObject *parent, GstEvent *e
         gst_event_parse_caps(event, &caps);
         if (!mfwrapper_sink_set_caps(pad, parent, caps))
         {
-            gst_element_message_full(GST_ELEMENT(decoder), GST_MESSAGE_ERROR, GST_STREAM_ERROR, GST_STREAM_ERROR_DECODE, g_strdup("Failed to decode stream"), NULL, ("mfwrapper.c"), ("mfwrapper_sink_event"), 0);
+            gst_element_message_full(GST_ELEMENT(decoder), GST_MESSAGE_ERROR,
+                                     GST_STREAM_ERROR, GST_STREAM_ERROR_DECODE,
+                                     g_strdup("Failed to decode stream"), NULL,
+                                     ("mfwrapper.c"), ("mfwrapper_sink_event"), 0);
         }
 
         // INLINE - gst_event_unref()
@@ -1161,11 +1555,11 @@ static HRESULT mfwrapper_set_input_media_type(GstMFWrapper *decoder, GstCaps *ca
     if (s == NULL)
         return E_FAIL;
 
-    hr = MFCreateMediaType(&pInputType);
-
     if (!mfwrapper_get_mf_media_types(caps, &majorType, &subType))
         return E_FAIL;
 
+    hr = MFCreateMediaType(&pInputType);
+
     if (SUCCEEDED(hr))
         hr = pInputType->SetGUID(MF_MT_MAJOR_TYPE, majorType);
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/plugins/mfwrapper/mfwrapper.h b/modules/javafx.media/src/main/native/gstreamer/plugins/mfwrapper/mfwrapper.h
index 93504006ed2..b38c588f702 100644
--- a/modules/javafx.media/src/main/native/gstreamer/plugins/mfwrapper/mfwrapper.h
+++ b/modules/javafx.media/src/main/native/gstreamer/plugins/mfwrapper/mfwrapper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,16 @@
 
 G_BEGIN_DECLS
 
+// Media Foundation Color Convert:
+// NV12 -> IYUV
+// P010 -> NV12 -> IYUV
+// Maximum number of color converters
+#define MAX_COLOR_CONVERT 2
+// Index in array for color convert with IYUV output format
+#define COLOR_CONVERT_IYUV 0
+// Index in array for color convert with NV12 output format
+#define COLOR_CONVERT_NV12 1
+
 #define GST_TYPE_MFWRAPPER \
     (gst_mfwrapper_get_type())
 #define GST_MFWRAPPER(obj) \
@@ -68,12 +78,10 @@ struct _GstMFWrapper
     HRESULT hr_mfstartup;
 
     IMFTransform *pDecoder;
-
     IMFSample *pDecoderOutput;
 
-    IMFTransform *pColorConvert;
-
-    IMFSample *pColorConvertOutput;
+    IMFTransform *pColorConvert[MAX_COLOR_CONVERT];
+    IMFSample *pColorConvertOutput[MAX_COLOR_CONVERT];
 
     BYTE *header;
     gsize header_size;
@@ -82,6 +90,10 @@ struct _GstMFWrapper
     guint height;
     guint framerate_num;
     guint framerate_den;
+
+    guint defaultStride;
+    guint pixel_num;
+    guint pixel_den;
 };
 
 struct _GstMFWrapperClass

From abb6dfefae840ac17893a12e4ac086140c83e451 Mon Sep 17 00:00:00 2001
From: Lukasz Kostyra <lkostyra@openjdk.org>
Date: Thu, 8 Aug 2024 13:48:32 +0000
Subject: [PATCH 11/75] 8336624: Improve Decora Shader loading for modern APIs

Reviewed-by: arapte
---
 .../main/java/com/sun/prism/d3d/D3DResourceFactory.java    | 7 ++++---
 .../main/java/com/sun/prism/es2/ES2ResourceFactory.java    | 7 ++++---
 .../java/com/sun/prism/null3d/DummyResourceFactory.java    | 3 ++-
 .../src/main/java/com/sun/prism/ps/ShaderFactory.java      | 3 ++-
 .../com/sun/scenario/effect/impl/prism/ps/PPSRenderer.java | 2 +-
 .../javafx.graphics/src/main/jsl-prism/PrismLoaderGlue.stg | 3 ++-
 6 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/modules/javafx.graphics/src/main/java/com/sun/prism/d3d/D3DResourceFactory.java b/modules/javafx.graphics/src/main/java/com/sun/prism/d3d/D3DResourceFactory.java
index 44498979bcd..51b12fcfd45 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/prism/d3d/D3DResourceFactory.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/prism/d3d/D3DResourceFactory.java
@@ -429,7 +429,8 @@ private static ByteBuffer getBuffer(InputStream is) {
     }
 
     @Override
-    public Shader createShader(InputStream pixelShaderCode,
+    public Shader createShader(String pixelShaderName,
+                               InputStream pixelShaderCode,
                                Map<String, Integer> samplers,
                                Map<String, Integer> params,
                                int maxTexCoordIndex,
@@ -458,8 +459,8 @@ public Shader createStockShader(final String name) {
             );
             Class klass = Class.forName("com.sun.prism.shader." + name + "_Loader");
             Method m = klass.getMethod("loadShader",
-                new Class[] { ShaderFactory.class, InputStream.class });
-            return (Shader)m.invoke(null, new Object[] { this, stream });
+                new Class[] { ShaderFactory.class, String.class, InputStream.class });
+            return (Shader)m.invoke(null, new Object[] { this, name, stream });
         } catch (Throwable e) {
             e.printStackTrace();
             throw new InternalError("Error loading stock shader " + name);
diff --git a/modules/javafx.graphics/src/main/java/com/sun/prism/es2/ES2ResourceFactory.java b/modules/javafx.graphics/src/main/java/com/sun/prism/es2/ES2ResourceFactory.java
index 9ba3a2b32d1..fcb731006fb 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/prism/es2/ES2ResourceFactory.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/prism/es2/ES2ResourceFactory.java
@@ -217,7 +217,8 @@ public int getMaximumTextureSize() {
     }
 
     @Override
-    public Shader createShader(InputStream pixelShaderCode,
+    public Shader createShader(String pixelShaderName,
+            InputStream pixelShaderCode,
             Map<String, Integer> samplers,
             Map<String, Integer> params,
             int maxTexCoordIndex,
@@ -320,8 +321,8 @@ public Shader createStockShader(String name) {
             }
             Method m =
                     klass.getMethod("loadShader", new Class[]{ShaderFactory.class,
-                        InputStream.class});
-            return (Shader) m.invoke(null, new Object[]{this, stream});
+                        String.class, InputStream.class});
+            return (Shader) m.invoke(null, new Object[]{this, name, stream});
         } catch (Throwable e) {
             e.printStackTrace();
             throw new InternalError("Error loading stock shader " + name);
diff --git a/modules/javafx.graphics/src/main/java/com/sun/prism/null3d/DummyResourceFactory.java b/modules/javafx.graphics/src/main/java/com/sun/prism/null3d/DummyResourceFactory.java
index 635e3e447ec..9f9b4de709f 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/prism/null3d/DummyResourceFactory.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/prism/null3d/DummyResourceFactory.java
@@ -108,7 +108,8 @@ public Presentable createPresentable(PresentableState pState) {
     }
 
     @Override
-    public Shader createShader(InputStream pixelShaderCode,
+    public Shader createShader(String pixelShaderName,
+                               InputStream pixelShaderCode,
                                Map<String, Integer> samplers,
                                Map<String, Integer> params,
                                int maxTexCoordIndex,
diff --git a/modules/javafx.graphics/src/main/java/com/sun/prism/ps/ShaderFactory.java b/modules/javafx.graphics/src/main/java/com/sun/prism/ps/ShaderFactory.java
index 60fcfdaa763..98d3896bb67 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/prism/ps/ShaderFactory.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/prism/ps/ShaderFactory.java
@@ -31,7 +31,8 @@
 
 public interface ShaderFactory extends ResourceFactory {
 
-    public Shader createShader(InputStream pixelShaderCode,
+    public Shader createShader(String pixelShaderName,
+                               InputStream pixelShaderCode,
                                Map<String, Integer> samplers,
                                Map<String, Integer> params,
                                int maxTexCoordIndex,
diff --git a/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/impl/prism/ps/PPSRenderer.java b/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/impl/prism/ps/PPSRenderer.java
index 9ef7a71b0e9..eeb0d2b1d34 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/impl/prism/ps/PPSRenderer.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/impl/prism/ps/PPSRenderer.java
@@ -267,7 +267,7 @@ public Shader createShader(String name,
         InputStream pscode = shaderSource.loadSource(name);
         int maxTexCoordIndex = samplers.keySet().size()-1;
         ShaderFactory factory = (ShaderFactory)rf;
-        return factory.createShader(pscode, samplers, params,
+        return factory.createShader(name, pscode, samplers, params,
                                     maxTexCoordIndex,
                                     isPixcoordUsed, false);
     }
diff --git a/modules/javafx.graphics/src/main/jsl-prism/PrismLoaderGlue.stg b/modules/javafx.graphics/src/main/jsl-prism/PrismLoaderGlue.stg
index 3abaa52f3d3..207e8820b80 100644
--- a/modules/javafx.graphics/src/main/jsl-prism/PrismLoaderGlue.stg
+++ b/modules/javafx.graphics/src/main/jsl-prism/PrismLoaderGlue.stg
@@ -43,13 +43,14 @@ public class $shaderName$_Loader {
     }
 
     public static Shader loadShader(ShaderFactory factory,
+                                    String pixelShaderName,
                                     InputStream pixelShaderCode)
     {
         HashMap<String, Integer> samplers = new HashMap<String, Integer>();
         $samplerInit$
         HashMap<String, Integer> params = new HashMap<String, Integer>();
         $paramInit$
-        return factory.createShader(pixelShaderCode, samplers, params,
+        return factory.createShader(pixelShaderName, pixelShaderCode, samplers, params,
                                     $maxTexCoordIndex$,
                                     $isPixcoordUsed$, true);
     }

From 00c74ebf96cbe24b833cb51d2ee533e69396c846 Mon Sep 17 00:00:00 2001
From: Lukasz Kostyra <lkostyra@openjdk.org>
Date: Tue, 13 Aug 2024 06:30:34 +0000
Subject: [PATCH 12/75] 8333919: [macOS] dragViewOffsetX/dragViewOffsetY are
 ignored for the dragView image

Reviewed-by: jpereda, kcr, angorya
---
 .../main/native-glass/mac/GlassViewDelegate.m | 31 +++++++++----------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/modules/javafx.graphics/src/main/native-glass/mac/GlassViewDelegate.m b/modules/javafx.graphics/src/main/native-glass/mac/GlassViewDelegate.m
index a68fbf49ea2..cf9075005a2 100644
--- a/modules/javafx.graphics/src/main/native-glass/mac/GlassViewDelegate.m
+++ b/modules/javafx.graphics/src/main/native-glass/mac/GlassViewDelegate.m
@@ -1021,7 +1021,7 @@ - (void)startDrag:(NSDragOperation)operation withItems:(NSArray<NSDraggingItem*>
 
         if (image != nil)
         {
-            DNDLOG("created an image with dim %dx%d", [image size].width, [image size].height);
+            DNDLOG("created an image with dim %fx%f", [image size].width, [image size].height);
             // check the drag image size and scale it down as needed using Safari behavior (sizes) as reference
             rect.size.width = [image size].width;
             rect.size.height = [image size].height;
@@ -1042,30 +1042,27 @@ - (void)startDrag:(NSDragOperation)operation withItems:(NSArray<NSDraggingItem*>
                     [image setSize:NSMakeSize(rect.size.width, rect.size.height)];
                 }
             }
-        }
-
-        if (image != nil)
-        {
-            // select the center of the image as the drag origin
-            // TODO http://javafx-jira.kenai.com/browse/RT-17629
-            // would be nice to get this info from the Java layer,
-            // so that we could adjust the drag image origin based on where in the src it was clicked on
-            dragPoint.x -= ([image size].width/2.0f);
-            dragPoint.y -= ([image size].height/2.0f);
 
             NSString *offsetString = [pbItem stringForType:DRAG_IMAGE_OFFSET];
             if (offsetString != nil) {
                 NSPoint offset = NSPointFromString(offsetString);
                 //Adjust offset to the image size
-                float imageHalfX = [image size].width/2.0f;
-                float imageHalfY = [image size].height/2.0f;
+                float imageW = [image size].width;
+                float imageH = [image size].height;
 
-                if (offset.x > imageHalfX || offset.x < -imageHalfX) {
-                    offset.x = imageHalfX * (offset.x > 0 ? 1 : -1);
+                if (offset.x < 0.0f) {
+                    offset.x = 0.0f;
+                } else if (offset.x > imageW) {
+                    offset.x = imageW;
                 }
-                if (offset.y > imageHalfY || offset.y < -imageHalfY) {
-                    offset.y = imageHalfY * (offset.y > 0 ? 1 : -1);
+                if (offset.y < 0.0f) {
+                    offset.y = 0.0f;
+                } else if (offset.y > imageH) {
+                    offset.y = imageH;
                 }
+
+                dragPoint.x -= offset.x;
+                dragPoint.y -= offset.y;
             }
         }
         else

From dc8f607e4ce95e348bb812a1c942e4321c00f0f8 Mon Sep 17 00:00:00 2001
From: Hima Bindu Meda <hmeda@openjdk.org>
Date: Wed, 14 Aug 2024 14:48:30 +0000
Subject: [PATCH 13/75] 8336941: Update libxslt to 1.1.42

Reviewed-by: kcr, jbhaskar
---
 modules/javafx.web/src/main/legal/libxslt.md  |   2 +-
 .../Source/ThirdParty/libxslt/linux/config.h  |   6 +-
 .../Source/ThirdParty/libxslt/mac/config.h    |   6 +-
 .../Source/ThirdParty/libxslt/src/Makefile.am |  10 -
 .../ThirdParty/libxslt/src/configure.ac       |  14 +-
 .../Source/ThirdParty/libxslt/src/libxslt.m4  | 190 ------------------
 .../libxslt/src/libxslt/documents.c           |   2 -
 .../libxslt/src/libxslt/extensions.c          |   2 +
 .../libxslt/src/libxslt/functions.c           |  81 ++++----
 .../ThirdParty/libxslt/src/libxslt/libxslt.h  |  19 ++
 .../ThirdParty/libxslt/src/libxslt/security.c |  13 ++
 .../libxslt/src/libxslt/variables.c           |  12 +-
 .../ThirdParty/libxslt/src/libxslt/xslt.c     |  40 +++-
 .../libxslt/src/libxslt/xsltInternals.h       |   3 +
 .../libxslt/src/libxslt/xsltconfig.h          |  41 +---
 .../libxslt/src/libxslt/xsltconfig.h.in       |  33 ---
 .../libxslt/src/libxslt/xsltlocale.c          |   6 +-
 .../libxslt/src/libxslt/xsltutils.c           |  44 ++--
 .../ThirdParty/libxslt/src/win32/configure.js |   5 -
 19 files changed, 162 insertions(+), 367 deletions(-)
 delete mode 100644 modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt.m4

diff --git a/modules/javafx.web/src/main/legal/libxslt.md b/modules/javafx.web/src/main/legal/libxslt.md
index 8be637f5ed7..a06f0941043 100644
--- a/modules/javafx.web/src/main/legal/libxslt.md
+++ b/modules/javafx.web/src/main/legal/libxslt.md
@@ -1,4 +1,4 @@
-## xmlsoft.org: libxslt v1.1.39
+## xmlsoft.org: libxslt v1.1.42
 
 ### libxslt License
 ```
diff --git a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/linux/config.h b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/linux/config.h
index cba9481b77f..4032ad15683 100644
--- a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/linux/config.h
+++ b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/linux/config.h
@@ -104,7 +104,7 @@
 #define PACKAGE_NAME "libxslt"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libxslt 1.1.39"
+#define PACKAGE_STRING "libxslt 1.1.42"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "libxslt"
@@ -113,7 +113,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.1.39"
+#define PACKAGE_VERSION "1.1.42"
 
 /* Define to 1 if all of the C90 standard headers exist (not just the ones
    required in a freestanding environment). This macro is provided for
@@ -209,7 +209,7 @@
 
 
 /* Version number of package */
-#define VERSION "1.1.39"
+#define VERSION "1.1.42"
 
 /* Define if debugging support is enabled */
 #define WITH_DEBUGGER /**/
diff --git a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/mac/config.h b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/mac/config.h
index 3594ce4b9b1..66b1484d667 100644
--- a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/mac/config.h
+++ b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/mac/config.h
@@ -104,7 +104,7 @@
 #define PACKAGE_NAME "libxslt"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libxslt 1.1.39"
+#define PACKAGE_STRING "libxslt 1.1.42"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "libxslt"
@@ -113,7 +113,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.1.39"
+#define PACKAGE_VERSION "1.1.42"
 
 /* Define to 1 if all of the C90 standard headers exist (not just the ones
    required in a freestanding environment). This macro is provided for
@@ -209,7 +209,7 @@
 
 
 /* Version number of package */
-#define VERSION "1.1.39"
+#define VERSION "1.1.42"
 
 /* Define if debugging support is enabled */
 #define WITH_DEBUGGER /**/
diff --git a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/Makefile.am b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/Makefile.am
index db50cddb77c..4c4deba697d 100644
--- a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/Makefile.am
+++ b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/Makefile.am
@@ -42,13 +42,6 @@ CLEANFILES = xsltConf.sh
 cleanup:
 	-@(find . -name .\#\* -exec rm {} \;)
 
-cleantar:
-	@(rm -f libxslt*.tar.gz)
-
-rpm: cleantar
-	@(unset CDPATH ; $(MAKE) dist && rpmbuild -ta $(distdir).tar.gz)
-
-
 pkgconfigdir=$(libdir)/pkgconfig
 pkgconfig_DATA = libxslt.pc libexslt.pc
 
@@ -56,6 +49,3 @@ cmakedir = $(libdir)/cmake/libxslt
 dist_cmake_DATA = FindGcrypt.cmake
 cmake_DATA = libxslt-config.cmake
 
-m4datadir = $(datadir)/aclocal
-dist_m4data_DATA = libxslt.m4
-
diff --git a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/configure.ac b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/configure.ac
index 0131754f968..e1e9a96b9c1 100644
--- a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/configure.ac
+++ b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ(2.63)
 
 m4_define([MAJOR_VERSION], [1])
 m4_define([MINOR_VERSION], [1])
-m4_define([MICRO_VERSION], [39])
+m4_define([MICRO_VERSION], [42])
 
 AC_INIT([libxslt], [MAJOR_VERSION.MINOR_VERSION.MICRO_VERSION])
 AC_CONFIG_SRCDIR([libxslt/xslt.c])
@@ -21,7 +21,7 @@ LIBXSLT_MINOR_VERSION=MINOR_VERSION
 LIBXSLT_MICRO_VERSION=MICRO_VERSION
 LIBEXSLT_MAJOR_VERSION=0
 LIBEXSLT_MINOR_VERSION=8
-LIBEXSLT_MICRO_VERSION=21
+LIBEXSLT_MICRO_VERSION=23
 LIBXML_REQUIRED_VERSION=2.6.27
 
 
@@ -253,15 +253,6 @@ else
 fi
 AC_SUBST(WITH_XSLT_DEBUG)
 
-AC_ARG_WITH(mem_debug, [  --with-mem-debug        Add the memory debugging module (off)])
-if test "$with_mem_debug" = "yes" ; then
-    echo Enabling memory debug support
-    WITH_MEM_DEBUG=1
-else    
-    WITH_MEM_DEBUG=0
-fi
-AC_SUBST(WITH_MEM_DEBUG)
-
 dnl 
 dnl Is debugger support requested
 dnl
@@ -568,7 +559,6 @@ tests/fuzz/Makefile
 doc/Makefile
 doc/devhelp/Makefile
 doc/EXSLT/devhelp/Makefile
-libxslt.spec
 ])
 AC_CONFIG_FILES([xslt-config], [chmod +x xslt-config])
 
diff --git a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt.m4 b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt.m4
deleted file mode 100644
index f1c20e85388..00000000000
--- a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt.m4
+++ /dev/null
@@ -1,190 +0,0 @@
-# Based on:
-# Configure paths for LIBXML2
-# Toshio Kuratomi 2001-04-21
-# Adapted from:
-# Configure paths for GLIB
-# Owen Taylor     97-11-3
-#
-# Modified to work with libxslt by Thomas Schraitle 2002/10/25
-# Fixed by Edward Rudd 2004/05/12
-
-dnl AM_PATH_XSLT([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for XML, and define XML_CFLAGS and XML_LIBS
-dnl
-AC_DEFUN([AM_PATH_XSLT],[
-AC_ARG_WITH(xslt-prefix,
-            [  --with-xslt-prefix=PFX   Prefix where libxslt is installed (optional)],
-            xslt_config_prefix="$withval", xslt_config_prefix="")
-AC_ARG_WITH(xslt-exec-prefix,
-            [  --with-xslt-exec-prefix=PFX Exec prefix where libxslt is installed (optional)],
-            xslt_config_exec_prefix="$withval", xslt_config_exec_prefix="")
-AC_ARG_ENABLE(xslttest,
-              [  --disable-xslttest       Do not try to compile and run a test LIBXSLT program],,
-              enable_xslttest=yes)
-
-  if test x$xslt_config_exec_prefix != x ; then
-     xslt_config_args="$xslt_config_args --exec-prefix=$xslt_config_exec_prefix"
-     if test x${XSLT_CONFIG+set} != xset ; then
-        XSLT_CONFIG=$xslt_config_exec_prefix/bin/xslt-config
-     fi
-  fi
-  if test x$xslt_config_prefix != x ; then
-     xslt_config_args="$xslt_config_args --prefix=$xslt_config_prefix"
-     if test x${XSLT_CONFIG+set} != xset ; then
-        XSLT_CONFIG=$xslt_config_prefix/bin/xslt-config
-     fi
-  fi
-
-  AC_PATH_PROG(XSLT_CONFIG, xslt-config, no)
-  min_xslt_version=ifelse([$1], ,1.0.0,[$1])
-  AC_MSG_CHECKING(for libxslt - version >= $min_xslt_version)
-  no_xslt=""
-  if test "$XSLT_CONFIG" = "no" ; then
-    no_xslt=yes
-  else
-    XSLT_CFLAGS=`$XSLT_CONFIG $xslt_config_args --cflags`
-    XSLT_LIBS=`$XSLT_CONFIG $xslt_config_args --libs`
-    xslt_config_major_version=`$XSLT_CONFIG $xslt_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    xslt_config_minor_version=`$XSLT_CONFIG $xslt_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    xslt_config_micro_version=`$XSLT_CONFIG $xslt_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_xslttest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $XSLT_CFLAGS"
-      LIBS="$XSLT_LIBS $LIBS"
-dnl
-dnl Now check if the installed libxslt is sufficiently new.
-dnl (Also sanity checks the results of xslt-config to some extent)
-dnl
-      rm -f conf.xslttest
-      AC_TRY_RUN([
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <libxslt/xsltconfig.h>
-#include <libxslt/xslt.h>
-int 
-main()
-{
-  int xslt_major_version, xslt_minor_version, xslt_micro_version;
-  int major, minor, micro;
-  char *tmp_version;
-
-  system("touch conf.xslttest");
-
-  /* Capture xslt-config output via autoconf/configure variables */
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = (char *)strdup("$min_xslt_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string from xslt-config\n", "$min_xslt_version");
-     exit(1);
-   }
-   free(tmp_version);
-
-   /* Capture the version information from the header files */
-   tmp_version = (char *)strdup(LIBXSLT_DOTTED_VERSION);
-   if (sscanf(tmp_version, "%d.%d.%d", &xslt_major_version, &xslt_minor_version, &xslt_micro_version) != 3) {
-     printf("%s, bad version string from libxslt includes\n", "LIBXSLT_DOTTED_VERSION");
-     exit(1);
-   }
-   free(tmp_version);
-
- /* Compare xslt-config output to the libxslt headers */
-  if ((xslt_major_version != $xslt_config_major_version) ||
-      (xslt_minor_version != $xslt_config_minor_version) ||
-      (xslt_micro_version != $xslt_config_micro_version))
-    {
-      printf("*** libxslt header files (version %d.%d.%d) do not match\n",
-         xslt_major_version, xslt_minor_version, xslt_micro_version);
-      printf("*** xslt-config (version %d.%d.%d)\n",
-         $xslt_config_major_version, $xslt_config_minor_version, $xslt_config_micro_version);
-      return 1;
-    } 
-/* Compare the headers to the library to make sure we match */
-  /* Less than ideal -- doesn't provide us with return value feedback, 
-   * only exits if there's a serious mismatch between header and library.
-   */
-    /* copied from LIBXML_TEST_VERSION; */
-    xmlCheckVersion(LIBXML_VERSION);
-
-    /* Test that the library is greater than our minimum version */
-    if ((xslt_major_version > major) ||
-        ((xslt_major_version == major) && (xslt_minor_version > minor)) ||
-        ((xslt_major_version == major) && (xslt_minor_version == minor) &&
-        (xslt_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of libxslt (%d.%d.%d) was found.\n",
-               xslt_major_version, xslt_minor_version, xslt_micro_version);
-        printf("*** You need a version of libxslt newer than %d.%d.%d.\n",
-           major, minor, micro);
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the xslt-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of LIBXSLT, but you can also set the XSLT_CONFIG environment to point to the\n");
-        printf("*** correct copy of xslt-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-    }
-  return 1;
-}
-],, no_xslt=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-
-  if test "x$no_xslt" = x ; then
-     AC_MSG_RESULT(yes (version $xslt_config_major_version.$xslt_config_minor_version.$xslt_config_micro_version))
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$XSLT_CONFIG" = "no" ; then
-       echo "*** The xslt-config script installed by LIBXSLT could not be found"
-       echo "*** If libxslt was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the XSLT_CONFIG environment variable to the"
-       echo "*** full path to xslt-config."
-     else
-       if test -f conf.xslttest ; then
-        :
-       else
-          echo "*** Could not run libxslt test program, checking why..."
-          CFLAGS="$CFLAGS $XSLT_CFLAGS"
-          LIBS="$LIBS $XSLT_LIBS"
-          AC_TRY_LINK([
-#include <libxslt/xslt.h>
-#include <stdio.h>
-],      [ LIBXSLT_TEST_VERSION; return 0;],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding LIBXSLT or finding the wrong"
-          echo "*** version of LIBXSLT. If it is not finding LIBXSLT, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-          echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means LIBXSLT was incorrectly installed"
-          echo "*** or that you have moved LIBXSLT since it was installed. In the latter case, you"
-          echo "*** may want to edit the xslt-config script: $XSLT_CONFIG" ])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-
-     XSLT_CFLAGS=""
-     XSLT_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(XSLT_CFLAGS)
-  AC_SUBST(XSLT_LIBS)
-  rm -f conf.xslttest
-])
diff --git a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/documents.c b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/documents.c
index af7f645963c..d2eb21f0770 100644
--- a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/documents.c
+++ b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/documents.c
@@ -88,8 +88,6 @@ xsltDocDefaultLoaderFunc(const xmlChar * URI, xmlDictPtr dict, int options,
         return(NULL);
     }
     inputPush(pctxt, inputStream);
-    if (pctxt->directory == NULL)
-        pctxt->directory = xmlParserGetDirectory((const char *) URI);
 
     xmlParseDocument(pctxt);
 
diff --git a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/extensions.c b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/extensions.c
index a839c14b775..8bd62cd7cad 100644
--- a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/extensions.c
+++ b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/extensions.c
@@ -415,6 +415,7 @@ xsltExtModuleRegisterDynamic(const xmlChar * URI)
                      module_filename, URI);
 #endif
 
+#if LIBXML_VERSION < 21300
     if (1 != xmlCheckFilename(module_filename)) {
 
 #ifdef WITH_XSLT_DEBUG_EXTENSIONS
@@ -425,6 +426,7 @@ xsltExtModuleRegisterDynamic(const xmlChar * URI)
         xmlFree(ext_name);
         return (-1);
     }
+#endif
 
     /* attempt to open the module */
     m = xmlModuleOpen(module_filename, 0);
diff --git a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/functions.c b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/functions.c
index e93445d6d33..f849ea236c2 100644
--- a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/functions.c
+++ b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/functions.c
@@ -96,45 +96,25 @@ xsltXPathFunctionLookup (void *vctxt,
  ************************************************************************/
 
 static void
-xsltDocumentFunctionLoadDocument(xmlXPathParserContextPtr ctxt, xmlChar* URI)
+xsltDocumentFunctionLoadDocument(xmlXPathParserContextPtr ctxt,
+                                 const xmlChar* URI, const xmlChar *fragment)
 {
     xsltTransformContextPtr tctxt;
-    xmlURIPtr uri;
-    xmlChar *fragment;
     xsltDocumentPtr idoc; /* document info */
     xmlDocPtr doc;
     xmlXPathContextPtr xptrctxt = NULL;
     xmlXPathObjectPtr resObj = NULL;
 
+    (void) xptrctxt;
+
     tctxt = xsltXPathGetTransformContext(ctxt);
     if (tctxt == NULL) {
         xsltTransformError(NULL, NULL, NULL,
             "document() : internal error tctxt == NULL\n");
-        valuePush(ctxt, xmlXPathNewNodeSet(NULL));
-        return;
+        goto out_fragment;
     }
 
-    uri = xmlParseURI((const char *) URI);
-    if (uri == NULL) {
-        xsltTransformError(tctxt, NULL, NULL,
-            "document() : failed to parse URI\n");
-        valuePush(ctxt, xmlXPathNewNodeSet(NULL));
-        return;
-    }
-
-    /*
-     * check for and remove fragment identifier
-     */
-    fragment = (xmlChar *)uri->fragment;
-    if (fragment != NULL) {
-        xmlChar *newURI;
-        uri->fragment = NULL;
-        newURI = xmlSaveUri(uri);
-        idoc = xsltLoadDocument(tctxt, newURI);
-        xmlFree(newURI);
-    } else
-        idoc = xsltLoadDocument(tctxt, URI);
-    xmlFreeURI(uri);
+    idoc = xsltLoadDocument(tctxt, URI);
 
     if (idoc == NULL) {
         if ((URI == NULL) ||
@@ -147,12 +127,7 @@ xsltDocumentFunctionLoadDocument(xmlXPathParserContextPtr ctxt, xmlChar* URI)
             */
             doc = tctxt->style->doc;
         } else {
-            valuePush(ctxt, xmlXPathNewNodeSet(NULL));
-
-            if (fragment != NULL)
-                xmlFree(fragment);
-
-            return;
+            goto out_fragment;
         }
     } else
         doc = idoc->doc;
@@ -164,7 +139,7 @@ xsltDocumentFunctionLoadDocument(xmlXPathParserContextPtr ctxt, xmlChar* URI)
 
     /* use XPointer of HTML location for fragment ID */
 #ifdef LIBXML_XPTR_ENABLED
-    xptrctxt = xmlXPtrNewContext(doc, NULL, NULL);
+    xptrctxt = xmlXPathNewContext(doc);
     if (xptrctxt == NULL) {
         xsltTransformError(tctxt, NULL, NULL,
             "document() : internal error xptrctxt == NULL\n");
@@ -199,7 +174,6 @@ xsltDocumentFunctionLoadDocument(xmlXPathParserContextPtr ctxt, xmlChar* URI)
     if (resObj == NULL)
         resObj = xmlXPathNewNodeSet(NULL);
     valuePush(ctxt, resObj);
-    xmlFree(fragment);
 }
 
 /**
@@ -215,7 +189,8 @@ xsltDocumentFunction(xmlXPathParserContextPtr ctxt, int nargs)
 {
     xmlXPathObjectPtr obj, obj2 = NULL;
     xmlChar *base = NULL, *URI;
-
+    xmlChar *newURI = NULL;
+    xmlChar *fragment = NULL;
 
     if ((nargs < 1) || (nargs > 2)) {
         xsltTransformError(xsltXPathGetTransformContext(ctxt), NULL, NULL,
@@ -297,7 +272,32 @@ xsltDocumentFunction(xmlXPathParserContextPtr ctxt, int nargs)
         valuePush(ctxt, xmlXPathNewNodeSet(NULL));
     } else {
         xsltTransformContextPtr tctxt;
+        xmlURIPtr uri;
+        const xmlChar *url;
+
         tctxt = xsltXPathGetTransformContext(ctxt);
+
+        url = obj->stringval;
+
+        uri = xmlParseURI((const char *) url);
+        if (uri == NULL) {
+            xsltTransformError(tctxt, NULL, NULL,
+                "document() : failed to parse URI '%s'\n", url);
+            valuePush(ctxt, xmlXPathNewNodeSet(NULL));
+            goto error;
+        }
+
+        /*
+         * check for and remove fragment identifier
+         */
+        fragment = (xmlChar *)uri->fragment;
+        if (fragment != NULL) {
+            uri->fragment = NULL;
+            newURI = xmlSaveUri(uri);
+            url = newURI;
+        }
+        xmlFreeURI(uri);
+
         if ((obj2 != NULL) && (obj2->nodesetval != NULL) &&
             (obj2->nodesetval->nodeNr > 0) &&
             IS_XSLT_REAL_NODE(obj2->nodesetval->nodeTab[0])) {
@@ -318,7 +318,8 @@ xsltDocumentFunction(xmlXPathParserContextPtr ctxt, int nargs)
                                       (xmlNodePtr) tctxt->style->doc);
             }
         }
-        URI = xmlBuildURI(obj->stringval, base);
+
+        URI = xmlBuildURI(url, base);
         if (base != NULL)
             xmlFree(base);
         if (URI == NULL) {
@@ -331,10 +332,14 @@ xsltDocumentFunction(xmlXPathParserContextPtr ctxt, int nargs)
                 valuePush(ctxt, xmlXPathNewNodeSet(NULL));
             }
         } else {
-            xsltDocumentFunctionLoadDocument( ctxt, URI );
+            xsltDocumentFunctionLoadDocument(ctxt, URI, fragment);
             xmlFree(URI);
         }
     }
+
+error:
+    xmlFree(newURI);
+    xmlFree(fragment);
     xmlXPathFreeObject(obj);
     if (obj2 != NULL)
         xmlXPathFreeObject(obj2);
@@ -695,7 +700,7 @@ xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){
     const xmlChar *nsPrefix = NULL;
     void **psviPtr;
     unsigned long id;
-    size_t size, nsPrefixSize;
+    size_t size, nsPrefixSize = 0;
 
     tctxt = xsltXPathGetTransformContext(ctxt);
 
diff --git a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/libxslt.h b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/libxslt.h
index 2b0c8b094f0..f81066c08fa 100644
--- a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/libxslt.h
+++ b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/libxslt.h
@@ -10,6 +10,19 @@
 #ifndef __XSLT_LIBXSLT_H__
 #define __XSLT_LIBXSLT_H__
 
+/*
+ * These macros must be defined before including system headers.
+ * Do not add any #include directives above this block.
+ */
+#ifndef NO_LARGEFILE_SOURCE
+  #ifndef _LARGEFILE_SOURCE
+    #define _LARGEFILE_SOURCE
+  #endif
+  #ifndef _FILE_OFFSET_BITS
+    #define _FILE_OFFSET_BITS 64
+  #endif
+#endif
+
 #if defined(_WIN32) && !defined (__MINGW32__)
 #include <win32config.h>
 #else
@@ -33,4 +46,10 @@
 #define mkdir(p,m) _mkdir(p)
 #endif
 
+#ifdef __GNUC__
+#define ATTRIBUTE_UNUSED __attribute__((unused))
+#else
+#define ATTRIBUTE_UNUSED
+#endif
+
 #endif /* ! __XSLT_LIBXSLT_H__ */
diff --git a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/security.c b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/security.c
index e9481f87705..ac2a1eced7f 100644
--- a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/security.c
+++ b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/security.c
@@ -422,6 +422,19 @@ xsltCheckRead(xsltSecurityPrefsPtr sec,
     xmlURIPtr uri;
     xsltSecurityCheck check;
 
+    if (xmlStrstr(URL, BAD_CAST "://") == NULL) {
+        check = xsltGetSecurityPrefs(sec, XSLT_SECPREF_READ_FILE);
+        if (check != NULL) {
+            ret = check(sec, ctxt, (const char *) URL);
+            if (ret == 0) {
+                xsltTransformError(ctxt, NULL, NULL,
+                             "Local file read for %s refused\n", URL);
+                return(0);
+            }
+        }
+        return(1);
+    }
+
     uri = xmlParseURI((const char *)URL);
     if (uri == NULL) {
         xsltTransformError(ctxt, NULL, NULL,
diff --git a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/variables.c b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/variables.c
index 0446ee32292..9e90cb7d8b8 100644
--- a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/variables.c
+++ b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/variables.c
@@ -1011,9 +1011,9 @@ xsltEvalVariable(xsltTransformContextPtr ctxt, xsltStackElemPtr variable,
                 result = xmlXPathNewCString("");
             } else {
                 /*
-                * Freeing is not handled there anymore.
-                * QUESTION TODO: What does the above comment mean?
-                */
+                 * This stops older libxml2 versions from freeing the nodes
+                 * in the tree.
+                 */
                 result->boolval = 0;
             }
 #ifdef WITH_XSLT_DEBUG_VARIABLE
@@ -1232,7 +1232,11 @@ xsltEvalGlobalVariable(xsltStackElemPtr elem, xsltTransformContextPtr ctxt)
             if (result == NULL) {
                 result = xmlXPathNewCString("");
             } else {
-                result->boolval = 0; /* Freeing is not handled there anymore */
+                /*
+                 * This stops older libxml2 versions from freeing the nodes
+                 * in the tree.
+                 */
+                result->boolval = 0;
             }
 #ifdef WITH_XSLT_DEBUG_VARIABLE
 #ifdef LIBXML_DEBUG_ENABLED
diff --git a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/xslt.c b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/xslt.c
index 44c6fcb84e2..63c71fb1489 100644
--- a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/xslt.c
+++ b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/xslt.c
@@ -4460,6 +4460,8 @@ xsltParseSequenceConstructor(xsltCompilerCtxtPtr cctxt, xmlNodePtr cur)
     * NOTE that this content model does *not* allow xsl:param.
     */
     while (cur != NULL) {
+        cctxt->style->principal->opCount += 1;
+
         if (deleteNode != NULL) {
 #ifdef WITH_XSLT_DEBUG_BLANKS
             xsltGenericDebug(xsltGenericDebugContext,
@@ -4500,7 +4502,11 @@ xsltParseSequenceConstructor(xsltCompilerCtxtPtr cctxt, xmlNodePtr cur)
                         * Leave the contained text-node in the tree.
                         */
                         xmlUnlinkNode(tmp);
-                        xmlAddPrevSibling(cur, tmp);
+                        if (xmlAddPrevSibling(cur, tmp) == NULL) {
+                            xsltTransformError(ctxt, NULL, NULL,
+                                    "out of memory\n");
+                            xmlFreeNode(tmp);
+                        }
                     } else {
                         tmp = NULL;
                         xsltTransformError(NULL, cctxt->style, cur,
@@ -4854,6 +4860,8 @@ xsltParseTemplateContent(xsltStylesheetPtr style, xmlNodePtr templ) {
         * user-defined extension instruction if needed).
         */
         do {
+            style->principal->opCount += 1;
+
             if ((child->type == XML_ELEMENT_NODE) &&
                 IS_XSLT_ELEM_FAST(child) &&
                 IS_XSLT_NAME(child, "param"))
@@ -4897,6 +4905,8 @@ xsltParseTemplateContent(xsltStylesheetPtr style, xmlNodePtr templ) {
     cur = templ->children;
     delete = NULL;
     while (cur != NULL) {
+        style->principal->opCount += 1;
+
         if (delete != NULL) {
 #ifdef WITH_XSLT_DEBUG_BLANKS
             xsltGenericDebug(xsltGenericDebugContext,
@@ -4986,7 +4996,11 @@ xsltParseTemplateContent(xsltStylesheetPtr style, xmlNodePtr templ) {
 
                             next = text->next;
                             xmlUnlinkNode(text);
-                            xmlAddPrevSibling(cur, text);
+                            if (xmlAddPrevSibling(cur, text) == NULL) {
+                                xsltTransformError(NULL, style, NULL,
+                                        "out of memory\n");
+                                xmlFreeNode(text);
+                            }
                             text = next;
                         }
                     }
@@ -5366,6 +5380,15 @@ xsltParseStylesheetTemplate(xsltStylesheetPtr style, xmlNodePtr template) {
         (template->type != XML_ELEMENT_NODE))
         return;
 
+    if (style->principal->opLimit > 0) {
+        if (style->principal->opCount > style->principal->opLimit) {
+            xsltTransformError(NULL, style, NULL,
+                "XSLT parser operation limit exceeded\n");
+            style->errors++;
+            return;
+        }
+    }
+
     /*
      * Create and link the structure
      */
@@ -6090,6 +6113,15 @@ xsltParseStylesheetTop(xsltStylesheetPtr style, xmlNodePtr top) {
     if ((top == NULL) || (top->type != XML_ELEMENT_NODE))
         return;
 
+    if (style->principal->opLimit > 0) {
+        if (style->principal->opCount > style->principal->opLimit) {
+            xsltTransformError(NULL, style, NULL,
+                "XSLT parser operation limit exceeded\n");
+            style->errors++;
+            return;
+        }
+    }
+
     prop = xmlGetNsProp(top, (const xmlChar *)"version", NULL);
     if (prop == NULL) {
         xsltTransformError(NULL, style, top,
@@ -6113,6 +6145,8 @@ xsltParseStylesheetTop(xsltStylesheetPtr style, xmlNodePtr top) {
      */
     cur = top->children;
     while (cur != NULL) {
+            style->principal->opCount += 1;
+
             if (IS_BLANK_NODE(cur)) {
                     cur = cur->next;
                     continue;
@@ -6129,6 +6163,8 @@ xsltParseStylesheetTop(xsltStylesheetPtr style, xmlNodePtr top) {
      * process other top-level elements
      */
     while (cur != NULL) {
+        style->principal->opCount += 1;
+
         if (IS_BLANK_NODE(cur)) {
             cur = cur->next;
             continue;
diff --git a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/xsltInternals.h b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/xsltInternals.h
index 483d03cc2d4..ac1b8907b7c 100644
--- a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/xsltInternals.h
+++ b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/xsltInternals.h
@@ -1634,6 +1634,9 @@ struct _xsltStylesheet {
     xmlHashTablePtr namedTemplates; /* hash table of named templates */
 
     xmlXPathContextPtr xpathCtxt;
+
+    unsigned long opLimit;
+    unsigned long opCount;
 };
 
 typedef struct _xsltTransformCache xsltTransformCache;
diff --git a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/xsltconfig.h b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/xsltconfig.h
index 185245538e5..1c3718572f3 100644
--- a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/xsltconfig.h
+++ b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/xsltconfig.h
@@ -20,21 +20,21 @@ extern "C" {
  *
  * the version string like "1.2.3"
  */
-#define LIBXSLT_DOTTED_VERSION "1.1.39"
+#define LIBXSLT_DOTTED_VERSION "1.1.42"
 
 /**
  * LIBXSLT_VERSION:
  *
  * the version number: 1.2.3 value is 10203
  */
-#define LIBXSLT_VERSION 10139
+#define LIBXSLT_VERSION 10142
 
 /**
  * LIBXSLT_VERSION_STRING:
  *
  * the version number string, 1.2.3 value is "10203"
  */
-#define LIBXSLT_VERSION_STRING "10139"
+#define LIBXSLT_VERSION_STRING "10142"
 
 /**
  * LIBXSLT_VERSION_EXTRA:
@@ -54,26 +54,6 @@ extern "C" {
 #define WITH_XSLT_DEBUG
 #endif
 
-#if 0
-/**
- * DEBUG_MEMORY:
- *
- * should be activated only when debugging libxslt. It replaces the
- * allocator with a collect and debug shell to the libc allocator.
- * Use configure --with-mem-debug to activate it on both library
- */
-#define DEBUG_MEMORY
-
-/**
- * DEBUG_MEMORY_LOCATION:
- *
- * should be activated only when debugging libxslt.
- * DEBUG_MEMORY_LOCATION should be activated only when libxml has
- * been configured with --with-debug-mem too
- */
-#define DEBUG_MEMORY_LOCATION
-#endif
-
 /**
  * XSLT_NEED_TRIO:
  *
@@ -132,20 +112,7 @@ extern "C" {
 #ifndef WITH_MODULES
 #define WITH_MODULES
 #endif
-#define LIBXSLT_DEFAULT_PLUGINS_PATH() "/usr/local/lib/libxslt-plugins"
-#endif
-
-/**
- * ATTRIBUTE_UNUSED:
- *
- * This macro is used to flag unused function parameters to GCC
- */
-#ifdef __GNUC__
-#ifndef ATTRIBUTE_UNUSED
-#define ATTRIBUTE_UNUSED __attribute__((unused))
-#endif
-#else
-#define ATTRIBUTE_UNUSED
+#define LIBXSLT_DEFAULT_PLUGINS_PATH() "NULL"
 #endif
 
 /**
diff --git a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/xsltconfig.h.in b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/xsltconfig.h.in
index e115e4963fb..c05e41fbc74 100644
--- a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/xsltconfig.h.in
+++ b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/xsltconfig.h.in
@@ -54,26 +54,6 @@ extern "C" {
 #define WITH_XSLT_DEBUG
 #endif
 
-#if @WITH_MEM_DEBUG@
-/**
- * DEBUG_MEMORY:
- *
- * should be activated only when debugging libxslt. It replaces the
- * allocator with a collect and debug shell to the libc allocator.
- * Use configure --with-mem-debug to activate it on both library
- */
-#define DEBUG_MEMORY
-
-/**
- * DEBUG_MEMORY_LOCATION:
- *
- * should be activated only when debugging libxslt.
- * DEBUG_MEMORY_LOCATION should be activated only when libxml has
- * been configured with --with-debug-mem too
- */
-#define DEBUG_MEMORY_LOCATION
-#endif
-
 /**
  * XSLT_NEED_TRIO:
  *
@@ -135,19 +115,6 @@ extern "C" {
 #define LIBXSLT_DEFAULT_PLUGINS_PATH() "@LIBXSLT_DEFAULT_PLUGINS_PATH@"
 #endif
 
-/**
- * ATTRIBUTE_UNUSED:
- *
- * This macro is used to flag unused function parameters to GCC
- */
-#ifdef __GNUC__
-#ifndef ATTRIBUTE_UNUSED
-#define ATTRIBUTE_UNUSED __attribute__((unused))
-#endif
-#else
-#define ATTRIBUTE_UNUSED
-#endif
-
 /**
  * LIBXSLT_ATTR_FORMAT:
  *
diff --git a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/xsltlocale.c b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/xsltlocale.c
index d0b999292f4..cb2c76df4f0 100644
--- a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/xsltlocale.c
+++ b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/xsltlocale.c
@@ -143,7 +143,7 @@ xsltNewLocale(const xmlChar *languageTag, int lowerFirst ATTRIBUTE_UNUSED) {
             return(NULL);
 
         memcpy(q, ".UTF-8", 7);
-        locale = newlocale(LC_COLLATE_MASK, localeName, NULL);
+        locale = newlocale(LC_ALL_MASK, localeName, NULL);
         if (locale != NULL)
             return(locale);
 
@@ -155,7 +155,7 @@ xsltNewLocale(const xmlChar *languageTag, int lowerFirst ATTRIBUTE_UNUSED) {
     /* Try locale without territory, e.g. for Esperanto (eo) */
 
     memcpy(q, ".UTF-8", 7);
-    locale = newlocale(LC_COLLATE_MASK, localeName, NULL);
+    locale = newlocale(LC_ALL_MASK, localeName, NULL);
     if (locale != NULL)
         return(locale);
 
@@ -173,7 +173,7 @@ xsltNewLocale(const xmlChar *languageTag, int lowerFirst ATTRIBUTE_UNUSED) {
     *q++ = region[0];
     *q++ = region[1];
     memcpy(q, ".UTF-8", 7);
-    locale = newlocale(LC_COLLATE_MASK, localeName, NULL);
+    locale = newlocale(LC_ALL_MASK, localeName, NULL);
 
     return(locale);
 #endif
diff --git a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/xsltutils.c b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/xsltutils.c
index 9dabd9b9c90..c41f00c14ba 100644
--- a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/xsltutils.c
+++ b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/xsltutils.c
@@ -1750,13 +1750,12 @@ xsltSaveResultToFilename(const char *URL, xmlDocPtr result,
 
     XSLT_GET_IMPORT_PTR(encoding, style, encoding)
     if (encoding != NULL) {
-        xmlCharEncodingHandlerPtr encoder;
+        xmlCharEncodingHandlerPtr encoder = NULL;
 
-        encoder = xmlFindCharEncodingHandler((char *)encoding);
-        if ((encoder != NULL) &&
-            (xmlStrEqual((const xmlChar *)encoder->name,
-                         (const xmlChar *) "UTF-8")))
-            encoder = NULL;
+        /* Don't use UTF-8 dummy encoder */
+        if ((xmlStrcasecmp(encoding, BAD_CAST "UTF-8") != 0) &&
+            (xmlStrcasecmp(encoding, BAD_CAST "UTF8") != 0))
+            encoder = xmlFindCharEncodingHandler((char *) encoding);
         buf = xmlOutputBufferCreateFilename(URL, encoder, compression);
     } else {
         buf = xmlOutputBufferCreateFilename(URL, NULL, compression);
@@ -1793,13 +1792,12 @@ xsltSaveResultToFile(FILE *file, xmlDocPtr result, xsltStylesheetPtr style) {
 
     XSLT_GET_IMPORT_PTR(encoding, style, encoding)
     if (encoding != NULL) {
-        xmlCharEncodingHandlerPtr encoder;
+        xmlCharEncodingHandlerPtr encoder = NULL;
 
-        encoder = xmlFindCharEncodingHandler((char *)encoding);
-        if ((encoder != NULL) &&
-            (xmlStrEqual((const xmlChar *)encoder->name,
-                         (const xmlChar *) "UTF-8")))
-            encoder = NULL;
+        /* Don't use UTF-8 dummy encoder */
+        if ((xmlStrcasecmp(encoding, BAD_CAST "UTF-8") != 0) &&
+            (xmlStrcasecmp(encoding, BAD_CAST "UTF8") != 0))
+            encoder = xmlFindCharEncodingHandler((char *) encoding);
         buf = xmlOutputBufferCreateFile(file, encoder);
     } else {
         buf = xmlOutputBufferCreateFile(file, NULL);
@@ -1837,13 +1835,12 @@ xsltSaveResultToFd(int fd, xmlDocPtr result, xsltStylesheetPtr style) {
 
     XSLT_GET_IMPORT_PTR(encoding, style, encoding)
     if (encoding != NULL) {
-        xmlCharEncodingHandlerPtr encoder;
+        xmlCharEncodingHandlerPtr encoder = NULL;
 
-        encoder = xmlFindCharEncodingHandler((char *)encoding);
-        if ((encoder != NULL) &&
-            (xmlStrEqual((const xmlChar *)encoder->name,
-                         (const xmlChar *) "UTF-8")))
-            encoder = NULL;
+        /* Don't use UTF-8 dummy encoder */
+        if ((xmlStrcasecmp(encoding, BAD_CAST "UTF-8") != 0) &&
+            (xmlStrcasecmp(encoding, BAD_CAST "UTF8") != 0))
+            encoder = xmlFindCharEncodingHandler((char *) encoding);
         buf = xmlOutputBufferCreateFd(fd, encoder);
     } else {
         buf = xmlOutputBufferCreateFd(fd, NULL);
@@ -1880,13 +1877,12 @@ xsltSaveResultToString(xmlChar **doc_txt_ptr, int * doc_txt_len,
 
     XSLT_GET_IMPORT_PTR(encoding, style, encoding)
     if (encoding != NULL) {
-        xmlCharEncodingHandlerPtr encoder;
+        xmlCharEncodingHandlerPtr encoder = NULL;
 
-        encoder = xmlFindCharEncodingHandler((char *)encoding);
-        if ((encoder != NULL) &&
-            (xmlStrEqual((const xmlChar *)encoder->name,
-                         (const xmlChar *) "UTF-8")))
-            encoder = NULL;
+        /* Don't use UTF-8 dummy encoder */
+        if ((xmlStrcasecmp(encoding, BAD_CAST "UTF-8") != 0) &&
+            (xmlStrcasecmp(encoding, BAD_CAST "UTF8") != 0))
+            encoder = xmlFindCharEncodingHandler((char *) encoding);
         buf = xmlAllocOutputBuffer(encoder);
         if (buf == NULL)
             xmlCharEncCloseFunc(encoder);
diff --git a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/win32/configure.js b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/win32/configure.js
index 22f65593f34..53be2ba276b 100644
--- a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/win32/configure.js
+++ b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/win32/configure.js
@@ -180,7 +180,6 @@ function discoverVersion()
 	cf.Close();
 	vf.WriteLine("WITH_TRIO=" + (withTrio? "1" : "0"));
 	vf.WriteLine("WITH_DEBUG=" + (withXsltDebug? "1" : "0"));
-	vf.WriteLine("WITH_MEM_DEBUG=" + (withMemDebug? "1" : "0"));
 	vf.WriteLine("WITH_DEBUGGER=" + (withDebugger? "1" : "0"));
 	vf.WriteLine("WITH_ICONV=" + (withIconv? "1" : "0"));
 	vf.WriteLine("WITH_ZLIB=" + (withZlib? "1" : "0"));
@@ -230,8 +229,6 @@ function configureXslt()
 			of.WriteLine(s.replace(/\@WITH_TRIO\@/, withTrio? "1" : "0"));
 		} else if (s.search(/\@WITH_XSLT_DEBUG\@/) != -1) {
 			of.WriteLine(s.replace(/\@WITH_XSLT_DEBUG\@/, withXsltDebug? "1" : "0"));
-		} else if (s.search(/\@WITH_MEM_DEBUG\@/) != -1) {
-			of.WriteLine(s.replace(/\@WITH_MEM_DEBUG\@/, withMemDebug? "1" : "0"));
 		} else if (s.search(/\@WITH_DEBUGGER\@/) != -1) {
 			of.WriteLine(s.replace(/\@WITH_DEBUGGER\@/, withDebugger? "1" : "0"));
 		} else if (s.search(/\@WITH_MODULES\@/) != -1) {
@@ -303,8 +300,6 @@ function configureLibxsltPy()
 			of.WriteLine(s.replace(/\@WITH_TRIO\@/, withTrio? "1" : "0"));
 		} else if (s.search(/\@WITH_XSLT_DEBUG\@/) != -1) {
 			of.WriteLine(s.replace(/\@WITH_XSLT_DEBUG\@/, withXsltDebug? "1" : "0"));
-		} else if (s.search(/\@WITH_MEM_DEBUG\@/) != -1) {
-			of.WriteLine(s.replace(/\@WITH_MEM_DEBUG\@/, withMemDebug? "1" : "0"));
 		} else if (s.search(/\@WITH_DEBUGGER\@/) != -1) {
 			of.WriteLine(s.replace(/\@WITH_DEBUGGER\@/, withDebugger? "1" : "0"));
 		} else if (s.search(/\@WITH_MODULES\@/) != -1) {

From a8f7850503043f616703fdfc8d0a26a00f47b7c8 Mon Sep 17 00:00:00 2001
From: Kevin Rushforth <kcr@openjdk.org>
Date: Wed, 14 Aug 2024 15:00:23 +0000
Subject: [PATCH 14/75] 8289174: JavaFX build fails on Windows when
 VS150COMNTOOLS is not set

Reviewed-by: nlisker, mhanl, lkostyra, prr
---
 .github/workflows/submit.yml                  |   7 --
 build.gradle                                  |  13 +--
 buildSrc/genVSproperties.bat                  |  88 +++++++-------
 buildSrc/win.gradle                           | 107 +++++++-----------
 .../native/jfxmedia/projects/win/Makefile     |   4 -
 5 files changed, 86 insertions(+), 133 deletions(-)

diff --git a/.github/workflows/submit.yml b/.github/workflows/submit.yml
index a25828273ba..8a1f4bd9e64 100644
--- a/.github/workflows/submit.yml
+++ b/.github/workflows/submit.yml
@@ -333,8 +333,6 @@ jobs:
       ANT_DIR: "apache-ant-1.10.5"
       ANT_FILENAME: "apache-ant-1.10.5.tar.gz"
       ANT_URL: "https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.5-bin.tar.gz"
-      # FIXME: hard-code the location of VS 2022 for now
-      VS150COMNTOOLS: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build"
 
     steps:
       - name: Checkout the source
@@ -379,15 +377,10 @@ jobs:
 
       - name: Setup environment
         run: |
-          echo "VS150COMNTOOLS=$env:VS150COMNTOOLS"
           echo "dir ...\VC\Tools\MSVC"
           dir "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC"
-          echo "dir VS150COMNTOOLS"
-          dir "$env:VS150COMNTOOLS"
           # echo "dir ...\VC\Tools\MSVC"
           # dir "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC"
-          # echo "dir VS150COMNTOOLS"
-          # dir "$env:VS150COMNTOOLS"
 
           $env:Path = "$HOME\cygwin\cygwin64\bin;$HOME\cygwin\cygwin64\bin;$env:Path" ;
           $env:JAVA_HOME = "$HOME\bootjdk\jdk-$env:BOOT_JDK_VERSION" ;
diff --git a/build.gradle b/build.gradle
index b1ab109d4e3..13178a974f6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -214,7 +214,7 @@ void setupTools(String name, Closure loader, Closure processor) {
     // then generate it. Once generated, we need to read the properties file to
     // help us define the defaults for this block of properties
     File propFile = file("$buildDir/${name}.properties");
-    if (!propFile.exists()) {
+    if (!propFile.exists() || propFile.length() == 0) {
         // Create the properties file
         propFile.getParentFile().mkdirs();
         propFile.createNewFile();
@@ -952,7 +952,6 @@ void ant(String conf,   // platform configuration
                     "INCLUDE"              : WINDOWS_VS_INCLUDE,
                     "LIB"                  : WINDOWS_VS_LIB,
                     "LIBPATH"              : WINDOWS_VS_LIBPATH,
-                    "DXSDK_DIR"            : WINDOWS_DXSDK_DIR,
                     "PATH"                 : WINDOWS_VS_PATH
             ]);
             commandLine "cmd", "/s", "/c", '"' + String.join(" ", cmdArgs) + '"'
@@ -5389,7 +5388,7 @@ compileTargets { t ->
             }
             if (IS_WINDOWS) {
                 from ("${graphicsProject.buildDir}/libs/prismD3D/${t.name}/${library(targetProperties.prismD3D.lib)}");
-                targetProperties.VS2017DLLs.each { vslib ->
+                targetProperties.VSDLLs.each { vslib ->
                     from ("$vslib");
                 }
                 targetProperties.WinSDKDLLs.each { winsdklib ->
@@ -5404,7 +5403,7 @@ compileTargets { t ->
                     inputFiles.include("*.dylib")
                     inputFiles.include("*.so")
                     // FIXME: if we ever need to strip on Windows platforms, we must
-                    // exclude the Microsoft DLLs (VS2017DLLNames and WinSDKDLLNames)
+                    // exclude the Microsoft DLLs (VSDLLNames and WinSDKDLLNames)
 
                     inputFiles.each { file ->
                         exec {
@@ -5421,7 +5420,7 @@ compileTargets { t ->
                     inputFiles.include("*.dylib")
                     inputFiles.include("*.so")
                     // FIXME: if we ever need to sign on Windows platforms, we must
-                    // exclude the Microsoft DLLs (VS2017DLLNames and WinSDKDLLNames)
+                    // exclude the Microsoft DLLs (VSDLLNames and WinSDKDLLNames)
 
                     inputFiles.each { file ->
                         exec {
@@ -5496,7 +5495,7 @@ compileTargets { t ->
                     inputFiles.include("*.dylib")
                     inputFiles.include("*.so")
                     // FIXME: if we ever need to sign on Windows platforms, we must
-                    // exclude the Microsoft DLLs (VS2017DLLNames and WinSDKDLLNames)
+                    // exclude the Microsoft DLLs (VSDLLNames and WinSDKDLLNames)
 
                     inputFiles.each { file ->
                         exec {
@@ -5549,7 +5548,7 @@ compileTargets { t ->
                     inputFiles.include("*.dylib")
                     inputFiles.include("*.so")
                     // FIXME: if we ever need to sign on Windows platforms, we must
-                    // exclude the Microsoft DLLs (VS2017DLLNames and WinSDKDLLNames)
+                    // exclude the Microsoft DLLs (VSDLLNames and WinSDKDLLNames)
 
                     inputFiles.each { file ->
                         exec {
diff --git a/buildSrc/genVSproperties.bat b/buildSrc/genVSproperties.bat
index 2105ae6ae78..161350e069b 100644
--- a/buildSrc/genVSproperties.bat
+++ b/buildSrc/genVSproperties.bat
@@ -1,4 +1,4 @@
-REM Copyright (c) 2009, 2021, Oracle and/or its affiliates. All rights reserved.
+REM Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM
 REM This code is free software; you can redistribute it and/or modify it
@@ -21,71 +21,62 @@ REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 REM or visit www.oracle.com if you need additional information or have any
 REM questions.
 
-REM Windows bat file that runs vcvars32.bat for Visual Studio 2003
-REM   and echos out a property file with the values of the environment
-REM   variables we want, e.g. PATH, INCLUDE, LIB, and LIBPATH.
+setlocal ENABLEDELAYEDEXPANSION
+
+REM Windows bat file that runs vcvars64.bat for Visual Studio
+REM and echoes out a property file with the values of the environment
+REM variables we want, e.g. PATH, INCLUDE, LIB, and LIBPATH.
 
 REM Clean out the current settings
 set INCLUDE=
 set LIB=
 set LIBPATH=
 
-REM Run the vsvars32.bat (12.0) / vcvars32.bat (15.0) file, sending it's output to neverland.
-REM The current officially supported Visual Studio version is 15.0.
-REM Handling of 11.0 and 14.0 is excluded here.
-REM The previous officially supported VS version was 12.0
-REM So, the search order is 150, then 120, then 100
-set VSVER=150
-set "VSVARS32FILE=C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build\vcvars32.bat"
-if not "%VS150COMNTOOLS%"=="" (
-    set "VS150COMNTOOLS=%VS150COMNTOOLS%"
+REM The current officially supported Visual Studio version is VS 2022
+
+REM Try the following in order of priority:
+REM 1. The VSCOMNTOOLS env var
+REM 2. The legacy VS150COMNTOOLS env var
+REM 3. Look in standard locations for Visual Studio (2022,2019,2017)
+
+
+set AUXBUILD=VC\Auxiliary\Build
+
+if not "%VSCOMNTOOLS%"=="" (
+    set "VSTOOLSDIR=%VSCOMNTOOLS%"
+) else if not "%VS150COMNTOOLS%"=="" (
+    set "VSTOOLSDIR=%VS150COMNTOOLS%"
 ) else (
-  if exist "%VSVARS32FILE%" set "VS150COMNTOOLS=C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build"
+    for %%a in (2022, 2019, 2017) do (
+        set year=%%a
+        for %%b in (Enterprise, Professional, Community, BuildTools) do (
+            set edition=%%b
+            for %%c in ("Program Files", "Program Files (x86)") do (
+                set ProgramFiles=%%~c
+                set "TMPDIR=C:\!ProgramFiles!\Microsoft Visual Studio\!year!\!edition!\%AUXBUILD%"
+                if exist "!TMPDIR!" (
+                    set "VSTOOLSDIR=!TMPDIR!"
+                    goto FOUNDVS
+                )
+            )
+        )
+    )
 )
-set VSVARSDIR=%VS150COMNTOOLS%
-if "%VSVARSDIR%"=="" set VSVER=120
-if "%VSVARSDIR%"=="" set VSVARSDIR=%VS120COMNTOOLS%
-if "%VSVARSDIR%"=="" set VSVER=100
-if "%VSVARSDIR%"=="" set VSVARSDIR=%VS100COMNTOOLS%
-
-REM We shouldn't depend on VSVARS32 as it's 32-bit only.
-REM   However, this var is still used somewhere in FX (e.g.
-REM   to build media), so we set it here.
 
-if "%VSVER%"=="100" set VSVARS32=%VSVARSDIR%\vsvars32.bat
-if "%VSVER%"=="120" set VSVARS32=%VSVARSDIR%\vsvars32.bat
-if "%VSVER%"=="150" set VSVARS32=%VSVARSDIR%\vcvars32.bat
-call "%VSVARS32%" > NUL
+:FOUNDVS
 
-if "%VSVER%"=="100" set VCVARSALL=%VCINSTALLDIR%\vcvarsall.bat
-if "%VSVER%"=="120" set VCVARSALL=%VCINSTALLDIR%\vcvarsall.bat
-if "%VSVER%"=="150" set VCVARSALL=%VSVARSDIR%\vcvarsall.bat
-call "%VCVARSALL%" %VCARCH% > NUL
+if "%VSTOOLSDIR%"=="" exit
+if not exist "%VSTOOLSDIR%" exit
 
-REM Some vars are reset by vcvarsall.bat, so save them here.
-set TEMPDEVENVDIR=%DEVENVDIR%
-set TEMPVCINSTALLDIR=%VCINSTALLDIR%
-set TEMPVSINSTALLDIR=%VSINSTALLDIR%
-if NOT "%WINSDKPATH%"=="" call "%WINSDKPATH%\Bin\SetEnv.Cmd" %SDKARCH% %CONF% > NUL
-set DEVENVDIR=%TEMPDEVENVDIR%
-set VSINSTALLDIR=%TEMPVSINSTALLDIR%
-set VCINSTALLDIR=%TEMPVCINSTALLDIR%
+call "%VSTOOLSDIR%\vcvars64.bat" > NUL
 
-REM Create some vars that are not set with VS Express 2008
+REM Set legacy MSVCDIR variable in case some Makefiles still need it
 if "%MSVCDIR%"=="" set MSVCDIR=%VCINSTALLDIR%
-REM Try using exe, com might be hanging in ssh environment?
-REM     set DEVENVCMD=%DEVENVDIR%\devenv.exe
-set DEVENVCMD=%DEVENVDIR%\devenv.com
-
-REM Adjust for lack of devenv in express editions.  This needs more work.
-REM VCExpress is the correct executable, but cmd line is different...
-if not exist "%DEVENVCMD%" set DEVENVCMD=%DEVENVDIR%\VCExpress.exe
 
 REM Echo out a properties file
 echo ############################################################
 echo # DO NOT EDIT: This is a generated file.
 echo windows.vs.DEVENVDIR=%DEVENVDIR%@@ENDOFLINE@@
-echo windows.vs.DEVENVCMD=%DEVENVCMD%@@ENDOFLINE@@
 echo windows.vs.VCINSTALLDIR=%VCINSTALLDIR%@@ENDOFLINE@@
 echo windows.vs.VSINSTALLDIR=%VSINSTALLDIR%@@ENDOFLINE@@
 echo windows.vs.MSVCDIR=%MSVCDIR%@@ENDOFLINE@@
@@ -93,7 +84,6 @@ echo windows.vs.INCLUDE=%INCLUDE%@@ENDOFLINE@@
 echo windows.vs.LIB=%LIB%@@ENDOFLINE@@
 echo windows.vs.LIBPATH=%LIBPATH%@@ENDOFLINE@@
 echo windows.vs.PATH=%PARFAIT_PATH%;%PATH%@@ENDOFLINE@@
-echo windows.vs.VER=%VSVER%@@ENDOFLINE@@
 echo windows.vs.VC_TOOLS_INSTALL_DIR=%VCToolsInstallDir%@@ENDOFLINE@@
 echo windows.vs.VC_TOOLS_REDIST_DIR=%VCToolsRedistDir%@@ENDOFLINE@@
 echo WINDOWS_SDK_DIR=%WindowsSdkDir%@@ENDOFLINE@@
diff --git a/buildSrc/win.gradle b/buildSrc/win.gradle
index 2561783b81f..83a97645a27 100644
--- a/buildSrc/win.gradle
+++ b/buildSrc/win.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,6 +47,17 @@ def IS_CROSS = HOST_ARCH != TARGET_ARCH
 
 setupTools("windows_tools",
     { propFile ->
+        if (System.getenv("VS150COMNTOOLS") != null) {
+            println "***********************************************************************"
+            if (System.getenv("VSCOMNTOOLS") != null) {
+                println "*** Using VSCOMNTOOLS and ignoring obsolete VS150COMNTOOLS.         ***"
+            } else {
+                println "*** VS150COMNTOOLS is deprecated and will be ignored in the future. ***"
+                println "*** Set VSCOMNTOOLS to your Visual Studio installation instead.     ***"
+            }
+            println "***********************************************************************"
+        }
+
         if (project.hasProperty('setupWinTools')) {
             setupWinTools(propFile)
         } else {
@@ -74,46 +85,33 @@ setupTools("windows_tools",
         }
     },
     { properties ->
-        defineProperty("WINDOWS_VS_VSINSTALLDIR", properties, "c:/Program Files (x86)/Microsoft Visual Studio/2017/Professional");
-        defineProperty("WINDOWS_VS_WINSDKDLLINSTALLDIR", properties, "c:/Program Files (x86)/Windows Kits/10/Redist/ucrt/DLLs");
-        defineProperty("WINDOWS_SDK_DIR", properties, System.getenv().get("WINSDK_DIR"))
+        defineProperty("WINDOWS_VS_VSINSTALLDIR", properties, "")
+        defineProperty("WINDOWS_VS_WINSDKDLLINSTALLDIR", properties, "")
+        defineProperty("WINDOWS_SDK_DIR", properties, "")
         defineProperty("WINDOWS_SDK_VERSION", properties, "")
         defineProperty("WINDOWS_VS_VCINSTALLDIR", properties, "$WINDOWS_VS_VSINSTALLDIR/VC")
         defineProperty("WINDOWS_VS_DEVENVDIR", properties, "$WINDOWS_VS_VSINSTALLDIR/Common7/IDE")
-        defineProperty("WINDOWS_VS_DEVENVCMD", properties, "$WINDOWS_VS_DEVENVDIR/VCExpress.exe")
         defineProperty("WINDOWS_VS_MSVCDIR", properties, WINDOWS_VS_VCINSTALLDIR)
         defineProperty("WINDOWS_VS_VC_TOOLS_INSTALL_DIR", properties, "")
         defineProperty("WINDOWS_VS_VC_TOOLS_REDIST_DIR", properties, "")
-        defineProperty("WINDOWS_DXSDK_DIR", properties, System.getenv().get("DXSDK_DIR"))
-        defineProperty("WINDOWS_VS_INCLUDE", properties, "$WINDOWS_VS_VCINSTALLDIR/INCLUDE;" + "$WINDOWS_SDK_DIR/include;")
-        defineProperty("WINDOWS_VS_VER", properties, "150")
-        defineProperty("WINDOWS_CRT_VER", properties, "150")
-        defineProperty("WINDOWS_VS_LIB", properties, "$WINDOWS_VS_VCINSTALLDIR/LIB;" + "$WINDOWS_SDK_DIR/lib;")
-        defineProperty("WINDOWS_VS_LIBPATH", properties, "$WINDOWS_VS_VCINSTALLDIR/LIB;")
-        def parfaitPath = IS_COMPILE_PARFAIT ? System.getenv().get("PARFAIT_PATH") + ";" : "";
-        defineProperty("WINDOWS_VS_PATH", properties, parfaitPath + "$WINDOWS_VS_DEVENVDIR;" +
-                "$WINDOWS_VS_VSINSTALLDIR/VC/BIN;" +
-                "$WINDOWS_VS_VSINSTALLDIR/Common7/Tools;" +
-                "$WINDOWS_VS_VCINSTALLDIR/VCPackages;" +
-                "$WINDOWS_SDK_DIR/bin/NETFX 4.0 Tools;" +
-                "$WINDOWS_SDK_DIR/bin;" +
-                System.getenv().get("PATH"))
+        defineProperty("WINDOWS_VS_INCLUDE", properties, "")
+        defineProperty("WINDOWS_CRT_VER", properties, "143")
+        defineProperty("WINDOWS_VS_LIB", properties, "")
+        defineProperty("WINDOWS_VS_LIBPATH", properties, "")
+        defineProperty("WINDOWS_VS_PATH", properties, "")
     }
 )
 
 if (WINDOWS_SDK_DIR == null || WINDOWS_SDK_DIR == "") {
-    throw new GradleException("FAIL: WINSDK_DIR not defined");
+    throw new GradleException("Cannot locate Visual Studio compilers; set the 'VSCOMNTOOLS' env var\nto the 'VC/Auxiliary/Build' dir in your Visual Studio installation");
 }
 
 // Define set of flags shared for all targets that support debug compilation
 def ccDebugFlags =
     IS_DEBUG_NATIVE ? ["/MDd", "/Od", "/Zi", "/DDEBUG"] : ["/O2", "/MD", "/DNDEBUG"]
 
-def winVsVer = Integer.parseInt(WINDOWS_VS_VER)
-if (winVsVer >= 120) {
-    // Serialize access to PDB file for debug builds if on VS2013 or later
-    if (IS_DEBUG_NATIVE) ccDebugFlags += "/FS"
-}
+// Serialize access to PDB file for debug builds
+if (IS_DEBUG_NATIVE) ccDebugFlags += "/FS"
 
 // Enables reproducible builds when defined
 def sourceDateEpoch = System.getenv("SOURCE_DATE_EPOCH")
@@ -139,28 +137,24 @@ if (sourceDateEpoch != null) {
     linkFlags.add("/experimental:deterministic")
 }
 
-// Remove C++ static linking if not on VS2010
-if (WINDOWS_VS_VER != "100") {
-    ccFlags -= ["/D_STATIC_CPPLIB", "/D_DISABLE_DEPRECATE_STATIC_CPPLIB"]
-}
+// Remove C++ static linking
+ccFlags -= ["/D_STATIC_CPPLIB", "/D_DISABLE_DEPRECATE_STATIC_CPPLIB"]
 
 ext.WINDOWS_NATIVE_COMPILE_ENVIRONMENT = [
         "VCINSTALLDIR"         : WINDOWS_VS_VCINSTALLDIR,
         "VSINSTALLDIR"         : WINDOWS_VS_VSINSTALLDIR,
         "DEVENVDIR"            : WINDOWS_VS_DEVENVDIR,
         "MSVCDIR"              : WINDOWS_VS_MSVCDIR,
-        "VS_VER"               : WINDOWS_VS_VER,
         "PATH"                 : WINDOWS_VS_PATH,
         "INCLUDE"              : WINDOWS_VS_INCLUDE,
         "LIB"                  : WINDOWS_VS_LIB,
         "LIBPATH"              : WINDOWS_VS_LIBPATH,
-        "DXSDK_DIR"            : WINDOWS_DXSDK_DIR
 ];
 def msvcVer = System.getenv("MSVC_VER")
 def msvcBinDir = ""
 if (hasProperty('toolchainDir')) {
     msvcBinDir = "$WINDOWS_VS_VSINSTALLDIR/VC/bin/$TARGET_ARCH"
-} else if (winVsVer == 150) {
+} else {
     def msvcInstallDir = ""
     if (msvcVer) {
         msvcInstallDir = "$WINDOWS_VS_VSINSTALLDIR/VC/Tools/MSVC/$msvcVer"
@@ -168,23 +162,15 @@ if (hasProperty('toolchainDir')) {
         msvcInstallDir = "$WINDOWS_VS_VC_TOOLS_INSTALL_DIR"
     }
     msvcBinDir = "$msvcInstallDir/bin/Host${CPU_BITS}/$TARGET_ARCH"
-} else if (winVsVer <= 120) {
-    msvcBinDir = (IS_64
-                      ? "$WINDOWS_VS_VSINSTALLDIR/VC/BIN/amd64"
-                      : "$WINDOWS_VS_VSINSTALLDIR/VC/BIN")
 }
 def compiler = IS_COMPILE_PARFAIT ? "cl.exe" : cygpath("$msvcBinDir/cl.exe")
 def linker = IS_STATIC_BUILD ? (IS_COMPILE_PARFAIT ? "lib.exe" : cygpath("$msvcBinDir/lib.exe")) : (IS_COMPILE_PARFAIT ? "link.exe" : cygpath("$msvcBinDir/link.exe"))
 def winSdkBinDir = "$WINDOWS_SDK_DIR/Bin"
-if (WINDOWS_VS_VER != "100") {
-    winSdkBinDir += "/$TARGET_ARCH"
-}
+winSdkBinDir += "/$TARGET_ARCH"
 
 if (!file(cygpath("$winSdkBinDir/RC.Exe")).exists()) {
     winSdkBinDir = "$WINDOWS_SDK_DIR/Bin/$WINDOWS_SDK_VERSION"
-    if (WINDOWS_VS_VER != "100") {
-        winSdkBinDir += "/$TARGET_ARCH"
-    }
+    winSdkBinDir += "/$TARGET_ARCH"
 }
 
 ext.RC = cygpath("$winSdkBinDir/rc.exe")
@@ -192,15 +178,8 @@ ext.RC = cygpath("$winSdkBinDir/rc.exe")
 def hostWinSdkBinDir = "$WINDOWS_SDK_DIR/Bin/$WINDOWS_SDK_VERSION/$HOST_ARCH"
 ext.RC = !isExecutable(RC) ? cygpath("$hostWinSdkBinDir/rc.exe") : RC
 def rcCompiler = RC
-ext.FXC = cygpath("$winSdkBinDir/fxc.exe")
-
-if (!file(FXC).exists()) {
-    if (WINDOWS_DXSDK_DIR == null || WINDOWS_DXSDK_DIR == "") {
-        throw new GradleException("FAIL: DXSDK_DIR not defined");
-    }
-    ext.FXC = cygpath("$WINDOWS_DXSDK_DIR/utilities/bin/x86/fxc.exe")
-}
 
+ext.FXC = cygpath("$winSdkBinDir/fxc.exe")
 // Use fxc from host system if it is not possible to run it from target system
 ext.FXC = !isExecutable(FXC) ? cygpath("$hostWinSdkBinDir/fxc.exe") : FXC
 
@@ -219,33 +198,30 @@ if (hasProperty('toolchainDir')) {
     }
 }
 
-def winSdkDllDir = "$WINDOWS_VS_WINSDKDLLINSTALLDIR/$TARGET_ARCH"
-
-def WINDOWS_DLL_VER = WINDOWS_VS_VER
+def winSdkDllDir = WINDOWS_VS_WINSDKDLLINSTALLDIR != "" ?
+    "$WINDOWS_VS_WINSDKDLLINSTALLDIR/$TARGET_ARCH" :
+    "${WINDOWS_SDK_DIR}/Redist/${WINDOWS_SDK_VERSION}/ucrt/DLLs/$TARGET_ARCH"
 
 def windowsCRTVer = System.getenv("WINDOWS_CRT_VER") ?: WINDOWS_CRT_VER
-if (WINDOWS_VS_VER == "150") {
-    WINDOWS_DLL_VER = "140"
-}
 
-def vs2017DllPath = cygpath("${msvcRedstDir}/Microsoft.VC${windowsCRTVer}.CRT")
-if (file(vs2017DllPath).exists()) {
-    ext.WIN.VS2017DLLNames = [
+def vsDllPath = cygpath("${msvcRedstDir}/Microsoft.VC${windowsCRTVer}.CRT")
+if (file(vsDllPath).exists()) {
+    ext.WIN.VSDLLNames = [
         "msvcp140.dll",
         "msvcp140_1.dll",
         "msvcp140_2.dll",
         "vcruntime140.dll",
         "vcruntime140_1.dll"
     ];
-    ext.WIN.VS2017DLLs = []
-    ext.WIN.VS2017DLLNames.each { vsdll->
-        ext.WIN.VS2017DLLs += "$vs2017DllPath/$vsdll"
+    ext.WIN.VSDLLs = []
+    ext.WIN.VSDLLNames.each { vsdll->
+        ext.WIN.VSDLLs += "$vsDllPath/$vsdll"
     }
 }
 else {
-    ext.WIN.VS2017DLLNames = [
+    ext.WIN.VSDLLNames = [
     ];
-    ext.WIN.VS2017DLLs = [
+    ext.WIN.VSDLLs = [
     ];
 }
 
@@ -345,8 +321,7 @@ WIN.glass.rcFlags = [
     "/d", "JFX_FNAME=glass.dll",
     "/d", "JFX_INTERNAL_NAME=glass",
     rcFlags].flatten();
-WIN.glass.ccFlags = [ccFlags, "/WX"].flatten()
-if (WINDOWS_VS_VER != "100") WIN.glass.ccFlags -= ["/WX"]
+WIN.glass.ccFlags = [ccFlags].flatten()
 WIN.glass.linker = linker
 WIN.glass.linkFlags = (IS_STATIC_BUILD ? [linkFlags] : [linkFlags, "delayimp.lib", "gdi32.lib", "urlmon.lib", "Comdlg32.lib",
         "winmm.lib", "imm32.lib", "shell32.lib", "Uiautomationcore.lib", "dwmapi.lib",
diff --git a/modules/javafx.media/src/main/native/jfxmedia/projects/win/Makefile b/modules/javafx.media/src/main/native/jfxmedia/projects/win/Makefile
index 9e115b7e8c5..6e0ecd160ac 100644
--- a/modules/javafx.media/src/main/native/jfxmedia/projects/win/Makefile
+++ b/modules/javafx.media/src/main/native/jfxmedia/projects/win/Makefile
@@ -85,10 +85,6 @@ CFLAGS = -DWIN32 \
          $(INCLUDES) \
          $(CL_COMPILER_FLAGS)
 
-ifeq ($(VS_VER), 100)
-    CFLAGS += -D_STATIC_CPPLIB -D_DISABLE_DEPRECATE_STATIC_CPPLIB
-endif
-
 LIBS = gstreamer-lite.lib \
        glib-lite.lib \
        Winmm.lib \

From 338b1f3a1cff64f8eceb140015fec232f21234eb Mon Sep 17 00:00:00 2001
From: Markus Mack <mmack@openjdk.org>
Date: Wed, 14 Aug 2024 17:52:38 +0000
Subject: [PATCH 15/75] 8334900: IOOBE when adding data to a Series of a
 BarChart that already contains data 8334901: Style class "negative" is not
 always added for new BarChart data with negative value

Reviewed-by: mstrauss, angorya
---
 .../java/javafx/scene/chart/BarChart.java     | 40 +++------
 .../test/javafx/scene/chart/BarChartTest.java | 88 ++++++++++++++++++-
 2 files changed, 97 insertions(+), 31 deletions(-)

diff --git a/modules/javafx.controls/src/main/java/javafx/scene/chart/BarChart.java b/modules/javafx.controls/src/main/java/javafx/scene/chart/BarChart.java
index 70ff9eeac76..ef6cfff5419 100644
--- a/modules/javafx.controls/src/main/java/javafx/scene/chart/BarChart.java
+++ b/modules/javafx.controls/src/main/java/javafx/scene/chart/BarChart.java
@@ -311,37 +311,17 @@ public BarChart(@NamedArg("xAxis") Axis<X> xAxis, @NamedArg("yAxis") Axis<Y> yAx
                 Data<X,Y> item = series.getData().get(j);
                 Node bar = item.getNode();
                 bar.getStyleClass().setAll("chart-bar", "series" + i, "data" + j, series.defaultColorStyleClass);
+                applyNegativeStyleClass(item);
             }
         }
     }
 
     @Override protected void seriesAdded(Series<X,Y> series, int seriesIndex) {
         // handle any data already in series
-        // create entry in the map
-        Map<String, Data<X,Y>> categoryMap = new HashMap<>();
         for (int j=0; j<series.getData().size(); j++) {
             Data<X,Y> item = series.getData().get(j);
-            Node bar = createBar(series, seriesIndex, item, j);
-            String category;
-            if (orientation == Orientation.VERTICAL) {
-                category = (String)item.getXValue();
-            } else {
-                category = (String)item.getYValue();
-            }
-            categoryMap.put(category, item);
-            if (shouldAnimate()) {
-                animateDataAdd(item, bar);
-            } else {
-                // RT-21164 check if bar value is negative to add NEGATIVE_STYLE style class
-                double barVal = (orientation == Orientation.VERTICAL) ? ((Number)item.getYValue()).doubleValue() :
-                        ((Number)item.getXValue()).doubleValue();
-                if (barVal < 0) {
-                    bar.getStyleClass().add(NEGATIVE_STYLE);
-                }
-                getPlotChildren().add(bar);
-            }
+            dataItemAdded(series, j, item);
         }
-        if (categoryMap.size() > 0) seriesCategoryMap.put(series, categoryMap);
     }
 
     @Override protected void seriesRemoved(final Series<X,Y> series) {
@@ -462,9 +442,6 @@ private void animateDataAdd(Data<X,Y> item, Node bar) {
         double barVal;
         if (orientation == Orientation.VERTICAL) {
             barVal = ((Number)item.getYValue()).doubleValue();
-            if (barVal < 0) {
-                bar.getStyleClass().add(NEGATIVE_STYLE);
-            }
             item.setCurrentY(getYAxis().toRealValue((barVal < 0) ? -bottomPos : bottomPos));
             getPlotChildren().add(bar);
             item.setYValue(getYAxis().toRealValue(barVal));
@@ -478,9 +455,6 @@ private void animateDataAdd(Data<X,Y> item, Node bar) {
             );
         } else {
             barVal = ((Number)item.getXValue()).doubleValue();
-            if (barVal < 0) {
-                bar.getStyleClass().add(NEGATIVE_STYLE);
-            }
             item.setCurrentX(getXAxis().toRealValue((barVal < 0) ? -bottomPos : bottomPos));
             getPlotChildren().add(bar);
             item.setXValue(getXAxis().toRealValue(barVal));
@@ -589,9 +563,19 @@ private Node createBar(Series<X,Y> series, int seriesIndex, final Data<X,Y> item
             item.setNode(bar);
         }
         bar.getStyleClass().setAll("chart-bar", "series" + seriesIndex, "data" + itemIndex, series.defaultColorStyleClass);
+        applyNegativeStyleClass(item);
         return bar;
     }
 
+    private void applyNegativeStyleClass(Data<X,Y> item) {
+        double barVal = (orientation == Orientation.VERTICAL) ? ((Number)item.getYValue()).doubleValue() :
+            ((Number)item.getXValue()).doubleValue();
+        if (barVal < 0) {
+            var bar = item.getNode();
+            bar.getStyleClass().add(NEGATIVE_STYLE);
+        }
+    }
+
     private Data<X,Y> getDataItem(Series<X,Y> series, int seriesIndex, int itemIndex, String category) {
         Map<String, Data<X,Y>> catmap = seriesCategoryMap.get(series);
         return (catmap != null) ? catmap.get(category) : null;
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/chart/BarChartTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/chart/BarChartTest.java
index f9446007e6c..2c45cacd906 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/chart/BarChartTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/chart/BarChartTest.java
@@ -29,10 +29,9 @@
 import java.util.List;
 
 import javafx.collections.FXCollections;
-import javafx.scene.Scene;
 import javafx.scene.shape.MoveTo;
 import javafx.scene.shape.Path;
-import javafx.stage.Stage;
+import org.junit.Assert;
 import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import javafx.collections.*;
@@ -151,7 +150,7 @@ public void testRemoveNotAnimated() {
     @Override
     ObservableList<XYChart.Series<?, ?>> createTestSeries() {
         ObservableList<XYChart.Series<?, ?>> list = FXCollections.observableArrayList();
-        for (int i = 0; i != 10; i++) {
+        for (int i = 1; i != 10; i++) {
             XYChart.Series<String, Number> series = new XYChart.Series<>();
             series.getData().add(new XYChart.Data<>(Integer.toString(i*10), i*10));
             series.getData().add(new XYChart.Data<>(Integer.toString(i*20), i*20));
@@ -276,6 +275,89 @@ public void testAddingMultipleSeriesWithDuplicateCategories() {
         assertEquals("4", categories.get(4));
     }
 
+    @Test
+    public void testNegativeStyleIsAddedToNewData() {
+        startApp();
+        Series<String, Number> series = bc.getData().getFirst();
+        series.getData().addFirst(new XYChart.Data<>("1", -1));
+        pulse();
+        Node bar = series.getData().getFirst().getNode();
+        checkStyleClass(bar, "negative");
+    }
+
+    @Test
+    public void testNegativeStyleIsAddedToDataOfNewSeries() {
+        startApp();
+        Series<String, Number> series = new Series<>();
+        series.getData().addFirst(new XYChart.Data<>("1", -1));
+        bc.getData().add(series);
+        pulse();
+        Node bar = series.getData().getFirst().getNode();
+        checkStyleClass(bar, "negative");
+    }
+
+    @Test
+    public void testNegativeStyleIsRemovedWhenChangingData() {
+        startApp();
+        Series<String, Number> series = bc.getData().getFirst();
+
+        series.getData().getFirst().setYValue(-1);
+        Node bar = series.getData().getFirst().getNode();
+        checkStyleClass(bar, "negative");
+
+        series.getData().getFirst().setYValue(1);
+        Assert.assertFalse(bar.getStyleClass().contains("negative"));
+    }
+
+    @Test
+    public void testAddingDataToEmptySeries() {
+        Thread.currentThread().setUncaughtExceptionHandler((t, e) -> Assert.fail("Exception: " + e));
+        startApp();
+        BarChart<String, Number> chart = new BarChart<>(new CategoryAxis(), new NumberAxis());
+        XYChart.Series<String, Number> series = new XYChart.Series<>();
+        chart.getData().add(series);
+        series.getData().add(new XYChart.Data<>("1", 1));
+        series.getData().add(new XYChart.Data<>("2", -2));
+        series.getData().add(new XYChart.Data<>("3", 3));
+        assertEquals(3, XYChartShim.Series_getDataSize(series));
+        assertEquals(3, XYChartShim.getPlotChildren(chart).size());
+        Node bar2 = series.getData().get(1).getNode();
+        checkStyleClass(bar2, "negative");
+    }
+
+    @Test
+    public void testAddingDataToNonEmptySeries() {
+        Thread.currentThread().setUncaughtExceptionHandler((t, e) -> Assert.fail("Exception: " + e));
+        startApp();
+        BarChart<String, Number> chart = new BarChart<>(new CategoryAxis(), new NumberAxis());
+        XYChart.Series<String, Number> series = new XYChart.Series<>();
+        series.getData().add(new XYChart.Data<>("1", 1));
+        chart.getData().add(series);
+        series.getData().add(new XYChart.Data<>("2", -2));
+        assertEquals(2, XYChartShim.Series_getDataSize(series));
+        assertEquals(2, XYChartShim.getPlotChildren(chart).size());
+        Node bar2 = series.getData().get(1).getNode();
+        checkStyleClass(bar2, "negative");
+    }
+
+    @Test
+    public void testAddingDataToSeriesContainingDuplicateCategories() {
+        Thread.currentThread().setUncaughtExceptionHandler((t, e) -> Assert.fail("Exception: " + e));
+        startApp();
+        BarChart<String, Number> chart = new BarChart<>(new CategoryAxis(), new NumberAxis());
+        XYChart.Series<String, Number> series = new XYChart.Series<>();
+        series.getData().add(new XYChart.Data<>("1", 1));
+        series.getData().add(new XYChart.Data<>("1", 2));
+        series.getData().add(new XYChart.Data<>("2", 3));
+        chart.getData().add(series);
+        series.getData().add(new XYChart.Data<>("3", -3));
+        assertEquals(3, XYChartShim.Series_getDataSize(series));
+        assertEquals(3, XYChartShim.getPlotChildren(chart).size());
+        assertEquals(4, series.getData().size());
+        Node bar3 = series.getData().get(3).getNode();
+        checkStyleClass(bar3, "negative");
+    }
+
     @Test
     public void testTickMarksMatchBarPositionsAfterAnimation() {
         startApp();

From 0ee74e185673fba03d490122d0560a181ebd6fb2 Mon Sep 17 00:00:00 2001
From: Alexander Zvegintsev <azvegint@openjdk.org>
Date: Thu, 15 Aug 2024 15:33:15 +0000
Subject: [PATCH 16/75] 8337827: [XWayland] Skip failing tests on Wayland

Reviewed-by: kcr
---
 .../robot/javafx/embed/swing/SwingNodeBase.java    |  7 +------
 .../javafx/embed/swing/SwingNodeJDialogTest.java   |  9 +++++++++
 .../java/test/robot/javafx/scene/SRGBTest.java     |  2 ++
 tests/system/src/test/java/test/util/Util.java     | 14 ++++++++++++++
 4 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/tests/system/src/test/java/test/robot/javafx/embed/swing/SwingNodeBase.java b/tests/system/src/test/java/test/robot/javafx/embed/swing/SwingNodeBase.java
index b1702deeb02..c49e810f5a7 100644
--- a/tests/system/src/test/java/test/robot/javafx/embed/swing/SwingNodeBase.java
+++ b/tests/system/src/test/java/test/robot/javafx/embed/swing/SwingNodeBase.java
@@ -191,11 +191,6 @@ public ColorPanel(java.awt.Color color) {
         }
     }
 
-    private static boolean isOnWayland() {
-        String waylandDisplay = System.getenv("WAYLAND_DISPLAY");
-        return waylandDisplay != null && !waylandDisplay.isEmpty();
-    }
-
     public void testAbove(boolean above) {
         int checkLoc = BASE_LOCATION + 3 * BASE_SIZE /4;
         int clickLoc = BASE_LOCATION + BASE_SIZE / 4;
@@ -207,7 +202,7 @@ public void testAbove(boolean above) {
 
             // Emulating mouse clicks on XWayland with XTEST does not currently affect the Wayland compositor,
             // so trying to click on the window title or window body will not bring the window to the front.
-            if (isOnWayland()) {
+            if (Util.isOnWayland()) {
                 runWaitSleep(() -> myApp.stage.toFront());
             }
         }
diff --git a/tests/system/src/test/java/test/robot/javafx/embed/swing/SwingNodeJDialogTest.java b/tests/system/src/test/java/test/robot/javafx/embed/swing/SwingNodeJDialogTest.java
index 5be7c2c30ab..f4e001e090b 100644
--- a/tests/system/src/test/java/test/robot/javafx/embed/swing/SwingNodeJDialogTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/embed/swing/SwingNodeJDialogTest.java
@@ -32,10 +32,13 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.concurrent.CountDownLatch;
 
+import static org.junit.Assume.assumeTrue;
+
 public class SwingNodeJDialogTest extends SwingNodeBase {
 
     @Test(timeout = 15000)
     public void testJDialogAbove() throws InterruptedException, InvocationTargetException {
+        assumeTrue(!Util.isOnWayland()); // JDK-8335470
         myApp.createStageAndDialog();
         myApp.showDialog();
 
@@ -46,6 +49,7 @@ public void testJDialogAbove() throws InterruptedException, InvocationTargetExce
 
     @Test(timeout = 15000)
     public void testNodeRemovalAfterShow() throws InterruptedException, InvocationTargetException {
+        assumeTrue(!Util.isOnWayland()); // JDK-8335470
         myApp.createStageAndDialog();
         myApp.showDialog();
 
@@ -60,6 +64,7 @@ public void testNodeRemovalAfterShow() throws InterruptedException, InvocationTa
 
     @Test(timeout = 15000)
     public void testNodeRemovalBeforeShow() throws InterruptedException, InvocationTargetException {
+        assumeTrue(!Util.isOnWayland()); // JDK-8335470
         myApp.createStageAndDialog();
         myApp.detachSwingNode();
         myApp.showDialog();
@@ -72,6 +77,7 @@ public void testNodeRemovalBeforeShow() throws InterruptedException, InvocationT
 
     @Test(timeout = 15000)
     public void testStageCloseAfterShow() throws InvocationTargetException, InterruptedException {
+        assumeTrue(!Util.isOnWayland()); // JDK-8335470
         myApp.createStageAndDialog();
         myApp.showDialog();
         testAbove(true);
@@ -81,6 +87,7 @@ public void testStageCloseAfterShow() throws InvocationTargetException, Interrup
 
     @Test(timeout = 15000)
     public void testStageCloseBeforeShow() throws InvocationTargetException, InterruptedException {
+        assumeTrue(!Util.isOnWayland()); // JDK-8335470
         myApp.createStageAndDialog();
         myApp.closeStage();
         myApp.showDialog();
@@ -91,6 +98,7 @@ public void testStageCloseBeforeShow() throws InvocationTargetException, Interru
 
     @Test(timeout = 15000)
     public void testNodeRemovalBeforeShowHoldEDT() throws InterruptedException, InvocationTargetException {
+        assumeTrue(!Util.isOnWayland()); // JDK-8335470
         myApp.createAndShowStage();
         CountDownLatch latch = new CountDownLatch(1);
         SwingUtilities.invokeLater(()-> {
@@ -108,6 +116,7 @@ public void testNodeRemovalBeforeShowHoldEDT() throws InterruptedException, Invo
 
     @Test(timeout = 15000)
     public void testStageCloseBeforeShowHoldEDT() throws InvocationTargetException, InterruptedException {
+        assumeTrue(!Util.isOnWayland()); // JDK-8335470
         myApp.createAndShowStage();
         CountDownLatch latch = new CountDownLatch(1);
         SwingUtilities.invokeLater(()-> {
diff --git a/tests/system/src/test/java/test/robot/javafx/scene/SRGBTest.java b/tests/system/src/test/java/test/robot/javafx/scene/SRGBTest.java
index 829cbdcdf4a..7cef9f3c6d2 100644
--- a/tests/system/src/test/java/test/robot/javafx/scene/SRGBTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/scene/SRGBTest.java
@@ -52,6 +52,7 @@
 import static org.junit.Assume.assumeTrue;
 
 import test.robot.testharness.VisualTestBase;
+import test.util.Util;
 
 public class SRGBTest extends VisualTestBase {
 
@@ -218,6 +219,7 @@ public void screenCaptureTest() {
     // Timeout for potential hang on XWayland, see JDK-8335468.
     @Test(timeout = 15000)
     public void sRGBPixelTest() throws Exception {
+        assumeTrue(!Util.isOnWayland()); // JDK-8335470
         Rectangle swatch = prepareStage();
 
         for (TestColor testColor : TestColor.values()) {
diff --git a/tests/system/src/test/java/test/util/Util.java b/tests/system/src/test/java/test/util/Util.java
index e7396c6da36..41448e8dfa4 100644
--- a/tests/system/src/test/java/test/util/Util.java
+++ b/tests/system/src/test/java/test/util/Util.java
@@ -48,6 +48,7 @@
 import javafx.stage.Window;
 import org.junit.Assert;
 import junit.framework.AssertionFailedError;
+import com.sun.javafx.PlatformUtil;
 
 /**
  * Utility methods for life-cycle testing
@@ -490,4 +491,17 @@ public static double getTolerance(Region r) {
         }
         return 0.0;
     }
+
+
+    /**
+     * Checks if the system is running Linux with the Wayland server.
+     *
+     * @return true if running on Wayland, false otherwise
+     */
+    public static boolean isOnWayland() {
+        if (!PlatformUtil.isLinux()) return false;
+
+        String waylandDisplay = System.getenv("WAYLAND_DISPLAY");
+        return waylandDisplay != null && !waylandDisplay.isEmpty();
+    }
 }

From 3261e940c0905b78230d5b6ce7980ed2d7476dfb Mon Sep 17 00:00:00 2001
From: Andy Goryachev <angorya@openjdk.org>
Date: Fri, 16 Aug 2024 21:58:08 +0000
Subject: [PATCH 17/75] 8338016: SplitMenuButton constructors should match
 MenuButton

Reviewed-by: kcr, mstrauss
---
 .../javafx/scene/control/SplitMenuButton.java | 49 +++++++++++++-
 .../scene/control/SplitMenuButtonTest.java    | 64 ++++++++++++++++++-
 2 files changed, 110 insertions(+), 3 deletions(-)

diff --git a/modules/javafx.controls/src/main/java/javafx/scene/control/SplitMenuButton.java b/modules/javafx.controls/src/main/java/javafx/scene/control/SplitMenuButton.java
index ee8a1279b16..dde537d60f2 100644
--- a/modules/javafx.controls/src/main/java/javafx/scene/control/SplitMenuButton.java
+++ b/modules/javafx.controls/src/main/java/javafx/scene/control/SplitMenuButton.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
 import javafx.scene.AccessibleAction;
 import javafx.scene.AccessibleAttribute;
 import javafx.scene.AccessibleRole;
+import javafx.scene.Node;
 import javafx.scene.control.skin.SplitMenuButtonSkin;
 
 /**
@@ -76,7 +77,31 @@ public class SplitMenuButton extends MenuButton {
      * {@link #setGraphic(Node)} and {@link #getItems()} to set the content.
      */
     public SplitMenuButton() {
-        this((MenuItem[])null);
+        this(null, null, (MenuItem[])null);
+    }
+
+    /**
+     * Creates a new empty split menu button with the given text to display on the
+     * button. Use {@link #setGraphic(Node)} and {@link #getItems()} to set the
+     * content.
+     *
+     * @param text the text to display on the menu button
+     * @since 24
+     */
+    public SplitMenuButton(String text) {
+        this(text, null, (MenuItem[])null);
+    }
+
+    /**
+     * Creates a new empty split menu button with the given text and graphic to
+     * display on the button. Use {@link #getItems()} to set the content.
+     *
+     * @param text the text to display on the menu button
+     * @param graphic the graphic to display on the menu button
+     * @since 24
+     */
+    public SplitMenuButton(String text, Node graphic) {
+        this(text, graphic, (MenuItem[])null);
     }
 
     /**
@@ -85,6 +110,26 @@ public SplitMenuButton() {
      * @param items The items to show within this button's menu
      */
     public SplitMenuButton(MenuItem... items) {
+        this(null, null, items);
+    }
+
+    /**
+     * Creates a new split menu button with the given text and graphic to
+     * display on the button, and inserts the given items
+     * into the {@link #getItems() items} list.
+     *
+     * @param text the text to display on the menu button
+     * @param graphic the graphic to display on the menu button
+     * @param items the items to display in the popup menu
+     * @since 24
+     */
+    public SplitMenuButton(String text, Node graphic, MenuItem... items) {
+        if (text != null) {
+            setText(text);
+        }
+        if (graphic != null) {
+            setGraphic(graphic);
+        }
         if (items != null) {
             getItems().addAll(items);
         }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/SplitMenuButtonTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/SplitMenuButtonTest.java
index 78d979f7da2..b0ab7b6f417 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/SplitMenuButtonTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/SplitMenuButtonTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,12 +27,14 @@
 
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.SplitMenuButton;
+import javafx.scene.shape.Rectangle;
 import org.junit.Before;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
 
 /**
+ * Basic SplitMenuButton Tests.
  *
  * @author lubermud
  */
@@ -81,7 +83,67 @@ public class SplitMenuButtonTest {
         assertTrue(smb2.isMnemonicParsing());
     }
 
+    @Test
+    public void oneArgConstructorShouldHaveNoGraphic1() {
+        SplitMenuButton mb2 = new SplitMenuButton((String)null);
+        assertNull(mb2.getGraphic());
+    }
+
+    @Test
+    public void oneArgConstructorShouldHaveNoGraphic2() {
+        SplitMenuButton mb2 = new SplitMenuButton("");
+        assertNull(mb2.getGraphic());
+    }
+
+    @Test
+    public void oneArgConstructorShouldHaveNoGraphic3() {
+        SplitMenuButton mb2 = new SplitMenuButton("Hello");
+        assertNull(mb2.getGraphic());
+    }
+
+    @Test
+    public void oneArgConstructorShouldHaveSpecifiedString1() {
+        SplitMenuButton mb2 = new SplitMenuButton((String)null);
+        assertEquals("", mb2.getText());
+    }
+
+    @Test
+    public void oneArgConstructorShouldHaveSpecifiedString2() {
+        SplitMenuButton mb2 = new SplitMenuButton("");
+        assertEquals("", mb2.getText());
+    }
 
+    @Test
+    public void oneArgConstructorShouldHaveSpecifiedString3() {
+        SplitMenuButton mb2 = new SplitMenuButton("Hello");
+        assertEquals("Hello", mb2.getText());
+    }
+
+    @Test
+    public void twoArgConstructorShouldHaveSpecifiedGraphic1() {
+        SplitMenuButton mb2 = new SplitMenuButton(null, null);
+        assertNull(mb2.getGraphic());
+    }
+
+    @Test
+    public void twoArgConstructorShouldHaveSpecifiedGraphic2() {
+        Rectangle rect = new Rectangle();
+        SplitMenuButton mb2 = new SplitMenuButton("Hello", rect);
+        assertSame(rect, mb2.getGraphic());
+    }
+
+    @Test
+    public void twoArgConstructorShouldHaveSpecifiedString1() {
+        SplitMenuButton mb2 = new SplitMenuButton(null, null);
+        assertEquals("", mb2.getText());
+    }
+
+    @Test
+    public void twoArgConstructorShouldHaveSpecifiedString2() {
+        Rectangle rect = new Rectangle();
+        SplitMenuButton mb2 = new SplitMenuButton("Hello", rect);
+        assertEquals("Hello", mb2.getText());
+    }
 
     @Test public void splitMenuButtonIsFiredIsNoOp() {
         splitMenuButton.fire(); // should throw no exceptions, if it does, the test fails

From 269d6897e4d4e62beff3a2179dcdabe8a0bf0bc7 Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Mon, 19 Aug 2024 19:18:47 +0000
Subject: [PATCH 18/75] 8338478: [macos] Crash in CoreText with certain strings
 using JDK 22 or later

Reviewed-by: kcr, arapte
---
 .../sun/javafx/font/coretext/CTFontFile.java  | 126 ++++++++++--------
 1 file changed, 72 insertions(+), 54 deletions(-)

diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/coretext/CTFontFile.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/coretext/CTFontFile.java
index b0bcd94b914..4751ba2d9ef 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/coretext/CTFontFile.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/coretext/CTFontFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
 
 package com.sun.javafx.font.coretext;
 
+import java.lang.ref.Reference;
+
 import com.sun.javafx.font.Disposer;
 import com.sun.javafx.font.DisposerRecord;
 import com.sun.javafx.font.FontFallbackInfo;
@@ -148,33 +150,45 @@ long getCGFontRef() {
 
     CGRect getBBox(int gc, float size) {
         CTFontStrike strike = (CTFontStrike)getStrike(size, BaseTransform.IDENTITY_TRANSFORM);
-        long fontRef = strike.getFontRef();
-        if (fontRef == 0) return null;
-        long pathRef = OS.CTFontCreatePathForGlyph(fontRef, (short)gc, tx);
-        if (pathRef == 0) return null;
-        CGRect rect = OS.CGPathGetPathBoundingBox(pathRef);
-        OS.CGPathRelease(pathRef);
-        return rect;
+        try {
+            long fontRef = strike.getFontRef();
+            if (fontRef == 0) return null;
+            long pathRef = OS.CTFontCreatePathForGlyph(fontRef, (short)gc, tx);
+            if (pathRef == 0) return null;
+            CGRect rect = OS.CGPathGetPathBoundingBox(pathRef);
+            OS.CGPathRelease(pathRef);
+            return rect;
+      } finally {
+          Reference.reachabilityFence(strike);
+      }
     }
 
     Path2D getGlyphOutline(int gc, float size) {
         CTFontStrike strike = (CTFontStrike)getStrike(size, BaseTransform.IDENTITY_TRANSFORM);
-        long fontRef = strike.getFontRef();
-        if (fontRef == 0) return null;
-        long pathRef = OS.CTFontCreatePathForGlyph(fontRef, (short)gc, tx);
-        if (pathRef == 0) return null;
-        Path2D path = OS.CGPathApply(pathRef);
-        OS.CGPathRelease(pathRef);
-        return path;
+        try {
+            long fontRef = strike.getFontRef();
+            if (fontRef == 0) return null;
+            long pathRef = OS.CTFontCreatePathForGlyph(fontRef, (short)gc, tx);
+            if (pathRef == 0) return null;
+            Path2D path = OS.CGPathApply(pathRef);
+            OS.CGPathRelease(pathRef);
+            return path;
+      } finally {
+          Reference.reachabilityFence(strike);
+      }
     }
 
    @Override protected float getAdvanceFromPlatform(int glyphCode, float ptSize) {
       CTFontStrike strike =
           (CTFontStrike)getStrike(ptSize, BaseTransform.IDENTITY_TRANSFORM);
-      long fontRef = strike.getFontRef();
-      int orientation = OS.kCTFontOrientationDefault;
-      CGSize size = new CGSize();
-      return (float)OS.CTFontGetAdvancesForGlyphs(fontRef, orientation, (short)glyphCode, size);
+      try {
+          long fontRef = strike.getFontRef();
+          int orientation = OS.kCTFontOrientationDefault;
+          CGSize size = new CGSize();
+          return (float)OS.CTFontGetAdvancesForGlyphs(fontRef, orientation, (short)glyphCode, size);
+      } finally {
+          Reference.reachabilityFence(strike);
+      }
    }
 
    @Override protected int[] createGlyphBoundingBox(int gc) {
@@ -187,46 +201,50 @@ Path2D getGlyphOutline(int gc, float size) {
         CTFontStrike strike = (CTFontStrike)getStrike(size,
                                                       BaseTransform.IDENTITY_TRANSFORM);
 
-        long fontRef = strike.getFontRef();
-        if (fontRef == 0) return null;
-        int[] bb = new int[4];
+        try {
+            long fontRef = strike.getFontRef();
+            if (fontRef == 0) return null;
+            int[] bb = new int[4];
 
-        /* For some reason CTFontGetBoundingRectsForGlyphs has poor performance.
-         * The fix is to use the 'loca' and the 'glyf' tables to determine
-         * the glyph bounding box (same as T2K). This implementation
-         * uses native code to read these tables since they can be large.
-         * However for color (emoji) glyphs this returns the wrong bounds,
-         * so use CTFontGetBoundingRectsForGlyphs anyway.
-         * In case it fails, or the font doesn't have a glyph table
-         * (CFF fonts), then the bounds of the glyph outline is used instead.
-         */
-        if (!isCFF()) {
-            if (isColorGlyph(gc)) {
-                CGRect rect = OS.CTFontGetBoundingRectForGlyphs(fontRef, (short)gc);
-                float scale = getUnitsPerEm() / size;
-                bb[0] = (int)(Math.round(rect.origin.x * scale));
-                bb[1] = (int)(Math.round(rect.origin.y * scale));
-                bb[2] = (int)(Math.round((rect.origin.x + rect.size.width) * scale));
-                bb[3] = (int)(Math.round((rect.origin.y + rect.size.height) * scale));
-                return bb;
-            } else {
-                short format = getIndexToLocFormat();
-                if (OS.CTFontGetBoundingRectForGlyphUsingTables(fontRef, (short)gc, format, bb)) {
+            /* For some reason CTFontGetBoundingRectsForGlyphs has poor performance.
+             * The fix is to use the 'loca' and the 'glyf' tables to determine
+             * the glyph bounding box (same as T2K). This implementation
+             * uses native code to read these tables since they can be large.
+             * However for color (emoji) glyphs this returns the wrong bounds,
+             * so use CTFontGetBoundingRectsForGlyphs anyway.
+             * In case it fails, or the font doesn't have a glyph table
+             * (CFF fonts), then the bounds of the glyph outline is used instead.
+             */
+            if (!isCFF()) {
+                if (isColorGlyph(gc)) {
+                    CGRect rect = OS.CTFontGetBoundingRectForGlyphs(fontRef, (short)gc);
+                    float scale = getUnitsPerEm() / size;
+                    bb[0] = (int)(Math.round(rect.origin.x * scale));
+                    bb[1] = (int)(Math.round(rect.origin.y * scale));
+                    bb[2] = (int)(Math.round((rect.origin.x + rect.size.width) * scale));
+                    bb[3] = (int)(Math.round((rect.origin.y + rect.size.height) * scale));
                     return bb;
+                } else {
+                    short format = getIndexToLocFormat();
+                    if (OS.CTFontGetBoundingRectForGlyphUsingTables(fontRef, (short)gc, format, bb)) {
+                        return bb;
+                    }
                 }
             }
+            /* Note: not using tx here as the bounds need to be y up */
+            long pathRef = OS.CTFontCreatePathForGlyph(fontRef, (short)gc, null);
+            if (pathRef == 0) return null;
+            CGRect rect = OS.CGPathGetPathBoundingBox(pathRef);
+            OS.CGPathRelease(pathRef);
+            float scale = getUnitsPerEm() / size;
+            bb[0] = (int)(Math.round(rect.origin.x * scale));
+            bb[1] = (int)(Math.round(rect.origin.y * scale));
+            bb[2] = (int)(Math.round((rect.origin.x + rect.size.width) * scale));
+            bb[3] = (int)(Math.round((rect.origin.y + rect.size.height) * scale));
+            return bb;
+        } finally {
+            Reference.reachabilityFence(strike);
         }
-        /* Note: not using tx here as the bounds need to be y up */
-        long pathRef = OS.CTFontCreatePathForGlyph(fontRef, (short)gc, null);
-        if (pathRef == 0) return null;
-        CGRect rect = OS.CGPathGetPathBoundingBox(pathRef);
-        OS.CGPathRelease(pathRef);
-        float scale = getUnitsPerEm() / size;
-        bb[0] = (int)(Math.round(rect.origin.x * scale));
-        bb[1] = (int)(Math.round(rect.origin.y * scale));
-        bb[2] = (int)(Math.round((rect.origin.x + rect.size.width) * scale));
-        bb[3] = (int)(Math.round((rect.origin.y + rect.size.height) * scale));
-        return bb;
     }
 
     @Override

From f1bac5a829e1f2b75b863c4f0822bf418107a1fb Mon Sep 17 00:00:00 2001
From: Alexander Matveev <almatvee@openjdk.org>
Date: Mon, 19 Aug 2024 22:03:58 +0000
Subject: [PATCH 19/75] 8336938: Update libFFI to 3.4.6

Reviewed-by: kcr, sykora
---
 modules/javafx.media/src/main/legal/libffi.md |   8 +-
 .../native/gstreamer/3rd_party/libffi/LICENSE |   2 +-
 .../3rd_party/libffi/include/ffi_common.h     |  10 +-
 .../libffi/include/mac/aarch64/ffi.h          |  87 ++-
 .../libffi/include/mac/aarch64/fficonfig.h    |  49 +-
 .../3rd_party/libffi/include/mac/x64/ffi.h    |  87 ++-
 .../libffi/include/mac/x64/fficonfig.h        |  46 +-
 .../3rd_party/libffi/include/win/x64/ffi.h    |  87 ++-
 .../libffi/include/win/x64/fficonfig.h        |  49 +-
 .../3rd_party/libffi/include/win/x86/ffi.h    |  87 ++-
 .../libffi/include/win/x86/fficonfig.h        |  49 +-
 .../3rd_party/libffi/src/aarch64/ffi.c        |  97 ++--
 .../3rd_party/libffi/src/aarch64/sysv.S       | 508 ++++++++++++------
 .../gstreamer/3rd_party/libffi/src/closures.c |  29 +-
 .../gstreamer/3rd_party/libffi/src/debug.c    |   4 +-
 .../gstreamer/3rd_party/libffi/src/dlmalloc.c |   2 +-
 .../gstreamer/3rd_party/libffi/src/prep_cif.c |   4 +-
 .../gstreamer/3rd_party/libffi/src/types.c    |   6 +-
 .../3rd_party/libffi/src/x86/ffiw64.c         |   2 +-
 .../gstreamer/3rd_party/libffi/src/x86/sysv.S | 122 +++--
 .../3rd_party/libffi/src/x86/sysv_intel.S     |   4 +-
 .../projects/win/glib-lite/Makefile.ffi       |   4 +-
 .../projects/win/glib-lite/Makefile.glib      |   2 +-
 .../projects/win/glib-lite/Makefile.gmodule   |   2 +-
 .../projects/win/glib-lite/Makefile.gobject   |   2 +-
 .../projects/win/glib-lite/Makefile.gthread   |   2 +-
 26 files changed, 683 insertions(+), 668 deletions(-)

diff --git a/modules/javafx.media/src/main/legal/libffi.md b/modules/javafx.media/src/main/legal/libffi.md
index 2c3ce2081a3..30602a1acd8 100644
--- a/modules/javafx.media/src/main/legal/libffi.md
+++ b/modules/javafx.media/src/main/legal/libffi.md
@@ -1,9 +1,9 @@
-## LibFFI v3.4.4
+## LibFFI v3.4.6
 
 ### LibFFI License
 ```
 
-libffi - Copyright (c) 1996-2022  Anthony Green, Red Hat, Inc and others.
+libffi - Copyright (c) 1996-2024  Anthony Green, Red Hat, Inc and others.
 See source files for details.
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -26,7 +26,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 Copyright (C) 2007-2010  Free Software Foundation, Inc
-Copyright (C) 1996-2014  Red Hat, Inc.
+Copyright (C) 1996-2024  Red Hat, Inc.
 Copyright (C) 2009-2012 ARM Ltd.
 Copyright (C) 2011 Plausible Labs Cooperative, Inc.
 Copyright (C) 2002  Ranjit Mathew
@@ -34,6 +34,8 @@ Copyright (C) 2002  Bo Thorsen
 Copyright (C) 2002  Roger Sayle
 Copyright (C) 2013  The Written Word, Inc.
 Copyright (C) 2002-2007  Bo Thorsen <bo@suse.de>
+Copyright (C) 2021  Microsoft, Inc.
+Copyright (c) 2022 Oracle and/or its affiliates.
 
 ```
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/LICENSE b/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/LICENSE
index 75d1bce11f9..7282e798c20 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/LICENSE
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/LICENSE
@@ -1,4 +1,4 @@
-libffi - Copyright (c) 1996-2022  Anthony Green, Red Hat, Inc and others.
+libffi - Copyright (c) 1996-2024  Anthony Green, Red Hat, Inc and others.
 See source files for details.
 
 Permission is hereby granted, free of charge, to any person obtaining
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/include/ffi_common.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/include/ffi_common.h
index 94c3920ebf0..4d8d133a369 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/include/ffi_common.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/include/ffi_common.h
@@ -49,8 +49,10 @@ extern "C" {
 #  endif
 # endif
 # define MAYBE_UNUSED __attribute__((__unused__))
+# define NORETURN __attribute__((__noreturn__))
 #else
 # define MAYBE_UNUSED
+# define NORETURN
 # if HAVE_ALLOCA_H
 #  include <alloca.h>
 # else
@@ -82,9 +84,9 @@ char *alloca ();
 #endif
 
 #ifdef FFI_DEBUG
-void ffi_assert(char *expr, char *file, int line);
+NORETURN void ffi_assert(const char *expr, const char *file, int line);
 void ffi_stop_here(void);
-void ffi_type_test(ffi_type *a, char *file, int line);
+void ffi_type_test(ffi_type *a, const char *file, int line);
 
 #define FFI_ASSERT(x) ((x) ? (void)0 : ffi_assert(#x, __FILE__,__LINE__))
 #define FFI_ASSERT_AT(x, f, l) ((x) ? 0 : ffi_assert(#x, (f), (l)))
@@ -128,6 +130,10 @@ void *ffi_data_to_code_pointer (void *data) FFI_HIDDEN;
    static trampoline. */
 int ffi_tramp_is_present (void *closure) FFI_HIDDEN;
 
+/* Return a file descriptor of a temporary zero-sized file in a
+   writable and executable filesystem. */
+int open_temp_exec_file(void) FFI_HIDDEN;
+
 /* Extended cif, used in callback from assembly routine */
 typedef struct
 {
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/include/mac/aarch64/ffi.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/include/mac/aarch64/ffi.h
index c3a45423919..88707fffb51 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/include/mac/aarch64/ffi.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/include/mac/aarch64/ffi.h
@@ -1,6 +1,6 @@
 /* -----------------------------------------------------------------*-C-*-
-   libffi 3.4.4
-     - Copyright (c) 2011, 2014, 2019, 2021, 2022 Anthony Green
+   libffi 3.4.6
+     - Copyright (c) 2011, 2014, 2019, 2021, 2022, 2024 Anthony Green
      - Copyright (c) 1996-2003, 2007, 2008 Red Hat, Inc.
 
    Permission is hereby granted, free of charge, to any person
@@ -56,6 +56,31 @@ extern "C" {
 
 /* ---- System configuration information --------------------------------- */
 
+/* If these change, update src/mips/ffitarget.h. */
+#define FFI_TYPE_VOID       0
+#define FFI_TYPE_INT        1
+#define FFI_TYPE_FLOAT      2
+#define FFI_TYPE_DOUBLE     3
+#if 0
+#define FFI_TYPE_LONGDOUBLE 4
+#else
+#define FFI_TYPE_LONGDOUBLE FFI_TYPE_DOUBLE
+#endif
+#define FFI_TYPE_UINT8      5
+#define FFI_TYPE_SINT8      6
+#define FFI_TYPE_UINT16     7
+#define FFI_TYPE_SINT16     8
+#define FFI_TYPE_UINT32     9
+#define FFI_TYPE_SINT32     10
+#define FFI_TYPE_UINT64     11
+#define FFI_TYPE_SINT64     12
+#define FFI_TYPE_STRUCT     13
+#define FFI_TYPE_POINTER    14
+#define FFI_TYPE_COMPLEX    15
+
+/* This should always refer to the last type code (for sanity checks).  */
+#define FFI_TYPE_LAST       FFI_TYPE_COMPLEX
+
 #include <ffitarget.h>
 
 #ifndef LIBFFI_ASM
@@ -115,13 +140,11 @@ typedef struct _ffi_type
    when using the static version of the library.
    Besides, as a workaround, they can define FFI_BUILDING if they
    *know* they are going to link with the static library.  */
-#if defined _MSC_VER
+#if defined _MSC_VER && !defined(FFI_STATIC_BUILD)
 # if defined FFI_BUILDING_DLL /* Building libffi.DLL with msvcc.sh */
 #  define FFI_API __declspec(dllexport)
-# elif !defined FFI_BUILDING  /* Importing libffi.DLL */
+# else  /* Importing libffi.DLL */
 #  define FFI_API __declspec(dllimport)
-# else                        /* Building/linking static library */
-#  define FFI_API
 # endif
 #else
 # define FFI_API
@@ -197,21 +220,12 @@ FFI_EXTERN ffi_type ffi_type_sint64;
 FFI_EXTERN ffi_type ffi_type_float;
 FFI_EXTERN ffi_type ffi_type_double;
 FFI_EXTERN ffi_type ffi_type_pointer;
-
-#if 0
 FFI_EXTERN ffi_type ffi_type_longdouble;
-#else
-#define ffi_type_longdouble ffi_type_double
-#endif
 
 #ifdef FFI_TARGET_HAS_COMPLEX_TYPE
 FFI_EXTERN ffi_type ffi_type_complex_float;
 FFI_EXTERN ffi_type ffi_type_complex_double;
-#if 0
 FFI_EXTERN ffi_type ffi_type_complex_longdouble;
-#else
-#define ffi_type_complex_longdouble ffi_type_complex_double
-#endif
 #endif
 #endif /* LIBFFI_HIDE_BASIC_TYPES */
 
@@ -338,14 +352,6 @@ typedef struct {
 FFI_API void *ffi_closure_alloc (size_t size, void **code);
 FFI_API void ffi_closure_free (void *);
 
-#if defined(PA_LINUX) || defined(PA_HPUX)
-#define FFI_CLOSURE_PTR(X) ((void *)((unsigned int)(X) | 2))
-#define FFI_RESTORE_PTR(X) ((void *)((unsigned int)(X) & ~3))
-#else
-#define FFI_CLOSURE_PTR(X) (X)
-#define FFI_RESTORE_PTR(X) (X)
-#endif
-
 FFI_API ffi_status
 ffi_prep_closure (ffi_closure*,
           ffi_cif *,
@@ -449,7 +455,7 @@ ffi_prep_java_raw_closure_loc (ffi_java_raw_closure*,
 
 #endif /* FFI_CLOSURES */
 
-#if FFI_GO_CLOSURES
+#ifdef FFI_GO_CLOSURES
 
 typedef struct {
   void      *tramp;
@@ -492,38 +498,19 @@ FFI_API
 ffi_status ffi_get_struct_offsets (ffi_abi abi, ffi_type *struct_type,
                    size_t *offsets);
 
-/* Useful for eliminating compiler warnings.  */
+/* Convert between closure and function pointers.  */
+#if defined(PA_LINUX) || defined(PA_HPUX)
+#define FFI_FN(f) ((void (*)(void))((unsigned int)(f) | 2))
+#define FFI_CL(f) ((void *)((unsigned int)(f) & ~3))
+#else
 #define FFI_FN(f) ((void (*)(void))f)
+#define FFI_CL(f) ((void *)(f))
+#endif
 
 /* ---- Definitions shared with assembly code ---------------------------- */
 
 #endif
 
-/* If these change, update src/mips/ffitarget.h. */
-#define FFI_TYPE_VOID       0
-#define FFI_TYPE_INT        1
-#define FFI_TYPE_FLOAT      2
-#define FFI_TYPE_DOUBLE     3
-#if 0
-#define FFI_TYPE_LONGDOUBLE 4
-#else
-#define FFI_TYPE_LONGDOUBLE FFI_TYPE_DOUBLE
-#endif
-#define FFI_TYPE_UINT8      5
-#define FFI_TYPE_SINT8      6
-#define FFI_TYPE_UINT16     7
-#define FFI_TYPE_SINT16     8
-#define FFI_TYPE_UINT32     9
-#define FFI_TYPE_SINT32     10
-#define FFI_TYPE_UINT64     11
-#define FFI_TYPE_SINT64     12
-#define FFI_TYPE_STRUCT     13
-#define FFI_TYPE_POINTER    14
-#define FFI_TYPE_COMPLEX    15
-
-/* This should always refer to the last type code (for sanity checks).  */
-#define FFI_TYPE_LAST       FFI_TYPE_COMPLEX
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/include/mac/aarch64/fficonfig.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/include/mac/aarch64/fficonfig.h
index af85a1e6150..86329babc06 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/include/mac/aarch64/fficonfig.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/include/mac/aarch64/fficonfig.h
@@ -4,9 +4,6 @@
 /* Define if building universal (internal helper macro) */
 /* #undef AC_APPLE_UNIVERSAL_BUILD */
 
-/* Define to 1 if using 'alloca.c'. */
-/* #undef C_ALLOCA */
-
 /* Define to the flags needed for the .section .eh_frame directive. */
 #define EH_FRAME_FLAGS "a"
 
@@ -32,10 +29,7 @@
 /* Define this if you do not want support for aggregate types. */
 /* #undef FFI_NO_STRUCTS */
 
-/* Define to 1 if you have 'alloca', as a function or macro. */
-#define HAVE_ALLOCA 1
-
-/* Define to 1 if <alloca.h> works. */
+/* Define to 1 if you have the <alloca.h> header file. */
 #define HAVE_ALLOCA_H 1
 
 /* Define if your assembler supports .cfi_* directives. */
@@ -78,27 +72,6 @@
 /* Define to 1 if you have the `memfd_create' function. */
 /* #undef HAVE_MEMFD_CREATE */
 
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `mkostemp' function. */
-#define HAVE_MKOSTEMP 1
-
-/* Define to 1 if you have the `mkstemp' function. */
-/* #undef HAVE_MKSTEMP */
-
-/* Define to 1 if you have the `mmap' function. */
-#define HAVE_MMAP 1
-
-/* Define if mmap with MAP_ANON(YMOUS) works. */
-#define HAVE_MMAP_ANON 1
-
-/* Define if mmap of /dev/zero works. */
-/* #undef HAVE_MMAP_DEV_ZERO */
-
-/* Define if read-only mmap of a plain file works. */
-#define HAVE_MMAP_FILE 1
-
 /* Define if your compiler supports pointer authentication. */
 /* #undef HAVE_PTRAUTH */
 
@@ -123,9 +96,6 @@
 /* Define to 1 if you have the <sys/memfd.h> header file. */
 /* #undef HAVE_SYS_MEMFD_H */
 
-/* Define to 1 if you have the <sys/mman.h> header file. */
-#define HAVE_SYS_MMAN_H 1
-
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1
 
@@ -151,7 +121,7 @@
 #define PACKAGE_NAME "libffi"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libffi 3.4.4"
+#define PACKAGE_STRING "libffi 3.4.6"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "libffi"
@@ -160,7 +130,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "3.4.4"
+#define PACKAGE_VERSION "3.4.6"
 
 /* The size of `double', as computed by sizeof. */
 #define SIZEOF_DOUBLE 8
@@ -171,14 +141,6 @@
 /* The size of `size_t', as computed by sizeof. */
 #define SIZEOF_SIZE_T 8
 
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at runtime.
-    STACK_DIRECTION > 0 => grows toward higher addresses
-    STACK_DIRECTION < 0 => grows toward lower addresses
-    STACK_DIRECTION = 0 => direction of growth unknown */
-/* #undef STACK_DIRECTION */
-
 /* Define to 1 if all of the C90 standard headers exist (not just the ones
    required in a freestanding environment). This macro is provided for
    backward compatibility; new code need not use it. */
@@ -192,7 +154,7 @@
 /* #undef USING_PURIFY */
 
 /* Version number of package */
-#define VERSION "3.4.4"
+#define VERSION "3.4.6"
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */
@@ -206,9 +168,6 @@
 # endif
 #endif
 
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */
-
 
 #ifdef HAVE_HIDDEN_VISIBILITY_ATTRIBUTE
 #ifdef LIBFFI_ASM
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/include/mac/x64/ffi.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/include/mac/x64/ffi.h
index 0ca42e5c648..b741a5c6760 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/include/mac/x64/ffi.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/include/mac/x64/ffi.h
@@ -1,6 +1,6 @@
 /* -----------------------------------------------------------------*-C-*-
-   libffi 3.4.4
-     - Copyright (c) 2011, 2014, 2019, 2021, 2022 Anthony Green
+   libffi 3.4.6
+     - Copyright (c) 2011, 2014, 2019, 2021, 2022, 2024 Anthony Green
      - Copyright (c) 1996-2003, 2007, 2008 Red Hat, Inc.
 
    Permission is hereby granted, free of charge, to any person
@@ -56,6 +56,31 @@ extern "C" {
 
 /* ---- System configuration information --------------------------------- */
 
+/* If these change, update src/mips/ffitarget.h. */
+#define FFI_TYPE_VOID       0
+#define FFI_TYPE_INT        1
+#define FFI_TYPE_FLOAT      2
+#define FFI_TYPE_DOUBLE     3
+#if 1
+#define FFI_TYPE_LONGDOUBLE 4
+#else
+#define FFI_TYPE_LONGDOUBLE FFI_TYPE_DOUBLE
+#endif
+#define FFI_TYPE_UINT8      5
+#define FFI_TYPE_SINT8      6
+#define FFI_TYPE_UINT16     7
+#define FFI_TYPE_SINT16     8
+#define FFI_TYPE_UINT32     9
+#define FFI_TYPE_SINT32     10
+#define FFI_TYPE_UINT64     11
+#define FFI_TYPE_SINT64     12
+#define FFI_TYPE_STRUCT     13
+#define FFI_TYPE_POINTER    14
+#define FFI_TYPE_COMPLEX    15
+
+/* This should always refer to the last type code (for sanity checks).  */
+#define FFI_TYPE_LAST       FFI_TYPE_COMPLEX
+
 #include <ffitarget.h>
 
 #ifndef LIBFFI_ASM
@@ -115,13 +140,11 @@ typedef struct _ffi_type
    when using the static version of the library.
    Besides, as a workaround, they can define FFI_BUILDING if they
    *know* they are going to link with the static library.  */
-#if defined _MSC_VER
+#if defined _MSC_VER && !defined(FFI_STATIC_BUILD)
 # if defined FFI_BUILDING_DLL /* Building libffi.DLL with msvcc.sh */
 #  define FFI_API __declspec(dllexport)
-# elif !defined FFI_BUILDING  /* Importing libffi.DLL */
+# else  /* Importing libffi.DLL */
 #  define FFI_API __declspec(dllimport)
-# else                        /* Building/linking static library */
-#  define FFI_API
 # endif
 #else
 # define FFI_API
@@ -197,21 +220,12 @@ FFI_EXTERN ffi_type ffi_type_sint64;
 FFI_EXTERN ffi_type ffi_type_float;
 FFI_EXTERN ffi_type ffi_type_double;
 FFI_EXTERN ffi_type ffi_type_pointer;
-
-#if 1
 FFI_EXTERN ffi_type ffi_type_longdouble;
-#else
-#define ffi_type_longdouble ffi_type_double
-#endif
 
 #ifdef FFI_TARGET_HAS_COMPLEX_TYPE
 FFI_EXTERN ffi_type ffi_type_complex_float;
 FFI_EXTERN ffi_type ffi_type_complex_double;
-#if 1
 FFI_EXTERN ffi_type ffi_type_complex_longdouble;
-#else
-#define ffi_type_complex_longdouble ffi_type_complex_double
-#endif
 #endif
 #endif /* LIBFFI_HIDE_BASIC_TYPES */
 
@@ -338,14 +352,6 @@ typedef struct {
 FFI_API void *ffi_closure_alloc (size_t size, void **code);
 FFI_API void ffi_closure_free (void *);
 
-#if defined(PA_LINUX) || defined(PA_HPUX)
-#define FFI_CLOSURE_PTR(X) ((void *)((unsigned int)(X) | 2))
-#define FFI_RESTORE_PTR(X) ((void *)((unsigned int)(X) & ~3))
-#else
-#define FFI_CLOSURE_PTR(X) (X)
-#define FFI_RESTORE_PTR(X) (X)
-#endif
-
 FFI_API ffi_status
 ffi_prep_closure (ffi_closure*,
           ffi_cif *,
@@ -449,7 +455,7 @@ ffi_prep_java_raw_closure_loc (ffi_java_raw_closure*,
 
 #endif /* FFI_CLOSURES */
 
-#if FFI_GO_CLOSURES
+#ifdef FFI_GO_CLOSURES
 
 typedef struct {
   void      *tramp;
@@ -492,38 +498,19 @@ FFI_API
 ffi_status ffi_get_struct_offsets (ffi_abi abi, ffi_type *struct_type,
                    size_t *offsets);
 
-/* Useful for eliminating compiler warnings.  */
+/* Convert between closure and function pointers.  */
+#if defined(PA_LINUX) || defined(PA_HPUX)
+#define FFI_FN(f) ((void (*)(void))((unsigned int)(f) | 2))
+#define FFI_CL(f) ((void *)((unsigned int)(f) & ~3))
+#else
 #define FFI_FN(f) ((void (*)(void))f)
+#define FFI_CL(f) ((void *)(f))
+#endif
 
 /* ---- Definitions shared with assembly code ---------------------------- */
 
 #endif
 
-/* If these change, update src/mips/ffitarget.h. */
-#define FFI_TYPE_VOID       0
-#define FFI_TYPE_INT        1
-#define FFI_TYPE_FLOAT      2
-#define FFI_TYPE_DOUBLE     3
-#if 1
-#define FFI_TYPE_LONGDOUBLE 4
-#else
-#define FFI_TYPE_LONGDOUBLE FFI_TYPE_DOUBLE
-#endif
-#define FFI_TYPE_UINT8      5
-#define FFI_TYPE_SINT8      6
-#define FFI_TYPE_UINT16     7
-#define FFI_TYPE_SINT16     8
-#define FFI_TYPE_UINT32     9
-#define FFI_TYPE_SINT32     10
-#define FFI_TYPE_UINT64     11
-#define FFI_TYPE_SINT64     12
-#define FFI_TYPE_STRUCT     13
-#define FFI_TYPE_POINTER    14
-#define FFI_TYPE_COMPLEX    15
-
-/* This should always refer to the last type code (for sanity checks).  */
-#define FFI_TYPE_LAST       FFI_TYPE_COMPLEX
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/include/mac/x64/fficonfig.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/include/mac/x64/fficonfig.h
index b1c6a055cfd..860cfa67204 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/include/mac/x64/fficonfig.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/include/mac/x64/fficonfig.h
@@ -4,9 +4,6 @@
 /* Define if building universal (internal helper macro) */
 /* #undef AC_APPLE_UNIVERSAL_BUILD */
 
-/* Define to 1 if using 'alloca.c'. */
-/* #undef C_ALLOCA */
-
 /* Define to the flags needed for the .section .eh_frame directive. */
 #define EH_FRAME_FLAGS "a"
 
@@ -32,10 +29,7 @@
 /* Define this if you do not want support for aggregate types. */
 /* #undef FFI_NO_STRUCTS */
 
-/* Define to 1 if you have 'alloca', as a function or macro. */
-#define HAVE_ALLOCA 1
-
-/* Define to 1 if <alloca.h> works. */
+/* Define to 1 if you have the <alloca.h> header file. */
 #define HAVE_ALLOCA_H 1
 
 /* Define if your assembler supports .cfi_* directives. */
@@ -78,27 +72,6 @@
 /* Define to 1 if you have the `memfd_create' function. */
 /* #undef HAVE_MEMFD_CREATE */
 
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `mkostemp' function. */
-#define HAVE_MKOSTEMP 1
-
-/* Define to 1 if you have the `mkstemp' function. */
-/* #undef HAVE_MKSTEMP */
-
-/* Define to 1 if you have the `mmap' function. */
-#define HAVE_MMAP 1
-
-/* Define if mmap with MAP_ANON(YMOUS) works. */
-#define HAVE_MMAP_ANON 1
-
-/* Define if mmap of /dev/zero works. */
-/* #undef HAVE_MMAP_DEV_ZERO */
-
-/* Define if read-only mmap of a plain file works. */
-#define HAVE_MMAP_FILE 1
-
 /* Define if your compiler supports pointer authentication. */
 /* #undef HAVE_PTRAUTH */
 
@@ -151,7 +124,7 @@
 #define PACKAGE_NAME "libffi"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libffi 3.4.4"
+#define PACKAGE_STRING "libffi 3.4.6"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "libffi"
@@ -160,7 +133,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "3.4.4"
+#define PACKAGE_VERSION "3.4.6"
 
 /* The size of `double', as computed by sizeof. */
 #define SIZEOF_DOUBLE 8
@@ -171,14 +144,6 @@
 /* The size of `size_t', as computed by sizeof. */
 #define SIZEOF_SIZE_T 8
 
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at runtime.
-    STACK_DIRECTION > 0 => grows toward higher addresses
-    STACK_DIRECTION < 0 => grows toward lower addresses
-    STACK_DIRECTION = 0 => direction of growth unknown */
-/* #undef STACK_DIRECTION */
-
 /* Define to 1 if all of the C90 standard headers exist (not just the ones
    required in a freestanding environment). This macro is provided for
    backward compatibility; new code need not use it. */
@@ -192,7 +157,7 @@
 /* #undef USING_PURIFY */
 
 /* Version number of package */
-#define VERSION "3.4.4"
+#define VERSION "3.4.6"
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */
@@ -206,9 +171,6 @@
 # endif
 #endif
 
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */
-
 
 #ifdef HAVE_HIDDEN_VISIBILITY_ATTRIBUTE
 #ifdef LIBFFI_ASM
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/include/win/x64/ffi.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/include/win/x64/ffi.h
index c7e5afa9a1d..fae025f4307 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/include/win/x64/ffi.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/include/win/x64/ffi.h
@@ -1,6 +1,6 @@
 /* -----------------------------------------------------------------*-C-*-
-   libffi 3.4.4
-     - Copyright (c) 2011, 2014, 2019, 2021, 2022 Anthony Green
+   libffi 3.4.6
+     - Copyright (c) 2011, 2014, 2019, 2021, 2022, 2024 Anthony Green
      - Copyright (c) 1996-2003, 2007, 2008 Red Hat, Inc.
 
    Permission is hereby granted, free of charge, to any person
@@ -56,6 +56,31 @@ extern "C" {
 
 /* ---- System configuration information --------------------------------- */
 
+/* If these change, update src/mips/ffitarget.h. */
+#define FFI_TYPE_VOID       0
+#define FFI_TYPE_INT        1
+#define FFI_TYPE_FLOAT      2
+#define FFI_TYPE_DOUBLE     3
+#if 0
+#define FFI_TYPE_LONGDOUBLE 4
+#else
+#define FFI_TYPE_LONGDOUBLE FFI_TYPE_DOUBLE
+#endif
+#define FFI_TYPE_UINT8      5
+#define FFI_TYPE_SINT8      6
+#define FFI_TYPE_UINT16     7
+#define FFI_TYPE_SINT16     8
+#define FFI_TYPE_UINT32     9
+#define FFI_TYPE_SINT32     10
+#define FFI_TYPE_UINT64     11
+#define FFI_TYPE_SINT64     12
+#define FFI_TYPE_STRUCT     13
+#define FFI_TYPE_POINTER    14
+#define FFI_TYPE_COMPLEX    15
+
+/* This should always refer to the last type code (for sanity checks).  */
+#define FFI_TYPE_LAST       FFI_TYPE_COMPLEX
+
 #include <ffitarget.h>
 
 #ifndef LIBFFI_ASM
@@ -115,13 +140,11 @@ typedef struct _ffi_type
    when using the static version of the library.
    Besides, as a workaround, they can define FFI_BUILDING if they
    *know* they are going to link with the static library.  */
-#if defined _MSC_VER
+#if defined _MSC_VER && !defined(FFI_STATIC_BUILD)
 # if defined FFI_BUILDING_DLL /* Building libffi.DLL with msvcc.sh */
 #  define FFI_API __declspec(dllexport)
-# elif !defined FFI_BUILDING  /* Importing libffi.DLL */
+# else  /* Importing libffi.DLL */
 #  define FFI_API __declspec(dllimport)
-# else                        /* Building/linking static library */
-#  define FFI_API
 # endif
 #else
 # define FFI_API
@@ -197,21 +220,12 @@ FFI_EXTERN ffi_type ffi_type_sint64;
 FFI_EXTERN ffi_type ffi_type_float;
 FFI_EXTERN ffi_type ffi_type_double;
 FFI_EXTERN ffi_type ffi_type_pointer;
-
-#if 0
 FFI_EXTERN ffi_type ffi_type_longdouble;
-#else
-#define ffi_type_longdouble ffi_type_double
-#endif
 
 #ifdef FFI_TARGET_HAS_COMPLEX_TYPE
 FFI_EXTERN ffi_type ffi_type_complex_float;
 FFI_EXTERN ffi_type ffi_type_complex_double;
-#if 0
 FFI_EXTERN ffi_type ffi_type_complex_longdouble;
-#else
-#define ffi_type_complex_longdouble ffi_type_complex_double
-#endif
 #endif
 #endif /* LIBFFI_HIDE_BASIC_TYPES */
 
@@ -338,14 +352,6 @@ typedef struct {
 FFI_API void *ffi_closure_alloc (size_t size, void **code);
 FFI_API void ffi_closure_free (void *);
 
-#if defined(PA_LINUX) || defined(PA_HPUX)
-#define FFI_CLOSURE_PTR(X) ((void *)((unsigned int)(X) | 2))
-#define FFI_RESTORE_PTR(X) ((void *)((unsigned int)(X) & ~3))
-#else
-#define FFI_CLOSURE_PTR(X) (X)
-#define FFI_RESTORE_PTR(X) (X)
-#endif
-
 FFI_API ffi_status
 ffi_prep_closure (ffi_closure*,
           ffi_cif *,
@@ -449,7 +455,7 @@ ffi_prep_java_raw_closure_loc (ffi_java_raw_closure*,
 
 #endif /* FFI_CLOSURES */
 
-#if FFI_GO_CLOSURES
+#ifdef FFI_GO_CLOSURES
 
 typedef struct {
   void      *tramp;
@@ -492,38 +498,19 @@ FFI_API
 ffi_status ffi_get_struct_offsets (ffi_abi abi, ffi_type *struct_type,
                    size_t *offsets);
 
-/* Useful for eliminating compiler warnings.  */
+/* Convert between closure and function pointers.  */
+#if defined(PA_LINUX) || defined(PA_HPUX)
+#define FFI_FN(f) ((void (*)(void))((unsigned int)(f) | 2))
+#define FFI_CL(f) ((void *)((unsigned int)(f) & ~3))
+#else
 #define FFI_FN(f) ((void (*)(void))f)
+#define FFI_CL(f) ((void *)(f))
+#endif
 
 /* ---- Definitions shared with assembly code ---------------------------- */
 
 #endif
 
-/* If these change, update src/mips/ffitarget.h. */
-#define FFI_TYPE_VOID       0
-#define FFI_TYPE_INT        1
-#define FFI_TYPE_FLOAT      2
-#define FFI_TYPE_DOUBLE     3
-#if 0
-#define FFI_TYPE_LONGDOUBLE 4
-#else
-#define FFI_TYPE_LONGDOUBLE FFI_TYPE_DOUBLE
-#endif
-#define FFI_TYPE_UINT8      5
-#define FFI_TYPE_SINT8      6
-#define FFI_TYPE_UINT16     7
-#define FFI_TYPE_SINT16     8
-#define FFI_TYPE_UINT32     9
-#define FFI_TYPE_SINT32     10
-#define FFI_TYPE_UINT64     11
-#define FFI_TYPE_SINT64     12
-#define FFI_TYPE_STRUCT     13
-#define FFI_TYPE_POINTER    14
-#define FFI_TYPE_COMPLEX    15
-
-/* This should always refer to the last type code (for sanity checks).  */
-#define FFI_TYPE_LAST       FFI_TYPE_COMPLEX
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/include/win/x64/fficonfig.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/include/win/x64/fficonfig.h
index 3585140026c..e563ae286b1 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/include/win/x64/fficonfig.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/include/win/x64/fficonfig.h
@@ -4,9 +4,6 @@
 /* Define if building universal (internal helper macro) */
 /* #undef AC_APPLE_UNIVERSAL_BUILD */
 
-/* Define to 1 if using 'alloca.c'. */
-/* #undef C_ALLOCA */
-
 /* Define to the flags needed for the .section .eh_frame directive. */
 /* #undef EH_FRAME_FLAGS */
 
@@ -32,10 +29,7 @@
 /* Define this if you do not want support for aggregate types. */
 /* #undef FFI_NO_STRUCTS */
 
-/* Define to 1 if you have 'alloca', as a function or macro. */
-#define HAVE_ALLOCA 1
-
-/* Define to 1 if <alloca.h> works. */
+/* Define to 1 if you have the <alloca.h> header file. */
 /* #undef HAVE_ALLOCA_H */
 
 /* Define if your assembler supports .cfi_* directives. */
@@ -78,27 +72,6 @@
 /* Define to 1 if you have the `memfd_create' function. */
 /* #undef HAVE_MEMFD_CREATE */
 
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `mkostemp' function. */
-/* #undef HAVE_MKOSTEMP */
-
-/* Define to 1 if you have the `mkstemp' function. */
-/* #undef HAVE_MKSTEMP */
-
-/* Define to 1 if you have the `mmap' function. */
-/* #undef HAVE_MMAP */
-
-/* Define if mmap with MAP_ANON(YMOUS) works. */
-/* #undef HAVE_MMAP_ANON */
-
-/* Define if mmap of /dev/zero works. */
-/* #undef HAVE_MMAP_DEV_ZERO */
-
-/* Define if read-only mmap of a plain file works. */
-/* #undef HAVE_MMAP_FILE */
-
 /* Define if your compiler supports pointer authentication. */
 /* #undef HAVE_PTRAUTH */
 
@@ -123,9 +96,6 @@
 /* Define to 1 if you have the <sys/memfd.h> header file. */
 /* #undef HAVE_SYS_MEMFD_H */
 
-/* Define to 1 if you have the <sys/mman.h> header file. */
-/* #undef HAVE_SYS_MMAN_H */
-
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1
 
@@ -151,7 +121,7 @@
 #define PACKAGE_NAME "libffi"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libffi 3.4.4"
+#define PACKAGE_STRING "libffi 3.4.6"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "libffi"
@@ -160,7 +130,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "3.4.4"
+#define PACKAGE_VERSION "3.4.6"
 
 /* The size of `double', as computed by sizeof. */
 #define SIZEOF_DOUBLE 8
@@ -171,14 +141,6 @@
 /* The size of `size_t', as computed by sizeof. */
 #define SIZEOF_SIZE_T 8
 
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at runtime.
-    STACK_DIRECTION > 0 => grows toward higher addresses
-    STACK_DIRECTION < 0 => grows toward lower addresses
-    STACK_DIRECTION = 0 => direction of growth unknown */
-/* #undef STACK_DIRECTION */
-
 /* Define to 1 if all of the C90 standard headers exist (not just the ones
    required in a freestanding environment). This macro is provided for
    backward compatibility; new code need not use it. */
@@ -192,7 +154,7 @@
 /* #undef USING_PURIFY */
 
 /* Version number of package */
-#define VERSION "3.4.4"
+#define VERSION "3.4.6"
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */
@@ -206,9 +168,6 @@
 # endif
 #endif
 
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */
-
 
 #ifdef HAVE_HIDDEN_VISIBILITY_ATTRIBUTE
 #ifdef LIBFFI_ASM
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/include/win/x86/ffi.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/include/win/x86/ffi.h
index c48f32c616f..dcdda3eb436 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/include/win/x86/ffi.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/include/win/x86/ffi.h
@@ -1,6 +1,6 @@
 /* -----------------------------------------------------------------*-C-*-
-   libffi 3.4.4
-     - Copyright (c) 2011, 2014, 2019, 2021, 2022 Anthony Green
+   libffi 3.4.6
+     - Copyright (c) 2011, 2014, 2019, 2021, 2022, 2024 Anthony Green
      - Copyright (c) 1996-2003, 2007, 2008 Red Hat, Inc.
 
    Permission is hereby granted, free of charge, to any person
@@ -56,6 +56,31 @@ extern "C" {
 
 /* ---- System configuration information --------------------------------- */
 
+/* If these change, update src/mips/ffitarget.h. */
+#define FFI_TYPE_VOID       0
+#define FFI_TYPE_INT        1
+#define FFI_TYPE_FLOAT      2
+#define FFI_TYPE_DOUBLE     3
+#if 0
+#define FFI_TYPE_LONGDOUBLE 4
+#else
+#define FFI_TYPE_LONGDOUBLE FFI_TYPE_DOUBLE
+#endif
+#define FFI_TYPE_UINT8      5
+#define FFI_TYPE_SINT8      6
+#define FFI_TYPE_UINT16     7
+#define FFI_TYPE_SINT16     8
+#define FFI_TYPE_UINT32     9
+#define FFI_TYPE_SINT32     10
+#define FFI_TYPE_UINT64     11
+#define FFI_TYPE_SINT64     12
+#define FFI_TYPE_STRUCT     13
+#define FFI_TYPE_POINTER    14
+#define FFI_TYPE_COMPLEX    15
+
+/* This should always refer to the last type code (for sanity checks).  */
+#define FFI_TYPE_LAST       FFI_TYPE_COMPLEX
+
 #include <ffitarget.h>
 
 #ifndef LIBFFI_ASM
@@ -115,13 +140,11 @@ typedef struct _ffi_type
    when using the static version of the library.
    Besides, as a workaround, they can define FFI_BUILDING if they
    *know* they are going to link with the static library.  */
-#if defined _MSC_VER
+#if defined _MSC_VER && !defined(FFI_STATIC_BUILD)
 # if defined FFI_BUILDING_DLL /* Building libffi.DLL with msvcc.sh */
 #  define FFI_API __declspec(dllexport)
-# elif !defined FFI_BUILDING  /* Importing libffi.DLL */
+# else  /* Importing libffi.DLL */
 #  define FFI_API __declspec(dllimport)
-# else                        /* Building/linking static library */
-#  define FFI_API
 # endif
 #else
 # define FFI_API
@@ -197,21 +220,12 @@ FFI_EXTERN ffi_type ffi_type_sint64;
 FFI_EXTERN ffi_type ffi_type_float;
 FFI_EXTERN ffi_type ffi_type_double;
 FFI_EXTERN ffi_type ffi_type_pointer;
-
-#if 0
 FFI_EXTERN ffi_type ffi_type_longdouble;
-#else
-#define ffi_type_longdouble ffi_type_double
-#endif
 
 #ifdef FFI_TARGET_HAS_COMPLEX_TYPE
 FFI_EXTERN ffi_type ffi_type_complex_float;
 FFI_EXTERN ffi_type ffi_type_complex_double;
-#if 0
 FFI_EXTERN ffi_type ffi_type_complex_longdouble;
-#else
-#define ffi_type_complex_longdouble ffi_type_complex_double
-#endif
 #endif
 #endif /* LIBFFI_HIDE_BASIC_TYPES */
 
@@ -338,14 +352,6 @@ typedef struct {
 FFI_API void *ffi_closure_alloc (size_t size, void **code);
 FFI_API void ffi_closure_free (void *);
 
-#if defined(PA_LINUX) || defined(PA_HPUX)
-#define FFI_CLOSURE_PTR(X) ((void *)((unsigned int)(X) | 2))
-#define FFI_RESTORE_PTR(X) ((void *)((unsigned int)(X) & ~3))
-#else
-#define FFI_CLOSURE_PTR(X) (X)
-#define FFI_RESTORE_PTR(X) (X)
-#endif
-
 FFI_API ffi_status
 ffi_prep_closure (ffi_closure*,
           ffi_cif *,
@@ -449,7 +455,7 @@ ffi_prep_java_raw_closure_loc (ffi_java_raw_closure*,
 
 #endif /* FFI_CLOSURES */
 
-#if FFI_GO_CLOSURES
+#ifdef FFI_GO_CLOSURES
 
 typedef struct {
   void      *tramp;
@@ -492,38 +498,19 @@ FFI_API
 ffi_status ffi_get_struct_offsets (ffi_abi abi, ffi_type *struct_type,
                    size_t *offsets);
 
-/* Useful for eliminating compiler warnings.  */
+/* Convert between closure and function pointers.  */
+#if defined(PA_LINUX) || defined(PA_HPUX)
+#define FFI_FN(f) ((void (*)(void))((unsigned int)(f) | 2))
+#define FFI_CL(f) ((void *)((unsigned int)(f) & ~3))
+#else
 #define FFI_FN(f) ((void (*)(void))f)
+#define FFI_CL(f) ((void *)(f))
+#endif
 
 /* ---- Definitions shared with assembly code ---------------------------- */
 
 #endif
 
-/* If these change, update src/mips/ffitarget.h. */
-#define FFI_TYPE_VOID       0
-#define FFI_TYPE_INT        1
-#define FFI_TYPE_FLOAT      2
-#define FFI_TYPE_DOUBLE     3
-#if 0
-#define FFI_TYPE_LONGDOUBLE 4
-#else
-#define FFI_TYPE_LONGDOUBLE FFI_TYPE_DOUBLE
-#endif
-#define FFI_TYPE_UINT8      5
-#define FFI_TYPE_SINT8      6
-#define FFI_TYPE_UINT16     7
-#define FFI_TYPE_SINT16     8
-#define FFI_TYPE_UINT32     9
-#define FFI_TYPE_SINT32     10
-#define FFI_TYPE_UINT64     11
-#define FFI_TYPE_SINT64     12
-#define FFI_TYPE_STRUCT     13
-#define FFI_TYPE_POINTER    14
-#define FFI_TYPE_COMPLEX    15
-
-/* This should always refer to the last type code (for sanity checks).  */
-#define FFI_TYPE_LAST       FFI_TYPE_COMPLEX
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/include/win/x86/fficonfig.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/include/win/x86/fficonfig.h
index 21bdd83c702..41765936b9d 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/include/win/x86/fficonfig.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/include/win/x86/fficonfig.h
@@ -4,9 +4,6 @@
 /* Define if building universal (internal helper macro) */
 /* #undef AC_APPLE_UNIVERSAL_BUILD */
 
-/* Define to 1 if using 'alloca.c'. */
-/* #undef C_ALLOCA */
-
 /* Define to the flags needed for the .section .eh_frame directive. */
 /* #undef EH_FRAME_FLAGS */
 
@@ -32,10 +29,7 @@
 /* Define this if you do not want support for aggregate types. */
 /* #undef FFI_NO_STRUCTS */
 
-/* Define to 1 if you have 'alloca', as a function or macro. */
-#define HAVE_ALLOCA 1
-
-/* Define to 1 if <alloca.h> works. */
+/* Define to 1 if you have the <alloca.h> header file. */
 /* #undef HAVE_ALLOCA_H */
 
 /* Define if your assembler supports .cfi_* directives. */
@@ -78,27 +72,6 @@
 /* Define to 1 if you have the `memfd_create' function. */
 /* #undef HAVE_MEMFD_CREATE */
 
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `mkostemp' function. */
-/* #undef HAVE_MKOSTEMP */
-
-/* Define to 1 if you have the `mkstemp' function. */
-/* #undef HAVE_MKSTEMP */
-
-/* Define to 1 if you have the `mmap' function. */
-/* #undef HAVE_MMAP */
-
-/* Define if mmap with MAP_ANON(YMOUS) works. */
-/* #undef HAVE_MMAP_ANON */
-
-/* Define if mmap of /dev/zero works. */
-/* #undef HAVE_MMAP_DEV_ZERO */
-
-/* Define if read-only mmap of a plain file works. */
-/* #undef HAVE_MMAP_FILE */
-
 /* Define if your compiler supports pointer authentication. */
 /* #undef HAVE_PTRAUTH */
 
@@ -123,9 +96,6 @@
 /* Define to 1 if you have the <sys/memfd.h> header file. */
 /* #undef HAVE_SYS_MEMFD_H */
 
-/* Define to 1 if you have the <sys/mman.h> header file. */
-/* #undef HAVE_SYS_MMAN_H */
-
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1
 
@@ -151,7 +121,7 @@
 #define PACKAGE_NAME "libffi"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libffi 3.4.4"
+#define PACKAGE_STRING "libffi 3.4.6"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "libffi"
@@ -160,7 +130,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "3.4.4"
+#define PACKAGE_VERSION "3.4.6"
 
 /* The size of `double', as computed by sizeof. */
 #define SIZEOF_DOUBLE 8
@@ -171,14 +141,6 @@
 /* The size of `size_t', as computed by sizeof. */
 #define SIZEOF_SIZE_T 4
 
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at runtime.
-    STACK_DIRECTION > 0 => grows toward higher addresses
-    STACK_DIRECTION < 0 => grows toward lower addresses
-    STACK_DIRECTION = 0 => direction of growth unknown */
-/* #undef STACK_DIRECTION */
-
 /* Define to 1 if all of the C90 standard headers exist (not just the ones
    required in a freestanding environment). This macro is provided for
    backward compatibility; new code need not use it. */
@@ -192,7 +154,7 @@
 /* #undef USING_PURIFY */
 
 /* Version number of package */
-#define VERSION "3.4.4"
+#define VERSION "3.4.6"
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */
@@ -206,9 +168,6 @@
 # endif
 #endif
 
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */
-
 
 #ifdef HAVE_HIDDEN_VISIBILITY_ATTRIBUTE
 #ifdef LIBFFI_ASM
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/aarch64/ffi.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/aarch64/ffi.c
index 3f8c4ad3882..b94ac3abe27 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/aarch64/ffi.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/aarch64/ffi.c
@@ -386,51 +386,64 @@ extend_hfa_type (void *dest, void *src, int h)
   ssize_t f = h - AARCH64_RET_S4;
   void *x0;
 
+#define BTI_J "hint #36"
   asm volatile (
 "adr    %0, 0f\n"
-"       add     %0, %0, %1\n"
-"       br      %0\n"
-"0:     ldp     s16, s17, [%3]\n"       /* S4 */
-"       ldp     s18, s19, [%3, #8]\n"
-"       b       4f\n"
-"       ldp     s16, s17, [%3]\n"       /* S3 */
-"       ldr     s18, [%3, #8]\n"
-"       b       3f\n"
-"       ldp     s16, s17, [%3]\n"       /* S2 */
-"       b       2f\n"
-"       nop\n"
-"       ldr     s16, [%3]\n"            /* S1 */
-"       b       1f\n"
-"       nop\n"
-"       ldp     d16, d17, [%3]\n"       /* D4 */
-"       ldp     d18, d19, [%3, #16]\n"
-"       b       4f\n"
-"       ldp     d16, d17, [%3]\n"       /* D3 */
-"       ldr     d18, [%3, #16]\n"
-"       b       3f\n"
-"       ldp     d16, d17, [%3]\n"       /* D2 */
-"       b       2f\n"
-"       nop\n"
-"       ldr     d16, [%3]\n"            /* D1 */
-"       b       1f\n"
-"       nop\n"
-"       ldp     q16, q17, [%3]\n"       /* Q4 */
-"       ldp     q18, q19, [%3, #32]\n"
-"       b       4f\n"
-"       ldp     q16, q17, [%3]\n"       /* Q3 */
-"       ldr     q18, [%3, #32]\n"
-"       b       3f\n"
-"       ldp     q16, q17, [%3]\n"       /* Q2 */
-"       b       2f\n"
-"       nop\n"
-"       ldr     q16, [%3]\n"            /* Q1 */
-"       b       1f\n"
-"4:     str     q19, [%2, #48]\n"
-"3:     str     q18, [%2, #32]\n"
-"2:     str     q17, [%2, #16]\n"
-"1:     str     q16, [%2]"
+"  add  %0, %0, %1\n"
+"  br  %0\n"
+"0:  "BTI_J"\n"      /* S4 */
+"  ldp  s16, s17, [%3]\n"
+"  ldp  s18, s19, [%3, #8]\n"
+"  b  4f\n"
+"  "BTI_J"\n"      /* S3 */
+"  ldp  s16, s17, [%3]\n"
+"  ldr  s18, [%3, #8]\n"
+"  b  3f\n"
+"  "BTI_J"\n"      /* S2 */
+"  ldp  s16, s17, [%3]\n"
+"  b  2f\n"
+"  nop\n"
+"  "BTI_J"\n"      /* S1 */
+"  ldr  s16, [%3]\n"
+"  b  1f\n"
+"  nop\n"
+"  "BTI_J"\n"      /* D4 */
+"  ldp  d16, d17, [%3]\n"
+"  ldp  d18, d19, [%3, #16]\n"
+"  b  4f\n"
+"  "BTI_J"\n"      /* D3 */
+"  ldp  d16, d17, [%3]\n"
+"  ldr  d18, [%3, #16]\n"
+"  b  3f\n"
+"  "BTI_J"\n"      /* D2 */
+"  ldp  d16, d17, [%3]\n"
+"  b  2f\n"
+"  nop\n"
+"  "BTI_J"\n"      /* D1 */
+"  ldr  d16, [%3]\n"
+"  b  1f\n"
+"  nop\n"
+"  "BTI_J"\n"      /* Q4 */
+"  ldp  q16, q17, [%3]\n"
+"  ldp  q18, q19, [%3, #32]\n"
+"  b  4f\n"
+"  "BTI_J"\n"      /* Q3 */
+"  ldp  q16, q17, [%3]\n"
+"  ldr  q18, [%3, #32]\n"
+"  b  3f\n"
+"  "BTI_J"\n"      /* Q2 */
+"  ldp  q16, q17, [%3]\n"
+"  b  2f\n"
+"  nop\n"
+"  "BTI_J"\n"      /* Q1 */
+"  ldr  q16, [%3]\n"
+"  b  1f\n"
+"4:  str  q19, [%2, #48]\n"
+"3:  str  q18, [%2, #32]\n"
+"2:  str  q17, [%2, #16]\n"
+"1:  str  q16, [%2]"
     : "=&r"(x0)
-    : "r"(f * 12), "r"(dest), "r"(src)
+    : "r"(f * 16), "r"(dest), "r"(src)
     : "memory", "v16", "v17", "v18", "v19");
 }
 #endif
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/aarch64/sysv.S b/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/aarch64/sysv.S
index 3cc41538a6b..044e56055b7 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/aarch64/sysv.S
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/aarch64/sysv.S
@@ -40,6 +40,12 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 #endif
 #endif
 
+#ifdef __APPLE__
+# define L(X)     CONCAT1(L, X)
+#else
+# define L(X)     CONCAT1(.L, X)
+#endif
+
 #ifdef __AARCH64EB__
 # define BE(X)  X
 #else
@@ -58,6 +64,13 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 #define PTR_SIZE        8
 #endif
 
+#define BTI_C hint #34
+#define BTI_J hint #36
+/*
+ * The ELF Notes section needs to indicate if BTI is supported, as the first ELF loaded that doesn't
+ * declare this support disables it for the whole process.
+ */
+# define GNU_PROPERTY_AARCH64_BTI (1 << 0)         /* Has Branch Target Identification */
         .text
         .align 4
 
@@ -78,6 +91,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
         cfi_startproc
 CNAME(ffi_call_SYSV):
+        BTI_C
         /* Sign the lr with x1 since that is where it will be stored */
         SIGN_LR_WITH_REG(x1)
 
@@ -122,93 +136,157 @@ CNAME(ffi_call_SYSV):
         ldp     x6, x7, [sp, #16*N_V_ARG_REG + 48]
 
         /* Deallocate the context, leaving the stacked arguments.  */
-        add     sp, sp, #CALL_CONTEXT_SIZE
+        add    sp, sp, #CALL_CONTEXT_SIZE
 
-        BRANCH_AND_LINK_TO_REG     x9   /* call fn */
+        BRANCH_AND_LINK_TO_REG     x9            /* call fn */
 
-        ldp     x3, x4, [x29, #16]      /* reload rvalue and flags */
+        ldp    x3, x4, [x29, #16]    /* reload rvalue and flags */
 
         /* Partially deconstruct the stack frame.  */
-        ldr     x9, [x29, #32]
-        mov     sp, x9
+        ldr    x9, [x29, #32]
+        mov    sp, x9
         cfi_def_cfa_register (sp)
-        mov     x2, x29                 /* Preserve for auth */
+        mov    x2, x29            /* Preserve for auth */
         ldp     x29, x30, [x29]
 
         /* Save the return value as directed.  */
-        adr     x5, 0f
-        and     w4, w4, #AARCH64_RET_MASK
-        add     x5, x5, x4, lsl #3
-        br      x5
+        adr    x5, 0f
+        and    w4, w4, #AARCH64_RET_MASK
+        add    x5, x5, x4, lsl #4
+        br    x5
 
-        /* Note that each table entry is 2 insns, and thus 8 bytes.
+        /* Note that each table entry is 4 insns, and thus 16 bytes.
            For integer data, note that we're storing into ffi_arg
            and therefore we want to extend to 64 bits; these types
            have two consecutive entries allocated for them.  */
-        .align  4
-0:      b 99f                           /* VOID */
+        .align    4
+0:      BTI_J                /* VOID */
+        b 99f
         nop
-1:      str     x0, [x3]                /* INT64 */
+        nop
+1:      BTI_J                /* INT64 */
+        str    x0, [x3]
         b 99f
-2:      stp     x0, x1, [x3]            /* INT128 */
+        nop
+2:      BTI_J                /* INT128 */
+        stp    x0, x1, [x3]
         b 99f
-3:      brk     #1000                   /* UNUSED */
+        nop
+3:      brk    #1000            /* UNUSED */
         b 99f
-4:      brk     #1000                   /* UNUSED */
+        nop
+        nop
+4:      brk    #1000            /* UNUSED */
         b 99f
-5:      brk     #1000                   /* UNUSED */
+        nop
+        nop
+5:      brk    #1000            /* UNUSED */
         b 99f
-6:      brk     #1000                   /* UNUSED */
+        nop
+        nop
+6:      brk    #1000            /* UNUSED */
         b 99f
-7:      brk     #1000                   /* UNUSED */
+    nop
+    nop
+7:    brk    #1000            /* UNUSED */
         b 99f
-8:      st4     { v0.s, v1.s, v2.s, v3.s }[0], [x3]  /* S4 */
+    nop
+    nop
+8:    BTI_J                /* S4 */
+    st4    { v0.s, v1.s, v2.s, v3.s }[0], [x3]
         b 99f
-9:      st3     { v0.s, v1.s, v2.s }[0], [x3]        /* S3 */
+    nop
+9:    BTI_J                /* S3 */
+    st3    { v0.s, v1.s, v2.s }[0], [x3]
         b 99f
-10:     stp     s0, s1, [x3]                         /* S2 */
+    nop
+10:    BTI_J                /* S2 */
+    stp    s0, s1, [x3]
         b 99f
-11:     str     s0, [x3]                             /* S1 */
+    nop
+11:    BTI_J
+    str    s0, [x3]        /* S1 */
         b 99f
-12:     st4     { v0.d, v1.d, v2.d, v3.d }[0], [x3]  /* D4 */
+    nop
+12:    BTI_J                /* D4 */
+    st4    { v0.d, v1.d, v2.d, v3.d }[0], [x3]
         b 99f
-13:     st3     { v0.d, v1.d, v2.d }[0], [x3]        /* D3 */
+    nop
+13:    BTI_J                /* D3 */
+    st3    { v0.d, v1.d, v2.d }[0], [x3]
         b 99f
-14:     stp     d0, d1, [x3]                         /* D2 */
+    nop
+14:    BTI_J                /* D2 */
+    stp    d0, d1, [x3]
         b 99f
-15:     str     d0, [x3]                             /* D1 */
+    nop
+15:    BTI_J                /* D1 */
+    str    d0, [x3]
         b 99f
-16:     str     q3, [x3, #48]                        /* Q4 */
+    nop
+16:    BTI_J                /* Q4 */
+    str    q3, [x3, #48]
+    nop
         nop
-17:     str     q2, [x3, #32]                        /* Q3 */
+17:    BTI_J                /* Q3 */
+    str    q2, [x3, #32]
+    nop
         nop
-18:     stp     q0, q1, [x3]                         /* Q2 */
+18:    BTI_J                /* Q2 */
+    stp    q0, q1, [x3]
         b 99f
-19:     str     q0, [x3]                             /* Q1 */
+    nop
+19:    BTI_J                /* Q1 */
+    str    q0, [x3]
         b 99f
-20:     uxtb    w0, w0                               /* UINT8 */
-        str     x0, [x3]
-21:     b 99f                                        /* reserved */
-        nop
-22:     uxth    w0, w0                               /* UINT16 */
-        str     x0, [x3]
-23:     b 99f                                        /* reserved */
-        nop
-24:     mov     w0, w0                               /* UINT32 */
-        str     x0, [x3]
-25:     b 99f                                        /* reserved */
-        nop
-26:     sxtb    x0, w0                               /* SINT8 */
-        str     x0, [x3]
-27:     b 99f                                        /* reserved */
-        nop
-28:     sxth    x0, w0                               /* SINT16 */
-        str     x0, [x3]
-29:     b 99f                                        /* reserved */
-        nop
-30:     sxtw    x0, w0                               /* SINT32 */
-        str     x0, [x3]
-31:     b 99f                                        /* reserved */
+    nop
+20:    BTI_J                /* UINT8 */
+    uxtb    w0, w0
+    str    x0, [x3]
+    nop
+21:    b 99f                /* reserved */
+    nop
+    nop
+    nop
+22:    BTI_J                /* UINT16 */
+    uxth    w0, w0
+    str    x0, [x3]
+    nop
+23:    b 99f                /* reserved */
+    nop
+    nop
+    nop
+24:    BTI_J                /* UINT32 */
+    mov    w0, w0
+    str    x0, [x3]
+    nop
+25:    b 99f                /* reserved */
+    nop
+    nop
+    nop
+26:    BTI_J                /* SINT8 */
+    sxtb    x0, w0
+    str    x0, [x3]
+    nop
+27:    b 99f                /* reserved */
+    nop
+    nop
+    nop
+28:    BTI_J                /* SINT16 */
+    sxth    x0, w0
+    str    x0, [x3]
+    nop
+29:    b 99f                /* reserved */
+    nop
+    nop
+    nop
+30:    BTI_J                /* SINT32 */
+    sxtw    x0, w0
+    str    x0, [x3]
+    nop
+31:    b 99f                /* reserved */
+    nop
+    nop
         nop
 
         /* Return now that result has been populated. */
@@ -218,10 +296,10 @@ CNAME(ffi_call_SYSV):
 
         cfi_endproc
 
-        .globl  CNAME(ffi_call_SYSV)
+    .globl    CNAME(ffi_call_SYSV)
         FFI_HIDDEN(CNAME(ffi_call_SYSV))
 #ifdef __ELF__
-        .type CNAME(ffi_call_SYSV), #function
+    .type    CNAME(ffi_call_SYSV), #function
         .size CNAME(ffi_call_SYSV), .-CNAME(ffi_call_SYSV)
 #endif
 
@@ -246,6 +324,7 @@ CNAME(ffi_call_SYSV):
         .align 4
 CNAME(ffi_closure_SYSV_V):
         cfi_startproc
+    BTI_C
         SIGN_LR
         stp     x29, x30, [sp, #-ffi_closure_SYSV_FS]!
         cfi_adjust_cfa_offset (ffi_closure_SYSV_FS)
@@ -257,19 +336,20 @@ CNAME(ffi_closure_SYSV_V):
         stp     q2, q3, [sp, #16 + 32]
         stp     q4, q5, [sp, #16 + 64]
         stp     q6, q7, [sp, #16 + 96]
-        b       0f
+    b    0f
         cfi_endproc
 
-        .globl  CNAME(ffi_closure_SYSV_V)
+    .globl    CNAME(ffi_closure_SYSV_V)
         FFI_HIDDEN(CNAME(ffi_closure_SYSV_V))
 #ifdef __ELF__
-        .type   CNAME(ffi_closure_SYSV_V), #function
-        .size   CNAME(ffi_closure_SYSV_V), . - CNAME(ffi_closure_SYSV_V)
+    .type    CNAME(ffi_closure_SYSV_V), #function
+    .size    CNAME(ffi_closure_SYSV_V), . - CNAME(ffi_closure_SYSV_V)
 #endif
 
-        .align  4
+    .align    4
         cfi_startproc
 CNAME(ffi_closure_SYSV):
+    BTI_C
         SIGN_LR
         stp     x29, x30, [sp, #-ffi_closure_SYSV_FS]!
         cfi_adjust_cfa_offset (ffi_closure_SYSV_FS)
@@ -285,130 +365,192 @@ CNAME(ffi_closure_SYSV):
         stp     x6, x7, [sp, #16 + 16*N_V_ARG_REG + 48]
 
         /* Load ffi_closure_inner arguments.  */
-        ldp     PTR_REG(0), PTR_REG(1), [x17, #FFI_TRAMPOLINE_CLOSURE_OFFSET]   /* load cif, fn */
-        ldr     PTR_REG(2), [x17, #FFI_TRAMPOLINE_CLOSURE_OFFSET+PTR_SIZE*2]    /* load user_data */
+    ldp    PTR_REG(0), PTR_REG(1), [x17, #FFI_TRAMPOLINE_CLOSURE_OFFSET]    /* load cif, fn */
+    ldr    PTR_REG(2), [x17, #FFI_TRAMPOLINE_CLOSURE_OFFSET+PTR_SIZE*2]    /* load user_data */
 #ifdef FFI_GO_CLOSURES
-.Ldo_closure:
+L(do_closure):
 #endif
-        add     x3, sp, #16                             /* load context */
-        add     x4, sp, #ffi_closure_SYSV_FS            /* load stack */
-        add     x5, sp, #16+CALL_CONTEXT_SIZE           /* load rvalue */
-        mov     x6, x8                                  /* load struct_rval */
+    add    x3, sp, #16                /* load context */
+    add    x4, sp, #ffi_closure_SYSV_FS        /* load stack */
+    add    x5, sp, #16+CALL_CONTEXT_SIZE        /* load rvalue */
+    mov    x6, x8                    /* load struct_rval */
         bl      CNAME(ffi_closure_SYSV_inner)
 
         /* Load the return value as directed.  */
-        adr     x1, 0f
-        and     w0, w0, #AARCH64_RET_MASK
-        add     x1, x1, x0, lsl #3
-        add     x3, sp, #16+CALL_CONTEXT_SIZE
-        br      x1
-
-        /* Note that each table entry is 2 insns, and thus 8 bytes.  */
-        .align  4
-0:      b       99f                     /* VOID */
-        nop
-1:      ldr     x0, [x3]                /* INT64 */
-        b       99f
-2:      ldp     x0, x1, [x3]            /* INT128 */
-        b       99f
-3:      brk     #1000                   /* UNUSED */
-        nop
-4:      brk     #1000                   /* UNUSED */
-        nop
-5:      brk     #1000                   /* UNUSED */
-        nop
-6:      brk     #1000                   /* UNUSED */
+    adr    x1, 0f
+    and    w0, w0, #AARCH64_RET_MASK
+    add    x1, x1, x0, lsl #4
+    add    x3, sp, #16+CALL_CONTEXT_SIZE
+    br    x1
+
+    /* Note that each table entry is 4 insns, and thus 16 bytes.  */
+    .align    4
+0:    BTI_J                /* VOID */
+    b    99f
+    nop
+    nop
+1:    BTI_J                /* INT64 */
+    ldr    x0, [x3]
+    b    99f
+    nop
+2:    BTI_J                /* INT128 */
+    ldp    x0, x1, [x3]
+    b    99f
+    nop
+3:    brk    #1000            /* UNUSED */
+    nop
+    nop
+    nop
+4:    brk    #1000            /* UNUSED */
+    nop
+    nop
+    nop
+5:    brk    #1000            /* UNUSED */
+    nop
+    nop
+    nop
+6:    brk    #1000            /* UNUSED */
+    nop
+    nop
+    nop
+7:    brk    #1000            /* UNUSED */
+    nop
+    nop
+    nop
+8:    BTI_J                /* S4 */
+    ldr    s3, [x3, #12]
+    nop
         nop
-7:      brk     #1000                   /* UNUSED */
+9:    BTI_J                /* S3 */
+    ldr    s2, [x3, #8]
+    nop
         nop
-8:      ldr     s3, [x3, #12]           /* S4 */
+10:    BTI_J                /* S2 */
+    ldp    s0, s1, [x3]
+    b    99f
+    nop
+11:    BTI_J                /* S1 */
+    ldr    s0, [x3]
+    b    99f
+    nop
+12:    BTI_J                /* D4 */
+    ldr    d3, [x3, #24]
+    nop
         nop
-9:      ldr     s2, [x3, #8]            /* S3 */
+13:    BTI_J                /* D3 */
+    ldr    d2, [x3, #16]
+    nop
         nop
-10:     ldp     s0, s1, [x3]            /* S2 */
-        b       99f
-11:     ldr     s0, [x3]                /* S1 */
-        b       99f
-12:     ldr     d3, [x3, #24]           /* D4 */
+14:    BTI_J                /* D2 */
+    ldp    d0, d1, [x3]
+    b    99f
+    nop
+15:    BTI_J                /* D1 */
+    ldr    d0, [x3]
+    b    99f
+    nop
+16:    BTI_J                /* Q4 */
+    ldr    q3, [x3, #48]
+    nop
         nop
-13:     ldr     d2, [x3, #16]           /* D3 */
+17:    BTI_J                /* Q3 */
+    ldr    q2, [x3, #32]
+    nop
         nop
-14:     ldp     d0, d1, [x3]            /* D2 */
-        b       99f
-15:     ldr     d0, [x3]                /* D1 */
-        b       99f
-16:     ldr     q3, [x3, #48]           /* Q4 */
+18:    BTI_J                /* Q2 */
+    ldp    q0, q1, [x3]
+    b    99f
+    nop
+19:    BTI_J                /* Q1 */
+    ldr    q0, [x3]
+    b    99f
+    nop
+20:    BTI_J                /* UINT8 */
+    ldrb    w0, [x3, #BE(7)]
+    b    99f
+    nop
+21:    brk    #1000            /* reserved */
+    nop
+    nop
+    nop
+22:    BTI_J                /* UINT16 */
+    ldrh    w0, [x3, #BE(6)]
+    b    99f
+    nop
+23:    brk    #1000            /* reserved */
+    nop
+    nop
+    nop
+24:    BTI_J                /* UINT32 */
+    ldr    w0, [x3, #BE(4)]
+    b    99f
+    nop
+25:    brk    #1000            /* reserved */
+    nop
+    nop
+    nop
+26:    BTI_J                /* SINT8 */
+    ldrsb    x0, [x3, #BE(7)]
+    b    99f
+    nop
+27:    brk    #1000            /* reserved */
+    nop
+    nop
+    nop
+28:    BTI_J                /* SINT16 */
+    ldrsh    x0, [x3, #BE(6)]
+    b    99f
+    nop
+29:    brk    #1000            /* reserved */
+    nop
+    nop
+    nop
+30:    BTI_J                /* SINT32 */
+    ldrsw    x0, [x3, #BE(4)]
+    nop
         nop
-17:     ldr     q2, [x3, #32]           /* Q3 */
-        nop
-18:     ldp     q0, q1, [x3]            /* Q2 */
-        b       99f
-19:     ldr     q0, [x3]                /* Q1 */
-        b       99f
-20:     ldrb    w0, [x3, #BE(7)]        /* UINT8 */
-        b       99f
-21:     brk     #1000                   /* reserved */
-        nop
-22:     ldrh    w0, [x3, #BE(6)]        /* UINT16 */
-        b       99f
-23:     brk     #1000                   /* reserved */
-        nop
-24:     ldr     w0, [x3, #BE(4)]        /* UINT32 */
-        b       99f
-25:     brk     #1000                   /* reserved */
-        nop
-26:     ldrsb   x0, [x3, #BE(7)]        /* SINT8 */
-        b       99f
-27:     brk     #1000                   /* reserved */
-        nop
-28:     ldrsh   x0, [x3, #BE(6)]        /* SINT16 */
-        b       99f
-29:     brk     #1000                   /* reserved */
-        nop
-30:     ldrsw   x0, [x3, #BE(4)]        /* SINT32 */
-        nop
-31:                                     /* reserved */
-99:     ldp     x29, x30, [sp], #ffi_closure_SYSV_FS
+31:                    /* reserved */
+99:    ldp     x29, x30, [sp], #ffi_closure_SYSV_FS
         cfi_adjust_cfa_offset (-ffi_closure_SYSV_FS)
         cfi_restore (x29)
         cfi_restore (x30)
         AUTH_LR_AND_RET
         cfi_endproc
 
-        .globl  CNAME(ffi_closure_SYSV)
+    .globl    CNAME(ffi_closure_SYSV)
         FFI_HIDDEN(CNAME(ffi_closure_SYSV))
 #ifdef __ELF__
-        .type   CNAME(ffi_closure_SYSV), #function
-        .size   CNAME(ffi_closure_SYSV), . - CNAME(ffi_closure_SYSV)
+    .type    CNAME(ffi_closure_SYSV), #function
+    .size    CNAME(ffi_closure_SYSV), . - CNAME(ffi_closure_SYSV)
 #endif
 
 #if defined(FFI_EXEC_STATIC_TRAMP)
         .align 4
 CNAME(ffi_closure_SYSV_V_alt):
         /* See the comments above trampoline_code_table. */
-        ldr     x17, [sp, #8]                   /* Load closure in x17 */
-        add     sp, sp, #16                     /* Restore the stack */
-        b       CNAME(ffi_closure_SYSV_V)
+    ldr    x17, [sp, #8]            /* Load closure in x17 */
+    add    sp, sp, #16            /* Restore the stack */
+    b    CNAME(ffi_closure_SYSV_V)
 
-        .globl  CNAME(ffi_closure_SYSV_V_alt)
+    .globl    CNAME(ffi_closure_SYSV_V_alt)
         FFI_HIDDEN(CNAME(ffi_closure_SYSV_V_alt))
 #ifdef __ELF__
-        .type   CNAME(ffi_closure_SYSV_V_alt), #function
-        .size   CNAME(ffi_closure_SYSV_V_alt), . - CNAME(ffi_closure_SYSV_V_alt)
+    .type    CNAME(ffi_closure_SYSV_V_alt), #function
+    .size    CNAME(ffi_closure_SYSV_V_alt), . - CNAME(ffi_closure_SYSV_V_alt)
 #endif
 
         .align 4
 CNAME(ffi_closure_SYSV_alt):
         /* See the comments above trampoline_code_table. */
-        ldr     x17, [sp, #8]                   /* Load closure in x17 */
-        add     sp, sp, #16                     /* Restore the stack */
-        b       CNAME(ffi_closure_SYSV)
+    ldr    x17, [sp, #8]            /* Load closure in x17 */
+    add    sp, sp, #16            /* Restore the stack */
+    b    CNAME(ffi_closure_SYSV)
 
-        .globl  CNAME(ffi_closure_SYSV_alt)
+    .globl    CNAME(ffi_closure_SYSV_alt)
         FFI_HIDDEN(CNAME(ffi_closure_SYSV_alt))
 #ifdef __ELF__
-        .type   CNAME(ffi_closure_SYSV_alt), #function
-        .size   CNAME(ffi_closure_SYSV_alt), . - CNAME(ffi_closure_SYSV_alt)
+    .type    CNAME(ffi_closure_SYSV_alt), #function
+    .size    CNAME(ffi_closure_SYSV_alt), . - CNAME(ffi_closure_SYSV_alt)
 #endif
 
 /*
@@ -430,26 +572,26 @@ CNAME(ffi_closure_SYSV_alt):
  * - load the data address in a register
  * - restore the stack pointer to what it was when the trampoline was invoked.
  */
-        .align  AARCH64_TRAMP_MAP_SHIFT
+    .align    AARCH64_TRAMP_MAP_SHIFT
 CNAME(trampoline_code_table):
-        .rept   AARCH64_TRAMP_MAP_SIZE / AARCH64_TRAMP_SIZE
-        sub     sp, sp, #16             /* Make space on the stack */
-        str     x17, [sp]               /* Save x17 on stack */
-        adr     x17, #16376             /* Get data address */
-        ldr     x17, [x17]              /* Copy data into x17 */
-        str     x17, [sp, #8]           /* Save data on stack */
-        adr     x17, #16372             /* Get code address */
-        ldr     x17, [x17]              /* Load code address into x17 */
-        br      x17                     /* Jump to code */
+    .rept    AARCH64_TRAMP_MAP_SIZE / AARCH64_TRAMP_SIZE
+    sub    sp, sp, #16        /* Make space on the stack */
+    str    x17, [sp]        /* Save x17 on stack */
+    adr    x17, #16376        /* Get data address */
+    ldr    x17, [x17]        /* Copy data into x17 */
+    str    x17, [sp, #8]        /* Save data on stack */
+    adr    x17, #16372        /* Get code address */
+    ldr    x17, [x17]        /* Load code address into x17 */
+    br    x17            /* Jump to code */
         .endr
 
         .globl CNAME(trampoline_code_table)
         FFI_HIDDEN(CNAME(trampoline_code_table))
 #ifdef __ELF__
-        .type   CNAME(trampoline_code_table), #function
-        .size   CNAME(trampoline_code_table), . - CNAME(trampoline_code_table)
+    .type    CNAME(trampoline_code_table), #function
+    .size    CNAME(trampoline_code_table), . - CNAME(trampoline_code_table)
 #endif
-        .align  AARCH64_TRAMP_MAP_SHIFT
+    .align    AARCH64_TRAMP_MAP_SHIFT
 #endif /* FFI_EXEC_STATIC_TRAMP */
 
 #if FFI_EXEC_TRAMPOLINE_TABLE
@@ -462,14 +604,14 @@ CNAME(ffi_closure_trampoline_table_page):
     adr x16, -PAGE_MAX_SIZE
     ldp x17, x16, [x16]
     br x16
-        nop           /* each entry in the trampoline config page is 2*sizeof(void*) so the trampoline itself cannot be smaller than 16 bytes */
+    nop        /* each entry in the trampoline config page is 2*sizeof(void*) so the trampoline itself cannot be smaller than 16 bytes */
     .endr
 
     .globl CNAME(ffi_closure_trampoline_table_page)
     FFI_HIDDEN(CNAME(ffi_closure_trampoline_table_page))
     #ifdef __ELF__
-        .type   CNAME(ffi_closure_trampoline_table_page), #function
-        .size   CNAME(ffi_closure_trampoline_table_page), . - CNAME(ffi_closure_trampoline_table_page)
+        .type    CNAME(ffi_closure_trampoline_table_page), #function
+        .size    CNAME(ffi_closure_trampoline_table_page), . - CNAME(ffi_closure_trampoline_table_page)
     #endif
 #endif
 
@@ -479,6 +621,7 @@ CNAME(ffi_closure_trampoline_table_page):
         .align 4
 CNAME(ffi_go_closure_SYSV_V):
         cfi_startproc
+    BTI_C
         stp     x29, x30, [sp, #-ffi_closure_SYSV_FS]!
         cfi_adjust_cfa_offset (ffi_closure_SYSV_FS)
         cfi_rel_offset (x29, 0)
@@ -489,19 +632,20 @@ CNAME(ffi_go_closure_SYSV_V):
         stp     q2, q3, [sp, #16 + 32]
         stp     q4, q5, [sp, #16 + 64]
         stp     q6, q7, [sp, #16 + 96]
-        b       0f
+    b    0f
         cfi_endproc
 
-        .globl  CNAME(ffi_go_closure_SYSV_V)
+    .globl    CNAME(ffi_go_closure_SYSV_V)
         FFI_HIDDEN(CNAME(ffi_go_closure_SYSV_V))
 #ifdef __ELF__
-        .type   CNAME(ffi_go_closure_SYSV_V), #function
-        .size   CNAME(ffi_go_closure_SYSV_V), . - CNAME(ffi_go_closure_SYSV_V)
+    .type    CNAME(ffi_go_closure_SYSV_V), #function
+    .size    CNAME(ffi_go_closure_SYSV_V), . - CNAME(ffi_go_closure_SYSV_V)
 #endif
 
-        .align  4
+    .align    4
         cfi_startproc
 CNAME(ffi_go_closure_SYSV):
+    BTI_C
         stp     x29, x30, [sp, #-ffi_closure_SYSV_FS]!
         cfi_adjust_cfa_offset (ffi_closure_SYSV_FS)
         cfi_rel_offset (x29, 0)
@@ -516,16 +660,16 @@ CNAME(ffi_go_closure_SYSV):
         stp     x6, x7, [sp, #16 + 16*N_V_ARG_REG + 48]
 
         /* Load ffi_closure_inner arguments.  */
-        ldp     PTR_REG(0), PTR_REG(1), [x18, #PTR_SIZE]/* load cif, fn */
-        mov     x2, x18                                 /* load user_data */
-        b       .Ldo_closure
+    ldp    PTR_REG(0), PTR_REG(1), [x18, #PTR_SIZE]/* load cif, fn */
+    mov    x2, x18                    /* load user_data */
+    b    L(do_closure)
         cfi_endproc
 
-        .globl  CNAME(ffi_go_closure_SYSV)
+    .globl    CNAME(ffi_go_closure_SYSV)
         FFI_HIDDEN(CNAME(ffi_go_closure_SYSV))
 #ifdef __ELF__
-        .type   CNAME(ffi_go_closure_SYSV), #function
-        .size   CNAME(ffi_go_closure_SYSV), . - CNAME(ffi_go_closure_SYSV)
+    .type    CNAME(ffi_go_closure_SYSV), #function
+    .size    CNAME(ffi_go_closure_SYSV), . - CNAME(ffi_go_closure_SYSV)
 #endif
 #endif /* FFI_GO_CLOSURES */
 #endif /* FFI_CLOSURES */
@@ -533,5 +677,17 @@ CNAME(ffi_go_closure_SYSV):
 
 #if defined __ELF__ && defined __linux__
         .section .note.GNU-stack,"",%progbits
+
+    .pushsection .note.gnu.property, "a";
+    .balign 8;
+    .long 4;
+    .long 0x10;
+    .long 0x5;
+    .asciz "GNU";
+    .long 0xc0000000; /* GNU_PROPERTY_AARCH64_FEATURE_1_AND */
+    .long 4;
+    .long GNU_PROPERTY_AARCH64_BTI;
+    .long 0;
+    .popsection;
 #endif
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/closures.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/closures.c
index 4ff6549f708..92719bd32c0 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/closures.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/closures.c
@@ -31,6 +31,8 @@
 #define _GNU_SOURCE 1
 #endif
 
+#ifndef __EMSCRIPTEN__
+
 #include <fficonfig.h>
 #include <ffi.h>
 #include <ffi_common.h>
@@ -597,7 +599,7 @@ open_temp_exec_file_memfd (const char *name)
 
 /* Open a temporary file name, and immediately unlink it.  */
 static int
-open_temp_exec_file_name (char *name, int flags)
+open_temp_exec_file_name (char *name, int flags MAYBE_UNUSED)
 {
   int fd;
 
@@ -793,9 +795,9 @@ open_temp_exec_file (void)
    Failure to allocate the space will cause SIGBUS to be thrown when
    the mapping is subsequently written to.  */
 static int
-allocate_space (int fd, off_t offset, off_t len)
+allocate_space (int fd, off_t len)
 {
-  static size_t page_size;
+  static long page_size;
 
   /* Obtain system page size. */
   if (!page_size)
@@ -836,7 +838,7 @@ dlmmap_locked (void *start, size_t length, int prot, int flags, off_t offset)
 
   offset = execsize;
 
-  if (allocate_space (execfd, offset, length))
+  if (allocate_space (execfd, length))
     return MFAIL;
 
   flags &= ~(MAP_PRIVATE | MAP_ANONYMOUS);
@@ -993,7 +995,7 @@ ffi_closure_alloc (size_t size, void **code)
   if (!code)
     return NULL;
 
-  ptr = FFI_CLOSURE_PTR (dlmalloc (size));
+  ptr = dlmalloc (size);
 
   if (ptr)
     {
@@ -1003,17 +1005,17 @@ ffi_closure_alloc (size_t size, void **code)
         return NULL;
 #endif // GSTREAMER_LITE
 
-      *code = add_segment_exec_offset (ptr, seg);
+      *code = FFI_FN (add_segment_exec_offset (ptr, seg));
       if (!ffi_tramp_is_supported ())
         return ptr;
 
       ftramp = ffi_tramp_alloc (0);
       if (ftramp == NULL)
       {
-        dlfree (FFI_RESTORE_PTR (ptr));
+        dlfree (ptr);
         return NULL;
     }
-      *code = ffi_tramp_get_addr (ftramp);
+      *code = FFI_FN (ffi_tramp_get_addr (ftramp));
       ((ffi_closure *) ptr)->ftramp = ftramp;
     }
 
@@ -1054,7 +1056,7 @@ ffi_closure_free (void *ptr)
   if (ffi_tramp_is_supported ())
     ffi_tramp_free (((ffi_closure *) ptr)->ftramp);
 
-  dlfree (FFI_RESTORE_PTR (ptr));
+  dlfree (ptr);
 }
 
 int
@@ -1074,16 +1076,20 @@ ffi_tramp_is_present (void *ptr)
 void *
 ffi_closure_alloc (size_t size, void **code)
 {
+  void *c;
+
   if (!code)
     return NULL;
 
-  return *code = FFI_CLOSURE_PTR (malloc (size));
+  c = malloc (size);
+  *code = FFI_FN (c);
+  return c;
 }
 
 void
 ffi_closure_free (void *ptr)
 {
-  free (FFI_RESTORE_PTR (ptr));
+  free (ptr);
 }
 
 void *
@@ -1102,3 +1108,4 @@ ffi_tramp_is_present (__attribute__((unused)) void *ptr)
 #endif /* FFI_CLOSURES */
 
 #endif /* NetBSD with PROT_MPROTECT */
+#endif /* __EMSCRIPTEN__ */
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/debug.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/debug.c
index d89f9f0ed42..f6eb5632609 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/debug.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/debug.c
@@ -38,7 +38,7 @@ void ffi_stop_here(void)
 
 /* This function should only be called via the FFI_ASSERT() macro */
 
-void ffi_assert(char *expr, char *file, int line)
+NORETURN void ffi_assert(const char *expr, const char *file, int line)
 {
   fprintf(stderr, "ASSERTION FAILURE: %s at %s:%d\n", expr, file, line);
   ffi_stop_here();
@@ -47,7 +47,7 @@ void ffi_assert(char *expr, char *file, int line)
 
 /* Perform a sanity check on an ffi_type structure */
 
-void ffi_type_test(ffi_type *a, char *file, int line)
+void ffi_type_test(ffi_type *a, const char *file, int line)
 {
   FFI_ASSERT_AT(a != NULL, file, line);
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/dlmalloc.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/dlmalloc.c
index 20af64c4a05..6b7f9b5aa34 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/dlmalloc.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/dlmalloc.c
@@ -4452,7 +4452,7 @@ struct mallinfo dlmallinfo(void) {
 }
 #endif /* NO_MALLINFO */
 
-void dlmalloc_stats() {
+void dlmalloc_stats(void) {
   internal_malloc_stats(gm);
 }
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/prep_cif.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/prep_cif.c
index b9914936e2e..194c0b59b0f 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/prep_cif.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/prep_cif.c
@@ -1,7 +1,7 @@
 /* -----------------------------------------------------------------------
    prep_cif.c - Copyright (c) 2011, 2012, 2021  Anthony Green
                 Copyright (c) 1996, 1998, 2007  Red Hat, Inc.
-                Copyright (c) 2022, 2023, Oracle and/or its affiliates.
+                Copyright (c) 2022 Oracle and/or its affiliates.
 
    Permission is hereby granted, free of charge, to any person obtaining
    a copy of this software and associated documentation files (the
@@ -234,7 +234,7 @@ ffi_status ffi_prep_cif_var(ffi_cif *cif,
 {
   ffi_status rc;
   size_t int_size = ffi_type_sint.size;
-  int i;
+  unsigned int i;
 
   rc = ffi_prep_cif_core(cif, abi, 1, nfixedargs, ntotalargs, rtype, atypes);
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/types.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/types.c
index cf2170b83d4..0b11be5e0ec 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/types.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/types.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------
-   types.c - Copyright (c) 1996, 1998  Red Hat, Inc.
+   types.c - Copyright (c) 1996, 1998, 2024  Red Hat, Inc.
 
    Predefined ffi_types needed by libffi.
 
@@ -95,14 +95,12 @@ FFI_TYPEDEF(double, double, FFI_TYPE_DOUBLE, const);
 #  error FFI_TYPE_LONGDOUBLE out of date
 # endif
 const ffi_type ffi_type_longdouble = { 16, 16, 4, NULL };
-#elif FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE
+#else
 FFI_TYPEDEF(longdouble, long double, FFI_TYPE_LONGDOUBLE, FFI_LDBL_CONST);
 #endif
 
 #ifdef FFI_TARGET_HAS_COMPLEX_TYPE
 FFI_COMPLEX_TYPEDEF(float, float, const);
 FFI_COMPLEX_TYPEDEF(double, double, const);
-#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE
 FFI_COMPLEX_TYPEDEF(longdouble, long double, FFI_LDBL_CONST);
 #endif
-#endif
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/x86/ffiw64.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/x86/ffiw64.c
index 17c314734a6..2d7c80b527f 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/x86/ffiw64.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/x86/ffiw64.c
@@ -227,7 +227,7 @@ EFI64(ffi_prep_closure_loc)(ffi_closure* closure,
               ffi_cif* cif,
               void (*fun)(ffi_cif*, void*, void**, void*),
               void *user_data,
-              void *codeloc)
+              void *codeloc MAYBE_UNUSED)
 {
   static const unsigned char trampoline[FFI_TRAMPOLINE_SIZE - 8] = {
     /* endbr64 */
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/x86/sysv.S b/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/x86/sysv.S
index f7f6c244f53..f23cdd623f9 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/x86/sysv.S
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/x86/sysv.S
@@ -888,14 +888,31 @@ ENDF(C(ffi_closure_raw_THISCALL))
 #endif /* !FFI_NO_RAW_API */
 
 #ifdef X86_DARWIN
-# define COMDAT(X)                                                      \
-        .section __TEXT,__text,coalesced,pure_instructions;             \
+/* The linker in use on earlier Darwin needs weak definitions to be
+   placed in a coalesced section.  That section should not be called
+   __TEXT,__text since that would be re-defining the attributes of the
+   .text section (which is an error for earlier tools). Here we use
+   '__textcoal_nt' which is what GCC emits for this.
+   Later linker versions are happy to use a normal section and, after
+   Darwin12 / OSX 10.8, the tools warn that using coalesced sections
+   for this is deprecated so we must switch to avoid build fails and/or
+   deprecation warnings.  */
+# if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) &&          \
+   __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1080
+#  define COMDAT(X)                                                     \
+        .section __TEXT,__textcoal_nt,coalesced,pure_instructions;      \
         .weak_definition X;                                             \
         FFI_HIDDEN(X)
+# else
+#  define COMDAT(X)                                                     \
+        .text;                                                          \
+        .weak_definition X;                                             \
+        FFI_HIDDEN(X)
+# endif
 #elif defined __ELF__ && !(defined(__sun__) && defined(__svr4__))
 # define COMDAT(X)                                                      \
         .section .text.X,"axG",@progbits,X,comdat;                      \
-        .globl  X;                                                      \
+        .globl	X;                                                      \
         FFI_HIDDEN(X)
 #else
 # define COMDAT(X)
@@ -916,7 +933,37 @@ ENDF(C(__x86.get_pc_thunk.dx))
 #endif /* DARWIN || HIDDEN */
 #endif /* __PIC__ */
 
-/* Sadly, OSX cctools-as doesn't understand .cfi directives at all.  */
+/* Sadly, OSX cctools-as does not understand .cfi directives at all so
+   we build an eh frame by hand.  */
+
+#ifdef __APPLE__
+/* The cctools assembler will try to make a difference between two local
+   symbols into a relocation against, which will not work in the eh (produces
+   link-time fails).
+   To avoid this, we compute the symbol difference with a .set directive and
+   then substitute this value.  */
+# define LEN(N, P)      .set Llen$N$P,L(N)-L(P); .long Llen$N$P
+/* Note, this assume DW_CFA_advance_loc1 fits into 7 bits.  */
+# define ADV(N, P)      .set Ladv$N$P,L(N)-L(P); .byte 2, Ladv$N$P
+/* For historical reasons, the EH reg numbers for SP and FP are swapped from
+   the DWARF ones for 32b Darwin.  */
+# define SP 5
+# define FP 4
+# define ENC 0x10
+#else
+# define LEN(N, P)      .long L(N)-L(P)
+/* Assume DW_CFA_advance_loc1 fits.  */
+# define ADV(N, P)      .byte 2, L(N)-L(P)
+# define SP 4
+# define FP 5
+# define ENC 0x1b
+#endif
+
+#ifdef HAVE_AS_X86_PCREL
+# define PCREL(X)	X-.
+#else
+# define PCREL(X)	X@rel
+#endif
 
 #ifdef __APPLE__
 .section __TEXT,__eh_frame,coalesced,no_toc+strip_static_syms+live_support
@@ -928,17 +975,11 @@ EHFrame0:
 #else
 .section .eh_frame,EH_FRAME_FLAGS,@progbits
 #endif
-
-#ifdef HAVE_AS_X86_PCREL
-# define PCREL(X)       X - .
-#else
-# define PCREL(X)       X@rel
+#ifndef __APPLE__
+/* EH sections are already suitably aligned on Darwin.  */
+        .balign 4
 #endif
 
-/* Simplify advancing between labels.  Assume DW_CFA_advance_loc1 fits.  */
-#define ADV(N, P)       .byte 2, L(N)-L(P)
-
-        .balign 4
 L(CIE):
         .set    L(set0),L(ECIE)-L(SCIE)
         .long   L(set0)                 /* CIE Length */
@@ -950,8 +991,8 @@ L(SCIE):
         .byte   0x7c                    /* CIE Data Alignment Factor */
         .byte   0x8                     /* CIE RA Column */
         .byte   1                       /* Augmentation size */
-        .byte   0x1b                    /* FDE Encoding (pcrel sdata4) */
-        .byte   0xc, 4, 4               /* DW_CFA_def_cfa, %esp offset 4 */
+        .byte   ENC                     /* FDE Encoding (pcrel abs/4byte) */
+        .byte   0xc, SP, 4              /* DW_CFA_def_cfa, %esp offset 4 */
         .byte   0x80+8, 1               /* DW_CFA_offset, %eip offset 1*-4 */
         .balign 4
 L(ECIE):
@@ -959,20 +1000,20 @@ L(ECIE):
         .set    L(set1),L(EFDE1)-L(SFDE1)
         .long   L(set1)                 /* FDE Length */
 L(SFDE1):
-        .long   L(SFDE1)-L(CIE)         /* FDE CIE offset */
+        LEN(SFDE1, CIE)                 /* FDE CIE offset */
         .long   PCREL(L(UW0))           /* Initial location */
-        .long   L(UW5)-L(UW0)           /* Address range */
+        LEN(UW5, UW0)                   /* Address range */
         .byte   0                       /* Augmentation size */
         ADV(UW1, UW0)
-        .byte   0xc, 5, 8               /* DW_CFA_def_cfa, %ebp 8 */
-        .byte   0x80+5, 2               /* DW_CFA_offset, %ebp 2*-4 */
+        .byte   0xc, FP, 8              /* DW_CFA_def_cfa, %ebp 8 */
+        .byte   0x80+FP, 2              /* DW_CFA_offset, %ebp 2*-4 */
         ADV(UW2, UW1)
         .byte   0x80+3, 0               /* DW_CFA_offset, %ebx 0*-4 */
         ADV(UW3, UW2)
         .byte   0xa                     /* DW_CFA_remember_state */
-        .byte   0xc, 4, 4               /* DW_CFA_def_cfa, %esp 4 */
+        .byte   0xc, SP, 4              /* DW_CFA_def_cfa, %esp 4 */
         .byte   0xc0+3                  /* DW_CFA_restore, %ebx */
-        .byte   0xc0+5                  /* DW_CFA_restore, %ebp */
+        .byte   0xc0+FP                 /* DW_CFA_restore, %ebp */
         ADV(UW4, UW3)
         .byte   0xb                     /* DW_CFA_restore_state */
         .balign 4
@@ -981,9 +1022,9 @@ L(EFDE1):
         .set    L(set2),L(EFDE2)-L(SFDE2)
         .long   L(set2)                 /* FDE Length */
 L(SFDE2):
-        .long   L(SFDE2)-L(CIE)         /* FDE CIE offset */
+        LEN(SFDE2, CIE)                 /* FDE CIE offset */
         .long   PCREL(L(UW6))           /* Initial location */
-        .long   L(UW8)-L(UW6)           /* Address range */
+        LEN(UW8,UW6)                    /* Address range */
         .byte   0                       /* Augmentation size */
         ADV(UW7, UW6)
         .byte   0xe, closure_FS+4       /* DW_CFA_def_cfa_offset */
@@ -993,9 +1034,9 @@ L(EFDE2):
         .set    L(set3),L(EFDE3)-L(SFDE3)
         .long   L(set3)                 /* FDE Length */
 L(SFDE3):
-        .long   L(SFDE3)-L(CIE)         /* FDE CIE offset */
+        LEN(SFDE3, CIE)                 /* FDE CIE offset */
         .long   PCREL(L(UW9))           /* Initial location */
-        .long   L(UW11)-L(UW9)          /* Address range */
+        LEN(UW11, UW9)                  /* Address range */
         .byte   0                       /* Augmentation size */
         ADV(UW10, UW9)
         .byte   0xe, closure_FS+4       /* DW_CFA_def_cfa_offset */
@@ -1005,9 +1046,9 @@ L(EFDE3):
         .set    L(set4),L(EFDE4)-L(SFDE4)
         .long   L(set4)                 /* FDE Length */
 L(SFDE4):
-        .long   L(SFDE4)-L(CIE)         /* FDE CIE offset */
+        LEN(SFDE4, CIE)                 /* FDE CIE offset */
         .long   PCREL(L(UW12))          /* Initial location */
-        .long   L(UW20)-L(UW12)         /* Address range */
+        LEN(UW20, UW12)                 /* Address range */
         .byte   0                       /* Augmentation size */
         ADV(UW13, UW12)
         .byte   0xe, closure_FS+4       /* DW_CFA_def_cfa_offset */
@@ -1033,9 +1074,9 @@ L(EFDE4):
         .set    L(set5),L(EFDE5)-L(SFDE5)
         .long   L(set5)                 /* FDE Length */
 L(SFDE5):
-        .long   L(SFDE5)-L(CIE)         /* FDE CIE offset */
+        LEN(SFDE5, CIE)                 /* FDE CIE offset */
         .long   PCREL(L(UW21))          /* Initial location */
-        .long   L(UW23)-L(UW21)         /* Address range */
+        LEN(UW23, UW21)                 /* Address range */
         .byte   0                       /* Augmentation size */
         ADV(UW22, UW21)
         .byte   0xe, closure_FS+4       /* DW_CFA_def_cfa_offset */
@@ -1045,9 +1086,9 @@ L(EFDE5):
         .set    L(set6),L(EFDE6)-L(SFDE6)
         .long   L(set6)                 /* FDE Length */
 L(SFDE6):
-        .long   L(SFDE6)-L(CIE)         /* FDE CIE offset */
+        LEN(SFDE6, CIE)                 /* FDE CIE offset */
         .long   PCREL(L(UW24))          /* Initial location */
-        .long   L(UW26)-L(UW24)         /* Address range */
+        LEN(UW26, UW24)                 /* Address range */
         .byte   0                       /* Augmentation size */
         .byte   0xe, 8                  /* DW_CFA_def_cfa_offset */
         .byte   0x80+8, 2               /* DW_CFA_offset %eip, 2*-4 */
@@ -1059,9 +1100,9 @@ L(EFDE6):
         .set    L(set7),L(EFDE7)-L(SFDE7)
         .long   L(set7)                 /* FDE Length */
 L(SFDE7):
-        .long   L(SFDE7)-L(CIE)         /* FDE CIE offset */
+        LEN(SFDE7, CIE)                 /* FDE CIE offset */
         .long   PCREL(L(UW27))          /* Initial location */
-        .long   L(UW31)-L(UW27)         /* Address range */
+        LEN(UW31, UW27)                 /* Address range */
         .byte   0                       /* Augmentation size */
         ADV(UW28, UW27)
         .byte   0xe, closure_FS+4       /* DW_CFA_def_cfa_offset */
@@ -1078,9 +1119,9 @@ L(EFDE7):
         .set    L(set8),L(EFDE8)-L(SFDE8)
         .long   L(set8)                 /* FDE Length */
 L(SFDE8):
-        .long   L(SFDE8)-L(CIE)         /* FDE CIE offset */
+        LEN(SFDE8, CIE)                 /* FDE CIE offset */
         .long   PCREL(L(UW32))          /* Initial location */
-        .long   L(UW40)-L(UW32)         /* Address range */
+        LEN(UW40, UW32)                 /* Address range */
         .byte   0                       /* Augmentation size */
         ADV(UW33, UW32)
         .byte   0xe, raw_closure_S_FS+4 /* DW_CFA_def_cfa_offset */
@@ -1102,9 +1143,9 @@ L(EFDE8):
         .set    L(set9),L(EFDE9)-L(SFDE9)
         .long   L(set9)                 /* FDE Length */
 L(SFDE9):
-        .long   L(SFDE9)-L(CIE)         /* FDE CIE offset */
+        LEN(SFDE9, CIE)                 /* FDE CIE offset */
         .long   PCREL(L(UW41))          /* Initial location */
-        .long   L(UW52)-L(UW41)         /* Address range */
+        LEN(UW52, UW41)                 /* Address range */
         .byte   0                       /* Augmentation size */
         ADV(UW42, UW41)
         .byte   0xe, 0                  /* DW_CFA_def_cfa_offset */
@@ -1141,8 +1182,12 @@ L(EFDE9):
 @feat.00 = 1
 #endif
 
-#ifdef __APPLE__
+#if defined(__APPLE__)
     .subsections_via_symbols
+# if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) &&          \
+   __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1070 && __clang__
+/* compact unwind is not used with GCC at present, was not present before 10.6
+   but has some bugs there, so do not emit until 10.7.  */
     .section __LD,__compact_unwind,regular,debug
 
     /* compact unwind for ffi_call_i386 */
@@ -1216,6 +1261,7 @@ L(EFDE9):
     .long    0x04000000 /* use dwarf unwind info */
     .long    0
     .long    0
+#endif /* use compact unwind */
 #endif /* __APPLE__ */
 
 #endif /* ifndef _MSC_VER */
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/x86/sysv_intel.S b/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/x86/sysv_intel.S
index f39cc46ce14..d8956ccddaf 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/x86/sysv_intel.S
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/x86/sysv_intel.S
@@ -102,7 +102,7 @@ L(UW1):
         mov         ecx, [12+ebp]               /* load return type code */
         mov     [ebp+8], ebx            /* preserve %ebx */
 L(UW2):
-        // cfi_rel_offset(%ebx, 8)
+        /* cfi_rel_offset(%ebx, 8) */
 
         and     ecx, X86_RET_TYPE_MASK
         lea     ebx, [L(store_table) + ecx * 8]
@@ -254,7 +254,7 @@ L(UW7):
         mov     [esp+closure_CF+36], eax        /* closure is user_data */
         jmp     L(do_closure_i386)
 L(UW8):
-        // cfi_endproc
+	/* cfi_endproc */
 ENDF(ffi_go_closure_EAX)
 
 ALIGN 16
diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/win/glib-lite/Makefile.ffi b/modules/javafx.media/src/main/native/gstreamer/projects/win/glib-lite/Makefile.ffi
index 43bd8de4d0c..a246ffc2b59 100644
--- a/modules/javafx.media/src/main/native/gstreamer/projects/win/glib-lite/Makefile.ffi
+++ b/modules/javafx.media/src/main/native/gstreamer/projects/win/glib-lite/Makefile.ffi
@@ -23,7 +23,7 @@ COMPILER_FLAGS = -nologo -W3 -WX- -EHsc -GS -fp:precise -Gm- \
 INCLUDES = -I$(SRCBASE_DIR)/include \
            -I$(SRCBASE_DIR)/src/x86
 
-CFLAGS = -DFFI_BUILDING \
+CFLAGS = -DFFI_STATIC_BUILD \
          -DGSTREAMER_LITE \
 	 $(INCLUDES) \
 	 $(COMPILER_FLAGS)
@@ -69,7 +69,7 @@ OBJECTS = $(patsubst %.c,$(OBJBASE_DIR)/%.obj,$(C_SOURCES)) \
 default: $(TARGET)
 
 $(TARGET): $(OBJECTS)
-	$(AR) $(LIBFLAGS) $(foreach object,$(OBJECTS),$(shell cygpath -ma $(object))) 
+	$(AR) $(LIBFLAGS) $(foreach object,$(OBJECTS),$(shell cygpath -ma $(object)))
 
 $(OBJECTS): | $(DEP_DIRS)
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/win/glib-lite/Makefile.glib b/modules/javafx.media/src/main/native/gstreamer/projects/win/glib-lite/Makefile.glib
index bf6965c5aec..9acf552341e 100644
--- a/modules/javafx.media/src/main/native/gstreamer/projects/win/glib-lite/Makefile.glib
+++ b/modules/javafx.media/src/main/native/gstreamer/projects/win/glib-lite/Makefile.glib
@@ -134,7 +134,7 @@ CFLAGS =   -DWIN32 \
            -DLIBDIR \
            -DNVALGRIND \
            -DG_OS_WIN32 \
-           -DFFI_BUILDING \
+           -DFFI_STATIC_BUILD \
            -DG_DISABLE_DEPRECATED \
            $(INCLUDES) \
            $(COMPILER_FLAGS)
diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/win/glib-lite/Makefile.gmodule b/modules/javafx.media/src/main/native/gstreamer/projects/win/glib-lite/Makefile.gmodule
index 11f6cac36f5..4c8c8b76072 100644
--- a/modules/javafx.media/src/main/native/gstreamer/projects/win/glib-lite/Makefile.gmodule
+++ b/modules/javafx.media/src/main/native/gstreamer/projects/win/glib-lite/Makefile.gmodule
@@ -30,7 +30,7 @@ CFLAGS =   -DWIN32 \
            -DG_LOG_DOMAIN=\"GModule\" \
            -D_MBCS \
            -DG_OS_WIN32 \
-           -DFFI_BUILDING \
+           -DFFI_STATIC_BUILD \
            -DG_DISABLE_DEPRECATED \
            $(INCLUDES) \
            $(COMPILER_FLAGS)
diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/win/glib-lite/Makefile.gobject b/modules/javafx.media/src/main/native/gstreamer/projects/win/glib-lite/Makefile.gobject
index f8d86b55f7d..55cff001c35 100644
--- a/modules/javafx.media/src/main/native/gstreamer/projects/win/glib-lite/Makefile.gobject
+++ b/modules/javafx.media/src/main/native/gstreamer/projects/win/glib-lite/Makefile.gobject
@@ -52,7 +52,7 @@ CFLAGS =   -DWIN32 \
            -DG_LOG_DOMAIN=\"Glib-GObject\" \
            -D_MBCS \
            -DG_OS_WIN32 \
-           -DFFI_BUILDING \
+           -DFFI_STATIC_BUILD \
            -DG_DISABLE_DEPRECATED \
            $(INCLUDES) \
            $(COMPILER_FLAGS)
diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/win/glib-lite/Makefile.gthread b/modules/javafx.media/src/main/native/gstreamer/projects/win/glib-lite/Makefile.gthread
index 9a5837f5a98..27544f0ec4b 100644
--- a/modules/javafx.media/src/main/native/gstreamer/projects/win/glib-lite/Makefile.gthread
+++ b/modules/javafx.media/src/main/native/gstreamer/projects/win/glib-lite/Makefile.gthread
@@ -30,7 +30,7 @@ CFLAGS =   -DWIN32 \
            -DG_LOG_DOMAIN=\"GThread\" \
            -D_MBCS \
            -DG_OS_WIN32 \
-           -DFFI_BUILDING \
+           -DFFI_STATIC_BUILD \
            -DG_DISABLE_DEPRECATED \
            $(INCLUDES) \
            $(COMPILER_FLAGS)

From 67ac9d7804cd8d572bcc3e06e2f640d8a744d3bb Mon Sep 17 00:00:00 2001
From: Hima Bindu Meda <hmeda@openjdk.org>
Date: Wed, 21 Aug 2024 06:38:19 +0000
Subject: [PATCH 20/75] 8338306: WebView Drag and Drop fails with WebKit 619.1

Reviewed-by: kcr, sykora
---
 .../Source/WebKitLegacy/java/WebCoreSupport/WebPage.cpp       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/WebCoreSupport/WebPage.cpp b/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/WebCoreSupport/WebPage.cpp
index 0b2f3c4ec95..4d49a497161 100644
--- a/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/WebCoreSupport/WebPage.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/WebCoreSupport/WebPage.cpp
@@ -2250,8 +2250,10 @@ JNIEXPORT jint JNICALL Java_com_sun_webkit_WebPage_twkProcessDrag
         case com_sun_webkit_WebPage_DND_DST_EXIT:
             dc.dragExited(*localMainFrame,WTFMove(dragData));
             return 0;
+        case com_sun_webkit_WebPage_DND_DST_ENTER:
         case com_sun_webkit_WebPage_DND_DST_OVER:
-
+        case com_sun_webkit_WebPage_DND_DST_CHANGE:
+            return dragOperationToDragCursor(std::get<std::optional<WebCore::DragOperation>>(dc.dragEnteredOrUpdated(*localMainFrame, WTFMove(dragData))));
         case com_sun_webkit_WebPage_DND_DST_DROP:
             {
                 int ret = dc.performDragOperation(WTFMove(dragData)) ? 1 : 0;

From b8987310dfff28b7a1a3862868c2d2210063985d Mon Sep 17 00:00:00 2001
From: Ambarish Rapte <arapte@openjdk.org>
Date: Wed, 21 Aug 2024 09:29:09 +0000
Subject: [PATCH 21/75] 8336632: Update Gradle to 8.9 8336633: Update boot JDK
 to 22.0.2

Reviewed-by: kcr, sykora
---
 .github/workflows/submit.yml             |  24 +++++++++++------------
 build.properties                         |   6 +++---
 gradle/UPDATING.txt                      |   2 +-
 gradle/wrapper/gradle-wrapper.jar        | Bin 43462 -> 43504 bytes
 gradle/wrapper/gradle-wrapper.properties |   4 ++--
 gradlew                                  |   7 +++++--
 gradlew.bat                              |  22 +++++++++++----------
 7 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/submit.yml b/.github/workflows/submit.yml
index 8a1f4bd9e64..2b2067b6f5c 100644
--- a/.github/workflows/submit.yml
+++ b/.github/workflows/submit.yml
@@ -73,9 +73,9 @@ jobs:
       # BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_FILENAME }}"
       # BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_URL }}"
       # BOOT_JDK_SHA256: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_SHA256 }}"
-      BOOT_JDK_VERSION: "21.0.2"
-      BOOT_JDK_FILENAME: "jdk-21.0.2_linux-x64_bin.tar.gz"
-      BOOT_JDK_URL: "https://download.oracle.com/java/21/archive/jdk-21.0.2_linux-x64_bin.tar.gz"
+      BOOT_JDK_VERSION: "22.0.2"
+      BOOT_JDK_FILENAME: "jdk-22.0.2_linux-x64_bin.tar.gz"
+      BOOT_JDK_URL: "https://download.oracle.com/java/22/archive/jdk-22.0.2_linux-x64_bin.tar.gz"
       ANT_DIR: "apache-ant-1.10.5"
       ANT_FILENAME: "apache-ant-1.10.5.tar.gz"
       ANT_URL: "https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.5-bin.tar.gz"
@@ -155,9 +155,9 @@ jobs:
       # BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_FILENAME }}"
       # BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_URL }}"
       # BOOT_JDK_SHA256: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_SHA256 }}"
-      BOOT_JDK_VERSION: "21.0.2"
-      BOOT_JDK_FILENAME: "jdk-21.0.2_macos-x64_bin.tar.gz"
-      BOOT_JDK_URL: "https://download.oracle.com/java/21/archive/jdk-21.0.2_macos-x64_bin.tar.gz"
+      BOOT_JDK_VERSION: "22.0.2"
+      BOOT_JDK_FILENAME: "jdk-22.0.2_macos-x64_bin.tar.gz"
+      BOOT_JDK_URL: "https://download.oracle.com/java/22/archive/jdk-22.0.2_macos-x64_bin.tar.gz"
       # Disabled due to timeout downloading ant; use ant installed on system
       #ANT_DIR: "apache-ant-1.10.5"
       #ANT_FILENAME: "apache-ant-1.10.5.tar.gz"
@@ -241,9 +241,9 @@ jobs:
       # BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_FILENAME }}"
       # BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_URL }}"
       # BOOT_JDK_SHA256: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_SHA256 }}"
-      BOOT_JDK_VERSION: "21.0.2"
-      BOOT_JDK_FILENAME: "jdk-21.0.2_macos-aarch64_bin.tar.gz"
-      BOOT_JDK_URL: "https://download.oracle.com/java/21/archive/jdk-21.0.2_macos-aarch64_bin.tar.gz"
+      BOOT_JDK_VERSION: "22.0.2"
+      BOOT_JDK_FILENAME: "jdk-22.0.2_macos-aarch64_bin.tar.gz"
+      BOOT_JDK_URL: "https://download.oracle.com/java/22/archive/jdk-22.0.2_macos-aarch64_bin.tar.gz"
       # Disabled due to timeout downloading ant; use ant installed on system
       #ANT_DIR: "apache-ant-1.10.5"
       #ANT_FILENAME: "apache-ant-1.10.5.tar.gz"
@@ -327,9 +327,9 @@ jobs:
       # BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_FILENAME }}"
       # BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_URL }}"
       # BOOT_JDK_SHA256: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_SHA256 }}"
-      BOOT_JDK_VERSION: "21.0.2"
-      BOOT_JDK_FILENAME: "jdk-21.0.2_windows-x64_bin.zip"
-      BOOT_JDK_URL: "https://download.oracle.com/java/21/archive/jdk-21.0.2_windows-x64_bin.zip"
+      BOOT_JDK_VERSION: "22.0.2"
+      BOOT_JDK_FILENAME: "jdk-22.0.2_windows-x64_bin.zip"
+      BOOT_JDK_URL: "https://download.oracle.com/java/22/archive/jdk-22.0.2_windows-x64_bin.zip"
       ANT_DIR: "apache-ant-1.10.5"
       ANT_FILENAME: "apache-ant-1.10.5.tar.gz"
       ANT_URL: "https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.5-bin.tar.gz"
diff --git a/build.properties b/build.properties
index 8400f17d83d..e99856ab1c0 100644
--- a/build.properties
+++ b/build.properties
@@ -77,8 +77,8 @@ javadoc.header=JavaFX&nbsp;24
 ##############################################################################
 
 # JDK
-jfx.build.jdk.version=21.0.2
-jfx.build.jdk.buildnum=13
+jfx.build.jdk.version=22.0.2
+jfx.build.jdk.buildnum=9
 jfx.build.jdk.version.min=21
 jfx.build.jdk.buildnum.min=35
 jfx.jdk.target.version=21
@@ -88,7 +88,7 @@ jfx.jdk.target.version=21
 # gradle/wrapper/gradle-wrapper.properties and should also be recorded in
 # The jfx.gradle.version.min property defines the minimum version of gradle
 # that is supported. It must be <= jfx.gradle.version.
-jfx.gradle.version=8.5
+jfx.gradle.version=8.9
 jfx.gradle.version.min=8.5
 
 # Toolchains
diff --git a/gradle/UPDATING.txt b/gradle/UPDATING.txt
index 13979bc0de7..ba598c70db1 100644
--- a/gradle/UPDATING.txt
+++ b/gradle/UPDATING.txt
@@ -10,4 +10,4 @@ NOTE: only update the minimum when necessary (e.g., when replacing deprecated AP
 * Update the version number in the URL in gradle/wrapper/gradle-wrapper.properties
 * Run: bash gradlew wrapper --gradle-version VERSION
 * Verify the changes (fix line endings in gradlew.bat if needed)
-* Add "distributionSha256Sum" back into gradle/wrapper/gradle-wrapper.properties (get the checksum from gradle.org)
+* Add "distributionSha256Sum" back into gradle/wrapper/gradle-wrapper.properties (get the checksum from https://gradle.org/release-checksums)
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index d64cd4917707c1f8861d8cb53dd15194d4248596..2c3521197d7c4586c843d1d3e9090525f1898cde 100644
GIT binary patch
delta 34463
zcmY(qRX`kF)3u#IAjsf0xCD212@LM;?(PI<f(@>NyAue(f;$XO2=4Cg1P$=#e%|lo
zKk1`B>Q#GH)wNd-&cI#Hz}3=WfYndTeo)CyX{fOHsQjGa<{e=jamMNwjda<PyWE6-
zP~B#x7leo3nD`qQ)CqpqLwL&Nv*c_uf@6ZzDxH4Kk*=_Q!1=S4w`ejm#xafRiVQ9K
zD|NMG<SxpdU<&W$m3qe4z`XCn(ZbVn07Ju^@)#`N!0VN6<~T~KDoO4tX0Wnd#9^aG
zzw_kBWvKv8AX+m002<gC-eNM-rZnBB9F6nP%6MQjX4aHBE}ky4v9DAk%X3G|ZVInC
z0sH3o9G@FVA`%%F8RyEFms&lE|8}H=IL>tD={CN3>GNchOE9OGPIqr)3v>RcKWR3Z
zF-guIMjE2UF0Wqk1)21791y#}ciBI*bAenY*B<S7Lsj7;64caBml7(9sSP$#!4bz5
zfe$Y|L&2pF$!`g2EFBw-(C>MW_)AeSuM5}vz_~`+1i!Lo?XAEq{TlK5-efNFgHr6o
zD>^vB&%3ZGEWMS>`?tu!@66|uiDvS5`?bF=gIq3rkK(j<_TybyoaDHg8;Y#`;>tXI
z=tXo~e9{U!*hqTe#nZjW4z0mP8A9UUv1}C#R*@yu9G3k;`Me0-BA2&Aw6f`{Ozan2
z8c8Cs#dA-7V)ZwcGKH}jW!Ja&VaUc@mu5a@CObzNot?b{f+~+212lwF;!QKI16FDS
zodx>XN$sk9;t;)maB^s6sr^L32EbMV(uvW%or=|0@U6cU<cnXKOZI@-_2b|FP!$}s
zAe;S8Mg2+heB}qk71p?*lsuXu#LR?_0T)ujf|bz~>kE`_!<=LHLlRGJx@gQI=B(nn
z-GEjDE}*8>3U$n(t^(b^C$q<Dz5^v_5fDC=_*60>STI;}6q&ypp?-2rGpqg7b}pyT
zOARu2x><t9J4jOACSe7Cla*>0HB{&D(d3sp`+}ka+Pca5glh|c=M)Ujn_$ly^X6&u
z%Q4Y*LtB_>i6(YR!?{Os-(^J`(70lZ&Hp1I^?t@~SFL1!m0x6j|NM!-JTDk)%Q^R<
z@e?23FD&9_W{Bgtr&CG&*Oer3Z(Bu2EbV3T9FeQ|-vo5pwzwQ%g&=zFS7b{n6T2ZQ
z*!H(=z<{D9@c`K<z${~)Mo?=i!8kgh3^kh#gZ+tgX&gTG!eX0?^?c|0?IsnpYDup`
zE@9&nF#>mHO&DbUIzpg`+r5207}4D=_P$ONIc5lsFgn)UB-oUE#{r+|uHc^hzv_df
zV`n<Uy?gf){vC8%ni$H6BLQ|&nNh_JVuc@V<M{j`fPiV3mmYOH;{D(UIYmW$_M(id
zfz>8&qry%jXQ33}Bjqcim~BY1?KZ}x453Oh7G@fA(}+m(f$)TY%7n=MeLi{jJ7LMB
zt(mE*vFnep?YpkT_&WPV9*f>uSi#n#@STJmV&SLZnlLsWYI@y+Bs=gzcqche=&<e&
zH!*BfX&4XuI(sK|M6EWNz&xj!)?<o^!;`2$ksx0>cBH2WL)dkR!a95*Ri)JH_4c*-
zl4pPLl^as5_y&6RDE@@7342DNyF&GLJez#eMJjI}#pZN{Y8io{l*D+|f_Y&RQPia@
zNDL;SBERA|B#cjlNC@V<BMj^PW+*!uB6Kia#Q_k#D<Kdw%NW0h5PShX-Ateg=^YLq
zPqOC>U{2csOvB8$HzU$01Q?y)KEfos>W46VMh>P~oQC8k=26-Ku)@C|n^zDP!hO}Y
z_tF}0@*Ds!JMt>?4y|l3?`v#5*oV-=vL7}zehMON^=s1%q+n=^^Z{^mTs7}*->#YL
z)x-~SWE{e?YCarwU$=cS>VzmUh?Q&7?#Xrcce+jeZ|%0!l|H_=D_`77hBfd4Zqk&!
zq-Dnt_?5*$Wsw8zGd@?woEtfYZ2|9L8b>TO6>oMh%`B7iBb)-aCefM~q|S2Cc0t9T
zlu-ZXmM0wd$!gd-dTtik{bqyx32%f;`XUvbUWWJmpHfk8^PQIEsByJm+@+-aj4J#D
z4#Br3pO6z1eIC>X^yKk|<Bgti^oqrbEGF$Jw^;w14UYT$*kTROuXlF!RjFMV72W^U
zoMllbg+6ow&xKMI7=%s{uAdU)(;XWPXi7!aAo)eS$$~Y>PeVwX_4B+IYJyJyc3B`4
zPrM#raacGIzVOexcVB;fcsxS=s<vwC^XKnl?x{xO@E;np^jTyr6HSfEb6qXiZr9dg
z)?Uhot!j3J`wuMIE#*geg>1e&V;Xe$tw&KQ`YaCkHTKe*Al#velxV{3wxx}`7@isG
zp6{+s)CG%HF#JBAQ_jM%zCX5X;J%-*%&jVI?6KpYyzGbq7qf;&hFprh?E5Wyo=bZ)
z8YNycvMNGp1836!-?nihm6jI`^C`EeGryoNZO1AFTQhzFJOA%Q{X(sMYlzABt!&f{
zoDENSuoJQIg5Q#@BUsNJX2h>jkdx4<+ipUymWKFr;w+s>$laIIkfP6nU}r+?J9bZg
zUIxz>RX$kX=C4m(zh-Eg$BsJ4OL&_J38PbHW&7JmR27%efAkqqdvf)Am)VF$+U3WR
z-E#I9H6^)zHLKCs7|Zs<7Bo9VCS3@CDQ;{UTczoEprCKL3ZZW!ffmZFkcWU-V|_M2
zUA9~8tE9<5`59W-UgUmDFp11YlORl3mS3*2#ZHjv{*-1#uMV_oVTy{PY(}AqZv#wF
zJVks)%N6LaHF$$<6p8S8Lqn+5&t}DmLKiC~lE{jPZ39oj{wR&fe*LX-z0m}9ZnZ{U
z>3-5Bh{KKN^n5i!M79Aw5eY=`6fG#aW1_ZG;fw7JM69qk^*(rmO{|Z6rXy?l=K=#_
zE-zd*P|(sskasO(cZ5L~_{Mz&Y@@@Q)5_8l<6vB$<SnmTz>@226O+pDvkFaK8b>%2
zfMtgJ@+cN@w>3)(_uR;s8$sGONbYvoEZ3-)zZk4!`tNzd<0lwt{RAgplo*f@Z)uO`
zzd`ljSqKfHJOLx<Pf6T=jN-Y)-G`fh^*;28D6YUz?Jn$Qe<sb8Bqa)nI_IHAx#i9Y
z$j}`a&gQX1Vaa!Ea{Z|{=AEw)&>ya4_}T`k5Ok1Mpo#MSqf~&ia3uIy{zyuaF}pV6
z)@$ZG5LYh8Gge*LqM_|GiT1*J*uKes=Oku_gMj&;FS`*sfpM+ygN&yOla-^WtIU#$
zuw(_-?DS?6DY7IbON7J)p^IM?N>7x^3)(7wR4PZJu(teex%l>zKAUSNL@~{czc}bR
z)I{Xz<Lxhu3=iQUmF>XqZBU3a;7UQ~PvAx8g-3q-9AEd}1JrlfS8NdPc+!=HJ6Bs(
zCG!0;e0z-22(Uzw>hkEmC&<fdEY_MO4!XLJs6(n80jtDO!nnCLqs#Y_I0IE~UCPp@
zM_JDqY7&S(Y&QK^-o&47T#3E|`NAlIxvHf3kny;RvvXG3GAWOcnn~MYcAb70=&uwJ
zkt37-cyED3`=cXw-}?~Jre&#~t1kA3Jz_#Bn#jD975Ham#lXmn@!Xe|z!$O^A|8Ja
zxE40Kw#qS@4?x}td&6F5(NIU<?GmP1&i-wkqanUS(~JutQ=}J2g$roe>xj?{0p|kc
zM}MMXCF%RLLa#5jG`+}{pDL3M&|%3BlwOi?dq!)KUdv5__zR>u^o|QkYiqr(m3HxF
z6J*DyN#Jpooc$ok=b7{UAVM@<lCUruKn!C)jTs?G3tF=X?02t9ti$}%_-&Apkmnno
z%fbj!k#YwEr={VibqP-VP5rAcB3fluUzRfi(z01WI?#!N!mLc);E?^+GEin57qXIO
zg8kNfR~-pWXV>nwGsr6kozSddwulf5g1{B=0#2)zv!zLXQup^BZ4sv*sEsn)+MA?t
zEL<g?Ek3W6nR6!O+b*MM+O~eGu_sDZwCnE-jqq7Mvt4JiAYMi&B_$Kb75}|i#Oq?4
z^@)_zxi_9dEszN`mdX;tu;@!Yj!NQXjGcs`B*6!}Q`Xp8$`LBVWzdw?k{MZ=kF0i6
z0u$CdmQDt$g$6JM?JyEA2oW1N)I#|wQ>)}3*R?4(J~CpeSJPM!oZ~8<cg4cY=X|VM
z=^|PC37b4k-X|34t*R-GX&L@u*U|J4q?K3(MG@qFTXx0}+s2jwB%hz+*7-k{2(QHj
zQmM#6vaQDzB)m!b_6aC`nE*p#lagJ>;8s_=@6o`IA%{aEA9!GELRvOuncE`s7sH91
zmF=+T!Q6%){?lJn3`5}oW31(^Of|$r%`~gT{eimT7R~*Mg@x+tWM3KE>=Q>nkMG$U
za7r>Yz2LEaA|PsMafvJ(Y>Xzha?=>#B!sYfVob4k5Orb$INFdL@U0(J8Hj&kgWUlO
zPm+R07E+oq^4f4#HvEPANGWLL_!uF{nkHYE&BCH%l1FL_r(Nj@M)*VOD5S42Gk-yT
z^23oAMvpA57H(fkDGMx86Z}rtQhR^L!T2iS!<mO!Z%ty;Vm%l(OCwBkU1^sK>788E
z+^${W1V}J_NwdwdxpXAW8}#6o1(Uu|vhJvubFvQIH1bDl4J4iDJ+181KuDuHwvM?`
z%1@Tnq+7>p{O&p=@QT}4wT;HCb@i)&7int<0#bj8j0sfN3s6|a(l7Bj#7$hxX@~iP
z1HF8RFH}irky&eCN4T94VyK<n?6cO6O!>qGywEGY{Gt0Xl-`|dOU&{Q;Ao;sL>C6N
zXx1y^RZSaL-pG|JN;j9ADjo^XR}gce#seM4QB1?S`L*aB&QlbBIRegMnTkTCks7JU
z<0(b+^Q?HN1&$M1l&I@>HMS;!&bb()a}hhJzsmB?I`poqTrSoO>m_JE5U4=?o;OV6
zBZjt;*%1P>%2{UL=;a4(aI>PRk|mr&F^=v6Fr&xMj8fRCXE5Z2qdre&;$_RNid5!S
zm^XiLK25G6_j4dWkFqjtU7#s;b8h?BYFxV?OE?c~&ME`n`$ix_`mb^AWr+{<eR?ie
zu^n7F<r|0}4&z!1h-oy{4Bz+F69}Q`VpCh(8k$5~F}&!BM0MdLg4qhh@bV;%4Rw1m
zzqF@FV8+w9w|_OPDgrx*NZebP^m@hq4m*)5tuF1+`%o#G^#zx@w5ZsxZaUE7jzw;N
zhD*<Wl`rn3nq7+Ag+JpPe%(D1QRTS`qM+;}+_^&I$1>M9{^^Rl;~KREplwy2q;&xe
zUR0SjHzKVYzuqQ84w$NKVPGVHL_4I)Uw<$uL2-Ml#+5r2X{LLqc*p13<F6YTV#kWf
zqG&w9QQdWL4?_d~CQnBI;?0D)Qg}{>{;w#E*Kwb*1D|v?e;(<>vl@VjnFB^^Y;;b3
z=R@(uRj6D}-h6CCOxAdqn~_SG=bN%^9(Ac?zfRkO5x2VM0+@_qk?MDXvf<z0O)%s7
zMAFU0$m3HcbC#~2Hc64da@3O%^-=j9undudUI{}zbhknzUL#akDQiL_v_tyrinjEO
zI(3QAK0&1x_y)uNn}57R#|)d${jFV)^rH-I`D9H?s`)o)uI9hKceIT0a|7|+J9G4R
z?^G4wKj6MYf*wobKriuVpvC#r;9ThcHk6^a^xn2ODvRhy6<dTeve8{i!Cu=iTXW7{
z{?H_E?=z!{hGvD8B;Y6V{)tUgB~RL}OZbPv*z!^?TUpHIl7qWjaL~c+st5S>=@q_*
z3IM@)er6-OXyE1Z4sU3{8$Y$>8NcnU-nkyWD&2ZaqX1JF_JYL8y}>@V8A5%lX#U3E
zet5PJM`z79q9u5v(OE~{by|Jzlw2<0h`hKpOefhw=fgLTY9M8h+?37k@TWpzAb2Fc
zQMf^aVf!yXlK?@5d-re}!fuAWu0t57ZKSSacwRGJ$0uC}ZgxCTw>cjRk*xCt%w&hh
zoeiIgdz__&u~8s|_TZsGvJ7sjvBW<(C@}Y%#l_ID2&C`0;Eg2Z+pk;IK}4T@W6X5H
z`s?ayU-iF+aNr5--T-^~K~p;}D<LJ~4Vm)-6?_|)BF5gW4JSY7&(G|Av&E;#AyyV$
zSunlmXPqL`WNNYmTNMzV20flD83AxG;E^Ec8R;(;vdTi$02nI6(4u&=rI7r^2x}@}
zb^h(s^Hv9AwRzcBrk1j8D%Js|d7yM)>(*GWOAYDV9JEw!w8ZYzS3;W6*_`#aZw&9J
ziXhBKU3~zd$kKzCAP-=t&cFDeQR*_e*(excIUxKuD@;-twSlP6>wWQU)$|H3Cy+`=
z-#7OW!ZlYzZxkdQpfqVDFU3V2B_-eJS)Fi{fLtRz!K{~7TR~XilNCu=Z;{GIf9KYz
zf3h=Jo+1#_s>z$lc~e)l93h&RqW1VHYN;Yjwg#Qi0yzjN^M4cuL>Ew`_-_wRhi*!f
zLK6vTpgo^Bz?8AsU%#n}^EGigkG3FXen3M;hm#C38P@Zs4{!QZPAU=m7ZV&xKI<yS
zef9C7IM#)bKApw^nm2P0xPH)?)BN&sFvRw*IK$#0AfO}b<r{uW7o8y}SN)F@&yQm%
zn~nNb7d)eJ2BHvG2FG3z@j=payQlcc`;O$D3XPT3JFukw8Xr%@g@bkhB?@#$+AOw(
z(|@nqsNM;#gS0yC1MWhDA!W&4Ru~!5ks5Q~Pml#jZyfXEak(Em<WRqk+Ush$9swq)
zmPM%H4#Ov0YvR0-8rrI^layyN^pm(_yZ9(@AnNKHRrR<^fYJvzs{G9-d<-PIeZxic
zI!fz70I#*sa*eAVT<99Vxgy-<y1w@xbY}slZ7CHAcKSW+wgZc7BMb2FfqhW}?;;BY
zP!O(w$5_aUKLF$CVvI<PnooNWjt084FOTmh7FT(=9D-a~XGZP;^5(x4>_HWNt90Ef
zxClm)ZY?S|n**2cNYy-xBlLAVZ=~+!|7y`(fh+M$#4zl&T^gV8ZaG(RBD!`3?9xcK
zp2+aD(T%QIgrLx5au&TjG1AazI;`8m{K7^!@m>uGCSR;Ut{&?t%3AsF{>0Cm(Kf)2
z?4?|J+!BUg*P~C{?m<lX{_VAm$p$7Sy5n4)MhYq@8YJpQU2G)^4Cs_N!H_NDI5wLC
zuxU!+I__)7xJYF^Pf|zP9)c{~jt|)Y(3ss;D?4|k?Aspv4X!02;`uMjy{H&7#%Q@o
z<nV(d4I5h&#m8g~O!r&@N38SW3XQ`EjZh!<u+JXC85$B2rn?)m6Y00}q3o2FWUH%+
zxkU_~@oBdV%UzT$+qN=8G&dY}bCZ=N#`=O2mzStcgw{uTG7hdoSCO(-*C<hlyRW_D
zI1Ra`6kd?oLFBA13(Fk<4zU<VtAK2o$FG2w@>wPQ#)gDMmro20YVNsVx5oWQMkzQ?
zsQ<ZZLyAH1!oNzFM}TfglR)=rWx*=M9GIjB?ZFULc>%Y>%7_wkJqnSMuZjB9lBM(o
zWut|B7w48cn}4buUBbdPBW_J@H7g=szrKEpb|aE>!4rLm+sO9K%iI75y~2HkUo^iw
zJ3se$8$|W>3}?JU@3h@M^HEFNmvCp|+$-0M?RQ8SMoZ@38%!tz8f8-Ptb@106heiJ
z^Bx!`0=I<O1KwEC{Zqa_WBh?i$W#4Fd46V<qLHAqFT^%K_=ff(6##B-Ub(l(@oz>m
z1!NUhO=9ICM*+||b3a7w*Y#5*Q}K^ar+oMMtekF0JnO>hzHqZKH0&PZ^^M(j;vwf_
z@^|VMBpcw8;4E-9J{<clOdQ-gLs}yNpT|>(u7sHSyZpQbS&N{VQ%ZCh{c1UA5;?R}
z+52*X_tkDQ(s~#-6`z4|Y}3N#a&dgP4S_^tsV=oZ<Y0d)Rr;arA(GJ}DlJV*pmcys
z*Mk;Dg{B7HD(oM1AgV$?pZ(feakO5tAV~SCs_W%F(?;(4m+NEoby{|2mc0XI>r4A1
zaSoPN1czE(UIBrC_r$0HM?RyBGe#lTBL4~JW#A`P^#0wuK)C-2$B6TvM<GJr3h=;Q
z>i@@%K@JAT_IB^T7Zfqc8?<ppV&KJMBtJ-oMFyu3aJ37qp`YqlHwSWDi``;8R3fKH
z;())3jrugRTov;`f2|96Ol0~`tdom%2YtK*BEp7dW){Z1+eUuiY^^+%IXC`kb4D<x
zHzFJB;p^zZ4`bRwAwzCEy&SFu3-$>{wHcSVG_?{(wUG%zhCm=%qP~EqeqKI$9UivF
zv+5IUOs|%@ypo6b+i=xsZ=^G1yeWe)z6IX-EC`F=(|_GCNbHbNp(CZ*lpSu5n`FRA
zhnrc4w+Vh?r>her@Ba_jv0Omp#-H7avZb=j_A~B%V0&FNi#!S8cwn0(Gg-Gi_LMI{
zCg=<XfJ{>g@m{W@u?GQ|yp^yENd;M=W2s-k7Gw2Z(tsD5fTGF{iZ%Ccgjy6O!AB4x
z%&=6jB7^}pyftW2YQpOY1w@%wZy%}-l0qJlOSKZXnN2wo3|hujU+-U~blRF!^;Tan
z0w;Srh0|Q~6*tXf!5-rCD)OYE(%S|^WTpa1KHtpHZ{!;KdcM^#g8Z^+LkbiBHt85m
z;2xv#83lWB(kplfgqv@ZNDcHizwi4-8+WHA$U-HBN<XXr0~J?$Lai#_;trL)VA8+1
zU!;TqE~}9XS7A@|JfNqKkGav_MPU#1&?e(-M~ysHg+5_(nK1v-W}9=?Zer5AMLpDA
zz5CzT^brYv;fMsP%wz!?lZWTP?W}8@vv2IuVI?tan0C9Y`-Wjik0PN~x7}xCz5j)1
zoSKG<CGs%hfuQ;WLC{xnn)TVIkPvvNhsVT7>qsZ`hKcUI3zV3d1ngJP-AMRET*A{>
zb2A>Fk|L|WYV;Eu4>{a6ESi2r3aZL7x}eRc?cf|~bP)6b7%BnsR{Sa>K^0obn?yiJ
zCVvaZ&;d_6WEk${F1SN0{_`(#TuOOH1as&#&xN~+JDzX(D-WU_nLEI}T_VaeLA=bc
zl_UZS$nu#C1yH}YV>N2^9^zye{rDrn(rS99>Fh&jtNY7PP15q%g=RGnxACdCov47=
zwf^<OLlg}xVjt0)p-rbBn7T~vS^5_Drk~dEL?fU{>9zfJaL{y`R#~tvVL#*<`=`Qe
zj_@Me$6sIK=LMFbBrJps7vdaf_HeX?eC+P^{AgSvbEn?n<}NDWiQGQG4^ZOc|GskK
z$Ve2_n8gQ-KZ=s(f`_X!+vM5)4+QmOP()2Fe#IL2toZBf+)8gTVgDSTN1CkP<}!j7
z0SEl>PBg{MnPHkj4wj$mZ?m5x!1ePVEYI(L_sb0OZ*=M%yQb?L{UL(2_*CTVbRxBe
z@{)COwTK1}!*CK0Vi4~AB;HF(MmQf|dsoy(eiQ><S&flYs}X=qI6%JhOL}c}8ReE6
z>WTKcEQlnKOri5xYsqi61Y=I4kzAjn5~{IWrz_l))|<ryzIgBfLDnKw3JSt*BE7Yk
z@<X1~%_3&{c@EWKT@&!_5{hgsv0*uWq^Ag5&!#`hO30t*Ey!ZHlK~#2TL+u093@m<
zmh@mPLF@+cbRf2&AOJqqsB1zg;bVL&+4p#cS%+M6!rPy}l*roS@+s2E+JcG2%rRTv
z2!(JA6$64oDKq`kHYO({m<UUf<`TtSFw}vw1zYukXby+c34(E)w*pi_qs3N7vw>Ls
zvq7xgQs?Xx@`N?f7+3XKLyD~6DRJw*uj*j?yvT3}a;(j_?YOe%hUFcPGWRVBXzpMJ
zM43g6DLFqS9tcTLSg=^&N-y0dXL816v&-nqC0iXdg7kV|PY+js`<tQ)jQ;9->F8dm
z2PuHw&k+8*&9SPQ6f!^5q0&AH(i+z3I7a?8O+S5`g)>}fG|BM&ZnmL;rk)|u{1!aZ
zEZHpAMmK_v$GbrrWNP|^2^s*!0waLW=-h5PZa-4jWYUt(<b#|Bsx3P3#+uA4`mmgX
z9Kz|`zO$@)@d{sIynMxFy0ta)_!*pZfTlj%)9Ee4zRt~F_6}gJArZ1%_&ds}7FnKN
zT=p-*f9G3aBCWvVUn3v-@ZXvQrHP}1zTx3P<Jhsl2HrSYxUcBQibO?|u3Wl@z}_;u
z86>Hr@EA(m3Mc3^uDxwt-me^55FMA9^>hpp26MhqjLg#^Y7OIJ5%ZLdNx&uDgIIqc
zZRZl|n6TyV)0^DDyVtw*jlWkDY&Gw4q;k!UwqSL6&sW$B*5Rc?&)dt29bDB*b6IBY
z6SY6Unsf6AOQdEf=P1inu6(6hVZ0~v-<>;LAlcQ2u?wRWj5VczBT$Op#8IhppP-1t
zfz5H59Aa~yh7EN;BXJsLyjkjqARS5iIhDVPj<=4AJb}m6M@n{xYj3qsR*Q8;h<IbJ
zd)uk&8m`?q_q1NS{$84>VxDyC4vLI;;?^eENOb5QARj#nII5l$MtBCI@5u~(ylFi$
zw6-+$<K_|-Wlyt+M0?(Bv&pcNNg0svOYzThtqKx!i*Dc5NZvH&F*N23|J~!vMN;d~
z^=H()7fOiv1)6`d`Xlx->$XQ}Ca>FWT>q{k)g{Ml(Yv=6aDfe?m<nPFf#(N8Laf1%
zeJ4>|5|kbGtWS}fKWI+})F6`x@||0oJ<?@*&=4(53;s&f1=p}VJ=CsEx0>^(g|+xi
zqlPdy5;`g*i*C=Q(aGeDw!eQg&w>UUj^{o?PrlFI=34qAU2u@BgwrBiaM8zoDTFJ<
zh7nWpv>dr?q;4ZA?}V}|7qWz4W?6#S&m>hs4IwvCBe@-C>+oohsQZ^JC*RfDRm!?y
zS4$7oxcI|##ga*y5hV>J4a%HHl^t$pjY%caL%-FlRb<$A$E!ws?8hf0@(4HdgQ!@>
zds{&g$ocr9W4I84TMa9-(&^_B*&R%^=@?Ntxi|Ejnh;z=!|uVj&3fiTngDPg=0=P2
zB)3#%HetD84ayj??qrxsd<YW&s^_fNRPJu1Lu~ooseFw$wVknfo;k}<f4``0v~+Y_
zKU_m+@|S(3^pR^^<>9nqrBem(8^_u_UY{1@R_vK-0H9N7lBX5K(^O2=0#TtUUGSz{
z%g>qU8#a$DyZ~EMa|8*@`GOhCW3%DN%xuS91T7~iXRr)SG`%=Lfu%U~Z_<B8YLfje
zenkDPv?7UMn^wh-#5zYOX60}ftn+_;r9>`1b=lSi?qpD4$vLh$?HU6t0MydaowUpb
zQr{>_${AMesCEffZo`}K0^~x>RY_ZIG{(r39MP>@=aiM@C;K)jUcfQV8#?SDvq>9D
zI{XeKM%$$XP5`7p3K0T}x;qn)VMo>2t}Ib(6zui;k}<<~KibAb%p)**e>ln<=qyWU
zrRDy|UXFi9y~PdEFIAXejLA{K)6<)Q`?;Q5!KsuEw({!#Rl8*5_F{TP?u|5(Hijv(
ztAA^I5+$A*+*e0V0R~fc{ET-RAS3suZ}TRk3r)xqj~g_hxB`qIK5z(5wxYboz%46G
zq{izIz^5xW1Vq#%lhXaZL&)FJWp0VZNO%2&ADd?+J%K$fM#T_Eke1{dQsx48dUPUY
zLS+DWMJeUSjYL453f@HpRGU6Dv)rw+-c6xB>(=p4U%}<qNSa;?l%-Qbgo6H=D;<Ac
z37*~61%G;Rk9zKyD{WraYx|9VK1aeUEagvgL(r)WImH;+hu8m^8fk3iQO!R?vp|AU
z#xX(31o5DGMHtXZ9zytcGdR#e9xm`5)!T;H26%a+**oa@WGMf=BFxg~`r&GAS7$4y
z^2|*EV<Mt4fFFPU)O>_p>z^I@Ow9`nkUG21?cMIh9}hN?R-d)*6%pr6d@mcb*ixr7
z)>Lo<&2F}~>WT1ybm^9UO{6P9;m+fU^06_$o9gBWL9_}EMZFD=rLJ~&e?fhDnJNBI
zKM=-WR6g7HY5tHf=V~6~QIQ~rakNv<yXlZw2~R->csamU8m28YE=z8+G7K=h%)l6k
zmCpiDInKL6*e#)#Pt;ANmjf`8h-nEt&d}(SBZMI_A{BI#ck-_V7nx)K9_D9K<wX2&
ztb`!H<{xu+%$XOK7#l;ig9boZT>-p@?Zh81#b@{wS?wCcJ%og)8RF*-0z+~)6f#T`
zWqF7_CBcnn=S-1QykC*F0YTsKMVG49BuKQBH%WuDkEy%E?*x&tt%0m>>5^HCOq|ux
zuvFB)JPR-<R9*qK#QvOEy<g2y->W|%$24eEC^AtG3Gp4qdK%pjRijF5Sg3X}uaKEE
z-L5p5aVR!NTM8T`4|2QA@hXiLXRcJveWZ%YeFfV%mO5q#($TJ`*U>hicS+CMj%Ip#
zivoL;dd*araeJK9EA<(tihD50FHWbITBgF9<S1F59NBB@-km2xgxh^jmVKRZHCzb@
zldh9O@Tx{jgxfxH#W4wy6M0z_-aTt2G@3|Yp>E<33A+eMr2;cgI3Gg6<-2o|_g9|>
zv5}i93<J?21Jwu60De+%9&8yD$M-==IBwP;d{BC=F44-LGWWplT_ESz4ovU#BL|G}
zcmR56^)_SYTt?AM`r&<V0_9alA|EwbVwM(BT3!TE$hsCu`Gm;Rg~8}C&9f4B^0>2(
zYf<!;V`YfO6gj*4fZkUAr?-F@aA9;z9|jbBgt=33h^ojL5J7|FUPfqa-W2^EN+IwG
zyucPVo58FAeHt$Nq*Z0Lz|^v35)f<vIMOX%n{Czoseg>TE9?4#nQhP@a|zm#9FST2
z!y+p3B;p>KkUzH!K;GkBW}bWssz)9b>Ulg^)EDca;jDl+q=243BddS$hY^fC6lbpM
z(q_bo4V8~e<Zs<b7cyyni#U}G!!KTEURDqc{bMpk?5mA1@g$Y$Wx|caEJ@!TvSwmW
zqw6$6_V9}M--vO-=^ZBsJr^(lCyvX*KI4W@0G*bBPEKAYRH$kkkjj{cPznS-d|ZUy
zJ?>VeA?0LFD6ZtKcmOH^75#q$E<Zzyhezvuj?3@d%!~X4ws-!zRzAK#UFhVU?-K@7
z2G)}Z&^k%kMrWcDJ1~9s%Y7B4b*Q5pIQJtR#E8_m=dCI`iz(ByzI1@)w#x&yV;Dmb
zBR*c4ZqzdV6%u1E<qjcp>o%a&qvE8Zsqg=$p}u^|>DSWUP5i{6)LAYF4E2DfGZuMJ
zMwxxmkxQf}Q$V3&2w|$`9_SQS^2NVbTHh;atB>=A%!}k-f4*i$X8m}Ni^ppZXk<vI
zv4b?e{$fL=4CN|)0GXH{ZZE#0qrw?r2yJZjI_c{zf+uDL9gwdN)`!v>5_oYF>Gq(&
z0wy{LjJOu}69}~#UFPc;$7ka+=gl(FZCy4xEsk);+he>Nnl>hb5Ud-lj!CNicgd^2
z_Qgr_-&S7*#nLAI7r()P$`x~fy)+y=W~6aNh_humoZr7MWGSWJPLk}$#<b0qDKzby
zfsF}6hSD25(h&SI*1V<_%OA=AVAytldFr(qeYf$b2GB9jc!!oXb+YO|A>w_1n%(@?
z3FnHf1lbxKJbQ9c&i<$(wd{tUTX6DAKs@cXIOBv~!9i{wD@*|kwfX~sjKASrNFGvN
zrFc=!0Bb^OhR2f`%hrp2ibv#KUxl)Np1aixD9{^o=)*U%n%rTHX?FSWL^UGpHpY@7
z<FJKJ-x}kSNUZ~J=(sQmm|=Hgx6NDTIwxW%&M+qtaTFkwf2nmoB#ib#d`3q#i8x4D
z8SO1)?2${?@9$aGnmIq+`mJ>74U}KoIRwxI#>)Pn4($A`nw1%-D}`sGRZD8Z#lF$6
zOeA5)+W2qvA%m^|$WluUU-O+KtMqd;Pd58?qZj})MbxYGO<{z9U&t4D{S2G>e+J9K
ztFZ?}ya>SVOLp9hpW)}G%kTrg*KXXXsLkGdgHb+R-ZXqdkdQC0_)`?6mqo8(EU#d(
zy;u&aVPe6C=YgCRPV!mJ6R6kdY*`e+VGM~`VtC>{k27!9vAZT)x2~AiX5|m1Rq}_=
z;A9LX^nd$l-9&2%4s~p5r6ad-siV`HtxKF}l&xGSYJmP=z!?Mlwmwef$EQq~7;#OE
z)U5eS6dB~~1pkj#9(}T3j!((8Uf%!W49FfUAozijoxInUE7z`~U3Y^}xc3xp){#9D
z<^Tz2xw}@o@fdUZ@hnW#dX6gDOj4R8dV}Dw`u!h@*K)-NrxT8%2`T}EvOImNF_N1S
zy?uo6_ZS>Qga4Xme3j#aX+1qdFFE{NT0Wfusa$^;eL5xGE_66!5_N8!Z~jCAH2=${
z*goHjl|z|kbmIE{cl-PloSTtD+2=CDm~ZHRgXJ8~1(g4W=1c3=2eF#3tah7ho`zm4
z05P&?nyqq$nC?iJ-nK_iBo=u5l#|Ka3H7{UZ&O`~t-=triw=SE7ynzMAE{Mv-{7E_
zViZtA(0^wD{iCCcg@c{54Ro@U5p1QZq_XlEGtdBAQ9@nT?(zLO0#)q55G8_Ug~Xnu
zR-^1~hp|cy&52iogG@o?-^AD8Jb^;@&Ea5jEicDlze6%>?u$-eE};bQ`T6@(bED0J
zKYtdc?%9*<<$2LCBzVx9CA4<AoGdF)iT9-BV}&@WMK}bKMAdQBHB9zIg~33D9XqBR
zD>YV|q-qg*-{yQ;|0=KIgI6~z0DKTtajw2Oms3<u6JfE3d!7x4=<@msnH0k~j9dW|
zZtZ80d$e)`WiYJI%5C4$o_@ZG+NLyWNO7P{Rii0d%$QNbSHy)#lwN8boUCoV3)k>L
zn{C%{P`duw!(F@*P)lFy11|Z&x`E2<=$Ln38>UR~z6~za(3r;45k<v>QK_^QTX%!s
zNzoIFFH8|Y>YVrUL5#mgA-Jh>j7)n<Zx96$&fzU>)5}iVM4%_@^GSwEIBA2g-;43*
z*)i7u*xc8jo2z8&=8t7qo|B-rsGw)b8UXnu`RgE4u!(J8yIJi(5m3~aYsADcfZ!GG
zzqa7p=sg<o&$HnFk3_PIDT7^R*l|Uy*ErkWh5p!iw%95SEqgx*(#2u}$;yHXwBY|t
z$vJDd#N!Akn_xau{*4y#!iM@tZOc&Rc)@cg)>`V_KjiqI*LA-=T;uiNRB;BZZ)~88
z`C%p8%hIev2rxS12@doqsrjgMg3{<L-IS7j<nG-26~xHYI&`%4j=)ZUR_2Nwyo&s*
zJ_0X{=sXdnBCoNzt%@LBIlEx@{+A&hsZt3nyF&Gtc)9fXv28Q&PU0uzxK5QDQ^0tT
z@ll2`vK+vydWK?7I0;u%diXOvNZ*YxV6uZ=wi~x}imLLs*Slf$SL&G~13D2Praj;n
z{D>A&N8A?%Ui5vSHh7!iC^ltF&HqG~;=16=h0{ygy^@HxixUb1XYcR36SB}}o3nxu
z_IpEmGh_CK<+sUh@2zbK9MqO!S5cao=8LSQg0Zv4?ju%ww^mvc0WU$q@!oo#2bv24
z+?c}14L2vlDn%Y0!t*z=$*a!`*|uAVu&NO!z_arim$=btpUPR5XGCG0U3YU`v>yMr
z^zmTdcEa<e${0lJ(<4$dGj^YwOU!gy-6u%trv^j}K^#M&{&D1UGEa2nS)OMS>!APX
zYF>^Q-TP11;{VgtMqC}7>B^2gN-3KYl33gS-p%f!X<_Hr?`rG8{jb9jmuQA9U;BeG
zHj6Pk(UB5c6zwX%SNi*Py*)gk^?+729$bAN-EUd*RKN7{CM4`Q65a1qF*-QWACA&m
zrT)B(M}yih{2r!Tiv5Y&O&=H_OtaHUz96Npo_k0eN|!*s2mLe!Zkuv>^E8Xa43ZwH
zO<I&Nur7C^JWb9`H||S7lnGT!zTpho2vN69_#Qs?kjYy$`Q0!HKi(a7WFX@;&MNY~
zax>I058AZznYGrRJ+`*GmZzMi6yliFmGMge6^j?|PN%ARns!Eg$ufpcLc#1Ns!1@1
zvC7N8M$mRgnixwEtX{ypBS^n`k@t2cCh#_6L6WtQb8E~*Vu+Rr)YsKZRX~hzLG*BE
zaeU#LPo?RLm(Wzltk79Jd1Y$|6<Tz#Ab3VOQL!oqnu8!3Ev#T)CDpRjo9fjjgw)N!
zErQj*AF93?w7h)pV7lh%{nq{Sh43S}4qRhV$tBKz2Q3F#YC0?apCV-cr-&g)Ta?xA
zc-})no|s-UajuvdSqa3zR2cl82_%nvGFwn23tfy0+-dPTJzZ8#!t6MWix9bj!?+yg
zn$~Be?akwbUV?z=Y{qc>aWz1)wf1K1RtqS;qyQMy@H@B805vQ%wfSJB?m&&=^m4i*
z<RSh9mC|UV(AH!)v4!3^(;(w}isKaD1$r>YVH`zTTFbFtNFkAI`Khe4e^CdGZw;O0
zqkQe2|NG_y6D%h(|EZNf&77_!NU%0y={^E=*gKGQ=)LdKPM3zUlM@otH2X07Awv8o
zY8Y7a1^&Yy%b%m{mNQ5sWNMTIq96Wtr>a(hL>Qi&F(ckgKkyvM0IH<_<ah`2Jtc4H
zzJ5Z$n<rF%>}v~Fv-GqDa<PYPnU!!je;%S69V23AFX{jR^q$cSK5eU!uzK5~_gTvx
z=xC#ygr;Z7l0l}tE!ut;$3u!G=k}WM8nnSovw+>pig=3*ZMOx!%cYY)SKzo7ECyem
z9Mj3C)tCYM?C9YIlt1?zTJXNOo&oVxu&uXKJs7i+j8p*Qvu2PAnY}b`KStdpi`trk
ztAO}T8eOC%x)mu+4ps8sYZ=vYJp16SVWEEgQyFKSfWQ@O5id6GfL`|2<}hMXLPszS
zgK><z_7D{#_0cM38i3?q!q=1kU*<f=E!5q~OGR+n-!$_a1@<av6z8(-tT0T>NWOoR
zBRyKeUPevpqKKShD|MZ`R;~#PdNMB3LWjqFKNvH9k+;(`;-pyXM55?qaji#nl~K8m
z_MifoM*W*X9CQiXAOH{cZcP0;Bn10E1)T@62Um>et2ci!J2$5-_HPy(AGif+BJpJ^
ziHWynC_%-NlrFY+(f7HyVvbDIM$5ci_i3?22ZkF>Y8RPBhgx-7k3M2>6m5R24C|~I
z&RPh9xpMGzhN4b<n_$TKj6;x$6eSY#J<6z8-<<eXD{YGtPeh(eK>ii*ryWaN^d(`0
zTOADlU)g`1p+SVMNLztd)c+;XjXox(VHQwqzu>FROvf0`s&|NEv26}(TAe;@=FpZq
zaVs6mp>W0rM3Qg*6x5f_bPJd!6dQGmh?&v0rpBNfS$DW-{4L7#_~-eA@7<2BsZV=X
zo<jFL%Bl|~iN=_%v|5Y<#Gpc-_nu`zPSa3B)eyzNRYkS_S7#Vl4Sx`|M*FHkF=-_)
z(qT@$sP8*6(;+2_2GrUtq?WVOz@%!47omewB^Cj*+)_Y7c8o#IQ%W|Wg+5PNnR*6U
zqsrE$&lE5UYNkcwa9IkWJQ`K6q;9o~nXTNNt4ypA@SdwPa*k(~yPsQD9A`rvY6hIQ
zbB3Wq3J(Ip%Spgn<@)Zq04$gB8>w){3aATmLZOQrs>uzDkXOD=IiX;Ue*B(^4RF%H
zeaZ^*MWn4tBDj(wj114r(`)P96EHq4th-;tWiHhkp2rDlrklX}I@ib-nel0slFoQO
zOeTc<hn5|jpM}{BL^>;Rh7sMIebO`1%u)=GlEj+7HU;c|Nj>2j)J-kpR)s3#+9AiB
zd$hAk6;3pu9(GCR#)#>aCGPYq%r&i02$<m+xZvsp>0L9=7Al<uiMgWi00$%C&<=p;
z&DJ&!X-+7DOQ<NGx053X=x&OTuveGw;P#7I963O-cntp%n;x3upG6$bSZdIscXKZz
zE26w-ESTe#dx<IxxgOyxd~k92x!}?e7=&}7EIUABcs@v7J^4#tE1Z2`vYo|Zfx#?M
zXxRQAUwIpnrd%x;d2(+0wHKQb5LXCF5FM|~=&cF?)N_xB4Bl|JpPd+>IGY<wi6MrB
zwuAQco(edmX)&f$!qgzbDk@I5RR!7e{<pl6;0q^D9rH)D+xQ^qUHFjiVuuZ(dNLoE
zk610d0D=8c-t>dlUO5%eH&M!ZWD&6^NBAj0Y<LF!W8hneCvn#&X!jeuMxFNL9R6gV
ziYL0E$zuPwu-dNyWbfxdM|kfI7dtb9QzzTE{}sJ=aTD#{Kb((+@c&OeMaT<*ofYbx
z;1%phK@uKkWduA*1(PK@!{WoV6$&w4_0RR0*51~cnd9Q6WRU~~+iD70xHZv5yb^q9
zSl{&Z2jJC&)zq%KFf=>9ZDcPg@r@8Y&-}e!aq0S(`}NuQ({;aigCPnq75U9cBH&Y7
ze)W0aD>muAepOKgm7uPg3Dz7G%)nEqTUm_&^^3(>+eEI;$ia`m<pPp!PnmJ$ax-Ni
zriP82FsWaes>>m0QHEkTt^<h|Kl{fGlDwG;CQ*b4lzdo-V$nC8<LA?4QJ%$e&M1jF
zj4MPd95jth&|E!zZ*d9v(}1-nH2c9uw}SWz(o)!u-C;JXs?Old?KmR?ZVapLr)~kt
z-!pxZ2T4qAqb;DH9;hiuAcN#25{6pE|B@nn@LY@;@6X}9ZRu6|3F2X?Musq<a_n+z
zJMV<b3!3d+o(r5xln5wq$mvr`E9}w25J;Qi>=cx^JsBC68#H(3zc~Z$E9I)oSrF$3
zUClHXhMBZ|^1ikm3nL$Z@v|JRhud*IhOvx!6X<(YSX(9LG#yYuZeB{=7-MyPF;?_8
zy2i3iVKG2q!=JHN>~!#Bl{cwa6-yB@b<;8LSj}`f9pw7#x3yTD>C=>1S@H)~(n_K4
z2-yr{2?|1b#lS`qG@+823j;&UE5|2+EdU4nVw5=m>o_gj#K>>(*t=xI7{R)lJhLU{
z4IO6!x@1f$aDVIE@1a0lraN9!(j~_uGlks)!&davUFRNYHflp<|ENwAxsp~4Hun$Q
z$w>@YzXp#VX~)ZP8`_b_sTg(Gt7?oXJW%^Pf0UW%YM+OGjKS}X`yO~{7WH6nX8S6Z
ztl!5AnM2Lo*_}ZLvo%?iV;D2z>#qdpMx*xY2*GGlRzmHCom`VedAoR=(A1nO)Y>;5
zCK-~a;#g5yDgf7_phlkM@)C8s!xOu)N2UnQhif-v5kL$*t=X}L9EyBRq$V(sI{90>
z=ghTPGswRVbTW@dS2H|)QYTY&I$ljbpNPTc_T|FEJkSW7MV!JM4I(ksRqQ8)V5>}v
z2Sf^Z9_v;dKSp_orZm09jb8;C(vzFFJgoYuWRc|Tt_&3k({wPKiD|*m!<X$9n>+<d
zfwbu(US!ljdxEAm@8L<A)Zh;j$1@#3i1Hba7~+=OxccBV?z(KQ^KiX-VG5F8{s<bz
zFTJ%sXJxQmw1gpd<`@dDaxW+0z@mAqX^!9bM3;Rg{vJ$y`jrFPf<taTjgOUiGo`tq
zU8^ynJ_vtmGeduy1>za$(l*!gNRo{xtmqjy1=kGzFkTH=Nc>EL@1Um0BiN1)wBO$i
z6rG={bRcT|%A3s3xh!Bw?=L&_-X+6}L9i~xRj2}-)7fsoq0|;;PS%mcn%_#oV#kAp
zGw^23c8<Fs8D%<c4(Nre;Oy43eq_*f8CVI6Y}O$7=4|A%Bh)_#+dgnF@9B?PZV+FK
z@D@b4V?}Hxb;mfT&3=fp%aQ_W<BpQFv8~7WceKD?ShRTE&*xP)Rp+|r%gOH<b#|`R
zpMk-?U*1{fo}21TS!!|lrVyo(<X*MXXY2ANSehq$FQcbg%rc;PQLx;F?K=D0V>_0~
ze}v9(p};6HM0+qF5^^>BBEI3<e#!JG>d=2<KmW5$FDhY04Ol??L%ZUPasCO+Pj|h!
zL*;#e7cVT$<F2gg5E8<=1=Y;hH6lJKfJK6P>DW&O#|(;wg}?3?uO=w+{*)+^l_-gE
zSw8GV=4_%U4*OU^hibDV38{Qb7P#Y8zh@BM9pEM_o2FuFc2LWrW2jRRB<+IE)G=Vx
zuu?cp2-`hgqlsn|$nx@I%TC!`>bX^G00_oKboOGGXLgyLKXoo$^@L7v;GWqfUFw3<
zekKMWo0LR;TaFY}T<F_}BWybmURg`OY9TP`)1kkA_VfNgEb>t4!O$3MU@pqcw!0w0
zA}SnJ6Lb597|P5W8$OsEHTku2Kw<?~p>9y4V=hx*K%iSn!#LW9W#~OiWf^dXEP$^2
zaok=UyGwy3GRp)bm6Gqr>8-4h@3=2`Eto2|JE6Sufh?%U6;ut1v1d@#EfcQP2chCt
z+mB{Bk5~()7G>wM3KYf7Xh?LGbwg1uWLotmc_}Z_o;XOUDyfU?{9atAT$={v82^w9
z(MW$gINHt4xB3{bdbhRR%T}L?M<kc`={1@bX$@c}pX`50EN?1djSoIxW|Rhd4u^_G
z>cK?!zkLK3(e>zKyei(yq%Nsijm~LV|9mll-XHavFcc$teX7v);H>=oN-+E_Q{c|!
zp<Ol>JV~-9AH}jxf6IF!PxrB9is{_9s@PYth^`pb%DkwghLdAyDREz(csf9)HcVRq
z+2Vn~>{(S&_;bq_qA{v7XbU?yR7;~JrLfo;g$Lkm#ufO1P`QW_`zWW+4+7xzQZnO$
z5&GyJs4-VGb5MEDBc5=zxZh9xEVoY(|2yRv&!T7LAlIs@tw+4n?v1T8M>;hBv}2n)
zcqi+>M*U@uY>4N3eDSAH2Rg@dsl!1py>kO39GMP#qOHipL~*cCac2_vH^6x@xmO|E
zkWeyvl@P$2Iy*mCgVF+b{&|FY*5Ygi82<omgvyGTqv|QTz=sN}TZ6>37i)9YW#Fp&
z?TJTQW+7U)xCE*`Nsx^yaiJ0KSW}}jc-ub)8Z8x(|K7G>`&l<bpFP+cS)jO`N_V-8
zyz*&criMW3Tge5_hcWP_V8=SvD0*^&JQ8c;z^ZkOK$H-b5$|gm$@;EfT;;o$;h7dL
z>{Y&~W=q#^4Gf{}aJ%6kLXsmv6cr=Hi*uB`V26;dr<aSR^xo%$9+~>4C$WrPnHO>g
zg1@A%DvIWPDtXzll39kY6#%j;aN7grYJP9AlJgs3FnC?crv$wC7S4_Z?<_s0j;MmE
z75yQGul2=bY%`l__1X3jxju2$Ws%hNv75ywfAqjgFO7wFsFDOW^)q2%VIF~WhwEW0
z45z^+r+}sJ{q+>X-w(}OiD(!*&cy4X&yM`!L0Fe+_RUfs@=J{AH#K~gArqT=#DcGE
z<spTPWq%oqdho$J0xh~6Q=^v}j=vBe*gL+|ud>!FwY(h&+&811rVCVoOuK)Z<-$EX
zp`TzcUQC256@YWZ*GkE@P_et4D@qpM92fWA6c$MV=^qTu7&g)U?O~-fUR&xFqNiY1
zRd=|zUs_rmFZhKI|H}dcKhy%Okl(#y#QuMi81zsY56Y@757xBQqDNkd+XhLQhp2BB
zBF^aJ<Yyh7pM5zBvii~t`R`{~RErSl{}-#Xjol7q<MNou@wjO9-e0+&FnPZ^6y4Ll
zv-4#qZasZI63$>__D676wLu|yYo6jNJNw^B+Ce;DYK!f$!dNs1*?D^97u^jKS++7S
z5qE%zG#HY-SMUn^_yru=T6v`)CM%K<>_Z>tPe|js`c<|y7<QPU`KuA=GRt?21}m$3
z)egm^_v+KsYdG<vt|ej|@=R$E;WS|)lq&hvDYqCWcNQVq*yoxejj)Sgjj^Yjl?NcX
zDFDlAtM@eY^eKCIx3Bn3tvI+`G-P!;moJ^4fysp(P&5s?@p7p>?qol&)C=>uLWkg5
zmzNcSAG_sL)E9or;i+O}tY^70@h7+=bG1;YDlX{<4zF_?{)K5B&?^tKZ6<$SD%@>F
zY0cl2H7)%zKeDX%Eo7`ky^mzS)s;842cP{_;dzFuyd~Npb4u!bwkkhf8-^C2e3`<?
zuCMcKb49Z{nlgrGOONk{-i&aq@>q8>MuPhgiv0VxHxvrN9_`rJv&GX0fWz-L-Jg^B
zrTsm>)-~j0F1sV=^V?UUi{L2cp%YwpvHwwLaSsCIrGI#({{QfbgDxMqR1Z0TcrO*~
z;`z(A$}o+TN+QHHSvsC2`@?YICZ>s8&hY;SlR#|0PKaZIauCMS*cOpAMn@6@g@rZ+
z+GT--(uT6#mL8^*mMf7BE`(AVj?zLY-2$aI%TjtREu}5AWdGlcWLvfz(%<HnWJcfj
z-uvEteDlov4?jvo%cNeW+poNG>wn72tGczwUOgGD3RXpWs%onuMxs9!*D^698AupW
z9qTDQu4`!>n|)e35b4t+d(+uOx+>VC#nXCiRex_Fq4fu1f`;C`>g;IuS%6KgEa3NK
z<8dsc`?SDP0g~*EC3QU&OZH-QpPowNEUd4rJF9MGAgb@H`mjRGq;?wFRDVQY7mMpm
z3yoB7eQ!#O#`XIBDXqU>Pt~tCe{Q#awQI4YOm?Q3muUO6`nZ<tt>4^zi5|(w<YclZ
zu+KExzcVzp-<c6itggO*X~x)Ub6iWOWm1_uy?SO#%E*8SSZpyY8dd&ki$+?HWK*%s
zK>b9R)oyarG?mI|I@A0U!+**&lW7_bYKF2biJ4BDbi~*$h?kQ`rCC(LG-oO(nPxMU
zfo#Z#n8t)+3Ph87roL-y2!!U4SEW<vR3`WM9hpvJa%7CIt!<Og+JH8nPFHCj`HIon
zWU69v;ml6>NCIM16i~-&+f55;kxC2bL$FE@jH{5p$Z8gxOiP%Y`hTTa_!v{AKQz&-
ztE+dosg?pN)leO5WpNTS>IKdEEn21zMm&?r28Q52{$e2tGL44^Ys=^?m6p=kOy!gJ
zWm*oFGKS@mqj~{|SONA*T2)3XC|J--en+NrnPlNhAmXMqmiXs^*154{EVE{Uc%xqF
zrbcQ~sezg;wQkW;dVezGrdC0qf!0|>JG6xErVZ8_?B(25cZrr-sL&=jKwW>zKyYMY
zdRn1&@Rid0<C+MnR2o`YS>oIhoRl)+X4)b&e?HUVlOtk^(<zwTW;whij!=-BE}&In
zXFHQ`T%bqdF}QRhp(UdsqzoXW^^{Cu7}aml+o{qH+6C)t@qf6nzbm;nY3xsK?iUUZ
zuVHw|MYP8Sn2YhNSD|j$%_1Jif>xl<NWlN1(3;V2Mahbi86q?_SJr9JNDuW2Zu(9r
zg9R<qC9s8->dhvgf^7r+@TXa!2`LC9<CJjGUIJTusY3k-%1g5`J)=+xD=iAagk|Z0
zbVg4EgrODM$A2{4B$Lg=;`O0e8rkmvgzD5YJ`2#7_lN<X(c{bX>AsB@wEO&eU2mN)
z(2^JsyA6qfeOf%LSJx?Y8BU1m=}0P;*H3vVXSjksEcm>#5Xa`}jj5D2fEfH2Xje-M
zUYHgYX}1u_p<<Rn@EZDvN>|fIC+pI5g6KGn%JeZPZ-0!!1})tOab>y=S>3W~x@o{-
z6^;@rhHTgRaoor06T(UUbrK<L%k*y$z*GoaYL0(Ax6MX8ZY6UNxruI8=|=i@Ca=FV
zjODYps&qYlQq-c*B(C!ypHk^s`ZUw>4+@5bO?r=!vckDD+nwK+>2{{|{u4N@g}r(r
z#3beB`G2`XrO(iR6q2H8yS9v;(z-=*`%fk%CVpj%l#pt?g4*)yP|xS-&NBKOeW5_5
zXkVr;A)BGS=+F;j%<x9&4$@s^^kw=A>O|69F0Lne?{U*t=^g?1HKy7R)R*<>%xD>K
zelPqrp$&BF_?^mZ&U<*tWDIuhrw3HJj~--_0)GL8jxYs2@VLev2$;`DG7X6UI9Z)P
zq|z`w46OtLJ1=V3U8B%9@FSsRP+Ze)dQ@;zLq|~>(%J5G-n}dRZ6&kyH|cQ!{Vil(
zBUvQvj*~0_A1JCtaGZW|?6>KdP}!4A%l>(MnVv>A%d;!|qA>*t&-9-JFU4GZhn`jG
z8GrgNsQJ%JSLgNFP`5;(=b+M9GO8cg+ygIz^4i?=eR@IY>IcG?+on?I4+Y47p-DB8
zjrlar)KtoI{#kBcqL&4?ub@Df+zMt*USCD_T8O$J$~oMrC6*TP7j@H5trGV$r0P6I
zV7EZ{MWH`5`DrX*wx&`d;C`jjYoc_PMSqNB290QXlRn_4*F{5hBmEE4DHBC$%EsbR
zQGb7p;)4MAjY@Bd*2F3L?<8typrrUykb$JXr#}c1|BL*QF|18D{ZTYBZ_=M&Ec6IS
ziv{(%>CbeR(9Aog)}hA!xSm1p@K?*ce*-6R%odqGGk?I4@6q3dmHq)4jbw+B?|%#2
zbX;ioJ_tcGO*#d0v?il&mPAi+AKQvsQnPf*?8tX6qfOPsf-ttT+RZX6Dm&RF6beP3
zdotcJDI1Kn7wkq=;Au=BIyoGfXCNVjCKTj+fxU@mxp*d*7aHec0GTUPt`xbN8x%fe
zikv87g)u<XFa`)x7(;`tKRdCl%zvlpDa(FQF6a4-(c(tNXi-s0t1@H6aN>~0cpQaf
zd<7Mi9GR0B@*<TNFs6&?{V6>S&l&9pCl-HEaNX?ZY8MoXaYHGDf}733;(88<{E%)<
z^k)X#To3=_O2$lKPsc9P-MkDAhJ~{x<=xTJw2aRY5SSZIA6Gij5cFzsGk@S)4@C65
zwN^6CwOI9`5c(3?cqRrH_gSq+ox(wtSBZc-Jr5N%^t3N&WB|TT_i4!i3lxwI=*p)Y
zn7fb%HlXhf8OGjhzswj!=Crh~YwQYb+p~UaV@s%YPgiH_);$|Gx3{{v5v?7s<)+cb
zxlT0Bb!OwtE!K>gx6c4v^M9mL0F=It*NfQL0J0O$RCpt746=H1pPNG#AZC|Y`SZt(
zG`yK<fxmbRn_~3f^D$uXR;DE-6l2Brn44`tAjOgDc$;+zFmZqKsnw<WO1^-%tK7vG
zq9rVGYRKsA6^HB)rDuo5<t~+X@@_Ht9zYzz5%-9s*T9%xs!EW^Uw?kI9?&CM(MEAM
zd|xD+#U-^eF-KWv>MBPV_0I|S?}?$t7G<RgM>U%;*_39bCGO*x3+R|<=9WNe!8jH-
zw5ZJS(k@wws?6w1rejjyZ>08aizReJBo%IRb3b3|VuR6Uo&sL?L5j(isqs%CYe@@b
zIID7kF*hyqmy+7D(SPa^xNVm54hVF3{;4I9+mh)F22+_YFP>ux`{F)8l;uRX>1-cH
zXqPnGsFRr|UZwJtjG=1x2^l_tF-mS0@sdC38kMi$kDw8W#zceJowZuV=@agQ_#l5w
znB`g+sb1mhkrXh$X4<U2%FUm!iUg)BMsC71C8xC>y(<-CntwmVwah5#oA_p-U<_5$
zGDc%(b6Z=!QQ%w6YZS&HWovIaN8wMw1B-9N+Vyl=>(yIgy}BrAhpc2}8YL-i*_KY7
ztV+`WKcC?{RKA@t3pu*BtqZJFSd2d)+cc07-Z#4x&7Dnd{yg6)lz@`z%=Sl-`9Z<I
zvq@B}FY%WJ&40l{%|nmhSKk!tZA)f!GeKYiaz;%KM5ZvweU<MKIGA~y{x*{g>~*io
zck_Lshk9JRJs=t><bs*w&DW%*QMrzYtZr})w%D?D^TyWZZ3+)hfHZHb_+blj1dx}-
z`Yr57thGn2H4E-BYweqe1pPoHo=wO0nOC=skqA`Su74$=MZ|5xc;Aabz*JI;TUTsx
zBeECjs&AbV9s2(kKjDH?ew*pEsRM4|QkgMxq)r%2#hz9wB=Xcs?v>1jmKB~>`6+(J
z@(S}J2Q{Q<aLwQD@U#3~m1O=Nj9M3u>{a-ASTnIViecW(FIagWQ%G41y?zS)gpooM
z@<VGKqkqS#V-&Y$lNsd6am~a_n3S50Y&>c<2$7TykMs4LH*UUYfts(!Ncn`?eZl}f
zg)wx@0N0J(X(OJ^=$2()HLn)=Cn~=zx(_9(B@L04%{F_Zn}5!~5Ec5D4ibN6G_AD}
zzxY^T_JF##qM8~B%aZ1OC}X^kQu`JDwaRaZnt!YcRrP7fq>eIihJW1UY{Xhkn>NdX
zKy|<6-wD*;GtE08sLYry<V<QH1Sv(jnToX72i-sNpHzN}-)36<|L{|pF{8{fZx)*4
zMp{2#T-wD4#<BxWH#fupXEv>W<-e)?7k;;B>e$u?v!QhU9jPK6*Y$o8{Tl`N`+QvG
ze}71rVC)fis9TZ<>EJ2JR`80F^2rkB7dihm$1Ta2bR?&wz>e`)w<4)1{3SfS$uKfV
z3R=JT!eY+i7+IIfl3SIgiR|KvBWH*s;OEuF5tq~wLOB^xP<BqZESF|TGvQX!tiq(3
z|Mp-8M+j94YLq<UQrMUO77=nwv&Hv{1%HwlNG60+0mF+VI@+*}+Yy&?lVZ@?0xxr=
z(^TnHX`Y)}t+&&KEIW%omrQ|e2EBBKDpg3BO{Sr4h#<3UH}T5KTE&42rA5Mk7*Z<J
z;?oZt>_Dc7-BbNjpC|dHYJrZCWj-ucmv4;YS~eN!LvwER`NCd`R4Xh5%zP$V^nU>j
zdOkNvbyB_117;mhiTiL_TBcy&Grvl->zO_SlCCX5dFLd`<IhUzJ>q7x-lBj*&ykj^
zR3@z`y0<8XlBHEhlCk7IV=ofWsuF|d)ECS}qnWf?I#-o~5=JFQM8u+7I!^>dg|wEb
zbu4wp#rHGayeYTT>MN+(x3O`nFMpOSERQdpzQv2ui|Z5#Q<D=p76p9*uO;+Tg4e>d
zB(+GbXda|>C<gg{Slr$#(gyLVu*4PBxH}eUBf0=-6H~npz6ZXezWrJ(10XZ|kJf6R
zW@a#7#xRRP5Y#bqIYq%2?-;boe6h4IYkgu-r1Np~n3gcG_CXgI%zf5XB!7hO#H@AV
z%SD8PvA>W55ky@mG13K0wfXAm8yoek3MJG!Hujn$5)Q(6wWb-l4ogu?jj2Q|srw?r
z-TG0$OfmDx%(qcX`Fc`D!WS{3dN*V%SZas3$vFXQy98^y3oT~8Yv>$EX0!uiRae?m
z_}pvK=rBy5Z_#_!8QEmix_@_*w8E8(2{R5kf^056;GzbLOPr2uqFYaG6Fkrv<RIBB
zuZTHP@Q)>($n_51%7~QN<&GT9$WdjE=H}>(a41KM%d2x#e@K3{W|+=-h*mR&2C01e
z2sMP;YjU)9h+1kxOKJ+g*W=&D@=$q4j<ya_SB@^U{)R?qM|jt+j(;KAZ9hVq;}NO}
zhi&DNPJ6lDnWI>F%@HyRtCwOmEmpS|R<c;xFIK|k0{|?){0Ln&Ob18k+HlZ5Lf3}_
zhv|kK-7-YC4bh<y`b;?J2zc#7^x22#i%dbM*ZC0L&2)&5c^%^Y>r9V<bWqOG;Y0i-
zuUwuJV$!S;8V0UF9e)`-{w&rX$<bqn$O|+X%6Y;o@5#|qIr?7EF?jqQ>_2br*NOd^
z4LN#oxd5yL=#MPWN{9Vo^X-Wo{a7IF2hvYWB%eUCkAZq+=NQ<Q2k7Uw(;NW*(gb!6
zQrQT-79OJiJ{kZTAcG2|_9{7g;}BH{TH?LH+sr_ocF-lDTz@9iN4$;^dNb^G?J585
z5dAJkZ{_H1vG){&&e2~Ek*6T2#m4(jd-3Dlpu@3TsZ_jB*ZX(Af5hvkRO}ZENh=jo
z)SzOLRf@=3%)A=}h*t@Mz~J$tu#;BI?7QNW$dr8L0h$Cxj#<1f_u9b}+lN{07@-@%
z`4E?tXLCILFn@b;JbTRA)K+9`56{W*-0*Vc4w@zCd3auq&)7bA`~|NmidVK(Dnc6B
zesSK^=JtbLdpIDDTwERzdgAHZ4|9!Js5?ZRUN~Sw&`}=2dN}Abd01+{M)-vF<81pE
z=oI00_+`uS3NVAH86<s#SA{*idWg?GYQ3%zuMcqZc7G4I4s#pMI!2Wuv>=iLI9?~@
zr+|ky4Rgm7yEDuc2dIe941~qc8V_$7;?7|XLk6+nbrh}e&Tt20EWZ@dRFDoYbwhkn
zj<rL!Cr3CE4%d$Gg76SWhq(7J?`<F91i%BehdB*P4D<dyLwwl?UlDFc<c;u^AnB+X
z;;REg{C`ovhdU1Qb%H*v1;ZZxc#dxfFPHBSjy>J$th974Z0F${3wtVLk_Ty;*J-Pi
zP0IwrAT!Lj<oLFr;^9vZ^Jl|Bmlv;}%kdX;eAfuy4L`CkS91LIN(DUKKXYM@A2i)d
z#?QlWE^#`&wa0R^pe*dC9OfYqf@;k?pn4ra*MA_~1S=1T73q^TL07=5cwK^0KoC02
z-x#GOB0~^^P6ajBVLloTss(B;uOlR+R13rw*Lqzw;|M)oOep{A9Hn`fkB#tC;gA=S
zdhNAP>34GcoSB8g?IKPt%!iLD-$s+f_eZg@9q!2Si?`F#fUqY`!{bM0O7V^G%VB|A
zyMM>SKNg|KKP}+>>?n6|5MlPK3Vto&;nxppD;yk@z4DXPm0z9hxb+U&Fv4$y&G>q=
z799L0$A2&#>CfSgCuu$+9W>s<-&yq3!C{F9N!{d?I|g|+Qd9@*d;GplgY5Fk$LOV+
zoMealKns!!80PWsJ%(}L61B!7l?j1_5P#LRrVv%NBhs{R`;aufHYb&b+mF%A+DGl5
zBemAHtbLFi++KT(wv9*?;awp>ROX~P?e<4#Uf5RKIV{c3NxmUz!LYO#Cxdz*CoRQp
zSvX|#NN06=q_eTU5-T!RmUJ?Ht=XQF8t)f+GnY5nY5>-}WLR1+R5pou?l@Y|F@KEX
zk=jh-yq=Rn9;riE*;S<SC4qvrM$x?L9*?xeN{b$8>lo}PfNKhXO#;FrZCf%VZ9h7W
z<63YWE^s_SlAVQh6B(En9i<9%4AT|2bTQ4Ph2)pI?f2S`$j?bp`>_3(`Fz&?ig-FJ
zoO7KAh@4BDOU>sBXV84Eajr9;>wlbW&OSUt&dug?oAV;`+3oBzpI18%%1wA4blzmb
z-{QPYJmn_2-F$A5JI!a8+-p8Bk*^U?^f5j7uZ}jEz0E3;XbahB2iZwS&l4jj4WRS6
z3O&!w=ymQSl~7LUE99noXd2y1)9E>yK`+ouR%sTOQ@Qjt@<<O;g>;lErGLk1wrw7r
zV)M})+amJXs_9hQa++&vrqgU&Xr8T)=G&5Vy6vOnvt37L*nU7&ws&ZO-9`)TGA**t
zpby#0X|df;etRud+s~#Y_7zlPZ=_oLg%q&wraF6s>g@;VO#2sUseO=^+3%&Z?61(-
z_IKzU`+Kw;Blil&LR#qv&{rzQnG|%i(Q3zLI@gh)2FE^H;~1dx9G|AOj(e%mSwT(C
z71Zp!jar<yQ>*i3S|_ik_3{n0L4Kav<X35<{5EujksbPy$o79wO9u!wto+&^6#xLx
zDU;zw9Fxm!Ie(jbdz(GluHDkTx^9E6ZQ4Cp*}@o%j!C7Iv2K*GVYy9i)4L_PCHH3C
zKoAuX5d;y`ZOBWcqNspfS}0>YWWZ2x3MhyU!66E$h=L+A&-s$9X_w9Q_e;+`-{ZW#
z^Zn2H_I~`}!vGeFRRY^DyKK#pORBr{&?X}ut`1a(x__(dt3y_-*Np0pX~q39D{Rns
z!iXBWZO~+oZu>($Mrf0rjM>$JZar!n_0_!*e@yT7n=HfVT6#jbYZ0wYEXnTgPDZ0N
zVE5?$1-v94G2@1jFyj##-E1Um(naG-8WuGy@rRAg)t9Oe0$RJ3OoWV8X4DXvW+ftx
zk%S(O8h?#_3B9-1NHn&@ZAXtr=PXcAATV*GzFBXK>hVb9*<BlrkfXpOFkOx&9W&Y(
zvf`m+B4Nax#%9{4cSQ{aDs9}XN9RPXkRCnX>`iMM-zvA6RwMH#2^901uxUFh&4fT%
zmP?pjNsiRIMD)<6xZyOeThl_DN_ZJ*?KUIHgnx{vz`WKxj&!7HbM8{w?{Rued(M1v
zKHsK{_q=YI88@Bf0*RW@cIV@=<{eGsG21xrTrWycT7*KBd!eD2zb1R(O@H~k7>Duv
zHPwp=n8;t#1>7~fuM9IaD5w%BpwLtNCe_Sq9eal4oj2DB1#<+(MGR-P&Ig%3t%=!<
zS$|KxI1a~an2Q>L$s;1$9nQJal4dk)Box$YsAKgCiEGni##jr|%So6Y4J@pYBF!;~
zhXwpKhc7&QZ$=e~Sb&ABZ4o)&U~N*dSU`2G^eQh-WCe9tA}~Ae369btLl<C!I4@0`
zGLiyiCAP}Ip6|uUSkAMjkh!MKQoLA^9)CJbU;;V2qRY0TNyk{NJ3U^kOnY~_K;@BB
zLcu5KLh7NAVN*uVr<{z`95sXfpBG2jJSRh&8E7bWE%>B{GjOKB@yEDH!C7Q&df^#X
zi~?{rCuAE|kAjKzt+r#t6s)1h840@A<%i5(O;$Q&tD(opg0)yzgm#=ucf4CSqkqYS
zaTdivk5I~#=1Z9K5M*uV6H??6s9*ynT`vzr2@%Tkr4k+Tr_ib40$fPP7$yLA$cwJ@
zF@`94=op)$x^0t+QAsNY$pi!4e7hp~gO=|yD=^8JTvTiC(HAamYEQ<z*u)-f1l>}t
z+hR~QoKTOz%)IHEg&6iC4vP=3mw&u4wvcSwi$vNBGQE5RoSUs^l+u{A+6s~aMMkXG
z+1g4wD8^Y2<w_nS2m7!^!)8#{7e#4=)sw`MntAKTV!<W&H0!%Gdm2*8ibO(};uU;G
z!{v+vZao|xa~v5E;#>7Oe4f``K{+tm76n(*d6<qtVYDcTDn?n`k{KsEu7ARpit$BU
zO%5GCuizR=3aYPd#umqmuV8sGuEli(j&V8gRm|pr8z_!ZD-tnC(bRl*s8vpqwi|I%
z5e5G1<n>BUA4;pLa26`6RD6?Rq?2K1yMXVAk`&xbks*~{+``Mhg<C1&>4cQEuw+aM
zaI9{}9en8DCh*S9CojIk)qh|k?#iNiCQ}rAmr&iYR<t*_v}8f?dyGqW<NFj*>JiND
ztt+j*c+}Fv&6x&7U~!(Sb1eAz1N@Nf`w?YxGJdhy+seiNNZEYIG1_<^?&pm^P8W?d
ze(p@$nWC`<TizHIL&PKuLfOp(5!FYo71^8O#e*1TDG!miS*@ofyMMclgb`k2=(1it
zOy`uHYl-(JGjNifek5D#G6v@?QSexvgOY{hCmJ5d69R?n)~@m|QSqce?a0C$8AmKd
zPiuG-dl`ogZA+V!ng6MV-S`<@5t0&arOwZb=Qw1$@pDoeidr^}{DPZ--S{QB*lZ=E
z;i|ahRCP1RRMDO2sedBSp`3kzl0HwSW)nlfuPE-e-fgT)5SGoT83RXSWBw9e*6?fm
zW=uKHUizb!^WXB#`JI4hQ1L1`M=sk|JU~Ximc<#lb8Sz;>Pxqpf8d&AIGNJn#Ty)j
z1NbA^Y}pNQ>OfTdiAp+WR>C6390IrFj;YZglitGH8r7(GvVRpWjZd7|r24M{u66B)
zs#VS$?R*!1FT&sO-ssvW<tq3m8RS^4Rv%RhdIO9Ylq(~zK_B2>8s5jh$-O=^9=7^y
z75||~QA6zLW}Lu!YOZh1J$j<uxF~7FLunBCFFxk|2PtY@W;}D|s-TC#l#yK&C~irz
zJ)LlKO7+mYLw^;8gj**rUaSg*9OH7S$E~<Y_R4E3ie%d(GzRSTN62mA)kJ|9M>46m
zNH|;^a$U_RKgla5h>5(igl^ek(~2nL5a_0}ipvA_Xf0k*E-ExJNld0{LZ;<hGrGh%
z-E8jt^9rA+<V{mY6*3YU(;bJMpRS1+vY(!7&yA~szJEO3a#mnjo-|s2#GD^3m^4?5
z*(6)cVFgP@<q73CU28=gPXL~IU8RS{cGKxmk~L4%YNAHeQ5m5Qi2AN%uj3Vd0stCq
zAov*p0NZe?j4ehe>F^DzqAL+IZGJ7<3<z}D#C%puf*qsH=##y!SSZ^IL9KS>i1szf
zxMRkQ(|@;wj9%I7h{c*{;?g%giylU}Dz{iwb(1vGK<-vlnKs!|Mb9}iTt)Rl&NZka
zkkugrMiY(ng3QseY!npaOf1jo3|r35nK+eTYh*`DHa<o;XAO1n1<mxbre>buv@IFy
zG7@V!LWE0&)bvqgQ8=-L-(vt#Z-&xaOj3G@Nq<T&HvleLUxrEa;$BHyE$#OZolzUy
zu)$Zb6BTtkF{OSdD*Zb#%~!Y+GX^p1KJZ@&sxdpguW$$HB<b$!YKJj5*jhV)DJjew
zMqRMBa}f2Cou9%9rA_oNg{6a7Hh{_$PThvZbtyD&Lj&!ppkHM$g;hgn4W2cCbAoMq
z;D70NkFUEQ9VBFZ3VI6Rj@n>w1FfbNQ`!bFEl@z)0)+#Z5e#_hQ|Rd!KrEoRn^aFz
zkzYzz%hher>ixcg6fW`=rr>Nx@enQ!sQqYR{<2^|eUfw?e8;B_<MLoY8^mWHZYp*+
zdCR@!#dlz)Pc8Q@3<kzYql<l-kG{UpaeswZ^dEfHrv+4>`T)Kxkp8${U>g?k*VhCd
zp^yYLvi}<#5TDjrx@{0U$jx*tQn+mhcXsq2e46a@44^-Sd;C6S2=}sK1LQ_OUhgO`
z^4yN+e9Dv9TQ64y1Bw)<aDY=7<mf(-mAEUQ4oj^*)u;J0N8wMeoS(Cj&Vd3ljDOw1
z4ZP#g;4mI13kR{M^r=BSGl*wX*cVV!c;2T5lzy~vz>0i4u)98(^+@R~eUUsG!Ye84
zFa7-?x3cqUXX)$G<2MgYiGWhjq?Q-CE(|sm-68_z>h_O2vME5nX;RodIf)=No(={I
z_<&3QJcPg8kAI}_Vd+OH4z{NsFMmjv3;kunMSh94VNnqD?85uOps%nq=q?kU_JT5@
zwih;eQlhxr)7d^K#-~InWlc&<*#?{A(8f^+C_WmRR{B&Yh3pxhLU9-toLz%rCPi}}
zE!cw^pQlXB3aACUpacU&ZlBUl(Jo4fxpbDVwDn^m{VG||ar9B)9}@K`(SJxmAWro&
z_3yzfUqLoXg`H($!I;FTudPdo6FTJm2@^S|&42H(XbSRW7!)V&=I`{;mWicu@BT7z
zQs!)F9t-K|aFaMsoJ_6z-ICrzjW5#yJRs>~)bugki)ST$8T%!D4F@EBliCNSA5!fl
zN;OuKbR3m0rj=rrq}5`nq<<%iHIl|euXt6QA}$hFNqV)oR?_Rm4oPnoLy|ru_DQ-=
zJTDFa;zjY2<PV6qn7XcU-RK@CR!CYTnq50ww@RKV^S8O~lsr@B`&|Q)XUhDb>p{sg
zWqz0I5y>-U{xR1Rl4r{NQ?6Ge&y@N7t~Vsll=-(^?@FF2^Y6JnkbgW==09{7N}eh4
z?h<ze^O6!zfO$HB=SEZ#@Cuws0NepL)}w%){Dt(+^x#SY;TxdhE&|n$potYICXn@t
z2*!yR#=Dkdf@>`%x-LM8D}+*41ZA#EG0D9K<?ahm;SOQ4y9ZO;o8WU>Qjc2#z59Pq
zO9u!y^MeiK3jhHB6_epc9Fs0q7m}w4lLmSnf6Gb(F%*XXShZTmYQ1gTje=G?4qg`Z
zf*U~;6hT37na-R}qnQiIv@S#+#J6xEf(swOhZ4_JMMMtdob%^9e?s#9@%jc}19Jk8
z4-e<fJGUi+8%jcV#|_$U!wu3nQ(ERKO}sb_iFHGoq$S?$Nb3b13T|vSw(d?_YD*0_
zEsMNZW}YfMsI|Qnwl<kH&7b*pS8En*M|$f8l0+&YGAfB!?UAv37VFKm&9#%ydPIM(
zdeUc9>KFdIEVQN4T|=j2t&EtMI{9_E$cx)DHN2-1mG28IEdMq557#dRO3U?22M($g
zlriC81f!!ELd`)1V?{MBFnGYPgmrGp{4)cn6%<#sg5fMU9E|fi%iTOm9KgiN)zu3o
zSD!J}c*e{V&__#si_#}hO9u$51d|3zY5@QM=aUgu9h0?tNPn1w)HWnB7LQ^GRUjeP
z(zSg-y4St;3UIQ}ZX?^;ZtL2n4`>^*Y>Trk?aBtSQ(D-o$(D8Px^?ZI-PUB?*1fv!
z{YdHme3Fc8%cR@*@zc5A_nq&2=R4<r9-m+R&Zn;t(I(C@T{wI8;I=1PhV;xy!^*aF
zw`7J}+FLSqet*o&>7Hp@$-JF4Fz*;SLw5}<j_PhQGiqc`x`n*k(mkx_T%)~ZY$Tc2
z$C9SVFow3@ogLZ?UT0fn|8OCf!-PAkCpQX<HDX$Z;h5G4W=|Q8i?cAltz&b?wq({g
z)$(MBm`NM73r@zk-^>|ID{W__bHvfJIivHmqmPXlPJd^=<$8K97bHK^(i8eAy)&m<
zBc1z)P8b<4NOeqgIeTQpaF|x5YV1#`#T`tctbN+b*?N{~O)bV<<z=w0G|psl1=l>K
z^y<lE4A<SOTe>>s-s;V!<r$8p=Q@YM*qO64CvoA<-ScjT@Va|U%k*|KJrcWxzPHq{
z*5U!(8-ML_T_Zn~!}hj^n0&Fehr+a&mTDBF2BsbV550rbq|q{J2ve9A)l-0$hbct$
z@^xF7G+HQME8$LE?OL~C!v?02niniPbVo`#)3iI~u<}T`cF+^l>}b2i=5=M-ComP?
zju>8FPIq0VrdV5*EH$|!Ot;e=VudJExcb;2wST}N#u?M~TxGC_!?ccCHCjt|F*PgJ
zf@kJB`|Ml}cmsyrAjO#Kjr^E5p29w+#>$C`Q|54BoDv$fQ9D?3n32P9LPM<W=*)YE
zse?M@JlL!0rj#DX(UtfhZPIA7xNo89?lK)HVLRht+EUVTE40?LfOK;#H9I(V$ZfXK
zc7NI5&9r!?jzPMIDQLR8<sxC)Nv#X%Ub>Izu?LjNqggOH=1@T{9bMn*u8(GI!;M<D
z7tPp~r<+z(x5mL%(#bU3j_B?)V;C6OsAorqO)DEU&gdC0Hy+(M%{Sf=qMjL{T=I92
z`rwLT+sW&&>Gs%MKpd@c!?|2x+D-Rsw10~pU|Rn@A}C1xOlxCribxes0~+n26qDaI
zA2$?e`opx3_KW!rAgbpzU)gFdjAKXh|5w``#F0R|c)Y)Du0_Ihhz^S?k^pk%P>9|p
zIDx)xHH^_~+aA=^$M!<8K~Hy(71nJG(ov0$3Fg{n+QicHk{UcoFg0-esGM}1X@Ad~
zBS?<d9l7c>mZCLw;l4W4a+D8qc)XJS`pUJ5X-f^1ytxwr`@si$lAE?{4G|o;O0l>`
zrr?;~c;{ZEFJ!!3=7=FdGJ?Q^xfNQh4A?i;IJ4}B+A?4olTK(fN++3CRBP97jTJnI
zF!X$o@{%29Dqq5zt&v4zmF$4E8GqYQko@>U1_;EC_6ig|Drn@=DMV9YEUSCaIf$kH
zei3(u#zm9I!Jf(4t`Vm1lltJ&lVHy(eIXE8sy9sUpmz%I_gA#8x^Zv8%w?r2{GdkX
z1SkzRIr>prRK@rqn9j2wG|rUv%t7pQ!2SrmOQRpAcS|Wp-{6gg=|^e5#DDOQVM?H4
z;eM-QeRFr06@ifV(ocvk?_)~N@1c2ien56UjWXid6<wFbYO4An`mpeRM5@Ny3+Rl(
zbU`xgF8Zh#5IvL!n|{2MoS$J@0_^k*xpuDL8B(Fc^sGo&OFzjx`jEid%&0ajY7f^6
zfatIeBxLVwwOXw-I;EOCd4GL8I;x*CqC<vZMLj)_&_*6PZF-{}tyZ6H4Vz9r>W%6i
zevIh)>dk|rIs##^kY67ib8Kw%#-oVFaXG7$ERyA9(NSJUvWiOA5H(!{uOpcWg&-?i
zqPhds%3%tFspHDqqr;A!N0fU`!IdoMs=lv7E*9NYeVfBht~=W5wtrfcc#o#+l8s8!
z(|NMeqjsy@0x{8^j0d00SqRZjp{Kj)&4UHYGxG+z9b-)72I*&J70?+8e?p_@=>-(>
zl6z5vYlP~<2%DU02b!mA{7mS)NS_eLe=<xzM?bHjUHTM)uwXrIBDU|SS$l5gff>CB
zc62^$j+OeC%Nkvg?0*n6EKlkPQ)EUvvfC=;4M&*|I!w}(@V_)eUKLA_t^%`o0PM9L
zV|UKTLn<KtS!oVFL)Q?{mT|@_FU$^-=?e7A^ee*ttH|7QwB8Lh$Ak3i&={ey4+SMm
zFH1;#j$T3N&fB6&@Eme<c}VD`qAe-rH_^|z`mhQuk;Qb^_kR@pQ1Z9v^BTQMzbz-D
zi>k|?M3u!|f2S0?UqZsEIH9*NJS-8lzu;A6-rr-ot=dg9SASoluZUkFH$7X;P=?kY
zX!K?JL-b~<#7wU;b;eS)O;@?h%sPPk{4xEBxb{!sm0AY|>CXVS(<o0c_+LmB_;dQY
z{5&bUko`3UMSlskT$p~5en}AeSLoCF>_RT9YPMpChUjl310o*$Qocj<cT9{r{SUb7
zyw8~+eM{OAdn8QXmU#Ln`e$U@gLrUCREOwaE9Fi3=+LNRpVo&2-v188V4HG54by)L
zRQ`khtGXQSuL|V<0Y7?3JSYt>Gdf>jS%%kn_+Y;Ztbauie*k&Q@=9;erLneIoel2C
zfCMiPTmYnjjxjV!Ar1h1yQ-31h=b@RZt-play?)#cs=ZxOt;5oX)|*e=7k*ASmQ;r
zO4_`=Z&gX-C2$fitvq+iGK1U*^*#IW!Bo{nON%KSxQv@MZsO%Lx21x78z740FSW!f
zJ%f-?XMgR#xdurqd6mWyUX2uh=Si>bnwg#gssR#jDVN{uEi3n(PZ%PFZ|6J25_rBf
z0-u>e4sFe0*Km49ATi7>Kn0f9!uc|rRMR1Dtt6m1LW8^>qFlo}h$@br=Rmpi;mI&>
zOF64Ba2v-pj&TB}f&A09bMg?1id{fn<o+-xxqqV`I(4E};GFW&(;WVov}3%HH;IhR
zkfD^(vt^DjZz(MyHLZxv8}qzPc(%itBkBwf_fC~sDBgh<3XAv5cxxfF3<2U!03Xe&
zz`is!JDHbe;mNmfkH+_LFE*I2^mdL@7(@9D^Dbmctn3bu{98(dlh7lKI0#mGVH(z)
zKYy3Zj)--;jA6Zy^D5&5v$o^>e%>Q?9GLm{i~p^lAn!%ZtF$I~>39XVZxk0bROh^B
zk9cE0AJBLozZIEmy7xG(yHWGztvf<IsL>nr0(2ro1%>zsGMS^EMu+S$r=_;9WwZkg
z)ww}6KOsH_)RkMh?x<ICbu<>@N2R^3(SICQNAzP7(RdB{@@`v*GfeSYLv=cfmTC<f
z(3^*m5~o9A&_)%lVDe@XW#mnNpPfZAT#_;^V_zXZWH^UJ6m3LR2*TSwYLLJG;HyFY
z`lD!=7J&u<gT=H2Ir9WY>%s2_T@_Cso2168v@AU^NzL&qv?6hZBJEdb)g=X=dVg9?
zYf78=0c@!QU6_a$>CPiXT7QAGDM}7Z(0z#_ZA=fmLUj{2z7@Ypo71UDy8GHr-&TLK
zf6a5WCf@Adl<p1`sp~vxi3mP+969Ibi5ssa2I4Q#TbRyM)c;uurU!iOgN?oMDSB|=
zD(y+9I6g^xC+NfA0s{OOtJwzUuz!ukeJ|0G1?Y9wVt#Epor*W6C+T4*d!Awmb^e`+
zt8`2hd<5gi(y5neN#dISS*lO?HcgP9U#UJ~XwDIf)F93nBt8WbF`vY59QLk*jStWQ
zJkES{3dVXbto#gSCt&^8;FoX1oHxK%PZ`RVjar9w@!S{MUm^dc#^EW-?SH#UR=V4t
zn54HiETzwcx&slvSnPCqYuz){n2ZE`&2>e3VglBt4>Z>;xF}}-S~B7<(%B;Y0QR55
z{z-buw>8ilNM3u6I+D$S%?)(p>=eBx-HpvZj{7c*_?K=d()*7<Jf=Q)<Xiv_`BJ;c
zIiKEFq>r74N{MulF2dQ*rGJ8Al=QJ~zb`)MPYedy2kVl9jXxdnmn`&r8ut0w>q?93
zus}1dq%FAFYLsW8ZTQ_XZLh`P2*6(NgS}qGcfGXVWpwsp#Rs}IuKbk*`2}&)I^Vsk
z6S&Q4@oYS?dJ`NwMVBs6!1v<01<?I<a9(_|3|urzWgBlTN5^wl>3>Q(y%%a0i}Y#1
z-F3m;Ieh#Y12UgW?-R)|eX>ZuF-2cc!1>~NS|XSF-6In>zBoZg+ml!6%fk7Uw0LHc
zz8VQk(jOJ+Yu)|^|15ufl$KQd_1eUZZzj`aC%umU6F1&D5XVWcUvDqcUtW@*>xfVd
z@!G2_v`o<z6jii^T2vK{(N;yb(@sTq(;h`rv|rJKbWG7>bR5<t(rH-HQL+^+(0de>
zU*UT{eMHfcUo`jw*u?4r<c@DtY>2s_$`}U{?NjvEm(u&<>B|%mq$Q3weshzrh!=m4
zH~yPq{qO0O>o|+xpE_i3$yVP%gs2l20HBh&_;PzZtwMPqQDk4~L}0tfu;d4uxUM8h
zx$5GP@<Hv#n>d7%rg(9Y8!9@i+9&2l=3<|?le_)g9Z)PQ5ESCo?x4680QstTl-CH_
z5m)j*Epfqj7I|G0-*vpm?U#8&k?((2zg<P{?hZ7>;QYNszIUs?zAIGUr9}em3I$<A
zs5ixZMZW(6J+@q19%>Fhb*w9-ci~gV$1;8(U;p&SDZE^3_CNLX1zM3@E|W%A=rX4;
zwOlLm!AP*(*Bl0rL_(L=6`Hv5>_8;g?VljGOuMhr8|fxKG|7jrCnCW}AbEe8A8O*a
z;rbQWArFQUVyZaIdGyF7WbZ8lvQ6v;yEgG7uqYA&H#G5ad?wWuhnhHBvUGfsN3K^(
zewji7_p=ede8DTP$FEa_M(6|&v8m{z@NJ&XsIgEPpP?ss9mYaeWBd+!UX6vy_yzie
z8Vi;2C+U(J3ze}%uZ)Gt_+?D`yc!FY@z?1aYAjU7Z=eB`u~3ZJ#|<)8RL1SxrN%;K
zoZ+XHo~5{G1p40!tUgK$I7L3rV9Y8@Eg;`_0Z>Z^2tPilXQ&PU0NNXq;YJ*jtBNjv
zYflqF6o%gs=t3z%xd|2&*IQdyR=^LH8WYpRgrrep4Mx6Aw}<V*UdmoD#>fxhSE$jN
z_`x6Gk20R2MM&C)-R$h{nfE#GnVgwFe}DZ3unAM(^yK7C>62cU)*<-~eOtHo^)=lJ
zyq4q2*a>{Y3mU}nkX(`x@nlm*hSem0>o7{ZNZ;O<ZbWN(%QigOG8~nI>Q5dw>RYT0
zOXvK4;<_A&n$p-%65n=wqR{bejviAOu@}cn>s#w3qd~{|=TQiObS+3ii(WV`2`mPo
zZQ7x1xMY3^WvfM@Sq*HPLJh+LQwQ=`ny&P1^Hu$TtXM-zVD=*VoC&`n>n>@37!?>f
zN*sy>#GXLvspC8GGlAj!USU^YC|}skAcN~^Xqe0(jqx#zAj>muU<=IUs~34|v06u2
zahGbSeT-uAG|Vv*B<wTSL7c#R&H9)rl3qE38(0{_JQf9J`Uo`S1hke4xPAu9m`!5|
zx42|^wj6;+musmsWmu!5gnWyC%7tpb#g_%ltB{@|SD-83y8@d7*`1w%h8tHyeJmd+
z%ZJ?fd}Uzfh5vJX5)@T}RqkqqccH*!l{ekX#H&;IR^iy-o@x*n<0q?{%;#c+zcZNN
z(cr&%T;m%^7vKNHRPG0+zd~JE%wV>w$#pf8#qXFtMfw|VuC{UeT)2WpJ6&O+E6jF;
z;~n9>cf~Ip6j<jm#c!}kVfVY(Du($6W;)n}!j_iX$oGOnXJBElU#^X{UW^X`qsn*a
zA5cpN2wnEIZ#$D5jcI?ahqQ_yf+s;y=zX)9CfjZ{VK=P@u@B-~coIDL06vsB5j{8y
z^YQ)mn_2er>-_@&PGFD0%Vu*QJ@Ht`C7Og!xt#L>mqlJGEh<%*ATJUmZc(FfNSB##
zfy_`Y-70r{Iv3jEfR|~Ii!xC44vZ(KNj#>kjsE86E3FB*Oay<UI$}~~5UnyP(KT8}
zZxN4%<6#sexaQA3Fb186Vr3;>D~$|}3Y&(h6^X|1(TcJ}8{Ua3yL1loSfg!2gTekn
ztVO7WNyFQCfwF2ti$UvL8C6{{IPBg01XK~$ThIQx{)~aw>(9F2L#G36*kRDPqA$P*
znq=!@bbQ#RzDpVIfYc*x9=}2N^*2z1E%3epP)i30>M4^xlbnuWe_MAGRTTb?O*?TC
zw6v5$6bS)qZqo=w4J~*9i;eVx4NwO!crrOjhE8U(&P-ZZU9$We^ubqNd73QDTJqqV
z55D;u{1?`JQre~$mu9WZ%=z|x?{A;q|NiAy0GH5U*nIM2xww(4aBEe#)zoy#s-^NN
z%WJl5hX=Oj8cnY%e+ZYt5!@FfY;fPO8p2xj+f6?;UE_`~@~KwcX!4d}D<7hA<#M$$
zMY^)MV_$1K4gr3H8yA&|Ten>yr0v!TT@%u$ScDfRrzVR=Rjj3cjDj)fWv?wQanp7L
zL)Me^LS6EzBMR%1w^~9L%8&g(G;d3f4uLKFIqs5JYKSlle?R1Fyx?%RURbI;6jq>N
zh+(uYf`e8J=hO2&ZQCoTU^AKRV>_^&!W{P-3%oVMaQqOcL1!4cYP)vuF~dMQb1#lK
zj_HWu4TgBXPYuJQYWv&8km~(7Mlh=5I8HE}*mJ#?mxhx%#+9e>eorO0)eg#m6uhb7
zG^KSg`Cbxlf9XizZH9>B@hZcqJ*7VTp6)w1tHLB11}(?)MI0$rLIUS0;Z^atECLmz
zzb6FE#PKdBl;L{}$M%UdWEi4$AS4ew$#8O?ZRr(G4syuHkcGi8a#*gRz@QP|7R93=
zj*A$L;eA}9id+JyWjkK`Mod00;{&DlA!QJFR3&ljf1vI*O1ec{(V=0QA?ELLVls-W
z``ELsu7M`3`vI4MzhVcpJ!9#^KGjq|#b-J`!F7h${dUEFmBLuMbYu>nV^(S3q+UC;
z7s@e_qZG#+N=oo0o$G1>6Y0a{9@&9;EU2+8k|7P6p?HMh|8#X5UnwpxGbHw;%WXHX
zn_~8ne<fP#lF)ExhoOC?U2oe?RjuMZTCZ6tJ(*l@2sf$dNaAE`m*&YDvG!UNU;j%>
zdvw09V+G$(lhoq7L}=qb+OaPSD&;$TuUtG(4;py(h)8|Nord(*d1ZH-Dmw1MqU&RK
ziI)26r-hE(pqnmo4uixe^`qe<N`Hnro&LZOe@TGNY!@+ezJoVIjBR2t_q>a7(_HA_
zR2K<zF>jdJ4$g!)7ve&Q^b1Tf+{(Vd6vI<Y)5k{)=3<DMk!vAtJl*=spzq;Wh%e0P
zNQhfMZ~d7&9mx~AM1m0Im1kSO<(|(!LzJ)!FT1#FcClh+AB>nCd>i725IomG^(Ez(
zD8L!4qlUAX=)EV9!3JfWLB4n1z)!ums&0UuuVLUHP)i30*5f6tnv<ZCa(|(K<w1}q
zl?27Kf`O2bZM(f5T<@B@Ye_WnLHrE9(8R{X7k&UglySCqr=>k?lbhL{|8I78X7|_c
zA3p(L9<~X5y1L3{K8Sf*xL|5gToDT;aYig?m8z^zQ`XdEMJqC#*O|ho!7x~+MzT<5
zg$turF~pS;RSY&GR;6TxR)3Q+&%yG`3&ngIwR*<kOEpEo38PGtb6lcIvdWk)s}j!E
znQq`(IG>qK&t{TERu@0|fDrKKw3=RE&t-)Xh-$i&l5|>BSn5)z)hg3d?<~8msU=ye
z>CHWR!9yT;PU|$KP*qAD<j+~b^g=HIp(q=sF6V1pM<B4@RH@8N9e-x`R*`CrZ{dLn
zg!lht%9(t}?YcMAEE5=RoywKz{NhrsRw3YhFITNh+_SU+T=7!VFW$-(rqxUWWRJi|
zohovXnrx>f(V?zj^n^g~nykv^I)Uz3{78Ty81{n~ZsS&7WH)#Ach3%UyV<js2d{R0
zFe-o_ZuLPAj1lN}N`J-oXZYZ*0D={~FF?TZ9tbdCd7=P82yySB0AU#9-Xj771~YfA
zl`a&!UOT=iAM|m3g2143U2hd&C>D1s=Ahvw9*%Wt<42vTt%|niux3Zww13+oK)-d~
zG>VKHM0ov>KXKaUH(Cc)#9GFVSc4EoUbnRudxi}T8J!VNY=4g*Y7C*Ho7#^wUVt&<
zKN3&ugs1Ur<7<OCJeL<=IKCj>67&ea4^1oBw%@h^+YZ<ko8Pq9dbC0G@TTE+3rA_p
zO3+3V$H%9q-(e(trvZ`hy#|bPZ-RT1p=huHQ=SGyzXJb-AO>+eK^VI5573*KZosq?
zpMj(u5257?^lBu&LF9`ao`sYf9&zx;uK2iv&$;8{4nFUSFF5$3JHFuHORo5YgFkV{
zCmcNEicdQDvO7NM;484|f=_+6!)x%g1CL;L9DE%%T=1xaKZ8v-+-@x1OZ;|0_a9J8
z2MFd71j+6K002-1li@}jlN6Rde_awnSQ^R>8l%uQO&WF!6qOdxN;eu7Q-nHAUeckH
znK(0P3kdECiu+2%6$MdLP?%OK@`LB_gMXCA`(~0RX;Tm9<mAqK?|ygr?tAyWfBwDo
z7k~}8%`kTQbZ_&?z<?AV;%XwWEf7xzLV>uJ&d7>n%9<KZYY9&CI#;-4e{fnHl#FnE
zkjICNY}yEHOG=8tLxD^xoR%_SS=itMTQ?;JHj=L1oX01#ib4~{pcGy&RMeELa<0p2
zie`toZjdjUZ*JPy)ErLm;lL?37=tIOW%W4UBP*OCpy{bdN|zD}kBsP2Cd2i}AxG{W
z<?*bk=`K_<EIcL+OA$p<e^Zg}fnz*wx=>A~GP*{Zrpyh7B^|a-)|8b<&(!>OhWQ08
z$LV}WQ`RD4Od8d3O-;%vhK7#W<7u;XvbxQo0JX@fY(C0RS6^zcd>jo287k@<4tg;k
z3q5e5hLHE@&4ooC)S|`<FXqib6_$A6#vJjr%nJ|Zimw$6-r_i1e^^C9@=@6^4cm2}
z7x&`<4_3oZ94MNUD1_%l01G^1<spW7I+qf=2&QWXbcLa|zM-Q)f7BEe-tNU3tQCMd
z0;IUvBk5c<9ex+)0eMEeXh2XnZe(aK%Gu^fR!y#}l9JEd_AC!%MdIY2h@ibhDlUYn
z$Z=;lO^IP$*&-B2f1Ha+<!0nSZ#%^l!8#9`u%2Oo!AmSM)YO-1i@I&ZCQ*gWlwhJr
zxs}e48;>w7N|jm>3tns$G}U4o!(2g=!}xLHp?+qFvj$ztd<%96=4tCKGG@ADSX{=m
zNZ@ho6rr?EOQ1(G2i@2;GXb&S#U3YtCuVwc*4rJcPm$kZf2+|!X~X6%(QMj{4u)mZ
zOi!(P(dF3hX4ra9l=RKQ$v(kJFS#;ib+z9K^#Gle6LKa>&4oMFJ4C&NBJ7hhPSIjc
zOno$M6iq+l;ExpH9rF68@D3-EgCCf}JJSgVPbI1$?JjPPX!_88InA}KX&=#cFH#s3
zIx<6LeY==wf5DK*jP`hqF%u+|sI)3HfyywfAj=0OMNUX2pLR;T(8c+$g&}Z#q9L>(
zD~t~l&X^VFXp@&w92f8tq+KXMZ&o!an%$#uo^hJh^9-RjEvqE_s%H8{qw(juo4?SC
z{YhO*`|H*ibxm%ZF6r=2QC)bE`d3oZ(~?<!ZyfHJe|{^JKQAxi6%Ss*s|>;a-(mX)
zb!|i%p!VVP>DN6tg*Ry97gUPUJj<}OxaYL1nXE}hxs-O{twImUw<O2r+a8?5JJeOn
z-4ZUmM`R1eXdf5gMV4(VAK*g|-p5Dz$VydQ_=KS<u4rP*ekLxPPjQ}_T%xq9ZhX$L
zwp^<ye}BHd5H7!D*x9A|hb1M;{UfqD=pW+8?JD|>43Eo6nJ4_RTDIQALB8H!3nq37
zcE6>oNG;jZZhXh!vORPsMKfzJ8_*?O7DfGmcrL8A(_NAhSH+JE?u?`xR1|ZThDb;2
zDt`9hC;UQ%94^20-MA*;<$KO0{3b&9y(ENIe@&xj6>X23)Ftc?ax=4pL5FZ06CPOj
zgG%2<Pb(@_2fd`avgrY??-$z<>*<WT=z&*(8gcQ{SB<##ZAni8k}eRDSU~@i0CQml
zDrxrb#$aPG6pW3-H;LL<tZN*LZ(`|9EWe4B79Kp0i{W56HuFcg&;%Z~P~T}GM4uZh
ze{AtJ(_nk3-@;=S+I+id^ki<d*Vjp-o=|^<g{XytzNcw;IJbDz_biR#xlz)>F$-x6
z&si`nj955%8LK)caVl1M8?IPaMPt<WLU;mO-+HX@*|}0L-G;E3gR?W7x9e6H9GT{B
znBvW<o>M85o>MvPUn@(X=!wZq0)at}MK|kJ&K<Rqc0O3RM|#tTjjbDBs~mqf;a<$8
zIF=hnE-|aOzi~Bvr@T|Og86i<xK2%}_`L=1nN}~!S>JggGx6y?Ey21qiw~76MoISk
z+LyUR=2+oJK1IoYOX~R}S1x>iblZ|_oAmqhyU+NpxvjQb;Ht{pO_xn4T+UO<73|gD
zaq0Wtdz^7GoZq-Fu+;61dX%|tud0myO`{vHTlP*oes5OaTBV$=y?3V{mRnFLdQ!Hj
z)lErp+uBchtEPv?ao=?feR1oRVaUdpIVC}+xkgTxPYSGDyR2Zw++VdTe(-~Oh=P%c
zFD5UUvx;?cLREy~<lwo<(ny!wGpI2DPxgQVm&q6BI>~@9BnQ?{+kh7j7^BGZ3r}vC
zuRPgbSbFk<c>*%f8<`nm*%=sYP!wJk1uNV$&qN0K`bt|AMMaWeMf&qirQ!Dt0<A<f
z>FDJ8`4KXRTiO^HPz`BO1{-ofSrz0YR`9K0lLHorGM!h0O0Z3yut19ieErkD1!7DO
zG~nX@7pO{uE-YFOTtaXT=wTxi=Y>zUU+BjIx>jcL#D!u^>AGNjXBL{vAZ}$~KnuVC
z1E3-$;H5MCAlFEP4~z$T=^-$HP(wOqa`hr78Te`EKnLicSpL~^a?K*8$-ft=N<+?q
zW?-0u5gn^0TQByPK^#BKz~G2th_L-+o5j*dCr4Ycg3q*_+`m|qNyu^Xvc-|obKpm+
zGBD_)==PZ0utaRK!4gv$&;gX1%nS@qfG$9_!NzrR<B}K|<iq+*Pz<^20aPG2S=L<<
zoMMpAl2JrasOtk%C_8zX7dYftKu3{G=36Gl^ePl6E;@PsGPcRyz!Tv?$quoM9(X7X
ziXrL|P{jr^h&4703`!`9mgj;LO<JxY16)4>Sv~>`eq9tbPbwj5K&x^fX&o_o$H1U~
zqIOd?L@oQ|Bg^Gwz#}riv?K=%D|r-k8@s@c6Ir1u0~(i50a^-LyMmf7oO;2EvR3Fw
zgF8gPQ1=7g{c3<>(&5P)SNO;vnvv+PKQakyh~7$L8Bq2Q1{!dbhk-!@#SpP+P(|#M
SXRcJ{65?fGI57uQ5&!`B?F@7P

delta 34554
zcmX7vV`H6d(}mmEwr$(CZQE$vU^m*aZQE(=WXEZ2+l}qF_w)XN>&rEBu9;)4xt<3b
zo(HR^Mh47P)@z^^pH!4#b(O8!;$>N+S+v5K5f8RrQ+Qv0_oH#e!pI2>yt4ij>fI9l
zW&-hsVAQg%dpn3NRy$kb_vbM2sr`>bZ48b35m{D=OqX;p8A${^Dp|W&J5mXvUl#_I
zN!~GCBUzj~C%K?<7<Lh)kN@p@FGCC|S+xWQML0moHteKXeb8wJdQH-gjR&7XH4^`G
z18O**eOiwBMhV|yW}+)H1-qhO2aiyh%|2AVjN^2;YOavpiJ0<eag))8h36*<J}UmM
zh5)@`0psU<7DA@>+UZ_q|L)EGG#_*2Zzko-&Kck)Qd2%CpS3{P1co1?$|Sj1?E;PO
z7alI9$X(MDly9AIEZ-vDLhpAKd1x4U#w$OvBtaA{fW9)iD#|AkMrsSaN<NH{Yj<;r
zJR^3Ei65zvOeKyy368On7xFr|udQdRg!uvBg!o!BMrLO4`R~=WSNU)FX3DN?UiRax
zt1Nc*-cP@`?<QFC2v<*!x!PMc9!`H@mKU%%&E@IsfX5sqlj5iC9s3zUdp-4#$Pj{D
z-ud{50Mow^jMOt&t!;$ig-cEDVcZ_LuIYDHKBg^7I=ypK+jgs5kU>z(69;h1iM1#_
z?u?O_aKa>vk=j;AR&*V-p3SY`CI}Uo%eRO(Dr-Te<99WQhi>y&l%UiS%W2m(d#woD
zW?alFl75!1NiUzVqgqY98fSQNjhX3uZ&orB08Y*DFD;sjIddWoJF;S_@{Lx#SQk+9
zvSQ-620z0D7cy8-u_7u?PqYt?R0m2k%PWj%V(L|MCO(@3%l&pzEy7ijNv(VXU9byn
z@6=4zL|qk*7!@QWd9imT9i%y}1#6+%w=s%WmsHbw@{UVc^?nL*GsnACaLnTbr9A>B
zK)H-$tB`>jt9LSw<e?{;w%G1n2P1|J0yx{P*t9jy^kFBQA#W^mMH}$k)?g@xYa+r6
zlJ|^>aY+4!F1q(YO!E7@?SX3X-Ug4r($QrmJnM8m#;#LN`kE>?<{vbCZbhKOrMpux
zTU=<lXsfLv18QvxbhhA4+*COFL{lUUKwTI^?+b!W)%bL{5ICeYgxi==?r7ml!xm!7
zhdowRK-_IXtccBJOk{G;-<SoBvpq6sZLl$N`1P40zF|?WL@Z|Q9X1BGIgTLA`g8zK
z6>02hy${;n&ikcP8PqufhT9nJU>s;dyl;&~|Cs+o{9pCu{cRF+0{iyuH~6=tIZXVd
zR~pJBC3Hf-g%Y|bhTuGyd~3-sm}kaX5=T?p$V?48h4{h2;_u{<w17YEUL6d7r?`IW
zC*$~_<n<G0=2K)oe-lc+anc79OB&v^xcsx>b}8s~Jar{39PnL7DsXpxcX#3zx@f9K
zkkrw9s2*>)&=fLY{=xeIYVICff2Id5cc*~l7ztSsU@xuXYdV1(lLGZ5)?mXyIDf1-
zA7j3P{C5s?$Y-kg60&XML*y93zrir8CNq*EMx)Kw)XA(N({9t-<qoKDSToyx=0O<F
zcZOoLjIgey#`z<{D=F=|jxIUj7G)oJ<z}l*I|pAYR$!%#pP+(2spDO4`pdL|xx}1{
zoCp>XAdX;rjxk`OF%4-0x?ne@LlBQMJe5+$Ir{Oj`@#qe+_-z!g5qQ2<A}CkiPnG%
z#<9e?dl5B^C&2WW>SxKQy1ex_x^Huj%u+S@Ef<hwN)i9H)8f1HlVw`IOD9pOk3F=2
zUFdA$C*zaFwUQBueYyoochf_SCZNJv(o>EPP-70KeL@7@PBfadCUBt%`huTknOCj{
z;v?wZ2&wsL@-iBa(iFd)7duJTY8z-q5^HR-R9d*ex2m^A-~uCvz9B-1C$2xXL#>ow
z!O<5&jhbM&@m=l_aW3F>vjJyy27gY}!9PSU3kITbrbs#Gm<n97W+KiQNM{Zc)RZRJ
zO9VM|sK^tMcU~i!8>0gD?~Tub8ZFFK$X?pdv-%EeopaGB#$rDQHELW!8bVt`%?&>0
zrZUQ0!yP(uzVK?jWJ8^n915hO$v1SLV_&$-2y(iDIg}GDFRo!JzQF#gJoWu^UW0#?
z*OC-SPMEY!LYcIZO95!sv{#-t!3Z!CfomqgzFJld>~CTFKGcr^sUai5s-y^vI5K={
z)cmQthQuKS07e8nLfaIYQ5f}PJQqcmokx?%yzFH*`%k}RyXCt1C<ET#?;-nOj&O_w
z0RjAX8jLRfx+{_%VvA`D$(8(CLoDsiJS|qdlA=Gf(}R42xBwFy^Y@K2Y2B5F73lIC
z_Y!h7$sAGI9OU(?0{R3(+-fA%SuZuc8k~w~-j=n9^J*)UAglq-zi6`BA?FFqiPk`=
zFg88a>hfv5KAeMWbq^2MNft;@`hMyhWg50(!jdAn;Jyx4Yt)^^DVCSu?xRu^<p^cd
z`AfT9K@W351Yp;%_)?5A+{-Sd(?fRZxF>$*&&=O6#JVShU_N3?D)|$5pyP8A!f)`|
z>t0k&S66T*es5(_cs>0F=twYJUrQMqYa2HQvy)d+XW&rai?m;8nW9tL9Ivp9qi2-`
zOQM<}D*g`<R@=@6xNeyfv+%3f>28wJ54H~1U!+)vQh)(cpuf^&8uteU$G{9BUhOL|
zBX{5E1**;hlc0ZAi(r@)IK{Y*ro_UL8Ztf8n{Xnwn=s=qH;<JNq#i!T6Ol{k1N4b^
z$<%S3ch|aFn`rrM7xp7Akdf|09MH!w#X^*^qWGG{=N4~T_X*vr=<9Sr1u0vsR}sts
z)nFJ(24Ixno*7<(J<m!__?DA*(CbmQp|*(D0(fX(I-?~pJ$dd#K$~K_UvNXKlCI0J
zAi?sKWY{_$3e#h0k$v$pwmR{i3$N!{^!LlUzPj3g^GFVYwXlrd2LlB<R)>fxkK+uL
zY)0pvf6-iHfX+{F8&6LzG;&d%^5g`_&GEEx0GU=cJM*}RecV-AqHSK@{TMi<FO;*^
zVIJ;K`_Wr?eL=2LPxeiG(NZ1XC=-->r1jaFf&R{@?|ieOUnmb?lQxCN!GnAqcii9$
z{a!Y{Vfz)xD!m2VfPH=`bk5m6dG{LfgtA4ITT?Sckn<92rt@pG+sk>3UhTQx9ywF3
z=<e;Zhr+VTogSTRTa`0dZhDEYFlz}iYJ-Ca|IInsl^}*}ws*9OfO%7=435_R)~{jX
z|C))|=(?2={M$D}=%iUpf}~t>$|U(bN<fa5trxoGzi!H8bL1;zwAZzO0dvgcXe@7*
zY^o`jnIo&H5j7~yXg%$-pqf(9s|<SUx!UU?X^UEuJZ$s34K@~hg}#3V7Z`DSr`YnM
zvIU1teWhe~+xESB+c<W5In8tK0k4NOX6yQKGIQC&FBWX~Q<%G1#g|49BQj)83&2%|
zUs<JZ#bIxoeZa-tcILuIpp|3uGrjDI|D_t;j#v#bOj@j6furiEu;aSGahA)d$u{2o
zqNVUdWs5~-2cc><=6-B4+UbYWxfQUOe8cmEDY3QL$;mOw&X2;q9x9qNz3J97)3^jb
zdlzkDYLKm^5?3IV>t3fdWwNpq3qY;hsj<HM2+6N#zwmbwcBhBpw2~<e#bkw}$`!Kn
z1)=dUBB{1-93?8Rgm^nY*tF;B7wJ85X%C|9a*1^ara~8e6Ph?%g(rj#aA~z51%f(0
zrd%qQA0cZ0Z2^@t)yso?$#(rr$H2>=pk9;P!wVmjP|6Dw^ez7_&DH9X33$T=Q{>Nl
zv*a*QMM1-2XQ)O=3n@X+RO~S`N13QM81^ZzljPJIFBh%x<~No?@z_&LAl)ap!AflS
zb{yFXU(Uw(dw%NR_l7%eN2VVX;^Ln{I1G+yPQr1AY+0MapBnJ3k1>Zdrw^3aUig*!
z?xQe8C0LW;EDY(qe_P!Z#Q^jP3u$Z3hQpy^w7?jI;~XTz0ju$DQNc4LUyX}+S5zh>
zGkB%~XU+L?3pw&j!i|x6C+RyP+_XYNm9<?|3Dg4wCcC?VQr<bzeKrSpw8b>`rtH<m
z^q>pqxvoCdV_MXg847oHhYJqO+{t!xxdbsw4Ugn($Cwkm<z&(cEdbmmHs@&T9(Qe{
zY0mG0W~lWDbhWX{<STjlgSTP0kYxL@HoRpRDzEHe(+0b)#tmEv>^+36&goy$vkaFs
zrH6F29eMPXyoBha7X^b+N*a!>VZ<&G<WRC+Em14oermb3Ag6>f3eeE+Bgz7PB-6X7
z_%2M~{sTwC^iQVjH9#fVa3IO6E4b*S%M;#WhHa^L+=DP%arD_`eW5G0<9Tk=Ci?P@
z6tJXhej{ZWF=idj32x7dp{zmQY;;D2*11&-(~wifGXLmD6C-XR=K3c>S^_+x!3OuB
z%D&!EOk;V4Sq6eQcE{UEDsPMtED*;qgcJU^UwLwjE-Ww54d73fQ`<mR8A?eX*vOu(
z;s!AeRF7I0k*#FrPh}Ask{q+pF}CGNj<O)=(?Ka}%Tcfb=@JBbsSO=CT&lP}la&!T
zB*Gtuxukvb<;Db%3gAA$>9Sv%^H>juEKmxN+*aD=0Q+ZFH1_J(*$~9&JyUJ6!>(Nj
zi3Z6zWC%Yz0ZjX>thi~rH+lqv<9nkI3?Ghn7@!u3Ef){G(0Pvwnxc&(YeC=Kg2-7z
zr>a^@b_QClXs?Obplq@Lq-l5>W);Y^JbCYk^n8G`8PzCH^rnY5Zk-AN6|7Pn=oF(H
zxE#8LkI;;}K7I^UK55Z)c=zn7OX_XVgFlEGSO}~H^y|wd7piw*b1$kA!0*X*DQ~O`
z*vFvc5Jy7(fFMRq>XA8Tq`E>EF35{?(_;yAdbO8rrmrlb&LceV%;U3haVV}Koh9C|
zTZnR0a(*yN^Hp9u*h+eAdn)d}vPCo3k?GCz1w>OOeme(Mbo*A7)*nEmmUt?eN_vA;
z=~2}K_}BtDXJM-y5fn^v>QQo+%*FdZQFNz^j&rYhmZHgDA-TH47#Wjn_@iH4?6R{J
z%+C8LYIy>{3~A@|y4kN8YZZp72F8F@dOZWp>N0-DyVb4UQd_t^`P)zsCoygL_>>x|
z2Hyu7;n(4G&?wCB4YVUIVg0K!CALjRsb}&4aLS|}0t`C}orYqhFe7N~h9XQ_bIW*f
zGlDCIE`&wwyFX1U>}g#P0xRRn2q9%FPRfm{-M7;}6cS(V6;kn@6!$y06lO>8AE_!O
z{|W{HEA<ltk<^3&v(zsFX*bwn-7C9ar58A%@T#a2aBXBI3o8y|0%iXyV|l}sg<m!U
zT-k`jQb^8oQ(X_pliK#72^1&??md*<37!Bk(#NKKogWc3``(E}^iGHbqW0g7K=ab9
zUpQLYqhr5^vY&U1qg(xAv~ioY%|o`fES|sX{~Wc{ICx(f+xCyUQrPRZo%C)iUsb?a
zew2`T0vB@=rlln7nHw`MOepMp{ML^Ja1HQ#K5&NkV!sK<&i;~{TAs9+9gJ+;Lz$da
zS};~j46utcwL=M>bI0eD$z9tQvWth7y>qpTKQ0$EDsJkQxAaV2+gE28Al8W%t`Pbh
zP<xNDbl}BXrCZDI-ZIp5KNryWfd5bbbb`{6SD?OqGei3JO+_9Y0^=JD49vHrX%anv
zx});E3Pu1^ut&6#2_NeA4BT3`JGz8npG~rjS&&I~|7dIHW39&8ddY=MbOQ07^K~#4
zAG+`}_`B-xd@Z|;49eO;uCH?5F>l#%_S@a^6Y;lH6BfUfZNRKwS#x_keQ`;Rjg@qj
zZRwQ<VVZO-GvahB#0&T?91+}W8%P`g+CV*WTDcQ*ECFq*EHu?RdUx6LGyt0&7`Ke<
z(79}oUUG8J6UjGrhsg*-n+Rzoc4V@;e92&Fv0kzs^dCx1BLpw}k)lbrZ+!!4b9rh_
z{{2T!5K`M=B=D3khI9L_t!YX2loweH^^dUIKs*I^r|TIqcqitK3=NKDIU!(-Fg-cJ
za`ZI<4s`pPup!z94p%kUdn`lUG3}x)93kQpWvT(t+fqvi%M1$&iX<2wVFk(pY2$hw
z;e()Ntun1;jRBx1Z_weKQ&VAEOVyzxlq3KpHRdO0*!<udc458*N}Tk<yvh(lq)+w`
zFEEJtD{)&$;xqmiHT}}u4L}!;Y0mFCG2c*If`gd*;VV3Vr8aURePSQ2wwxyp-Zg;}
z2y5*0{Ns5&4yo$wW`M$Wj^j~)lpJ%p0cE61bW)~~n2lIIinNG2#<)ly#Dd$&{nJPv
zg4t&sQ>XZd-rWngbYC}r6X)VCJ-=D54A+81%(L*8?+&r7(wOxDSNn!t(U}!;5|sjq
zc5yF5$V!;%C#T+T3*AD+A({T)#p$H_<$nDd#M)KOLbd*KoW~9E19BBd-UwBX1<0h9
z8lNI&7Z_r4bx;`%5&;ky+y7PD9F^;Qk{`J@z!jJKyJ|s@lY^y!r9p^75D)_TJ6S*T
zLA7AA*m}Y|5~)-`cyB+lUE9CS_`iB;MM&0f<l?>X**f;$n($fQ1_Zo=u>|n~r$<Jr
zR^#jf&wU3t7icxNwdO00+#eaU-n3>HvkOUK(gv_L&@DE0b4#ya{HN)8bNQMl9hCva
zi~j0v&plR<c*E(e0zzsewSSCWoYNe#zBz~4gPJgFZQI3UCOBaQQRa$tLad>sp?_zR
zA}uI4n;^_Ko5`N-HCw_1BMLd#OAmmIY#ol4M^UjLL-UAat+xA+zxrFqKc@V5Zqan_
z+L<vzaOW^{oV^!V7EZrt5zgiq1K|N3u8LNf1;g77T|EW9D_#STe{m<8-*ti95##sc
zyGd7O;e|{=b{s4r=uzKM#MLq2_E;Cl(9-pAG6@1SP&CT#ClJkT<QXn*!E+nh?X8yH
zcMM9Cu5gnFv(px!)SJCU0$OR|_#*aP@{anWc1hQYPQ<vIYfp}%E>oVX-Ub2mT7Dk_
z<+_3?XWBEM84@J_F}FDe-hl@}x@v-s1AR{_YD!_fMgagH6s9uyi6pW3gdhauG>+H?
zi<5^{dp*5-9v`|m*ceT&`Hqv77oBQ+Da!=?dDO&9jo;<Pz>=JkzrQKx^o$RqAgzL{
zjK@n)JW~lzxB>(o(21ibI}i|r3e;17zT<i-A5WFI)l0=DfsHm5h*a$|nW5w2Z&g&C
zfIgxfWxL<b7<;2;0#?vaiBe<amMP~Hu(BM=D~XPJ7}ZO*rIjib5G!Hs^`n3(-k2!C
z!UiS)1Z$XWmt$B+Er?b&6mkk#-D8jLY4v(Z+xBe4-ze{3Z8c}rWsNw!vUg{(e_E!O
zGy`+{2}jJyQpV^h@Z#T~xRhsp27NBzs^L@HyvOdwuq!yc4;~zS%a~%ld&pD6w$+^X
z4e>jdEl5c`Cn-KAlR7EPp84M@!8~CywES-`mxKJ@Dsf6B18_!XMIq$Q3rTDeIgJ3X
zB1)voa#V{iY^ju>*Cdg&UCbx?d3UMArPRHZauE}c@<I9zuOvh8{QaF~!8NmT14ZcB
zXDiDmH{)Nqe}et`?!f-+>Fdk;z85OcA&Th>ZN%}=VU%3b9={Q(@M4QaeuGE(BbZ{U
z?WPD<in~-M2H?eVIA^jvfi8U5&YUg%&UM*~ACg=ZhWs!uCP(%s`pq9sl~Rn<t^myp
zyBzUD^1Z%w8~>G+sjJSz1OYFpdImKYHUa@ELn%n&PR9&I7B$<-c3e|{tPH*u@hs<V
z<H3(ufuU6=m@PPl*Z5lGM+(I8E&;iIFkSFjg3169JAkH{U;A7oj2f|AG+4C#qrq+Q
zSEMgDyQI)s?9FfgI&>)Ci>Z@5$M?lP(#d#QIz}~()P7mt`<2PT4oHH}R&#dIx4<lE
zZM@x|FQ}SFXpD?iesWRPGe4;I$q-cmdj*5H_;}S&ml}cX6{lN;Hc9cQTAqNu`75Pu
zm)lpl05-+8mc%^XjQ*+==x*CFMVtN~s|N?yyj?nb@+0b65tp1aoBu<}P|sqT#oxbu
z^9TFiuY0AD1GFwI&Vgx(N@^#!xc>uq943D8gVbaa2&Fygr<d;h^~M>Sk3*whGr~Jn
zR4QnS@83UZ_BUGw<CYZIe2@PKT3-tK{$nVwgnd*Bz&L7Z=B%q|uGZL4XMBC&BC8z`
z)4RakhXH*19!wvlHiX`r;-qnceEtmXoaf9Zp<!_s;6!03b&^hmte9c568Cp_f0FC4
z@(8kb-pvrKkck`L9ixZbpEUWNQ0z@i@*Zn<GA0aPaURQm-ybWQ)C=W4nKD;in<YK)
z$64%N3;kIt{W*W&vFr90Wr=?+S%KEmK=Dy9&+KBnRXYEkzmZq_)xy)7^gtx11&*2l
zFT&6!U^|U`oJ*VvM^5Eh;*~96yk0B!PnHB-7=?Z<!C6~0J+Dn$C3)1UuE9Wd>;?@T
zo5jA#potERcBv+dd8V$xTh)COur`TQ^^Yb&cdBcesjHlA3O8SBeKrVj!-D3+_p6%P
zP@e{|^-G-C(}g+=bAuAy8)wcS{$XB?I=|r=&=TvbqeyXiuG43RR>R72Ry7d6RS;n^
zO5J-QIc@)sz_l6%Lg5zA8cgNK^GK_b-Z+M{RLYk5=O|6c%!1u6YMm3jJg{TfS*L%2
zA<*7$@wgJ(M*gyTzz8+7{iRP_e~(CCbGB}FN-#`&1ntct@`5gB-u6oUp3#QDxyF8v
zOjxr}pS{5RpK1l7+l(bC)0>M;%7L?@<gTpQHS2vT6B!6J&3W7)M@B+Riqg<&33yLj
zDz(l!s5Pz!g$so{@5)~9fIqA36)y?X;K=l3yijdZuqQpxQ-60#B4i){*o9>6t}S&a
zx0gP8^sXi(g2_g8+8-1~hKO;9Nn%_S%9djd*;nCLadHpVx(S0tixw2{Q}vOPCWvZg
zjYc6LQ~nIZ*b0m_uN~l{&2df2*ZmBU8dv`#o+^5p>D5l%9@(Y-g%`|$%nQ|SSRm0c
zLZV)45DS8d#v(z6gj&6|ay@MP23leodS8-GWIMH8_YCScX#Xr)mbuvXqSHo*)cY9g
z#Ea+NvHIA)@`L+)T|f$Etx;-vrE3;Gk^O@IN@1{lpg&XzU5Eh3!w;6l=Q$k|%7nj^
z|HGu}c59-Ilzu^w<93il$cRf@C(4Cr2S!!E&7#)GgUH@py?O;Vl&joXrep=2A|3Vn
zH+e$Ctmdy3B^fh%12D$nQk^j|v=>_3JAdKP<DgTp;^DIt;)F-EZ+0`lzs+uJ77mXF
zKO=n36r1cJ6ZeI&O)*O1QP@8JX7{q1%3ybU`ux1R!~W&-hs|$w8=(7Htli#B52kNC
zQ^VL@u3up6CP>t2YVusbNW&CL?M*?`K1mK*!&-9Ecp~>V1w{EK(429OT>DJAV21fG
z=XP=%m+0vV4LdIi#(~XpaUY$~fQ=xA#5?V%xGRr_|5WWV=uoG_Z&{fae)`2~u{6-p
zG>E>8j({w7njU-5Lai|2HhDPn<YS^8ehQhE5I<iRyh-9mT)mWhU$mn4$2>tQ(X@yB
z9l?NGoKB5N98fWrkdN3g8ox7Vic|gfTF~jIfXkm|9Yuu-p>v3d{5&hC+ZD%mh|_=*
zD5v*u(SuLxzX~owH!mJQi%Z=ALvdjyt9U6baVY<88B>{HApAJ~>`buHVGQd%KUu(d
z5#{NEKk6Vy08_8*E(?hqZe2L?P2$>!0~26N(rVzB9KbF&JQOIaU{SumX!TsYzR%wB
z<5EgJXDJ=1L_SNCNZcBWBNeN+Y`)B%R(wEA?}Wi@mp(jcw9&^1EMSM58?68gwnXF`
zzT0_7>)e<HsEdDR$NlH-Oz4z)4YK4*R4;r~#@Bf-qNf*W7N2rb$7_0t8fk5+&(AR?
zC<bDf1Ag^T@+r>p%6hid-*DZ42eU)tFcFz7@bo=<<wtaeOw^nO{PSb9Z|&*5Akk|K
zT2kaOkz6nI=><d29ZzfLPsac!Z^b$VBXIcmh|xmM@r6)Mz5F3JrGc)HCM;QKXdFn2
zN)F<RDq^r=d;jb2Z_(C<ZvTXP1meFPC<#c8lVpTKloUq~l@!Z@3NZ9Vm&6DNgWy6`
zT}ws|4y{dC<8Z`V4@yo&7N=2Lrz)W}q0uSpoVQq?bXwW`hPgX1VxJc#-*ykw$5f~i
zC|ut1-c`N^gj;icG!hG34qg7q@S4iL%Vod%yqRXM`*vS6e0@J#RM8K8!&}P;Cm)AA
z)coSDZ19_26LgSk3ec~JtbuRjAHdkaY|=S$lB0)roUPH^c%Bj9Hk?JTOI5=(QpBAL
z3sAe_Ulf+sv37C%@|)xs+e!7Qj4K_W!%anrHBA})sm;TbBl+0B6}Z)(%yc<S4D7=h
zfb2Z7*=sa~gIe^IJ52<6s26k2%UEB?h3dcZ_+%c$(i1?60)R)50crnWc*@*MJ7j?m
z+#_q#5p|jLUHhtmm6?Sn8@r$&TZ(yj%-c?;b-Jx|^5Dlk#go9U4yb7#!fULIqQBds
z&2I{W54>~CrLXpNDM}tv*-B(ZF`(9^RiM9W4xC%@ZHv=>w(&~$Wta%)Z;d!{J;e@z
zX1Gkw^XrHOfYHR#<ZxGz&lw$T6G0Nxnpuw>hAU=G`v43E$Iq}*gwqm@-mPac0HOZ0
zVtfu7>CQYS_F@n6n#CGcC5R%4{+P4m7uVlg3axX}B(_kf((>W?EhIO&rQ{iUO$16X
zv{Abj3ZApUrc<F~?Lk!w&f2Xtq>ar7Ck}B1%RvnR%uocMlKsRxV9Qqe^Y_5<iO7aU
zq3dedVPYS67#l$e6weB_b04g?APY5;b;`8Mge$lbj+y6C?EmJGf9^Ws=8R+H6IIt7
zKe|lohcPUhO~ppHQMA6xg5WT0HL*b(&d+ITYX&Vxg_jkc$c~ekjBwTWLMPMT{$RcV
z!!#NM$Q>C$xQW@9QdCcF%W#!zj;!xWc+0#VQ*}u&rJ7)zc+{vpw+nV?{tdd&Xs`NV
zKUp|dV98WbWl*_MoyzM0xv8tTNJChwifP!9WM^GD|Mkc75$F;j$K%Y8K@7?uJjq-w
zz*|>EH5jH&oTKlIzueAN2926Uo1OryC|Cmkyo<gXO1RvR0{t_&+f8HnilyXjJ;i5c
zxvz56DxWcDNyd~<XL{%_niD)o#)a~_BvNhsPHlrS(q>QZABt#FtHz)QmQvSX35o`f
z<^*5XXxexj+Q-a#2h4(?_*|!5Pjph@?Na8Z>K%AAjNr3T!7RN;7c)1SqAJfHY|xAV
z1f;p%lSdE8I}E4~tRH(l*rK?OZ>mB4C{3e%E-bUng2ymerg8?M$rXC!D?3O}_mka?
zm*Y~JMu+_F7O4T;#nFv)?Ru6<Jo9R8v(kHoGs?{2=?i%Iyi}0!42){}rxVvL!pJk>
z92r|old*4ZB$*6M<gaMZQRWjo$?vcL>40B;V&2w->#>4DEu0;#vHSgXdEzm{+VS48
z7U1tVn<u)EUy|Q1O0Ir9Rk;P;jjZ*6(#9^$Kg9d7dC=gOZg$lTVjzn?JP?E=U!^HZ
zZX5_RsBK=U`f|HJ?<gCGcIs3j%>#AnQ3z#gP26$!dmS5&JsXsrR>~rWA}%qd{92+j
zu+wYAqrJYOA%WC9nZ>BKH&;9vMSW_59z5LtzS4Q@o5vcrWjg+<k0<>28#&$*8SMYP
z!l5=|p@x6YnmNq>23sQ(^du5K)TB&K8t{P`@T4J5cEFL@qwtsCmn~p>>*b=37y!kB
zn6x{#KjM{S9O_otGQub*K)iIjtE2NfiV~zD2x{4r)IUD(Y8%r`n;#)ujIrl8Sa+L{
z<QB-&R!kciC=u%_Pu&BK7EGV1yUp_s@Qqpd^*Cf6xOgo*V|4$hGSSKA2WpaB33(Y*
zN`4+3BzbZ%lDtqn<HlZ9zS#|E)QFj}w@z>>ixGoZJ1K@;wTUbRRFgnltN_U*^EOJS
zRo4Y+S`cP}e-zNtdl^S5#%oN#HLjmq$W^(Y6=5tM#RBK-M14RO7X(8Gliy3+&9fO;
zXn{60%0sWh1_g1Z2r0MuGwSGUE;l4TI*M!$5dm&v9pO7@KlW@j_Qboe<WL{+D=0|S
z04rq}Cn#r|Qh`OLI1_QL5U}R{geifFF9P8T)vM{2=Wygi8p}p~9owhqk+?19n*#yM
zj*#{xPp0@cJDT3i?GOww`QWntOHm1f!c}va;b?tOb2%YIGP6RX6g6=_2i^T=N30Lx
zGGxIOD~)lgV;r;otK)h-PN}|RW44>Dd1k9!7S)jIwBza-V#1)(7ht|sjY}a19sO!T
z2VEW7nB0!zP=Sx17-6S$r=A)MZikCjlQHE)%_Ka|OY4+jgGOw=I3CM`3ui^=o0p7u
z?xujpg#dRVZCg|{%!^DvoR*~;QBH8ia6%4pOh<#t+e_u!8gjuk<TWg3Zfj1VT(rT(
z+;cFX>_Aic=|*H24Yq~Wup1dTRQs0nlZOy+30f16;f7EYh*^*i9hTZ`h`015%{i|4
z?$7qC3&kt#(jI#<76B<Zc8_jzF}-jz?c}RJj?}d~o|A$peyx&2tAof6rbF8`JJ<LA
zkx}wt?p2W^anecKr7&{Wp)yE)mY79tNY^xv{LL@QzaTPd04d4;6lK5S1YUv7FN_j~
ztrXYDtR<2@iHMgRaE>iz=bl=k<lj_Eu32rlOy9O^>=&qyaH><ZvCyu=u73u5Amj3Z
zlBLffeJyS(F;wLAij_z7LBu;aGHquG4Ecd?iDly_Tmu`)-}iF7q9@!(siy|rCL-T)
zMJ=;>foM#zA7}N`Ji~<RlOT@^-5)rOA8|yZid=(^iWhCiV9#ueyabSRKG4M!ILEeK
z@}E_xM=5xQ^8{3sm^736?!4juH{#woOSkhU{pHmMs7%U%L{L7L?9}ZSTh126kqS##
z7l>)-f-t&tR4^do)-5t?Hz_Q+X~S2bZx{t+MEjwy3kGfbv(ij^@;<DrdI3T`-v~_9
zcRbkI9fdmuaS>=?H_^FIIu*HP_7mpV)NS{MY-Rr7&rvWo@Wd~{Lt!8|66rq`GdGu%
z@<(<7bYcZKCt%_RmTpAjx=TNvdh+ZiLkMN+hT;=tC?%vQQGc7WrCPIYZwYTW`;x|N
zrlEz1yf95FiloUU^(onr3A3>+96;;6aL?($@!JwiQ2hO|^<dM|7%UlhRzx6gJV9|=
z=NpG%ffNZg)Ud#-8(4E`FwI`_0dIbwuD$x#G#SyFPIa|i#MJAmCx}gJ+(iX-<$2`F
zq$b)!gO0}32UorvmcjGcs0oMXeFUsIgX?OLA?6&a$PuFr{46GnR!g|y(}h#A`6l)i
zpT!HijVb^7e>i)b4pCJ7-y&a~B#J`#FO!3uBp{5G<W@uu@K85&o0q~6#LtppE&cVY
z3Bv{xQ-;i}LN-60B2*1suMd=Fi%Y|7@52axZ|b=Wiwk^5eg{9X4}(q%4D5N5_Gm)`
zg~VyFCwfkIKW(@@ZGAlTra6CO$RA_b*yz#){B82N7AYpQ9)s<e%0{=46^?9=ZEQ-l
zAQWxGXxNdHjc*vyWIT!33B;oq*FC${iQp|GUP9ZdljM~?wy^$O5X<tj{P6elLK%T5
zC#svA*D5wmh9fQFpm0}|k!**l^Nlj<UP85>LQfhOAOMUV7$0|d$=_y&jl>va$3u-H
z_+H*|UXBPLe%N2Uk<CC2<5os`NfNoGP!Ib0m9`%)&9#>wu1*)kt!$Y>(IH3`YbEt;
znb1uB*{UgwG{pQnh>h@vyCE!6B~!k}NxEai#iY{$!_w54s5!6jG9%pr=S~3Km^EEA
z)sCnnau+ZY)(}IK#(3jGGADw8V7#v~<&y5cF=5_Ypkrs3&<giP_=TY>7{}%(4KM7)
zuSHVqo~g#1kzNwXc39%hL8atpa1Wd#V^uL<!G-fTwDKo?kirzAqPxES@VyF*HS5iQ
z6u^SQDo@?kL(sZYU;lwg?P>=W^&E)fvGivt)B!M)?)Y#Ze&zU6O_I?1wj)*M;b*dE
zqlcwgX#eVuZj2GKgBu@QB(#LHMd`qk<08i$hG1@g1;zD*#(9PHjVWl*5!;ER{Q#A9
zyQ%fu<$U?dOW=&_#~{nrq{RRyD8upRi}c-m!n)DZw9P>WGs>o1vefI}ujt_`O@l#Z
z%xnOt4&e}LlM1-0*dd?|EvrAO-$fX8i{aTP^2wsmSDd!Xc9DxJB=x1}6|yM~QQPbl
z0xrJcQNtWHgt*MdGmt<!{59BQ@6R8^J{W0F$k->j%x6SWYd?uGnrx4{m{6A9bYx`m
z$*UAs@9?3s;@Jl19%$!3TxPlCkawEk12FADYJClt0N@O@Pxxhj+Kk(1jK~<na;r+|
zm{2yx7Tja~_uQ<c+6H|8mu<-YUr>laR0*KGAc7%C4nI^v2NShTc4#?!p{0@p<m@p~
zP+-C1vUzlE>0T#HSIRndH;#Ts0YECtlSR}~{Uck+keoJq6iH)(Zc~C!fBe2~4(Wd>
zR<rpD32Yz=|MVv!jF0SQWXAJmWFDV0ka3bIedmZ8+smZ53Ho~&j~&2Ke3DNyKLA+A
zbJ10q_<tT*Npv&sy}xR;{lmk%mN;2WFCXUz0F+vcRuJB#5+NyF41aEUQ~yy+_{tj7
zrTp6j;lWAkEZhiI7QwVMiDXtF6(d<{RD?!c&lT5iMqpaD7bA4G&{!+@%C<d+c70Wi
zU;*do=_MRGv5LZbeY<RwC*Ablvqx17uLc~M%ux><4I1zMeW$<0xww(@09!l?;oDiq
zk8qjS9Lxv$<5m#j(?4VLDgLz;8b$B%XO|9i7^1M;V{aGC#JT)c+L=BgCfO5k>CTlI
zOlf~DzcopV29Dajzt*OcYvaUH{UJPaD$;spv%>{y8goE+bDD$~HQbON>W*~JD`;`-
zZEcCP<ta~{4Akw!C0ePB!7KfHnqyMC?0a{DvplTx4je+~_=&7<z9BH2!>SdlCvANe
z=?|+e{6AW$f(H;BND>uy1MvQ`pri>SafK5bK!YAE>0URAW9RS8#LWUHBOc&BNQ9T+
zJpg~Eky!u!9WBk)!$Z?!^3M~o_VPERYnk1NmzVYaGH;1h+;st==-;jzF~2LTn+x*k
zvywHZg7~=<axHmC^DNM(rrxXXZ+6q8kDUy#Wo11Iv58)OcYVE^Pyh_LpKFMxqfz^m
zX-?%QT4qvLZS`UJtdA|zc7nI&w@Ai(hyYF^v>aiJe=OhS@U>1fYGvT1+jsAaiaM;)
zay2xsMKhO+FIeK?|K{G4SJOEt*eX?!>K8jpsZWW8c!X|JR#v(1+Ey5NM^TB1n|_40
z@Db2gH}PNT+3YEyqXP8U@)`E|Xat<{K5K;eK7O0yV72m|b!o43!e-!P>iW>7-9HN7
zmmc7)JX0^lPz<DsX{e!8YOmOSO*e%?uh^R5cfwUMA1cm{WQM4>F#>$#D~nU^3f!~Q
zQWly&oZEb1847&czU;dg?=dS>z3lJkADL1innNtE(f?~OxM`%A_PBp?Lj;zDDomdw
zoC=eKBnzA5DamDVIk!-AoSMv~QchAOt&5fk#G=s!$FD}9rL0yDjwDkw<9>|UUuyVm
z&o7y|6Ut5WI0!G$M?NiMUy%;s3ugPKJU_+B!Z$eMFm}A**6Z8jHg)_qVmzG-uG7bj
zfb6twRQ2wVgd)WY00}ux=jqy@YH4ldI*;T^2iAk+@0u`r_Fu(hmc3}!u-Pb>BDIf{
zCN<?+PO@76t^M~>DDv_Ko`U@<h{fuj6s>})TZvuE=#74~E4SUh)<>8kxZ=7`E?#|c
zdDKEoHxbEq;VVpkk^b&~>-y`uO<UK(6@qDtV}WxIHiDW6Fs=Oj9`v(O*Al1E76K`*
zJpPUt>~mX=X0bmP!=F1G1YiluyeEg!D*8Fq-h=Ny<ihcl5CnIQP~m5~*+=tV5EK_@
z;F@I)hdX~?{m>E-2S;^F6j=QMtU<k@K}zH2fHq|>zN4oPedvc*q(BCpbg~*As!D@U
z3(sz|;Pe1hn08P<o)tz^6{_0K@t@xxURQdhHo}v;@M76*{4a;hniVAv>_cDQ(klZ6
z;P`q(5_V?*kJYBBrA1^yDgJD|)X1FV_<LnK&#C2?lx^wxJ`?B?Y+;SDXi8|Z0Waj`
zkfD4-F3*H!jF054^gZ3S5xE`McvCD2myEl5(og_>*~sO>?8Sy~I9WdK5K8bc7aeNC
zDb{Fe>y3N^{mrD<dm^3E&Vl+mCGGvrwso}I%<(WEzOn>1+GyH{F?@9}YQ2Om3t`nt
zQ(}MS8M?6Vk>B=*j*yibz6QCdR=ALgTUcKx61){O@1WkPp-v$$4}e#KgK<N~t~;2S
zxPkz4<?YE$L@Ji%7x}Ycray*%EZnc8%G%R=;^20vexFLyVE?wgrEWYm%wFmDv$A6S
z;FnvyM^ZAT9vH!Czs1MO8Y+9fm2`UD@{gu@{-iUlqi;M)NyA|}D)n;tgni%*-M87Z
zrxY`r-uq#uU7xxF<)32NCL<X)rw|)2EdGJz6tDbc&K9%qKZBP_+AxmxpX40;Pja4Q
z#Q)3Yi(-62#WR+SN<#jF3{|OO`hEJ467}KOwM+62ek}8w1%{iKORJ1B|0HMs_q0vD
zgkrRE=D$>`HG~2@#A?`BF8em`ah6+8hH-DNA2>@02WWk9(fzhL_iz|~H~qEViQ(*{
zV;3tjb<%&r!whm6<KTa;Z&Svx(I3Dl{C=o5o%icCS*ze|9kyEo81pbg3aHBh$%tqi
zO^d2^A6vdf5s7))JlFz`+M4&D?K_s>B`XtWmmrMWi=#ZO&`{h9`->HVxQ)^_oOS{W
z!BzVRjdx5@pCXl#87ovlp<^QU;s<*d$)+|vI;Ai(!8Tjll^mi6!o~CpnlgZAK>6=V
zm38^kT`D$_$v@UYeFyVhnsMZI1m`E&8<{V07>bBEI1=fg3cji*N?7pBzuamD`X|^^
zm!)<lrp3t)f;D+J`&arUA{h~5GAW}`YKXM7cbi&qt^^%;RV+@eSZs(3gfwQ7Il^wR
zgw2TwPg8s@AkmZuFhiEZGYj~&&!a1uTKY~SC|)bqctGlhtwgW3iBK?3h-i(2rwJ-P
z?*!Vj6Ko>2v?s|6T&H-_^y`KM&$!0!9tai9x&)5<(&sY6B`3D{$$KMAX3@&`SW;X0
zB-}obt^I;|#o_bR>eOv?P>=UC6CGTXIM+lSu?Uy+R9~O;q|c2+FafBP;E)B5M9H<q
z36O%f4We9cD!RaEFO2QAjn8OEs)0DsupfZKYPw!RZw5F4nwyN;FyuIngDkb`=$?&p
zF2TFkR56Z+kSzToYD%o`U(%^~PP4^++$qOD#N>JgRIpF|GvRi*E+JTBI~T?T*X}r)
zefUd*(+3n_YHZZS(g8)+7=pNV9QR^>Qs8t+iEpbJS!9;wio&9rn=19C0G#<yg$YZL
zjccm%L?k$q_x@t@P<lcl{xx(@SVx3sFpyo5sk5J`Wm}+FtML=sq=Dtxrr6KAaO>Ax
zM-tWHp_YlJ<b?O=20XtJZ>vXWsUqJUr^`OYFA4wkgL`cSOV;w4?tp>GT1jq}-qPoN
zp&G}*;+#+Zh&vqDOp>gRL#^O7;s2yWqs+U4_+R4`{l9rEt-ud(kZ*JZm#0M{4K(OH
zb<7kgkgbakPE=G&!#cNkvSgpU{KLkc6)dNU$}BQelv+t+gemD5;)F-0(%cjYUFcm{
zxaUt??ycI({X5Gkk@K<a<*;?zZ`*hKrsv%M>IR$WCqy4!wkeO_j)?O7=lFL@zJDfz
zrJJRDePaPzCAB)hPOL%05T5D*hq|L5-GG&s5sB97pCT23toUrTxRB{!lejfX_xg(y
z;VQ+X91I;EUOB;=mTkswkW0~F$<oE;TsR91qN?zYft5oMd;^F{?x@|gO<W5Y(KiX>
zS%M}ATlKkIg??F?I|%gd<Xbr0$vQ#Yv3PQHLovgQujPQ$nUr)0Z1GhgO9@*A8ojQY
zwLpIXJ6Rf28rhQ@9`5ko-@kq-`8I^6s{@I++iX26ONTi7T`Wm~*~68Lek!um)dW3m
zNS!FQvGZPuTH&*5?PD%RWsc@+YUnYBa*<q&vu&J}_@HjP#B<xIz-IPr;ziEeNX%U7
z{2nUhfmJ|g>YBhU(h$LqkhE!Xx$7kPS{2U4wLujF_4O+d8^e<sEgeoOW+LM*7!>j{
zgSo(;vA)|(KT8R_n_aQ$YqDQaI9Stqi7u=+l~~*u^3-WsfA$=w=VX6H%gf!6X|O#X
z*U6Wg#naq%yrf&|`*$O!?cS<s6ao87Ru3$BSA77uB8lfJ%#WNb3^|8yl{I@3XkrI(
zJgt1sZOB!FTT<0jS&V`X5%1ab%LR!W%{s@SArDPyD{m<hnQzx-(jw@%8EE|ul^M=+
zesZFnS+it?KOjMwnUHL)A{*=WZ=sf$Lf-W@s2go-(8O3#by~pGFY*dX2h%ohQnzfs
zwIjfgmcvtjlv+XaW*8-pvY!WwfkeAt`S3gx^{M%O*8CF6VJcqpTMV)x8Sdsu>94GD
zk}Gx%{UU!kx|HFb+{f(RA2h+t#A!32`fxL}QlXUM{QF3m&{=7+hz@aXMq*FirZk?W
zoQ~ZCOx>S?o>3`+tC&N0x4R`%m)%O$b@BkW;6zE+aBzeYi47~78w$d~uypaV*p$kQ
zJf34Q+pp~vg6)yeTT&qWbnR2|SifwK2gA7fzy#W(DyM^bdCjnee42Ws>5mM9W6_`j
zC(|n5Fa&=MT$$@?p~)!IlLezYa}=Uw21^Fz-I#?_AOk(7Ttxm;#>RDD_9EloqhvrS
z&7fpbd$q_e21Al+bcz|o{(^p}AG>jX0B}ZZRfzk$WLbNLC{y|lZ|&a(=bOE6Mxum{
zM=Nd+-I2A-N&2giWM2oAH`O&QecJn6%uYl0GWlpx&2*)BIfl3h&2E(>#ODt4oG}Dq
z__73?sw2-TOWq@d&gmYKd<iKo&=r8}Zr?JqOn1s50dI0cNjF}-c{?&Hz5cB3HhBX)
z${^V&RtR{CsrRLf!?KxfOlNemEhWK%QpeqxD-?X>h`a}-_6YQ5```}bEBEmWLj))O
z?*eUM4tw0Cwrr+4Ml^9JkKW9e4|_^oal0*sS-u_Xovjo8RJ18x_m7v!j$eR@-{2(Y
z?&K4ZR8^T{MGHL#C(+ZAs6&k}r07Xqo1WzaMLo9V;I<9a6jx2wH2qeU?kv25MJxoj
zJKzX`Un|;_e&KY%R2jU~<5lm-`$EjIJLDP~11_5?&W#t3I{~+0Ze++pOh2B4c1Mde
zSgj$ODQQm7gk&w{wwfE1_@V(g!C=2Hd%Gwj{{-_K4S|nZu+vk}@k(?&13iccsLkQo
z<h;ZAnp{#9Ey_QcGt8aIJ@N)XMhg3=bc~HZs<28<6Vcv6=C3+=2(xal&%ow9r;}2d
zw|9bJBQ1)^12O!e@-UD2#$5V0+%zZ41tq8UxaP75u>_t8#Ah$HVB-MRyzpab*OHOp
zl`$tEcUcF9_=3*qh8KTaW$znGztA7Obzb`QW5IQN+8XC=l%+$FVgZ|*XCU?G4w)}!
zmEY+2!(!%R5;h`>W(ACqB|7`GTSp4{d)eEC8O)Mhsr$dQG}WVBk$aN1->sTSV7E)K
zBqr;^#^bZJJX4E_{9gdPo8e?Ry>ZrE&qM)zF5<O!k#@8yI;8@YdgAaHwRYo~PGeSl
zDTThdwE~4P^B}RF(%vYzE9v&J87|VRsaIA)vPz0V+n?~Rvo2gCvUCr`{FGAV$EOE5
zd6pw_Dv!AP{mhLin0T_el%J7Du$u_Ba*4jz_;My<R#<>z20DP0`)IIm_!vm&s2mzl
z2;EPI{HgFH-Mp&fIL^6f74>19^>o^AOj`uyL0+Nb##Slvi9K4LQSs>f+$j?cn9<mj
zieNNixK}$@qK0mprFZhLE<IH!gf50ZH0vp@`@wp=8egh_Ki4E(AEGq@WB!b7>Z__C
zAkyZ9C;#uRi3cDYoTA>AT<|*pt{K70oZKG*S1F$r?KE=$4~W3!u53yUvh~(kMrClS
zXC?Dmgv4iS`>~wBPJJFL_C8x2tEg*PCDX2=rHQ@z+Zs)Kkr;FYG`GnbUXqdipzvHE
z1aZ>G6|e`}Q#)Kru0)(SZnUCN#d<Gt44{&d27e++`2xrdaX0E|gVQ)W*}}Ox*>N2H
zd1}r&xGs<zfr+x^()^{Y1UJ;@R0%&9u+-$3A%g|foWzAw*Xx6f<iTqDhPaYlD-f$r
zP5+@uvX}wg;FkC+oc_!X=-H#zQWteppW=;SBPa8+dJ8;gvf{^-k()KxbwcKuI&8_d
zke(`-RKUK6cQ<(gAqjK}ih<cg+h(dOn3q(C<GUhn*Qy8H;`i5tGFNSiHZL^iu^kg#
zHz+UYQAlWZo(+G9+*gFHO+o?0WeER=x9#8D!B51%I19%|084P(tMC%(Gyg|k`d~=j
z1{ZDwN9VgbuE5!s`whsOBzPoq^K%~Tt1IeS2GH;YZ%PKW5uI9skV{dC0gL7A^46Q$
z&z;u!G<Tb1L0VzlNxyRo(7zVSnVx85$a08H;RTXg=h~E4A@dDeUxQ$&&8GQK^+P@m
zijtmTokm3Qi3S9@y0D+tU4q`pcFY&-qhN$2V^sReZlV$MhTOQ^-;G5V#V8fVG$m9S
z0mFAL4Q7QY`(-+5F_)y?7Ygm-#hET&({7hnC@aivI%RzUIiL=R$8~}w#`^6%#4M37
zp5TrNfdOoa0A)AXhOhSeiLbPJejFy)wgI(1!pDWs3Ar<nrJDH4mtXz?&u0dGh1n~k
z*v<c+6GwM~>aAeEed9#?|0HzMGA7pl2=aehy_zsRV8RKV6+^I8woDd%4J8v9hs$x{
zl*V61wSumovRVWtetd1eJ%i^#z`_~~^B;aeuD`6LgHL66F0b^G5@om^&_3REtGmhz
z%j^9{U`BH7-~P_>c_yu9sE+kk)|2`C)-ygYhR?g~gH`OK@JFAGg0O)ng-JzSZMjw<
z2f&vA7@qAhrVyoz64A!JaTVa>jb5=I0c<PFnWwv`<3{7CrJh8Oo-vquiY~b_AC3Hr
ztnQPPhJHDMi{*c?GS?I?uf>bRuTv;gM<a&j)iA&{?jB-W%9UX^AEu}sZ0Ki<g;a+D
z`yLgTENm=NL#_&OE84?60w36OPG8#l)-JaIn$Y+*&ASDRGxCRu64+E;_dN?7+}vQn
zo7^7ZQy{(ggn~3*ZHLde$7_xJ3c8hkF1@T3G3ER(XBeWiNV__sSFjj(BP1!CA5Uij
zf#twm-!Rp<s+~20Ez`ReuBI7LFUnq>F@4bX3DVV#!VWZEo>PWHeMQtU!!7ptMzb{H
ze`E4ZG!rr4A8>j2AK(A<!A`>0Vh6mNY0|*1BbLhs4?>jmi6fRaQwed-Z?0d=eT@Hg
zLS(%af5#q%h@txY2KaYmJBu>}ZESUv-G02~cJ-(ADz6u8rLVECbAR7+KV~a!DI83H
zd!Z(<r&PayxII^4gN5aNhUy5@hr)bsq97X4US^3#=|g9mK!&-LQ}73Z@xN=ztiyWZ
zm2+h7SAr_M-uvK%yY%p|IUQ@6z<nr*aYO>Ekz%vjA-|%4-YpgfymMzxm_RjZg%ruo
zT4^x)f*%Ufvg_n`&55cK;~QChP6~Fy_Z67HA`UtdW)@$Xk-2+|opk6A@y0~3Qb;V%
z%+B@ArKl|<U*EFDzaIRPp3Z=;9bNVOwbz;xij3dVU~8#|?SWYWSfh(t#&CbW2=6I8
z1hX{0V+Nkq$T~nCt1_8FVM9dH>Q^DJW&xuBZD#~SurH7XXf*uE0@|ccNd&MA%Ts*1
zg7TU!xY}~*AOY+tAnFR(Fu)e@^9V!Rm65$;G$-?6e%7w7p9WT098%-R?u#J+zLot@
z4H7R>G8;q~_^uxC_Z=-548YRA`r`CsPDL!^$v0Yy<^KSoKwiJaCt&dlW?p^7Y_<9c
z3n#c<y~)c7^bffE9+=2-yiOta15ir`2n&9G&yycmS$~yT349ynm49zE(u~H+VJl7|
zLW1HXM2;<+gpfla5MN20$WE{mf^uNS(%2S}G)6}f(-yY0w1qAUU3!JGJ?LS&rG?T&
zHn<Q<AwWwn+Cu5w?M+X5vUHd9|IJ9YWy>MWFUe@W@4ffE`}pQduRZ)I5v`G8On2RI
zL)V5k)PMBq(Zfb6Ruig;_SMwaM9t)2JfUafW-6F8V+PjKM#9iD1~v!uOfWiNL=R_j
z$xKbCPfuiw`kKN1U{W6p#s!Vo+Suw#*7O24y`hNTmrEqDkQvZ}tMO{2`r|3XNXJwC
zSUqB-GdK(D8yYTd*bs~vM{3@r5;JMtW-c8ywtvPG2Gepg-QU=s)?*2y@n~8f95m96
z+pO1p_FIP@Pbnlb&AnDXqBkb=RDa{H-fN9$Rv{OYoWwrU{J??m#C~^HFtMrjN~Spz
zt1SsVlTk=x^7b3q-DxumB4DxAv}x1?YHb=BBbrOcvqOzjVK#ZlL$frhpxI1I&JL^4
zTz{rnIH(26vL$9Zf7%ffyC7agUX3bg9@D~^pcI<VQ~|PKGin(ViYXFJ8QI3YU11Pf
zNIs1g(0NRr$vX<2&*aRSd%N1Fp|t~T30<JkV)B=wwJTJ^<i?rZ@R20Mm{&xdtZff1
zrxhA4qYGh`J{VV}K#A3CIE7X*xs2;_@P9F;>Ogp^SvS@0_fS0rHL9Zq*vjT4ZZ-;<
zjl1>i0E~DMlLHLFe*&dK6lIzW57ySu#Tu=qwM<ph_Z3<Pma?Ypk>h#+h*$yk2HIFb
z>nT*!OJPT$OPLhmOCaK*%WUy42dzuvsd)CXDdLTLrH7iRS)<L=Vyktxo;Ffh4}Y}@
z0-I^8O|(-_8XnqiufblfgALc}>E$Zzgab4TrcDG#Hg058>HuG9V=$qMph{<;l?`Ri
zEyGDUBkrQzLi1NJtvoj(mN?yl$vw8i+u{fXdFV>oD0cQS`6mT>G!chOCzE<A7Dmbd
zLdHld6oF9#HoXHH?WcpVzMe>!M}POG4yVkcsa=D@;o&t554oCp+<>_TZ~ZFu!frP4
zU=Fl`17;Hbhh*q72kj_XUp7O8XXeU24I1gAe!<PaS!J-H6}lF-(9`|7Bvi0xXb}EX
z8J?1YKr%r|HytLh#n-7ch@iYK7dNshrLoeg5=>Z;8OmghWKbAdr6WwUEq^k(Y&_8z
zj%SeljzOqyBkQ*T{RNL0@|%7B?116lab<@;U^MhM_=By<A+ftTIdnu%<c!(|m9EDL
zF(VUA#|!$YD(4Juq&EpZZz#sGb$U}etq&mv{|(yJGlCbU6(!m&26DKRWe~iH-lEZ)
z>8;asX*oe`l13GJ8<aOeVSl@x8GyJ7y#ra@wrZw%$YvFe5-x@8&<Anct@KXeB>z5*
z5VjTi4+vl>1TM8OFqzvHGm)^9If&dr@6zaY`cEcbpgfH2v+vgE7J84UMd4{&7eL;p
z(c9_$OzU1R7?w91eP-GY=k8o@VPB!Un6?GZ;<PsQrl}Cqlw08EZhwtFK>t-tik9u#
zvqoC)70K;GOln-bWzDpZYO;db3+qtNN9djk`Y?U8NTp<7p^qb*p}pudj%BUzM(7UH
zy%qEc`XuT^%33b1Ck5~E(5L7=0rzR9`q$N${pil>S#W+o{57c$^%{6jXLl7mylgTC
zJD;ToHF|(P$0P-VDu1113cl`fO??oskdG7^5dm<nI)6x`QF<6!2?h^bz4=g`N}tC|
zQqQ8eW<2z$;HHjFp)_Q2y_tf0R|ne5X6rA|;{y7N$h>B%MB4r5SOQ*GRGZ)={o>ds
z>9kPUQ%r0Ab$o@MK{hL}EBvA<4GAv_oC7bVTzr|H)#yv~6@O3*T%M^d=yP+!DwVzl
zmBv#s<Jhh~co~$}?xAncb3#|&6u#U(lRCdGK%PgFYNnbBX`HFKoag+j+<u2%6x@Cn
z1;XN1Fl+JpePplYs0*T;!<|~=84-Um5B<<CaX&(;E?@)?351^%`$LPLrXprrIxPb3
zryBiCl+KE%nSaWn5zXv0hCK8O(NNt^zhqi4Rg~sjJP{N1_tz*s2!P*c^pa>zT%!L@
zp@s&_ia!GxNcwyFgCOxo<d3XrZ+hrYqLF!t{tRQGM?hLEs@Fq*rF(^D{$^<%Y8*@$
zS@aIC*yjCTaFW1mksYw|2MqZS`afZ%|A&lbs?#j=1%DnoBQ*Q~grK<=ouWC~QZWxp
zqNjL(9i=U)RXP=R7CM*lrfO<InAq9mVTDzVUF;SLg`zJ#7w?#s4JO(P_Mj^8ET#+3
z4M*WQNC@F61-VdQ@8C)|&*iFO<6H`$@H~yHMXu(}DleEJCyH2M3=nmU0fJP<(BK%%
zO>HX+X@7dgvR{(Rc?n~*xScUt%qyo=g)w5da7a@kfkHC5f{IFx%*o4ng~rPm)5Yw;
zw2^`5jQ4|6i@zwi9u9D=8;Zrap%z2I!`5JN3kOAh$h0K~vqK(kg#U3hW2TTZ@#_r_
zuYrSM;o@m|cf2&M;Y$Pr=7tL<l}<DS{d&R*_<y!zQKMk34NQw{R{bc1{$wtZjl;$L
zcI(lga!BKiBH%74K*dZW<4>7cfFCjZdTPi91>|OQ<ueY<dyxmWqwfuy=Hc9+!Wcvr
zwzh3;+8f@}v#qPCHQd&-x4W&YXZx;>HV-$Uwc{<^Jl;4rh{n0WYMi;%o-qsd8G>t`
zQ-2D8(zo(95gXe<cIufb?|_X#)<_-kaM%XK>{3}cf6_?9yO@>*O2@DnMi0IM0|s|7
zttz7!JH98}Y&!xefmFwP>`Q>D`_oUYE!S7_mAp^my?hl~!ZN3Z&HjFI$bM0J_S;+@
z)c61&5|i&S#33B9M<l(?jQORe42i<!M}ONfBbpO!6!*gSMY360Rx49;lzpb5ag<U2
zTyX!sIBIN3R+@5Div^QQ>vme=0gk(Yj(KKL8KhQ>V+m7_DV!+plI5r>jJ{+xCiSCc
z`tY83(lA9*;dT!X@^x-D8ExhQ@OlJNOt(y3U<O&sS}4mojgySIX-%M<)V7T_m4Cr)
zx0QEHpu_XeD}&sg%49K^D*T4hIi|QT?gK<wPWD>P_9ldOS+k8hnRVig8sESest%o%
z;j<W{>}Clsg_Ca5_>KG)G$OIMXfS(ocFQ<>%6$;u%x@EBc{_~MsPZjH3YcHB?RH<~
z;dk0a0@D>EH({DmGJ2n}HyvkMGJnIh%sA;g_+3K57^-Gv&8F^__Vz-f!0)!MQ5b`i
zqoef_mEQ*sEWHiuFftjv-)N2Z8=|Bgx097+l$5w-TRn5KDo+Fae1PxP_%6mQq=HuS
zP*%8{9H>3e?BNgbhlQLUK_uk{V@U3p*8>NdMN#@Fe@vi#yja%I#t$?$$AA0VQ(42x
z0mDFwS%-M|lb{3O|He|F-NJ`0?$h{Q{<P?i9v8pv7fll4eC}k^H0v2ur3XdEHW_n@
zvb$^7j<%LPDxaJJY28Hehz&Uk$m`>SHul5z+L*m&!#!fJJqj;3jztr>O#Fy-E!z~0
zLOmUN3K~L8HkR|Nwiywi&40)E3vRgB<4otz96rleEBpjg`mCW*>Nn*WDNrlBS2nlV
zdOxl4ll+uzZtGeG6`^DdE!@@cGyElu6#g>Yp&=1HtTN^eSMqQSqq&E_W@quQ!v*8$
z+|%d|%rshx=j?UN8s|+=?8>FG$a<4ngKuN*X)$w&m{snhX#>vXAAhv&&-}3>HGiL(
z_9x8fVZXSs^sD>=(;RT!)SEFAxvXK^@<r>SkiV<(^P-nfQ+mo2Io4{LcX;>*{6kT1
zf8-?bXHN4L2l2NaD^3zncNc1-nY1lw-EQ*FFcGJZs{9L$e=aJlCR8<`r&0!z{?fpt
ztJbK!nz3wF0D<a$&3`Wm)ZZ{IJ}aogzk^$5(?elMDU!!bq{Tky{(=9f@$dQN(n<aG
zJyT(fAC=b4Kuf~R7*~i(x5UuIl?~3bHpBpCHJyLuziIpz{(H&Pux9{<Lg~X~;>;ur
zV^Cy@9RmCxjK=X*#$+N#;gcRdLx}GuB`W$sS&0-$g7}56F@GLO#-t)SB+Mj^M7&p(
z6cp|<Vm6y*7J;u1iZ3MAERB(KwIaDSNfQ~woj_g?N5HddOJgjhCxvpdq97cYa@j3;
zq*-tzX?Af^EPOk#!Xb<*12sx>#ig#l@GT+ik-Xx2!!l_e8s;ehRK%E%3_0F#P1+Hc
zYSW_5-U2TRC4ZkLEs)OhP@Dbhd?Cw$($5_;U|V4>EzzV(=>k+4<b4rVw(X`~IoYc?
zaH&)S14_#vNJf0RK^i}nEn)Y(z|7}KE2Ikr`bzjPEY?tHY!iAe6&*lxZTIQIUaC|p
zECkF#?pg6V4R#?LNp(`a&;#ZdZ<+gSMQT(ruvuRfI)9ApfC)*rl%afJ8s*7nrHwvu
zv)O1<z@clTi#4i{)|T8mltL+z_=XZs9Wf6h<!mf7D9(IATryfo8>Eezv|b9qyP_f%
zJ<_EjASxvcKW!7qG9kWy8P-j=tyX_g&Hf!tUH*8gxIDQ$`d6;VtZYyv@r?#q71eqQ
zuVwU8hJV-Mv?Dc1&FBmy<lBluKPztERjEyU>ML`_H0h2++J;ImVNPoF!}q{<%zspm
zX8~m8`|*10*R2fZ&ze^H4}rQEqeM{`zr#4%AJ6!6_9qfm>cr6#TEf6N09|0P_S;v9
z5PmmirL$iSA{@-4#T<wr>OxVGx|!+=_0&Hxs(;xvNvL&VY_&!l9JH6|vKHhzEX6SO
zrIYcL;g1S;8$`*n#4IE;{|-Iv?@OCWf7FZ_y^yVFseR%m<}9p51Z(??En=Zh=pMqj
ze{7=8N(YOdYb_d`rseakM&DL5mx|f<X42KgD-#Q55;8_KS$u#+)fJa8ow;PMk=`SC
zpns+0B*iMIh&fX6kELEB_n+~rf=KmNIrB6pPt|!^l&7VUaGq9H)#j=3xbkA%C|&Xp
zZDI-!Q`NpP+8pVq%hQ$-YON2isw=*4!@nI>;i}F&b&b&8JY8k~4Uf_O$iai1BXmeU
zNxJh9s*6M%Rncy_%IMBhysGXbnZ?!Xuz#8ntNV&8IjkHNE0L-p09L)>B;7blH;>WV
zBO!T=Zixg>&~16TbA;YILdVDG1Cfw3=#xk2gAdWim_ja}>mfoTdz?@EoZ|Oqm>vV^
zkdmhp$NA$vr7ADPq{=ZG1+G9H8$R<a)*s2!W5>w{GzH3e!l(4)>FGRuHRK#VbAKQ9
zzi#a}i2b>n^YpEC0<apOFW8{fPWc+^*AsdAo<KSZq#syFet{%Ufcg~I1laBe>Bo1`
zLID4d1?(E8iZS|GWQ2ZxDhM<{hEz!HQ}gtz<1|mu62FVQ%?%c4hui|nZ9%=o=NzM#
zB0hId)o(}WcX@g_Pk#}6PebTD{eS&9d5ePDY`pf24==BVoX&M>wd#YqUc2YDlRjs)
zDqkZctyV2jL#jnqEg@?&^J)knJ~ada!)H#xPI@V`uZmNmGxAjcXcicGX7PKSPX<#g
zkFwS|Mz@3W5w57p<$3lA_U3v1gte)?#MWM3nCC^2b?V(zDd>55ah{j%8-G6YoX--)
zr#PxrA&nwmQ!ur){W+f;35p|ERz-!Lc=o;%TqhP9j#IY}4!Akwtcqei5^`BQtd?&Q
zK4HJCl|M=ggxlfGk>~Yb22nFi#u#smczM$ZUwX>^d71e6Ah+!Ea@#1k<E+zEEkX+-
zIf3JIL4FE)dFLp1&agYjT7PkZiU`eMM7-8{dG`o+k8%Vuhy|asWQ7kzIw51#b%>^-
zbokLQ!dK^6Kkj&9jH8iA{TMHcjBsp(`%m!UjxkOGJXn8%GqA)cAMF|8>&N(wkq$)O
z7~cSr&bkqPb8v*;3iwFp34Vv5Pg}sSmv7DUZIN}#-NLbF`&`ww&VPmNynK6cPlHU#
zFwOG09My_tnP3EDM)}S>zc-|M`Te8(!AQsrU*dc6{E0EX7fvLv!|SK2RWS6Kxy$qX
zfaO~XUOx-Z5=Ya^J+_a96k$B|1fKvE=+#OBn$H<>55q^WVx<M?J#`^>(5L#`f>KZr
zI>8T((-L7Jh(V!(nt%HQe?Ah@iqzabXIO}+6^X5^_qppP5js^$sPNM@PV)qRag3jg
zgnbaxC)Y!tPv`krD+Nb7M37unh#gD59TthNj$>mx(wXOP+(oN{!k9D*k8fG|#6QN*
zM+9ztkC(qA;*P&p#QXj!?&J_+?8o!?CrK~=^k#j%lS7J6d4G!b7FOpw-+ec2ALE}#
ztl;`(JvjJPo_}k3(VrrnPtg*DIcU6szm@d#&7=I<Fljq|O6M@oM}F#ranC%kbC}&e
z<urY#E-x{B2U?I^z_5;g<uTeEwneS;N~#b@2vJ*a2~kr&CTWq55vig+FU^T`oTj<;
zkIEk=t=_SwV}F>O+);m;_KZoDk%M7CROO}W4*3yU9C6flk4lU3(&7=xKPoN9$pNpl
zDlau)w;~dDc%_TFz0zu|UxF0{E33L0Z=3ezrOQ4m^kyyZbkqTC%c@bSRj6zl^W1r=
zsACw%D{Zxm^V7W4?v-{5E4xcnzA9MM);O9^>+wn*c7IOvO1mat#{t|k0PGYHUg?Te
zBhsEzlQ^yi$5$3Po+8Or#dQlAm<LYLJhTh5Rkw7A7SVDFNImlX@=4`cNtZ|EFIvxM
z<QK%#Rq0yj$`QF%x*DwKTGx8(xyjXHJzHE`T?U@*uCVpI!gauU_P7k|d4uaF<#If4
za@}UZ-+$q{Q#_T+l^xczL)mRTyOfyq>{o6SPc$)6{MSG`t;S{}Nwk|Bw4Y=$(D1~`
zMMG$NZbZZLE;Ks#kVdGb^hxs2eKd>ir`hy1nnTagT-K<PtEfu)G<l_mX`Xb7s-?$i
zzGE>haQJDVV+HvfwRE0i9W8RS(D{ztwAe8~OMe_Gy1?;P@;lx^OC8^&8pq#gne3qD
zvO+85Idq|1MJwe11>}0FmDkcLc|Fz1O;j&mMM3!xHONtFly9bs<d4y6d6?G7_tVAl
z3$#}LGhHITLhIz$XuWeOZE&uljm{v2oLgy=GfbB{ucgh-3|;0tLYF(=LtC8pQIo5Z
znm1i*sl|0CwYuI%ZLa5OtI|r_lv`=L@)c@VUZfq$%g`0(b?8eX$3Fp3O9u$6?>Zp=
z6aWB?DU;C^9FxIqIe*i8dz(GluG`YRvTlQ}ZQ8wBMi`H+11Xd;){T;FQf`ym_HIdT
zxw%<4ULqnQiUNY#fhed{bPCKaEfg4_ZZJSmR31)Vg5U#DR8+vtbG{^9+GV)@e(AaA
z`@Zu&-#O>ofAE2a0W1-#1$JC<#oFbUR(9&)Ek-<28LSL<Re#o2hOJny8Py%riU(p=
z#GrNCh#Gprpv@jV5eWAf;Vp?|EKwQk(xVBZwz9W75Yu}DCi93ai!5$f(n)9S<yrc!
zWHd?(i5@+$m{23$ZN?45Hsjs2y4A1~B#YLU*DbAE9*7uQD=$|e1hh6QX@`w7%%~wS
z)3UqkyKOxZHGk^+Y`wSFu<M)S2}h4c=Py=JATW8ezE!V}>hbRSb2~R1VMjrsz%03%
zbj)ad*oudfwr#|n`X(aNJEMjIl?b=$(fLs;tVcJPy=iF^TO^rj)iZvQKrx?*m<eaK
zX$zEPG284+vZvPD(NUtf;nc5R+e}0ye2k=ancYcSdVf@4VM`uE+S9Np_bAa9Iz47$
z{vt9yA5q47KDWY*o6ac$cGXzD^I=)_K8ocr>$vcIFG^5a1P{u+&```@)4cGezkFUy
zz(oF<;l(6O=C4@-?kc7$!yF9?`~n5!dh*|ts)a4%V@TF{bB$0iUtmJF;jGa)km+bm
z&Jt!V^?%|x9Is&kssyGTX4&R&&aFzC(THIysMb)!;uT`os>h7+8l;aCvjFOtSv`50
zeGrcb1gefacqDB`6tP&0B`j?z8DD2@QPCivI#&9W7bmcQ8Y~x>mp6iAq)68VSs~6#
zGeH?ij<W3S(y<%7I2ot#?y01%nP4tntV}Ph5`UOP#;)v4Ska_otkInwFIK0mJ6)jS
z=qaJ#V{{?)aM(ytMlPb9?5_IA4Eldod<60Q3~b^;L%wUqSsKp7*#gHOBawo0NZa(m
zGp!go;9O3~R;(FQCfc?q93!S+EqTtc>0XzQs=bD^bVyf2kC6uJu)YXwIG^r#mu^Or
zwtsOB`9bfdlqt=ZFc%=i(l$_~$iq;<CQ7<qUWigfD9@Kl6yyuhq2c4Wh{7150_>0#
zo#`-!DS0T2O;J6OAQ5AdRxXkX2D<omb?0|lzRRq@BxQ1|T3e64q@l4b8S`QbTeKN;
zOSLYGi?ZQ_dj#g>P1kIRVJqUWIC#Beg@3V)cqhED(^in`<%f%NlNF6p8k5w7f}}u^
z5$kofw-5#SIBTIi$!la_AGT@O3d;JTD6Oz~;#g9(aO3z|a49Zhd6#FSA-SxyZC$cg
z@Cgl9avgB%k;u4kWQq{qs;lrRK6f?cz*t=rTto3N9fRCxQ4&oZqiu6$o%FaCpMNdJ
zXK)=EbmYE*&r?!Re{D6kIbM7LrxfFQe36P{TrS**dAx8F`7vsBcN-*VM!q}LA~#9e
z&A6qA9RFpqdNrpHrIkODEfszhU*$5=!DVNMfbXcB6x>FhA(39(&d0xouan2q2`PJF
z$+#3?U)_N_Iq2V{;+>mMUVNLo!GC7lm96TTOi}P1s_KrlvaPAPIa?IJ%XR5)e2+Xz
zGlJQ*eYMpWk6L=9DKmfwG~~HD$5KDPj~}pp_fR$`<CmDdE!_N%md&Gv5#fE<#e_dh
zH;r`t+@01lMQe2ld1F)z6Ji@wWw%m^s62YF$leq$9>555d62BlN?n!g>VGn9BeK@e
zWxskjn>ZPbvg?oJ34&}Ak7;-mKjI28x|^oS?Egf=9_*#$rK%KZp_$B!$Jv-YctXGv
zj#>#?d6L`o9y~=!(qtv05r5or{9Szg{gkaeekuo)O+Te{%#%aekSTbEJd)76jP*8E
znb}q23dMMD`~uHv_&I(#u7A;Huj5BH+Fx@{KPMpSRJ=gOk;w@w9wa4yldS-fa$S#Y
z^`(cv-*UGwoJ>*o;$`;2OL&EJwi0!5nhjLEM$MLEZd+uSLuKc<V;TWSrPuL>M&0B0
z+1`_`9Gr3_`Yi$1`nJ(NlCwvYf5e}P@CW>PY}b-}75s%1a;z4skALboP3MOd%H@$)
zp}*p98s5RXWL}>ck63*P75^Yl(WvU^W}M3Cj9lBAdUU(ZxHxIV!|Ch&9{$Dj|0b_>
zn(<7`RlF}S{V)|diid^KY3oBysUCU}s5nR!<%EU?8okLdZe)7gikqabyimd=2NL1t
zQo8Xd1Ca1&_^+V(-hV?~-*&ic=bD-kev((HqKHpwbVrWZR)m*bpqtJaT)1g^YW9kW
zVv;5%h{=@i*-O(L?@eZUcjnHCQfdRFdCm?^nmJ==&ITzlMU*qospO!lyhqYDP1i)3
z@QrCxq*zRM92Pl46Eo$sydbe4u8P^z3A*I2z=}Mnxbdj>W`8VWQqM2u5^qt-0+x@-
zHM%2Yup$;vdCt6@(o5rK<@74?I$l(1;yAI8ngq=^G*u;g9j~aNB0{UR0@a6$NWyUZ
z#x^6Ibodtf=~~6i1iu9nTvX`7iaHicj2)xZ=#!JISR{uBv6!aS!_wC#<Bl0KPTv+b
zdgUl1mTF=dH-ENS*$QMt{JE{j-$mR=LL()a-%OA`etN8#5kGYUxmTx(<yjfhVYE?C
z@53A!!7=3|XJbXq+}C_=&IUcvW*??#&icoQ<eWK;BHTppW*XJGB)2AGorb-RJw&z5
zLn9q|7M{r^{MrHtdNYt-S`yMbOG0{=(M#V&=gTmK-hb1p2&*RgLV~laLz_1F3U*^^
z&2CJu-HnRCZp`#~c4PJs=H3VXD?ugZrRhA|NG5T2UsgSW1)-MeK}=6!;RtF%)g42q
zmFS`rmX$WrzZ6a!!iqsuq;Oh48fsE#>PH>XOr>8%D1|eI(Gogm5a)$j_o8sX^+C-p
zv=ft!DSzlGMB1xEp-ps}PE2nd#LQp;kp(@2m>mih)~3+YK8RRQaW|@kjYR>;T`gDp
zq16U_1u0zY^Q7SHK=Cjx3918VX8ej!P~Ate4!!MDM{s2*s14zh4>uOO8@=V;^5Q!&
z$ETKimxO{7q|(Jc%|~CKZok?q1`fUA(}Jo`y?-B{6G(sDAkdGc{PiV)N5~~Xjr9Kt
zJH)4Tl=ctdRx&f~ixj>wjBm9M9D0KED;&f?3OfTnWf=FeVuNJH0A6e_FDkqPdwt42
zJX$MHg@TG?r?7)l7-H|<pXK;aP#uv{eX36jWI_>0pInr4lHx!P8Nr^=CZ>3lv>U>Y
zhkvjyh5bP_g{OULP#Hig`>Dvs3wvrqSwobL(w~tb!}wJS&zHV9YE5=u?I=AU4SjWV
zO9YjIMzy@iby29X=ytKFT-|Z-qHN^pH&Zg(nG=7i2(%pv7I0ike>aRbcj4_6{$Bde
z6#mms5yO+xQcs}t1F}Z6j^Mwc!iVrqD1YShbcEcchuR9tglO|L7N$f&d0|J}kWf;h
zm{KJrO8T*djc*+hWg#CeOdApvWc`SkN&7=$7P)ReIeIUue1&CVPEaj)2udhe<n}3T
z<l3T?m`8y-&^mz0^s8VN^XX%1U|3YA1W~_Am?~jlFXs9RvcB<jl!^LrSx{SDlYbIR
z+T~@55IC<jaPNp%7UIkw5)FI!I~~U|ae}0MzD%5$2_)@f5xoL#5f_M)XbQhu!ksk3
zG91MH5<Z4~67HvgjNyxTS;E)whJ<h79SPqTf+6)-O~MIcnuHZ%u7s81L<vt8YbA_{
zUhy1Z7mI5pyiQy%;SJ(e32zg_5`R7@9+&WO@uWBah^NIf5<ehbW9Yidb)D;dajJyx
ziIuJ!T{ladA>+5W`X$bg@!MQ?OPnF&J6-okoFU`8T)QRCknthc6B1|0_*1TDCC-rX
z7hEq%oFU_{xL%hyL&o29y(@8sj30EnCC-p=s)kKe88@Q>JiDAt)wLaNY+XbFz1BVS
zL@dNLRAFy|io2*{eh7_dip6SpMK>mh7$&+JFv)c`CcD<5#I*sXt_xA-axlexD$3nw
zVXAu#rn%Q+y88n7+?%8vx2)ps{{c`-2M9FbluW}5006p^;dxnq+e!m55QhI)wOUte
zJ>7V>3ZA+y^#Dc18$lElK|$~`-JNcu*#pV8UWh)3Z{dXqUibh$lsH=z5gEwL{Q2fj
zNZvnQ-vDf2PT=w3;k<e0wq$TaN$BplLEEjnK^kXD%Uq?27pEbyZb*}~#G4&yy`V$E
zjqS$P-Dyj0sqSVikr&I%Q-w#k6*jgvTFjc}&wRV9H4C;Qy#}|GL@FUNDv4O_k+FOh
z>&^Ae^^@j$M1ODMq|d0-FZ_2|XiKHLhEB;^88I<+^6PSu7q?|<cuyrN-xpX|{%i0b
zUbz$~Ew5ZUa4=Cp8C3@(7#+nBY7QzGE2?RM!2^CJG`K1A&kUeeP+ZjthO^*sFwW~N
zck?K50M*s2s~1eJJ!7i=jF~5(kCyrtrB6^x2MCiS?FIm90RRB!lR*$2lgxWae=!NE
zZAfA)9>ox<KtisiYx{z9uY2zm;AElQM)vBqu5G#&x`r&<;%rO1vVrWB7WQhgWnH^&
zUAt$uHCeZHudaJPQu;riBwMy+(rx_s>D=%8&Ue1^o%27B&#!&!lh=u83+I?Fo;!DF
z$CE8Xdghd2Wm~#iGQ%zHEg3sMe`e-%&$O*%-p(4BcZ{5&y9O3VbvKzAH8Q8%Lf&oZ
z9@cZN(cUsPlFaL4NmFEG@6K-Cwq*#s&W_6d;X*El33pUaZpP5CMoh~v9Mc-X>}kVs
zaTexxbZqU|k<1#WTb>FLGiif%!O0j8m^p)Kwe5^_jyQTYXLO!%^szC+f9dSETu;yC
zg5+mfeo{ZJcjk0!r1QYgNh9M0sg9{GXOD~+4%3=cjr}RLxRWWAwa-{NThB7BtHrpx
zybRXW#@S4+;F_nEUOkzN;kx^DOIN3K*4n&h!3_{scdu!g-Y%v`W4F-omO9m1Jg9r4
zJ+5oyhjQ57_Arw#*7k6if0oj6je^v`l>A?58l)zTR!~Ej!nCBG0<<zrA*z?J+rp&L
zV)<GPm+5NPhE1C`F^$x`QrT%cQ_5kc-6@BaN6LMJo*-jq+buS4DAPWHqWEvb@cMGP
z>oPUP+Nxx!$(>=ko$io(N14La#|EhdE-=oTuIDNfJrbr3)T+^Xf4YmQS+N#8GuPQ?
z=W@UlaOwsr##C?Q$Gq_r_Axb9PE?#ShXdo3(5Q{t!J5O29EKAbVr|D}-#bhl)G6n|
zUQIJndK^br;)AqBqpjkw#iqO4bfARojE8AkNz3ifTF(Nu&9T(n0N5$F*+KWn{%)qF
zvvmy8y-Y#V-6IzXf732%T}=1U{Y;NPs7xNsg2^$53UcY_##VP@G;14f)Uv&3#<o1&
zw4%B-4z`j`rr~x(_naNWz{o~DJ34Gy*{E?=&v?1<=;mp@@s1Gn%nH|%zk}2VR}9-u
zUWZNZiOmPZu^Km=&lRRU^ngaY=|QHA-ywp6)X%g&_LhiLe*rY0(Oyb1`Can~LxHA0
zO#A78nC~FsctP`(t>(fwb~OKgwcQ~c3ABsH``hMQBut0th^QhVpEHL-^bWxZ^lhtQ
zj9%OJpr$^y4~h+Xy5kwnhRs1brqOZ1T-$7$SbAPkgC{Aa296(-lTI-0eQN~C@wy{d
zoyJnM#xC4fe`i{W5@8OHR}x-dx&AP1tAUcYb|PRu_)t%B%eL(yf&<qm7T3rW9Mc=`
z+=ujqjJMkyF(gPv5O^@RLW`9F`{o*Fmi<s$225kpNsUJ76w|6|?fR{;f(H?Xo)1!9
zvcqiUOL((2vS_T59k4cQ8;Xt}U&sJ~*s)%LqDKXde_T3^Xex|lbq_iRvDDu$;?B~z
zXz~QuGdbHe!t`BI5nOr->{+ER1R_iIhUs1OZsGmziq=&(?k$+PtW<^X)#$tcrD2An
z-|`GqF}@F`^X!L=v!y-r5IY^PKR`dI(f892Nx4RE;Ejgqhv|UC@Q+|hpkm>EYh!)$
zcb64`e~|amkBKhtLuFgoLksNufb4t*WyG^9x~_=TRQ1Q{L&E!EsT%Jrp!*5aMai(c
z=_6u5^hq9U`q5HyewJw&u+uZ-+PQ*fNKFpYb0T3q{Ur0~!vbqFqgt(~JzOgQqQg3n
zkiE0jYPHhnhHCQU_3`Mae%go*8HN@0^gKcve|hAL>5X=@T79-PY&!X<H>!L1F`^r*
zHxG{L2!z2xeq(gZv9Zw`k0Kh!<*ZV&NS2dDM|mB|3i$~-m@b0Xk<5fbkd-Y_-GOT5
zFonU?apmpNVaLuR$~~vxN|tj~Z`UCgi|($z%@HTp9c^`6txCK{Q+CNlrRnKBS?NQ&
ze^qXQm}pPNgHPrygy^Txx6OF-P{H!dyn$}V7!$cc`k6TebXLNj(C7tv5rw?uUKHUP
zq525ICa2ng=II(g8#*u1$Heg;57W=l&ueIxK7k-CSWlRU?K^7Lo|!x_s~5qJ&PU9#
zQvY&AqpOk~f`;Wu9bt;hYDe~1g}mV?fAc|yNtzP=muJbVVhPeUU=~gOKHD+&<cvI|
z0^*;R=HOFw9RY0_XT9>m+#s2*K)+1CBJ974%so%*Jy3HzNWTt^5gPkZP{Q<zgv4j)
z)!9v{i9F(1dahHzrW)GAjxLV{y;QU%#r!7vIaeQ6p(V1I?)r{`A4>ifeO9B_f9SX6
zWOPw=`BSK}xa;qfV)qM3I29-K7KVo<q7D?is?7U)Ot)3LY4+;xYxE`YOJv5g)eL25
z{eebbq(4M&rb^88DjpKCRBh8$E;G9h;68s$e<H5^Q+TD;fkFB+!0imm6Ab<rQU(5;
zzA8UY$u4AnO+isYEf=O=q+b$*fBqHvv_89#%c`2K7@{Hi8_9r(2fvi>5d9q!qfY+=
z?z-RuCP?3qcElbD(>Eoa{)zq>+4c|~l@iq<`qxT%Q$9L8>ey%WA%XY5LowK<Tu{UG
zp8}Qtp#Q2ahX<+x`G3HV9ukj6!^?~=6j+wwbsjm?uL5fc#2-Z7vb@qee{*@PZBA!{
z`!OKFiv$+{X`o{ajZ%mM0N?JaWEbKfx`|u7)Ph_O*b82dI40BWu{qkz9)@`_hc(uC
z$()k5VDDR1(s&u1#LFwsowCdzH$r{SK5{5kb<xsd3J0#>W{sP8<?L;#Am0XvBKb=#
zu}aS%B-A<kXVxHTHLuY)f5K~#0`NTP)m<~wQ$RI9;w|O!nclK;--U!BQuubhLo9*k
zTO;t9Ddf=B9B~b&X9N<%+yYc!c|Dvjvq?1_;?_z6nkO{K8zIUyyhEts=y?v7OCO#L
z3$~PV3In%sT;mugU>e9jV>_n~qo~*g<VEfebCNsip;ISn1<olSe?86Nk4Zbmn|X`K
z*a{g+89iI(2=lhm5>nHu*n%<7JA~&RICDgu;o;t?QVYd9(L!PI-dS%ggq9&d+y&sH
zSryoqrsgK|(kwjrHtx~*e(uEv)0N)NaSCH7zhT~uOo^2}0g`{qiEt8ngb@e9DlbgK
zl0S*ucdNf$Y}joKf9r*uR~a9ivmNL6^Ioyz0MpL@hoB(uL(QwSCV1(11-EY$7d2Gp
zymzm7;{YGjct5`#nQXfEIHS8!bLQ3^As*D|O?nYJ5u$=Zd=#0?QBR}8c9_#r+t)MN
zfrjebpqif$9|!8nEnRoiE4exv3-M#p-qvW2t0VexiD<lre|&kjEyNk7_^qKjokdHv
zh7IV=!$^tKAu(v9idHZ=lSCPL)8A)jkqnomOv~6`$PXFLVG%`}Q5AylwvQU*??3oz
zkiY&Y8m1+nLBL=sEkn*ciP1*z`$5;l)5j;N@fxj24@^>X{3@+VT%}0+Ra$dd!Ka?q
z(z?<neh^#ge?S)};zhdiXpuHvByEb40~2(AqDY(51Furu#LaKSuhG_YYLf20zRS1W
z-|S!aJgtj2`?sXK14Zh(Kw2V#kDW))`+4H#>xqH*%k(y;3l#N#nu6&8U;AKVZ+wa#
z8n{M#(<zQm(!L4$5V(K<|D|fS!Fg<Bao@{ybP;-;fAyGOpH8RZjp<2x1j=5ZSVEnD
zXW|+i7X=^1`0;e=6<U_K?thNz6TU4I<mXqbj~JSF#1b`#GX{xIz(mZa@EeD{>tN%9
zv<QzgADxD=-U}-~i`fZS|8@A~n=t21@YPd>vSp*zVO>1;x%OAdf4OmZigNp}k(KWD
zCno8ge+|p&Q=#ra#4i>*liptUEHx%00bg@nk)E7@wdn)Rb&D>E*}syE_=|L|NZ*6~
z=dpj1p7w1IGzXH`pQnywb6{%&-8?r%?@4!K^N-@bizEK!n~L=QqY#g&4<0=qfJ45}
zE^;oU_ZR6WE<mM3x=5Gc?B`QKF-rP)x8D~ZfAl8?1MP!#$-%~-j`&L!dLa$_{Ok>-
z#SK`XnO4&_+-xn%v(PsDZkx8(Qg8%dulK=Tui?91+V3(td$HmJ-5yu|N`m}?xM_p$
zzO@P5X03QOo>;pDj-8^*7b)O->HH$-{suTNy;KG+nx(Rhx0j>i`D=7Fo!$pEi$(gR
zf8g$h;O;y=evJW{&!qQ@WSBl#q~DmL&ne)1{sJwNOa1QAiJPCFpkwXHYxG6o{8Cyx
zGf7{L1SaW^iu9Fke}jLHzdl0CD*k$X;^x<r>9UjF!2gMx?;eQbq&IG~7wIoA%g+r&
zsD^m$RTf&I=qidT+Cr_0#%Q~u_s}jyOZU)TMN@P@(L;1x(c^Ri)+N$uSkY0k6)n(v
z6qR4$dp~_x(UM;@_ygF)>LTQhuT^Y_xuD7z2NUg6^w*cu`{U^=6cMB)PBeaflh243
ze@`_2n_~U%>6IHei{PI+WN*n<-$I0_6BhxXlDYUwdpxZ|c_2|_U+F|(yU4KQ2b;LA
zBucsJ($Vrk?I)Tzgp;OtX^|T$I;`0*=0@gXpSY8|{oEZ;EUOR{;??e;xD^2TvUrr&
z3EB}?@;@zc!FLvULlfV1qR8!6cvF$@e^$R;MegnnG{oTieMP=+yT86GRNtjV0__R~
zVMM4m#eGG7;37S~Qd=2n4nKXoE2MYfQ^&^&elTDE%ttA_Qfu}<{meyLm0T&4Mpx(x
zr!cirEApX8u-(@j29QKTm(~@UxcS^bB-rhrAh%4ruhE<7CO$mLM{Xn{!AKx^e}x}z
z;&<Ts71$vUh7w|`ILvwM=w)Q@Z3D7R>;}6w@uRRP5&}0g@d<n;)fI=DI9sxGe3D0Q
zR7-w^LIU@55x;!FD{sVaP=rS4BoDEv=wtA0p3bVVP#K@4CwT+LLf2yaE_y+Yh06Fv
z`j{FEmGQ^vvKkAOu|%(oh06F9O!}-E3zhL#>1%2%RK{<j0hF;&jM>KxGFDW^?cAlt
zLS>xcXOy0$xM&3W-wv!kMvFK_KF(mwDoZUQ-?sr!O9u!`Lm;-F4gdhY8<Wu$9Fxn6
zE`R$@6G0TlzmdyADVA~*EGVwGwy>;4O&V%U42cOzgT@++{5Rb_Y!~)Y_JT1+9)zb*
zqnP-I58y)?&(I<yv|%SZyL0CIoo^;*=Fi_>zX7bl6gWOQdQ<(RH>I^tfvvCW)~>#y
zTcO`}J(;*+VECa;9FNE&852*oWNcV1vVZpD)Q|P`UFpTNqPHExmu<sUIqWBP<>^|J
zwNdqq-%UM_193|l6&_OHxB*e*1`bCLDT>*P<JHy2t5w6ML;dpzgg~YdrjbQ2U5^Cj
z!^kn6NZKBmA0pXqQ)Jdd$Dv5WpuohQJd~y<1IK*T+#@T|Ff1^A9(}<?V9TaQ8h=Iv
zh7MAf5&^LzF#OC7+~m2yU~#9kEih0lZD*0i^$axRvdCa;6hp}Kj2AirGsXIO-bSMK
zQB&N7H8eiP3Hcgkm<dz%ndu;IXuf8B!W2ormc<Rsjbaw_0#iK%8VUkhTLruzi$zRl
zuz*{<WO=$BfkzkDveA-JgAP&(EPtw%>b*8!6ELqrE-i8iy7Ij%u-2E|-0W*uxf<$W
z`9N7d<iZy>`evT{Ki4BcStVHJs&4Qp6v);2&~2rDlcKi@M}=#uL12{Myecx^iy{8c
zVw`(}N3*!b4ak(=|HMS$2PVHlJ$X!Fx~nO4HM#P4Odcci4L6rhaQjTSgiAYJVW}(3
zcZ6dd;k|d|FB}wD<$jpIV3ES^cd=y*as#G1*to(L7Ee&T3=W)vrT%_}6Rcdu_!2Ox
zd<XskP)i30>YK3HJOTg!9+QD19g|)V50gKZ2$Phk9FvcY6@RORP(={Ilb|T{zS&HZ
zZ8w{+o7RKa2k|XD2_Ad^A4;5v9-M{w_<sA%Ec^NO{s91E*kkar+1y7@JQi|^CgD>q
z=X}6rk(Ww~N);x^iv)>V)F>R%WhPu8Gn7lW${nB1g?2dLWg6t73{<@%IZZ~BaZFho
z{msu;S`%=Y2!BRo(WJ^CT4hqAYqXBuA|4G-hEb5<nm_x%7<3+rm6dp{G%`3UY#OFk
zBpSm<E6NgWcqgjt(mBjyjkXO92Kx)K7NHg<4R7NG%Bl@52CZ{tRCU4Nuy^wlP(@g8
zJ^SzaGX`F-KkI@Ioes2Nhe6|tz5pX=lC6u;@nM_#E*`l9QjfHG{080E-#`tv!21SJ
zO9u$2Uk=(N0RRAMlR*$2liiL#e@k=IRuukj<3z4(N=OI+w-jS&>X+gsK<hft2Q)M;
zdC(Y0MIZE9zLrH~$s@@LOr}i#23d5=mX$o<nX>4vi|+ax`Y)QE>yX5GbXw0?()rHg
zp2v6Y?|;Ai6~Hta44Y4$EEhLYRc@>br<N+EjCv}cGTdg%vUy;+j@EQ*e}ZsN*n<0l
zlnw4{Mnf2@e!J<XN_B4gBA;rRT9dalOU9^Ou1#H;u9B@+-0`osZJPkU!L=z8g=1Qd
z5T50jgsutCr?UtzPF|WUYBjNz`Y8&=pjO<rXNa4YEf}({XBJG4*KAQ(_js!%yh7!%
zABg5{&m|$Sgg?g}QhN#_e+<J9`5G_S+%XGF)rZ0e6bvzpnj$#p#c&}#-?O&df;?;{
zvn{p*%P!1uzp=nuGYlsVfeKWHp{tf-1)nesq%-&8h~t=w7~W!t_s3K)Os1B<T@0Dt
zk7ER*Do)@e!^yqSdwD51rD9x08t;!(c3SPA5_p0)6`Y~84kq7Af8uQw3B1D)v0Ywc
zIK5}o=ijq^7w6<LNrpkgc6|{?N|uno1xk2TJg$g99@5_vf@b1)4-?YyeTHNER0=W-
zQ7aH04_uGo)IQ(xYn%e)kdGk?jbY@lUO|CDA-*k&M?oA@7>(frOjAV;0o1acsC^@*
zn3r)y+I>hF1TIxce;hk#yN!}<5g)5iP-2MryPTMe;_5#3Y?~{f39Ej<y})0w0@|Lj
z^x>Fts-NL=6`$fd!<&A)>c385EL}b_hc7TIt#4AVZQ2VNn8;C%V-97h_=;pxPGBN^
zxZEQ<FpmW}mPK-;K{FJOaQvU4ZsTjo<z<G%o_4wI1Xfebe?BrqOI{KR?(8tMue9rJ
z%dW{)yhrOb>v^u1TyF>`Dd|Y+WNVk^$vUz2S`^>>OG|rnzOP~h-%^w0;yXlW?LXSF
zFAFN=d;B0nJdh6>c=m{s`j9&f&t2!$-EFF>xC?`>kKH9&>Z_j?I&y<<y2yD95})Lc
zhL0%y8BCJ?f4~rFfX!?dF@3&+;~~a2F_?Sa#kj67ba1+hgua;9^lS%bL!1wBF+}<W
zCK+yJU*HnMQ<UiABL;mj#LURG5I3G~{iV_Oa4f`^dMOg()-PLs=FUX&gf5XHL}lgK
z)^EAz^Un|^?Bc5~?&@8v=-CG&dI#Ty_%Q^}bx?anD)}XF7VD_v9431231qNAS!a;%
z$s72&_m<TS(DMxp`~y%+2MBtsPVk(Qy^?Z&TOO={C{HR0ifIJ{AtBq|_Ihx=Hh0&O
zXyk+V8GNCMjfpS(0DdUrZ0}A>d)Ov7vpfIa?C#9&uirm@0zd|~2z<J{%w<1_1zJ33
znk24>#gaHD7ORz-qEb_-YRO7fVmPlel~IFXuuP3)vCN9+M!jN)D<!HLY)-7n$qKE1
zB^91ST9ndDnF4C{tizY;s)`dvnI_XXWSXpKjOmId<7|WJ2Cjwk+4+U}Y*Jzk@uLq2
z0e`+)*Ng1AqA~)}sxGHwok}W8UFft{V|wbHWw)wYNs;S%YtLTr5D1>p22H6{lT-VJ
zGgdUc&`&^+6vNb&LY?af1om1gjhU%`gWT>aQtk0gJTQUq-oH$Flkd1w_lBBf0;BCy
z`7+HcE$8bM0^avZ&C0|*OB=uyFRJ?aTcyIPb&~+uB{0^Ysv=R7ZMP*l&{d2c6X;)4
zG{sye&>M>%3NQkre(=Ig+{%mG#`fOM=|O%cclvVw)s7Fw1@Oa-0qBDX0)tL}srdd3
zAKVr|u!4652w2`d0fsD36d(v8?%fw448z=eKw!vV=Ju7+g<@B0$2aAJ0j^IF7?!W<
ztpbe1;%>zpHr&Lcv2JbrusgL?(as#!?0ARvZ(9Tyw9dPLBI6nnUO(iIo%Z>S_JI|#
zma!w&AcT?E9qq-QVS__Pcf=Ea+vSIvK<Mzg_9KlKV8Zy1#1lK_X*^r_+8~YR^5P4}
z7sOkF9^v<)Wd+*~+BRU@A=_f}TNYc7Hi#bHH2iMjXaTblw9&-T(aFho7z^KOLL_{r
z36tEL;@)&98f?OhrwP%oz<(i#LEKIdh93L_^e1MUFzdwUAZf=#X!!zWeTi=n`C^CX
zA?1cg9Q>gxKI!0TcYM;pGp_iegD<(`iw?f*icdNCBX@kt!LzRTw1Yo($EO{91y)_~
zna_534W4x25$ukGuftOpJnG=jV8ac!8;kc6zdg|V2T)4~2x;QgE$@>LmS2BOn-Id%
zP<GH51==)e*e#n11+>zQ28t;HPLr2p=wv3&Oj;JfT|seQL0nM~MJ-CF6-0jU9DeYR
z@_64&(j;x_;hdb@dGFotF5i9czW2|+H~#{#7PlELoIc&#dNMd5B?h^g3~ml4Qo(RA
zp=EQjBAK$LMzUIx)4a|VE*XEE7Bi9&No06p(8y<v;O3O17(5)zr6XA>7m<aH<oe{A
z4QmHTS8pxiQ+Y+92_qv#*3givX<6l5m(?`Q4sqQeUo_v^vaY2ylH^0dQywq|Z%oVU
z3BFraI73j=)6ujpB^4eW)}>sI>(K*_+;xm6@}{P{;bNG3R2q_^ill$0qum2XdBSv~
zj!flrjWkV}8w?9NY@NI*E76{b`7I2yOInW8*^Z{HMa7sj>JplolG6-L9n;6tX6xj2
zn?nKGDyy>jD8s78N_*AgXzF9AX>98AVK(M^;YK|n@6nqZ^So$4y$?Rjnt@s@@WF!_
z;%ku)Ud$9<OBj6Rakzi6jDqCHWWzLU*Zn@+j|aS1jsS6>Xi~Bio)1CH@sgE?7-s2Q
zO70|>uI<+qhK9zbjuQPbQ&f114=b=z09Fwo&CMQ3=c?)OJGTfZGU7uMLc(z~Lu*;i
zHb=5*a$S{_V&=AIc_1$mC;vnQ?IluiBSJ+^IKxRw46Caap*(-$LQE<*qx*Z?DW)h^
zd(nb5408-#VUeM}u~J*qZ5`H&Dr}$xlV!>~=nQ%A2*bQ|r4_N@!zMvf12!|v6f`-E
zA159fr-nFf(3Q+@#Wuk_ZM}KMRF@3%tC$uEJdW)mlpT{2=#k8f2Ro-GAQpVs?IiHT
zRBz6DyJPh!@>_pyHI|XqZrB*hXFcd(STxD>#HtTnj{R<iP4`4e|1_NJ6`b^vD`Q$$
z`<zhs(@8lY=VH`cxKq6Y)JrJBemUn9E$+nBPt!)(^fM0rP#NAK@5lt+;Y4!q0~2^>
zI_co4MD?WI#m!+&AKWKrxt2HWBiimm8X2J@Gq@Vt#l(MB42sNXkJlShK|+a2t3nf~
z9K#Z_+$Sk=QZo6ZQ{saz&VK_8f$J9yVJq^&_z>ZYX>pD=c{zsT0)B$DOC{*dt0qOW
z>sW&4oM!brL%2=LE6ISWnE}yg0)_4tD7E51O4qW1RV$2DEgqb%=<rTa-FT7uS4z{f
zl39Ik9PEFXd@EExFE8U2FJ8i{459zuVf!+=HY^QL`*8a7>t39~8?^CDDrIS&Wms6=
zbK2Eh-Xx=3%DVAZsfQF>l4J92FV5i|>Z;Xl2{+y&vIS$bk4x|}%eIvd@Szv)<D+6^
zl`3w0!cdz~G_hqr6PL}WI8RM3Sy@#NK4(~2tyO<iKVM%6mtQh$@6rN8l9K0vVcE<C
z2KjNjiUA|X6LL!C$$+d@tv7K{toPS~iS2^jZ|N#hEB3Sp-!Zst58Wxz%-X94bQxDf
zQGXzwORMd4m!!p2@gsvLC+P+i#hj)g($TtxpS}1Azfd8Es&9P{Mg+Wi&$*1>L<qlE
zgs^`@)96`6+hdfvgdIX*W|}bQ5RPHo3k!cx>D%aOMWyPXmsD3iJHYjQVmo3Dol!SE
z@M=&mE`Iu|7uUWm=}AD+4I&bA=>HbL+*kq^&HmjSY7T`%@iF*sp&=gc8pHfiEF8t+
zQ7pCa;CWn%gd*{&Kf;B_@vw!)P77iBTx)+}qra5~Tf#>yJZ7QIzl%ms7DjvgoiyqR
zAE~hrv(V>%nuZ4pi--Ns(kM|Fr7Rq^khSof1=GT?g_BpXtn(I5#a*}Ij(62GJN`%C
z<=Drl3ZC?LG0U$s-Dq50A)NbSTPi=_%})kwxho&E==wkE(LH}@{{)3qO|C%#YF=3$
zdiA?ni$9)wR*=E-zD>6#=i#B!N#gG&-1E6KkNw7xOU%m~-nh!XQ{HJ<!rc8=T(_oF
zeBXrsO2vWOl$DC2B6ckgYmtAy;$wWzPA9|v=4YoIme9MasB(Dzm-njLU%%MipH|W<
z{)U}vVr56^?I$dY`hbUa?qcJ*rMpCT(Z}{_zxLlZj_X^!P?^c3FMfS!#jMPH&f~%R
zxV~8>=8J4JS5MC7j80GfF1F!!W{h{y?1Y6gJv#Es?z-Mhy6*8qFYB=KY5fJ$eA5<B
zUX?jnaGp<_N3Lb-;Wt-+Bf#~bI%b`~tp}42%vr_it^2-4X>$JDWZC&|wm9Vh`;wc1
z=hdk(0FO+816Kit$%z66lMChx$ilBF2VOs5jG{_Fm|^llWu?h^^R#6V_b)Rr*r2Go
zCJIq?W1a~s_?F7ag7Zb0%OoM9-t$dmLAMF|0NpViXalO=LkbX8`{$d;BCcg)V6a88
zp-~y6${p-l#0_8!3>GM=&ZvP@X-r<TKua2Q6BIAdMrWYUQT=p(^2Y`KvY<PRmIJ$t
z=YVRAP)rHahPbGHp_VN2eKYnbs?u~Js$MKKmqlFNfF8>J1|U_6z{_d)L2hS-94p_r
zNR&C&lwq=fmEz=Gi{xeDN1+4Vql040S4)s8GqAtmXGCMf(rRml$p-dPz{AsxWx*#7
z1I<|s^p_oqSz`7Kll2`vz-A#%!)0L5M^WYL$S|3)N@Q}Svnp66{FqRnt&S)votz;m
zA;;+IfmI{UMr2?xK~eqK4W?QPtP=SQA4L?Exn2;JaX#W;mGFaPfWAVFN$n7b${>49
zkV+ZQVI((!sx|@ru8U%(NZ90nWgaq!b@vPmS||zvBY+B|C!b%YB@17*Bg(*_graC;
zF33Ka$q#Y`z%B!>QGqN`0osXb-`Pr#N^_7ZX~ZBQ1A_vJd9x>9Ty7%^AMXK%usn+V
z#4d>c>{h7C!iPA3cA@5E<z9%YDJyhj!96NqiuVKF6KjBC){;JmsxN(NV7G%Cq`+_r
x0IEcF`|?Q)lOIk3yPXAGr1Y;8WBxT2Bq%-EZ<_ezTPu0ESa^Xa_s;>9CIF-wP*MN@

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9cac784e41a..1f3327fc638 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
-distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
+distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 1aa94a42690..f5feea6d6b1 100644
--- a/gradlew
+++ b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/gradlew.bat b/gradlew.bat
index 93e3f59f135..9d21a21834d 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

From fac1c2abae822fbfa60057565a941a09ec51ffdd Mon Sep 17 00:00:00 2001
From: Ambarish Rapte <arapte@openjdk.org>
Date: Fri, 23 Aug 2024 04:36:55 +0000
Subject: [PATCH 22/75] 8338849: Update copyright header for files modified in
 2024

Reviewed-by: kcr
---
 .../javafx.graphics/src/main/java/com/sun/glass/ui/Window.java  | 2 +-
 .../main/java/com/sun/javafx/tk/quantum/GlassSystemMenu.java    | 2 +-
 .../src/main/java/com/sun/prism/d3d/D3DResourceFactory.java     | 2 +-
 .../src/main/java/com/sun/prism/es2/ES2ResourceFactory.java     | 2 +-
 .../main/java/com/sun/prism/null3d/DummyResourceFactory.java    | 2 +-
 .../src/main/java/com/sun/prism/ps/ShaderFactory.java           | 2 +-
 .../java/com/sun/scenario/effect/impl/prism/ps/PPSRenderer.java | 2 +-
 .../src/main/java/javafx/scene/AccessibleAction.java            | 2 +-
 modules/javafx.graphics/src/main/jsl-prism/PrismLoaderGlue.stg  | 2 +-
 .../javafx.graphics/src/main/native-glass/mac/GlassLayer3D.m    | 2 +-
 modules/javafx.graphics/src/main/native-glass/mac/GlassPixels.m | 2 +-
 .../src/main/native-glass/mac/GlassWindow+Overrides.m           | 2 +-
 .../javafx.graphics/src/main/native-glass/mac/PlatformSupport.m | 2 +-
 .../javafx.media/src/main/native/jfxmedia/projects/win/Makefile | 2 +-
 .../src/main/native/Source/WebCore/bridge/jni/jsc/BridgeUtils.h | 2 +-
 .../src/main/native/Source/WebCore/editing/java/EditorJava.cpp  | 2 +-
 .../Source/WebCore/platform/graphics/java/BitmapImageJava.cpp   | 2 +-
 .../Source/WebCore/platform/graphics/java/BufferImageJava.cpp   | 2 +-
 .../Source/WebCore/platform/graphics/java/BufferImageJava.h     | 2 +-
 .../Source/WebCore/platform/graphics/java/FontCacheJava.cpp     | 2 +-
 .../native/Source/WebCore/platform/graphics/java/ImageJava.cpp  | 2 +-
 .../Source/WebCore/platform/graphics/java/NativeImageJava.cpp   | 2 +-
 .../WebCore/platform/graphics/texmap/BitmapTextureJava.cpp      | 2 +-
 .../Source/WebCore/platform/graphics/texmap/BitmapTextureJava.h | 2 +-
 .../native/Source/WebCore/platform/java/ContextMenuJava.cpp     | 2 +-
 .../src/main/native/Source/WebCore/platform/java/CursorJava.cpp | 2 +-
 .../main/native/Source/WebCore/platform/java/MouseEventJava.cpp | 2 +-
 .../native/Source/WebCore/platform/java/PageSupplementJava.cpp  | 2 +-
 .../native/Source/WebCore/platform/java/PageSupplementJava.h    | 2 +-
 .../native/Source/WebCore/platform/java/RenderThemeJava.cpp     | 2 +-
 .../native/Source/WebCore/platform/network/java/URLLoader.cpp   | 2 +-
 .../main/native/Source/WebKitLegacy/java/DOM/JavaDocument.cpp   | 2 +-
 .../native/Source/WebKitLegacy/java/DOM/JavaKeyboardEvent.cpp   | 2 +-
 .../main/native/Source/WebKitLegacy/java/DOM/JavaMouseEvent.cpp | 2 +-
 .../src/main/native/Source/WebKitLegacy/java/DOM/JavaRange.cpp  | 2 +-
 .../src/test/java/test/javafx/scene/web/HistoryTest.java        | 2 +-
 .../src/test/java/test/javafx/scene/web/MiscellaneousTest.java  | 2 +-
 37 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Window.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Window.java
index 47e22695254..20e28d47109 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Window.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Window.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSystemMenu.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSystemMenu.java
index f0ce48397e3..c254b8f2b93 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSystemMenu.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSystemMenu.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.graphics/src/main/java/com/sun/prism/d3d/D3DResourceFactory.java b/modules/javafx.graphics/src/main/java/com/sun/prism/d3d/D3DResourceFactory.java
index 51b12fcfd45..83e20ba665c 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/prism/d3d/D3DResourceFactory.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/prism/d3d/D3DResourceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.graphics/src/main/java/com/sun/prism/es2/ES2ResourceFactory.java b/modules/javafx.graphics/src/main/java/com/sun/prism/es2/ES2ResourceFactory.java
index fcb731006fb..c3bae451ae3 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/prism/es2/ES2ResourceFactory.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/prism/es2/ES2ResourceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.graphics/src/main/java/com/sun/prism/null3d/DummyResourceFactory.java b/modules/javafx.graphics/src/main/java/com/sun/prism/null3d/DummyResourceFactory.java
index 9f9b4de709f..d22347da5ac 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/prism/null3d/DummyResourceFactory.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/prism/null3d/DummyResourceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.graphics/src/main/java/com/sun/prism/ps/ShaderFactory.java b/modules/javafx.graphics/src/main/java/com/sun/prism/ps/ShaderFactory.java
index 98d3896bb67..53366c99780 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/prism/ps/ShaderFactory.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/prism/ps/ShaderFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/impl/prism/ps/PPSRenderer.java b/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/impl/prism/ps/PPSRenderer.java
index eeb0d2b1d34..09cde267c51 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/impl/prism/ps/PPSRenderer.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/impl/prism/ps/PPSRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/AccessibleAction.java b/modules/javafx.graphics/src/main/java/javafx/scene/AccessibleAction.java
index 5213804cf5e..53b7825e973 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/AccessibleAction.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/AccessibleAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.graphics/src/main/jsl-prism/PrismLoaderGlue.stg b/modules/javafx.graphics/src/main/jsl-prism/PrismLoaderGlue.stg
index 207e8820b80..9c092373f10 100644
--- a/modules/javafx.graphics/src/main/jsl-prism/PrismLoaderGlue.stg
+++ b/modules/javafx.graphics/src/main/jsl-prism/PrismLoaderGlue.stg
@@ -2,7 +2,7 @@ group PrismLoaderGlue;
 
 glue(shaderName,samplerInit,paramInit,maxTexCoordIndex,isPixcoordUsed) ::= <<
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.graphics/src/main/native-glass/mac/GlassLayer3D.m b/modules/javafx.graphics/src/main/native-glass/mac/GlassLayer3D.m
index e0ec059f2d9..e672ce3f4c6 100644
--- a/modules/javafx.graphics/src/main/native-glass/mac/GlassLayer3D.m
+++ b/modules/javafx.graphics/src/main/native-glass/mac/GlassLayer3D.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.graphics/src/main/native-glass/mac/GlassPixels.m b/modules/javafx.graphics/src/main/native-glass/mac/GlassPixels.m
index 0e4906ecb20..fd3aaec78e7 100644
--- a/modules/javafx.graphics/src/main/native-glass/mac/GlassPixels.m
+++ b/modules/javafx.graphics/src/main/native-glass/mac/GlassPixels.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.graphics/src/main/native-glass/mac/GlassWindow+Overrides.m b/modules/javafx.graphics/src/main/native-glass/mac/GlassWindow+Overrides.m
index 719a8bdfcf2..982a5b295da 100644
--- a/modules/javafx.graphics/src/main/native-glass/mac/GlassWindow+Overrides.m
+++ b/modules/javafx.graphics/src/main/native-glass/mac/GlassWindow+Overrides.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.graphics/src/main/native-glass/mac/PlatformSupport.m b/modules/javafx.graphics/src/main/native-glass/mac/PlatformSupport.m
index fb811139961..11c17e7a75a 100644
--- a/modules/javafx.graphics/src/main/native-glass/mac/PlatformSupport.m
+++ b/modules/javafx.graphics/src/main/native-glass/mac/PlatformSupport.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.media/src/main/native/jfxmedia/projects/win/Makefile b/modules/javafx.media/src/main/native/jfxmedia/projects/win/Makefile
index 6e0ecd160ac..1ea7600ebc3 100644
--- a/modules/javafx.media/src/main/native/jfxmedia/projects/win/Makefile
+++ b/modules/javafx.media/src/main/native/jfxmedia/projects/win/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/bridge/jni/jsc/BridgeUtils.h b/modules/javafx.web/src/main/native/Source/WebCore/bridge/jni/jsc/BridgeUtils.h
index 054c4800472..a58b481d7c9 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/bridge/jni/jsc/BridgeUtils.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/bridge/jni/jsc/BridgeUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/editing/java/EditorJava.cpp b/modules/javafx.web/src/main/native/Source/WebCore/editing/java/EditorJava.cpp
index 186d3328761..427e5a226b4 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/editing/java/EditorJava.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/editing/java/EditorJava.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/java/BitmapImageJava.cpp b/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/java/BitmapImageJava.cpp
index b4f0fe5dfb1..91a3a3c0811 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/java/BitmapImageJava.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/java/BitmapImageJava.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/java/BufferImageJava.cpp b/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/java/BufferImageJava.cpp
index 55d7135d995..e476e369701 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/java/BufferImageJava.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/java/BufferImageJava.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/java/BufferImageJava.h b/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/java/BufferImageJava.h
index ea793bd4d37..293b3210e3f 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/java/BufferImageJava.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/java/BufferImageJava.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/java/FontCacheJava.cpp b/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/java/FontCacheJava.cpp
index a9dff518f99..036b09101c2 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/java/FontCacheJava.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/java/FontCacheJava.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/java/ImageJava.cpp b/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/java/ImageJava.cpp
index 3145432e440..ff77b6b59f3 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/java/ImageJava.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/java/ImageJava.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/java/NativeImageJava.cpp b/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/java/NativeImageJava.cpp
index f41ef59277e..9aeb2572b90 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/java/NativeImageJava.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/java/NativeImageJava.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/texmap/BitmapTextureJava.cpp b/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/texmap/BitmapTextureJava.cpp
index 8522cfd812a..e59471d62b4 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/texmap/BitmapTextureJava.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/texmap/BitmapTextureJava.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/texmap/BitmapTextureJava.h b/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/texmap/BitmapTextureJava.h
index 10c11515e8e..aca04ac1df7 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/texmap/BitmapTextureJava.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/texmap/BitmapTextureJava.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/platform/java/ContextMenuJava.cpp b/modules/javafx.web/src/main/native/Source/WebCore/platform/java/ContextMenuJava.cpp
index 61ab9ca72c9..aeefe021125 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/platform/java/ContextMenuJava.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/platform/java/ContextMenuJava.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/platform/java/CursorJava.cpp b/modules/javafx.web/src/main/native/Source/WebCore/platform/java/CursorJava.cpp
index ddc625ff5bc..92f4271b4dd 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/platform/java/CursorJava.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/platform/java/CursorJava.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/platform/java/MouseEventJava.cpp b/modules/javafx.web/src/main/native/Source/WebCore/platform/java/MouseEventJava.cpp
index 5b5c21005b4..6ee5a1f5a36 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/platform/java/MouseEventJava.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/platform/java/MouseEventJava.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/platform/java/PageSupplementJava.cpp b/modules/javafx.web/src/main/native/Source/WebCore/platform/java/PageSupplementJava.cpp
index 45564f888a9..a8056feb8ba 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/platform/java/PageSupplementJava.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/platform/java/PageSupplementJava.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/platform/java/PageSupplementJava.h b/modules/javafx.web/src/main/native/Source/WebCore/platform/java/PageSupplementJava.h
index ad2587a0069..8b5b5064876 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/platform/java/PageSupplementJava.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/platform/java/PageSupplementJava.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/platform/java/RenderThemeJava.cpp b/modules/javafx.web/src/main/native/Source/WebCore/platform/java/RenderThemeJava.cpp
index b62c754b814..7b606b1bde9 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/platform/java/RenderThemeJava.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/platform/java/RenderThemeJava.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/platform/network/java/URLLoader.cpp b/modules/javafx.web/src/main/native/Source/WebCore/platform/network/java/URLLoader.cpp
index ee747304c85..af1cdcffbe9 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/platform/network/java/URLLoader.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/platform/network/java/URLLoader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/DOM/JavaDocument.cpp b/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/DOM/JavaDocument.cpp
index 1b080f12ee2..6224074571f 100644
--- a/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/DOM/JavaDocument.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/DOM/JavaDocument.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/DOM/JavaKeyboardEvent.cpp b/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/DOM/JavaKeyboardEvent.cpp
index f95a2e5dfdc..d9e30812531 100644
--- a/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/DOM/JavaKeyboardEvent.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/DOM/JavaKeyboardEvent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/DOM/JavaMouseEvent.cpp b/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/DOM/JavaMouseEvent.cpp
index 5a92997c803..616946c43b1 100644
--- a/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/DOM/JavaMouseEvent.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/DOM/JavaMouseEvent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/DOM/JavaRange.cpp b/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/DOM/JavaRange.cpp
index 4cd7110fa24..dc11b3c2dc1 100644
--- a/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/DOM/JavaRange.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/DOM/JavaRange.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/HistoryTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/HistoryTest.java
index c64da4d60da..e803b8f725b 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/HistoryTest.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/HistoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/MiscellaneousTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/MiscellaneousTest.java
index 122daefaa7e..5d1900c52ec 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/MiscellaneousTest.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/MiscellaneousTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

From aa52f7efc370a4c55ff7a05a6903988871436d64 Mon Sep 17 00:00:00 2001
From: Hima Bindu Meda <hmeda@openjdk.org>
Date: Fri, 23 Aug 2024 13:40:53 +0000
Subject: [PATCH 23/75] 8338307: Additional WebKit 619.1 fixes from WebKitGTK
 2.44.3

Reviewed-by: kcr, sykora
---
 .../assembler/ARM64EAssembler.h               |  4 +-
 .../builtins/ArrayConstructor.js              | 10 +--
 .../bytecompiler/BytecodeGenerator.cpp        |  2 +
 .../JavaScriptCore/dfg/DFGByteCodeParser.cpp  | 20 ++---
 .../Source/JavaScriptCore/heap/Heap.cpp       |  3 +-
 .../Source/JavaScriptCore/jit/JITCode.h       |  2 +-
 .../main/native/Source/JavaScriptCore/jsc.cpp | 42 +++++++++-
 .../Source/JavaScriptCore/runtime/ArgList.cpp |  8 +-
 .../Source/JavaScriptCore/runtime/ArgList.h   | 16 ++--
 .../JavaScriptCore/runtime/CommonSlowPaths.h  | 18 ++++-
 .../runtime/CustomGetterSetter.h              |  9 ++-
 .../runtime/InternalFunction.cpp              |  5 ++
 .../JavaScriptCore/wasm/WasmB3IRGenerator.cpp | 52 ++++++++----
 .../JavaScriptCore/wasm/WasmB3IRGenerator.h   |  4 +-
 .../Source/JavaScriptCore/wasm/WasmBBQJIT.cpp | 24 ++++++
 .../Source/JavaScriptCore/wasm/WasmBBQJIT.h   |  2 +
 .../wasm/WasmConstExprGenerator.cpp           |  1 +
 .../JavaScriptCore/wasm/WasmFunctionParser.h  | 35 ++++++--
 .../wasm/WasmIPIntGenerator.cpp               |  1 +
 .../wasm/WasmIRGeneratorHelpers.h             | 23 +++---
 .../wasm/WasmLLIntGenerator.cpp               |  1 +
 .../JavaScriptCore/wasm/WasmOMGPlan.cpp       |  2 +-
 .../JavaScriptCore/wasm/WasmOSREntryPlan.cpp  |  2 +-
 .../JavaScriptCore/wasm/WasmTypeDefinition.h  |  9 +++
 .../JavaScriptCore/yarr/YarrInterpreter.cpp   | 34 ++++++--
 .../JavaScriptCore/yarr/YarrPattern.cpp       | 15 +++-
 .../src/main/native/Source/WTF/wtf/Deque.h    |  4 +
 .../main/native/Source/WTF/wtf/UniStdExtras.h |  2 +
 .../Source/WTF/wtf/unix/UniStdExtrasUnix.cpp  | 12 +++
 .../WebCore/Modules/fetch/FetchBodyOwner.cpp  |  9 +++
 .../WebCore/Modules/fetch/FetchBodyOwner.h    |  2 +-
 .../mediastream/PeerConnectionBackend.cpp     | 66 +++++++++++++--
 .../mediastream/PeerConnectionBackend.h       | 22 ++++-
 .../Modules/mediastream/RTCPeerConnection.cpp | 11 +--
 .../Modules/mediastream/RTCPeerConnection.h   |  2 +-
 .../Modules/mediastream/RTCSctpTransport.cpp  |  8 +-
 .../Modules/mediastream/RTCSctpTransport.h    |  8 +-
 .../Modules/mediastream/RTCStatsReport.h      |  2 +-
 .../libwebrtc/LibWebRTCMediaEndpoint.cpp      | 10 ++-
 .../MainThreadPermissionObserver.cpp          |  2 +-
 .../MainThreadPermissionObserver.h            |  6 +-
 .../permissions/PermissionController.h        |  4 +-
 .../Modules/permissions/PermissionObserver.h  |  2 +-
 .../Modules/permissions/PermissionStatus.cpp  |  4 +-
 .../Modules/permissions/PermissionStatus.h    |  4 +-
 .../WebCore/Modules/webaudio/AudioBuffer.cpp  | 13 +++
 .../WebCore/Modules/webaudio/AudioBuffer.h    |  2 +
 .../webaudio/AudioBufferSourceNode.cpp        | 26 ++++++
 .../Modules/webaudio/AudioBufferSourceNode.h  |  2 +
 .../Modules/webaudio/AudioDestinationNode.cpp |  6 +-
 .../WebCore/Modules/webaudio/AudioNode.cpp    | 22 +++++
 .../WebCore/Modules/webaudio/AudioNode.h      |  1 +
 .../webaudio/AudioWorkletGlobalScope.cpp      |  5 +-
 .../webaudio/AudioWorkletMessagingProxy.cpp   |  1 +
 .../Modules/webaudio/BaseAudioContext.cpp     |  9 +++
 .../Modules/webaudio/BaseAudioContext.h       |  4 +
 .../WebCodecsVideoFrameAlgorithms.cpp         |  2 +
 .../WebCore/PAL/pal/text/TextCodecLatin1.cpp  |  7 +-
 .../WebCore/PAL/pal/text/TextCodecUTF8.cpp    |  9 ++-
 .../InternalSettingsGenerated.h.erb           |  2 +-
 .../AccessibilityListBoxOption.cpp            | 28 +++----
 .../accessibility/AccessibilityObject.cpp     | 20 ++---
 .../accessibility/AccessibilityObject.h       |  2 +-
 .../atspi/AccessibilityRootAtspi.h            |  2 +-
 .../isolatedtree/AXIsolatedTree.cpp           |  6 +-
 .../bindings/js/SerializedScriptValue.cpp     | 23 +++++-
 .../WebCore/css/ComputedStyleExtractor.cpp    |  4 +
 .../native/Source/WebCore/css/FontFace.cpp    |  5 ++
 .../WebCore/css/ShorthandSerializer.cpp       | 11 ++-
 .../native/Source/WebCore/dom/Document.cpp    | 11 ++-
 .../main/native/Source/WebCore/dom/Document.h |  2 +
 .../native/Source/WebCore/dom/Element.cpp     |  6 +-
 .../WebCore/dom/EmptyScriptExecutionContext.h |  2 +
 .../Source/WebCore/dom/ScriptElement.cpp      |  2 +-
 .../WebCore/dom/ScriptExecutionContext.h      |  3 +
 .../native/Source/WebCore/dom/TreeScope.cpp   | 34 --------
 .../Source/WebCore/dom/WindowEventLoop.h      |  2 +-
 .../WebCore/editing/CompositeEditCommand.cpp  |  8 +-
 .../native/Source/WebCore/editing/Editor.cpp  |  1 +
 .../WebCore/history/BackForwardController.h   |  2 +-
 .../Source/WebCore/history/CachedPage.cpp     |  2 +-
 .../Source/WebCore/history/CachedPage.h       |  2 +-
 .../Source/WebCore/history/HistoryItem.cpp    | 31 ++++++-
 .../Source/WebCore/history/HistoryItem.h      | 12 ++-
 .../Source/WebCore/html/HTMLMediaElement.cpp  |  6 ++
 .../html/ValidatedFormListedElement.cpp       |  5 +-
 .../WebCore/html/canvas/WebGLUtilities.h      | 16 ++--
 .../InspectorFrontendAPIDispatcher.h          |  2 +-
 .../inspector/InspectorFrontendClientLocal.h  |  2 +-
 .../WebCore/inspector/InspectorFrontendHost.h |  2 +-
 .../inline/InlineContentBalancer.cpp          |  9 ++-
 .../invalidation/InlineInvalidation.cpp       |  3 +-
 .../Source/WebCore/loader/EmptyClients.cpp    |  2 +-
 .../Source/WebCore/loader/FrameLoader.cpp     |  4 +-
 .../WebCore/loader/HistoryController.cpp      | 17 +++-
 .../Source/WebCore/loader/HistoryController.h |  5 +-
 .../Source/WebCore/loader/ProgressTracker.h   |  2 +-
 .../native/Source/WebCore/page/EditorClient.h |  3 +-
 .../Source/WebCore/page/EventHandler.cpp      |  5 +-
 .../main/native/Source/WebCore/page/Frame.h   |  2 +-
 .../native/Source/WebCore/page/History.cpp    | 12 ++-
 .../main/native/Source/WebCore/page/History.h | 14 ++--
 .../native/Source/WebCore/page/History.idl    |  5 +-
 .../Source/WebCore/page/ImageAnalysisQueue.h  |  2 +-
 .../WebCore/page/ImageOverlayController.h     |  2 +-
 .../native/Source/WebCore/page/LocalFrame.cpp |  2 +-
 .../native/Source/WebCore/page/LocalFrame.h   |  2 +-
 .../Source/WebCore/page/LocalFrameView.cpp    |  4 +-
 .../WebCore/page/OpportunisticTaskScheduler.h |  2 +-
 .../main/native/Source/WebCore/page/Page.cpp  | 25 +++++-
 .../main/native/Source/WebCore/page/Page.h    | 10 ++-
 .../native/Source/WebCore/page/PageGroup.h    |  4 +-
 .../native/Source/WebCore/page/PageOverlay.h  |  2 +-
 .../native/Source/WebCore/page/SettingsBase.h |  2 +-
 .../Source/WebCore/page/UserContentProvider.h |  2 +-
 .../Source/WebCore/page/VisitedLinkStore.h    |  2 +-
 .../page/scrolling/ScrollingCoordinator.h     |  2 +-
 .../Source/WebCore/platform/SharedBuffer.cpp  |  4 +
 .../platform/audio/MultiChannelResampler.cpp  | 23 +-----
 .../platform/audio/MultiChannelResampler.h    |  2 -
 .../audio/PlatformMediaSessionManager.cpp     | 16 +++-
 .../audio/PlatformMediaSessionManager.h       |  7 +-
 .../filters/FELightingNeonParallelApplier.cpp |  4 +-
 .../platform/graphics/filters/FELighting.h    |  5 --
 .../coordinated/CoordinatedGraphicsLayer.cpp  | 11 ++-
 .../MediaRecorderPrivateGStreamer.cpp         |  6 +-
 .../mediastream/RTCRtpTransceiverDirection.h  |  4 +
 .../WebCore/platform/text/SegmentedString.h   |  4 +-
 .../platform/xdg/MIMETypeRegistryXdg.cpp      | 14 +++-
 .../WebCore/plugins/PluginInfoProvider.h      |  2 +-
 .../WebCore/rendering/InlineBoxPainter.cpp    |  2 +-
 .../Source/WebCore/rendering/RenderLayer.cpp  |  4 +-
 .../rendering/RenderLayerCompositor.cpp       | 10 ++-
 .../WebCore/rendering/RenderListBox.cpp       |  4 +-
 .../WebCore/rendering/RenderMenuList.cpp      | 18 +++--
 .../rendering/style/StyleGradientImage.cpp    |  4 +-
 .../WebCore/rendering/svg/SVGResources.cpp    |  5 ++
 .../WebCore/rendering/svg/SVGResources.h      |  1 +
 .../rendering/updating/RenderTreeBuilder.cpp  | 19 +++--
 .../updating/RenderTreeBuilderRuby.cpp        | 14 +++-
 .../native/Source/WebCore/svg/SVGElement.cpp  |  4 +-
 .../Source/WebCore/testing/InternalSettings.h |  2 +-
 .../native/Source/WebCore/workers/Worker.cpp  |  1 +
 .../WebCore/workers/WorkerGlobalScope.cpp     |  2 +-
 .../workers/WorkerInitializationData.h        |  4 +
 .../WebCore/workers/WorkerMessagingProxy.cpp  |  1 +
 .../workers/WorkerOrWorkletGlobalScope.cpp    |  3 +-
 .../workers/WorkerOrWorkletGlobalScope.h      |  6 +-
 .../WebCore/workers/WorkerOrWorkletThread.cpp |  2 +-
 .../WebCore/workers/WorkerScriptLoader.cpp    |  2 +
 .../WebCore/workers/WorkerScriptLoader.h      |  5 ++
 .../Source/WebCore/workers/WorkerThread.cpp   |  3 +
 .../Source/WebCore/workers/WorkerThread.h     |  3 +
 .../service/ServiceWorkerClientData.cpp       |  7 +-
 .../workers/service/ServiceWorkerClientData.h |  2 +
 .../service/context/ServiceWorkerThread.cpp   |  8 +-
 .../service/context/ServiceWorkerThread.h     |  5 +-
 .../context/ServiceWorkerThreadProxy.cpp      |  2 +-
 .../workers/service/server/SWServer.cpp       | 41 +++++++---
 .../WebCore/workers/service/server/SWServer.h |  4 +
 .../server/SWServerToContextConnection.h      |  3 +-
 .../shared/SharedWorkerScriptLoader.cpp       |  1 +
 .../context/SharedWorkerThreadProxy.cpp       |  1 +
 .../WebCore/worklets/WorkletGlobalScope.cpp   |  4 +-
 .../WebCore/worklets/WorkletParameters.h      |  6 +-
 .../Source/WebCore/xml/XPathFunctions.cpp     | 60 +++++++-------
 .../native/Source/WebCore/xml/XPathParser.cpp | 39 +++++----
 .../native/Source/WebCore/xml/XPathPath.h     | 38 ++++-----
 .../Source/WebCore/xml/XPathPredicate.cpp     |  8 +-
 .../Source/WebCore/xml/XPathPredicate.h       | 80 +++++++++----------
 .../native/Source/WebCore/xml/XPathResult.cpp | 12 +--
 .../native/Source/WebCore/xml/XPathValue.cpp  | 34 ++++----
 .../native/Source/WebCore/xml/XPathValue.h    | 62 ++++++++------
 .../WebCore/xml/XPathVariableReference.h      | 17 ++--
 .../Storage/WebStorageNamespaceProvider.h     |  2 +-
 .../PageStorageSessionProvider.h              |  2 +-
 .../java/WebCoreSupport/BackForwardList.cpp   |  3 +-
 .../java/WebCoreSupport/EditorClientJava.cpp  |  2 +-
 .../java/WebCoreSupport/EditorClientJava.h    |  2 +-
 .../java/WebCoreSupport/WebPage.cpp           |  2 +-
 .../main/native/Tools/Scripts/webkitdirs.pm   | 15 +++-
 181 files changed, 1163 insertions(+), 555 deletions(-)

diff --git a/modules/javafx.web/src/main/native/Source/JavaScriptCore/assembler/ARM64EAssembler.h b/modules/javafx.web/src/main/native/Source/JavaScriptCore/assembler/ARM64EAssembler.h
index ac9ffc669cd..2f7fd5d5091 100644
--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/assembler/ARM64EAssembler.h
+++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/assembler/ARM64EAssembler.h
@@ -261,12 +261,12 @@ class ARM64EAssembler : public ARM64Assembler {
 
     ALWAYS_INLINE void braaz(RegisterID dest)
     {
-        insn(encodeGroup4(Group4Op::BLRAAZ, dest));
+        insn(encodeGroup4(Group4Op::BRAAZ, dest));
     }
 
     ALWAYS_INLINE void brabz(RegisterID dest)
     {
-        insn(encodeGroup4(Group4Op::BLRABZ, dest));
+        insn(encodeGroup4(Group4Op::BRABZ, dest));
     }
 
     ALWAYS_INLINE void blraaz(RegisterID dest)
diff --git a/modules/javafx.web/src/main/native/Source/JavaScriptCore/builtins/ArrayConstructor.js b/modules/javafx.web/src/main/native/Source/JavaScriptCore/builtins/ArrayConstructor.js
index 2a3cd7170be..569c6e6f5fc 100644
--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/builtins/ArrayConstructor.js
+++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/builtins/ArrayConstructor.js
@@ -120,10 +120,12 @@ function isArray(array)
 
 @linkTimeConstant
 @visibility=PrivateRecursive
-async function defaultAsyncFromAsyncIterator(result, iterator, mapFn, thisArg)
+async function defaultAsyncFromAsyncIterator(iterator, mapFn, thisArg)
 {
     "use strict";
 
+    var result = this !== @Array && @isConstructor(this) ? new this() : [];
+
     var k = 0;
 
     // Since for-of loop once more looks up the @@iterator property of a given iterable,
@@ -202,14 +204,12 @@ function fromAsync(asyncItems  /*, mapFn, thisArg */)
             }
         }
 
-        var result = this !== @Array && @isConstructor(this) ? new this() : [];
-
         if (!@isUndefinedOrNull(usingAsyncIterator))
-            return @defaultAsyncFromAsyncIterator(result, usingAsyncIterator.@call(asyncItems), mapFn, thisArg);
+            return @defaultAsyncFromAsyncIterator.@call(this, usingAsyncIterator.@call(asyncItems), mapFn, thisArg);
 
         if (!@isUndefinedOrNull(usingSyncIterator)) {
             var iterator = usingSyncIterator.@call(asyncItems);
-            return @defaultAsyncFromAsyncIterator(result, @createAsyncFromSyncIterator(iterator, iterator.next), mapFn, thisArg);
+            return @defaultAsyncFromAsyncIterator.@call(this, @createAsyncFromSyncIterator(iterator, iterator.next), mapFn, thisArg);
         }
 
         return @defaultAsyncFromAsyncArrayLike.@call(this, asyncItems, mapFn, thisArg);
diff --git a/modules/javafx.web/src/main/native/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp b/modules/javafx.web/src/main/native/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
index f51719877c3..983e4d4a092 100644
--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
+++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
@@ -602,8 +602,10 @@ BytecodeGenerator::BytecodeGenerator(VM& vm, FunctionNode* functionNode, Unlinke
                     SymbolTableEntry entry(varOffset);
                     functionSymbolTable->set(NoLockingNecessary, name, entry);
 
+IGNORE_GCC_WARNINGS_BEGIN("dangling-reference")
                     const Identifier& ident =
                         static_cast<const BindingNode*>(parameters.at(i).first)->boundProperty();
+IGNORE_GCC_WARNINGS_END
 
                     varOrAnonymous = addConstant(ident);
                 }
diff --git a/modules/javafx.web/src/main/native/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp b/modules/javafx.web/src/main/native/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp
index 8db0a369a30..203c9491620 100644
--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp
+++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp
@@ -5019,18 +5019,18 @@ Node* ByteCodeParser::load(
 
 ObjectPropertyCondition ByteCodeParser::presenceConditionIfConsistent(JSObject* knownBase, UniquedStringImpl* uid, PropertyOffset offset, const StructureSet& set)
 {
-    if (set.isEmpty())
-        return ObjectPropertyCondition();
+    Structure* structure = knownBase->structure();
     unsigned attributes;
-    PropertyOffset firstOffset = set[0]->getConcurrently(uid, attributes);
-    if (firstOffset != offset)
+    PropertyOffset baseOffset = structure->getConcurrently(uid, attributes);
+    if (offset != baseOffset)
         return ObjectPropertyCondition();
-    for (unsigned i = 1; i < set.size(); ++i) {
-        unsigned otherAttributes;
-        PropertyOffset otherOffset = set[i]->getConcurrently(uid, otherAttributes);
-        if (otherOffset != offset || otherAttributes != attributes)
-            return ObjectPropertyCondition();
-    }
+
+    // We need to check set contains knownBase's structure because knownBase's GetOwnPropertySlot could normally prevent access
+    // to this property, for example via a cross-origin restriction check. So unless we've executed this access before we can't assume
+    // just because knownBase has a property uid at offset we're allowed to access.
+    if (!set.contains(structure))
+        return ObjectPropertyCondition();
+
     return ObjectPropertyCondition::presenceWithoutBarrier(knownBase, uid, offset, attributes);
 }
 
diff --git a/modules/javafx.web/src/main/native/Source/JavaScriptCore/heap/Heap.cpp b/modules/javafx.web/src/main/native/Source/JavaScriptCore/heap/Heap.cpp
index 49781240764..f3cd29bf5db 100644
--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/heap/Heap.cpp
+++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/heap/Heap.cpp
@@ -973,7 +973,8 @@ size_t Heap::extraMemorySize()
     checkedTotal += m_arrayBuffers.size();
     size_t total = UNLIKELY(checkedTotal.hasOverflowed()) ? std::numeric_limits<size_t>::max() : checkedTotal.value();
 
-    ASSERT(m_objectSpace.capacity() >= m_objectSpace.size());
+    // It would be nice to have `ASSERT(m_objectSpace.capacity() >= m_objectSpace.size());` here but `m_objectSpace.size()`
+    // requires having heap access which thread might not. Specifically, we might be called from the resource usage thread.
     return std::min(total, std::numeric_limits<size_t>::max() - m_objectSpace.capacity());
 }
 
diff --git a/modules/javafx.web/src/main/native/Source/JavaScriptCore/jit/JITCode.h b/modules/javafx.web/src/main/native/Source/JavaScriptCore/jit/JITCode.h
index b110c672afd..e58cce59990 100644
--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/jit/JITCode.h
+++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/jit/JITCode.h
@@ -72,7 +72,7 @@ enum class JITType : uint8_t {
 static constexpr unsigned widthOfJITType = 3;
 static_assert(WTF::getMSBSetConstexpr(static_cast<std::underlying_type_t<JITType>>(JITType::FTLJIT)) + 1 == widthOfJITType);
 
-#if USE(JSVALUE64)
+#if CPU(ADDRESS64)
 template<typename ByteSizedEnumType>
 class JITConstant {
     static_assert(sizeof(ByteSizedEnumType) == 1);
diff --git a/modules/javafx.web/src/main/native/Source/JavaScriptCore/jsc.cpp b/modules/javafx.web/src/main/native/Source/JavaScriptCore/jsc.cpp
index 8271ff4635e..3a41f2df0ff 100644
--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/jsc.cpp
+++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/jsc.cpp
@@ -146,6 +146,7 @@
 #include <fenv.h>
 #include <arm/arch.h>
 #endif
+
 #if OS(DARWIN) && PLATFORM(MAC)
 #include <libproc.h>
 #endif
@@ -285,6 +286,7 @@ class Workers {
     SentinelLinkedList<Worker, BasicRawSentinelNode<Worker>> m_workers;
     Deque<String> m_reports;
 };
+
 WTF_MAKE_TZONE_ALLOCATED_IMPL(Workers);
 
 
@@ -416,6 +418,7 @@ static JSC_DECLARE_HOST_FUNCTION(functionDropAllLocks);
 #if ENABLE(FUZZILLI)
 static JSC_DECLARE_HOST_FUNCTION(functionFuzzilli);
 #endif
+
 struct Script {
     enum class StrictMode {
         Strict,
@@ -563,6 +566,7 @@ class GlobalObject final : public JSGlobalObject {
                 propertyNames.add(propertyName);
         }
     }
+
 private:
     GlobalObject(VM&, Structure*);
 
@@ -577,30 +581,39 @@ class GlobalObject final : public JSGlobalObject {
             if (result.isNewEntry)
                 m_strings.append(uid);
         }
+
         bool contains(UniquedStringImpl* name) const { return m_names.contains(name); }
         const HashSet<UniquedStringImpl*>& names() const { return m_names; }
+
     private:
         Vector<AtomString> m_strings; // To keep the UniqueStringImpls alive.
         HashSet<UniquedStringImpl*> m_names;
     };
+
     void finishCreation(VM& vm, const Vector<String>& arguments)
     {
         auto& filter = ensurePropertyFilter();
+
         auto addFunction = [&] (VM& vm, ASCIILiteral name, NativeFunction function, unsigned arguments, unsigned attributes = static_cast<unsigned>(PropertyAttribute::DontEnum)) {
             addFunctionImpl(filter, vm, name, function, arguments, attributes);
         };
+
         auto addFunctionToObject = [&] (VM& vm, JSObject* owner, ASCIILiteral name, NativeFunction function, unsigned arguments, unsigned attributes = static_cast<unsigned>(PropertyAttribute::DontEnum)) {
             addFunctionToObjectImpl(filter, vm, owner, name, function, arguments, attributes);
         };
+
         auto putDirect = [&] (VM& vm, PropertyName propertyName, JSValue value, unsigned attributes = 0) -> bool {
             return putDirectImpl(filter, vm, propertyName, value, attributes);
         };
+
         auto putDirectWithoutTransition = [&] (VM& vm, PropertyName propertyName, JSValue value, unsigned attributes) {
             putDirectWithoutTransitionImpl(filter, vm, propertyName, value, attributes);
         };
+
         auto putDirectNativeFunction = [&] (VM& vm, JSGlobalObject* globalObject, const PropertyName& propertyName, unsigned functionLength, NativeFunction nativeFunction, ImplementationVisibility implementationVisibility, Intrinsic intrinsic, unsigned attributes) -> bool {
             return putDirectNativeFunctionImpl(filter, vm, globalObject, propertyName, functionLength, nativeFunction, implementationVisibility, intrinsic, attributes);
         };
+
         Base::finishCreation(vm);
         JSC_TO_STRING_TAG_WITHOUT_TRANSITION();
 
@@ -776,10 +789,12 @@ class GlobalObject final : public JSGlobalObject {
 #if ENABLE(FUZZILLI)
         addFunction(vm, "fuzzilli"_s, functionFuzzilli, 2);
 #endif
+
         if (Options::exposeCustomSettersOnGlobalObjectForTesting()) {
             auto putDirectCustomAccessor = [&] (VM& vm, PropertyName propertyName, JSValue value, unsigned attributes) -> bool {
                 return putDirectCustomAccessorImpl(filter, vm, propertyName, value, attributes);
             };
+
             {
                 CustomGetterSetter* custom = CustomGetterSetter::create(vm, nullptr, testCustomAccessorSetter);
                 Identifier identifier = Identifier::fromString(vm, "testCustomAccessorSetter"_s);
@@ -792,6 +807,7 @@ class GlobalObject final : public JSGlobalObject {
                 putDirectCustomAccessor(vm, identifier, custom, PropertyAttribute::DontEnum | PropertyAttribute::DontDelete | PropertyAttribute::CustomValue);
             }
         }
+
         if (Options::useDollarVM()) {
             // $vm is added in JSGlobalObject but we also want it filtered out. Just add it to the filter here.
             Identifier dollarVMIdentifier = Identifier::fromString(vm, "$vm"_s);
@@ -1193,6 +1209,7 @@ static bool fillBufferWithContentsOfFile(const String& fileName, Vector<char>& b
         fprintf(stderr, "Could not open file: %s\n", fileName.utf8().data());
         return false;
     }
+
     if ((statBuf.st_mode & S_IFMT) != S_IFREG) {
         fprintf(stderr, "Trying to open a non-file: %s\n", fileName.utf8().data());
         return false;
@@ -1339,7 +1356,6 @@ class ShellSourceProvider final : public StringSourceProvider {
         // bytecode cache, which results in intermittent test failures. As $.agent.start is only
         // a rarely used testing facility, we simply do not cache bytecode on these threads.
         , m_cacheEnabled(Worker::current().isMain() && !!Options::diskCachePath())
-
     {
     }
 
@@ -3232,19 +3248,30 @@ JSC_DEFINE_HOST_FUNCTION(functionDropAllLocks, (JSGlobalObject* globalObject, Ca
     JSLock::DropAllLocks dropAllLocks(globalObject);
     return JSValue::encode(jsUndefined());
 }
+
 #if ENABLE(FUZZILLI)
+
+// We have to assume that the fuzzer will be able to call this function e.g. by
+// enumerating the properties of the global object and eval'ing them. As such
+// this function is implemented in a way that requires passing some magic value
+// as first argument (with the idea being that the fuzzer won't be able to
+// generate this value) which then also acts as a selector for the operation
+// to perform.
 JSC_DEFINE_HOST_FUNCTION(functionFuzzilli, (JSGlobalObject* globalObject, CallFrame* callFrame))
 {
     VM& vm = globalObject->vm();
     auto scope = DECLARE_THROW_SCOPE(vm);
     if (!callFrame->argument(0).isString()) {
+        // We directly require a string as argument for simplicity.
         return JSValue::encode(jsUndefined());
     }
     auto operation = callFrame->argument(0).toWTFString(globalObject);
     RETURN_IF_EXCEPTION(scope, { });
+
     if (operation == "FUZZILLI_CRASH"_s) {
         int32_t command = callFrame->argument(1).toInt32(globalObject);
         RETURN_IF_EXCEPTION(scope, { });
+
         switch (command) {
         case 0:
             *reinterpret_cast<int32_t*>(0x41414141) = 0x1337;
@@ -3256,14 +3283,18 @@ JSC_DEFINE_HOST_FUNCTION(functionFuzzilli, (JSGlobalObject* globalObject, CallFr
             ASSERT(0);
             break;
         }
+
     } else if (operation == "FUZZILLI_PRINT"_s) {
         String string = callFrame->argument(1).toWTFString(globalObject);
         RETURN_IF_EXCEPTION(scope, { });
+
         Fuzzilli::logFile().println(string);
         Fuzzilli::logFile().flush();
     }
+
     return JSValue::encode(jsUndefined());
 }
+
 #endif // ENABLE(FUZZILLI)
 
 // Use SEH for Release builds only to get rid of the crash report dialog
@@ -3638,6 +3669,7 @@ static void runWithOptions(GlobalObject* globalObject, CommandLine& options, boo
     for (size_t i = 0; i < scripts.size(); i++) {
         JSInternalPromise* promise = nullptr;
         bool isModule = options.m_module || scripts[i].scriptType == Script::ScriptType::Module;
+
         switch (scripts[i].codeSource) {
         case Script::CodeSource::File: {
             fileName = String::fromLatin1(scripts[i].argument);
@@ -4047,6 +4079,7 @@ void CommandLine::parseArguments(int argc, char** argv)
             }
             continue;
         }
+
         // See if the -- option is a JSC VM option.
         if (strstr(arg, "--") == arg) {
             if (!JSC::Options::setOption(&arg[2], /* verify = */ false)) {
@@ -4096,16 +4129,20 @@ int runJSC(const CommandLine& options, bool isWorker, const Func& func)
 
     int result;
     bool success;
+
 #if ENABLE(FUZZILLI)
+    // Let parent know we are ready.
     if (options.m_reprl) {
         Fuzzilli::initializeReprl();
     }
 #endif // ENABLE(FUZZILLI)
+
     do {
 #if ENABLE(FUZZILLI)
         if (options.m_reprl)
             Fuzzilli::waitForCommand();
 #endif // ENABLE(FUZZILLI)
+
         success = true;
     GlobalObject* globalObject = nullptr;
     {
@@ -4120,6 +4157,7 @@ int runJSC(const CommandLine& options, bool isWorker, const Func& func)
     vm.deferredWorkTimer->runRunLoop();
     {
         JSLockHolder locker(vm);
+
             if (!options.m_reprl && options.m_interactive && success)
             runInteractive(globalObject);
     }
@@ -4152,7 +4190,6 @@ int runJSC(const CommandLine& options, bool isWorker, const Func& func)
             printf("JSC OSR EXIT FUZZ: encountered %u dynamic checks.\n", numberOfOSRExitFuzzChecks());
         }
 
-
         auto compileTimeStats = JIT::compileTimeStats();
         Vector<CString> compileTimeKeys;
         for (auto& entry : compileTimeStats)
@@ -4196,6 +4233,7 @@ int runJSC(const CommandLine& options, bool isWorker, const Func& func)
         }
 #endif // ENABLE(FUZZILLI)
     } while (options.m_reprl);
+
     vm.codeCache()->write();
 
     if (options.m_destroyVM || isWorker) {
diff --git a/modules/javafx.web/src/main/native/Source/JavaScriptCore/runtime/ArgList.cpp b/modules/javafx.web/src/main/native/Source/JavaScriptCore/runtime/ArgList.cpp
index b3bbbf99e71..85edf96b609 100644
--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/runtime/ArgList.cpp
+++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/runtime/ArgList.cpp
@@ -45,7 +45,7 @@ void MarkedVectorBase::addMarkSet(JSValue v)
 
 void ArgList::getSlice(int startIndex, ArgList& result) const
 {
-    if (startIndex <= 0 || startIndex >= m_argCount) {
+    if (startIndex <= 0 || static_cast<unsigned>(startIndex) >= m_argCount) {
         result = ArgList();
         return;
     }
@@ -60,7 +60,7 @@ void MarkedVectorBase::markLists(Visitor& visitor, ListSet& markSet)
     ListSet::iterator end = markSet.end();
     for (ListSet::iterator it = markSet.begin(); it != end; ++it) {
         MarkedVectorBase* list = *it;
-        for (int i = 0; i < list->m_size; ++i)
+        for (unsigned i = 0; i < list->m_size; ++i)
             visitor.appendUnbarriered(JSValue::decode(list->slotFor(i)));
     }
 }
@@ -86,7 +86,7 @@ auto MarkedVectorBase::expandCapacity() -> Status
     return expandCapacity(checkedNewCapacity);
 }
 
-auto MarkedVectorBase::expandCapacity(int newCapacity) -> Status
+auto MarkedVectorBase::expandCapacity(unsigned newCapacity) -> Status
 {
     setNeedsOverflowCheck();
     ASSERT(m_capacity < newCapacity);
@@ -96,7 +96,7 @@ auto MarkedVectorBase::expandCapacity(int newCapacity) -> Status
     EncodedJSValue* newBuffer = static_cast<EncodedJSValue*>(Gigacage::tryMalloc(Gigacage::JSValue, checkedSize));
     if (!newBuffer)
         return Status::Overflowed;
-    for (int i = 0; i < m_size; ++i) {
+    for (unsigned i = 0; i < m_size; ++i) {
         newBuffer[i] = m_buffer[i];
         addMarkSet(JSValue::decode(m_buffer[i]));
     }
diff --git a/modules/javafx.web/src/main/native/Source/JavaScriptCore/runtime/ArgList.h b/modules/javafx.web/src/main/native/Source/JavaScriptCore/runtime/ArgList.h
index 4321c8f5c67..59ca86ffec3 100644
--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/runtime/ArgList.h
+++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/runtime/ArgList.h
@@ -83,14 +83,14 @@ class alignas(alignof(EncodedJSValue)) MarkedVectorBase {
     }
 
     Status expandCapacity();
-    Status expandCapacity(int newCapacity);
+    Status expandCapacity(unsigned newCapacity);
     JS_EXPORT_PRIVATE Status slowEnsureCapacity(size_t requestedCapacity);
 
     void addMarkSet(JSValue);
 
     JS_EXPORT_PRIVATE Status slowAppend(JSValue);
 
-    EncodedJSValue& slotFor(int item) const
+    EncodedJSValue& slotFor(unsigned item) const
     {
         return m_buffer[item];
     }
@@ -114,8 +114,8 @@ class alignas(alignof(EncodedJSValue)) MarkedVectorBase {
     void setNeedsOverflowCheck() { }
     void clearNeedsOverflowCheck() { }
 #endif // ASSERT_ENABLED
-    int m_size;
-    int m_capacity;
+    unsigned m_size;
+    unsigned m_capacity;
     EncodedJSValue* m_buffer;
     ListSet* m_markSet;
 };
@@ -136,7 +136,7 @@ class MarkedVector : public OverflowHandler, public MarkedVectorBase  {
         }
     }
 
-    auto at(int i) const -> decltype(auto)
+    auto at(unsigned i) const -> decltype(auto)
     {
         if constexpr (std::is_same_v<T, JSValue>) {
             if (i >= m_size)
@@ -276,13 +276,13 @@ class ArgList {
     {
     }
 
-    ArgList(EncodedJSValue* args, int count)
+    ArgList(EncodedJSValue* args, unsigned count)
         : m_args(args)
         , m_argCount(count)
     {
     }
 
-    JSValue at(int i) const
+    JSValue at(unsigned i) const
     {
         if (i >= m_argCount)
             return jsUndefined();
@@ -298,7 +298,7 @@ class ArgList {
 
 private:
     EncodedJSValue* m_args { nullptr };
-    int m_argCount { 0 };
+    unsigned m_argCount { 0 };
 };
 
 } // namespace JSC
diff --git a/modules/javafx.web/src/main/native/Source/JavaScriptCore/runtime/CommonSlowPaths.h b/modules/javafx.web/src/main/native/Source/JavaScriptCore/runtime/CommonSlowPaths.h
index 79463ea3171..75c81124405 100644
--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/runtime/CommonSlowPaths.h
+++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/runtime/CommonSlowPaths.h
@@ -180,7 +180,15 @@ static ALWAYS_INLINE void putDirectWithReify(VM& vm, JSGlobalObject* globalObjec
     auto scope = DECLARE_THROW_SCOPE(vm);
     bool isJSFunction = baseObject->inherits<JSFunction>();
     if (isJSFunction) {
-        jsCast<JSFunction*>(baseObject)->reifyLazyPropertyIfNeeded<>(vm, globalObject, propertyName);
+        JSFunction* jsFunction = jsCast<JSFunction*>(baseObject);
+
+        if (propertyName == vm.propertyNames->prototype) {
+            slot.disableCaching();
+            if (FunctionRareData* rareData = jsFunction->rareData())
+                rareData->clear("Store to prototype property of a function");
+        }
+
+        jsFunction->reifyLazyPropertyIfNeeded<>(vm, globalObject, propertyName);
         RETURN_IF_EXCEPTION(scope, void());
     }
 
@@ -201,16 +209,18 @@ static ALWAYS_INLINE void putDirectWithReify(VM& vm, JSGlobalObject* globalObjec
 
 static ALWAYS_INLINE void putDirectAccessorWithReify(VM& vm, JSGlobalObject* globalObject, JSObject* baseObject, PropertyName propertyName, GetterSetter* accessor, unsigned attribute)
 {
+    // baseObject is either JSFinalObject during object literal construction, or a userland JSFunction class
+    // constructor, both of which are guaranteed to be extensible and without non-configurable |propertyName|.
+    // Please also note that static "prototype" accessor in a `class` literal is a syntax error.
+
     auto scope = DECLARE_THROW_SCOPE(vm);
     bool isJSFunction = baseObject->inherits<JSFunction>();
     if (isJSFunction) {
+        ASSERT(propertyName != vm.propertyNames->prototype);
         jsCast<JSFunction*>(baseObject)->reifyLazyPropertyIfNeeded<>(vm, globalObject, propertyName);
         RETURN_IF_EXCEPTION(scope, void());
     }
 
-    // baseObject is either JSFinalObject during object literal construction, or a userland JSFunction class
-    // constructor, both of which are guaranteed to be extensible and without non-configurable |propertyName|.
-    // Please also note that static "prototype" accessor in a `class` literal is a syntax error.
     ASSERT(canPutDirectFast(vm, originalStructureBeforePut(baseObject), propertyName, isJSFunction));
     scope.release();
     baseObject->putDirectAccessor(globalObject, propertyName, accessor, attribute);
diff --git a/modules/javafx.web/src/main/native/Source/JavaScriptCore/runtime/CustomGetterSetter.h b/modules/javafx.web/src/main/native/Source/JavaScriptCore/runtime/CustomGetterSetter.h
index 6b875fc933a..82e1692a28c 100644
--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/runtime/CustomGetterSetter.h
+++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/runtime/CustomGetterSetter.h
@@ -35,7 +35,7 @@ namespace JSC {
 class CustomGetterSetter : public JSCell {
 public:
     using Base = JSCell;
-    static constexpr unsigned StructureFlags = Base::StructureFlags | StructureIsImmortal;
+    static constexpr unsigned StructureFlags = Base::StructureFlags | OverridesGetOwnPropertySlot | OverridesPut | StructureIsImmortal;
 
     using CustomGetter = GetValueFunc;
     using CustomSetter = PutValueFunc;
@@ -60,6 +60,13 @@ class CustomGetterSetter : public JSCell {
 
     DECLARE_EXPORT_INFO;
 
+    static bool getOwnPropertySlot(JSObject*, JSGlobalObject*, PropertyName, PropertySlot&) { RELEASE_ASSERT_NOT_REACHED(); return false; }
+    static bool put(JSCell*, JSGlobalObject*, PropertyName, JSValue, PutPropertySlot&) { RELEASE_ASSERT_NOT_REACHED(); return false; }
+    static bool putByIndex(JSCell*, JSGlobalObject*, unsigned, JSValue, bool) { RELEASE_ASSERT_NOT_REACHED(); return false; }
+    static bool setPrototype(JSObject*, JSGlobalObject*, JSValue, bool) { RELEASE_ASSERT_NOT_REACHED(); return false; }
+    static bool defineOwnProperty(JSObject*, JSGlobalObject*, PropertyName, const PropertyDescriptor&, bool) { RELEASE_ASSERT_NOT_REACHED(); return false; }
+    static bool deleteProperty(JSCell*, JSGlobalObject*, PropertyName, DeletePropertySlot&) { RELEASE_ASSERT_NOT_REACHED(); return false; }
+
 protected:
     CustomGetterSetter(VM& vm, Structure* structure, CustomGetter getter, CustomSetter setter)
         : JSCell(vm, structure)
diff --git a/modules/javafx.web/src/main/native/Source/JavaScriptCore/runtime/InternalFunction.cpp b/modules/javafx.web/src/main/native/Source/JavaScriptCore/runtime/InternalFunction.cpp
index c46d734aed0..9b420379bb4 100644
--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/runtime/InternalFunction.cpp
+++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/runtime/InternalFunction.cpp
@@ -144,6 +144,11 @@ Structure* InternalFunction::createSubclassStructure(JSGlobalObject* globalObjec
     if (UNLIKELY(!targetFunction || !targetFunction->canUseAllocationProfiles())) {
         JSValue prototypeValue = newTarget->get(globalObject, vm.propertyNames->prototype);
         RETURN_IF_EXCEPTION(scope, nullptr);
+        // .prototype getter could have triggered having a bad time so need to recheck array structures.
+        if (UNLIKELY(baseGlobalObject->isHavingABadTime())) {
+            if (baseGlobalObject->isOriginalArrayStructure(baseClass))
+                baseClass = baseGlobalObject->arrayStructureForIndexingTypeDuringAllocation(baseClass->indexingType());
+        }
         if (JSObject* prototype = jsDynamicCast<JSObject*>(prototypeValue)) {
             // This only happens if someone Reflect.constructs our builtin constructor with another builtin constructor or weird .prototype property on a
             // JSFunction as the new.target. Thus, we don't care about the cost of looking up the structure from our hash table every time.
diff --git a/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp b/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp
index f86c5e7c5a7..af2872c1900 100644
--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp
+++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp
@@ -345,12 +345,13 @@ class B3IRGenerator {
         return m_callSiteIndex;
     }
 
-    B3IRGenerator(const ModuleInformation&, OptimizingJITCallee&, Procedure&, Vector<UnlinkedWasmToWasmCall>&, unsigned& osrEntryScratchBufferSize, MemoryMode, CompilationMode, unsigned functionIndex, std::optional<bool> hasExceptionHandlers, unsigned loopIndexForOSREntry, TierUpCount*);
-    B3IRGenerator(B3IRGenerator& inlineCaller, B3IRGenerator& inlineRoot, unsigned functionIndex, BasicBlock* returnContinuation, Vector<Value*> args);
+    B3IRGenerator(CalleeGroup&, const ModuleInformation&, OptimizingJITCallee&, Procedure&, Vector<UnlinkedWasmToWasmCall>&, unsigned& osrEntryScratchBufferSize, MemoryMode, CompilationMode, unsigned functionIndex, std::optional<bool> hasExceptionHandlers, unsigned loopIndexForOSREntry, TierUpCount*);
+    B3IRGenerator(B3IRGenerator& inlineCaller, B3IRGenerator& inlineRoot, CalleeGroup&, unsigned functionIndex, std::optional<bool> hasExceptionHandlers, BasicBlock* returnContinuation, Vector<Value*> args);
 
     void computeStackCheckSize(bool& needsOverflowCheck, int32_t& checkSize);
 
     // SIMD
+    bool usesSIMD() { return m_info.usesSIMD(m_functionIndex); }
     void notifyFunctionUsesSIMD() { ASSERT(m_info.usesSIMD(m_functionIndex)); }
     PartialResult WARN_UNUSED_RETURN addSIMDLoad(ExpressionType pointer, uint32_t offset, ExpressionType& result);
     PartialResult WARN_UNUSED_RETURN addSIMDStore(ExpressionType value, ExpressionType pointer, uint32_t offset);
@@ -902,6 +903,7 @@ class B3IRGenerator {
     void traceCF(Args&&... info);
 
     FunctionParser<B3IRGenerator>* m_parser { nullptr };
+    CalleeGroup& m_calleeGroup;
     const ModuleInformation& m_info;
     OptimizingJITCallee* m_callee;
     const MemoryMode m_mode { MemoryMode::BoundsChecking };
@@ -1008,8 +1010,9 @@ void B3IRGenerator::restoreWasmContextInstance(BasicBlock* block, Value* arg)
     });
 }
 
-B3IRGenerator::B3IRGenerator(B3IRGenerator& parentCaller, B3IRGenerator& rootCaller, unsigned functionIndex, BasicBlock* returnContinuation, Vector<Value*> args)
-    : m_info(rootCaller.m_info)
+B3IRGenerator::B3IRGenerator(B3IRGenerator& parentCaller, B3IRGenerator& rootCaller, CalleeGroup& calleeGroup, unsigned functionIndex, std::optional<bool> hasExceptionHandlers, BasicBlock* returnContinuation, Vector<Value*> args)
+    : m_calleeGroup(calleeGroup)
+    , m_info(rootCaller.m_info)
     , m_callee(parentCaller.m_callee)
     , m_mode(rootCaller.m_mode)
     , m_compilationMode(CompilationMode::OMGMode)
@@ -1025,7 +1028,7 @@ B3IRGenerator::B3IRGenerator(B3IRGenerator& parentCaller, B3IRGenerator& rootCal
     , m_unlinkedWasmToWasmCalls(rootCaller.m_unlinkedWasmToWasmCalls)
     , m_osrEntryScratchBufferSize(nullptr)
     , m_constantInsertionValues(m_proc)
-    , m_hasExceptionHandlers(false)
+    , m_hasExceptionHandlers(hasExceptionHandlers)
     , m_numImportFunctions(m_info.importFunctionCount())
     , m_tryCatchDepth(parentCaller.m_tryCatchDepth)
     , m_callSiteIndex(0)
@@ -1036,6 +1039,8 @@ B3IRGenerator::B3IRGenerator(B3IRGenerator& parentCaller, B3IRGenerator& rootCal
     m_instanceValue = rootCaller.m_instanceValue;
     m_baseMemoryValue = rootCaller.m_baseMemoryValue;
     m_boundsCheckingSizeValue = rootCaller.m_boundsCheckingSizeValue;
+    if (parentCaller.m_hasExceptionHandlers && *parentCaller.m_hasExceptionHandlers)
+        m_hasExceptionHandlers = { true };
 }
 
 void B3IRGenerator::computeStackCheckSize(bool& needsOverflowCheck, int32_t& checkSize)
@@ -1074,8 +1079,9 @@ void B3IRGenerator::computeStackCheckSize(bool& needsOverflowCheck, int32_t& che
     needsOverflowCheck = needsOverflowCheck || needUnderflowCheck;
 }
 
-B3IRGenerator::B3IRGenerator(const ModuleInformation& info, OptimizingJITCallee& callee, Procedure& procedure, Vector<UnlinkedWasmToWasmCall>& unlinkedWasmToWasmCalls, unsigned& osrEntryScratchBufferSize, MemoryMode mode, CompilationMode compilationMode, unsigned functionIndex, std::optional<bool> hasExceptionHandlers, unsigned loopIndexForOSREntry, TierUpCount* tierUp)
-    : m_info(info)
+B3IRGenerator::B3IRGenerator(CalleeGroup& calleeGroup, const ModuleInformation& info, OptimizingJITCallee& callee, Procedure& procedure, Vector<UnlinkedWasmToWasmCall>& unlinkedWasmToWasmCalls, unsigned& osrEntryScratchBufferSize, MemoryMode mode, CompilationMode compilationMode, unsigned functionIndex, std::optional<bool> hasExceptionHandlers, unsigned loopIndexForOSREntry, TierUpCount* tierUp)
+    : m_calleeGroup(calleeGroup)
+    , m_info(info)
     , m_callee(&callee)
     , m_mode(mode)
     , m_compilationMode(compilationMode)
@@ -4276,7 +4282,7 @@ PatchpointExceptionHandle B3IRGenerator::preparePatchpointForExceptions(BasicBlo
     bool mustSaveState = m_tryCatchDepth;
 
     if (!mustSaveState)
-        return { m_hasExceptionHandlers };
+        return { m_hasExceptionHandlers, callSiteIndex() };
 
     Vector<Value*> liveValues;
     Origin origin = this->origin();
@@ -4299,6 +4305,8 @@ PatchpointExceptionHandle B3IRGenerator::preparePatchpointForExceptions(BasicBlo
         if (ControlType::isAnyCatch(data))
             liveValues.append(get(block, data.exception()));
     }
+        for (Variable* value : currentFrame->m_parser->expressionStack())
+            liveValues.append(get(block, value));
     }
 
     patch->effects.exitsSideways = true;
@@ -4375,6 +4383,10 @@ Value* B3IRGenerator::emitCatchImpl(CatchKind kind, ControlType& data, unsigned
             auto& expressionStack = currentFrame->m_parser->controlStack()[controlIndex].enclosedExpressionStack;
         connectControlAtEntrypoint(indexInBuffer, pointer, controlData, expressionStack, data);
     }
+
+        auto& topControlData = currentFrame->m_parser->controlStack().last().controlData;
+        auto& topExpressionStack = currentFrame->m_parser->expressionStack();
+        connectControlAtEntrypoint(indexInBuffer, pointer, topControlData, topExpressionStack, data);
     }
 
     set(data.exception(), exception);
@@ -4405,6 +4417,7 @@ auto B3IRGenerator::addDelegateToUnreachable(ControlType& target, ControlType& d
 auto B3IRGenerator::addThrow(unsigned exceptionIndex, Vector<ExpressionType>& args, Stack&) -> PartialResult
 {
     TRACE_CF("THROW");
+
     PatchpointValue* patch = m_proc.add<PatchpointValue>(B3::Void, origin(), cloningForbidden(Patchpoint));
     patch->effects.terminal = true;
     patch->append(instanceValue(), ValueRep::reg(GPRInfo::argumentGPR0));
@@ -4431,6 +4444,7 @@ auto B3IRGenerator::addThrow(unsigned exceptionIndex, Vector<ExpressionType>& ar
 auto B3IRGenerator::addRethrow(unsigned, ControlType& data) -> PartialResult
 {
     TRACE_CF("RETHROW");
+
     PatchpointValue* patch = m_proc.add<PatchpointValue>(B3::Void, origin(), cloningForbidden(Patchpoint));
     patch->clobber(RegisterSetBuilder::registersToSaveForJSCall(m_proc.usesSIMD() ? RegisterSetBuilder::allRegisters() : RegisterSetBuilder::allScalarRegisters()));
     patch->effects.terminal = true;
@@ -4648,7 +4662,7 @@ B3::PatchpointValue* B3IRGenerator::createCallPatchpoint(BasicBlock* block, Valu
     if (jsCalleeAnchor)
         constrainedPatchArgs.append(B3::ConstrainedValue(jsCalleeAnchor, wasmCalleeInfo.thisArgument));
 
-    Box<PatchpointExceptionHandle> exceptionHandle = Box<PatchpointExceptionHandle>::create(m_hasExceptionHandlers);
+    Box<PatchpointExceptionHandle> exceptionHandle = Box<PatchpointExceptionHandle>::create(m_hasExceptionHandlers, callSiteIndex());
 
     PatchpointValue* patchpoint = m_proc.add<PatchpointValue>(returnType, origin());
     patchpoint->effects.writesPinned = true;
@@ -4782,7 +4796,14 @@ auto B3IRGenerator::emitInlineDirectCall(uint32_t calleeFunctionIndex, const Typ
     auto firstInlineCSI = advanceCallSiteIndex();
 
     const FunctionData& function = m_info.functions[calleeFunctionIndex];
-    m_protectedInlineeGenerators.append(makeUnique<B3IRGenerator>(*this, *m_inlineRoot, calleeFunctionIndex, continuation, WTFMove(getArgs)));
+    std::optional<bool> inlineeHasExceptionHandlers;
+    {
+        Locker locker { m_calleeGroup.m_lock };
+        unsigned calleeFunctionIndexSpace = calleeFunctionIndex + m_numImportFunctions;
+        auto& inlineCallee = m_calleeGroup.wasmEntrypointCalleeFromFunctionIndexSpace(locker, calleeFunctionIndexSpace);
+        inlineeHasExceptionHandlers = inlineCallee.hasExceptionHandlers();
+    }
+    m_protectedInlineeGenerators.append(makeUnique<B3IRGenerator>(*this, *m_inlineRoot, m_calleeGroup, calleeFunctionIndex, inlineeHasExceptionHandlers, continuation, WTFMove(getArgs)));
     auto& irGenerator = *m_protectedInlineeGenerators.last();
     m_protectedInlineeParsers.append(makeUnique<FunctionParser<B3IRGenerator>>(irGenerator, function.data.data(), function.data.size(), calleeSignature, m_info));
     auto& parser = *m_protectedInlineeParsers.last();
@@ -4807,9 +4828,8 @@ auto B3IRGenerator::emitInlineDirectCall(uint32_t calleeFunctionIndex, const Typ
 
     dataLogLnIf(WasmB3IRGeneratorInternal::verboseInlining, "Block ", *m_currentBlock, " is going to do an inline call to block ", *irGenerator.m_topLevelBlock, " then continue at ", *continuation);
 
-    bool mayHaveExceptionHandlers = !m_hasExceptionHandlers || m_hasExceptionHandlers.value();
     m_currentBlock->appendNew<B3::MemoryValue>(m_proc, B3::Store, origin(),
-        m_currentBlock->appendIntConstant(m_proc, origin(), Int32, mayHaveExceptionHandlers ? PatchpointExceptionHandle::s_invalidCallSiteIndex : firstInlineCSI),
+        m_currentBlock->appendIntConstant(m_proc, origin(), Int32, firstInlineCSI),
         framePointer(), safeCast<int32_t>(CallFrameSlot::argumentCountIncludingThis * sizeof(Register) + TagOffset));
 
     m_currentBlock->appendNewControlValue(m_proc, B3::Jump, origin(), FrequentedBlock(irGenerator.m_topLevelBlock));
@@ -4821,7 +4841,7 @@ auto B3IRGenerator::emitInlineDirectCall(uint32_t calleeFunctionIndex, const Typ
     auto lastInlineCSI = advanceCallSiteIndex();
 
     m_currentBlock->appendNew<B3::MemoryValue>(m_proc, B3::Store, origin(),
-        m_currentBlock->appendIntConstant(m_proc, origin(), Int32, mayHaveExceptionHandlers ? PatchpointExceptionHandle::s_invalidCallSiteIndex : advanceCallSiteIndex()),
+        m_currentBlock->appendIntConstant(m_proc, origin(), Int32, advanceCallSiteIndex()),
         framePointer(), safeCast<int32_t>(CallFrameSlot::argumentCountIncludingThis * sizeof(Register) + TagOffset));
 
     m_callee->addCodeOrigin(firstInlineCSI, lastInlineCSI, m_info, calleeFunctionIndex + m_numImportFunctions);
@@ -5172,7 +5192,7 @@ static bool shouldDumpIRFor(uint32_t functionIndex)
     return dumpAllowlist->shouldDumpWasmFunction(functionIndex);
 }
 
-Expected<std::unique_ptr<InternalFunction>, String> parseAndCompileB3(CompilationContext& compilationContext, OptimizingJITCallee& callee, const FunctionData& function, const TypeDefinition& signature, Vector<UnlinkedWasmToWasmCall>& unlinkedWasmToWasmCalls, const ModuleInformation& info, MemoryMode mode, CompilationMode compilationMode, uint32_t functionIndex, std::optional<bool> hasExceptionHandlers, uint32_t loopIndexForOSREntry, TierUpCount* tierUp)
+Expected<std::unique_ptr<InternalFunction>, String> parseAndCompileB3(CompilationContext& compilationContext, OptimizingJITCallee& callee, const FunctionData& function, const TypeDefinition& signature, Vector<UnlinkedWasmToWasmCall>& unlinkedWasmToWasmCalls, CalleeGroup& calleeGroup, const ModuleInformation& info, MemoryMode mode, CompilationMode compilationMode, uint32_t functionIndex, std::optional<bool> hasExceptionHandlers, uint32_t loopIndexForOSREntry, TierUpCount* tierUp)
 {
     CompilerTimingScope totalScope("B3", "Total WASM compilation");
 
@@ -5213,7 +5233,7 @@ Expected<std::unique_ptr<InternalFunction>, String> parseAndCompileB3(Compilatio
 
     procedure.code().setForceIRCRegisterAllocation();
 
-    B3IRGenerator irGenerator(info, callee, procedure, unlinkedWasmToWasmCalls, result->osrEntryScratchBufferSize, mode, compilationMode, functionIndex, hasExceptionHandlers, loopIndexForOSREntry, tierUp);
+    B3IRGenerator irGenerator(calleeGroup, info, callee, procedure, unlinkedWasmToWasmCalls, result->osrEntryScratchBufferSize, mode, compilationMode, functionIndex, hasExceptionHandlers, loopIndexForOSREntry, tierUp);
     FunctionParser<B3IRGenerator> parser(irGenerator, function.data.data(), function.data.size(), signature, info);
     WASM_FAIL_IF_HELPER_FAILS(parser.parse());
 
@@ -5775,7 +5795,7 @@ using namespace B3;
 #if !USE(JSVALUE64)
 // On 32-bit platforms, we stub out the entire B3 generator
 
-Expected<std::unique_ptr<InternalFunction>, String> parseAndCompileB3(CompilationContext&, OptimizingJITCallee&, const FunctionData&, const TypeDefinition&, Vector<UnlinkedWasmToWasmCall>&, const ModuleInformation&, MemoryMode, CompilationMode, uint32_t, std::optional<bool>, uint32_t, TierUpCount*)
+Expected<std::unique_ptr<InternalFunction>, String> parseAndCompileB3(CompilationContext&, OptimizingJITCallee&, const FunctionData&, const TypeDefinition&, Vector<UnlinkedWasmToWasmCall>&, CalleeGroup&, const ModuleInformation&, MemoryMode, CompilationMode, uint32_t, std::optional<bool>, uint32_t, TierUpCount*)
 {
     UNREACHABLE_FOR_PLATFORM();
 }
diff --git a/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmB3IRGenerator.h b/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmB3IRGenerator.h
index e84a71bfb25..c6d04a845ea 100644
--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmB3IRGenerator.h
+++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmB3IRGenerator.h
@@ -49,7 +49,9 @@ namespace JSC {
 
 namespace Wasm {
 
-Expected<std::unique_ptr<InternalFunction>, String> parseAndCompileB3(CompilationContext&, OptimizingJITCallee&, const FunctionData&, const TypeDefinition&, Vector<UnlinkedWasmToWasmCall>&, const ModuleInformation&, MemoryMode, CompilationMode, uint32_t functionIndex, std::optional<bool> hasExceptionHandlers, uint32_t loopIndexForOSREntry, TierUpCount* = nullptr);
+class CalleeGroup;
+
+Expected<std::unique_ptr<InternalFunction>, String> parseAndCompileB3(CompilationContext&, OptimizingJITCallee&, const FunctionData&, const TypeDefinition&, Vector<UnlinkedWasmToWasmCall>&, CalleeGroup&, const ModuleInformation&, MemoryMode, CompilationMode, uint32_t functionIndex, std::optional<bool> hasExceptionHandlers, uint32_t loopIndexForOSREntry, TierUpCount* = nullptr);
 
 } } // namespace JSC::Wasm
 
diff --git a/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmBBQJIT.cpp b/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmBBQJIT.cpp
index 02a4febf3e9..9184bbe875a 100644
--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmBBQJIT.cpp
+++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmBBQJIT.cpp
@@ -3958,6 +3958,25 @@ void BBQJIT::returnValuesFromCall(Vector<Value, N>& results, const FunctionSigna
                         ASSERT(m_validFPRs.contains(returnLocation.asFPR(), Width::Width128));
                         m_fprSet.add(returnLocation.asFPR(), Width::Width128);
                 }
+            } else {
+                ASSERT(returnLocation.isStackArgument());
+                // FIXME: Ideally, we would leave these values where they are but a subsequent call could clobber them before they are used.
+                // That said, stack results are very rare so this isn't too painful.
+                // Even if we did leave them where they are, we'd need to flush them to their canonical location at the next branch otherwise
+                // we could have something like (assume no result regs for simplicity):
+                // call (result i32 i32) $foo
+                // if (result i32) // Stack: i32(StackArgument:8) i32(StackArgument:0)
+                //   // Stack: i32(StackArgument:8)
+                // else
+                //   call (result i32 i32) $bar // Stack: i32(StackArgument:8) we have to flush the stack argument to make room for the result of bar
+                //   drop // Stack: i32(Stack:X) i32(StackArgument:8) i32(StackArgument:0)
+                //   drop // Stack: i32(Stack:X) i32(StackArgument:8)
+                // end
+                // return // Stack i32(*Conflicting locations*)
+
+                Location canonicalLocation = canonicalSlot(result);
+                emitMoveMemory(result.type(), returnLocation, canonicalLocation);
+                returnLocation = canonicalLocation;
             }
             }
             bind(result, returnLocation);
@@ -4181,6 +4200,11 @@ ALWAYS_INLINE void BBQJIT::didParseOpcode()
 
 // SIMD
 
+bool BBQJIT::usesSIMD()
+{
+    return m_usesSIMD;
+}
+
 void BBQJIT::dump(const ControlStack&, const Stack*) { }
 void BBQJIT::didFinishParsingLocals() { }
 void BBQJIT::didPopValueFromStack(ExpressionType, String) { }
diff --git a/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmBBQJIT.h b/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmBBQJIT.h
index 6c4d7ef7e50..8a4ef5bd5ca 100644
--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmBBQJIT.h
+++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmBBQJIT.h
@@ -1780,6 +1780,8 @@ class BBQJIT {
 
     // SIMD
 
+    bool usesSIMD();
+
     void notifyFunctionUsesSIMD();
 
     PartialResult addSIMDLoad(ExpressionType, uint32_t, ExpressionType&);
diff --git a/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmConstExprGenerator.cpp b/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmConstExprGenerator.cpp
index f85009c2b7e..119328eef33 100644
--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmConstExprGenerator.cpp
+++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmConstExprGenerator.cpp
@@ -654,6 +654,7 @@ class ConstExprGenerator {
     PartialResult WARN_UNUSED_RETURN addCallRef(const TypeDefinition&, Vector<ExpressionType>&, ResultList&) CONST_EXPR_STUB
     PartialResult WARN_UNUSED_RETURN addUnreachable() CONST_EXPR_STUB
     PartialResult WARN_UNUSED_RETURN addCrash() CONST_EXPR_STUB
+    bool usesSIMD() { return false; }
     void notifyFunctionUsesSIMD() { }
     PartialResult WARN_UNUSED_RETURN addSIMDLoad(ExpressionType, uint32_t, ExpressionType&) CONST_EXPR_STUB
     PartialResult WARN_UNUSED_RETURN addSIMDStore(ExpressionType, ExpressionType, uint32_t) CONST_EXPR_STUB
diff --git a/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmFunctionParser.h b/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmFunctionParser.h
index 059e8a9cafb..46838eb2027 100644
--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmFunctionParser.h
+++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmFunctionParser.h
@@ -331,6 +331,7 @@ class FunctionParser : public Parser<void>, public FunctionParserTypes<typename
 
     void addReferencedFunctions(const Element&);
     PartialResult WARN_UNUSED_RETURN parseArrayTypeDefinition(const char*, bool, uint32_t&, FieldType&, Type&);
+    PartialResult WARN_UNUSED_RETURN parseBlockSignatureAndNotifySIMDUseIfNeeded(BlockSignature&);
 
     Context& m_context;
     Stack m_expressionStack;
@@ -349,6 +350,29 @@ class FunctionParser : public Parser<void>, public FunctionParserTypes<typename
     unsigned m_loopIndex { 0 };
 };
 
+template<typename Context>
+auto FunctionParser<Context>::parseBlockSignatureAndNotifySIMDUseIfNeeded(BlockSignature& signature) -> PartialResult
+{
+    auto result = parseBlockSignature(m_info, signature);
+
+    // This check ensures the valid result and the non empty signature.
+    if (!result || !signature)
+        return result;
+
+    if (m_context.usesSIMD()) {
+        if (!Context::tierSupportsSIMD)
+            WASM_TRY_ADD_TO_CONTEXT(addCrash());
+        return result;
+    }
+
+    if (signature->hasReturnVector()) {
+        m_context.notifyFunctionUsesSIMD();
+        if (!Context::tierSupportsSIMD)
+            WASM_TRY_ADD_TO_CONTEXT(addCrash());
+    }
+    return result;
+}
+
 template<typename ControlType>
 static bool isTryOrCatch(ControlType& data)
 {
@@ -2723,6 +2747,7 @@ FOR_EACH_WASM_MEMORY_STORE_OP(CREATE_CASE)
         WASM_PARSER_FAIL_IF(!Options::useWebAssemblyTypedFunctionReferences(), "function references are not enabled");
         TypedExpression ref;
         WASM_TRY_POP_EXPRESSION_STACK_INTO(ref, "ref.as_non_null");
+        WASM_VALIDATOR_FAIL_IF(!isRefType(ref.type()), "ref.as_non_null ref to type ", ref.type(), " expected a reference type");
 
         ExpressionType result;
         WASM_TRY_ADD_TO_CONTEXT(addRefAsNonNull(ref, result));
@@ -3064,7 +3089,7 @@ FOR_EACH_WASM_MEMORY_STORE_OP(CREATE_CASE)
             return { };
 
         BlockSignature inlineSignature;
-        WASM_PARSER_FAIL_IF(!parseBlockSignature(m_info, inlineSignature), "can't get block's signature");
+        WASM_PARSER_FAIL_IF(!parseBlockSignatureAndNotifySIMDUseIfNeeded(inlineSignature), "can't get block's signature");
 
         WASM_VALIDATOR_FAIL_IF(m_expressionStack.size() < inlineSignature->argumentCount(), "Too few values on stack for block. Block expects ", inlineSignature->argumentCount(), ", but only ", m_expressionStack.size(), " were present. Block has inlineSignature: ", inlineSignature->toString());
         unsigned offset = m_expressionStack.size() - inlineSignature->argumentCount();
@@ -3086,7 +3111,7 @@ FOR_EACH_WASM_MEMORY_STORE_OP(CREATE_CASE)
 
     case Loop: {
         BlockSignature inlineSignature;
-        WASM_PARSER_FAIL_IF(!parseBlockSignature(m_info, inlineSignature), "can't get loop's signature");
+        WASM_PARSER_FAIL_IF(!parseBlockSignatureAndNotifySIMDUseIfNeeded(inlineSignature), "can't get loop's signature");
 
         WASM_VALIDATOR_FAIL_IF(m_expressionStack.size() < inlineSignature->argumentCount(), "Too few values on stack for loop block. Loop expects ", inlineSignature->argumentCount(), ", but only ", m_expressionStack.size(), " were present. Loop has inlineSignature: ", inlineSignature->toString());
         unsigned offset = m_expressionStack.size() - inlineSignature->argumentCount();
@@ -3110,7 +3135,7 @@ FOR_EACH_WASM_MEMORY_STORE_OP(CREATE_CASE)
     case If: {
         BlockSignature inlineSignature;
         TypedExpression condition;
-        WASM_PARSER_FAIL_IF(!parseBlockSignature(m_info, inlineSignature), "can't get if's signature");
+        WASM_PARSER_FAIL_IF(!parseBlockSignatureAndNotifySIMDUseIfNeeded(inlineSignature), "can't get if's signature");
         WASM_TRY_POP_EXPRESSION_STACK_INTO(condition, "if condition");
 
         WASM_VALIDATOR_FAIL_IF(!condition.type().isI32(), "if condition must be i32, got ", condition.type());
@@ -3146,7 +3171,7 @@ FOR_EACH_WASM_MEMORY_STORE_OP(CREATE_CASE)
 
     case Try: {
         BlockSignature inlineSignature;
-        WASM_PARSER_FAIL_IF(!parseBlockSignature(m_info, inlineSignature), "can't get try's signature");
+        WASM_PARSER_FAIL_IF(!parseBlockSignatureAndNotifySIMDUseIfNeeded(inlineSignature), "can't get try's signature");
 
         WASM_VALIDATOR_FAIL_IF(m_expressionStack.size() < inlineSignature->argumentCount(), "Too few arguments on stack for try block. Try expects ", inlineSignature->argumentCount(), ", but only ", m_expressionStack.size(), " were present. Try block has signature: ", inlineSignature->toString());
         unsigned offset = m_expressionStack.size() - inlineSignature->argumentCount();
@@ -3555,7 +3580,7 @@ auto FunctionParser<Context>::parseUnreachableExpression() -> PartialResult
     case Block: {
         m_unreachableBlocks++;
         BlockSignature unused;
-        WASM_PARSER_FAIL_IF(!parseBlockSignature(m_info, unused), "can't get inline type for ", m_currentOpcode, " in unreachable context");
+        WASM_PARSER_FAIL_IF(!parseBlockSignatureAndNotifySIMDUseIfNeeded(unused), "can't get inline type for ", m_currentOpcode, " in unreachable context");
         return { };
     }
 
diff --git a/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmIPIntGenerator.cpp b/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmIPIntGenerator.cpp
index 359256c3dcc..88137a48c47 100644
--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmIPIntGenerator.cpp
+++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmIPIntGenerator.cpp
@@ -200,6 +200,7 @@ class IPIntGenerator {
 
     // SIMD
 
+    bool usesSIMD() { return m_usesSIMD; }
     void notifyFunctionUsesSIMD() { ASSERT(Options::useWebAssemblySIMD()); m_usesSIMD = true; }
     PartialResult WARN_UNUSED_RETURN addSIMDLoad(ExpressionType, uint32_t, ExpressionType&);
     PartialResult WARN_UNUSED_RETURN addSIMDStore(ExpressionType, ExpressionType, uint32_t);
diff --git a/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmIRGeneratorHelpers.h b/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmIRGeneratorHelpers.h
index acb6938e743..e446b7e54f0 100644
--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmIRGeneratorHelpers.h
+++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmIRGeneratorHelpers.h
@@ -46,8 +46,9 @@ struct PatchpointExceptionHandleBase {
 
 #if ENABLE(WEBASSEMBLY_OMGJIT)
 struct PatchpointExceptionHandle : public PatchpointExceptionHandleBase {
-    PatchpointExceptionHandle(std::optional<bool> hasExceptionHandlers)
+    PatchpointExceptionHandle(std::optional<bool> hasExceptionHandlers, unsigned callSiteIndex)
         : m_hasExceptionHandlers(hasExceptionHandlers)
+        , m_callSiteIndex(callSiteIndex)
     { }
 
     PatchpointExceptionHandle(std::optional<bool> hasExceptionHandlers, unsigned callSiteIndex, unsigned numLiveValues)
@@ -59,26 +60,26 @@ struct PatchpointExceptionHandle : public PatchpointExceptionHandleBase {
     template <typename Generator>
     void generate(CCallHelpers& jit, const B3::StackmapGenerationParams& params, Generator* generator) const
     {
-        if (m_callSiteIndex == s_invalidCallSiteIndex) {
-            if (!m_hasExceptionHandlers || m_hasExceptionHandlers.value())
+        JIT_COMMENT(jit, "Store call site index ", m_callSiteIndex, " at throw or call site.");
                 jit.store32(CCallHelpers::TrustedImm32(m_callSiteIndex), CCallHelpers::tagFor(CallFrameSlot::argumentCountIncludingThis));
+
+        if (m_hasExceptionHandlers && !*m_hasExceptionHandlers)
+            return;
+        if (!m_numLiveValues)
             return;
-        }
 
-        StackMap values(m_numLiveValues);
-        unsigned paramsOffset = params.size() - m_numLiveValues;
-        unsigned childrenOffset = params.value()->numChildren() - m_numLiveValues;
-        for (unsigned i = 0; i < m_numLiveValues; ++i)
+        StackMap values(*m_numLiveValues);
+        unsigned paramsOffset = params.size() - *m_numLiveValues;
+        unsigned childrenOffset = params.value()->numChildren() - *m_numLiveValues;
+        for (unsigned i = 0; i < *m_numLiveValues; ++i)
             values[i] = OSREntryValue(params[i + paramsOffset], params.value()->child(i + childrenOffset)->type());
 
         generator->addStackMap(m_callSiteIndex, WTFMove(values));
-        JIT_COMMENT(jit, "Store call site index ", m_callSiteIndex, " at throw or call site.");
-        jit.store32(CCallHelpers::TrustedImm32(m_callSiteIndex), CCallHelpers::tagFor(CallFrameSlot::argumentCountIncludingThis));
     }
 
     std::optional<bool> m_hasExceptionHandlers;
     unsigned m_callSiteIndex { s_invalidCallSiteIndex };
-    unsigned m_numLiveValues;
+    std::optional<unsigned> m_numLiveValues { };
 };
 #else
 
diff --git a/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmLLIntGenerator.cpp b/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmLLIntGenerator.cpp
index 67e72cc370b..b162ad2a2e5 100644
--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmLLIntGenerator.cpp
+++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmLLIntGenerator.cpp
@@ -257,6 +257,7 @@ class LLIntGenerator : public BytecodeGeneratorBase<GeneratorTraits> {
     }
 
     void didPopValueFromStack(ExpressionType, String) { --m_stackSize; }
+    bool usesSIMD() { return m_usesSIMD; }
     void notifyFunctionUsesSIMD() { ASSERT(Options::useWebAssemblySIMD()); m_usesSIMD = true; }
 
     PartialResult WARN_UNUSED_RETURN addDrop(ExpressionType);
diff --git a/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmOMGPlan.cpp b/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmOMGPlan.cpp
index bbb17c66731..1da200ef190 100644
--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmOMGPlan.cpp
+++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmOMGPlan.cpp
@@ -114,7 +114,7 @@ void OMGPlan::work(CompilationEffort)
 
     Vector<UnlinkedWasmToWasmCall> unlinkedCalls;
     CompilationContext context;
-    auto parseAndCompileResult = parseAndCompileB3(context, callee.get(), function, signature, unlinkedCalls, m_moduleInformation.get(), m_mode, CompilationMode::OMGMode, m_functionIndex, m_hasExceptionHandlers, UINT32_MAX);
+    auto parseAndCompileResult = parseAndCompileB3(context, callee.get(), function, signature, unlinkedCalls, m_calleeGroup.get(), m_moduleInformation.get(), m_mode, CompilationMode::OMGMode, m_functionIndex, m_hasExceptionHandlers, UINT32_MAX);
 
     if (UNLIKELY(!parseAndCompileResult)) {
         Locker locker { m_lock };
diff --git a/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmOSREntryPlan.cpp b/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmOSREntryPlan.cpp
index b094c34a497..dafccb9442d 100644
--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmOSREntryPlan.cpp
+++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmOSREntryPlan.cpp
@@ -107,7 +107,7 @@ void OSREntryPlan::work(CompilationEffort)
 
     Vector<UnlinkedWasmToWasmCall> unlinkedCalls;
     CompilationContext context;
-    auto parseAndCompileResult = parseAndCompileB3(context, callee.get(), function, signature, unlinkedCalls, m_moduleInformation.get(), m_mode, targetCompilationMode, m_functionIndex, m_hasExceptionHandlers, m_loopIndex);
+    auto parseAndCompileResult = parseAndCompileB3(context, callee.get(), function, signature, unlinkedCalls, m_calleeGroup.get(), m_moduleInformation.get(), m_mode, targetCompilationMode, m_functionIndex, m_hasExceptionHandlers, m_loopIndex);
 
     if (UNLIKELY(!parseAndCompileResult)) {
         Locker locker { m_lock };
diff --git a/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmTypeDefinition.h b/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmTypeDefinition.h
index c5b8888b0c6..dc78ea5f26f 100644
--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmTypeDefinition.h
+++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmTypeDefinition.h
@@ -355,6 +355,15 @@ class FunctionSignature {
         return n;
     }
 
+    bool hasReturnVector() const
+    {
+        for (size_t i = 0; i < returnCount(); ++i) {
+            if (returnType(i).isV128())
+                return true;
+        }
+        return false;
+    }
+
     bool operator==(const FunctionSignature& other) const
     {
         // Function signatures are unique because it is just an view class over TypeDefinition and
diff --git a/modules/javafx.web/src/main/native/Source/JavaScriptCore/yarr/YarrInterpreter.cpp b/modules/javafx.web/src/main/native/Source/JavaScriptCore/yarr/YarrInterpreter.cpp
index c7a83860464..93a1e767bde 100644
--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/yarr/YarrInterpreter.cpp
+++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/yarr/YarrInterpreter.cpp
@@ -954,6 +954,21 @@ class Interpreter {
         ASSERT(term.type == ByteTerm::Type::BackReference);
         BackTrackInfoBackReference* backTrack = reinterpret_cast<BackTrackInfoBackReference*>(context->frame + term.frameLocation);
 
+        // Initialize backtracking info first before we check for possible null matches.
+        switch (term.atom.quantityType) {
+        case QuantifierType::NonGreedy:
+            backTrack->matchAmount = 0;
+            FALLTHROUGH;
+
+        case QuantifierType::FixedCount:
+            backTrack->begin = input.getPos();
+            break;
+
+        case QuantifierType::Greedy:
+            backTrack->matchAmount = 0;
+            break;
+        }
+
         unsigned subpatternId;
 
         if (auto duplicateNamedGroupId = term.duplicateNamedGroupId()) {
@@ -984,7 +999,6 @@ class Interpreter {
 
         switch (term.atom.quantityType) {
         case QuantifierType::FixedCount: {
-            backTrack->begin = input.getPos();
             for (unsigned matchAmount = 0; matchAmount < term.atom.quantityMaxCount; ++matchAmount) {
                 if (!tryConsumeBackReference(matchBegin, matchEnd, term)) {
                     input.setPos(backTrack->begin);
@@ -999,13 +1013,10 @@ class Interpreter {
             while ((matchAmount < term.atom.quantityMaxCount) && tryConsumeBackReference(matchBegin, matchEnd, term))
                 ++matchAmount;
             backTrack->matchAmount = matchAmount;
-            backTrack->backReferenceSize = matchEnd - matchBegin;
             return true;
         }
 
         case QuantifierType::NonGreedy:
-            backTrack->begin = input.getPos();
-            backTrack->matchAmount = 0;
             return true;
         }
 
@@ -1018,8 +1029,19 @@ class Interpreter {
         ASSERT(term.type == ByteTerm::Type::BackReference);
         BackTrackInfoBackReference* backTrack = reinterpret_cast<BackTrackInfoBackReference*>(context->frame + term.frameLocation);
 
-        unsigned matchBegin = output[(term.subpatternId() << 1)];
-        unsigned matchEnd = output[(term.subpatternId() << 1) + 1];
+        unsigned subpatternId;
+
+        if (auto duplicateNamedGroupId = term.duplicateNamedGroupId()) {
+            subpatternId = output[pattern->offsetForDuplicateNamedGroupId(duplicateNamedGroupId)];
+            if (subpatternId < 1) {
+                // If we don't have a subpattern that matched, then the string to match is empty.
+                return false;
+            }
+        } else
+            subpatternId = term.subpatternId();
+
+        unsigned matchBegin = output[(subpatternId << 1)];
+        unsigned matchEnd = output[(subpatternId << 1) + 1];
 
         if (matchBegin == offsetNoMatch)
             return false;
diff --git a/modules/javafx.web/src/main/native/Source/JavaScriptCore/yarr/YarrPattern.cpp b/modules/javafx.web/src/main/native/Source/JavaScriptCore/yarr/YarrPattern.cpp
index 0e12e4d27a8..00613785b73 100644
--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/yarr/YarrPattern.cpp
+++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/yarr/YarrPattern.cpp
@@ -228,8 +228,9 @@ class CharacterClassConstructor {
                 for (auto* set = canonicalCharacterSetInfo(info->value, m_canonicalMode); (ch = *set); ++set)
                     addChar(ch);
             } else {
-                addChar(ch);
-                addChar(getCanonicalPair(info, ch));
+                char32_t canonicalChar = getCanonicalPair(info, ch);
+                addChar(std::min(ch, canonicalChar));
+                addChar(std::max(ch, canonicalChar));
             }
         }
 
@@ -777,6 +778,7 @@ class CharacterClassConstructor {
                 if (ch > chunkHi)
                     break;
 
+                ASSERT(ch >= chunkLo);
                 lhsChunkBitSet.set(ch - chunkLo);
             }
 
@@ -788,8 +790,10 @@ class CharacterClassConstructor {
                 auto begin = std::max(chunkLo, range.begin);
                 auto end = std::min(range.end, chunkHi);
 
-                for (char32_t ch = begin; ch <= end; ch++)
+                for (char32_t ch = begin; ch <= end; ch++) {
+                    ASSERT(ch >= chunkLo);
                     lhsChunkBitSet.set(ch - chunkLo);
+                }
 
                 if (range.end > chunkHi)
                     break;
@@ -800,6 +804,7 @@ class CharacterClassConstructor {
                 if (ch > chunkHi)
                     break;
 
+                ASSERT(ch >= chunkLo);
                 rhsChunkBitSet.set(ch - chunkLo);
             }
 
@@ -811,8 +816,10 @@ class CharacterClassConstructor {
                 auto begin = std::max(chunkLo, range.begin);
                 auto end = std::min(range.end, chunkHi);
 
-                for (char32_t ch = begin; ch <= end; ch++)
+                for (char32_t ch = begin; ch <= end; ch++) {
+                    ASSERT(ch >= chunkLo);
                     rhsChunkBitSet.set(ch - chunkLo);
+                }
 
                 if (range.end > chunkHi)
                     break;
diff --git a/modules/javafx.web/src/main/native/Source/WTF/wtf/Deque.h b/modules/javafx.web/src/main/native/Source/WTF/wtf/Deque.h
index 681563774cd..2bd3d83edd6 100644
--- a/modules/javafx.web/src/main/native/Source/WTF/wtf/Deque.h
+++ b/modules/javafx.web/src/main/native/Source/WTF/wtf/Deque.h
@@ -116,6 +116,10 @@ template<typename T, size_t inlineCapacity> class Deque final {
 
     template<typename Predicate> iterator findIf(const Predicate&);
     template<typename Predicate> const_iterator findIf(const Predicate&) const;
+    template<typename Predicate> bool containsIf(const Predicate& predicate) const
+    {
+        return findIf(predicate) != end();
+    }
 
 private:
     friend class DequeIteratorBase<T, inlineCapacity>;
diff --git a/modules/javafx.web/src/main/native/Source/WTF/wtf/UniStdExtras.h b/modules/javafx.web/src/main/native/Source/WTF/wtf/UniStdExtras.h
index b79dfe7dcfe..7e93dc3dc10 100644
--- a/modules/javafx.web/src/main/native/Source/WTF/wtf/UniStdExtras.h
+++ b/modules/javafx.web/src/main/native/Source/WTF/wtf/UniStdExtras.h
@@ -32,6 +32,7 @@
 namespace WTF {
 
 WTF_EXPORT_PRIVATE bool setCloseOnExec(int fileDescriptor);
+WTF_EXPORT_PRIVATE bool unsetCloseOnExec(int fileDescriptor);
 WTF_EXPORT_PRIVATE int dupCloseOnExec(int fileDescriptor);
 
 inline int closeWithRetry(int fileDescriptor)
@@ -57,6 +58,7 @@ WTF_EXPORT_PRIVATE bool setNonBlock(int fileDescriptor);
 using WTF::closeWithRetry;
 using WTF::dupCloseOnExec;
 using WTF::setCloseOnExec;
+using WTF::unsetCloseOnExec;
 using WTF::setNonBlock;
 
 #endif // UniStdExtras_h
diff --git a/modules/javafx.web/src/main/native/Source/WTF/wtf/unix/UniStdExtrasUnix.cpp b/modules/javafx.web/src/main/native/Source/WTF/wtf/unix/UniStdExtrasUnix.cpp
index 115f770ebba..b9a63fbc76a 100644
--- a/modules/javafx.web/src/main/native/Source/WTF/wtf/unix/UniStdExtrasUnix.cpp
+++ b/modules/javafx.web/src/main/native/Source/WTF/wtf/unix/UniStdExtrasUnix.cpp
@@ -42,6 +42,18 @@ bool setCloseOnExec(int fileDescriptor)
     return returnValue != -1;
 }
 
+bool unsetCloseOnExec(int fileDescriptor)
+{
+    int returnValue = -1;
+    do {
+        int flags = fcntl(fileDescriptor, F_GETFD);
+        if (flags == -1)
+            returnValue = fcntl(fileDescriptor, F_SETFD, flags & ~FD_CLOEXEC);
+    } while (returnValue == -1 && errno == EINTR);
+
+    return returnValue != -1;
+}
+
 int dupCloseOnExec(int fileDescriptor)
 {
     int duplicatedFileDescriptor = -1;
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/fetch/FetchBodyOwner.cpp b/modules/javafx.web/src/main/native/Source/WebCore/Modules/fetch/FetchBodyOwner.cpp
index e10c5d255d4..56b2dabbaab 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/fetch/FetchBodyOwner.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/fetch/FetchBodyOwner.cpp
@@ -280,6 +280,9 @@ void FetchBodyOwner::blobLoadingSucceeded()
     }
 
     m_body->loadingSucceeded(contentType());
+    if (!m_blobLoader)
+        return;
+
     finishBlobLoading();
 }
 
@@ -320,6 +323,12 @@ void FetchBodyOwner::BlobLoader::didFail(const ResourceError&)
         owner.blobLoadingFailed();
 }
 
+void FetchBodyOwner::BlobLoader::didSucceed(const NetworkLoadMetrics&)
+{
+    Ref protectedOwner = Ref { owner };
+    protectedOwner->blobLoadingSucceeded();
+}
+
 ExceptionOr<RefPtr<ReadableStream>> FetchBodyOwner::readableStream(JSC::JSGlobalObject& state)
 {
     if (isBodyNullOrOpaque())
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/fetch/FetchBodyOwner.h b/modules/javafx.web/src/main/native/Source/WebCore/Modules/fetch/FetchBodyOwner.h
index bb7678ae011..d4dede473e9 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/fetch/FetchBodyOwner.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/fetch/FetchBodyOwner.h
@@ -120,7 +120,7 @@ class FetchBodyOwner : public RefCounted<FetchBodyOwner>, public ActiveDOMObject
         void didReceiveResponse(const ResourceResponse&) final;
         void didReceiveData(const SharedBuffer& buffer) final { owner.blobChunk(buffer); }
         void didFail(const ResourceError&) final;
-        void didSucceed(const NetworkLoadMetrics&) final { owner.blobLoadingSucceeded(); }
+        void didSucceed(const NetworkLoadMetrics&) final;
 
         FetchBodyOwner& owner;
         std::unique_ptr<FetchLoader> loader;
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp b/modules/javafx.web/src/main/native/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp
index 47c0c040947..5b708a0ad83 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp
@@ -236,18 +236,19 @@ static void processRemoteTracks(RTCRtpTransceiver& transceiver, PeerConnectionBa
     transceiver.setFiredDirection(state.firedDirection);
 }
 
-void PeerConnectionBackend::setLocalDescriptionSucceeded(std::optional<DescriptionStates>&& descriptionStates, std::optional<TransceiverStates>&& transceiverStates, std::unique_ptr<RTCSctpTransportBackend>&& sctpBackend)
+void PeerConnectionBackend::setLocalDescriptionSucceeded(std::optional<DescriptionStates>&& descriptionStates, std::optional<TransceiverStates>&& transceiverStates, std::unique_ptr<RTCSctpTransportBackend>&& sctpBackend, std::optional<double> maxMessageSize)
 {
     ASSERT(isMainThread());
     ALWAYS_LOG(LOGIDENTIFIER);
-
+    if (transceiverStates)
+        DEBUG_LOG(LOGIDENTIFIER, "Transceiver states: ", *transceiverStates);
     ASSERT(m_setDescriptionCallback);
-    m_peerConnection.queueTaskKeepingObjectAlive(m_peerConnection, TaskSource::Networking, [this, callback = WTFMove(m_setDescriptionCallback), descriptionStates = WTFMove(descriptionStates), transceiverStates = WTFMove(transceiverStates), sctpBackend = WTFMove(sctpBackend)]() mutable {
+    m_peerConnection.queueTaskKeepingObjectAlive(m_peerConnection, TaskSource::Networking, [this, callback = WTFMove(m_setDescriptionCallback), descriptionStates = WTFMove(descriptionStates), transceiverStates = WTFMove(transceiverStates), sctpBackend = WTFMove(sctpBackend), maxMessageSize]() mutable {
         if (m_peerConnection.isClosed())
             return;
 
         m_peerConnection.updateTransceiversAfterSuccessfulLocalDescription();
-        m_peerConnection.updateSctpBackend(WTFMove(sctpBackend));
+        m_peerConnection.updateSctpBackend(WTFMove(sctpBackend), maxMessageSize);
 
         if (descriptionStates) {
             m_peerConnection.updateDescriptions(WTFMove(*descriptionStates));
@@ -321,13 +322,15 @@ void PeerConnectionBackend::setRemoteDescription(const RTCSessionDescription& se
     doSetRemoteDescription(sessionDescription);
 }
 
-void PeerConnectionBackend::setRemoteDescriptionSucceeded(std::optional<DescriptionStates>&& descriptionStates, std::optional<TransceiverStates>&& transceiverStates, std::unique_ptr<RTCSctpTransportBackend>&& sctpBackend)
+void PeerConnectionBackend::setRemoteDescriptionSucceeded(std::optional<DescriptionStates>&& descriptionStates, std::optional<TransceiverStates>&& transceiverStates, std::unique_ptr<RTCSctpTransportBackend>&& sctpBackend, std::optional<double> maxMessageSize)
 {
     ASSERT(isMainThread());
     ALWAYS_LOG(LOGIDENTIFIER, "Set remote description succeeded");
+    if (transceiverStates)
+        DEBUG_LOG(LOGIDENTIFIER, "Transceiver states: ", *transceiverStates);
     ASSERT(m_setDescriptionCallback);
 
-    m_peerConnection.queueTaskKeepingObjectAlive(m_peerConnection, TaskSource::Networking, [this, callback = WTFMove(m_setDescriptionCallback), descriptionStates = WTFMove(descriptionStates), transceiverStates = WTFMove(transceiverStates), sctpBackend = WTFMove(sctpBackend), events = WTFMove(m_pendingTrackEvents)]() mutable {
+    m_peerConnection.queueTaskKeepingObjectAlive(m_peerConnection, TaskSource::Networking, [this, callback = WTFMove(m_setDescriptionCallback), descriptionStates = WTFMove(descriptionStates), transceiverStates = WTFMove(transceiverStates), sctpBackend = WTFMove(sctpBackend), maxMessageSize, events = WTFMove(m_pendingTrackEvents)]() mutable {
         if (m_peerConnection.isClosed())
             return;
 
@@ -344,7 +347,7 @@ void PeerConnectionBackend::setRemoteDescriptionSucceeded(std::optional<Descript
         }
 
         m_peerConnection.updateTransceiversAfterSuccessfulRemoteDescription();
-        m_peerConnection.updateSctpBackend(WTFMove(sctpBackend));
+        m_peerConnection.updateSctpBackend(WTFMove(sctpBackend), maxMessageSize);
 
         if (descriptionStates) {
             m_peerConnection.updateDescriptions(WTFMove(*descriptionStates));
@@ -653,6 +656,55 @@ WTFLogChannel& PeerConnectionBackend::logChannel() const
 }
 #endif
 
+static Ref<JSON::Object> toJSONObject(const PeerConnectionBackend::TransceiverState& transceiverState)
+{
+    auto object = JSON::Object::create();
+    object->setString("mid"_s, transceiverState.mid);
+
+    auto receiverStreams = JSON::Array::create();
+    for (auto receiverStream : transceiverState.receiverStreams)
+        receiverStreams->pushString(receiverStream->id());
+    object->setArray("receiverStreams"_s, WTFMove(receiverStreams));
+
+    if (auto firedDirection = transceiverState.firedDirection)
+        object->setString("firedDirection"_s, convertEnumerationToString(*firedDirection));
+
+    return object;
+}
+
+static Ref<JSON::Array> toJSONArray(const PeerConnectionBackend::TransceiverStates& transceiverStates)
+{
+    auto array = JSON::Array::create();
+    for (auto transceiverState : transceiverStates)
+        array->pushObject(toJSONObject(transceiverState));
+
+    return array;
+}
+
+static String toJSONString(const PeerConnectionBackend::TransceiverState& transceiverState)
+{
+    return toJSONObject(transceiverState)->toJSONString();
+}
+
+static String toJSONString(const PeerConnectionBackend::TransceiverStates& transceiverStates)
+{
+    return toJSONArray(transceiverStates)->toJSONString();
+}
+
 } // namespace WebCore
 
+namespace WTF {
+
+String LogArgument<WebCore::PeerConnectionBackend::TransceiverState>::toString(const WebCore::PeerConnectionBackend::TransceiverState& transceiverState)
+{
+    return toJSONString(transceiverState);
+}
+
+String LogArgument<WebCore::PeerConnectionBackend::TransceiverStates>::toString(const WebCore::PeerConnectionBackend::TransceiverStates& transceiverStates)
+{
+    return toJSONString(transceiverStates);
+}
+
+}
+
 #endif // ENABLE(WEB_RTC)
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h b/modules/javafx.web/src/main/native/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h
index e9604852a54..a43d0112097 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h
@@ -220,10 +220,10 @@ class PeerConnectionBackend
     void createAnswerSucceeded(String&&);
     void createAnswerFailed(Exception&&);
 
-    void setLocalDescriptionSucceeded(std::optional<DescriptionStates>&&, std::optional<TransceiverStates>&&, std::unique_ptr<RTCSctpTransportBackend>&&);
+    void setLocalDescriptionSucceeded(std::optional<DescriptionStates>&&, std::optional<TransceiverStates>&&, std::unique_ptr<RTCSctpTransportBackend>&&, std::optional<double>);
     void setLocalDescriptionFailed(Exception&&);
 
-    void setRemoteDescriptionSucceeded(std::optional<DescriptionStates>&&, std::optional<TransceiverStates>&&, std::unique_ptr<RTCSctpTransportBackend>&&);
+    void setRemoteDescriptionSucceeded(std::optional<DescriptionStates>&&, std::optional<TransceiverStates>&&, std::unique_ptr<RTCSctpTransportBackend>&&, std::optional<double>);
     void setRemoteDescriptionFailed(Exception&&);
 
     void validateSDP(const String&) const;
@@ -279,7 +279,23 @@ inline PeerConnectionBackend::DescriptionStates PeerConnectionBackend::Descripti
         WTFMove(pendingRemoteDescriptionSdp).isolatedCopy()
     };
 }
-
 } // namespace WebCore
 
+namespace WTF {
+
+template<typename>
+struct LogArgument;
+
+template <>
+struct LogArgument<WebCore::PeerConnectionBackend::TransceiverState> {
+    static String toString(const WebCore::PeerConnectionBackend::TransceiverState&);
+};
+
+template <>
+struct LogArgument<WebCore::PeerConnectionBackend::TransceiverStates> {
+    static String toString(const WebCore::PeerConnectionBackend::TransceiverStates&);
+};
+
+}
+
 #endif // ENABLE(WEB_RTC)
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp b/modules/javafx.web/src/main/native/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp
index c9b5d4060f4..2ddcdf1c015 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp
@@ -1063,16 +1063,14 @@ void RTCPeerConnection::updateTransceiversAfterSuccessfulRemoteDescription()
     updateTransceiverTransports();
 }
 
-void RTCPeerConnection::updateSctpBackend(std::unique_ptr<RTCSctpTransportBackend>&& sctpBackend)
+void RTCPeerConnection::updateSctpBackend(std::unique_ptr<RTCSctpTransportBackend>&& sctpBackend, std::optional<double> maxMessageSize)
 {
     if (!sctpBackend) {
         m_sctpTransport = nullptr;
         return;
     }
-    if (m_sctpTransport && m_sctpTransport->backend() == *sctpBackend) {
-        m_sctpTransport->update();
-        return;
-    }
+
+    if (!m_sctpTransport || m_sctpTransport->backend() != *sctpBackend) {
     RefPtr context = scriptExecutionContext();
     if (!context)
         return;
@@ -1081,6 +1079,9 @@ void RTCPeerConnection::updateSctpBackend(std::unique_ptr<RTCSctpTransportBacken
     if (!dtlsTransport)
         return;
     m_sctpTransport = RTCSctpTransport::create(*context, makeUniqueRefFromNonNullUniquePtr(WTFMove(sctpBackend)), dtlsTransport.releaseNonNull());
+    }
+
+    m_sctpTransport->updateMaxMessageSize(maxMessageSize);
 }
 
 #if !RELEASE_LOG_DISABLED
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/mediastream/RTCPeerConnection.h b/modules/javafx.web/src/main/native/Source/WebCore/Modules/mediastream/RTCPeerConnection.h
index 8992c18d2d9..cbd9c11d4a5 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/mediastream/RTCPeerConnection.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/mediastream/RTCPeerConnection.h
@@ -191,7 +191,7 @@ class RTCPeerConnection final
     void updateDescriptions(PeerConnectionBackend::DescriptionStates&&);
     void updateTransceiversAfterSuccessfulLocalDescription();
     void updateTransceiversAfterSuccessfulRemoteDescription();
-    void updateSctpBackend(std::unique_ptr<RTCSctpTransportBackend>&&);
+    void updateSctpBackend(std::unique_ptr<RTCSctpTransportBackend>&&, std::optional<double>);
 
     void processIceTransportStateChange(RTCIceTransport&);
     void processIceTransportChanges();
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/mediastream/RTCSctpTransport.cpp b/modules/javafx.web/src/main/native/Source/WebCore/Modules/mediastream/RTCSctpTransport.cpp
index bf7745a1c60..eb7f7590af9 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/mediastream/RTCSctpTransport.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/mediastream/RTCSctpTransport.cpp
@@ -75,8 +75,7 @@ void RTCSctpTransport::onStateChanged(RTCSctpTransportState state, std::optional
         if (m_state == RTCSctpTransportState::Closed)
             return;
 
-        if (maxMessageSize)
-            m_maxMessageSize = *maxMessageSize;
+        m_maxMessageSize = maxMessageSize;
         if (maxChannels)
             m_maxChannels = *maxChannels;
 
@@ -87,6 +86,11 @@ void RTCSctpTransport::onStateChanged(RTCSctpTransportState state, std::optional
     });
 }
 
+void RTCSctpTransport::updateMaxMessageSize(std::optional<double> maxMessageSize)
+{
+    m_maxMessageSize = maxMessageSize;
+}
+
 } // namespace WebCore
 
 #endif // ENABLE(WEB_RTC)
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/mediastream/RTCSctpTransport.h b/modules/javafx.web/src/main/native/Source/WebCore/Modules/mediastream/RTCSctpTransport.h
index 76987a83abf..4a8ad6bde51 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/mediastream/RTCSctpTransport.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/mediastream/RTCSctpTransport.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Apple Inc. All rights reserved.
+ * Copyright (C) 2021-2024 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -46,10 +46,10 @@ class RTCSctpTransport final : public RefCounted<RTCSctpTransport>, public Activ
 
     RTCDtlsTransport& transport() { return m_transport.get(); }
     RTCSctpTransportState state() const { return m_state; }
-    double maxMessageSize() const { return m_maxMessageSize; }
+    double maxMessageSize() const { return m_maxMessageSize.value_or(std::numeric_limits<double>::infinity()); }
     std::optional<unsigned short>  maxChannels() const { return m_maxChannels; }
 
-    void update() { }
+    void updateMaxMessageSize(std::optional<double>);
 
     const RTCSctpTransportBackend& backend() const { return m_backend.get(); }
 
@@ -73,7 +73,7 @@ class RTCSctpTransport final : public RefCounted<RTCSctpTransport>, public Activ
     UniqueRef<RTCSctpTransportBackend> m_backend;
     Ref<RTCDtlsTransport> m_transport;
     RTCSctpTransportState m_state { RTCSctpTransportState::Connecting };
-    double m_maxMessageSize { std::numeric_limits<double>::max() };
+    std::optional<double> m_maxMessageSize;
     std::optional<unsigned short> m_maxChannels;
 };
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/mediastream/RTCStatsReport.h b/modules/javafx.web/src/main/native/Source/WebCore/Modules/mediastream/RTCStatsReport.h
index 58f0120f9ca..2c8bc5bd0b3 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/mediastream/RTCStatsReport.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/mediastream/RTCStatsReport.h
@@ -61,7 +61,7 @@ class RTCStatsReport : public RefCounted<RTCStatsReport> {
         Certificate,
     };
     struct Stats {
-        double timestamp;
+        double timestamp { 0 };
         Type type;
         String id;
     };
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp b/modules/javafx.web/src/main/native/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp
index 1b68dfd1859..b8a43717130 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp
@@ -656,6 +656,7 @@ class SctpTransportState {
 public:
     explicit SctpTransportState(rtc::scoped_refptr<webrtc::SctpTransportInterface>&&);
     std::unique_ptr<LibWebRTCSctpTransportBackend> createBackend();
+    std::optional<double> maxMessageSize() const;
 
 private:
     rtc::scoped_refptr<webrtc::SctpTransportInterface> m_transport;
@@ -676,6 +677,11 @@ std::unique_ptr<LibWebRTCSctpTransportBackend> SctpTransportState::createBackend
     return makeUnique<LibWebRTCSctpTransportBackend>(WTFMove(m_transport), m_information.dtls_transport());
 }
 
+std::optional<double> SctpTransportState::maxMessageSize() const
+{
+    return m_information.MaxMessageSize() ? std::make_optional(*m_information.MaxMessageSize()) : std::nullopt;
+}
+
 struct LibWebRTCMediaEndpointTransceiverState {
     String mid;
     Vector<String> receiverStreamIds;
@@ -733,7 +739,7 @@ void LibWebRTCMediaEndpoint::setLocalSessionDescriptionSucceeded()
             });
             return { WTFMove(state.mid), WTFMove(streams), state.firedDirection };
         });
-        protectedThis->m_peerConnectionBackend.setLocalDescriptionSucceeded(WTFMove(descriptions), WTFMove(transceiverStates), sctpState.createBackend());
+        protectedThis->m_peerConnectionBackend.setLocalDescriptionSucceeded(WTFMove(descriptions), WTFMove(transceiverStates), sctpState.createBackend(), sctpState.maxMessageSize());
     });
 }
 
@@ -760,7 +766,7 @@ void LibWebRTCMediaEndpoint::setRemoteSessionDescriptionSucceeded()
             });
             return { WTFMove(state.mid), WTFMove(streams), state.firedDirection };
         });
-        protectedThis->m_peerConnectionBackend.setRemoteDescriptionSucceeded(WTFMove(descriptions), WTFMove(transceiverStates), sctpState.createBackend());
+        protectedThis->m_peerConnectionBackend.setRemoteDescriptionSucceeded(WTFMove(descriptions), WTFMove(transceiverStates), sctpState.createBackend(), sctpState.maxMessageSize());
     });
 }
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/permissions/MainThreadPermissionObserver.cpp b/modules/javafx.web/src/main/native/Source/WebCore/Modules/permissions/MainThreadPermissionObserver.cpp
index 993d808b166..939d8d0a1c7 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/permissions/MainThreadPermissionObserver.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/permissions/MainThreadPermissionObserver.cpp
@@ -34,7 +34,7 @@
 
 namespace WebCore {
 
-MainThreadPermissionObserver::MainThreadPermissionObserver(ThreadSafeWeakPtr<PermissionStatus>&& permissionStatus, ScriptExecutionContextIdentifier contextIdentifier, PermissionState state, PermissionDescriptor descriptor, PermissionQuerySource source, SingleThreadWeakPtr<Page>&& page, ClientOrigin&& origin)
+MainThreadPermissionObserver::MainThreadPermissionObserver(ThreadSafeWeakPtr<PermissionStatus>&& permissionStatus, ScriptExecutionContextIdentifier contextIdentifier, PermissionState state, PermissionDescriptor descriptor, PermissionQuerySource source, WeakPtr<Page>&& page, ClientOrigin&& origin)
     : m_permissionStatus(WTFMove(permissionStatus))
     , m_contextIdentifier(contextIdentifier)
     , m_state(state)
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/permissions/MainThreadPermissionObserver.h b/modules/javafx.web/src/main/native/Source/WebCore/Modules/permissions/MainThreadPermissionObserver.h
index 38cc5d5dcd7..4cf44e17d1e 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/permissions/MainThreadPermissionObserver.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/permissions/MainThreadPermissionObserver.h
@@ -42,7 +42,7 @@ class MainThreadPermissionObserver final : public PermissionObserver {
     WTF_MAKE_NONCOPYABLE(MainThreadPermissionObserver);
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    MainThreadPermissionObserver(ThreadSafeWeakPtr<PermissionStatus>&&, ScriptExecutionContextIdentifier, PermissionState, PermissionDescriptor, PermissionQuerySource, SingleThreadWeakPtr<Page>&&, ClientOrigin&&);
+    MainThreadPermissionObserver(ThreadSafeWeakPtr<PermissionStatus>&&, ScriptExecutionContextIdentifier, PermissionState, PermissionDescriptor, PermissionQuerySource, WeakPtr<Page>&&, ClientOrigin&&);
     ~MainThreadPermissionObserver();
 
 private:
@@ -52,14 +52,14 @@ class MainThreadPermissionObserver final : public PermissionObserver {
     const ClientOrigin& origin() const final { return m_origin; }
     PermissionDescriptor descriptor() const final { return m_descriptor; }
     PermissionQuerySource source() const final { return m_source; }
-    const SingleThreadWeakPtr<Page>& page() const final { return m_page; }
+    const WeakPtr<Page>& page() const final { return m_page; }
 
     ThreadSafeWeakPtr<PermissionStatus> m_permissionStatus;
     ScriptExecutionContextIdentifier m_contextIdentifier;
     PermissionState m_state;
     PermissionDescriptor m_descriptor;
     PermissionQuerySource m_source;
-    SingleThreadWeakPtr<Page> m_page;
+    WeakPtr<Page> m_page;
     ClientOrigin m_origin;
 };
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/permissions/PermissionController.h b/modules/javafx.web/src/main/native/Source/WebCore/Modules/permissions/PermissionController.h
index 871c920a33f..8aedcc95680 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/permissions/PermissionController.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/permissions/PermissionController.h
@@ -47,7 +47,7 @@ class PermissionController : public ThreadSafeRefCounted<PermissionController> {
     WEBCORE_EXPORT static void setSharedController(Ref<PermissionController>&&);
 
     virtual ~PermissionController() = default;
-    virtual void query(ClientOrigin&&, PermissionDescriptor, const SingleThreadWeakPtr<Page>&, PermissionQuerySource, CompletionHandler<void(std::optional<PermissionState>)>&&) = 0;
+    virtual void query(ClientOrigin&&, PermissionDescriptor, const WeakPtr<Page>&, PermissionQuerySource, CompletionHandler<void(std::optional<PermissionState>)>&&) = 0;
     virtual void addObserver(PermissionObserver&) = 0;
     virtual void removeObserver(PermissionObserver&) = 0;
     virtual void permissionChanged(PermissionName, const SecurityOriginData&) = 0;
@@ -60,7 +60,7 @@ class DummyPermissionController final : public PermissionController {
     static Ref<DummyPermissionController> create() { return adoptRef(*new DummyPermissionController); }
 private:
     DummyPermissionController() = default;
-    void query(ClientOrigin&&, PermissionDescriptor, const SingleThreadWeakPtr<Page>&, PermissionQuerySource, CompletionHandler<void(std::optional<PermissionState>)>&& callback) final { callback({ }); }
+    void query(ClientOrigin&&, PermissionDescriptor, const WeakPtr<Page>&, PermissionQuerySource, CompletionHandler<void(std::optional<PermissionState>)>&& callback) final { callback({ }); }
     void addObserver(PermissionObserver&) final { }
     void removeObserver(PermissionObserver&) final { }
     void permissionChanged(PermissionName, const SecurityOriginData&) final { }
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/permissions/PermissionObserver.h b/modules/javafx.web/src/main/native/Source/WebCore/Modules/permissions/PermissionObserver.h
index ee3898165a5..bf15785854c 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/permissions/PermissionObserver.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/permissions/PermissionObserver.h
@@ -46,7 +46,7 @@ class PermissionObserver : public CanMakeWeakPtr<PermissionObserver> {
     virtual const ClientOrigin& origin() const = 0;
     virtual PermissionDescriptor descriptor() const = 0;
     virtual PermissionQuerySource source() const = 0;
-    virtual const SingleThreadWeakPtr<Page>& page() const = 0;
+    virtual const WeakPtr<Page>& page() const = 0;
 };
 
 } // namespace WebCore
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/permissions/PermissionStatus.cpp b/modules/javafx.web/src/main/native/Source/WebCore/Modules/permissions/PermissionStatus.cpp
index e6e99ded275..8da274acb18 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/permissions/PermissionStatus.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/permissions/PermissionStatus.cpp
@@ -54,14 +54,14 @@ static HashMap<MainThreadPermissionObserverIdentifier, std::unique_ptr<MainThrea
     return map;
 }
 
-Ref<PermissionStatus> PermissionStatus::create(ScriptExecutionContext& context, PermissionState state, PermissionDescriptor descriptor, PermissionQuerySource source, SingleThreadWeakPtr<Page>&& page)
+Ref<PermissionStatus> PermissionStatus::create(ScriptExecutionContext& context, PermissionState state, PermissionDescriptor descriptor, PermissionQuerySource source, WeakPtr<Page>&& page)
 {
     auto status = adoptRef(*new PermissionStatus(context, state, descriptor, source, WTFMove(page)));
     status->suspendIfNeeded();
     return status;
 }
 
-PermissionStatus::PermissionStatus(ScriptExecutionContext& context, PermissionState state, PermissionDescriptor descriptor, PermissionQuerySource source, SingleThreadWeakPtr<Page>&& page)
+PermissionStatus::PermissionStatus(ScriptExecutionContext& context, PermissionState state, PermissionDescriptor descriptor, PermissionQuerySource source, WeakPtr<Page>&& page)
     : ActiveDOMObject(&context)
     , m_state(state)
     , m_descriptor(descriptor)
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/permissions/PermissionStatus.h b/modules/javafx.web/src/main/native/Source/WebCore/Modules/permissions/PermissionStatus.h
index 11d9197eb65..dac934c8b72 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/permissions/PermissionStatus.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/permissions/PermissionStatus.h
@@ -42,7 +42,7 @@ class ScriptExecutionContext;
 class PermissionStatus final : public ActiveDOMObject, public ThreadSafeRefCountedAndCanMakeThreadSafeWeakPtr<PermissionStatus>, public EventTarget  {
     WTF_MAKE_ISO_ALLOCATED(PermissionStatus);
 public:
-    static Ref<PermissionStatus> create(ScriptExecutionContext&, PermissionState, PermissionDescriptor, PermissionQuerySource, SingleThreadWeakPtr<Page>&&);
+    static Ref<PermissionStatus> create(ScriptExecutionContext&, PermissionState, PermissionDescriptor, PermissionQuerySource, WeakPtr<Page>&&);
     ~PermissionStatus();
 
     PermissionState state() const { return m_state; }
@@ -54,7 +54,7 @@ class PermissionStatus final : public ActiveDOMObject, public ThreadSafeRefCount
     using ThreadSafeRefCountedAndCanMakeThreadSafeWeakPtr::deref;
 
 private:
-    PermissionStatus(ScriptExecutionContext&, PermissionState, PermissionDescriptor, PermissionQuerySource, SingleThreadWeakPtr<Page>&&);
+    PermissionStatus(ScriptExecutionContext&, PermissionState, PermissionDescriptor, PermissionQuerySource, WeakPtr<Page>&&);
 
     // ActiveDOMObject
     const char* activeDOMObjectName() const final;
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioBuffer.cpp b/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioBuffer.cpp
index ffcd79b0396..fd26cb4318e 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioBuffer.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioBuffer.cpp
@@ -144,6 +144,19 @@ AudioBuffer::AudioBuffer(AudioBus& bus)
     m_channelWrappers = FixedVector<JSValueInWrappedObject> { m_channels.size() };
 }
 
+// FIXME: We don't currently implement "acquire the content" [1] and
+// AudioBuffer::getChannelData() correctly. As a result, the audio thread
+// may be reading an array buffer that the JS can detach. To guard against
+// this, we mark the array buffers as non-detachable as soon as their content
+// has been acquired.
+// [1] https://www.w3.org/TR/webaudio/#acquire-the-content
+void AudioBuffer::markBuffersAsNonDetachable()
+{
+    Locker locker { m_channelsLock };
+    for (auto& channel : m_channels)
+        channel->setDetachable(false);
+}
+
 void AudioBuffer::invalidate()
 {
     releaseMemory();
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioBuffer.h b/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioBuffer.h
index ce0246ced77..cedd79a3f8a 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioBuffer.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioBuffer.h
@@ -59,6 +59,8 @@ class AudioBuffer : public RefCounted<AudioBuffer> {
     size_t length() const { return hasDetachedChannelBuffer() ? 0 : m_originalLength; }
     double duration() const { return length() / static_cast<double>(sampleRate()); }
 
+    void markBuffersAsNonDetachable();
+
     // Channel data access
     unsigned numberOfChannels() const { return m_channels.size(); }
     ExceptionOr<JSC::JSValue> getChannelData(JSDOMGlobalObject&, unsigned channelIndex);
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioBufferSourceNode.cpp b/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioBufferSourceNode.cpp
index 66e716a38f8..12b599beda7 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioBufferSourceNode.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioBufferSourceNode.cpp
@@ -328,9 +328,16 @@ bool AudioBufferSourceNode::renderFromBuffer(AudioBus* bus, unsigned destination
         virtualReadIndex = readIndex;
     } else if (!pitchRate) {
         unsigned readIndex = static_cast<unsigned>(virtualReadIndex);
+        int deltaFrames = static_cast<int>(virtualDeltaFrames);
+        maxFrame = static_cast<unsigned>(virtualMaxFrame);
+
+        if (readIndex >= maxFrame)
+            readIndex -= deltaFrames;
 
         for (unsigned i = 0; i < numberOfChannels; ++i)
             std::fill_n(destinationChannels[i] + writeIndex, framesToProcess, sourceChannels[i][readIndex]);
+
+        virtualReadIndex = readIndex;
     } else if (reverse) {
         unsigned maxFrame = static_cast<unsigned>(virtualMaxFrame);
         unsigned minFrame = static_cast<unsigned>(floorf(virtualMinFrame));
@@ -343,6 +350,12 @@ bool AudioBufferSourceNode::renderFromBuffer(AudioBus* bus, unsigned destination
             if (readIndex2 >= maxFrame)
                 readIndex2 = m_isLooping ? minFrame : readIndex;
 
+            // Final sanity check on buffer access.
+            // FIXME: as an optimization, try to get rid of this inner-loop check and
+            // put assertions and guards before the loop.
+            if (readIndex >= bufferLength || readIndex2 >= bufferLength)
+                break;
+
             // Linear interpolation.
             for (unsigned i = 0; i < numberOfChannels; ++i) {
                 float* destination = destinationChannels[i];
@@ -409,6 +422,15 @@ bool AudioBufferSourceNode::renderFromBuffer(AudioBus* bus, unsigned destination
     return true;
 }
 
+void AudioBufferSourceNode::acquireBufferContent()
+{
+    ASSERT(isMainThread());
+
+    // FIXME: We should implement https://www.w3.org/TR/webaudio/#acquire-the-content.
+    if (m_buffer)
+        m_buffer->markBuffersAsNonDetachable();
+}
+
 ExceptionOr<void> AudioBufferSourceNode::setBufferForBindings(RefPtr<AudioBuffer>&& buffer)
 {
     ASSERT(isMainThread());
@@ -446,6 +468,9 @@ ExceptionOr<void> AudioBufferSourceNode::setBufferForBindings(RefPtr<AudioBuffer
     if (m_isGrain)
         adjustGrainParameters();
 
+    if (isPlayingOrScheduled())
+        acquireBufferContent();
+
     return { };
 }
 
@@ -513,6 +538,7 @@ ExceptionOr<void> AudioBufferSourceNode::startPlaying(double when, double grainO
 
     adjustGrainParameters();
 
+    acquireBufferContent();
     m_playbackState = SCHEDULED_STATE;
 
     return { };
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioBufferSourceNode.h b/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioBufferSourceNode.h
index 79573a03d40..0561402748c 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioBufferSourceNode.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioBufferSourceNode.h
@@ -85,6 +85,8 @@ class AudioBufferSourceNode final : public AudioScheduledSourceNode {
 private:
     AudioBufferSourceNode(BaseAudioContext&);
 
+    void acquireBufferContent() WTF_REQUIRES_LOCK(m_processLock);
+
     double tailTime() const final { return 0; }
     double latencyTime() const final { return 0; }
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioDestinationNode.cpp b/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioDestinationNode.cpp
index 628ccb66017..ce78c1b8957 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioDestinationNode.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioDestinationNode.cpp
@@ -87,8 +87,10 @@ void AudioDestinationNode::renderQuantum(AudioBus* destinationBus, size_t number
     context().handlePreRenderTasks(outputPosition);
 
     RefPtr<AudioWorkletGlobalScope> workletGlobalScope;
-    if (RefPtr audioWorkletProxy = context().audioWorklet().proxy())
-        workletGlobalScope = audioWorkletProxy->workletThread().globalScope();
+    if (RefPtr audioWorkletProxy = context().audioWorklet().proxy()) {
+        if (Ref workletThread = audioWorkletProxy->workletThread(); workletThread->thread() == &Thread::current())
+            workletGlobalScope = workletThread->globalScope();
+    }
     if (workletGlobalScope)
         workletGlobalScope->handlePreRenderTasks();
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioNode.cpp b/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioNode.cpp
index 9588bdc6bfa..f7e6848ef53 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioNode.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioNode.cpp
@@ -578,6 +578,11 @@ void AudioNode::incrementConnectionCount()
     // In this case, we need to re-enable.
     enableOutputsIfNecessary();
 
+    {
+        Locker locker { context().graphLock() };
+        unmarkNodeForDeletionIfNecessary();
+    }
+
 #if DEBUG_AUDIONODE_REFERENCES
     fprintf(stderr, "%p: %d: AudioNode::incrementConnectionCount() %d %d\n", this, nodeType(), m_normalRefCount, m_connectionRefCount);
 #endif
@@ -640,10 +645,27 @@ void AudioNode::markNodeForDeletionIfNecessary()
     m_isMarkedForDeletion = true;
 }
 
+void AudioNode::unmarkNodeForDeletionIfNecessary()
+{
+    ASSERT(context().isGraphOwner());
+    if (!m_isMarkedForDeletion)
+        return;
+    if (!m_connectionRefCount && !m_normalRefCount)
+        return;
+
+    m_isMarkedForDeletion = false;
+    context().unmarkForDeletion(*this);
+}
+
 void AudioNode::ref()
 {
     ++m_normalRefCount;
 
+    {
+        Locker locker { context().graphLock() };
+        const_cast<AudioNode*>(this)->unmarkNodeForDeletionIfNecessary();
+    }
+
 #if DEBUG_AUDIONODE_REFERENCES
     fprintf(stderr, "%p: %d: AudioNode::ref() %d %d\n", this, nodeType(), m_normalRefCount, m_connectionRefCount);
 #endif
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioNode.h b/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioNode.h
index 6119988cc32..3c9efc17ef6 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioNode.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioNode.h
@@ -206,6 +206,7 @@ class AudioNode
     void addOutput(unsigned numberOfChannels);
 
     void markNodeForDeletionIfNecessary();
+    void unmarkNodeForDeletionIfNecessary();
     void derefWithLock();
 
     struct DefaultAudioNodeOptions {
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioWorkletGlobalScope.cpp b/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioWorkletGlobalScope.cpp
index fcc4edcc7e5..bf1cb86c072 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioWorkletGlobalScope.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioWorkletGlobalScope.cpp
@@ -188,9 +188,8 @@ AudioWorkletThread& AudioWorkletGlobalScope::thread() const
 void AudioWorkletGlobalScope::handlePreRenderTasks()
 {
     // This makes sure that we only drain the MicroTask queue after each render quantum.
-    // It is only safe to grab the lock if we are on the context thread. We might get called on
-    // another thread if audio rendering started before the audio worklet got started.
-    if (isContextThread())
+    // It is only safe to grab the lock if we are on the context thread.
+    RELEASE_ASSERT(isContextThread());
         m_delayMicrotaskDrainingDuringRendering = script()->vm().drainMicrotaskDelayScope();
 }
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioWorkletMessagingProxy.cpp b/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioWorkletMessagingProxy.cpp
index f206a9022e1..dd7c154f6d7 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioWorkletMessagingProxy.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioWorkletMessagingProxy.cpp
@@ -60,6 +60,7 @@ static WorkletParameters generateWorkletParameters(AudioWorklet& worklet)
         document->settingsValues(),
         document->referrerPolicy(),
         worklet.audioContext() ? !worklet.audioContext()->isOfflineContext() : false,
+        document->advancedPrivacyProtections(),
         document->noiseInjectionHashSalt()
     };
 }
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/BaseAudioContext.cpp b/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/BaseAudioContext.cpp
index 94034b17c59..89cd3db5344 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/BaseAudioContext.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/BaseAudioContext.cpp
@@ -708,6 +708,15 @@ void BaseAudioContext::markForDeletion(AudioNode& node)
     removeAutomaticPullNode(node);
 }
 
+void BaseAudioContext::unmarkForDeletion(AudioNode& node)
+{
+    ASSERT(isGraphOwner());
+    ASSERT_WITH_MESSAGE(node.nodeType() != AudioNode::NodeTypeDestination, "Destination node is owned by the BaseAudioContext");
+
+    m_nodesToDelete.removeFirst(&node);
+    m_nodesMarkedForDeletion.removeFirst(&node);
+}
+
 void BaseAudioContext::scheduleNodeDeletion()
 {
     bool isGood = m_isInitialized && isGraphOwner();
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/BaseAudioContext.h b/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/BaseAudioContext.h
index b77ec48f4c1..eb614afc6da 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/BaseAudioContext.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/BaseAudioContext.h
@@ -161,6 +161,10 @@ class BaseAudioContext
     // We schedule deletion of all marked nodes at the end of each realtime render quantum.
     void markForDeletion(AudioNode&);
     void deleteMarkedNodes();
+    // In some cases, a node marked for deletion may get ref'd. We need to make sure we no
+    // longer mark the node for deletion or it may get deleted while someone is holding a
+    // Ref / RefPtr to it.
+    void unmarkForDeletion(AudioNode&);
 
     void addTailProcessingNode(AudioNode&);
     void removeTailProcessingNode(AudioNode&);
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/webcodecs/WebCodecsVideoFrameAlgorithms.cpp b/modules/javafx.web/src/main/native/Source/WebCore/Modules/webcodecs/WebCodecsVideoFrameAlgorithms.cpp
index ea510f13838..58df88dd587 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/webcodecs/WebCodecsVideoFrameAlgorithms.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/webcodecs/WebCodecsVideoFrameAlgorithms.cpp
@@ -111,6 +111,8 @@ ExceptionOr<DOMRectInit> parseVisibleRect(const DOMRectInit& defaultRect, const
 {
     auto sourceRect = defaultRect;
     if (overrideRect) {
+        if (!std::isfinite(overrideRect->width) || !std::isfinite(overrideRect->height) || !std::isfinite(overrideRect->x) || !std::isfinite(overrideRect->y))
+            return Exception { ExceptionCode::TypeError, "overrideRect is not valid"_s };
         if (overrideRect->width <= 0 || overrideRect->height <= 0 || overrideRect->x < 0 || overrideRect->y < 0)
             return Exception { ExceptionCode::TypeError, "overrideRect is not valid"_s };
         if (overrideRect->x + overrideRect->width > codedWidth)
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/PAL/pal/text/TextCodecLatin1.cpp b/modules/javafx.web/src/main/native/Source/WebCore/PAL/pal/text/TextCodecLatin1.cpp
index 5c5d845e7a8..f01cd286a57 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/PAL/pal/text/TextCodecLatin1.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/PAL/pal/text/TextCodecLatin1.cpp
@@ -97,11 +97,16 @@ void TextCodecLatin1::registerCodecs(TextCodecRegistrar registrar)
     });
 }
 
-String TextCodecLatin1::decode(const char* bytes, size_t length, bool, bool, bool&)
+String TextCodecLatin1::decode(const char* bytes, size_t length, bool, bool, bool& sawException)
 {
     LChar* characters;
     if (!length)
         return emptyString();
+    if (UNLIKELY(length > std::numeric_limits<unsigned>::max())) {
+        ASSERT_NOT_REACHED();
+        sawException = true;
+        return emptyString();
+    }
     String result = String::createUninitialized(length, characters);
 
     const uint8_t* source = reinterpret_cast<const uint8_t*>(bytes);
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/PAL/pal/text/TextCodecUTF8.cpp b/modules/javafx.web/src/main/native/Source/WebCore/PAL/pal/text/TextCodecUTF8.cpp
index 6b5c85ce374..41d7537b381 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/PAL/pal/text/TextCodecUTF8.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/PAL/pal/text/TextCodecUTF8.cpp
@@ -301,7 +301,12 @@ String TextCodecUTF8::decode(const char* bytes, size_t length, bool flush, bool
     // Each input byte might turn into a character.
     // That includes all bytes in the partial-sequence buffer because
     // each byte in an invalid sequence will turn into a replacement character.
-    StringBuffer<LChar> buffer(m_partialSequenceSize + length);
+    size_t bufferSize = length + m_partialSequenceSize;
+    if (bufferSize > std::numeric_limits<unsigned>::max()) {
+        sawError = true;
+        return { };
+    }
+    StringBuffer<LChar> buffer(bufferSize);
 
     const uint8_t* source = reinterpret_cast<const uint8_t*>(bytes);
     const uint8_t* end = source + length;
@@ -383,7 +388,7 @@ String TextCodecUTF8::decode(const char* bytes, size_t length, bool flush, bool
     return String::adopt(WTFMove(buffer));
 
 upConvertTo16Bit:
-    StringBuffer<UChar> buffer16(m_partialSequenceSize + length);
+    StringBuffer<UChar> buffer16(bufferSize);
 
     UChar* destination16 = buffer16.characters();
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Scripts/SettingsTemplates/InternalSettingsGenerated.h.erb b/modules/javafx.web/src/main/native/Source/WebCore/Scripts/SettingsTemplates/InternalSettingsGenerated.h.erb
index 7bed1a22806..ff490b7032b 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Scripts/SettingsTemplates/InternalSettingsGenerated.h.erb
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Scripts/SettingsTemplates/InternalSettingsGenerated.h.erb
@@ -49,7 +49,7 @@ public:
 <%- end -%>
 
 private:
-    SingleThreadWeakPtr<Page> m_page;
+    WeakPtr<Page> m_page;
 
 <%- for @setting in @allSettingsSet.settings do -%>
 <%- if @setting.excludeFromInternalSettings == false and @setting.idlType -%>
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/accessibility/AccessibilityListBoxOption.cpp b/modules/javafx.web/src/main/native/Source/WebCore/accessibility/AccessibilityListBoxOption.cpp
index 17c6607329b..abbb0e7997c 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/accessibility/AccessibilityListBoxOption.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/accessibility/AccessibilityListBoxOption.cpp
@@ -89,24 +89,20 @@ bool AccessibilityListBoxOption::isSelectedOptionActive() const
 
 LayoutRect AccessibilityListBoxOption::elementRect() const
 {
-    LayoutRect rect;
-    if (!m_optionElement)
-        return rect;
-
-    HTMLSelectElement* listBoxParentNode = listBoxOptionParentNode();
-    if (!listBoxParentNode)
-        return rect;
-
-    RenderElement* listBoxRenderer = listBoxParentNode->renderer();
-    if (!listBoxRenderer)
-        return rect;
+    auto* optionParent = listBoxOptionParentNode();
+    CheckedPtr parentRenderer = optionParent ? dynamicDowncast<RenderListBox>(optionParent->renderer()) : nullptr;
+    if (!parentRenderer)
+        return { };
 
-    LayoutRect parentRect = listBoxRenderer->document().axObjectCache()->getOrCreate(listBoxRenderer)->boundingBoxRect();
+    auto* cache = parentRenderer->document().axObjectCache();
+    if (RefPtr axObject = cache ? cache->getOrCreate(parentRenderer.get()) : nullptr) {
     int index = listBoxOptionIndex();
-    if (index != -1)
-        rect = downcast<RenderListBox>(*listBoxRenderer).itemBoundingBoxRect(parentRect.location(), index);
-
-    return rect;
+        if (index != -1) {
+            auto parentRect = axObject->boundingBoxRect();
+            return parentRenderer->itemBoundingBoxRect(parentRect.location(), index);
+        }
+    }
+    return { };
 }
 
 bool AccessibilityListBoxOption::computeAccessibilityIsIgnored() const
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/accessibility/AccessibilityObject.cpp b/modules/javafx.web/src/main/native/Source/WebCore/accessibility/AccessibilityObject.cpp
index b924d899326..b51fbbd7128 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/accessibility/AccessibilityObject.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/accessibility/AccessibilityObject.cpp
@@ -2151,22 +2151,16 @@ void AccessibilityObject::clearChildren()
     m_childrenInitialized = false;
 }
 
-AccessibilityObject* AccessibilityObject::anchorElementForNode(Node* node)
+AccessibilityObject* AccessibilityObject::anchorElementForNode(Node& node)
 {
-    RenderObject* obj = node->renderer();
-    if (!obj)
-        return nullptr;
-
-    RefPtr<AccessibilityObject> axObj = obj->document().axObjectCache()->getOrCreate(obj);
-    Element* anchor = axObj->anchorElement();
-    if (!anchor)
-        return nullptr;
-
-    RenderObject* anchorRenderer = anchor->renderer();
-    if (!anchorRenderer)
+    CheckedPtr renderer = node.renderer();
+    if (!renderer)
         return nullptr;
 
-    return anchorRenderer->document().axObjectCache()->getOrCreate(anchorRenderer);
+    WeakPtr cache = renderer->document().axObjectCache();
+    RefPtr axObject = cache ? cache->getOrCreate(renderer.get()) : nullptr;
+    auto* anchor = axObject ? axObject->anchorElement() : nullptr;
+    return anchor ? cache->getOrCreate(anchor->renderer()) : nullptr;
 }
 
 AccessibilityObject* AccessibilityObject::headingElementForNode(Node* node)
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/accessibility/AccessibilityObject.h b/modules/javafx.web/src/main/native/Source/WebCore/accessibility/AccessibilityObject.h
index 77f17010c49..af14d7e478c 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/accessibility/AccessibilityObject.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/accessibility/AccessibilityObject.h
@@ -424,7 +424,7 @@ class AccessibilityObject : public AXCoreObject, public CanMakeWeakPtr<Accessibi
 
     AXObjectCache* axObjectCache() const override;
 
-    static AccessibilityObject* anchorElementForNode(Node*);
+    static AccessibilityObject* anchorElementForNode(Node&);
     static AccessibilityObject* headingElementForNode(Node*);
     virtual Element* anchorElement() const { return nullptr; }
     virtual RefPtr<Element> popoverTargetElement() const { return nullptr; }
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/accessibility/atspi/AccessibilityRootAtspi.h b/modules/javafx.web/src/main/native/Source/WebCore/accessibility/atspi/AccessibilityRootAtspi.h
index 5a60f3b987d..e2fb789df8c 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/accessibility/atspi/AccessibilityRootAtspi.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/accessibility/atspi/AccessibilityRootAtspi.h
@@ -64,7 +64,7 @@ class AccessibilityRootAtspi final : public RefCounted<AccessibilityRootAtspi>,
     static GDBusInterfaceVTable s_socketFunctions;
     static GDBusInterfaceVTable s_componentFunctions;
 
-    SingleThreadWeakPtr<Page> m_page;
+    WeakPtr<Page> m_page;
     String m_path;
     String m_parentUniqueName;
     String m_parentPath;
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp b/modules/javafx.web/src/main/native/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp
index 6047240d898..3740526b7ae 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp
@@ -393,7 +393,10 @@ Vector<AXIsolatedTree::NodeChange> AXIsolatedTree::resolveAppends()
     double counter = 0;
     Vector<NodeChange> resolvedAppends;
             resolvedAppends.reserveInitialCapacity(m_unresolvedPendingAppends.size());
-            for (const auto& unresolvedAppend : m_unresolvedPendingAppends) {
+    // The process of resolving appends can add more IDs to m_unresolvedPendingAppends as we iterate over it, so
+    // iterate over an exchanged map instead. Any late-appended IDs will get picked up in the next cycle.
+    auto unresolvedPendingAppends = std::exchange(m_unresolvedPendingAppends, { });
+    for (const auto& unresolvedAppend : unresolvedPendingAppends) {
         if (m_replacingTree) {
             ++counter;
             if (MonotonicTime::now() - lastFeedbackTime > CreationFeedbackInterval) {
@@ -408,7 +411,6 @@ Vector<AXIsolatedTree::NodeChange> AXIsolatedTree::resolveAppends()
                 }
             }
     resolvedAppends.shrinkToFit();
-            m_unresolvedPendingAppends.clear();
 
     if (m_replacingTree)
         reportCreationProgress(*cache, 100);
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/bindings/js/SerializedScriptValue.cpp b/modules/javafx.web/src/main/native/Source/WebCore/bindings/js/SerializedScriptValue.cpp
index dc800e75691..ef90dcbff91 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/bindings/js/SerializedScriptValue.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/bindings/js/SerializedScriptValue.cpp
@@ -106,6 +106,7 @@
 #include <wtf/DataLog.h>
 #include <wtf/MainThread.h>
 #include <wtf/RunLoop.h>
+#include <wtf/StackCheck.h>
 #include <wtf/Vector.h>
 #include <wtf/threads/BinarySemaphore.h>
 
@@ -944,6 +945,10 @@ class CloneBase {
 #else
     ALWAYS_INLINE void appendObjectPoolTag(SerializationTag) { }
 #endif
+    bool isSafeToRecurse()
+    {
+        return m_stackCheck.isSafeToRecurse();
+    }
 
     JSGlobalObject* const m_lexicalGlobalObject;
     bool m_failed;
@@ -952,6 +957,7 @@ class CloneBase {
 #if ASSERT_ENABLED
     Vector<SerializationTag> m_objectPoolTags;
 #endif
+    StackCheck m_stackCheck;
 };
 
 #if ENABLE(WEB_CRYPTO)
@@ -3650,6 +3656,8 @@ class CloneDeserializer : public CloneBase {
     template <typename LengthType>
     bool readArrayBufferViewImpl(VM& vm, JSValue& arrayBufferView)
     {
+        if (!isSafeToRecurse())
+            return false;
         ArrayBufferViewSubtag arrayBufferViewSubtag;
         if (!readArrayBufferViewSubtag(arrayBufferViewSubtag))
             return false;
@@ -3729,6 +3737,8 @@ class CloneDeserializer : public CloneBase {
 
     bool readArrayBufferView(VM& vm, JSValue& arrayBufferView)
     {
+        if (!isSafeToRecurse())
+            return false;
         if (m_majorVersion < 10)
             return readArrayBufferViewImpl<uint32_t>(vm, arrayBufferView);
         return readArrayBufferViewImpl<uint64_t>(vm, arrayBufferView);
@@ -4476,7 +4486,8 @@ class CloneDeserializer : public CloneBase {
             return JSValue();
 
         Vector<RTCCertificate::DtlsFingerprint> fingerprints;
-        fingerprints.reserveInitialCapacity(size);
+        if (!fingerprints.tryReserveInitialCapacity(size))
+            return JSValue();
         for (unsigned i = 0; i < size; i++) {
             CachedStringRef algorithm;
             if (!readStringData(algorithm))
@@ -4752,6 +4763,8 @@ class CloneDeserializer : public CloneBase {
 
     JSValue readTerminal()
     {
+        if (!isSafeToRecurse())
+            return JSValue();
         SerializationTag tag = readTag();
         if (!isTypeExposedToGlobalObject(*m_globalObject, tag)) {
             SERIALIZE_TRACE("FAIL deserialize");
@@ -4878,11 +4891,14 @@ class CloneDeserializer : public CloneBase {
                     return JSValue();
             }
 
-            if (length && (IntSize(width, height).area() * 4) != length) {
+            if (length) {
+                auto area = IntSize(width, height).area<RecordOverflow>() * 4;
+                if (area.hasOverflowed() || area.value() != length) {
                 SERIALIZE_TRACE("FAIL deserialize");
                 fail();
                 return JSValue();
             }
+            }
 
             if (!m_isDOMGlobalObject)
                 return jsNull();
@@ -4947,7 +4963,8 @@ class CloneDeserializer : public CloneBase {
             if (!readStringData(flags))
                 return JSValue();
             auto reFlags = Yarr::parseFlags(flags->string());
-            ASSERT(reFlags.has_value());
+            if (!reFlags.has_value())
+                return JSValue();
             VM& vm = m_lexicalGlobalObject->vm();
             RegExp* regExp = RegExp::create(vm, pattern->string(), reFlags.value());
             return RegExpObject::create(vm, m_globalObject->regExpStructure(), regExp);
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/css/ComputedStyleExtractor.cpp b/modules/javafx.web/src/main/native/Source/WebCore/css/ComputedStyleExtractor.cpp
index 0b31c0ef412..59be00334b4 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/css/ComputedStyleExtractor.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/css/ComputedStyleExtractor.cpp
@@ -369,6 +369,10 @@ static Ref<CSSValue> fontSizeAdjustFromStyle(const RenderStyle& style)
 
     auto metric = fontSizeAdjust.metric;
     auto value = fontSizeAdjust.isFromFont() ? fontSizeAdjust.resolve(style.computedFontSize(), style.metricsOfPrimaryFont()) : fontSizeAdjust.value.asOptional();
+
+    if (!value)
+        return CSSPrimitiveValue::create(CSSValueNone);
+
     if (metric == FontSizeAdjust::Metric::ExHeight)
         return CSSPrimitiveValue::create(*value);
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/css/FontFace.cpp b/modules/javafx.web/src/main/native/Source/WebCore/css/FontFace.cpp
index 6eee7ed8598..4c29794d6cf 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/css/FontFace.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/css/FontFace.cpp
@@ -62,6 +62,11 @@ Ref<FontFace> FontFace::create(ScriptExecutionContext& context, const String& fa
     auto result = adoptRef(*new FontFace(*context.cssFontSelector()));
     result->suspendIfNeeded();
 
+#if COMPILER(GCC) && CPU(ARM64)
+    // FIXME: Workaround for GCC bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115033
+    // that is related to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115135 as well.
+    volatile
+#endif
     bool dataRequiresAsynchronousLoading = true;
 
     auto setFamilyResult = result->setFamily(context, family);
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/css/ShorthandSerializer.cpp b/modules/javafx.web/src/main/native/Source/WebCore/css/ShorthandSerializer.cpp
index 9fc5487f5c7..c495fdba01a 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/css/ShorthandSerializer.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/css/ShorthandSerializer.cpp
@@ -1168,16 +1168,15 @@ String ShorthandSerializer::serializeGridTemplate() const
         return hasAtLeastOneTrackSize;
     };
 
-    // For the rows we need to return early if the value of grid-template-rows is none because otherwise
-    // we will iteratively build up that portion of the shorthand and check to see if the value is a valid
-    // <track-size> at the appropriate position in the shorthand. For the columns we must check the entire
-    // value of grid-template-columns beforehand because we append the value as a whole to the shorthand
-    if (isLonghandValueNone(rowsIndex) || (!isLonghandValueNone(columnsIndex) && !isValidExplicitTrackList(longhandValue(columnsIndex))))
+    Ref rowTrackSizes = longhandValue(rowsIndex);
+
+    // Make sure the longhands can be expressed in this version of the shorthand.
+    if (!rowTrackSizes->isValueList() || (!isLonghandValueNone(columnsIndex) && !isValidExplicitTrackList(longhandValue(columnsIndex))))
         return String();
 
     StringBuilder result;
     unsigned row = 0;
-    for (auto& currentValue : downcast<CSSValueList>(longhandValue(rowsIndex))) {
+    for (auto& currentValue : downcast<CSSValueList>(rowTrackSizes).get()) {
         if (!result.isEmpty())
             result.append(' ');
         if (auto lineNames = dynamicDowncast<CSSGridLineNamesValue>(currentValue))
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/dom/Document.cpp b/modules/javafx.web/src/main/native/Source/WebCore/dom/Document.cpp
index 855a4035791..2951e672911 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/dom/Document.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/dom/Document.cpp
@@ -10354,13 +10354,18 @@ void Document::resetObservationSizeForContainIntrinsicSize(Element& target)
 
 NoiseInjectionPolicy Document::noiseInjectionPolicy() const
 {
-    if (RefPtr loader = topDocument().loader()) {
-        if (loader->advancedPrivacyProtections().contains(AdvancedPrivacyProtections::FingerprintingProtections))
+    if (advancedPrivacyProtections().contains(AdvancedPrivacyProtections::FingerprintingProtections))
             return NoiseInjectionPolicy::Minimal;
-    }
     return NoiseInjectionPolicy::None;
 }
 
+OptionSet<AdvancedPrivacyProtections> Document::advancedPrivacyProtections() const
+{
+    if (RefPtr loader = topDocument().loader())
+        return loader->advancedPrivacyProtections();
+    return { };
+}
+
 std::optional<uint64_t> Document::noiseInjectionHashSalt() const
 {
     if (!page() || noiseInjectionPolicy() == NoiseInjectionPolicy::None)
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/dom/Document.h b/modules/javafx.web/src/main/native/Source/WebCore/dom/Document.h
index 4cb9e16db56..362285f4752 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/dom/Document.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/dom/Document.h
@@ -1388,6 +1388,8 @@ class Document
     WEBCORE_EXPORT void exitPointerLock();
 #endif
 
+    OptionSet<AdvancedPrivacyProtections> advancedPrivacyProtections() const final;
+
     std::optional<uint64_t> noiseInjectionHashSalt() const final;
     NoiseInjectionPolicy noiseInjectionPolicy() const;
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/dom/Element.cpp b/modules/javafx.web/src/main/native/Source/WebCore/dom/Element.cpp
index f489fe389e1..6a9617179be 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/dom/Element.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/dom/Element.cpp
@@ -1047,7 +1047,7 @@ inline ScrollAlignment toScrollAlignmentForBlockDirection(std::optional<ScrollLo
     }
 }
 
-static std::optional<std::pair<CheckedRef<RenderElement>, LayoutRect>> listBoxElementScrollIntoView(const Element& element)
+static std::optional<std::pair<SingleThreadWeakPtr<RenderElement>, LayoutRect>> listBoxElementScrollIntoView(const Element& element)
 {
     auto owningSelectElement = [](const Element& element) -> HTMLSelectElement* {
         if (auto* optionElement = dynamicDowncast<HTMLOptionElement>(element))
@@ -1074,7 +1074,7 @@ static std::optional<std::pair<CheckedRef<RenderElement>, LayoutRect>> listBoxEl
         itemIndex = 0;
 
     auto itemLocalRect = renderListBox->itemBoundingBoxRect({ }, itemIndex);
-    return std::pair<CheckedRef<RenderElement>, LayoutRect> { renderListBox.releaseNonNull(), itemLocalRect };
+    return std::pair<SingleThreadWeakPtr<RenderElement>, LayoutRect> { renderListBox.releaseNonNull(), itemLocalRect };
 }
 
 void Element::scrollIntoView(std::optional<std::variant<bool, ScrollIntoViewOptions>>&& arg)
@@ -1084,7 +1084,7 @@ void Element::scrollIntoView(std::optional<std::variant<bool, ScrollIntoViewOpti
 
     document->updateLayoutIgnorePendingStylesheets(LayoutOptions::UpdateCompositingLayers);
 
-    CheckedPtr<RenderElement> renderer;
+    SingleThreadWeakPtr<RenderElement> renderer;
     bool insideFixed = false;
     LayoutRect absoluteBounds;
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/dom/EmptyScriptExecutionContext.h b/modules/javafx.web/src/main/native/Source/WebCore/dom/EmptyScriptExecutionContext.h
index 057c3e1f67e..4272548d425 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/dom/EmptyScriptExecutionContext.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/dom/EmptyScriptExecutionContext.h
@@ -25,6 +25,7 @@
 
 #pragma once
 
+#include "AdvancedPrivacyProtections.h"
 #include "EventLoop.h"
 #include "Microtasks.h"
 #include "ReferrerPolicy.h"
@@ -70,6 +71,7 @@ class EmptyScriptExecutionContext final : public RefCounted<EmptyScriptExecution
 
     SecurityOrigin& topOrigin() const final { return m_origin.get(); };
 
+    OptionSet<AdvancedPrivacyProtections> advancedPrivacyProtections() const final { return { }; }
     std::optional<uint64_t> noiseInjectionHashSalt() const { return std::nullopt; }
 
     void postTask(Task&&) final { ASSERT_NOT_REACHED(); }
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/dom/ScriptElement.cpp b/modules/javafx.web/src/main/native/Source/WebCore/dom/ScriptElement.cpp
index 69460be1f35..0349476ac27 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/dom/ScriptElement.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/dom/ScriptElement.cpp
@@ -85,7 +85,7 @@ ScriptElement::ScriptElement(Element& element, bool parserInserted, bool already
 
 void ScriptElement::didFinishInsertingNode()
 {
-    ASSERT(m_parserInserted == ParserInserted::No);
+    if (m_parserInserted == ParserInserted::No)
     prepareScript(); // FIXME: Provide a real starting line number here.
 }
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/dom/ScriptExecutionContext.h b/modules/javafx.web/src/main/native/Source/WebCore/dom/ScriptExecutionContext.h
index 972d7cf5a28..2dafc0dd259 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/dom/ScriptExecutionContext.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/dom/ScriptExecutionContext.h
@@ -44,6 +44,7 @@
 #include <wtf/HashSet.h>
 #include <wtf/NativePromise.h>
 #include <wtf/ObjectIdentifier.h>
+#include <wtf/OptionSet.h>
 #include <wtf/URL.h>
 #include <wtf/WeakPtr.h>
 #include <wtf/text/WTFString.h>
@@ -84,6 +85,7 @@ class ServiceWorker;
 class ServiceWorkerContainer;
 class SocketProvider;
 class WebCoreOpaqueRoot;
+enum class AdvancedPrivacyProtections : uint16_t;
 enum class LoadedFromOpaqueSource : bool;
 enum class TaskSource : uint8_t;
 
@@ -141,6 +143,7 @@ class ScriptExecutionContext : public SecurityContext, public TimerAlignment {
 
     virtual GraphicsClient* graphicsClient() { return nullptr; }
 
+    virtual OptionSet<AdvancedPrivacyProtections> advancedPrivacyProtections() const = 0;
     virtual std::optional<uint64_t> noiseInjectionHashSalt() const = 0;
 
     virtual RefPtr<RTCDataChannelRemoteHandlerConnection> createRTCDataChannelRemoteHandlerConnection();
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/dom/TreeScope.cpp b/modules/javafx.web/src/main/native/Source/WebCore/dom/TreeScope.cpp
index 3b9d965650c..267d46282e7 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/dom/TreeScope.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/dom/TreeScope.cpp
@@ -103,40 +103,6 @@ void TreeScope::decrementPtrCount() const
         checkedDowncast<ShadowRoot>(m_rootNode).decrementPtrCount();
 }
 
-#if CHECKED_POINTER_DEBUG
-void TreeScope::registerCheckedPtr(const void* pointer) const
-{
-    if (auto* document = dynamicDowncast<Document>(m_rootNode))
-        document->registerCheckedPtr(pointer);
-    else
-        checkedDowncast<ShadowRoot>(m_rootNode).registerCheckedPtr(pointer);
-}
-
-void TreeScope::copyCheckedPtr(const void* source, const void* destination) const
-{
-    if (auto* document = dynamicDowncast<Document>(m_rootNode))
-        document->copyCheckedPtr(source, destination);
-    else
-        checkedDowncast<ShadowRoot>(m_rootNode).copyCheckedPtr(source, destination);
-}
-
-void TreeScope::moveCheckedPtr(const void* source, const void* destination) const
-{
-    if (auto* document = dynamicDowncast<Document>(m_rootNode))
-        document->moveCheckedPtr(source, destination);
-    else
-        checkedDowncast<ShadowRoot>(m_rootNode).moveCheckedPtr(source, destination);
-}
-
-void TreeScope::unregisterCheckedPtr(const void* pointer) const
-{
-    if (auto* document = dynamicDowncast<Document>(m_rootNode))
-        document->unregisterCheckedPtr(pointer);
-    else
-        checkedDowncast<ShadowRoot>(m_rootNode).unregisterCheckedPtr(pointer);
-}
-#endif // CHECKED_POINTER_DEBUG
-
 IdTargetObserverRegistry& TreeScope::ensureIdTargetObserverRegistry()
 {
     if (!m_idTargetObserverRegistry)
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/dom/WindowEventLoop.h b/modules/javafx.web/src/main/native/Source/WebCore/dom/WindowEventLoop.h
index 74f307406e0..2b5e8374c96 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/dom/WindowEventLoop.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/dom/WindowEventLoop.h
@@ -89,7 +89,7 @@ class WindowEventLoop final : public EventLoop {
     HashSet<RefPtr<MutationObserver>> m_activeObservers;
     HashSet<RefPtr<MutationObserver>> m_suspendedObservers;
 
-    SingleThreadWeakHashMap<Page, MonotonicTime> m_pagesWithRenderingOpportunity;
+    WeakHashMap<Page, MonotonicTime> m_pagesWithRenderingOpportunity;
 
     std::unique_ptr<CustomElementQueue> m_customElementQueue;
     bool m_processingBackupElementQueue { false };
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/editing/CompositeEditCommand.cpp b/modules/javafx.web/src/main/native/Source/WebCore/editing/CompositeEditCommand.cpp
index e20c433368c..c091c4f9b66 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/editing/CompositeEditCommand.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/editing/CompositeEditCommand.cpp
@@ -287,8 +287,10 @@ void EditCommandComposition::reapply()
     if (!document->editor().willReapplyEditing(*this))
         return;
 
-    for (auto& command : m_commands)
+    for (size_t i = 0; i < m_commands.size(); ++i) {
+        RefPtr command = m_commands[i].get();
         command->doReapply();
+    }
 
     document->editor().reappliedEditing(*this);
 
@@ -325,8 +327,10 @@ void EditCommandComposition::setRangeDeletedByUnapply(const VisiblePositionIndex
 #ifndef NDEBUG
 void EditCommandComposition::getNodesInCommand(HashSet<Ref<Node>>& nodes)
 {
-    for (auto& command : m_commands)
+    for (size_t i = 0; i < m_commands.size(); ++i) {
+        RefPtr command = m_commands[i].get();
         command->getNodesInCommand(nodes);
+    }
 }
 #endif
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/editing/Editor.cpp b/modules/javafx.web/src/main/native/Source/WebCore/editing/Editor.cpp
index dad5d446b88..b85b758699f 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/editing/Editor.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/editing/Editor.cpp
@@ -1278,6 +1278,7 @@ void Editor::appliedEditing(CompositeEditCommand& command)
 
 bool Editor::willUnapplyEditing(const EditCommandComposition& composition) const
 {
+    TypingCommand::closeTyping(protectedDocument());
     return dispatchBeforeInputEvents(composition.startingRootEditableElement(), composition.endingRootEditableElement(), "historyUndo"_s, IsInputMethodComposing::No);
 }
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/history/BackForwardController.h b/modules/javafx.web/src/main/native/Source/WebCore/history/BackForwardController.h
index 4964568d969..4bb0c15fecb 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/history/BackForwardController.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/history/BackForwardController.h
@@ -72,7 +72,7 @@ class BackForwardController : public CanMakeCheckedPtr {
     Ref<Page> protectedPage() const;
     Ref<BackForwardClient> protectedClient() const;
 
-    SingleThreadWeakRef<Page> m_page;
+    WeakRef<Page> m_page;
     Ref<BackForwardClient> m_client;
 };
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/history/CachedPage.cpp b/modules/javafx.web/src/main/native/Source/WebCore/history/CachedPage.cpp
index fa196f03ec2..f9bc9984e09 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/history/CachedPage.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/history/CachedPage.cpp
@@ -116,7 +116,7 @@ class CachedPageRestorationScope {
     }
 
 private:
-    SingleThreadWeakRef<Page> m_page;
+    WeakRef<Page> m_page;
 };
 
 void CachedPage::restore(Page& page)
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/history/CachedPage.h b/modules/javafx.web/src/main/native/Source/WebCore/history/CachedPage.h
index e65eda49816..51291799fe4 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/history/CachedPage.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/history/CachedPage.h
@@ -63,7 +63,7 @@ class CachedPage : public CanMakeCheckedPtr {
     void markForContentsSizeChanged() { m_needsUpdateContentsSize = true; }
 
 private:
-    SingleThreadWeakRef<Page> m_page;
+    WeakRef<Page> m_page;
     MonotonicTime m_expirationTime;
     std::unique_ptr<CachedFrame> m_cachedMainFrame;
 #if ENABLE(VIDEO)
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/history/HistoryItem.cpp b/modules/javafx.web/src/main/native/Source/WebCore/history/HistoryItem.cpp
index c97db6bbbff..6a9328c31e3 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/history/HistoryItem.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/history/HistoryItem.cpp
@@ -55,10 +55,11 @@ extern "C" {
 extern void notifyHistoryItemDestroyed(const JLObject&);
 }
 #endif
-
-HistoryItem::HistoryItem(Client& client, const String& urlString, std::optional<BackForwardItemIdentifier> identifier)
+HistoryItem::HistoryItem(Client& client, const String& urlString, const String& title, const String& alternateTitle, std::optional<BackForwardItemIdentifier> identifier)
     : m_urlString(urlString)
     , m_originalURLString(urlString)
+    , m_title(title)
+    , m_displayTitle(alternateTitle)
     , m_pruningReason(PruningReason::None)
     , m_identifier(identifier ? *identifier : BackForwardItemIdentifier::generate())
     , m_client(client)
@@ -82,6 +83,8 @@ HistoryItem::HistoryItem(const HistoryItem& item)
     , m_originalURLString(item.m_originalURLString)
     , m_referrer(item.m_referrer)
     , m_target(item.m_target)
+    , m_title(item.m_title)
+    , m_displayTitle(item.m_displayTitle)
     , m_scrollPosition(item.m_scrollPosition)
     , m_pageScaleFactor(item.m_pageScaleFactor)
     , m_children(item.m_children.map([](auto& child) { return child->copy(); }))
@@ -116,6 +119,8 @@ void HistoryItem::reset()
     m_originalURLString = String();
     m_referrer = String();
     m_target = nullAtom();
+    m_title = String();
+    m_displayTitle = String();
 
     m_lastVisitWasFailure = false;
     m_isTargetItem = false;
@@ -143,6 +148,16 @@ const String& HistoryItem::originalURLString() const
     return m_originalURLString;
 }
 
+const String& HistoryItem::title() const
+{
+    return m_title;
+}
+
+const String& HistoryItem::alternateTitle() const
+{
+    return m_displayTitle;
+}
+
 bool HistoryItem::hasCachedPageExpired() const
 {
     return m_cachedPage ? m_cachedPage->hasExpired() : false;
@@ -184,6 +199,12 @@ const AtomString& HistoryItem::target() const
     return m_target;
 }
 
+void HistoryItem::setAlternateTitle(const String& alternateTitle)
+{
+    m_displayTitle = alternateTitle;
+    notifyChanged();
+}
+
 void HistoryItem::setURLString(const String& urlString)
 {
     m_urlString = urlString;
@@ -209,6 +230,12 @@ void HistoryItem::setReferrer(const String& referrer)
     notifyChanged();
 }
 
+void HistoryItem::setTitle(const String& title)
+{
+    m_title = title;
+    notifyChanged();
+}
+
 void HistoryItem::setTarget(const AtomString& target)
 {
     m_target = target;
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/history/HistoryItem.h b/modules/javafx.web/src/main/native/Source/WebCore/history/HistoryItem.h
index 778e24fc194..260485f5324 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/history/HistoryItem.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/history/HistoryItem.h
@@ -76,9 +76,9 @@ class HistoryItem : public RefCounted<HistoryItem>, public CanMakeWeakPtr<Histor
 
 public:
     using Client = HistoryItemClient;
-    static Ref<HistoryItem> create(Client& client, const String& urlString = { }, std::optional<BackForwardItemIdentifier> identifier = { })
+    static Ref<HistoryItem> create(Client& client, const String& urlString = { }, const String& title = { }, const String& alternateTitle = { }, std::optional<BackForwardItemIdentifier> identifier = { })
     {
-        return adoptRef(*new HistoryItem(client, urlString, identifier));
+        return adoptRef(*new HistoryItem(client, urlString, title, alternateTitle, identifier));
     }
 
     WEBCORE_EXPORT ~HistoryItem();
@@ -92,10 +92,13 @@ class HistoryItem : public RefCounted<HistoryItem>, public CanMakeWeakPtr<Histor
 
     WEBCORE_EXPORT const String& originalURLString() const;
     WEBCORE_EXPORT const String& urlString() const;
+    WEBCORE_EXPORT const String& title() const;
 
     bool isInBackForwardCache() const { return m_cachedPage.get(); }
     WEBCORE_EXPORT bool hasCachedPageExpired() const;
 
+    WEBCORE_EXPORT void setAlternateTitle(const String&);
+    WEBCORE_EXPORT const String& alternateTitle() const;
 
     WEBCORE_EXPORT URL url() const;
     WEBCORE_EXPORT URL originalURL() const;
@@ -130,6 +133,7 @@ class HistoryItem : public RefCounted<HistoryItem>, public CanMakeWeakPtr<Histor
     WEBCORE_EXPORT void setOriginalURLString(const String&);
     WEBCORE_EXPORT void setReferrer(const String&);
     WEBCORE_EXPORT void setTarget(const AtomString&);
+    WEBCORE_EXPORT void setTitle(const String&);
     WEBCORE_EXPORT void setIsTargetItem(bool);
 
     WEBCORE_EXPORT void setStateObject(RefPtr<SerializedScriptValue>&&);
@@ -219,7 +223,7 @@ class HistoryItem : public RefCounted<HistoryItem>, public CanMakeWeakPtr<Histor
     void setPolicyContainer(const PolicyContainer& policyContainer) { m_policyContainer = policyContainer; }
 
 private:
-    WEBCORE_EXPORT HistoryItem(Client&, const String& urlString, std::optional<BackForwardItemIdentifier>);
+    WEBCORE_EXPORT HistoryItem(Client&, const String& urlString, const String& title, const String& alternateTitle, std::optional<BackForwardItemIdentifier>);
 
     void setCachedPage(std::unique_ptr<CachedPage>&&);
     std::unique_ptr<CachedPage> takeCachedPage();
@@ -234,6 +238,8 @@ class HistoryItem : public RefCounted<HistoryItem>, public CanMakeWeakPtr<Histor
     String m_originalURLString;
     String m_referrer;
     AtomString m_target;
+    String m_title;
+    String m_displayTitle;
 
     IntPoint m_scrollPosition;
     float m_pageScaleFactor { 0 }; // 0 indicates "unset".
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/html/HTMLMediaElement.cpp b/modules/javafx.web/src/main/native/Source/WebCore/html/HTMLMediaElement.cpp
index 2312466f2a1..e88e489d466 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/html/HTMLMediaElement.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/html/HTMLMediaElement.cpp
@@ -3342,6 +3342,9 @@ void HTMLMediaElement::progressEventTimerFired()
     ASSERT(m_player);
     if (m_networkState != NETWORK_LOADING)
         return;
+
+    updateSleepDisabling();
+
     if (!m_player->supportsProgressMonitoring())
         return;
 
@@ -5088,6 +5091,9 @@ void HTMLMediaElement::updateCaptionContainer()
 void HTMLMediaElement::layoutSizeChanged()
 {
     auto task = [this] {
+        if (isContextStopped())
+            return;
+
             if (auto root = userAgentShadowRoot())
             root->dispatchEvent(Event::create(eventNames().resizeEvent, Event::CanBubble::No, Event::IsCancelable::No));
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/html/ValidatedFormListedElement.cpp b/modules/javafx.web/src/main/native/Source/WebCore/html/ValidatedFormListedElement.cpp
index c429b3ff2c8..cf823728488 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/html/ValidatedFormListedElement.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/html/ValidatedFormListedElement.cpp
@@ -168,9 +168,8 @@ void ValidatedFormListedElement::focusAndShowValidationMessage(Ref<HTMLElement>
     // focus() will scroll the element into view and this scroll may happen asynchronously.
     // Because scrolling the view hides the validation message, we need to show the validation
     // message asynchronously as well.
-    callOnMainThread([this, protectedThis, validationAnchor] {
-        updateVisibleValidationMessage(validationAnchor);
-    });
+    if (RefPtr page = validationAnchor->document().page())
+        page->scheduleValidationMessageUpdate(*this, validationAnchor);
 }
 
 void ValidatedFormListedElement::reportNonFocusableControlError()
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/html/canvas/WebGLUtilities.h b/modules/javafx.web/src/main/native/Source/WebCore/html/canvas/WebGLUtilities.h
index 5ecaea73650..7b3910148f0 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/html/canvas/WebGLUtilities.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/html/canvas/WebGLUtilities.h
@@ -53,14 +53,14 @@ class ScopedInspectorShaderProgramHighlight {
     void hideHighlight();
 
     struct {
-        GCGLfloat color[4];
-        GCGLenum equationRGB;
-        GCGLenum equationAlpha;
-        GCGLenum srcRGB;
-        GCGLenum dstRGB;
-        GCGLenum srcAlpha;
-        GCGLenum dstAlpha;
-        GCGLboolean enabled;
+        GCGLfloat color[4] { 0, 0, 0, 0 };
+        GCGLenum equationRGB { GraphicsContextGL::NONE };
+        GCGLenum equationAlpha { GraphicsContextGL::NONE };
+        GCGLenum srcRGB { GraphicsContextGL::ONE };
+        GCGLenum dstRGB { GraphicsContextGL::ZERO };
+        GCGLenum srcAlpha { GraphicsContextGL::ONE };
+        GCGLenum dstAlpha { GraphicsContextGL::ZERO };
+        GCGLboolean enabled { false };
     } m_savedBlend;
 
     WebGLRenderingContextBase* const m_context;
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/inspector/InspectorFrontendAPIDispatcher.h b/modules/javafx.web/src/main/native/Source/WebCore/inspector/InspectorFrontendAPIDispatcher.h
index 6ec5afe08f5..f2b8e3938d5 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/inspector/InspectorFrontendAPIDispatcher.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/inspector/InspectorFrontendAPIDispatcher.h
@@ -90,7 +90,7 @@ class InspectorFrontendAPIDispatcher final
     void invalidatePendingResponses();
     ValueOrException evaluateExpression(const String&);
 
-    SingleThreadWeakPtr<Page> m_frontendPage;
+    WeakPtr<Page> m_frontendPage;
     Vector<std::pair<String, EvaluationResultHandler>> m_queuedEvaluations;
     HashMap<Ref<DOMPromise>, EvaluationResultHandler> m_pendingResponses;
     bool m_frontendLoaded { false };
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/inspector/InspectorFrontendClientLocal.h b/modules/javafx.web/src/main/native/Source/WebCore/inspector/InspectorFrontendClientLocal.h
index b0c30d8f2c6..6731eacaf67 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/inspector/InspectorFrontendClientLocal.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/inspector/InspectorFrontendClientLocal.h
@@ -145,7 +145,7 @@ class InspectorFrontendClientLocal : public InspectorFrontendClient {
     std::optional<bool> evaluationResultToBoolean(InspectorFrontendAPIDispatcher::EvaluationResult);
 
     InspectorController* m_inspectedPageController { nullptr };
-    SingleThreadWeakPtr<Page> m_frontendPage;
+    WeakPtr<Page> m_frontendPage;
     // TODO(yurys): this ref shouldn't be needed.
     RefPtr<InspectorFrontendHost> m_frontendHost;
     std::unique_ptr<InspectorFrontendClientLocal::Settings> m_settings;
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/inspector/InspectorFrontendHost.h b/modules/javafx.web/src/main/native/Source/WebCore/inspector/InspectorFrontendHost.h
index e8497937e6f..4a2556f3480 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/inspector/InspectorFrontendHost.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/inspector/InspectorFrontendHost.h
@@ -187,7 +187,7 @@ class InspectorFrontendHost : public RefCounted<InspectorFrontendHost> {
     WEBCORE_EXPORT InspectorFrontendHost(InspectorFrontendClient*, Page* frontendPage);
 
     InspectorFrontendClient* m_client;
-    SingleThreadWeakPtr<Page> m_frontendPage;
+    WeakPtr<Page> m_frontendPage;
 #if ENABLE(CONTEXT_MENUS)
     FrontendMenuProvider* m_menuProvider;
 #endif
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/layout/formattingContexts/inline/InlineContentBalancer.cpp b/modules/javafx.web/src/main/native/Source/WebCore/layout/formattingContexts/inline/InlineContentBalancer.cpp
index e50db2c782c..a5c5e1bbee0 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/layout/formattingContexts/inline/InlineContentBalancer.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/layout/formattingContexts/inline/InlineContentBalancer.cpp
@@ -201,16 +201,19 @@ std::optional<Vector<LayoutUnit>> InlineContentBalancer::computeBalanceConstrain
     for (auto chunkSize : chunkSizes) {
         bool isFirstChunk = !startLine;
         auto rangeToBalance = InlineItemRange { m_originalLineInlineItemRanges[startLine].startIndex(), m_originalLineInlineItemRanges[startLine + chunkSize - 1].endIndex() };
+        std::optional<Vector<LayoutUnit>> balancedLineWidthsForChunk;
+
+        if (rangeToBalance.startIndex() < rangeToBalance.endIndex()) {
         InlineLayoutUnit totalWidth = 0;
         for (size_t i = 0; i < chunkSize; i++)
             totalWidth += m_originalLineWidths[startLine + i];
         InlineLayoutUnit idealLineWidth = totalWidth / chunkSize;
 
-        std::optional<Vector<LayoutUnit>> balancedLineWidthsForChunk;
         if (m_numberOfLinesInOriginalLayout <= maximumLinesToBalanceWithLineRequirement)
             balancedLineWidthsForChunk = balanceRangeWithLineRequirement(rangeToBalance, idealLineWidth, chunkSize, isFirstChunk);
         else
             balancedLineWidthsForChunk = balanceRangeWithNoLineRequirement(rangeToBalance, idealLineWidth, isFirstChunk);
+        }
 
         if (!balancedLineWidthsForChunk) {
             for (size_t i = 0; i < chunkSize; i++)
@@ -228,6 +231,8 @@ std::optional<Vector<LayoutUnit>> InlineContentBalancer::computeBalanceConstrain
 
 std::optional<Vector<LayoutUnit>> InlineContentBalancer::balanceRangeWithLineRequirement(InlineItemRange range, InlineLayoutUnit idealLineWidth, size_t numberOfLines, bool isFirstChunk)
 {
+    ASSERT(range.startIndex() < range.endIndex());
+
     // breakOpportunities holds the indices i such that a line break can occur before m_inlineItemList[i].
     auto breakOpportunities = computeBreakOpportunities(m_inlineItemList, range);
 
@@ -329,6 +334,8 @@ std::optional<Vector<LayoutUnit>> InlineContentBalancer::balanceRangeWithLineReq
 
 std::optional<Vector<LayoutUnit>> InlineContentBalancer::balanceRangeWithNoLineRequirement(InlineItemRange range, InlineLayoutUnit idealLineWidth, bool isFirstChunk)
 {
+    ASSERT(range.startIndex() < range.endIndex());
+
     // breakOpportunities holds the indices i such that a line break can occur before m_inlineItemList[i].
     auto breakOpportunities = computeBreakOpportunities(m_inlineItemList, range);
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/layout/formattingContexts/inline/invalidation/InlineInvalidation.cpp b/modules/javafx.web/src/main/native/Source/WebCore/layout/formattingContexts/inline/invalidation/InlineInvalidation.cpp
index 480ab92c2b6..226d8aec7d3 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/layout/formattingContexts/inline/invalidation/InlineInvalidation.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/layout/formattingContexts/inline/invalidation/InlineInvalidation.cpp
@@ -159,7 +159,8 @@ static const InlineDisplay::Box* leadingContentDisplayForLineIndex(size_t lineIn
 
     for (auto firstContentDisplayBoxIndex = rootInlineBoxIndexOnLine() + 1; firstContentDisplayBoxIndex < displayBoxes.size(); ++firstContentDisplayBoxIndex) {
         auto& displayBox = displayBoxes[firstContentDisplayBoxIndex];
-        ASSERT(!displayBox.isRootInlineBox());
+        if (displayBox.isRootInlineBox())
+            return nullptr;
         if (!displayBox.isNonRootInlineBox() || displayBox.isFirstForLayoutBox())
             return &displayBox;
     }
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/loader/EmptyClients.cpp b/modules/javafx.web/src/main/native/Source/WebCore/loader/EmptyClients.cpp
index 305b852657e..5cee4d5dd49 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/loader/EmptyClients.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/loader/EmptyClients.cpp
@@ -293,7 +293,7 @@ class EmptyEditorClient final : public EditorClient {
     void registerRedoStep(UndoStep&) final;
     void clearUndoRedoOperations() final { }
 
-    DOMPasteAccessResponse requestDOMPasteAccess(DOMPasteAccessCategory, const String&) final { return DOMPasteAccessResponse::DeniedForGesture; }
+    DOMPasteAccessResponse requestDOMPasteAccess(DOMPasteAccessCategory, FrameIdentifier, const String&) final { return DOMPasteAccessResponse::DeniedForGesture; }
 
     bool canCopyCut(LocalFrame*, bool defaultValue) const final { return defaultValue; }
     bool canPaste(LocalFrame*, bool defaultValue) const final { return defaultValue; }
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/loader/FrameLoader.cpp b/modules/javafx.web/src/main/native/Source/WebCore/loader/FrameLoader.cpp
index e2c93b831ae..f5e2c3349d7 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/loader/FrameLoader.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/loader/FrameLoader.cpp
@@ -248,7 +248,7 @@ class PageLevelForbidScope {
 
     ~PageLevelForbidScope() = default;
 
-    SingleThreadWeakPtr<Page> m_page;
+    WeakPtr<Page> m_page;
 };
 
 struct ForbidPromptsScope : public PageLevelForbidScope {
@@ -4365,6 +4365,8 @@ void FrameLoader::didChangeTitle(DocumentLoader* loader)
     m_client->didChangeTitle(loader);
 
     if (loader == m_documentLoader) {
+        // Must update the entries in the back-forward list too.
+        history().setCurrentItemTitle(loader->title());
         // This must go through the WebFrame because it has the right notion of the current b/f item.
         m_client->setTitle(loader->title(), loader->urlForHistory());
         m_client->setMainFrameDocumentReady(true); // update observers with new DOMDocument
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/loader/HistoryController.cpp b/modules/javafx.web/src/main/native/Source/WebCore/loader/HistoryController.cpp
index 114312289a3..7d640711743 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/loader/HistoryController.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/loader/HistoryController.cpp
@@ -635,6 +635,13 @@ void HistoryController::setCurrentItem(Ref<HistoryItem>&& item)
     m_previousItem = std::exchange(m_currentItem, WTFMove(item));
 }
 
+void HistoryController::setCurrentItemTitle(const StringWithDirection& title)
+{
+    // FIXME: This ignores the title's direction.
+    if (RefPtr currentItem = m_currentItem)
+        currentItem->setTitle(title.string);
+}
+
 bool HistoryController::currentItemShouldBeReplaced() const
 {
     // From the HTML5 spec for location.assign():
@@ -686,8 +693,12 @@ void HistoryController::initializeItem(HistoryItem& item)
     if (originalURL.isEmpty())
         originalURL = aboutBlankURL();
 
+    StringWithDirection title = documentLoader->title();
+
     item.setURL(url);
     item.setTarget(m_frame->tree().uniqueName());
+    // FIXME: Should store the title direction as well.
+    item.setTitle(title.string);
     item.setOriginalURLString(originalURL.string());
 
     if (!unreachableURL.isEmpty() || documentLoader->response().httpStatusCode() >= 400)
@@ -881,7 +892,7 @@ void HistoryController::updateCurrentItem()
     }
 }
 
-void HistoryController::pushState(RefPtr<SerializedScriptValue>&& stateObject, const String& urlString)
+void HistoryController::pushState(RefPtr<SerializedScriptValue>&& stateObject, const String& title, const String& urlString)
 {
     if (!m_currentItem)
         return;
@@ -909,6 +920,7 @@ void HistoryController::pushState(RefPtr<SerializedScriptValue>&& stateObject, c
     // Override data in the current item (created by createItemTree) to reflect
     // the pushState() arguments.
     RefPtr currentItem = m_currentItem;
+    currentItem->setTitle(title);
     currentItem->setStateObject(WTFMove(stateObject));
     currentItem->setURLString(urlString);
     currentItem->setShouldRestoreScrollPosition(shouldRestoreScrollPosition);
@@ -924,7 +936,7 @@ void HistoryController::pushState(RefPtr<SerializedScriptValue>&& stateObject, c
     frame->checkedLoader()->client().updateGlobalHistory();
 }
 
-void HistoryController::replaceState(RefPtr<SerializedScriptValue>&& stateObject, const String& urlString)
+void HistoryController::replaceState(RefPtr<SerializedScriptValue>&& stateObject, const String& title, const String& urlString)
 {
     RefPtr currentItem = m_currentItem;
     if (!currentItem)
@@ -934,6 +946,7 @@ void HistoryController::replaceState(RefPtr<SerializedScriptValue>&& stateObject
 
     if (!urlString.isEmpty())
         currentItem->setURLString(urlString);
+    currentItem->setTitle(title);
     currentItem->setStateObject(WTFMove(stateObject));
     currentItem->setFormData(nullptr);
     currentItem->setFormContentType(String());
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/loader/HistoryController.h b/modules/javafx.web/src/main/native/Source/WebCore/loader/HistoryController.h
index 8ad74abb11e..5fdd7fb3c5d 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/loader/HistoryController.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/loader/HistoryController.h
@@ -76,6 +76,7 @@ class HistoryController : public CanMakeCheckedPtr {
     HistoryItem* currentItem() const { return m_currentItem.get(); }
     RefPtr<HistoryItem> protectedCurrentItem() const;
     WEBCORE_EXPORT void setCurrentItem(Ref<HistoryItem>&&);
+    void setCurrentItemTitle(const StringWithDirection&);
     bool currentItemShouldBeReplaced() const;
     WEBCORE_EXPORT void replaceCurrentItem(RefPtr<HistoryItem>&&);
 
@@ -87,8 +88,8 @@ class HistoryController : public CanMakeCheckedPtr {
     RefPtr<HistoryItem> protectedProvisionalItem() const;
     void setProvisionalItem(RefPtr<HistoryItem>&&);
 
-    void pushState(RefPtr<SerializedScriptValue>&&, const String& url);
-    void replaceState(RefPtr<SerializedScriptValue>&&, const String& url);
+    void pushState(RefPtr<SerializedScriptValue>&&, const String& title, const String& url);
+    void replaceState(RefPtr<SerializedScriptValue>&&, const String& title, const String& url);
 
     void setDefersLoading(bool);
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/loader/ProgressTracker.h b/modules/javafx.web/src/main/native/Source/WebCore/loader/ProgressTracker.h
index 93a02888f3a..94a15cd04f4 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/loader/ProgressTracker.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/loader/ProgressTracker.h
@@ -74,7 +74,7 @@ class ProgressTracker : public CanMakeCheckedPtr {
     void progressHeartbeatTimerFired();
     Ref<Page> protectedPage() const;
 
-    SingleThreadWeakRef<Page> m_page;
+    WeakRef<Page> m_page;
     UniqueRef<ProgressTrackerClient> m_client;
     RefPtr<LocalFrame> m_originatingProgressFrame;
     HashMap<ResourceLoaderIdentifier, std::unique_ptr<ProgressItem>> m_progressItems;
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/page/EditorClient.h b/modules/javafx.web/src/main/native/Source/WebCore/page/EditorClient.h
index cdcc30bb477..44c5bd488bf 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/page/EditorClient.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/page/EditorClient.h
@@ -27,6 +27,7 @@
 #pragma once
 
 #include "EditorInsertAction.h"
+#include "FrameIdentifier.h"
 #include "SerializedAttachmentData.h"
 #include "TextAffinity.h"
 #include "TextChecking.h"
@@ -110,7 +111,7 @@ class EditorClient : public CanMakeWeakPtr<EditorClient>, public CanMakeCheckedP
     virtual void requestCandidatesForSelection(const VisibleSelection&) { }
     virtual void handleAcceptedCandidateWithSoftSpaces(TextCheckingResult) { }
 
-    virtual DOMPasteAccessResponse requestDOMPasteAccess(DOMPasteAccessCategory, const String& originIdentifier) = 0;
+    virtual DOMPasteAccessResponse requestDOMPasteAccess(DOMPasteAccessCategory, FrameIdentifier, const String& originIdentifier) = 0;
 
     // Notify an input method that a composition was voluntarily discarded by WebCore, so that it could clean up too.
     // This function is not called when a composition is closed per a request from an input method.
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/page/EventHandler.cpp b/modules/javafx.web/src/main/native/Source/WebCore/page/EventHandler.cpp
index 4ed7d8b2afe..35fbe9df300 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/page/EventHandler.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/page/EventHandler.cpp
@@ -4561,7 +4561,10 @@ void EventHandler::defaultBackspaceEventHandler(KeyboardEvent& event)
 
 void EventHandler::stopKeyboardScrolling()
 {
-    if (auto animator = m_frame->page()->currentKeyboardScrollingAnimator())
+    RefPtr page = m_frame->page();
+    if (!page)
+        return;
+    if (auto animator = page->currentKeyboardScrollingAnimator())
         animator->handleKeyUpEvent();
 }
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/page/Frame.h b/modules/javafx.web/src/main/native/Source/WebCore/page/Frame.h
index ac13e1e2cb0..87d91b1c349 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/page/Frame.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/page/Frame.h
@@ -107,7 +107,7 @@ class Frame : public ThreadSafeRefCounted<Frame, WTF::DestructionThread::Main>,
 private:
     virtual DOMWindow* virtualWindow() const = 0;
 
-    SingleThreadWeakPtr<Page> m_page;
+    WeakPtr<Page> m_page;
     const FrameIdentifier m_frameID;
     mutable FrameTree m_treeNode;
     Ref<WindowProxy> m_windowProxy;
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/page/History.cpp b/modules/javafx.web/src/main/native/Source/WebCore/page/History.cpp
index c3486a6e7a4..7b337248afa 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/page/History.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/page/History.cpp
@@ -200,7 +200,7 @@ URL History::urlForState(const String& urlString)
     return frame->document()->completeURL(urlString);
 }
 
-ExceptionOr<void> History::stateObjectAdded(RefPtr<SerializedScriptValue>&& data, const String& urlString, StateObjectType stateObjectType)
+ExceptionOr<void> History::stateObjectAdded(RefPtr<SerializedScriptValue>&& data, const String& title, const String& urlString, StateObjectType stateObjectType)
 {
     m_cachedState.clear();
 
@@ -266,10 +266,14 @@ ExceptionOr<void> History::stateObjectAdded(RefPtr<SerializedScriptValue>&& data
         return Exception { ExceptionCode::SecurityError, makeString("Attempt to use history.pushState() more than ", perStateObjectTimeSpanLimit, " times per ", stateObjectTimeSpan.seconds(), " seconds") };
     }
 
+    Checked<unsigned> titleSize = title.length();
+    titleSize *= 2;
+
     Checked<unsigned> urlSize = fullURL.string().length();
     urlSize *= 2;
 
-    Checked<uint64_t> payloadSize = urlSize;
+    Checked<uint64_t> payloadSize = titleSize;
+    payloadSize += urlSize;
     payloadSize += data ? data->wireBytes().size() : 0;
 
     Checked<uint64_t> newTotalUsage = mainHistory.m_totalStateObjectUsage;
@@ -293,10 +297,10 @@ ExceptionOr<void> History::stateObjectAdded(RefPtr<SerializedScriptValue>&& data
         frame->document()->updateURLForPushOrReplaceState(fullURL);
 
     if (stateObjectType == StateObjectType::Push) {
-        frame->loader().history().pushState(WTFMove(data), fullURL.string());
+        frame->loader().history().pushState(WTFMove(data), title, fullURL.string());
         frame->loader().client().dispatchDidPushStateWithinPage();
     } else if (stateObjectType == StateObjectType::Replace) {
-        frame->loader().history().replaceState(WTFMove(data), fullURL.string());
+        frame->loader().history().replaceState(WTFMove(data), title, fullURL.string());
         frame->loader().client().dispatchDidReplaceStateWithinPage();
     }
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/page/History.h b/modules/javafx.web/src/main/native/Source/WebCore/page/History.h
index 176f8268f1b..463a8409822 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/page/History.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/page/History.h
@@ -65,14 +65,14 @@ class History final : public ScriptWrappable, public RefCounted<History>, public
 
     bool isSameAsCurrentState(SerializedScriptValue*) const;
 
-    ExceptionOr<void> pushState(RefPtr<SerializedScriptValue>&& data, const String&, const String& urlString);
-    ExceptionOr<void> replaceState(RefPtr<SerializedScriptValue>&& data, const String&, const String& urlString);
+    ExceptionOr<void> pushState(RefPtr<SerializedScriptValue>&& data, const String& title, const String& urlString);
+    ExceptionOr<void> replaceState(RefPtr<SerializedScriptValue>&& data, const String& title, const String& urlString);
 
 private:
     explicit History(LocalDOMWindow&);
 
     enum class StateObjectType { Push, Replace };
-    ExceptionOr<void> stateObjectAdded(RefPtr<SerializedScriptValue>&&, const String& url, StateObjectType);
+    ExceptionOr<void> stateObjectAdded(RefPtr<SerializedScriptValue>&&, const String& title, const String& url, StateObjectType);
     bool stateChanged() const;
 
     URL urlForState(const String& url);
@@ -92,14 +92,14 @@ class History final : public ScriptWrappable, public RefCounted<History>, public
     uint64_t m_mostRecentStateObjectUsage { 0 };
 };
 
-inline ExceptionOr<void> History::pushState(RefPtr<SerializedScriptValue>&& data, const String&, const String& urlString)
+inline ExceptionOr<void> History::pushState(RefPtr<SerializedScriptValue>&& data, const String& title, const String& urlString)
 {
-    return stateObjectAdded(WTFMove(data), urlString, StateObjectType::Push);
+    return stateObjectAdded(WTFMove(data), title, urlString, StateObjectType::Push);
 }
 
-inline ExceptionOr<void> History::replaceState(RefPtr<SerializedScriptValue>&& data, const String&, const String& urlString)
+inline ExceptionOr<void> History::replaceState(RefPtr<SerializedScriptValue>&& data, const String& title, const String& urlString)
 {
-    return stateObjectAdded(WTFMove(data), urlString, StateObjectType::Replace);
+    return stateObjectAdded(WTFMove(data), title, urlString, StateObjectType::Replace);
 }
 
 } // namespace WebCore
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/page/History.idl b/modules/javafx.web/src/main/native/Source/WebCore/page/History.idl
index 1b7b69dbfd4..4c7197afa42 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/page/History.idl
+++ b/modules/javafx.web/src/main/native/Source/WebCore/page/History.idl
@@ -36,8 +36,9 @@
     [CallWith=RelevantDocument] undefined forward();
     [CallWith=RelevantDocument] undefined go(optional long delta = 0);
 
-    undefined pushState(SerializedScriptValue data, DOMString unused, optional USVString? url = null);
-    undefined replaceState(SerializedScriptValue data, DOMString unused, optional USVString? url = null);
+    // FIXME: title should not be nullable as per the HTML specification.
+    undefined pushState(SerializedScriptValue data, DOMString? title, optional USVString? url = null);
+    undefined replaceState(SerializedScriptValue data, DOMString? title, optional USVString? url = null);
 };
 
 enum ScrollRestoration { "auto", "manual" };
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/page/ImageAnalysisQueue.h b/modules/javafx.web/src/main/native/Source/WebCore/page/ImageAnalysisQueue.h
index 9c847977e0f..8c753e87485 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/page/ImageAnalysisQueue.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/page/ImageAnalysisQueue.h
@@ -80,7 +80,7 @@ class ImageAnalysisQueue {
     // FIXME: Refactor the source and target LIDs into either a std::pair<> of strings, or its own named struct.
     String m_sourceLanguageIdentifier;
     String m_targetLanguageIdentifier;
-    SingleThreadWeakPtr<Page> m_page;
+    WeakPtr<Page> m_page;
     Timer m_resumeProcessingTimer;
     WeakHashMap<HTMLImageElement, URL, WeakPtrImplWithEventTargetData> m_queuedElements;
     PriorityQueue<Task, firstIsHigherPriority> m_queue;
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/page/ImageOverlayController.h b/modules/javafx.web/src/main/native/Source/WebCore/page/ImageOverlayController.h
index 2056b88540a..03e26a6c640 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/page/ImageOverlayController.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/page/ImageOverlayController.h
@@ -91,7 +91,7 @@ class ImageOverlayController final : private PageOverlay::Client
     void platformUpdateElementUnderMouse(LocalFrame&, Element* elementUnderMouse);
     bool platformHandleMouseEvent(const PlatformMouseEvent&);
 
-    SingleThreadWeakPtr<Page> m_page;
+    WeakPtr<Page> m_page;
     RefPtr<PageOverlay> m_overlay;
     WeakPtr<HTMLElement, WeakPtrImplWithEventTargetData> m_hostElementForSelection;
     Vector<FloatQuad> m_selectionQuads;
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/page/LocalFrame.cpp b/modules/javafx.web/src/main/native/Source/WebCore/page/LocalFrame.cpp
index 7c8ec4fd3a6..298c0009187 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/page/LocalFrame.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/page/LocalFrame.cpp
@@ -634,7 +634,7 @@ bool LocalFrame::requestDOMPasteAccess(DOMPasteAccessCategory pasteAccessCategor
         if (!client)
             return false;
 
-        auto response = client->requestDOMPasteAccess(pasteAccessCategory, m_doc->originIdentifierForPasteboard());
+        auto response = client->requestDOMPasteAccess(pasteAccessCategory, frameID(), m_doc->originIdentifierForPasteboard());
         gestureToken->didRequestDOMPasteAccess(response);
         switch (response) {
         case DOMPasteAccessResponse::GrantedForCommand:
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/page/LocalFrame.h b/modules/javafx.web/src/main/native/Source/WebCore/page/LocalFrame.h
index 415386db2ae..760965de5cf 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/page/LocalFrame.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/page/LocalFrame.h
@@ -152,7 +152,7 @@ class LocalFrame final : public Frame {
 
     EventHandler& eventHandler() { return m_eventHandler; }
     const EventHandler& eventHandler() const { return m_eventHandler; }
-    CheckedRef<EventHandler> checkedEventHandler();
+    WEBCORE_EXPORT CheckedRef<EventHandler> checkedEventHandler();
     CheckedRef<const EventHandler> checkedEventHandler() const;
 
     const FrameLoader& loader() const { return m_loader.get(); }
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/page/LocalFrameView.cpp b/modules/javafx.web/src/main/native/Source/WebCore/page/LocalFrameView.cpp
index 7e94b7a1b12..e3ee2912965 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/page/LocalFrameView.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/page/LocalFrameView.cpp
@@ -175,7 +175,7 @@ Pagination::Mode paginationModeForRenderStyle(const RenderStyle& style)
 
     // paged-x always corresponds to LeftToRightPaginated or RightToLeftPaginated. If the WritingMode
     // is horizontal, then we use TextDirection to choose between those options. If the WritingMode
-    // is vertical, then the direction of the verticality dictates the choice.
+    // is vertical, then the block flow direction dictates the choice.
     if (overflow == Overflow::PagedX) {
         if ((isHorizontalWritingMode && textDirection == TextDirection::LTR) || blockFlowDirection == BlockFlowDirection::LeftToRight)
             return Pagination::Mode::LeftToRightPaginated;
@@ -183,7 +183,7 @@ Pagination::Mode paginationModeForRenderStyle(const RenderStyle& style)
     }
 
     // paged-y always corresponds to TopToBottomPaginated or BottomToTopPaginated. If the WritingMode
-    // is horizontal, then the direction of the horizontality dictates the choice. If the WritingMode
+    // is horizontal, then the block flow direction dictates the choice. If the WritingMode
     // is vertical, then we use TextDirection to choose between those options.
     if (blockFlowDirection == BlockFlowDirection::TopToBottom || (!isHorizontalWritingMode && textDirection == TextDirection::RTL))
         return Pagination::Mode::TopToBottomPaginated;
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/page/OpportunisticTaskScheduler.h b/modules/javafx.web/src/main/native/Source/WebCore/page/OpportunisticTaskScheduler.h
index 283929a8f0e..d6f5b48d450 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/page/OpportunisticTaskScheduler.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/page/OpportunisticTaskScheduler.h
@@ -120,7 +120,7 @@ class OpportunisticTaskScheduler final : public RefCounted<OpportunisticTaskSche
 
     bool shouldAllowOpportunisticallyScheduledTasks() const;
 
-    SingleThreadWeakPtr<Page> m_page;
+    WeakPtr<Page> m_page;
     uint64_t m_imminentlyScheduledWorkCount { 0 };
     uint64_t m_runloopCountAfterBeingScheduled { 0 };
     MonotonicTime m_currentDeadline;
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/page/Page.cpp b/modules/javafx.web/src/main/native/Source/WebCore/page/Page.cpp
index 80e28117b3e..a48f5f9a8d0 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/page/Page.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/page/Page.cpp
@@ -21,6 +21,7 @@
 #include "Page.h"
 
 #include "ActivityStateChangeObserver.h"
+#include "AdvancedPrivacyProtections.h"
 #include "AlternativeTextClient.h"
 #include "AnimationFrameRate.h"
 #include "AppHighlightStorage.h"
@@ -212,9 +213,9 @@
 
 namespace WebCore {
 
-static HashSet<SingleThreadWeakRef<Page>>& allPages()
+static HashSet<WeakRef<Page>>& allPages()
 {
-    static NeverDestroyed<HashSet<SingleThreadWeakRef<Page>>> set;
+    static NeverDestroyed<HashSet<WeakRef<Page>>> set;
     return set;
 }
 
@@ -244,6 +245,19 @@ void Page::updateValidationBubbleStateIfNeeded()
         client->updateValidationBubbleStateIfNeeded();
 }
 
+void Page::scheduleValidationMessageUpdate(ValidatedFormListedElement& element, HTMLElement& anchor)
+{
+    m_validationMessageUpdates.append({ element, anchor });
+}
+
+void Page::updateValidationMessages()
+{
+    for (auto& item : std::exchange(m_validationMessageUpdates, { })) {
+        if (RefPtr anchor = item.second.get())
+            item.first->updateVisibleValidationMessage(*anchor);
+    }
+}
+
 static void networkStateChanged(bool isOnLine)
 {
     Vector<WeakPtr<LocalFrame>> frames;
@@ -1986,6 +2000,8 @@ void Page::doAfterUpdateRendering()
     updateElementsWithTextRecognitionResults();
 #endif
 
+    updateValidationMessages();
+
     prioritizeVisibleResources();
 
     m_renderingUpdateRemainingSteps.last().remove(RenderingUpdateStep::EventRegionUpdate);
@@ -4443,7 +4459,7 @@ ModelPlayerProvider& Page::modelPlayerProvider()
     return m_modelPlayerProvider.get();
 }
 
-void Page::setupForRemoteWorker(const URL& scriptURL, const SecurityOriginData& topOrigin, const String& referrerPolicy)
+void Page::setupForRemoteWorker(const URL& scriptURL, const SecurityOriginData& topOrigin, const String& referrerPolicy, OptionSet<AdvancedPrivacyProtections> advancedPrivacyProtections)
 {
     RefPtr localMainFrame = dynamicDowncast<LocalFrame>(mainFrame());
     if (!localMainFrame)
@@ -4459,6 +4475,9 @@ void Page::setupForRemoteWorker(const URL& scriptURL, const SecurityOriginData&
     document->setSiteForCookies(originAsURL);
     document->setFirstPartyForCookies(originAsURL);
 
+    if (RefPtr documentLoader = localMainFrame->checkedLoader()->documentLoader())
+        documentLoader->setAdvancedPrivacyProtections(advancedPrivacyProtections);
+
     if (document->settings().storageBlockingPolicy() != StorageBlockingPolicy::BlockThirdParty)
         document->setDomainForCachePartition(String { emptyString() });
     else
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/page/Page.h b/modules/javafx.web/src/main/native/Source/WebCore/page/Page.h
index 004bc0f7dc8..2639e13f925 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/page/Page.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/page/Page.h
@@ -164,6 +164,7 @@ class UserContentProvider;
 class UserContentURLPattern;
 class UserScript;
 class UserStyleSheet;
+class ValidatedFormListedElement;
 class ValidationMessageClient;
 class VisibleSelection;
 class VisitedLinkStore;
@@ -180,6 +181,7 @@ using PlatformDisplayID = uint32_t;
 using SharedStringHash = uint32_t;
 
 enum class ActivityState : uint16_t;
+enum class AdvancedPrivacyProtections : uint16_t;
 enum class CanWrap : bool;
 enum class DidWrap : bool;
 enum class DisabledAdaptations : uint8_t;
@@ -280,7 +282,7 @@ constexpr auto allRenderingUpdateSteps = updateRenderingSteps | OptionSet<Render
 };
 
 
-class Page : public RefCounted<Page>, public Supplementable<Page>, public CanMakeSingleThreadWeakPtr<Page> {
+class Page : public RefCounted<Page>, public Supplementable<Page>, public CanMakeWeakPtr<Page> {
     WTF_MAKE_NONCOPYABLE(Page);
     WTF_MAKE_FAST_ALLOCATED;
     friend class SettingsBase;
@@ -292,7 +294,7 @@ class Page : public RefCounted<Page>, public Supplementable<Page>, public CanMak
     WEBCORE_EXPORT static void updateStyleForAllPagesAfterGlobalChangeInEnvironment();
     WEBCORE_EXPORT static void clearPreviousItemFromAllPages(HistoryItem*);
 
-    WEBCORE_EXPORT void setupForRemoteWorker(const URL& scriptURL, const SecurityOriginData& topOrigin, const String& referrerPolicy);
+    WEBCORE_EXPORT void setupForRemoteWorker(const URL& scriptURL, const SecurityOriginData& topOrigin, const String& referrerPolicy, OptionSet<AdvancedPrivacyProtections>);
 
     WEBCORE_EXPORT void updateStyleAfterChangeInEnvironment();
 
@@ -396,6 +398,7 @@ class Page : public RefCounted<Page>, public Supplementable<Page>, public CanMak
 
     ValidationMessageClient* validationMessageClient() const { return m_validationMessageClient.get(); }
     void updateValidationBubbleStateIfNeeded();
+    void scheduleValidationMessageUpdate(ValidatedFormListedElement&, HTMLElement&);
 
     WEBCORE_EXPORT ScrollingCoordinator* scrollingCoordinator();
     WEBCORE_EXPORT RefPtr<ScrollingCoordinator> protectedScrollingCoordinator();
@@ -1093,6 +1096,8 @@ class Page : public RefCounted<Page>, public Supplementable<Page>, public CanMak
      explicit Page(PageConfiguration&&);
 #endif
 
+    void updateValidationMessages();
+
     struct Navigation {
         RegistrableDomain domain;
         FrameLoadType type;
@@ -1176,6 +1181,7 @@ class Page : public RefCounted<Page>, public Supplementable<Page>, public CanMak
     RefPtr<PluginData> m_pluginData;
 
     std::unique_ptr<ValidationMessageClient> m_validationMessageClient;
+    Vector<std::pair<Ref<ValidatedFormListedElement>, WeakPtr<HTMLElement, WeakPtrImplWithEventTargetData>>> m_validationMessageUpdates;
     std::unique_ptr<DiagnosticLoggingClient> m_diagnosticLoggingClient;
     std::unique_ptr<PerformanceLoggingClient> m_performanceLoggingClient;
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/page/PageGroup.h b/modules/javafx.web/src/main/native/Source/WebCore/page/PageGroup.h
index f6333a1ba2f..cceb1af25a9 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/page/PageGroup.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/page/PageGroup.h
@@ -45,7 +45,7 @@ class PageGroup : public CanMakeWeakPtr<PageGroup> {
 
     WEBCORE_EXPORT static PageGroup* pageGroup(const String& groupName);
 
-    const SingleThreadWeakHashSet<Page>& pages() const { return m_pages; }
+    const WeakHashSet<Page>& pages() const { return m_pages; }
 
     void addPage(Page&);
     void removePage(Page&);
@@ -61,7 +61,7 @@ class PageGroup : public CanMakeWeakPtr<PageGroup> {
 
 private:
     String m_name;
-    SingleThreadWeakHashSet<Page> m_pages;
+    WeakHashSet<Page> m_pages;
 
     unsigned m_identifier;
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/page/PageOverlay.h b/modules/javafx.web/src/main/native/Source/WebCore/page/PageOverlay.h
index 7d9bdf5de7e..9d675433b6d 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/page/PageOverlay.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/page/PageOverlay.h
@@ -131,7 +131,7 @@ class PageOverlay final : public RefCounted<PageOverlay>, public CanMakeWeakPtr<
     void fadeAnimationTimerFired();
 
     Client& m_client;
-    SingleThreadWeakPtr<Page> m_page;
+    WeakPtr<Page> m_page;
 
     Timer m_fadeAnimationTimer;
     WallTime m_fadeAnimationStartTime;
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/page/SettingsBase.h b/modules/javafx.web/src/main/native/Source/WebCore/page/SettingsBase.h
index b8252afb3d5..9e29fba0010 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/page/SettingsBase.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/page/SettingsBase.h
@@ -167,7 +167,7 @@ class SettingsBase {
     void sampleBufferContentKeySessionSupportEnabledChanged();
 #endif
 
-    SingleThreadWeakPtr<Page> m_page;
+    WeakPtr<Page> m_page;
 
     Seconds m_minimumDOMTimerInterval;
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/page/UserContentProvider.h b/modules/javafx.web/src/main/native/Source/WebCore/page/UserContentProvider.h
index f0a806ca412..592b896c6fc 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/page/UserContentProvider.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/page/UserContentProvider.h
@@ -84,7 +84,7 @@ class UserContentProvider : public RefCounted<UserContentProvider> {
     WEBCORE_EXPORT void invalidateInjectedStyleSheetCacheInAllFramesInAllPages();
 
 private:
-    SingleThreadWeakHashSet<Page> m_pages;
+    WeakHashSet<Page> m_pages;
     WeakHashSet<UserContentProviderInvalidationClient> m_userMessageHandlerInvalidationClients;
 };
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/page/VisitedLinkStore.h b/modules/javafx.web/src/main/native/Source/WebCore/page/VisitedLinkStore.h
index bd9053d69e6..33a28d43410 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/page/VisitedLinkStore.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/page/VisitedLinkStore.h
@@ -50,7 +50,7 @@ class VisitedLinkStore : public RefCounted<VisitedLinkStore> {
     WEBCORE_EXPORT void invalidateStylesForLink(SharedStringHash);
 
 private:
-    SingleThreadWeakHashSet<Page> m_pages;
+    WeakHashSet<Page> m_pages;
 };
 
 } // namespace WebCore
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/page/scrolling/ScrollingCoordinator.h b/modules/javafx.web/src/main/native/Source/WebCore/page/scrolling/ScrollingCoordinator.h
index 044da6f0b8a..3d38036d09b 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/page/scrolling/ScrollingCoordinator.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/page/scrolling/ScrollingCoordinator.h
@@ -226,7 +226,7 @@ class ScrollingCoordinator : public ThreadSafeRefCountedAndCanMakeThreadSafeWeak
 
     virtual void willCommitTree() { }
 
-    SingleThreadWeakPtr<Page> m_page; // FIXME: ideally this would be a WeakRef but it gets nulled on async teardown.
+    WeakPtr<Page> m_page; // FIXME: ideally this would be a WeakRef but it gets nulled on async teardown.
 
 private:
     virtual bool hasVisibleSlowRepaintViewportConstrainedObjects(const LocalFrameView&) const;
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/platform/SharedBuffer.cpp b/modules/javafx.web/src/main/native/Source/WebCore/platform/SharedBuffer.cpp
index 38324fd9285..567abce5293 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/platform/SharedBuffer.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/platform/SharedBuffer.cpp
@@ -195,6 +195,10 @@ String FragmentedSharedBuffer::toHexString() const
 
 RefPtr<ArrayBuffer> FragmentedSharedBuffer::tryCreateArrayBuffer() const
 {
+    if (size() > std::numeric_limits<unsigned>::max()) {
+        WTFLogAlways("SharedBuffer::tryCreateArrayBuffer Unable to create buffer. Requested size is too large (%zu)\n", size());
+        return nullptr;
+    }
     auto arrayBuffer = ArrayBuffer::tryCreateUninitialized(static_cast<unsigned>(size()), 1);
     if (!arrayBuffer) {
         WTFLogAlways("SharedBuffer::tryCreateArrayBuffer Unable to create buffer. Requested size was %zu\n", size());
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/platform/audio/MultiChannelResampler.cpp b/modules/javafx.web/src/main/native/Source/WebCore/platform/audio/MultiChannelResampler.cpp
index 2a4e0c79b13..c44df274cbb 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/platform/audio/MultiChannelResampler.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/platform/audio/MultiChannelResampler.cpp
@@ -42,19 +42,8 @@ namespace WebCore {
 MultiChannelResampler::MultiChannelResampler(double scaleFactor, unsigned numberOfChannels, unsigned requestFrames, Function<void(AudioBus*, size_t framesToProcess)>&& provideInput)
     : m_numberOfChannels(numberOfChannels)
     , m_provideInput(WTFMove(provideInput))
-    , m_multiChannelBus(AudioBus::create(numberOfChannels, requestFrames, false))
+    , m_multiChannelBus(AudioBus::create(numberOfChannels, requestFrames))
 {
-    // As an optimization, we will use the buffer passed to provideInputForChannel() as channel memory for the first channel so we
-    // only need to allocate memory if there is more than one channel.
-    if (numberOfChannels > 1) {
-        m_channelsMemory = Vector<std::unique_ptr<AudioFloatArray>>(numberOfChannels - 1, [&](size_t i) {
-            size_t channelIndex = i + 1;
-            auto floatArray = makeUnique<AudioFloatArray>(requestFrames);
-            m_multiChannelBus->setChannelMemory(channelIndex, floatArray->data(), requestFrames);
-            return floatArray;
-        });
-        }
-
     // Create each channel's resampler.
     m_kernels = Vector<std::unique_ptr<SincResampler>>(numberOfChannels, [&](size_t channelIndex) {
         return makeUnique<SincResampler>(scaleFactor, requestFrames, std::bind(&MultiChannelResampler::provideInputForChannel, this, std::placeholders::_1, std::placeholders::_2, channelIndex));
@@ -93,16 +82,10 @@ void MultiChannelResampler::process(AudioBus* destination, size_t framesToProces
 void MultiChannelResampler::provideInputForChannel(std::span<float> buffer, size_t framesToProcess, unsigned channelIndex)
 {
     ASSERT(channelIndex < m_multiChannelBus->numberOfChannels());
-    ASSERT(framesToProcess == m_multiChannelBus->length());
+    ASSERT(framesToProcess <= m_multiChannelBus->length());
 
-    if (!channelIndex) {
-        // As an optimization, we use the provided buffer as memory for the first channel in the AudioBus. This avoids
-        // having to memcpy() for the first channel.
-        RELEASE_ASSERT(framesToProcess <= buffer.size());
-        m_multiChannelBus->setChannelMemory(0, buffer.data(), framesToProcess);
+    if (!channelIndex)
         m_provideInput(m_multiChannelBus.get(), framesToProcess);
-        return;
-    }
 
     // Copy the channel data from what we received from m_multiChannelProvider.
     memcpySpan(buffer.subspan(0, framesToProcess), m_multiChannelBus->channel(channelIndex)->span().subspan(0, framesToProcess));
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/platform/audio/MultiChannelResampler.h b/modules/javafx.web/src/main/native/Source/WebCore/platform/audio/MultiChannelResampler.h
index 2010f885eb6..4cc16979506 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/platform/audio/MultiChannelResampler.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/platform/audio/MultiChannelResampler.h
@@ -29,7 +29,6 @@
 #ifndef MultiChannelResampler_h
 #define MultiChannelResampler_h
 
-#include "AudioArray.h"
 #include <memory>
 #include <wtf/Function.h>
 #include <wtf/Vector.h>
@@ -62,7 +61,6 @@ class MultiChannelResampler final {
     size_t m_outputFramesReady { 0 };
     Function<void(AudioBus*, size_t framesToProcess)> m_provideInput;
     RefPtr<AudioBus> m_multiChannelBus;
-    Vector<std::unique_ptr<AudioFloatArray>> m_channelsMemory;
 };
 
 } // namespace WebCore
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp b/modules/javafx.web/src/main/native/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp
index 8f8058844cb..68c6299b55c 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp
@@ -112,6 +112,11 @@ PlatformMediaSessionManager::PlatformMediaSessionManager()
 {
 }
 
+PlatformMediaSessionManager::~PlatformMediaSessionManager()
+{
+    m_taskGroup.cancel();
+}
+
 static inline unsigned indexFromMediaType(PlatformMediaSession::MediaType type)
 {
     return static_cast<unsigned>(type);
@@ -469,7 +474,7 @@ void PlatformMediaSessionManager::sessionCanProduceAudioChanged()
         return;
 
     m_alreadyScheduledSessionStatedUpdate = true;
-    callOnMainThread([this] {
+    enqueueTaskOnMainThread([this] {
         m_alreadyScheduledSessionStatedUpdate = false;
     maybeActivateAudioSession();
     updateSessionState();
@@ -633,7 +638,7 @@ void PlatformMediaSessionManager::scheduleUpdateSessionState()
         return;
 
     m_hasScheduledSessionStateUpdate = true;
-    callOnMainThread([this] {
+    enqueueTaskOnMainThread([this] {
         updateSessionState();
         m_hasScheduledSessionStateUpdate = false;
     });
@@ -823,6 +828,13 @@ void PlatformMediaSessionManager::setMediaCapabilityGrantsEnabled(bool mediaCapa
 }
 #endif
 
+void PlatformMediaSessionManager::enqueueTaskOnMainThread(Function<void()>&& task)
+{
+    callOnMainThread(CancellableTask(m_taskGroup, [task = WTFMove(task)] () mutable {
+        task();
+    }));
+}
+
 #if !RELEASE_LOG_DISABLED
 WTFLogChannel& PlatformMediaSessionManager::logChannel() const
 {
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/platform/audio/PlatformMediaSessionManager.h b/modules/javafx.web/src/main/native/Source/WebCore/platform/audio/PlatformMediaSessionManager.h
index 63da933c584..38a52b6b72a 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/platform/audio/PlatformMediaSessionManager.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/platform/audio/PlatformMediaSessionManager.h
@@ -30,6 +30,7 @@
 #include "RemoteCommandListener.h"
 #include "Timer.h"
 #include <wtf/AggregateLogger.h>
+#include <wtf/CancellableTask.h>
 #include <wtf/Vector.h>
 #include <wtf/WeakHashSet.h>
 #include <wtf/WeakPtr.h>
@@ -80,7 +81,7 @@ class PlatformMediaSessionManager
     WEBCORE_EXPORT static void setMediaCapabilityGrantsEnabled(bool);
 #endif
 
-    virtual ~PlatformMediaSessionManager() = default;
+    virtual ~PlatformMediaSessionManager();
 
     virtual void scheduleSessionStatusUpdate() { }
 
@@ -214,6 +215,8 @@ class PlatformMediaSessionManager
 
     std::optional<bool> supportsSpatialAudioPlayback() { return m_supportsSpatialAudioPlayback; }
 
+    void enqueueTaskOnMainThread(Function<void()>&&);
+
 private:
     friend class Internals;
 
@@ -240,6 +243,8 @@ class PlatformMediaSessionManager
     WeakHashSet<PlatformMediaSession::AudioCaptureSource> m_audioCaptureSources;
     bool m_hasScheduledSessionStateUpdate { false };
 
+    TaskCancellationGroup m_taskGroup;
+
 #if ENABLE(WEBM_FORMAT_READER)
     static bool m_webMFormatReaderEnabled;
 #endif
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNeonParallelApplier.cpp b/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNeonParallelApplier.cpp
index 04d855fa6d7..5f4250d87b6 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNeonParallelApplier.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNeonParallelApplier.cpp
@@ -542,14 +542,14 @@ void FELightingNeonParallelApplier::applyPlatformParallel(const LightingData& da
     floatArguments.colorBlue = color.blue;
     floatArguments.padding4 = 0;
 
-    if (data.lightSource->type() == LS_POINT) {
+    if (data.lightSource->type() == LightType::LS_POINT) {
         neonData.flags |= FLAG_POINT_LIGHT;
         auto& pointLightSource = downcast<PointLightSource>(*data.lightSource);
         floatArguments.lightX = pointLightSource.position().x();
         floatArguments.lightY = pointLightSource.position().y();
         floatArguments.lightZ = pointLightSource.position().z();
         floatArguments.padding2 = 0;
-    } else if (data.lightSource->type() == LS_SPOT) {
+    } else if (data.lightSource->type() == LightType::LS_SPOT) {
         neonData.flags |= FLAG_SPOT_LIGHT;
         auto& spotLightSource = downcast<SpotLightSource>(*data.lightSource);
         floatArguments.lightX = spotLightSource.position().x();
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/filters/FELighting.h b/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/filters/FELighting.h
index 918657c43e4..27546b040d0 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/filters/FELighting.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/filters/FELighting.h
@@ -68,11 +68,6 @@ class FELighting : public FilterEffect {
 
     std::unique_ptr<FilterEffectApplier> createSoftwareApplier() const override;
 
-#if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_COMPATIBLE)
-    static int getPowerCoefficients(float exponent);
-    inline void platformApplyNeon(const LightingData&, const LightSource::PaintingData&);
-#endif
-
     Color m_lightingColor;
     float m_surfaceScale;
     float m_diffuseConstant;
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp b/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp
index d833de69279..8457dcebb43 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp
@@ -914,10 +914,15 @@ void CoordinatedGraphicsLayer::flushCompositingStateForThisLayerOnly()
 
         // Update the image contents only when the image layer is visible and the native image changed.
         auto& layerState = m_nicosia.imageBacking->layerState();
-        layerState.imageID = imageID;
-        layerState.update.isVisible = transformedVisibleRect().intersects(IntRect(contentsRect()));
-        if (layerState.update.isVisible && (!nativeImageID || layerState.update.nativeImageID != nativeImageID)) {
+        bool nativeImageChanged = layerState.update.nativeImageID != nativeImageID;
+        if (nativeImageChanged)
             layerState.update.nativeImageID = nativeImageID;
+
+        bool wasVisible = layerState.update.isVisible;
+        layerState.update.isVisible = transformedVisibleRect().intersects(IntRect(contentsRect()));
+
+        // Update the image contents only when the image layer is visible and it was previously hidden or the native image changed.
+        if (layerState.update.isVisible && (!wasVisible || nativeImageChanged)) {
             layerState.update.imageBackingStore = m_coordinator->imageBackingStore(nativeImageID,
                 [&] {
                     auto buffer = Nicosia::Buffer::create(IntSize(image.size()),
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/platform/mediarecorder/MediaRecorderPrivateGStreamer.cpp b/modules/javafx.web/src/main/native/Source/WebCore/platform/mediarecorder/MediaRecorderPrivateGStreamer.cpp
index 4446074cf81..9292f3efea1 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/platform/mediarecorder/MediaRecorderPrivateGStreamer.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/platform/mediarecorder/MediaRecorderPrivateGStreamer.cpp
@@ -137,6 +137,7 @@ void MediaRecorderPrivateBackend::stopRecording(CompletionHandler<void()>&& comp
     GST_DEBUG_OBJECT(m_transcoder.get(), "Stop requested, pushing EOS event");
 
     auto scopeExit = makeScopeExit([this, completionHandler = WTFMove(completionHandler)]() mutable {
+        unregisterPipeline(m_pipeline);
         m_pipeline.clear();
         GST_DEBUG_OBJECT(m_transcoder.get(), "Stopping");
         m_transcoder.clear();
@@ -297,12 +298,11 @@ GRefPtr<GstEncodingContainerProfile> MediaRecorderPrivateBackend::containerProfi
 void MediaRecorderPrivateBackend::setSource(GstElement* element)
 {
     auto selectedTracks = MediaRecorderPrivate::selectTracks(stream());
-    bool onlyTrack = (selectedTracks.audioTrack && !selectedTracks.videoTrack) || (selectedTracks.videoTrack && !selectedTracks.audioTrack);
     auto* src = WEBKIT_MEDIA_STREAM_SRC(element);
     if (selectedTracks.audioTrack)
-        webkitMediaStreamSrcAddTrack(src, selectedTracks.audioTrack, onlyTrack);
+        webkitMediaStreamSrcAddTrack(src, selectedTracks.audioTrack);
     if (selectedTracks.videoTrack)
-        webkitMediaStreamSrcAddTrack(src, selectedTracks.videoTrack, onlyTrack);
+        webkitMediaStreamSrcAddTrack(src, selectedTracks.videoTrack);
     if (m_selectTracksCallback) {
         auto& callback = *m_selectTracksCallback;
         callback(selectedTracks);
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/platform/mediastream/RTCRtpTransceiverDirection.h b/modules/javafx.web/src/main/native/Source/WebCore/platform/mediastream/RTCRtpTransceiverDirection.h
index 7c0d67db592..15d7136bdc1 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/platform/mediastream/RTCRtpTransceiverDirection.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/platform/mediastream/RTCRtpTransceiverDirection.h
@@ -27,6 +27,8 @@
 
 #if ENABLE(WEB_RTC)
 
+#include <wtf/text/WTFString.h>
+
 namespace WebCore {
 
 enum class RTCRtpTransceiverDirection {
@@ -36,6 +38,8 @@ enum class RTCRtpTransceiverDirection {
     Inactive
 };
 
+String convertEnumerationToString(RTCRtpTransceiverDirection); // in JSRTCRtpTransceiverDirection.h
+
 } // namespace WebCore
 
 #endif
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/platform/text/SegmentedString.h b/modules/javafx.web/src/main/native/Source/WebCore/platform/text/SegmentedString.h
index 7602a3651c1..06ff28c51fe 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/platform/text/SegmentedString.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/platform/text/SegmentedString.h
@@ -97,10 +97,10 @@ class SegmentedString {
         unsigned originalLength { 0 };
         unsigned length { 0 };
         union {
-            const LChar* currentCharacter8;
+            const LChar* currentCharacter8 { nullptr };
             const UChar* currentCharacter16;
         };
-        bool is8Bit;
+        bool is8Bit { true };
         bool doNotExcludeLineNumbers { true };
     };
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/platform/xdg/MIMETypeRegistryXdg.cpp b/modules/javafx.web/src/main/native/Source/WebCore/platform/xdg/MIMETypeRegistryXdg.cpp
index 595b30a77b5..e32a6184679 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/platform/xdg/MIMETypeRegistryXdg.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/platform/xdg/MIMETypeRegistryXdg.cpp
@@ -29,6 +29,7 @@
 #define XDG_PREFIX _wk_xdg
 #include "xdgmime.h"
 
+#define MAX_EXTENSION_COUNT 10
 namespace WebCore {
 
 String MIMETypeRegistry::mimeTypeForExtension(StringView string)
@@ -69,10 +70,19 @@ String MIMETypeRegistry::preferredExtensionForMIMEType(const String& mimeType)
     return returnValue;
 }
 
-Vector<String> MIMETypeRegistry::extensionsForMIMEType(const String&)
+Vector<String> MIMETypeRegistry::extensionsForMIMEType(const String& mimeType)
 {
-    ASSERT_NOT_IMPLEMENTED_YET();
+    if (mimeType.isEmpty())
     return { };
+
+    Vector<String> returnValue;
+    char* extensions[MAX_EXTENSION_COUNT];
+    int n = xdg_mime_get_simple_globs(mimeType.utf8().data(), extensions, MAX_EXTENSION_COUNT);
+    for (int i = 0; i < n; ++i) {
+        returnValue.append(String::fromUTF8(extensions[i]));
+        free(extensions[i]);
+    }
+    return returnValue;
 }
 
 }
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/plugins/PluginInfoProvider.h b/modules/javafx.web/src/main/native/Source/WebCore/plugins/PluginInfoProvider.h
index f9d8a3f67a8..4e4ab9ff13b 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/plugins/PluginInfoProvider.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/plugins/PluginInfoProvider.h
@@ -47,7 +47,7 @@ class WEBCORE_EXPORT PluginInfoProvider : public RefCounted<PluginInfoProvider>,
 private:
     virtual void refreshPlugins() = 0;
 
-    SingleThreadWeakHashSet<Page> m_pages;
+    WeakHashSet<Page> m_pages;
 };
 
 }
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/rendering/InlineBoxPainter.cpp b/modules/javafx.web/src/main/native/Source/WebCore/rendering/InlineBoxPainter.cpp
index 14770df62bc..18ca5678ee3 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/rendering/InlineBoxPainter.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/rendering/InlineBoxPainter.cpp
@@ -238,7 +238,7 @@ void InlineBoxPainter::paintDecorations()
     if (!BackgroundPainter::boxShadowShouldBeAppliedToBackground(renderer(), adjustedPaintoffset, BackgroundBleedNone, m_inlineBox))
         paintBoxShadow(ShadowStyle::Normal, paintRect);
 
-    auto color = style.visitedDependentColor(CSSPropertyBackgroundColor);
+    auto color = style.visitedDependentColor(CSSPropertyBackgroundColor, m_paintInfo.paintBehavior);
     auto compositeOp = renderer().document().compositeOperatorForBackgroundColor(color, renderer());
 
     color = style.colorByApplyingColorFilter(color);
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderLayer.cpp b/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderLayer.cpp
index a0b024dcd2e..213d3d3ca7e 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderLayer.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderLayer.cpp
@@ -2166,11 +2166,11 @@ bool RenderLayer::cannotBlitToWindow() const
 
 RenderLayer* RenderLayer::transparentPaintingAncestor()
 {
-    if (isComposited())
+    if (isComposited() || paintsIntoProvidedBacking())
         return nullptr;
 
     for (RenderLayer* curr = stackingContext(); curr; curr = curr->stackingContext()) {
-        if (curr->isComposited())
+        if (curr->isComposited() || curr->paintsIntoProvidedBacking())
             break;
         if (curr->isTransparent())
             return curr;
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderLayerCompositor.cpp b/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderLayerCompositor.cpp
index 8e12f3ad858..ae08a7f907f 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderLayerCompositor.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderLayerCompositor.cpp
@@ -3854,11 +3854,13 @@ static void collectStationaryLayerRelatedOverflowNodes(const RenderLayer& layer,
 
     auto appendOverflowLayerNodeID = [&scrollingNodes] (const RenderLayer& overflowLayer) {
         ASSERT(overflowLayer.isComposited());
-        auto scrollingNodeID = overflowLayer.backing()->scrollingNodeIDForRole(ScrollCoordinationRole::Scrolling);
-        if (scrollingNodeID)
+        if (overflowLayer.isComposited()) {
+            if (auto scrollingNodeID = overflowLayer.backing()->scrollingNodeIDForRole(ScrollCoordinationRole::Scrolling)) {
             scrollingNodes.append(scrollingNodeID);
-        else
-            LOG(Scrolling, "Layer %p doesn't have scrolling node ID yet", &overflowLayer);
+                return;
+            }
+        }
+        LOG(Scrolling, "Layer %p isn't composited or doesn't have scrolling node ID yet", &overflowLayer);
     };
 
     // Collect all the composited scrollers which affect the position of this layer relative to its compositing ancestor (which might be inside the scroller or the scroller itself).
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderListBox.cpp b/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderListBox.cpp
index 3a40dd4b456..0bf71eaec43 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderListBox.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderListBox.cpp
@@ -484,7 +484,7 @@ void RenderListBox::paintItemForeground(PaintInfo& paintInfo, const LayoutPoint&
     const auto& listItems = selectElement().listItems();
     RefPtr listItemElement = listItems[listIndex].get();
 
-    auto itemStyle = listItemElement->computedStyle();
+    auto itemStyle = listItemElement->computedStyleForEditability();
     if (!itemStyle)
         return;
 
@@ -544,7 +544,7 @@ void RenderListBox::paintItemBackground(PaintInfo& paintInfo, const LayoutPoint&
 {
     const auto& listItems = selectElement().listItems();
     RefPtr listItemElement = listItems[listIndex].get();
-    auto itemStyle = listItemElement->computedStyle();
+    auto itemStyle = listItemElement->computedStyleForEditability();
     if (!itemStyle)
         return;
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderMenuList.cpp b/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderMenuList.cpp
index cde4c2706ae..bcf0bc70645 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderMenuList.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderMenuList.cpp
@@ -216,7 +216,7 @@ void RenderMenuList::updateOptionsWidth()
         if (theme().popupOptionSupportsTextIndent()) {
             // Add in the option's text indent.  We can't calculate percentage values for now.
             float optionWidth = 0;
-            if (auto* optionStyle = option->computedStyle())
+            if (auto* optionStyle = option->computedStyleForEditability())
                 optionWidth += minimumValueForLength(optionStyle->textIndent(), 0);
             if (!text.isEmpty()) {
                 const FontCascade& font = style().fontCascade();
@@ -265,7 +265,7 @@ void RenderMenuList::setTextFromOption(int optionIndex)
     if (i >= 0 && i < size) {
         if (RefPtr option = dynamicDowncast<HTMLOptionElement>(*listItems[i])) {
             text = option->textIndentedToRespectGroupLabel();
-            auto* style = option->computedStyle();
+            auto* style = option->computedStyleForEditability();
             m_optionStyle = style ? RenderStyle::clonePtr(*style) : nullptr;
         }
     }
@@ -515,9 +515,12 @@ PopupMenuStyle RenderMenuList::itemStyle(unsigned listIndex) const
     bool itemHasCustomBackgroundColor;
     getItemBackgroundColor(listIndex, itemBackgroundColor, itemHasCustomBackgroundColor);
 
-    auto& style = *element->computedStyle();
-    return PopupMenuStyle(style.visitedDependentColorWithColorFilter(CSSPropertyColor), itemBackgroundColor, style.fontCascade(), style.visibility() == Visibility::Visible,
-        style.display() == DisplayType::None, true, style.textIndent(), style.direction(), isOverride(style.unicodeBidi()),
+    auto* style = element->computedStyleForEditability();
+    if (!style)
+        return menuStyle();
+
+    return PopupMenuStyle(style->visitedDependentColorWithColorFilter(CSSPropertyColor), itemBackgroundColor, style->fontCascade(), style->visibility() == Visibility::Visible,
+        style->display() == DisplayType::None, true, style->textIndent(), style->direction(), isOverride(style->unicodeBidi()),
         itemHasCustomBackgroundColor ? PopupMenuStyle::CustomBackgroundColor : PopupMenuStyle::DefaultBackgroundColor);
 }
 
@@ -531,7 +534,10 @@ void RenderMenuList::getItemBackgroundColor(unsigned listIndex, Color& itemBackg
     }
     HTMLElement* element = listItems[listIndex].get();
 
-    Color backgroundColor = element->computedStyle()->visitedDependentColorWithColorFilter(CSSPropertyBackgroundColor);
+    Color backgroundColor;
+    if (auto* style = element->computedStyleForEditability())
+        backgroundColor = style->visitedDependentColorWithColorFilter(CSSPropertyBackgroundColor);
+
     itemHasCustomBackgroundColor = backgroundColor.isValid() && backgroundColor.isVisible();
     // If the item has an opaque background color, return that.
     if (backgroundColor.isOpaque()) {
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/rendering/style/StyleGradientImage.cpp b/modules/javafx.web/src/main/native/Source/WebCore/rendering/style/StyleGradientImage.cpp
index 29b8bcd4f72..549c9f82fad 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/rendering/style/StyleGradientImage.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/rendering/style/StyleGradientImage.cpp
@@ -568,9 +568,12 @@ GradientColorStops StyleGradientImage::computeStops(GradientAdapter& gradientAda
     // We can't just push this logic down into the platform-specific Gradient code,
     // because we have to know the extent of the gradient, and possible move the end points.
     if (repeating == CSSGradientRepeat::Repeating && numberOfStops > 1) {
+        float maxExtent = gradientAdapter.maxExtent(maxLengthForRepeat, gradientLength);
         // If the difference in the positions of the first and last color-stops is 0,
         // the gradient defines a solid-color image with the color of the last color-stop in the rule.
         float gradientRange = *stops.last().offset - *stops.first().offset;
+        if (maxExtent > 1)
+            gradientRange /= maxExtent;
         if (!gradientRange) {
             stops.first().offset = 0;
             stops.first().color = stops.last().color;
@@ -587,7 +590,6 @@ GradientColorStops StyleGradientImage::computeStops(GradientAdapter& gradientAda
         } else {
             // Since the gradient range is deemed big enough, the amount of necessary stops is
             // calculated for both the [0, first-offset] and the [last-offset, maxExtent] ranges.
-            float maxExtent = gradientAdapter.maxExtent(maxLengthForRepeat, gradientLength);
             CheckedSize numberOfGeneratedStopsBeforeFirst;
             CheckedSize numberOfGeneratedStopsAfterLast;
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/rendering/svg/SVGResources.cpp b/modules/javafx.web/src/main/native/Source/WebCore/rendering/svg/SVGResources.cpp
index a14ac6d9149..25271d06c7d 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/rendering/svg/SVGResources.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/rendering/svg/SVGResources.cpp
@@ -310,6 +310,11 @@ std::unique_ptr<SVGResources> SVGResources::buildCachedResources(const RenderEle
 
 void SVGResources::layoutDifferentRootIfNeeded(const RenderElement& resourcesClient)
 {
+    if (m_inLayoutForDifferentRoot)
+        return;
+
+    SetForScope inLayoutForDifferentRoot(m_inLayoutForDifferentRoot, true);
+
     const LegacyRenderSVGRoot* clientRoot = nullptr;
 
     auto layoutDifferentRootIfNeeded = [&](LegacyRenderSVGResourceContainer* container) {
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/rendering/svg/SVGResources.h b/modules/javafx.web/src/main/native/Source/WebCore/rendering/svg/SVGResources.h
index 3727907a4de..7deacd6661b 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/rendering/svg/SVGResources.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/rendering/svg/SVGResources.h
@@ -144,6 +144,7 @@ class SVGResources {
     std::unique_ptr<MarkerData> m_markerData;
     std::unique_ptr<FillStrokeData> m_fillStrokeData;
     SingleThreadWeakPtr<LegacyRenderSVGResourceContainer> m_linkedResource;
+    bool m_inLayoutForDifferentRoot { false };
 };
 
 } // namespace WebCore
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/rendering/updating/RenderTreeBuilder.cpp b/modules/javafx.web/src/main/native/Source/WebCore/rendering/updating/RenderTreeBuilder.cpp
index 00a5d39d920..7fe258f7cbb 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/rendering/updating/RenderTreeBuilder.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/rendering/updating/RenderTreeBuilder.cpp
@@ -852,32 +852,32 @@ void RenderTreeBuilder::destroyAndCleanUpAnonymousWrappers(RenderObject& rendere
         return *destroyRoot;
     };
 
-    auto& destroyRoot = destroyRootIncludingAnonymous();
+    WeakPtr destroyRoot = destroyRootIncludingAnonymous();
 
     auto clearFloatsAndOutOfFlowPositionedObjects = [&] {
         // Remove floats and out-of-flow positioned objects from their containing block before detaching
         // the renderer from the tree. It includes all the anonymous block descendants that we are about
         // to destroy as well as part of the cleanup process below.
-        auto* destroyRootElement = dynamicDowncast<RenderElement>(destroyRoot);
+        WeakPtr destroyRootElement = dynamicDowncast<RenderElement>(destroyRoot.get());
         if (!destroyRootElement)
             return;
         for (auto& descendant : descendantsOfType<RenderBox>(*destroyRootElement)) {
             if (descendant.isFloatingOrOutOfFlowPositioned())
                 descendant.removeFloatingOrPositionedChildFromBlockLists();
         }
-        if (CheckedPtr box = dynamicDowncast<RenderBox>(destroyRoot); box && box->isFloatingOrOutOfFlowPositioned())
+        if (CheckedPtr box = dynamicDowncast<RenderBox>(destroyRoot.get()); box && box->isFloatingOrOutOfFlowPositioned())
             box->removeFloatingOrPositionedChildFromBlockLists();
     };
     clearFloatsAndOutOfFlowPositionedObjects();
 
     auto collapseAndDestroyAnonymousSiblings = [&] {
         // FIXME: Probably need to handle other table parts here as well.
-        if (CheckedPtr cell = dynamicDowncast<RenderTableCell>(destroyRoot)) {
+        if (CheckedPtr cell = dynamicDowncast<RenderTableCell>(destroyRoot.get())) {
             tableBuilder().collapseAndDestroyAnonymousSiblingCells(*cell);
             return;
         }
 
-        if (CheckedPtr row = dynamicDowncast<RenderTableRow>(destroyRoot)) {
+        if (CheckedPtr row = dynamicDowncast<RenderTableRow>(destroyRoot.get())) {
             tableBuilder().collapseAndDestroyAnonymousSiblingRows(*row);
             return;
         }
@@ -885,12 +885,15 @@ void RenderTreeBuilder::destroyAndCleanUpAnonymousWrappers(RenderObject& rendere
     collapseAndDestroyAnonymousSiblings();
 
     // FIXME: Do not try to collapse/cleanup the anonymous wrappers inside destroy (see webkit.org/b/186746).
-    WeakPtr destroyRootParent = *destroyRoot.parent();
-    if (&rendererToDestroy != &destroyRoot) {
+    WeakPtr destroyRootParent = destroyRoot->parent();
+    if (&rendererToDestroy != destroyRoot.get()) {
         // Destroy the child renderer first, before we start tearing down the anonymous wrapper ancestor chain.
         destroy(rendererToDestroy);
     }
-    destroy(destroyRoot);
+
+    if (destroyRoot)
+        destroy(*destroyRoot);
+
     if (!destroyRootParent)
         return;
     removeAnonymousWrappersForInlineChildrenIfNeeded(*destroyRootParent);
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/rendering/updating/RenderTreeBuilderRuby.cpp b/modules/javafx.web/src/main/native/Source/WebCore/rendering/updating/RenderTreeBuilderRuby.cpp
index 4b9b01d431e..429a8b85950 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/rendering/updating/RenderTreeBuilderRuby.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/rendering/updating/RenderTreeBuilderRuby.cpp
@@ -271,10 +271,18 @@ RenderElement& RenderTreeBuilder::Ruby::findOrCreateParentForStyleBasedRubyChild
     if (!child.isRenderText() && child.style().display() == DisplayType::Ruby && parent.style().display() == DisplayType::RubyBlock)
         return parent;
 
-    if (parent.style().display() == DisplayType::RubyBlock && parent.firstChild()) {
+    if (parent.style().display() == DisplayType::RubyBlock) {
         // See if we have an anonymous ruby box already.
-        ASSERT(parent.firstChild()->style().display() == DisplayType::Ruby);
-        return downcast<RenderElement>(*parent.firstChild());
+        // FIXME: It should be the immediate child but continuations can break this assumption.
+        for (CheckedPtr first = parent.firstChild(); first; first = first->firstChildSlow()) {
+            if (!first->isAnonymous()) {
+                // <ruby blockified><ruby> is valid and still requires construction of an anonymous inline ruby box.
+                ASSERT(first->style().display() == DisplayType::Ruby);
+                break;
+            }
+            if (first->style().display() == DisplayType::Ruby)
+                return downcast<RenderElement>(*first);
+        }
     }
 
     if (parent.style().display() != DisplayType::Ruby) {
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/svg/SVGElement.cpp b/modules/javafx.web/src/main/native/Source/WebCore/svg/SVGElement.cpp
index c188c0cd5b5..f2bc3173f2a 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/svg/SVGElement.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/svg/SVGElement.cpp
@@ -1042,13 +1042,13 @@ Node::InsertedIntoAncestorResult SVGElement::insertedIntoAncestor(InsertionType
     else if (RefPtr parentElement = dynamicDowncast<SVGElement>(parentNode()); parentElement && &parentOfInsertedTree == parentNode())
         parentElement->updateRelativeLengthsInformationForChild(hasRelativeLengths(), *this);
 
+    hideNonce();
+
     if (needsPendingResourceHandling() && insertionType.connectedToDocument && !isInShadowTree()) {
         if (treeScopeForSVGReferences().isIdOfPendingSVGResource(getIdAttribute()))
             return InsertedIntoAncestorResult::NeedsPostInsertionCallback;
     }
 
-    hideNonce();
-
     return InsertedIntoAncestorResult::Done;
 }
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/testing/InternalSettings.h b/modules/javafx.web/src/main/native/Source/WebCore/testing/InternalSettings.h
index 2a6eedea7b8..b3eba11e8f7 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/testing/InternalSettings.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/testing/InternalSettings.h
@@ -165,7 +165,7 @@ class InternalSettings : public InternalSettingsGenerated {
         bool m_shouldDeactivateAudioSession;
     };
 
-    SingleThreadWeakPtr<Page> m_page;
+    WeakPtr<Page> m_page;
     Backup m_backup;
 };
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/workers/Worker.cpp b/modules/javafx.web/src/main/native/Source/WebCore/workers/Worker.cpp
index 99668d09c5d..67aaf3aae78 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/workers/Worker.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/workers/Worker.cpp
@@ -222,6 +222,7 @@ void Worker::notifyFinished()
     WorkerInitializationData initializationData {
         m_scriptLoader->takeServiceWorkerData(),
         m_clientIdentifier,
+        m_scriptLoader->advancedPrivacyProtections(),
         context->userAgent(m_scriptLoader->responseURL())
     };
     m_contextProxy.startWorkerGlobalScope(m_scriptLoader->responseURL(), *sessionID, m_options.name, WTFMove(initializationData), m_scriptLoader->script(), contentSecurityPolicyResponseHeaders, m_shouldBypassMainWorldContentSecurityPolicy, m_scriptLoader->crossOriginEmbedderPolicy(), m_workerCreationTime, referrerPolicy, m_options.type, m_options.credentials, m_runtimeFlags);
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerGlobalScope.cpp b/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerGlobalScope.cpp
index abf2146a4e3..4c6351b284a 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerGlobalScope.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerGlobalScope.cpp
@@ -97,7 +97,7 @@ static WorkQueue& sharedFileSystemStorageQueue()
 WTF_MAKE_ISO_ALLOCATED_IMPL(WorkerGlobalScope);
 
 WorkerGlobalScope::WorkerGlobalScope(WorkerThreadType type, const WorkerParameters& params, Ref<SecurityOrigin>&& origin, WorkerThread& thread, Ref<SecurityOrigin>&& topOrigin, IDBClient::IDBConnectionProxy* connectionProxy, SocketProvider* socketProvider, std::unique_ptr<WorkerClient>&& workerClient)
-    : WorkerOrWorkletGlobalScope(type, params.sessionID, isMainThread() ? Ref { commonVM() } : JSC::VM::create(), params.referrerPolicy, &thread, params.noiseInjectionHashSalt, params.clientIdentifier)
+    : WorkerOrWorkletGlobalScope(type, params.sessionID, isMainThread() ? Ref { commonVM() } : JSC::VM::create(), params.referrerPolicy, &thread, params.noiseInjectionHashSalt, params.advancedPrivacyProtections, params.clientIdentifier)
     , m_url(params.scriptURL)
     , m_ownerURL(params.ownerURL)
     , m_inspectorIdentifier(params.inspectorIdentifier)
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerInitializationData.h b/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerInitializationData.h
index f2a73bd6848..eab8d841996 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerInitializationData.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerInitializationData.h
@@ -25,9 +25,11 @@
 
 #pragma once
 
+#include "AdvancedPrivacyProtections.h"
 #include "ScriptExecutionContextIdentifier.h"
 #include "ServiceWorkerData.h"
 #include <wtf/CrossThreadCopier.h>
+#include <wtf/OptionSet.h>
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
@@ -35,6 +37,7 @@ namespace WebCore {
 struct WorkerInitializationData {
     std::optional<ServiceWorkerData> serviceWorkerData;
     std::optional<ScriptExecutionContextIdentifier> clientIdentifier;
+    OptionSet<WebCore::AdvancedPrivacyProtections> advancedPrivacyProtections;
     String userAgent;
 
     WorkerInitializationData isolatedCopy() const;
@@ -45,6 +48,7 @@ inline WorkerInitializationData WorkerInitializationData::isolatedCopy() const
     return {
         crossThreadCopy(serviceWorkerData),
         clientIdentifier,
+        advancedPrivacyProtections,
         userAgent.isolatedCopy()
     };
 }
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerMessagingProxy.cpp b/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerMessagingProxy.cpp
index 76d9dc74baa..e4630e51c30 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerMessagingProxy.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerMessagingProxy.cpp
@@ -149,6 +149,7 @@ void WorkerMessagingProxy::startWorkerGlobalScope(const URL& scriptURL, PAL::Ses
     WorkerParameters params { scriptURL, m_scriptExecutionContext->url(), name, identifier, WTFMove(initializationData.userAgent), isOnline, contentSecurityPolicyResponseHeaders, shouldBypassMainWorldContentSecurityPolicy, crossOriginEmbedderPolicy, timeOrigin, referrerPolicy, workerType, credentials, m_scriptExecutionContext->settingsValues(), WorkerThreadMode::CreateNewThread, sessionID,
         WTFMove(initializationData.serviceWorkerData),
         initializationData.clientIdentifier.value_or(ScriptExecutionContextIdentifier { }),
+        m_scriptExecutionContext->advancedPrivacyProtections(),
         m_scriptExecutionContext->noiseInjectionHashSalt()
     };
     auto thread = DedicatedWorkerThread::create(params, sourceCode, *this, *this, *this, *this, startMode, m_scriptExecutionContext->topOrigin(), proxy, socketProvider, runtimeFlags);
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerOrWorkletGlobalScope.cpp b/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerOrWorkletGlobalScope.cpp
index 45feab347dc..97be22eda70 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerOrWorkletGlobalScope.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerOrWorkletGlobalScope.cpp
@@ -40,7 +40,7 @@ namespace WebCore {
 
 WTF_MAKE_ISO_ALLOCATED_IMPL(WorkerOrWorkletGlobalScope);
 
-WorkerOrWorkletGlobalScope::WorkerOrWorkletGlobalScope(WorkerThreadType type, PAL::SessionID sessionID, Ref<JSC::VM>&& vm, ReferrerPolicy referrerPolicy, WorkerOrWorkletThread* thread, std::optional<uint64_t> noiseInjectionHashSalt, ScriptExecutionContextIdentifier contextIdentifier)
+WorkerOrWorkletGlobalScope::WorkerOrWorkletGlobalScope(WorkerThreadType type, PAL::SessionID sessionID, Ref<JSC::VM>&& vm, ReferrerPolicy referrerPolicy, WorkerOrWorkletThread* thread, std::optional<uint64_t> noiseInjectionHashSalt, OptionSet<AdvancedPrivacyProtections> advancedPrivacyProtections, ScriptExecutionContextIdentifier contextIdentifier)
     : ScriptExecutionContext(Type::WorkerOrWorkletGlobalScope, contextIdentifier)
     , m_script(makeUnique<WorkerOrWorkletScriptController>(type, WTFMove(vm), this))
     , m_moduleLoader(makeUnique<ScriptModuleLoader>(this, ScriptModuleLoader::OwnerType::WorkerOrWorklet))
@@ -49,6 +49,7 @@ WorkerOrWorkletGlobalScope::WorkerOrWorkletGlobalScope(WorkerThreadType type, PA
     , m_sessionID(sessionID)
     , m_referrerPolicy(referrerPolicy)
     , m_noiseInjectionHashSalt(noiseInjectionHashSalt)
+    , m_advancedPrivacyProtections(advancedPrivacyProtections)
 {
     relaxAdoptionRequirement();
 }
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerOrWorkletGlobalScope.h b/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerOrWorkletGlobalScope.h
index fc64ee1a76e..9dd71ea166f 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerOrWorkletGlobalScope.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerOrWorkletGlobalScope.h
@@ -39,6 +39,8 @@ class WorkerInspectorController;
 class WorkerOrWorkletScriptController;
 class WorkerOrWorkletThread;
 
+enum class AdvancedPrivacyProtections : uint16_t;
+
 class WorkerOrWorkletGlobalScope : public RefCounted<WorkerOrWorkletGlobalScope>, public ScriptExecutionContext, public EventTarget {
     WTF_MAKE_ISO_ALLOCATED(WorkerOrWorkletGlobalScope);
     WTF_MAKE_NONCOPYABLE(WorkerOrWorkletGlobalScope);
@@ -83,9 +85,10 @@ class WorkerOrWorkletGlobalScope : public RefCounted<WorkerOrWorkletGlobalScope>
     virtual FetchOptions::Destination destination() const = 0;
     ReferrerPolicy referrerPolicy() const final { return m_referrerPolicy; }
     std::optional<uint64_t> noiseInjectionHashSalt() const final { return m_noiseInjectionHashSalt; }
+    OptionSet<AdvancedPrivacyProtections> advancedPrivacyProtections() const final { return m_advancedPrivacyProtections; }
 
 protected:
-    WorkerOrWorkletGlobalScope(WorkerThreadType, PAL::SessionID, Ref<JSC::VM>&&, ReferrerPolicy, WorkerOrWorkletThread*, std::optional<uint64_t>,  ScriptExecutionContextIdentifier = { });
+    WorkerOrWorkletGlobalScope(WorkerThreadType, PAL::SessionID, Ref<JSC::VM>&&, ReferrerPolicy, WorkerOrWorkletThread*, std::optional<uint64_t>, OptionSet<AdvancedPrivacyProtections>, ScriptExecutionContextIdentifier = { });
 
     // ScriptExecutionContext.
     bool isJSExecutionForbidden() const final;
@@ -116,6 +119,7 @@ class WorkerOrWorkletGlobalScope : public RefCounted<WorkerOrWorkletGlobalScope>
     ReferrerPolicy m_referrerPolicy;
     bool m_isClosing { false };
     std::optional<uint64_t> m_noiseInjectionHashSalt;
+    OptionSet<AdvancedPrivacyProtections> m_advancedPrivacyProtections;
 };
 
 } // namespace WebCore
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerOrWorkletThread.cpp b/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerOrWorkletThread.cpp
index 3b4af74f137..fdd0d19b68c 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerOrWorkletThread.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerOrWorkletThread.cpp
@@ -110,7 +110,7 @@ void WorkerOrWorkletThread::runEventLoop()
 {
     // Does not return until terminated.
     if (is<WorkerDedicatedRunLoop>(m_runLoop.get()))
-        downcast<WorkerDedicatedRunLoop>(m_runLoop.get()).run(m_globalScope.get());
+        downcast<WorkerDedicatedRunLoop>(m_runLoop.get()).run(RefPtr { m_globalScope }.get());
 }
 
 void WorkerOrWorkletThread::workerOrWorkletThread()
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerScriptLoader.cpp b/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerScriptLoader.cpp
index 90cdca9a00f..a20fd013e10 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerScriptLoader.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerScriptLoader.cpp
@@ -76,6 +76,7 @@ std::optional<Exception> WorkerScriptLoader::loadSynchronously(ScriptExecutionCo
     m_source = source;
     m_destination = FetchOptions::Destination::Script;
     m_isCOEPEnabled = scriptExecutionContext->settingsValues().crossOriginEmbedderPolicyEnabled;
+    m_advancedPrivacyProtections = scriptExecutionContext->advancedPrivacyProtections();
 
     auto* serviceWorkerGlobalScope = dynamicDowncast<ServiceWorkerGlobalScope>(workerGlobalScope);
     if (serviceWorkerGlobalScope) {
@@ -131,6 +132,7 @@ void WorkerScriptLoader::loadAsynchronously(ScriptExecutionContext& scriptExecut
     m_destination = fetchOptions.destination;
     m_isCOEPEnabled = scriptExecutionContext.settingsValues().crossOriginEmbedderPolicyEnabled;
     m_clientIdentifier = clientIdentifier;
+    m_advancedPrivacyProtections = scriptExecutionContext.advancedPrivacyProtections();
 
     ASSERT(scriptRequest.httpMethod() == "GET"_s);
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerScriptLoader.h b/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerScriptLoader.h
index 9f1008a55d5..f34644853f8 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerScriptLoader.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerScriptLoader.h
@@ -26,6 +26,7 @@
 
 #pragma once
 
+#include "AdvancedPrivacyProtections.h"
 #include "CertificateInfo.h"
 #include "ContentSecurityPolicyResponseHeaders.h"
 #include "CrossOriginEmbedderPolicy.h"
@@ -40,6 +41,7 @@
 #include "ThreadableLoaderClient.h"
 #include <memory>
 #include <wtf/FastMalloc.h>
+#include <wtf/OptionSet.h>
 #include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>
 #include <wtf/URL.h>
@@ -70,6 +72,8 @@ class WorkerScriptLoader : public RefCounted<WorkerScriptLoader>, public Threada
 
     void notifyError();
 
+    OptionSet<AdvancedPrivacyProtections> advancedPrivacyProtections() const { return m_advancedPrivacyProtections; }
+
     const ScriptBuffer& script() const { return m_script; }
     const ContentSecurityPolicyResponseHeaders& contentSecurityPolicy() const { return m_contentSecurityPolicy; }
     const String& referrerPolicy() const { return m_referrerPolicy; }
@@ -160,6 +164,7 @@ class WorkerScriptLoader : public RefCounted<WorkerScriptLoader>, public Threada
     RefPtr<ServiceWorkerDataManager> m_serviceWorkerDataManager;
     WeakPtr<ScriptExecutionContext> m_context;
     String m_userAgentForSharedWorker;
+    OptionSet<AdvancedPrivacyProtections> m_advancedPrivacyProtections;
 };
 
 } // namespace WebCore
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerThread.cpp b/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerThread.cpp
index 369b08df253..0071043bfd2 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerThread.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerThread.cpp
@@ -27,6 +27,7 @@
 #include "config.h"
 #include "WorkerThread.h"
 
+#include "AdvancedPrivacyProtections.h"
 #include "IDBConnectionProxy.h"
 #include "ScriptSourceCode.h"
 #include "SecurityOrigin.h"
@@ -71,6 +72,7 @@ WorkerParameters WorkerParameters::isolatedCopy() const
         sessionID,
         crossThreadCopy(serviceWorkerData),
         clientIdentifier,
+        advancedPrivacyProtections,
         noiseInjectionHashSalt
     };
 }
@@ -198,6 +200,7 @@ SocketProvider* WorkerThread::socketProvider()
 
 WorkerGlobalScope* WorkerThread::globalScope()
 {
+    ASSERT(!thread() || thread() == &Thread::current());
     return downcast<WorkerGlobalScope>(WorkerOrWorkletThread::globalScope());
 }
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerThread.h b/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerThread.h
index 4be2244ed1a..75a7bb8f9b5 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerThread.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerThread.h
@@ -62,6 +62,8 @@ namespace IDBClient {
 class IDBConnectionProxy;
 }
 
+enum class AdvancedPrivacyProtections : uint16_t;
+
 struct WorkerThreadStartupData;
 
 struct WorkerParameters {
@@ -84,6 +86,7 @@ struct WorkerParameters {
     PAL::SessionID sessionID;
     std::optional<ServiceWorkerData> serviceWorkerData;
     ScriptExecutionContextIdentifier clientIdentifier;
+    OptionSet<AdvancedPrivacyProtections> advancedPrivacyProtections;
     std::optional<uint64_t> noiseInjectionHashSalt;
 
     WorkerParameters isolatedCopy() const;
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/workers/service/ServiceWorkerClientData.cpp b/modules/javafx.web/src/main/native/Source/WebCore/workers/service/ServiceWorkerClientData.cpp
index fe962e0cbcc..71c82fd8ed6 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/workers/service/ServiceWorkerClientData.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/workers/service/ServiceWorkerClientData.cpp
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "ServiceWorkerClientData.h"
 
+#include "AdvancedPrivacyProtections.h"
 #include "Document.h"
 #include "DocumentLoader.h"
 #include "FrameDestructionObserverInlines.h"
@@ -59,12 +60,12 @@ static ServiceWorkerClientFrameType toServiceWorkerClientFrameType(ScriptExecuti
 
 ServiceWorkerClientData ServiceWorkerClientData::isolatedCopy() const &
 {
-    return { identifier, type, frameType, url.isolatedCopy(), ownerURL.isolatedCopy(), pageIdentifier, frameIdentifier, lastNavigationWasAppInitiated, isVisible, isFocused, focusOrder, crossThreadCopy(ancestorOrigins) };
+    return { identifier, type, frameType, url.isolatedCopy(), ownerURL.isolatedCopy(), pageIdentifier, frameIdentifier, lastNavigationWasAppInitiated, advancedPrivacyProtections, isVisible, isFocused, focusOrder, crossThreadCopy(ancestorOrigins) };
 }
 
 ServiceWorkerClientData ServiceWorkerClientData::isolatedCopy() &&
 {
-    return { identifier, type, frameType, WTFMove(url).isolatedCopy(), WTFMove(ownerURL).isolatedCopy(), pageIdentifier, frameIdentifier, lastNavigationWasAppInitiated, isVisible, isFocused, focusOrder, crossThreadCopy(WTFMove(ancestorOrigins)) };
+    return { identifier, type, frameType, WTFMove(url).isolatedCopy(), WTFMove(ownerURL).isolatedCopy(), pageIdentifier, frameIdentifier, lastNavigationWasAppInitiated, advancedPrivacyProtections, isVisible, isFocused, focusOrder, crossThreadCopy(WTFMove(ancestorOrigins)) };
 }
 
 ServiceWorkerClientData ServiceWorkerClientData::from(ScriptExecutionContext& context)
@@ -89,6 +90,7 @@ ServiceWorkerClientData ServiceWorkerClientData::from(ScriptExecutionContext& co
             document->pageID(),
             document->frameID(),
             lastNavigationWasAppInitiated,
+            context.advancedPrivacyProtections(),
             !document->hidden(),
             document->hasFocus(),
             0,
@@ -107,6 +109,7 @@ ServiceWorkerClientData ServiceWorkerClientData::from(ScriptExecutionContext& co
         { },
         { },
         LastNavigationWasAppInitiated::No,
+        context.advancedPrivacyProtections(),
         false,
         false,
         0,
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/workers/service/ServiceWorkerClientData.h b/modules/javafx.web/src/main/native/Source/WebCore/workers/service/ServiceWorkerClientData.h
index 759302e6c67..b57de45f447 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/workers/service/ServiceWorkerClientData.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/workers/service/ServiceWorkerClientData.h
@@ -38,6 +38,7 @@ namespace WebCore {
 class SWClientConnection;
 class ScriptExecutionContext;
 
+enum class AdvancedPrivacyProtections : uint16_t;
 enum class LastNavigationWasAppInitiated : bool { No, Yes };
 
 struct ServiceWorkerClientData {
@@ -51,6 +52,7 @@ struct ServiceWorkerClientData {
     std::optional<PageIdentifier> pageIdentifier;
     std::optional<FrameIdentifier> frameIdentifier;
     LastNavigationWasAppInitiated lastNavigationWasAppInitiated;
+    OptionSet<WebCore::AdvancedPrivacyProtections> advancedPrivacyProtections;
     bool isVisible { false };
     bool isFocused { false };
     uint64_t focusOrder { 0 };
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/workers/service/context/ServiceWorkerThread.cpp b/modules/javafx.web/src/main/native/Source/WebCore/workers/service/context/ServiceWorkerThread.cpp
index 619651bdfb7..cbbb2f46057 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/workers/service/context/ServiceWorkerThread.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/workers/service/context/ServiceWorkerThread.cpp
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "ServiceWorkerThread.h"
 
+#include "AdvancedPrivacyProtections.h"
 #include "BackgroundFetchManager.h"
 #include "BackgroundFetchUpdateUIEvent.h"
 #include "CacheStorageProvider.h"
@@ -81,7 +82,7 @@ class DummyServiceWorkerThreadProxy : public WorkerObjectProxy {
 // FIXME: Use a valid WorkerObjectProxy
 // FIXME: Use valid runtime flags
 
-static WorkerParameters generateWorkerParameters(const ServiceWorkerContextData& contextData, String&& userAgent, WorkerThreadMode workerThreadMode, const Settings::Values& settingsValues, PAL::SessionID sessionID, std::optional<uint64_t> noiseInjectionHashSalt)
+static WorkerParameters generateWorkerParameters(const ServiceWorkerContextData& contextData, String&& userAgent, WorkerThreadMode workerThreadMode, const Settings::Values& settingsValues, PAL::SessionID sessionID, OptionSet<AdvancedPrivacyProtections> advancedPrivacyProtections, std::optional<uint64_t> noiseInjectionHashSalt)
 {
     return {
         contextData.scriptURL,
@@ -102,12 +103,13 @@ static WorkerParameters generateWorkerParameters(const ServiceWorkerContextData&
         sessionID,
         { },
         { },
+        advancedPrivacyProtections,
         noiseInjectionHashSalt
     };
 }
 
-ServiceWorkerThread::ServiceWorkerThread(ServiceWorkerContextData&& contextData, ServiceWorkerData&& workerData, String&& userAgent, WorkerThreadMode workerThreadMode, const Settings::Values& settingsValues, WorkerLoaderProxy& loaderProxy, WorkerDebuggerProxy& debuggerProxy, WorkerBadgeProxy& badgeProxy, IDBClient::IDBConnectionProxy* idbConnectionProxy, SocketProvider* socketProvider, std::unique_ptr<NotificationClient>&& notificationClient, PAL::SessionID sessionID, std::optional<uint64_t> noiseInjectionHashSalt)
-    : WorkerThread(generateWorkerParameters(contextData, WTFMove(userAgent), workerThreadMode, settingsValues, sessionID, noiseInjectionHashSalt), contextData.script, loaderProxy, debuggerProxy, DummyServiceWorkerThreadProxy::shared(), badgeProxy, WorkerThreadStartMode::Normal, contextData.registration.key.topOrigin().securityOrigin().get(), idbConnectionProxy, socketProvider, JSC::RuntimeFlags::createAllEnabled())
+ServiceWorkerThread::ServiceWorkerThread(ServiceWorkerContextData&& contextData, ServiceWorkerData&& workerData, String&& userAgent, WorkerThreadMode workerThreadMode, const Settings::Values& settingsValues, WorkerLoaderProxy& loaderProxy, WorkerDebuggerProxy& debuggerProxy, WorkerBadgeProxy& badgeProxy, IDBClient::IDBConnectionProxy* idbConnectionProxy, SocketProvider* socketProvider, std::unique_ptr<NotificationClient>&& notificationClient, PAL::SessionID sessionID, std::optional<uint64_t> noiseInjectionHashSalt, OptionSet<AdvancedPrivacyProtections> advancedPrivacyProtections)
+    : WorkerThread(generateWorkerParameters(contextData, WTFMove(userAgent), workerThreadMode, settingsValues, sessionID, advancedPrivacyProtections, noiseInjectionHashSalt), contextData.script, loaderProxy, debuggerProxy, DummyServiceWorkerThreadProxy::shared(), badgeProxy, WorkerThreadStartMode::Normal, contextData.registration.key.topOrigin().securityOrigin().get(), idbConnectionProxy, socketProvider, JSC::RuntimeFlags::createAllEnabled())
     , m_serviceWorkerIdentifier(contextData.serviceWorkerIdentifier)
     , m_jobDataIdentifier(contextData.jobDataIdentifier)
     , m_contextData(crossThreadCopy(WTFMove(contextData)))
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/workers/service/context/ServiceWorkerThread.h b/modules/javafx.web/src/main/native/Source/WebCore/workers/service/context/ServiceWorkerThread.h
index e5544e91574..cc3ee154681 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/workers/service/context/ServiceWorkerThread.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/workers/service/context/ServiceWorkerThread.h
@@ -36,6 +36,7 @@
 #include "Settings.h"
 #include "Timer.h"
 #include "WorkerThread.h"
+#include <wtf/OptionSet.h>
 #include <wtf/WeakPtr.h>
 
 namespace WebCore {
@@ -50,6 +51,8 @@ struct MessageWithMessagePorts;
 struct NotificationData;
 struct NotificationPayload;
 
+enum class AdvancedPrivacyProtections : uint16_t;
+
 class ServiceWorkerThread : public WorkerThread, public CanMakeWeakPtr<ServiceWorkerThread, WeakPtrFactoryInitialization::Eager> {
 public:
     template<typename... Args> static Ref<ServiceWorkerThread> create(Args&&... args)
@@ -98,7 +101,7 @@ class ServiceWorkerThread : public WorkerThread, public CanMakeWeakPtr<ServiceWo
     void runEventLoop() override;
 
 private:
-    WEBCORE_EXPORT ServiceWorkerThread(ServiceWorkerContextData&&, ServiceWorkerData&&, String&& userAgent, WorkerThreadMode, const Settings::Values&, WorkerLoaderProxy&, WorkerDebuggerProxy&, WorkerBadgeProxy&, IDBClient::IDBConnectionProxy*, SocketProvider*, std::unique_ptr<NotificationClient>&&, PAL::SessionID, std::optional<uint64_t>);
+    WEBCORE_EXPORT ServiceWorkerThread(ServiceWorkerContextData&&, ServiceWorkerData&&, String&& userAgent, WorkerThreadMode, const Settings::Values&, WorkerLoaderProxy&, WorkerDebuggerProxy&, WorkerBadgeProxy&, IDBClient::IDBConnectionProxy*, SocketProvider*, std::unique_ptr<NotificationClient>&&, PAL::SessionID, std::optional<uint64_t>, OptionSet<AdvancedPrivacyProtections>);
 
     ASCIILiteral threadName() const final { return "WebCore: ServiceWorker"_s; }
     void finishedEvaluatingScript() final;
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/workers/service/context/ServiceWorkerThreadProxy.cpp b/modules/javafx.web/src/main/native/Source/WebCore/workers/service/context/ServiceWorkerThreadProxy.cpp
index 575c196ffb7..c98b2323fa5 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/workers/service/context/ServiceWorkerThreadProxy.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/workers/service/context/ServiceWorkerThreadProxy.cpp
@@ -70,7 +70,7 @@ ServiceWorkerThreadProxy::ServiceWorkerThreadProxy(Ref<Page>&& page, ServiceWork
 #if ENABLE(REMOTE_INSPECTOR)
     , m_remoteDebuggable(makeUnique<ServiceWorkerDebuggable>(*this, contextData))
 #endif
-    , m_serviceWorkerThread(ServiceWorkerThread::create(WTFMove(contextData), WTFMove(workerData), WTFMove(userAgent), workerThreadMode, m_document->settingsValues(), *this, *this, *this, idbConnectionProxy(m_document), m_document->socketProvider(), WTFMove(notificationClient), m_page->sessionID(), m_document->noiseInjectionHashSalt()))
+    , m_serviceWorkerThread(ServiceWorkerThread::create(WTFMove(contextData), WTFMove(workerData), WTFMove(userAgent), workerThreadMode, m_document->settingsValues(), *this, *this, *this, idbConnectionProxy(m_document), m_document->socketProvider(), WTFMove(notificationClient), m_page->sessionID(), m_document->noiseInjectionHashSalt(), m_document->advancedPrivacyProtections()))
     , m_cacheStorageProvider(cacheStorageProvider)
     , m_inspectorProxy(*this)
 {
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/workers/service/server/SWServer.cpp b/modules/javafx.web/src/main/native/Source/WebCore/workers/service/server/SWServer.cpp
index 1ce8416d1ba..b1914b6dc75 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/workers/service/server/SWServer.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/workers/service/server/SWServer.cpp
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "SWServer.h"
 
+#include "AdvancedPrivacyProtections.h"
 #include "BackgroundFetchEngine.h"
 #include "BackgroundFetchInformation.h"
 #include "BackgroundFetchOptions.h"
@@ -743,19 +744,30 @@ void SWServer::matchAll(SWServerWorker& worker, const ServiceWorkerClientQueryOp
     callback(WTFMove(matchingClients));
 }
 
-void SWServer::forEachClientForOrigin(const ClientOrigin& origin, const Function<void(ServiceWorkerClientData&)>& apply)
+template<typename ClientDataType, typename ClientsByIDType>
+void forEachClientForOriginImpl(const Vector<ScriptExecutionContextIdentifier>& identifiers, ClientsByIDType& clientsById, const Function<void(ClientDataType&)>& apply)
 {
-    auto iterator = m_clientIdentifiersPerOrigin.find(origin);
-    if (iterator == m_clientIdentifiersPerOrigin.end())
-        return;
-
-    for (auto& clientIdentifier : iterator->value.identifiers) {
-        auto clientIterator = m_clientsById.find(clientIdentifier);
-        ASSERT(clientIterator != m_clientsById.end());
+    for (auto& clientIdentifier : identifiers) {
+        auto clientIterator = clientsById.find(clientIdentifier);
+        ASSERT(clientIterator != clientsById.end());
         apply(clientIterator->value);
     }
 }
 
+void SWServer::forEachClientForOrigin(const ClientOrigin& origin, const Function<void(const ServiceWorkerClientData&)>& apply) const
+{
+    auto iterator = m_clientIdentifiersPerOrigin.find(origin);
+    if (iterator != m_clientIdentifiersPerOrigin.end())
+        forEachClientForOriginImpl(iterator->value.identifiers, m_clientsById, apply);
+}
+
+void SWServer::forEachClientForOrigin(const ClientOrigin& origin, const Function<void(ServiceWorkerClientData&)>& apply)
+{
+    auto iterator = m_clientIdentifiersPerOrigin.find(origin);
+    if (iterator != m_clientIdentifiersPerOrigin.end())
+        forEachClientForOriginImpl(iterator->value.identifiers, m_clientsById, apply);
+}
+
 std::optional<ExceptionData> SWServer::claim(SWServerWorker& worker)
 {
     RefPtr registration = worker.registration();
@@ -893,6 +905,15 @@ void SWServer::terminateContextConnectionWhenPossible(const RegistrableDomain& r
     contextConnection->terminateWhenPossible();
 }
 
+OptionSet<AdvancedPrivacyProtections> SWServer::advancedPrivacyProtectionsFromClient(const ClientOrigin& origin) const
+{
+    OptionSet<AdvancedPrivacyProtections> result;
+    forEachClientForOrigin(origin, [&result](auto& clientData) {
+        result.add(clientData.advancedPrivacyProtections);
+    });
+    return result;
+}
+
 void SWServer::installContextData(const ServiceWorkerContextData& data)
 {
     ASSERT_WITH_MESSAGE(!data.loadedFromDisk, "Workers we just read from disk should only be launched as needed");
@@ -916,7 +937,7 @@ void SWServer::installContextData(const ServiceWorkerContextData& data)
     auto result = m_runningOrTerminatingWorkers.add(data.serviceWorkerIdentifier, worker.copyRef());
     ASSERT_UNUSED(result, result.isNewEntry);
 
-    connection->installServiceWorkerContext(data, worker->data(), userAgent, worker->workerThreadMode());
+    connection->installServiceWorkerContext(data, worker->data(), userAgent, worker->workerThreadMode(), advancedPrivacyProtectionsFromClient(worker->registrationKey().clientOrigin()));
 }
 
 void SWServer::runServiceWorkerIfNecessary(ServiceWorkerIdentifier identifier, RunServiceWorkerCallback&& callback)
@@ -993,7 +1014,7 @@ bool SWServer::runServiceWorker(SWServerWorker& worker)
     CheckedPtr contextConnection = worker.contextConnection();
     ASSERT(contextConnection);
 
-    contextConnection->installServiceWorkerContext(worker.contextData(), worker.data(), worker.userAgent(), worker.workerThreadMode());
+    contextConnection->installServiceWorkerContext(worker.contextData(), worker.data(), worker.userAgent(), worker.workerThreadMode(), advancedPrivacyProtectionsFromClient(worker.registrationKey().clientOrigin()));
 
     return true;
 }
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/workers/service/server/SWServer.h b/modules/javafx.web/src/main/native/Source/WebCore/workers/service/server/SWServer.h
index 1ebc34a09d5..a5514ff85cb 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/workers/service/server/SWServer.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/workers/service/server/SWServer.h
@@ -65,6 +65,7 @@ class SWServerRegistration;
 class SWServerToContextConnection;
 class Timer;
 
+enum class AdvancedPrivacyProtections : uint16_t;
 enum class NotificationEventType : bool;
 
 struct BackgroundFetchInformation;
@@ -271,6 +272,7 @@ class SWServer : public RefCounted<SWServer>, public CanMakeWeakPtr<SWServer> {
 
     std::optional<ServiceWorkerRegistrationIdentifier> clientIdentifierToControllingRegistration(ScriptExecutionContextIdentifier) const;
     WEBCORE_EXPORT void forEachClientForOrigin(const ClientOrigin&, const Function<void(ServiceWorkerClientData&)>&);
+    void forEachClientForOrigin(const ClientOrigin&, const Function<void(const ServiceWorkerClientData&)>&) const;
 
     struct GatheredClientData {
         ClientOrigin clientOrigin;
@@ -290,6 +292,8 @@ class SWServer : public RefCounted<SWServer>, public CanMakeWeakPtr<SWServer> {
 
     WEBCORE_EXPORT void postMessageToServiceWorkerClient(ScriptExecutionContextIdentifier, const MessageWithMessagePorts&, ServiceWorkerIdentifier, const String&, const Function<void(ScriptExecutionContextIdentifier, const MessageWithMessagePorts&, const ServiceWorkerData&, const String&)>&);
 
+    WEBCORE_EXPORT OptionSet<AdvancedPrivacyProtections> advancedPrivacyProtectionsFromClient(const ClientOrigin&) const;
+
 private:
     SWServer(SWServerDelegate&, UniqueRef<SWOriginStore>&&, bool processTerminationDelayEnabled, String&& registrationDatabaseDirectory, PAL::SessionID, bool shouldRunServiceWorkersOnMainThreadForTesting, bool hasServiceWorkerEntitlement, std::optional<unsigned> overrideServiceWorkerRegistrationCountTestingValue, ServiceWorkerIsInspectable);
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/workers/service/server/SWServerToContextConnection.h b/modules/javafx.web/src/main/native/Source/WebCore/workers/service/server/SWServerToContextConnection.h
index 2fbf2b6dd70..5e801ff9e04 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/workers/service/server/SWServerToContextConnection.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/workers/service/server/SWServerToContextConnection.h
@@ -41,6 +41,7 @@
 
 namespace WebCore {
 
+enum class AdvancedPrivacyProtections : uint16_t;
 struct BackgroundFetchInformation;
 struct NotificationData;
 struct NotificationPayload;
@@ -65,7 +66,7 @@ class SWServerToContextConnection: public CanMakeWeakPtr<SWServerToContextConnec
     void terminateWhenPossible();
 
     // Messages to the SW host process
-    virtual void installServiceWorkerContext(const ServiceWorkerContextData&, const ServiceWorkerData&, const String& userAgent, WorkerThreadMode) = 0;
+    virtual void installServiceWorkerContext(const ServiceWorkerContextData&, const ServiceWorkerData&, const String& userAgent, WorkerThreadMode, OptionSet<AdvancedPrivacyProtections>) = 0;
     virtual void updateAppInitiatedValue(ServiceWorkerIdentifier, LastNavigationWasAppInitiated) = 0;
     virtual void fireInstallEvent(ServiceWorkerIdentifier) = 0;
     virtual void fireActivateEvent(ServiceWorkerIdentifier) = 0;
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/workers/shared/SharedWorkerScriptLoader.cpp b/modules/javafx.web/src/main/native/Source/WebCore/workers/shared/SharedWorkerScriptLoader.cpp
index 5b6b23a5c4d..fd8419ee959 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/workers/shared/SharedWorkerScriptLoader.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/workers/shared/SharedWorkerScriptLoader.cpp
@@ -70,6 +70,7 @@ void SharedWorkerScriptLoader::notifyFinished()
     m_completionHandler(WTFMove(fetchResult), WorkerInitializationData {
         m_loader->takeServiceWorkerData(),
         m_loader->clientIdentifier(),
+        m_loader->advancedPrivacyProtections(),
         m_loader->userAgentForSharedWorker()
     }); // deletes this.
 }
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/workers/shared/context/SharedWorkerThreadProxy.cpp b/modules/javafx.web/src/main/native/Source/WebCore/workers/shared/context/SharedWorkerThreadProxy.cpp
index 9775b084f6f..4be8f015fbe 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/workers/shared/context/SharedWorkerThreadProxy.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/workers/shared/context/SharedWorkerThreadProxy.cpp
@@ -81,6 +81,7 @@ static WorkerParameters generateWorkerParameters(const WorkerFetchResult& worker
         *document.sessionID(),
         WTFMove(initializationData.serviceWorkerData),
         *initializationData.clientIdentifier,
+        document.advancedPrivacyProtections(),
         document.noiseInjectionHashSalt()
     };
 }
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/worklets/WorkletGlobalScope.cpp b/modules/javafx.web/src/main/native/Source/WebCore/worklets/WorkletGlobalScope.cpp
index f5acfe94878..2371b8f9a91 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/worklets/WorkletGlobalScope.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/worklets/WorkletGlobalScope.cpp
@@ -50,7 +50,7 @@ WTF_MAKE_ISO_ALLOCATED_IMPL(WorkletGlobalScope);
 static std::atomic<unsigned> gNumberOfWorkletGlobalScopes { 0 };
 
 WorkletGlobalScope::WorkletGlobalScope(WorkerOrWorkletThread& thread, Ref<JSC::VM>&& vm, const WorkletParameters& parameters)
-    : WorkerOrWorkletGlobalScope(WorkerThreadType::Worklet, parameters.sessionID, WTFMove(vm), parameters.referrerPolicy, &thread, parameters.noiseInjectionHashSalt)
+    : WorkerOrWorkletGlobalScope(WorkerThreadType::Worklet, parameters.sessionID, WTFMove(vm), parameters.referrerPolicy, &thread, parameters.noiseInjectionHashSalt, parameters.advancedPrivacyProtections)
     , m_topOrigin(SecurityOrigin::createOpaque())
     , m_url(parameters.windowURL)
     , m_jsRuntimeFlags(parameters.jsRuntimeFlags)
@@ -64,7 +64,7 @@ WorkletGlobalScope::WorkletGlobalScope(WorkerOrWorkletThread& thread, Ref<JSC::V
 }
 
 WorkletGlobalScope::WorkletGlobalScope(Document& document, Ref<JSC::VM>&& vm, ScriptSourceCode&& code)
-    : WorkerOrWorkletGlobalScope(WorkerThreadType::Worklet, *document.sessionID(), WTFMove(vm), document.referrerPolicy(), nullptr, document.noiseInjectionHashSalt())
+    : WorkerOrWorkletGlobalScope(WorkerThreadType::Worklet, *document.sessionID(), WTFMove(vm), document.referrerPolicy(), nullptr, document.noiseInjectionHashSalt(), document.advancedPrivacyProtections())
     , m_document(document)
     , m_topOrigin(SecurityOrigin::createOpaque())
     , m_url(code.url())
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/worklets/WorkletParameters.h b/modules/javafx.web/src/main/native/Source/WebCore/worklets/WorkletParameters.h
index 8942891b681..88a8303490d 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/worklets/WorkletParameters.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/worklets/WorkletParameters.h
@@ -25,6 +25,7 @@
 
 #pragma once
 
+#include "AdvancedPrivacyProtections.h"
 #include "Settings.h"
 #include <JavaScriptCore/RuntimeFlags.h>
 #include <wtf/URL.h>
@@ -40,10 +41,11 @@ struct WorkletParameters {
     Settings::Values settingsValues;
     ReferrerPolicy referrerPolicy;
     bool isAudioContextRealTime;
+    OptionSet<AdvancedPrivacyProtections> advancedPrivacyProtections;
     std::optional<uint64_t> noiseInjectionHashSalt;
 
-    WorkletParameters isolatedCopy() const & { return { windowURL.isolatedCopy(), jsRuntimeFlags, sampleRate, identifier.isolatedCopy(), sessionID, settingsValues.isolatedCopy(), referrerPolicy, isAudioContextRealTime, noiseInjectionHashSalt }; }
-    WorkletParameters isolatedCopy() && { return { WTFMove(windowURL).isolatedCopy(), jsRuntimeFlags, sampleRate, WTFMove(identifier).isolatedCopy(), sessionID, WTFMove(settingsValues).isolatedCopy(), referrerPolicy, isAudioContextRealTime, WTFMove(noiseInjectionHashSalt) }; }
+    WorkletParameters isolatedCopy() const & { return { windowURL.isolatedCopy(), jsRuntimeFlags, sampleRate, identifier.isolatedCopy(), sessionID, settingsValues.isolatedCopy(), referrerPolicy, isAudioContextRealTime, advancedPrivacyProtections, noiseInjectionHashSalt }; }
+    WorkletParameters isolatedCopy() && { return { WTFMove(windowURL).isolatedCopy(), jsRuntimeFlags, sampleRate, WTFMove(identifier).isolatedCopy(), sessionID, WTFMove(settingsValues).isolatedCopy(), referrerPolicy, isAudioContextRealTime, advancedPrivacyProtections, WTFMove(noiseInjectionHashSalt) }; }
 };
 
 } // namespace WebCore
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/xml/XPathFunctions.cpp b/modules/javafx.web/src/main/native/Source/WebCore/xml/XPathFunctions.cpp
index f5d2bbfdbac..0fa552c3feb 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/xml/XPathFunctions.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/xml/XPathFunctions.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2005 Frerich Raabe <raabe@kde.org>
- * Copyright (C) 2006, 2009, 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2006-2024 Apple Inc. All rights reserved.
  * Copyright (C) 2019 Google Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  *
@@ -68,157 +68,157 @@ class Interval {
 
 class FunLast final : public Function {
     Value evaluate() const override;
-    Value::Type resultType() const override { return Value::NumberValue; }
+    Value::Type resultType() const override { return Value::Type::Number; }
 public:
     FunLast() { setIsContextSizeSensitive(true); }
 };
 
 class FunPosition final : public Function {
     Value evaluate() const override;
-    Value::Type resultType() const override { return Value::NumberValue; }
+    Value::Type resultType() const override { return Value::Type::Number; }
 public:
     FunPosition() { setIsContextPositionSensitive(true); }
 };
 
 class FunCount final : public Function {
     Value evaluate() const override;
-    Value::Type resultType() const override { return Value::NumberValue; }
+    Value::Type resultType() const override { return Value::Type::Number; }
 };
 
 class FunId final : public Function {
     Value evaluate() const override;
-    Value::Type resultType() const override { return Value::NodeSetValue; }
+    Value::Type resultType() const override { return Value::Type::NodeSet; }
 };
 
 class FunLocalName final : public Function {
     Value evaluate() const override;
-    Value::Type resultType() const override { return Value::StringValue; }
+    Value::Type resultType() const override { return Value::Type::String; }
 public:
     FunLocalName() { setIsContextNodeSensitive(true); } // local-name() with no arguments uses context node.
 };
 
 class FunNamespaceURI final : public Function {
     Value evaluate() const override;
-    Value::Type resultType() const override { return Value::StringValue; }
+    Value::Type resultType() const override { return Value::Type::String; }
 public:
     FunNamespaceURI() { setIsContextNodeSensitive(true); } // namespace-uri() with no arguments uses context node.
 };
 
 class FunName final : public Function {
     Value evaluate() const override;
-    Value::Type resultType() const override { return Value::StringValue; }
+    Value::Type resultType() const override { return Value::Type::String; }
 public:
     FunName() { setIsContextNodeSensitive(true); } // name() with no arguments uses context node.
 };
 
 class FunString final : public Function {
     Value evaluate() const override;
-    Value::Type resultType() const override { return Value::StringValue; }
+    Value::Type resultType() const override { return Value::Type::String; }
 public:
     FunString() { setIsContextNodeSensitive(true); } // string() with no arguments uses context node.
 };
 
 class FunConcat final : public Function {
     Value evaluate() const override;
-    Value::Type resultType() const override { return Value::StringValue; }
+    Value::Type resultType() const override { return Value::Type::String; }
 };
 
 class FunStartsWith final : public Function {
     Value evaluate() const override;
-    Value::Type resultType() const override { return Value::BooleanValue; }
+    Value::Type resultType() const override { return Value::Type::Boolean; }
 };
 
 class FunContains final : public Function {
     Value evaluate() const override;
-    Value::Type resultType() const override { return Value::BooleanValue; }
+    Value::Type resultType() const override { return Value::Type::Boolean; }
 };
 
 class FunSubstringBefore final : public Function {
     Value evaluate() const override;
-    Value::Type resultType() const override { return Value::StringValue; }
+    Value::Type resultType() const override { return Value::Type::String; }
 };
 
 class FunSubstringAfter final : public Function {
     Value evaluate() const override;
-    Value::Type resultType() const override { return Value::StringValue; }
+    Value::Type resultType() const override { return Value::Type::String; }
 };
 
 class FunSubstring final : public Function {
     Value evaluate() const override;
-    Value::Type resultType() const override { return Value::StringValue; }
+    Value::Type resultType() const override { return Value::Type::String; }
 };
 
 class FunStringLength final : public Function {
     Value evaluate() const override;
-    Value::Type resultType() const override { return Value::NumberValue; }
+    Value::Type resultType() const override { return Value::Type::Number; }
 public:
     FunStringLength() { setIsContextNodeSensitive(true); } // string-length() with no arguments uses context node.
 };
 
 class FunNormalizeSpace final : public Function {
     Value evaluate() const override;
-    Value::Type resultType() const override { return Value::StringValue; }
+    Value::Type resultType() const override { return Value::Type::String; }
 public:
     FunNormalizeSpace() { setIsContextNodeSensitive(true); } // normalize-space() with no arguments uses context node.
 };
 
 class FunTranslate final : public Function {
     Value evaluate() const override;
-    Value::Type resultType() const override { return Value::StringValue; }
+    Value::Type resultType() const override { return Value::Type::String; }
 };
 
 class FunBoolean final : public Function {
     Value evaluate() const override;
-    Value::Type resultType() const override { return Value::BooleanValue; }
+    Value::Type resultType() const override { return Value::Type::Boolean; }
 };
 
 class FunNot : public Function {
     Value evaluate() const override;
-    Value::Type resultType() const override { return Value::BooleanValue; }
+    Value::Type resultType() const override { return Value::Type::Boolean; }
 };
 
 class FunTrue final : public Function {
     Value evaluate() const override;
-    Value::Type resultType() const override { return Value::BooleanValue; }
+    Value::Type resultType() const override { return Value::Type::Boolean; }
 };
 
 class FunFalse final : public Function {
     Value evaluate() const override;
-    Value::Type resultType() const override { return Value::BooleanValue; }
+    Value::Type resultType() const override { return Value::Type::Boolean; }
 };
 
 class FunLang final : public Function {
     Value evaluate() const override;
-    Value::Type resultType() const override { return Value::BooleanValue; }
+    Value::Type resultType() const override { return Value::Type::Boolean; }
 public:
     FunLang() { setIsContextNodeSensitive(true); } // lang() always works on context node.
 };
 
 class FunNumber final : public Function {
     Value evaluate() const override;
-    Value::Type resultType() const override { return Value::NumberValue; }
+    Value::Type resultType() const override { return Value::Type::Number; }
 public:
     FunNumber() { setIsContextNodeSensitive(true); } // number() with no arguments uses context node.
 };
 
 class FunSum final : public Function {
     Value evaluate() const override;
-    Value::Type resultType() const override { return Value::NumberValue; }
+    Value::Type resultType() const override { return Value::Type::Number; }
 };
 
 class FunFloor final : public Function {
     Value evaluate() const override;
-    Value::Type resultType() const override { return Value::NumberValue; }
+    Value::Type resultType() const override { return Value::Type::Number; }
 };
 
 class FunCeiling final : public Function {
     Value evaluate() const override;
-    Value::Type resultType() const override { return Value::NumberValue; }
+    Value::Type resultType() const override { return Value::Type::Number; }
 };
 
 class FunRound final : public Function {
     Value evaluate() const override;
-    Value::Type resultType() const override { return Value::NumberValue; }
+    Value::Type resultType() const override { return Value::Type::Number; }
 public:
     static double round(double);
 };
@@ -784,5 +784,5 @@ std::unique_ptr<Function> Function::create(const String& name, Vector<std::uniqu
     return function;
 }
 
-}
-}
+} // namespace XPath
+} // namespace WebCore
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/xml/XPathParser.cpp b/modules/javafx.web/src/main/native/Source/WebCore/xml/XPathParser.cpp
index ff3a44d1031..a0ff8f1293d 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/xml/XPathParser.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/xml/XPathParser.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright 2005 Maksim Orlovich <maksim@kde.org>
- * Copyright (C) 2006, 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2006-2024 Apple Inc. All rights reserved.
  * Copyright (C) 2019 Google Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  *
@@ -47,16 +47,22 @@ namespace XPath {
 
 struct Parser::Token {
     int type;
-    String string;
-    Step::Axis axis;
-    NumericOp::Opcode numericOpcode;
-    EqTestOp::Opcode equalityTestOpcode;
-
-    Token(int type) : type(type) { }
-    Token(int type, const String& string) : type(type), string(string) { }
-    Token(int type, Step::Axis axis) : type(type), axis(axis) { }
-    Token(int type, NumericOp::Opcode opcode) : type(type), numericOpcode(opcode) { }
-    Token(int type, EqTestOp::Opcode opcode) : type(type), equalityTestOpcode(opcode) { }
+    using TokenValue = std::variant<String, Step::Axis, NumericOp::Opcode, EqTestOp::Opcode>;
+    TokenValue value;
+
+    Token() = delete;
+
+    Token(int type)
+        : type(type)
+    { }
+    Token(int type, TokenValue&& value)
+        : type(type), value(WTFMove(value))
+    { }
+
+    String& string() { return std::get<String>(value); }
+    Step::Axis axis() const { return std::get<Step::Axis>(value); }
+    NumericOp::Opcode numericOpcode() const { return std::get<NumericOp::Opcode>(value); }
+    EqTestOp::Opcode equalityTestOpcode() const { return std::get<EqTestOp::Opcode>(value); }
 };
 
 enum XMLCat { NameStart, NameCont, NotPartOfName };
@@ -409,14 +415,14 @@ int Parser::lex(YYSTYPE& yylval)
 
     switch (token.type) {
     case AXISNAME:
-        yylval.axis = token.axis;
+        yylval.axis = token.axis();
         break;
     case MULOP:
-        yylval.numericOpcode = token.numericOpcode;
+        yylval.numericOpcode = token.numericOpcode();
         break;
     case RELOP:
     case EQOP:
-        yylval.equalityTestOpcode = token.equalityTestOpcode;
+        yylval.equalityTestOpcode = token.equalityTestOpcode();
         break;
     case NODETYPE:
     case FUNCTIONNAME:
@@ -424,7 +430,7 @@ int Parser::lex(YYSTYPE& yylval)
     case VARIABLEREFERENCE:
     case NUMBER:
     case NAMETEST:
-        yylval.string = token.string.releaseImpl().leakRef();
+        yylval.string = token.string().releaseImpl().leakRef();
         break;
     }
 
@@ -465,4 +471,5 @@ ExceptionOr<std::unique_ptr<Expression>> Parser::parseStatement(const String& st
     return WTFMove(parser.m_result);
 }
 
-} }
+} // namespace XPath
+} // namespace WebCore
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/xml/XPathPath.h b/modules/javafx.web/src/main/native/Source/WebCore/xml/XPathPath.h
index 6f5961ad9a3..6872663f078 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/xml/XPathPath.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/xml/XPathPath.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2005 Frerich Raabe <raabe@kde.org>
- * Copyright (C) 2006, 2009, 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2006-2024 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -29,24 +29,24 @@
 #include "XPathExpressionNode.h"
 
 namespace WebCore {
-    namespace XPath {
+namespace XPath {
 
-        class Step;
+class Step;
 
-        class Filter final : public Expression {
-        public:
+class Filter final : public Expression {
+public:
             Filter(std::unique_ptr<Expression>, Vector<std::unique_ptr<Expression>> predicates);
 
-        private:
+private:
             Value evaluate() const override;
-            Value::Type resultType() const override { return Value::NodeSetValue; }
+    Value::Type resultType() const override { return Value::Type::NodeSet; }
 
             std::unique_ptr<Expression> m_expression;
             Vector<std::unique_ptr<Expression>> m_predicates;
-        };
+};
 
-        class LocationPath final : public Expression {
-        public:
+class LocationPath final : public Expression {
+public:
             LocationPath();
 
             void setAbsolute() { m_isAbsolute = true; setIsContextNodeSensitive(false); }
@@ -56,25 +56,25 @@ namespace WebCore {
             void appendStep(std::unique_ptr<Step>);
             void prependStep(std::unique_ptr<Step>);
 
-        private:
+private:
             Value evaluate() const override;
-            Value::Type resultType() const override { return Value::NodeSetValue; }
+    Value::Type resultType() const override { return Value::Type::NodeSet; }
 
             Vector<std::unique_ptr<Step>> m_steps;
             bool m_isAbsolute;
-        };
+};
 
-        class Path final : public Expression {
-        public:
+class Path final : public Expression {
+public:
             Path(std::unique_ptr<Expression> filter, std::unique_ptr<LocationPath>);
 
-        private:
+private:
             Value evaluate() const override;
-            Value::Type resultType() const override { return Value::NodeSetValue; }
+    Value::Type resultType() const override { return Value::Type::NodeSet; }
 
             std::unique_ptr<Expression> m_filter;
             std::unique_ptr<LocationPath> m_path;
-        };
+};
 
-    } // namespace XPath
+} // namespace XPath
 } // namespace WebCore
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/xml/XPathPredicate.cpp b/modules/javafx.web/src/main/native/Source/WebCore/xml/XPathPredicate.cpp
index 11b8455f287..47a04ca2037 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/xml/XPathPredicate.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/xml/XPathPredicate.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright 2005 Frerich Raabe <raabe@kde.org>
- * Copyright (C) 2006, 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2006-2024 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -297,8 +297,8 @@ bool evaluatePredicate(const Expression& expression)
 
 bool predicateIsContextPositionSensitive(const Expression& expression)
 {
-    return expression.isContextPositionSensitive() || expression.resultType() == Value::NumberValue;
+    return expression.isContextPositionSensitive() || expression.resultType() == Value::Type::Number;
 }
 
-}
-}
+} // namespace XPath
+} // namespace WebCore
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/xml/XPathPredicate.h b/modules/javafx.web/src/main/native/Source/WebCore/xml/XPathPredicate.h
index aae181c8026..c7faf1c8898 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/xml/XPathPredicate.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/xml/XPathPredicate.h
@@ -1,6 +1,6 @@
 /*
  * Copyright 2005 Frerich Raabe <raabe@kde.org>
- * Copyright (C) 2006, 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2006-2024 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -29,88 +29,88 @@
 #include "XPathExpressionNode.h"
 
 namespace WebCore {
-    namespace XPath {
+namespace XPath {
 
-        class Number final : public Expression {
-        public:
+class Number final : public Expression {
+public:
             explicit Number(double);
 
-        private:
+private:
             Value evaluate() const override;
-            Value::Type resultType() const override { return Value::NumberValue; }
+    Value::Type resultType() const override { return Value::Type::Number; }
 
             Value m_value;
-        };
+};
 
-        class StringExpression final : public Expression {
-        public:
+class StringExpression final : public Expression {
+public:
             explicit StringExpression(String&&);
 
-        private:
+private:
             Value evaluate() const override;
-            Value::Type resultType() const override { return Value::StringValue; }
+    Value::Type resultType() const override { return Value::Type::String; }
 
             Value m_value;
-        };
+};
 
-        class Negative final : public Expression {
-        public:
+class Negative final : public Expression {
+public:
             explicit Negative(std::unique_ptr<Expression>);
 
-        private:
+private:
             Value evaluate() const override;
-            Value::Type resultType() const override { return Value::NumberValue; }
-        };
+    Value::Type resultType() const override { return Value::Type::Number; }
+};
 
-        class NumericOp final : public Expression {
-        public:
+class NumericOp final : public Expression {
+public:
             enum Opcode { OP_Add, OP_Sub, OP_Mul, OP_Div, OP_Mod };
             NumericOp(Opcode, std::unique_ptr<Expression> lhs, std::unique_ptr<Expression> rhs);
 
-        private:
+private:
             Value evaluate() const override;
-            Value::Type resultType() const override { return Value::NumberValue; }
+    Value::Type resultType() const override { return Value::Type::Number; }
 
             Opcode m_opcode;
-        };
+};
 
-        class EqTestOp final : public Expression {
-        public:
+class EqTestOp final : public Expression {
+public:
             enum Opcode { OP_EQ, OP_NE, OP_GT, OP_LT, OP_GE, OP_LE };
             EqTestOp(Opcode, std::unique_ptr<Expression> lhs, std::unique_ptr<Expression> rhs);
             Value evaluate() const override;
 
-        private:
-            Value::Type resultType() const override { return Value::BooleanValue; }
+private:
+    Value::Type resultType() const override { return Value::Type::Boolean; }
             bool compare(const Value&, const Value&) const;
 
             Opcode m_opcode;
-        };
+};
 
-        class LogicalOp final : public Expression {
-        public:
+class LogicalOp final : public Expression {
+public:
             enum Opcode { OP_And, OP_Or };
             LogicalOp(Opcode, std::unique_ptr<Expression> lhs, std::unique_ptr<Expression> rhs);
 
-        private:
-            Value::Type resultType() const override { return Value::BooleanValue; }
+private:
+    Value::Type resultType() const override { return Value::Type::Boolean; }
             bool shortCircuitOn() const;
             Value evaluate() const override;
 
             Opcode m_opcode;
-        };
+};
 
-        class Union final : public Expression {
-        public:
+class Union final : public Expression {
+public:
             Union(std::unique_ptr<Expression>, std::unique_ptr<Expression>);
 
-        private:
+private:
             Value evaluate() const override;
-            Value::Type resultType() const override { return Value::NodeSetValue; }
-        };
+    Value::Type resultType() const override { return Value::Type::NodeSet; }
+};
 
-        bool evaluatePredicate(const Expression&);
-        bool predicateIsContextPositionSensitive(const Expression&);
+bool evaluatePredicate(const Expression&);
+bool predicateIsContextPositionSensitive(const Expression&);
 
-    } // namespace XPath
+} // namespace XPath
 } // namespace WebCore
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/xml/XPathResult.cpp b/modules/javafx.web/src/main/native/Source/WebCore/xml/XPathResult.cpp
index 5da71f692a9..1dddf8be164 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/xml/XPathResult.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/xml/XPathResult.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2005 Frerich Raabe <raabe@kde.org>
- * Copyright (C) 2006, 2009 Apple Inc. All rights reserved.
+ * Copyright (C) 2006-2024 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -36,16 +36,16 @@ XPathResult::XPathResult(Document& document, const XPath::Value& value)
     : m_value(value)
 {
     switch (m_value.type()) {
-        case XPath::Value::BooleanValue:
+    case XPath::Value::Type::Boolean:
             m_resultType = BOOLEAN_TYPE;
             return;
-        case XPath::Value::NumberValue:
+    case XPath::Value::Type::Number:
             m_resultType = NUMBER_TYPE;
             return;
-        case XPath::Value::StringValue:
+    case XPath::Value::Type::String:
             m_resultType = STRING_TYPE;
             return;
-        case XPath::Value::NodeSetValue:
+    case XPath::Value::Type::NodeSet:
             m_resultType = UNORDERED_NODE_ITERATOR_TYPE;
             m_nodeSetPosition = 0;
             m_nodeSet = m_value.toNodeSet();
@@ -180,4 +180,4 @@ ExceptionOr<Node*> XPathResult::snapshotItem(unsigned index)
     return nodes[index];
 }
 
-}
+} // namespace WebCore
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/xml/XPathValue.cpp b/modules/javafx.web/src/main/native/Source/WebCore/xml/XPathValue.cpp
index 809a634d011..50ac0359f31 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/xml/XPathValue.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/xml/XPathValue.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright 2005 Frerich Raabe <raabe@kde.org>
- * Copyright (C) 2006, 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2006-2024 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -59,20 +59,20 @@ NodeSet& Value::modifiableNodeSet()
     if (!m_data)
         m_data = Data::create();
 
-    m_type = NodeSetValue;
+    m_type = Type::NodeSet;
     return m_data->nodeSet;
 }
 
 bool Value::toBoolean() const
 {
     switch (m_type) {
-        case NodeSetValue:
+    case Type::NodeSet:
             return !m_data->nodeSet.isEmpty();
-        case BooleanValue:
+    case Type::Boolean:
             return m_bool;
-        case NumberValue:
+    case Type::Number:
             return m_number && !std::isnan(m_number);
-        case StringValue:
+    case Type::String:
             return !m_data->string.isEmpty();
     }
     ASSERT_NOT_REACHED();
@@ -82,11 +82,11 @@ bool Value::toBoolean() const
 double Value::toNumber() const
 {
     switch (m_type) {
-        case NodeSetValue:
+    case Type::NodeSet:
             return Value(toString()).toNumber();
-        case NumberValue:
+    case Type::Number:
             return m_number;
-        case StringValue: {
+    case Type::String: {
             const String& str = m_data->string.simplifyWhiteSpace(deprecatedIsSpaceOrNewline);
 
             // String::toDouble() supports exponential notation, which is not allowed in XPath.
@@ -103,7 +103,7 @@ double Value::toNumber() const
                 return value;
             return std::numeric_limits<double>::quiet_NaN();
         }
-        case BooleanValue:
+    case Type::Boolean:
             return m_bool;
     }
 
@@ -114,21 +114,21 @@ double Value::toNumber() const
 String Value::toString() const
 {
     switch (m_type) {
-        case NodeSetValue:
+    case Type::NodeSet:
             if (m_data->nodeSet.isEmpty())
                 return emptyString();
             return stringValue(m_data->nodeSet.firstNode());
-        case StringValue:
+    case Type::String:
             return m_data->string;
-        case NumberValue:
+    case Type::Number:
             if (std::isnan(m_number))
                 return "NaN"_s;
-            if (m_number == 0)
+        if (!m_number)
                 return "0"_s;
             if (std::isinf(m_number))
                 return std::signbit(m_number) ? "-Infinity"_s : "Infinity"_s;
             return String::number(m_number);
-        case BooleanValue:
+    case Type::Boolean:
             return m_bool ? trueAtom() : falseAtom();
     }
 
@@ -136,5 +136,5 @@ String Value::toString() const
     return String();
 }
 
-}
-}
+} // namespace XPath
+} // namespace WebCore
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/xml/XPathValue.h b/modules/javafx.web/src/main/native/Source/WebCore/xml/XPathValue.h
index a46291615d3..9980e34c048 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/xml/XPathValue.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/xml/XPathValue.h
@@ -1,6 +1,6 @@
 /*
  * Copyright 2005 Frerich Raabe <raabe@kde.org>
- * Copyright (C) 2006, 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2006-2024 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -29,35 +29,47 @@
 #include "XPathNodeSet.h"
 
 namespace WebCore {
-    namespace XPath {
-
-        class Value {
-        public:
-            enum Type { NodeSetValue, BooleanValue, NumberValue, StringValue };
-
-            Value(bool value) : m_type(BooleanValue), m_bool(value) { }
-            Value(unsigned value) : m_type(NumberValue), m_number(value) { }
-            Value(double value) : m_type(NumberValue), m_number(value) { }
-
-            Value(const String& value) : m_type(StringValue), m_data(Data::create(value)) { }
-            Value(const char* value) : m_type(StringValue), m_data(Data::create(String::fromLatin1(value))) { }
+namespace XPath {
+
+class Value {
+public:
+    enum class Type : uint8_t { NodeSet, Boolean, Number, String };
+
+    Value() = delete;
+
+    Value(bool value)
+        : m_type(Type::Boolean), m_bool(value)
+    { }
+    Value(unsigned value)
+        : m_type(Type::Number), m_number(value)
+    { }
+    Value(double value)
+        : m_type(Type::Number), m_number(value)
+    { }
+
+    Value(const String& value)
+        : m_type(Type::String), m_data(Data::create(value))
+    { }
+    Value(const char* value)
+        : m_type(Type::String), m_data(Data::create(String::fromLatin1(value)))
+    { }
 
             explicit Value(NodeSet&& value)
-                : m_type(NodeSetValue), m_data(Data::create(WTFMove(value)))
+        : m_type(Type::NodeSet), m_data(Data::create(WTFMove(value)))
             { }
             explicit Value(Node* value)
-                : m_type(NodeSetValue), m_data(Data::create(value))
+        : m_type(Type::NodeSet), m_data(Data::create(value))
             { }
             explicit Value(RefPtr<Node>&& value)
-                : m_type(NodeSetValue), m_data(Data::create(WTFMove(value)))
+        : m_type(Type::NodeSet), m_data(Data::create(WTFMove(value)))
             { }
 
             Type type() const { return m_type; }
 
-            bool isNodeSet() const { return m_type == NodeSetValue; }
-            bool isBoolean() const { return m_type == BooleanValue; }
-            bool isNumber() const { return m_type == NumberValue; }
-            bool isString() const { return m_type == StringValue; }
+    bool isNodeSet() const { return m_type == Type::NodeSet; }
+    bool isBoolean() const { return m_type == Type::Boolean; }
+    bool isNumber() const { return m_type == Type::Number; }
+    bool isString() const { return m_type == Type::String; }
 
             const NodeSet& toNodeSet() const;
             bool toBoolean() const;
@@ -67,7 +79,7 @@ namespace WebCore {
             // Note that the NodeSet is shared with other Values that this one was copied from or that are copies of this one.
             NodeSet& modifiableNodeSet();
 
-        private:
+private:
             // This constructor creates ambiguity so that we don't accidentally call the boolean overload for pointer types.
             Value(void*) = delete;
 
@@ -94,10 +106,10 @@ namespace WebCore {
             };
 
             Type m_type;
-            bool m_bool;
-            double m_number;
+    bool m_bool { false };
+    double m_number { 0 };
             RefPtr<Data> m_data;
-        };
+};
 
-    } // namespace XPath
+} // namespace XPath
 } // namespace WebCore
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/xml/XPathVariableReference.h b/modules/javafx.web/src/main/native/Source/WebCore/xml/XPathVariableReference.h
index ff35064f834..b915443ec88 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/xml/XPathVariableReference.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/xml/XPathVariableReference.h
@@ -1,5 +1,6 @@
 /*
  * Copyright 2005 Frerich Raabe <raabe@kde.org>
+ * Copyright (C) 2006-2024 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -28,17 +29,17 @@
 #include "XPathExpressionNode.h"
 
 namespace WebCore {
-    namespace XPath {
+namespace XPath {
 
-        // Variable references are not used with XPathEvaluator.
-        class VariableReference : public Expression {
-        public:
+// Variable references are not used with XPathEvaluator.
+class VariableReference : public Expression {
+public:
             explicit VariableReference(const String& name);
-        private:
+private:
             Value evaluate() const override;
-            Value::Type resultType() const override { ASSERT_NOT_REACHED(); return Value::NumberValue; }
+    Value::Type resultType() const override { ASSERT_NOT_REACHED(); return Value::Type::Number; }
             String m_name;
-        };
+};
 
-    } // namespace XPath
+} // namespace XPath
 } // namespace WebCore
diff --git a/modules/javafx.web/src/main/native/Source/WebKitLegacy/Storage/WebStorageNamespaceProvider.h b/modules/javafx.web/src/main/native/Source/WebKitLegacy/Storage/WebStorageNamespaceProvider.h
index 13c8826f334..c366851f8e2 100644
--- a/modules/javafx.web/src/main/native/Source/WebKitLegacy/Storage/WebStorageNamespaceProvider.h
+++ b/modules/javafx.web/src/main/native/Source/WebKitLegacy/Storage/WebStorageNamespaceProvider.h
@@ -58,7 +58,7 @@ class WebStorageNamespaceProvider final : public WebCore::StorageNamespaceProvid
     void copySessionStorageNamespace(WebCore::Page&, WebCore::Page&) final;
 
     const String m_localStorageDatabasePath;
-    SingleThreadWeakHashMap<WebCore::Page, HashMap<WebCore::SecurityOriginData, RefPtr<WebCore::StorageNamespace>>> m_sessionStorageNamespaces;
+    WeakHashMap<WebCore::Page, HashMap<WebCore::SecurityOriginData, RefPtr<WebCore::StorageNamespace>>> m_sessionStorageNamespaces;
 };
 
 } // namespace WebKit
diff --git a/modules/javafx.web/src/main/native/Source/WebKitLegacy/WebCoreSupport/PageStorageSessionProvider.h b/modules/javafx.web/src/main/native/Source/WebKitLegacy/WebCoreSupport/PageStorageSessionProvider.h
index b0097638034..f20c2b549e3 100644
--- a/modules/javafx.web/src/main/native/Source/WebKitLegacy/WebCoreSupport/PageStorageSessionProvider.h
+++ b/modules/javafx.web/src/main/native/Source/WebKitLegacy/WebCoreSupport/PageStorageSessionProvider.h
@@ -48,5 +48,5 @@ class PageStorageSessionProvider final : public WebCore::StorageSessionProvider
     }
 
 private:
-    SingleThreadWeakPtr<WebCore::Page> m_page;
+    WeakPtr<WebCore::Page> m_page;
 };
diff --git a/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/WebCoreSupport/BackForwardList.cpp b/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/WebCoreSupport/BackForwardList.cpp
index 1fc26872260..37d5d0df2d0 100644
--- a/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/WebCoreSupport/BackForwardList.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/WebCoreSupport/BackForwardList.cpp
@@ -179,7 +179,8 @@ JNIEXPORT jstring JNICALL Java_com_sun_webkit_BackForwardList_bflItemGetURL(JNIE
 // entry.getTitle()
 JNIEXPORT jstring JNICALL Java_com_sun_webkit_BackForwardList_bflItemGetTitle(JNIEnv* env, jclass, jlong jitem)
 {
-    String title= ""_s;
+    HistoryItem* item = getItem(jitem);
+    String title = item->title();
     return title.toJavaString(env).releaseLocal();
 
 }
diff --git a/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/WebCoreSupport/EditorClientJava.cpp b/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/WebCoreSupport/EditorClientJava.cpp
index c70640c59f7..044d3157ece 100644
--- a/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/WebCoreSupport/EditorClientJava.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/WebCoreSupport/EditorClientJava.cpp
@@ -643,7 +643,7 @@ void EditorClientJava::discardedComposition(const Document&)
 {
 }
 
-DOMPasteAccessResponse EditorClientJava::requestDOMPasteAccess(DOMPasteAccessCategory, const String& originIdentifier)
+DOMPasteAccessResponse EditorClientJava::requestDOMPasteAccess(DOMPasteAccessCategory, FrameIdentifier, const String& originIdentifier)
 {
     return DOMPasteAccessResponse::DeniedForGesture;
 }
diff --git a/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/WebCoreSupport/EditorClientJava.h b/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/WebCoreSupport/EditorClientJava.h
index 344892d0706..51e688b60cf 100644
--- a/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/WebCoreSupport/EditorClientJava.h
+++ b/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/WebCoreSupport/EditorClientJava.h
@@ -73,7 +73,7 @@ class EditorClientJava final : public EditorClient, public TextCheckerClient {
     void getClientPasteboardData(const std::optional<SimpleRange>&, Vector<String>& pasteboardTypes, Vector<RefPtr<SharedBuffer> >& pasteboardData) override;
     void didUpdateComposition() override { }
 
-    DOMPasteAccessResponse requestDOMPasteAccess(DOMPasteAccessCategory, const String& originIdentifier) override;
+    DOMPasteAccessResponse requestDOMPasteAccess(DOMPasteAccessCategory, FrameIdentifier, const String& originIdentifier) override;
     void discardedComposition(const Document&) override;
     void canceledComposition() override;
 
diff --git a/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/WebCoreSupport/WebPage.cpp b/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/WebCoreSupport/WebPage.cpp
index 4d49a497161..1f1f073ee24 100644
--- a/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/WebCoreSupport/WebPage.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/WebCoreSupport/WebPage.cpp
@@ -808,7 +808,7 @@ class WebStorageNamespaceProviderJava final : public WebCore::StorageNamespacePr
     }
 private:
     String m_localStorageDatabasePath;
-        SingleThreadWeakHashMap<WebCore::Page, HashMap<WebCore::SecurityOriginData, RefPtr<WebCore::StorageNamespace>>> m_sessionStorageNamespaces;
+        WeakHashMap<WebCore::Page, HashMap<WebCore::SecurityOriginData, RefPtr<WebCore::StorageNamespace>>> m_sessionStorageNamespaces;
 
         RefPtr<StorageNamespace> sessionStorageNamespace(const SecurityOrigin& topLevelOrigin, Page& page, ShouldCreateNamespace shouldCreate) override{
             if (m_sessionStorageNamespaces.find(page) == m_sessionStorageNamespaces.end()) {
diff --git a/modules/javafx.web/src/main/native/Tools/Scripts/webkitdirs.pm b/modules/javafx.web/src/main/native/Tools/Scripts/webkitdirs.pm
index 7f7f740e2f2..612aa16c490 100644
--- a/modules/javafx.web/src/main/native/Tools/Scripts/webkitdirs.pm
+++ b/modules/javafx.web/src/main/native/Tools/Scripts/webkitdirs.pm
@@ -733,11 +733,18 @@ sub determineNumberOfCPUs
     if (defined($ENV{NUMBER_OF_PROCESSORS})) {
         $numberOfCPUs = $ENV{NUMBER_OF_PROCESSORS};
     } elsif (isLinux()) {
-        # First try the nproc utility, if it exists. If we get no
-        # results fall back to just interpretting /proc directly.
-        chomp($numberOfCPUs = `nproc --all 2> /dev/null`);
+        use POSIX;
+        $numberOfCPUs = POSIX::sysconf(83); # _SC_NPROCESSORS_ONLN = 83
         if ($numberOfCPUs eq "") {
-            $numberOfCPUs = (grep /processor/, `cat /proc/cpuinfo`);
+            $numberOfCPUs = 0;
+            open CPUINFO, "/proc/cpuinfo";
+            while (<CPUINFO>) {
+                if (/[Pp]rocessor\s/) { $numberOfCPUs++; }
+            }
+            close CPUINFO;
+        }
+        if ($numberOfCPUs == 0) {
+            $numberOfCPUs = 1;
         }
     } elsif (isAnyWindows()) {
         # Assumes cygwin

From 48497168892f5625f77936eccf19e836a6c1971e Mon Sep 17 00:00:00 2001
From: Jay Bhaskar <jbhaskar@openjdk.org>
Date: Fri, 23 Aug 2024 16:34:52 +0000
Subject: [PATCH 24/75] 8338886: JavaFX debug builds fail on macOS

Reviewed-by: kcr
---
 .../main/native/Source/WebCore/bindings/java/JavaDOMUtils.cpp   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/javafx.web/src/main/native/Source/WebCore/bindings/java/JavaDOMUtils.cpp b/modules/javafx.web/src/main/native/Source/WebCore/bindings/java/JavaDOMUtils.cpp
index 15f488156eb..8a1b5232634 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/bindings/java/JavaDOMUtils.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/bindings/java/JavaDOMUtils.cpp
@@ -47,7 +47,7 @@ namespace WebCore {
 
 static void raiseDOMErrorException(JNIEnv* env, WebCore::ExceptionCode ec)
 {
-    ASSERT(ec);
+    ASSERT(ec == ExceptionCode::TypeError);
 
     auto description = DOMException::description(ec);
 

From b88ac0495650bd033ba11e3131e9bffc517872eb Mon Sep 17 00:00:00 2001
From: Alexander Matveev <almatvee@openjdk.org>
Date: Fri, 23 Aug 2024 18:19:48 +0000
Subject: [PATCH 25/75] 8336940: Update GStreamer to 1.24.6 8336939: Update
 Glib to 2.80.4

Reviewed-by: kcr, sykora
---
 modules/javafx.media/src/main/legal/glib.md   |  136 +-
 .../javafx.media/src/main/legal/gstreamer.md  |   19 +-
 .../3rd_party/glib/build/osx/config.h         |   13 +-
 .../3rd_party/glib/build/osx/glibconfig.h     |    4 +-
 .../3rd_party/glib/build/win32/vs100/config.h |   10 +-
 .../glib/build/win32/vs100/glib-lite.def      | 1008 ++++-----
 .../glib/build/win32/vs100/glibconfig.h       |    4 +-
 .../3rd_party/glib/glib/deprecated/gthread.h  |   16 +-
 .../gstreamer/3rd_party/glib/glib/garcbox.c   |  125 --
 .../gstreamer/3rd_party/glib/glib/garray.c    |  158 +-
 .../3rd_party/glib/glib/gasyncqueue.c         |   70 +-
 .../gstreamer/3rd_party/glib/glib/gatomic.c   |   99 +-
 .../gstreamer/3rd_party/glib/glib/gatomic.h   |   40 +-
 .../gstreamer/3rd_party/glib/glib/gbase64.c   |   24 -
 .../gstreamer/3rd_party/glib/glib/gbitlock.c  |  248 ++-
 .../gstreamer/3rd_party/glib/glib/gbitlock.h  |   31 +
 .../gstreamer/3rd_party/glib/glib/gcharset.c  |    4 +-
 .../gstreamer/3rd_party/glib/glib/gchecksum.c |   27 +-
 .../gstreamer/3rd_party/glib/glib/gchecksum.h |   10 -
 .../3rd_party/glib/glib/gconstructor.h        |   25 +-
 .../3rd_party/glib/glib/gconstructorprivate.h |   69 +
 .../gstreamer/3rd_party/glib/glib/gconvert.c  |  110 +-
 .../gstreamer/3rd_party/glib/glib/gdataset.c  |  821 ++++----
 .../3rd_party/glib/glib/gdatasetprivate.h     |   23 +
 .../gstreamer/3rd_party/glib/glib/gdate.c     |   80 +-
 .../gstreamer/3rd_party/glib/glib/gdate.h     |    9 -
 .../3rd_party/glib/glib/gdatetime-private.c   |  257 +++
 .../3rd_party/glib/glib/gdatetime-private.h   |   88 +
 .../gstreamer/3rd_party/glib/glib/gdatetime.c |  457 +++-
 .../gstreamer/3rd_party/glib/glib/gdatetime.h |   34 +-
 .../gstreamer/3rd_party/glib/glib/gdir.c      |  108 +-
 .../gstreamer/3rd_party/glib/glib/gdir.h      |    5 +
 .../gstreamer/3rd_party/glib/glib/gerror.c    |  489 +----
 .../3rd_party/glib/glib/gfileutils.c          |   71 +-
 .../gstreamer/3rd_party/glib/glib/ggettext.c  |   51 +
 .../gstreamer/3rd_party/glib/glib/ghash.c     |  123 +-
 .../gstreamer/3rd_party/glib/glib/ghmac.c     |   19 +-
 .../gstreamer/3rd_party/glib/glib/ghmac.h     |    9 -
 .../gstreamer/3rd_party/glib/glib/ghook.c     |   18 +-
 .../3rd_party/glib/glib/ghostutils.c          |   18 +
 .../3rd_party/glib/glib/giochannel.c          |   71 +-
 .../gstreamer/3rd_party/glib/glib/giowin32.c  |    2 +-
 .../gstreamer/3rd_party/glib/glib/gkeyfile.c  |   74 +-
 .../3rd_party/glib/glib/glib-autocleanups.h   |    4 +
 .../gstreamer/3rd_party/glib/glib/glib-init.c |   55 +-
 .../3rd_party/glib/glib/glib-private.c        |   10 +-
 .../3rd_party/glib/glib/glib-private.h        |   97 +-
 .../gstreamer/3rd_party/glib/glib/glib-unix.c |  438 +++-
 .../gstreamer/3rd_party/glib/glib/glib-unix.h |  214 ++
 .../3rd_party/glib/glib/glib-visibility.h     |   34 +
 .../gstreamer/3rd_party/glib/glib/glist.c     |   98 +-
 .../gstreamer/3rd_party/glib/glib/gmacros.h   |    1 +
 .../gstreamer/3rd_party/glib/glib/gmain.c     |  196 +-
 .../gstreamer/3rd_party/glib/glib/gmarkup.c   |   56 +-
 .../gstreamer/3rd_party/glib/glib/gmem.c      |   30 -
 .../gstreamer/3rd_party/glib/glib/gmessages.c | 1108 +++++-----
 .../gstreamer/3rd_party/glib/glib/gmessages.h |   11 +
 .../gstreamer/3rd_party/glib/glib/gnode.c     |   45 +-
 .../3rd_party/glib/glib/gnulib/vasnprintf.c   |    2 +-
 .../gstreamer/3rd_party/glib/glib/goption.c   |  172 +-
 .../gstreamer/3rd_party/glib/glib/gpathbuf.c  |   14 +-
 .../gstreamer/3rd_party/glib/glib/gpathbuf.h  |    7 -
 .../gstreamer/3rd_party/glib/glib/gpattern.c  |   32 +-
 .../gstreamer/3rd_party/glib/glib/gprintf.c   |  155 +-
 .../gstreamer/3rd_party/glib/glib/gqsort.c    |    2 +-
 .../gstreamer/3rd_party/glib/glib/gquark.c    |   44 +-
 .../gstreamer/3rd_party/glib/glib/gqueue.c    |   37 +-
 .../gstreamer/3rd_party/glib/glib/grand.c     |   65 +-
 .../gstreamer/3rd_party/glib/glib/grcbox.c    |  130 --
 .../gstreamer/3rd_party/glib/glib/grefcount.c |   23 -
 .../gstreamer/3rd_party/glib/glib/gscanner.c  |   13 +-
 .../3rd_party/glib/glib/gscripttable.h        |    5 +-
 .../gstreamer/3rd_party/glib/glib/gsequence.c |   72 +-
 .../gstreamer/3rd_party/glib/glib/gshell.c    |   14 -
 .../gstreamer/3rd_party/glib/glib/gslice.c    |   59 -
 .../gstreamer/3rd_party/glib/glib/gslice.h    |    2 +
 .../gstreamer/3rd_party/glib/glib/gslist.c    |   65 +-
 .../gstreamer/3rd_party/glib/glib/gspawn.c    |  583 +-----
 .../gstreamer/3rd_party/glib/glib/gstdio.h    |    2 +-
 .../gstreamer/3rd_party/glib/glib/gstrfuncs.c |  902 ++++----
 .../gstreamer/3rd_party/glib/glib/gstrfuncs.h |   42 +-
 .../gstreamer/3rd_party/glib/glib/gstring.c   |   34 +-
 .../3rd_party/glib/glib/gstringchunk.c        |   39 +-
 .../3rd_party/glib/glib/gtestutils.c          |  307 +--
 .../3rd_party/glib/glib/gtestutils.h          |    5 +
 .../3rd_party/glib/glib/gthread-win32.c       |   44 +-
 .../gstreamer/3rd_party/glib/glib/gthread.c   |  218 +-
 .../gstreamer/3rd_party/glib/glib/gthread.h   |  219 +-
 .../3rd_party/glib/glib/gthreadpool.c         |   66 +-
 .../gstreamer/3rd_party/glib/glib/gtimer.c    |   23 +-
 .../gstreamer/3rd_party/glib/glib/gtimezone.c |   51 +-
 .../3rd_party/glib/glib/gtrashstack.c         |   32 +-
 .../gstreamer/3rd_party/glib/glib/gtree.c     |   44 +-
 .../gstreamer/3rd_party/glib/glib/gunibreak.h | 1000 +++++----
 .../3rd_party/glib/glib/gunichartables.h      |  560 ++---
 .../gstreamer/3rd_party/glib/glib/gunicode.h  |   14 +-
 .../3rd_party/glib/glib/gunicollate.c         |    2 +
 .../gstreamer/3rd_party/glib/glib/gunicomp.h  |   46 +-
 .../3rd_party/glib/glib/gunidecomp.c          |   37 -
 .../3rd_party/glib/glib/gunidecomp.h          |  132 +-
 .../gstreamer/3rd_party/glib/glib/guri.c      |  207 +-
 .../gstreamer/3rd_party/glib/glib/gutils.c    |  136 +-
 .../3rd_party/glib/glib/gutilsprivate.h       |    2 +
 .../3rd_party/glib/glib/gvariant-core.c       |   18 +-
 .../3rd_party/glib/glib/gvariant-parser.c     |    9 +-
 .../3rd_party/glib/glib/gvariant-serialiser.c |    3 +-
 .../gstreamer/3rd_party/glib/glib/gvariant.c  |  187 +-
 .../3rd_party/glib/glib/gvarianttype.c        |  173 +-
 .../3rd_party/glib/glib/gvarianttype.h        |   11 +-
 .../gstreamer/3rd_party/glib/glib/gversion.c  |   22 -
 .../gstreamer/3rd_party/glib/glib/gwakeup.c   |   18 +-
 .../3rd_party/glib/gmodule/gmodule-dl.c       |    4 +-
 .../glib/gmodule/gmodule-visibility.h         |   34 +
 .../3rd_party/glib/gmodule/gmodule.c          |   95 +-
 .../3rd_party/glib/gobject/gbinding.c         |   67 +-
 .../3rd_party/glib/gobject/gbinding.h         |    8 -
 .../gstreamer/3rd_party/glib/gobject/gboxed.c |   46 +-
 .../3rd_party/glib/gobject/gclosure.c         |  329 +--
 .../3rd_party/glib/gobject/gclosure.h         |   10 +-
 .../gstreamer/3rd_party/glib/gobject/genums.c |   37 -
 .../gstreamer/3rd_party/glib/gobject/genums.h |   12 +-
 .../3rd_party/glib/gobject/glib-types.h       |   44 +
 .../glib/gobject/gobject-autocleanups.h       |    4 +
 .../glib/gobject/gobject-visibility.h         |   34 +
 .../3rd_party/glib/gobject/gobject.c          | 1849 ++++++++++++-----
 .../3rd_party/glib/gobject/gobject.h          |   17 +-
 .../gstreamer/3rd_party/glib/gobject/gparam.c |   61 +-
 .../gstreamer/3rd_party/glib/gobject/gparam.h |   15 +-
 .../3rd_party/glib/gobject/gparamspecs.c      |   45 +-
 .../3rd_party/glib/gobject/gsignal.c          |  144 +-
 .../3rd_party/glib/gobject/gsignal.h          |   22 +-
 .../3rd_party/glib/gobject/gsourceclosure.c   |    4 +-
 .../gstreamer/3rd_party/glib/gobject/gtype.c  |  127 +-
 .../gstreamer/3rd_party/glib/gobject/gtype.h  |   73 +-
 .../3rd_party/glib/gobject/gtypemodule.c      |   35 +-
 .../3rd_party/glib/gobject/gtypemodule.h      |    7 -
 .../3rd_party/glib/gobject/gtypeplugin.c      |   47 +-
 .../3rd_party/glib/gobject/gtypeplugin.h      |    6 -
 .../gstreamer/3rd_party/glib/gobject/gvalue.c |  116 --
 .../3rd_party/glib/gobject/gvaluearray.c      |   44 +-
 .../3rd_party/glib/gobject/gvaluearray.h      |    7 -
 .../3rd_party/glib/gobject/gvaluecollector.h  |   12 +-
 .../3rd_party/glib/gobject/gvaluetypes.c      |   39 +-
 .../3rd_party/glib/gobject/gvaluetypes.h      |    2 +
 .../gst-plugins-base/ext/alsa/gstalsa.c       |  250 ++-
 .../gst-plugins-base/ext/alsa/gstalsasink.c   |   39 +
 .../gst-libs/gst/app/gstappsink.c             |  318 ++-
 .../gst-libs/gst/app/gstappsink.h             |   46 +-
 .../gst-libs/gst/app/gstapputils.c            |  250 +++
 .../gst-libs/gst/app/gstapputils.h            |   47 +
 .../gst-libs/gst/audio/audio-buffer.c         |    9 +-
 .../gst-libs/gst/audio/audio-channel-mixer.c  |   32 +-
 .../gst-libs/gst/audio/audio-channels.c       |    4 +-
 .../gst-libs/gst/audio/audio-converter.c      |    8 +-
 .../gst-libs/gst/audio/audio-info.c           |   10 +-
 .../gst-libs/gst/audio/audio-quantize.c       |    4 +-
 .../gst-libs/gst/audio/audio-resampler.c      |    6 +-
 .../gst-libs/gst/audio/audio.h                |    1 +
 .../gst-libs/gst/audio/gstaudiobasesink.c     |   15 +-
 .../gst-libs/gst/audio/gstaudiobasesrc.c      |    6 +-
 .../gst-libs/gst/audio/gstaudiodecoder.c      |   24 +-
 .../gst-libs/gst/audio/gstaudioencoder.c      |   10 +-
 .../gst-libs/gst/audio/gstaudiometa.c         |  129 +-
 .../gst-libs/gst/audio/gstaudiometa.h         |    3 +
 .../gst-libs/gst/audio/gstaudioringbuffer.c   |  106 +-
 .../gst-libs/gst/audio/gstaudioringbuffer.h   |   40 +-
 .../gst-libs/gst/audio/gstaudiosink.c         |   23 +-
 .../gst-libs/gst/fft/kiss_fft_f32.c           |    2 +-
 .../gst-libs/gst/fft/kiss_fftr_f32.c          |    2 +-
 .../gst-libs/gst/pbutils/codec-utils.c        |   18 +-
 .../gst-libs/gst/pbutils/descriptions.c       |   22 +-
 .../gst-libs/gst/pbutils/gstaudiovisualizer.c |   11 +-
 .../gst/pbutils/gstdiscoverer-types.c         |    2 +-
 .../gst-libs/gst/pbutils/gstdiscoverer.c      |  128 +-
 .../gst-libs/gst/pbutils/gstdiscoverer.h      |   18 +-
 .../gst-libs/gst/pbutils/missing-plugins.c    |   10 +-
 .../gst-libs/gst/riff/riff-media.c            |   50 +-
 .../gst-libs/gst/tag/gsttagdemux.c            |    2 +-
 .../gst-plugins-base/gst-libs/gst/tag/id3v2.c |  120 +-
 .../gst-libs/gst/video/convertframe.c         |   28 +-
 .../gst-libs/gst/video/gstvideometa.c         |  127 +-
 .../gst-libs/gst/video/gstvideometa.h         |    7 +-
 .../gst-libs/gst/video/gstvideoutils.c        |    8 +-
 .../gst-libs/gst/video/video-chroma.c         |    4 +-
 .../gst-libs/gst/video/video-converter.c      |  221 +-
 .../gst-libs/gst/video/video-dither.c         |    6 +-
 .../gst-libs/gst/video/video-format.c         | 1107 +++++++---
 .../gst-libs/gst/video/video-format.h         |  331 ++-
 .../gst-libs/gst/video/video-frame.c          |    2 +-
 .../gst-libs/gst/video/video-info.c           |   73 +-
 .../gst-libs/gst/video/video-multiview.c      |   26 +-
 .../gst-libs/gst/video/video-orc-dist.c       | 1028 +++++++++
 .../gst-libs/gst/video/video-orc-dist.h       |    4 +
 .../gst-libs/gst/video/video-orc.orc          |   88 +
 .../gst/video/video-overlay-composition.c     |   16 +-
 .../gst-libs/gst/video/video.h                |    3 +
 .../gst-libs/gst/video/videoorientation.c     |    1 -
 .../gst/audioconvert/gstaudioconvert.c        |   30 +-
 .../gst/typefind/gsttypefindfunctions.c       |  812 +++++++-
 .../gst/typefind/gsttypefindfunctionsdata.c   |    2 +-
 .../gst/typefind/gsttypefindfunctionsplugin.c |   10 +
 .../gst/typefind/gsttypefindfunctionsplugin.h |   24 +
 .../gst/typefind/gsttypefindfunctionsriff.c   |    6 +-
 .../typefind/gsttypefindfunctionsstartwith.c  |    6 +-
 .../gst-plugins-base/gst/volume/gstvolume.c   |  217 +-
 .../gst-plugins-base/gst/volume/gstvolume.h   |    8 +-
 .../gst/audioparsers/gstaacparse.c            |   92 +-
 .../gst-plugins-good/gst/isomp4/fourcc.h      |   13 +
 .../gst-plugins-good/gst/isomp4/qtdemux.c     |  714 ++++++-
 .../gst-plugins-good/gst/isomp4/qtdemux.h     |   33 +
 .../gst/isomp4/qtdemux_tags.c                 |  240 ++-
 .../gst/isomp4/qtdemux_types.c                |    4 +-
 .../gst/wavparse/gstwavparse.c                |    1 +
 .../sys/osxaudio/gstosxaudio.c                |   18 +-
 .../sys/osxaudio/gstosxaudioringbuffer.c      |    7 +-
 .../sys/osxaudio/gstosxaudiosink.c            |    8 +
 .../sys/osxaudio/gstosxaudiosink.h            |    2 +
 .../sys/osxaudio/gstosxaudiosrc.c             |   23 +
 .../sys/osxaudio/gstosxaudiosrc.h             |    2 +
 .../sys/osxaudio/gstosxcoreaudio.c            |  136 +-
 .../sys/osxaudio/gstosxcoreaudio.h            |   15 +
 .../sys/osxaudio/gstosxcoreaudiocommon.c      |   29 +-
 .../sys/osxaudio/gstosxcoreaudiocommon.h      |    4 +
 .../sys/osxaudio/gstosxcoreaudiohal.c         |   32 +-
 .../gstreamer-lite/gstreamer/gst/gst.c        |   33 +-
 .../gstreamer-lite/gstreamer/gst/gst.h        |    1 +
 .../gstreamer/gst/gst_private.h               |   10 +-
 .../gstreamer/gst/gstallocator.c              |   34 +-
 .../gstreamer/gst/gstallocator.h              |   18 +
 .../gstreamer-lite/gstreamer/gst/gstbin.c     |   24 +-
 .../gstreamer-lite/gstreamer/gst/gstbuffer.c  |  132 +-
 .../gstreamer-lite/gstreamer/gst/gstbuffer.h  |    3 +
 .../gstreamer/gst/gstbufferlist.c             |   16 +-
 .../gstreamer/gst/gstbufferpool.c             |    6 +
 .../gstreamer-lite/gstreamer/gst/gstbus.c     |   50 +-
 .../gstreamer/gst/gstbytearrayinterface.h     |  133 ++
 .../gstreamer-lite/gstreamer/gst/gstcaps.c    |   11 +-
 .../gstreamer/gst/gstcapsfeatures.c           |    4 +-
 .../gstreamer-lite/gstreamer/gst/gstclock.c   |   10 +-
 .../gstreamer-lite/gstreamer/gst/gstclock.h   |   43 +-
 .../gstreamer-lite/gstreamer/gst/gstcontext.c |   25 +-
 .../gstreamer-lite/gstreamer/gst/gstcontext.h |    9 +
 .../gstreamer/gst/gstcontrolbinding.c         |    2 +-
 .../gstreamer/gst/gstdatetime.c               |    4 +-
 .../gstreamer/gst/gstdebugutils.c             |    7 +
 .../gstreamer-lite/gstreamer/gst/gstelement.c |  108 +-
 .../gstreamer/gst/gstelementfactory.c         |    8 +-
 .../gstreamer/gst/gstelementfactory.h         |    8 +
 .../gstreamer-lite/gstreamer/gst/gstevent.c   |    8 +-
 .../gstreamer-lite/gstreamer/gst/gstformat.c  |    2 +-
 .../gstreamer-lite/gstreamer/gst/gstinfo.c    |   28 +-
 .../gstreamer/gst/gstiterator.c               |    7 +-
 .../gstreamer-lite/gstreamer/gst/gstmessage.c |    8 +-
 .../gstreamer-lite/gstreamer/gst/gstmeta.c    |  420 +++-
 .../gstreamer-lite/gstreamer/gst/gstmeta.h    |  128 +-
 .../gstreamer-lite/gstreamer/gst/gstobject.c  |    2 +
 .../gstreamer-lite/gstreamer/gst/gstobject.h  |   48 +
 .../gstreamer-lite/gstreamer/gst/gstpad.c     |   90 +-
 .../gstreamer-lite/gstreamer/gst/gstpad.h     |   28 +
 .../gstreamer-lite/gstreamer/gst/gstparse.c   |    4 +-
 .../gstreamer/gst/gstpipeline.c               |   68 +-
 .../gstreamer/gst/gstpipeline.h               |    6 +
 .../gstreamer-lite/gstreamer/gst/gstplugin.c  |  168 +-
 .../gstreamer-lite/gstreamer/gst/gstplugin.h  |   18 +
 .../gstreamer/gst/gstpluginfeature.c          |   13 +-
 .../gstreamer/gst/gstpluginloader.c           | 1191 -----------
 .../gstreamer/gst/gstpluginloader.h           |   42 -
 .../gstreamer-lite/gstreamer/gst/gstpoll.c    |    4 +-
 .../gstreamer/gst/gstprotection.c             |    9 +
 .../gstreamer-lite/gstreamer/gst/gstquery.c   |    6 +-
 .../gstreamer/gst/gstregistry.c               |  108 +-
 .../gstreamer/gst/gstregistrybinary.c         |   14 +-
 .../gstreamer/gst/gstregistrybinary.h         |    2 +-
 .../gstreamer/gst/gstregistrychunks.c         |   61 +-
 .../gstreamer/gst/gstregistrychunks.h         |    4 +-
 .../gstreamer-lite/gstreamer/gst/gstsample.c  |   32 +-
 .../gstreamer-lite/gstreamer/gst/gstsample.h  |   15 +-
 .../gstreamer-lite/gstreamer/gst/gstsegment.c |   11 +-
 .../gstreamer/gst/gststreamcollection.c       |   14 +-
 .../gstreamer/gst/gststructure.c              |   45 +-
 .../gstreamer/gst/gststructure.h              |   18 +-
 .../gstreamer/gst/gstsystemclock.c            |  266 ++-
 .../gstreamer-lite/gstreamer/gst/gsttaglist.c |   10 +-
 .../gstreamer-lite/gstreamer/gst/gsttaglist.h |   12 +
 .../gstreamer/gst/gsttagsetter.c              |    4 +-
 .../gstreamer-lite/gstreamer/gst/gsttask.c    |   26 +-
 .../gstreamer/gst/gsttaskpool.c               |   11 +-
 .../gstreamer-lite/gstreamer/gst/gsttoc.c     |    8 +-
 .../gstreamer/gst/gsttocsetter.c              |    4 +-
 .../gstreamer/gst/gsttracerutils.c            |    4 +-
 .../gstreamer-lite/gstreamer/gst/gsturi.c     |  117 +-
 .../gstreamer-lite/gstreamer/gst/gsturi.h     |    6 +
 .../gstreamer-lite/gstreamer/gst/gstutils.c   |  307 ++-
 .../gstreamer-lite/gstreamer/gst/gstutils.h   |   23 +
 .../gstreamer-lite/gstreamer/gst/gstvalue.c   |  131 +-
 .../gstreamer/libs/gst/base/gstadapter.c      |    2 +-
 .../gstreamer/libs/gst/base/gstbaseparse.c    |   20 +-
 .../gstreamer/libs/gst/base/gstbasesink.c     |   39 +-
 .../gstreamer/libs/gst/base/gstbasesink.h     |   14 +
 .../gstreamer/libs/gst/base/gstbasesrc.c      |  132 +-
 .../gstreamer/libs/gst/base/gstbasesrc.h      |    4 +
 .../gstreamer/libs/gst/base/gstbitreader.c    |    4 +-
 .../gstreamer/libs/gst/base/gstbytereader.c   |    4 +-
 .../gstreamer/libs/gst/base/gstbytewriter.c   |    8 +-
 .../gstreamer/libs/gst/base/gstcollectpads.c  |    2 +-
 .../gstreamer/libs/gst/base/gstflowcombiner.c |    4 +-
 .../gstreamer/libs/gst/base/gstindex.c        |   16 +-
 .../gstreamer/libs/gst/base/gstmemindex.c     |    8 +-
 .../gstreamer/libs/gst/base/gstqueuearray.c   |  221 +-
 .../gstreamer/libs/gst/base/gstqueuearray.h   |   17 +
 .../libs/gst/base/gsttypefindhelper.c         |   13 +-
 .../gstinterpolationcontrolsource.c           |   17 +-
 .../libs/gst/controller/gstlfocontrolsource.c |   20 +-
 .../controller/gsttimedvaluecontrolsource.c   |   10 +-
 .../gstreamer/plugins/elements/gstqueue.c     |  164 +-
 .../gstreamer/plugins/elements/gstqueue.h     |    1 +
 .../plugins/elements/gsttypefindelement.c     |    2 +-
 .../projects/build/linux/common/config.h      |    6 +-
 .../projects/build/osx/common/x86_64/config.h |    6 +-
 .../projects/build/win32/common/config.h      |    6 +-
 .../projects/linux/gstreamer-lite/Makefile    |    2 +-
 .../gstreamer/projects/mac/glib-lite/Makefile |    1 +
 .../projects/mac/gstreamer-lite/Makefile      |    2 +-
 .../projects/win/glib-lite/Makefile.glib      |    1 +
 .../win/gstreamer-lite/Makefile.gstreamer     |    2 +-
 .../main/native/vs_project/glib/glib.vcxproj  |    3 +
 .../vs_project/glib/glib.vcxproj.filters      |    1 +
 .../vs_project/gstreamer/gstreamer.vcxproj    |   20 +-
 .../gstreamer/gstreamer.vcxproj.filters       |    6 +-
 329 files changed, 17758 insertions(+), 11574 deletions(-)
 create mode 100644 modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gconstructorprivate.h
 create mode 100644 modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdatetime-private.c
 create mode 100644 modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdatetime-private.h
 create mode 100644 modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/app/gstapputils.c
 create mode 100644 modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/app/gstapputils.h
 create mode 100644 modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstbytearrayinterface.h
 delete mode 100644 modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstpluginloader.c
 delete mode 100644 modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstpluginloader.h

diff --git a/modules/javafx.media/src/main/legal/glib.md b/modules/javafx.media/src/main/legal/glib.md
index 1175efa501f..148b44f478f 100644
--- a/modules/javafx.media/src/main/legal/glib.md
+++ b/modules/javafx.media/src/main/legal/glib.md
@@ -1,11 +1,11 @@
-## GNU Glib v2.78.1
+## GNU Glib v2.80.4
 
 ### Glib Notice
 ```
 
-You are receiving a copy of GNU Glib, Version: 2.78.1 in either source or
+You are receiving a copy of GNU Glib, Version: 2.80.4 in either source or
 object code in the JavaFX runtime or JavaFX SDK. The terms of the
-Oracle license do NOT apply to the GNU Glib, Version: 2.78.1; it is
+Oracle license do NOT apply to the GNU Glib, Version: 2.80.4; it is
 licensed under the following license, separately from the Oracle programs
 you receive. If you do not wish to install this library, you may delete
 this library:
@@ -39,60 +39,67 @@ other parts by BSD-style licenses.
 ```
 Copyright (C) 1997-2005 Tim Janik
 Copyright (C) 1995-1998  Peter Mattis, Spencer Kimball and Josh MacDonald
-Copyright 2018  Emmanuele Bassi
-Copyright (C) 2000 Sebastian Wilhelmi; University of Karlsruhe
+Copyright (C) 2018  Emmanuele Bassi
+Copyright (C) 1998-2001 Sebastian Wilhelmi; University of Karlsruhe
 Copyright (C) 2007-2011 Ryan Lortie
 Copyright (C) 2005-2006 Alexander Larsson <alexl@redhat.com>
 Copyright (C) 2000-2003 Ximian Inc.
 Copyright (C) 2009-2010 Codethink Limited
-Copyright (C) 2011 Collabora Ltd.
-Copyright (C) 1998-2012 Red Hat, Inc.
+Copyright (C) 2009-2024 Collabora Ltd.
+Copyright (C) 1998-2022 Red Hat, Inc.
 Copyright (C) 2007  Emmanuele Bassi  <ebassi@gnome.org>
-Copyright Red Hat Inc., 2000
-Copyright 2020 Frederic Martinsons
+Copyright (C) 2023 Luca Bacci
+Copyright (C) Red Hat Inc., 2000
+Copyright (C) 2020 Frederic Martinsons
 Copyright (C) 2005  Red Hat
+Copyright (C) 2023 GNOME Foundation Inc.
 Copyright (C) 2009-2010 Christian Hergert <chris@dronelabs.com>
 Copyright (C) 2010 Thiago Santos <thiago.sousa.santos@collabora.co.uk>
 Copyright (C) 2010 Emmanuele Bassi <ebassi@linux.intel.com>
 Copyright (C) 2018 Tomasz Miasko
-Copyright 2001 Hans Breuer
-Copyright 2000-2004 Tor Lillqvist
-Copyright 2000-2005 Red Hat, Inc.
+Copyright (C) 2001 Hans Breuer
+Copyright (C) 1998-2004 Tor Lillqvist
 Copyright (C) 2011  Stef Walter  <stefw@collabora.co.uk>
 Copyright (C) 1995-2002  Peter Mattis, Red Hat, Inc.
-Copyright 1998 Owen Taylor
-Copyright 1998 Owen Taylor and Tor Lillqvist
-Copyright 1999-2000 Tor Lillqvist and Craig Setera
-Copyright 2001-2003 Andrew Lanoix
-Copyright 2009-2018  Collabora Ltd.
-Copyright 2009  Nokia Corporation
+Copyright (C) 1998 Owen Taylor
+Copyright (C) 1998 Owen Taylor and Tor Lillqvist
+Copyright (C) 1999-2000 Tor Lillqvist and Craig Setera
+Copyright (C) 2001-2003 Andrew Lanoix
+Copyright (C) 2009  Nokia Corporation
 Copyright (C) 2011-2015 Canonical Limited
 Copyright (C) 1997-2001 Tim Janik and Red Hat, Inc.
 Copyright (C) 2021  Iain Lane, Xavier Claessens
-Copyright 2005 Matthias Clasen
+Copyright (C) 2003-2007 Matthias Clasen
+Copyright (C) 2006 Padraig O'Briain
+Copyright (C) 2007 Lennart Poettering
+Copyright (C) 2018-2022 Endless OS Foundation, LLC
+Copyright (C) 2018 Peter Wu
+Copyright (C) 2019 Ting-Wei Lan
+Copyright (C) 2019 Sebastian Schwarz
+Copyright (C) 2020 Matt Rose
+Copyright (C) 2021 Casper Dik
+Copyright (C) 2022 Alexander Richardson
+Copyright (C) 2022 Ray Strode
+Copyright (C) 2022 Thomas Haller
+Copyright (C) 2003-2023 Sebastian Wilhelmi
+Copyright (C) 2023 CaiJingLong
 Copyright (C) 1991-2019 Free Software Foundation, Inc.
-Copyright (C) 2003  Matthias Clasen
 Copyright (C) 1999-2019 Free Software
 Copyright (C) 1999-2003 Red Hat Software
 Copyright (C) 2004       Anders Carlsson <andersca@gnome.org>
 Copyright (C) 2000 Eazel, Inc.
 Copyright (C) 2002-2007
- Copyright 1991, 92, 95, 96, 97, 98, 99 Free Software Foundation, Inc.
-Copyright 2017-2019 Руслан Ижбулатов
+Copyright (C) 1991, 92, 95, 96, 97, 98, 99 Free Software Foundation, Inc.
+Copyright (C) 2017-2019 Руслан Ижбулатов
 Copyright (C) 2005-2007 Imendio AB
-Copyright 1998-2001 Sebastian Wilhelmi; University of Karlsruhe
-Copyright (C) 2003 Sebastian Wilhelmi
-Copyright © 2020 Endless Mobile, Inc.
+Copyright (C) 2018-2020 Endless Mobile, Inc.
 Copyright (C) 1999-2000 Tom Tromey
 Copyright (C) 2003 Noah Levitt
-Copyright © 2020 Red Hat, Inc.
-Copyright (C) 2018 Endless Mobile, Inc.
-Copyright (C) 2022 Endless OS Foundation, LLC
 Copyright (C) 2020 William Manley
-Copyright (C) 1998-1999  Tor Lillqvist
 Copyright (C) 2009 Benjamin Otte <otte@gnome.org>
 Copyright (C) 2010  Intel Corp.
 Copyright (C) 2010 Christian Persch
+Copyright (C) 2006 Dave Benson
 
                   GNU LESSER GENERAL PUBLIC LICENSE
                        Version 2.1, February 1999
@@ -603,7 +610,7 @@ That's all there is to it!
 #### MIT License
 ```
 ---------------------------------
-The below license applies to the following files:
+The below applies to the following file(s):
 glib/glib/gbsearcharray.h
 
 Copyright (C) 2000-2003 Tim Janik
@@ -624,7 +631,7 @@ otherwise) arising in any way out of the use of this software, even
 if advised of the possibility of such damage.
 
 ---------------------------------
-The below license applies to the following files:
+The below applies to the following file(s):
 glib/glib/gutils.c
 
 Copyright (C) 2007 Red Hat, Inc.
@@ -654,17 +661,15 @@ SOFTWARE.
 #### Permissive License
 ```
 ---------------------------------
-The below license applies to the following files:
+The below applies to the following file(s):
 glib/glib/win_iconv.c
 
-iconv library implemented with Win32 API.
-
 This file is placed in the public domain.
 
 Maintainer: Yukihiro Nakadaira <yukihiro.nakadaira@gmail.com>
 
 ---------------------------------
-The below license applies to the following files:
+The below applies to the following file(s):
 glib/glib/gchecksum.c
 
 Copyright (C) 1995, A.M. Kuchling
@@ -673,65 +678,4 @@ Distribute and use freely; there are no restrictions on further
 dissemination and usage except those imposed by the laws of your
 country of residence.
 
----------------------------------
-The below license applies to the following files:
-glib/glib/gcharset.c (guess_category_value())
-
-Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-
-The following is (partly) taken from the gettext package.
-
----------------------------------
-The below license applies to the following files:
-glib/glib/gchecksum.c (sha256_sum_init())
-
-Copyright (C) 2006 Dave Benson
-
-Adapted from the SHA256 implementation in gsk/src/hash/gskhash.c.
-Released under the terms of the GNU Lesser General Public License
-
----------------------------------
-The below license applies to the following files:
-glib/glib/gpoll.c (poll())
-
-Copyright (C) 1994-1997 Free Software Foundation, Inc.
-
-The following implementation of poll() comes from the GNU C Library.
-
----------------------------------
-The below license applies to the following files:
-glib/glib/gfileutils.c
-
-Copyright (C) 1991,92,93,94,95,96,97,98,99 Free Software Foundation, Inc.
-
-get_tmp_file based on the mkstemp implementation from the GNU C library.
-
----------------------------------
-The below license applies to the following files:
-glib/glib/gmarkup.c
-
-Copyright (C) 1999-2003 Free Software Foundation, Inc.
-
-Partially based on code from printf-parser.c
-
----------------------------------
-The below license applies to the following files:
-glib/glib/gstrfuncs.c (g_parse_long_long())
-
-Copyright (C) 1991-2002 Free Software Foundation, Inc.
-
-This code is based on on the strtol(3) code from GNU libc released under
-the GNU Lesser General Public License.
-
----------------------------------
-The below license applies to the following files:
-glib/glib/gunicollate.c
-
-Copyright (C) 1995-2001 Free Software Foundation, Inc.
-
-Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
-
-utf8_encode() is taken (with modification) from GNU
-libc's strxfrm routine.
-
 ```
diff --git a/modules/javafx.media/src/main/legal/gstreamer.md b/modules/javafx.media/src/main/legal/gstreamer.md
index 69f835e3a84..e625f37f7fb 100644
--- a/modules/javafx.media/src/main/legal/gstreamer.md
+++ b/modules/javafx.media/src/main/legal/gstreamer.md
@@ -1,11 +1,11 @@
-## GStreamer v1.22.6
+## GStreamer v1.24.6
 
 ### GStreamer Notice
 ```
 
-You are receiving a copy of GStreamer, Version: 1.22.6 in either source or
+You are receiving a copy of GStreamer, Version: 1.24.6 in either source or
 object code in the JavaFX runtime or JavaFX SDK. The terms of the
-Oracle license do NOT apply to the GStreamer, Version: 1.22.6; it is
+Oracle license do NOT apply to the GStreamer, Version: 1.24.6; it is
 licensed under the following license, separately from the Oracle programs
 you receive. If you do not wish to install this library, you may delete
 this library:
@@ -63,9 +63,7 @@ Copyright (C) 2010 Collabora Multimedia
 Copyright (C) 2009-2010 Edward Hervey <edward.hervey@collabora.co.uk>
 Copyright (C) 2005-2007 Jan Schmidt <thaytan@mad.scientist.com>
 Copyright (C) 2010 Thiago Santos <thiago.sousa.santos@collabora.co.uk>
-Copyright 2005 Jan Schmidt <thaytan@mad.scientist.com>
-Copyright 2002-2003 Scott Wheeler <wheeler@kde.org> (portions from taglib)
-Copyright 2006-2008 Tim-Philipp Müller <tim centricular net>
+Copyright (C) 2002-2003 Scott Wheeler <wheeler@kde.org> (portions from taglib)
 Copyright (C) 2005 Ross Burton <ross@burtonini.com>
 Copyright (C) 2010 Brandon Lewis <brandon.lewis@collabora.co.uk>
 Copyright (C) <2003> Julien Moutte <julien@moutte.net>
@@ -97,14 +95,13 @@ Copyright (C) <2006> Nokia Corporation, Stefan Kost <stefan.kost@nokia.com>.
 Copyright (C) 2005 Sebastien Moutte <sebastien@moutte.net>
 Copyright (C) 2010-2013 Fluendo S.A. <support@fluendo.com>
 Copyright (C) 2005-2006 Zaheer Abbas Merali <zaheerabbas at merali dot org>
-Copyright 2005 David Schleef <ds@schleef.org>
 Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
 Copyright (C) 2009-2011 Wim Taymans <wim.taymans@gmail.be>
 Copyright (C) 2009-2010 Edward Hervey <bilboed@bilboed.com>
 Copyright (C) 2009 Axis Communications <dev-gstreamer at axis dot com>
 Copyright (C) 2014 Tim-Philipp Müller <tim at centricular dot com>
+Copyright (C) 2023 Netflix Inc.
 Copyright (C) 2011-2016 Stefan Sauer <ensonic@users.sf.net>
-Copyright (C) 2008 Jan Schmidt <jan.schmidt@sun.com>
 Copyright (C) 2007 Peter Kjellerstedt <pkj@axis.com>
 Copyright (C) 2008 Ole André Vadla Ravnås <ole.andre.ravnas@tandberg.com>
 Copyright (C) 2006 Josep Torra <josep@fluendo.com>
@@ -668,7 +665,7 @@ Sebastian Dröge <slomo@coaxion.net>
 #### BSD License
 ```
 ---------------------------------
-The below license applies to the following files:
+The below applies to the following file(s):
 gstreamer-lite/gst-plugins-base/gst-libs/gst/fft/_kiss_fft_guts_f32.h
 gstreamer-lite/gst-plugins-base/gst-libs/gst/fft/kiss_fft_f32.c
 gstreamer-lite/gst-plugins-base/gst-libs/gst/fft/kiss_fft_f32.h
@@ -711,7 +708,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #### Permissive License
 ```
 ---------------------------------
-The below license applies to the following files:
+The below applies to the following file(s):
 gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/dbesi0.c
 
 Copyright (C) 1996 Takuya OOURA
@@ -722,7 +719,7 @@ without fee.
 Package home:  http://www.kurims.kyoto-u.ac.jp/~ooura/bessel.html
 
 ---------------------------------
-The below license applies to the following files:
+The below applies to the following file(s):
 gstreamer-lite/gstreamer/gst/gsturi.c
 
 Copyright (C) 1990-1993
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/build/osx/config.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/build/osx/config.h
index bc2b8b03d9f..4e3968f247e 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/build/osx/config.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/build/osx/config.h
@@ -39,7 +39,7 @@
 #define GETTEXT_PACKAGE "glib20"
 
 /* Define to the GLIB binary age */
-#define GLIB_BINARY_AGE 7801
+#define GLIB_BINARY_AGE 8004
 
 /* Define to the GLIB interface age */
 #define GLIB_INTERFACE_AGE 1
@@ -51,10 +51,10 @@
 #define GLIB_MAJOR_VERSION 2
 
 /* Define to the GLIB micro version */
-#define GLIB_MICRO_VERSION 1
+#define GLIB_MICRO_VERSION 4
 
 /* Define to the GLIB minor version */
-#define GLIB_MINOR_VERSION 78
+#define GLIB_MINOR_VERSION 80
 
 /* Have inline keyword */
 #define G_HAVE_INLINE 1
@@ -705,7 +705,7 @@
 #define PACKAGE_NAME "glib"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "glib 2.78.1"
+#define PACKAGE_STRING "glib 2.80.4"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "glib"
@@ -714,7 +714,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.78.1"
+#define PACKAGE_VERSION "2.80.4"
 
 /* define if posix_memalign() can allocate any size */
 #define POSIX_MEMALIGN_WITH_COMPLIANT_ALLOCS 1
@@ -829,9 +829,6 @@
 /* Number of bits in a file offset, on hosts where this is settable. */
 /* #undef _FILE_OFFSET_BITS */
 
-/* defines how to decorate public symbols while building */
-#define _GLIB_EXTERN __attribute__((visibility("default"))) extern
-
 /* Define for large files, on AIX-style hosts. */
 /* #undef _LARGE_FILES */
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/build/osx/glibconfig.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/build/osx/glibconfig.h
index c2ffadd5657..5bf29a9c3f0 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/build/osx/glibconfig.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/build/osx/glibconfig.h
@@ -113,8 +113,8 @@ typedef unsigned long guintptr;
 #define G_GUINTPTR_FORMAT       "lu"
 
 #define GLIB_MAJOR_VERSION 2
-#define GLIB_MINOR_VERSION 78
-#define GLIB_MICRO_VERSION 1
+#define GLIB_MINOR_VERSION 80
+#define GLIB_MICRO_VERSION 4
 
 #define G_OS_UNIX
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/build/win32/vs100/config.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/build/win32/vs100/config.h
index 620ad4657af..cbab05f9c8d 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/build/win32/vs100/config.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/build/win32/vs100/config.h
@@ -38,7 +38,7 @@
 #define GETTEXT_PACKAGE "glib20"
 
 /* Define to the GLIB binary age */
-#define GLIB_BINARY_AGE 7801
+#define GLIB_BINARY_AGE 8004
 
 /* Define to the GLIB interface age */
 #define GLIB_INTERFACE_AGE 1
@@ -50,10 +50,10 @@
 #define GLIB_MAJOR_VERSION 2
 
 /* Define to the GLIB micro version */
-#define GLIB_MICRO_VERSION 1
+#define GLIB_MICRO_VERSION 4
 
 /* Define to the GLIB minor version */
-#define GLIB_MINOR_VERSION 78
+#define GLIB_MINOR_VERSION 80
 
 /* A 'va_copy' style function */
 #if !defined (_MSC_VER) || (_MSC_VER >= 1800)
@@ -692,7 +692,7 @@
 #define PACKAGE_NAME "glib"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "glib 2.78.1"
+#define PACKAGE_STRING "glib 2.80.4"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "glib"
@@ -701,7 +701,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.78.1"
+#define PACKAGE_VERSION "2.80.4"
 
 /* define if posix_memalign() can allocate any size */
 /* #undef POSIX_MEMALIGN_WITH_COMPLIANT_ALLOCS */
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/build/win32/vs100/glib-lite.def b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/build/win32/vs100/glib-lite.def
index c8a2f39bda0..343a80f9403 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/build/win32/vs100/glib-lite.def
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/build/win32/vs100/glib-lite.def
@@ -43,504 +43,510 @@ g_base64_encode	@41	NONAME
 g_boxed_type_register_static	@42	NONAME
 g_build_filename	@43	NONAME
 g_build_filenamev	@44	NONAME
-g_bytes_compare	@45	NONAME
-g_bytes_get_data	@46	NONAME
-g_bytes_get_type	@47	NONAME
-g_bytes_new	@48	NONAME
-g_bytes_new_take	@49	NONAME
-g_bytes_ref	@50	NONAME
-g_bytes_unref	@51	NONAME
-g_cclosure_marshal_VOID__VOID	@52	NONAME
-g_cclosure_marshal_generic	@53	NONAME
-g_checksum_free	@54	NONAME
-g_checksum_get_string	@55	NONAME
-g_checksum_new	@56	NONAME
-g_checksum_update	@57	NONAME
-g_clear_error	@58	NONAME
-g_cond_broadcast	@59	NONAME
-g_cond_clear	@60	NONAME
-g_cond_init	@61	NONAME
-g_cond_signal	@62	NONAME
-g_cond_wait	@63	NONAME
-g_cond_wait_until	@64	NONAME
-g_convert	@65	NONAME
-g_datalist_id_get_data	@66	NONAME
-g_datalist_id_set_data_full	@67	NONAME
-g_datalist_init	@68	NONAME
-g_date_free	@69	NONAME
-g_date_get_day	@70	NONAME
-g_date_get_julian	@71	NONAME
-g_date_get_month	@72	NONAME
-g_date_get_type	@73	NONAME
-g_date_get_year	@74	NONAME
-g_date_new_dmy	@75	NONAME
-g_date_time_add	@76	NONAME
-g_date_time_add_minutes	@77	NONAME
-g_date_time_add_seconds	@78	NONAME
-g_date_time_compare	@79	NONAME
-g_date_time_get_day_of_month	@80	NONAME
-g_date_time_get_hour	@81	NONAME
-g_date_time_get_microsecond	@82	NONAME
-g_date_time_get_minute	@83	NONAME
-g_date_time_get_month	@84	NONAME
-g_date_time_get_second	@85	NONAME
-g_date_time_get_type	@86	NONAME
-g_date_time_get_utc_offset	@87	NONAME
-g_date_time_get_year	@88	NONAME
-g_date_time_get_ymd	@89	NONAME
-g_date_time_new	@90	NONAME
-g_date_time_new_from_unix_local	@91	NONAME
-g_date_time_new_from_unix_utc	@92	NONAME
-g_date_time_new_local	@93	NONAME
-g_date_time_new_now_local	@94	NONAME
-g_date_time_new_now_utc	@95	NONAME
-g_date_time_new_utc	@96	NONAME
-g_date_time_to_local	@97	NONAME
-g_date_time_to_unix	@98	NONAME
-g_date_time_unref	@99	NONAME
-g_date_valid	@100	NONAME
-g_date_valid_dmy	@101	NONAME
-g_dgettext	@102	NONAME
-g_dir_close	@103	NONAME
-g_dir_open	@104	NONAME
-g_dir_read_name	@105	NONAME
-g_enum_get_value	@106	NONAME
-g_enum_get_value_by_name	@107	NONAME
-g_enum_get_value_by_nick	@108	NONAME
-g_enum_register_static	@109	NONAME
-g_error_free	@110	NONAME
-g_error_get_type	@111	NONAME
-g_error_new	@112	NONAME
-g_error_new_literal	@113	NONAME
-g_file_set_contents	@114	NONAME
-g_file_test	@115	NONAME
-g_filename_to_uri	@116	NONAME
-g_flags_get_first_value	@117	NONAME
-g_flags_get_value_by_name	@118	NONAME
-g_flags_get_value_by_nick	@119	NONAME
-g_flags_register_static	@120	NONAME
-g_free	@121	NONAME
-g_get_charset	@122	NONAME
-g_get_current_dir	@123	NONAME
-g_get_current_time	@124	NONAME
-g_get_monotonic_time	@125	NONAME
-g_get_prgname	@126	NONAME
-g_get_real_time	@127	NONAME
-g_get_user_cache_dir	@128	NONAME
-g_get_user_data_dir	@129	NONAME
-g_getenv	@130	NONAME
-g_gtype_get_type	@131	NONAME
-g_hash_table_contains	@132	NONAME
-g_hash_table_destroy	@133	NONAME
-g_hash_table_foreach	@134	NONAME
-g_hash_table_foreach_remove	@135	NONAME
-g_hash_table_get_keys	@136	NONAME
-g_hash_table_get_values	@137	NONAME
-g_hash_table_insert	@138	NONAME
-g_hash_table_iter_init	@139	NONAME
-g_hash_table_iter_next	@140	NONAME
-g_hash_table_lookup	@141	NONAME
-g_hash_table_new	@142	NONAME
-g_hash_table_new_full	@143	NONAME
-g_hash_table_ref	@144	NONAME
-g_hash_table_remove	@145	NONAME
-g_hash_table_replace	@146	NONAME
-g_hash_table_size	@147	NONAME
-g_hash_table_unref	@148	NONAME
-g_hook_alloc	@149	NONAME
-g_hook_destroy_link	@150	NONAME
-g_hook_get	@151	NONAME
-g_hook_insert_before	@152	NONAME
-g_hook_list_clear	@153	NONAME
-g_hook_list_init	@154	NONAME
-g_hook_list_marshal	@155	NONAME
-g_hook_ref	@156	NONAME
-g_hook_unref	@157	NONAME
-g_initially_unowned_get_type	@158	NONAME
-g_int_equal	@159	NONAME
-g_int_hash	@160	NONAME
-g_intern_static_string	@161	NONAME
-g_intern_string	@162	NONAME
-g_key_file_free	@163	NONAME
-g_key_file_get_comment	@164	NONAME
-g_key_file_get_groups	@165	NONAME
-g_key_file_get_keys	@166	NONAME
-g_key_file_get_value	@167	NONAME
-g_key_file_has_group	@168	NONAME
-g_key_file_load_from_file	@169	NONAME
-g_key_file_new	@170	NONAME
-g_key_file_remove_group	@171	NONAME
-g_key_file_remove_key	@172	NONAME
-g_key_file_set_comment	@173	NONAME
-g_key_file_set_string	@174	NONAME
-g_key_file_set_value	@175	NONAME
-g_key_file_to_data	@176	NONAME
-g_list_alloc	@177	NONAME
-g_list_append	@178	NONAME
-g_list_concat	@179	NONAME
-g_list_copy	@180	NONAME
-g_list_copy_deep	@181	NONAME
-g_list_delete_link	@182	NONAME
-g_list_find	@183	NONAME
-g_list_find_custom	@184	NONAME
-g_list_foreach	@185	NONAME
-g_list_free	@186	NONAME
-g_list_free_full	@187	NONAME
-g_list_index	@188	NONAME
-g_list_insert	@189	NONAME
-g_list_insert_before	@190	NONAME
-g_list_insert_sorted	@191	NONAME
-g_list_last	@192	NONAME
-g_list_length	@193	NONAME
-g_list_nth_data	@194	NONAME
-g_list_position	@195	NONAME
-g_list_prepend	@196	NONAME
-g_list_remove	@197	NONAME
-g_list_remove_link	@198	NONAME
-g_list_reverse	@199	NONAME
-g_list_sort	@200	NONAME
-g_locale_to_utf8	@201	NONAME
-g_log	@202	NONAME
-g_log_default_handler	@203	NONAME
-g_log_set_default_handler	@204	NONAME
-g_log_set_handler	@205	NONAME
-g_main_context_get_thread_default	@206	NONAME
-g_main_context_new	@207	NONAME
-g_main_context_unref	@208	NONAME
-g_main_loop_is_running	@209	NONAME
-g_main_loop_new	@210	NONAME
-g_main_loop_quit	@211	NONAME
-g_main_loop_run	@212	NONAME
-g_main_loop_unref	@213	NONAME
-g_malloc	@214	NONAME
-g_malloc0	@215	NONAME
-g_malloc0_n	@216	NONAME
-g_malloc_n	@217	NONAME
-g_mapped_file_ref	@218	NONAME
-g_mapped_file_unref	@219	NONAME
-g_markup_parse_context_ref	@220	NONAME
-g_markup_parse_context_unref	@221	NONAME
-g_memdup	@222	NONAME
-g_memdup2	@223	NONAME
-g_mkdir_with_parents	@224	NONAME
-g_module_close	@225	NONAME
-g_module_error	@226	NONAME
-g_module_make_resident	@227	NONAME
-g_module_open	@228	NONAME
-g_module_supported	@229	NONAME
-g_module_symbol	@230	NONAME
-g_mutex_clear	@231	NONAME
-g_mutex_init	@232	NONAME
-g_mutex_lock	@233	NONAME
-g_mutex_unlock	@234	NONAME
-g_node_children_foreach	@235	NONAME
-g_node_destroy	@236	NONAME
-g_node_insert_before	@237	NONAME
-g_node_new	@238	NONAME
-g_node_nth_child	@239	NONAME
-g_object_add_weak_pointer	@240	NONAME
-g_object_class_find_property	@241	NONAME
-g_object_class_install_properties	@242	NONAME
-g_object_class_install_property	@243	NONAME
-g_object_class_list_properties	@244	NONAME
-g_object_force_floating	@245	NONAME
-g_object_freeze_notify	@246	NONAME
-g_object_get	@247	NONAME
-g_object_get_property	@248	NONAME
-g_object_interface_install_property	@249	NONAME
-g_object_is_floating	@250	NONAME
-g_object_new	@251	NONAME
-g_object_new_with_properties	@252	NONAME
-g_object_notify	@253	NONAME
-g_object_notify_by_pspec	@254	NONAME
-g_object_ref	@255	NONAME
-g_object_ref_sink	@256	NONAME
-g_object_remove_weak_pointer	@257	NONAME
-g_object_set	@258	NONAME
-g_object_set_property	@259	NONAME
-g_object_thaw_notify	@260	NONAME
-g_object_unref	@261	NONAME
-g_once_impl	@262	NONAME
-g_once_init_enter	@263	NONAME
-g_once_init_leave	@264	NONAME
-g_option_group_ref	@265	NONAME
-g_option_group_unref	@266	NONAME
-g_param_spec_boolean	@267	NONAME
-g_param_spec_boxed	@268	NONAME
-g_param_spec_double	@269	NONAME
-g_param_spec_enum	@270	NONAME
-g_param_spec_flags	@271	NONAME
-g_param_spec_float	@272	NONAME
-g_param_spec_gtype	@273	NONAME
-g_param_spec_int	@274	NONAME
-g_param_spec_int64	@275	NONAME
-g_param_spec_internal	@276	NONAME
-g_param_spec_object	@277	NONAME
-g_param_spec_ref	@278	NONAME
-g_param_spec_sink	@279	NONAME
-g_param_spec_string	@280	NONAME
-g_param_spec_uint	@281	NONAME
-g_param_spec_uint64	@282	NONAME
-g_param_spec_unref	@283	NONAME
-g_param_type_register_static	@284	NONAME
-g_param_value_set_default	@285	NONAME
-g_param_value_validate	@286	NONAME
-g_param_values_cmp	@287	NONAME
-g_path_get_basename	@288	NONAME
-g_path_get_dirname	@289	NONAME
-g_path_is_absolute	@290	NONAME
-g_pointer_type_register_static	@291	NONAME
-g_print	@292	NONAME
-g_printerr	@293	NONAME
-g_private_get	@294	NONAME
-g_private_set	@295	NONAME
-g_propagate_error	@296	NONAME
-g_ptr_array_add	@297	NONAME
-g_ptr_array_find_with_equal_func	@298	NONAME
-g_ptr_array_foreach	@299	NONAME
-g_ptr_array_free	@300	NONAME
-g_ptr_array_new_full	@301	NONAME
-g_ptr_array_new_with_free_func	@302	NONAME
-g_ptr_array_remove_fast	@303	NONAME
-g_ptr_array_remove_index	@304	NONAME
-g_ptr_array_set_size	@305	NONAME
-g_ptr_array_sort	@306	NONAME
-g_qsort_with_data	@307	NONAME
-g_quark_from_static_string	@308	NONAME
-g_quark_from_string	@309	NONAME
-g_quark_to_string	@310	NONAME
-g_quark_try_string	@311	NONAME
-g_queue_clear	@312	NONAME
-g_queue_clear_full	@313	NONAME
-g_queue_delete_link	@314	NONAME
-g_queue_find	@315	NONAME
-g_queue_find_custom	@316	NONAME
-g_queue_foreach	@317	NONAME
-g_queue_free	@318	NONAME
-g_queue_get_length	@319	NONAME
-g_queue_init	@320	NONAME
-g_queue_is_empty	@321	NONAME
-g_queue_new	@322	NONAME
-g_queue_peek_nth	@323	NONAME
-g_queue_pop_head	@324	NONAME
-g_queue_push_head	@325	NONAME
-g_queue_push_tail	@326	NONAME
-g_queue_remove	@327	NONAME
-g_queue_sort	@328	NONAME
-g_random_int	@329	NONAME
-g_realloc	@330	NONAME
-g_realloc_n	@331	NONAME
-g_rec_mutex_clear	@332	NONAME
-g_rec_mutex_init	@333	NONAME
-g_rec_mutex_lock	@334	NONAME
-g_rec_mutex_unlock	@335	NONAME
-g_rename	@336	NONAME
-g_rw_lock_init	@337	NONAME
-g_rw_lock_reader_lock	@338	NONAME
-g_rw_lock_reader_unlock	@339	NONAME
-g_rw_lock_writer_lock	@340	NONAME
-g_rw_lock_writer_unlock	@341	NONAME
-g_set_error	@342	NONAME
-g_set_error_literal	@343	NONAME
-g_signal_connect_data	@344	NONAME
-g_signal_emit	@345	NONAME
-g_signal_handler_disconnect	@346	NONAME
-g_signal_handlers_destroy	@347	NONAME
-g_signal_handlers_disconnect_matched	@348	NONAME
-g_signal_new	@349	NONAME
-g_slice_alloc	@350	NONAME
-g_slice_alloc0	@351	NONAME
-g_slice_copy	@352	NONAME
-g_slice_free1	@353	NONAME
-g_slist_append	@354	NONAME
-g_slist_concat	@355	NONAME
-g_slist_delete_link	@356	NONAME
-g_slist_foreach	@357	NONAME
-g_slist_free	@358	NONAME
-g_slist_insert_before	@359	NONAME
-g_slist_prepend	@360	NONAME
-g_slist_remove	@361	NONAME
-g_slist_reverse	@362	NONAME
-g_snprintf	@363	NONAME
-g_source_add_poll	@364	NONAME
-g_source_attach	@365	NONAME
-g_source_destroy	@366	NONAME
-g_source_new	@367	NONAME
-g_source_ref	@368	NONAME
-g_source_remove	@369	NONAME
-g_source_set_callback	@370	NONAME
-g_source_set_dispose_function	@371	NONAME
-g_source_set_name	@372	NONAME
-g_source_set_priority	@373	NONAME
-g_source_unref	@374	NONAME
-g_spawn_close_pid	@375	NONAME
-g_stat	@376	NONAME
-g_str_equal	@377	NONAME
-g_str_has_prefix	@378	NONAME
-g_str_has_suffix	@379	NONAME
-g_str_hash	@380	NONAME
-g_strchomp	@381	NONAME
-g_strchug	@382	NONAME
-g_strcmp0	@383	NONAME
-g_strconcat	@384	NONAME
-g_strdelimit	@385	NONAME
-g_strdup	@386	NONAME
-g_strdup_printf	@387	NONAME
-g_strdup_value_contents	@388	NONAME
-g_strdup_vprintf	@389	NONAME
-g_strdupv	@390	NONAME
-g_strerror	@391	NONAME
-g_strfreev	@392	NONAME
-g_string_append	@393	NONAME
-g_string_append_len	@394	NONAME
-g_string_append_printf	@395	NONAME
-g_string_free	@396	NONAME
-g_string_insert_c	@397	NONAME
-g_string_insert_len	@398	NONAME
-g_string_new	@399	NONAME
-g_string_set_size	@400	NONAME
-g_string_sized_new	@401	NONAME
-g_string_truncate	@402	NONAME
-g_strjoin	@403	NONAME
-g_strlcat	@404	NONAME
-g_strlcpy	@405	NONAME
-g_strndup	@406	NONAME
-g_strrstr	@407	NONAME
-g_strsplit	@408	NONAME
-g_strsplit_set	@409	NONAME
-g_strstr_len	@410	NONAME
-g_strtod	@411	NONAME
-g_strv_get_type	@412	NONAME
-g_strv_length	@413	NONAME
-g_thread_get_type	@414	NONAME
-g_thread_join	@415	NONAME
-g_thread_new	@416	NONAME
-g_thread_pool_free	@417	NONAME
-g_thread_pool_new	@418	NONAME
-g_thread_pool_push	@419	NONAME
-g_thread_pool_set_max_threads	@420	NONAME
-g_thread_pool_set_max_unused_threads	@421	NONAME
-g_thread_self	@422	NONAME
-g_thread_try_new	@423	NONAME
-g_thread_yield	@424	NONAME
-g_time_zone_new	@425	NONAME
-g_time_zone_new_identifier	@426	NONAME
-g_time_zone_unref	@427	NONAME
-g_timeout_add_full	@428	NONAME
-g_timer_destroy	@429	NONAME
-g_timer_elapsed	@430	NONAME
-g_timer_new	@431	NONAME
-g_timer_start	@432	NONAME
-g_tree_destroy	@433	NONAME
-g_tree_insert	@434	NONAME
-g_tree_new_with_data	@435	NONAME
-g_tree_search	@436	NONAME
-g_try_malloc	@437	NONAME
-g_try_malloc0_n	@438	NONAME
-g_try_malloc_n	@439	NONAME
-g_try_realloc	@440	NONAME
-g_try_realloc_n	@441	NONAME
-g_type_add_class_private	@442	NONAME
-g_type_add_instance_private	@443	NONAME
-g_type_add_interface_static	@444	NONAME
-g_type_check_class_cast	@445	NONAME
-g_type_check_instance_cast	@446	NONAME
-g_type_check_instance_is_a	@447	NONAME
-g_type_check_instance_is_fundamentally_a	@448	NONAME
-g_type_check_value	@449	NONAME
-g_type_check_value_holds	@450	NONAME
-g_type_class_add_private	@451	NONAME
-g_type_class_adjust_private_offset	@452	NONAME
-g_type_class_get_private	@453	NONAME
-g_type_class_peek	@454	NONAME
-g_type_class_peek_parent	@455	NONAME
-g_type_class_ref	@456	NONAME
-g_type_class_unref	@457	NONAME
-g_type_from_name	@458	NONAME
-g_type_fundamental	@459	NONAME
-g_type_fundamental_next	@460	NONAME
-g_type_get_qdata	@461	NONAME
-g_type_init	@462	NONAME
-g_type_instance_get_private	@463	NONAME
-g_type_interface_add_prerequisite	@464	NONAME
-g_type_interface_peek	@465	NONAME
-g_type_interfaces	@466	NONAME
-g_type_is_a	@467	NONAME
-g_type_name	@468	NONAME
-g_type_parent	@469	NONAME
-g_type_qname	@470	NONAME
-g_type_register_fundamental	@471	NONAME
-g_type_register_static	@472	NONAME
-g_type_register_static_simple	@473	NONAME
-g_type_set_qdata	@474	NONAME
-g_type_value_table_peek	@475	NONAME
-g_unlink	@476	NONAME
-g_uri_escape_string	@477	NONAME
-g_uri_unescape_segment	@478	NONAME
-g_uri_unescape_string	@479	NONAME
-g_utf16_to_utf8	@480	NONAME
-g_utf8_strchr	@481	NONAME
-g_utf8_to_utf16	@482	NONAME
-g_utf8_validate	@483	NONAME
-g_value_array_append	@484	NONAME
-g_value_array_get_nth	@485	NONAME
-g_value_array_get_type	@486	NONAME
-g_value_array_new	@487	NONAME
-g_value_copy	@488	NONAME
-g_value_dup_boxed	@489	NONAME
-g_value_dup_object	@490	NONAME
-g_value_dup_string	@491	NONAME
-g_value_get_boolean	@492	NONAME
-g_value_get_boxed	@493	NONAME
-g_value_get_double	@494	NONAME
-g_value_get_enum	@495	NONAME
-g_value_get_flags	@496	NONAME
-g_value_get_float	@497	NONAME
-g_value_get_gtype	@498	NONAME
-g_value_get_int	@499	NONAME
-g_value_get_int64	@500	NONAME
-g_value_get_long	@501	NONAME
-g_value_get_object	@502	NONAME
-g_value_get_pointer	@503	NONAME
-g_value_get_string	@504	NONAME
-g_value_get_uchar	@505	NONAME
-g_value_get_uint	@506	NONAME
-g_value_get_uint64	@507	NONAME
-g_value_get_ulong	@508	NONAME
-g_value_init	@509	NONAME
-g_value_peek_pointer	@510	NONAME
-g_value_register_transform_func	@511	NONAME
-g_value_reset	@512	NONAME
-g_value_set_boolean	@513	NONAME
-g_value_set_boxed	@514	NONAME
-g_value_set_double	@515	NONAME
-g_value_set_enum	@516	NONAME
-g_value_set_flags	@517	NONAME
-g_value_set_float	@518	NONAME
-g_value_set_gtype	@519	NONAME
-g_value_set_int	@520	NONAME
-g_value_set_int64	@521	NONAME
-g_value_set_long	@522	NONAME
-g_value_set_object	@523	NONAME
-g_value_set_pointer	@524	NONAME
-g_value_set_static_boxed	@525	NONAME
-g_value_set_static_string	@526	NONAME
-g_value_set_string	@527	NONAME
-g_value_set_uchar	@528	NONAME
-g_value_set_uint	@529	NONAME
-g_value_set_uint64	@530	NONAME
-g_value_set_ulong	@531	NONAME
-g_value_take_boxed	@532	NONAME
-g_value_take_object	@533	NONAME
-g_value_take_string	@534	NONAME
-g_value_transform	@535	NONAME
-g_value_type_compatible	@536	NONAME
-g_value_unset	@537	NONAME
-g_vasprintf	@538	NONAME
-g_warn_message	@539	NONAME
-g_weak_ref_clear	@540	NONAME
-g_weak_ref_get	@541	NONAME
-g_weak_ref_init	@542	NONAME
-g_weak_ref_set	@543	NONAME
-g_win32_error_message	@544	NONAME
-g_win32_get_package_installation_directory_of_module	@545	NONAME
+g_byte_array_set_size	@45	NONAME
+g_bytes_compare	@46	NONAME
+g_bytes_get_data	@47	NONAME
+g_bytes_get_type	@48	NONAME
+g_bytes_new	@49	NONAME
+g_bytes_new_take	@50	NONAME
+g_bytes_ref	@51	NONAME
+g_bytes_unref	@52	NONAME
+g_cclosure_marshal_VOID__VOID	@53	NONAME
+g_cclosure_marshal_generic	@54	NONAME
+g_checksum_free	@55	NONAME
+g_checksum_get_string	@56	NONAME
+g_checksum_new	@57	NONAME
+g_checksum_update	@58	NONAME
+g_clear_error	@59	NONAME
+g_cond_broadcast	@60	NONAME
+g_cond_clear	@61	NONAME
+g_cond_init	@62	NONAME
+g_cond_signal	@63	NONAME
+g_cond_wait	@64	NONAME
+g_cond_wait_until	@65	NONAME
+g_convert	@66	NONAME
+g_datalist_id_get_data	@67	NONAME
+g_datalist_id_set_data_full	@68	NONAME
+g_datalist_init	@69	NONAME
+g_date_free	@70	NONAME
+g_date_get_day	@71	NONAME
+g_date_get_julian	@72	NONAME
+g_date_get_month	@73	NONAME
+g_date_get_type	@74	NONAME
+g_date_get_year	@75	NONAME
+g_date_new_dmy	@76	NONAME
+g_date_time_add	@77	NONAME
+g_date_time_add_minutes	@78	NONAME
+g_date_time_add_seconds	@79	NONAME
+g_date_time_compare	@80	NONAME
+g_date_time_get_day_of_month	@81	NONAME
+g_date_time_get_hour	@82	NONAME
+g_date_time_get_microsecond	@83	NONAME
+g_date_time_get_minute	@84	NONAME
+g_date_time_get_month	@85	NONAME
+g_date_time_get_second	@86	NONAME
+g_date_time_get_type	@87	NONAME
+g_date_time_get_utc_offset	@88	NONAME
+g_date_time_get_year	@89	NONAME
+g_date_time_get_ymd	@90	NONAME
+g_date_time_new	@91	NONAME
+g_date_time_new_from_unix_local	@92	NONAME
+g_date_time_new_from_unix_utc	@93	NONAME
+g_date_time_new_local	@94	NONAME
+g_date_time_new_now_local	@95	NONAME
+g_date_time_new_now_utc	@96	NONAME
+g_date_time_new_utc	@97	NONAME
+g_date_time_to_local	@98	NONAME
+g_date_time_to_unix	@99	NONAME
+g_date_time_unref	@100	NONAME
+g_date_valid	@101	NONAME
+g_date_valid_dmy	@102	NONAME
+g_dgettext	@103	NONAME
+g_dir_close	@104	NONAME
+g_dir_open	@105	NONAME
+g_dir_read_name	@106	NONAME
+g_enum_get_value	@107	NONAME
+g_enum_get_value_by_name	@108	NONAME
+g_enum_get_value_by_nick	@109	NONAME
+g_enum_register_static	@110	NONAME
+g_error_free	@111	NONAME
+g_error_get_type	@112	NONAME
+g_error_new	@113	NONAME
+g_error_new_literal	@114	NONAME
+g_file_set_contents	@115	NONAME
+g_file_test	@116	NONAME
+g_filename_to_uri	@117	NONAME
+g_flags_get_first_value	@118	NONAME
+g_flags_get_value_by_name	@119	NONAME
+g_flags_get_value_by_nick	@120	NONAME
+g_flags_register_static	@121	NONAME
+g_free	@122	NONAME
+g_get_charset	@123	NONAME
+g_get_current_dir	@124	NONAME
+g_get_current_time	@125	NONAME
+g_get_monotonic_time	@126	NONAME
+g_get_prgname	@127	NONAME
+g_get_real_time	@128	NONAME
+g_get_user_cache_dir	@129	NONAME
+g_get_user_data_dir	@130	NONAME
+g_getenv	@131	NONAME
+g_gtype_get_type	@132	NONAME
+g_hash_table_contains	@133	NONAME
+g_hash_table_destroy	@134	NONAME
+g_hash_table_foreach	@135	NONAME
+g_hash_table_foreach_remove	@136	NONAME
+g_hash_table_get_keys	@137	NONAME
+g_hash_table_get_values	@138	NONAME
+g_hash_table_insert	@139	NONAME
+g_hash_table_iter_init	@140	NONAME
+g_hash_table_iter_next	@141	NONAME
+g_hash_table_lookup	@142	NONAME
+g_hash_table_new	@143	NONAME
+g_hash_table_new_full	@144	NONAME
+g_hash_table_ref	@145	NONAME
+g_hash_table_remove	@146	NONAME
+g_hash_table_replace	@147	NONAME
+g_hash_table_size	@148	NONAME
+g_hash_table_unref	@149	NONAME
+g_hook_alloc	@150	NONAME
+g_hook_destroy_link	@151	NONAME
+g_hook_get	@152	NONAME
+g_hook_insert_before	@153	NONAME
+g_hook_list_clear	@154	NONAME
+g_hook_list_init	@155	NONAME
+g_hook_list_marshal	@156	NONAME
+g_hook_ref	@157	NONAME
+g_hook_unref	@158	NONAME
+g_initially_unowned_get_type	@159	NONAME
+g_int_equal	@160	NONAME
+g_int_hash	@161	NONAME
+g_intern_static_string	@162	NONAME
+g_intern_string	@163	NONAME
+g_key_file_free	@164	NONAME
+g_key_file_get_comment	@165	NONAME
+g_key_file_get_groups	@166	NONAME
+g_key_file_get_keys	@167	NONAME
+g_key_file_get_value	@168	NONAME
+g_key_file_has_group	@169	NONAME
+g_key_file_load_from_file	@170	NONAME
+g_key_file_new	@171	NONAME
+g_key_file_remove_group	@172	NONAME
+g_key_file_remove_key	@173	NONAME
+g_key_file_set_comment	@174	NONAME
+g_key_file_set_string	@175	NONAME
+g_key_file_set_value	@176	NONAME
+g_key_file_to_data	@177	NONAME
+g_list_alloc	@178	NONAME
+g_list_append	@179	NONAME
+g_list_concat	@180	NONAME
+g_list_copy	@181	NONAME
+g_list_copy_deep	@182	NONAME
+g_list_delete_link	@183	NONAME
+g_list_find	@184	NONAME
+g_list_find_custom	@185	NONAME
+g_list_foreach	@186	NONAME
+g_list_free	@187	NONAME
+g_list_free_full	@188	NONAME
+g_list_index	@189	NONAME
+g_list_insert	@190	NONAME
+g_list_insert_before	@191	NONAME
+g_list_insert_sorted	@192	NONAME
+g_list_last	@193	NONAME
+g_list_length	@194	NONAME
+g_list_nth_data	@195	NONAME
+g_list_position	@196	NONAME
+g_list_prepend	@197	NONAME
+g_list_remove	@198	NONAME
+g_list_remove_link	@199	NONAME
+g_list_reverse	@200	NONAME
+g_list_sort	@201	NONAME
+g_locale_to_utf8	@202	NONAME
+g_log	@203	NONAME
+g_log_default_handler	@204	NONAME
+g_log_set_default_handler	@205	NONAME
+g_log_set_handler	@206	NONAME
+g_main_context_get_thread_default	@207	NONAME
+g_main_context_new	@208	NONAME
+g_main_context_unref	@209	NONAME
+g_main_loop_is_running	@210	NONAME
+g_main_loop_new	@211	NONAME
+g_main_loop_quit	@212	NONAME
+g_main_loop_run	@213	NONAME
+g_main_loop_unref	@214	NONAME
+g_malloc	@215	NONAME
+g_malloc0	@216	NONAME
+g_malloc0_n	@217	NONAME
+g_malloc_n	@218	NONAME
+g_mapped_file_ref	@219	NONAME
+g_mapped_file_unref	@220	NONAME
+g_markup_parse_context_ref	@221	NONAME
+g_markup_parse_context_unref	@222	NONAME
+g_memdup	@223	NONAME
+g_memdup2	@224	NONAME
+g_mkdir_with_parents	@225	NONAME
+g_module_close	@226	NONAME
+g_module_error	@227	NONAME
+g_module_make_resident	@228	NONAME
+g_module_open	@229	NONAME
+g_module_supported	@230	NONAME
+g_module_symbol	@231	NONAME
+g_mutex_clear	@232	NONAME
+g_mutex_init	@233	NONAME
+g_mutex_lock	@234	NONAME
+g_mutex_unlock	@235	NONAME
+g_node_children_foreach	@236	NONAME
+g_node_destroy	@237	NONAME
+g_node_insert_before	@238	NONAME
+g_node_new	@239	NONAME
+g_node_nth_child	@240	NONAME
+g_object_add_weak_pointer	@241	NONAME
+g_object_class_find_property	@242	NONAME
+g_object_class_install_properties	@243	NONAME
+g_object_class_install_property	@244	NONAME
+g_object_class_list_properties	@245	NONAME
+g_object_force_floating	@246	NONAME
+g_object_freeze_notify	@247	NONAME
+g_object_get	@248	NONAME
+g_object_get_property	@249	NONAME
+g_object_interface_install_property	@250	NONAME
+g_object_is_floating	@251	NONAME
+g_object_new	@252	NONAME
+g_object_new_with_properties	@253	NONAME
+g_object_notify	@254	NONAME
+g_object_notify_by_pspec	@255	NONAME
+g_object_ref	@256	NONAME
+g_object_ref_sink	@257	NONAME
+g_object_remove_weak_pointer	@258	NONAME
+g_object_set	@259	NONAME
+g_object_set_property	@260	NONAME
+g_object_thaw_notify	@261	NONAME
+g_object_unref	@262	NONAME
+g_once_impl	@263	NONAME
+g_once_init_enter	@264	NONAME
+g_once_init_enter_pointer	@265	NONAME
+g_once_init_leave	@266	NONAME
+g_once_init_leave_pointer	@267	NONAME
+g_option_group_ref	@268	NONAME
+g_option_group_unref	@269	NONAME
+g_param_spec_boolean	@270	NONAME
+g_param_spec_boxed	@271	NONAME
+g_param_spec_double	@272	NONAME
+g_param_spec_enum	@273	NONAME
+g_param_spec_flags	@274	NONAME
+g_param_spec_float	@275	NONAME
+g_param_spec_gtype	@276	NONAME
+g_param_spec_int	@277	NONAME
+g_param_spec_int64	@278	NONAME
+g_param_spec_internal	@279	NONAME
+g_param_spec_object	@280	NONAME
+g_param_spec_ref	@281	NONAME
+g_param_spec_sink	@282	NONAME
+g_param_spec_string	@283	NONAME
+g_param_spec_uint	@284	NONAME
+g_param_spec_uint64	@285	NONAME
+g_param_spec_unref	@286	NONAME
+g_param_type_register_static	@287	NONAME
+g_param_value_set_default	@288	NONAME
+g_param_value_validate	@289	NONAME
+g_param_values_cmp	@290	NONAME
+g_path_get_basename	@291	NONAME
+g_path_get_dirname	@292	NONAME
+g_path_is_absolute	@293	NONAME
+g_pointer_type_register_static	@294	NONAME
+g_print	@295	NONAME
+g_printerr	@296	NONAME
+g_private_get	@297	NONAME
+g_private_set	@298	NONAME
+g_propagate_error	@299	NONAME
+g_ptr_array_add	@300	NONAME
+g_ptr_array_find_with_equal_func	@301	NONAME
+g_ptr_array_foreach	@302	NONAME
+g_ptr_array_free	@303	NONAME
+g_ptr_array_new_full	@304	NONAME
+g_ptr_array_new_with_free_func	@305	NONAME
+g_ptr_array_remove_fast	@306	NONAME
+g_ptr_array_remove_index	@307	NONAME
+g_ptr_array_set_size	@308	NONAME
+g_ptr_array_sized_new	@309	NONAME
+g_ptr_array_sort	@310	NONAME
+g_qsort_with_data	@311	NONAME
+g_quark_from_static_string	@312	NONAME
+g_quark_from_string	@313	NONAME
+g_quark_to_string	@314	NONAME
+g_quark_try_string	@315	NONAME
+g_queue_clear	@316	NONAME
+g_queue_clear_full	@317	NONAME
+g_queue_delete_link	@318	NONAME
+g_queue_find	@319	NONAME
+g_queue_find_custom	@320	NONAME
+g_queue_foreach	@321	NONAME
+g_queue_free	@322	NONAME
+g_queue_get_length	@323	NONAME
+g_queue_init	@324	NONAME
+g_queue_is_empty	@325	NONAME
+g_queue_new	@326	NONAME
+g_queue_peek_head	@327	NONAME
+g_queue_peek_nth	@328	NONAME
+g_queue_pop_head	@329	NONAME
+g_queue_push_head	@330	NONAME
+g_queue_push_tail	@331	NONAME
+g_queue_remove	@332	NONAME
+g_queue_sort	@333	NONAME
+g_random_int	@334	NONAME
+g_realloc	@335	NONAME
+g_realloc_n	@336	NONAME
+g_rec_mutex_clear	@337	NONAME
+g_rec_mutex_init	@338	NONAME
+g_rec_mutex_lock	@339	NONAME
+g_rec_mutex_unlock	@340	NONAME
+g_rename	@341	NONAME
+g_rw_lock_init	@342	NONAME
+g_rw_lock_reader_lock	@343	NONAME
+g_rw_lock_reader_unlock	@344	NONAME
+g_rw_lock_writer_lock	@345	NONAME
+g_rw_lock_writer_unlock	@346	NONAME
+g_set_error	@347	NONAME
+g_set_error_literal	@348	NONAME
+g_signal_connect_data	@349	NONAME
+g_signal_emit	@350	NONAME
+g_signal_handler_disconnect	@351	NONAME
+g_signal_handlers_destroy	@352	NONAME
+g_signal_handlers_disconnect_matched	@353	NONAME
+g_signal_new	@354	NONAME
+g_signal_new_class_handler	@355	NONAME
+g_slice_alloc	@356	NONAME
+g_slice_alloc0	@357	NONAME
+g_slice_copy	@358	NONAME
+g_slice_free1	@359	NONAME
+g_slist_append	@360	NONAME
+g_slist_concat	@361	NONAME
+g_slist_delete_link	@362	NONAME
+g_slist_foreach	@363	NONAME
+g_slist_free	@364	NONAME
+g_slist_insert_before	@365	NONAME
+g_slist_prepend	@366	NONAME
+g_slist_remove	@367	NONAME
+g_slist_reverse	@368	NONAME
+g_snprintf	@369	NONAME
+g_source_add_poll	@370	NONAME
+g_source_attach	@371	NONAME
+g_source_destroy	@372	NONAME
+g_source_new	@373	NONAME
+g_source_ref	@374	NONAME
+g_source_remove	@375	NONAME
+g_source_set_callback	@376	NONAME
+g_source_set_dispose_function	@377	NONAME
+g_source_set_name	@378	NONAME
+g_source_set_priority	@379	NONAME
+g_source_unref	@380	NONAME
+g_spawn_close_pid	@381	NONAME
+g_stat	@382	NONAME
+g_str_equal	@383	NONAME
+g_str_has_prefix	@384	NONAME
+g_str_has_suffix	@385	NONAME
+g_str_hash	@386	NONAME
+g_strchomp	@387	NONAME
+g_strchug	@388	NONAME
+g_strcmp0	@389	NONAME
+g_strconcat	@390	NONAME
+g_strdelimit	@391	NONAME
+g_strdup	@392	NONAME
+g_strdup_printf	@393	NONAME
+g_strdup_value_contents	@394	NONAME
+g_strdup_vprintf	@395	NONAME
+g_strdupv	@396	NONAME
+g_strerror	@397	NONAME
+g_strfreev	@398	NONAME
+g_string_append	@399	NONAME
+g_string_append_len	@400	NONAME
+g_string_append_printf	@401	NONAME
+g_string_free	@402	NONAME
+g_string_insert_c	@403	NONAME
+g_string_insert_len	@404	NONAME
+g_string_new	@405	NONAME
+g_string_set_size	@406	NONAME
+g_string_sized_new	@407	NONAME
+g_string_truncate	@408	NONAME
+g_strjoin	@409	NONAME
+g_strlcat	@410	NONAME
+g_strlcpy	@411	NONAME
+g_strndup	@412	NONAME
+g_strrstr	@413	NONAME
+g_strsplit	@414	NONAME
+g_strsplit_set	@415	NONAME
+g_strstr_len	@416	NONAME
+g_strtod	@417	NONAME
+g_strv_get_type	@418	NONAME
+g_strv_length	@419	NONAME
+g_thread_get_type	@420	NONAME
+g_thread_join	@421	NONAME
+g_thread_new	@422	NONAME
+g_thread_pool_free	@423	NONAME
+g_thread_pool_new	@424	NONAME
+g_thread_pool_push	@425	NONAME
+g_thread_pool_set_max_threads	@426	NONAME
+g_thread_pool_set_max_unused_threads	@427	NONAME
+g_thread_self	@428	NONAME
+g_thread_try_new	@429	NONAME
+g_thread_yield	@430	NONAME
+g_time_zone_new	@431	NONAME
+g_time_zone_new_identifier	@432	NONAME
+g_time_zone_unref	@433	NONAME
+g_timeout_add_full	@434	NONAME
+g_timer_destroy	@435	NONAME
+g_timer_elapsed	@436	NONAME
+g_timer_new	@437	NONAME
+g_timer_start	@438	NONAME
+g_tree_destroy	@439	NONAME
+g_tree_insert	@440	NONAME
+g_tree_new_with_data	@441	NONAME
+g_tree_search	@442	NONAME
+g_try_malloc	@443	NONAME
+g_try_malloc0_n	@444	NONAME
+g_try_malloc_n	@445	NONAME
+g_try_realloc	@446	NONAME
+g_try_realloc_n	@447	NONAME
+g_type_add_class_private	@448	NONAME
+g_type_add_instance_private	@449	NONAME
+g_type_add_interface_static	@450	NONAME
+g_type_check_class_cast	@451	NONAME
+g_type_check_instance_cast	@452	NONAME
+g_type_check_instance_is_a	@453	NONAME
+g_type_check_instance_is_fundamentally_a	@454	NONAME
+g_type_check_value	@455	NONAME
+g_type_check_value_holds	@456	NONAME
+g_type_class_add_private	@457	NONAME
+g_type_class_adjust_private_offset	@458	NONAME
+g_type_class_get_private	@459	NONAME
+g_type_class_peek	@460	NONAME
+g_type_class_peek_parent	@461	NONAME
+g_type_class_ref	@462	NONAME
+g_type_class_unref	@463	NONAME
+g_type_from_name	@464	NONAME
+g_type_fundamental	@465	NONAME
+g_type_fundamental_next	@466	NONAME
+g_type_get_qdata	@467	NONAME
+g_type_init	@468	NONAME
+g_type_instance_get_private	@469	NONAME
+g_type_interface_add_prerequisite	@470	NONAME
+g_type_interface_peek	@471	NONAME
+g_type_interfaces	@472	NONAME
+g_type_is_a	@473	NONAME
+g_type_name	@474	NONAME
+g_type_parent	@475	NONAME
+g_type_qname	@476	NONAME
+g_type_register_fundamental	@477	NONAME
+g_type_register_static	@478	NONAME
+g_type_register_static_simple	@479	NONAME
+g_type_set_qdata	@480	NONAME
+g_type_value_table_peek	@481	NONAME
+g_unlink	@482	NONAME
+g_uri_escape_string	@483	NONAME
+g_uri_unescape_segment	@484	NONAME
+g_uri_unescape_string	@485	NONAME
+g_utf16_to_utf8	@486	NONAME
+g_utf8_strchr	@487	NONAME
+g_utf8_to_utf16	@488	NONAME
+g_utf8_validate	@489	NONAME
+g_value_array_append	@490	NONAME
+g_value_array_get_nth	@491	NONAME
+g_value_array_get_type	@492	NONAME
+g_value_array_new	@493	NONAME
+g_value_copy	@494	NONAME
+g_value_dup_boxed	@495	NONAME
+g_value_dup_object	@496	NONAME
+g_value_dup_string	@497	NONAME
+g_value_get_boolean	@498	NONAME
+g_value_get_boxed	@499	NONAME
+g_value_get_double	@500	NONAME
+g_value_get_enum	@501	NONAME
+g_value_get_flags	@502	NONAME
+g_value_get_float	@503	NONAME
+g_value_get_gtype	@504	NONAME
+g_value_get_int	@505	NONAME
+g_value_get_int64	@506	NONAME
+g_value_get_long	@507	NONAME
+g_value_get_object	@508	NONAME
+g_value_get_pointer	@509	NONAME
+g_value_get_string	@510	NONAME
+g_value_get_uchar	@511	NONAME
+g_value_get_uint	@512	NONAME
+g_value_get_uint64	@513	NONAME
+g_value_get_ulong	@514	NONAME
+g_value_init	@515	NONAME
+g_value_peek_pointer	@516	NONAME
+g_value_register_transform_func	@517	NONAME
+g_value_reset	@518	NONAME
+g_value_set_boolean	@519	NONAME
+g_value_set_boxed	@520	NONAME
+g_value_set_double	@521	NONAME
+g_value_set_enum	@522	NONAME
+g_value_set_flags	@523	NONAME
+g_value_set_float	@524	NONAME
+g_value_set_gtype	@525	NONAME
+g_value_set_int	@526	NONAME
+g_value_set_int64	@527	NONAME
+g_value_set_long	@528	NONAME
+g_value_set_object	@529	NONAME
+g_value_set_pointer	@530	NONAME
+g_value_set_static_boxed	@531	NONAME
+g_value_set_static_string	@532	NONAME
+g_value_set_string	@533	NONAME
+g_value_set_uchar	@534	NONAME
+g_value_set_uint	@535	NONAME
+g_value_set_uint64	@536	NONAME
+g_value_set_ulong	@537	NONAME
+g_value_take_boxed	@538	NONAME
+g_value_take_object	@539	NONAME
+g_value_take_string	@540	NONAME
+g_value_transform	@541	NONAME
+g_value_type_compatible	@542	NONAME
+g_value_unset	@543	NONAME
+g_vasprintf	@544	NONAME
+g_warn_message	@545	NONAME
+g_weak_ref_clear	@546	NONAME
+g_weak_ref_get	@547	NONAME
+g_weak_ref_init	@548	NONAME
+g_weak_ref_set	@549	NONAME
+g_win32_error_message	@550	NONAME
+g_win32_get_package_installation_directory_of_module	@551	NONAME
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/build/win32/vs100/glibconfig.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/build/win32/vs100/glibconfig.h
index ea803d381dd..5d116d67bd6 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/build/win32/vs100/glibconfig.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/build/win32/vs100/glibconfig.h
@@ -119,8 +119,8 @@ typedef unsigned long long guintptr;
 #endif
 
 #define GLIB_MAJOR_VERSION 2
-#define GLIB_MINOR_VERSION 78
-#define GLIB_MICRO_VERSION 1
+#define GLIB_MINOR_VERSION 80
+#define GLIB_MICRO_VERSION 4
 
 #define G_OS_WIN32
 #define G_PLATFORM_WIN32
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/deprecated/gthread.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/deprecated/gthread.h
index da330d6b118..3acc30f41e6 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/deprecated/gthread.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/deprecated/gthread.h
@@ -141,10 +141,12 @@ void     g_thread_foreach      (GFunc             thread_func,
 typedef struct
 {
   GMutex *mutex;
-#ifndef G_OS_WIN32
+#ifndef __GI_SCANNER__
+# ifndef G_OS_WIN32
   /* only for ABI compatibility reasons */
   pthread_mutex_t unused;
-#endif
+# endif /* !G_OS_WIN32 */
+#endif /* !__GI_SCANNER__ */
 } GStaticMutex GLIB_DEPRECATED_TYPE_IN_2_32_FOR(GMutex);
 
 #define g_static_mutex_lock(mutex) \
@@ -168,15 +170,17 @@ struct _GStaticRecMutex
   GStaticMutex mutex;
   guint depth;
 
+#ifndef __GI_SCANNER__
   /* ABI compat only */
   union {
-#ifdef G_OS_WIN32
+# ifdef G_OS_WIN32
     void *owner;
-#else
+# else
     pthread_t owner;
-#endif
+# endif /* !G_OS_WIN32 */
     gdouble dummy;
   } unused;
+#endif /* !__GI_SCANNER__ */
 } GLIB_DEPRECATED_TYPE_IN_2_32_FOR(GRecMutex);
 
 #define G_STATIC_REC_MUTEX_INIT { G_STATIC_MUTEX_INIT, 0, { 0 } } GLIB_DEPRECATED_MACRO_IN_2_32_FOR(g_rec_mutex_init)
@@ -292,7 +296,7 @@ void            g_cond_free             (GCond  *cond);
 GLIB_DEPRECATED_IN_2_32
 gboolean        g_cond_timed_wait       (GCond          *cond,
                                          GMutex         *mutex,
-                                         GTimeVal       *timeval);
+                                         GTimeVal       *abs_time);
 
 G_GNUC_END_IGNORE_DEPRECATIONS
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/garcbox.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/garcbox.c
index d69e75de18c..da19cd405c3 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/garcbox.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/garcbox.c
@@ -35,131 +35,6 @@
 
 #define G_ARC_BOX(p)            (GArcBox *) (((char *) (p)) - G_ARC_BOX_SIZE)
 
-/**
- * SECTION:arcbox
- * @Title: Atomically reference counted data
- * @Short_description: Allocated memory with atomic reference counting semantics
- *
- * An "atomically reference counted box", or "ArcBox", is an opaque wrapper
- * data type that is guaranteed to be as big as the size of a given data type,
- * and which augments the given data type with thread safe reference counting
- * semantics for its memory management.
- *
- * ArcBox is useful if you have a plain old data type, like a structure
- * typically placed on the stack, and you wish to provide additional API
- * to use it on the heap; or if you want to implement a new type to be
- * passed around by reference without necessarily implementing copy/free
- * semantics or your own reference counting.
- *
- * The typical use is:
- *
- * |[<!-- language="C" -->
- * typedef struct {
- *   char *name;
- *   char *address;
- *   char *city;
- *   char *state;
- *   int age;
- * } Person;
- *
- * Person *
- * person_new (void)
- * {
- *   return g_atomic_rc_box_new0 (Person);
- * }
- * ]|
- *
- * Every time you wish to acquire a reference on the memory, you should
- * call g_atomic_rc_box_acquire(); similarly, when you wish to release a reference
- * you should call g_atomic_rc_box_release():
- *
- * |[<!-- language="C" -->
- * // Add a Person to the Database; the Database acquires ownership
- * // of the Person instance
- * void
- * add_person_to_database (Database *db, Person *p)
- * {
- *   db->persons = g_list_prepend (db->persons, g_atomic_rc_box_acquire (p));
- * }
- *
- * // Removes a Person from the Database; the reference acquired by
- * // add_person_to_database() is released here
- * void
- * remove_person_from_database (Database *db, Person *p)
- * {
- *   db->persons = g_list_remove (db->persons, p);
- *   g_atomic_rc_box_release (p);
- * }
- * ]|
- *
- * If you have additional memory allocated inside the structure, you can
- * use g_atomic_rc_box_release_full(), which takes a function pointer, which
- * will be called if the reference released was the last:
- *
- * |[<!-- language="C" -->
- * void
- * person_clear (Person *p)
- * {
- *   g_free (p->name);
- *   g_free (p->address);
- *   g_free (p->city);
- *   g_free (p->state);
- * }
- *
- * void
- * remove_person_from_database (Database *db, Person *p)
- * {
- *   db->persons = g_list_remove (db->persons, p);
- *   g_atomic_rc_box_release_full (p, (GDestroyNotify) person_clear);
- * }
- * ]|
- *
- * If you wish to transfer the ownership of a reference counted data
- * type without increasing the reference count, you can use g_steal_pointer():
- *
- * |[<!-- language="C" -->
- *   Person *p = g_atomic_rc_box_new (Person);
- *
- *   fill_person_details (p);
- *
- *   add_person_to_database (db, g_steal_pointer (&p));
- * ]|
- *
- * ## Thread safety
- *
- * The reference counting operations on data allocated using g_atomic_rc_box_alloc(),
- * g_atomic_rc_box_new(), and g_atomic_rc_box_dup() are guaranteed to be atomic, and thus
- * can be safely be performed by different threads. It is important to note that
- * only the reference acquisition and release are atomic; changes to the content
- * of the data are your responsibility.
- *
- * ## Automatic pointer clean up
- *
- * If you want to add g_autoptr() support to your plain old data type through
- * reference counting, you can use the G_DEFINE_AUTOPTR_CLEANUP_FUNC() and
- * g_atomic_rc_box_release():
- *
- * |[<!-- language="C" -->
- * G_DEFINE_AUTOPTR_CLEANUP_FUNC (MyDataStruct, g_atomic_rc_box_release)
- * ]|
- *
- * If you need to clear the contents of the data, you will need to use an
- * ancillary function that calls g_rc_box_release_full():
- *
- * |[<!-- language="C" -->
- * static void
- * my_data_struct_release (MyDataStruct *data)
- * {
- *   // my_data_struct_clear() is defined elsewhere
- *   g_atomic_rc_box_release_full (data, (GDestroyNotify) my_data_struct_clear);
- * }
- *
- * G_DEFINE_AUTOPTR_CLEANUP_FUNC (MyDataStruct, my_data_struct_release)
- * ]|
- *
- * Since: 2.58
- */
-
 /**
  * g_atomic_rc_box_alloc:
  * @block_size: the size of the allocation, must be greater than 0
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/garray.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/garray.c
index 72d4b2fa8cd..5d59aea3ad7 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/garray.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/garray.c
@@ -47,53 +47,6 @@
 #include "grefcount.h"
 #include "gutilsprivate.h"
 
-/**
- * SECTION:arrays
- * @title: Arrays
- * @short_description: arrays of arbitrary elements which grow
- *     automatically as elements are added
- *
- * Arrays are similar to standard C arrays, except that they grow
- * automatically as elements are added.
- *
- * Array elements can be of any size (though all elements of one array
- * are the same size), and the array can be automatically cleared to
- * '0's and zero-terminated.
- *
- * To create a new array use g_array_new().
- *
- * To add elements to an array with a cost of O(n) at worst, use
- * g_array_append_val(), g_array_append_vals(), g_array_prepend_val(),
- * g_array_prepend_vals(), g_array_insert_val() and g_array_insert_vals().
- *
- * To access an element of an array in O(1) (to read it or to write it),
- * use g_array_index().
- *
- * To set the size of an array, use g_array_set_size().
- *
- * To free an array, use g_array_unref() or g_array_free().
- *
- * All the sort functions are internally calling a quick-sort (or similar)
- * function with an average cost of O(n log(n)) and a worst case
- * cost of O(n^2).
- *
- * Here is an example that stores integers in a #GArray:
- * |[<!-- language="C" -->
- *   GArray *garray;
- *   gint i;
- *   // We create a new array to store gint values.
- *   // We don't want it zero-terminated or cleared to 0's.
- *   garray = g_array_new (FALSE, FALSE, sizeof (gint));
- *   for (i = 0; i < 10000; i++)
- *     g_array_append_val (garray, i);
- *   for (i = 0; i < 10000; i++)
- *     if (g_array_index (garray, gint, i) != i)
- *       g_print ("ERROR: got %d instead of %d\n",
- *                g_array_index (garray, gint, i), i);
- *   g_array_free (garray, TRUE);
- * ]|
- */
-
 #define MIN_ARRAY_SIZE  16
 
 typedef struct _GRealArray  GRealArray;
@@ -930,6 +883,7 @@ g_array_remove_range (GArray *farray,
 
   g_return_val_if_fail (array, NULL);
   g_return_val_if_fail (index_ <= array->len, NULL);
+  g_return_val_if_fail (index_ <= G_MAXUINT - length, NULL);
   g_return_val_if_fail (index_ + length <= array->len, NULL);
 
   if (array->clear_func != NULL)
@@ -1119,6 +1073,7 @@ g_array_maybe_expand (GRealArray *array,
   if (want_len > array->elt_capacity)
     {
       gsize want_alloc = g_nearest_pow (g_array_elt_len (array, want_len));
+      g_assert (want_alloc >= g_array_elt_len (array, want_len));
       want_alloc = MAX (want_alloc, MIN_ARRAY_SIZE);
 
       array->data = g_realloc (array->data, want_alloc);
@@ -1131,54 +1086,6 @@ g_array_maybe_expand (GRealArray *array,
     }
 }
 
-/**
- * SECTION:arrays_pointer
- * @title: Pointer Arrays
- * @short_description: arrays of pointers to any type of data, which
- *     grow automatically as new elements are added
- *
- * Pointer Arrays are similar to Arrays but are used only for storing
- * pointers.
- *
- * If you remove elements from the array, elements at the end of the
- * array are moved into the space previously occupied by the removed
- * element. This means that you should not rely on the index of particular
- * elements remaining the same. You should also be careful when deleting
- * elements while iterating over the array.
- *
- * To create a pointer array, use g_ptr_array_new().
- *
- * To add elements to a pointer array, use g_ptr_array_add().
- *
- * To remove elements from a pointer array, use g_ptr_array_remove(),
- * g_ptr_array_remove_index() or g_ptr_array_remove_index_fast().
- *
- * To access an element of a pointer array, use g_ptr_array_index().
- *
- * To set the size of a pointer array, use g_ptr_array_set_size().
- *
- * To free a pointer array, use g_ptr_array_free().
- *
- * An example using a #GPtrArray:
- * |[<!-- language="C" -->
- *   GPtrArray *array;
- *   gchar *string1 = "one";
- *   gchar *string2 = "two";
- *   gchar *string3 = "three";
- *
- *   array = g_ptr_array_new ();
- *   g_ptr_array_add (array, (gpointer) string1);
- *   g_ptr_array_add (array, (gpointer) string2);
- *   g_ptr_array_add (array, (gpointer) string3);
- *
- *   if (g_ptr_array_index (array, 0) != (gpointer) string1)
- *     g_print ("ERROR: got %p instead of %p\n",
- *              g_ptr_array_index (array, 0), string1);
- *
- *   g_ptr_array_free (array, TRUE);
- * ]|
- */
-
 typedef struct _GRealPtrArray  GRealPtrArray;
 
 /**
@@ -2202,6 +2109,7 @@ g_ptr_array_remove_range (GPtrArray *array,
   g_return_val_if_fail (rarray != NULL, NULL);
   g_return_val_if_fail (rarray->len == 0 || (rarray->len != 0 && rarray->pdata != NULL), NULL);
   g_return_val_if_fail (index_ <= rarray->len, NULL);
+  g_return_val_if_fail (index_ <= G_MAXUINT - length, NULL);
   g_return_val_if_fail (length == 0 || index_ + length <= rarray->len, NULL);
 
   if (length == 0)
@@ -2779,45 +2687,6 @@ g_ptr_array_find_with_equal_func (GPtrArray     *haystack,
   return FALSE;
 }
 
-/**
- * SECTION:arrays_byte
- * @title: Byte Arrays
- * @short_description: arrays of bytes
- *
- * #GByteArray is a mutable array of bytes based on #GArray, to provide arrays
- * of bytes which grow automatically as elements are added.
- *
- * To create a new #GByteArray use g_byte_array_new(). To add elements to a
- * #GByteArray, use g_byte_array_append(), and g_byte_array_prepend().
- *
- * To set the size of a #GByteArray, use g_byte_array_set_size().
- *
- * To free a #GByteArray, use g_byte_array_free().
- *
- * An example for using a #GByteArray:
- * |[<!-- language="C" -->
- *   GByteArray *gbarray;
- *   gint i;
- *
- *   gbarray = g_byte_array_new ();
- *   for (i = 0; i < 10000; i++)
- *     g_byte_array_append (gbarray, (guint8*) "abcd", 4);
- *
- *   for (i = 0; i < 10000; i++)
- *     {
- *       g_assert (gbarray->data[4*i] == 'a');
- *       g_assert (gbarray->data[4*i+1] == 'b');
- *       g_assert (gbarray->data[4*i+2] == 'c');
- *       g_assert (gbarray->data[4*i+3] == 'd');
- *     }
- *
- *   g_byte_array_free (gbarray, TRUE);
- * ]|
- *
- * See #GBytes if you are interested in an immutable object representing a
- * sequence of bytes.
- */
-
 /**
  * GByteArray:
  * @data: a pointer to the element data. The data may be moved as
@@ -2913,7 +2782,7 @@ g_byte_array_new_take (guint8 *data,
  * bytes to the array. Note however that the size of the array is still
  * 0.
  *
- * Returns: the new #GByteArray
+ * Returns: (transfer full): the new #GByteArray
  */
 GByteArray*
 g_byte_array_sized_new (guint reserved_size)
@@ -2977,7 +2846,7 @@ g_byte_array_free_to_bytes (GByteArray *array)
  * Atomically increments the reference count of @array by one.
  * This function is thread-safe and may be called from any thread.
  *
- * Returns: The passed in #GByteArray
+ * Returns: (transfer full): The passed in #GByteArray
  *
  * Since: 2.22
  */
@@ -3013,7 +2882,7 @@ g_byte_array_unref (GByteArray *array)
  * Adds the given bytes to the end of the #GByteArray.
  * The array will grow in size automatically if necessary.
  *
- * Returns: the #GByteArray
+ * Returns: (transfer none): the #GByteArray
  */
 GByteArray*
 g_byte_array_append (GByteArray   *array,
@@ -3034,7 +2903,7 @@ g_byte_array_append (GByteArray   *array,
  * Adds the given data to the start of the #GByteArray.
  * The array will grow in size automatically if necessary.
  *
- * Returns: the #GByteArray
+ * Returns: (transfer none): the #GByteArray
  */
 GByteArray*
 g_byte_array_prepend (GByteArray   *array,
@@ -3053,7 +2922,7 @@ g_byte_array_prepend (GByteArray   *array,
  *
  * Sets the size of the #GByteArray, expanding it if necessary.
  *
- * Returns: the #GByteArray
+ * Returns: (transfer none): the #GByteArray
  */
 GByteArray*
 g_byte_array_set_size (GByteArray *array,
@@ -3072,7 +2941,7 @@ g_byte_array_set_size (GByteArray *array,
  * Removes the byte at the given index from a #GByteArray.
  * The following bytes are moved down one place.
  *
- * Returns: the #GByteArray
+ * Returns: (transfer none): the #GByteArray
  **/
 GByteArray*
 g_byte_array_remove_index (GByteArray *array,
@@ -3093,7 +2962,7 @@ g_byte_array_remove_index (GByteArray *array,
  * does not preserve the order of the #GByteArray. But it is faster
  * than g_byte_array_remove_index().
  *
- * Returns: the #GByteArray
+ * Returns: (transfer none): the #GByteArray
  */
 GByteArray*
 g_byte_array_remove_index_fast (GByteArray *array,
@@ -3113,7 +2982,7 @@ g_byte_array_remove_index_fast (GByteArray *array,
  * Removes the given number of bytes starting at the given index from a
  * #GByteArray.  The following elements are moved to close the gap.
  *
- * Returns: the #GByteArray
+ * Returns: (transfer none): the #GByteArray
  *
  * Since: 2.4
  */
@@ -3124,6 +2993,7 @@ g_byte_array_remove_range (GByteArray *array,
 {
   g_return_val_if_fail (array, NULL);
   g_return_val_if_fail (index_ <= array->len, NULL);
+  g_return_val_if_fail (index_ <= G_MAXUINT - length, NULL);
   g_return_val_if_fail (index_ + length <= array->len, NULL);
 
   return (GByteArray *)g_array_remove_range ((GArray *)array, index_, length);
@@ -3132,7 +3002,7 @@ g_byte_array_remove_range (GByteArray *array,
 /**
  * g_byte_array_sort:
  * @array: a #GByteArray
- * @compare_func: comparison function
+ * @compare_func: (scope call): comparison function
  *
  * Sorts a byte array, using @compare_func which should be a
  * qsort()-style comparison function (returns less than zero for first
@@ -3155,7 +3025,7 @@ g_byte_array_sort (GByteArray   *array,
 /**
  * g_byte_array_sort_with_data:
  * @array: a #GByteArray
- * @compare_func: comparison function
+ * @compare_func: (scope call): comparison function
  * @user_data: data to pass to @compare_func
  *
  * Like g_byte_array_sort(), but the comparison function takes an extra
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gasyncqueue.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gasyncqueue.c
index 16dd0b25f69..122ee152792 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gasyncqueue.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gasyncqueue.c
@@ -37,56 +37,6 @@
 #include "gthread.h"
 #include "deprecated/gthread.h"
 
-
-/**
- * SECTION:async_queues
- * @title: Asynchronous Queues
- * @short_description: asynchronous communication between threads
- * @see_also: #GThreadPool
- *
- * Often you need to communicate between different threads. In general
- * it's safer not to do this by shared memory, but by explicit message
- * passing. These messages only make sense asynchronously for
- * multi-threaded applications though, as a synchronous operation could
- * as well be done in the same thread.
- *
- * Asynchronous queues are an exception from most other GLib data
- * structures, as they can be used simultaneously from multiple threads
- * without explicit locking and they bring their own builtin reference
- * counting. This is because the nature of an asynchronous queue is that
- * it will always be used by at least 2 concurrent threads.
- *
- * For using an asynchronous queue you first have to create one with
- * g_async_queue_new(). #GAsyncQueue structs are reference counted,
- * use g_async_queue_ref() and g_async_queue_unref() to manage your
- * references.
- *
- * A thread which wants to send a message to that queue simply calls
- * g_async_queue_push() to push the message to the queue.
- *
- * A thread which is expecting messages from an asynchronous queue
- * simply calls g_async_queue_pop() for that queue. If no message is
- * available in the queue at that point, the thread is now put to sleep
- * until a message arrives. The message will be removed from the queue
- * and returned. The functions g_async_queue_try_pop() and
- * g_async_queue_timeout_pop() can be used to only check for the presence
- * of messages or to only wait a certain time for messages respectively.
- *
- * For almost every function there exist two variants, one that locks
- * the queue and one that doesn't. That way you can hold the queue lock
- * (acquire it with g_async_queue_lock() and release it with
- * g_async_queue_unlock()) over multiple queue accessing instructions.
- * This can be necessary to ensure the integrity of the queue, but should
- * only be used when really necessary, as it can make your life harder
- * if used unwisely. Normally you should only use the locking function
- * variants (those without the _unlocked suffix).
- *
- * In many cases, it may be more convenient to use #GThreadPool when
- * you need to distribute work to a set of worker threads instead of
- * using #GAsyncQueue manually. #GThreadPool uses a GAsyncQueue
- * internally.
- */
-
 /**
  * GAsyncQueue:
  *
@@ -111,11 +61,11 @@ typedef struct
 } SortData;
 
 /**
- * g_async_queue_new:
+ * g_async_queue_new: (constructor)
  *
  * Creates a new asynchronous queue.
  *
- * Returns: a new #GAsyncQueue. Free with g_async_queue_unref()
+ * Returns: (transfer full): a new #GAsyncQueue. Free with g_async_queue_unref()
  */
 GAsyncQueue *
 g_async_queue_new (void)
@@ -124,14 +74,14 @@ g_async_queue_new (void)
 }
 
 /**
- * g_async_queue_new_full:
+ * g_async_queue_new_full: (constructor)
  * @item_free_func: (nullable): function to free queue elements
  *
  * Creates a new asynchronous queue and sets up a destroy notify
  * function that is used to free any remaining queue items when
  * the queue is destroyed after the final unref.
  *
- * Returns: a new #GAsyncQueue. Free with g_async_queue_unref()
+ * Returns: (transfer full): a new #GAsyncQueue. Free with g_async_queue_unref()
  *
  * Since: 2.16
  */
@@ -158,7 +108,7 @@ g_async_queue_new_full (GDestroyNotify item_free_func)
  * Increases the reference count of the asynchronous @queue by 1.
  * You do not need to hold the lock to call this function.
  *
- * Returns: the @queue that was passed in (since 2.6)
+ * Returns: (transfer full): the @queue that was passed in (since 2.6)
  */
 GAsyncQueue *
 g_async_queue_ref (GAsyncQueue *queue)
@@ -212,7 +162,7 @@ g_async_queue_unref_and_unlock (GAsyncQueue *queue)
 
 /**
  * g_async_queue_unref:
- * @queue: a #GAsyncQueue.
+ * @queue: (transfer full): a #GAsyncQueue.
  *
  * Decreases the reference count of the asynchronous @queue by 1.
  *
@@ -326,7 +276,7 @@ g_async_queue_push_unlocked (GAsyncQueue *queue,
  * g_async_queue_push_sorted:
  * @queue: a #GAsyncQueue
  * @data: (not nullable): the @data to push into the @queue
- * @func: the #GCompareDataFunc is used to sort @queue
+ * @func: (scope call): the #GCompareDataFunc is used to sort @queue
  * @user_data: user data passed to @func.
  *
  * Inserts @data into @queue using @func to determine the new
@@ -367,7 +317,7 @@ g_async_queue_invert_compare (gpointer  v1,
  * g_async_queue_push_sorted_unlocked:
  * @queue: a #GAsyncQueue
  * @data: the data to push into the @queue
- * @func: the #GCompareDataFunc is used to sort @queue
+ * @func: (scope call): the #GCompareDataFunc is used to sort @queue
  * @user_data: user data passed to @func.
  *
  * Inserts @data into @queue using @func to determine the new
@@ -722,7 +672,7 @@ g_async_queue_length_unlocked (GAsyncQueue *queue)
 /**
  * g_async_queue_sort:
  * @queue: a #GAsyncQueue
- * @func: the #GCompareDataFunc is used to sort @queue
+ * @func: (scope call): the #GCompareDataFunc is used to sort @queue
  * @user_data: user data passed to @func
  *
  * Sorts @queue using @func.
@@ -766,7 +716,7 @@ g_async_queue_sort (GAsyncQueue      *queue,
 /**
  * g_async_queue_sort_unlocked:
  * @queue: a #GAsyncQueue
- * @func: the #GCompareDataFunc is used to sort @queue
+ * @func: (scope call): the #GCompareDataFunc is used to sort @queue
  * @user_data: user data passed to @func
  *
  * Sorts @queue using @func.
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gatomic.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gatomic.c
index 6174fe00320..e9475a26e3f 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gatomic.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gatomic.c
@@ -23,49 +23,6 @@
 
 #include "gatomic.h"
 
-/**
- * SECTION:atomic_operations
- * @title: Atomic Operations
- * @short_description: basic atomic integer and pointer operations
- * @see_also: #GMutex
- *
- * The following is a collection of compiler macros to provide atomic
- * access to integer and pointer-sized values.
- *
- * The macros that have 'int' in the name will operate on pointers to
- * #gint and #guint.  The macros with 'pointer' in the name will operate
- * on pointers to any pointer-sized value, including #gsize.  There is
- * no support for 64bit operations on platforms with 32bit pointers
- * because it is not generally possible to perform these operations
- * atomically.
- *
- * The get, set and exchange operations for integers and pointers
- * nominally operate on #gint and #gpointer, respectively.  Of the
- * arithmetic operations, the 'add' operation operates on (and returns)
- * signed integer values (#gint and #gssize) and the 'and', 'or', and
- * 'xor' operations operate on (and return) unsigned integer values
- * (#guint and #gsize).
- *
- * All of the operations act as a full compiler and (where appropriate)
- * hardware memory barrier.  Acquire and release or producer and
- * consumer barrier semantics are not available through this API.
- *
- * It is very important that all accesses to a particular integer or
- * pointer be performed using only this API and that different sizes of
- * operation are not mixed or used on overlapping memory regions.  Never
- * read or assign directly from or to a value -- always use this API.
- *
- * For simple reference counting purposes you should use
- * g_atomic_int_inc() and g_atomic_int_dec_and_test().  Other uses that
- * fall outside of simple reference counting patterns are prone to
- * subtle bugs and occasionally undefined behaviour.  It is also worth
- * noting that since all of these operations require global
- * synchronisation of the entire machine, they can be quite slow.  In
- * the case of performing multiple atomic operations it can often be
- * faster to simply acquire a mutex lock around the critical area,
- * perform the operations normally and then release the lock.
- **/
-
 /**
  * G_ATOMIC_LOCK_FREE:
  *
@@ -538,11 +495,15 @@ gpointer
  * While @atomic has a `volatile` qualifier, this is a historical artifact and
  * the pointer passed to it should not be `volatile`.
  *
+ * In GLib 2.80, the return type was changed from #gssize to #gintptr to add
+ * support for platforms with 128-bit pointers. This should not affect existing
+ * code.
+ *
  * Returns: the value of @atomic before the add, signed
  *
  * Since: 2.30
  **/
-gssize
+gintptr
 (g_atomic_pointer_add) (volatile void *atomic,
                         gssize         val)
 {
@@ -565,11 +526,15 @@ gssize
  * While @atomic has a `volatile` qualifier, this is a historical artifact and
  * the pointer passed to it should not be `volatile`.
  *
+ * In GLib 2.80, the return type was changed from #gsize to #guintptr to add
+ * support for platforms with 128-bit pointers. This should not affect existing
+ * code.
+ *
  * Returns: the value of @atomic before the operation, unsigned
  *
  * Since: 2.30
  **/
-gsize
+guintptr
 (g_atomic_pointer_and) (volatile void *atomic,
                         gsize          val)
 {
@@ -592,11 +557,15 @@ gsize
  * While @atomic has a `volatile` qualifier, this is a historical artifact and
  * the pointer passed to it should not be `volatile`.
  *
+ * In GLib 2.80, the return type was changed from #gsize to #guintptr to add
+ * support for platforms with 128-bit pointers. This should not affect existing
+ * code.
+ *
  * Returns: the value of @atomic before the operation, unsigned
  *
  * Since: 2.30
  **/
-gsize
+guintptr
 (g_atomic_pointer_or) (volatile void *atomic,
                        gsize          val)
 {
@@ -619,11 +588,15 @@ gsize
  * While @atomic has a `volatile` qualifier, this is a historical artifact and
  * the pointer passed to it should not be `volatile`.
  *
+ * In GLib 2.80, the return type was changed from #gsize to #guintptr to add
+ * support for platforms with 128-bit pointers. This should not affect existing
+ * code.
+ *
  * Returns: the value of @atomic before the operation, unsigned
  *
  * Since: 2.30
  **/
-gsize
+guintptr
 (g_atomic_pointer_xor) (volatile void *atomic,
                         gsize          val)
 {
@@ -820,7 +793,7 @@ gpointer
   return InterlockedExchangePointer (atomic, newval);
 }
 
-gssize
+gintptr
 (g_atomic_pointer_add) (volatile void *atomic,
                         gssize         val)
 {
@@ -831,7 +804,7 @@ gssize
 #endif
 }
 
-gsize
+guintptr
 (g_atomic_pointer_and) (volatile void *atomic,
                         gsize          val)
 {
@@ -842,7 +815,7 @@ gsize
 #endif
 }
 
-gsize
+guintptr
 (g_atomic_pointer_or) (volatile void *atomic,
                        gsize          val)
 {
@@ -853,7 +826,7 @@ gsize
 #endif
 }
 
-gsize
+guintptr
 (g_atomic_pointer_xor) (volatile void *atomic,
                         gsize          val)
 {
@@ -1124,12 +1097,12 @@ gpointer
   return oldval;
 }
 
-gssize
+gintptr
 (g_atomic_pointer_add) (volatile void *atomic,
                         gssize         val)
 {
-  gssize *ptr = atomic;
-  gssize oldval;
+  gintptr *ptr = atomic;
+  gintptr oldval;
 
   pthread_mutex_lock (&g_atomic_lock);
   oldval = *ptr;
@@ -1139,12 +1112,12 @@ gssize
   return oldval;
 }
 
-gsize
+guintptr
 (g_atomic_pointer_and) (volatile void *atomic,
                         gsize          val)
 {
-  gsize *ptr = atomic;
-  gsize oldval;
+  guintptr *ptr = atomic;
+  guintptr oldval;
 
   pthread_mutex_lock (&g_atomic_lock);
   oldval = *ptr;
@@ -1154,12 +1127,12 @@ gsize
   return oldval;
 }
 
-gsize
+guintptr
 (g_atomic_pointer_or) (volatile void *atomic,
                        gsize          val)
 {
-  gsize *ptr = atomic;
-  gsize oldval;
+  guintptr *ptr = atomic;
+  guintptr oldval;
 
   pthread_mutex_lock (&g_atomic_lock);
   oldval = *ptr;
@@ -1169,12 +1142,12 @@ gsize
   return oldval;
 }
 
-gsize
+guintptr
 (g_atomic_pointer_xor) (volatile void *atomic,
                         gsize          val)
 {
-  gsize *ptr = atomic;
-  gsize oldval;
+  guintptr *ptr = atomic;
+  guintptr oldval;
 
   pthread_mutex_lock (&g_atomic_lock);
   oldval = *ptr;
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gatomic.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gatomic.h
index 1247d5d049f..c8bc773b02a 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gatomic.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gatomic.h
@@ -83,16 +83,16 @@ GLIB_AVAILABLE_IN_2_74
 gpointer                g_atomic_pointer_exchange             (void           *atomic,
                                                                gpointer        newval);
 GLIB_AVAILABLE_IN_ALL
-gssize                  g_atomic_pointer_add                  (volatile void  *atomic,
+gintptr                 g_atomic_pointer_add                  (volatile void  *atomic,
                                                                gssize          val);
 GLIB_AVAILABLE_IN_2_30
-gsize                   g_atomic_pointer_and                  (volatile void  *atomic,
+guintptr                g_atomic_pointer_and                  (volatile void  *atomic,
                                                                gsize           val);
 GLIB_AVAILABLE_IN_2_30
-gsize                   g_atomic_pointer_or                   (volatile void  *atomic,
+guintptr                g_atomic_pointer_or                   (volatile void  *atomic,
                                                                gsize           val);
 GLIB_AVAILABLE_IN_ALL
-gsize                   g_atomic_pointer_xor                  (volatile void  *atomic,
+guintptr                g_atomic_pointer_xor                  (volatile void  *atomic,
                                                                gsize           val);
 
 GLIB_DEPRECATED_IN_2_30_FOR(g_atomic_int_add)
@@ -280,34 +280,34 @@ G_END_DECLS
     G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer));                 \
     (void) (0 ? (gpointer) *(atomic) : NULL);                                \
     (void) (0 ? (val) ^ (val) : 1);                                          \
-    (gssize) __atomic_fetch_add ((atomic), (val), __ATOMIC_SEQ_CST);         \
+    (gintptr) __atomic_fetch_add ((atomic), (val), __ATOMIC_SEQ_CST);        \
   }))
 #define g_atomic_pointer_and(atomic, val) \
   (G_GNUC_EXTENSION ({                                                       \
-    gsize *gapa_atomic = (gsize *) (atomic);                                 \
+    guintptr *gapa_atomic = (guintptr *) (atomic);                           \
     G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer));                 \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gsize));                    \
+    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (guintptr));                 \
     (void) (0 ? (gpointer) *(atomic) : NULL);                                \
     (void) (0 ? (val) ^ (val) : 1);                                          \
-    (gsize) __atomic_fetch_and (gapa_atomic, (val), __ATOMIC_SEQ_CST);       \
+    (guintptr) __atomic_fetch_and (gapa_atomic, (val), __ATOMIC_SEQ_CST);    \
   }))
 #define g_atomic_pointer_or(atomic, val) \
   (G_GNUC_EXTENSION ({                                                       \
-    gsize *gapo_atomic = (gsize *) (atomic);                                 \
+    guintptr *gapo_atomic = (guintptr *) (atomic);                           \
     G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer));                 \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gsize));                    \
+    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (guintptr));                 \
     (void) (0 ? (gpointer) *(atomic) : NULL);                                \
     (void) (0 ? (val) ^ (val) : 1);                                          \
-    (gsize) __atomic_fetch_or (gapo_atomic, (val), __ATOMIC_SEQ_CST);        \
+    (guintptr) __atomic_fetch_or (gapo_atomic, (val), __ATOMIC_SEQ_CST);     \
   }))
 #define g_atomic_pointer_xor(atomic, val) \
   (G_GNUC_EXTENSION ({                                                       \
-    gsize *gapx_atomic = (gsize *) (atomic);                                 \
+    guintptr *gapx_atomic = (guintptr *) (atomic);                           \
     G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer));                 \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gsize));                    \
+    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (guintptr));                 \
     (void) (0 ? (gpointer) *(atomic) : NULL);                                \
     (void) (0 ? (val) ^ (val) : 1);                                          \
-    (gsize) __atomic_fetch_xor (gapx_atomic, (val), __ATOMIC_SEQ_CST);       \
+    (guintptr) __atomic_fetch_xor (gapx_atomic, (val), __ATOMIC_SEQ_CST);    \
   }))
 
 #else /* defined(__ATOMIC_SEQ_CST) */
@@ -374,7 +374,7 @@ G_END_DECLS
     (void) (0 ? (gpointer) *(atomic) : NULL);                                \
     __sync_synchronize ();                                                   \
     __asm__ __volatile__ ("" : : : "memory");                                \
-    *(atomic) = (glib_typeof (*(atomic))) (gsize) (newval);                  \
+    *(atomic) = (glib_typeof (*(atomic))) (guintptr) (newval);               \
   }))
 #else /* if !(defined(glib_typeof) */
 #define g_atomic_pointer_set(atomic, newval) \
@@ -383,7 +383,7 @@ G_END_DECLS
     (void) (0 ? (gpointer) *(atomic) : NULL);                                \
     __sync_synchronize ();                                                   \
     __asm__ __volatile__ ("" : : : "memory");                                \
-    *(atomic) = (gpointer) (gsize) (newval);                                         \
+    *(atomic) = (gpointer) (guintptr) (newval);                              \
   }))
 #endif /* if defined(glib_typeof) */
 
@@ -498,28 +498,28 @@ G_END_DECLS
     G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer));                 \
     (void) (0 ? (gpointer) *(atomic) : NULL);                                \
     (void) (0 ? (val) ^ (val) : 1);                                          \
-    (gssize) __sync_fetch_and_add ((atomic), (val));                         \
+    (gintptr) __sync_fetch_and_add ((atomic), (val));                        \
   }))
 #define g_atomic_pointer_and(atomic, val) \
   (G_GNUC_EXTENSION ({                                                       \
     G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer));                 \
     (void) (0 ? (gpointer) *(atomic) : NULL);                                \
     (void) (0 ? (val) ^ (val) : 1);                                          \
-    (gsize) __sync_fetch_and_and ((atomic), (val));                          \
+    (guintptr) __sync_fetch_and_and ((atomic), (val));                       \
   }))
 #define g_atomic_pointer_or(atomic, val) \
   (G_GNUC_EXTENSION ({                                                       \
     G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer));                 \
     (void) (0 ? (gpointer) *(atomic) : NULL);                                \
     (void) (0 ? (val) ^ (val) : 1);                                          \
-    (gsize) __sync_fetch_and_or ((atomic), (val));                           \
+    (guintptr) __sync_fetch_and_or ((atomic), (val));                        \
   }))
 #define g_atomic_pointer_xor(atomic, val) \
   (G_GNUC_EXTENSION ({                                                       \
     G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer));                 \
     (void) (0 ? (gpointer) *(atomic) : NULL);                                \
     (void) (0 ? (val) ^ (val) : 1);                                          \
-    (gsize) __sync_fetch_and_xor ((atomic), (val));                          \
+    (guintptr) __sync_fetch_and_xor ((atomic), (val));                       \
   }))
 
 #endif /* !defined(__ATOMIC_SEQ_CST) */
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gbase64.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gbase64.c
index 3c273ad3897..8082958cf7d 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gbase64.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gbase64.c
@@ -31,30 +31,6 @@
 #include "gtestutils.h"
 #include "glibintl.h"
 
-
-/**
- * SECTION:base64
- * @title: Base64 Encoding
- * @short_description: encodes and decodes data in Base64 format
- *
- * Base64 is an encoding that allows a sequence of arbitrary bytes to be
- * encoded as a sequence of printable ASCII characters. For the definition
- * of Base64, see
- * [RFC 1421](http://www.ietf.org/rfc/rfc1421.txt)
- * or
- * [RFC 2045](http://www.ietf.org/rfc/rfc2045.txt).
- * Base64 is most commonly used as a MIME transfer encoding
- * for email.
- *
- * GLib supports incremental encoding using g_base64_encode_step() and
- * g_base64_encode_close(). Incremental decoding can be done with
- * g_base64_decode_step(). To encode or decode data in one go, use
- * g_base64_encode() or g_base64_decode(). To avoid memory allocation when
- * decoding, you can use g_base64_decode_inplace().
- *
- * Support for Base64 encoding has been added in GLib 2.12.
- */
-
 static const char base64_alphabet[] =
         "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gbitlock.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gbitlock.c
index e9667cae7d5..b3828e734a4 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gbitlock.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gbitlock.c
@@ -180,6 +180,12 @@ g_futex_wake (const gint *address)
 #define CONTENTION_CLASSES 11
 static gint g_bit_lock_contended[CONTENTION_CLASSES];  /* (atomic) */
 
+G_ALWAYS_INLINE static inline guint
+bit_lock_contended_class (gpointer address)
+{
+  return ((gsize) address) % G_N_ELEMENTS (g_bit_lock_contended);
+}
+
 #if (defined (i386) || defined (__amd64__))
   #if G_GNUC_CHECK_VERSION(4, 5)
     #define USE_ASM_GOTO 1
@@ -232,7 +238,7 @@ g_bit_lock (volatile gint *address,
     v = (guint) g_atomic_int_get (address_nonvolatile);
     if (v & mask)
       {
-        guint class = ((gsize) address_nonvolatile) % G_N_ELEMENTS (g_bit_lock_contended);
+        guint class = bit_lock_contended_class (address_nonvolatile);
 
         g_atomic_int_add (&g_bit_lock_contended[class], +1);
         g_futex_wait (address_nonvolatile, v);
@@ -249,7 +255,7 @@ g_bit_lock (volatile gint *address,
   if (v & mask)
     /* already locked */
     {
-      guint class = ((gsize) address_nonvolatile) % G_N_ELEMENTS (g_bit_lock_contended);
+      guint class = bit_lock_contended_class (address_nonvolatile);
 
       g_atomic_int_add (&g_bit_lock_contended[class], +1);
       g_futex_wait (address_nonvolatile, v);
@@ -342,8 +348,12 @@ g_bit_unlock (volatile gint *address,
   g_atomic_int_and (address_nonvolatile, ~mask);
 #endif
 
+  /* Warning: unlocking may allow another thread to proceed and destroy the
+   * memory that @address points to. We thus must not dereference it anymore.
+   */
+
   {
-    guint class = ((gsize) address_nonvolatile) % G_N_ELEMENTS (g_bit_lock_contended);
+    guint class = bit_lock_contended_class (address_nonvolatile);
 
     if (g_atomic_int_get (&g_bit_lock_contended[class]))
       g_futex_wake (address_nonvolatile);
@@ -393,10 +403,39 @@ g_futex_int_address (const void *address)
   return int_address;
 }
 
+G_ALWAYS_INLINE static inline gpointer
+pointer_bit_lock_mask_ptr (gpointer ptr, guint lock_bit, gboolean set, guintptr preserve_mask, gpointer preserve_ptr)
+{
+  guintptr x_ptr;
+  guintptr x_preserve_ptr;
+  guintptr lock_mask;
+
+  x_ptr = (guintptr) ptr;
+
+  if (preserve_mask != 0)
+    {
+      x_preserve_ptr = (guintptr) preserve_ptr;
+      x_ptr = (x_preserve_ptr & preserve_mask) | (x_ptr & ~preserve_mask);
+    }
+
+  if (lock_bit == G_MAXUINT)
+    return (gpointer) x_ptr;
+
+  lock_mask = (guintptr) (1u << lock_bit);
+  if (set)
+    return (gpointer) (x_ptr | lock_mask);
+  else
+    return (gpointer) (x_ptr & ~lock_mask);
+}
+
 /**
- * g_pointer_bit_lock:
+ * g_pointer_bit_lock_and_get:
  * @address: (not nullable): a pointer to a #gpointer-sized value
  * @lock_bit: a bit value between 0 and 31
+ * @out_ptr: (out) (optional): returns the set pointer atomically.
+ *   This is the value after setting the lock, it thus always has the
+ *   lock bit set, while previously @address had the lockbit unset.
+ *   You may also use g_pointer_bit_lock_mask_ptr() to clear the lock bit.
  *
  * This is equivalent to g_bit_lock, but working on pointers (or other
  * pointer-sized values).
@@ -404,67 +443,82 @@ g_futex_int_address (const void *address)
  * For portability reasons, you may only lock on the bottom 32 bits of
  * the pointer.
  *
- * While @address has a `volatile` qualifier, this is a historical
- * artifact and the argument passed to it should not be `volatile`.
- *
- * Since: 2.30
+ * Since: 2.80
  **/
 void
-(g_pointer_bit_lock) (volatile void *address,
-                      gint           lock_bit)
+(g_pointer_bit_lock_and_get) (gpointer address,
+                              guint lock_bit,
+                              guintptr *out_ptr)
 {
-  void *address_nonvolatile = (void *) address;
+  guint class = bit_lock_contended_class (address);
+  guintptr mask;
+  guintptr v;
 
   g_return_if_fail (lock_bit < 32);
 
-  {
-#ifdef USE_ASM_GOTO
- retry:
-    __asm__ volatile goto ("lock bts %1, (%0)\n"
-                           "jc %l[contended]"
-                           : /* no output */
-                           : "r" (address), "r" ((gsize) lock_bit)
-                           : "cc", "memory"
-                           : contended);
-    return;
+  mask = 1u << lock_bit;
 
- contended:
+#ifdef USE_ASM_GOTO
+  if (G_LIKELY (!out_ptr))
     {
-      gsize *pointer_address = address_nonvolatile;
-      gsize mask = 1u << lock_bit;
-      gsize v;
-
-      v = (gsize) g_atomic_pointer_get (pointer_address);
-      if (v & mask)
+      while (TRUE)
         {
-          guint class = ((gsize) address_nonvolatile) % G_N_ELEMENTS (g_bit_lock_contended);
-
-          g_atomic_int_add (&g_bit_lock_contended[class], +1);
-          g_futex_wait (g_futex_int_address (address_nonvolatile), v);
-          g_atomic_int_add (&g_bit_lock_contended[class], -1);
+          __asm__ volatile goto ("lock bts %1, (%0)\n"
+                                 "jc %l[contended]"
+                                 : /* no output */
+                                 : "r"(address), "r"((gsize) lock_bit)
+                                 : "cc", "memory"
+                                 : contended);
+          return;
+
+        contended:
+          v = (guintptr) g_atomic_pointer_get ((gpointer *) address);
+          if (v & mask)
+            {
+              g_atomic_int_add (&g_bit_lock_contended[class], +1);
+              g_futex_wait (g_futex_int_address (address), v);
+              g_atomic_int_add (&g_bit_lock_contended[class], -1);
+            }
         }
     }
-    goto retry;
-#else
-  gsize *pointer_address = address_nonvolatile;
-  gsize mask = 1u << lock_bit;
-  gsize v;
+#endif
 
- retry:
-  v = g_atomic_pointer_or (pointer_address, mask);
+retry:
+  v = g_atomic_pointer_or ((gpointer *) address, mask);
   if (v & mask)
     /* already locked */
     {
-      guint class = ((gsize) address_nonvolatile) % G_N_ELEMENTS (g_bit_lock_contended);
-
       g_atomic_int_add (&g_bit_lock_contended[class], +1);
-      g_futex_wait (g_futex_int_address (address_nonvolatile), (guint) v);
+      g_futex_wait (g_futex_int_address (address), (guint) v);
       g_atomic_int_add (&g_bit_lock_contended[class], -1);
-
       goto retry;
     }
-#endif
-  }
+
+  if (out_ptr)
+    *out_ptr = (v | mask);
+}
+
+/**
+ * g_pointer_bit_lock:
+ * @address: (not nullable): a pointer to a #gpointer-sized value
+ * @lock_bit: a bit value between 0 and 31
+ *
+ * This is equivalent to g_bit_lock, but working on pointers (or other
+ * pointer-sized values).
+ *
+ * For portability reasons, you may only lock on the bottom 32 bits of
+ * the pointer.
+ *
+ * While @address has a `volatile` qualifier, this is a historical
+ * artifact and the argument passed to it should not be `volatile`.
+ *
+ * Since: 2.30
+ **/
+void
+(g_pointer_bit_lock) (volatile void *address,
+                      gint lock_bit)
+{
+  g_pointer_bit_lock_and_get ((gpointer *) address, (guint) lock_bit, NULL);
 }
 
 /**
@@ -505,15 +559,15 @@ gboolean
     return result;
 #else
     void *address_nonvolatile = (void *) address;
-    gsize *pointer_address = address_nonvolatile;
+    gpointer *pointer_address = address_nonvolatile;
     gsize mask = 1u << lock_bit;
-    gsize v;
+    guintptr v;
 
     g_return_val_if_fail (lock_bit < 32, FALSE);
 
     v = g_atomic_pointer_or (pointer_address, mask);
 
-    return ~v & mask;
+    return (~(gsize) v & mask) != 0;
 #endif
   }
 }
@@ -549,16 +603,108 @@ void
                       : "r" (address), "r" ((gsize) lock_bit)
                       : "cc", "memory");
 #else
-    gsize *pointer_address = address_nonvolatile;
+    gpointer *pointer_address = address_nonvolatile;
     gsize mask = 1u << lock_bit;
 
     g_atomic_pointer_and (pointer_address, ~mask);
 #endif
 
+    /* Warning: unlocking may allow another thread to proceed and destroy the
+     * memory that @address points to. We thus must not dereference it anymore.
+     */
+
     {
-      guint class = ((gsize) address_nonvolatile) % G_N_ELEMENTS (g_bit_lock_contended);
+      guint class = bit_lock_contended_class (address_nonvolatile);
+
       if (g_atomic_int_get (&g_bit_lock_contended[class]))
         g_futex_wake (g_futex_int_address (address_nonvolatile));
     }
   }
 }
+
+/**
+ * g_pointer_bit_lock_mask_ptr:
+ * @ptr: (nullable): the pointer to mask
+ * @lock_bit: the bit to set/clear. If set to `G_MAXUINT`, the
+ *   lockbit is taken from @preserve_ptr or @ptr (depending on @preserve_mask).
+ * @set: whether to set (lock) the bit or unset (unlock). This
+ *   has no effect, if @lock_bit is set to `G_MAXUINT`.
+ * @preserve_mask: if non-zero, a bit-mask for @preserve_ptr. The
+ *   @preserve_mask bits from @preserve_ptr are set in the result.
+ *   Note that the @lock_bit bit will be always set according to @set,
+ *   regardless of @preserve_mask and @preserve_ptr (unless @lock_bit is
+ *   `G_MAXUINT`).
+ * @preserve_ptr: (nullable): if @preserve_mask is non-zero, the bits
+ *   from this pointer are set in the result.
+ *
+ * This mangles @ptr as g_pointer_bit_lock() and g_pointer_bit_unlock()
+ * do.
+ *
+ * Returns: the mangled pointer.
+ *
+ * Since: 2.80
+ **/
+gpointer
+g_pointer_bit_lock_mask_ptr (gpointer ptr, guint lock_bit, gboolean set, guintptr preserve_mask, gpointer preserve_ptr)
+{
+  g_return_val_if_fail (lock_bit < 32u || lock_bit == G_MAXUINT, ptr);
+
+  return pointer_bit_lock_mask_ptr (ptr, lock_bit, set, preserve_mask, preserve_ptr);
+}
+
+/**
+ * g_pointer_bit_unlock_and_set:
+ * @address: (not nullable): a pointer to a #gpointer-sized value
+ * @lock_bit: a bit value between 0 and 31
+ * @ptr: the new pointer value to set
+ * @preserve_mask: if non-zero, those bits of the current pointer in @address
+ *   are preserved.
+ *   Note that the @lock_bit bit will be always set according to @set,
+ *   regardless of @preserve_mask and the currently set value in @address.
+ *
+ * This is equivalent to g_pointer_bit_unlock() and atomically setting
+ * the pointer value.
+ *
+ * Note that the lock bit will be cleared from the pointer. If the unlocked
+ * pointer that was set is not identical to @ptr, an assertion fails. In other
+ * words, @ptr must have @lock_bit unset. This also means, you usually can
+ * only use this on the lowest bits.
+ *
+ * Since: 2.80
+ **/
+void (g_pointer_bit_unlock_and_set) (void *address,
+                                     guint lock_bit,
+                                     gpointer ptr,
+                                     guintptr preserve_mask)
+{
+  gpointer *pointer_address = address;
+  guint class = bit_lock_contended_class (address);
+  gpointer ptr2;
+
+  g_return_if_fail (lock_bit < 32u);
+
+  if (preserve_mask != 0)
+    {
+      gpointer old_ptr = g_atomic_pointer_get ((gpointer *) address);
+
+    again:
+      ptr2 = pointer_bit_lock_mask_ptr (ptr, lock_bit, FALSE, preserve_mask, old_ptr);
+      if (!g_atomic_pointer_compare_and_exchange_full (pointer_address, old_ptr, ptr2, &old_ptr))
+        goto again;
+    }
+  else
+    {
+      ptr2 = pointer_bit_lock_mask_ptr (ptr, lock_bit, FALSE, 0, NULL);
+      g_atomic_pointer_set (pointer_address, ptr2);
+    }
+
+  if (g_atomic_int_get (&g_bit_lock_contended[class]) > 0)
+    g_futex_wake (g_futex_int_address (address));
+
+  /* It makes no sense, if unlocking mangles the pointer. Assert against
+   * that.
+   *
+   * Note that based on @preserve_mask, the pointer also gets mangled, which
+   * can make sense for the caller. We don't assert for that. */
+  g_return_if_fail (ptr == pointer_bit_lock_mask_ptr (ptr, lock_bit, FALSE, 0, NULL));
+}
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gbitlock.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gbitlock.h
index 7efecd0bef0..9338ebb715e 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gbitlock.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gbitlock.h
@@ -44,6 +44,12 @@ void      g_bit_unlock                    (volatile gint *address,
 GLIB_AVAILABLE_IN_ALL
 void      g_pointer_bit_lock              (volatile void *address,
                                            gint           lock_bit);
+
+GLIB_AVAILABLE_IN_2_80
+void      g_pointer_bit_lock_and_get      (gpointer address,
+                                           guint lock_bit,
+                                           guintptr *out_ptr);
+
 GLIB_AVAILABLE_IN_ALL
 gboolean  g_pointer_bit_trylock           (volatile void *address,
                                            gint           lock_bit);
@@ -51,6 +57,19 @@ GLIB_AVAILABLE_IN_ALL
 void      g_pointer_bit_unlock            (volatile void *address,
                                            gint           lock_bit);
 
+GLIB_AVAILABLE_IN_2_80
+gpointer  g_pointer_bit_lock_mask_ptr     (gpointer ptr,
+                                           guint lock_bit,
+                                           gboolean set,
+                                           guintptr preserve_mask,
+                                           gpointer preserve_ptr);
+
+GLIB_AVAILABLE_IN_2_80
+void g_pointer_bit_unlock_and_set         (void *address,
+                                           guint lock_bit,
+                                           gpointer ptr,
+                                           guintptr preserve_mask);
+
 #ifdef __GNUC__
 
 #define g_pointer_bit_lock(address, lock_bit) \
@@ -59,6 +78,12 @@ void      g_pointer_bit_unlock            (volatile void *address,
     g_pointer_bit_lock ((address), (lock_bit));                              \
   }))
 
+#define g_pointer_bit_lock_and_get(address, lock_bit, out_ptr)     \
+  (G_GNUC_EXTENSION ({                                             \
+    G_STATIC_ASSERT (sizeof *(address) == sizeof (gpointer));      \
+    g_pointer_bit_lock_and_get ((address), (lock_bit), (out_ptr)); \
+  }))
+
 #define g_pointer_bit_trylock(address, lock_bit) \
   (G_GNUC_EXTENSION ({                                                       \
     G_STATIC_ASSERT (sizeof *(address) == sizeof (gpointer));                \
@@ -71,6 +96,12 @@ void      g_pointer_bit_unlock            (volatile void *address,
     g_pointer_bit_unlock ((address), (lock_bit));                            \
   }))
 
+#define g_pointer_bit_unlock_and_set(address, lock_bit, ptr, preserve_mask)       \
+  (G_GNUC_EXTENSION ({                                                            \
+    G_STATIC_ASSERT (sizeof *(address) == sizeof (gpointer));                     \
+    g_pointer_bit_unlock_and_set ((address), (lock_bit), (ptr), (preserve_mask)); \
+  }))
+
 #endif
 
 G_END_DECLS
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gcharset.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gcharset.c
index 82cd0a7b811..040b499d9b8 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gcharset.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gcharset.c
@@ -500,11 +500,11 @@ unalias_lang (char *lang)
   char *p;
   int i;
 
-  if (g_once_init_enter (&alias_table))
+  if (g_once_init_enter_pointer (&alias_table))
     {
       GHashTable *table = g_hash_table_new (g_str_hash, g_str_equal);
       read_aliases ("/usr/share/locale/locale.alias", table);
-      g_once_init_leave (&alias_table, table);
+      g_once_init_leave_pointer (&alias_table, table);
     }
 
   i = 0;
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gchecksum.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gchecksum.c
index 662c92ea316..6a94d19a3e6 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gchecksum.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gchecksum.c
@@ -33,25 +33,26 @@
 
 
 /**
- * SECTION:checksum
- * @title: Data Checksums
- * @short_description: computes the checksum for data
+ * GChecksum:
  *
- * GLib provides a generic API for computing checksums (or "digests")
+ * GLib provides a generic API for computing checksums (or ‘digests’)
  * for a sequence of arbitrary bytes, using various hashing algorithms
  * like MD5, SHA-1 and SHA-256. Checksums are commonly used in various
  * environments and specifications.
  *
- * GLib supports incremental checksums using the GChecksum data
- * structure, by calling g_checksum_update() as long as there's data
- * available and then using g_checksum_get_string() or
- * g_checksum_get_digest() to compute the checksum and return it either
- * as a string in hexadecimal form, or as a raw sequence of bytes. To
- * compute the checksum for binary blobs and NUL-terminated strings in
- * one go, use the convenience functions g_compute_checksum_for_data()
- * and g_compute_checksum_for_string(), respectively.
+ * To create a new `GChecksum`, use [ctor@GLib.Checksum.new]. To free
+ * a `GChecksum`, use [method@GLib.Checksum.free].
  *
- * Support for checksums has been added in GLib 2.16
+ * GLib supports incremental checksums using the `GChecksum` data
+ * structure, by calling [method@GLib.Checksum.update] as long as there’s data
+ * available and then using [method@GLib.Checksum.get_string] or
+ * [method@GLib.Checksum.get_digest] to compute the checksum and return it
+ * either as a string in hexadecimal form, or as a raw sequence of bytes. To
+ * compute the checksum for binary blobs and nul-terminated strings in
+ * one go, use the convenience functions [func@GLib.compute_checksum_for_data]
+ * and [func@GLib.compute_checksum_for_string], respectively.
+ *
+ * Since: 2.16
  **/
 
 #define IS_VALID_TYPE(type)     ((type) >= G_CHECKSUM_MD5 && (type) <= G_CHECKSUM_SHA384)
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gchecksum.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gchecksum.h
index e5c54e7c75e..3dd84fd8466 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gchecksum.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gchecksum.h
@@ -54,16 +54,6 @@ typedef enum {
   G_CHECKSUM_SHA384
 } GChecksumType;
 
-/**
- * GChecksum:
- *
- * An opaque structure representing a checksumming operation.
- *
- * To create a new GChecksum, use g_checksum_new(). To free
- * a GChecksum, use g_checksum_free().
- *
- * Since: 2.16
- */
 typedef struct _GChecksum       GChecksum;
 
 GLIB_AVAILABLE_IN_ALL
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gconstructor.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gconstructor.h
index 4ef1284b348..1af76bd9cf2 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gconstructor.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gconstructor.h
@@ -54,8 +54,7 @@
 #define G_DEFINE_CONSTRUCTOR(_func) static void __attribute__((constructor)) _func (void);
 #define G_DEFINE_DESTRUCTOR(_func) static void __attribute__((destructor)) _func (void);
 
-#elif defined (_MSC_VER) && (_MSC_VER >= 1500)
-/* Visual studio 2008 and later has _Pragma */
+#elif defined (_MSC_VER)
 
 /*
  * Only try to include gslist.h if not already included via glib.h,
@@ -110,28 +109,6 @@
   __pragma(section(".CRT$XCU",read)) \
   __declspec(allocate(".CRT$XCU")) int (* _array ## _func)(void) = _func ## _constructor;
 
-#elif defined (_MSC_VER)
-
-#define G_HAS_CONSTRUCTORS 1
-
-/* Pre Visual studio 2008 must use #pragma section */
-#define G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA 1
-#define G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA 1
-
-#define G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(_func) \
-  section(".CRT$XCU",read)
-#define G_DEFINE_CONSTRUCTOR(_func) \
-  static void _func(void); \
-  static int _func ## _wrapper(void) { _func(); return 0; } \
-  __declspec(allocate(".CRT$XCU")) static int (*p)(void) = _func ## _wrapper;
-
-#define G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(_func) \
-  section(".CRT$XCU",read)
-#define G_DEFINE_DESTRUCTOR(_func) \
-  static void _func(void); \
-  static int _func ## _constructor(void) { atexit (_func); return 0; } \
-  __declspec(allocate(".CRT$XCU")) static int (* _array ## _func)(void) = _func ## _constructor;
-
 #elif defined(__SUNPRO_C)
 
 /* This is not tested, but i believe it should work, based on:
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gconstructorprivate.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gconstructorprivate.h
new file mode 100644
index 00000000000..d8f20a78896
--- /dev/null
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gconstructorprivate.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright © 2023 Luca Bacci
+ *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "gconstructor.h"
+
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
+#ifdef _WIN32
+
+#ifdef __cplusplus
+/* const defaults to static (internal visibility) in C++,
+ * but we want extern instead */
+#define G_EXTERN_CONST extern const
+#else
+/* Using extern const in C is perfectly valid, but triggers
+ * a warning in GCC and CLANG, therefore we avoid it */
+#define G_EXTERN_CONST const
+#endif
+
+#ifdef _MSC_VER
+
+#define G_HAS_TLS_CALLBACKS 1
+
+#define G_DEFINE_TLS_CALLBACK(func) \
+__pragma (section (".CRT$XLCE", long, read))                                \
+                                                                            \
+static void NTAPI func (PVOID, DWORD, PVOID);                               \
+                                                                            \
+G_BEGIN_DECLS                                                               \
+__declspec (allocate (".CRT$XLCE"))                                         \
+G_EXTERN_CONST PIMAGE_TLS_CALLBACK _ptr_##func = func;                      \
+G_END_DECLS                                                                 \
+                                                                            \
+__pragma (comment (linker, "/INCLUDE:" G_MSVC_SYMBOL_PREFIX "_tls_used"))   \
+__pragma (comment (linker, "/INCLUDE:" G_MSVC_SYMBOL_PREFIX "_ptr_" #func))
+
+#else
+
+#define G_HAS_TLS_CALLBACKS 1
+
+#define G_DEFINE_TLS_CALLBACK(func) \
+static void NTAPI func (PVOID, DWORD, PVOID);          \
+                                                       \
+G_BEGIN_DECLS                                          \
+__attribute__ ((section (".CRT$XLCE")))                \
+G_EXTERN_CONST PIMAGE_TLS_CALLBACK _ptr_##func = func; \
+G_END_DECLS
+
+#endif /* _MSC_VER */
+
+#endif /* _WIN32 */
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gconvert.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gconvert.c
index 4f126a2cdcc..85b6fd6f9e2 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gconvert.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gconvert.c
@@ -56,105 +56,6 @@
 
 #include "glibintl.h"
 
-/**
- * SECTION:conversions
- * @title: Character Set Conversion
- * @short_description: convert strings between different character sets
- *
- * The g_convert() family of function wraps the functionality of iconv().
- * In addition to pure character set conversions, GLib has functions to
- * deal with the extra complications of encodings for file names.
- *
- * ## File Name Encodings
- *
- * Historically, UNIX has not had a defined encoding for file names:
- * a file name is valid as long as it does not have path separators
- * in it ("/"). However, displaying file names may require conversion:
- * from the character set in which they were created, to the character
- * set in which the application operates. Consider the Spanish file name
- * "Presentacion.sxi". If the application which created it uses
- * ISO-8859-1 for its encoding,
- * |[
- * Character:  P  r  e  s  e  n  t  a  c  i  o  n  .  s  x  i
- * Hex code:   50 72 65 73 65 6e 74 61 63 69 f3 6e 2e 73 78 69
- * ]|
- * However, if the application use UTF-8, the actual file name on
- * disk would look like this:
- * |[
- * Character:  P  r  e  s  e  n  t  a  c  i  o  n  .  s  x  i
- * Hex code:   50 72 65 73 65 6e 74 61 63 69 c3 b3 6e 2e 73 78 69
- * ]|
- * GLib uses UTF-8 for its strings, and GUI toolkits like GTK that use
- * GLib do the same thing. If you get a file name from the file system,
- * for example, from readdir() or from g_dir_read_name(), and you wish
- * to display the file name to the user, you  will need to convert it
- * into UTF-8. The opposite case is when the user types the name of a
- * file they wish to save: the toolkit will give you that string in
- * UTF-8 encoding, and you will need to convert it to the character
- * set used for file names before you can create the file with open()
- * or fopen().
- *
- * By default, GLib assumes that file names on disk are in UTF-8
- * encoding. This is a valid assumption for file systems which
- * were created relatively recently: most applications use UTF-8
- * encoding for their strings, and that is also what they use for
- * the file names they create. However, older file systems may
- * still contain file names created in "older" encodings, such as
- * ISO-8859-1. In this case, for compatibility reasons, you may want
- * to instruct GLib to use that particular encoding for file names
- * rather than UTF-8. You can do this by specifying the encoding for
- * file names in the [`G_FILENAME_ENCODING`][G_FILENAME_ENCODING]
- * environment variable. For example, if your installation uses
- * ISO-8859-1 for file names, you can put this in your `~/.profile`:
- * |[
- * export G_FILENAME_ENCODING=ISO-8859-1
- * ]|
- * GLib provides the functions g_filename_to_utf8() and
- * g_filename_from_utf8() to perform the necessary conversions.
- * These functions convert file names from the encoding specified
- * in `G_FILENAME_ENCODING` to UTF-8 and vice-versa. This
- * [diagram][file-name-encodings-diagram] illustrates how
- * these functions are used to convert between UTF-8 and the
- * encoding for file names in the file system.
- *
- * ## Conversion between file name encodings # {#file-name-encodings-diagram)
- *
- * ![](file-name-encodings.png)
- *
- * ## Checklist for Application Writers
- *
- * This section is a practical summary of the detailed
- * things to do to make sure your applications process file
- * name encodings correctly.
- *
- * 1. If you get a file name from the file system from a function
- *    such as readdir() or gtk_file_chooser_get_filename(), you do
- *    not need to do any conversion to pass that file name to
- *    functions like open(), rename(), or fopen() -- those are "raw"
- *    file names which the file system understands.
- *
- * 2. If you need to display a file name, convert it to UTF-8 first
- *    by using g_filename_to_utf8(). If conversion fails, display a
- *    string like "Unknown file name". Do not convert this string back
- *    into the encoding used for file names if you wish to pass it to
- *    the file system; use the original file name instead.
- *
- *    For example, the document window of a word processor could display
- *    "Unknown file name" in its title bar but still let the user save
- *    the file, as it would keep the raw file name internally. This
- *    can happen if the user has not set the `G_FILENAME_ENCODING`
- *    environment variable even though they have files whose names are
- *    not encoded in UTF-8.
- *
- * 3. If your user interface lets the user type a file name for saving
- *    or renaming, convert it to the encoding used for file names in
- *    the file system by using g_filename_from_utf8(). Pass the converted
- *    file name to functions like fopen(). If conversion fails, ask the
- *    user to enter a different file name. This can happen if the user
- *    types Japanese characters when `G_FILENAME_ENCODING` is set to
- *    `ISO-8859-1`, for example.
- */
-
 /* We try to terminate strings in unknown charsets with this many zero bytes
  * to ensure that multibyte strings really are nul-terminated when we return
  * them from g_convert() and friends.
@@ -172,7 +73,16 @@ try_conversion (const char *to_codeset,
 
   if (*cd == (iconv_t)-1 && errno == EINVAL)
     return FALSE;
-  else
+
+#if defined(__FreeBSD__) && defined(ICONV_SET_ILSEQ_INVALID)
+  /* On FreeBSD request GNU iconv compatible handling of characters that cannot
+   * be repesented in the destination character set.
+   * See https://cgit.freebsd.org/src/commit/?id=7c5b23111c5fd1992047922d4247c4a1ce1bb6c3
+   */
+  int value = 1;
+  if (iconvctl (*cd, ICONV_SET_ILSEQ_INVALID, &value) != 0)
+    return FALSE;
+#endif
     return TRUE;
 }
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdataset.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdataset.c
index 0dbed6d869e..c8dbab9f298 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdataset.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdataset.c
@@ -40,6 +40,7 @@
 
 #include "gslice.h"
 #include "gdatasetprivate.h"
+#include "gutilsprivate.h"
 #include "ghash.h"
 #include "gquark.h"
 #include "gstrfuncs.h"
@@ -48,85 +49,12 @@
 #include "glib_trace.h"
 #include "galloca.h"
 
-/**
- * SECTION:datasets
- * @title: Datasets
- * @short_description: associate groups of data elements with
- *                     particular memory locations
- *
- * Datasets associate groups of data elements with particular memory
- * locations. These are useful if you need to associate data with a
- * structure returned from an external library. Since you cannot modify
- * the structure, you use its location in memory as the key into a
- * dataset, where you can associate any number of data elements with it.
- *
- * There are two forms of most of the dataset functions. The first form
- * uses strings to identify the data elements associated with a
- * location. The second form uses #GQuark identifiers, which are
- * created with a call to g_quark_from_string() or
- * g_quark_from_static_string(). The second form is quicker, since it
- * does not require looking up the string in the hash table of #GQuark
- * identifiers.
- *
- * There is no function to create a dataset. It is automatically
- * created as soon as you add elements to it.
- *
- * To add data elements to a dataset use g_dataset_id_set_data(),
- * g_dataset_id_set_data_full(), g_dataset_set_data() and
- * g_dataset_set_data_full().
- *
- * To get data elements from a dataset use g_dataset_id_get_data() and
- * g_dataset_get_data().
- *
- * To iterate over all data elements in a dataset use
- * g_dataset_foreach() (not thread-safe).
- *
- * To remove data elements from a dataset use
- * g_dataset_id_remove_data() and g_dataset_remove_data().
- *
- * To destroy a dataset, use g_dataset_destroy().
- **/
-
-/**
- * SECTION:datalist
- * @title: Keyed Data Lists
- * @short_description: lists of data elements which are accessible by a
- *                     string or GQuark identifier
- *
- * Keyed data lists provide lists of arbitrary data elements which can
- * be accessed either with a string or with a #GQuark corresponding to
- * the string.
- *
- * The #GQuark methods are quicker, since the strings have to be
- * converted to #GQuarks anyway.
- *
- * Data lists are used for associating arbitrary data with #GObjects,
- * using g_object_set_data() and related functions.
- *
- * To create a datalist, use g_datalist_init().
- *
- * To add data elements to a datalist use g_datalist_id_set_data(),
- * g_datalist_id_set_data_full(), g_datalist_set_data() and
- * g_datalist_set_data_full().
- *
- * To get data elements from a datalist use g_datalist_id_get_data()
- * and g_datalist_get_data().
- *
- * To iterate over all data elements in a datalist use
- * g_datalist_foreach() (not thread-safe).
- *
- * To remove data elements from a datalist use
- * g_datalist_id_remove_data() and g_datalist_remove_data().
- *
- * To remove all data elements from a datalist, use g_datalist_clear().
- **/
-
 /**
  * GData:
  *
  * An opaque data structure that represents a keyed data list.
  *
- * See also: [Keyed data lists][glib-Keyed-Data-Lists].
+ * See also: [Keyed data lists](datalist-and-dataset.html).
  **/
 
 /**
@@ -140,15 +68,18 @@
 
 #define G_DATALIST_FLAGS_MASK_INTERNAL 0x7
 
+#define G_DATALIST_CLEAN_POINTER(ptr) \
+  ((GData *) ((gpointer) (((guintptr) (ptr)) & ~((guintptr) G_DATALIST_FLAGS_MASK_INTERNAL))))
+
 /* datalist pointer accesses have to be carried out atomically */
-#define G_DATALIST_GET_POINTER(datalist)            \
-  ((GData*) ((gsize) g_atomic_pointer_get (datalist) & ~(gsize) G_DATALIST_FLAGS_MASK_INTERNAL))
+#define G_DATALIST_GET_POINTER(datalist) \
+  G_DATALIST_CLEAN_POINTER (g_atomic_pointer_get (datalist))
 
 #define G_DATALIST_SET_POINTER(datalist, pointer)       G_STMT_START {                           \
   gpointer _oldv = g_atomic_pointer_get (datalist);                                              \
   gpointer _newv;                                                                                \
   do {                                                                                           \
-    _newv = (gpointer) (((gsize) _oldv & G_DATALIST_FLAGS_MASK_INTERNAL) | (gsize) pointer);     \
+    _newv = (gpointer) (((guintptr) _oldv & ((guintptr) G_DATALIST_FLAGS_MASK_INTERNAL)) | (guintptr) pointer); \
   } while (!g_atomic_pointer_compare_and_exchange_full ((void**) datalist, _oldv,                \
                                                         _newv, &_oldv));                         \
 } G_STMT_END
@@ -177,7 +108,6 @@ struct _GDataset
 
 /* --- prototypes --- */
 static inline GDataset* g_dataset_lookup    (gconstpointer    dataset_location);
-static inline void  g_datalist_clear_i    (GData    **datalist);
 static void   g_dataset_destroy_internal  (GDataset  *dataset);
 static inline gpointer  g_data_set_internal   (GData      **datalist,
                GQuark       key_id,
@@ -207,10 +137,13 @@ static GDataset     *g_dataset_cached = NULL; /* should this be
 
 #define DATALIST_LOCK_BIT 2
 
-static void
-g_datalist_lock (GData **datalist)
+G_ALWAYS_INLINE static inline GData *
+g_datalist_lock_and_get (GData **datalist)
 {
-  g_pointer_bit_lock ((void **)datalist, DATALIST_LOCK_BIT);
+  guintptr ptr;
+
+  g_pointer_bit_lock_and_get ((void **) datalist, DATALIST_LOCK_BIT, &ptr);
+  return G_DATALIST_CLEAN_POINTER (ptr);
 }
 
 static void
@@ -219,31 +152,150 @@ g_datalist_unlock (GData **datalist)
   g_pointer_bit_unlock ((void **)datalist, DATALIST_LOCK_BIT);
 }
 
-/* Called with the datalist lock held, or the dataset global
- * lock for dataset lists
- */
 static void
-g_datalist_clear_i (GData **datalist)
+g_datalist_unlock_and_set (GData **datalist, gpointer ptr)
 {
-  GData *data;
-  guint i;
+  g_pointer_bit_unlock_and_set ((void **) datalist, DATALIST_LOCK_BIT, ptr, G_DATALIST_FLAGS_MASK_INTERNAL);
+}
+
+static gboolean
+datalist_append (GData **data, GQuark key_id, gpointer new_data, GDestroyNotify destroy_func)
+{
+  gboolean reallocated;
+  GData *d;
+
+  d = *data;
+  if (!d)
+    {
+      d = g_malloc (G_STRUCT_OFFSET (GData, data) + 2u * sizeof (GDataElt));
+      d->len = 0;
+      d->alloc = 2u;
+      *data = d;
+      reallocated = TRUE;
+    }
+  else if (d->len == d->alloc)
+    {
+      d->alloc = d->alloc * 2u;
+#if G_ENABLE_DEBUG
+      /* d->alloc is always a power of two. It thus overflows the first time
+       * when going to (G_MAXUINT32+1), or when requesting 2^31+1 elements.
+       *
+       * This is not handled, and we just crash. That's because we track the GData
+       * in a linear list, which horribly degrades long before we add 2 billion entries.
+       * Don't ever try to do that. */
+      g_assert (d->alloc > d->len);
+#endif
+      d = g_realloc (d, G_STRUCT_OFFSET (GData, data) + d->alloc * sizeof (GDataElt));
+      *data = d;
+      reallocated = TRUE;
+    }
+  else
+    reallocated = FALSE;
+
+  d->data[d->len] = (GDataElt){
+    .key = key_id,
+    .data = new_data,
+    .destroy = destroy_func,
+  };
+  d->len++;
+
+  return reallocated;
+}
+
+static void
+datalist_remove (GData *data, guint32 idx)
+{
+#if G_ENABLE_DEBUG
+  g_assert (idx < data->len);
+#endif
+
+  /* g_data_remove_internal() relies on the fact, that this function removes
+   * the entry similar to g_array_remove_index_fast(). That is, the entries up
+   * to @idx are left unchanged, and the last entry is moved to position @idx.
+   * */
 
-  data = G_DATALIST_GET_POINTER (datalist);
-  G_DATALIST_SET_POINTER (datalist, NULL);
+  data->len--;
+
+  if (idx != data->len)
+    data->data[idx] = data->data[data->len];
+}
+
+static gboolean
+datalist_shrink (GData **data, GData **d_to_free)
+{
+  guint32 alloc_by_4;
+  guint32 v;
+  GData *d;
+
+  d = *data;
+
+  alloc_by_4 = d->alloc / 4u;
+
+  if (G_LIKELY (d->len > alloc_by_4))
+    {
+      /* No shrinking */
+      return FALSE;
+    }
+
+  if (d->len == 0)
+    {
+      /* The list became empty. We drop the allocated memory altogether. */
+
+      /* The caller will free the buffer after releasing the lock, to minimize
+       * the time we hold the lock. Transfer it out. */
+      *d_to_free = d;
+      *data = NULL;
+      return TRUE;
+    }
+
+  /* If the buffer is filled not more than 25%. Shrink to double the current length. */
+
+  v = d->len;
+  if (v != alloc_by_4)
+    {
+      /* d->alloc is a power of two. Usually, we remove one element at a
+       * time, then we will just reach reach a quarter of that.
+       *
+       * However, with g_datalist_id_remove_multiple(), len can be smaller
+       * at once. In that case, find first the next power of two. */
+      v = g_nearest_pow (v);
+    }
+  v *= 2u;
+
+#if G_ENABLE_DEBUG
+  g_assert (v > d->len);
+  g_assert (v <= d->alloc / 2u);
+#endif
+
+  d->alloc = v;
+  d = g_realloc (d, G_STRUCT_OFFSET (GData, data) + (v * sizeof (GDataElt)));
+  *d_to_free = NULL;
+  *data = d;
+  return TRUE;
+}
+
+static GDataElt *
+datalist_find (GData *data, GQuark key_id, guint32 *out_idx)
+{
+  guint32 i;
 
   if (data)
     {
-      G_UNLOCK (g_dataset_global);
       for (i = 0; i < data->len; i++)
         {
-          if (data->data[i].data && data->data[i].destroy)
-            data->data[i].destroy (data->data[i].data);
-        }
-      G_LOCK (g_dataset_global);
+          GDataElt *data_elt = &data->data[i];
 
-      g_free (data);
+          if (data_elt->key == key_id)
+            {
+              if (out_idx)
+                *out_idx = i;
+              return data_elt;
+            }
+        }
     }
-
+  if (out_idx)
+    *out_idx = G_MAXUINT32;
+  return NULL;
 }
 
 /**
@@ -262,23 +314,23 @@ g_datalist_clear (GData **datalist)
 
   g_return_if_fail (datalist != NULL);
 
-  g_datalist_lock (datalist);
+  data = g_datalist_lock_and_get (datalist);
 
-  data = G_DATALIST_GET_POINTER (datalist);
-  G_DATALIST_SET_POINTER (datalist, NULL);
+  if (!data)
+    {
+      g_datalist_unlock (datalist);
+      return;
+    }
 
-  g_datalist_unlock (datalist);
+  g_datalist_unlock_and_set (datalist, NULL);
 
-  if (data)
+  for (i = 0; i < data->len; i++)
     {
-      for (i = 0; i < data->len; i++)
-        {
-          if (data->data[i].data && data->data[i].destroy)
-            data->data[i].destroy (data->data[i].data);
-        }
-
-      g_free (data);
+      if (data->data[i].data && data->data[i].destroy)
+        data->data[i].destroy (data->data[i].data);
     }
+
+  g_free (data);
 }
 
 /* HOLDS: g_dataset_global_lock */
@@ -306,7 +358,12 @@ g_dataset_destroy_internal (GDataset *dataset)
   dataset_location = dataset->location;
   while (dataset)
     {
-      if (G_DATALIST_GET_POINTER(&dataset->datalist) == NULL)
+      GData *data;
+      guint i;
+
+      data = G_DATALIST_GET_POINTER (&dataset->datalist);
+
+      if (!data)
   {
     if (dataset == g_dataset_cached)
       g_dataset_cached = NULL;
@@ -315,7 +372,18 @@ g_dataset_destroy_internal (GDataset *dataset)
     break;
   }
 
-      g_datalist_clear_i (&dataset->datalist);
+      G_DATALIST_SET_POINTER (&dataset->datalist, NULL);
+
+      G_UNLOCK (g_dataset_global);
+
+      for (i = 0; i < data->len; i++)
+        {
+          if (data->data[i].data && data->data[i].destroy)
+            data->data[i].destroy (data->data[i].data);
+        }
+      g_free (data);
+
+      G_LOCK (g_dataset_global);
       dataset = g_dataset_lookup (dataset_location);
     }
 }
@@ -352,137 +420,99 @@ g_data_set_internal (GData    **datalist,
          GDestroyNotify new_destroy_func,
          GDataset    *dataset)
 {
-  GData *d, *old_d;
-  GDataElt old, *data, *data_last, *data_end;
+  GData *d;
+  GData *new_d = NULL;
+  GDataElt old, *data;
+  guint32 idx;
 
-  g_datalist_lock (datalist);
+  d = g_datalist_lock_and_get (datalist);
 
-  d = G_DATALIST_GET_POINTER (datalist);
+  data = datalist_find (d, key_id, &idx);
 
   if (new_data == NULL) /* remove */
     {
-      if (d)
-  {
-    data = d->data;
-    data_last = data + d->len - 1;
-    while (data <= data_last)
-      {
-        if (data->key == key_id)
+      if (data)
     {
+          GData *d_to_free;
+
       old = *data;
-      if (data != data_last)
-        *data = *data_last;
-      d->len--;
-
-      /* We don't bother to shrink, but if all data are now gone
-       * we at least free the memory
-                   */
-      if (d->len == 0)
-        {
-          G_DATALIST_SET_POINTER (datalist, NULL);
-          g_free (d);
-          /* datalist may be situated in dataset, so must not be
-           * unlocked after we free it
-           */
-          g_datalist_unlock (datalist);
 
-          /* the dataset destruction *must* be done
-           * prior to invocation of the data destroy function
-           */
-          if (dataset)
-      g_dataset_destroy_internal (dataset);
+          datalist_remove (d, idx);
+          if (datalist_shrink (&d, &d_to_free))
+            {
+              g_datalist_unlock_and_set (datalist, d);
+
+              /* the dataset destruction *must* be done
+               * prior to invocation of the data destroy function
+               */
+              if (dataset && !d)
+                g_dataset_destroy_internal (dataset);
+
+              if (d_to_free)
+                g_free (d_to_free);
         }
       else
-        {
           g_datalist_unlock (datalist);
-        }
 
-      /* We found and removed an old value
-       * the GData struct *must* already be unlinked
-       * when invoking the destroy function.
-       * we use (new_data==NULL && new_destroy_func!=NULL) as
-       * a special hint combination to "steal"
-       * data without destroy notification
-       */
-      if (old.destroy && !new_destroy_func)
-        {
-          if (dataset)
-      G_UNLOCK (g_dataset_global);
-          old.destroy (old.data);
-          if (dataset)
-      G_LOCK (g_dataset_global);
-          old.data = NULL;
-        }
+          /* We found and removed an old value
+           * the GData struct *must* already be unlinked
+           * when invoking the destroy function.
+           * we use (new_data==NULL && new_destroy_func!=NULL) as
+           * a special hint combination to "steal"
+           * data without destroy notification
+           */
+          if (old.destroy && !new_destroy_func)
+            {
+              if (dataset)
+                G_UNLOCK (g_dataset_global);
+              old.destroy (old.data);
+              if (dataset)
+                G_LOCK (g_dataset_global);
+              old.data = NULL;
+            }
 
-      return old.data;
-    }
-        data++;
-      }
-  }
+          return old.data;
+        }
     }
   else
     {
-      old.data = NULL;
-      if (d)
-  {
-    data = d->data;
-    data_end = data + d->len;
-    while (data < data_end)
-      {
-        if (data->key == key_id)
-    {
-      if (!data->destroy)
-        {
-          data->data = new_data;
-          data->destroy = new_destroy_func;
-          g_datalist_unlock (datalist);
-        }
-      else
+      if (data)
         {
-          old = *data;
-          data->data = new_data;
-          data->destroy = new_destroy_func;
+          if (!data->destroy)
+            {
+              data->data = new_data;
+              data->destroy = new_destroy_func;
+              g_datalist_unlock (datalist);
+            }
+          else
+            {
+              old = *data;
+              data->data = new_data;
+              data->destroy = new_destroy_func;
 
-          g_datalist_unlock (datalist);
+              g_datalist_unlock (datalist);
 
-          /* We found and replaced an old value
-           * the GData struct *must* already be unlinked
-           * when invoking the destroy function.
-           */
-          if (dataset)
-      G_UNLOCK (g_dataset_global);
-          old.destroy (old.data);
-          if (dataset)
-      G_LOCK (g_dataset_global);
+              /* We found and replaced an old value
+               * the GData struct *must* already be unlinked
+               * when invoking the destroy function.
+               */
+              if (dataset)
+                G_UNLOCK (g_dataset_global);
+              old.destroy (old.data);
+              if (dataset)
+                G_LOCK (g_dataset_global);
+            }
+          return NULL;
         }
-      return NULL;
-    }
-        data++;
-      }
-  }
 
       /* The key was not found, insert it */
-      old_d = d;
-      if (d == NULL)
-  {
-    d = g_malloc (sizeof (GData));
-    d->len = 0;
-    d->alloc = 1;
-  }
-      else if (d->len == d->alloc)
-  {
-    d->alloc = d->alloc * 2;
-    d = g_realloc (d, sizeof (GData) + (d->alloc - 1) * sizeof (GDataElt));
-  }
-      if (old_d != d)
-  G_DATALIST_SET_POINTER (datalist, d);
-
-      d->data[d->len].key = key_id;
-      d->data[d->len].data = new_data;
-      d->data[d->len].destroy = new_destroy_func;
-      d->len++;
+      if (datalist_append (&d, key_id, new_data, new_destroy_func))
+        new_d = d;
     }
 
+  if (new_d)
+    g_datalist_unlock_and_set (datalist, new_d);
+  else
   g_datalist_unlock (datalist);
 
   return NULL;
@@ -495,87 +525,86 @@ g_data_remove_internal (GData  **datalist,
                         gsize    n_keys)
 {
   GData *d;
+  GDataElt *old;
+  GDataElt *old_to_free = NULL;
+  GData *d_to_free;
+  gsize found_keys;
+  gsize i_keys;
+  guint32 i_data;
 
-  g_datalist_lock (datalist);
-
-  d = G_DATALIST_GET_POINTER (datalist);
+  d = g_datalist_lock_and_get (datalist);
 
-  if (d)
+  if (!d)
     {
-      GDataElt *old, *data, *data_end;
-      gsize found_keys;
+      g_datalist_unlock (datalist);
+      return;
+    }
 
-      /* Allocate an array of GDataElt to hold copies of the elements
-       * that are removed from the datalist. Allow enough space for all
-       * the keys; if a key is not found, the corresponding element of
-       * old is not populated, so we initialize them all to NULL to
-       * detect that case. */
-      old = g_newa0 (GDataElt, n_keys);
+  /* Allocate an array of GDataElt to hold copies of the elements
+   * that are removed from the datalist. Allow enough space for all
+   * the keys; if a key is not found, the corresponding element of
+   * old is not populated, so we initialize them all to NULL to
+   * detect that case.
+   *
+   * At most allocate 400 bytes on the stack. Especially since we call
+   * out to external code, we don't know how much stack we can use. */
+  if (n_keys <= 400u / sizeof (GDataElt))
+    old = g_newa0 (GDataElt, n_keys);
+  else
+    {
+      old_to_free = g_new0 (GDataElt, n_keys);
+      old = old_to_free;
+    }
 
-      data = d->data;
-      data_end = data + d->len;
-      found_keys = 0;
+  i_data = 0;
+  found_keys = 0;
+  while (i_data < d->len && found_keys < n_keys)
+    {
+      GDataElt *data = &d->data[i_data];
+      gboolean remove = FALSE;
 
-      while (data < data_end && found_keys < n_keys)
+      for (i_keys = 0; i_keys < n_keys; i_keys++)
         {
-          gboolean remove = FALSE;
-
-          for (gsize i = 0; i < n_keys; i++)
-            {
-              if (data->key == keys[i])
-                {
-                  old[i] = *data;
-                  remove = TRUE;
-                  break;
-                }
-            }
-
-          if (remove)
+          if (data->key == keys[i_keys])
             {
-              GDataElt *data_last = data_end - 1;
-
+              /* We must invoke the destroy notifications in the order of @keys.
+               * Hence, build up the list @old at index @i_keys. */
+              old[i_keys] = *data;
               found_keys++;
-
-              if (data < data_last)
-                *data = *data_last;
-
-              data_end--;
-              d->len--;
-
-              /* We don't bother to shrink, but if all data are now gone
-               * we at least free the memory
-               */
-              if (d->len == 0)
-                {
-                  G_DATALIST_SET_POINTER (datalist, NULL);
-                  g_free (d);
-                  break;
-                }
-            }
-          else
-            {
-              data++;
+              remove = TRUE;
+              break;
             }
         }
 
-      if (found_keys > 0)
+      if (!remove)
         {
-          g_datalist_unlock (datalist);
+          i_data++;
+          continue;
+        }
 
-          for (gsize i = 0; i < n_keys; i++)
-            {
-              /* If keys[i] was not found, then old[i].destroy is NULL.
-               * Call old[i].destroy() only if keys[i] was found, and
-               * is associated with a destroy notifier: */
-              if (old[i].destroy)
-                old[i].destroy (old[i].data);
-            }
+      datalist_remove (d, i_data);
+    }
+
+  if (found_keys > 0 && datalist_shrink (&d, &d_to_free))
+    {
+      g_datalist_unlock_and_set (datalist, d);
+      if (d_to_free)
+        g_free (d_to_free);
+    }
+  else
+    g_datalist_unlock (datalist);
 
-          return;
+  if (found_keys > 0)
+    {
+      for (i_keys = 0; i_keys < n_keys; i_keys++)
+        {
+          if (old[i_keys].destroy)
+            old[i_keys].destroy (old[i_keys].data);
         }
     }
 
-  g_datalist_unlock (datalist);
+  if (G_UNLIKELY (old_to_free))
+    g_free (old_to_free);
 }
 
 /**
@@ -773,13 +802,17 @@ g_datalist_id_set_data_full (GData    **datalist,
  * g_datalist_id_remove_multiple:
  * @datalist: a datalist
  * @keys: (array length=n_keys): keys to remove
- * @n_keys: length of @keys, must be <= 16
+ * @n_keys: length of @keys.
  *
  * Removes multiple keys from a datalist.
  *
  * This is more efficient than calling g_datalist_id_remove_data()
  * multiple times in a row.
  *
+ * Before 2.80, @n_keys had to be not larger than 16. Now it can be larger, but
+ * note that GData does a linear search, so an excessive number of keys will
+ * perform badly.
+ *
  * Since: 2.74
  */
 void
@@ -787,8 +820,6 @@ g_datalist_id_remove_multiple (GData  **datalist,
                                GQuark  *keys,
                                gsize    n_keys)
 {
-  g_return_if_fail (n_keys <= 16);
-
   g_data_remove_internal (datalist, keys, n_keys);
 }
 
@@ -864,6 +895,113 @@ g_datalist_id_remove_no_notify (GData **datalist,
   return ret_data;
 }
 
+/*< private >
+ * g_datalist_id_update_atomic:
+ * @datalist: the data list
+ * @key_id: the key to add.
+ * @callback: (scope call): callback to update (set, remove, steal, update) the
+ *   data.
+ * @user_data: the user data for @callback.
+ *
+ * Will call @callback while holding the lock on @datalist. Be careful to not
+ * end up calling into another data-list function, because the lock is not
+ * reentrant and deadlock will happen.
+ *
+ * The callback receives the current data and destroy function. If @key_id is
+ * currently not in @datalist, they will be %NULL. The callback can update
+ * those pointers, and @datalist will be updated with the result. Note that if
+ * callback modifies a received data, then it MUST steal it and take ownership
+ * on it. Possibly by freeing it with the provided destroy function.
+ *
+ * The point is to atomically access the entry, while holding a lock
+ * of @datalist. Without this, the user would have to hold their own mutex
+ * while handling @key_id entry.
+ *
+ * The return value of @callback is not used, except it becomes the return
+ * value of the function. This is an alternative to returning a result via
+ * @user_data.
+ *
+ * Returns: the value returned by @callback.
+ *
+ * Since: 2.80
+ */
+gpointer
+g_datalist_id_update_atomic (GData **datalist,
+                             GQuark key_id,
+                             GDataListUpdateAtomicFunc callback,
+                             gpointer user_data)
+{
+  GData *d;
+  GDataElt *data;
+  gpointer new_data;
+  gpointer result;
+  GDestroyNotify new_destroy;
+  guint32 idx;
+  gboolean to_unlock = TRUE;
+
+  d = g_datalist_lock_and_get (datalist);
+
+  data = datalist_find (d, key_id, &idx);
+
+  if (data)
+    {
+      new_data = data->data;
+      new_destroy = data->destroy;
+    }
+  else
+    {
+      new_data = NULL;
+      new_destroy = NULL;
+    }
+
+  result = callback (key_id, &new_data, &new_destroy, user_data);
+
+  if (data && !new_data)
+    {
+      GData *d_to_free;
+
+      /* Remove. The callback indicates to drop the entry.
+       *
+       * The old data->data was stolen by callback(). */
+      datalist_remove (d, idx);
+      if (datalist_shrink (&d, &d_to_free))
+        {
+          g_datalist_unlock_and_set (datalist, d);
+          if (d_to_free)
+            g_free (d_to_free);
+          to_unlock = FALSE;
+        }
+    }
+  else if (data)
+    {
+      /* Update. The callback may have provided new pointers to an existing
+       * entry.
+       *
+       * The old data was stolen by callback(). We only update the pointers and
+       * are done. */
+      data->data = new_data;
+      data->destroy = new_destroy;
+    }
+  else if (!data && !new_data)
+    {
+      /* Absent. No change. The entry didn't exist and still does not. */
+    }
+  else
+    {
+      /* Add. Add a new entry that didn't exist previously. */
+      if (datalist_append (&d, key_id, new_data, new_destroy))
+        {
+          g_datalist_unlock_and_set (datalist, d);
+          to_unlock = FALSE;
+        }
+    }
+
+  if (to_unlock)
+    g_datalist_unlock (datalist);
+
+  return result;
+}
+
 /**
  * g_dataset_id_get_data:
  * @dataset_location: (not nullable): the location identifying the dataset.
@@ -974,26 +1112,13 @@ g_datalist_id_dup_data (GData          **datalist,
   gpointer val = NULL;
   gpointer retval = NULL;
   GData *d;
-  GDataElt *data, *data_end;
+  GDataElt *data;
 
-  g_datalist_lock (datalist);
+  d = g_datalist_lock_and_get (datalist);
 
-  d = G_DATALIST_GET_POINTER (datalist);
-  if (d)
-    {
-      data = d->data;
-      data_end = data + d->len;
-      do
-        {
-          if (data->key == key_id)
-            {
-              val = data->data;
-              break;
-            }
-          data++;
-        }
-      while (data < data_end);
-    }
+  data = datalist_find (d, key_id, NULL);
+  if (data)
+    val = data->data;
 
   if (dup_func)
     retval = dup_func (val, user_data);
@@ -1043,7 +1168,10 @@ g_datalist_id_replace_data (GData          **datalist,
 {
   gpointer val = NULL;
   GData *d;
-  GDataElt *data, *data_end;
+  GDataElt *data;
+  GData *d_to_free = NULL;
+  gboolean set_d = FALSE;
+  guint32 idx;
 
   g_return_val_if_fail (datalist != NULL, FALSE);
   g_return_val_if_fail (key_id != 0, FALSE);
@@ -1051,77 +1179,46 @@ g_datalist_id_replace_data (GData          **datalist,
   if (old_destroy)
     *old_destroy = NULL;
 
-  g_datalist_lock (datalist);
+  d = g_datalist_lock_and_get (datalist);
 
-  d = G_DATALIST_GET_POINTER (datalist);
-  if (d)
+  data = datalist_find (d, key_id, &idx);
+  if (data)
     {
-      data = d->data;
-      data_end = data + d->len - 1;
-      while (data <= data_end)
+      val = data->data;
+      if (val == oldval)
         {
-          if (data->key == key_id)
+          if (old_destroy)
+            *old_destroy = data->destroy;
+          if (newval != NULL)
             {
-              val = data->data;
-              if (val == oldval)
-                {
-                  if (old_destroy)
-                    *old_destroy = data->destroy;
-                  if (newval != NULL)
-                    {
-                      data->data = newval;
-                      data->destroy = destroy;
-                    }
-                  else
-                   {
-                     if (data != data_end)
-                       *data = *data_end;
-                     d->len--;
-
-                     /* We don't bother to shrink, but if all data are now gone
-                      * we at least free the memory
-                      */
-                     if (d->len == 0)
-                       {
-                         G_DATALIST_SET_POINTER (datalist, NULL);
-                         g_free (d);
-                       }
-                   }
-                }
-              break;
+              data->data = newval;
+              data->destroy = destroy;
+            }
+          else
+            {
+              datalist_remove (d, idx);
+              if (datalist_shrink (&d, &d_to_free))
+                set_d = TRUE;
             }
-          data++;
         }
     }
 
   if (val == NULL && oldval == NULL && newval != NULL)
     {
-      GData *old_d;
-
-      /* insert newval */
-      old_d = d;
-      if (d == NULL)
-  {
-          d = g_malloc (sizeof (GData));
-          d->len = 0;
-          d->alloc = 1;
-        }
-      else if (d->len == d->alloc)
+      if (datalist_append (&d, key_id, newval, destroy))
         {
-          d->alloc = d->alloc * 2;
-          d = g_realloc (d, sizeof (GData) + (d->alloc - 1) * sizeof (GDataElt));
+          set_d = TRUE;
         }
-      if (old_d != d)
-        G_DATALIST_SET_POINTER (datalist, d);
-
-      d->data[d->len].key = key_id;
-      d->data[d->len].data = newval;
-      d->data[d->len].destroy = destroy;
-      d->len++;
     }
 
+  if (set_d)
+    g_datalist_unlock_and_set (datalist, d);
+  else
   g_datalist_unlock (datalist);
 
+  if (d_to_free)
+    g_free (d_to_free);
+
   return val == oldval;
 }
 
@@ -1146,15 +1243,19 @@ g_datalist_get_data (GData   **datalist,
 
   g_return_val_if_fail (datalist != NULL, NULL);
 
-  g_datalist_lock (datalist);
-
-  d = G_DATALIST_GET_POINTER (datalist);
+  d = g_datalist_lock_and_get (datalist);
   if (d)
     {
       data = d->data;
       data_end = data + d->len;
       while (data < data_end)
   {
+    /* Here we intentionally compare by strings, instead of calling
+     * g_quark_try_string() first.
+     *
+     * See commit 1cceda49b60b ('Make g_datalist_get_data not look up the
+     * quark').
+     */
     if (g_strcmp0 (g_quark_to_string (data->key), key) == 0)
       {
         res = data->data;
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdatasetprivate.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdatasetprivate.h
index bb0f16db97f..9568eea42d9 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdatasetprivate.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdatasetprivate.h
@@ -38,6 +38,29 @@ G_BEGIN_DECLS
 #define G_DATALIST_GET_FLAGS(datalist)        \
   ((gsize) g_atomic_pointer_get (datalist) & G_DATALIST_FLAGS_MASK)
 
+/*< private >
+ * GDataListUpdateAtomicFunc:
+ * @key_id: ID of the entry to update
+ * @data: (inout) (nullable) (not optional): the existing data corresponding
+ *   to @key_id, and return location for the new value for it
+ * @destroy_notify: (inout) (nullable) (not optional): the existing destroy
+ *   notify function for @data, and return location for the destroy notify
+ *   function for the new value for it
+ * @user_data: user data passed in to [func@GLib.datalist_id_update_atomic]
+ *
+ * Callback from [func@GLib.datalist_id_update_atomic].
+ *
+ * Since: 2.80
+ */
+typedef gpointer (*GDataListUpdateAtomicFunc) (GQuark key_id,
+                                               gpointer *data,
+                                               GDestroyNotify *destroy_notify,
+                                               gpointer user_data);
+
+gpointer g_datalist_id_update_atomic (GData **datalist,
+                                      GQuark key_id,
+                                      GDataListUpdateAtomicFunc callback,
+                                      gpointer user_data);
 
 G_END_DECLS
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdate.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdate.c
index 5f21c46bc01..e8c93e379e8 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdate.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdate.c
@@ -60,21 +60,29 @@
 #endif
 
 /**
- * SECTION:date
- * @title: Date and Time Functions
- * @short_description: calendrical calculations and miscellaneous time stuff
+ * GDate:
+ * @julian_days: the Julian representation of the date
+ * @julian: this bit is set if @julian_days is valid
+ * @dmy: this is set if @day, @month and @year are valid
+ * @day: the day of the day-month-year representation of the date,
+ *   as a number between 1 and 31
+ * @month: the month of the day-month-year representation of the date,
+ *   as a number between 1 and 12
+ * @year: the year of the day-month-year representation of the date
+ *
+ * `GDate` is a struct for calendrical calculations.
  *
- * The #GDate data structure represents a day between January 1, Year 1,
+ * The `GDate` data structure represents a day between January 1, Year 1,
  * and sometime a few thousand years in the future (right now it will go
- * to the year 65535 or so, but g_date_set_parse() only parses up to the
- * year 8000 or so - just count on "a few thousand"). #GDate is meant to
+ * to the year 65535 or so, but [method@GLib.Date.set_parse] only parses up to the
+ * year 8000 or so - just count on "a few thousand"). `GDate` is meant to
  * represent everyday dates, not astronomical dates or historical dates
  * or ISO timestamps or the like. It extrapolates the current Gregorian
  * calendar forward and backward in time; there is no attempt to change
- * the calendar to match time periods or locations. #GDate does not store
+ * the calendar to match time periods or locations. `GDate` does not store
  * time information; it represents a day.
  *
- * The #GDate implementation has several nice features; it is only a
+ * The `GDate` implementation has several nice features; it is only a
  * 64-bit struct, so storing large numbers of dates is very efficient. It
  * can keep both a Julian and day-month-year representation of the date,
  * since some calculations are much easier with one representation or the
@@ -84,25 +92,23 @@
  * technical sense; technically, Julian dates count from the start of the
  * Julian period, Jan 1, 4713 BC).
  *
- * #GDate is simple to use. First you need a "blank" date; you can get a
- * dynamically allocated date from g_date_new(), or you can declare an
- * automatic variable or array and initialize it by
- * calling g_date_clear(). A cleared date is safe; it's safe to call
- * g_date_set_dmy() and the other mutator functions to initialize the
- * value of a cleared date. However, a cleared date is initially
- * invalid, meaning that it doesn't represent a day that exists.
- * It is undefined to call any of the date calculation routines on an
- * invalid date. If you obtain a date from a user or other
- * unpredictable source, you should check its validity with the
- * g_date_valid() predicate. g_date_valid() is also used to check for
- * errors with g_date_set_parse() and other functions that can
- * fail. Dates can be invalidated by calling g_date_clear() again.
+ * `GDate` is simple to use. First you need a "blank" date; you can get a
+ * dynamically allocated date from [ctor@GLib.Date.new], or you can declare an
+ * automatic variable or array and initialize it by calling [method@GLib.Date.clear].
+ * A cleared date is safe; it's safe to call [method@GLib.Date.set_dmy] and the other
+ * mutator functions to initialize the value of a cleared date. However, a cleared date
+ * is initially invalid, meaning that it doesn't represent a day that exists.
+ * It is undefined to call any of the date calculation routines on an invalid date.
+ * If you obtain a date from a user or other unpredictable source, you should check
+ * its validity with the [method@GLib.Date.valid] predicate. [method@GLib.Date.valid]
+ * is also used to check for errors with [method@GLib.Date.set_parse] and other functions
+ * that can fail. Dates can be invalidated by calling [method@GLib.Date.clear] again.
  *
- * It is very important to use the API to access the #GDate
- * struct. Often only the day-month-year or only the Julian
- * representation is valid. Sometimes neither is valid. Use the API.
+ * It is very important to use the API to access the `GDate` struct. Often only the
+ * day-month-year or only the Julian representation is valid. Sometimes neither is valid.
+ * Use the API.
  *
- * GLib also features #GDateTime which represents a precise time.
+ * GLib also features `GDateTime` which represents a precise time.
  */
 
 /**
@@ -131,30 +137,6 @@
  * Deprecated: 2.62: Use #GDateTime or #guint64 instead.
  */
 
-/**
- * GDate:
- * @julian_days: the Julian representation of the date
- * @julian: this bit is set if @julian_days is valid
- * @dmy: this is set if @day, @month and @year are valid
- * @day: the day of the day-month-year representation of the date,
- *   as a number between 1 and 31
- * @month: the day of the day-month-year representation of the date,
- *   as a number between 1 and 12
- * @year: the day of the day-month-year representation of the date
- *
- * Represents a day between January 1, Year 1 and a few thousand years in
- * the future. None of its members should be accessed directly.
- *
- * If the `GDate` is obtained from g_date_new(), it will be safe
- * to mutate but invalid and thus not safe for calendrical computations.
- *
- * If it's declared on the stack, it will contain garbage so must be
- * initialized with g_date_clear(). g_date_clear() makes the date invalid
- * but safe. An invalid date doesn't represent a day, it's "empty." A date
- * becomes valid after you set it to a Julian day or you set a day, month,
- * and year.
- */
-
 /**
  * GTime:
  *
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdate.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdate.h
index 920a9af2822..b7aec2cad3f 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdate.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdate.h
@@ -38,15 +38,6 @@
 
 G_BEGIN_DECLS
 
-/* GDate
- *
- * Date calculations (not time for now, to be resolved). These are a
- * mutant combination of Steffen Beyer's DateCalc routines
- * (http://www.perl.com/CPAN/authors/id/STBEY/) and Jon Trowbridge's
- * date routines (written for in-house software).  Written by Havoc
- * Pennington <hp@pobox.com>
- */
-
 typedef gint32  GTime GLIB_DEPRECATED_TYPE_IN_2_62_FOR(GDateTime);
 typedef guint16 GDateYear;
 typedef guint8  GDateDay;   /* day of the month */
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdatetime-private.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdatetime-private.c
new file mode 100644
index 00000000000..b392b622333
--- /dev/null
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdatetime-private.c
@@ -0,0 +1,257 @@
+/*
+ * Copyright 2023 GNOME Foundation Inc.
+ *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *  - Philip Withnall <pwithnall@gnome.org>
+ */
+
+#include "glib.h"
+#include "gdatetime-private.h"
+
+/**
+ * _g_era_date_compare:
+ * @date1: first date
+ * @date2: second date
+ *
+ * Compare two #GEraDates for ordering, taking into account negative and
+ * positive infinity.
+ *
+ * Returns: strcmp()-style integer, `<0` indicates `date1 < date2`, `0`
+ *   indicates `date1 == date2`, `>0` indicates `date1 > date2`
+ * Since: 2.80
+ */
+int
+_g_era_date_compare (const GEraDate *date1,
+                     const GEraDate *date2)
+{
+  if (date1->type == G_ERA_DATE_SET &&
+      date2->type == G_ERA_DATE_SET)
+    {
+      if (date1->year != date2->year)
+        return date1->year - date2->year;
+      if (date1->month != date2->month)
+        return date1->month - date2->month;
+      return date1->day - date2->day;
+    }
+
+  if (date1->type == date2->type)
+    return 0;
+
+  if (date1->type == G_ERA_DATE_MINUS_INFINITY || date2->type == G_ERA_DATE_PLUS_INFINITY)
+    return -1;
+  if (date1->type == G_ERA_DATE_PLUS_INFINITY || date2->type == G_ERA_DATE_MINUS_INFINITY)
+    return 1;
+
+  g_assert_not_reached ();
+}
+
+static gboolean
+parse_era_date (const char *str,
+                const char *endptr,
+                GEraDate   *out_date)
+{
+  const char *str_endptr = NULL;
+  int year_multiplier;
+  guint64 year, month, day;
+
+  year_multiplier = (str[0] == '-') ? -1 : 1;
+  if (str[0] == '-' || str[0] == '+')
+    str++;
+
+  year = g_ascii_strtoull (str, (gchar **) &str_endptr, 10);
+  g_assert (str_endptr <= endptr);
+  if (str_endptr == endptr || *str_endptr != '/' || year > G_MAXINT)
+    return FALSE;
+  str = str_endptr + 1;
+
+  month = g_ascii_strtoull (str, (gchar **) &str_endptr, 10);
+  g_assert (str_endptr <= endptr);
+  if (str_endptr == endptr || *str_endptr != '/' || month < 1 || month > 12)
+    return FALSE;
+  str = str_endptr + 1;
+
+  day = g_ascii_strtoull (str, (gchar **) &str_endptr, 10);
+  g_assert (str_endptr <= endptr);
+  if (str_endptr != endptr || day < 1 || day > 31)
+    return FALSE;
+
+  /* Success */
+  out_date->type = G_ERA_DATE_SET;
+  out_date->year = year_multiplier * year;
+  out_date->month = month;
+  out_date->day = day;
+
+  return TRUE;
+}
+
+/**
+ * _g_era_description_segment_ref:
+ * @segment: a #GEraDescriptionSegment
+ *
+ * Increase the ref count of @segment.
+ *
+ * Returns: (transfer full): @segment
+ * Since: 2.80
+ */
+GEraDescriptionSegment *
+_g_era_description_segment_ref (GEraDescriptionSegment *segment)
+{
+  g_atomic_ref_count_inc (&segment->ref_count);
+  return segment;
+}
+
+/**
+ * _g_era_description_segment_unref:
+ * @segment: (transfer full): a #GEraDescriptionSegment to unref
+ *
+ * Decreases the ref count of @segment.
+ *
+ * Since: 2.80
+ */
+void
+_g_era_description_segment_unref (GEraDescriptionSegment *segment)
+{
+  if (g_atomic_ref_count_dec (&segment->ref_count))
+    {
+      g_free (segment->era_format);
+      g_free (segment->era_name);
+      g_free (segment);
+    }
+}
+
+/**
+ * _g_era_description_parse:
+ * @desc: an `ERA` description string from `nl_langinfo()`
+ *
+ * Parse an ERA description string. See [`nl_langinfo(3)`](man:nl_langinfo(3)).
+ *
+ * Example description string for th_TH.UTF-8:
+ * ```
+ * +:1:-543/01/01:+*:พ.ศ.:%EC %Ey
+ * ```
+ *
+ * @desc must be in UTF-8, so all conversion from the locale encoding must
+ * happen before this function is called. The resulting `era_name` and
+ * `era_format` in the returned segments will be in UTF-8.
+ *
+ * Returns: (transfer full) (nullable) (element-type GEraDescriptionSegment):
+ *   array of one or more parsed era segments, or %NULL if parsing failed
+ * Since: 2.80
+ */
+GPtrArray *
+_g_era_description_parse (const char *desc)
+{
+  GPtrArray *segments = g_ptr_array_new_with_free_func ((GDestroyNotify) _g_era_description_segment_unref);
+
+  for (const char *p = desc; *p != '\0';)
+    {
+      const char *next_colon, *endptr = NULL;
+      GEraDescriptionSegment *segment = NULL;
+      char direction;
+      guint64 offset;
+      GEraDate start_date, end_date;
+      char *era_name = NULL, *era_format = NULL;
+
+      /* direction */
+      direction = *p++;
+      if (direction != '+' && direction != '-')
+        goto error;
+
+      if (*p++ != ':')
+        goto error;
+
+      /* offset */
+      next_colon = strchr (p, ':');
+      if (next_colon == NULL)
+        goto error;
+
+      offset = g_ascii_strtoull (p, (gchar **) &endptr, 10);
+      if (endptr != next_colon)
+        goto error;
+      p = next_colon + 1;
+
+      /* start_date */
+      next_colon = strchr (p, ':');
+      if (next_colon == NULL)
+        goto error;
+
+      if (!parse_era_date (p, next_colon, &start_date))
+        goto error;
+      p = next_colon + 1;
+
+      /* end_date */
+      next_colon = strchr (p, ':');
+      if (next_colon == NULL)
+        goto error;
+
+      if (strncmp (p, "-*", 2) == 0)
+        end_date.type = G_ERA_DATE_MINUS_INFINITY;
+      else if (strncmp (p, "+*", 2) == 0)
+        end_date.type = G_ERA_DATE_PLUS_INFINITY;
+      else if (!parse_era_date (p, next_colon, &end_date))
+        goto error;
+      p = next_colon + 1;
+
+      /* era_name */
+      next_colon = strchr (p, ':');
+      if (next_colon == NULL)
+        goto error;
+
+      if (next_colon - p == 0)
+        goto error;
+      era_name = g_strndup (p, next_colon - p);
+      p = next_colon + 1;
+
+      /* era_format; either the final field in the segment (followed by a
+       * semicolon) or the description (followed by nul) */
+      next_colon = strchr (p, ';');
+      if (next_colon == NULL)
+        next_colon = p + strlen (p);
+
+      if (next_colon - p == 0)
+        {
+          g_free (era_name);
+          goto error;
+        }
+      era_format = g_strndup (p, next_colon - p);
+      if (*next_colon == ';')
+        p = next_colon + 1;
+      else
+        p = next_colon;
+
+      /* Successfully parsed that segment. */
+      segment = g_new0 (GEraDescriptionSegment, 1);
+      g_atomic_ref_count_init (&segment->ref_count);
+      segment->offset = offset;
+      segment->start_date = start_date;
+      segment->end_date = end_date;
+      segment->direction_multiplier =
+          ((_g_era_date_compare (&segment->start_date, &segment->end_date) <= 0) ? 1 : -1) *
+          ((direction == '-') ? -1 : 1);
+      segment->era_name = g_steal_pointer (&era_name);
+      segment->era_format = g_steal_pointer (&era_format);
+
+      g_ptr_array_add (segments, g_steal_pointer (&segment));
+    }
+
+  return g_steal_pointer (&segments);
+
+error:
+  g_ptr_array_unref (segments);
+  return NULL;
+}
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdatetime-private.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdatetime-private.h
new file mode 100644
index 00000000000..1513141cec4
--- /dev/null
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdatetime-private.h
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2023 GNOME Foundation Inc.
+ *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *  - Philip Withnall <pwithnall@gnome.org>
+ */
+
+#pragma once
+
+#include "glib.h"
+
+G_BEGIN_DECLS
+
+/**
+ * GEraDate:
+ * @type: the type of date
+ * @year: year of the date, in the Gregorian calendar
+ * @month: month of the date, in the Gregorian calendar
+ * @day: day of the date, in the Gregorian calendar
+ *
+ * A date from a #GEraDescriptionSegment.
+ *
+ * If @type is %G_ERA_DATE_SET, @year, @month and @day are valid. Otherwise,
+ * they are undefined.
+ *
+ * Since: 2.80
+ */
+typedef struct {
+  enum {
+    G_ERA_DATE_SET,
+    G_ERA_DATE_PLUS_INFINITY,
+    G_ERA_DATE_MINUS_INFINITY,
+  } type;
+  int year;
+  int month;
+  int day;
+} GEraDate;
+
+int _g_era_date_compare (const GEraDate *date1,
+                         const GEraDate *date2);
+
+/**
+ * GEraDescriptionSegment:
+ * @ref_count: reference count
+ * @direction_multiplier: `-1` or `1` depending on the order of @start_date and
+ *   @end_date
+ * @offset: offset of the first year in the era
+ * @start_date: start date (in the Gregorian calendar) of the era
+ * @end_date: end date (in the Gregorian calendar) of the era
+ * @era_name: (not nullable): name of the era
+ * @era_format: (not nullable): format string to use for `%EY`
+ *
+ * A segment of an `ERA` description string, describing a single era. See
+ * [`nl_langinfo(3)`](man:nl_langinfo(3)).
+ *
+ * Since: 2.80
+ */
+typedef struct {
+  gatomicrefcount ref_count;
+  int direction_multiplier;
+  guint64 offset;
+  GEraDate start_date;  /* inclusive */
+  GEraDate end_date;  /* inclusive */
+  char *era_name;  /* UTF-8 encoded */
+  char *era_format;  /* UTF-8 encoded */
+} GEraDescriptionSegment;
+
+GPtrArray *_g_era_description_parse (const char *desc);
+
+GEraDescriptionSegment *_g_era_description_segment_ref (GEraDescriptionSegment *segment);
+void _g_era_description_segment_unref (GEraDescriptionSegment *segment);
+
+G_END_DECLS
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdatetime.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdatetime.c
index 95d50b5cc79..b6f2e4ae7c7 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdatetime.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdatetime.c
@@ -5,6 +5,7 @@
  * Copyright (C) 2010 Emmanuele Bassi <ebassi@linux.intel.com>
  * Copyright (C) 2010 Codethink Limited
  * Copyright (C) 2018 Tomasz Miasko
+ * Copyright 2023 GNOME Foundation Inc.
  *
  * SPDX-License-Identifier: LGPL-2.1-or-later
  *
@@ -26,6 +27,7 @@
  *          Emmanuele Bassi <ebassi@linux.intel.com>
  *          Ryan Lortie <desrt@desrt.ca>
  *          Robert Ancell <robert.ancell@canonical.com>
+ *          Philip Withnall <pwithnall@gnome.org>
  */
 
 /* Algorithms within this file are based on the Calendar FAQ by
@@ -54,6 +56,7 @@
 #define _GNU_SOURCE 1
 #endif
 
+#include <locale.h>
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
@@ -68,6 +71,7 @@
 #include "gconvert.h"
 #include "gconvertprivate.h"
 #include "gdatetime.h"
+#include "gdatetime-private.h"
 #include "gfileutils.h"
 #include "ghash.h"
 #include "glibintl.h"
@@ -89,39 +93,6 @@
 #endif
 #endif /* !G_OS_WIN32 */
 
-/**
- * SECTION:date-time
- * @title: GDateTime
- * @short_description: a structure representing Date and Time
- * @see_also: #GTimeZone
- *
- * #GDateTime is a structure that combines a Gregorian date and time
- * into a single structure.  It provides many conversion and methods to
- * manipulate dates and times.  Time precision is provided down to
- * microseconds and the time can range (proleptically) from 0001-01-01
- * 00:00:00 to 9999-12-31 23:59:59.999999.  #GDateTime follows POSIX
- * time in the sense that it is oblivious to leap seconds.
- *
- * #GDateTime is an immutable object; once it has been created it cannot
- * be modified further.  All modifiers will create a new #GDateTime.
- * Nearly all such functions can fail due to the date or time going out
- * of range, in which case %NULL will be returned.
- *
- * #GDateTime is reference counted: the reference count is increased by calling
- * g_date_time_ref() and decreased by calling g_date_time_unref(). When the
- * reference count drops to 0, the resources allocated by the #GDateTime
- * structure are released.
- *
- * Many parts of the API may produce non-obvious results.  As an
- * example, adding two months to January 31st will yield March 31st
- * whereas adding one month and then one month again will yield either
- * March 28th or March 29th.  Also note that adding 24 hours is not
- * always the same as adding one day (since days containing daylight
- * savings time transitions are either 23 or 25 hours in length).
- *
- * #GDateTime is available since GLib 2.26.
- */
-
 struct _GDateTime
 {
   /* Microsecond timekeeping within Day */
@@ -587,6 +558,31 @@ get_month_name_abbr_with_day (gint month)
 
 #endif  /* HAVE_LANGINFO_ABALTMON */
 
+/* FIXME: It doesn’t seem to be possible to use ERA on 64-bit big-endian platforms with glibc
+ * in a POSIX-compliant way right now.
+ * See https://gitlab.gnome.org/GNOME/glib/-/issues/3225 */
+#if defined(HAVE_LANGINFO_ERA) && (G_BYTE_ORDER == G_LITTLE_ENDIAN || GLIB_SIZEOF_VOID_P == 4)
+
+#define PREFERRED_ERA_DATE_TIME_FMT nl_langinfo (ERA_D_T_FMT)
+#define PREFERRED_ERA_DATE_FMT nl_langinfo (ERA_D_FMT)
+#define PREFERRED_ERA_TIME_FMT nl_langinfo (ERA_T_FMT)
+
+#define ERA_DESCRIPTION nl_langinfo (ERA)
+#define ERA_DESCRIPTION_IS_LOCALE TRUE
+#define ERA_DESCRIPTION_N_SEGMENTS (int) (gintptr) nl_langinfo (_NL_TIME_ERA_NUM_ENTRIES)
+
+#else  /* if !HAVE_LANGINFO_ERA */
+
+#define PREFERRED_ERA_DATE_TIME_FMT PREFERRED_DATE_TIME_FMT
+#define PREFERRED_ERA_DATE_FMT PREFERRED_DATE_FMT
+#define PREFERRED_ERA_TIME_FMT PREFERRED_TIME_FMT
+
+#define ERA_DESCRIPTION NULL
+#define ERA_DESCRIPTION_IS_LOCALE FALSE
+#define ERA_DESCRIPTION_N_SEGMENTS 0
+
+#endif  /* !HAVE_LANGINFO_ERA */
+
 /* Format AM/PM indicator if the locale does not have a localized version. */
 static const gchar *
 get_fallback_ampm (gint hour)
@@ -1040,15 +1036,41 @@ g_date_time_new_now_utc (void)
 GDateTime *
 g_date_time_new_from_unix_local (gint64 t)
 {
-  GDateTime *datetime;
-  GTimeZone *local;
-
   if (t > G_MAXINT64 / USEC_PER_SECOND ||
       t < G_MININT64 / USEC_PER_SECOND)
     return NULL;
 
+  return g_date_time_new_from_unix_local_usec (t * USEC_PER_SECOND);
+}
+
+/**
+ * g_date_time_new_from_unix_local_usec: (constructor)
+ * @usecs: the Unix time in microseconds
+ *
+ * Creates a [struct@GLib.DateTime] corresponding to the given Unix time @t in the
+ * local time zone.
+ *
+ * Unix time is the number of microseconds that have elapsed since 1970-01-01
+ * 00:00:00 UTC, regardless of the local time offset.
+ *
+ * This call can fail (returning `NULL`) if @t represents a time outside
+ * of the supported range of #GDateTime.
+ *
+ * You should release the return value by calling [method@GLib.DateTime.unref]
+ * when you are done with it.
+ *
+ * Returns: (transfer full) (nullable): a new [struct@GLib.DateTime], or `NULL`
+ *
+ * Since: 2.80
+ **/
+GDateTime *
+g_date_time_new_from_unix_local_usec (gint64 usecs)
+{
+  GDateTime *datetime;
+  GTimeZone *local;
+
   local = g_time_zone_new_local ();
-  datetime = g_date_time_new_from_unix (local, t * USEC_PER_SECOND);
+  datetime = g_date_time_new_from_unix (local, usecs);
   g_time_zone_unref (local);
 
   return datetime;
@@ -1076,15 +1098,40 @@ g_date_time_new_from_unix_local (gint64 t)
 GDateTime *
 g_date_time_new_from_unix_utc (gint64 t)
 {
-  GDateTime *datetime;
-  GTimeZone *utc;
-
   if (t > G_MAXINT64 / USEC_PER_SECOND ||
       t < G_MININT64 / USEC_PER_SECOND)
     return NULL;
 
+  return g_date_time_new_from_unix_utc_usec (t * USEC_PER_SECOND);
+}
+
+/**
+ * g_date_time_new_from_unix_utc_usec: (constructor)
+ * @usecs: the Unix time in microseconds
+ *
+ * Creates a [struct@GLib.DateTime] corresponding to the given Unix time @t in UTC.
+ *
+ * Unix time is the number of microseconds that have elapsed since 1970-01-01
+ * 00:00:00 UTC.
+ *
+ * This call can fail (returning `NULL`) if @t represents a time outside
+ * of the supported range of #GDateTime.
+ *
+ * You should release the return value by calling [method@GLib.DateTime.unref]
+ * when you are done with it.
+ *
+ * Returns: (transfer full) (nullable): a new [struct@GLib.DateTime], or `NULL`
+ *
+ * Since: 2.80
+ **/
+GDateTime *
+g_date_time_new_from_unix_utc_usec (gint64 usecs)
+{
+  GDateTime *datetime;
+  GTimeZone *utc;
+
   utc = g_time_zone_new_utc ();
-  datetime = g_date_time_new_from_unix (utc, t * USEC_PER_SECOND);
+  datetime = g_date_time_new_from_unix (utc, usecs);
   g_time_zone_unref (utc);
 
   return datetime;
@@ -2578,6 +2625,27 @@ g_date_time_to_unix (GDateTime *datetime)
   return INSTANT_TO_UNIX (g_date_time_to_instant (datetime));
 }
 
+/**
+ * g_date_time_to_unix_usec:
+ * @datetime: a #GDateTime
+ *
+ * Gives the Unix time corresponding to @datetime, in microseconds.
+ *
+ * Unix time is the number of microseconds that have elapsed since 1970-01-01
+ * 00:00:00 UTC, regardless of the time zone associated with @datetime.
+ *
+ * Returns: the Unix time corresponding to @datetime
+ *
+ * Since: 2.80
+ **/
+gint64
+g_date_time_to_unix_usec (GDateTime *datetime)
+{
+  g_return_val_if_fail (datetime != NULL, 0);
+
+  return INSTANT_TO_UNIX_USECS (g_date_time_to_instant (datetime));
+}
+
 /**
  * g_date_time_to_timeval:
  * @datetime: a #GDateTime
@@ -2858,6 +2926,9 @@ format_z (GString *outstr,
 /* Initializes the array with UTF-8 encoded alternate digits suitable for use
  * in current locale. Returns NULL when current locale does not use alternate
  * digits or there was an error converting them to UTF-8.
+ *
+ * This needs external locking, so must only be called from within
+ * format_number().
  */
 static const gchar * const *
 initialize_alt_digits (void)
@@ -2899,6 +2970,134 @@ initialize_alt_digits (void)
 }
 #endif /* HAVE_LANGINFO_OUTDIGIT */
 
+/* Look up the era which contains @datetime, in the ERA description from libc
+ * which corresponds to the currently set LC_TIME locale. The ERA is parsed and
+ * cached the first time this function is called (or when LC_TIME changes).
+ * See nl_langinfo(3).
+ *
+ * The return value is (transfer full). */
+static GEraDescriptionSegment *
+date_time_lookup_era (GDateTime *datetime,
+                      gboolean   locale_is_utf8)
+{
+  static GMutex era_mutex;
+  static GPtrArray *static_era_description = NULL;  /* (mutex era_mutex) (element-type GEraDescriptionSegment) */
+  static const char *static_era_description_locale = NULL;  /* (mutex era_mutex) */
+  const char *current_lc_time = setlocale (LC_TIME, NULL);
+  GPtrArray *local_era_description;  /* (element-type GEraDescriptionSegment) */
+  GEraDate datetime_date;
+
+  g_mutex_lock (&era_mutex);
+
+  if (static_era_description_locale != current_lc_time)
+    {
+      const char *era_description_str;
+      size_t era_description_str_len;
+      char *tmp = NULL;
+
+      era_description_str = ERA_DESCRIPTION;
+      if (era_description_str != NULL)
+        {
+          /* FIXME: glibc 2.37 seems to return the era segments nul-separated rather
+           * than semicolon-separated (which is what nl_langinfo(3) specifies).
+           * Fix that up before sending it to the parsing code.
+           * See https://sourceware.org/bugzilla/show_bug.cgi?id=31030*/
+            {
+              /* Work out the length of the whole description string, regardless
+               * of whether it uses nuls or semicolons as separators. */
+              int n_entries = ERA_DESCRIPTION_N_SEGMENTS;
+              const char *s = era_description_str;
+
+              for (int i = 1; i < n_entries; i++)
+                {
+                  const char *next_semicolon = strchr (s, ';');
+                  const char *next_nul = strchr (s, '\0');
+
+                  if (next_semicolon != NULL && next_semicolon < next_nul)
+                    s = next_semicolon + 1;
+                  else
+                    s = next_nul + 1;
+                }
+
+              era_description_str_len = strlen (s) + (s - era_description_str);
+
+              /* Replace all the nuls with semicolons. */
+              era_description_str = tmp = g_memdup2 (era_description_str, era_description_str_len + 1);
+              s = era_description_str;
+
+              for (int i = 1; i < n_entries; i++)
+                {
+                  char *next_nul = strchr (s, '\0');
+
+                  if ((size_t) (next_nul - era_description_str) >= era_description_str_len)
+                    break;
+
+                  *next_nul = ';';
+                  s = next_nul + 1;
+                }
+            }
+
+          /* Convert from the LC_TIME encoding to UTF-8 if needed. */
+          if (!locale_is_utf8 && ERA_DESCRIPTION_IS_LOCALE)
+            {
+              char *tmp2 = NULL;
+              era_description_str = tmp2 = g_locale_to_utf8 (era_description_str, -1, NULL, NULL, NULL);
+              g_free (tmp);
+              tmp = g_steal_pointer (&tmp2);
+            }
+
+          g_clear_pointer (&static_era_description, g_ptr_array_unref);
+
+          if (era_description_str != NULL)
+            static_era_description = _g_era_description_parse (era_description_str);
+          if (static_era_description == NULL)
+            g_warning ("Could not parse ERA description: %s", era_description_str);
+        }
+      else
+        {
+          g_clear_pointer (&static_era_description, g_ptr_array_unref);
+        }
+
+      g_free (tmp);
+
+      static_era_description_locale = current_lc_time;
+    }
+
+  if (static_era_description == NULL)
+    {
+      g_mutex_unlock (&era_mutex);
+      return NULL;
+    }
+
+  local_era_description = g_ptr_array_ref (static_era_description);
+  g_mutex_unlock (&era_mutex);
+
+  /* Search through the eras and see if one matches. */
+  datetime_date.type = G_ERA_DATE_SET;
+  datetime_date.year = g_date_time_get_year (datetime);
+  datetime_date.month = g_date_time_get_month (datetime);
+  datetime_date.day = g_date_time_get_day_of_month (datetime);
+
+  for (unsigned int i = 0; i < local_era_description->len; i++)
+    {
+      GEraDescriptionSegment *segment = g_ptr_array_index (local_era_description, i);
+
+      if ((_g_era_date_compare (&segment->start_date, &datetime_date) <= 0 &&
+           _g_era_date_compare (&datetime_date, &segment->end_date) <= 0) ||
+          (_g_era_date_compare (&segment->end_date, &datetime_date) <= 0 &&
+           _g_era_date_compare (&datetime_date, &segment->start_date) <= 0))
+        {
+          /* @datetime is within this era segment. */
+          g_ptr_array_unref (local_era_description);
+          return _g_era_description_segment_ref (segment);
+        }
+    }
+
+  g_ptr_array_unref (local_era_description);
+
+  return NULL;
+}
+
 static void
 format_number (GString     *str,
                gboolean     use_alt_digits,
@@ -2912,6 +3111,9 @@ format_number (GString     *str,
   const gchar * const *digits = ascii_digits;
   const gchar *tmp[10];
   gint i = 0;
+#ifdef HAVE_LANGINFO_OUTDIGIT
+  static GMutex alt_digits_mutex;
+#endif
 
   g_return_if_fail (width <= 10);
 
@@ -2919,16 +3121,22 @@ format_number (GString     *str,
   if (use_alt_digits)
     {
       static const gchar * const *alt_digits = NULL;
-      static gsize initialised;
+      static char *alt_digits_locale = NULL;
+      const char *current_ctype_locale = setlocale (LC_CTYPE, NULL);
+
+      /* Lock so we can initialise (or re-initialise, if the locale has changed)
+       * and hold access to the digits buffer until done formatting. */
+      g_mutex_lock (&alt_digits_mutex);
 
-      if G_UNLIKELY (g_once_init_enter (&initialised))
+      if (g_strcmp0 (alt_digits_locale, current_ctype_locale) != 0)
         {
           alt_digits = initialize_alt_digits ();
 
           if (alt_digits == NULL)
             alt_digits = ascii_digits;
 
-          g_once_init_leave (&initialised, TRUE);
+          g_free (alt_digits_locale);
+          alt_digits_locale = g_strdup (current_ctype_locale);
         }
 
       digits = alt_digits;
@@ -2945,6 +3153,11 @@ format_number (GString     *str,
   while (pad && i < width)
     tmp[i++] = *pad == '0' ? digits[0] : pad;
 
+#ifdef HAVE_LANGINFO_OUTDIGIT
+  if (use_alt_digits)
+    g_mutex_unlock (&alt_digits_mutex);
+#endif
+
   /* should really be impossible */
   g_assert (i <= 10);
 
@@ -3018,13 +3231,17 @@ g_date_time_format_locale (GDateTime   *datetime,
 static inline gboolean
 string_append (GString     *string,
                const gchar *s,
+               gboolean     do_strup,
                gboolean     s_is_utf8)
 {
   gchar *utf8;
   gsize  utf8_len;
+  char *tmp = NULL;
 
   if (s_is_utf8)
     {
+      if (do_strup)
+        s = tmp = g_utf8_strup (s, -1);
       g_string_append (string, s);
     }
   else
@@ -3032,10 +3249,18 @@ string_append (GString     *string,
       utf8 = _g_time_locale_to_utf8 (s, -1, NULL, &utf8_len, NULL);
       if (utf8 == NULL)
         return FALSE;
+      if (do_strup)
+        {
+          tmp = g_utf8_strup (utf8, utf8_len);
+          g_free (utf8);
+          utf8 = g_steal_pointer (&tmp);
+        }
       g_string_append_len (string, utf8, utf8_len);
       g_free (utf8);
     }
 
+  g_free (tmp);
+
   return TRUE;
 }
 
@@ -3052,11 +3277,15 @@ g_date_time_format_utf8 (GDateTime   *datetime,
   guint     colons;
   gunichar  c;
   gboolean  alt_digits = FALSE;
+  gboolean alt_era = FALSE;
   gboolean  pad_set = FALSE;
+  gboolean mod_case = FALSE;
   gboolean  name_is_utf8;
   const gchar *pad = "";
+  const gchar *mod = "";
   const gchar *name;
   const gchar *tz;
+  char *tmp = NULL;
 
   while (*utf8_format)
     {
@@ -3075,7 +3304,9 @@ g_date_time_format_utf8 (GDateTime   *datetime,
 
       colons = 0;
       alt_digits = FALSE;
+      alt_era = FALSE;
       pad_set = FALSE;
+      mod_case = FALSE;
 
     next_mod:
       c = g_utf8_get_char (utf8_format);
@@ -3089,7 +3320,7 @@ g_date_time_format_utf8 (GDateTime   *datetime,
 
           name_is_utf8 = locale_is_utf8 || !WEEKDAY_ABBR_IS_LOCALE;
 
-          if (!string_append (outstr, name, name_is_utf8))
+          if (!string_append (outstr, name, mod_case, name_is_utf8))
             return FALSE;
 
     break;
@@ -3100,7 +3331,7 @@ g_date_time_format_utf8 (GDateTime   *datetime,
 
           name_is_utf8 = locale_is_utf8 || !WEEKDAY_FULL_IS_LOCALE;
 
-          if (!string_append (outstr, name, name_is_utf8))
+          if (!string_append (outstr, name, mod_case, name_is_utf8))
             return FALSE;
 
     break;
@@ -3114,7 +3345,7 @@ g_date_time_format_utf8 (GDateTime   *datetime,
             ((alt_digits && !MONTH_ABBR_STANDALONE_IS_LOCALE) ||
              (!alt_digits && !MONTH_ABBR_WITH_DAY_IS_LOCALE));
 
-          if (!string_append (outstr, name, name_is_utf8))
+          if (!string_append (outstr, name, mod_case, name_is_utf8))
             return FALSE;
 
     break;
@@ -3128,20 +3359,37 @@ g_date_time_format_utf8 (GDateTime   *datetime,
             ((alt_digits && !MONTH_FULL_STANDALONE_IS_LOCALE) ||
              (!alt_digits && !MONTH_FULL_WITH_DAY_IS_LOCALE));
 
-          if (!string_append (outstr, name, name_is_utf8))
+          if (!string_append (outstr, name, mod_case, name_is_utf8))
               return FALSE;
 
     break;
   case 'c':
     {
-            if (g_strcmp0 (PREFERRED_DATE_TIME_FMT, "") == 0)
+            const char *subformat = alt_era ? PREFERRED_ERA_DATE_TIME_FMT : PREFERRED_DATE_TIME_FMT;
+
+            /* Fallback */
+            if (alt_era && g_strcmp0 (subformat, "") == 0)
+              subformat = PREFERRED_DATE_TIME_FMT;
+
+            if (g_strcmp0 (subformat, "") == 0)
               return FALSE;
-            if (!g_date_time_format_locale (datetime, PREFERRED_DATE_TIME_FMT,
+            if (!g_date_time_format_locale (datetime, subformat,
                                             outstr, locale_is_utf8))
               return FALSE;
     }
     break;
   case 'C':
+          if (alt_era)
+            {
+              GEraDescriptionSegment *era = date_time_lookup_era (datetime, locale_is_utf8);
+              if (era != NULL)
+                {
+                  g_string_append (outstr, era->era_name);
+                  _g_era_description_segment_unref (era);
+                  break;
+                }
+            }
+
     format_number (outstr, alt_digits, pad_set ? pad : "0", 2,
        g_date_time_get_year (datetime) / 100);
     break;
@@ -3181,7 +3429,7 @@ g_date_time_format_utf8 (GDateTime   *datetime,
             ((alt_digits && !MONTH_ABBR_STANDALONE_IS_LOCALE) ||
              (!alt_digits && !MONTH_ABBR_WITH_DAY_IS_LOCALE));
 
-          if (!string_append (outstr, name, name_is_utf8))
+          if (!string_append (outstr, name, mod_case, name_is_utf8))
             return FALSE;
 
     break;
@@ -3218,13 +3466,20 @@ g_date_time_format_utf8 (GDateTime   *datetime,
       break;
   case 'O':
     alt_digits = TRUE;
+    goto next_mod;
+        case 'E':
+          alt_era = TRUE;
     goto next_mod;
   case 'p':
-          if (!format_ampm (datetime, outstr, locale_is_utf8, TRUE))
+          if (!format_ampm (datetime, outstr, locale_is_utf8,
+                            mod_case && g_strcmp0 (mod, "#") == 0 ? FALSE
+                                                                  : TRUE))
             return FALSE;
           break;
   case 'P':
-          if (!format_ampm (datetime, outstr, locale_is_utf8, FALSE))
+          if (!format_ampm (datetime, outstr, locale_is_utf8,
+                            mod_case && g_strcmp0 (mod, "^") == 0 ? TRUE
+                                                                  : FALSE))
             return FALSE;
     break;
   case 'r':
@@ -3271,27 +3526,76 @@ g_date_time_format_utf8 (GDateTime   *datetime,
     break;
   case 'x':
     {
-            if (g_strcmp0 (PREFERRED_DATE_FMT, "") == 0)
+            const char *subformat = alt_era ? PREFERRED_ERA_DATE_FMT : PREFERRED_DATE_FMT;
+
+            /* Fallback */
+            if (alt_era && g_strcmp0 (subformat, "") == 0)
+              subformat = PREFERRED_DATE_FMT;
+
+            if (g_strcmp0 (subformat, "") == 0)
               return FALSE;
-      if (!g_date_time_format_locale (datetime, PREFERRED_DATE_FMT,
+      if (!g_date_time_format_locale (datetime, subformat,
               outstr, locale_is_utf8))
         return FALSE;
     }
     break;
   case 'X':
     {
-            if (g_strcmp0 (PREFERRED_TIME_FMT, "") == 0)
+            const char *subformat = alt_era ? PREFERRED_ERA_TIME_FMT : PREFERRED_TIME_FMT;
+
+            /* Fallback */
+            if (alt_era && g_strcmp0 (subformat, "") == 0)
+              subformat = PREFERRED_TIME_FMT;
+
+            if (g_strcmp0 (subformat, "") == 0)
               return FALSE;
-      if (!g_date_time_format_locale (datetime, PREFERRED_TIME_FMT,
+      if (!g_date_time_format_locale (datetime, subformat,
               outstr, locale_is_utf8))
         return FALSE;
     }
     break;
   case 'y':
+          if (alt_era)
+            {
+              GEraDescriptionSegment *era = date_time_lookup_era (datetime, locale_is_utf8);
+              if (era != NULL)
+                {
+                  int delta = g_date_time_get_year (datetime) - era->start_date.year;
+
+                  /* Both these years are in the Gregorian calendar (CE/BCE),
+                   * which has no year zero. So take one from the delta if they
+                   * cross across where year zero would be. */
+                  if ((g_date_time_get_year (datetime) < 0) != (era->start_date.year < 0))
+                    delta -= 1;
+
+                  format_number (outstr, alt_digits, pad_set ? pad : "0", 2,
+                                 era->offset + delta * era->direction_multiplier);
+                  _g_era_description_segment_unref (era);
+                  break;
+                }
+            }
+
     format_number (outstr, alt_digits, pad_set ? pad : "0", 2,
        g_date_time_get_year (datetime) % 100);
     break;
   case 'Y':
+          if (alt_era)
+            {
+              GEraDescriptionSegment *era = date_time_lookup_era (datetime, locale_is_utf8);
+              if (era != NULL)
+                {
+                  if (!g_date_time_format_utf8 (datetime, era->era_format,
+                                                outstr, locale_is_utf8))
+                    {
+                      _g_era_description_segment_unref (era);
+                      return FALSE;
+                    }
+
+                  _g_era_description_segment_unref (era);
+                  break;
+                }
+            }
+
     format_number (outstr, alt_digits, 0, 0,
        g_date_time_get_year (datetime));
     break;
@@ -3305,7 +3609,10 @@ g_date_time_format_utf8 (GDateTime   *datetime,
     break;
   case 'Z':
     tz = g_date_time_get_timezone_abbreviation (datetime);
+          if (mod_case && g_strcmp0 (mod, "#") == 0)
+            tz = tmp = g_utf8_strdown (tz, -1);
           g_string_append (outstr, tz);
+          g_free (tmp);
     break;
   case '%':
     g_string_append_c (outstr, '%');
@@ -3327,6 +3634,14 @@ g_date_time_format_utf8 (GDateTime   *datetime,
     if (*utf8_format && *utf8_format != 'z' && *utf8_format != ':')
       return FALSE;
     colons++;
+    goto next_mod;
+        case '^':
+          mod_case = TRUE;
+          mod = "^";
+          goto next_mod;
+        case '#':
+          mod_case = TRUE;
+          mod = "#";
     goto next_mod;
   default:
     return FALSE;
@@ -3423,8 +3738,9 @@ g_date_time_format_utf8 (GDateTime   *datetime,
  * - `%%`: a literal `%` character
  *
  * Some conversion specifications can be modified by preceding the
- * conversion specifier by one or more modifier characters. The
- * following modifiers are supported for many of the numeric
+ * conversion specifier by one or more modifier characters.
+ *
+ * The following modifiers are supported for many of the numeric
  * conversions:
  *
  * - `O`: Use alternative numeric symbols, if the current locale supports those.
@@ -3435,6 +3751,13 @@ g_date_time_format_utf8 (GDateTime   *datetime,
  * - `0`: Pad a numeric result with zeros. This overrides the default padding
  *   for the specifier.
  *
+ * The following modifiers are supported for many of the alphabetic conversions:
+ *
+ * - `^`: Use upper case if possible. This is a gnulib `strftime()` extension.
+ *   Since: 2.80
+ * - `#`: Use opposite case if possible. This is a gnulib `strftime()`
+ *   extension. Since: 2.80
+ *
  * Additionally, when `O` is used with `B`, `b`, or `h`, it produces the alternative
  * form of a month name. The alternative form should be used when the month
  * name is used without a day number (e.g., standalone). It is required in
@@ -3443,6 +3766,22 @@ g_date_time_format_utf8 (GDateTime   *datetime,
  * `strftime()` extension expected to be added to the future POSIX specification,
  * `%Ob` and `%Oh` are GNU `strftime()` extensions. Since: 2.56
  *
+ * Since GLib 2.80, when `E` is used with `%c`, `%C`, `%x`, `%X`, `%y` or `%Y`,
+ * the date is formatted using an alternate era representation specific to the
+ * locale. This is typically used for the Thai solar calendar or Japanese era
+ * names, for example.
+ *
+ * - `%Ec`: the preferred date and time representation for the current locale,
+ *   using the alternate era representation
+ * - `%EC`: the name of the era
+ * - `%Ex`: the preferred date representation for the current locale without
+ *   the time, using the alternate era representation
+ * - `%EX`: the preferred time representation for the current locale without
+ *   the date, using the alternate era representation
+ * - `%Ey`: the year since the beginning of the era denoted by the `%EC`
+ *   specifier
+ * - `%EY`: the full alternative year representation
+ *
  * Returns: (transfer full) (nullable): a newly allocated string formatted to
  *    the requested format or %NULL in the case that there was an error (such
  *    as a format specifier not being supported in the current locale). The
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdatetime.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdatetime.h
index aa3ce843bc7..b27ade0c04d 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdatetime.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdatetime.h
@@ -91,7 +91,31 @@ typedef gint64 GTimeSpan;
 /**
  * GDateTime:
  *
- * An opaque structure that represents a date and time, including a time zone.
+ * `GDateTime` is a structure that combines a Gregorian date and time
+ * into a single structure.
+ *
+ * `GDateTime` provides many conversion and methods to manipulate dates and times.
+ * Time precision is provided down to microseconds and the time can range
+ * (proleptically) from 0001-01-01 00:00:00 to 9999-12-31 23:59:59.999999.
+ * `GDateTime` follows POSIX time in the sense that it is oblivious to leap
+ * seconds.
+ *
+ * `GDateTime` is an immutable object; once it has been created it cannot
+ * be modified further. All modifiers will create a new `GDateTime`.
+ * Nearly all such functions can fail due to the date or time going out
+ * of range, in which case %NULL will be returned.
+ *
+ * `GDateTime` is reference counted: the reference count is increased by calling
+ * [method@GLib.DateTime.ref] and decreased by calling [method@GLib.DateTime.unref].
+ * When the reference count drops to 0, the resources allocated by the `GDateTime`
+ * structure are released.
+ *
+ * Many parts of the API may produce non-obvious results. As an
+ * example, adding two months to January 31st will yield March 31st
+ * whereas adding one month and then one month again will yield either
+ * March 28th or March 29th.  Also note that adding 24 hours is not
+ * always the same as adding one day (since days containing daylight
+ * savings time transitions are either 23 or 25 hours in length).
  *
  * Since: 2.26
  */
@@ -114,6 +138,11 @@ GDateTime *             g_date_time_new_from_unix_local                 (gint64
 GLIB_AVAILABLE_IN_ALL
 GDateTime *             g_date_time_new_from_unix_utc                   (gint64          t);
 
+GLIB_AVAILABLE_IN_2_80
+GDateTime *             g_date_time_new_from_unix_local_usec            (gint64          usecs);
+GLIB_AVAILABLE_IN_2_80
+GDateTime *             g_date_time_new_from_unix_utc_usec              (gint64          usecs);
+
 G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 GLIB_DEPRECATED_IN_2_62_FOR(g_date_time_new_from_unix_local)
 GDateTime *             g_date_time_new_from_timeval_local              (const GTimeVal *tv);
@@ -241,6 +270,9 @@ gdouble                 g_date_time_get_seconds                         (GDateTi
 
 GLIB_AVAILABLE_IN_ALL
 gint64                  g_date_time_to_unix                             (GDateTime      *datetime);
+GLIB_AVAILABLE_IN_2_80
+gint64                  g_date_time_to_unix_usec                        (GDateTime      *datetime);
+
 G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 GLIB_DEPRECATED_IN_2_62_FOR(g_date_time_to_unix)
 gboolean                g_date_time_to_timeval                          (GDateTime      *datetime,
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdir.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdir.c
index b4a3d76f0e8..a71c452477b 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdir.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdir.c
@@ -62,6 +62,7 @@
 
 struct _GDir
 {
+  gatomicrefcount ref_count;
 #ifdef G_OS_WIN32
   _WDIR *wdirp;
 #else
@@ -95,10 +96,13 @@ GDir *
 g_dir_open_with_errno (const gchar *path,
                        guint        flags)
 {
-  GDir dir;
 #ifdef G_OS_WIN32
+  GDir *dir;
+  _WDIR *wdirp;
   gint saved_errno;
   wchar_t *wpath;
+#else
+  DIR *dirp;
 #endif
 
   g_return_val_if_fail (path != NULL, NULL);
@@ -108,25 +112,31 @@ g_dir_open_with_errno (const gchar *path,
 
   g_return_val_if_fail (wpath != NULL, NULL);
 
-  dir.wdirp = _wopendir (wpath);
+  wdirp = _wopendir (wpath);
   saved_errno = errno;
   g_free (wpath);
   errno = saved_errno;
 
-  if (dir.wdirp == NULL)
+  if (wdirp == NULL)
     return NULL;
+
+  dir = g_new0 (GDir, 1);
+  g_atomic_ref_count_init (&dir->ref_count);
+  dir->wdirp = wdirp;
+
+  return g_steal_pointer (&dir);
 #else
-  dir.dirp = opendir (path);
+  dirp = opendir (path);
 
-  if (dir.dirp == NULL)
+  if (dirp == NULL)
     return NULL;
-#endif
 
-  return g_memdup2 (&dir, sizeof dir);
+  return g_dir_new_from_dirp (dirp);
+#endif
 }
 
 /**
- * g_dir_open:
+ * g_dir_open: (constructor)
  * @path: the path to the directory you are interested in. On Unix
  *         in the on-disk encoding. On Windows in UTF-8
  * @flags: Currently must be set to 0. Reserved for future use.
@@ -138,7 +148,7 @@ g_dir_open_with_errno (const gchar *path,
  * directory can then be retrieved using g_dir_read_name().  Note
  * that the ordering is not defined.
  *
- * Returns: a newly allocated #GDir on success, %NULL on failure.
+ * Returns: (transfer full): a newly allocated #GDir on success, %NULL on failure.
  *   If non-%NULL, you must free the result with g_dir_close()
  *   when you are finished with it.
  **/
@@ -193,7 +203,8 @@ g_dir_new_from_dirp (gpointer dirp)
 
   g_return_val_if_fail (dirp != NULL, NULL);
 
-  dir = g_new (GDir, 1);
+  dir = g_new0 (GDir, 1);
+  g_atomic_ref_count_init (&dir->ref_count);
   dir->dirp = dirp;
 
   return dir;
@@ -293,23 +304,84 @@ g_dir_rewind (GDir *dir)
 #endif
 }
 
+static void
+g_dir_actually_close (GDir *dir)
+{
+#ifdef G_OS_WIN32
+  g_clear_pointer (&dir->wdirp, _wclosedir);
+#else
+  g_clear_pointer (&dir->dirp, closedir);
+#endif
+}
+
 /**
  * g_dir_close:
- * @dir: a #GDir* created by g_dir_open()
+ * @dir: (transfer full): a #GDir* created by g_dir_open()
  *
- * Closes the directory and deallocates all related resources.
+ * Closes the directory immediately and decrements the reference count.
+ *
+ * Once the reference count reaches zero, the `GDir` structure itself will be
+ * freed. Prior to GLib 2.80, `GDir` was not reference counted.
+ *
+ * It is an error to call any of the `GDir` methods other than
+ * [method@GLib.Dir.ref] and [method@GLib.Dir.unref] on a `GDir` after calling
+ * [method@GLib.Dir.close] on it.
  **/
 void
 g_dir_close (GDir *dir)
 {
   g_return_if_fail (dir != NULL);
 
-#ifdef G_OS_WIN32
-  _wclosedir (dir->wdirp);
-#else
-  closedir (dir->dirp);
-#endif
-  g_free (dir);
+  g_dir_actually_close (dir);
+  g_dir_unref (dir);
+}
+
+/**
+ * g_dir_ref:
+ * @dir: (transfer none): a `GDir`
+ *
+ * Increment the reference count of `dir`.
+ *
+ * Returns: (transfer full): the same pointer as `dir`
+ * Since: 2.80
+ */
+GDir *
+g_dir_ref (GDir *dir)
+{
+  g_return_val_if_fail (dir != NULL, NULL);
+
+  g_atomic_ref_count_inc (&dir->ref_count);
+  return dir;
+}
+
+/**
+ * g_dir_unref:
+ * @dir: (transfer full): a `GDir`
+ *
+ * Decrements the reference count of `dir`.
+ *
+ * Once the reference count reaches zero, the directory will be closed and all
+ * resources associated with it will be freed. If [method@GLib.Dir.close] is
+ * called when the reference count is greater than zero, the directory is closed
+ * but the `GDir` structure will not be freed until its reference count reaches
+ * zero.
+ *
+ * It is an error to call any of the `GDir` methods other than
+ * [method@GLib.Dir.ref] and [method@GLib.Dir.unref] on a `GDir` after calling
+ * [method@GLib.Dir.close] on it.
+ *
+ * Since: 2.80
+ */
+void
+g_dir_unref (GDir *dir)
+{
+  g_return_if_fail (dir != NULL);
+
+  if (g_atomic_ref_count_dec (&dir->ref_count))
+    {
+      g_dir_actually_close (dir);
+      g_free (dir);
+    }
 }
 
 #ifdef G_OS_WIN32
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdir.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdir.h
index 24b509d9b53..097c99ccb32 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdir.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdir.h
@@ -49,6 +49,11 @@ void                     g_dir_rewind         (GDir         *dir);
 GLIB_AVAILABLE_IN_ALL
 void                     g_dir_close          (GDir         *dir);
 
+GLIB_AVAILABLE_IN_2_80
+GDir *                   g_dir_ref             (GDir        *dir);
+GLIB_AVAILABLE_IN_2_80
+void                     g_dir_unref           (GDir        *dir);
+
 G_END_DECLS
 
 #endif /* __G_DIR_H__ */
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gerror.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gerror.c
index d65cc9852f7..da89351cfcf 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gerror.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gerror.c
@@ -24,481 +24,6 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-/**
- * SECTION:error_reporting
- * @Title: Error Reporting
- * @Short_description: a system for reporting errors
- *
- * GLib provides a standard method of reporting errors from a called
- * function to the calling code. (This is the same problem solved by
- * exceptions in other languages.) It's important to understand that
- * this method is both a data type (the #GError struct) and a [set of
- * rules][gerror-rules]. If you use #GError incorrectly, then your code will not
- * properly interoperate with other code that uses #GError, and users
- * of your API will probably get confused. In most cases, [using #GError is
- * preferred over numeric error codes][gerror-comparison], but there are
- * situations where numeric error codes are useful for performance.
- *
- * First and foremost: #GError should only be used to report recoverable
- * runtime errors, never to report programming errors. If the programmer
- * has screwed up, then you should use g_warning(), g_return_if_fail(),
- * g_assert(), g_error(), or some similar facility. (Incidentally,
- * remember that the g_error() function should only be used for
- * programming errors, it should not be used to print any error
- * reportable via #GError.)
- *
- * Examples of recoverable runtime errors are "file not found" or
- * "failed to parse input." Examples of programming errors are "NULL
- * passed to strcmp()" or "attempted to free the same pointer twice."
- * These two kinds of errors are fundamentally different: runtime errors
- * should be handled or reported to the user, programming errors should
- * be eliminated by fixing the bug in the program. This is why most
- * functions in GLib and GTK do not use the #GError facility.
- *
- * Functions that can fail take a return location for a #GError as their
- * last argument. On error, a new #GError instance will be allocated and
- * returned to the caller via this argument. For example:
- * |[<!-- language="C" -->
- * gboolean g_file_get_contents (const gchar  *filename,
- *                               gchar       **contents,
- *                               gsize        *length,
- *                               GError      **error);
- * ]|
- * If you pass a non-%NULL value for the `error` argument, it should
- * point to a location where an error can be placed. For example:
- * |[<!-- language="C" -->
- * gchar *contents;
- * GError *err = NULL;
- *
- * g_file_get_contents ("foo.txt", &contents, NULL, &err);
- * g_assert ((contents == NULL && err != NULL) || (contents != NULL && err == NULL));
- * if (err != NULL)
- *   {
- *     // Report error to user, and free error
- *     g_assert (contents == NULL);
- *     fprintf (stderr, "Unable to read file: %s\n", err->message);
- *     g_error_free (err);
- *   }
- * else
- *   {
- *     // Use file contents
- *     g_assert (contents != NULL);
- *   }
- * ]|
- * Note that `err != NULL` in this example is a reliable indicator
- * of whether g_file_get_contents() failed. Additionally,
- * g_file_get_contents() returns a boolean which
- * indicates whether it was successful.
- *
- * Because g_file_get_contents() returns %FALSE on failure, if you
- * are only interested in whether it failed and don't need to display
- * an error message, you can pass %NULL for the @error argument:
- * |[<!-- language="C" -->
- * if (g_file_get_contents ("foo.txt", &contents, NULL, NULL)) // ignore errors
- *   // no error occurred
- *   ;
- * else
- *   // error
- *   ;
- * ]|
- *
- * The #GError object contains three fields: @domain indicates the module
- * the error-reporting function is located in, @code indicates the specific
- * error that occurred, and @message is a user-readable error message with
- * as many details as possible. Several functions are provided to deal
- * with an error received from a called function: g_error_matches()
- * returns %TRUE if the error matches a given domain and code,
- * g_propagate_error() copies an error into an error location (so the
- * calling function will receive it), and g_clear_error() clears an
- * error location by freeing the error and resetting the location to
- * %NULL. To display an error to the user, simply display the @message,
- * perhaps along with additional context known only to the calling
- * function (the file being opened, or whatever - though in the
- * g_file_get_contents() case, the @message already contains a filename).
- *
- * Since error messages may be displayed to the user, they need to be valid
- * UTF-8 (all GTK widgets expect text to be UTF-8). Keep this in mind in
- * particular when formatting error messages with filenames, which are in
- * the 'filename encoding', and need to be turned into UTF-8 using
- * g_filename_to_utf8(), g_filename_display_name() or g_utf8_make_valid().
- *
- * Note, however, that many error messages are too technical to display to the
- * user in an application, so prefer to use g_error_matches() to categorize errors
- * from called functions, and build an appropriate error message for the context
- * within your application. Error messages from a #GError are more appropriate
- * to be printed in system logs or on the command line. They are typically
- * translated.
- *
- * When implementing a function that can report errors, the basic
- * tool is g_set_error(). Typically, if a fatal error occurs you
- * want to g_set_error(), then return immediately. g_set_error()
- * does nothing if the error location passed to it is %NULL.
- * Here's an example:
- * |[<!-- language="C" -->
- * gint
- * foo_open_file (GError **error)
- * {
- *   gint fd;
- *   int saved_errno;
- *
- *   g_return_val_if_fail (error == NULL || *error == NULL, -1);
- *
- *   fd = open ("file.txt", O_RDONLY);
- *   saved_errno = errno;
- *
- *   if (fd < 0)
- *     {
- *       g_set_error (error,
- *                    FOO_ERROR,                 // error domain
- *                    FOO_ERROR_BLAH,            // error code
- *                    "Failed to open file: %s", // error message format string
- *                    g_strerror (saved_errno));
- *       return -1;
- *     }
- *   else
- *     return fd;
- * }
- * ]|
- *
- * Things are somewhat more complicated if you yourself call another
- * function that can report a #GError. If the sub-function indicates
- * fatal errors in some way other than reporting a #GError, such as
- * by returning %TRUE on success, you can simply do the following:
- * |[<!-- language="C" -->
- * gboolean
- * my_function_that_can_fail (GError **err)
- * {
- *   g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
- *
- *   if (!sub_function_that_can_fail (err))
- *     {
- *       // assert that error was set by the sub-function
- *       g_assert (err == NULL || *err != NULL);
- *       return FALSE;
- *     }
- *
- *   // otherwise continue, no error occurred
- *   g_assert (err == NULL || *err == NULL);
- * }
- * ]|
- *
- * If the sub-function does not indicate errors other than by
- * reporting a #GError (or if its return value does not reliably indicate
- * errors) you need to create a temporary #GError
- * since the passed-in one may be %NULL. g_propagate_error() is
- * intended for use in this case.
- * |[<!-- language="C" -->
- * gboolean
- * my_function_that_can_fail (GError **err)
- * {
- *   GError *tmp_error;
- *
- *   g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
- *
- *   tmp_error = NULL;
- *   sub_function_that_can_fail (&tmp_error);
- *
- *   if (tmp_error != NULL)
- *     {
- *       // store tmp_error in err, if err != NULL,
- *       // otherwise call g_error_free() on tmp_error
- *       g_propagate_error (err, tmp_error);
- *       return FALSE;
- *     }
- *
- *   // otherwise continue, no error occurred
- * }
- * ]|
- *
- * Error pileups are always a bug. For example, this code is incorrect:
- * |[<!-- language="C" -->
- * gboolean
- * my_function_that_can_fail (GError **err)
- * {
- *   GError *tmp_error;
- *
- *   g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
- *
- *   tmp_error = NULL;
- *   sub_function_that_can_fail (&tmp_error);
- *   other_function_that_can_fail (&tmp_error);
- *
- *   if (tmp_error != NULL)
- *     {
- *       g_propagate_error (err, tmp_error);
- *       return FALSE;
- *     }
- * }
- * ]|
- * @tmp_error should be checked immediately after sub_function_that_can_fail(),
- * and either cleared or propagated upward. The rule is: after each error,
- * you must either handle the error, or return it to the calling function.
- *
- * Note that passing %NULL for the error location is the equivalent
- * of handling an error by always doing nothing about it. So the
- * following code is fine, assuming errors in sub_function_that_can_fail()
- * are not fatal to my_function_that_can_fail():
- * |[<!-- language="C" -->
- * gboolean
- * my_function_that_can_fail (GError **err)
- * {
- *   GError *tmp_error;
- *
- *   g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
- *
- *   sub_function_that_can_fail (NULL); // ignore errors
- *
- *   tmp_error = NULL;
- *   other_function_that_can_fail (&tmp_error);
- *
- *   if (tmp_error != NULL)
- *     {
- *       g_propagate_error (err, tmp_error);
- *       return FALSE;
- *     }
- * }
- * ]|
- *
- * Note that passing %NULL for the error location ignores errors;
- * it's equivalent to
- * `try { sub_function_that_can_fail (); } catch (...) {}`
- * in C++. It does not mean to leave errors unhandled; it means
- * to handle them by doing nothing.
- *
- * Error domains and codes are conventionally named as follows:
- *
- * - The error domain is called <NAMESPACE>_<MODULE>_ERROR,
- *   for example %G_SPAWN_ERROR or %G_THREAD_ERROR:
- *   |[<!-- language="C" -->
- *   #define G_SPAWN_ERROR g_spawn_error_quark ()
- *
- *   G_DEFINE_QUARK (g-spawn-error-quark, g_spawn_error)
- *   ]|
- *
- * - The quark function for the error domain is called
- *   <namespace>_<module>_error_quark,
- *   for example g_spawn_error_quark() or g_thread_error_quark().
- *
- * - The error codes are in an enumeration called
- *   <Namespace><Module>Error;
- *   for example, #GThreadError or #GSpawnError.
- *
- * - Members of the error code enumeration are called
- *   <NAMESPACE>_<MODULE>_ERROR_<CODE>,
- *   for example %G_SPAWN_ERROR_FORK or %G_THREAD_ERROR_AGAIN.
- *
- * - If there's a "generic" or "unknown" error code for unrecoverable
- *   errors it doesn't make sense to distinguish with specific codes,
- *   it should be called <NAMESPACE>_<MODULE>_ERROR_FAILED,
- *   for example %G_SPAWN_ERROR_FAILED. In the case of error code
- *   enumerations that may be extended in future releases, you should
- *   generally not handle this error code explicitly, but should
- *   instead treat any unrecognized error code as equivalent to
- *   FAILED.
- *
- * ## Comparison of #GError and traditional error handling # {#gerror-comparison}
- *
- * #GError has several advantages over traditional numeric error codes:
- * importantly, tools like
- * [gobject-introspection](https://developer.gnome.org/gi/stable/) understand
- * #GErrors and convert them to exceptions in bindings; the message includes
- * more information than just a code; and use of a domain helps prevent
- * misinterpretation of error codes.
- *
- * #GError has disadvantages though: it requires a memory allocation, and
- * formatting the error message string has a performance overhead. This makes it
- * unsuitable for use in retry loops where errors are a common case, rather than
- * being unusual. For example, using %G_IO_ERROR_WOULD_BLOCK means hitting these
- * overheads in the normal control flow. String formatting overhead can be
- * eliminated by using g_set_error_literal() in some cases.
- *
- * These performance issues can be compounded if a function wraps the #GErrors
- * returned by the functions it calls: this multiplies the number of allocations
- * and string formatting operations. This can be partially mitigated by using
- * g_prefix_error().
- *
- * ## Rules for use of #GError # {#gerror-rules}
- *
- * Summary of rules for use of #GError:
- *
- * - Do not report programming errors via #GError.
- *
- * - The last argument of a function that returns an error should
- *   be a location where a #GError can be placed (i.e. `GError **error`).
- *   If #GError is used with varargs, the `GError**` should be the last
- *   argument before the `...`.
- *
- * - The caller may pass %NULL for the `GError**` if they are not interested
- *   in details of the exact error that occurred.
- *
- * - If %NULL is passed for the `GError**` argument, then errors should
- *   not be returned to the caller, but your function should still
- *   abort and return if an error occurs. That is, control flow should
- *   not be affected by whether the caller wants to get a #GError.
- *
- * - If a #GError is reported, then your function by definition had a
- *   fatal failure and did not complete whatever it was supposed to do.
- *   If the failure was not fatal, then you handled it and you should not
- *   report it. If it was fatal, then you must report it and discontinue
- *   whatever you were doing immediately.
- *
- * - If a #GError is reported, out parameters are not guaranteed to
- *   be set to any defined value.
- *
- * - A `GError*` must be initialized to %NULL before passing its address
- *   to a function that can report errors.
- *
- * - #GError structs must not be stack-allocated.
- *
- * - "Piling up" errors is always a bug. That is, if you assign a
- *   new #GError to a `GError*` that is non-%NULL, thus overwriting
- *   the previous error, it indicates that you should have aborted
- *   the operation instead of continuing. If you were able to continue,
- *   you should have cleared the previous error with g_clear_error().
- *   g_set_error() will complain if you pile up errors.
- *
- * - By convention, if you return a boolean value indicating success
- *   then %TRUE means success and %FALSE means failure. Avoid creating
- *   functions which have a boolean return value and a #GError parameter,
- *   but where the boolean does something other than signal whether the
- *   #GError is set.  Among other problems, it requires C callers to allocate
- *   a temporary error.  Instead, provide a `gboolean *` out parameter.
- *   There are functions in GLib itself such as g_key_file_has_key() that
- *   are hard to use because of this. If %FALSE is returned, the error must
- *   be set to a non-%NULL value.  One exception to this is that in situations
- *   that are already considered to be undefined behaviour (such as when a
- *   g_return_val_if_fail() check fails), the error need not be set.
- *   Instead of checking separately whether the error is set, callers
- *   should ensure that they do not provoke undefined behaviour, then
- *   assume that the error will be set on failure.
- *
- * - A %NULL return value is also frequently used to mean that an error
- *   occurred. You should make clear in your documentation whether %NULL
- *   is a valid return value in non-error cases; if %NULL is a valid value,
- *   then users must check whether an error was returned to see if the
- *   function succeeded.
- *
- * - When implementing a function that can report errors, you may want
- *   to add a check at the top of your function that the error return
- *   location is either %NULL or contains a %NULL error (e.g.
- *   `g_return_if_fail (error == NULL || *error == NULL);`).
- *
- * ## Extended #GError Domains # {#gerror-extended-domains}
- *
- * Since GLib 2.68 it is possible to extend the #GError type. This is
- * done with the G_DEFINE_EXTENDED_ERROR() macro. To create an
- * extended #GError type do something like this in the header file:
- * |[<!-- language="C" -->
- * typedef enum
- * {
- *   MY_ERROR_BAD_REQUEST,
- * } MyError;
- * #define MY_ERROR (my_error_quark ())
- * GQuark my_error_quark (void);
- * int
- * my_error_get_parse_error_id (GError *error);
- * const char *
- * my_error_get_bad_request_details (GError *error);
- * ]|
- * and in implementation:
- * |[<!-- language="C" -->
- * typedef struct
- * {
- *   int parse_error_id;
- *   char *bad_request_details;
- * } MyErrorPrivate;
- *
- * static void
- * my_error_private_init (MyErrorPrivate *priv)
- * {
- *   priv->parse_error_id = -1;
- *   // No need to set priv->bad_request_details to NULL,
- *   // the struct is initialized with zeros.
- * }
- *
- * static void
- * my_error_private_copy (const MyErrorPrivate *src_priv, MyErrorPrivate *dest_priv)
- * {
- *   dest_priv->parse_error_id = src_priv->parse_error_id;
- *   dest_priv->bad_request_details = g_strdup (src_priv->bad_request_details);
- * }
- *
- * static void
- * my_error_private_clear (MyErrorPrivate *priv)
- * {
- *   g_free (priv->bad_request_details);
- * }
- *
- * // This defines the my_error_get_private and my_error_quark functions.
- * G_DEFINE_EXTENDED_ERROR (MyError, my_error)
- *
- * int
- * my_error_get_parse_error_id (GError *error)
- * {
- *   MyErrorPrivate *priv = my_error_get_private (error);
- *   g_return_val_if_fail (priv != NULL, -1);
- *   return priv->parse_error_id;
- * }
- *
- * const char *
- * my_error_get_bad_request_details (GError *error)
- * {
- *   MyErrorPrivate *priv = my_error_get_private (error);
- *   g_return_val_if_fail (priv != NULL, NULL);
- *   g_return_val_if_fail (error->code != MY_ERROR_BAD_REQUEST, NULL);
- *   return priv->bad_request_details;
- * }
- *
- * static void
- * my_error_set_bad_request (GError     **error,
- *                           const char  *reason,
- *                           int          error_id,
- *                           const char  *details)
- * {
- *   MyErrorPrivate *priv;
- *   g_set_error (error, MY_ERROR, MY_ERROR_BAD_REQUEST, "Invalid request: %s", reason);
- *   if (error != NULL && *error != NULL)
- *     {
- *       priv = my_error_get_private (error);
- *       g_return_val_if_fail (priv != NULL, NULL);
- *       priv->parse_error_id = error_id;
- *       priv->bad_request_details = g_strdup (details);
- *     }
- * }
- * ]|
- * An example of use of the error could be:
- * |[<!-- language="C" -->
- * gboolean
- * send_request (GBytes *request, GError **error)
- * {
- *   ParseFailedStatus *failure = validate_request (request);
- *   if (failure != NULL)
- *     {
- *       my_error_set_bad_request (error, failure->reason, failure->error_id, failure->details);
- *       parse_failed_status_free (failure);
- *       return FALSE;
- *     }
- *
- *   return send_one (request, error);
- * }
- * ]|
- *
- * Please note that if you are a library author and your library
- * exposes an existing error domain, then you can't make this error
- * domain an extended one without breaking ABI. This is because
- * earlier it was possible to create an error with this error domain
- * on the stack and then copy it with g_error_copy(). If the new
- * version of your library makes the error domain an extended one,
- * then g_error_copy() called by code that allocated the error on the
- * stack will try to copy more data than it used to, which will lead
- * to undefined behavior. You must not stack-allocate errors with an
- * extended error domain, and it is bad practice to stack-allocate any
- * other #GErrors.
- *
- * Extended error domains in unloadable plugins/modules are not
- * supported.
- */
-
 #include "config.h"
 
 #include "gvalgrind.h"
@@ -581,9 +106,9 @@ error_domain_register (GQuark            error_quark,
  * g_error_domain_register_static:
  * @error_type_name: static string to create a #GQuark from
  * @error_type_private_size: size of the private error data in bytes
- * @error_type_init: function initializing fields of the private error data
- * @error_type_copy: function copying fields of the private error data
- * @error_type_clear: function freeing fields of the private error data
+ * @error_type_init: (scope forever): function initializing fields of the private error data
+ * @error_type_copy: (scope forever): function copying fields of the private error data
+ * @error_type_clear: (scope forever): function freeing fields of the private error data
  *
  * This function registers an extended #GError domain.
  *
@@ -634,9 +159,9 @@ g_error_domain_register_static (const char        *error_type_name,
  * g_error_domain_register:
  * @error_type_name: string to create a #GQuark from
  * @error_type_private_size: size of the private error data in bytes
- * @error_type_init: function initializing fields of the private error data
- * @error_type_copy: function copying fields of the private error data
- * @error_type_clear: function freeing fields of the private error data
+ * @error_type_init: (scope forever): function initializing fields of the private error data
+ * @error_type_copy: (scope forever): function copying fields of the private error data
+ * @error_type_clear: (scope forever): function freeing fields of the private error data
  *
  * This function registers an extended #GError domain.
  * @error_type_name will be duplicated. Otherwise does the same as
@@ -1112,7 +637,7 @@ g_prefix_error (GError      **err,
 
 /**
  * g_prefix_error_literal:
- * @err: (allow-none): a return location for a #GError, or %NULL
+ * @err: (inout) (nullable) (optional): a return location for a #GError, or %NULL
  * @prefix: string to prefix @err with
  *
  * Prefixes @prefix to an existing error message. If @err or *@err is
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gfileutils.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gfileutils.c
index 9250e87b50a..2c4ff05cf6e 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gfileutils.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gfileutils.c
@@ -59,43 +59,6 @@
 #include "glibintl.h"
 
 
-/**
- * SECTION:fileutils
- * @title: File Utilities
- * @short_description: various file-related functions
- *
- * Do not use these APIs unless you are porting a POSIX application to Windows.
- * A more high-level file access API is provided as GIO - see the documentation
- * for #GFile.
- *
- * There is a group of functions which wrap the common POSIX functions
- * dealing with filenames (g_open(), g_rename(), g_mkdir(), g_stat(),
- * g_unlink(), g_remove(), g_fopen(), g_freopen()). The point of these
- * wrappers is to make it possible to handle file names with any Unicode
- * characters in them on Windows without having to use ifdefs and the
- * wide character API in the application code.
- *
- * On some Unix systems, these APIs may be defined as identical to their POSIX
- * counterparts. For this reason, you must check for and include the necessary
- * header files (such as `fcntl.h`) before using functions like g_creat(). You
- * must also define the relevant feature test macros.
- *
- * The pathname argument should be in the GLib file name encoding.
- * On POSIX this is the actual on-disk encoding which might correspond
- * to the locale settings of the process (or the `G_FILENAME_ENCODING`
- * environment variable), or not.
- *
- * On Windows the GLib file name encoding is UTF-8. Note that the
- * Microsoft C library does not use UTF-8, but has separate APIs for
- * current system code page and wide characters (UTF-16). The GLib
- * wrappers call the wide character API if present (on modern Windows
- * systems), otherwise convert to/from the system code page.
- *
- * Another group of functions allows to open and read directories
- * in the GLib file name encoding. These are g_dir_open(),
- * g_dir_read_name(), g_dir_rewind(), g_dir_close().
- */
-
 /**
  * GFileError:
  * @G_FILE_ERROR_EXIST: Operation not permitted; only the owner of
@@ -759,14 +722,19 @@ get_contents_stdio (const gchar  *filename,
 
           if (tmp == NULL)
             {
+              char *display_size = g_format_size_full (total_allocated, G_FORMAT_SIZE_LONG_FORMAT);
               display_filename = g_filename_display_name (filename);
               g_set_error (error,
                            G_FILE_ERROR,
                            G_FILE_ERROR_NOMEM,
-                           g_dngettext (GETTEXT_PACKAGE, "Could not allocate %lu byte to read file '%s'", "Could not allocate %lu bytes to read file '%s'", (gulong)total_allocated),
-                           (gulong) total_allocated,
-         display_filename);
+                           /* Translators: the first %s contains the file size
+                            * (already formatted with units), and the second %s
+                            * contains the file name */
+                           _("Could not allocate %s to read file '%s'"),
+                           display_size,
+                           display_filename);
               g_free (display_filename);
+              g_free (display_size);
 
               goto error;
             }
@@ -844,6 +812,18 @@ get_contents_regfile (const gchar  *filename,
   gsize alloc_size;
   gchar *display_filename;
 
+  if ((G_MAXOFFSET >= G_MAXSIZE) && (stat_buf->st_size > (goffset) (G_MAXSIZE - 1)))
+    {
+      display_filename = g_filename_display_name (filename);
+      g_set_error (error,
+                   G_FILE_ERROR,
+                   G_FILE_ERROR_FAILED,
+                   _("File '%s' is too large"),
+                   display_filename);
+      g_free (display_filename);
+      goto error;
+    }
+
   size = stat_buf->st_size;
 
   alloc_size = size + 1;
@@ -851,14 +831,19 @@ get_contents_regfile (const gchar  *filename,
 
   if (buf == NULL)
     {
+      char *display_size = g_format_size_full (alloc_size, G_FORMAT_SIZE_LONG_FORMAT);
       display_filename = g_filename_display_name (filename);
       g_set_error (error,
                    G_FILE_ERROR,
                    G_FILE_ERROR_NOMEM,
-                           g_dngettext (GETTEXT_PACKAGE, "Could not allocate %lu byte to read file '%s'", "Could not allocate %lu bytes to read file '%s'", (gulong)alloc_size),
-                   (gulong) alloc_size,
-       display_filename);
+                   /* Translators: the first %s contains the file size
+                    * (already formatted with units), and the second %s
+                    * contains the file name */
+                   _("Could not allocate %s to read file '%s'"),
+                   display_size,
+                   display_filename);
       g_free (display_filename);
+      g_free (display_size);
       goto error;
     }
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/ggettext.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/ggettext.c
index e1edf575099..d10c365e592 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/ggettext.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/ggettext.c
@@ -468,6 +468,57 @@ g_dngettext (const gchar *domain,
 }
 
 
+
+/**
+ * SECTION:i18n
+ * @title: Internationalization
+ * @short_description: gettext support macros
+ * @see_also: the gettext manual
+ *
+ * GLib doesn't force any particular localization method upon its users.
+ * But since GLib itself is localized using the gettext() mechanism, it seems
+ * natural to offer the de-facto standard gettext() support macros in an
+ * easy-to-use form.
+ *
+ * In order to use these macros in an application, you must include
+ * `<glib/gi18n.h>`. For use in a library, you must include
+ * `<glib/gi18n-lib.h>`
+ * after defining the %GETTEXT_PACKAGE macro suitably for your library:
+ * |[<!-- language="C" -->
+ * #define GETTEXT_PACKAGE "gtk20"
+ * #include <glib/gi18n-lib.h>
+ * ]|
+ * For an application, note that you also have to call bindtextdomain(),
+ * bind_textdomain_codeset(), textdomain() and setlocale() early on in your
+ * main() to make gettext() work. For example:
+ * |[<!-- language="C" -->
+ * #include <glib/gi18n.h>
+ * #include <locale.h>
+ *
+ * int
+ * main (int argc, char **argv)
+ * {
+ *   setlocale (LC_ALL, "");
+ *   bindtextdomain (GETTEXT_PACKAGE, DATADIR "/locale");
+ *   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ *   textdomain (GETTEXT_PACKAGE);
+ *
+ *   // Rest of your application.
+ * }
+ * ]|
+ * where `DATADIR` is as typically provided by automake or Meson.
+ *
+ * For a library, you only have to call bindtextdomain() and
+ * bind_textdomain_codeset() in your initialization function. If your library
+ * doesn't have an initialization function, you can call the functions before
+ * the first translated message.
+ *
+ * The
+ * [gettext manual](http://www.gnu.org/software/gettext/manual/gettext.html#Maintainers)
+ * covers details of how to integrate gettext into a project’s build system and
+ * workflow.
+ */
+
 /**
  * SECTION:i18n
  * @title: Internationalization
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/ghash.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/ghash.c
index 0e3d9fd4173..100aaa437cb 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/ghash.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/ghash.c
@@ -63,65 +63,6 @@
 #pragma GCC diagnostic ignored "-Wduplicated-branches"
 #endif
 
-/**
- * SECTION:hash_tables
- * @title: Hash Tables
- * @short_description: associations between keys and values so that
- *     given a key the value can be found quickly
- *
- * A #GHashTable provides associations between keys and values which is
- * optimized so that given a key, the associated value can be found,
- * inserted or removed in amortized O(1). All operations going through
- * each element take O(n) time (list all keys/values, table resize, etc.).
- *
- * Note that neither keys nor values are copied when inserted into the
- * #GHashTable, so they must exist for the lifetime of the #GHashTable.
- * This means that the use of static strings is OK, but temporary
- * strings (i.e. those created in buffers and those returned by GTK
- * widgets) should be copied with g_strdup() before being inserted.
- *
- * If keys or values are dynamically allocated, you must be careful to
- * ensure that they are freed when they are removed from the
- * #GHashTable, and also when they are overwritten by new insertions
- * into the #GHashTable. It is also not advisable to mix static strings
- * and dynamically-allocated strings in a #GHashTable, because it then
- * becomes difficult to determine whether the string should be freed.
- *
- * To create a #GHashTable, use g_hash_table_new().
- *
- * To insert a key and value into a #GHashTable, use
- * g_hash_table_insert().
- *
- * To look up a value corresponding to a given key, use
- * g_hash_table_lookup() and g_hash_table_lookup_extended().
- *
- * g_hash_table_lookup_extended() can also be used to simply
- * check if a key is present in the hash table.
- *
- * To remove a key and value, use g_hash_table_remove().
- *
- * To call a function for each key and value pair use
- * g_hash_table_foreach() or use an iterator to iterate over the
- * key/value pairs in the hash table, see #GHashTableIter. The iteration order
- * of a hash table is not defined, and you must not rely on iterating over
- * keys/values in the same order as they were inserted.
- *
- * To destroy a #GHashTable use g_hash_table_destroy().
- *
- * A common use-case for hash tables is to store information about a
- * set of keys, without associating any particular value with each
- * key. GHashTable optimizes one way of doing so: If you store only
- * key-value pairs where key == value, then GHashTable does not
- * allocate memory to store the values, which can be a considerable
- * space saving, if your set is large. The functions
- * g_hash_table_add() and g_hash_table_contains() are designed to be
- * used when using #GHashTable this way.
- *
- * #GHashTable is not designed to be statically initialised with keys and
- * values known at compile time. To build a static hash table, use a tool such
- * as [gperf](https://www.gnu.org/software/gperf/).
- */
-
 /**
  * GHashTable:
  *
@@ -1029,7 +970,7 @@ g_hash_table_ensure_keyval_fits (GHashTable *hash_table, gpointer key, gpointer
  * as its first parameter, and the user-provided key to check against as
  * its second.
  *
- * Returns: a new #GHashTable
+ * Returns: (transfer full): a new #GHashTable
  */
 GHashTable *
 g_hash_table_new (GHashFunc  hash_func,
@@ -1062,7 +1003,7 @@ g_hash_table_new (GHashFunc  hash_func,
  * calling g_hash_table_remove_all() before releasing the last reference using
  * g_hash_table_unref().
  *
- * Returns: a new #GHashTable
+ * Returns: (transfer full): a new #GHashTable
  */
 GHashTable *
 g_hash_table_new_full (GHashFunc      hash_func,
@@ -1165,7 +1106,7 @@ g_hash_table_iter_init (GHashTableIter *iter,
 /**
  * g_hash_table_iter_next:
  * @iter: an initialized #GHashTableIter
- * @key: (out) (optional): a location to store the key
+ * @key: (out) (optional) (nullable): a location to store the key
  * @value: (out) (optional) (nullable): a location to store the value
  *
  * Advances @iter and retrieves the key and/or value that are now
@@ -1218,7 +1159,7 @@ g_hash_table_iter_next (GHashTableIter *iter,
  *
  * Returns the #GHashTable associated with @iter.
  *
- * Returns: the #GHashTable associated with @iter.
+ * Returns: (transfer none): the #GHashTable associated with @iter.
  *
  * Since: 2.16
  */
@@ -1462,7 +1403,7 @@ g_hash_table_iter_steal (GHashTableIter *iter)
  * Atomically increments the reference count of @hash_table by one.
  * This function is MT-safe and may be called from any thread.
  *
- * Returns: the passed in #GHashTable
+ * Returns: (transfer full): the passed in #GHashTable
  *
  * Since: 2.10
  */
@@ -1478,7 +1419,7 @@ g_hash_table_ref (GHashTable *hash_table)
 
 /**
  * g_hash_table_unref:
- * @hash_table: a valid #GHashTable
+ * @hash_table: (transfer full): a valid #GHashTable
  *
  * Atomically decrements the reference count of @hash_table by one.
  * If the reference count drops to 0, all keys and values will be
@@ -2083,7 +2024,7 @@ g_hash_table_foreach_remove_or_steal (GHashTable *hash_table,
 /**
  * g_hash_table_foreach_remove:
  * @hash_table: a #GHashTable
- * @func: the function to call for each key/value pair
+ * @func: (scope call): the function to call for each key/value pair
  * @user_data: user data to pass to the function
  *
  * Calls the given function for each key/value pair in the
@@ -2111,7 +2052,7 @@ g_hash_table_foreach_remove (GHashTable *hash_table,
 /**
  * g_hash_table_foreach_steal:
  * @hash_table: a #GHashTable
- * @func: the function to call for each key/value pair
+ * @func: (scope call): the function to call for each key/value pair
  * @user_data: user data to pass to the function
  *
  * Calls the given function for each key/value pair in the
@@ -2138,7 +2079,7 @@ g_hash_table_foreach_steal (GHashTable *hash_table,
 /**
  * g_hash_table_foreach:
  * @hash_table: a #GHashTable
- * @func: the function to call for each key/value pair
+ * @func: (scope call): the function to call for each key/value pair
  * @user_data: user data to pass to the function
  *
  * Calls the given function for each of the key/value pairs in the
@@ -2189,7 +2130,7 @@ g_hash_table_foreach (GHashTable *hash_table,
 /**
  * g_hash_table_find:
  * @hash_table: a #GHashTable
- * @predicate: function to test the key/value pairs for a certain property
+ * @predicate: (scope call): function to test the key/value pairs for a certain property
  * @user_data: user data to pass to the function
  *
  * Calls the given function for key/value pairs in the #GHashTable
@@ -2616,6 +2557,50 @@ g_int_hash (gconstpointer v)
   return *(const gint*) v;
 }
 
+/**
+ * g_uint_equal:
+ * @v1: (not nullable): a pointer to a #guint key
+ * @v2: (not nullable): a pointer to a #guint key to compare with @v1
+ *
+ * Compares the two #guint values being pointed to and returns
+ * %TRUE if they are equal.
+ * It can be passed to g_hash_table_new() as the @key_equal_func
+ * parameter, when using non-%NULL pointers to integers as keys in a
+ * #GHashTable.
+ *
+ * Note that this function acts on pointers to #guint, not on #guint
+ * directly: if your hash table's keys are of the form
+ * `GUINT_TO_POINTER (n)`, use g_direct_equal() instead.
+ *
+ * Returns: %TRUE if the two keys match.
+ */
+gboolean
+g_uint_equal (gconstpointer v1,
+              gconstpointer v2)
+{
+  return *((const guint *) v1) == *((const guint *) v2);
+}
+
+/**
+ * g_uint_hash:
+ * @v: (not nullable): a pointer to a #guint key
+ *
+ * Converts a pointer to a #guint to a hash value.
+ * It can be passed to g_hash_table_new() as the @hash_func parameter,
+ * when using non-%NULL pointers to integer values as keys in a #GHashTable.
+ *
+ * Note that this function acts on pointers to #guint, not on #guint
+ * directly: if your hash table's keys are of the form
+ * `GUINT_TO_POINTER (n)`, use g_direct_hash() instead.
+ *
+ * Returns: a hash value corresponding to the key.
+ */
+guint
+g_uint_hash (gconstpointer v)
+{
+  return *(const guint *) v;
+}
+
 /**
  * g_int64_equal:
  * @v1: (not nullable): a pointer to a #gint64 key
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/ghmac.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/ghmac.c
index 7ad28d6f085..97e2fff9099 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/ghmac.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/ghmac.c
@@ -37,9 +37,7 @@
 
 
 /**
- * SECTION:hmac
- * @title: Secure HMAC Digests
- * @short_description: computes the HMAC for data
+ * GHmac:
  *
  * HMACs should be used when producing a cookie or hash based on data
  * and a key. Simple mechanisms for using SHA1 and other algorithms to
@@ -53,6 +51,11 @@
  *
  * Support for HMAC Digests has been added in GLib 2.30, and support for SHA-512
  * in GLib 2.42. Support for SHA-384 was added in GLib 2.52.
+ *
+ * To create a new `GHmac`, use [ctor@GLib.Hmac.new]. To free a `GHmac`, use
+ * [method@GLib.Hmac.unref].
+ *
+ * Since: 2.30
  */
 
 struct _GHmac
@@ -64,7 +67,7 @@ struct _GHmac
 };
 
 /**
- * g_hmac_new:
+ * g_hmac_new: (constructor)
  * @digest_type: the desired type of digest
  * @key: (array length=key_len): the key for the HMAC
  * @key_len: the length of the keys
@@ -86,7 +89,7 @@ struct _GHmac
  * Support for digests of type %G_CHECKSUM_SHA512 has been added in GLib 2.42.
  * Support for %G_CHECKSUM_SHA384 was added in GLib 2.52.
  *
- * Returns: the newly created #GHmac, or %NULL.
+ * Returns: (nullable) (transfer full): the newly created #GHmac, or %NULL.
  *   Use g_hmac_unref() to free the memory allocated by it.
  *
  * Since: 2.30
@@ -177,7 +180,7 @@ g_hmac_new (GChecksumType  digest_type,
  * g_hmac_get_string() or g_hmac_get_digest(), the copied
  * HMAC will be closed as well.
  *
- * Returns: the copy of the passed #GHmac. Use g_hmac_unref()
+ * Returns: (transfer full): the copy of the passed #GHmac. Use g_hmac_unref()
  *   when finished using it.
  *
  * Since: 2.30
@@ -206,7 +209,7 @@ g_hmac_copy (const GHmac *hmac)
  *
  * This function is MT-safe and may be called from any thread.
  *
- * Returns: the passed in #GHmac.
+ * Returns: (transfer full): the passed in #GHmac.
  *
  * Since: 2.30
  **/
@@ -222,7 +225,7 @@ g_hmac_ref (GHmac *hmac)
 
 /**
  * g_hmac_unref:
- * @hmac: a #GHmac
+ * @hmac: (transfer full): a #GHmac
  *
  * Atomically decrements the reference count of @hmac by one.
  *
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/ghmac.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/ghmac.h
index 346b45136e4..79380b6bb0b 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/ghmac.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/ghmac.h
@@ -30,15 +30,6 @@
 
 G_BEGIN_DECLS
 
-/**
- * GHmac:
- *
- * An opaque structure representing a HMAC operation.
- * To create a new GHmac, use g_hmac_new(). To free
- * a GHmac, use g_hmac_unref().
- *
- * Since: 2.30
- */
 typedef struct _GHmac       GHmac;
 
 GLIB_AVAILABLE_IN_2_30
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/ghook.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/ghook.c
index 8e8972f0238..02e0535cbbc 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/ghook.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/ghook.c
@@ -38,16 +38,6 @@
 #include "gtestutils.h"
 #include "gslice.h"
 
-/**
- * SECTION:hooks
- * @title: Hook Functions
- * @short_description: support for manipulating lists of hook functions
- *
- * The #GHookList, #GHook and their related functions provide support for
- * lists of hook functions. Functions can be added and removed from the lists,
- * and the list of hook functions can be invoked.
- */
-
 /**
  * GHookList:
  * @seq_id: the next free #GHook id
@@ -597,7 +587,7 @@ g_hook_list_invoke_check (GHookList *hook_list,
  * @may_recurse: %TRUE if hooks which are currently running
  *     (e.g. in another thread) are considered valid. If set to %FALSE,
  *     these are skipped
- * @marshaller: the function to call for each #GHook
+ * @marshaller: (scope call): the function to call for each #GHook
  * @marshal_data: data to pass to @marshaller
  *
  * Calls a function on each valid #GHook and destroys it if the
@@ -647,7 +637,7 @@ g_hook_list_marshal_check (GHookList         *hook_list,
  * @may_recurse: %TRUE if hooks which are currently running
  *     (e.g. in another thread) are considered valid. If set to %FALSE,
  *     these are skipped
- * @marshaller: the function to call for each #GHook
+ * @marshaller: (scope call): the function to call for each #GHook
  * @marshal_data: data to pass to @marshaller
  *
  * Calls a function on each valid #GHook.
@@ -805,7 +795,7 @@ g_hook_get (GHookList *hook_list,
  * @hook_list: a #GHookList
  * @need_valids: %TRUE if #GHook elements which have been destroyed
  *     should be skipped
- * @func: the function to call for each #GHook, which should return
+ * @func: (scope call): the function to call for each #GHook, which should return
  *     %TRUE when the #GHook has been found
  * @data: the data to pass to @func
  *
@@ -982,7 +972,7 @@ g_hook_find_func_data (GHookList *hook_list,
  * g_hook_insert_sorted:
  * @hook_list: a #GHookList
  * @hook: the #GHook to insert
- * @func: the comparison function used to sort the #GHook elements
+ * @func: (scope call): the comparison function used to sort the #GHook elements
  *
  * Inserts a #GHook into a #GHookList, sorted by the given function.
  */
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/ghostutils.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/ghostutils.c
index 736a730b4f0..a779075b09c 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/ghostutils.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/ghostutils.c
@@ -59,6 +59,24 @@
  * ".org" maps to "xn--4wa8awb4637h.org".)
  **/
 
+/**
+ * SECTION:ghostutils
+ * @short_description: Internet hostname utilities
+ *
+ * Functions for manipulating internet hostnames; in particular, for
+ * converting between Unicode and ASCII-encoded forms of
+ * Internationalized Domain Names (IDNs).
+ *
+ * The
+ * [Internationalized Domain Names for Applications (IDNA)](http://www.ietf.org/rfc/rfc3490.txt)
+ * standards allow for the use
+ * of Unicode domain names in applications, while providing
+ * backward-compatibility with the old ASCII-only DNS, by defining an
+ * ASCII-Compatible Encoding of any given Unicode name, which can be
+ * used with non-IDN-aware applications and protocols. (For example,
+ * "Παν語.org" maps to "xn--4wa8awb4637h.org".)
+ **/
+
 #define IDNA_ACE_PREFIX     "xn--"
 #define IDNA_ACE_PREFIX_LEN 4
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/giochannel.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/giochannel.c
index 6b46df2e334..01db791f1a2 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/giochannel.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/giochannel.c
@@ -44,55 +44,44 @@
 
 
 /**
- * SECTION:iochannels
- * @title: IO Channels
- * @short_description: portable support for using files, pipes and sockets
- * @see_also: g_io_add_watch(), g_io_add_watch_full(), g_source_remove(),
- *     #GMainLoop
+ * GIOChannel:
  *
- * The #GIOChannel data type aims to provide a portable method for
+ * The `GIOChannel` data type aims to provide a portable method for
  * using file descriptors, pipes, and sockets, and integrating them
- * into the [main event loop][glib-The-Main-Event-Loop]. Currently,
- * full support is available on UNIX platforms, support for Windows
+ * into the main event loop (see [struct@GLib.MainContext]). Currently,
+ * full support is available on UNIX platforms; support for Windows
  * is only partially complete.
  *
- * To create a new #GIOChannel on UNIX systems use
- * g_io_channel_unix_new(). This works for plain file descriptors,
+ * To create a new `GIOChannel` on UNIX systems use
+ * [ctor@GLib.IOChannel.unix_new]. This works for plain file descriptors,
  * pipes and sockets. Alternatively, a channel can be created for a
- * file in a system independent manner using g_io_channel_new_file().
+ * file in a system independent manner using [ctor@GLib.IOChannel.new_file].
  *
- * Once a #GIOChannel has been created, it can be used in a generic
- * manner with the functions g_io_channel_read_chars(),
- * g_io_channel_write_chars(), g_io_channel_seek_position(), and
- * g_io_channel_shutdown().
+ * Once a `GIOChannel` has been created, it can be used in a generic
+ * manner with the functions [method@GLib.IOChannel.read_chars],
+ * [method@GLib.IOChannel.write_chars], [method@GLib.IOChannel.seek_position],
+ * and [method@GLib.IOChannel.shutdown].
  *
- * To add a #GIOChannel to the [main event loop][glib-The-Main-Event-Loop],
- * use g_io_add_watch() or g_io_add_watch_full(). Here you specify which
- * events you are interested in on the #GIOChannel, and provide a
- * function to be called whenever these events occur.
+ * To add a `GIOChannel` to the main event loop, use [func@GLib.io_add_watch] or
+ * [func@GLib.io_add_watch_full]. Here you specify which events you are
+ * interested in on the `GIOChannel`, and provide a function to be called
+ * whenever these events occur.
  *
- * #GIOChannel instances are created with an initial reference count of 1.
- * g_io_channel_ref() and g_io_channel_unref() can be used to
+ * `GIOChannel` instances are created with an initial reference count of 1.
+ * [method@GLib.IOChannel.ref] and [method@GLib.IOChannel.unref] can be used to
  * increment or decrement the reference count respectively. When the
- * reference count falls to 0, the #GIOChannel is freed. (Though it
- * isn't closed automatically, unless it was created using
- * g_io_channel_new_file().) Using g_io_add_watch() or
- * g_io_add_watch_full() increments a channel's reference count.
- *
- * The new functions g_io_channel_read_chars(),
- * g_io_channel_read_line(), g_io_channel_read_line_string(),
- * g_io_channel_read_to_end(), g_io_channel_write_chars(),
- * g_io_channel_seek_position(), and g_io_channel_flush() should not be
- * mixed with the deprecated functions g_io_channel_read(),
- * g_io_channel_write(), and g_io_channel_seek() on the same channel.
- **/
-
-/**
- * GIOChannel:
- *
- * A data structure representing an IO Channel. The fields should be
- * considered private and should only be accessed with the following
- * functions.
+ * reference count falls to 0, the `GIOChannel` is freed. (Though it
+ * isn’t closed automatically, unless it was created using
+ * [ctor@GLib.IOChannel.new_file].) Using [func@GLib.io_add_watch] or
+ * [func@GLib.io_add_watch_full] increments a channel’s reference count.
+ *
+ * The new functions [method@GLib.IOChannel.read_chars],
+ * [method@GLib.IOChannel.read_line], [method@GLib.IOChannel.read_line_string],
+ * [method@GLib.IOChannel.read_to_end], [method@GLib.IOChannel.write_chars],
+ * [method@GLib.IOChannel.seek_position], and [method@GLib.IOChannel.flush]
+ * should not be mixed with the deprecated functions
+ * [method@GLib.IOChannel.read], [method@GLib.IOChannel.write], and
+ * [method@GLib.IOChannel.seek] on the same channel.
  **/
 
 /**
@@ -105,7 +94,7 @@
  *            various functions such as g_io_channel_write_chars() to
  *            write raw bytes to the channel.  Encoding and buffering
  *            issues are dealt with at a higher level.
- * @io_seek: (optional) seeks the channel.  This is called from
+ * @io_seek: (optional): seeks the channel.  This is called from
  *           g_io_channel_seek() on channels that support it.
  * @io_close: closes the channel.  This is called from
  *            g_io_channel_close() after flushing the buffers.
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/giowin32.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/giowin32.c
index dc5a00d0622..e0bfc746580 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/giowin32.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/giowin32.c
@@ -1661,7 +1661,7 @@ g_io_channel_new_file (const gchar  *filename,
             mode_num |= MODE_PLUS;
             break;
           }
-        /* Fall through */
+        G_GNUC_FALLTHROUGH;
       default:
         g_warning ("Invalid GIOFileMode %s.", mode);
         return NULL;
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gkeyfile.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gkeyfile.c
index 56710987767..247f5caf7e6 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gkeyfile.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gkeyfile.c
@@ -74,23 +74,22 @@
 
 
 /**
- * SECTION:gkeyfile
- * @title: Key-value file parser
- * @short_description: parses .ini-like config files
+ * GKeyFile:
+ *
+ * `GKeyFile` parses .ini-like config files.
  *
- * #GKeyFile lets you parse, edit or create files containing groups of
+ * `GKeyFile` lets you parse, edit or create files containing groups of
  * key-value pairs, which we call "key files" for lack of a better name.
  * Several freedesktop.org specifications use key files now, e.g the
  * [Desktop Entry Specification](http://freedesktop.org/Standards/desktop-entry-spec)
- * and the
- * [Icon Theme Specification](http://freedesktop.org/Standards/icon-theme-spec).
+ * and the [Icon Theme Specification](http://freedesktop.org/Standards/icon-theme-spec).
  *
  * The syntax of key files is described in detail in the
  * [Desktop Entry Specification](http://freedesktop.org/Standards/desktop-entry-spec),
- * here is a quick summary: Key files
- * consists of groups of key-value pairs, interspersed with comments.
+ * here is a quick summary: Key files consists of groups of key-value pairs, interspersed
+ * with comments.
  *
- * |[
+ * ```txt
  * # this is just an example
  * # there can be comments before the first group
  *
@@ -103,14 +102,13 @@
  * Welcome[de]=Hallo
  * Welcome[fr_FR]=Bonjour
  * Welcome[it]=Ciao
- * Welcome[be@latin]=Hello
  *
  * [Another Group]
  *
  * Numbers=2;20;-200;0
  *
  * Booleans=true;false;true;true
- * ]|
+ * ```
  *
  * Lines beginning with a '#' and blank lines are considered comments.
  *
@@ -118,15 +116,13 @@
  * in '[' and ']', and ended implicitly by the start of the next group or
  * the end of the file. Each key-value pair must be contained in a group.
  *
- * Key-value pairs generally have the form `key=value`, with the
- * exception of localized strings, which have the form
- * `key[locale]=value`, with a locale identifier of the
- * form `lang_COUNTRY@MODIFIER` where `COUNTRY` and `MODIFIER`
- * are optional.
- * Space before and after the '=' character are ignored. Newline, tab,
- * carriage return and backslash characters in value are escaped as \n,
- * \t, \r, and \\\\, respectively. To preserve leading spaces in values,
- * these can also be escaped as \s.
+ * Key-value pairs generally have the form `key=value`, with the exception
+ * of localized strings, which have the form `key[locale]=value`, with a
+ * locale identifier of the form `lang_COUNTRY@MODIFIER` where `COUNTRY`
+ * and `MODIFIER` are optional. Space before and after the '=' character
+ * are ignored. Newline, tab, carriage return and backslash characters in
+ * value are escaped as `\n`, `\t`, `\r`, and `\\\\`, respectively. To preserve
+ * leading spaces in values, these can also be escaped as `\s`.
  *
  * Key files can store strings (possibly with localized variants), integers,
  * booleans and lists of these. Lists are separated by a separator character,
@@ -153,15 +149,14 @@
  *
  * Note that in contrast to the
  * [Desktop Entry Specification](http://freedesktop.org/Standards/desktop-entry-spec),
- * groups in key files may contain the same
- * key multiple times; the last entry wins. Key files may also contain
- * multiple groups with the same name; they are merged together.
- * Another difference is that keys and group names in key files are not
+ * groups in key files may contain the same key multiple times; the last entry wins.
+ * Key files may also contain multiple groups with the same name; they are merged
+ * together. Another difference is that keys and group names in key files are not
  * restricted to ASCII characters.
  *
  * Here is an example of loading a key file and reading a value:
  *
- * |[<!-- language="C" -->
+ * ```c
  * g_autoptr(GError) error = NULL;
  * g_autoptr(GKeyFile) key_file = g_key_file_new ();
  *
@@ -184,11 +179,11 @@
  *     // Fall back to a default value.
  *     val = g_strdup ("default-value");
  *   }
- * ]|
+ * ```
  *
  * Here is an example of creating and saving a key file:
  *
- * |[<!-- language="C" -->
+ * ```c
  * g_autoptr(GKeyFile) key_file = g_key_file_new ();
  * const gchar *val = ...;
  * g_autoptr(GError) error = NULL;
@@ -211,7 +206,7 @@
  *     return;
  *   }
  * g_autoptr(GBytes) bytes = g_bytes_new_take (g_steal_pointer (&data), data_len);
- * ]|
+ * ```
  */
 
 /**
@@ -499,12 +494,6 @@
 
 typedef struct _GKeyFileGroup GKeyFileGroup;
 
-/**
- * GKeyFile:
- *
- * The GKeyFile struct contains only private data
- * and should not be accessed directly.
- */
 struct _GKeyFile
 {
   GList *groups;
@@ -4431,7 +4420,6 @@ g_key_file_parse_value_as_string (GKeyFile     *key_file,
               break;
 
       case '\0':
-        g_clear_error (error);
         g_set_error_literal (error, G_KEY_FILE_ERROR,
                                    G_KEY_FILE_ERROR_INVALID_VALUE,
                                    _("Key file contains escape character "
@@ -4454,25 +4442,11 @@ g_key_file_parse_value_as_string (GKeyFile     *key_file,
                       sequence[1] = *p;
                       sequence[2] = '\0';
 
-                      /* FIXME: This should be a fatal error, but there was a
-                       * bug which prevented that being reported for a long
-                       * time, so a lot of applications and in-the-field key
-                       * files use invalid escape sequences without anticipating
-                       * problems. For now (GLib 2.78), message about it; in
-                       * future, the behaviour may become fatal again.
-                       *
-                       * The previous behaviour was to set the #GError but not
-                       * return failure from the function, so the caller could
-                       * explicitly check for invalid escapes, but also ignore
-                       * the error if they want. This is not how #GError is
-                       * meant to be used, but the #GKeyFile code is very old.
-                       *
-                       * See https://gitlab.gnome.org/GNOME/glib/-/issues/3098 */
-                      g_clear_error (error);
                       g_set_error (error, G_KEY_FILE_ERROR,
                                    G_KEY_FILE_ERROR_INVALID_VALUE,
                                    _("Key file contains invalid escape "
                                    "sequence '%s'"), sequence);
+                      goto error;
                     }
                 }
               break;
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/glib-autocleanups.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/glib-autocleanups.h
index 2c6f6a71ba1..7c03473b26f 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/glib-autocleanups.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/glib-autocleanups.h
@@ -23,6 +23,8 @@
 #error "Only <glib.h> can be included directly."
 #endif
 
+#ifndef __GI_SCANNER__
+
 static inline void
 g_autoptr_cleanup_generic_gfree (void *p)
 {
@@ -113,3 +115,5 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (GPathBuf, g_path_buf_free)
 G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC (GPathBuf, g_path_buf_clear)
 
 G_GNUC_END_IGNORE_DEPRECATIONS
+
+#endif /* __GI_SCANNER__ */
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/glib-init.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/glib-init.c
index a1c10d9fb98..38f4ed28649 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/glib-init.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/glib-init.c
@@ -26,6 +26,7 @@
 #include "gtypes.h"
 #include "gutils.h"     /* for GDebugKey */
 #include "gconstructor.h"
+#include "gconstructorprivate.h"
 #include "gmem.h"       /* for g_mem_gc_friendly */
 
 #include <string.h>
@@ -452,32 +453,60 @@ DllMain (HINSTANCE hinstDLL,
   return TRUE;
 }
 
-#elif defined(G_HAS_CONSTRUCTORS) /* && G_PLATFORM_WIN32 && GLIB_STATIC_COMPILATION */
-#ifdef G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA
-#pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(glib_init_ctor)
+#else
+
+#ifndef G_HAS_CONSTRUCTORS
+#error static compilation on Windows requires constructor support
 #endif
-#ifdef G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA
-#pragma G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(glib_init_dtor)
+
+#ifdef G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA
+#pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(glib_priv_constructor)
 #endif
 
-G_DEFINE_CONSTRUCTOR (glib_init_ctor)
+static gboolean tls_callback_invoked;
+
+G_DEFINE_CONSTRUCTOR (glib_priv_constructor)
 
 static void
-glib_init_ctor (void)
+glib_priv_constructor (void)
 {
   glib_win32_init ();
+
+  if (!tls_callback_invoked)
+    g_critical ("TLS callback not invoked");
 }
 
-G_DEFINE_DESTRUCTOR (glib_init_dtor)
+#ifndef G_HAS_TLS_CALLBACKS
+#error static compilation on Windows requires TLS callbacks support
+#endif
+
+G_DEFINE_TLS_CALLBACK (glib_priv_tls_callback)
 
-static void
-glib_init_dtor (void)
+static void NTAPI
+glib_priv_tls_callback (LPVOID hinstance,
+                        DWORD  reason,
+                        LPVOID reserved)
 {
-  glib_win32_deinit (FALSE);
+  switch (reason)
+    {
+    case DLL_PROCESS_ATTACH:
+      glib_dll = hinstance;
+      tls_callback_invoked = TRUE;
+      break;
+    case DLL_THREAD_DETACH:
+#ifdef THREADS_WIN32
+      g_thread_win32_thread_detach ();
+#endif
+      break;
+    case DLL_PROCESS_DETACH:
+      glib_win32_deinit (reserved == NULL);
+      break;
+
+    default:
+      break;
+    }
 }
 
-#else /* G_PLATFORM_WIN32 && GLIB_STATIC_COMPILATION && !G_HAS_CONSTRUCTORS */
-#error Your platform/compiler is missing constructor support
 #endif /* GLIB_STATIC_COMPILATION */
 
 #elif defined(G_HAS_CONSTRUCTORS) /* && !G_PLATFORM_WIN32 */
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/glib-private.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/glib-private.c
index b38a51c9f2f..09edd5ebda9 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/glib-private.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/glib-private.c
@@ -23,6 +23,8 @@
 
 #include "glib-private.h"
 #include "glib-init.h"
+#include "gutilsprivate.h"
+#include "gdatasetprivate.h"
 
 #ifdef USE_INVALID_PARAMETER_HANDLER
 #include <crtdbg.h>
@@ -35,10 +37,10 @@
  * Do not call this function; it is used to share private
  * API between glib, gobject, and gio.
  */
-GLibPrivateVTable *
+const GLibPrivateVTable *
 glib__private__ (void)
 {
-  static GLibPrivateVTable table = {
+  static const GLibPrivateVTable table = {
     g_wakeup_new,
     g_wakeup_free,
     g_wakeup_get_pollfd,
@@ -71,6 +73,10 @@ glib__private__ (void)
     g_find_program_for_path,
 
     g_uri_get_default_scheme_port,
+
+    g_set_prgname_once,
+
+    g_datalist_id_update_atomic,
   };
 
   return &table;
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/glib-private.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/glib-private.h
index f49e38f7b69..c24b59d6f00 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/glib-private.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/glib-private.h
@@ -23,6 +23,7 @@
 #include <glib.h>
 #include "gwakeup.h"
 #include "gstdioprivate.h"
+#include "gdatasetprivate.h"
 
 /* gcc defines __SANITIZE_ADDRESS__, clang sets the address_sanitizer
  * feature flag.
@@ -37,13 +38,62 @@
 /*
  * %_GLIB_ADDRESS_SANITIZER:
  *
- * Private macro defined if the AddressSanitizer is in use.
+ * Private macro defined if the AddressSanitizer is in use by GLib itself.
  */
 #define _GLIB_ADDRESS_SANITIZER
 
 #include <sanitizer/lsan_interface.h>
 
+/* If GLib itself is not compiled with ASAN sanitizer we may still want to
+ * control it in case it's linked by the loading application, so we need to
+ * do this check dynamically.
+ * However MinGW doesn't support weak attribute properly (even if it advertises
+ * it), so we ignore it in such case since it's not convenient to go through
+ * dlsym().
+ * Under MSVC we could use alternatename, but it doesn't seem to be as reliable
+ * as we'd like: https://stackoverflow.com/a/11529277/210151 and
+ * https://devblogs.microsoft.com/oldnewthing/20200731-00/?p=104024
+ */
+#elif defined (G_OS_UNIX) && !defined (__APPLE__) && g_macro__has_attribute (weak)
+
+#define HAS_DYNAMIC_ASAN_LOADING
+
+void __lsan_enable (void) __attribute__ ((weak));
+void __lsan_disable (void) __attribute__ ((weak));
+void __lsan_ignore_object (const void *p) __attribute__ ((weak));
+
+#endif
+
+/**
+ * G_CONTAINER_OF:
+ * @ptr: a pointer to a member @field of type @type.
+ * @type: the type of the container in which @field is embedded.
+ * @field: the name of the field in @type.
+ *
+ * Casts away constness of @ptr.
+ *
+ * Returns: a pointer to the container, so that "&(@container)->field == (@ptr)" holds.
+ */
+#define G_CONTAINER_OF(ptr, type, field) ((type *) G_STRUCT_MEMBER_P (ptr, -G_STRUCT_OFFSET (type, field)))
+
+/*
+ * g_leak_sanitizer_is_supported:
+ *
+ * Checks at runtime if LeakSanitizer is currently supported by the running
+ * binary. This may imply that GLib itself is not compiled with sanitizer
+ * but that the loading program is.
+ */
+static inline gboolean
+g_leak_sanitizer_is_supported (void)
+{
+#if defined (_GLIB_ADDRESS_SANITIZER)
+  return TRUE;
+#elif defined (HAS_DYNAMIC_ASAN_LOADING)
+  return __lsan_enable != NULL && __lsan_ignore_object != NULL;
+#else
+  return FALSE;
 #endif
+}
 
 /*
  * g_ignore_leak:
@@ -57,9 +107,12 @@
 static inline void
 g_ignore_leak (gconstpointer p)
 {
-#ifdef _GLIB_ADDRESS_SANITIZER
+#if defined (_GLIB_ADDRESS_SANITIZER)
   if (p != NULL)
     __lsan_ignore_object (p);
+#elif defined (HAS_DYNAMIC_ASAN_LOADING)
+  if (p != NULL && __lsan_ignore_object != NULL)
+    __lsan_ignore_object (p);
 #endif
 }
 
@@ -73,9 +126,11 @@ g_ignore_leak (gconstpointer p)
 static inline void
 g_ignore_strv_leak (GStrv strv)
 {
-#ifdef _GLIB_ADDRESS_SANITIZER
   gchar **item;
 
+  if (!g_leak_sanitizer_is_supported ())
+    return;
+
   if (strv)
     {
       g_ignore_leak (strv);
@@ -83,7 +138,6 @@ g_ignore_strv_leak (GStrv strv)
       for (item = strv; *item != NULL; item++)
         g_ignore_leak (*item);
     }
-#endif
 }
 
 /*
@@ -98,8 +152,11 @@ g_ignore_strv_leak (GStrv strv)
 static inline void
 g_begin_ignore_leaks (void)
 {
-#ifdef _GLIB_ADDRESS_SANITIZER
+#if defined (_GLIB_ADDRESS_SANITIZER)
   __lsan_disable ();
+#elif defined (HAS_DYNAMIC_ASAN_LOADING)
+  if (__lsan_disable != NULL)
+    __lsan_disable ();
 #endif
 }
 
@@ -112,11 +169,16 @@ g_begin_ignore_leaks (void)
 static inline void
 g_end_ignore_leaks (void)
 {
-#ifdef _GLIB_ADDRESS_SANITIZER
+#if defined (_GLIB_ADDRESS_SANITIZER)
   __lsan_enable ();
+#elif defined (HAS_DYNAMIC_ASAN_LOADING)
+  if (__lsan_enable != NULL)
+    __lsan_enable ();
 #endif
 }
 
+#undef HAS_DYNAMIC_ASAN_LOADING
+
 GMainContext *          g_get_worker_context            (void);
 gboolean                g_check_setuid                  (void);
 GMainContext *          g_main_context_new_with_next_id (guint next_id);
@@ -227,11 +289,19 @@ typedef struct {
   /* See guri.c */
   int (* g_uri_get_default_scheme_port) (const char *scheme);
 
+  /* See gutils.c */
+  gboolean (* g_set_prgname_once) (const gchar *prgname);
+
+  gpointer (*g_datalist_id_update_atomic) (GData **datalist,
+                                           GQuark key_id,
+                                           GDataListUpdateAtomicFunc callback,
+                                           gpointer user_data);
+
   /* Add other private functions here, initialize them in glib-private.c */
 } GLibPrivateVTable;
 
 GLIB_AVAILABLE_IN_ALL
-GLibPrivateVTable *glib__private__ (void);
+const GLibPrivateVTable *glib__private__ (void);
 
 /* Please see following for the use of ".ACP" over ""
  * on Windows, although both are accepted at compile-time
@@ -254,4 +324,17 @@ GLibPrivateVTable *glib__private__ (void);
 # define GLIB_DEFAULT_LOCALE ""
 #endif
 
+gboolean g_uint_equal (gconstpointer v1, gconstpointer v2);
+guint g_uint_hash (gconstpointer v);
+
+#if defined(__GNUC__)
+#define G_THREAD_LOCAL __thread
+#else
+#undef G_THREAD_LOCAL
+#endif
+
+/* Convenience wrapper to call private g_datalist_id_update_atomic() function. */
+#define _g_datalist_id_update_atomic(datalist, key_id, callback, user_data) \
+  (GLIB_PRIVATE_CALL (g_datalist_id_update_atomic) ((datalist), (key_id), (callback), (user_data)))
+
 #endif /* __GLIB_PRIVATE_H__ */
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/glib-unix.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/glib-unix.c
index df5726cf01d..7cb76dd331d 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/glib-unix.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/glib-unix.c
@@ -1,5 +1,20 @@
 /* GLIB - Library of useful routines for C programming
- * Copyright (C) 2011 Red Hat, Inc.
+ * Copyright 2000-2022 Red Hat, Inc.
+ * Copyright 2006-2007 Matthias Clasen
+ * Copyright 2006 Padraig O'Briain
+ * Copyright 2007 Lennart Poettering
+ * Copyright 2018-2022 Endless OS Foundation, LLC
+ * Copyright 2018 Peter Wu
+ * Copyright 2019 Ting-Wei Lan
+ * Copyright 2019 Sebastian Schwarz
+ * Copyright 2020 Matt Rose
+ * Copyright 2021 Casper Dik
+ * Copyright 2022 Alexander Richardson
+ * Copyright 2022 Ray Strode
+ * Copyright 2022 Thomas Haller
+ * Copyright 2023-2024 Collabora Ltd.
+ * Copyright 2023 Sebastian Wilhelmi
+ * Copyright 2023 CaiJingLong
  *
  * glib-unix.c: UNIX specific API wrappers and convenience functions
  *
@@ -27,9 +42,27 @@
 #include "glib-unixprivate.h"
 #include "gmain-internal.h"
 
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>   /* for fdwalk */
 #include <string.h>
 #include <sys/types.h>
 #include <pwd.h>
+#include <unistd.h>
+
+#if defined(__linux__) || defined(__DragonFly__)
+#include <sys/syscall.h>  /* for syscall and SYS_getdents64 */
+#endif
+
+#ifdef HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
+#endif /* HAVE_SYS_RESOURCE_H */
+
+#if defined(__APPLE__) && defined(HAVE_LIBPROC_H)
+#include <libproc.h>
+#include <sys/proc_info.h>
+#endif
 
 G_STATIC_ASSERT (sizeof (ssize_t) == GLIB_SIZEOF_SSIZE_T);
 G_STATIC_ASSERT (G_ALIGNOF (gssize) == G_ALIGNOF (ssize_t));
@@ -43,21 +76,6 @@ G_STATIC_ASSERT (G_ALIGNOF (GPid) == G_ALIGNOF (pid_t));
  * might not be true everywhere. */
 G_STATIC_ASSERT (O_NONBLOCK != FD_CLOEXEC);
 
-/**
- * SECTION:gunix
- * @title: UNIX-specific utilities and integration
- * @short_description: pipes, signal handling
- * @include: glib-unix.h
- *
- * Most of GLib is intended to be portable; in contrast, this set of
- * functions is designed for programs which explicitly target UNIX,
- * or are using it to build higher level abstractions which would be
- * conditionally compiled if the platform matches %G_OS_UNIX.
- *
- * To use these functions, you must explicitly include the
- * "glib-unix.h" header.
- */
-
 G_DEFINE_QUARK (g-unix-error-quark, g_unix_error)
 
 static gboolean
@@ -87,6 +105,9 @@ g_unix_set_error_from_errno (GError **error,
  * you wanted to configure `O_NONBLOCK` then that had to be done separately with
  * `fcntl()`.
  *
+ * Since GLib 2.80, the constants %G_UNIX_PIPE_END_READ and
+ * %G_UNIX_PIPE_END_WRITE can be used as mnemonic indexes in @fds.
+ *
  * It is a programmer error to call this function with unsupported flags, and a
  * critical warning will be raised.
  *
@@ -518,3 +539,388 @@ g_unix_get_passwd_entry (const gchar  *user_name,
 
   return (struct passwd *) g_steal_pointer (&buffer);
 }
+
+/* This function is called between fork() and exec() and hence must be
+ * async-signal-safe (see signal-safety(7)). */
+static int
+set_cloexec (void *data, gint fd)
+{
+  if (fd >= GPOINTER_TO_INT (data))
+    fcntl (fd, F_SETFD, FD_CLOEXEC);
+
+  return 0;
+}
+
+/* fdwalk()-compatible callback to close a fd for non-compliant
+ * implementations of fdwalk() that potentially pass already
+ * closed fds.
+ *
+ * It is not an error to pass an invalid fd to this function.
+ *
+ * This function is called between fork() and exec() and hence must be
+ * async-signal-safe (see signal-safety(7)).
+ */
+G_GNUC_UNUSED static int
+close_func_with_invalid_fds (void *data, int fd)
+{
+  /* We use close and not g_close here because on some platforms, we
+   * don't know how to close only valid, open file descriptors, so we
+   * have to pass bad fds to close too. g_close warns if given a bad
+   * fd.
+   *
+   * This function returns no error, because there is nothing that the caller
+   * could do with that information. That is even the case for EINTR. See
+   * g_close() about the specialty of EINTR and why that is correct.
+   * If g_close() ever gets extended to handle EINTR specially, then this place
+   * should get updated to do the same handling.
+   */
+  if (fd >= GPOINTER_TO_INT (data))
+    close (fd);
+
+  return 0;
+}
+
+#ifdef __linux__
+struct linux_dirent64
+{
+  guint64        d_ino;    /* 64-bit inode number */
+  guint64        d_off;    /* 64-bit offset to next structure */
+  unsigned short d_reclen; /* Size of this dirent */
+  unsigned char  d_type;   /* File type */
+  char           d_name[]; /* Filename (null-terminated) */
+};
+
+/* This function is called between fork() and exec() and hence must be
+ * async-signal-safe (see signal-safety(7)). */
+static gint
+filename_to_fd (const char *p)
+{
+  char c;
+  int fd = 0;
+  const int cutoff = G_MAXINT / 10;
+  const int cutlim = G_MAXINT % 10;
+
+  if (*p == '\0')
+    return -1;
+
+  while ((c = *p++) != '\0')
+    {
+      if (c < '0' || c > '9')
+        return -1;
+      c -= '0';
+
+      /* Check for overflow. */
+      if (fd > cutoff || (fd == cutoff && c > cutlim))
+        return -1;
+
+      fd = fd * 10 + c;
+    }
+
+  return fd;
+}
+#endif
+
+static int safe_fdwalk_with_invalid_fds (int (*cb)(void *data, int fd), void *data);
+
+/* This function is called between fork() and exec() and hence must be
+ * async-signal-safe (see signal-safety(7)). */
+static int
+safe_fdwalk (int (*cb)(void *data, int fd), void *data)
+{
+#if 0
+  /* Use fdwalk function provided by the system if it is known to be
+   * async-signal safe.
+   *
+   * Currently there are no operating systems known to provide a safe
+   * implementation, so this section is not used for now.
+   */
+  return fdwalk (cb, data);
+#else
+  /* Fallback implementation of fdwalk. It should be async-signal safe, but it
+   * may fail on non-Linux operating systems. See safe_fdwalk_with_invalid_fds
+   * for a slower alternative.
+   */
+
+#ifdef __linux__
+  gint fd;
+  gint res = 0;
+
+  /* Avoid use of opendir/closedir since these are not async-signal-safe. */
+  int dir_fd = open ("/proc/self/fd", O_RDONLY | O_DIRECTORY);
+  if (dir_fd >= 0)
+    {
+      /* buf needs to be aligned correctly to receive linux_dirent64.
+       * C11 has _Alignof for this purpose, but for now a
+       * union serves the same purpose. */
+      union
+      {
+        char buf[4096];
+        struct linux_dirent64 alignment;
+      } u;
+      int pos, nread;
+      struct linux_dirent64 *de;
+
+      while ((nread = syscall (SYS_getdents64, dir_fd, u.buf, sizeof (u.buf))) > 0)
+        {
+          for (pos = 0; pos < nread; pos += de->d_reclen)
+            {
+              de = (struct linux_dirent64 *) (u.buf + pos);
+
+              fd = filename_to_fd (de->d_name);
+              if (fd < 0 || fd == dir_fd)
+                  continue;
+
+              if ((res = cb (data, fd)) != 0)
+                  break;
+            }
+        }
+
+      g_close (dir_fd, NULL);
+      return res;
+    }
+
+  /* If /proc is not mounted or not accessible we fail here and rely on
+   * safe_fdwalk_with_invalid_fds to fall back to the old
+   * rlimit trick. */
+
+#endif
+
+#if defined(__sun__) && defined(F_PREVFD) && defined(F_NEXTFD)
+/*
+ * Solaris 11.4 has a signal-safe way which allows
+ * us to find all file descriptors in a process.
+ *
+ * fcntl(fd, F_NEXTFD, maxfd)
+ * - returns the first allocated file descriptor <= maxfd  > fd.
+ *
+ * fcntl(fd, F_PREVFD)
+ * - return highest allocated file descriptor < fd.
+ */
+  gint fd;
+  gint res = 0;
+
+  open_max = fcntl (INT_MAX, F_PREVFD); /* find the maximum fd */
+  if (open_max < 0) /* No open files */
+    return 0;
+
+  for (fd = -1; (fd = fcntl (fd, F_NEXTFD, open_max)) != -1; )
+    if ((res = cb (data, fd)) != 0 || fd == open_max)
+      break;
+
+  return res;
+#endif
+
+  return safe_fdwalk_with_invalid_fds (cb, data);
+#endif
+}
+
+/* This function is called between fork() and exec() and hence must be
+ * async-signal-safe (see signal-safety(7)). */
+static int
+safe_fdwalk_with_invalid_fds (int (*cb)(void *data, int fd), void *data)
+{
+  /* Fallback implementation of fdwalk. It should be async-signal safe, but it
+   * may be slow, especially on systems allowing very high number of open file
+   * descriptors.
+   */
+  gint open_max = -1;
+  gint fd;
+  gint res = 0;
+
+#if 0 && defined(HAVE_SYS_RESOURCE_H)
+  struct rlimit rl;
+
+  /* Use getrlimit() function provided by the system if it is known to be
+   * async-signal safe.
+   *
+   * Currently there are no operating systems known to provide a safe
+   * implementation, so this section is not used for now.
+   */
+  if (getrlimit (RLIMIT_NOFILE, &rl) == 0 && rl.rlim_max != RLIM_INFINITY)
+    open_max = rl.rlim_max;
+#endif
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
+  /* Use sysconf() function provided by the system if it is known to be
+   * async-signal safe.
+   *
+   * FreeBSD: sysconf() is included in the list of async-signal safe functions
+   * found in https://man.freebsd.org/sigaction(2).
+   *
+   * OpenBSD: sysconf() is included in the list of async-signal safe functions
+   * found in https://man.openbsd.org/sigaction.2.
+   *
+   * Apple: sysconf() is included in the list of async-signal safe functions
+   * found in https://opensource.apple.com/source/xnu/xnu-517.12.7/bsd/man/man2/sigaction.2
+   */
+  if (open_max < 0)
+    open_max = sysconf (_SC_OPEN_MAX);
+#endif
+  /* Hardcoded fallback: the default process hard limit in Linux as of 2020 */
+  if (open_max < 0)
+    open_max = 4096;
+
+#if defined(__APPLE__) && defined(HAVE_LIBPROC_H)
+  /* proc_pidinfo isn't documented as async-signal-safe but looking at the implementation
+   * in the darwin tree here:
+   *
+   * https://opensource.apple.com/source/Libc/Libc-498/darwin/libproc.c.auto.html
+   *
+   * It's just a thin wrapper around a syscall, so it's probably okay.
+   */
+  {
+    char buffer[4096 * PROC_PIDLISTFD_SIZE];
+    ssize_t buffer_size;
+
+    buffer_size = proc_pidinfo (getpid (), PROC_PIDLISTFDS, 0, buffer, sizeof (buffer));
+
+    if (buffer_size > 0 &&
+        sizeof (buffer) >= (size_t) buffer_size &&
+        (buffer_size % PROC_PIDLISTFD_SIZE) == 0)
+      {
+        const struct proc_fdinfo *fd_info = (const struct proc_fdinfo *) buffer;
+        size_t number_of_fds = (size_t) buffer_size / PROC_PIDLISTFD_SIZE;
+
+        for (size_t i = 0; i < number_of_fds; i++)
+          if ((res = cb (data, fd_info[i].proc_fd)) != 0)
+            break;
+
+        return res;
+      }
+  }
+#endif
+
+  for (fd = 0; fd < open_max; fd++)
+      if ((res = cb (data, fd)) != 0)
+          break;
+
+  return res;
+}
+
+/**
+ * g_fdwalk_set_cloexec:
+ * @lowfd: Minimum fd to act on, which must be non-negative
+ *
+ * Mark every file descriptor equal to or greater than @lowfd to be closed
+ * at the next `execve()` or similar, as if via the `FD_CLOEXEC` flag.
+ *
+ * Typically @lowfd will be 3, to leave standard input, standard output
+ * and standard error open after exec.
+ *
+ * This is the same as Linux `close_range (lowfd, ~0U, CLOSE_RANGE_CLOEXEC)`,
+ * but portable to other OSs and to older versions of Linux.
+ *
+ * This function is async-signal safe, making it safe to call from a
+ * signal handler or a [callback@GLib.SpawnChildSetupFunc], as long as @lowfd is
+ * non-negative.
+ * See [`signal(7)`](man:signal(7)) and
+ * [`signal-safety(7)`](man:signal-safety(7)) for more details.
+ *
+ * Returns: 0 on success, -1 with errno set on error
+ * Since: 2.80
+ */
+int
+g_fdwalk_set_cloexec (int lowfd)
+{
+  int ret;
+
+  g_return_val_if_fail (lowfd >= 0, (errno = EINVAL, -1));
+
+#if defined(HAVE_CLOSE_RANGE) && defined(CLOSE_RANGE_CLOEXEC)
+  /* close_range() is available in Linux since kernel 5.9, and on FreeBSD at
+   * around the same time. It was designed for use in async-signal-safe
+   * situations: https://bugs.python.org/issue38061
+   *
+   * The `CLOSE_RANGE_CLOEXEC` flag was added in Linux 5.11, and is not yet
+   * present in FreeBSD.
+   *
+   * Handle ENOSYS in case it’s supported in libc but not the kernel; if so,
+   * fall back to safe_fdwalk(). Handle EINVAL in case `CLOSE_RANGE_CLOEXEC`
+   * is not supported. */
+  ret = close_range (lowfd, G_MAXUINT, CLOSE_RANGE_CLOEXEC);
+  if (ret == 0 || !(errno == ENOSYS || errno == EINVAL))
+    return ret;
+#endif  /* HAVE_CLOSE_RANGE */
+
+  ret = safe_fdwalk (set_cloexec, GINT_TO_POINTER (lowfd));
+
+  return ret;
+}
+
+/**
+ * g_closefrom:
+ * @lowfd: Minimum fd to close, which must be non-negative
+ *
+ * Close every file descriptor equal to or greater than @lowfd.
+ *
+ * Typically @lowfd will be 3, to leave standard input, standard output
+ * and standard error open.
+ *
+ * This is the same as Linux `close_range (lowfd, ~0U, 0)`,
+ * but portable to other OSs and to older versions of Linux.
+ * Equivalently, it is the same as BSD `closefrom (lowfd)`, but portable,
+ * and async-signal-safe on all OSs.
+ *
+ * This function is async-signal safe, making it safe to call from a
+ * signal handler or a [callback@GLib.SpawnChildSetupFunc], as long as @lowfd is
+ * non-negative.
+ * See [`signal(7)`](man:signal(7)) and
+ * [`signal-safety(7)`](man:signal-safety(7)) for more details.
+ *
+ * Returns: 0 on success, -1 with errno set on error
+ * Since: 2.80
+ */
+int
+g_closefrom (int lowfd)
+{
+  int ret;
+
+  g_return_val_if_fail (lowfd >= 0, (errno = EINVAL, -1));
+
+#if defined(HAVE_CLOSE_RANGE)
+  /* close_range() is available in Linux since kernel 5.9, and on FreeBSD at
+   * around the same time. It was designed for use in async-signal-safe
+   * situations: https://bugs.python.org/issue38061
+   *
+   * Handle ENOSYS in case it’s supported in libc but not the kernel; if so,
+   * fall back to safe_fdwalk(). */
+  ret = close_range (lowfd, G_MAXUINT, 0);
+  if (ret == 0 || errno != ENOSYS)
+    return ret;
+#endif  /* HAVE_CLOSE_RANGE */
+
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || \
+  (defined(__sun__) && defined(F_CLOSEFROM))
+  /* Use closefrom function provided by the system if it is known to be
+   * async-signal safe.
+   *
+   * FreeBSD: closefrom is included in the list of async-signal safe functions
+   * found in https://man.freebsd.org/sigaction(2).
+   *
+   * OpenBSD: closefrom is not included in the list, but a direct system call
+   * should be safe to use.
+   *
+   * In Solaris as of 11.3 SRU 31, closefrom() is also a direct system call.
+   * On such systems, F_CLOSEFROM is defined.
+   */
+  (void) closefrom (lowfd);
+  return 0;
+#elif defined(__DragonFly__)
+  /* It is unclear whether closefrom function included in DragonFlyBSD libc_r
+   * is safe to use because it calls a lot of library functions. It is also
+   * unclear whether libc_r itself is still being used. Therefore, we do a
+   * direct system call here ourselves to avoid possible issues.
+   */
+  (void) syscall (SYS_closefrom, lowfd);
+  return 0;
+#elif defined(F_CLOSEM)
+  /* NetBSD and AIX have a special fcntl command which does the same thing as
+   * closefrom. NetBSD also includes closefrom function, which seems to be a
+   * simple wrapper of the fcntl command.
+   */
+  return fcntl (lowfd, F_CLOSEM);
+#else
+  ret = safe_fdwalk (close_func_with_invalid_fds, GINT_TO_POINTER (lowfd));
+
+  return ret;
+#endif
+}
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/glib-unix.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/glib-unix.h
index 7cf4f0dc83e..bccbea57890 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/glib-unix.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/glib-unix.h
@@ -1,5 +1,6 @@
 /* glib-unix.h - Unix specific integration
  * Copyright (C) 2011 Red Hat, Inc.
+ * Copyright 2023 Collabora Ltd.
  *
  * SPDX-License-Identifier: LGPL-2.1-or-later
  *
@@ -33,6 +34,7 @@
 #include <fcntl.h>
 
 #include <glib.h>
+#include <glib/gstdio.h>
 
 #ifndef G_OS_UNIX
 #error "This header may only be used on UNIX"
@@ -120,6 +122,218 @@ GLIB_AVAILABLE_IN_2_64
 struct passwd *g_unix_get_passwd_entry (const gchar  *user_name,
                                         GError      **error);
 
+/**
+ * GUnixPipe:
+ * @fds: A pair of file descriptors, each negative if closed or not yet opened.
+ *  The file descriptor with index %G_UNIX_PIPE_END_READ is readable.
+ *  The file descriptor with index %G_UNIX_PIPE_END_WRITE is writable.
+ *
+ * A Unix pipe. The advantage of this type over `int[2]` is that it can
+ * be closed automatically when it goes out of scope, using `g_auto(GUnixPipe)`,
+ * on compilers that support that feature.
+ *
+ * Since: 2.80
+ */
+GLIB_AVAILABLE_TYPE_IN_2_80
+typedef struct {
+  int fds[2];
+} GUnixPipe;
+
+/**
+ * GUnixPipeEnd:
+ * @G_UNIX_PIPE_END_READ: The readable file descriptor 0
+ * @G_UNIX_PIPE_END_WRITE: The writable file descriptor 1
+ *
+ * Mnemonic constants for the ends of a Unix pipe.
+ *
+ * Since: 2.80
+ */
+GLIB_AVAILABLE_TYPE_IN_2_80
+typedef enum
+{
+  G_UNIX_PIPE_END_READ = 0,
+  G_UNIX_PIPE_END_WRITE = 1
+} GUnixPipeEnd;
+
+/**
+ * G_UNIX_PIPE_INIT:
+ *
+ * Initializer for a #GUnixPipe that has not yet been opened.
+ * Both of its file descriptors are initialized to `-1` (invalid),
+ * the same as if they had been closed.
+ *
+ * Since: 2.80
+ */
+#define G_UNIX_PIPE_INIT { { -1, -1 } } GLIB_AVAILABLE_MACRO_IN_2_80
+
+/* Suppress "Not available before" warnings when declaring the
+ * implementations */
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
+/**
+ * g_unix_pipe_open:
+ * @self: A pair of file descriptors
+ * @flags: Flags to pass to g_unix_open_pipe(), typically `O_CLOEXEC`
+ * @error: Used to report an error on failure
+ *
+ * Open a pipe. This is the same as g_unix_open_pipe(), but uses the
+ * #GUnixPipe data structure.
+ *
+ * Returns: %TRUE on success
+ *
+ * Since: 2.80
+ */
+GLIB_AVAILABLE_STATIC_INLINE_IN_2_80
+static inline gboolean
+g_unix_pipe_open (GUnixPipe *self,
+                  int flags,
+                  GError **error)
+{
+  return g_unix_open_pipe (self->fds, flags, error);
+}
+
+/**
+ * g_unix_pipe_get:
+ * @self: A pair of file descriptors
+ * @end: One of the ends of the pipe
+ *
+ * Return one of the ends of the pipe. It remains owned by @self.
+ *
+ * This function is async-signal safe (see [`signal(7)`](man:signal(7)) and
+ * [`signal-safety(7)`](man:signal-safety(7))), making it safe to call from a
+ * signal handler or a #GSpawnChildSetupFunc.
+ *
+ * This function preserves the value of `errno`.
+ *
+ * Returns: a non-negative file descriptor owned by @self, which must not
+ *  be closed by the caller, or a negative number if the corresponding
+ *  end of the pipe was already closed or stolen
+ *
+ * Since: 2.80
+ */
+GLIB_AVAILABLE_STATIC_INLINE_IN_2_80
+static inline int
+g_unix_pipe_get (GUnixPipe *self,
+                 GUnixPipeEnd end)
+{
+  return self->fds[end];
+}
+
+/**
+ * g_unix_pipe_steal:
+ * @self: A pair of file descriptors
+ * @end: One of the ends of the pipe
+ *
+ * Return one of the ends of the pipe. It becomes owned by the caller,
+ * and the file descriptor in the data structure is set to `-1`,
+ * similar to g_steal_fd().
+ *
+ * This function is async-signal safe (see [`signal(7)`](man:signal(7)) and
+ * [`signal-safety(7)`](man:signal-safety(7))), making it safe to call from a
+ * signal handler or a #GSpawnChildSetupFunc.
+ *
+ * This function preserves the value of `errno`.
+ *
+ * Returns: a non-negative file descriptor, which becomes owned by the
+ *  caller and must be closed by the caller if required, or a negative
+ *  number if the corresponding end of the pipe was already closed or stolen
+ *
+ * Since: 2.80
+ */
+GLIB_AVAILABLE_STATIC_INLINE_IN_2_80
+static inline int
+g_unix_pipe_steal (GUnixPipe *self,
+                   GUnixPipeEnd end)
+{
+  return g_steal_fd (&self->fds[end]);
+}
+
+/**
+ * g_unix_pipe_close:
+ * @self: A pair of file descriptors
+ * @end: One of the ends of the pipe
+ * @error: Optionally used to report an error on failure
+ *
+ * Close one of the ends of the pipe and set the relevant member of @fds
+ * to `-1` before returning, equivalent to g_clear_fd().
+ *
+ * Like g_close(), if closing the file descriptor fails, the error is
+ * stored in both %errno and @error. If this function succeeds,
+ * %errno is undefined.
+ *
+ * This function is async-signal safe if @error is %NULL and the relevant
+ * member of @fds is either negative or a valid open file descriptor.
+ * This makes it safe to call from a signal handler or a #GSpawnChildSetupFunc
+ * under those conditions.
+ * See [`signal(7)`](man:signal(7)) and
+ * [`signal-safety(7)`](man:signal-safety(7)) for more details.
+ *
+ * To close both file descriptors and ignore any errors, use
+ * g_unix_pipe_clear() instead.
+ *
+ * Returns: %TRUE on success
+ *
+ * Since: 2.80
+ */
+GLIB_AVAILABLE_STATIC_INLINE_IN_2_80
+static inline gboolean
+g_unix_pipe_close (GUnixPipe *self,
+                   GUnixPipeEnd end,
+                   GError **error)
+{
+  return g_clear_fd (&self->fds[end], error);
+}
+
+/**
+ * g_unix_pipe_clear:
+ * @self: a #GUnixPipe
+ *
+ * Close both ends of the pipe, unless they have already been closed or
+ * stolen. Any errors are ignored: use g_unix_pipe_close() or g_clear_fd()
+ * if error-handling is required.
+ *
+ * This function is async-signal safe if @error is %NULL and each member
+ * of @fds are either negative or a valid open file descriptor.
+ * As a result, it is safe to call this function or use `g_auto(GUnixPipe)`
+ * (on compilers that support it) in a signal handler or a
+ * #GSpawnChildSetupFunc, as long as those conditions are ensured to be true.
+ * See [`signal(7)`](man:signal(7)) and
+ * [`signal-safety(7)`](man:signal-safety(7)) for more details.
+ *
+ * This function preserves the value of `errno`.
+ *
+ * Since: 2.80
+ */
+GLIB_AVAILABLE_STATIC_INLINE_IN_2_80
+static inline void
+g_unix_pipe_clear (GUnixPipe *self)
+{
+  /* Don't overwrite thread-local errno if closing the fd fails */
+  int errsv = errno;
+
+  if (!g_unix_pipe_close (self, G_UNIX_PIPE_END_READ, NULL))
+    {
+      /* ignore */
+    }
+
+  if (!g_unix_pipe_close (self, G_UNIX_PIPE_END_WRITE, NULL))
+    {
+      /* ignore */
+    }
+
+  errno = errsv;
+}
+
+G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC (GUnixPipe, g_unix_pipe_clear)
+
+GLIB_AVAILABLE_IN_2_80
+int g_closefrom (int lowfd);
+
+GLIB_AVAILABLE_IN_2_80
+int g_fdwalk_set_cloexec (int lowfd);
+
+G_GNUC_END_IGNORE_DEPRECATIONS
+
 G_END_DECLS
 
 #endif  /* __G_UNIX_H__ */
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/glib-visibility.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/glib-visibility.h
index 296c9abb5c8..c12fa05f528 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/glib-visibility.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/glib-visibility.h
@@ -950,3 +950,37 @@
 #define GLIB_AVAILABLE_ENUMERATOR_IN_2_78
 #define GLIB_AVAILABLE_TYPE_IN_2_78
 #endif
+
+#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_80
+#define GLIB_DEPRECATED_IN_2_80 GLIB_DEPRECATED
+#define GLIB_DEPRECATED_IN_2_80_FOR(f) GLIB_DEPRECATED_FOR (f)
+#define GLIB_DEPRECATED_MACRO_IN_2_80 GLIB_DEPRECATED_MACRO
+#define GLIB_DEPRECATED_MACRO_IN_2_80_FOR(f) GLIB_DEPRECATED_MACRO_FOR (f)
+#define GLIB_DEPRECATED_ENUMERATOR_IN_2_80 GLIB_DEPRECATED_ENUMERATOR
+#define GLIB_DEPRECATED_ENUMERATOR_IN_2_80_FOR(f) GLIB_DEPRECATED_ENUMERATOR_FOR (f)
+#define GLIB_DEPRECATED_TYPE_IN_2_80 GLIB_DEPRECATED_TYPE
+#define GLIB_DEPRECATED_TYPE_IN_2_80_FOR(f) GLIB_DEPRECATED_TYPE_FOR (f)
+#else
+#define GLIB_DEPRECATED_IN_2_80 _GLIB_EXTERN
+#define GLIB_DEPRECATED_IN_2_80_FOR(f) _GLIB_EXTERN
+#define GLIB_DEPRECATED_MACRO_IN_2_80
+#define GLIB_DEPRECATED_MACRO_IN_2_80_FOR(f)
+#define GLIB_DEPRECATED_ENUMERATOR_IN_2_80
+#define GLIB_DEPRECATED_ENUMERATOR_IN_2_80_FOR(f)
+#define GLIB_DEPRECATED_TYPE_IN_2_80
+#define GLIB_DEPRECATED_TYPE_IN_2_80_FOR(f)
+#endif
+
+#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_80
+#define GLIB_AVAILABLE_IN_2_80 GLIB_UNAVAILABLE (2, 80)
+#define GLIB_AVAILABLE_STATIC_INLINE_IN_2_80 GLIB_UNAVAILABLE_STATIC_INLINE (2, 80)
+#define GLIB_AVAILABLE_MACRO_IN_2_80 GLIB_UNAVAILABLE_MACRO (2, 80)
+#define GLIB_AVAILABLE_ENUMERATOR_IN_2_80 GLIB_UNAVAILABLE_ENUMERATOR (2, 80)
+#define GLIB_AVAILABLE_TYPE_IN_2_80 GLIB_UNAVAILABLE_TYPE (2, 80)
+#else
+#define GLIB_AVAILABLE_IN_2_80 _GLIB_EXTERN
+#define GLIB_AVAILABLE_STATIC_INLINE_IN_2_80
+#define GLIB_AVAILABLE_MACRO_IN_2_80
+#define GLIB_AVAILABLE_ENUMERATOR_IN_2_80
+#define GLIB_AVAILABLE_TYPE_IN_2_80
+#endif
\ No newline at end of file
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/glist.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/glist.c
index 03b3083871f..6ded8ebf94d 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/glist.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/glist.c
@@ -36,90 +36,6 @@
 
 #include "gtestutils.h"
 
-/**
- * SECTION:linked_lists_double
- * @title: Doubly-Linked Lists
- * @short_description: linked lists that can be iterated over in both directions
- *
- * The #GList structure and its associated functions provide a standard
- * doubly-linked list data structure. The benefit of this data-structure
- * is to provide insertion/deletion operations in O(1) complexity where
- * access/search operations are in O(n). The benefit of #GList over
- * #GSList (singly linked list) is that the worst case on access/search
- * operations is divided by two which comes at a cost in space as we need
- * to retain two pointers in place of one.
- *
- * Each element in the list contains a piece of data, together with
- * pointers which link to the previous and next elements in the list.
- * Using these pointers it is possible to move through the list in both
- * directions (unlike the singly-linked [GSList][glib-Singly-Linked-Lists],
- * which only allows movement through the list in the forward direction).
- *
- * The double linked list does not keep track of the number of items
- * and does not keep track of both the start and end of the list. If
- * you want fast access to both the start and the end of the list,
- * and/or the number of items in the list, use a
- * [GQueue][glib-Double-ended-Queues] instead.
- *
- * The data contained in each element can be either integer values, by
- * using one of the [Type Conversion Macros][glib-Type-Conversion-Macros],
- * or simply pointers to any type of data.
- *
- * List elements are allocated from the [slice allocator][glib-Memory-Slices],
- * which is more efficient than allocating elements individually.
- *
- * Note that most of the #GList functions expect to be passed a pointer
- * to the first element in the list. The functions which insert
- * elements return the new start of the list, which may have changed.
- *
- * There is no function to create a #GList. %NULL is considered to be
- * a valid, empty list so you simply set a #GList* to %NULL to initialize
- * it.
- *
- * To add elements, use g_list_append(), g_list_prepend(),
- * g_list_insert() and g_list_insert_sorted().
- *
- * To visit all elements in the list, use a loop over the list:
- * |[<!-- language="C" -->
- * GList *l;
- * for (l = list; l != NULL; l = l->next)
- *   {
- *     // do something with l->data
- *   }
- * ]|
- *
- * To call a function for each element in the list, use g_list_foreach().
- *
- * To loop over the list and modify it (e.g. remove a certain element)
- * a while loop is more appropriate, for example:
- * |[<!-- language="C" -->
- * GList *l = list;
- * while (l != NULL)
- *   {
- *     GList *next = l->next;
- *     if (should_be_removed (l))
- *       {
- *         // possibly free l->data
- *         list = g_list_delete_link (list, l);
- *       }
- *     l = next;
- *   }
- * ]|
- *
- * To remove elements, use g_list_remove().
- *
- * To navigate in a list, use g_list_first(), g_list_last(),
- * g_list_next(), g_list_previous().
- *
- * To find elements in the list use g_list_nth(), g_list_nth_data(),
- * g_list_find() and g_list_find_custom().
- *
- * To find the index of an element use g_list_position() and
- * g_list_index().
- *
- * To free the entire list, use g_list_free() or g_list_free_full().
- */
-
 /**
  * GList:
  * @data: holds the element's data, which can be a pointer to any kind
@@ -743,7 +659,7 @@ g_list_copy (GList *list)
 /**
  * g_list_copy_deep:
  * @list: a #GList, this must point to the top of the list
- * @func: a copy function used to copy every element in the list
+ * @func: (scope call): a copy function used to copy every element in the list
  * @user_data: user data passed to the copy function @func, or %NULL
  *
  * Makes a full (deep) copy of a #GList.
@@ -940,7 +856,7 @@ g_list_find (GList         *list,
  * g_list_find_custom:
  * @list: a #GList, this must point to the top of the list
  * @data: user data passed to the function
- * @func: the function to call for each element.
+ * @func: (scope call): the function to call for each element.
  *     It should return 0 when the desired element is found
  *
  * Finds an element in a #GList, using a supplied function to
@@ -1100,7 +1016,7 @@ g_list_length (GList *list)
 /**
  * g_list_foreach:
  * @list: a #GList, this must point to the top of the list
- * @func: the function to call with each element's data
+ * @func: (scope call): the function to call with each element's data
  * @user_data: user data to pass to the function
  *
  * Calls a function for each element of a #GList.
@@ -1186,7 +1102,7 @@ g_list_insert_sorted_real (GList    *list,
  * @list: a pointer to a #GList, this must point to the top of the
  *     already sorted list
  * @data: the data for the new element
- * @func: the function to compare elements in the list. It should
+ * @func: (scope call): the function to compare elements in the list. It should
  *     return a number > 0 if the first parameter comes after the
  *     second parameter in the sort order.
  *
@@ -1213,7 +1129,7 @@ g_list_insert_sorted (GList        *list,
  * @list: a pointer to a #GList, this must point to the top of the
  *     already sorted list
  * @data: the data for the new element
- * @func: the function to compare elements in the list. It should
+ * @func: (scope call): the function to compare elements in the list. It should
  *     return a number > 0 if the first parameter  comes after the
  *     second parameter in the sort order.
  * @user_data: user data to pass to comparison function
@@ -1308,7 +1224,7 @@ g_list_sort_real (GList    *list,
 /**
  * g_list_sort:
  * @list: a #GList, this must point to the top of the list
- * @compare_func: the comparison function used to sort the #GList.
+ * @compare_func: (scope call): the comparison function used to sort the #GList.
  *     This function is passed the data from 2 elements of the #GList
  *     and should return 0 if they are equal, a negative value if the
  *     first element comes before the second, or a positive value if
@@ -1342,7 +1258,7 @@ g_list_sort (GList        *list,
 /**
  * g_list_sort_with_data:
  * @list: a #GList, this must point to the top of the list
- * @compare_func: comparison function
+ * @compare_func: (scope call): comparison function
  * @user_data: user data to pass to comparison function
  *
  * Like g_list_sort(), but the comparison function accepts
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gmacros.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gmacros.h
index 9d7900870b8..2f2a1a619e6 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gmacros.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gmacros.h
@@ -185,6 +185,7 @@
 #define g_macro__has_attribute___pure__ G_GNUC_CHECK_VERSION (2, 96)
 #define g_macro__has_attribute___sentinel__ G_GNUC_CHECK_VERSION (4, 0)
 #define g_macro__has_attribute___unused__ G_GNUC_CHECK_VERSION (2, 4)
+#define g_macro__has_attribute___weak__ G_GNUC_CHECK_VERSION (2, 8)
 #define g_macro__has_attribute_cleanup G_GNUC_CHECK_VERSION (3, 3)
 #define g_macro__has_attribute_fallthrough G_GNUC_CHECK_VERSION (6, 0)
 #define g_macro__has_attribute_may_alias G_GNUC_CHECK_VERSION (3, 3)
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gmain.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gmain.c
index c523c71dc47..988e63362dc 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gmain.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gmain.c
@@ -127,134 +127,6 @@
 #include "glib-init.h"
 #include "glib-private.h"
 
-/**
- * SECTION:main
- * @title: The Main Event Loop
- * @short_description: manages all available sources of events
- *
- * The main event loop manages all the available sources of events for
- * GLib and GTK applications. These events can come from any number of
- * different types of sources such as file descriptors (plain files,
- * pipes or sockets) and timeouts. New types of event sources can also
- * be added using g_source_attach().
- *
- * To allow multiple independent sets of sources to be handled in
- * different threads, each source is associated with a #GMainContext.
- * A #GMainContext can only be running in a single thread, but
- * sources can be added to it and removed from it from other threads. All
- * functions which operate on a #GMainContext or a built-in #GSource are
- * thread-safe.
- *
- * Each event source is assigned a priority. The default priority,
- * %G_PRIORITY_DEFAULT, is 0. Values less than 0 denote higher priorities.
- * Values greater than 0 denote lower priorities. Events from high priority
- * sources are always processed before events from lower priority sources: if
- * several sources are ready to dispatch, the ones with equal-highest priority
- * will be dispatched on the current #GMainContext iteration, and the rest wait
- * until a subsequent #GMainContext iteration when they have the highest
- * priority of the sources which are ready for dispatch.
- *
- * Idle functions can also be added, and assigned a priority. These will
- * be run whenever no events with a higher priority are ready to be dispatched.
- *
- * The #GMainLoop data type represents a main event loop. A GMainLoop is
- * created with g_main_loop_new(). After adding the initial event sources,
- * g_main_loop_run() is called. This continuously checks for new events from
- * each of the event sources and dispatches them. Finally, the processing of
- * an event from one of the sources leads to a call to g_main_loop_quit() to
- * exit the main loop, and g_main_loop_run() returns.
- *
- * It is possible to create new instances of #GMainLoop recursively.
- * This is often used in GTK applications when showing modal dialog
- * boxes. Note that event sources are associated with a particular
- * #GMainContext, and will be checked and dispatched for all main
- * loops associated with that GMainContext.
- *
- * GTK contains wrappers of some of these functions, e.g. gtk_main(),
- * gtk_main_quit() and gtk_events_pending().
- *
- * ## Creating new source types
- *
- * One of the unusual features of the #GMainLoop functionality
- * is that new types of event source can be created and used in
- * addition to the builtin type of event source. A new event source
- * type is used for handling GDK events. A new source type is created
- * by "deriving" from the #GSource structure. The derived type of
- * source is represented by a structure that has the #GSource structure
- * as a first element, and other elements specific to the new source
- * type. To create an instance of the new source type, call
- * g_source_new() passing in the size of the derived structure and
- * a table of functions. These #GSourceFuncs determine the behavior of
- * the new source type.
- *
- * New source types basically interact with the main context
- * in two ways. Their prepare function in #GSourceFuncs can set a timeout
- * to determine the maximum amount of time that the main loop will sleep
- * before checking the source again. In addition, or as well, the source
- * can add file descriptors to the set that the main context checks using
- * g_source_add_poll().
- *
- * ## Customizing the main loop iteration
- *
- * Single iterations of a #GMainContext can be run with
- * g_main_context_iteration(). In some cases, more detailed control
- * of exactly how the details of the main loop work is desired, for
- * instance, when integrating the #GMainLoop with an external main loop.
- * In such cases, you can call the component functions of
- * g_main_context_iteration() directly. These functions are
- * g_main_context_prepare(), g_main_context_query(),
- * g_main_context_check() and g_main_context_dispatch().
- *
- * If the event loop thread releases #GMainContext ownership until the results
- * required by g_main_context_check() are ready you must create a context with
- * the flag %G_MAIN_CONTEXT_FLAGS_OWNERLESS_POLLING or else you'll lose
- * g_source_attach() notifications. This happens for instance when you integrate
- * the GLib event loop into implementations that follow the proactor pattern
- * (i.e. in these contexts the `poll()` implementation will reclaim the thread for
- * other tasks until the results are ready). One example of the proactor pattern
- * is the Boost.Asio library.
- *
- * ## State of a Main Context # {#mainloop-states}
- *
- * The operation of these functions can best be seen in terms
- * of a state diagram, as shown in this image.
- *
- * ![](mainloop-states.gif)
- *
- * On UNIX, the GLib mainloop is incompatible with fork(). Any program
- * using the mainloop must either exec() or exit() from the child
- * without returning to the mainloop.
- *
- * ## Memory management of sources # {#mainloop-memory-management}
- *
- * There are two options for memory management of the user data passed to a
- * #GSource to be passed to its callback on invocation. This data is provided
- * in calls to g_timeout_add(), g_timeout_add_full(), g_idle_add(), etc. and
- * more generally, using g_source_set_callback(). This data is typically an
- * object which 'owns' the timeout or idle callback, such as a widget or a
- * network protocol implementation. In many cases, it is an error for the
- * callback to be invoked after this owning object has been destroyed, as that
- * results in use of freed memory.
- *
- * The first, and preferred, option is to store the source ID returned by
- * functions such as g_timeout_add() or g_source_attach(), and explicitly
- * remove that source from the main context using g_source_remove() when the
- * owning object is finalized. This ensures that the callback can only be
- * invoked while the object is still alive.
- *
- * The second option is to hold a strong reference to the object in the
- * callback, and to release it in the callback's #GDestroyNotify. This ensures
- * that the object is kept alive until after the source is finalized, which is
- * guaranteed to be after it is invoked for the final time. The #GDestroyNotify
- * is another callback passed to the 'full' variants of #GSource functions (for
- * example, g_timeout_add_full()). It is called when the source is finalized,
- * and is designed for releasing references like this.
- *
- * One important caveat of this second approach is that it will keep the object
- * alive indefinitely if the main loop is stopped before the #GSource is
- * invoked, which may be undesirable.
- */
-
 /* Types */
 
 typedef struct _GIdleSource GIdleSource;
@@ -275,6 +147,7 @@ typedef struct _GSourceList GSourceList;
 
 struct _GSourceList
 {
+  GList link;
   GSource *head, *tail;
   gint priority;
 };
@@ -319,7 +192,7 @@ struct _GMainContext
   gint timeout;                 /* Timeout for current iteration */
 
   guint next_id;
-  GList *source_lists;
+  GQueue source_lists;
   gint in_check_or_prepare;
 
   GPollRec *poll_records;
@@ -669,12 +542,13 @@ g_main_context_unref (GMainContext *context)
       g_source_destroy_internal (source, context, TRUE);
     }
 
-  for (sl_iter = context->source_lists; sl_iter; sl_iter = sl_iter->next)
+  sl_iter = context->source_lists.head;
+  while (sl_iter != NULL)
     {
       list = sl_iter->data;
+      sl_iter = sl_iter->next;
       g_slice_free (GSourceList, list);
     }
-  g_list_free (context->source_lists);
 
   g_hash_table_destroy (context->sources);
 
@@ -763,7 +637,7 @@ g_main_context_new_with_flags (GMainContextFlags flags)
   g_mutex_init (&context->mutex);
   g_cond_init (&context->cond);
 
-  context->sources = g_hash_table_new (NULL, NULL);
+  context->sources = g_hash_table_new (g_uint_hash, g_uint_equal);
   context->owner = NULL;
   context->flags = flags;
   context->waiters = NULL;
@@ -772,8 +646,6 @@ g_main_context_new_with_flags (GMainContextFlags flags)
 
   context->next_id = 1;
 
-  context->source_lists = NULL;
-
   context->poll_func = g_poll;
 
   context->cached_poll_array = NULL;
@@ -815,7 +687,7 @@ g_main_context_default (void)
 {
   static GMainContext *default_main_context = NULL;
 
-  if (g_once_init_enter (&default_main_context))
+  if (g_once_init_enter_pointer (&default_main_context))
     {
       GMainContext *context;
 
@@ -828,7 +700,7 @@ g_main_context_default (void)
         g_print ("global-default main context=%p\n", context);
 #endif
 
-      g_once_init_leave (&default_main_context, context);
+      g_once_init_leave_pointer (&default_main_context, context);
     }
 
   return default_main_context;
@@ -1137,7 +1009,7 @@ g_source_iter_next (GSourceIter *iter, GSource **source)
       if (iter->current_list)
   iter->current_list = iter->current_list->next;
       else
-  iter->current_list = iter->context->source_lists;
+  iter->current_list = iter->context->source_lists.head;
 
       if (iter->current_list)
   {
@@ -1187,11 +1059,10 @@ find_source_list_for_priority (GMainContext *context,
              gint          priority,
              gboolean      create)
 {
-  GList *iter, *last;
+  GList *iter;
   GSourceList *source_list;
 
-  last = NULL;
-  for (iter = context->source_lists; iter != NULL; last = iter, iter = iter->next)
+  for (iter = context->source_lists.head; iter; iter = iter->next)
     {
       source_list = iter->data;
 
@@ -1204,10 +1075,11 @@ find_source_list_for_priority (GMainContext *context,
       return NULL;
 
     source_list = g_slice_new0 (GSourceList);
+          source_list->link.data = source_list;
     source_list->priority = priority;
-    context->source_lists = g_list_insert_before (context->source_lists,
-              iter,
-              source_list);
+          g_queue_insert_before_link (&context->source_lists,
+                                      iter,
+                                      &source_list->link);
     return source_list;
   }
     }
@@ -1216,18 +1088,10 @@ find_source_list_for_priority (GMainContext *context,
     return NULL;
 
   source_list = g_slice_new0 (GSourceList);
+  source_list->link.data = source_list;
   source_list->priority = priority;
+  g_queue_push_tail_link (&context->source_lists, &source_list->link);
 
-  if (!last)
-    context->source_lists = g_list_append (NULL, source_list);
-  else
-    {
-      /* This just appends source_list to the end of
-       * context->source_lists without having to walk the list again.
-       */
-      last = g_list_append (last, source_list);
-      (void) last;
-    }
   return source_list;
 }
 
@@ -1299,7 +1163,7 @@ source_remove_from_context (GSource      *source,
 
   if (source_list->head == NULL)
     {
-      context->source_lists = g_list_remove (context->source_lists, source_list);
+      g_queue_unlink (&context->source_lists, &source_list->link);
       g_slice_free (GSourceList, source_list);
     }
 }
@@ -1317,13 +1181,13 @@ g_source_attach_unlocked (GSource      *source,
    */
   do
     id = context->next_id++;
-  while (id == 0 || g_hash_table_contains (context->sources, GUINT_TO_POINTER (id)));
+  while (id == 0 || g_hash_table_contains (context->sources, &id));
 
   source->context = context;
   source->source_id = id;
   g_source_ref (source);
 
-  g_hash_table_insert (context->sources, GUINT_TO_POINTER (id), source);
+  g_hash_table_add (context->sources, &source->source_id);
 
   source_add_to_context (source, context);
 
@@ -2136,8 +2000,8 @@ g_source_set_ready_time (GSource *source,
  * Gets the "ready time" of @source, as set by
  * g_source_set_ready_time().
  *
- * Any time before the current monotonic time (including 0) is an
- * indication that the source will fire immediately.
+ * Any time before or equal to the current monotonic time (including 0)
+ * is an indication that the source will fire immediately.
  *
  * Returns: the monotonic ready time, -1 for "never"
  **/
@@ -2423,7 +2287,7 @@ g_source_unref_internal (GSource      *source,
       g_warning (G_STRLOC ": ref_count == 0, but source was still attached to a context!");
     source_remove_from_context (source, context);
 
-          g_hash_table_remove (context->sources, GUINT_TO_POINTER (source->source_id));
+    g_hash_table_remove (context->sources, &source->source_id);
   }
 
       if (source->source_funcs->finalize)
@@ -2536,7 +2400,8 @@ GSource *
 g_main_context_find_source_by_id (GMainContext *context,
                                   guint         source_id)
 {
-  GSource *source;
+  GSource *source = NULL;
+  gconstpointer ptr;
 
   g_return_val_if_fail (source_id > 0, NULL);
 
@@ -2544,12 +2409,15 @@ g_main_context_find_source_by_id (GMainContext *context,
     context = g_main_context_default ();
 
   LOCK_CONTEXT (context);
-  source = g_hash_table_lookup (context->sources, GUINT_TO_POINTER (source_id));
+  ptr = g_hash_table_lookup (context->sources, &source_id);
+  if (ptr)
+    {
+      source = G_CONTAINER_OF (ptr, GSource, source_id);
+      if (SOURCE_DESTROYED (source))
+        source = NULL;
+    }
   UNLOCK_CONTEXT (context);
 
-  if (source && SOURCE_DESTROYED (source))
-    source = NULL;
-
   return source;
 }
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gmarkup.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gmarkup.c
index fa354c1abed..36063dd0e94 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gmarkup.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gmarkup.c
@@ -38,60 +38,6 @@
 #include "glibintl.h"
 #include "gthread.h"
 
-/**
- * SECTION:markup
- * @Title: Simple XML Subset Parser
- * @Short_description: parses a subset of XML
- * @See_also: [XML Specification](http://www.w3.org/TR/REC-xml/)
- *
- * The "GMarkup" parser is intended to parse a simple markup format
- * that's a subset of XML. This is a small, efficient, easy-to-use
- * parser. It should not be used if you expect to interoperate with
- * other applications generating full-scale XML, and must not be used if you
- * expect to parse untrusted input. However, it's very
- * useful for application data files, config files, etc. where you
- * know your application will be the only one writing the file.
- * Full-scale XML parsers should be able to parse the subset used by
- * GMarkup, so you can easily migrate to full-scale XML at a later
- * time if the need arises.
- *
- * GMarkup is not guaranteed to signal an error on all invalid XML;
- * the parser may accept documents that an XML parser would not.
- * However, XML documents which are not well-formed (which is a
- * weaker condition than being valid. See the
- * [XML specification](http://www.w3.org/TR/REC-xml/)
- * for definitions of these terms.) are not considered valid GMarkup
- * documents.
- *
- * Simplifications to XML include:
- *
- * - Only UTF-8 encoding is allowed
- *
- * - No user-defined entities
- *
- * - Processing instructions, comments and the doctype declaration
- *   are "passed through" but are not interpreted in any way
- *
- * - No DTD or validation
- *
- * The markup format does support:
- *
- * - Elements
- *
- * - Attributes
- *
- * - 5 standard entities: &amp; &lt; &gt; &quot; &apos;
- *
- * - Character references
- *
- * - Sections marked as CDATA
-
- * ## An example parser # {#example}
- *
- * Here is an example for a markup parser:
- * [markup-example.c](https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/glib/tests/markup-example.c)
- */
-
 G_DEFINE_QUARK (g-markup-error-quark, g_markup_error)
 
 typedef enum
@@ -1939,7 +1885,7 @@ g_markup_parse_context_get_element (GMarkupParseContext *context)
  * would merely return the name of the element that is being
  * processed.
  *
- * Returns: the element stack, which must not be modified
+ * Returns: (element-type utf8): the element stack, which must not be modified
  *
  * Since: 2.16
  */
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gmem.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gmem.c
index 2a2c5a72838..14273ed56d4 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gmem.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gmem.c
@@ -77,36 +77,6 @@ static GMemVTable glib_mem_vtable = {
   realloc,
 };
 
-/**
- * SECTION:memory
- * @Short_Description: general memory-handling
- * @Title: Memory Allocation
- *
- * These functions provide support for allocating and freeing memory.
- *
- * If any call to allocate memory using functions g_new(), g_new0(), g_renew(),
- * g_malloc(), g_malloc0(), g_malloc0_n(), g_realloc(), and g_realloc_n()
- * fails, the application is terminated. This also means that there is no
- * need to check if the call succeeded. On the other hand, the `g_try_...()` family
- * of functions returns %NULL on failure that can be used as a check
- * for unsuccessful memory allocation. The application is not terminated
- * in this case.
- *
- * As all GLib functions and data structures use `g_malloc()` internally, unless
- * otherwise specified, any allocation failure will result in the application
- * being terminated.
- *
- * It's important to match g_malloc() (and wrappers such as g_new()) with
- * g_free(), g_slice_alloc() (and wrappers such as g_slice_new()) with
- * g_slice_free(), plain malloc() with free(), and (if you're using C++)
- * new with delete and new[] with delete[]. Otherwise bad things can happen,
- * since these allocators may use different memory pools (and new/delete call
- * constructors and destructors).
- *
- * Since GLib 2.46 g_malloc() is hardcoded to always use the system malloc
- * implementation.
- */
-
 /* --- functions --- */
 /**
  * g_malloc:
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gmessages.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gmessages.c
index 8f88809e539..25648c8f280 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gmessages.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gmessages.c
@@ -28,146 +28,6 @@
  * MT safe
  */
 
-/**
- * SECTION:messages
- * @Title: Message Output and Debugging Functions
- * @Short_description: functions to output messages and help debug applications
- *
- * These functions provide support for outputting messages.
- *
- * The g_return family of macros (g_return_if_fail(),
- * g_return_val_if_fail(), g_return_if_reached(),
- * g_return_val_if_reached()) should only be used for programming
- * errors, a typical use case is checking for invalid parameters at
- * the beginning of a public function. They should not be used if
- * you just mean "if (error) return", they should only be used if
- * you mean "if (bug in program) return". The program behavior is
- * generally considered undefined after one of these checks fails.
- * They are not intended for normal control flow, only to give a
- * perhaps-helpful warning before giving up.
- *
- * Structured logging output is supported using g_log_structured(). This differs
- * from the traditional g_log() API in that log messages are handled as a
- * collection of key-value pairs representing individual pieces of information,
- * rather than as a single string containing all the information in an arbitrary
- * format.
- *
- * The convenience macros g_info(), g_message(), g_debug(), g_warning() and g_error()
- * will use the traditional g_log() API unless you define the symbol
- * %G_LOG_USE_STRUCTURED before including `glib.h`. But note that even messages
- * logged through the traditional g_log() API are ultimatively passed to
- * g_log_structured(), so that all log messages end up in same destination.
- * If %G_LOG_USE_STRUCTURED is defined, g_test_expect_message() will become
- * ineffective for the wrapper macros g_warning() and friends (see
- * [Testing for Messages][testing-for-messages]).
- *
- * The support for structured logging was motivated by the following needs (some
- * of which were supported previously; others weren't):
- *  * Support for multiple logging levels.
- *  * Structured log support with the ability to add `MESSAGE_ID`s (see
- *    g_log_structured()).
- *  * Moving the responsibility for filtering log messages from the program to
- *    the log viewer - instead of libraries and programs installing log handlers
- *    (with g_log_set_handler()) which filter messages before output, all log
- *    messages are outputted, and the log viewer program (such as `journalctl`)
- *    must filter them. This is based on the idea that bugs are sometimes hard
- *    to reproduce, so it is better to log everything possible and then use
- *    tools to analyse the logs than it is to not be able to reproduce a bug to
- *    get additional log data. Code which uses logging in performance-critical
- *    sections should compile out the g_log_structured() calls in
- *    release builds, and compile them in in debugging builds.
- *  * A single writer function which handles all log messages in a process, from
- *    all libraries and program code; rather than multiple log handlers with
- *    poorly defined interactions between them. This allows a program to easily
- *    change its logging policy by changing the writer function, for example to
- *    log to an additional location or to change what logging output fallbacks
- *    are used. The log writer functions provided by GLib are exposed publicly
- *    so they can be used from programs' log writers. This allows log writer
- *    policy and implementation to be kept separate.
- *  * If a library wants to add standard information to all of its log messages
- *    (such as library state) or to redact private data (such as passwords or
- *    network credentials), it should use a wrapper function around its
- *    g_log_structured() calls or implement that in the single log writer
- *    function.
- *  * If a program wants to pass context data from a g_log_structured() call to
- *    its log writer function so that, for example, it can use the correct
- *    server connection to submit logs to, that user data can be passed as a
- *    zero-length #GLogField to g_log_structured_array().
- *  * Color output needed to be supported on the terminal, to make reading
- *    through logs easier.
- *
- * ## Using Structured Logging ## {#using-structured-logging}
- *
- * To use structured logging (rather than the old-style logging), either use
- * the g_log_structured() and g_log_structured_array() functions; or define
- * `G_LOG_USE_STRUCTURED` before including any GLib header, and use the
- * g_message(), g_debug(), g_error() (etc.) macros.
- *
- * You do not need to define `G_LOG_USE_STRUCTURED` to use g_log_structured(),
- * but it is a good idea to avoid confusion.
- *
- * ## Log Domains ## {#log-domains}
- *
- * Log domains may be used to broadly split up the origins of log messages.
- * Typically, there are one or a few log domains per application or library.
- * %G_LOG_DOMAIN should be used to define the default log domain for the current
- * compilation unit - it is typically defined at the top of a source file, or in
- * the preprocessor flags for a group of source files.
- *
- * Log domains must be unique, and it is recommended that they are the
- * application or library name, optionally followed by a hyphen and a sub-domain
- * name. For example, `bloatpad` or `bloatpad-io`.
- *
- * ## Debug Message Output ## {#debug-message-output}
- *
- * The default log functions (g_log_default_handler() for the old-style API and
- * g_log_writer_default() for the structured API) both drop debug and
- * informational messages by default, unless the log domains of those messages
- * are listed in the `G_MESSAGES_DEBUG` environment variable (or it is set to
- * `all`).
- *
- * It is recommended that custom log writer functions re-use the
- * `G_MESSAGES_DEBUG` environment variable, rather than inventing a custom one,
- * so that developers can re-use the same debugging techniques and tools across
- * projects. Since GLib 2.68, this can be implemented by dropping messages
- * for which g_log_writer_default_would_drop() returns %TRUE.
- *
- * ## Testing for Messages ## {#testing-for-messages}
- *
- * With the old g_log() API, g_test_expect_message() and
- * g_test_assert_expected_messages() could be used in simple cases to check
- * whether some code under test had emitted a given log message. These
- * functions have been deprecated with the structured logging API, for several
- * reasons:
- *  * They relied on an internal queue which was too inflexible for many use
- *    cases, where messages might be emitted in several orders, some
- *    messages might not be emitted deterministically, or messages might be
- *    emitted by unrelated log domains.
- *  * They do not support structured log fields.
- *  * Examining the log output of code is a bad approach to testing it, and
- *    while it might be necessary for legacy code which uses g_log(), it should
- *    be avoided for new code using g_log_structured().
- *
- * They will continue to work as before if g_log() is in use (and
- * %G_LOG_USE_STRUCTURED is not defined). They will do nothing if used with the
- * structured logging API.
- *
- * Examining the log output of code is discouraged: libraries should not emit to
- * `stderr` during defined behaviour, and hence this should not be tested. If
- * the log emissions of a library during undefined behaviour need to be tested,
- * they should be limited to asserting that the library aborts and prints a
- * suitable error message before aborting. This should be done with
- * g_test_trap_assert_stderr().
- *
- * If it is really necessary to test the structured log messages emitted by a
- * particular piece of code - and the code cannot be restructured to be more
- * suitable to more conventional unit testing - you should write a custom log
- * writer function (see g_log_set_writer_func()) which appends all log messages
- * to a queue. When you want to check the log messages, examine and clear the
- * queue, ignoring irrelevant log messages (for example, from log domains other
- * than the one under test).
- */
-
 #include "config.h"
 
 #include <stdlib.h>
@@ -204,6 +64,10 @@
 #include "gthreadprivate.h"
 #include "gutilsprivate.h"
 
+#ifdef HAVE_SYSLOG_H
+#include <syslog.h>
+#endif
+
 #if defined(__linux__) && !defined(__BIONIC__)
 #include "gjournal-private.h"
 #endif
@@ -260,83 +124,83 @@
  * GLib log levels that are considered fatal by default.
  *
  * This is not used if structured logging is enabled; see
- * [Using Structured Logging][using-structured-logging].
+ * [Using Structured Logging](logging.html#using-structured-logging).
  */
 
 /**
  * GLogFunc:
  * @log_domain: the log domain of the message
  * @log_level: the log level of the message (including the
- *     fatal and recursion flags)
+ *   fatal and recursion flags)
  * @message: the message to process
- * @user_data: user data, set in g_log_set_handler()
+ * @user_data: user data, set in [func@GLib.log_set_handler]
  *
  * Specifies the prototype of log handler functions.
  *
- * The default log handler, g_log_default_handler(), automatically appends a
+ * The default log handler, [func@GLib.log_default_handler], automatically appends a
  * new-line character to @message when printing it. It is advised that any
  * custom log handler functions behave similarly, so that logging calls in user
  * code do not need modifying to add a new-line character to the message if the
  * log handler is changed.
  *
  * This is not used if structured logging is enabled; see
- * [Using Structured Logging][using-structured-logging].
+ * [Using Structured Logging](logging.html#using-structured-logging).
  */
 
 /**
  * GLogLevelFlags:
  * @G_LOG_FLAG_RECURSION: internal flag
  * @G_LOG_FLAG_FATAL: internal flag
- * @G_LOG_LEVEL_ERROR: log level for errors, see g_error().
- *     This level is also used for messages produced by g_assert().
+ * @G_LOG_LEVEL_ERROR: log level for errors, see [func@GLib.error].
+ *   This level is also used for messages produced by [func@GLib.assert].
  * @G_LOG_LEVEL_CRITICAL: log level for critical warning messages, see
- *     g_critical().
- *     This level is also used for messages produced by g_return_if_fail()
- *     and g_return_val_if_fail().
- * @G_LOG_LEVEL_WARNING: log level for warnings, see g_warning()
- * @G_LOG_LEVEL_MESSAGE: log level for messages, see g_message()
- * @G_LOG_LEVEL_INFO: log level for informational messages, see g_info()
- * @G_LOG_LEVEL_DEBUG: log level for debug messages, see g_debug()
+ *   [func@GLib.critical]. This level is also used for messages produced by
+ *   [func@GLib.return_if_fail] and [func@GLib.return_val_if_fail].
+ * @G_LOG_LEVEL_WARNING: log level for warnings, see [func@GLib.warning]
+ * @G_LOG_LEVEL_MESSAGE: log level for messages, see [func@GLib.message]
+ * @G_LOG_LEVEL_INFO: log level for informational messages, see [func@GLib.info]
+ * @G_LOG_LEVEL_DEBUG: log level for debug messages, see [func@GLib.debug]
  * @G_LOG_LEVEL_MASK: a mask including all log levels
  *
  * Flags specifying the level of log messages.
  *
  * It is possible to change how GLib treats messages of the various
- * levels using g_log_set_handler() and g_log_set_fatal_mask().
+ * levels using [func@GLib.log_set_handler] and [func@GLib.log_set_fatal_mask].
  */
 
 /**
  * G_LOG_LEVEL_USER_SHIFT:
  *
- * Log levels below 1<<G_LOG_LEVEL_USER_SHIFT are used by GLib.
+ * Log levels below `1<<G_LOG_LEVEL_USER_SHIFT` are used by GLib.
  * Higher bits can be used for user-defined log levels.
  */
 
 /**
  * g_message:
- * @...: format string, followed by parameters to insert
- *     into the format string (as with printf())
+ * @...: format string, followed by parameters to insert into the format string
+ *   (as with `printf()`)
  *
  * A convenience function/macro to log a normal message.
  *
- * If g_log_default_handler() is used as the log handler function, a new-line
+ * If [func@GLib.log_default_handler] is used as the log handler function, a new-line
  * character will automatically be appended to @..., and need not be entered
  * manually.
  *
- * If structured logging is enabled, this will use g_log_structured();
- * otherwise it will use g_log(). See
- * [Using Structured Logging][using-structured-logging].
+ * If structured logging is enabled, this will use [func@GLib.log_structured];
+ * otherwise it will use [func@GLib.log]. See
+ * [Using Structured Logging](logging.html#using-structured-logging).
  */
 
 /**
  * g_warning:
- * @...: format string, followed by parameters to insert
- *     into the format string (as with printf())
+ * @...: format string, followed by parameters to insert into the format string
+ *   (as with `printf()`)
+ *
+ * A convenience function/macro to log a warning message.
  *
- * A convenience function/macro to log a warning message. The message should
- * typically *not* be translated to the user's language.
+ * The message should typically *not* be translated to the user’s language.
  *
- * This is not intended for end user error reporting. Use of #GError is
+ * This is not intended for end user error reporting. Use of [type@GLib.Error] is
  * preferred for that instead, as it allows calling functions to perform actions
  * conditional on the type of error.
  *
@@ -346,138 +210,144 @@
  * trusted files, etc.)
  *
  * If attempting to deal with programmer errors (for example, incorrect function
- * parameters) then you should use %G_LOG_LEVEL_CRITICAL instead.
+ * parameters) then you should use [flags@GLib.LogLevelFlags.LEVEL_CRITICAL] instead.
  *
- * g_warn_if_reached() and g_warn_if_fail() log at %G_LOG_LEVEL_WARNING.
+ * [func@GLib.warn_if_reached] and func@GLib.warn_if_fail] log at [flags@GLib.LogLevelFlags.LEVEL_WARNING].
  *
  * You can make warnings fatal at runtime by setting the `G_DEBUG`
  * environment variable (see
  * [Running GLib Applications](glib-running.html)):
  *
- * |[
- *   G_DEBUG=fatal-warnings gdb ./my-program
- * ]|
+ * ```
+ * G_DEBUG=fatal-warnings gdb ./my-program
+ * ```
  *
  * Any unrelated failures can be skipped over in
  * [gdb](https://www.gnu.org/software/gdb/) using the `continue` command.
  *
- * If g_log_default_handler() is used as the log handler function,
+ * If [func@GLib.log_default_handler] is used as the log handler function,
  * a newline character will automatically be appended to @..., and
  * need not be entered manually.
  *
- * If structured logging is enabled, this will use g_log_structured();
- * otherwise it will use g_log(). See
- * [Using Structured Logging][using-structured-logging].
+ * If structured logging is enabled, this will use [func@GLib.log_structured];
+ * otherwise it will use [func@GLib.log]. See
+ * [Using Structured Logging](logging.html#using-structured-logging).
  */
 
 /**
  * g_critical:
- * @...: format string, followed by parameters to insert
- *     into the format string (as with printf())
+ * @...: format string, followed by parameters to insert into the format string
+ *   (as with `printf()`)
  *
- * Logs a "critical warning" (%G_LOG_LEVEL_CRITICAL).
+ * Logs a ‘critical warning’ ([flags@GLib.LogLevelFlags.LEVEL_CRITICAL]).
  *
  * Critical warnings are intended to be used in the event of an error
  * that originated in the current process (a programmer error).
  * Logging of a critical error is by definition an indication of a bug
  * somewhere in the current program (or its libraries).
  *
- * g_return_if_fail(), g_return_val_if_fail(), g_return_if_reached() and
- * g_return_val_if_reached() log at %G_LOG_LEVEL_CRITICAL.
+ * [func@GLib.return_if_fail], [func@GLib.return_val_if_fail], [func@GLib.return_if_reached] and
+ * [func@GLib.return_val_if_reached] log at [flags@GLib.LogLevelFlags.LEVEL_CRITICAL].
  *
  * You can make critical warnings fatal at runtime by
  * setting the `G_DEBUG` environment variable (see
  * [Running GLib Applications](glib-running.html)):
  *
- * |[
- *   G_DEBUG=fatal-warnings gdb ./my-program
- * ]|
+ * ```
+ * G_DEBUG=fatal-warnings gdb ./my-program
+ * ```
  *
- * You can also use g_log_set_always_fatal().
+ * You can also use [func@GLib.log_set_always_fatal].
  *
  * Any unrelated failures can be skipped over in
  * [gdb](https://www.gnu.org/software/gdb/) using the `continue` command.
  *
  * The message should typically *not* be translated to the
- * user's language.
+ * user’s language.
  *
- * If g_log_default_handler() is used as the log handler function, a new-line
+ * If [func@GLib.log_default_handler] is used as the log handler function, a new-line
  * character will automatically be appended to @..., and need not be entered
  * manually.
  *
- * If structured logging is enabled, this will use g_log_structured();
- * otherwise it will use g_log(). See
- * [Using Structured Logging][using-structured-logging].
+ * If structured logging is enabled, this will use [func@GLib.log_structured];
+ * otherwise it will use [func@GLib.log]. See
+ * [Using Structured Logging](logging.html#using-structured-logging).
  */
 
 /**
  * g_error:
- * @...: format string, followed by parameters to insert
- *     into the format string (as with printf())
+ * @...: format string, followed by parameters to insert into the format string
+ *   (as with `printf()`)
  *
- * A convenience function/macro to log an error message. The message should
- * typically *not* be translated to the user's language.
+ * A convenience function/macro to log an error message.
  *
- * This is not intended for end user error reporting. Use of #GError is
+ * The message should typically *not* be translated to the user’s language.
+ *
+ * This is not intended for end user error reporting. Use of [type@GLib.Error] is
  * preferred for that instead, as it allows calling functions to perform actions
  * conditional on the type of error.
  *
- * Error messages are always fatal, resulting in a call to G_BREAKPOINT()
+ * Error messages are always fatal, resulting in a call to [func@GLib.BREAKPOINT]
  * to terminate the application. This function will
- * result in a core dump; don't use it for errors you expect.
+ * result in a core dump; don’t use it for errors you expect.
  * Using this function indicates a bug in your program, i.e.
  * an assertion failure.
  *
- * If g_log_default_handler() is used as the log handler function, a new-line
+ * If [func@GLib.log_default_handler] is used as the log handler function, a new-line
  * character will automatically be appended to @..., and need not be entered
  * manually.
  *
- * If structured logging is enabled, this will use g_log_structured();
- * otherwise it will use g_log(). See
- * [Using Structured Logging][using-structured-logging].
+ * If structured logging is enabled, this will use [func@GLib.log_structured];
+ * otherwise it will use [func@GLib.log]. See
+ * [Using Structured Logging](logging.html#using-structured-logging).
  */
 
 /**
  * g_info:
- * @...: format string, followed by parameters to insert
- *     into the format string (as with printf())
+ * @...: format string, followed by parameters to insert into the format string
+ *   (as with `printf()`)
+ *
+ * A convenience function/macro to log an informational message.
  *
- * A convenience function/macro to log an informational message. Seldom used.
+ * Seldom used.
  *
- * If g_log_default_handler() is used as the log handler function, a new-line
+ * If [func@GLib.log_default_handler] is used as the log handler function, a new-line
  * character will automatically be appended to @..., and need not be entered
  * manually.
  *
- * Such messages are suppressed by the g_log_default_handler() and
- * g_log_writer_default() unless the `G_MESSAGES_DEBUG` environment variable is
- * set appropriately.
+ * Such messages are suppressed by the [func@GLib.log_default_handler] and
+ * [func@GLib.log_writer_default] unless the `G_MESSAGES_DEBUG` environment variable is
+ * set appropriately. If you need to set the allowed domains at runtime, use
+ * [func@GLib.log_writer_default_set_debug_domains].
  *
- * If structured logging is enabled, this will use g_log_structured();
- * otherwise it will use g_log(). See
- * [Using Structured Logging][using-structured-logging].
+ * If structured logging is enabled, this will use [func@GLib.log_structured];
+ * otherwise it will use [func@GLib.log]. See
+ * [Using Structured Logging](logging.html#using-structured-logging).
  *
  * Since: 2.40
  */
 
 /**
  * g_debug:
- * @...: format string, followed by parameters to insert
- *     into the format string (as with printf())
+ * @...: format string, followed by parameters to insert into the format string
+ *   (as with `printf()`)
+ *
+ * A convenience function/macro to log a debug message.
  *
- * A convenience function/macro to log a debug message. The message should
- * typically *not* be translated to the user's language.
+ * The message should typically *not* be translated to the user’s language.
  *
- * If g_log_default_handler() is used as the log handler function, a new-line
+ * If [func@GLib.log_default_handler] is used as the log handler function, a new-line
  * character will automatically be appended to @..., and need not be entered
  * manually.
  *
- * Such messages are suppressed by the g_log_default_handler() and
- * g_log_writer_default() unless the `G_MESSAGES_DEBUG` environment variable is
- * set appropriately.
+ * Such messages are suppressed by the [func@GLib.log_default_handler] and
+ * [func@GLib.log_writer_default] unless the `G_MESSAGES_DEBUG` environment variable is
+ * set appropriately. If you need to set the allowed domains at runtime, use
+ * [func@GLib.log_writer_default_set_debug_domains].
  *
- * If structured logging is enabled, this will use g_log_structured();
- * otherwise it will use g_log(). See
- * [Using Structured Logging][using-structured-logging].
+ * If structured logging is enabled, this will use [func@GLib.log_structured];
+ * otherwise it will use [func@GLib.log]. See
+ * [Using Structured Logging](logging.html#using-structured-logging).
  *
  * Since: 2.6
  */
@@ -566,27 +436,6 @@ static gboolean win32_keep_fatal_message = FALSE;
  * called with huge strings, is it?
  */
 static gchar  fatal_msg_buf[1000] = "Unspecified fatal error encountered, aborting.";
-static gchar *fatal_msg_ptr = fatal_msg_buf;
-
-#undef write
-static inline int
-dowrite (int          fd,
-   const void  *buf,
-   unsigned int len)
-{
-  if (win32_keep_fatal_message)
-    {
-      memcpy (fatal_msg_ptr, buf, len);
-      fatal_msg_ptr += len;
-      *fatal_msg_ptr = 0;
-      return len;
-    }
-
-  write (fd, buf, len);
-
-  return len;
-}
-#define write(fd, buf, len) dowrite(fd, buf, len)
 
 #endif
 
@@ -705,13 +554,14 @@ g_log_domain_get_handler_L (GLogDomain  *domain,
 
 /**
  * g_log_set_always_fatal:
- * @fatal_mask: the mask containing bits set for each level
- *     of error which is to be fatal
+ * @fatal_mask: the mask containing bits set for each level of error which is
+ *   to be fatal
  *
  * Sets the message levels which are always fatal, in any log domain.
+ *
  * When a message with any of these levels is logged the program terminates.
  * You can only set the levels defined by GLib to be fatal.
- * %G_LOG_LEVEL_ERROR is always fatal.
+ * [flags@GLib.LogLevelFlags.LEVEL_ERROR] is always fatal.
  *
  * You can also make some message levels fatal at runtime by setting
  * the `G_DEBUG` environment variable (see
@@ -720,10 +570,10 @@ g_log_domain_get_handler_L (GLogDomain  *domain,
  * Libraries should not call this function, as it affects all messages logged
  * by a process, including those from other libraries.
  *
- * Structured log messages (using g_log_structured() and
- * g_log_structured_array()) are fatal only if the default log writer is used;
+ * Structured log messages (using [func@GLib.log_structured] and
+ * [func@GLib.log_structured_array]) are fatal only if the default log writer is used;
  * otherwise it is up to the writer function to determine which log messages
- * are fatal. See [Using Structured Logging][using-structured-logging].
+ * are fatal. See [Using Structured Logging](logging.html#using-structured-logging).
  *
  * Returns: the old fatal mask
  */
@@ -755,18 +605,19 @@ g_log_set_always_fatal (GLogLevelFlags fatal_mask)
  * @fatal_mask: the new fatal mask
  *
  * Sets the log levels which are fatal in the given domain.
- * %G_LOG_LEVEL_ERROR is always fatal.
  *
- * This has no effect on structured log messages (using g_log_structured() or
- * g_log_structured_array()). To change the fatal behaviour for specific log
+ * [flags@GLib.LogLevelFlags.LEVEL_ERROR] is always fatal.
+ *
+ * This has no effect on structured log messages (using [func@GLib.log_structured] or
+ * [func@GLib.log_structured_array]). To change the fatal behaviour for specific log
  * messages, programs must install a custom log writer function using
- * g_log_set_writer_func(). See
- * [Using Structured Logging][using-structured-logging].
+ * [func@GLib.log_set_writer_func]. See
+ * [Using Structured Logging](logging.html#using-structured-logging).
  *
  * This function is mostly intended to be used with
- * %G_LOG_LEVEL_CRITICAL.  You should typically not set
- * %G_LOG_LEVEL_WARNING, %G_LOG_LEVEL_MESSAGE, %G_LOG_LEVEL_INFO or
- * %G_LOG_LEVEL_DEBUG as fatal except inside of test programs.
+ * [flags@GLib.LogLevelFlags.LEVEL_CRITICAL].  You should typically not set
+ * [flags@GLib.LogLevelFlags.LEVEL_WARNING], [flags@GLib.LogLevelFlags.LEVEL_MESSAGE], [flags@GLib.LogLevelFlags.LEVEL_INFO] or
+ * [flags@GLib.LogLevelFlags.LEVEL_DEBUG] as fatal except inside of test programs.
  *
  * Returns: the old fatal mask for the log domain
  */
@@ -802,49 +653,49 @@ g_log_set_fatal_mask (const gchar   *log_domain,
 
 /**
  * g_log_set_handler:
- * @log_domain: (nullable): the log domain, or %NULL for the default ""
+ * @log_domain: (nullable): the log domain, or `NULL` for the default `""`
  *    application domain
  * @log_levels: the log levels to apply the log handler for.
  *    To handle fatal and recursive messages as well, combine
- *    the log levels with the %G_LOG_FLAG_FATAL and
- *    %G_LOG_FLAG_RECURSION bit flags.
+ *    the log levels with the [flags@GLib.LogLevelFlags.FLAG_FATAL] and
+ *    [flags@GLib.LogLevelFlags.FLAG_RECURSION] bit flags.
  * @log_func: the log handler function
  * @user_data: data passed to the log handler
  *
  * Sets the log handler for a domain and a set of log levels.
  *
  * To handle fatal and recursive messages the @log_levels parameter
- * must be combined with the %G_LOG_FLAG_FATAL and %G_LOG_FLAG_RECURSION
+ * must be combined with the [flags@GLib.LogLevelFlags.FLAG_FATAL] and [flags@GLib.LogLevelFlags.FLAG_RECURSION]
  * bit flags.
  *
- * Note that since the %G_LOG_LEVEL_ERROR log level is always fatal, if
+ * Note that since the [flags@GLib.LogLevelFlags.LEVEL_ERROR] log level is always fatal, if
  * you want to set a handler for this log level you must combine it with
- * %G_LOG_FLAG_FATAL.
+ * [flags@GLib.LogLevelFlags.FLAG_FATAL].
  *
  * This has no effect if structured logging is enabled; see
- * [Using Structured Logging][using-structured-logging].
+ * [Using Structured Logging](logging.html#using-structured-logging).
  *
  * Here is an example for adding a log handler for all warning messages
  * in the default domain:
  *
- * |[<!-- language="C" -->
+ * ```c
  * g_log_set_handler (NULL, G_LOG_LEVEL_WARNING | G_LOG_FLAG_FATAL
  *                    | G_LOG_FLAG_RECURSION, my_log_handler, NULL);
- * ]|
+ * ```
  *
  * This example adds a log handler for all critical messages from GTK:
  *
- * |[<!-- language="C" -->
+ * ```c
  * g_log_set_handler ("Gtk", G_LOG_LEVEL_CRITICAL | G_LOG_FLAG_FATAL
  *                    | G_LOG_FLAG_RECURSION, my_log_handler, NULL);
- * ]|
+ * ```
  *
  * This example adds a log handler for all messages from GLib:
  *
- * |[<!-- language="C" -->
+ * ```c
  * g_log_set_handler ("GLib", G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL
  *                    | G_LOG_FLAG_RECURSION, my_log_handler, NULL);
- * ]|
+ * ```
  *
  * Returns: the id of the new handler
  */
@@ -859,22 +710,22 @@ g_log_set_handler (const gchar   *log_domain,
 
 /**
  * g_log_set_handler_full: (rename-to g_log_set_handler)
- * @log_domain: (nullable): the log domain, or %NULL for the default ""
+ * @log_domain: (nullable): the log domain, or `NULL` for the default `""`
  *   application domain
  * @log_levels: the log levels to apply the log handler for.
  *   To handle fatal and recursive messages as well, combine
- *   the log levels with the %G_LOG_FLAG_FATAL and
- *   %G_LOG_FLAG_RECURSION bit flags.
+ *   the log levels with the [flags@GLib.LogLevelFlags.FLAG_FATAL] and
+ *   [flags@GLib.LogLevelFlags.FLAG_RECURSION] bit flags.
  * @log_func: the log handler function
  * @user_data: data passed to the log handler
- * @destroy: destroy notify for @user_data, or %NULL
+ * @destroy: destroy notify for @user_data, or `NULL`
  *
- * Like g_log_set_handler(), but takes a destroy notify for the @user_data.
+ * Like [func@GLib.log_set_handler], but takes a destroy notify for the @user_data.
  *
  * This has no effect if structured logging is enabled; see
- * [Using Structured Logging][using-structured-logging].
+ * [Using Structured Logging](logging.html#using-structured-logging).
  *
- * Returns: the id of the new handler
+ * Returns: the ID of the new handler
  *
  * Since: 2.46
  */
@@ -923,11 +774,12 @@ g_log_set_handler_full (const gchar    *log_domain,
  *
  * Installs a default log handler which is used if no
  * log handler has been set for the particular log domain
- * and log level combination. By default, GLib uses
- * g_log_default_handler() as default log handler.
+ * and log level combination.
+ *
+ * By default, GLib uses [func@GLib.log_default_handler] as default log handler.
  *
  * This has no effect if structured logging is enabled; see
- * [Using Structured Logging][using-structured-logging].
+ * [Using Structured Logging](logging.html#using-structured-logging).
  *
  * Returns: the previous default log handler
  *
@@ -970,10 +822,10 @@ g_log_set_default_handler (GLogFunc log_func,
  * This handler has no effect on g_error messages.
  *
  * This handler also has no effect on structured log messages (using
- * g_log_structured() or g_log_structured_array()). To change the fatal
+ * [func@GLib.log_structured] or [func@GLib.log_structured_array]). To change the fatal
  * behaviour for specific log messages, programs must install a custom log
- * writer function using g_log_set_writer_func().See
- * [Using Structured Logging][using-structured-logging].
+ * writer function using [func@GLib.log_set_writer_func].See
+ * [Using Structured Logging](logging.html#using-structured-logging).
  *
  * Since: 2.22
  **/
@@ -990,13 +842,13 @@ g_test_log_set_fatal_handler (GTestLogFatalFunc log_func,
 /**
  * g_log_remove_handler:
  * @log_domain: the log domain
- * @handler_id: the id of the handler, which was returned
- *     in g_log_set_handler()
+ * @handler_id: the ID of the handler, which was returned
+ *   in [func@GLib.log_set_handler]
  *
  * Removes the log handler.
  *
  * This has no effect if structured logging is enabled; see
- * [Using Structured Logging][using-structured-logging].
+ * [Using Structured Logging](logging.html#using-structured-logging).
  */
 void
 g_log_remove_handler (const gchar *log_domain,
@@ -1179,16 +1031,18 @@ static gboolean gmessages_use_stderr = FALSE;
 
 /**
  * g_log_writer_default_set_use_stderr:
- * @use_stderr: If %TRUE, use `stderr` for log messages that would
+ * @use_stderr: If `TRUE`, use `stderr` for log messages that would
  *  normally have appeared on `stdout`
  *
- * Configure whether the built-in log functions
- * (g_log_default_handler() for the old-style API, and both
- * g_log_writer_default() and g_log_writer_standard_streams() for the
- * structured API) will output all log messages to `stderr`.
+ * Configure whether the built-in log functions will output all log messages to
+ * `stderr`.
  *
- * By default, log messages of levels %G_LOG_LEVEL_INFO and
- * %G_LOG_LEVEL_DEBUG are sent to `stdout`, and other log messages are
+ * The built-in log functions are [func@GLib.log_default_handler] for the
+ * old-style API, and both [func@GLib.log_writer_default] and
+ * [func@GLib.log_writer_standard_streams] for the structured API.
+ *
+ * By default, log messages of levels [flags@GLib.LogLevelFlags.LEVEL_INFO] and
+ * [flags@GLib.LogLevelFlags.LEVEL_DEBUG] are sent to `stdout`, and other log messages are
  * sent to `stderr`. This is problematic for applications that intend
  * to reserve `stdout` for structured output such as JSON or XML.
  *
@@ -1269,24 +1123,24 @@ static GSList *expected_messages = NULL;
 
 /**
  * g_logv:
- * @log_domain: (nullable): the log domain, or %NULL for the default ""
- * application domain
+ * @log_domain: (nullable): the log domain, or `NULL` for the default `""`
+ *   application domain
  * @log_level: the log level
- * @format: the message format. See the printf() documentation
+ * @format: the message format. See the `printf()` documentation
  * @args: the parameters to insert into the format string
  *
  * Logs an error or debugging message.
  *
- * If the log level has been set as fatal, G_BREAKPOINT() is called
- * to terminate the program. See the documentation for G_BREAKPOINT() for
+ * If the log level has been set as fatal, [func@GLib.BREAKPOINT] is called
+ * to terminate the program. See the documentation for [func@GLib.BREAKPOINT] for
  * details of the debugging options this provides.
  *
- * If g_log_default_handler() is used as the log handler function, a new-line
+ * If [func@GLib.log_default_handler] is used as the log handler function, a new-line
  * character will automatically be appended to @..., and need not be entered
  * manually.
  *
- * If [structured logging is enabled][using-structured-logging] this will
- * output via the structured log writer function (see g_log_set_writer_func()).
+ * If [structured logging is enabled](logging.html#using-structured-logging) this will
+ * output via the structured log writer function (see [func@GLib.log_set_writer_func]).
  */
 void
 g_logv (const gchar   *log_domain,
@@ -1429,25 +1283,25 @@ g_logv (const gchar   *log_domain,
 
 /**
  * g_log:
- * @log_domain: (nullable): the log domain, usually %G_LOG_DOMAIN, or %NULL
+ * @log_domain: (nullable): the log domain, usually `G_LOG_DOMAIN`, or `NULL`
  *   for the default
- * @log_level: the log level, either from #GLogLevelFlags
+ * @log_level: the log level, either from [type@GLib.LogLevelFlags]
  *   or a user-defined level
  * @format: the message format. See the `printf()` documentation
  * @...: the parameters to insert into the format string
  *
  * Logs an error or debugging message.
  *
- * If the log level has been set as fatal, G_BREAKPOINT() is called
- * to terminate the program. See the documentation for G_BREAKPOINT() for
+ * If the log level has been set as fatal, [func@GLib.BREAKPOINT] is called
+ * to terminate the program. See the documentation for [func@GLib.BREAKPOINT] for
  * details of the debugging options this provides.
  *
- * If g_log_default_handler() is used as the log handler function, a new-line
+ * If [func@GLib.log_default_handler] is used as the log handler function, a new-line
  * character will automatically be appended to @..., and need not be entered
  * manually.
  *
- * If [structured logging is enabled][using-structured-logging] this will
- * output via the structured log writer function (see g_log_set_writer_func()).
+ * If [structured logging is enabled](logging.html#using-structured-logging) this will
+ * output via the structured log writer function (see [func@GLib.log_set_writer_func]).
  */
 void
 g_log (const gchar   *log_domain,
@@ -1485,6 +1339,25 @@ log_level_to_priority (GLogLevelFlags log_level)
   return "5";
 }
 
+#ifdef HAVE_SYSLOG_H
+static int
+str_to_syslog_facility (const gchar *syslog_facility_str)
+{
+  int syslog_facility = LOG_USER;
+
+  if (g_strcmp0 (syslog_facility_str, "auth") == 0)
+    {
+      syslog_facility = LOG_AUTH;
+    }
+  else if (g_strcmp0 (syslog_facility_str, "daemon") == 0)
+    {
+      syslog_facility = LOG_DAEMON;
+    }
+
+  return syslog_facility;
+}
+#endif
+
 static inline FILE *
 log_level_to_file (GLogLevelFlags log_level)
 {
@@ -1614,27 +1487,27 @@ win32_is_pipe_tty (int fd)
 
 /**
  * g_log_structured:
- * @log_domain: log domain, usually %G_LOG_DOMAIN
- * @log_level: log level, either from #GLogLevelFlags, or a user-defined
+ * @log_domain: log domain, usually `G_LOG_DOMAIN`
+ * @log_level: log level, either from [type@GLib.LogLevelFlags], or a user-defined
  *    level
  * @...: key-value pairs of structured data to add to the log entry, followed
- *    by the key "MESSAGE", followed by a printf()-style message format,
+ *    by the key `MESSAGE`, followed by a `printf()`-style message format,
  *    followed by parameters to insert in the format string
  *
  * Log a message with structured data.
  *
  * The message will be passed through to the log writer set by the application
- * using g_log_set_writer_func(). If the message is fatal (i.e. its log level
- * is %G_LOG_LEVEL_ERROR), the program will be aborted by calling
- * G_BREAKPOINT() at the end of this function. If the log writer returns
- * %G_LOG_WRITER_UNHANDLED (failure), no other fallback writers will be tried.
- * See the documentation for #GLogWriterFunc for information on chaining
+ * using [func@GLib.log_set_writer_func]. If the message is fatal (i.e. its log level
+ * is [flags@GLib.LogLevelFlags.LEVEL_ERROR]), the program will be aborted by calling
+ * [func@GLib.BREAKPOINT] at the end of this function. If the log writer returns
+ * [enum@GLib.LogWriterOutput.UNHANDLED] (failure), no other fallback writers will be tried.
+ * See the documentation for [type@GLib.LogWriterFunc] for information on chaining
  * writers.
  *
- * The structured data is provided as key-value pairs, where keys are UTF-8
- * strings, and values are arbitrary pointers typically pointing to UTF-8
+ * The structured data is provided as key–value pairs, where keys are UTF-8
+ * strings, and values are arbitrary pointers — typically pointing to UTF-8
  * strings, but that is not a requirement. To pass binary (non-nul-terminated)
- * structured data, use g_log_structured_array(). The keys for structured data
+ * structured data, use [func@GLib.log_structured_array]. The keys for structured data
  * should follow the [systemd journal
  * fields](https://www.freedesktop.org/software/systemd/man/systemd.journal-fields.html)
  * specification. It is suggested that custom keys are namespaced according to
@@ -1642,10 +1515,10 @@ win32_is_pipe_tty (int fd)
  * `GLIB_` prefix.
  *
  * Note that keys that expect UTF-8 strings (specifically `"MESSAGE"` and
- * `"GLIB_DOMAIN"`) must be passed as NUL-terminated UTF-8 strings until GLib
+ * `"GLIB_DOMAIN"`) must be passed as nul-terminated UTF-8 strings until GLib
  * version 2.74.1 because the default log handler did not consider the length of
  * the `GLogField`. Starting with GLib 2.74.1 this is fixed and
- * non-NUL-terminated UTF-8 strings can be passed with their correct length.
+ * non-nul-terminated UTF-8 strings can be passed with their correct length.
  *
  * The @log_domain will be converted into a `GLIB_DOMAIN` field. @log_level will
  * be converted into a
@@ -1664,19 +1537,19 @@ win32_is_pipe_tty (int fd)
  *  * [`ERRNO`](https://www.freedesktop.org/software/systemd/man/systemd.journal-fields.html#ERRNO=)
  *
  * Note that `CODE_FILE`, `CODE_LINE` and `CODE_FUNC` are automatically set by
- * the logging macros, G_DEBUG_HERE(), g_message(), g_warning(), g_critical(),
- * g_error(), etc, if the symbols `G_LOG_USE_STRUCTURED` is defined before including
+ * the logging macros, [func@GLib.DEBUG_HERE], [func@GLib.message], [func@GLib.warning], [func@GLib.critical],
+ * [func@GLib.error], etc, if the symbol `G_LOG_USE_STRUCTURED` is defined before including
  * `glib.h`.
  *
  * For example:
  *
- * |[<!-- language="C" -->
+ * ```c
  * g_log_structured (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,
  *                   "MESSAGE_ID", "06d4df59e6c24647bfe69d2c27ef0b4e",
  *                   "MY_APPLICATION_CUSTOM_FIELD", "some debug string",
  *                   "MESSAGE", "This is a debug message about pointer %p and integer %u.",
  *                   some_pointer, some_integer);
- * ]|
+ * ```
  *
  * Note that each `MESSAGE_ID` must be [uniquely and randomly
  * generated](https://www.freedesktop.org/software/systemd/man/systemd.journal-fields.html#MESSAGE_ID=).
@@ -1685,13 +1558,13 @@ win32_is_pipe_tty (int fd)
  * your software.
  *
  * To pass a user data pointer to the log writer function which is specific to
- * this logging call, you must use g_log_structured_array() and pass the pointer
- * as a field with #GLogField.length set to zero, otherwise it will be
+ * this logging call, you must use [func@GLib.log_structured_array] and pass the pointer
+ * as a field with `GLogField.length` set to zero, otherwise it will be
  * interpreted as a string.
  *
  * For example:
  *
- * |[<!-- language="C" -->
+ * ```c
  * const GLogField fields[] = {
  *   { "MESSAGE", "This is a debug message.", -1 },
  *   { "MESSAGE_ID", "fcfb2e1e65c3494386b74878f1abf893", -1 },
@@ -1699,12 +1572,12 @@ win32_is_pipe_tty (int fd)
  *   { "MY_APPLICATION_STATE", state_object, 0 },
  * };
  * g_log_structured_array (G_LOG_LEVEL_DEBUG, fields, G_N_ELEMENTS (fields));
- * ]|
+ * ```
  *
  * Note also that, even if no other structured fields are specified, there
  * must always be a `MESSAGE` key before the format string. The `MESSAGE`-format
  * pair has to be the last of the key-value pairs, and `MESSAGE` is the only
- * field for which printf()-style formatting is supported.
+ * field for which `printf()`-style formatting is supported.
  *
  * The default writer function for `stdout` and `stderr` will automatically
  * append a new-line character after the message, so you should not add one
@@ -1818,30 +1691,30 @@ g_log_structured (const gchar    *log_domain,
 
 /**
  * g_log_variant:
- * @log_domain: (nullable): log domain, usually %G_LOG_DOMAIN
- * @log_level: log level, either from #GLogLevelFlags, or a user-defined
+ * @log_domain: (nullable): log domain, usually `G_LOG_DOMAIN`
+ * @log_level: log level, either from [type@GLib.LogLevelFlags], or a user-defined
  *    level
- * @fields: a dictionary (#GVariant of the type %G_VARIANT_TYPE_VARDICT)
+ * @fields: a dictionary ([type@GLib.Variant] of the type `G_VARIANT_TYPE_VARDICT`)
  * containing the key-value pairs of message data.
  *
- * Log a message with structured data, accepting the data within a #GVariant. This
- * version is especially useful for use in other languages, via introspection.
+ * Log a message with structured data, accepting the data within a [type@GLib.Variant].
  *
- * The only mandatory item in the @fields dictionary is the "MESSAGE" which must
+ * This version is especially useful for use in other languages, via introspection.
+ *
+ * The only mandatory item in the @fields dictionary is the `"MESSAGE"` which must
  * contain the text shown to the user.
  *
- * The values in the @fields dictionary are likely to be of type String
- * (%G_VARIANT_TYPE_STRING). Array of bytes (%G_VARIANT_TYPE_BYTESTRING) is also
+ * The values in the @fields dictionary are likely to be of type `G_VARIANT_TYPE_STRING`.
+ * Array of bytes (`G_VARIANT_TYPE_BYTESTRING`) is also
  * supported. In this case the message is handled as binary and will be forwarded
  * to the log writer as such. The size of the array should not be higher than
- * %G_MAXSSIZE. Otherwise it will be truncated to this size. For other types
- * g_variant_print() will be used to convert the value into a string.
+ * `G_MAXSSIZE`. Otherwise it will be truncated to this size. For other types
+ * [method@GLib.Variant.print] will be used to convert the value into a string.
  *
- * For more details on its usage and about the parameters, see g_log_structured().
+ * For more details on its usage and about the parameters, see [func@GLib.log_structured].
  *
  * Since: 2.50
  */
-
 void
 g_log_variant (const gchar    *log_domain,
                GLogLevelFlags  log_level,
@@ -1935,18 +1808,20 @@ static GLogWriterOutput _g_log_writer_fallback (GLogLevelFlags   log_level,
 
 /**
  * g_log_structured_array:
- * @log_level: log level, either from #GLogLevelFlags, or a user-defined
+ * @log_level: log level, either from [type@GLib.LogLevelFlags], or a user-defined
  *    level
- * @fields: (array length=n_fields): key-value pairs of structured data to add
+ * @fields: (array length=n_fields): key–value pairs of structured data to add
  *    to the log message
  * @n_fields: number of elements in the @fields array
  *
- * Log a message with structured data. The message will be passed through to the
- * log writer set by the application using g_log_set_writer_func(). If the
- * message is fatal (i.e. its log level is %G_LOG_LEVEL_ERROR), the program will
+ * Log a message with structured data.
+ *
+ * The message will be passed through to the log writer set by the application
+ * using [func@GLib.log_set_writer_func]. If the
+ * message is fatal (i.e. its log level is [flags@GLib.LogLevelFlags.LEVEL_ERROR]), the program will
  * be aborted at the end of this function.
  *
- * See g_log_structured() for more documentation.
+ * See [func@GLib.log_structured] for more documentation.
  *
  * This assumes that @log_level is already present in @fields (typically as the
  * `PRIORITY` field).
@@ -2045,16 +1920,18 @@ g_log_structured_standard (const gchar    *log_domain,
 
 /**
  * g_log_set_writer_func:
- * @func: log writer function, which must not be %NULL
+ * @func: log writer function, which must not be `NULL`
  * @user_data: (closure func): user data to pass to @func
- * @user_data_free: (destroy func): function to free @user_data once it's
- *    finished with, if non-%NULL
+ * @user_data_free: (destroy func): function to free @user_data once it’s
+ *    finished with, if non-`NULL`
  *
  * Set a writer function which will be called to format and write out each log
- * message. Each program should set a writer function, or the default writer
- * (g_log_writer_default()) will be used.
+ * message.
+ *
+ * Each program should set a writer function, or the default writer
+ * ([func@GLib.log_writer_default]) will be used.
  *
- * Libraries **must not** call this function only programs are allowed to
+ * Libraries **must not** call this function — only programs are allowed to
  * install a writer function, as there must be a single, central point where
  * log messages are formatted and outputted.
  *
@@ -2089,11 +1966,12 @@ g_log_set_writer_func (GLogWriterFunc func,
  * g_log_writer_supports_color:
  * @output_fd: output file descriptor to check
  *
- * Check whether the given @output_fd file descriptor supports ANSI color
- * escape sequences. If so, they can safely be used when formatting log
- * messages.
+ * Check whether the given @output_fd file descriptor supports
+ * [ANSI color escape sequences](https://en.wikipedia.org/wiki/ANSI_escape_code).
  *
- * Returns: %TRUE if ANSI color escapes are supported, %FALSE otherwise
+ * If so, they can safely be used when formatting log messages.
+ *
+ * Returns: `TRUE` if ANSI color escapes are supported, `FALSE` otherwise
  * Since: 2.50
  */
 gboolean
@@ -2168,6 +2046,13 @@ g_log_writer_supports_color (gint output_fd)
 #endif
 }
 
+#ifdef HAVE_SYSLOG_H
+static gboolean syslog_opened = FALSE;
+#ifndef __linux__
+G_LOCK_DEFINE_STATIC (syslog_opened);
+#endif
+#endif
+
 #if defined(__linux__) && !defined(__BIONIC__)
 static int journal_fd = -1;
 
@@ -2201,13 +2086,13 @@ open_journal (void)
  * systemd journal, or something else (like a log file or `stdout` or
  * `stderr`).
  *
- * Invalid file descriptors are accepted and return %FALSE, which allows for
+ * Invalid file descriptors are accepted and return `FALSE`, which allows for
  * the following construct without needing any additional error handling:
- * |[<!-- language="C" -->
- *   is_journald = g_log_writer_is_journald (fileno (stderr));
- * ]|
+ * ```c
+ * is_journald = g_log_writer_is_journald (fileno (stderr));
+ * ```
  *
- * Returns: %TRUE if @output_fd points to the journal, %FALSE otherwise
+ * Returns: `TRUE` if @output_fd points to the journal, `FALSE` otherwise
  * Since: 2.50
  */
 gboolean
@@ -2224,18 +2109,21 @@ static void escape_string (GString *string);
 
 /**
  * g_log_writer_format_fields:
- * @log_level: log level, either from #GLogLevelFlags, or a user-defined
+ * @log_level: log level, either from [type@GLib.LogLevelFlags], or a user-defined
  *    level
- * @fields: (array length=n_fields): key-value pairs of structured data forming
+ * @fields: (array length=n_fields): key–value pairs of structured data forming
  *    the log message
  * @n_fields: number of elements in the @fields array
- * @use_color: %TRUE to use ANSI color escape sequences when formatting the
- *    message, %FALSE to not
+ * @use_color: `TRUE` to use
+ *   [ANSI color escape sequences](https://en.wikipedia.org/wiki/ANSI_escape_code)
+ *   when formatting the message, `FALSE` to not
  *
  * Format a structured log message as a string suitable for outputting to the
- * terminal (or elsewhere). This will include the values of all fields it knows
+ * terminal (or elsewhere).
+ *
+ * This will include the values of all fields it knows
  * how to interpret, which includes `MESSAGE` and `GLIB_DOMAIN` (see the
- * documentation for g_log_structured()). It does not include values from
+ * documentation for [func@GLib.log_structured]). It does not include values from
  * unknown fields.
  *
  * The returned string does **not** have a trailing new-line character. It is
@@ -2354,6 +2242,113 @@ g_log_writer_format_fields (GLogLevelFlags   log_level,
   return g_string_free (gstring, FALSE);
 }
 
+/**
+ * g_log_writer_syslog:
+ * @log_level: log level, either from [type@GLib.LogLevelFlags], or a user-defined
+ *    level
+ * @fields: (array length=n_fields): key–value pairs of structured data forming
+ *    the log message
+ * @n_fields: number of elements in the @fields array
+ * @user_data: user data passed to [func@GLib.log_set_writer_func]
+ *
+ * Format a structured log message and send it to the syslog daemon. Only fields
+ * which are understood by this function are included in the formatted string
+ * which is printed.
+ *
+ * Log facility will be defined via the SYSLOG_FACILITY field and accepts the following
+ * values: "auth", "daemon", and "user". If SYSLOG_FACILITY is not specified, LOG_USER
+ * facility will be used.
+ *
+ * This is suitable for use as a [type@GLib.LogWriterFunc].
+ *
+ * If syslog is not supported, this function is still defined, but will always
+ * return [enum@GLib.LogWriterOutput.UNHANDLED].
+ *
+ * Returns: [enum@GLib.LogWriterOutput.HANDLED] on success, [enum@GLib.LogWriterOutput.UNHANDLED] otherwise
+ * Since: 2.80
+ */
+GLogWriterOutput
+g_log_writer_syslog (GLogLevelFlags   log_level,
+                     const GLogField *fields,
+                     gsize            n_fields,
+                     gpointer         user_data)
+{
+#ifdef HAVE_SYSLOG_H
+  gsize i;
+  const char *message = NULL;
+  const char *log_domain = NULL;
+  int syslog_facility = 0;
+  int syslog_level;
+  gssize message_length = -1;
+  gssize log_domain_length = -1;
+  GString *gstring;
+
+  g_return_val_if_fail (fields != NULL, G_LOG_WRITER_UNHANDLED);
+  g_return_val_if_fail (n_fields > 0, G_LOG_WRITER_UNHANDLED);
+
+/* As not all man pages provide sufficient information about the thread safety
+ * of the openlog() routine or even describe alternative routines like logopen_r()
+ * intended for multi-threaded applications, use locking on non-Linux platforms till
+ * the situation can be cleared. See the following links for more information:
+ * FreeBSD: https://man.freebsd.org/cgi/man.cgi?query=openlog
+ * NetBSD: https://man.netbsd.org/openlog.3
+ * POSIX: https://pubs.opengroup.org/onlinepubs/9699919799.2008edition/functions/openlog.html#
+ */
+#ifndef __linux__
+  G_LOCK (syslog_opened);
+#endif
+
+  if (!syslog_opened)
+    {
+      openlog (NULL, 0, 0);
+      syslog_opened = TRUE;
+    }
+
+#ifndef __linux__
+  G_UNLOCK (syslog_opened);
+#endif
+
+  for (i = 0; i < n_fields; i++)
+    {
+      const GLogField *field = &fields[i];
+
+      if (g_strcmp0 (field->key, "MESSAGE") == 0)
+        {
+          message = field->value;
+          message_length = field->length;
+        }
+      else if (g_strcmp0 (field->key, "GLIB_DOMAIN") == 0)
+        {
+          log_domain = field->value;
+          log_domain_length = field->length;
+        }
+      else if (g_strcmp0 (field->key, "SYSLOG_FACILITY") == 0)
+        {
+          syslog_facility = str_to_syslog_facility (field->value);
+        }
+    }
+
+  gstring = g_string_new (NULL);
+
+  if (log_domain != NULL)
+    {
+      g_string_append_len (gstring, log_domain, log_domain_length);
+      g_string_append (gstring, ": ");
+    }
+
+  g_string_append_len (gstring, message, message_length);
+
+  syslog_level = atoi (log_level_to_priority (log_level));
+  syslog (syslog_level | syslog_facility, "%s", gstring->str);
+
+  g_string_free (gstring, TRUE);
+
+  return G_LOG_WRITER_HANDLED;
+#else
+  return G_LOG_WRITER_UNHANDLED;
+#endif /* HAVE_SYSLOG_H */
+}
+
 /* Enable support for the journal if we're on a recent enough Linux */
 #if defined(__linux__) && !defined(__BIONIC__) && defined(HAVE_MKOSTEMP) && defined(O_CLOEXEC)
 #define ENABLE_JOURNAL_SENDV
@@ -2447,24 +2442,26 @@ journal_sendv (struct iovec *iov,
 
 /**
  * g_log_writer_journald:
- * @log_level: log level, either from #GLogLevelFlags, or a user-defined
+ * @log_level: log level, either from [type@GLib.LogLevelFlags], or a user-defined
  *    level
- * @fields: (array length=n_fields): key-value pairs of structured data forming
+ * @fields: (array length=n_fields): key–value pairs of structured data forming
  *    the log message
  * @n_fields: number of elements in the @fields array
- * @user_data: user data passed to g_log_set_writer_func()
+ * @user_data: user data passed to [func@GLib.log_set_writer_func]
  *
  * Format a structured log message and send it to the systemd journal as a set
- * of key-value pairs. All fields are sent to the journal, but if a field has
+ * of key–value pairs.
+ *
+ * All fields are sent to the journal, but if a field has
  * length zero (indicating program-specific data) then only its key will be
  * sent.
  *
- * This is suitable for use as a #GLogWriterFunc.
+ * This is suitable for use as a [type@GLib.LogWriterFunc].
  *
  * If GLib has been compiled without systemd support, this function is still
- * defined, but will always return %G_LOG_WRITER_UNHANDLED.
+ * defined, but will always return [enum@GLib.LogWriterOutput.UNHANDLED].
  *
- * Returns: %G_LOG_WRITER_HANDLED on success, %G_LOG_WRITER_UNHANDLED otherwise
+ * Returns: [enum@GLib.LogWriterOutput.HANDLED] on success, [enum@GLib.LogWriterOutput.UNHANDLED] otherwise
  * Since: 2.50
  */
 GLogWriterOutput
@@ -2487,8 +2484,8 @@ g_log_writer_journald (GLogLevelFlags   log_level,
   /* According to systemd.journal-fields(7), the journal allows fields in any
    * format (including arbitrary binary), but expects text fields to be UTF-8.
    * This is great, because we require input strings to be in UTF-8, so no
-   * conversion is necessary and we don't need to care about the current
-   * locale's character set.
+   * conversion is necessary and we don’t need to care about the current
+   * locale’s character set.
    */
 
   iov = g_alloca (sizeof (struct iovec) * 5 * n_fields);
@@ -2558,29 +2555,33 @@ g_log_writer_journald (GLogLevelFlags   log_level,
 
 /**
  * g_log_writer_standard_streams:
- * @log_level: log level, either from #GLogLevelFlags, or a user-defined
+ * @log_level: log level, either from [type@GLib.LogLevelFlags], or a user-defined
  *    level
- * @fields: (array length=n_fields): key-value pairs of structured data forming
+ * @fields: (array length=n_fields): key–value pairs of structured data forming
  *    the log message
  * @n_fields: number of elements in the @fields array
- * @user_data: user data passed to g_log_set_writer_func()
+ * @user_data: user data passed to [func@GLib.log_set_writer_func]
  *
  * Format a structured log message and print it to either `stdout` or `stderr`,
- * depending on its log level. %G_LOG_LEVEL_INFO and %G_LOG_LEVEL_DEBUG messages
+ * depending on its log level.
+ *
+ * [flags@GLib.LogLevelFlags.LEVEL_INFO] and [flags@GLib.LogLevelFlags.LEVEL_DEBUG] messages
  * are sent to `stdout`, or to `stderr` if requested by
- * g_log_writer_default_set_use_stderr();
+ * [func@GLib.log_writer_default_set_use_stderr];
  * all other log levels are sent to `stderr`. Only fields
  * which are understood by this function are included in the formatted string
  * which is printed.
  *
- * If the output stream supports ANSI color escape sequences, they will be used
- * in the output.
+ * If the output stream supports
+ * [ANSI color escape sequences](https://en.wikipedia.org/wiki/ANSI_escape_code),
+ * they will be used in the output.
  *
  * A trailing new-line character is added to the log message when it is printed.
  *
- * This is suitable for use as a #GLogWriterFunc.
+ * This is suitable for use as a [type@GLib.LogWriterFunc].
  *
- * Returns: %G_LOG_WRITER_HANDLED on success, %G_LOG_WRITER_UNHANDLED otherwise
+ * Returns: [enum@GLib.LogWriterOutput.HANDLED] on success,
+ *   [enum@GLib.LogWriterOutput.UNHANDLED] otherwise
  * Since: 2.50
  */
 GLogWriterOutput
@@ -2590,7 +2591,7 @@ g_log_writer_standard_streams (GLogLevelFlags   log_level,
                                gpointer         user_data)
 {
   FILE *stream;
-  gchar *out = NULL;  /* in the current locale's character set */
+  gchar *out = NULL;  /* in the current locale’s character set */
 
   g_return_val_if_fail (fields != NULL, G_LOG_WRITER_UNHANDLED);
   g_return_val_if_fail (n_fields > 0, G_LOG_WRITER_UNHANDLED);
@@ -2626,6 +2627,58 @@ log_is_old_api (const GLogField *fields,
           g_strcmp0 (fields[0].value, "1") == 0);
 }
 
+static gboolean
+domain_found (const gchar *domains,
+              const char  *log_domain)
+{
+  guint len;
+  const gchar *found;
+
+  len = strlen (log_domain);
+
+  for (found = strstr (domains, log_domain); found;
+       found = strstr (found + 1, log_domain))
+    {
+      if ((found == domains || found[-1] == ' ')
+          && (found[len] == 0 || found[len] == ' '))
+        return TRUE;
+    }
+
+  return FALSE;
+}
+
+static struct {
+  GRWLock lock;
+  gchar *domains;
+  gboolean domains_set;
+} g_log_global;
+
+/**
+ * g_log_writer_default_set_debug_domains:
+ * @domains: (nullable) (transfer none): `NULL`-terminated array with domains to be printed.
+ *   `NULL` or an array with no values means none. Array with a single value `"all"` means all.
+ *
+ * Reset the list of domains to be logged, that might be initially set by the
+ * `G_MESSAGES_DEBUG` environment variable.
+ *
+ * This function is thread-safe.
+ *
+ * Since: 2.80
+ */
+void
+g_log_writer_default_set_debug_domains (const gchar * const *domains)
+{
+  g_rw_lock_writer_lock (&g_log_global.lock);
+
+  g_free (g_log_global.domains);
+  g_log_global.domains = domains ?
+      g_strjoinv (" ", (gchar **)domains) : NULL;
+
+  g_log_global.domains_set = TRUE;
+
+  g_rw_lock_writer_unlock (&g_log_global.lock);
+}
+
 /*
  * Internal version of g_log_writer_default_would_drop(), which can
  * read from either a log_domain or an array of fields. This avoids
@@ -2643,14 +2696,22 @@ should_drop_message (GLogLevelFlags   log_level,
       !(log_level >> G_LOG_LEVEL_USER_SHIFT) &&
       !g_log_get_debug_enabled ())
     {
-      const gchar *domains;
       gsize i;
 
-      domains = g_getenv ("G_MESSAGES_DEBUG");
+      g_rw_lock_reader_lock (&g_log_global.lock);
+
+      if (G_UNLIKELY (!g_log_global.domains_set))
+        {
+          g_log_global.domains = g_strdup (g_getenv ("G_MESSAGES_DEBUG"));
+          g_log_global.domains_set = TRUE;
+        }
 
       if ((log_level & INFO_LEVELS) == 0 ||
-          domains == NULL)
-        return TRUE;
+          g_log_global.domains == NULL)
+        {
+          g_rw_lock_reader_unlock (&g_log_global.lock);
+          return TRUE;
+        }
 
       if (log_domain == NULL)
         {
@@ -2664,9 +2725,14 @@ should_drop_message (GLogLevelFlags   log_level,
             }
         }
 
-      if (strcmp (domains, "all") != 0 &&
-          (log_domain == NULL || !strstr (domains, log_domain)))
-        return TRUE;
+      if (strcmp (g_log_global.domains, "all") != 0 &&
+          (log_domain == NULL || !domain_found (g_log_global.domains, log_domain)))
+        {
+          g_rw_lock_reader_unlock (&g_log_global.lock);
+          return TRUE;
+        }
+
+      g_rw_lock_reader_unlock (&g_log_global.lock);
     }
 
   return FALSE;
@@ -2675,39 +2741,38 @@ should_drop_message (GLogLevelFlags   log_level,
 /**
  * g_log_writer_default_would_drop:
  * @log_domain: (nullable): log domain
- * @log_level: log level, either from #GLogLevelFlags, or a user-defined
+ * @log_level: log level, either from [type@GLib.LogLevelFlags], or a user-defined
  *    level
  *
- * Check whether g_log_writer_default() and g_log_default_handler() would
+ * Check whether [func@GLib.log_writer_default] and [func@GLib.log_default_handler] would
  * ignore a message with the given domain and level.
  *
- * As with g_log_default_handler(), this function drops debug and informational
+ * As with [func@GLib.log_default_handler], this function drops debug and informational
  * messages unless their log domain (or `all`) is listed in the space-separated
- * `G_MESSAGES_DEBUG` environment variable.
+ * `G_MESSAGES_DEBUG` environment variable, or by [func@GLib.log_writer_default_set_debug_domains].
  *
  * This can be used when implementing log writers with the same filtering
  * behaviour as the default, but a different destination or output format:
  *
- * |[<!-- language="C" -->
- *   if (g_log_writer_default_would_drop (log_level, log_domain))
- *     return G_LOG_WRITER_HANDLED;
+ * ```c
+ * if (g_log_writer_default_would_drop (log_level, log_domain))
+ *   return G_LOG_WRITER_HANDLED;
  * ]|
  *
  * or to skip an expensive computation if it is only needed for a debugging
  * message, and `G_MESSAGES_DEBUG` is not set:
  *
- * |[<!-- language="C" -->
- *   if (!g_log_writer_default_would_drop (G_LOG_LEVEL_DEBUG, G_LOG_DOMAIN))
- *     {
- *       gchar *result = expensive_computation (my_object);
+ * ```c
+ * if (!g_log_writer_default_would_drop (G_LOG_LEVEL_DEBUG, G_LOG_DOMAIN))
+ *   {
+ *     g_autofree gchar *result = expensive_computation (my_object);
  *
- *       g_debug ("my_object result: %s", result);
- *       g_free (result);
- *     }
- * ]|
+ *     g_debug ("my_object result: %s", result);
+ *   }
+ * ```
  *
- * Returns: %TRUE if the log message would be dropped by GLib's
- *  default log handlers
+ * Returns: `TRUE` if the log message would be dropped by GLib’s
+ *   default log handlers
  * Since: 2.68
  */
 gboolean
@@ -2719,15 +2784,17 @@ g_log_writer_default_would_drop (GLogLevelFlags  log_level,
 
 /**
  * g_log_writer_default:
- * @log_level: log level, either from #GLogLevelFlags, or a user-defined
+ * @log_level: log level, either from [type@GLib.LogLevelFlags], or a user-defined
  *    level
- * @fields: (array length=n_fields): key-value pairs of structured data forming
+ * @fields: (array length=n_fields): key–value pairs of structured data forming
  *    the log message
  * @n_fields: number of elements in the @fields array
- * @user_data: user data passed to g_log_set_writer_func()
+ * @user_data: user data passed to [func@GLib.log_set_writer_func]
  *
  * Format a structured log message and output it to the default log destination
- * for the platform. On Linux, this is typically the systemd journal, falling
+ * for the platform.
+ *
+ * On Linux, this is typically the systemd journal, falling
  * back to `stdout` or `stderr` if running from the terminal or if output is
  * being redirected to a file.
  *
@@ -2735,18 +2802,19 @@ g_log_writer_default_would_drop (GLogLevelFlags  log_level,
  * future. Distributors of GLib may modify this function to impose their own
  * (documented) platform-specific log writing policies.
  *
- * This is suitable for use as a #GLogWriterFunc, and is the default writer used
- * if no other is set using g_log_set_writer_func().
+ * This is suitable for use as a [type@GLib.LogWriterFunc], and is the default writer used
+ * if no other is set using [func@GLib.log_set_writer_func].
  *
- * As with g_log_default_handler(), this function drops debug and informational
+ * As with [func@GLib.log_default_handler], this function drops debug and informational
  * messages unless their log domain (or `all`) is listed in the space-separated
- * `G_MESSAGES_DEBUG` environment variable.
+ * `G_MESSAGES_DEBUG` environment variable, or set at runtime by [func@GLib.log_writer_default_set_debug_domains].
  *
- * g_log_writer_default() uses the mask set by g_log_set_always_fatal() to
- * determine which messages are fatal. When using a custom writer func instead it is
+ * [func@GLib.log_writer_default] uses the mask set by [func@GLib.log_set_always_fatal] to
+ * determine which messages are fatal. When using a custom writer function instead it is
  * up to the writer function to determine which log messages are fatal.
  *
- * Returns: %G_LOG_WRITER_HANDLED on success, %G_LOG_WRITER_UNHANDLED otherwise
+ * Returns: [enum@GLib.LogWriterOutput.HANDLED] on success,
+ *   [enum@GLib.LogWriterOutput.UNHANDLED] otherwise
  * Since: 2.50
  */
 GLogWriterOutput
@@ -2877,14 +2945,14 @@ _g_log_writer_fallback (GLogLevelFlags   log_level,
  *
  * Return whether debug output from the GLib logging system is enabled.
  *
- * Note that this should not be used to conditionalise calls to g_debug() or
- * other logging functions; it should only be used from %GLogWriterFunc
+ * Note that this should not be used to conditionalise calls to [func@GLib.debug] or
+ * other logging functions; it should only be used from [type@GLib.LogWriterFunc]
  * implementations.
  *
- * Note also that the value of this does not depend on `G_MESSAGES_DEBUG`; see
- * the docs for g_log_set_debug_enabled().
+ * Note also that the value of this does not depend on `G_MESSAGES_DEBUG`, nor
+ * [func@GLib.log_writer_default_set_debug_domains]; see the docs for [func@GLib.log_set_debug_enabled].
  *
- * Returns: %TRUE if debug output is enabled, %FALSE otherwise
+ * Returns: `TRUE` if debug output is enabled, `FALSE` otherwise
  *
  * Since: 2.72
  */
@@ -2896,11 +2964,13 @@ g_log_get_debug_enabled (void)
 
 /**
  * g_log_set_debug_enabled:
- * @enabled: %TRUE to enable debug output, %FALSE otherwise
+ * @enabled: `TRUE` to enable debug output, `FALSE` otherwise
  *
  * Enable or disable debug output from the GLib logging system for all domains.
- * This value interacts disjunctively with `G_MESSAGES_DEBUG` — if either of
- * them would allow a debug message to be outputted, it will be.
+ *
+ * This value interacts disjunctively with `G_MESSAGES_DEBUG` and
+ * [func@GLib.log_writer_default_set_debug_domains] — if any of them would allow
+ * a debug message to be outputted, it will be.
  *
  * Note that this should not be used from within library code to enable debug
  * output — it is intended for external use.
@@ -2919,8 +2989,8 @@ g_log_set_debug_enabled (gboolean enabled)
  * @pretty_function: function containing the assertion
  * @expression: (nullable): expression which failed
  *
- * Internal function used to print messages from the public g_return_if_fail()
- * and g_return_val_if_fail() macros.
+ * Internal function used to print messages from the public [func@GLib.return_if_fail]
+ * and [func@GLib.return_val_if_fail] macros.
  */
 void
 g_return_if_fail_warning (const char *log_domain,
@@ -2942,8 +3012,8 @@ g_return_if_fail_warning (const char *log_domain,
  * @func: function containing the warning
  * @warnexpr: (nullable): expression which failed
  *
- * Internal function used to print messages from the public g_warn_if_reached()
- * and g_warn_if_fail() macros.
+ * Internal function used to print messages from the public [func@GLib.warn_if_reached]
+ * and [func@GLib.warn_if_fail] macros.
  */
 void
 g_warn_message (const char     *domain,
@@ -2996,42 +3066,43 @@ g_assert_warning (const char *log_domain,
  * g_test_expect_message:
  * @log_domain: (nullable): the log domain of the message
  * @log_level: the log level of the message
- * @pattern: a glob-style [pattern][glib-Glob-style-pattern-matching]
+ * @pattern: a glob-style pattern (see [type@GLib.PatternSpec])
  *
  * Indicates that a message with the given @log_domain and @log_level,
- * with text matching @pattern, is expected to be logged. When this
- * message is logged, it will not be printed, and the test case will
+ * with text matching @pattern, is expected to be logged.
+ *
+ * When this message is logged, it will not be printed, and the test case will
  * not abort.
  *
- * This API may only be used with the old logging API (g_log() without
- * %G_LOG_USE_STRUCTURED defined). It will not work with the structured logging
- * API. See [Testing for Messages][testing-for-messages].
+ * This API may only be used with the old logging API ([func@GLib.log] without
+ * `G_LOG_USE_STRUCTURED` defined). It will not work with the structured logging
+ * API. See [Testing for Messages](logging.html#testing-for-messages).
  *
- * Use g_test_assert_expected_messages() to assert that all
+ * Use [func@GLib.test_assert_expected_messages] to assert that all
  * previously-expected messages have been seen and suppressed.
  *
  * You can call this multiple times in a row, if multiple messages are
  * expected as a result of a single call. (The messages must appear in
- * the same order as the calls to g_test_expect_message().)
+ * the same order as the calls to [func@GLib.test_expect_message].)
  *
  * For example:
  *
- * |[<!-- language="C" -->
- *   // g_main_context_push_thread_default() should fail if the
- *   // context is already owned by another thread.
- *   g_test_expect_message (G_LOG_DOMAIN,
- *                          G_LOG_LEVEL_CRITICAL,
- *                          "assertion*acquired_context*failed");
- *   g_main_context_push_thread_default (bad_context);
- *   g_test_assert_expected_messages ();
- * ]|
+ * ```c
+ * // g_main_context_push_thread_default() should fail if the
+ * // context is already owned by another thread.
+ * g_test_expect_message (G_LOG_DOMAIN,
+ *                        G_LOG_LEVEL_CRITICAL,
+ *                        "assertion*acquired_context*failed");
+ * g_main_context_push_thread_default (bad_context);
+ * g_test_assert_expected_messages ();
+ * ```
  *
- * Note that you cannot use this to test g_error() messages, since
- * g_error() intentionally never returns even if the program doesn't
- * abort; use g_test_trap_subprocess() in this case.
+ * Note that you cannot use this to test [func@GLib.error] messages, since
+ * [func@GLib.error] intentionally never returns even if the program doesn’t
+ * abort; use [func@GLib.test_trap_subprocess] in this case.
  *
- * If messages at %G_LOG_LEVEL_DEBUG are emitted, but not explicitly
- * expected via g_test_expect_message() then they will be ignored.
+ * If messages at [flags@GLib.LogLevelFlags.LEVEL_DEBUG] are emitted, but not explicitly
+ * expected via [func@GLib.test_expect_message] then they will be ignored.
  *
  * Since: 2.34
  */
@@ -3081,14 +3152,14 @@ g_test_assert_expected_messages_internal (const char     *domain,
  * g_test_assert_expected_messages:
  *
  * Asserts that all messages previously indicated via
- * g_test_expect_message() have been seen and suppressed.
+ * [func@GLib.test_expect_message] have been seen and suppressed.
  *
- * This API may only be used with the old logging API (g_log() without
- * %G_LOG_USE_STRUCTURED defined). It will not work with the structured logging
- * API. See [Testing for Messages][testing-for-messages].
+ * This API may only be used with the old logging API ([func@GLib.log] without
+ * `G_LOG_USE_STRUCTURED` defined). It will not work with the structured logging
+ * API. See [Testing for Messages](logging.html#testing-for-messages).
  *
- * If messages at %G_LOG_LEVEL_DEBUG are emitted, but not explicitly
- * expected via g_test_expect_message() then they will be ignored.
+ * If messages at [flags@GLib.LogLevelFlags.LEVEL_DEBUG] are emitted, but not explicitly
+ * expected via [func@GLib.test_expect_message] then they will be ignored.
  *
  * Since: 2.34
  */
@@ -3204,38 +3275,40 @@ escape_string (GString *string)
 
 /**
  * g_log_default_handler:
- * @log_domain: (nullable): the log domain of the message, or %NULL for the
- * default "" application domain
+ * @log_domain: (nullable): the log domain of the message, or `NULL` for the
+ *   default `""` application domain
  * @log_level: the level of the message
  * @message: (nullable): the message
- * @unused_data: (nullable): data passed from g_log() which is unused
+ * @unused_data: (nullable): data passed from [func@GLib.log] which is unused
  *
- * The default log handler set up by GLib; g_log_set_default_handler()
+ * The default log handler set up by GLib; [func@GLib.log_set_default_handler]
  * allows to install an alternate default log handler.
+ *
  * This is used if no log handler has been set for the particular log
- * domain and log level combination. It outputs the message to stderr
- * or stdout and if the log level is fatal it calls G_BREAKPOINT(). It automatically
+ * domain and log level combination. It outputs the message to `stderr`
+ * or `stdout` and if the log level is fatal it calls [func@GLib.BREAKPOINT]. It automatically
  * prints a new-line character after the message, so one does not need to be
  * manually included in @message.
  *
  * The behavior of this log handler can be influenced by a number of
  * environment variables:
  *
- * - `G_MESSAGES_PREFIXED`: A :-separated list of log levels for which
- *   messages should be prefixed by the program name and PID of the
- *   application.
- *
- * - `G_MESSAGES_DEBUG`: A space-separated list of log domains for
- *   which debug and informational messages are printed. By default
- *   these messages are not printed.
+ *   - `G_MESSAGES_PREFIXED`: A `:`-separated list of log levels for which
+ *     messages should be prefixed by the program name and PID of the
+ *     application.
+ *   - `G_MESSAGES_DEBUG`: A space-separated list of log domains for
+ *     which debug and informational messages are printed. By default
+ *     these messages are not printed. If you need to set the allowed
+ *     domains at runtime, use [func@GLib.log_writer_default_set_debug_domains].
  *
- * stderr is used for levels %G_LOG_LEVEL_ERROR, %G_LOG_LEVEL_CRITICAL,
- * %G_LOG_LEVEL_WARNING and %G_LOG_LEVEL_MESSAGE. stdout is used for
- * the rest, unless stderr was requested by
- * g_log_writer_default_set_use_stderr().
+ * `stderr` is used for levels [flags@GLib.LogLevelFlags.LEVEL_ERROR],
+ * [flags@GLib.LogLevelFlags.LEVEL_CRITICAL], [flags@GLib.LogLevelFlags.LEVEL_WARNING] and
+ * [flags@GLib.LogLevelFlags.LEVEL_MESSAGE]. `stdout` is used for
+ * the rest, unless `stderr` was requested by
+ * [func@GLib.log_writer_default_set_use_stderr].
  *
  * This has no effect if structured logging is enabled; see
- * [Using Structured Logging][using-structured-logging].
+ * [Using Structured Logging](logging.html#using-structured-logging).
  */
 void
 g_log_default_handler (const gchar   *log_domain,
@@ -3286,24 +3359,24 @@ g_log_default_handler (const gchar   *log_domain,
 
 /**
  * g_set_print_handler:
- * @func: (nullable): the new print handler or %NULL to
+ * @func: (nullable): the new print handler or `NULL` to
  *   reset to the default
  *
  * Sets the print handler to @func, or resets it to the
- * default GLib handler if %NULL.
+ * default GLib handler if `NULL`.
  *
- * Any messages passed to g_print() will be output via
+ * Any messages passed to [func@GLib.print] will be output via
  * the new handler. The default handler outputs
- * the encoded message to stdout. By providing your own handler
+ * the encoded message to `stdout`. By providing your own handler
  * you can redirect the output, to a GTK widget or a
  * log file for example.
  *
  * Since 2.76 this functions always returns a valid
- * #GPrintFunc, and never returns %NULL. If no custom
+ * [type@GLib.PrintFunc], and never returns `NULL`. If no custom
  * print handler was set, it will return the GLib
  * default print handler and that can be re-used to
- * decorate its output and/or to write to stderr
- * in all platforms. Before GLib 2.76, this was %NULL.
+ * decorate its output and/or to write to `stderr`
+ * in all platforms. Before GLib 2.76, this was `NULL`.
  *
  * Returns: (not nullable): the old print handler
  */
@@ -3379,19 +3452,20 @@ g_default_printerr_func (const gchar *string)
 
 /**
  * g_print:
- * @format: the message format. See the printf() documentation
+ * @format: the message format. See the `printf()` documentation
  * @...: the parameters to insert into the format string
  *
  * Outputs a formatted message via the print handler.
- * The default print handler outputs the encoded message to stdout, without
+ *
+ * The default print handler outputs the encoded message to `stdout`, without
  * appending a trailing new-line character. Typically, @format should end with
  * its own new-line character.
  *
- * g_print() should not be used from within libraries for debugging
+ * This function should not be used from within libraries for debugging
  * messages, since it may be redirected by applications to special
  * purpose message windows or even files. Instead, libraries should
- * use g_log(), g_log_structured(), or the convenience macros g_message(),
- * g_warning() and g_error().
+ * use [func@GLib.log], [func@GLib.log_structured], or the convenience macros
+ * [func@GLib.message], [func@GLib.warning] and [func@GLib.error].
  */
 void
 g_print (const gchar *format,
@@ -3415,24 +3489,24 @@ g_print (const gchar *format,
 
 /**
  * g_set_printerr_handler:
- * @func: (nullable): he new error message handler or %NULL
- *  to reset to the default
+ * @func: (nullable): he new error message handler or `NULL`
+ *   to reset to the default
  *
  * Sets the handler for printing error messages to @func,
- * or resets it to the default GLib handler if %NULL.
+ * or resets it to the default GLib handler if `NULL`.
  *
- * Any messages passed to g_printerr() will be output via
+ * Any messages passed to [func@GLib.printerr] will be output via
  * the new handler. The default handler outputs the encoded
- * message to stderr. By providing your own handler you can
+ * message to `stderr`. By providing your own handler you can
  * redirect the output, to a GTK widget or a log file for
  * example.
  *
  * Since 2.76 this functions always returns a valid
- * #GPrintFunc, and never returns %NULL. If no custom error
+ * [type@GLib.PrintFunc], and never returns `NULL`. If no custom error
  * print handler was set, it will return the GLib default
  * error print handler and that can be re-used to decorate
- * its output and/or to write to stderr in all platforms.
- * Before GLib 2.76, this was %NULL.
+ * its output and/or to write to `stderr` in all platforms.
+ * Before GLib 2.76, this was `NULL`.
  *
  * Returns: (not nullable): the old error message handler
  */
@@ -3445,17 +3519,18 @@ g_set_printerr_handler (GPrintFunc func)
 
 /**
  * g_printerr:
- * @format: the message format. See the printf() documentation
+ * @format: the message format. See the `printf()` documentation
  * @...: the parameters to insert into the format string
  *
  * Outputs a formatted message via the error message handler.
- * The default handler outputs the encoded message to stderr, without appending
+ *
+ * The default handler outputs the encoded message to `stderr`, without appending
  * a trailing new-line character. Typically, @format should end with its own
  * new-line character.
  *
- * g_printerr() should not be used from within libraries.
- * Instead g_log() or g_log_structured() should be used, or the convenience
- * macros g_message(), g_warning() and g_error().
+ * This function should not be used from within libraries.
+ * Instead [func@GLib.log] or [func@GLib.log_structured] should be used, or the convenience
+ * macros [func@GLib.message], [func@GLib.warning] and [func@GLib.error].
  */
 void
 g_printerr (const gchar *format,
@@ -3479,18 +3554,31 @@ g_printerr (const gchar *format,
 
 /**
  * g_printf_string_upper_bound:
- * @format: the format string. See the printf() documentation
+ * @format: the format string. See the `printf()` documentation
  * @args: the parameters to be inserted into the format string
  *
  * Calculates the maximum space needed to store the output
- * of the sprintf() function.
+ * of the `sprintf()` function.
+ *
+ * If @format or @args are invalid, `0` is returned. This could happen if, for
+ * example, @format contains an `%lc` or `%ls` placeholder and @args contains a
+ * wide character which cannot be represented in multibyte encoding. `0`
+ * can also be returned legitimately if, for example, @format is `%s` and @args
+ * is an empty string. The caller is responsible for differentiating these two
+ * return cases if necessary. It is recommended to not use `%lc` or `%ls`
+ * placeholders in any case, as their behaviour is locale-dependent.
  *
- * Returns: the maximum space needed to store the formatted string
+ * Returns: the maximum space needed to store the formatted string, or `0` on error
  */
 gsize
 g_printf_string_upper_bound (const gchar *format,
                              va_list      args)
 {
   gchar c;
-  return _g_vsnprintf (&c, 1, format, args) + 1;
+  int count = _g_vsnprintf (&c, 1, format, args);
+
+  if (count < 0)
+    return 0;
+
+  return count + 1;
 }
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gmessages.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gmessages.h
index f2196fd8406..748c6ccb813 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gmessages.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gmessages.h
@@ -229,6 +229,11 @@ gchar           *g_log_writer_format_fields    (GLogLevelFlags   log_level,
                                                 gsize            n_fields,
                                                 gboolean         use_color);
 
+GLIB_AVAILABLE_IN_2_80
+GLogWriterOutput g_log_writer_syslog           (GLogLevelFlags   log_level,
+                                                const GLogField *fields,
+                                                gsize            n_fields,
+                                                gpointer         user_data);
 GLIB_AVAILABLE_IN_2_50
 GLogWriterOutput g_log_writer_journald         (GLogLevelFlags   log_level,
                                                 const GLogField *fields,
@@ -250,6 +255,9 @@ void            g_log_writer_default_set_use_stderr (gboolean use_stderr);
 GLIB_AVAILABLE_IN_2_68
 gboolean        g_log_writer_default_would_drop (GLogLevelFlags  log_level,
                                                  const char     *log_domain);
+GLIB_AVAILABLE_IN_2_80
+void            g_log_writer_default_set_debug_domains (const gchar * const *domains);
+
 
 /* G_MESSAGES_DEBUG enablement */
 GLIB_AVAILABLE_IN_2_72
@@ -544,6 +552,9 @@ GPrintFunc      g_set_printerr_handler  (GPrintFunc      func);
  *
  * Logs a warning if the expression is not true.
  *
+ * Unlike g_return_if_fail(), the expression is always evaluated, even if
+ * checks and assertions are disabled.
+ *
  * Since: 2.16
  */
 #define g_warn_if_fail(expr) \
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gnode.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gnode.c
index 56790a0d17c..07f810b3491 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gnode.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gnode.c
@@ -39,43 +39,6 @@
 
 #include "gtestutils.h"
 
-/**
- * SECTION:trees-nary
- * @title: N-ary Trees
- * @short_description: trees of data with any number of branches
- *
- * The #GNode struct and its associated functions provide a N-ary tree
- * data structure, where nodes in the tree can contain arbitrary data.
- *
- * To create a new tree use g_node_new().
- *
- * To insert a node into a tree use g_node_insert(),
- * g_node_insert_before(), g_node_append() and g_node_prepend().
- *
- * To create a new node and insert it into a tree use
- * g_node_insert_data(), g_node_insert_data_after(),
- * g_node_insert_data_before(), g_node_append_data()
- * and g_node_prepend_data().
- *
- * To reverse the children of a node use g_node_reverse_children().
- *
- * To find a node use g_node_get_root(), g_node_find(),
- * g_node_find_child(), g_node_child_index(), g_node_child_position(),
- * g_node_first_child(), g_node_last_child(), g_node_nth_child(),
- * g_node_first_sibling(), g_node_prev_sibling(), g_node_next_sibling()
- * or g_node_last_sibling().
- *
- * To get information about a node or tree use G_NODE_IS_LEAF(),
- * G_NODE_IS_ROOT(), g_node_depth(), g_node_n_nodes(),
- * g_node_n_children(), g_node_is_ancestor() or g_node_max_height().
- *
- * To traverse a tree, calling a function for each node visited in the
- * traversal, use g_node_traverse() or g_node_children_foreach().
- *
- * To remove a node or subtree from a tree use g_node_unlink() or
- * g_node_destroy().
- **/
-
 /**
  * GNode:
  * @data: contains the actual data of the node.
@@ -170,8 +133,8 @@ g_node_unlink (GNode *node)
 /**
  * g_node_copy_deep:
  * @node: a #GNode
- * @copy_func: the function which is called to copy the data inside each node,
- *   or %NULL to use the original data.
+ * @copy_func: (scope call): the function which is called to copy the data
+ *   inside each node, or %NULL to use the original data.
  * @data: data to pass to @copy_func
  *
  * Recursively copies a #GNode and its data.
@@ -812,7 +775,7 @@ g_node_depth_traverse_level (GNode             *node,
  *     depth will not be visited. If max_depth is -1 all nodes in
  *     the tree are visited. If depth is 1, only the root is visited.
  *     If depth is 2, the root and its children are visited. And so on.
- * @func: the function to call for each visited #GNode
+ * @func: (scope call): the function to call for each visited #GNode
  * @data: user data to pass to the function
  *
  * Traverses a tree starting at the given root #GNode.
@@ -1235,7 +1198,7 @@ g_node_last_sibling (GNode *node)
  * @node: a #GNode
  * @flags: which types of children are to be visited, one of
  *     %G_TRAVERSE_ALL, %G_TRAVERSE_LEAVES and %G_TRAVERSE_NON_LEAVES
- * @func: the function to call for each visited node
+ * @func: (scope call): the function to call for each visited node
  * @data: user data to pass to the function
  *
  * Calls a function for each of the children of a #GNode. Note that it
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gnulib/vasnprintf.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gnulib/vasnprintf.c
index a5b68db8c97..7e151b46212 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gnulib/vasnprintf.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gnulib/vasnprintf.c
@@ -379,7 +379,7 @@ multiply (mpn_t src1, mpn_t src2, mpn_t *dest)
     {
       /* src1 or src2 is zero.  */
       dest->nlimbs = 0;
-      dest->limbs = (mp_limb_t *) malloc (1);
+      dest->limbs = (mp_limb_t *) malloc (sizeof (mp_limb_t));
     }
   else
     {
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/goption.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/goption.c
index 80325b07857..1d04a704c1e 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/goption.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/goption.c
@@ -19,166 +19,6 @@
  * along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-/**
- * SECTION:goptioncontext
- * @Short_description: parses commandline options
- * @Title: Commandline option parser
- *
- * The GOption commandline parser is intended to be a simpler replacement
- * for the popt library. It supports short and long commandline options,
- * as shown in the following example:
- *
- * `testtreemodel -r 1 --max-size 20 --rand --display=:1.0 -vb -- file1 file2`
- *
- * The example demonstrates a number of features of the GOption
- * commandline parser:
- *
- * - Options can be single letters, prefixed by a single dash.
- *
- * - Multiple short options can be grouped behind a single dash.
- *
- * - Long options are prefixed by two consecutive dashes.
- *
- * - Options can have an extra argument, which can be a number, a string or
- *   a filename. For long options, the extra argument can be appended with
- *   an equals sign after the option name, which is useful if the extra
- *   argument starts with a dash, which would otherwise cause it to be
- *   interpreted as another option.
- *
- * - Non-option arguments are returned to the application as rest arguments.
- *
- * - An argument consisting solely of two dashes turns off further parsing,
- *   any remaining arguments (even those starting with a dash) are returned
- *   to the application as rest arguments.
- *
- * Another important feature of GOption is that it can automatically
- * generate nicely formatted help output. Unless it is explicitly turned
- * off with g_option_context_set_help_enabled(), GOption will recognize
- * the `--help`, `-?`, `--help-all` and `--help-groupname` options
- * (where `groupname` is the name of a #GOptionGroup) and write a text
- * similar to the one shown in the following example to stdout.
- *
- * |[
- * Usage:
- *   testtreemodel [OPTION...] - test tree model performance
- *
- * Help Options:
- *   -h, --help               Show help options
- *   --help-all               Show all help options
- *   --help-gtk               Show GTK Options
- *
- * Application Options:
- *   -r, --repeats=N          Average over N repetitions
- *   -m, --max-size=M         Test up to 2^M items
- *   --display=DISPLAY        X display to use
- *   -v, --verbose            Be verbose
- *   -b, --beep               Beep when done
- *   --rand                   Randomize the data
- * ]|
- *
- * GOption groups options in #GOptionGroups, which makes it easy to
- * incorporate options from multiple sources. The intended use for this is
- * to let applications collect option groups from the libraries it uses,
- * add them to their #GOptionContext, and parse all options by a single call
- * to g_option_context_parse(). See gtk_get_option_group() for an example.
- *
- * If an option is declared to be of type string or filename, GOption takes
- * care of converting it to the right encoding; strings are returned in
- * UTF-8, filenames are returned in the GLib filename encoding. Note that
- * this only works if setlocale() has been called before
- * g_option_context_parse().
- *
- * Here is a complete example of setting up GOption to parse the example
- * commandline above and produce the example help output.
- * |[<!-- language="C" -->
- * static gint repeats = 2;
- * static gint max_size = 8;
- * static gboolean verbose = FALSE;
- * static gboolean beep = FALSE;
- * static gboolean randomize = FALSE;
- *
- * static GOptionEntry entries[] =
- * {
- *   { "repeats", 'r', 0, G_OPTION_ARG_INT, &repeats, "Average over N repetitions", "N" },
- *   { "max-size", 'm', 0, G_OPTION_ARG_INT, &max_size, "Test up to 2^M items", "M" },
- *   { "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose, "Be verbose", NULL },
- *   { "beep", 'b', 0, G_OPTION_ARG_NONE, &beep, "Beep when done", NULL },
- *   { "rand", 0, 0, G_OPTION_ARG_NONE, &randomize, "Randomize the data", NULL },
- *   G_OPTION_ENTRY_NULL
- * };
- *
- * int
- * main (int argc, char *argv[])
- * {
- *   GError *error = NULL;
- *   GOptionContext *context;
- *
- *   context = g_option_context_new ("- test tree model performance");
- *   g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
- *   g_option_context_add_group (context, gtk_get_option_group (TRUE));
- *   if (!g_option_context_parse (context, &argc, &argv, &error))
- *     {
- *       g_print ("option parsing failed: %s\n", error->message);
- *       exit (1);
- *     }
- *
- *   ...
- *
- * }
- * ]|
- *
- * On UNIX systems, the argv that is passed to main() has no particular
- * encoding, even to the extent that different parts of it may have
- * different encodings.  In general, normal arguments and flags will be
- * in the current locale and filenames should be considered to be opaque
- * byte strings.  Proper use of %G_OPTION_ARG_FILENAME vs
- * %G_OPTION_ARG_STRING is therefore important.
- *
- * Note that on Windows, filenames do have an encoding, but using
- * #GOptionContext with the argv as passed to main() will result in a
- * program that can only accept commandline arguments with characters
- * from the system codepage.  This can cause problems when attempting to
- * deal with filenames containing Unicode characters that fall outside
- * of the codepage.
- *
- * A solution to this is to use g_win32_get_command_line() and
- * g_option_context_parse_strv() which will properly handle full Unicode
- * filenames.  If you are using #GApplication, this is done
- * automatically for you.
- *
- * The following example shows how you can use #GOptionContext directly
- * in order to correctly deal with Unicode filenames on Windows:
- *
- * |[<!-- language="C" -->
- * int
- * main (int argc, char **argv)
- * {
- *   GError *error = NULL;
- *   GOptionContext *context;
- *   gchar **args;
- *
- * #ifdef G_OS_WIN32
- *   args = g_win32_get_command_line ();
- * #else
- *   args = g_strdupv (argv);
- * #endif
- *
- *   // set up context
- *
- *   if (!g_option_context_parse_strv (context, &args, &error))
- *     {
- *       // error happened
- *     }
- *
- *   ...
- *
- *   g_strfreev (args);
- *
- *   ...
- * }
- * ]|
- */
-
 #include "config.h"
 
 #include <string.h>
@@ -195,6 +35,7 @@
 
 #include "gprintf.h"
 #include "glibintl.h"
+#include "gutilsprivate.h"
 
 #if defined G_OS_WIN32
 #include <windows.h>
@@ -328,7 +169,7 @@ _g_utf8_strwidth (const gchar *p)
 G_DEFINE_QUARK (g-option-context-error-quark, g_option_error)
 
 /**
- * g_option_context_new:
+ * g_option_context_new: (constructor)
  * @parameter_string: (nullable): a string which is displayed in
  *    the first line of `--help` output, after the usage summary
  *    `programname [OPTION...]`
@@ -353,7 +194,7 @@ G_DEFINE_QUARK (g-option-context-error-quark, g_option_error)
  * function set with g_option_context_set_translate_func(), so
  * it should normally be passed untranslated.
  *
- * Returns: a newly created #GOptionContext, which must be
+ * Returns: (transfer full): a newly created #GOptionContext, which must be
  *    freed with g_option_context_free() after use.
  *
  * Since: 2.6
@@ -381,7 +222,7 @@ g_option_context_new (const gchar *parameter_string)
 
 /**
  * g_option_context_free:
- * @context: a #GOptionContext
+ * @context: (transfer full): a #GOptionContext
  *
  * Frees context and all the groups which have been
  * added to it.
@@ -1973,10 +1814,7 @@ g_option_context_parse (GOptionContext   *context,
       else
   prgname = platform_get_argv0 ();
 
-      if (prgname)
-  g_set_prgname (prgname);
-      else
-  g_set_prgname ("<unknown>");
+      g_set_prgname_once (prgname ? prgname : "<unknown>");
 
       g_free (prgname);
     }
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gpathbuf.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gpathbuf.c
index c7cf04849cb..e51f3f1bd96 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gpathbuf.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gpathbuf.c
@@ -15,15 +15,13 @@
 #include "gstrfuncs.h"
 
 /**
- * SECTION:gpathbuf
- * @Title: GPathBuf
- * @Short_description: A mutable path builder
+ * GPathBuf:
  *
  * `GPathBuf` is a helper type that allows you to easily build paths from
  * individual elements, using the platform specific conventions for path
  * separators.
  *
- * |[<!-- language="C" -->
+ * ```c
  * g_auto (GPathBuf) path;
  *
  * g_path_buf_init (&path);
@@ -34,11 +32,11 @@
  *
  * g_autofree char *echo = g_path_buf_to_path (&path);
  * g_assert_cmpstr (echo, ==, "/usr/bin/echo");
- * ]|
+ * ```
  *
  * You can also load a full path and then operate on its components:
  *
- * |[<!-- language="C" -->
+ * ```c
  * g_auto (GPathBuf) path;
  *
  * g_path_buf_init_from_path (&path, "/usr/bin/echo");
@@ -48,9 +46,9 @@
  *
  * g_autofree char *sh = g_path_buf_to_path (&path);
  * g_assert_cmpstr (sh, ==, "/usr/bin/sh");
- * ]|
+ * ```
  *
- * `GPathBuf` is available since GLib 2.76.
+ * Since: 2.76
  */
 
 typedef struct {
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gpathbuf.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gpathbuf.h
index b42341998d1..1ea01f0358a 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gpathbuf.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gpathbuf.h
@@ -16,13 +16,6 @@ G_BEGIN_DECLS
 
 typedef struct _GPathBuf  GPathBuf;
 
-/**
- * GPathBuf: (copy-func g_path_buf_copy) (free-func g_path_buf_free)
- *
- * A mutable path builder.
- *
- * Since: 2.76
- */
 struct _GPathBuf
 {
   /*< private >*/
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gpattern.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gpattern.c
index d823896e30f..d885e5fd5a0 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gpattern.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gpattern.c
@@ -31,32 +31,24 @@
 #include "gutils.h"
 
 /**
- * SECTION:patterns
- * @title: Glob-style pattern matching
- * @short_description: matches strings against patterns containing '*'
- *                     (wildcard) and '?' (joker)
- *
- * The g_pattern_match* functions match a string
- * against a pattern containing '*' and '?' wildcards with similar
- * semantics as the standard glob() function: '*' matches an arbitrary,
+ * GPatternSpec:
+ *
+ * A `GPatternSpec` struct is the 'compiled' form of a glob-style pattern.
+ *
+ * The [func@GLib.pattern_match_simple] and [method@GLib.PatternSpec.match] functions
+ * match a string against a pattern containing '*' and '?' wildcards with similar
+ * semantics as the standard `glob()` function: '*' matches an arbitrary,
  * possibly empty, string, '?' matches an arbitrary character.
  *
- * Note that in contrast to glob(), the '/' character can be matched by
+ * Note that in contrast to `glob()`, the '/' character can be matched by
  * the wildcards, there are no '[...]' character ranges and '*' and '?'
  * can not be escaped to include them literally in a pattern.
  *
- * When multiple strings must be matched against the same pattern, it
- * is better to compile the pattern to a #GPatternSpec using
- * g_pattern_spec_new() and use g_pattern_match_string() instead of
- * g_pattern_match_simple(). This avoids the overhead of repeated
+ * When multiple strings must be matched against the same pattern, it is better
+ * to compile the pattern to a [struct@GLib.PatternSpec] using
+ * [ctor@GLib.PatternSpec.new] and use [method@GLib.PatternSpec.match_string]
+ * instead of [func@GLib.pattern_match_simple]. This avoids the overhead of repeated
  * pattern compilation.
- **/
-
-/**
- * GPatternSpec:
- *
- * A GPatternSpec struct is the 'compiled' form of a pattern. This
- * structure is opaque and its fields cannot be accessed directly.
  */
 
 /* keep enum and structure of gpattern.c and patterntest.c in sync */
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gprintf.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gprintf.c
index b1efecb05a8..898b7018d3d 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gprintf.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gprintf.c
@@ -30,20 +30,20 @@
 
 /**
  * g_printf:
- * @format: a standard printf() format string, but notice
- *          [string precision pitfalls][string-precision]
- * @...: the arguments to insert in the output.
+ * @format: a standard `printf()` format string, but notice
+ *   [string precision pitfalls](string-utils.html#string-precision-pitfalls)
+ * @...: the arguments to insert in the output
  *
- * An implementation of the standard printf() function which supports
+ * An implementation of the standard `printf()` function which supports
  * positional parameters, as specified in the Single Unix Specification.
  *
- * As with the standard printf(), this does not automatically append a trailing
+ * As with the standard `printf()`, this does not automatically append a trailing
  * new-line character to the message, so typically @format should end with its
  * own new-line character.
  *
  * `glib/gprintf.h` must be explicitly included in order to use this function.
  *
- * Returns: the number of bytes printed.
+ * Returns: the number of bytes printed
  *
  * Since: 2.2
  **/
@@ -63,17 +63,17 @@ g_printf (gchar const *format,
 
 /**
  * g_fprintf:
- * @file: (not nullable): the stream to write to.
- * @format: a standard printf() format string, but notice
- *          [string precision pitfalls][string-precision]
- * @...: the arguments to insert in the output.
+ * @file: (not nullable): the stream to write to
+ * @format: a standard `printf()` format string, but notice
+ *   [string precision pitfalls](string-utils.html#string-precision-pitfalls)
+ * @...: the arguments to insert in the output
  *
- * An implementation of the standard fprintf() function which supports
+ * An implementation of the standard `fprintf()` function which supports
  * positional parameters, as specified in the Single Unix Specification.
  *
  * `glib/gprintf.h` must be explicitly included in order to use this function.
  *
- * Returns: the number of bytes printed.
+ * Returns: the number of bytes printed
  *
  * Since: 2.2
  **/
@@ -95,23 +95,23 @@ g_fprintf (FILE        *file,
 /**
  * g_sprintf:
  * @string: A pointer to a memory buffer to contain the resulting string. It
- *          is up to the caller to ensure that the allocated buffer is large
- *          enough to hold the formatted result
- * @format: a standard printf() format string, but notice
- *          [string precision pitfalls][string-precision]
- * @...: the arguments to insert in the output.
+ *   is up to the caller to ensure that the allocated buffer is large
+ *   enough to hold the formatted result.
+ * @format: a standard `printf()` format string, but notice
+ *   [string precision pitfalls](string-utils.html#string-precision-pitfalls)
+ * @...: the arguments to insert in the output
  *
- * An implementation of the standard sprintf() function which supports
+ * An implementation of the standard `sprintf()` function which supports
  * positional parameters, as specified in the Single Unix Specification.
  *
- * Note that it is usually better to use g_snprintf(), to avoid the
+ * Note that it is usually better to use [func@GLib.snprintf], to avoid the
  * risk of buffer overflow.
  *
  * `glib/gprintf.h` must be explicitly included in order to use this function.
  *
- * See also g_strdup_printf().
+ * See also [func@GLib.strdup_printf].
  *
- * Returns: the number of bytes printed.
+ * Returns: the number of bytes printed
  *
  * Since: 2.2
  **/
@@ -132,18 +132,18 @@ g_sprintf (gchar       *string,
 
 /**
  * g_snprintf:
- * @string: the buffer to hold the output.
+ * @string: the buffer to hold the output
  * @n: the maximum number of bytes to produce (including the
- *     terminating nul character).
- * @format: a standard printf() format string, but notice
- *          [string precision pitfalls][string-precision]
- * @...: the arguments to insert in the output.
+ *   terminating nul character)
+ * @format: a standard `printf()` format string, but notice
+ *   [string precision pitfalls](string-utils.html#string-precision-pitfalls)
+ * @...: the arguments to insert in the output
  *
  * A safer form of the standard sprintf() function. The output is guaranteed
  * to not exceed @n characters (including the terminating nul character), so
  * it is easy to ensure that a buffer overflow cannot occur.
  *
- * See also g_strdup_printf().
+ * See also [func@GLib.strdup_printf].
  *
  * In versions of GLib prior to 1.2.3, this function may return -1 if the
  * output was truncated, and the truncated string may not be nul-terminated.
@@ -152,13 +152,13 @@ g_sprintf (gchar       *string,
  *
  * The return value of g_snprintf() conforms to the snprintf()
  * function as standardized in ISO C99. Note that this is different from
- * traditional snprintf(), which returns the length of the output string.
+ * traditional `snprintf()`, which returns the length of the output string.
  *
  * The format string may contain positional parameters, as specified in
  * the Single Unix Specification.
  *
  * Returns: the number of bytes which would be produced if the buffer
- *     was large enough.
+ *   was large enough
  **/
 gint
 g_snprintf (gchar *string,
@@ -178,16 +178,16 @@ g_snprintf (gchar *string,
 
 /**
  * g_vprintf:
- * @format: a standard printf() format string, but notice
- *          [string precision pitfalls][string-precision]
- * @args: the list of arguments to insert in the output.
+ * @format: a standard `printf()` format string, but notice
+ *   [string precision pitfalls](string-utils.html#string-precision-pitfalls)
+ * @args: the list of arguments to insert in the output
  *
- * An implementation of the standard vprintf() function which supports
+ * An implementation of the standard `vprintf()` function which supports
  * positional parameters, as specified in the Single Unix Specification.
  *
  * `glib/gprintf.h` must be explicitly included in order to use this function.
  *
- * Returns: the number of bytes printed.
+ * Returns: the number of bytes printed
  *
  * Since: 2.2
  **/
@@ -202,17 +202,17 @@ g_vprintf (gchar const *format,
 
 /**
  * g_vfprintf:
- * @file: (not nullable): the stream to write to.
- * @format: a standard printf() format string, but notice
- *          [string precision pitfalls][string-precision]
- * @args: the list of arguments to insert in the output.
+ * @file: (not nullable): the stream to write to
+ * @format: a standard `printf()` format string, but notice
+ *   [string precision pitfalls](string-utils.html#string-precision-pitfalls)
+ * @args: the list of arguments to insert in the output
  *
- * An implementation of the standard fprintf() function which supports
+ * An implementation of the standard `fprintf()` function which supports
  * positional parameters, as specified in the Single Unix Specification.
  *
  * `glib/gprintf.h` must be explicitly included in order to use this function.
  *
- * Returns: the number of bytes printed.
+ * Returns: the number of bytes printed
  *
  * Since: 2.2
  **/
@@ -228,17 +228,17 @@ g_vfprintf (FILE        *file,
 
 /**
  * g_vsprintf:
- * @string: the buffer to hold the output.
- * @format: a standard printf() format string, but notice
- *          [string precision pitfalls][string-precision]
- * @args: the list of arguments to insert in the output.
+ * @string: the buffer to hold the output
+ * @format: a standard `printf()` format string, but notice
+ *   [string precision pitfalls](string-utils.html#string-precision-pitfalls)
+ * @args: the list of arguments to insert in the output
  *
- * An implementation of the standard vsprintf() function which supports
+ * An implementation of the standard `vsprintf()` function which supports
  * positional parameters, as specified in the Single Unix Specification.
  *
  * `glib/gprintf.h` must be explicitly included in order to use this function.
  *
- * Returns: the number of bytes printed.
+ * Returns: the number of bytes printed
  *
  * Since: 2.2
  **/
@@ -255,33 +255,33 @@ g_vsprintf (gchar  *string,
 
 /**
  * g_vsnprintf:
- * @string: the buffer to hold the output.
+ * @string: the buffer to hold the output
  * @n: the maximum number of bytes to produce (including the
- *     terminating nul character).
- * @format: a standard printf() format string, but notice
- *          [string precision pitfalls][string-precision]
- * @args: the list of arguments to insert in the output.
+ *   terminating nul character)
+ * @format: a standard `printf()` format string, but notice
+ *   [string precision pitfalls](string-utils.html#string-precision-pitfalls)
+ * @args: the list of arguments to insert in the output
  *
- * A safer form of the standard vsprintf() function. The output is guaranteed
+ * A safer form of the standard `vsprintf()` function. The output is guaranteed
  * to not exceed @n characters (including the terminating nul character), so
  * it is easy to ensure that a buffer overflow cannot occur.
  *
- * See also g_strdup_vprintf().
+ * See also [func@GLib.strdup_vprintf].
  *
  * In versions of GLib prior to 1.2.3, this function may return -1 if the
  * output was truncated, and the truncated string may not be nul-terminated.
  * In versions prior to 1.3.12, this function returns the length of the output
  * string.
  *
- * The return value of g_vsnprintf() conforms to the vsnprintf() function
+ * The return value of `g_vsnprintf()` conforms to the `vsnprintf()` function
  * as standardized in ISO C99. Note that this is different from traditional
- * vsnprintf(), which returns the length of the output string.
+ * `vsnprintf()`, which returns the length of the output string.
  *
  * The format string may contain positional parameters, as specified in
  * the Single Unix Specification.
  *
  * Returns: the number of bytes which would be produced if the buffer
- *  was large enough.
+ *  was large enough
  */
 gint
 g_vsnprintf (gchar   *string,
@@ -297,25 +297,26 @@ g_vsnprintf (gchar   *string,
 
 /**
  * g_vasprintf:
- * @string: (not optional) (nullable): the return location for the newly-allocated string,
- *   which will be %NULL if (and only if) this function fails
- * @format: (not nullable): a standard printf() format string, but notice
- *          [string precision pitfalls][string-precision]
- * @args: the list of arguments to insert in the output.
- *
- * An implementation of the GNU vasprintf() function which supports
+ * @string: (out) (not optional) (nullable): the return location for the
+ *   newly-allocated string, which will be `NULL` if (and only if)
+ *   this function fails
+ * @format: (not nullable): a standard `printf()` format string, but notice
+ *   [string precision pitfalls](string-utils.html#string-precision-pitfalls)
+ * @args: the list of arguments to insert in the output
+ *
+ * An implementation of the GNU `vasprintf()` function which supports
  * positional parameters, as specified in the Single Unix Specification.
- * This function is similar to g_vsprintf(), except that it allocates a
+ * This function is similar to [func@GLib.vsprintf], except that it allocates a
  * string to hold the output, instead of putting the output in a buffer
  * you allocate in advance.
  *
- * The returned value in @string is guaranteed to be non-NULL, unless
+ * The returned value in @string is guaranteed to be non-`NULL`, unless
  * @format contains `%lc` or `%ls` conversions, which can fail if no
  * multibyte representation is available for the given character.
  *
  * `glib/gprintf.h` must be explicitly included in order to use this function.
  *
- * Returns: the number of bytes printed, or `-1` on failure
+ * Returns: the number of bytes printed, or -1 on failure
  *
  * Since: 2.4
  **/
@@ -359,19 +360,29 @@ g_vasprintf (gchar      **string,
 
   {
     va_list args2;
+    char c;
+    int max_len;
 
     va_copy (args2, args);
 
-    *string = g_new (gchar, g_printf_string_upper_bound (format, args));
+    max_len = _g_vsnprintf (&c, 1, format, args);
+    if (max_len < 0)
+      {
+        /* This can happen if @format contains `%ls` or `%lc` and @args contains
+         * something not representable in the current locale’s encoding (which
+         * should be UTF-8, but ymmv). Basically: don’t use `%ls` or `%lc`. */
+        va_end (args2);
+        *string = NULL;
+        return -1;
+      }
+
+    *string = g_new (gchar, (size_t) max_len + 1);
 
     len = _g_vsprintf (*string, format, args2);
     va_end (args2);
 
-    if (len < 0)
-      {
-        g_free (*string);
-        *string = NULL;
-      }
+    /* _g_vsprintf() should have exactly the same failure modes as _g_vsnprintf() */
+    g_assert (len >= 0);
   }
 #endif
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gqsort.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gqsort.c
index fca7331c575..bb2be7711e6 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gqsort.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gqsort.c
@@ -286,7 +286,7 @@ msort_r (void *b, size_t n, size_t s, GCompareDataFunc cmp, void *arg)
  * @pbase: (not nullable): start of array to sort
  * @total_elems: elements in the array
  * @size: size of each element
- * @compare_func: function to compare elements
+ * @compare_func: (scope call): function to compare elements
  * @user_data: data to pass to @compare_func
  *
  * This is just like the standard C qsort() function, but
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gquark.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gquark.c
index 42cb393644e..0b6863a230a 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gquark.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gquark.c
@@ -43,6 +43,7 @@
 #include "gtestutils.h"
 #include "glib_trace.h"
 #include "glib-init.h"
+#include "glib-private.h"
 
 #define QUARK_BLOCK_SIZE         2048
 #define QUARK_STRING_BLOCK_SIZE (4096 - sizeof (gsize))
@@ -67,40 +68,34 @@ g_quark_init (void)
 }
 
 /**
- * SECTION:quarks
- * @title: Quarks
- * @short_description: a 2-way association between a string and a
- *     unique integer identifier
+ * GQuark:
+ *
+ * A GQuark is a non-zero integer which uniquely identifies a
+ * particular string.
  *
- * Quarks are associations between strings and integer identifiers.
- * Given either the string or the #GQuark identifier it is possible to
+ * A GQuark value of zero is associated to `NULL`.
+ *
+ * Given either the string or the `GQuark` identifier it is possible to
  * retrieve the other.
  *
- * Quarks are used for both [datasets][glib-Datasets] and
- * [keyed data lists][glib-Keyed-Data-Lists].
+ * Quarks are used for both
+ * [datasets and keyed data lists](datalist-and-dataset.html).
  *
- * To create a new quark from a string, use g_quark_from_string() or
- * g_quark_from_static_string().
+ * To create a new quark from a string, use [func@GLib.quark_from_string]
+ * or [func@GLib.quark_from_static_string].
  *
- * To find the string corresponding to a given #GQuark, use
- * g_quark_to_string().
+ * To find the string corresponding to a given `GQuark`, use
+ * [func@GLib.quark_to_string].
  *
- * To find the #GQuark corresponding to a given string, use
- * g_quark_try_string().
+ * To find the `GQuark` corresponding to a given string, use
+ * [func@GLib.quark_try_string].
  *
  * Another use for the string pool maintained for the quark functions
- * is string interning, using g_intern_string() or
- * g_intern_static_string(). An interned string is a canonical
+ * is string interning, using [func@GLib.intern_string] or
+ * [func@GLib.intern_static_string]. An interned string is a canonical
  * representation for a string. One important advantage of interned
  * strings is that they can be compared for equality by a simple
- * pointer comparison, rather than using strcmp().
- */
-
-/**
- * GQuark:
- *
- * A GQuark is a non-zero integer which uniquely identifies a
- * particular string. A GQuark value of zero is associated to %NULL.
+ * pointer comparison, rather than using `strcmp()`.
  */
 
 /**
@@ -301,6 +296,7 @@ quark_new (gchar *string)
        * us to do lockless lookup of the arrays, and there shouldn't be that
        * many quarks in an app
        */
+      g_ignore_leak (g_atomic_pointer_get (&quarks));
       g_atomic_pointer_set (&quarks, quarks_new);
     }
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gqueue.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gqueue.c
index 8df89f79af7..86945505f54 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gqueue.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gqueue.c
@@ -24,35 +24,6 @@
  * MT safe
  */
 
-/**
- * SECTION:queue
- * @Title: Double-ended Queues
- * @Short_description: double-ended queue data structure
- *
- * The #GQueue structure and its associated functions provide a standard
- * queue data structure. Internally, GQueue uses the same data structure
- * as #GList to store elements with the same complexity over
- * insertion/deletion (O(1)) and access/search (O(n)) operations.
- *
- * The data contained in each element can be either integer values, by
- * using one of the [Type Conversion Macros][glib-Type-Conversion-Macros],
- * or simply pointers to any type of data.
- *
- * As with all other GLib data structures, #GQueue is not thread-safe.
- * For a thread-safe queue, use #GAsyncQueue.
- *
- * To create a new GQueue, use g_queue_new().
- *
- * To initialize a statically-allocated GQueue, use %G_QUEUE_INIT or
- * g_queue_init().
- *
- * To add elements, use g_queue_push_head(), g_queue_push_head_link(),
- * g_queue_push_tail() and g_queue_push_tail_link().
- *
- * To remove elements, use g_queue_pop_head() and g_queue_pop_tail().
- *
- * To free the entire queue, use g_queue_free().
- */
 #include "config.h"
 
 #include "gqueue.h"
@@ -256,7 +227,7 @@ g_queue_copy (GQueue *queue)
 /**
  * g_queue_foreach:
  * @queue: a #GQueue
- * @func: the function to call for each element's data
+ * @func: (scope call): the function to call for each element's data
  * @user_data: user data to pass to @func
  *
  * Calls @func for each element in the queue passing @user_data to the
@@ -310,7 +281,7 @@ g_queue_find (GQueue        *queue,
  * g_queue_find_custom:
  * @queue: a #GQueue
  * @data: user data passed to @func
- * @func: a #GCompareFunc to call for each element. It should return 0
+ * @func: (scope call): a #GCompareFunc to call for each element. It should return 0
  *     when the desired element is found
  *
  * Finds an element in a #GQueue, using a supplied function to find the
@@ -337,7 +308,7 @@ g_queue_find_custom (GQueue        *queue,
 /**
  * g_queue_sort:
  * @queue: a #GQueue
- * @compare_func: the #GCompareDataFunc used to sort @queue. This function
+ * @compare_func: (scope call): the #GCompareDataFunc used to sort @queue. This function
  *     is passed two elements of the queue and should return 0 if they are
  *     equal, a negative value if the first comes before the second, and
  *     a positive value if the second comes before the first.
@@ -1165,7 +1136,7 @@ g_queue_insert_after_link (GQueue   *queue,
  * g_queue_insert_sorted:
  * @queue: a #GQueue
  * @data: the data to insert
- * @func: the #GCompareDataFunc used to compare elements in the queue. It is
+ * @func: (scope call): the #GCompareDataFunc used to compare elements in the queue. It is
  *     called with two elements of the @queue and @user_data. It should
  *     return 0 if the elements are equal, a negative value if the first
  *     element comes before the second, and a positive value if the second
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/grand.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/grand.c
index ea142d2e24d..cd831d10f2e 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/grand.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/grand.c
@@ -62,57 +62,6 @@
 #include <process.h> /* For getpid() */
 #endif
 
-/**
- * SECTION:random_numbers
- * @title: Random Numbers
- * @short_description: pseudo-random number generator
- *
- * The following functions allow you to use a portable, fast and good
- * pseudo-random number generator (PRNG).
- *
- * Do not use this API for cryptographic purposes such as key
- * generation, nonces, salts or one-time pads.
- *
- * This PRNG is suitable for non-cryptographic use such as in games
- * (shuffling a card deck, generating levels), generating data for
- * a test suite, etc. If you need random data for cryptographic
- * purposes, it is recommended to use platform-specific APIs such
- * as `/dev/random` on UNIX, or CryptGenRandom() on Windows.
- *
- * GRand uses the Mersenne Twister PRNG, which was originally
- * developed by Makoto Matsumoto and Takuji Nishimura. Further
- * information can be found at
- * [this page](http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html).
- *
- * If you just need a random number, you simply call the g_random_*
- * functions, which will create a globally used #GRand and use the
- * according g_rand_* functions internally. Whenever you need a
- * stream of reproducible random numbers, you better create a
- * #GRand yourself and use the g_rand_* functions directly, which
- * will also be slightly faster. Initializing a #GRand with a
- * certain seed will produce exactly the same series of random
- * numbers on all platforms. This can thus be used as a seed for
- * e.g. games.
- *
- * The g_rand*_range functions will return high quality equally
- * distributed random numbers, whereas for example the
- * `(g_random_int()%max)` approach often
- * doesn't yield equally distributed numbers.
- *
- * GLib changed the seeding algorithm for the pseudo-random number
- * generator Mersenne Twister, as used by #GRand. This was necessary,
- * because some seeds would yield very bad pseudo-random streams.
- * Also the pseudo-random integers generated by g_rand*_int_range()
- * will have a slightly better equal distribution with the new
- * version of GLib.
- *
- * The original seeding and generation algorithms, as found in
- * GLib 2.0.x, can be used instead of the new ones by setting the
- * environment variable `G_RANDOM_VERSION` to the value of '2.0'.
- * Use the GLib-2.0 algorithms only if you have sequences of numbers
- * generated with Glib-2.0 that you need to reproduce exactly.
- */
-
 /**
  * GRand:
  *
@@ -170,12 +119,12 @@ struct _GRand
 };
 
 /**
- * g_rand_new_with_seed:
+ * g_rand_new_with_seed: (constructor)
  * @seed: a value to initialize the random number generator
  *
  * Creates a new random number generator initialized with @seed.
  *
- * Returns: the new #GRand
+ * Returns: (transfer full): the new #GRand
  **/
 GRand*
 g_rand_new_with_seed (guint32 seed)
@@ -186,14 +135,14 @@ g_rand_new_with_seed (guint32 seed)
 }
 
 /**
- * g_rand_new_with_seed_array:
+ * g_rand_new_with_seed_array: (constructor)
  * @seed: an array of seeds to initialize the random number generator
  * @seed_length: an array of seeds to initialize the random number
  *     generator
  *
  * Creates a new random number generator initialized with @seed.
  *
- * Returns: the new #GRand
+ * Returns: (transfer full): the new #GRand
  *
  * Since: 2.4
  */
@@ -207,7 +156,7 @@ g_rand_new_with_seed_array (const guint32 *seed,
 }
 
 /**
- * g_rand_new:
+ * g_rand_new: (constructor)
  *
  * Creates a new random number generator initialized with a seed taken
  * either from `/dev/urandom` (if existing) or from the current time
@@ -215,7 +164,7 @@ g_rand_new_with_seed_array (const guint32 *seed,
  *
  * On Windows, the seed is taken from rand_s().
  *
- * Returns: the new #GRand
+ * Returns: (transfer full): the new #GRand
  */
 GRand*
 g_rand_new (void)
@@ -310,7 +259,7 @@ g_rand_free (GRand *rand)
  * This way you can take a snapshot of the random number generator for
  * replaying later.
  *
- * Returns: the new #GRand
+ * Returns: (transfer full): the new #GRand
  *
  * Since: 2.4
  */
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/grcbox.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/grcbox.c
index 2538157a85f..4238247e55a 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/grcbox.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/grcbox.c
@@ -34,136 +34,6 @@
 
 #include <string.h>
 
-/**
- * SECTION:rcbox
- * @Title: Reference counted data
- * @Short_description: Allocated memory with reference counting semantics
- *
- * A "reference counted box", or "RcBox", is an opaque wrapper data type
- * that is guaranteed to be as big as the size of a given data type, and
- * which augments the given data type with reference counting semantics
- * for its memory management.
- *
- * RcBox is useful if you have a plain old data type, like a structure
- * typically placed on the stack, and you wish to provide additional API
- * to use it on the heap; or if you want to implement a new type to be
- * passed around by reference without necessarily implementing copy/free
- * semantics or your own reference counting.
- *
- * The typical use is:
- *
- * |[<!-- language="C" -->
- * typedef struct {
- *   char *name;
- *   char *address;
- *   char *city;
- *   char *state;
- *   int age;
- * } Person;
- *
- * Person *
- * person_new (void)
- * {
- *   return g_rc_box_new0 (Person);
- * }
- * ]|
- *
- * Every time you wish to acquire a reference on the memory, you should
- * call g_rc_box_acquire(); similarly, when you wish to release a reference
- * you should call g_rc_box_release():
- *
- * |[<!-- language="C" -->
- * // Add a Person to the Database; the Database acquires ownership
- * // of the Person instance
- * void
- * add_person_to_database (Database *db, Person *p)
- * {
- *   db->persons = g_list_prepend (db->persons, g_rc_box_acquire (p));
- * }
- *
- * // Removes a Person from the Database; the reference acquired by
- * // add_person_to_database() is released here
- * void
- * remove_person_from_database (Database *db, Person *p)
- * {
- *   db->persons = g_list_remove (db->persons, p);
- *   g_rc_box_release (p);
- * }
- * ]|
- *
- * If you have additional memory allocated inside the structure, you can
- * use g_rc_box_release_full(), which takes a function pointer, which
- * will be called if the reference released was the last:
- *
- * |[<!-- language="C" -->
- * void
- * person_clear (Person *p)
- * {
- *   g_free (p->name);
- *   g_free (p->address);
- *   g_free (p->city);
- *   g_free (p->state);
- * }
- *
- * void
- * remove_person_from_database (Database *db, Person *p)
- * {
- *   db->persons = g_list_remove (db->persons, p);
- *   g_rc_box_release_full (p, (GDestroyNotify) person_clear);
- * }
- * ]|
- *
- * If you wish to transfer the ownership of a reference counted data
- * type without increasing the reference count, you can use g_steal_pointer():
- *
- * |[<!-- language="C" -->
- *   Person *p = g_rc_box_new (Person);
- *
- *   // fill_person_details() is defined elsewhere
- *   fill_person_details (p);
- *
- *   // add_person_to_database_no_ref() is defined elsewhere; it adds
- *   // a Person to the Database without taking a reference
- *   add_person_to_database_no_ref (db, g_steal_pointer (&p));
- * ]|
- *
- * ## Thread safety
- *
- * The reference counting operations on data allocated using g_rc_box_alloc(),
- * g_rc_box_new(), and g_rc_box_dup() are not thread safe; it is your code's
- * responsibility to ensure that references are acquired are released on the
- * same thread.
- *
- * If you need thread safe reference counting, see the [atomic reference counted
- * data][arcbox] API.
- *
- * ## Automatic pointer clean up
- *
- * If you want to add g_autoptr() support to your plain old data type through
- * reference counting, you can use the G_DEFINE_AUTOPTR_CLEANUP_FUNC() and
- * g_rc_box_release():
- *
- * |[<!-- language="C" -->
- * G_DEFINE_AUTOPTR_CLEANUP_FUNC (MyDataStruct, g_rc_box_release)
- * ]|
- *
- * If you need to clear the contents of the data, you will need to use an
- * ancillary function that calls g_rc_box_release_full():
- *
- * |[<!-- language="C" -->
- * static void
- * my_data_struct_release (MyDataStruct *data)
- * {
- *   // my_data_struct_clear() is defined elsewhere
- *   g_rc_box_release_full (data, (GDestroyNotify) my_data_struct_clear);
- * }
- *
- * G_DEFINE_AUTOPTR_CLEANUP_FUNC (MyDataStruct, my_data_struct_release)
- * ]|
- *
- * Since: 2.58
- */
-
 /* We use the same alignment as GTypeInstance and GNU libc's malloc */
 #define ALIGN_STRUCT(offset)    ((offset + (STRUCT_ALIGNMENT - 1)) & -STRUCT_ALIGNMENT)
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/grefcount.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/grefcount.c
index 38dfdbcad07..df0ddc52cbc 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/grefcount.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/grefcount.c
@@ -18,29 +18,6 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-/**
- * SECTION:refcount
- * @Title: Reference counting
- * @Short_description: Reference counting types and functions
- *
- * Reference counting is a garbage collection mechanism that is based on
- * assigning a counter to a data type, or any memory area; the counter is
- * increased whenever a new reference to that data type is acquired, and
- * decreased whenever the reference is released. Once the last reference
- * is released, the resources associated to that data type are freed.
- *
- * GLib uses reference counting in many of its data types, and provides
- * the #grefcount and #gatomicrefcount types to implement safe and atomic
- * reference counting semantics in new data types.
- *
- * It is important to note that #grefcount and #gatomicrefcount should be
- * considered completely opaque types; you should always use the provided
- * API to increase and decrease the counters, and you should never check
- * their content directly, or compare their content with other values.
- *
- * Since: 2.58
- */
-
 #include "config.h"
 
 #include "grefcount.h"
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gscanner.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gscanner.c
index 759f7d4ed3f..5a6a30b4c8a 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gscanner.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gscanner.c
@@ -54,15 +54,6 @@
 #endif
 
 
-/**
- * SECTION:scanner
- * @title: Lexical Scanner
- * @short_description: a general purpose lexical scanner
- *
- * The #GScanner and its associated functions provide a
- * general purpose lexical scanner.
- */
-
 /**
  * GScannerMsgFunc:
  * @scanner: a #GScanner
@@ -196,7 +187,7 @@
  * @next_position: char number of the last token from g_scanner_peek_next_token()
  * @msg_handler: handler function for _warn and _error
  *
- * The data structure representing a lexical scanner.
+ * `GScanner` provides a general-purpose lexical scanner.
  *
  * You should set @input_name after creating the scanner, since
  * it is used by the default message handler when displaying
@@ -904,7 +895,7 @@ g_scanner_foreach_internal (gpointer  _key,
  * g_scanner_scope_foreach_symbol:
  * @scanner: a #GScanner
  * @scope_id: the scope id
- * @func: the function to call for each symbol/value pair
+ * @func: (scope call): the function to call for each symbol/value pair
  * @user_data: user data to pass to the function
  *
  * Calls the given function for each of the symbol/value pairs
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gscripttable.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gscripttable.h
index e695ba33e3a..6d9d1bb9667 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gscripttable.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gscripttable.h
@@ -2799,8 +2799,7 @@ static const struct {
  { 0x2e80,    26, G_UNICODE_SCRIPT_HAN },
  { 0x2e9b,    89, G_UNICODE_SCRIPT_HAN },
  { 0x2f00,   214, G_UNICODE_SCRIPT_HAN },
- { 0x2ff0,    12, G_UNICODE_SCRIPT_COMMON },
- { 0x3000,     5, G_UNICODE_SCRIPT_COMMON },
+ { 0x2ff0,    21, G_UNICODE_SCRIPT_COMMON },
  { 0x3005,     1, G_UNICODE_SCRIPT_HAN },
  { 0x3006,     1, G_UNICODE_SCRIPT_COMMON },
  { 0x3007,     1, G_UNICODE_SCRIPT_HAN },
@@ -2824,6 +2823,7 @@ static const struct {
  { 0x3190,    16, G_UNICODE_SCRIPT_COMMON },
  { 0x31a0,    32, G_UNICODE_SCRIPT_BOPOMOFO },
  { 0x31c0,    36, G_UNICODE_SCRIPT_COMMON },
+ { 0x31ef,     1, G_UNICODE_SCRIPT_COMMON },
  { 0x31f0,    16, G_UNICODE_SCRIPT_KATAKANA },
  { 0x3200,    31, G_UNICODE_SCRIPT_HANGUL },
  { 0x3220,    64, G_UNICODE_SCRIPT_COMMON },
@@ -3341,6 +3341,7 @@ static const struct {
  { 0x2b740,   222, G_UNICODE_SCRIPT_HAN },
  { 0x2b820,  5762, G_UNICODE_SCRIPT_HAN },
  { 0x2ceb0,  7473, G_UNICODE_SCRIPT_HAN },
+ { 0x2ebf0,   622, G_UNICODE_SCRIPT_HAN },
  { 0x2f800,   542, G_UNICODE_SCRIPT_HAN },
  { 0x30000,  4939, G_UNICODE_SCRIPT_HAN },
  { 0x31350,  4192, G_UNICODE_SCRIPT_HAN },
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gsequence.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gsequence.c
index ead827d4661..81f0d085afd 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gsequence.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gsequence.c
@@ -25,54 +25,6 @@
 #include "gmem.h"
 #include "gtestutils.h"
 #include "gslice.h"
-/**
- * SECTION:sequence
- * @title: Sequences
- * @short_description: scalable lists
- *
- * The #GSequence data structure has the API of a list, but is
- * implemented internally with a balanced binary tree. This means that
- * most of the operations  (access, search, insertion, deletion, ...) on
- * #GSequence are O(log(n)) in average and O(n) in worst case for time
- * complexity. But, note that maintaining a balanced sorted list of n
- * elements is done in time O(n log(n)).
- * The data contained in each element can be either integer values, by using
- * of the [Type Conversion Macros][glib-Type-Conversion-Macros], or simply
- * pointers to any type of data.
- *
- * A #GSequence is accessed through "iterators", represented by a
- * #GSequenceIter. An iterator represents a position between two
- * elements of the sequence. For example, the "begin" iterator
- * represents the gap immediately before the first element of the
- * sequence, and the "end" iterator represents the gap immediately
- * after the last element. In an empty sequence, the begin and end
- * iterators are the same.
- *
- * Some methods on #GSequence operate on ranges of items. For example
- * g_sequence_foreach_range() will call a user-specified function on
- * each element with the given range. The range is delimited by the
- * gaps represented by the passed-in iterators, so if you pass in the
- * begin and end iterators, the range in question is the entire
- * sequence.
- *
- * The function g_sequence_get() is used with an iterator to access the
- * element immediately following the gap that the iterator represents.
- * The iterator is said to "point" to that element.
- *
- * Iterators are stable across most operations on a #GSequence. For
- * example an iterator pointing to some element of a sequence will
- * continue to point to that element even after the sequence is sorted.
- * Even moving an element to another sequence using for example
- * g_sequence_move_range() will not invalidate the iterators pointing
- * to it. The only operation that will invalidate an iterator is when
- * the element it points to is removed from any sequence.
- *
- * To sort the data, either use g_sequence_insert_sorted() or
- * g_sequence_insert_sorted_iter() to add data to the #GSequence or, if
- * you want to add a large amount of data, it is more efficient to call
- * g_sequence_sort() or g_sequence_sort_iter() after doing unsorted
- * insertions.
- */
 
 /**
  * GSequenceIter:
@@ -303,7 +255,7 @@ g_sequence_free (GSequence *seq)
  * g_sequence_foreach_range:
  * @begin: a #GSequenceIter
  * @end: a #GSequenceIter
- * @func: a #GFunc
+ * @func: (scope call): a #GFunc
  * @user_data: user data passed to @func
  *
  * Calls @func for each item in the range (@begin, @end) passing
@@ -345,7 +297,7 @@ g_sequence_foreach_range (GSequenceIter *begin,
 /**
  * g_sequence_foreach:
  * @seq: a #GSequence
- * @func: the function to call for each item in @seq
+ * @func: (scope call): the function to call for each item in @seq
  * @user_data: user data passed to @func
  *
  * Calls @func for each item in the sequence passing @user_data
@@ -675,7 +627,7 @@ g_sequence_move_range (GSequenceIter *dest,
 /**
  * g_sequence_sort:
  * @seq: a #GSequence
- * @cmp_func: the function used to sort the sequence
+ * @cmp_func: (scope call): the function used to sort the sequence
  * @cmp_data: user data passed to @cmp_func
  *
  * Sorts @seq using @cmp_func.
@@ -707,7 +659,7 @@ g_sequence_sort (GSequence        *seq,
  * g_sequence_insert_sorted:
  * @seq: a #GSequence
  * @data: the data to insert
- * @cmp_func: the function used to compare items in the sequence
+ * @cmp_func: (scope call): the function used to compare items in the sequence
  * @cmp_data: user data passed to @cmp_func.
  *
  * Inserts @data into @seq using @cmp_func to determine the new
@@ -749,7 +701,7 @@ g_sequence_insert_sorted (GSequence        *seq,
 /**
  * g_sequence_sort_changed:
  * @iter: A #GSequenceIter
- * @cmp_func: the function used to compare items in the sequence
+ * @cmp_func: (scope call): the function used to compare items in the sequence
  * @cmp_data: user data passed to @cmp_func.
  *
  * Moves the data pointed to by @iter to a new position as indicated by
@@ -790,7 +742,7 @@ g_sequence_sort_changed (GSequenceIter    *iter,
  * g_sequence_search:
  * @seq: a #GSequence
  * @data: data for the new item
- * @cmp_func: the function used to compare items in the sequence
+ * @cmp_func: (scope call): the function used to compare items in the sequence
  * @cmp_data: user data passed to @cmp_func
  *
  * Returns an iterator pointing to the position where @data would
@@ -834,7 +786,7 @@ g_sequence_search (GSequence        *seq,
  * g_sequence_lookup:
  * @seq: a #GSequence
  * @data: data to look up
- * @cmp_func: the function used to compare items in the sequence
+ * @cmp_func: (scope call): the function used to compare items in the sequence
  * @cmp_data: user data passed to @cmp_func
  *
  * Returns an iterator pointing to the position of the first item found
@@ -878,7 +830,7 @@ g_sequence_lookup (GSequence        *seq,
 /**
  * g_sequence_sort_iter:
  * @seq: a #GSequence
- * @cmp_func: the function used to compare iterators in the sequence
+ * @cmp_func: (scope call): the function used to compare iterators in the sequence
  * @cmp_data: user data passed to @cmp_func
  *
  * Like g_sequence_sort(), but uses a #GSequenceIterCompareFunc instead
@@ -932,7 +884,7 @@ g_sequence_sort_iter (GSequence                *seq,
 /**
  * g_sequence_sort_changed_iter:
  * @iter: a #GSequenceIter
- * @iter_cmp: the function used to compare iterators in the sequence
+ * @iter_cmp: (scope call): the function used to compare iterators in the sequence
  * @cmp_data: user data passed to @cmp_func
  *
  * Like g_sequence_sort_changed(), but uses
@@ -997,7 +949,7 @@ g_sequence_sort_changed_iter (GSequenceIter            *iter,
  * g_sequence_insert_sorted_iter:
  * @seq: a #GSequence
  * @data: data for the new item
- * @iter_cmp: the function used to compare iterators in the sequence
+ * @iter_cmp: (scope call): the function used to compare iterators in the sequence
  * @cmp_data: user data passed to @iter_cmp
  *
  * Like g_sequence_insert_sorted(), but uses
@@ -1064,7 +1016,7 @@ g_sequence_insert_sorted_iter (GSequence                *seq,
  * g_sequence_search_iter:
  * @seq: a #GSequence
  * @data: data for the new item
- * @iter_cmp: the function used to compare iterators in the sequence
+ * @iter_cmp: (scope call): the function used to compare iterators in the sequence
  * @cmp_data: user data passed to @iter_cmp
  *
  * Like g_sequence_search(), but uses a #GSequenceIterCompareFunc
@@ -1122,7 +1074,7 @@ g_sequence_search_iter (GSequence                *seq,
  * g_sequence_lookup_iter:
  * @seq: a #GSequence
  * @data: data to look up
- * @iter_cmp: the function used to compare iterators in the sequence
+ * @iter_cmp: (scope call): the function used to compare iterators in the sequence
  * @cmp_data: user data passed to @iter_cmp
  *
  * Like g_sequence_lookup(), but uses a #GSequenceIterCompareFunc
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gshell.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gshell.c
index 28333a8713d..779a6858258 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gshell.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gshell.c
@@ -33,20 +33,6 @@
 #include "glibintl.h"
 #include "gthread.h"
 
-/**
- * SECTION:shell
- * @title: Shell-related Utilities
- * @short_description: shell-like commandline handling
- *
- * GLib provides the functions g_shell_quote() and g_shell_unquote()
- * to handle shell-like quoting in strings. The function g_shell_parse_argv()
- * parses a string similar to the way a POSIX shell (/bin/sh) would.
- *
- * Note that string handling in shells has many obscure and historical
- * corner-cases which these functions do not necessarily reproduce. They
- * are good enough in practice, though.
- */
-
 /**
  * G_SHELL_ERROR:
  *
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gslice.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gslice.c
index 28a8032ca72..83b6708a0c3 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gslice.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gslice.c
@@ -30,65 +30,6 @@
 #include "glib_trace.h"
 #include "gprintf.h"
 
-/**
- * SECTION:memory_slices
- * @title: Memory Slices
- * @short_description: efficient way to allocate groups of equal-sized
- *     chunks of memory
- *
- * GSlice was a space-efficient and multi-processing scalable way to allocate
- * equal sized pieces of memory. Since GLib 2.76, its implementation has been
- * removed and it calls g_malloc() and g_free_sized(), because the performance
- * of the system-default allocators has improved on all platforms since GSlice
- * was written.
- *
- * The GSlice APIs have not been deprecated, as they are widely in use and doing
- * so would be very disruptive for little benefit.
- *
- * New code should be written using g_new()/g_malloc() and g_free_sized() or
- * g_free(). There is no particular benefit in porting existing code away from
- * g_slice_new()/g_slice_free() unless it’s being rewritten anyway.
- *
- * Here is an example for using the slice allocator:
- * |[<!-- language="C" -->
- * gchar *mem[10000];
- * gint i;
- *
- * // Allocate 10000 blocks.
- * for (i = 0; i < 10000; i++)
- *   {
- *     mem[i] = g_slice_alloc (50);
- *
- *     // Fill in the memory with some junk.
- *     for (j = 0; j < 50; j++)
- *       mem[i][j] = i * j;
- *   }
- *
- * // Now free all of the blocks.
- * for (i = 0; i < 10000; i++)
- *   g_slice_free1 (50, mem[i]);
- * ]|
- *
- * And here is an example for using the using the slice allocator
- * with data structures:
- * |[<!-- language="C" -->
- * GRealArray *array;
- *
- * // Allocate one block, using the g_slice_new() macro.
- * array = g_slice_new (GRealArray);
- *
- * // We can now use array just like a normal pointer to a structure.
- * array->data            = NULL;
- * array->len             = 0;
- * array->alloc           = 0;
- * array->zero_terminated = (zero_terminated ? 1 : 0);
- * array->clear           = (clear ? 1 : 0);
- * array->elt_size        = elt_size;
- *
- * // We can free the block, so it can be reused.
- * g_slice_free (GRealArray, array);
- * ]|
- */
 
 /* --- auxiliary functions --- */
 void
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gslice.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gslice.h
index dc7782b4cb9..5cc1e38ecb2 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gslice.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gslice.h
@@ -107,10 +107,12 @@ gint64   g_slice_get_config    (GSliceConfig ckey);
 GLIB_DEPRECATED_IN_2_34
 gint64*  g_slice_get_config_state  (GSliceConfig ckey, gint64 address, guint *n_values);
 
+#ifndef __GI_SCANNER__
 #ifdef G_ENABLE_DEBUG
 GLIB_AVAILABLE_IN_ALL
 void     g_slice_debug_tree_statistics (void);
 #endif
+#endif
 
 G_END_DECLS
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gslist.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gslist.c
index 65185b51772..3b7c247f1b8 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gslist.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gslist.c
@@ -35,57 +35,6 @@
 #include "gtestutils.h"
 #include "gslice.h"
 
-/**
- * SECTION:linked_lists_single
- * @title: Singly-Linked Lists
- * @short_description: linked lists that can be iterated in one direction
- *
- * The #GSList structure and its associated functions provide a
- * standard singly-linked list data structure. The benefit of this
- * data-structure is to provide insertion/deletion operations in O(1)
- * complexity where access/search operations are in O(n). The benefit
- * of #GSList over #GList (doubly linked list) is that they are lighter
- * in space as they only need to retain one pointer but it double the
- * cost of the worst case access/search operations.
- *
- * Each element in the list contains a piece of data, together with a
- * pointer which links to the next element in the list. Using this
- * pointer it is possible to move through the list in one direction
- * only (unlike the [double-linked lists][glib-Doubly-Linked-Lists],
- * which allow movement in both directions).
- *
- * The data contained in each element can be either integer values, by
- * using one of the [Type Conversion Macros][glib-Type-Conversion-Macros],
- * or simply pointers to any type of data.
- *
- * List elements are allocated from the [slice allocator][glib-Memory-Slices],
- * which is more efficient than allocating elements individually.
- *
- * Note that most of the #GSList functions expect to be passed a
- * pointer to the first element in the list. The functions which insert
- * elements return the new start of the list, which may have changed.
- *
- * There is no function to create a #GSList. %NULL is considered to be
- * the empty list so you simply set a #GSList* to %NULL.
- *
- * To add elements, use g_slist_append(), g_slist_prepend(),
- * g_slist_insert() and g_slist_insert_sorted().
- *
- * To remove elements, use g_slist_remove().
- *
- * To find elements in the list use g_slist_last(), g_slist_next(),
- * g_slist_nth(), g_slist_nth_data(), g_slist_find() and
- * g_slist_find_custom().
- *
- * To find the index of an element use g_slist_position() and
- * g_slist_index().
- *
- * To call a function for each element in the list use
- * g_slist_foreach().
- *
- * To free the entire list, use g_slist_free().
- **/
-
 /**
  * GSList:
  * @data: holds the element's data, which can be a pointer to any kind
@@ -572,7 +521,7 @@ g_slist_copy (GSList *list)
 /**
  * g_slist_copy_deep:
  * @list: a #GSList
- * @func: a copy function used to copy every element in the list
+ * @func: (scope call): a copy function used to copy every element in the list
  * @user_data: user data passed to the copy function @func, or #NULL
  *
  * Makes a full (deep) copy of a #GSList.
@@ -728,7 +677,7 @@ g_slist_find (GSList        *list,
  * g_slist_find_custom:
  * @list: a #GSList
  * @data: user data passed to the function
- * @func: the function to call for each element.
+ * @func: (scope call): the function to call for each element.
  *     It should return 0 when the desired element is found
  *
  * Finds an element in a #GSList, using a supplied function to
@@ -868,7 +817,7 @@ g_slist_length (GSList *list)
 /**
  * g_slist_foreach:
  * @list: a #GSList
- * @func: the function to call with each element's data
+ * @func: (scope call): the function to call with each element's data
  * @user_data: user data to pass to the function
  *
  * Calls a function for each element of a #GSList.
@@ -947,7 +896,7 @@ g_slist_insert_sorted_real (GSList   *list,
  * g_slist_insert_sorted:
  * @list: a #GSList
  * @data: the data for the new element
- * @func: the function to compare elements in the list.
+ * @func: (scope call): the function to compare elements in the list.
  *     It should return a number > 0 if the first parameter
  *     comes after the second parameter in the sort order.
  *
@@ -968,7 +917,7 @@ g_slist_insert_sorted (GSList       *list,
  * g_slist_insert_sorted_with_data:
  * @list: a #GSList
  * @data: the data for the new element
- * @func: the function to compare elements in the list.
+ * @func: (scope call): the function to compare elements in the list.
  *     It should return a number > 0 if the first parameter
  *     comes after the second parameter in the sort order.
  * @user_data: data to pass to comparison function
@@ -1053,7 +1002,7 @@ g_slist_sort_real (GSList   *list,
 /**
  * g_slist_sort:
  * @list: a #GSList
- * @compare_func: the comparison function used to sort the #GSList.
+ * @compare_func: (scope call): the comparison function used to sort the #GSList.
  *     This function is passed the data from 2 elements of the #GSList
  *     and should return 0 if they are equal, a negative value if the
  *     first element comes before the second, or a positive value if
@@ -1074,7 +1023,7 @@ g_slist_sort (GSList       *list,
 /**
  * g_slist_sort_with_data:
  * @list: a #GSList
- * @compare_func: comparison function
+ * @compare_func: (scope call): comparison function
  * @user_data: data to pass to comparison function
  *
  * Like g_slist_sort(), but the sort function accepts a user data argument.
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gspawn.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gspawn.c
index a30205e94a0..341af57ff52 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gspawn.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gspawn.c
@@ -70,7 +70,7 @@
 #include "glibintl.h"
 #include "glib-unix.h"
 
-#ifdef __APPLE__
+#if defined(__APPLE__) && defined(HAVE_LIBPROC_H)
 #include <libproc.h>
 #include <sys/proc_info.h>
 #endif
@@ -110,67 +110,6 @@ extern char **environ;
 #define HAVE_O_CLOEXEC 1
 #endif
 
-/**
- * SECTION:spawn
- * @Short_description: process launching
- * @Title: Spawning Processes
- *
- * GLib supports spawning of processes with an API that is more
- * convenient than the bare UNIX fork() and exec().
- *
- * The g_spawn family of functions has synchronous (g_spawn_sync())
- * and asynchronous variants (g_spawn_async(), g_spawn_async_with_pipes()),
- * as well as convenience variants that take a complete shell-like
- * commandline (g_spawn_command_line_sync(), g_spawn_command_line_async()).
- *
- * See #GSubprocess in GIO for a higher-level API that provides
- * stream interfaces for communication with child processes.
- *
- * An example of using g_spawn_async_with_pipes():
- * |[<!-- language="C" -->
- * const gchar * const argv[] = { "my-favourite-program", "--args", NULL };
- * gint child_stdout, child_stderr;
- * GPid child_pid;
- * g_autoptr(GError) error = NULL;
- *
- * // Spawn child process.
- * g_spawn_async_with_pipes (NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD, NULL,
- *                           NULL, &child_pid, NULL, &child_stdout,
- *                           &child_stderr, &error);
- * if (error != NULL)
- *   {
- *     g_error ("Spawning child failed: %s", error->message);
- *     return;
- *   }
- *
- * // Add a child watch function which will be called when the child process
- * // exits.
- * g_child_watch_add (child_pid, child_watch_cb, NULL);
- *
- * // You could watch for output on @child_stdout and @child_stderr using
- * // #GUnixInputStream or #GIOChannel here.
- *
- * static void
- * child_watch_cb (GPid     pid,
- *                 gint     status,
- *                 gpointer user_data)
- * {
- *   g_message ("Child %" G_PID_FORMAT " exited %s", pid,
- *              g_spawn_check_wait_status (status, NULL) ? "normally" : "abnormally");
- *
- *   // Free any resources associated with the child here, such as I/O channels
- *   // on its stdout and stderr FDs. If you have no code to put in the
- *   // child_watch_cb() callback, you can remove it and the g_child_watch_add()
- *   // call, but you must also remove the G_SPAWN_DO_NOT_REAP_CHILD flag,
- *   // otherwise the child process will stay around as a zombie until this
- *   // process exits.
- *
- *   g_spawn_close_pid (pid);
- * }
- * ]|
- */
-
-
 static gint g_execute (const gchar  *file,
                        gchar       **argv,
                        gchar       **argv_buffer,
@@ -263,23 +202,6 @@ g_spawn_async (const gchar          *working_directory,
                                    error);
 }
 
-/* Avoids a danger in threaded situations (calling close()
- * on a file descriptor twice, and another thread has
- * re-opened it since the first close)
- *
- * This function is called between fork() and exec() and hence must be
- * async-signal-safe (see signal-safety(7)).
- */
-static void
-close_and_invalidate (gint *fd)
-{
-  if (*fd < 0)
-    return;
-
-  g_close (*fd, NULL);
-  *fd = -1;
-}
-
 /* Some versions of OS X define READ_OK in public headers */
 #undef READ_OK
 
@@ -484,8 +406,7 @@ g_spawn_sync (const gchar          *working_directory,
               failed = TRUE;
               break;
             case READ_EOF:
-              close_and_invalidate (&outpipe);
-              outpipe = -1;
+              g_clear_fd (&outpipe, NULL);
               break;
             default:
               break;
@@ -503,8 +424,7 @@ g_spawn_sync (const gchar          *working_directory,
               failed = TRUE;
               break;
             case READ_EOF:
-              close_and_invalidate (&errpipe);
-              errpipe = -1;
+              g_clear_fd (&errpipe, NULL);
               break;
             default:
               break;
@@ -516,11 +436,8 @@ g_spawn_sync (const gchar          *working_directory,
     }
 
   /* These should only be open still if we had an error.  */
-
-  if (outpipe >= 0)
-    close_and_invalidate (&outpipe);
-  if (errpipe >= 0)
-    close_and_invalidate (&errpipe);
+  g_clear_fd (&outpipe, NULL);
+  g_clear_fd (&errpipe, NULL);
 
   /* Wait for child to exit, even if we have
    * an error pending.
@@ -1277,13 +1194,10 @@ write_err_and_exit (gint fd, gint msg)
 
 /* This function is called between fork() and exec() and hence must be
  * async-signal-safe (see signal-safety(7)). */
-static int
-set_cloexec (void *data, gint fd)
+static void
+set_cloexec (int fd)
 {
-  if (fd >= GPOINTER_TO_INT (data))
-    fcntl (fd, F_SETFD, FD_CLOEXEC);
-
-  return 0;
+  fcntl (fd, F_SETFD, FD_CLOEXEC);
 }
 
 /* This function is called between fork() and exec() and hence must be
@@ -1348,337 +1262,6 @@ dupfd_cloexec (int old_fd, int new_fd_min)
   return fd;
 }
 
-/* fdwalk()-compatible callback to close a fd for non-compliant
- * implementations of fdwalk() that potentially pass already
- * closed fds.
- *
- * It is not an error to pass an invalid fd to this function.
- *
- * This function is called between fork() and exec() and hence must be
- * async-signal-safe (see signal-safety(7)).
- */
-G_GNUC_UNUSED static int
-close_func_with_invalid_fds (void *data, int fd)
-{
-  /* We use close and not g_close here because on some platforms, we
-   * don't know how to close only valid, open file descriptors, so we
-   * have to pass bad fds to close too. g_close warns if given a bad
-   * fd.
-   *
-   * This function returns no error, because there is nothing that the caller
-   * could do with that information. That is even the case for EINTR. See
-   * g_close() about the specialty of EINTR and why that is correct.
-   * If g_close() ever gets extended to handle EINTR specially, then this place
-   * should get updated to do the same handling.
-   */
-  if (fd >= GPOINTER_TO_INT (data))
-    close (fd);
-
-  return 0;
-}
-
-#ifdef __linux__
-struct linux_dirent64
-{
-  guint64        d_ino;    /* 64-bit inode number */
-  guint64        d_off;    /* 64-bit offset to next structure */
-  unsigned short d_reclen; /* Size of this dirent */
-  unsigned char  d_type;   /* File type */
-  char           d_name[]; /* Filename (null-terminated) */
-};
-
-/* This function is called between fork() and exec() and hence must be
- * async-signal-safe (see signal-safety(7)). */
-static gint
-filename_to_fd (const char *p)
-{
-  char c;
-  int fd = 0;
-  const int cutoff = G_MAXINT / 10;
-  const int cutlim = G_MAXINT % 10;
-
-  if (*p == '\0')
-    return -1;
-
-  while ((c = *p++) != '\0')
-    {
-      if (c < '0' || c > '9')
-        return -1;
-      c -= '0';
-
-      /* Check for overflow. */
-      if (fd > cutoff || (fd == cutoff && c > cutlim))
-        return -1;
-
-      fd = fd * 10 + c;
-    }
-
-  return fd;
-}
-#endif
-
-static int safe_fdwalk_with_invalid_fds (int (*cb)(void *data, int fd), void *data);
-
-/* This function is called between fork() and exec() and hence must be
- * async-signal-safe (see signal-safety(7)). */
-static int
-safe_fdwalk (int (*cb)(void *data, int fd), void *data)
-{
-#if 0
-  /* Use fdwalk function provided by the system if it is known to be
-   * async-signal safe.
-   *
-   * Currently there are no operating systems known to provide a safe
-   * implementation, so this section is not used for now.
-   */
-  return fdwalk (cb, data);
-#else
-  /* Fallback implementation of fdwalk. It should be async-signal safe, but it
-   * may fail on non-Linux operating systems. See safe_fdwalk_with_invalid_fds
-   * for a slower alternative.
-   */
-
-#ifdef __linux__
-  gint fd;
-  gint res = 0;
-
-  /* Avoid use of opendir/closedir since these are not async-signal-safe. */
-  int dir_fd = open ("/proc/self/fd", O_RDONLY | O_DIRECTORY);
-  if (dir_fd >= 0)
-    {
-      /* buf needs to be aligned correctly to receive linux_dirent64.
-       * C11 has _Alignof for this purpose, but for now a
-       * union serves the same purpose. */
-      union
-      {
-        char buf[4096];
-        struct linux_dirent64 alignment;
-      } u;
-      int pos, nread;
-      struct linux_dirent64 *de;
-
-      while ((nread = syscall (SYS_getdents64, dir_fd, u.buf, sizeof (u.buf))) > 0)
-        {
-          for (pos = 0; pos < nread; pos += de->d_reclen)
-            {
-              de = (struct linux_dirent64 *) (u.buf + pos);
-
-              fd = filename_to_fd (de->d_name);
-              if (fd < 0 || fd == dir_fd)
-                  continue;
-
-              if ((res = cb (data, fd)) != 0)
-                  break;
-            }
-        }
-
-      g_close (dir_fd, NULL);
-      return res;
-    }
-
-  /* If /proc is not mounted or not accessible we fail here and rely on
-   * safe_fdwalk_with_invalid_fds to fall back to the old
-   * rlimit trick. */
-
-#endif
-
-#if defined(__sun__) && defined(F_PREVFD) && defined(F_NEXTFD)
-/*
- * Solaris 11.4 has a signal-safe way which allows
- * us to find all file descriptors in a process.
- *
- * fcntl(fd, F_NEXTFD, maxfd)
- * - returns the first allocated file descriptor <= maxfd  > fd.
- *
- * fcntl(fd, F_PREVFD)
- * - return highest allocated file descriptor < fd.
- */
-  gint fd;
-  gint res = 0;
-
-  open_max = fcntl (INT_MAX, F_PREVFD); /* find the maximum fd */
-  if (open_max < 0) /* No open files */
-    return 0;
-
-  for (fd = -1; (fd = fcntl (fd, F_NEXTFD, open_max)) != -1; )
-    if ((res = cb (data, fd)) != 0 || fd == open_max)
-      break;
-
-  return res;
-#endif
-
-  return safe_fdwalk_with_invalid_fds (cb, data);
-#endif
-}
-
-/* This function is called between fork() and exec() and hence must be
- * async-signal-safe (see signal-safety(7)). */
-static int
-safe_fdwalk_with_invalid_fds (int (*cb)(void *data, int fd), void *data)
-{
-  /* Fallback implementation of fdwalk. It should be async-signal safe, but it
-   * may be slow, especially on systems allowing very high number of open file
-   * descriptors.
-   */
-  gint open_max = -1;
-  gint fd;
-  gint res = 0;
-
-#if 0 && defined(HAVE_SYS_RESOURCE_H)
-  struct rlimit rl;
-
-  /* Use getrlimit() function provided by the system if it is known to be
-   * async-signal safe.
-   *
-   * Currently there are no operating systems known to provide a safe
-   * implementation, so this section is not used for now.
-   */
-  if (getrlimit (RLIMIT_NOFILE, &rl) == 0 && rl.rlim_max != RLIM_INFINITY)
-    open_max = rl.rlim_max;
-#endif
-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
-  /* Use sysconf() function provided by the system if it is known to be
-   * async-signal safe.
-   *
-   * FreeBSD: sysconf() is included in the list of async-signal safe functions
-   * found in https://man.freebsd.org/sigaction(2).
-   *
-   * OpenBSD: sysconf() is included in the list of async-signal safe functions
-   * found in https://man.openbsd.org/sigaction.2.
-   *
-   * Apple: sysconf() is included in the list of async-signal safe functions
-   * found in https://opensource.apple.com/source/xnu/xnu-517.12.7/bsd/man/man2/sigaction.2
-   */
-  if (open_max < 0)
-    open_max = sysconf (_SC_OPEN_MAX);
-#endif
-  /* Hardcoded fallback: the default process hard limit in Linux as of 2020 */
-  if (open_max < 0)
-    open_max = 4096;
-
-#if defined(__APPLE__)
-  /* proc_pidinfo isn't documented as async-signal-safe but looking at the implementation
-   * in the darwin tree here:
-   *
-   * https://opensource.apple.com/source/Libc/Libc-498/darwin/libproc.c.auto.html
-   *
-   * It's just a thin wrapper around a syscall, so it's probably okay.
-   */
-  {
-    char buffer[4096 * PROC_PIDLISTFD_SIZE];
-    ssize_t buffer_size;
-
-    buffer_size = proc_pidinfo (getpid (), PROC_PIDLISTFDS, 0, buffer, sizeof (buffer));
-
-    if (buffer_size > 0 &&
-        sizeof (buffer) >= (size_t) buffer_size &&
-        (buffer_size % PROC_PIDLISTFD_SIZE) == 0)
-      {
-        const struct proc_fdinfo *fd_info = (const struct proc_fdinfo *) buffer;
-        size_t number_of_fds = (size_t) buffer_size / PROC_PIDLISTFD_SIZE;
-
-        for (size_t i = 0; i < number_of_fds; i++)
-          if ((res = cb (data, fd_info[i].proc_fd)) != 0)
-            break;
-
-        return res;
-      }
-  }
-#endif
-
-  for (fd = 0; fd < open_max; fd++)
-      if ((res = cb (data, fd)) != 0)
-          break;
-
-  return res;
-}
-
-/* This function is called between fork() and exec() and hence must be
- * async-signal-safe (see signal-safety(7)). */
-static int
-safe_fdwalk_set_cloexec (int lowfd)
-{
-  int ret;
-
-#if defined(HAVE_CLOSE_RANGE) && defined(CLOSE_RANGE_CLOEXEC)
-  /* close_range() is available in Linux since kernel 5.9, and on FreeBSD at
-   * around the same time. It was designed for use in async-signal-safe
-   * situations: https://bugs.python.org/issue38061
-   *
-   * The `CLOSE_RANGE_CLOEXEC` flag was added in Linux 5.11, and is not yet
-   * present in FreeBSD.
-   *
-   * Handle ENOSYS in case it’s supported in libc but not the kernel; if so,
-   * fall back to safe_fdwalk(). Handle EINVAL in case `CLOSE_RANGE_CLOEXEC`
-   * is not supported. */
-  ret = close_range (lowfd, G_MAXUINT, CLOSE_RANGE_CLOEXEC);
-  if (ret == 0 || !(errno == ENOSYS || errno == EINVAL))
-    return ret;
-#endif  /* HAVE_CLOSE_RANGE */
-
-  ret = safe_fdwalk (set_cloexec, GINT_TO_POINTER (lowfd));
-
-  return ret;
-}
-
-/* This function is called between fork() and exec() and hence must be
- * async-signal-safe (see signal-safety(7)).
- *
- * On failure, `-1` will be returned and errno will be set. */
-static int
-safe_closefrom (int lowfd)
-{
-  int ret;
-
-#if defined(HAVE_CLOSE_RANGE)
-  /* close_range() is available in Linux since kernel 5.9, and on FreeBSD at
-   * around the same time. It was designed for use in async-signal-safe
-   * situations: https://bugs.python.org/issue38061
-   *
-   * Handle ENOSYS in case it’s supported in libc but not the kernel; if so,
-   * fall back to safe_fdwalk(). */
-  ret = close_range (lowfd, G_MAXUINT, 0);
-  if (ret == 0 || errno != ENOSYS)
-    return ret;
-#endif  /* HAVE_CLOSE_RANGE */
-
-#if defined(__FreeBSD__) || defined(__OpenBSD__) || \
-  (defined(__sun__) && defined(F_CLOSEFROM))
-  /* Use closefrom function provided by the system if it is known to be
-   * async-signal safe.
-   *
-   * FreeBSD: closefrom is included in the list of async-signal safe functions
-   * found in https://man.freebsd.org/sigaction(2).
-   *
-   * OpenBSD: closefrom is not included in the list, but a direct system call
-   * should be safe to use.
-   *
-   * In Solaris as of 11.3 SRU 31, closefrom() is also a direct system call.
-   * On such systems, F_CLOSEFROM is defined.
-   */
-  (void) closefrom (lowfd);
-  return 0;
-#elif defined(__DragonFly__)
-  /* It is unclear whether closefrom function included in DragonFlyBSD libc_r
-   * is safe to use because it calls a lot of library functions. It is also
-   * unclear whether libc_r itself is still being used. Therefore, we do a
-   * direct system call here ourselves to avoid possible issues.
-   */
-  (void) syscall (SYS_closefrom, lowfd);
-  return 0;
-#elif defined(F_CLOSEM)
-  /* NetBSD and AIX have a special fcntl command which does the same thing as
-   * closefrom. NetBSD also includes closefrom function, which seems to be a
-   * simple wrapper of the fcntl command.
-   */
-  return fcntl (lowfd, F_CLOSEM);
-#else
-  ret = safe_fdwalk (close_func_with_invalid_fds, GINT_TO_POINTER (lowfd));
-
-  return ret;
-#endif
-}
-
 /* This function is called between fork() and exec() and hence must be
  * async-signal-safe (see signal-safety(7)). */
 static gint
@@ -1810,7 +1393,7 @@ do_exec (gint                  child_err_report_fd,
         write_err_and_exit (child_err_report_fd,
                             CHILD_DUPFD_FAILED);
 
-      set_cloexec (GINT_TO_POINTER(0), stdin_fd);
+      set_cloexec (stdin_fd);
     }
   else if (!child_inherits_stdin)
     {
@@ -1822,7 +1405,7 @@ do_exec (gint                  child_err_report_fd,
       if (safe_dup2 (read_null, 0) < 0)
         write_err_and_exit (child_err_report_fd,
                             CHILD_DUPFD_FAILED);
-      close_and_invalidate (&read_null);
+      g_clear_fd (&read_null, NULL);
     }
 
   /* Like with stdin above, it's possible the caller assigned
@@ -1848,7 +1431,7 @@ do_exec (gint                  child_err_report_fd,
         write_err_and_exit (child_err_report_fd,
                             CHILD_DUPFD_FAILED);
 
-      set_cloexec (GINT_TO_POINTER(0), stdout_fd);
+      set_cloexec (stdout_fd);
     }
   else if (stdout_to_null)
     {
@@ -1859,7 +1442,7 @@ do_exec (gint                  child_err_report_fd,
       if (safe_dup2 (write_null, 1) < 0)
         write_err_and_exit (child_err_report_fd,
                             CHILD_DUPFD_FAILED);
-      close_and_invalidate (&write_null);
+      g_clear_fd (&write_null, NULL);
     }
 
   if (IS_STD_FILENO (stderr_fd) && stderr_fd != STDERR_FILENO)
@@ -1880,7 +1463,7 @@ do_exec (gint                  child_err_report_fd,
         write_err_and_exit (child_err_report_fd,
                             CHILD_DUPFD_FAILED);
 
-      set_cloexec (GINT_TO_POINTER(0), stderr_fd);
+      set_cloexec (stderr_fd);
     }
   else if (stderr_to_null)
     {
@@ -1891,7 +1474,7 @@ do_exec (gint                  child_err_report_fd,
       if (safe_dup2 (write_null, 2) < 0)
         write_err_and_exit (child_err_report_fd,
                             CHILD_DUPFD_FAILED);
-      close_and_invalidate (&write_null);
+      g_clear_fd (&write_null, NULL);
     }
 
   /* Close all file descriptors but stdin, stdout and stderr, and any of source_fds,
@@ -1905,21 +1488,21 @@ do_exec (gint                  child_err_report_fd,
         {
           if (safe_dup2 (child_err_report_fd, 3) < 0)
             write_err_and_exit (child_err_report_fd, CHILD_DUPFD_FAILED);
-          set_cloexec (GINT_TO_POINTER (0), 3);
-          if (safe_closefrom (4) < 0)
+          set_cloexec (3);
+          if (g_closefrom (4) < 0)
             write_err_and_exit (child_err_report_fd, CHILD_CLOSE_FAILED);
           child_err_report_fd = 3;
         }
       else
         {
-          if (safe_fdwalk_set_cloexec (3) < 0)
+          if (g_fdwalk_set_cloexec (3) < 0)
             write_err_and_exit (child_err_report_fd, CHILD_CLOSE_FAILED);
         }
     }
   else
     {
       /* We need to do child_err_report_fd anyway */
-      set_cloexec (GINT_TO_POINTER (0), child_err_report_fd);
+      set_cloexec (child_err_report_fd);
     }
 
   /*
@@ -1982,7 +1565,7 @@ do_exec (gint                  child_err_report_fd,
               if (safe_dup2 (source_fds[i], target_fds[i]) < 0)
                 write_err_and_exit (child_err_report_fd, CHILD_DUPFD_FAILED);
 
-              close_and_invalidate (&source_fds[i]);
+              g_clear_fd (&source_fds[i], NULL);
             }
         }
     }
@@ -2228,6 +1811,8 @@ do_posix_spawn (const gchar * const *argv,
     goto out_close_fds;
 
   duped_source_fds = g_new (gint, n_fds);
+  for (i = 0; i < n_fds; i++)
+    duped_source_fds[i] = -1;  /* initialise in case dupfd_cloexec() fails below */
   for (i = 0; i < n_fds; i++)
     {
       duped_source_fds[i] = dupfd_cloexec (source_fds[i], max_target_fd + 1);
@@ -2272,12 +1857,12 @@ do_posix_spawn (const gchar * const *argv,
 
 out_close_fds:
   for (i = 0; i < num_parent_close_fds; i++)
-    close_and_invalidate (&parent_close_fds [i]);
+    g_clear_fd (&parent_close_fds[i], NULL);
 
   if (duped_source_fds != NULL)
     {
       for (i = 0; i < n_fds; i++)
-        close_and_invalidate (&duped_source_fds[i]);
+        g_clear_fd (&duped_source_fds[i], NULL);
       g_free (duped_source_fds);
     }
 
@@ -2290,6 +1875,16 @@ do_posix_spawn (const gchar * const *argv,
 }
 #endif /* POSIX_SPAWN_AVAILABLE */
 
+static gboolean
+source_fds_collide_with_pipe (const GUnixPipe  *pipefd,
+                              const int        *source_fds,
+                              gsize             n_fds,
+                              GError          **error)
+{
+  return (_g_spawn_invalid_source_fd (pipefd->fds[G_UNIX_PIPE_END_READ], source_fds, n_fds, error) ||
+          _g_spawn_invalid_source_fd (pipefd->fds[G_UNIX_PIPE_END_WRITE], source_fds, n_fds, error));
+}
+
 static gboolean
 fork_exec (gboolean              intermediate_child,
            const gchar          *working_directory,
@@ -2318,9 +1913,9 @@ fork_exec (gboolean              intermediate_child,
            GError              **error)
 {
   GPid pid = -1;
-  gint child_err_report_pipe[2] = { -1, -1 };
-  gint child_pid_report_pipe[2] = { -1, -1 };
-  guint pipe_flags = cloexec_pipes ? FD_CLOEXEC : 0;
+  GUnixPipe child_err_report_pipe = G_UNIX_PIPE_INIT;
+  GUnixPipe child_pid_report_pipe = G_UNIX_PIPE_INIT;
+  guint pipe_flags = cloexec_pipes ? O_CLOEXEC : 0;
   gint status;
   const gchar *chosen_search_path;
   gchar *search_path_buffer = NULL;
@@ -2329,9 +1924,9 @@ fork_exec (gboolean              intermediate_child,
   gchar **argv_buffer = NULL;
   gchar **argv_buffer_heap = NULL;
   gsize argv_buffer_len = 0;
-  gint stdin_pipe[2] = { -1, -1 };
-  gint stdout_pipe[2] = { -1, -1 };
-  gint stderr_pipe[2] = { -1, -1 };
+  GUnixPipe stdin_pipe = G_UNIX_PIPE_INIT;
+  GUnixPipe stdout_pipe = G_UNIX_PIPE_INIT;
+  GUnixPipe stderr_pipe = G_UNIX_PIPE_INIT;
   gint child_close_fds[4] = { -1, -1, -1, -1 };
   gint n_child_close_fds = 0;
   gint *source_fds_copy = NULL;
@@ -2344,35 +1939,32 @@ fork_exec (gboolean              intermediate_child,
   /* If pipes have been requested, open them */
   if (stdin_pipe_out != NULL)
     {
-      if (!g_unix_open_pipe (stdin_pipe, pipe_flags, error))
+      if (!g_unix_pipe_open (&stdin_pipe, pipe_flags, error))
         goto cleanup_and_fail;
-      if (_g_spawn_invalid_source_fd (stdin_pipe[0], source_fds, n_fds, error) ||
-          _g_spawn_invalid_source_fd (stdin_pipe[1], source_fds, n_fds, error))
+      if (source_fds_collide_with_pipe (&stdin_pipe, source_fds, n_fds, error))
         goto cleanup_and_fail;
-      child_close_fds[n_child_close_fds++] = stdin_pipe[1];
-      stdin_fd = stdin_pipe[0];
+      child_close_fds[n_child_close_fds++] = g_unix_pipe_get (&stdin_pipe, G_UNIX_PIPE_END_WRITE);
+      stdin_fd = g_unix_pipe_get (&stdin_pipe, G_UNIX_PIPE_END_READ);
     }
 
   if (stdout_pipe_out != NULL)
     {
-      if (!g_unix_open_pipe (stdout_pipe, pipe_flags, error))
+      if (!g_unix_pipe_open (&stdout_pipe, pipe_flags, error))
         goto cleanup_and_fail;
-      if (_g_spawn_invalid_source_fd (stdout_pipe[0], source_fds, n_fds, error) ||
-          _g_spawn_invalid_source_fd (stdout_pipe[1], source_fds, n_fds, error))
+      if (source_fds_collide_with_pipe (&stdout_pipe, source_fds, n_fds, error))
         goto cleanup_and_fail;
-      child_close_fds[n_child_close_fds++] = stdout_pipe[0];
-      stdout_fd = stdout_pipe[1];
+      child_close_fds[n_child_close_fds++] = g_unix_pipe_get (&stdout_pipe, G_UNIX_PIPE_END_READ);
+      stdout_fd = g_unix_pipe_get (&stdout_pipe, G_UNIX_PIPE_END_WRITE);
     }
 
   if (stderr_pipe_out != NULL)
     {
-      if (!g_unix_open_pipe (stderr_pipe, pipe_flags, error))
+      if (!g_unix_pipe_open (&stderr_pipe, pipe_flags, error))
         goto cleanup_and_fail;
-      if (_g_spawn_invalid_source_fd (stderr_pipe[0], source_fds, n_fds, error) ||
-          _g_spawn_invalid_source_fd (stderr_pipe[1], source_fds, n_fds, error))
+      if (source_fds_collide_with_pipe (&stderr_pipe, source_fds, n_fds, error))
         goto cleanup_and_fail;
-      child_close_fds[n_child_close_fds++] = stderr_pipe[0];
-      stderr_fd = stderr_pipe[1];
+      child_close_fds[n_child_close_fds++] = g_unix_pipe_get (&stderr_pipe, G_UNIX_PIPE_END_READ);
+      stderr_fd = g_unix_pipe_get (&stderr_pipe, G_UNIX_PIPE_END_WRITE);
     }
 
   child_close_fds[n_child_close_fds++] = -1;
@@ -2510,18 +2102,16 @@ fork_exec (gboolean              intermediate_child,
   if (n_fds > 0)
     memcpy (source_fds_copy, source_fds, sizeof (*source_fds) * n_fds);
 
-  if (!g_unix_open_pipe (child_err_report_pipe, pipe_flags, error))
+  if (!g_unix_pipe_open (&child_err_report_pipe, pipe_flags, error))
     goto cleanup_and_fail;
-  if (_g_spawn_invalid_source_fd (child_err_report_pipe[0], source_fds, n_fds, error) ||
-      _g_spawn_invalid_source_fd (child_err_report_pipe[1], source_fds, n_fds, error))
+  if (source_fds_collide_with_pipe (&child_err_report_pipe, source_fds, n_fds, error))
     goto cleanup_and_fail;
 
   if (intermediate_child)
     {
-      if (!g_unix_open_pipe (child_pid_report_pipe, pipe_flags, error))
+      if (!g_unix_pipe_open (&child_pid_report_pipe, pipe_flags, error))
         goto cleanup_and_fail;
-      if (_g_spawn_invalid_source_fd (child_pid_report_pipe[0], source_fds, n_fds, error) ||
-          _g_spawn_invalid_source_fd (child_pid_report_pipe[1], source_fds, n_fds, error))
+      if (source_fds_collide_with_pipe (&child_pid_report_pipe, source_fds, n_fds, error))
         goto cleanup_and_fail;
     }
 
@@ -2560,13 +2150,13 @@ fork_exec (gboolean              intermediate_child,
        * not needed in the close_descriptors case,
        * though
        */
-      close_and_invalidate (&child_err_report_pipe[0]);
-      close_and_invalidate (&child_pid_report_pipe[0]);
+      g_unix_pipe_close (&child_err_report_pipe, G_UNIX_PIPE_END_READ, NULL);
+      g_unix_pipe_close (&child_pid_report_pipe, G_UNIX_PIPE_END_READ, NULL);
       if (child_close_fds[0] != -1)
         {
            int i = -1;
            while (child_close_fds[++i] != -1)
-             close_and_invalidate (&child_close_fds[i]);
+             g_clear_fd (&child_close_fds[i], NULL);
         }
 
       if (intermediate_child)
@@ -2583,16 +2173,16 @@ fork_exec (gboolean              intermediate_child,
           if (grandchild_pid < 0)
             {
               /* report -1 as child PID */
-              write_all (child_pid_report_pipe[1], &grandchild_pid,
-                         sizeof(grandchild_pid));
+              write_all (g_unix_pipe_get (&child_pid_report_pipe, G_UNIX_PIPE_END_WRITE),
+                         &grandchild_pid, sizeof(grandchild_pid));
 
-              write_err_and_exit (child_err_report_pipe[1],
+              write_err_and_exit (g_unix_pipe_get (&child_err_report_pipe, G_UNIX_PIPE_END_WRITE),
                                   CHILD_FORK_FAILED);
             }
           else if (grandchild_pid == 0)
             {
-              close_and_invalidate (&child_pid_report_pipe[1]);
-              do_exec (child_err_report_pipe[1],
+              g_unix_pipe_close (&child_pid_report_pipe, G_UNIX_PIPE_END_WRITE, NULL);
+              do_exec (g_unix_pipe_get (&child_err_report_pipe, G_UNIX_PIPE_END_WRITE),
                        stdin_fd,
                        stdout_fd,
                        stderr_fd,
@@ -2617,8 +2207,9 @@ fork_exec (gboolean              intermediate_child,
             }
           else
             {
-              write_all (child_pid_report_pipe[1], &grandchild_pid, sizeof(grandchild_pid));
-              close_and_invalidate (&child_pid_report_pipe[1]);
+              write_all (g_unix_pipe_get (&child_pid_report_pipe, G_UNIX_PIPE_END_WRITE),
+                         &grandchild_pid, sizeof(grandchild_pid));
+              g_unix_pipe_close (&child_pid_report_pipe, G_UNIX_PIPE_END_WRITE, NULL);
 
               _exit (0);
             }
@@ -2628,7 +2219,7 @@ fork_exec (gboolean              intermediate_child,
           /* Just run the child.
            */
 
-          do_exec (child_err_report_pipe[1],
+          do_exec (g_unix_pipe_get (&child_err_report_pipe, G_UNIX_PIPE_END_WRITE),
                    stdin_fd,
                    stdout_fd,
                    stderr_fd,
@@ -2660,8 +2251,8 @@ fork_exec (gboolean              intermediate_child,
       gint n_ints = 0;
 
       /* Close the uncared-about ends of the pipes */
-      close_and_invalidate (&child_err_report_pipe[1]);
-      close_and_invalidate (&child_pid_report_pipe[1]);
+      g_unix_pipe_close (&child_err_report_pipe, G_UNIX_PIPE_END_WRITE, NULL);
+      g_unix_pipe_close (&child_pid_report_pipe, G_UNIX_PIPE_END_WRITE, NULL);
 
       /* If we had an intermediate child, reap it */
       if (intermediate_child)
@@ -2679,7 +2270,7 @@ fork_exec (gboolean              intermediate_child,
         }
 
 
-      if (!read_ints (child_err_report_pipe[0],
+      if (!read_ints (g_unix_pipe_get (&child_err_report_pipe, G_UNIX_PIPE_END_READ),
                       buf, 2, &n_ints,
                       error))
         goto cleanup_and_fail;
@@ -2760,7 +2351,7 @@ fork_exec (gboolean              intermediate_child,
         {
           n_ints = 0;
 
-          if (!read_ints (child_pid_report_pipe[0],
+          if (!read_ints (g_unix_pipe_get (&child_pid_report_pipe, G_UNIX_PIPE_END_READ),
                           buf, 1, &n_ints, error))
             goto cleanup_and_fail;
 
@@ -2783,8 +2374,8 @@ fork_exec (gboolean              intermediate_child,
         }
 
       /* Success against all odds! return the information */
-      close_and_invalidate (&child_err_report_pipe[0]);
-      close_and_invalidate (&child_pid_report_pipe[0]);
+      g_unix_pipe_close (&child_err_report_pipe, G_UNIX_PIPE_END_READ, NULL);
+      g_unix_pipe_close (&child_pid_report_pipe, G_UNIX_PIPE_END_READ, NULL);
 
       g_free (search_path_buffer_heap);
       g_free (argv_buffer_heap);
@@ -2798,18 +2389,18 @@ fork_exec (gboolean              intermediate_child,
 
 success:
   /* Close the uncared-about ends of the pipes */
-  close_and_invalidate (&stdin_pipe[0]);
-  close_and_invalidate (&stdout_pipe[1]);
-  close_and_invalidate (&stderr_pipe[1]);
+  g_unix_pipe_close (&stdin_pipe, G_UNIX_PIPE_END_READ, NULL);
+  g_unix_pipe_close (&stdout_pipe, G_UNIX_PIPE_END_WRITE, NULL);
+  g_unix_pipe_close (&stderr_pipe, G_UNIX_PIPE_END_WRITE, NULL);
 
   if (stdin_pipe_out != NULL)
-    *stdin_pipe_out = g_steal_fd (&stdin_pipe[1]);
+    *stdin_pipe_out = g_unix_pipe_steal (&stdin_pipe, G_UNIX_PIPE_END_WRITE);
 
   if (stdout_pipe_out != NULL)
-    *stdout_pipe_out = g_steal_fd (&stdout_pipe[0]);
+    *stdout_pipe_out = g_unix_pipe_steal (&stdout_pipe, G_UNIX_PIPE_END_READ);
 
   if (stderr_pipe_out != NULL)
-    *stderr_pipe_out = g_steal_fd (&stderr_pipe[0]);
+    *stderr_pipe_out = g_unix_pipe_steal (&stderr_pipe, G_UNIX_PIPE_END_READ);
 
   return TRUE;
 
@@ -2833,17 +2424,11 @@ fork_exec (gboolean              intermediate_child,
        }
    }
 
-  close_and_invalidate (&stdin_pipe[0]);
-  close_and_invalidate (&stdin_pipe[1]);
-  close_and_invalidate (&stdout_pipe[0]);
-  close_and_invalidate (&stdout_pipe[1]);
-  close_and_invalidate (&stderr_pipe[0]);
-  close_and_invalidate (&stderr_pipe[1]);
-
-  close_and_invalidate (&child_err_report_pipe[0]);
-  close_and_invalidate (&child_err_report_pipe[1]);
-  close_and_invalidate (&child_pid_report_pipe[0]);
-  close_and_invalidate (&child_pid_report_pipe[1]);
+  g_unix_pipe_clear (&stdin_pipe);
+  g_unix_pipe_clear (&stdout_pipe);
+  g_unix_pipe_clear (&stderr_pipe);
+  g_unix_pipe_clear (&child_err_report_pipe);
+  g_unix_pipe_clear (&child_pid_report_pipe);
 
   g_clear_pointer (&search_path_buffer_heap, g_free);
   g_clear_pointer (&argv_buffer_heap, g_free);
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gstdio.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gstdio.h
index c67c45c3933..eead02af2bd 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gstdio.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gstdio.h
@@ -57,7 +57,7 @@ typedef struct stat GStatBuf;
 
 #endif
 
-#if defined(G_OS_UNIX) && !defined(G_STDIO_WRAP_ON_UNIX)
+#if defined(G_OS_UNIX) && !defined(G_STDIO_WRAP_ON_UNIX) && !defined(__GI_SCANNER__)
 
 /* Just pass on to the system functions, so there's no potential for data
  * format mismatches, especially with large file interfaces.
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gstrfuncs.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gstrfuncs.c
index 8b4268472c2..1b1fbf0579b 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gstrfuncs.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gstrfuncs.c
@@ -57,59 +57,20 @@
 #include "gprintfint.h"
 #include "glibintl.h"
 
-
-/**
- * SECTION:string_utils
- * @title: String Utility Functions
- * @short_description: various string-related functions
- *
- * This section describes a number of utility functions for creating,
- * duplicating, and manipulating strings.
- *
- * Note that the functions g_printf(), g_fprintf(), g_sprintf(),
- * g_vprintf(), g_vfprintf(), g_vsprintf() and g_vasprintf()
- * are declared in the header `gprintf.h` which is not included in `glib.h`
- * (otherwise using `glib.h` would drag in `stdio.h`), so you'll have to
- * explicitly include `<glib/gprintf.h>` in order to use the GLib
- * printf() functions.
- *
- * ## String precision pitfalls # {#string-precision}
- *
- * While you may use the printf() functions to format UTF-8 strings,
- * notice that the precision of a \%Ns parameter is interpreted
- * as the number of bytes, not characters to print. On top of that,
- * the GNU libc implementation of the printf() functions has the
- * "feature" that it checks that the string given for the \%Ns
- * parameter consists of a whole number of characters in the current
- * encoding. So, unless you are sure you are always going to be in an
- * UTF-8 locale or your know your text is restricted to ASCII, avoid
- * using \%Ns. If your intention is to format strings for a
- * certain number of columns, then \%Ns is not a correct solution
- * anyway, since it fails to take wide characters (see g_unichar_iswide())
- * into account.
- *
- * Note also that there are various printf() parameters which are platform
- * dependent. GLib provides platform independent macros for these parameters
- * which should be used instead. A common example is %G_GUINT64_FORMAT, which
- * should be used instead of `%llu` or similar parameters for formatting
- * 64-bit integers. These macros are all named `G_*_FORMAT`; see
- * [Basic Types][glib-Basic-Types].
- */
-
 /**
  * g_ascii_isalnum:
  * @c: any character
  *
  * Determines whether a character is alphanumeric.
  *
- * Unlike the standard C library isalnum() function, this only
+ * Unlike the standard C library `isalnum()` function, this only
  * recognizes standard ASCII letters and ignores the locale,
- * returning %FALSE for all non-ASCII characters. Also, unlike
- * the standard library function, this takes a char, not an int,
- * so don't call it on %EOF, but no need to cast to #guchar before
+ * returning false for all non-ASCII characters. Also, unlike
+ * the standard library function, this takes a `char`, not an `int`,
+ * so don't call it on `EOF`, but no need to cast to `guchar` before
  * passing a possibly non-ASCII character in.
  *
- * Returns: %TRUE if @c is an ASCII alphanumeric character
+ * Returns: true if @c is an ASCII alphanumeric character
  */
 
 /**
@@ -118,14 +79,14 @@
  *
  * Determines whether a character is alphabetic (i.e. a letter).
  *
- * Unlike the standard C library isalpha() function, this only
+ * Unlike the standard C library `isalpha()` function, this only
  * recognizes standard ASCII letters and ignores the locale,
- * returning %FALSE for all non-ASCII characters. Also, unlike
- * the standard library function, this takes a char, not an int,
- * so don't call it on %EOF, but no need to cast to #guchar before
+ * returning false for all non-ASCII characters. Also, unlike
+ * the standard library function, this takes a `char`, not an `int`,
+ * so don't call it on `EOF`, but no need to cast to `guchar` before
  * passing a possibly non-ASCII character in.
  *
- * Returns: %TRUE if @c is an ASCII alphabetic character
+ * Returns: true if @c is an ASCII alphabetic character
  */
 
 /**
@@ -134,14 +95,14 @@
  *
  * Determines whether a character is a control character.
  *
- * Unlike the standard C library iscntrl() function, this only
+ * Unlike the standard C library `iscntrl()` function, this only
  * recognizes standard ASCII control characters and ignores the
- * locale, returning %FALSE for all non-ASCII characters. Also,
- * unlike the standard library function, this takes a char, not
- * an int, so don't call it on %EOF, but no need to cast to #guchar
+ * locale, returning false for all non-ASCII characters. Also,
+ * unlike the standard library function, this takes a `char`, not
+ * an `int`, so don't call it on `EOF`, but no need to cast to `guchar`
  * before passing a possibly non-ASCII character in.
  *
- * Returns: %TRUE if @c is an ASCII control character.
+ * Returns: true if @c is an ASCII control character
  */
 
 /**
@@ -150,11 +111,11 @@
  *
  * Determines whether a character is digit (0-9).
  *
- * Unlike the standard C library isdigit() function, this takes
- * a char, not an int, so don't call it  on %EOF, but no need to
- * cast to #guchar before passing a possibly non-ASCII character in.
+ * Unlike the standard C library `isdigit()` function, this takes
+ * a `char`, not an `int`, so don't call it  on `EOF`, but no need to
+ * cast to `guchar` before passing a possibly non-ASCII character in.
  *
- * Returns: %TRUE if @c is an ASCII digit.
+ * Returns: true if @c is an ASCII digit
  */
 
 /**
@@ -163,14 +124,14 @@
  *
  * Determines whether a character is a printing character and not a space.
  *
- * Unlike the standard C library isgraph() function, this only
+ * Unlike the standard C library `isgraph()` function, this only
  * recognizes standard ASCII characters and ignores the locale,
- * returning %FALSE for all non-ASCII characters. Also, unlike
- * the standard library function, this takes a char, not an int,
- * so don't call it on %EOF, but no need to cast to #guchar before
+ * returning false for all non-ASCII characters. Also, unlike
+ * the standard library function, this takes a `char`, not an `int`,
+ * so don't call it on `EOF`, but no need to cast to `guchar` before
  * passing a possibly non-ASCII character in.
  *
- * Returns: %TRUE if @c is an ASCII printing character other than space.
+ * Returns: true if @c is an ASCII printing character other than space
  */
 
 /**
@@ -179,14 +140,14 @@
  *
  * Determines whether a character is an ASCII lower case letter.
  *
- * Unlike the standard C library islower() function, this only
+ * Unlike the standard C library `islower()` function, this only
  * recognizes standard ASCII letters and ignores the locale,
- * returning %FALSE for all non-ASCII characters. Also, unlike
- * the standard library function, this takes a char, not an int,
- * so don't call it on %EOF, but no need to worry about casting
- * to #guchar before passing a possibly non-ASCII character in.
+ * returning false for all non-ASCII characters. Also, unlike
+ * the standard library function, this takes a `char`, not an `int`,
+ * so don't call it on `EOF`, but no need to worry about casting
+ * to `guchar` before passing a possibly non-ASCII character in.
  *
- * Returns: %TRUE if @c is an ASCII lower case letter
+ * Returns: true if @c is an ASCII lower case letter
  */
 
 /**
@@ -195,14 +156,14 @@
  *
  * Determines whether a character is a printing character.
  *
- * Unlike the standard C library isprint() function, this only
+ * Unlike the standard C library `isprint()` function, this only
  * recognizes standard ASCII characters and ignores the locale,
- * returning %FALSE for all non-ASCII characters. Also, unlike
- * the standard library function, this takes a char, not an int,
- * so don't call it on %EOF, but no need to cast to #guchar before
+ * returning false for all non-ASCII characters. Also, unlike
+ * the standard library function, this takes a `char`, not an `int`,
+ * so don't call it on `EOF`, but no need to cast to `guchar` before
  * passing a possibly non-ASCII character in.
  *
- * Returns: %TRUE if @c is an ASCII printing character.
+ * Returns: true if @c is an ASCII printing character
  */
 
 /**
@@ -211,14 +172,14 @@
  *
  * Determines whether a character is a punctuation character.
  *
- * Unlike the standard C library ispunct() function, this only
+ * Unlike the standard C library `ispunct()` function, this only
  * recognizes standard ASCII letters and ignores the locale,
- * returning %FALSE for all non-ASCII characters. Also, unlike
- * the standard library function, this takes a char, not an int,
- * so don't call it on %EOF, but no need to cast to #guchar before
+ * returning false for all non-ASCII characters. Also, unlike
+ * the standard library function, this takes a `char`, not an `int`,
+ * so don't call it on `EOF`, but no need to cast to `guchar` before
  * passing a possibly non-ASCII character in.
  *
- * Returns: %TRUE if @c is an ASCII punctuation character.
+ * Returns: true if @c is an ASCII punctuation character
  */
 
 /**
@@ -227,14 +188,14 @@
  *
  * Determines whether a character is a white-space character.
  *
- * Unlike the standard C library isspace() function, this only
+ * Unlike the standard C library `isspace()` function, this only
  * recognizes standard ASCII white-space and ignores the locale,
- * returning %FALSE for all non-ASCII characters. Also, unlike
- * the standard library function, this takes a char, not an int,
- * so don't call it on %EOF, but no need to cast to #guchar before
+ * returning false for all non-ASCII characters. Also, unlike
+ * the standard library function, this takes a `char`, not an `int`,
+ * so don't call it on `EOF`, but no need to cast to `guchar` before
  * passing a possibly non-ASCII character in.
  *
- * Returns: %TRUE if @c is an ASCII white-space character
+ * Returns: true if @c is an ASCII white-space character
  */
 
 /**
@@ -243,14 +204,14 @@
  *
  * Determines whether a character is an ASCII upper case letter.
  *
- * Unlike the standard C library isupper() function, this only
+ * Unlike the standard C library `isupper()` function, this only
  * recognizes standard ASCII letters and ignores the locale,
- * returning %FALSE for all non-ASCII characters. Also, unlike
- * the standard library function, this takes a char, not an int,
- * so don't call it on %EOF, but no need to worry about casting
- * to #guchar before passing a possibly non-ASCII character in.
+ * returning false for all non-ASCII characters. Also, unlike
+ * the standard library function, this takes a `char`, not an `int`,
+ * so don't call it on `EOF`, but no need to worry about casting
+ * to `guchar` before passing a possibly non-ASCII character in.
  *
- * Returns: %TRUE if @c is an ASCII upper case letter
+ * Returns: true if @c is an ASCII upper case letter
  */
 
 /**
@@ -259,26 +220,26 @@
  *
  * Determines whether a character is a hexadecimal-digit character.
  *
- * Unlike the standard C library isxdigit() function, this takes
- * a char, not an int, so don't call it on %EOF, but no need to
- * cast to #guchar before passing a possibly non-ASCII character in.
+ * Unlike the standard C library `isxdigit()` function, this takes
+ * a `char`, not an `int`, so don't call it on `EOF`, but no need to
+ * cast to `guchar` before passing a possibly non-ASCII character in.
  *
- * Returns: %TRUE if @c is an ASCII hexadecimal-digit character.
+ * Returns: true if @c is an ASCII hexadecimal-digit character
  */
 
 /**
  * G_ASCII_DTOSTR_BUF_SIZE:
  *
- * A good size for a buffer to be passed into g_ascii_dtostr().
+ * A good size for a buffer to be passed into [func@GLib.ascii_dtostr].
  * It is guaranteed to be enough for all output of that function
  * on systems with 64bit IEEE-compatible doubles.
  *
  * The typical usage would be something like:
- * |[<!-- language="C" -->
- *   char buf[G_ASCII_DTOSTR_BUF_SIZE];
+ * ```C
+ * char buf[G_ASCII_DTOSTR_BUF_SIZE];
  *
- *   fprintf (out, "value=%s\n", g_ascii_dtostr (buf, sizeof (buf), value));
- * ]|
+ * fprintf (out, "value=%s\n", g_ascii_dtostr (buf, sizeof (buf), value));
+ * ```
  */
 
 /**
@@ -286,7 +247,8 @@
  * @string: a string to remove the leading and trailing whitespace from
  *
  * Removes leading and trailing whitespace from a string.
- * See g_strchomp() and g_strchug().
+ *
+ * See [func@GLib.strchomp] and [func@GLib.strchug].
  *
  * Returns: @string
  */
@@ -294,7 +256,7 @@
 /**
  * G_STR_DELIMITERS:
  *
- * The standard delimiters, used in g_strdelimit().
+ * The standard delimiters, used in [func@GLib.strdelimit].
  */
 
 static const guint16 ascii_table_data[256] = {
@@ -345,9 +307,7 @@ get_C_locale (void)
  * g_strdup:
  * @str: (nullable): the string to duplicate
  *
- * Duplicates a string. If @str is %NULL it returns %NULL.
- * The returned string should be freed with g_free()
- * when no longer needed.
+ * Duplicates a string. If @str is `NULL` it returns `NULL`.
  *
  * Returns: a newly-allocated copy of @str
  */
@@ -371,17 +331,17 @@ gchar*
 
 /**
  * g_memdup:
- * @mem: the memory to copy.
- * @byte_size: the number of bytes to copy.
+ * @mem: the memory to copy
+ * @byte_size: the number of bytes to copy
  *
  * Allocates @byte_size bytes of memory, and copies @byte_size bytes into it
- * from @mem. If @mem is %NULL it returns %NULL.
+ * from @mem. If @mem is `NULL` it returns `NULL`.
  *
- * Returns: a pointer to the newly-allocated copy of the memory, or %NULL if @mem
- *  is %NULL.
- * Deprecated: 2.68: Use g_memdup2() instead, as it accepts a #gsize argument
- *     for @byte_size, avoiding the possibility of overflow in a #gsize → #guint
- *     conversion
+ * Returns: (transfer full) (nullable): a pointer to the newly-allocated copy of the memory
+ *
+ * Deprecated: 2.68: Use [func@GLib.memdup2] instead, as it accepts a gsize argument
+ *   for @byte_size, avoiding the possibility of overflow in a `gsize` → `guint`
+ *   conversion
  */
 gpointer
 g_memdup (gconstpointer mem,
@@ -402,17 +362,17 @@ g_memdup (gconstpointer mem,
 
 /**
  * g_memdup2:
- * @mem: (nullable): the memory to copy.
- * @byte_size: the number of bytes to copy.
+ * @mem: (nullable): the memory to copy
+ * @byte_size: the number of bytes to copy
  *
  * Allocates @byte_size bytes of memory, and copies @byte_size bytes into it
- * from @mem. If @mem is %NULL it returns %NULL.
+ * from @mem. If @mem is `NULL` it returns `NULL`.
+ *
+ * This replaces [func@GLib.memdup], which was prone to integer overflows when
+ * converting the argument from a `gsize` to a `guint`.
  *
- * This replaces g_memdup(), which was prone to integer overflows when
- * converting the argument from a #gsize to a #guint.
+ * Returns: (transfer full) (nullable): a pointer to the newly-allocated copy of the memory
  *
- * Returns: (nullable): a pointer to the newly-allocated copy of the memory,
- *    or %NULL if @mem is %NULL.
  * Since: 2.68
  */
 gpointer
@@ -434,20 +394,19 @@ g_memdup2 (gconstpointer mem,
 
 /**
  * g_strndup:
- * @str: the string to duplicate
+ * @str: (nullable): the string to duplicate
  * @n: the maximum number of bytes to copy from @str
  *
  * Duplicates the first @n bytes of a string, returning a newly-allocated
  * buffer @n + 1 bytes long which will always be nul-terminated. If @str
  * is less than @n bytes long the buffer is padded with nuls. If @str is
- * %NULL it returns %NULL. The returned value should be freed when no longer
- * needed.
+ * `NULL` it returns `NULL`.
  *
  * To copy a number of characters from a UTF-8 encoded string,
- * use g_utf8_strncpy() instead.
+ * use [func@GLib.utf8_strncpy] instead.
  *
- * Returns: a newly-allocated buffer containing the first @n bytes
- *     of @str, nul-terminated
+ * Returns: (nullable): a newly-allocated buffer containing the first
+ *    @n bytes of @str
  */
 gchar*
 g_strndup (const gchar *str,
@@ -473,9 +432,8 @@ g_strndup (const gchar *str,
  * @fill_char: the byte to fill the string with
  *
  * Creates a new string @length bytes long filled with @fill_char.
- * The returned string should be freed when no longer needed.
  *
- * Returns: a newly-allocated string filled the @fill_char
+ * Returns: a newly-allocated string filled with @fill_char
  */
 gchar*
 g_strnfill (gsize length,
@@ -492,15 +450,15 @@ g_strnfill (gsize length,
 
 /**
  * g_stpcpy:
- * @dest: destination buffer.
- * @src: source string.
+ * @dest: destination buffer
+ * @src: source string
  *
  * Copies a nul-terminated string into the destination buffer, including
  * the trailing nul byte, and returns a pointer to the trailing nul byte
  * in `dest`.  The return value is useful for concatenating multiple
  * strings without having to repeatedly scan for the end.
  *
- * Returns: a pointer to the trailing nul byte in `dest`.
+ * Returns: a pointer to the trailing nul byte in `dest`
  **/
 gchar *
 g_stpcpy (gchar       *dest,
@@ -526,23 +484,23 @@ g_stpcpy (gchar       *dest,
 
 /**
  * g_strdup_vprintf:
- * @format: (not nullable): a standard printf() format string, but notice
- *     [string precision pitfalls][string-precision]
+ * @format: (not nullable): a standard `printf()` format string, but notice
+ *   [string precision pitfalls](string-utils.html#string-precision-pitfalls)
  * @args: the list of parameters to insert into the format string
  *
- * Similar to the standard C vsprintf() function but safer, since it
+ * Similar to the standard C `vsprintf()` function but safer, since it
  * calculates the maximum space required and allocates memory to hold
- * the result. The returned string should be freed with g_free() when
- * no longer needed.
+ * the result.
  *
  * The returned string is guaranteed to be non-NULL, unless @format
  * contains `%lc` or `%ls` conversions, which can fail if no multibyte
  * representation is available for the given character.
  *
- * See also g_vasprintf(), which offers the same functionality, but
+ * See also [func@GLib.vasprintf], which offers the same functionality, but
  * additionally returns the length of the allocated string.
  *
- * Returns: a newly-allocated string holding the result
+ * Returns: (nullable) (transfer full): a newly-allocated string holding the
+ *   result
  */
 gchar*
 g_strdup_vprintf (const gchar *format,
@@ -557,20 +515,20 @@ g_strdup_vprintf (const gchar *format,
 
 /**
  * g_strdup_printf:
- * @format: (not nullable): a standard printf() format string, but notice
- *     [string precision pitfalls][string-precision]
+ * @format: (not nullable): a standard `printf()` format string, but notice
+ *   [string precision pitfalls](string-utils.html#string-precision-pitfalls)
  * @...: the parameters to insert into the format string
  *
- * Similar to the standard C sprintf() function but safer, since it
+ * Similar to the standard C `sprintf()` function but safer, since it
  * calculates the maximum space required and allocates memory to hold
- * the result. The returned string should be freed with g_free() when no
- * longer needed.
+ * the result.
  *
  * The returned string is guaranteed to be non-NULL, unless @format
  * contains `%lc` or `%ls` conversions, which can fail if no multibyte
  * representation is available for the given character.
  *
- * Returns: a newly-allocated string holding the result
+ * Returns: (nullable) (transfer full): a newly-allocated string holding the
+ *   result
  */
 gchar*
 g_strdup_printf (const gchar *format,
@@ -588,14 +546,13 @@ g_strdup_printf (const gchar *format,
 
 /**
  * g_strconcat:
- * @string1: the first string to add, which must not be %NULL
- * @...: a %NULL-terminated list of strings to append to the string
+ * @string1: the first string to add, which must not be `NULL`
+ * @...: a `NULL`-terminated list of strings to append to the string
  *
- * Concatenates all of the given strings into one long string. The
- * returned string should be freed with g_free() when no longer needed.
+ * Concatenates all of the given strings into one long string.
  *
- * The variable argument list must end with %NULL. If you forget the %NULL,
- * g_strconcat() will start appending random memory junk to your string.
+ * The variable argument list must end with `NULL`. If you forget the `NULL`,
+ * `g_strconcat()` will start appending random memory junk to your string.
  *
  * Note that this function is usually not the right function to use to
  * assemble a translated message from pieces, since proper translation
@@ -643,23 +600,24 @@ g_strconcat (const gchar *string1, ...)
 
 /**
  * g_strtod:
- * @nptr:    the string to convert to a numeric value.
- * @endptr:  (out) (transfer none) (optional): if non-%NULL, it returns the
- *           character after the last character used in the conversion.
+ * @nptr: the string to convert to a numeric value
+ * @endptr: (out) (transfer none) (optional): if non-`NULL`, it returns the
+ *   character after the last character used in the conversion
+ *
+ * Converts a string to a floating point value.
  *
- * Converts a string to a #gdouble value.
- * It calls the standard strtod() function to handle the conversion, but
+ * It calls the standard `strtod()` function to handle the conversion, but
  * if the string is not completely converted it attempts the conversion
- * again with g_ascii_strtod(), and returns the best match.
+ * again with [func@GLib.ascii_strtod], and returns the best match.
  *
  * This function should seldom be used. The normal situation when reading
- * numbers not for human consumption is to use g_ascii_strtod(). Only when
+ * numbers not for human consumption is to use [func@GLib.ascii_strtod]. Only when
  * you know that you must expect both locale formatted and C formatted numbers
  * should you use this. Make sure that you don't pass strings such as comma
  * separated lists of values, since the commas may be interpreted as a decimal
  * point in some locales, causing unexpected results.
  *
- * Returns: the #gdouble value.
+ * Returns: the converted value
  **/
 gdouble
 g_strtod (const gchar *nptr,
@@ -696,13 +654,13 @@ g_strtod (const gchar *nptr,
 
 /**
  * g_ascii_strtod:
- * @nptr:    the string to convert to a numeric value.
- * @endptr:  (out) (transfer none) (optional): if non-%NULL, it returns the
- *           character after the last character used in the conversion.
+ * @nptr: the string to convert to a numeric value
+ * @endptr: (out) (transfer none) (optional): if non-`NULL`, it returns the
+ *   character after the last character used in the conversion
  *
- * Converts a string to a #gdouble value.
+ * Converts a string to a floating point value.
  *
- * This function behaves like the standard strtod() function
+ * This function behaves like the standard `strtod()` function
  * does in the C locale. It does this without actually changing
  * the current locale, since that would not be thread-safe.
  * A limitation of the implementation is that this function
@@ -711,20 +669,20 @@ g_strtod (const gchar *nptr,
  * This function is typically used when reading configuration
  * files or other non-user input that should be locale independent.
  * To handle input from the user you should normally use the
- * locale-sensitive system strtod() function.
+ * locale-sensitive system `strtod()` function.
  *
- * To convert from a #gdouble to a string in a locale-insensitive
- * way, use g_ascii_dtostr().
+ * To convert from a gdouble to a string in a locale-insensitive
+ * way, use [func@GLib.ascii_dtostr].
  *
- * If the correct value would cause overflow, plus or minus %HUGE_VAL
- * is returned (according to the sign of the value), and %ERANGE is
- * stored in %errno. If the correct value would cause underflow,
- * zero is returned and %ERANGE is stored in %errno.
+ * If the correct value would cause overflow, plus or minus `HUGE_VAL`
+ * is returned (according to the sign of the value), and `ERANGE` is
+ * stored in `errno`. If the correct value would cause underflow,
+ * zero is returned and `ERANGE` is stored in `errno`.
  *
- * This function resets %errno before calling strtod() so that
+ * This function resets `errno` before calling `strtod()` so that
  * you can reliably detect overflow and underflow.
  *
- * Returns: the #gdouble value.
+ * Returns: the converted value
  */
 gdouble
 g_ascii_strtod (const gchar *nptr,
@@ -905,21 +863,21 @@ g_ascii_strtod (const gchar *nptr,
 
 /**
  * g_ascii_dtostr:
- * @buffer: A buffer to place the resulting string in
- * @buf_len: The length of the buffer.
- * @d: The #gdouble to convert
+ * @buffer: a buffer to place the resulting string in
+ * @buf_len: the length of the buffer
+ * @d: the value to convert
  *
- * Converts a #gdouble to a string, using the '.' as
+ * Converts a `gdouble` to a string, using the '.' as
  * decimal point.
  *
  * This function generates enough precision that converting
- * the string back using g_ascii_strtod() gives the same machine-number
+ * the string back using [func@GLib.ascii_strtod] gives the same machine-number
  * (on machines with IEEE compatible 64bit doubles). It is
  * guaranteed that the size of the resulting string will never
- * be larger than %G_ASCII_DTOSTR_BUF_SIZE bytes, including the terminating
+ * be larger than [const@GLib.ASCII_DTOSTR_BUF_SIZE] bytes, including the terminating
  * nul character, which is always added.
  *
- * Returns: The pointer to the buffer with the converted string.
+ * Returns: the pointer to the buffer with the converted string
  **/
 gchar *
 g_ascii_dtostr (gchar       *buffer,
@@ -941,26 +899,26 @@ g_ascii_dtostr (gchar       *buffer,
 
 /**
  * g_ascii_formatd:
- * @buffer: A buffer to place the resulting string in
- * @buf_len: The length of the buffer.
- * @format: The printf()-style format to use for the
+ * @buffer: a buffer to place the resulting string in
+ * @buf_len: the length of the buffer
+ * @format: the `printf()`-style format to use for the
  *   code to use for converting
- * @d: The #gdouble to convert
+ * @d: the value to convert
  *
- * Converts a #gdouble to a string, using the '.' as
+ * Converts a `gdouble` to a string, using the '.' as
  * decimal point. To format the number you pass in
- * a printf()-style format string. Allowed conversion
+ * a `printf()`-style format string. Allowed conversion
  * specifiers are 'e', 'E', 'f', 'F', 'g' and 'G'.
  *
  * The @format must just be a single format specifier
- * starting with `%`, expecting a #gdouble argument.
+ * starting with `%`, expecting a `gdouble` argument.
  *
  * The returned buffer is guaranteed to be nul-terminated.
  *
  * If you just want to want to serialize the value into a
- * string, use g_ascii_dtostr().
+ * string, use [func@GLib.ascii_dtostr].
  *
- * Returns: The pointer to the buffer with the converted string.
+ * Returns: the pointer to the buffer with the converted string
  */
 gchar *
 g_ascii_formatd (gchar       *buffer,
@@ -1201,35 +1159,36 @@ g_parse_long_long (const gchar  *nptr,
 
 /**
  * g_ascii_strtoull:
- * @nptr:    the string to convert to a numeric value.
- * @endptr:  (out) (transfer none) (optional): if non-%NULL, it returns the
- *           character after the last character used in the conversion.
- * @base:    to be used for the conversion, 2..36 or 0
+ * @nptr: the string to convert to a numeric value
+ * @endptr: (out) (transfer none) (optional): if non-`NULL`, it returns the
+ *   character after the last character used in the conversion
+ * @base: to be used for the conversion, 2..36 or 0
  *
- * Converts a string to a #guint64 value.
- * This function behaves like the standard strtoull() function
+ * Converts a string to a `guint64` value.
+ *
+ * This function behaves like the standard `strtoull()` function
  * does in the C locale. It does this without actually
  * changing the current locale, since that would not be
  * thread-safe.
  *
  * Note that input with a leading minus sign (`-`) is accepted, and will return
- * the negation of the parsed number, unless that would overflow a #guint64.
+ * the negation of the parsed number, unless that would overflow a `guint64`.
  * Critically, this means you cannot assume that a short fixed length input will
- * never result in a low return value, as the input could have a leading `-`.
+ * result in a low return value, as the input could have a leading `-`.
  *
  * This function is typically used when reading configuration
  * files or other non-user input that should be locale independent.
  * To handle input from the user you should normally use the
- * locale-sensitive system strtoull() function.
+ * locale-sensitive system `strtoull()` function.
  *
- * If the correct value would cause overflow, %G_MAXUINT64
+ * If the correct value would cause overflow, [const@GLib.MAXUINT64]
  * is returned, and `ERANGE` is stored in `errno`.
  * If the base is outside the valid range, zero is returned, and
  * `EINVAL` is stored in `errno`.
  * If the string conversion fails, zero is returned, and @endptr returns
- * @nptr (if @endptr is non-%NULL).
+ * @nptr (if @endptr is non-`NULL`).
  *
- * Returns: the #guint64 value or zero on error.
+ * Returns: the converted value, or zero on error
  *
  * Since: 2.2
  */
@@ -1253,13 +1212,14 @@ g_ascii_strtoull (const gchar *nptr,
 
 /**
  * g_ascii_strtoll:
- * @nptr:    the string to convert to a numeric value.
- * @endptr:  (out) (transfer none) (optional): if non-%NULL, it returns the
- *           character after the last character used in the conversion.
- * @base:    to be used for the conversion, 2..36 or 0
+ * @nptr: the string to convert to a numeric value
+ * @endptr: (out) (transfer none) (optional): if non-`NULL`, it returns the
+ *   character after the last character used in the conversion
+ * @base: to be used for the conversion, 2..36 or 0
+ *
+ * Converts a string to a `gint64` value.
  *
- * Converts a string to a #gint64 value.
- * This function behaves like the standard strtoll() function
+ * This function behaves like the standard `strtoll()` function
  * does in the C locale. It does this without actually
  * changing the current locale, since that would not be
  * thread-safe.
@@ -1267,16 +1227,16 @@ g_ascii_strtoull (const gchar *nptr,
  * This function is typically used when reading configuration
  * files or other non-user input that should be locale independent.
  * To handle input from the user you should normally use the
- * locale-sensitive system strtoll() function.
+ * locale-sensitive system `strtoll()` function.
  *
- * If the correct value would cause overflow, %G_MAXINT64 or %G_MININT64
- * is returned, and `ERANGE` is stored in `errno`.
+ * If the correct value would cause overflow, [const@GLib.MAXINT64] or
+ * [const@GLib.MININT64] is returned, and `ERANGE` is stored in `errno`.
  * If the base is outside the valid range, zero is returned, and
  * `EINVAL` is stored in `errno`. If the
  * string conversion fails, zero is returned, and @endptr returns @nptr
- * (if @endptr is non-%NULL).
+ * (if @endptr is non-`NULL`).
  *
- * Returns: the #gint64 value or zero on error.
+ * Returns: the converted value, or zero on error
  *
  * Since: 2.12
  */
@@ -1312,30 +1272,31 @@ g_ascii_strtoll (const gchar *nptr,
 
 /**
  * g_strerror:
- * @errnum: the system error number. See the standard C %errno
- *     documentation
+ * @errnum: the system error number. See the standard C `errno` documentation
  *
  * Returns a string corresponding to the given error code, e.g. "no
- * such process". Unlike strerror(), this always returns a string in
+ * such process".
+ *
+ * Unlike `strerror()`, this always returns a string in
  * UTF-8 encoding, and the pointer is guaranteed to remain valid for
- * the lifetime of the process.
+ * the lifetime of the process. If the error code is unknown, it returns a
+ * string like “Unknown error <code\>”.
  *
  * Note that the string may be translated according to the current locale.
  *
- * The value of %errno will not be changed by this function. However, it may
+ * The value of `errno` will not be changed by this function. However, it may
  * be changed by intermediate function calls, so you should save its value
  * as soon as the call returns:
- * |[
- *   int saved_errno;
+ * ```C
+ * int saved_errno;
  *
- *   ret = read (blah);
- *   saved_errno = errno;
+ * ret = read (blah);
+ * saved_errno = errno;
  *
- *   g_strerror (saved_errno);
- * ]|
+ * g_strerror (saved_errno);
+ * ```
  *
- * Returns: a UTF-8 string describing the error code. If the error code
- *     is unknown, it returns a string like "Unknown error: <code>".
+ * Returns: the string describing the error code
  */
 const gchar *
 g_strerror (gint errnum)
@@ -1412,12 +1373,13 @@ g_strerror (gint errnum)
  * @signum: the signal number. See the `signal` documentation
  *
  * Returns a string describing the given signal, e.g. "Segmentation fault".
- * You should use this function in preference to strsignal(), because it
+ * If the signal is unknown, it returns “unknown signal (<signum\>)”.
+ *
+ * You should use this function in preference to `strsignal()`, because it
  * returns a string in UTF-8 encoding, and since not all platforms support
- * the strsignal() function.
+ * the `strsignal()` function.
  *
- * Returns: a UTF-8 string describing the signal. If the signal is unknown,
- *     it returns "unknown signal (<signum>)".
+ * Returns: the string describing the signal
  */
 const gchar *
 g_strsignal (gint signum)
@@ -1479,19 +1441,19 @@ g_strlcat (gchar       *dest,
  * @src: source buffer
  * @dest_size: length of @dest in bytes
  *
- * Portability wrapper that calls strlcpy() on systems which have it,
- * and emulates strlcpy() otherwise. Copies @src to @dest; @dest is
+ * Portability wrapper that calls `strlcpy()` on systems which have it,
+ * and emulates `strlcpy()` otherwise. Copies @src to @dest; @dest is
  * guaranteed to be nul-terminated; @src must be nul-terminated;
  * @dest_size is the buffer size, not the number of bytes to copy.
  *
  * At most @dest_size - 1 characters will be copied. Always nul-terminates
  * (unless @dest_size is 0). This function does not allocate memory. Unlike
- * strncpy(), this function doesn't pad @dest (so it's often faster). It
- * returns the size of the attempted result, strlen (src), so if
+ * `strncpy()`, this function doesn't pad @dest (so it's often faster). It
+ * returns the size of the attempted result, `strlen (src)`, so if
  * @retval >= @dest_size, truncation occurred.
  *
- * Caveat: strlcpy() is supposedly more secure than strcpy() or strncpy(),
- * but if you really want to avoid screwups, g_strdup() is an even better
+ * Caveat: `strlcpy()` is supposedly more secure than `strcpy()` or `strncpy()`,
+ * but if you really want to avoid screwups, [func@GLib.strdup] is an even better
  * idea.
  *
  * Returns: length of @src
@@ -1537,25 +1499,25 @@ g_strlcpy (gchar       *dest,
  * @dest: destination buffer, already containing one nul-terminated string
  * @src: source buffer
  * @dest_size: length of @dest buffer in bytes (not length of existing string
- *     inside @dest)
+ *   inside @dest)
  *
- * Portability wrapper that calls strlcat() on systems which have it,
+ * Portability wrapper that calls `strlcat()` on systems which have it,
  * and emulates it otherwise. Appends nul-terminated @src string to @dest,
  * guaranteeing nul-termination for @dest. The total size of @dest won't
  * exceed @dest_size.
  *
- * At most @dest_size - 1 characters will be copied. Unlike strncat(),
+ * At most @dest_size - 1 characters will be copied. Unlike `strncat()`,
  * @dest_size is the full size of dest, not the space left over. This
  * function does not allocate memory. It always nul-terminates (unless
  * @dest_size == 0 or there were no nul characters in the @dest_size
  * characters of dest to start with).
  *
- * Caveat: this is supposedly a more secure alternative to strcat() or
- * strncat(), but for real security g_strconcat() is harder to mess up.
+ * Caveat: this is supposedly a more secure alternative to `strcat()` or
+ * `strncat()`, but for real security [func@GLib.strconcat] is harder to mess up.
  *
- * Returns: size of attempted result, which is MIN (dest_size, strlen
- *     (original dest)) + strlen (src), so if retval >= dest_size,
- *     truncation occurred.
+ * Returns: size of attempted result, which is `MIN (dest_size, strlen
+ *   (original dest)) + strlen (src)`, so if @retval >= @dest_size,
+ *   truncation occurred
  */
 gsize
 g_strlcat (gchar       *dest,
@@ -1597,14 +1559,14 @@ g_strlcat (gchar       *dest,
 /**
  * g_ascii_strdown:
  * @str: a string
- * @len: length of @str in bytes, or -1 if @str is nul-terminated
+ * @len: length of @str in bytes, or `-1` if @str is nul-terminated
  *
- * Converts all upper case ASCII letters to lower case ASCII letters.
+ * Converts all upper case ASCII letters to lower case ASCII letters, with
+ * semantics that exactly match [func@GLib.ascii_tolower].
  *
- * Returns: a newly-allocated string, with all the upper case
- *     characters in @str converted to lower case, with semantics that
- *     exactly match g_ascii_tolower(). (Note that this is unlike the
- *     old g_strdown(), which modified the string in place.)
+ * Returns: a newly-allocated string, with all the upper case characters in
+ *   @str converted to lower case. (Note that this is unlike the old
+ *   [func@GLib.strdown], which modified the string in place.)
  */
 gchar*
 g_ascii_strdown (const gchar *str,
@@ -1615,9 +1577,10 @@ g_ascii_strdown (const gchar *str,
   g_return_val_if_fail (str != NULL, NULL);
 
   if (len < 0)
-    len = (gssize) strlen (str);
+    result = g_strdup (str);
+  else
+    result = g_strndup (str, (gsize) len);
 
-  result = g_strndup (str, (gsize) len);
   for (s = result; *s; s++)
     *s = g_ascii_tolower (*s);
 
@@ -1627,14 +1590,14 @@ g_ascii_strdown (const gchar *str,
 /**
  * g_ascii_strup:
  * @str: a string
- * @len: length of @str in bytes, or -1 if @str is nul-terminated
+ * @len: length of @str in bytes, or `-1` if @str is nul-terminated
  *
- * Converts all lower case ASCII letters to upper case ASCII letters.
+ * Converts all lower case ASCII letters to upper case ASCII letters, with
+ * semantics that exactly match [func@GLib.ascii_toupper].
  *
- * Returns: a newly allocated string, with all the lower case
- *     characters in @str converted to upper case, with semantics that
- *     exactly match g_ascii_toupper(). (Note that this is unlike the
- *     old g_strup(), which modified the string in place.)
+ * Returns: a newly-allocated string, with all the lower case characters
+ *   in @str converted to upper case. (Note that this is unlike the old
+ *   [func@GLib.strup], which modified the string in place.)
  */
 gchar*
 g_ascii_strup (const gchar *str,
@@ -1645,9 +1608,10 @@ g_ascii_strup (const gchar *str,
   g_return_val_if_fail (str != NULL, NULL);
 
   if (len < 0)
-    len = (gssize) strlen (str);
+    result = g_strdup (str);
+  else
+    result = g_strndup (str, (gsize) len);
 
-  result = g_strndup (str, (gsize) len);
   for (s = result; *s; s++)
     *s = g_ascii_toupper (*s);
 
@@ -1661,7 +1625,7 @@ g_ascii_strup (const gchar *str,
  * Determines if a string is pure ASCII. A string is pure ASCII if it
  * contains no bytes with the high bit set.
  *
- * Returns: %TRUE if @str is ASCII
+ * Returns: true if @str is ASCII
  *
  * Since: 2.40
  */
@@ -1679,15 +1643,15 @@ g_str_is_ascii (const gchar *str)
 
 /**
  * g_strdown:
- * @string: the string to convert.
+ * @string: the string to convert
  *
  * Converts a string to lower case.
  *
  * Returns: the string
  *
- * Deprecated:2.2: This function is totally broken for the reasons discussed
- * in the g_strncasecmp() docs - use g_ascii_strdown() or g_utf8_strdown()
- * instead.
+ * Deprecated: 2.2: This function is totally broken for the reasons discussed
+ *   in the [func@GLib.strncasecmp] docs — use [func@GLib.ascii_strdown] or
+ *   [func@GLib.utf8_strdown] instead.
  **/
 gchar*
 g_strdown (gchar *string)
@@ -1716,9 +1680,9 @@ g_strdown (gchar *string)
  *
  * Returns: the string
  *
- * Deprecated:2.2: This function is totally broken for the reasons
- *     discussed in the g_strncasecmp() docs - use g_ascii_strup()
- *     or g_utf8_strup() instead.
+ * Deprecated: 2.2: This function is totally broken for the reasons discussed
+ *   in the [func@GLib.strncasecmp] docs — use [func@GLib.ascii_strup] or
+ *   [func@GLib.utf8_strup] instead.
  */
 gchar*
 g_strup (gchar *string)
@@ -1746,11 +1710,11 @@ g_strup (gchar *string)
  * Reverses all of the bytes in a string. For example,
  * `g_strreverse ("abcdef")` will result in "fedcba".
  *
- * Note that g_strreverse() doesn't work on UTF-8 strings
+ * Note that `g_strreverse()` doesn't work on UTF-8 strings
  * containing multibyte characters. For that purpose, use
- * g_utf8_strreverse().
+ * [func@GLib.utf8_strreverse].
  *
- * Returns: the same pointer passed in as @string
+ * Returns: the @string, reversed in place
  */
 gchar*
 g_strreverse (gchar *string)
@@ -1783,18 +1747,18 @@ g_strreverse (gchar *string)
  * g_ascii_tolower:
  * @c: any character
  *
- * Convert a character to ASCII lower case.
+ * Convert a character to ASCII lower case. If the character is not an
+ * ASCII upper case letter, it is returned unchanged.
  *
- * Unlike the standard C library tolower() function, this only
+ * Unlike the standard C library `tolower()` function, this only
  * recognizes standard ASCII letters and ignores the locale, returning
  * all non-ASCII characters unchanged, even if they are lower case
  * letters in a particular character set. Also unlike the standard
  * library function, this takes and returns a char, not an int, so
- * don't call it on %EOF but no need to worry about casting to #guchar
+ * don't call it on `EOF` but no need to worry about casting to `guchar`
  * before passing a possibly non-ASCII character in.
  *
- * Returns: the result of converting @c to lower case. If @c is
- *     not an ASCII upper case letter, @c is returned unchanged.
+ * Returns: the result of the conversion
  */
 gchar
 g_ascii_tolower (gchar c)
@@ -1806,18 +1770,18 @@ g_ascii_tolower (gchar c)
  * g_ascii_toupper:
  * @c: any character
  *
- * Convert a character to ASCII upper case.
+ * Convert a character to ASCII upper case. If the character is not an
+ * ASCII lower case letter, it is returned unchanged.
  *
- * Unlike the standard C library toupper() function, this only
+ * Unlike the standard C library `toupper()` function, this only
  * recognizes standard ASCII letters and ignores the locale, returning
  * all non-ASCII characters unchanged, even if they are upper case
  * letters in a particular character set. Also unlike the standard
  * library function, this takes and returns a char, not an int, so
- * don't call it on %EOF but no need to worry about casting to #guchar
+ * don't call it on `EOF` but no need to worry about casting to `guchar`
  * before passing a possibly non-ASCII character in.
  *
- * Returns: the result of converting @c to upper case. If @c is not
- *    an ASCII lower case letter, @c is returned unchanged.
+ * Returns: the result of the conversion
  */
 gchar
 g_ascii_toupper (gchar c)
@@ -1829,12 +1793,14 @@ g_ascii_toupper (gchar c)
  * g_ascii_digit_value:
  * @c: an ASCII character
  *
- * Determines the numeric value of a character as a decimal digit.
- * Differs from g_unichar_digit_value() because it takes a char, so
+ * Determines the numeric value of a character as a decimal digit. If the
+ * character is not a decimal digit according to [func@GLib.ascii_isdigit],
+ * `-1` is returned.
+ *
+ * Differs from [func@GLib.unichar_digit_value] because it takes a char, so
  * there's no worry about sign extension if characters are signed.
  *
- * Returns: If @c is a decimal digit (according to g_ascii_isdigit()),
- *    its numeric value. Otherwise, -1.
+ * Returns: the numerical value of @c if it is a decimal digit, `-1` otherwise
  */
 int
 g_ascii_digit_value (gchar c)
@@ -1846,15 +1812,19 @@ g_ascii_digit_value (gchar c)
 
 /**
  * g_ascii_xdigit_value:
- * @c: an ASCII character.
+ * @c: an ASCII character
  *
- * Determines the numeric value of a character as a hexadecimal
- * digit. Differs from g_unichar_xdigit_value() because it takes
- * a char, so there's no worry about sign extension if characters
- * are signed.
+ * Determines the numeric value of a character as a hexadecimal digit. If the
+ * character is not a hex digit according to [func@GLib.ascii_isxdigit],
+ * `-1` is returned.
  *
- * Returns: If @c is a hex digit (according to g_ascii_isxdigit()),
- *     its numeric value. Otherwise, -1.
+ * Differs from [func@GLib.unichar_xdigit_value] because it takes a char, so
+ * there's no worry about sign extension if characters are signed.
+ *
+ * Differs from [func@GLib.unichar_xdigit_value] because it takes a char, so
+ * there's no worry about sign extension if characters are signed.
+ *
+ * Returns: the numerical value of @c if it is a hex digit, `-1` otherwise
  */
 int
 g_ascii_xdigit_value (gchar c)
@@ -1873,7 +1843,7 @@ g_ascii_xdigit_value (gchar c)
  *
  * Compare two strings, ignoring the case of ASCII characters.
  *
- * Unlike the BSD strcasecmp() function, this only recognizes standard
+ * Unlike the BSD `strcasecmp()` function, this only recognizes standard
  * ASCII letters and ignores the locale, treating all non-ASCII
  * bytes as if they are not letters.
  *
@@ -1885,10 +1855,10 @@ g_ascii_xdigit_value (gchar c)
  * characters include all ASCII letters. If you compare two CP932
  * strings using this function, you will get false matches.
  *
- * Both @s1 and @s2 must be non-%NULL.
+ * Both @s1 and @s2 must be non-`NULL`.
  *
  * Returns: 0 if the strings match, a negative value if @s1 < @s2,
- *     or a positive value if @s1 > @s2.
+ *   or a positive value if @s1 > @s2
  */
 gint
 g_ascii_strcasecmp (const gchar *s1,
@@ -1922,16 +1892,16 @@ g_ascii_strcasecmp (const gchar *s1,
  * less than @n bytes long, comparison will stop at the first nul byte
  * encountered.
  *
- * Unlike the BSD strcasecmp() function, this only recognizes standard
+ * Unlike the BSD `strncasecmp()` function, this only recognizes standard
  * ASCII letters and ignores the locale, treating all non-ASCII
  * characters as if they are not letters.
  *
- * The same warning as in g_ascii_strcasecmp() applies: Use this
+ * The same warning as in [func@GLib.ascii_strcasecmp] applies: Use this
  * function only on strings known to be in encodings where bytes
  * corresponding to ASCII letters always represent themselves.
  *
  * Returns: 0 if the strings match, a negative value if @s1 < @s2,
- *     or a positive value if @s1 > @s2.
+ *   or a positive value if @s1 > @s2
  */
 gint
 g_ascii_strncasecmp (const gchar *s1,
@@ -1961,17 +1931,17 @@ g_ascii_strncasecmp (const gchar *s1,
 
 /**
  * g_strcasecmp:
- * @s1: a string
- * @s2: a string to compare with @s1
+ * @s1: string to compare with @s2
+ * @s2: string to compare with @s1
  *
  * A case-insensitive string comparison, corresponding to the standard
- * strcasecmp() function on platforms which support it.
+ * `strcasecmp()` function on platforms which support it.
  *
  * Returns: 0 if the strings match, a negative value if @s1 < @s2,
- *     or a positive value if @s1 > @s2.
+ *   or a positive value if @s1 > @s2
  *
- * Deprecated:2.2: See g_strncasecmp() for a discussion of why this
- *     function is deprecated and how to replace it.
+ * Deprecated: 2.2: See [func@GLib.strncasecmp] for a discussion of why this
+ *   function is deprecated and how to replace it.
  */
 gint
 g_strcasecmp (const gchar *s1,
@@ -2006,32 +1976,32 @@ g_strcasecmp (const gchar *s1,
 
 /**
  * g_strncasecmp:
- * @s1: a string
- * @s2: a string to compare with @s1
+ * @s1: string to compare with @s2
+ * @s2: string to compare with @s1
  * @n: the maximum number of characters to compare
  *
  * A case-insensitive string comparison, corresponding to the standard
- * strncasecmp() function on platforms which support it. It is similar
- * to g_strcasecmp() except it only compares the first @n characters of
+ * `strncasecmp()` function on platforms which support it. It is similar
+ * to [func@GLib.strcasecmp] except it only compares the first @n characters of
  * the strings.
  *
  * Returns: 0 if the strings match, a negative value if @s1 < @s2,
- *     or a positive value if @s1 > @s2.
- *
- * Deprecated:2.2: The problem with g_strncasecmp() is that it does
- *     the comparison by calling toupper()/tolower(). These functions
- *     are locale-specific and operate on single bytes. However, it is
- *     impossible to handle things correctly from an internationalization
- *     standpoint by operating on bytes, since characters may be multibyte.
- *     Thus g_strncasecmp() is broken if your string is guaranteed to be
- *     ASCII, since it is locale-sensitive, and it's broken if your string
- *     is localized, since it doesn't work on many encodings at all,
- *     including UTF-8, EUC-JP, etc.
- *
- *     There are therefore two replacement techniques: g_ascii_strncasecmp(),
- *     which only works on ASCII and is not locale-sensitive, and
- *     g_utf8_casefold() followed by strcmp() on the resulting strings,
- *     which is good for case-insensitive sorting of UTF-8.
+ *   or a positive value if @s1 > @s2
+ *
+ * Deprecated: 2.2: The problem with `g_strncasecmp()` is that it does
+ *   the comparison by calling `toupper()`/`tolower()`. These functions
+ *   are locale-specific and operate on single bytes. However, it is
+ *   impossible to handle things correctly from an internationalization
+ *   standpoint by operating on bytes, since characters may be multibyte.
+ *   Thus `g_strncasecmp()` is broken if your string is guaranteed to be
+ *   ASCII, since it is locale-sensitive, and it's broken if your string
+ *   is localized, since it doesn't work on many encodings at all,
+ *   including UTF-8, EUC-JP, etc.
+ *
+ *   There are therefore two replacement techniques: [func@GLib.ascii_strncasecmp],
+ *   which only works on ASCII and is not locale-sensitive, and
+ *   [func@GLib.utf8_casefold] followed by `strcmp()` on the resulting strings,
+ *   which is good for case-insensitive sorting of UTF-8.
  */
 gint
 g_strncasecmp (const gchar *s1,
@@ -2069,8 +2039,8 @@ g_strncasecmp (const gchar *s1,
 /**
  * g_strdelimit:
  * @string: the string to convert
- * @delimiters: (nullable): a string containing the current delimiters,
- *     or %NULL to use the standard delimiters defined in %G_STR_DELIMITERS
+ * @delimiters: (nullable): a string containing the current delimiters, or
+ *   `NULL` to use the standard delimiters defined in [const@GLib.STR_DELIMITERS]
  * @new_delimiter: the new delimiter character
  *
  * Converts any delimiter characters in @string to @new_delimiter.
@@ -2080,18 +2050,16 @@ g_strncasecmp (const gchar *s1,
  * and returns @string itself, not a copy.
  *
  * The return value is to allow nesting such as:
+ * ```C
+ * g_ascii_strup (g_strdelimit (str, "abc", '?'))
+ * ```
  *
- * |[<!-- language="C" -->
- *   g_ascii_strup (g_strdelimit (str, "abc", '?'))
- * ]|
- *
- * In order to modify a copy, you may use g_strdup():
- *
- * |[<!-- language="C" -->
- *   reformatted = g_strdelimit (g_strdup (const_str), "abc", '?');
- *   ...
- *   g_free (reformatted);
- * ]|
+ * In order to modify a copy, you may use [func@GLib.strdup]:
+ * ```C
+ * reformatted = g_strdelimit (g_strdup (const_str), "abc", '?');
+ * …
+ * g_free (reformatted);
+ * ```
  *
  * Returns: the modified @string
  */
@@ -2127,18 +2095,16 @@ g_strdelimit (gchar       *string,
  *
  * Modifies @string in place, and return @string itself, not a copy. The
  * return value is to allow nesting such as:
+ * ```C
+ * g_ascii_strup (g_strcanon (str, "abc", '?'))
+ * ```
  *
- * |[<!-- language="C" -->
- *   g_ascii_strup (g_strcanon (str, "abc", '?'))
- * ]|
- *
- * In order to modify a copy, you may use g_strdup():
- *
- * |[<!-- language="C" -->
- *   reformatted = g_strcanon (g_strdup (const_str), "abc", '?');
- *   ...
- *   g_free (reformatted);
- * ]|
+ * In order to modify a copy, you may use [func@GLib.strdup]:
+ * ```C
+ * reformatted = g_strcanon (g_strdup (const_str), "abc", '?');
+ * …
+ * g_free (reformatted);
+ * ```
  *
  * Returns: the modified @string
  */
@@ -2167,10 +2133,10 @@ g_strcanon (gchar       *string,
  *
  * Replaces all escaped characters with their one byte equivalent.
  *
- * This function does the reverse conversion of g_strescape().
+ * This function does the reverse conversion of [func@GLib.strescape].
  *
  * Returns: a newly-allocated copy of @source with all escaped
- *     character compressed
+ *   character compressed
  */
 gchar *
 g_strcompress (const gchar *source)
@@ -2251,10 +2217,9 @@ g_strcompress (const gchar *source)
  * replaced with a '\' followed by their octal representation.
  * Characters supplied in @exceptions are not escaped.
  *
- * g_strcompress() does the reverse conversion.
+ * [func@GLib.strcompress] does the reverse conversion.
  *
- * Returns: a newly-allocated copy of @source with certain
- *     characters escaped. See above.
+ * Returns: a newly-allocated copy of @source with special characters escaped
  */
 gchar *
 g_strescape (const gchar *source,
@@ -2355,9 +2320,9 @@ g_strescape (const gchar *source,
  *
  * The pointer to @string is returned to allow the nesting of functions.
  *
- * Also see g_strchomp() and g_strstrip().
+ * Also see [func@GLib.strchomp] and [func@GLib.strstrip].
  *
- * Returns: @string
+ * Returns: the modified @string
  */
 gchar *
 g_strchug (gchar *string)
@@ -2386,9 +2351,9 @@ g_strchug (gchar *string)
  *
  * The pointer to @string is returned to allow the nesting of functions.
  *
- * Also see g_strchug() and g_strstrip().
+ * Also see [func@GLib.strchug] and [func@GLib.strstrip].
  *
- * Returns: @string
+ * Returns: the modified @string
  */
 gchar *
 g_strchomp (gchar *string)
@@ -2413,28 +2378,27 @@ g_strchomp (gchar *string)
  * g_strsplit:
  * @string: a string to split
  * @delimiter: a string which specifies the places at which to split
- *     the string. The delimiter is not included in any of the resulting
- *     strings, unless @max_tokens is reached.
- * @max_tokens: the maximum number of pieces to split @string into.
- *     If this is less than 1, the string is split completely.
+ *   the string. The delimiter is not included in any of the resulting
+ *   strings, unless @max_tokens is reached.
+ * @max_tokens: the maximum number of pieces to split @string into
+ *   If this is less than 1, the string is split completely
  *
  * Splits a string into a maximum of @max_tokens pieces, using the given
  * @delimiter. If @max_tokens is reached, the remainder of @string is
  * appended to the last token.
  *
- * As an example, the result of g_strsplit (":a:bc::d:", ":", -1) is a
- * %NULL-terminated vector containing the six strings "", "a", "bc", "", "d"
- * and "".
+ * As an example, the result of `g_strsplit (":a:bc::d:", ":", -1)` is an array
+ * containing the six strings "", "a", "bc", "", "d" and "".
  *
  * As a special case, the result of splitting the empty string "" is an empty
- * vector, not a vector containing a single string. The reason for this
- * special case is that being able to represent an empty vector is typically
+ * array, not an array containing a single string. The reason for this
+ * special case is that being able to represent an empty array is typically
  * more useful than consistent handling of empty elements. If you do need
  * to represent empty elements, you'll need to check for the empty string
- * before calling g_strsplit().
+ * before calling `g_strsplit()`.
  *
- * Returns: (transfer full): a newly-allocated %NULL-terminated array of
- *    strings. Use g_strfreev() to free it.
+ * Returns: (transfer full): a newly-allocated array of strings, freed with
+ *   [func@GLib.strfreev]
  */
 gchar**
 g_strsplit (const gchar *string,
@@ -2485,37 +2449,35 @@ g_strsplit (const gchar *string,
 
 /**
  * g_strsplit_set:
- * @string: The string to be tokenized
- * @delimiters: A nul-terminated string containing bytes that are used
- *     to split the string (it can accept an empty string, which will result
- *     in no string splitting).
- * @max_tokens: The maximum number of tokens to split @string into.
- *     If this is less than 1, the string is split completely
+ * @string: a string to split
+ * @delimiters: a string containing characters that are used to split the
+ *   string. Can be empty, which will result in no string splitting
+ * @max_tokens: the maximum number of tokens to split @string into.
+ *   If this is less than 1, the string is split completely
  *
  * Splits @string into a number of tokens not containing any of the characters
- * in @delimiter. A token is the (possibly empty) longest string that does not
+ * in @delimiters. A token is the (possibly empty) longest string that does not
  * contain any of the characters in @delimiters. If @max_tokens is reached, the
  * remainder is appended to the last token.
  *
- * For example the result of g_strsplit_set ("abc:def/ghi", ":/", -1) is a
- * %NULL-terminated vector containing the three strings "abc", "def",
- * and "ghi".
+ * For example, the result of g_strsplit_set ("abc:def/ghi", ":/", -1) is an
+ * array containing the three strings "abc", "def", and "ghi".
  *
- * The result of g_strsplit_set (":def/ghi:", ":/", -1) is a %NULL-terminated
- * vector containing the four strings "", "def", "ghi", and "".
+ * The result of g_strsplit_set (":def/ghi:", ":/", -1) is an array containing
+ * the four strings "", "def", "ghi", and "".
  *
  * As a special case, the result of splitting the empty string "" is an empty
- * vector, not a vector containing a single string. The reason for this
- * special case is that being able to represent an empty vector is typically
+ * array, not an array containing a single string. The reason for this
+ * special case is that being able to represent an empty array is typically
  * more useful than consistent handling of empty elements. If you do need
  * to represent empty elements, you'll need to check for the empty string
- * before calling g_strsplit_set().
+ * before calling `g_strsplit_set()`.
  *
  * Note that this function works on bytes not characters, so it can't be used
  * to delimit UTF-8 strings for anything but ASCII characters.
  *
- * Returns: (transfer full): a newly-allocated %NULL-terminated array of
- *    strings. Use g_strfreev() to free it.
+ * Returns: (transfer full): a newly-allocated array of strings. Use
+ *   [func@GLib.strfreev] to free it.
  *
  * Since: 2.4
  **/
@@ -2589,17 +2551,17 @@ g_strsplit_set (const gchar *string,
  * GStrv:
  *
  * A typedef alias for gchar**. This is mostly useful when used together with
- * g_auto().
+ * `g_auto()`.
  */
 
 /**
  * g_strfreev:
- * @str_array: (nullable): a %NULL-terminated array of strings to free
+ * @str_array: (array zero-terminated=1) (nullable) (transfer full): an
+ *   array of strings to free
  *
- * Frees a %NULL-terminated array of strings, as well as each
- * string it contains.
+ * Frees an array of strings, as well as each string it contains.
  *
- * If @str_array is %NULL, this function simply returns.
+ * If @str_array is `NULL`, this function simply returns.
  */
 void
 g_strfreev (gchar **str_array)
@@ -2617,14 +2579,15 @@ g_strfreev (gchar **str_array)
 
 /**
  * g_strdupv:
- * @str_array: (nullable): a %NULL-terminated array of strings
+ * @str_array: (array zero-terminated=1) (nullable): an array of strings to copy
  *
- * Copies %NULL-terminated array of strings. The copy is a deep copy;
- * the new array should be freed by first freeing each string, then
- * the array itself. g_strfreev() does this for you. If called
- * on a %NULL value, g_strdupv() simply returns %NULL.
+ * Copies an array of strings. The copy is a deep copy; each string is also
+ * copied.
  *
- * Returns: (nullable): a new %NULL-terminated array of strings.
+ * If called on a `NULL` value, `g_strdupv()` simply returns `NULL`.
+ *
+ * Returns: (array zero-terminated=1) (nullable) (transfer full): a
+ *   newly-allocated array of strings. Use [func@GLib.strfreev] to free it.
  */
 gchar**
 g_strdupv (gchar **str_array)
@@ -2656,20 +2619,18 @@ g_strdupv (gchar **str_array)
 
 /**
  * g_strjoinv:
- * @separator: (nullable): a string to insert between each of the
- *     strings, or %NULL
- * @str_array: a %NULL-terminated array of strings to join
+ * @separator: (nullable): a string to insert between each of the strings
+ * @str_array: (array zero-terminated=1): an array of strings to join
  *
- * Joins a number of strings together to form one long string, with the
- * optional @separator inserted between each of them. The returned string
- * should be freed with g_free().
+ * Joins an array of strings together to form one long string, with the
+ * optional @separator inserted between each of them.
  *
  * If @str_array has no items, the return value will be an
  * empty string. If @str_array contains a single item, @separator will not
  * appear in the resulting string.
  *
  * Returns: a newly-allocated string containing all of the strings joined
- *     together, with @separator between them
+ *   together, with @separator between them
  */
 gchar*
 g_strjoinv (const gchar  *separator,
@@ -2713,16 +2674,14 @@ g_strjoinv (const gchar  *separator,
 
 /**
  * g_strjoin:
- * @separator: (nullable): a string to insert between each of the
- *     strings, or %NULL
- * @...: a %NULL-terminated list of strings to join
+ * @separator: (nullable): a string to insert between each of the strings
+ * @...: a `NULL`-terminated list of strings to join
  *
  * Joins a number of strings together to form one long string, with the
- * optional @separator inserted between each of them. The returned string
- * should be freed with g_free().
+ * optional @separator inserted between each of them.
  *
  * Returns: a newly-allocated string containing all of the strings joined
- *     together, with @separator between them
+ *   together, with @separator between them
  */
 gchar*
 g_strjoin (const gchar *separator,
@@ -2783,17 +2742,19 @@ g_strjoin (const gchar *separator,
 
 /**
  * g_strstr_len:
- * @haystack: a nul-terminated string
- * @haystack_len: the maximum length of @haystack in bytes. A length of -1
- *     can be used to mean "search the entire string", like `strstr()`.
+ * @haystack: a string to search in
+ * @haystack_len: the maximum length of @haystack in bytes, or `-1` to
+ *   search it entirely
  * @needle: the string to search for
  *
  * Searches the string @haystack for the first occurrence
  * of the string @needle, limiting the length of the search
  * to @haystack_len or a nul terminator byte (whichever is reached first).
  *
- * Returns: a pointer to the found occurrence, or
- *    %NULL if not found.
+ * A length of `-1` can be used to mean “search the entire string”, like
+ * `strstr()`.
+ *
+ * Returns: a pointer to the found occurrence, or `NULL` if not found
  */
 gchar *
 g_strstr_len (const gchar *haystack,
@@ -2839,14 +2800,13 @@ g_strstr_len (const gchar *haystack,
 
 /**
  * g_strrstr:
- * @haystack: a nul-terminated string
- * @needle: the nul-terminated string to search for
+ * @haystack: a string to search in
+ * @needle: the string to search for
  *
  * Searches the string @haystack for the last occurrence
  * of the string @needle.
  *
- * Returns: a pointer to the found occurrence, or
- *    %NULL if not found.
+ * Returns: a pointer to the found occurrence, or `NULL` if not found
  */
 gchar *
 g_strrstr (const gchar *haystack,
@@ -2888,17 +2848,16 @@ g_strrstr (const gchar *haystack,
 
 /**
  * g_strrstr_len:
- * @haystack: a nul-terminated string
- * @haystack_len: the maximum length of @haystack in bytes. A length of -1
- *     can be used to mean "search the entire string", like g_strrstr().
- * @needle: the nul-terminated string to search for
+ * @haystack: a string to search in
+ * @haystack_len: the maximum length of @haystack in bytes. A length of `-1`
+ *   can be used to mean "search the entire string", like [func@GLib.strrstr]
+ * @needle: the string to search for
  *
  * Searches the string @haystack for the last occurrence
  * of the string @needle, limiting the length of the search
  * to @haystack_len.
  *
- * Returns: a pointer to the found occurrence, or
- *    %NULL if not found.
+ * Returns: a pointer to the found occurrence, or `NULL` if not found
  */
 gchar *
 g_strrstr_len (const gchar *haystack,
@@ -2944,12 +2903,12 @@ g_strrstr_len (const gchar *haystack,
 
 /**
  * g_str_has_suffix:
- * @str: a nul-terminated string
- * @suffix: the nul-terminated suffix to look for
+ * @str: a string to look in
+ * @suffix: the suffix to look for
  *
- * Looks whether the string @str ends with @suffix.
+ * Looks whether a string ends with @suffix.
  *
- * Returns: %TRUE if @str end with @suffix, %FALSE otherwise.
+ * Returns: true if @str ends with @suffix, false otherwise
  *
  * Since: 2.2
  */
@@ -2973,12 +2932,12 @@ gboolean (g_str_has_suffix) (const gchar *str,
 
 /**
  * g_str_has_prefix:
- * @str: a nul-terminated string
- * @prefix: the nul-terminated prefix to look for
+ * @str: a string to look in
+ * @prefix: the prefix to look for
  *
  * Looks whether the string @str begins with @prefix.
  *
- * Returns: %TRUE if @str begins with @prefix, %FALSE otherwise.
+ * Returns: true if @str begins with @prefix, false otherwise
  *
  * Since: 2.2
  */
@@ -2993,12 +2952,11 @@ gboolean (g_str_has_prefix) (const gchar *str,
 
 /**
  * g_strv_length:
- * @str_array: a %NULL-terminated array of strings
+ * @str_array: (array zero-terminated=1): an array of strings
  *
- * Returns the length of the given %NULL-terminated
- * string array @str_array. @str_array must not be %NULL.
+ * Returns the length of an array of strings. @str_array must not be `NULL`.
  *
- * Returns: length of @str_array.
+ * Returns: length of @str_array
  *
  * Since: 2.6
  */
@@ -3102,21 +3060,21 @@ split_words (const gchar *value)
 
 /**
  * g_str_tokenize_and_fold:
- * @string: a string
+ * @string: a string to tokenize
  * @translit_locale: (nullable): the language code (like 'de' or
  *   'en_GB') from which @string originates
- * @ascii_alternates: (out) (transfer full) (array zero-terminated=1): a
- *   return location for ASCII alternates
+ * @ascii_alternates: (out) (optional) (transfer full) (array zero-terminated=1):
+ *   a return location for ASCII alternates
  *
- * Tokenises @string and performs folding on each token.
+ * Tokenizes @string and performs folding on each token.
  *
  * A token is a non-empty sequence of alphanumeric characters in the
  * source string, separated by non-alphanumeric characters.  An
  * "alphanumeric" character for this purpose is one that matches
- * g_unichar_isalnum() or g_unichar_ismark().
+ * [func@GLib.unichar_isalnum] or [func@GLib.unichar_ismark].
  *
  * Each token is then (Unicode) normalised and case-folded.  If
- * @ascii_alternates is non-%NULL and some of the returned tokens
+ * @ascii_alternates is non-`NULL` and some of the returned tokens
  * contain non-ASCII characters, ASCII alternatives will be generated.
  *
  * The number of ASCII alternatives that are generated and the method
@@ -3190,13 +3148,13 @@ g_str_tokenize_and_fold (const gchar   *string,
  * g_str_match_string:
  * @search_term: the search term from the user
  * @potential_hit: the text that may be a hit
- * @accept_alternates: %TRUE to accept ASCII alternates
+ * @accept_alternates: if true, ASCII alternates are accepted
  *
  * Checks if a search conducted for @search_term should match
  * @potential_hit.
  *
- * This function calls g_str_tokenize_and_fold() on both
- * @search_term and @potential_hit.  ASCII alternates are never taken
+ * This function calls [func@GLib.str_tokenize_and_fold] on both
+ * @search_term and @potential_hit. ASCII alternates are never taken
  * for @search_term but will be taken for @potential_hit according to
  * the value of @accept_alternates.
  *
@@ -3204,9 +3162,9 @@ g_str_tokenize_and_fold (const gchar   *string,
  * folded token from @potential_hit.
  *
  * Depending on how you're performing the search, it will typically be
- * faster to call g_str_tokenize_and_fold() on each string in
+ * faster to call `g_str_tokenize_and_fold()` on each string in
  * your corpus and build an index on the returned folded tokens, then
- * call g_str_tokenize_and_fold() on the search term and
+ * call `g_str_tokenize_and_fold()` on the search term and
  * perform lookups into that index.
  *
  * As some examples, searching for "fred" would match the potential hit
@@ -3215,7 +3173,7 @@ g_str_tokenize_and_fold (const gchar   *string,
  * accent matching).  Searching "fo" would match "Foo" and "Bar Foo
  * Baz", but not "SFO" (because no word as "fo" as a prefix).
  *
- * Returns: %TRUE if @potential_hit is a hit
+ * Returns: true if @potential_hit is a hit
  *
  * Since: 2.40
  **/
@@ -3265,12 +3223,13 @@ g_str_match_string (const gchar *search_term,
 
 /**
  * g_strv_contains:
- * @strv: a %NULL-terminated array of strings
- * @str: a string
+ * @strv: (array zero-terminated=1): an array of strings to search in
+ * @str: the string to search for
  *
- * Checks if @strv contains @str. @strv must not be %NULL.
+ * Checks if an array of strings contains the string @str according to
+ * [func@GLib.str_equal]. @strv must not be `NULL`.
  *
- * Returns: %TRUE if @str is an element of @strv, according to g_str_equal().
+ * Returns: true if @str is an element of @strv
  *
  * Since: 2.44
  */
@@ -3292,17 +3251,24 @@ g_strv_contains (const gchar * const *strv,
 
 /**
  * g_strv_equal:
- * @strv1: a %NULL-terminated array of strings
- * @strv2: another %NULL-terminated array of strings
+ * @strv1: (array zero-terminated=1): an array of strings to compare to @strv2
+ * @strv2: (array zero-terminated=1): an array of strings to compare to @strv1
  *
- * Checks if @strv1 and @strv2 contain exactly the same elements in exactly the
- * same order. Elements are compared using g_str_equal(). To match independently
- * of order, sort the arrays first (using g_qsort_with_data() or similar).
+ * Checks if two arrays of strings contain exactly the same elements in
+ * exactly the same order.
  *
- * Two empty arrays are considered equal. Neither @strv1 not @strv2 may be
- * %NULL.
+ * Elements are compared using [func@GLib.str_equal]. To match independently
+ * of order, sort the arrays first (using [func@GLib.qsort_with_data]
+ * or similar).
  *
- * Returns: %TRUE if @strv1 and @strv2 are equal
+ * Elements are compared using [func@GLib.str_equal]. To match independently
+ * of order, sort the arrays first (using [func@GLib.qsort_with_data]
+ * or similar).
+ *
+ * Two empty arrays are considered equal. Neither @strv1 nor @strv2 may be
+ * `NULL`.
+ *
+ * Returns: true if @strv1 and @strv2 are equal
  * Since: 2.60
  */
 gboolean
@@ -3338,7 +3304,7 @@ str_has_hex_prefix (const gchar *str)
 
 /**
  * g_ascii_string_to_signed:
- * @str: a string
+ * @str: a string to convert
  * @base: base of a parsed number
  * @min: a lower bound (inclusive)
  * @max: an upper bound (inclusive)
@@ -3358,16 +3324,16 @@ str_has_hex_prefix (const gchar *str)
  * for octal numbers, since they were usually prefixed with a zero
  * which does not change the value of the parsed number.
  *
- * Parsing failures result in an error with the %G_NUMBER_PARSER_ERROR
+ * Parsing failures result in an error with the `G_NUMBER_PARSER_ERROR`
  * domain. If the input is invalid, the error code will be
- * %G_NUMBER_PARSER_ERROR_INVALID. If the parsed number is out of
- * bounds - %G_NUMBER_PARSER_ERROR_OUT_OF_BOUNDS.
+ * [error@GLib.NumberParserError.INVALID]. If the parsed number is out of
+ * bounds - [error@GLib.NumberParserError.OUT_OF_BOUNDS].
  *
- * See g_ascii_strtoll() if you have more complex needs such as
+ * See [func@GLib.ascii_strtoll] if you have more complex needs such as
  * parsing a string which starts with a number, but then has other
  * characters.
  *
- * Returns: %TRUE if @str was a number, otherwise %FALSE.
+ * Returns: true if @str was a number, false otherwise
  *
  * Since: 2.54
  */
@@ -3460,16 +3426,16 @@ g_ascii_string_to_signed (const gchar  *str,
  * for octal numbers, since they were usually prefixed with a zero
  * which does not change the value of the parsed number.
  *
- * Parsing failures result in an error with the %G_NUMBER_PARSER_ERROR
+ * Parsing failures result in an error with the `G_NUMBER_PARSER_ERROR`
  * domain. If the input is invalid, the error code will be
- * %G_NUMBER_PARSER_ERROR_INVALID. If the parsed number is out of
- * bounds - %G_NUMBER_PARSER_ERROR_OUT_OF_BOUNDS.
+ * [error@GLib.NumberParserError.INVALID]. If the parsed number is out of
+ * bounds - [error@GLib.NumberParserError.OUT_OF_BOUNDS].
  *
- * See g_ascii_strtoull() if you have more complex needs such as
+ * See [func@GLib.ascii_strtoull] if you have more complex needs such as
  * parsing a string which starts with a number, but then has other
  * characters.
  *
- * Returns: %TRUE if @str was a number, otherwise %FALSE.
+ * Returns: true if @str was a number, false otherwise
  *
  * Since: 2.54
  */
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gstrfuncs.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gstrfuncs.h
index 069e20b75ac..712fabb0e7c 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gstrfuncs.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gstrfuncs.h
@@ -412,8 +412,8 @@ gboolean              g_strv_equal     (const gchar * const *strv1,
 
 /**
  * GNumberParserError:
- * @G_NUMBER_PARSER_ERROR_INVALID: String was not a valid number.
- * @G_NUMBER_PARSER_ERROR_OUT_OF_BOUNDS: String was a number, but out of bounds.
+ * @G_NUMBER_PARSER_ERROR_INVALID: string was not a valid number
+ * @G_NUMBER_PARSER_ERROR_OUT_OF_BOUNDS: string was a number, but out of bounds
  *
  * Error codes returned by functions converting a string to a number.
  *
@@ -456,28 +456,34 @@ gboolean              g_ascii_string_to_unsigned   (const gchar  *str,
 
 /**
  * g_set_str: (skip)
- * @str_pointer: (inout) (not optional) (nullable): a pointer to either a string or %NULL
- * @new_str: (nullable): a string to assign to @str_pointer, or %NULL
+ * @str_pointer: (inout) (not optional) (nullable): a pointer to either
+ *   a string or `NULL`
+ * @new_str: (nullable): a string to assign to @str_pointer
  *
- * Updates a pointer to a string to a copy of @new_str. The previous string
- * pointed to by @str_pointer will be freed with g_free().
+ * Updates a pointer to a string to a copy of @new_str and returns whether the
+ * string was changed.
  *
- * @str_pointer must not be %NULL, but can point to a %NULL value.
+ * If @new_str matches the previous string, this function is a no-op. If
+ * @new_str is different, a copy of it will be assigned to @str_pointer and
+ * the previous string pointed to by @str_pointer will be freed with
+ * [func@GLib.free].
+ *
+ * @str_pointer must not be `NULL`, but can point to a `NULL` value.
  *
  * One convenient usage of this function is in implementing property settings:
- * |[
- *   void
- *   foo_set_bar (Foo        *foo,
- *                const char *new_bar)
- *   {
- *     g_return_if_fail (IS_FOO (foo));
+ * ```C
+ * void
+ * foo_set_bar (Foo        *foo,
+ *              const char *new_bar)
+ * {
+ *   g_return_if_fail (IS_FOO (foo));
  *
- *     if (g_set_str (&foo->bar, new_bar))
- *       g_object_notify (foo, "bar");
- *   }
- * ]|
+ *   if (g_set_str (&foo->bar, new_bar))
+ *     g_object_notify (foo, "bar");
+ * }
+ * ```
  *
- * Returns: %TRUE if the value of @str_pointer changed, %FALSE otherwise
+ * Returns: true if the value of @str_pointer changed, false otherwise
  *
  * Since: 2.76
  */
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gstring.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gstring.c
index b31ab41638e..610f70513e2 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gstring.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gstring.c
@@ -42,25 +42,6 @@
 #include "gutilsprivate.h"
 
 
-/**
- * SECTION:strings
- * @title: Strings
- * @short_description: text buffers which grow automatically
- *     as text is added
- *
- * A #GString is an object that handles the memory management of a C
- * string for you.  The emphasis of #GString is on text, typically
- * UTF-8.  Crucially, the "str" member of a #GString is guaranteed to
- * have a trailing nul character, and it is therefore always safe to
- * call functions such as strchr() or g_strdup() on it.
- *
- * However, a #GString can also hold arbitrary binary data, because it
- * has a "len" member, which includes any possible embedded nul
- * characters in the data.  Conceptually then, #GString is like a
- * #GByteArray with the addition of many convenience methods for text,
- * and a guaranteed nul terminator.
- */
-
 /**
  * GString:
  * @str: points to the character data. It may move as text is added.
@@ -71,7 +52,16 @@
  * @allocated_len: the number of bytes that can be stored in the
  *   string before it needs to be reallocated. May be larger than @len.
  *
- * The GString struct contains the public fields of a GString.
+ * A `GString` is an object that handles the memory management of a C string.
+ *
+ * The emphasis of `GString` is on text, typically UTF-8. Crucially, the "str" member
+ * of a `GString` is guaranteed to have a trailing nul character, and it is therefore
+ * always safe to call functions such as `strchr()` or `strdup()` on it.
+ *
+ * However, a `GString` can also hold arbitrary binary data, because it has a "len" member,
+ * which includes any possible embedded nul characters in the data. Conceptually then,
+ * `GString` is like a `GByteArray` with the addition of many convenience methods for
+ * text, and a guaranteed nul terminator.
  */
 
 static void
@@ -1236,6 +1226,10 @@ g_string_append_vprintf (GString     *string,
       string->len += len;
       g_free (buf);
     }
+  else
+    {
+      g_critical ("Failed to append to string: invalid format/args passed to g_vasprintf()");
+    }
 }
 
 /**
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gstringchunk.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gstringchunk.c
index f4cf6cfc98a..fb95146237e 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gstringchunk.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gstringchunk.c
@@ -42,40 +42,33 @@
 #include "gutilsprivate.h"
 
 /**
- * SECTION:string_chunks
- * @title: String Chunks
- * @short_description: efficient storage of groups of strings
+ * GStringChunk:
+ *
+ * `GStringChunk` provides efficient storage of groups of strings
  *
  * String chunks are used to store groups of strings. Memory is
- * allocated in blocks, and as strings are added to the #GStringChunk
+ * allocated in blocks, and as strings are added to the `GStringChunk`
  * they are copied into the next free position in a block. When a block
  * is full a new block is allocated.
  *
  * When storing a large number of strings, string chunks are more
- * efficient than using g_strdup() since fewer calls to malloc() are
- * needed, and less memory is wasted in memory allocation overheads.
+ * efficient than using [func@GLib.strdup] since fewer calls to `malloc()`
+ * are needed, and less memory is wasted in memory allocation overheads.
  *
- * By adding strings with g_string_chunk_insert_const() it is also
+ * By adding strings with [method@GLib.StringChunk.insert_const] it is also
  * possible to remove duplicates.
  *
- * To create a new #GStringChunk use g_string_chunk_new().
+ * To create a new `GStringChunk` use [func@GLib.StringChunk.new].
  *
- * To add strings to a #GStringChunk use g_string_chunk_insert().
+ * To add strings to a `GStringChunk` use [method@GLib.StringChunk.insert].
  *
- * To add strings to a #GStringChunk, but without duplicating strings
- * which are already in the #GStringChunk, use
- * g_string_chunk_insert_const().
+ * To add strings to a `GStringChunk`, but without duplicating strings
+ * which are already in the `GStringChunk`, use [method@GLib.StringChunk.insert_const].
  *
- * To free the entire #GStringChunk use g_string_chunk_free(). It is
- * not possible to free individual strings.
+ * To free the entire `GStringChunk` use [method@GLib.StringChunk.free].
+ * It is not possible to free individual strings.
  */
 
-/**
- * GStringChunk:
- *
- * An opaque data structure representing String Chunks.
- * It should only be accessed by using the following functions.
- */
 struct _GStringChunk
 {
   GHashTable *const_table;
@@ -86,7 +79,7 @@ struct _GStringChunk
 };
 
 /**
- * g_string_chunk_new:
+ * g_string_chunk_new: (constructor)
  * @size: the default size of the blocks of memory which are
  *     allocated to store the strings. If a particular string
  *     is larger than this default size, a larger block of
@@ -94,7 +87,7 @@ struct _GStringChunk
  *
  * Creates a new #GStringChunk.
  *
- * Returns: a new #GStringChunk
+ * Returns: (transfer full): a new #GStringChunk
  */
 GStringChunk *
 g_string_chunk_new (gsize size)
@@ -115,7 +108,7 @@ g_string_chunk_new (gsize size)
 
 /**
  * g_string_chunk_free:
- * @chunk: a #GStringChunk
+ * @chunk: (transfer full): a #GStringChunk
  *
  * Frees all memory allocated by the #GStringChunk.
  * After calling g_string_chunk_free() it is not safe to
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gtestutils.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gtestutils.c
index c821dfaa28a..d78cd5a6290 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gtestutils.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gtestutils.c
@@ -67,193 +67,6 @@
  * See https://gitlab.gnome.org/GNOME/glib/-/issues/2885 */
 #define TAP_SUBTEST_PREFIX "#    "  /* a 4-space indented line */
 
-/**
- * SECTION:testing
- * @title: Testing
- * @short_description: a test framework
- *
- * GLib provides a framework for writing and maintaining unit tests
- * in parallel to the code they are testing. The API is designed according
- * to established concepts found in the other test frameworks (JUnit, NUnit,
- * RUnit), which in turn is based on smalltalk unit testing concepts.
- *
- * - Test case: Tests (test methods) are grouped together with their
- *   fixture into test cases.
- *
- * - Fixture: A test fixture consists of fixture data and setup and
- *   teardown methods to establish the environment for the test
- *   functions. We use fresh fixtures, i.e. fixtures are newly set
- *   up and torn down around each test invocation to avoid dependencies
- *   between tests.
- *
- * - Test suite: Test cases can be grouped into test suites, to allow
- *   subsets of the available tests to be run. Test suites can be
- *   grouped into other test suites as well.
- *
- * The API is designed to handle creation and registration of test suites
- * and test cases implicitly. A simple call like
- * |[<!-- language="C" -->
- *   g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL);
- *
- *   g_test_add_func ("/misc/assertions", test_assertions);
- * ]|
- * creates a test suite called "misc" with a single test case named
- * "assertions", which consists of running the test_assertions function.
- *
- * g_test_init() should be called before calling any other test functions.
- *
- * In addition to the traditional g_assert_true(), the test framework provides
- * an extended set of assertions for comparisons: g_assert_cmpfloat(),
- * g_assert_cmpfloat_with_epsilon(), g_assert_cmpint(), g_assert_cmpuint(),
- * g_assert_cmphex(), g_assert_cmpstr(), g_assert_cmpmem() and
- * g_assert_cmpvariant(). The
- * advantage of these variants over plain g_assert_true() is that the assertion
- * messages can be more elaborate, and include the values of the compared
- * entities.
- *
- * Note that g_assert() should not be used in unit tests, since it is a no-op
- * when compiling with `G_DISABLE_ASSERT`. Use g_assert() in production code,
- * and g_assert_true() in unit tests.
- *
- * A full example of creating a test suite with two tests using fixtures:
- * |[<!-- language="C" -->
- * #include <glib.h>
- * #include <locale.h>
- *
- * typedef struct {
- *   MyObject *obj;
- *   OtherObject *helper;
- * } MyObjectFixture;
- *
- * static void
- * my_object_fixture_set_up (MyObjectFixture *fixture,
- *                           gconstpointer user_data)
- * {
- *   fixture->obj = my_object_new ();
- *   my_object_set_prop1 (fixture->obj, "some-value");
- *   my_object_do_some_complex_setup (fixture->obj, user_data);
- *
- *   fixture->helper = other_object_new ();
- * }
- *
- * static void
- * my_object_fixture_tear_down (MyObjectFixture *fixture,
- *                              gconstpointer user_data)
- * {
- *   g_clear_object (&fixture->helper);
- *   g_clear_object (&fixture->obj);
- * }
- *
- * static void
- * test_my_object_test1 (MyObjectFixture *fixture,
- *                       gconstpointer user_data)
- * {
- *   g_assert_cmpstr (my_object_get_property (fixture->obj), ==, "initial-value");
- * }
- *
- * static void
- * test_my_object_test2 (MyObjectFixture *fixture,
- *                       gconstpointer user_data)
- * {
- *   my_object_do_some_work_using_helper (fixture->obj, fixture->helper);
- *   g_assert_cmpstr (my_object_get_property (fixture->obj), ==, "updated-value");
- * }
- *
- * int
- * main (int argc, char *argv[])
- * {
- *   setlocale (LC_ALL, "");
- *
- *   g_test_init (&argc, &argv, NULL);
- *
- *   // Define the tests.
- *   g_test_add ("/my-object/test1", MyObjectFixture, "some-user-data",
- *               my_object_fixture_set_up, test_my_object_test1,
- *               my_object_fixture_tear_down);
- *   g_test_add ("/my-object/test2", MyObjectFixture, "some-user-data",
- *               my_object_fixture_set_up, test_my_object_test2,
- *               my_object_fixture_tear_down);
- *
- *   return g_test_run ();
- * }
- * ]|
- *
- * ## Integrating GTest in your project
- *
- * If you are using the [Meson](http://mesonbuild.com) build system, you will
- * typically use the provided `test()` primitive to call the test binaries,
- * e.g.:
- *
- * |[<!-- language="plain" -->
- *   test(
- *     'foo',
- *     executable('foo', 'foo.c', dependencies: deps),
- *     env: [
- *       'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()),
- *       'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
- *     ],
- *   )
- *
- *   test(
- *     'bar',
- *     executable('bar', 'bar.c', dependencies: deps),
- *     env: [
- *       'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()),
- *       'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
- *     ],
- *   )
- * ]|
- *
- * If you are using Autotools, you're strongly encouraged to use the Automake
- * [TAP](https://testanything.org/) harness; GLib provides template files for
- * easily integrating with it:
- *
- *   - [glib-tap.mk](https://gitlab.gnome.org/GNOME/glib/blob/glib-2-58/glib-tap.mk)
- *   - [tap-test](https://gitlab.gnome.org/GNOME/glib/blob/glib-2-58/tap-test)
- *   - [tap-driver.sh](https://gitlab.gnome.org/GNOME/glib/blob/glib-2-58/tap-driver.sh)
- *
- * You can copy these files in your own project's root directory, and then
- * set up your `Makefile.am` file to reference them, for instance:
- *
- * |[<!-- language="plain" -->
- * include $(top_srcdir)/glib-tap.mk
- *
- * # test binaries
- * test_programs = \
- *   foo \
- *   bar
- *
- * # data distributed in the tarball
- * dist_test_data = \
- *   foo.data.txt \
- *   bar.data.txt
- *
- * # data not distributed in the tarball
- * test_data = \
- *   blah.data.txt
- * ]|
- *
- * Make sure to distribute the TAP files, using something like the following
- * in your top-level `Makefile.am`:
- *
- * |[<!-- language="plain" -->
- * EXTRA_DIST += \
- *   tap-driver.sh \
- *   tap-test
- * ]|
- *
- * `glib-tap.mk` will be distributed implicitly due to being included in a
- * `Makefile.am`. All three files should be added to version control.
- *
- * If you don't have access to the Autotools TAP harness, you can use the
- * [gtester][gtester] and [gtester-report][gtester-report] tools, and use
- * the [glib.mk](https://gitlab.gnome.org/GNOME/glib/blob/glib-2-58/glib.mk)
- * Automake template provided by GLib. Note, however, that since GLib 2.62,
- * [gtester][gtester] and [gtester-report][gtester-report] have been deprecated
- * in favour of using TAP. The `--tap` argument to tests is enabled by default
- * as of GLib 2.62.
- */
-
 /**
  * g_test_initialized:
  *
@@ -1102,10 +915,10 @@ g_test_log (GTestLogType lbit,
   unsigned subtest_level;
   gdouble timing;
 
-  if (g_once_init_enter (&g_default_print_func))
+  if (g_once_init_enter_pointer (&g_default_print_func))
     {
-      g_once_init_leave (&g_default_print_func,
-                         g_set_print_handler (g_test_print_handler));
+      g_once_init_leave_pointer (&g_default_print_func,
+                                 g_set_print_handler (g_test_print_handler));
       g_assert_nonnull (g_default_print_func);
     }
 
@@ -1844,8 +1657,8 @@ void
       test_run_seedstr = seedstr;
     }
 
-  if (!g_get_prgname() && !no_g_set_prgname)
-    g_set_prgname ((*argv)[0]);
+  if (!g_get_prgname () && !no_g_set_prgname)
+    g_set_prgname_once ((*argv)[0]);
 
   if (g_getenv ("G_TEST_ROOT_PROCESS"))
     {
@@ -3071,12 +2884,13 @@ g_test_queue_free (gpointer gfree_pointer)
  * @destroy_func:       Destroy callback for teardown phase.
  * @destroy_data:       Destroy callback data.
  *
- * This function enqueus a callback @destroy_func to be executed
- * during the next test case teardown phase. This is most useful
- * to auto destruct allocated test resources at the end of a test run.
- * Resources are released in reverse queue order, that means enqueueing
- * callback A before callback B will cause B() to be called before
- * A() during teardown.
+ * Enqueues a callback @destroy_func to be executed during the next test case
+ * teardown phase.
+ *
+ * This is most useful to auto destroy allocated test resources at the end of a
+ * test run. Resources are released in reverse queue order, that means
+ * enqueueing callback `A` before callback `B` will cause `B()` to be called
+ * before `A()` during teardown.
  *
  * Since: 2.16
  */
@@ -3111,17 +2925,30 @@ test_has_prefix (gconstpointer a,
     return g_strcmp0 (test_run_name_local, test_path_skipped_local);
 }
 
+static gboolean test_should_run (const char *test_path,
+                                 const char *cmp_path);
+
 static gboolean
-test_case_run (GTestCase *tc)
+test_case_run (GTestCase  *tc,
+               const char *test_run_name,
+               const char *path)
 {
-  gchar *old_base = g_strdup (test_uri_base);
+  gchar *old_base = NULL;
   GSList **old_free_list, *filename_free_list = NULL;
   gboolean success = G_TEST_RUN_SUCCESS;
+  gboolean free_test_data = TRUE;
 
+  old_base = g_strdup (test_uri_base);
   old_free_list = test_filename_free_list;
   test_filename_free_list = &filename_free_list;
 
-  if (++test_run_count <= test_startup_skip_count)
+  if (!test_should_run (test_run_name, path))
+    {
+      /* Silently skip the test and return success. This happens if it’s a
+       * /subprocess path. */
+      success = G_TEST_RUN_SKIPPED;
+    }
+  else if (++test_run_count <= test_startup_skip_count)
     g_test_log (G_TEST_LOG_SKIP_CASE, test_run_name, NULL, 0, NULL);
   else if (test_run_list)
     {
@@ -3168,6 +2995,7 @@ test_case_run (GTestCase *tc)
                 }
               if (tc->fixture_teardown)
                 tc->fixture_teardown (fixture, tc->test_data);
+              free_test_data = FALSE;
               if (tc->fixture_size)
                 g_free (fixture);
               g_timer_stop (test_run_timer);
@@ -3185,6 +3013,13 @@ test_case_run (GTestCase *tc)
       g_timer_destroy (test_run_timer);
     }
 
+  /* In case the test didn’t run (due to being skipped or an error), the test
+   * data may still need to be freed, as the client’s main() function may have
+   * passed ownership of it into g_test_add_data_func_full() with a
+   * #GDestroyNotify. */
+  if (free_test_data && tc->fixture_size == 0 && tc->fixture_teardown != NULL)
+    tc->fixture_teardown (tc->test_data, tc->test_data);
+
   g_slist_free_full (filename_free_list, g_free);
   test_filename_free_list = old_free_list;
   g_free (test_uri_base);
@@ -3250,11 +3085,10 @@ g_test_run_suite_internal (GTestSuite *suite,
 
       test_run_name = g_build_path ("/", old_name, tc->name, NULL);
       test_run_name_path = g_build_path (G_DIR_SEPARATOR_S, old_name_path, tc->name, NULL);
-      if (test_should_run (test_run_name, path))
-        {
-          if (!test_case_run (tc))
-            n_bad++;
-        }
+
+      if (!test_case_run (tc, test_run_name, path))
+        n_bad++;
+
       g_free (test_run_name);
       g_free (test_run_name_path);
     }
@@ -4036,6 +3870,32 @@ G_GNUC_END_IGNORE_DEPRECATIONS
  * @test_flags:   Flags to modify subprocess behaviour.
  *
  * Respawns the test program to run only @test_path in a subprocess.
+ *
+ * This is equivalent to calling g_test_trap_subprocess_with_envp() with `envp`
+ * set to %NULL. See the documentation for that function for full details.
+ *
+ * Since: 2.38
+ */
+void
+g_test_trap_subprocess (const char           *test_path,
+                        guint64               usec_timeout,
+                        GTestSubprocessFlags  test_flags)
+{
+  g_test_trap_subprocess_with_envp (test_path, NULL, usec_timeout, test_flags);
+}
+
+/**
+ * g_test_trap_subprocess_with_envp:
+ * @test_path: (nullable): Test to run in a subprocess
+ * @envp: (array zero-terminated=1) (nullable) (element-type filename): Environment
+ *   to run the test in, or %NULL to inherit the parent’s environment. This must
+ *   be in the GLib filename encoding.
+ * @usec_timeout: Timeout for the subprocess test in micro seconds.
+ * @test_flags:   Flags to modify subprocess behaviour.
+ *
+ * Respawns the test program to run only @test_path in a subprocess with the
+ * given @envp environment.
+ *
  * This can be used for a test case that might not return, or that
  * might abort.
  *
@@ -4049,6 +3909,8 @@ G_GNUC_END_IGNORE_DEPRECATIONS
  * tests with names of this form will automatically be skipped in the
  * parent process.
  *
+ * If @envp is %NULL, the parent process’ environment will be inherited.
+ *
  * If @usec_timeout is non-0, the test subprocess is aborted and
  * considered failing if its run time exceeds it.
  *
@@ -4091,23 +3953,44 @@ G_GNUC_END_IGNORE_DEPRECATIONS
  *     g_test_trap_assert_stderr ("*ERROR*too large*");
  *   }
  *
+ *   static void
+ *   test_different_username (void)
+ *   {
+ *     if (g_test_subprocess ())
+ *       {
+ *         // Code under test goes here
+ *         g_message ("Username is now simulated as %s", g_getenv ("USER"));
+ *         return;
+ *       }
+ *
+ *     // Reruns this same test in a subprocess
+ *     g_autoptr(GStrv) envp = g_get_environ ();
+ *     envp = g_environ_setenv (g_steal_pointer (&envp), "USER", "charlie", TRUE);
+ *     g_test_trap_subprocess_with_envp (NULL, envp, 0, G_TEST_SUBPROCESS_DEFAULT);
+ *     g_test_trap_assert_passed ();
+ *     g_test_trap_assert_stdout ("Username is now simulated as charlie");
+ *   }
+ *
  *   int
  *   main (int argc, char **argv)
  *   {
  *     g_test_init (&argc, &argv, NULL);
  *
- *     g_test_add_func ("/myobject/create_large_object",
+ *     g_test_add_func ("/myobject/create-large-object",
  *                      test_create_large_object);
+ *     g_test_add_func ("/myobject/different-username",
+ *                      test_different_username);
  *     return g_test_run ();
  *   }
  * ]|
  *
- * Since: 2.38
+ * Since: 2.80
  */
 void
-g_test_trap_subprocess (const char           *test_path,
-                        guint64               usec_timeout,
-                        GTestSubprocessFlags  test_flags)
+g_test_trap_subprocess_with_envp (const char           *test_path,
+                                  const char * const   *envp,
+                                  guint64               usec_timeout,
+                                  GTestSubprocessFlags  test_flags)
 {
   GError *error = NULL;
   GPtrArray *argv;
@@ -4166,7 +4049,7 @@ g_test_trap_subprocess (const char           *test_path,
 
   if (!g_spawn_async_with_pipes (test_initial_cwd,
                                  (char **)argv->pdata,
-                                 NULL, flags,
+                                 (char **) envp, flags,
                                  NULL, NULL,
                                  &pid, NULL, &stdout_fd, &stderr_fd,
                                  &error))
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gtestutils.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gtestutils.h
index 9aef7a8269b..f8008289e28 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gtestutils.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gtestutils.h
@@ -515,6 +515,11 @@ GLIB_AVAILABLE_IN_2_38
 void     g_test_trap_subprocess         (const char           *test_path,
                                          guint64               usec_timeout,
                                          GTestSubprocessFlags  test_flags);
+GLIB_AVAILABLE_IN_2_80
+void     g_test_trap_subprocess_with_envp (const char           *test_path,
+                                           const char * const   *envp,
+                                           guint64               usec_timeout,
+                                           GTestSubprocessFlags  test_flags);
 
 GLIB_AVAILABLE_IN_ALL
 gboolean g_test_trap_has_passed         (void);
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gthread-win32.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gthread-win32.c
index 582b4c135ce..541b3fdd670 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gthread-win32.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gthread-win32.c
@@ -424,28 +424,6 @@ g_system_thread_free (GRealThread *thread)
 void
 g_system_thread_exit (void)
 {
-  /* In static compilation, DllMain doesn't exist and so DLL_THREAD_DETACH
-   * case is never called and thread destroy notifications are not triggered.
-   * To ensure that notifications are correctly triggered in static
-   * compilation mode, we call directly the "detach" function here right
-   * before terminating the thread.
-   * As all win32 threads initialized through the glib API are run through
-   * the same proxy function g_thread_win32_proxy() which calls systematically
-   * g_system_thread_exit() when finishing, we obtain the same behavior as
-   * with dynamic compilation.
-   *
-   * WARNING: unfortunately this mechanism cannot work with threads created
-   * directly from the Windows API using CreateThread() or _beginthread/ex().
-   * It only works with threads created by using the glib API with
-   * g_system_thread_new(). If users need absolutely to use a thread NOT
-   * created with glib API under Windows and in static compilation mode, they
-   * should not use glib functions within their thread or they may encounter
-   * memory leaks when the thread finishes.
-   */
-#ifdef GLIB_STATIC_COMPILATION
-  g_thread_win32_thread_detach ();
-#endif
-
   _endthreadex (0);
 }
 
@@ -593,7 +571,7 @@ SetThreadName (DWORD  dwThreadID,
    info.dwThreadID = dwThreadID;
    info.dwFlags = 0;
 
-   infosize = sizeof (info) / sizeof (DWORD);
+   infosize = sizeof (info) / sizeof (ULONG_PTR);
 
 #ifdef _MSC_VER
    __try
@@ -601,14 +579,12 @@ SetThreadName (DWORD  dwThreadID,
        RaiseException (EXCEPTION_SET_THREAD_NAME, 0, infosize,
                        (const ULONG_PTR *) &info);
      }
-   __except (EXCEPTION_EXECUTE_HANDLER)
+   __except (GetExceptionCode () == EXCEPTION_SET_THREAD_NAME ?
+             EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH)
      {
      }
 #else
-   /* Without a debugger we *must* have an exception handler,
-    * otherwise raising an exception will crash the process.
-    */
-   if ((!IsDebuggerPresent ()) && (SetThreadName_VEH_handle == NULL))
+   if ((!IsDebuggerPresent ()) || (SetThreadName_VEH_handle == NULL))
      return;
 
    RaiseException (EXCEPTION_SET_THREAD_NAME, 0, infosize, (const ULONG_PTR *) &info);
@@ -681,11 +657,15 @@ g_thread_win32_init (void)
   InitializeCriticalSection (&g_private_lock);
 
 #ifndef _MSC_VER
-  SetThreadName_VEH_handle = AddVectoredExceptionHandler (1, &SetThreadName_VEH);
+  /* Set the handler as last to not interfere with ASAN runtimes.
+   * Many ASAN implementations (currently all three of GCC, CLANG
+   * and MSVC) install a Vectored Exception Handler that must be
+   * first in the sequence to work well
+   */
+  SetThreadName_VEH_handle = AddVectoredExceptionHandler (0, &SetThreadName_VEH);
   if (SetThreadName_VEH_handle == NULL)
-    {
-      /* This is bad, but what can we do? */
-    }
+    g_critical ("%s failed with error code %u",
+                "AddVectoredExceptionHandler", (unsigned int) GetLastError ());
 #endif
 }
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gthread.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gthread.c
index 74704c253eb..ff27929c5d4 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gthread.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gthread.c
@@ -47,7 +47,11 @@
 
 #ifdef G_OS_UNIX
 #include <unistd.h>
+
+#if defined(THREADS_POSIX) && defined(HAVE_PTHREAD_GETAFFINITY_NP)
+#include <pthread.h>
 #endif
+#endif /* G_OS_UNIX */
 
 #ifndef G_OS_WIN32
 #include <sys/time.h>
@@ -62,104 +66,6 @@
 #include "glib_trace.h"
 #include "gtrace-private.h"
 
-/**
- * SECTION:threads
- * @title: Threads
- * @short_description: portable support for threads, mutexes, locks,
- *     conditions and thread private data
- * @see_also: #GThreadPool, #GAsyncQueue
- *
- * Threads act almost like processes, but unlike processes all threads
- * of one process share the same memory. This is good, as it provides
- * easy communication between the involved threads via this shared
- * memory, and it is bad, because strange things (so called
- * "Heisenbugs") might happen if the program is not carefully designed.
- * In particular, due to the concurrent nature of threads, no
- * assumptions on the order of execution of code running in different
- * threads can be made, unless order is explicitly forced by the
- * programmer through synchronization primitives.
- *
- * The aim of the thread-related functions in GLib is to provide a
- * portable means for writing multi-threaded software. There are
- * primitives for mutexes to protect the access to portions of memory
- * (#GMutex, #GRecMutex and #GRWLock). There is a facility to use
- * individual bits for locks (g_bit_lock()). There are primitives
- * for condition variables to allow synchronization of threads (#GCond).
- * There are primitives for thread-private data - data that every
- * thread has a private instance of (#GPrivate). There are facilities
- * for one-time initialization (#GOnce, g_once_init_enter()). Finally,
- * there are primitives to create and manage threads (#GThread).
- *
- * The GLib threading system used to be initialized with g_thread_init().
- * This is no longer necessary. Since version 2.32, the GLib threading
- * system is automatically initialized at the start of your program,
- * and all thread-creation functions and synchronization primitives
- * are available right away.
- *
- * Note that it is not safe to assume that your program has no threads
- * even if you don't call g_thread_new() yourself. GLib and GIO can
- * and will create threads for their own purposes in some cases, such
- * as when using g_unix_signal_source_new() or when using GDBus.
- *
- * Originally, UNIX did not have threads, and therefore some traditional
- * UNIX APIs are problematic in threaded programs. Some notable examples
- * are
- *
- * - C library functions that return data in statically allocated
- *   buffers, such as strtok() or strerror(). For many of these,
- *   there are thread-safe variants with a _r suffix, or you can
- *   look at corresponding GLib APIs (like g_strsplit() or g_strerror()).
- *
- * - The functions setenv() and unsetenv() manipulate the process
- *   environment in a not thread-safe way, and may interfere with getenv()
- *   calls in other threads. Note that getenv() calls may be hidden behind
- *   other APIs. For example, GNU gettext() calls getenv() under the
- *   covers. In general, it is best to treat the environment as readonly.
- *   If you absolutely have to modify the environment, do it early in
- *   main(), when no other threads are around yet.
- *
- * - The setlocale() function changes the locale for the entire process,
- *   affecting all threads. Temporary changes to the locale are often made
- *   to change the behavior of string scanning or formatting functions
- *   like scanf() or printf(). GLib offers a number of string APIs
- *   (like g_ascii_formatd() or g_ascii_strtod()) that can often be
- *   used as an alternative. Or you can use the uselocale() function
- *   to change the locale only for the current thread.
- *
- * - The fork() function only takes the calling thread into the child's
- *   copy of the process image. If other threads were executing in critical
- *   sections they could have left mutexes locked which could easily
- *   cause deadlocks in the new child. For this reason, you should
- *   call exit() or exec() as soon as possible in the child and only
- *   make signal-safe library calls before that.
- *
- * - The daemon() function uses fork() in a way contrary to what is
- *   described above. It should not be used with GLib programs.
- *
- * GLib itself is internally completely thread-safe (all global data is
- * automatically locked), but individual data structure instances are
- * not automatically locked for performance reasons. For example,
- * you must coordinate accesses to the same #GHashTable from multiple
- * threads. The two notable exceptions from this rule are #GMainLoop
- * and #GAsyncQueue, which are thread-safe and need no further
- * application-level locking to be accessed from multiple threads.
- * Most refcounting functions such as g_object_ref() are also thread-safe.
- *
- * A common use for #GThreads is to move a long-running blocking operation out
- * of the main thread and into a worker thread. For GLib functions, such as
- * single GIO operations, this is not necessary, and complicates the code.
- * Instead, the '..._async()' version of the function should be used from the main
- * thread, eliminating the need for locking and synchronisation between multiple
- * threads. If an operation does need to be moved to a worker thread, consider
- * using g_task_run_in_thread(), or a #GThreadPool. #GThreadPool is often a
- * better choice than #GThread, as it handles thread reuse and task queueing;
- * #GTask uses this internally.
- *
- * However, if multiple blocking operations need to be performed in sequence,
- * and it is not possible to use #GTask for them, moving them to a worker thread
- * can clarify the code.
- */
-
 /* G_LOCK Documentation {{{1 ---------------------------------------------- */
 
 /**
@@ -236,6 +142,20 @@
  * %G_LOCK_DEFINE.
  */
 
+/**
+ * G_AUTO_LOCK:
+ * @name: the name of the lock
+ *
+ * Works like [func@GLib.MUTEX_AUTO_LOCK], but for a lock defined with
+ * [func@GLib.LOCK_DEFINE].
+ *
+ * This feature is only supported on GCC and clang. This macro is not defined on
+ * other compilers and should not be used in programs that are intended to be
+ * portable to those compilers.
+ *
+ * Since: 2.80
+ */
+
 /* GMutex Documentation {{{1 ------------------------------------------ */
 
 /**
@@ -663,7 +583,7 @@ g_once_impl (GOnce       *once,
 
 /**
  * g_once_init_enter:
- * @location: (not nullable): location of a static initializable variable
+ * @location: (inout) (not optional): location of a static initializable variable
  *    containing 0
  *
  * Function to be called when starting a critical initialization
@@ -720,8 +640,56 @@ gboolean
 }
 
 /**
- * g_once_init_leave:
+ * g_once_init_enter_pointer:
  * @location: (not nullable): location of a static initializable variable
+ *    containing `NULL`
+ *
+ * This functions behaves in the same way as g_once_init_enter(), but can
+ * can be used to initialize pointers (or #guintptr) instead of #gsize.
+ *
+ * |[<!-- language="C" -->
+ *   static MyStruct *interesting_struct = NULL;
+ *
+ *   if (g_once_init_enter_pointer (&interesting_struct))
+ *     {
+ *       MyStruct *setup_value = allocate_my_struct (); // initialization code here
+ *
+ *       g_once_init_leave_pointer (&interesting_struct, g_steal_pointer (&setup_value));
+ *     }
+ *
+ *   // use interesting_struct here
+ * ]|
+ *
+ * Returns: %TRUE if the initialization section should be entered,
+ *     %FALSE and blocks otherwise
+ *
+ * Since: 2.80
+ */
+gboolean
+(g_once_init_enter_pointer) (gpointer location)
+{
+  gpointer *value_location = (gpointer *) location;
+  gboolean need_init = FALSE;
+  g_mutex_lock (&g_once_mutex);
+  if (g_atomic_pointer_get (value_location) == 0)
+    {
+      if (!g_slist_find (g_once_init_list, (void *) value_location))
+        {
+          need_init = TRUE;
+          g_once_init_list = g_slist_prepend (g_once_init_list, (void *) value_location);
+        }
+      else
+        do
+          g_cond_wait (&g_once_cond, &g_once_mutex);
+        while (g_slist_find (g_once_init_list, (void *) value_location));
+    }
+  g_mutex_unlock (&g_once_mutex);
+  return need_init;
+}
+
+/**
+ * g_once_init_leave:
+ * @location: (inout) (not optional): location of a static initializable variable
  *    containing 0
  * @result: new non-0 value for *@value_location
  *
@@ -755,6 +723,42 @@ void
   g_mutex_unlock (&g_once_mutex);
 }
 
+/**
+ * g_once_init_leave_pointer:
+ * @location: (not nullable): location of a static initializable variable
+ *    containing `NULL`
+ * @result: new non-`NULL` value for `*location`
+ *
+ * Counterpart to g_once_init_enter_pointer(). Expects a location of a static
+ * `NULL`-initialized initialization variable, and an initialization value
+ * other than `NULL`. Sets the variable to the initialization value, and
+ * releases concurrent threads blocking in g_once_init_enter_pointer() on this
+ * initialization variable.
+ *
+ * This functions behaves in the same way as g_once_init_leave(), but
+ * can be used to initialize pointers (or #guintptr) instead of #gsize.
+ *
+ * Since: 2.80
+ */
+void
+(g_once_init_leave_pointer) (gpointer location,
+                             gpointer result)
+{
+  gpointer *value_location = (gpointer *) location;
+  gpointer old_value;
+
+  g_return_if_fail (result != 0);
+
+  old_value = g_atomic_pointer_exchange (value_location, result);
+  g_return_if_fail (old_value == 0);
+
+  g_mutex_lock (&g_once_mutex);
+  g_return_if_fail (g_once_init_list != NULL);
+  g_once_init_list = g_slist_remove (g_once_init_list, (void *) value_location);
+  g_cond_broadcast (&g_once_cond);
+  g_mutex_unlock (&g_once_mutex);
+}
+
 /* GThread {{{1 -------------------------------------------------------- */
 
 /**
@@ -1086,6 +1090,20 @@ g_get_num_processors (void)
 
   if (count > 0)
     return count;
+#elif defined(_SC_NPROCESSORS_ONLN) && defined(THREADS_POSIX) && defined(HAVE_PTHREAD_GETAFFINITY_NP)
+  {
+    int ncores = MIN (sysconf (_SC_NPROCESSORS_ONLN), CPU_SETSIZE);
+    cpu_set_t cpu_mask;
+    CPU_ZERO (&cpu_mask);
+
+    int af_count = 0;
+    int err = pthread_getaffinity_np (pthread_self (), sizeof (cpu_mask), &cpu_mask);
+    if (!err)
+      af_count = CPU_COUNT (&cpu_mask);
+
+    int count = (af_count > 0) ? af_count : ncores;
+    return count;
+  }
 #elif defined(_SC_NPROCESSORS_ONLN)
   {
     int count;
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gthread.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gthread.h
index 14bb5a07d44..3cfa28f84d6 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gthread.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gthread.h
@@ -139,6 +139,10 @@ struct _GOnce
 #  define G_TRYLOCK(name) g_mutex_trylock (&G_LOCK_NAME (name))
 #endif /* !G_DEBUG_LOCKS */
 
+#ifdef g_autoptr
+#define G_AUTO_LOCK(name) G_MUTEX_AUTO_LOCK (&G_LOCK_NAME (name), g__##name##_locker)
+#endif /* g_autoptr */
+
 GLIB_AVAILABLE_IN_2_32
 GThread *       g_thread_ref                    (GThread        *thread);
 GLIB_AVAILABLE_IN_2_32
@@ -236,6 +240,12 @@ GLIB_AVAILABLE_IN_ALL
 void            g_once_init_leave               (volatile void  *location,
                                                  gsize           result);
 
+GLIB_AVAILABLE_IN_2_80
+gboolean g_once_init_enter_pointer              (void *location);
+GLIB_AVAILABLE_IN_2_80
+void g_once_init_leave_pointer                  (void *location,
+                                                 gpointer result);
+
 /* Use C11-style atomic extensions to check the fast path for status=ready. If
  * they are not available, fall back to using a mutex and condition variable in
  * g_once_impl().
@@ -268,11 +278,30 @@ void            g_once_init_leave               (volatile void  *location,
     0 ? (void) (*(location) = (result)) : (void) 0;                  \
     g_once_init_leave ((location), (gsize) (result));                \
   }))
+# define g_once_init_enter_pointer(location)                   \
+  (G_GNUC_EXTENSION ({                                         \
+    G_STATIC_ASSERT (sizeof *(location) == sizeof (gpointer)); \
+    (void) (0 ? (gpointer) * (location) : NULL);               \
+    (!g_atomic_pointer_get (location) &&                       \
+     g_once_init_enter_pointer (location));                    \
+  })) GLIB_AVAILABLE_MACRO_IN_2_80
+# define g_once_init_leave_pointer(location, result)                        \
+  (G_GNUC_EXTENSION ({                                                      \
+    G_STATIC_ASSERT (sizeof *(location) == sizeof (gpointer));              \
+    0 ? (void) (*(location) = (result)) : (void) 0;                         \
+    g_once_init_leave_pointer ((location), (gpointer) (guintptr) (result)); \
+  })) GLIB_AVAILABLE_MACRO_IN_2_80
 #else
 # define g_once_init_enter(location) \
   (g_once_init_enter((location)))
 # define g_once_init_leave(location, result) \
   (g_once_init_leave((location), (gsize) (result)))
+# define g_once_init_enter_pointer(location) \
+  (g_once_init_enter_pointer((location))) \
+  GLIB_AVAILABLE_MACRO_IN_2_80
+# define g_once_init_leave_pointer(location, result) \
+  (g_once_init_leave_pointer((location), (gpointer) (guintptr) (result))) \
+  GLIB_AVAILABLE_MACRO_IN_2_80
 #endif
 
 GLIB_AVAILABLE_IN_2_36
@@ -314,7 +343,7 @@ typedef void GMutexLocker;
  *
  *   // Code with mutex locked here
  *
- *   if (cond)
+ *   if (condition)
  *     // No need to unlock
  *     return;
  *
@@ -325,6 +354,10 @@ typedef void GMutexLocker;
  * }
  * ]|
  *
+ * Note that it is common for the declared variable to not be used in the scope,
+ * which causes some compilers to warn. That can be avoided by using
+ * `G_GNUC_UNUSED` or, since 2.80, [func@GLib.MUTEX_AUTO_LOCK].
+ *
  * Returns: a #GMutexLocker
  * Since: 2.44
  */
@@ -353,6 +386,49 @@ g_mutex_locker_free (GMutexLocker *locker)
   g_mutex_unlock ((GMutex *) locker);
 }
 
+/**
+ * G_MUTEX_AUTO_LOCK:
+ * @mutex: a [type@GLib.Mutex]
+ * @var: a variable name to be declared
+ *
+ * Declare a [type@GLib.MutexLocker] variable with `g_autoptr()` and lock the
+ * mutex. The mutex will be unlocked automatically when leaving the scope. The
+ * variable is declared with `G_GNUC_UNUSED` to avoid compiler warning if it is
+ * not used in the scope.
+ *
+ * This feature is only supported on GCC and clang. This macro is not defined on
+ * other compilers and should not be used in programs that are intended to be
+ * portable to those compilers.
+ *
+ * Note that this should be used in a place where it is allowed to declare a
+ * variable, which could be before any statement in the case
+ * `-Wdeclaration-after-statement` is used, or C standard prior to C99.
+ *
+ * ```c
+ * {
+ *   G_MUTEX_AUTO_LOCK (&obj->mutex, locker);
+ *
+ *   obj->stuff_with_lock ();
+ *   if (condition)
+ *     {
+ *       // No need to unlock
+ *       return;
+ *     }
+ *
+ *   // Unlock before end of scope
+ *   g_clear_pointer (&locker, g_mutex_locker_free);
+ *   obj->stuff_without_lock ();
+ * }
+ * ```
+ *
+ * Since: 2.80.0
+ */
+#ifdef g_autoptr
+#define G_MUTEX_AUTO_LOCK(mutex, var)                   \
+  GLIB_AVAILABLE_MACRO_IN_2_80 g_autoptr (GMutexLocker) \
+  G_GNUC_UNUSED var = g_mutex_locker_new (mutex)
+#endif /* g_autoptr */
+
 /**
  * GRecMutexLocker:
  *
@@ -389,7 +465,7 @@ typedef void GRecMutexLocker;
  *
  *   // Code with rec_mutex locked here
  *
- *   if (cond)
+ *   if (condition)
  *     // No need to unlock
  *     return;
  *
@@ -400,6 +476,10 @@ typedef void GRecMutexLocker;
  * }
  * ]|
  *
+ * Note that it is common for the declared variable to not be used in the scope,
+ * which causes some compilers to warn. That can be avoided by using
+ * `G_GNUC_UNUSED` or, since 2.80, [func@GLib.REC_MUTEX_AUTO_LOCK].
+ *
  * Returns: a #GRecMutexLocker
  * Since: 2.60
  */
@@ -432,6 +512,49 @@ g_rec_mutex_locker_free (GRecMutexLocker *locker)
 }
 G_GNUC_END_IGNORE_DEPRECATIONS
 
+/**
+ * G_REC_MUTEX_AUTO_LOCK:
+ * @mutex: a [type@GLib.RecMutex]
+ * @var: a variable name to be declared
+ *
+ * Declare a [type@GLib.RecMutexLocker] variable with `g_autoptr()` and lock the
+ * mutex. The mutex will be unlocked automatically when leaving the scope. The
+ * variable is declared with `G_GNUC_UNUSED` to avoid compiler warning if it is
+ * not used in the scope.
+ *
+ * This feature is only supported on GCC and clang. This macro is not defined on
+ * other compilers and should not be used in programs that are intended to be
+ * portable to those compilers.
+ *
+ * Note that this should be used in a place where it is allowed to declare a
+ * variable, which could be before any statement in the case
+ * `-Wdeclaration-after-statement` is used, or C standard prior to C99.
+ *
+ * ```c
+ * {
+ *   G_REC_MUTEX_AUTO_LOCK (&obj->rec_mutex, locker);
+ *
+ *   obj->stuff_with_lock ();
+ *   if (condition)
+ *     {
+ *       // No need to unlock
+ *       return;
+ *     }
+ *
+ *   // Unlock before end of scope
+ *   g_clear_pointer (&locker, g_rec_mutex_locker_free);
+ *   obj->stuff_without_lock ();
+ * }
+ * ```
+ *
+ * Since: 2.80.0
+ */
+#ifdef g_autoptr
+#define G_REC_MUTEX_AUTO_LOCK(mutex, var)                  \
+  GLIB_AVAILABLE_MACRO_IN_2_80 g_autoptr (GRecMutexLocker) \
+  G_GNUC_UNUSED var = g_rec_mutex_locker_new (mutex)
+#endif /* g_autoptr */
+
 /**
  * GRWLockWriterLocker:
  *
@@ -495,7 +618,7 @@ typedef void GRWLockWriterLocker;
  *   if (self->array == NULL)
  *     self->array = g_ptr_array_new ();
  *
- *   if (cond)
+ *   if (condition)
  *     // No need to unlock
  *     return;
  *
@@ -510,6 +633,10 @@ typedef void GRWLockWriterLocker;
  * }
  * ]|
  *
+ * Note that it is common for the declared variable to not be used in the scope,
+ * which causes some compilers to warn. That can be avoided by using
+ * `G_GNUC_UNUSED` or, since 2.80, [func@GLib.RW_LOCK_WRITER_AUTO_LOCK].
+ *
  * Returns: a #GRWLockWriterLocker
  * Since: 2.62
  */
@@ -543,6 +670,49 @@ g_rw_lock_writer_locker_free (GRWLockWriterLocker *locker)
 }
 G_GNUC_END_IGNORE_DEPRECATIONS
 
+/**
+ * G_RW_LOCK_WRITER_AUTO_LOCK:
+ * @mutex: a [type@GLib.RWLock]
+ * @var: a variable name to be declared
+ *
+ * Declare a [type@GLib.RWLockWriterLocker] variable with `g_autoptr()` and lock
+ * for writing. The mutex will be unlocked automatically when leaving the scope.
+ * The variable is declared with `G_GNUC_UNUSED` to avoid compiler warning if it
+ * is not used in the scope.
+ *
+ * This feature is only supported on GCC and clang. This macro is not defined on
+ * other compilers and should not be used in programs that are intended to be
+ * portable to those compilers.
+ *
+ * Note that this should be used in a place where it is allowed to declare a
+ * variable, which could be before any statement in the case
+ * `-Wdeclaration-after-statement` is used, or C standard prior to C99.
+ *
+ * ```c
+ * {
+ *   G_RW_LOCK_WRITER_AUTO_LOCK (&obj->rw_lock, locker);
+ *
+ *   obj->stuff_with_lock ();
+ *   if (condition)
+ *     {
+ *       // No need to unlock
+ *       return;
+ *     }
+ *
+ *   // Unlock before end of scope
+ *   g_clear_pointer (&locker, g_rw_lock_writer_locker_free);
+ *   obj->stuff_without_lock ();
+ * }
+ * ```
+ *
+ * Since: 2.80.0
+ */
+#ifdef g_autoptr
+#define G_RW_LOCK_WRITER_AUTO_LOCK(mutex, var)                 \
+  GLIB_AVAILABLE_MACRO_IN_2_80 g_autoptr (GRWLockWriterLocker) \
+  G_GNUC_UNUSED var = g_rw_lock_writer_locker_new (mutex)
+#endif /* g_autoptr */
+
 /**
  * GRWLockReaderLocker:
  *
@@ -598,6 +768,49 @@ g_rw_lock_reader_locker_free (GRWLockReaderLocker *locker)
 }
 G_GNUC_END_IGNORE_DEPRECATIONS
 
+/**
+ * G_RW_LOCK_READER_AUTO_LOCK:
+ * @mutex: a [type@GLib.RWLock]
+ * @var: a variable name to be declared
+ *
+ * Declare a [type@GLib.RWLockReaderLocker] variable with `g_autoptr()` and lock
+ * for reading. The mutex will be unlocked automatically when leaving the scope.
+ * The variable is declared with `G_GNUC_UNUSED` to avoid compiler warning if it
+ * is not used in the scope.
+ *
+ * This feature is only supported on GCC and clang. This macro is not defined on
+ * other compilers and should not be used in programs that are intended to be
+ * portable to those compilers.
+ *
+ * Note that this should be used in a place where it is allowed to declare a
+ * variable, which could be before any statement in the case
+ * `-Wdeclaration-after-statement` is used, or C standard prior to C99.
+ *
+ * ```c
+ * {
+ *   G_RW_LOCK_READER_AUTO_LOCK (&obj->rw_lock, locker);
+ *
+ *   obj->stuff_with_lock ();
+ *   if (condition)
+ *     {
+ *       // No need to unlock
+ *       return;
+ *     }
+ *
+ *   // Unlock before end of scope
+ *   g_clear_pointer (&locker, g_rw_lock_reader_locker_free);
+ *   obj->stuff_without_lock ();
+ * }
+ * ```
+ *
+ * Since: 2.80.0
+ */
+#ifdef g_autoptr
+#define G_RW_LOCK_READER_AUTO_LOCK(mutex, var)                 \
+  GLIB_AVAILABLE_MACRO_IN_2_80 g_autoptr (GRWLockReaderLocker) \
+  G_GNUC_UNUSED var = g_rw_lock_reader_locker_new (mutex)
+#endif /* g_autoptr */
+
 G_END_DECLS
 
 #endif /* __G_THREAD_H__ */
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gthreadpool.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gthreadpool.c
index 62c05126ea7..5ce1f3d018c 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gthreadpool.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gthreadpool.c
@@ -37,43 +37,6 @@
 #include "gtimer.h"
 #include "gutils.h"
 
-/**
- * SECTION:thread_pools
- * @title: Thread Pools
- * @short_description: pools of threads to execute work concurrently
- * @see_also: #GThread
- *
- * Sometimes you wish to asynchronously fork out the execution of work
- * and continue working in your own thread. If that will happen often,
- * the overhead of starting and destroying a thread each time might be
- * too high. In such cases reusing already started threads seems like a
- * good idea. And it indeed is, but implementing this can be tedious
- * and error-prone.
- *
- * Therefore GLib provides thread pools for your convenience. An added
- * advantage is, that the threads can be shared between the different
- * subsystems of your program, when they are using GLib.
- *
- * To create a new thread pool, you use g_thread_pool_new().
- * It is destroyed by g_thread_pool_free().
- *
- * If you want to execute a certain task within a thread pool,
- * you call g_thread_pool_push().
- *
- * To get the current number of running threads you call
- * g_thread_pool_get_num_threads(). To get the number of still
- * unprocessed tasks you call g_thread_pool_unprocessed(). To control
- * the maximal number of threads for a thread pool, you use
- * g_thread_pool_get_max_threads() and g_thread_pool_set_max_threads().
- *
- * Finally you can control the number of unused threads, that are kept
- * alive by GLib for future use. The current number can be fetched with
- * g_thread_pool_get_num_unused_threads(). The maximal number can be
- * controlled by g_thread_pool_get_max_unused_threads() and
- * g_thread_pool_set_max_unused_threads(). All currently unused threads
- * can be stopped by calling g_thread_pool_stop_unused_threads().
- */
-
 #define DEBUG_MSG(x)
 /* #define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n");    */
 
@@ -85,9 +48,32 @@ typedef struct _GRealThreadPool GRealThreadPool;
  * @user_data: the user data for the threads of this pool
  * @exclusive: are all threads exclusive to this pool
  *
- * The #GThreadPool struct represents a thread pool. It has three
- * public read-only members, but the underlying struct is bigger,
- * so you must not copy this struct.
+ * The `GThreadPool` struct represents a thread pool.
+ *
+ * A thread pool is useful when you wish to asynchronously fork out the execution of work
+ * and continue working in your own thread. If that will happen often, the overhead of starting
+ * and destroying a thread each time might be too high. In such cases reusing already started
+ * threads seems like a good idea. And it indeed is, but implementing this can be tedious
+ * and error-prone.
+ *
+ * Therefore GLib provides thread pools for your convenience. An added advantage is, that the
+ * threads can be shared between the different subsystems of your program, when they are using GLib.
+ *
+ * To create a new thread pool, you use [func@GLib.ThreadPool.new].
+ * It is destroyed by [method@GLib.ThreadPool.free].
+ *
+ * If you want to execute a certain task within a thread pool, use [method@GLib.ThreadPool.push].
+ *
+ * To get the current number of running threads you call [method@GLib.ThreadPool.get_num_threads].
+ * To get the number of still unprocessed tasks you call [method@GLib.ThreadPool.unprocessed].
+ * To control the maximum number of threads for a thread pool, you use
+ * [method@GLib.ThreadPool.get_max_threads]. and [method@GLib.ThreadPool.set_max_threads].
+ *
+ * Finally you can control the number of unused threads, that are kept alive by GLib for future use.
+ * The current number can be fetched with [func@GLib.ThreadPool.get_num_unused_threads].
+ * The maximum number can be controlled by [func@GLib.ThreadPool.get_max_unused_threads] and
+ * [func@GLib.ThreadPool.set_max_unused_threads]. All currently unused threads
+ * can be stopped by calling [func@GLib.ThreadPool.stop_unused_threads].
  */
 struct _GRealThreadPool
 {
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gtimer.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gtimer.c
index 3a0e78959dc..de6ea4eac56 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gtimer.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gtimer.c
@@ -56,22 +56,15 @@
 #include "gtestutils.h"
 #include "gmain.h"
 
-/**
- * SECTION:timers
- * @title: Timers
- * @short_description: keep track of elapsed time
- *
- * #GTimer records a start time, and counts microseconds elapsed since
- * that time. This is done somewhat differently on different platforms,
- * and can be tricky to get exactly right, so #GTimer provides a
- * portable/convenient interface.
- **/
-
 /**
  * GTimer:
  *
- * Opaque datatype that records a start time.
- **/
+ * `GTimer` records a start time, and counts microseconds elapsed since
+ * that time.
+ *
+ * This is done somewhat differently on different platforms, and can be
+ * tricky to get exactly right, so `GTimer` provides a portable/convenient interface.
+ */
 struct _GTimer
 {
   guint64 start;
@@ -81,12 +74,12 @@ struct _GTimer
 };
 
 /**
- * g_timer_new:
+ * g_timer_new: (constructor)
  *
  * Creates a new timer, and starts timing (i.e. g_timer_start() is
  * implicitly called for you).
  *
- * Returns: a new #GTimer.
+ * Returns: (transfer full): a new #GTimer.
  **/
 GTimer*
 g_timer_new (void)
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gtimezone.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gtimezone.c
index 93ca8603be7..4ebc36396b0 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gtimezone.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gtimezone.c
@@ -53,25 +53,23 @@
 #endif
 
 /**
- * SECTION:timezone
- * @title: GTimeZone
- * @short_description: a structure representing a time zone
- * @see_also: #GDateTime
- *
- * #GTimeZone is a structure that represents a time zone, at no
- * particular point in time.  It is refcounted and immutable.
- *
- * Each time zone has an identifier (for example, 'Europe/London') which is
- * platform dependent. See g_time_zone_new() for information on the identifier
- * formats. The identifier of a time zone can be retrieved using
- * g_time_zone_get_identifier().
- *
- * A time zone contains a number of intervals.  Each interval has
- * an abbreviation to describe it (for example, 'PDT'), an offset to UTC and a
- * flag indicating if the daylight savings time is in effect during that
- * interval.  A time zone always has at least one interval - interval 0. Note
- * that interval abbreviations are not the same as time zone identifiers
- * (apart from 'UTC'), and cannot be passed to g_time_zone_new().
+ * GTimeZone:
+ *
+ * A `GTimeZone` represents a time zone, at no particular point in time.
+ *
+ * The `GTimeZone` struct is refcounted and immutable.
+ *
+ * Each time zone has an identifier (for example, ‘Europe/London’) which is
+ * platform dependent. See [ctor@GLib.TimeZone.new] for information on the
+ * identifier formats. The identifier of a time zone can be retrieved using
+ * [method@GLib.TimeZone.get_identifier].
+ *
+ * A time zone contains a number of intervals. Each interval has an abbreviation
+ * to describe it (for example, ‘PDT’), an offset to UTC and a flag indicating
+ * if the daylight savings time is in effect during that interval. A time zone
+ * always has at least one interval — interval 0. Note that interval abbreviations
+ * are not the same as time zone identifiers (apart from ‘UTC’), and cannot be
+ * passed to [ctor@GLib.TimeZone.new].
  *
  * Every UTC time is contained within exactly one interval, but a given
  * local time may be contained within zero, one or two intervals (due to
@@ -84,17 +82,8 @@
  * that some properties (like the abbreviation) change between intervals
  * without other properties changing.
  *
- * #GTimeZone is available since GLib 2.26.
- */
-
-/**
- * GTimeZone:
- *
- * #GTimeZone is an opaque structure whose members cannot be accessed
- * directly.
- *
  * Since: 2.26
- **/
+ */
 
 /* IANA zoneinfo file format {{{1 */
 
@@ -103,6 +92,8 @@ typedef struct { gchar bytes[8]; } gint64_be;
 typedef struct { gchar bytes[4]; } gint32_be;
 typedef struct { gchar bytes[4]; } guint32_be;
 
+#ifdef G_OS_UNIX
+
 static inline gint64 gint64_from_be (const gint64_be be) {
   gint64 tmp; memcpy (&tmp, &be, sizeof tmp); return GINT64_FROM_BE (tmp);
 }
@@ -115,6 +106,8 @@ static inline guint32 guint32_from_be (const guint32_be be) {
   guint32 tmp; memcpy (&tmp, &be, sizeof tmp); return GUINT32_FROM_BE (tmp);
 }
 
+#endif
+
 /* The layout of an IANA timezone file header */
 struct tzhead
 {
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gtrashstack.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gtrashstack.c
index 125c330b78b..0deda812b66 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gtrashstack.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gtrashstack.c
@@ -34,34 +34,26 @@
 #include "gtrashstack.h"
 
 /**
- * SECTION:trash_stack
- * @title: Trash Stacks
- * @short_description: maintain a stack of unused allocated memory chunks
+ * GTrashStack:
+ * @next: pointer to the previous element of the stack,
+ *     gets stored in the first `sizeof (gpointer)`
+ *     bytes of the element
  *
- * A #GTrashStack is an efficient way to keep a stack of unused allocated
+ * A `GTrashStack` is an efficient way to keep a stack of unused allocated
  * memory chunks. Each memory chunk is required to be large enough to hold
- * a #gpointer. This allows the stack to be maintained without any space
+ * a `gpointer`. This allows the stack to be maintained without any space
  * overhead, since the stack pointers can be stored inside the memory chunks.
  *
- * There is no function to create a #GTrashStack. A %NULL #GTrashStack*
+ * There is no function to create a `GTrashStack`. A `NULL` `GTrashStack*`
  * is a perfectly valid empty stack.
  *
- * There is no longer any good reason to use #GTrashStack.  If you have
- * extra pieces of memory, free() them and allocate them again later.
- *
- * Deprecated: 2.48: #GTrashStack is deprecated without replacement
- */
-
-/**
- * GTrashStack:
- * @next: pointer to the previous element of the stack,
- *     gets stored in the first `sizeof (gpointer)`
- *     bytes of the element
+ * Each piece of memory that is pushed onto the stack is cast to a
+ * `GTrashStack*`.
  *
- * Each piece of memory that is pushed onto the stack
- * is cast to a GTrashStack*.
+ * There is no longer any good reason to use `GTrashStack`.  If you have
+ * extra pieces of memory, `free()` them and allocate them again later.
  *
- * Deprecated: 2.48: #GTrashStack is deprecated without replacement
+ * Deprecated: 2.48: `GTrashStack` is deprecated without replacement
  */
 
 /**
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gtree.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gtree.c
index a7697b0af40..d43a9a9b04d 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gtree.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gtree.c
@@ -36,38 +36,6 @@
 #include "gtestutils.h"
 #include "gslice.h"
 
-/**
- * SECTION:trees-binary
- * @title: Balanced Binary Trees
- * @short_description: a sorted collection of key/value pairs optimized
- *                     for searching and traversing in order
- *
- * The #GTree structure and its associated functions provide a sorted
- * collection of key/value pairs optimized for searching and traversing
- * in order. This means that most of the operations  (access, search,
- * insertion, deletion, ...) on #GTree are O(log(n)) in average and O(n)
- * in worst case for time complexity. But, note that maintaining a
- * balanced sorted #GTree of n elements is done in time O(n log(n)).
- *
- * To create a new #GTree use g_tree_new().
- *
- * To insert a key/value pair into a #GTree use g_tree_insert()
- * (O(n log(n))).
- *
- * To remove a key/value pair use g_tree_remove() (O(n log(n))).
- *
- * To look up the value corresponding to a given key, use
- * g_tree_lookup() and g_tree_lookup_extended().
- *
- * To find out the number of nodes in a #GTree, use g_tree_nnodes(). To
- * get the height of a #GTree, use g_tree_height().
- *
- * To traverse a #GTree, calling a function for each node visited in
- * the traversal, use g_tree_foreach().
- *
- * To destroy a #GTree, use g_tree_destroy().
- **/
-
 #define MAX_GTREE_HEIGHT 40
 /* G_MAXUINT nodes will be covered by tree height of log2(G_MAXUINT) + 2. */
 G_STATIC_ASSERT ((G_GUINT64_CONSTANT (1) << (MAX_GTREE_HEIGHT - 2)) >= G_MAXUINT);
@@ -157,7 +125,7 @@ g_tree_node_new (gpointer key,
 }
 
 /**
- * g_tree_new:
+ * g_tree_new: (constructor)
  * @key_compare_func: the function used to order the nodes in the #GTree.
  *   It should return values similar to the standard strcmp() function -
  *   0 if the two arguments are equal, a negative value if the first argument
@@ -1160,7 +1128,7 @@ g_tree_lookup_extended (GTree         *tree,
 /**
  * g_tree_foreach:
  * @tree: a #GTree
- * @func: the function to call for each node visited.
+ * @func: (scope call): the function to call for each node visited.
  *     If this function returns %TRUE, the traversal is stopped.
  * @user_data: user data to pass to the function
  *
@@ -1199,7 +1167,7 @@ g_tree_foreach (GTree         *tree,
 /**
  * g_tree_foreach_node:
  * @tree: a #GTree
- * @func: the function to call for each node visited.
+ * @func: (scope call): the function to call for each node visited.
  *     If this function returns %TRUE, the traversal is stopped.
  * @user_data: user data to pass to the function
  *
@@ -1240,7 +1208,7 @@ g_tree_foreach_node (GTree             *tree,
 /**
  * g_tree_traverse:
  * @tree: a #GTree
- * @traverse_func: the function to call for each node visited. If this
+ * @traverse_func: (scope call): the function to call for each node visited. If this
  *   function returns %TRUE, the traversal is stopped.
  * @traverse_type: the order in which nodes are visited, one of %G_IN_ORDER,
  *   %G_PRE_ORDER and %G_POST_ORDER
@@ -1300,7 +1268,7 @@ g_tree_traverse (GTree         *tree,
 /**
  * g_tree_search_node:
  * @tree: a #GTree
- * @search_func: a function used to search the #GTree
+ * @search_func: (scope call): a function used to search the #GTree
  * @user_data: the data passed as the second argument to @search_func
  *
  * Searches a #GTree using @search_func.
@@ -1334,7 +1302,7 @@ g_tree_search_node (GTree         *tree,
 /**
  * g_tree_search:
  * @tree: a #GTree
- * @search_func: a function used to search the #GTree
+ * @search_func: (scope call): a function used to search the #GTree
  * @user_data: the data passed as the second argument to @search_func
  *
  * Searches a #GTree using @search_func.
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gunibreak.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gunibreak.h
index dc3151a16e2..6a3e731de51 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gunibreak.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gunibreak.h
@@ -7,7 +7,7 @@
 #include <glib/gtypes.h>
 #include <glib/gunicode.h>
 
-#define G_UNICODE_DATA_VERSION "15.0.0"
+#define G_UNICODE_DATA_VERSION "15.1.0"
 
 #define G_UNICODE_LAST_CHAR 0x10FFFF
 
@@ -18,7 +18,7 @@
 
 static const gint8 break_property_data[][256] = {
   { /* page 0, index 0 */
-     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
@@ -148,7 +148,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC
   },
   { /* page 2, index 1 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -278,7 +278,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
   { /* page 3, index 2 */
-     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
@@ -408,7 +408,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
   { /* page 4, index 3 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -538,7 +538,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
   { /* page 5, index 4 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -668,9 +668,9 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 6, index 5 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC,
+    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC,
+    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_POSTFIX,
     G_UNICODE_BREAK_POSTFIX, G_UNICODE_BREAK_POSTFIX,
@@ -778,7 +778,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
-    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_NUMERIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
@@ -798,7 +798,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
   { /* page 7, index 6 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -928,7 +928,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_PREFIX, G_UNICODE_BREAK_PREFIX
   },
   { /* page 8, index 7 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -1000,7 +1000,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
@@ -1041,7 +1041,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_COMBINING_MARK,
+    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
@@ -1058,7 +1058,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK
   },
   { /* page 9, index 8 */
-     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -1188,7 +1188,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 10, index 9 */
-     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_COMBINING_MARK,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -1318,7 +1318,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK
   },
   { /* page 11, index 10 */
-     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_COMBINING_MARK,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -1448,7 +1448,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 12, index 11 */
-     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -1578,7 +1578,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 13, index 12 */
-     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -1708,7 +1708,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 14, index 13 */
-     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_COMPLEX_CONTEXT,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_COMPLEX_CONTEXT,
     G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT,
     G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT,
     G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT,
@@ -1837,7 +1837,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 15, index 14 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_BEFORE,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_BEFORE,
     G_UNICODE_BREAK_BEFORE, G_UNICODE_BREAK_BEFORE, G_UNICODE_BREAK_BEFORE,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_BEFORE,
     G_UNICODE_BREAK_BEFORE, G_UNICODE_BREAK_NON_BREAKING_GLUE,
@@ -1965,7 +1965,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 16, index 15 */
-     G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT,
+    G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT,
     G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT,
     G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT,
     G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT,
@@ -2095,7 +2095,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC
   },
   { /* page 17, index 16 */
-     G_UNICODE_BREAK_HANGUL_L_JAMO, G_UNICODE_BREAK_HANGUL_L_JAMO,
+    G_UNICODE_BREAK_HANGUL_L_JAMO, G_UNICODE_BREAK_HANGUL_L_JAMO,
     G_UNICODE_BREAK_HANGUL_L_JAMO, G_UNICODE_BREAK_HANGUL_L_JAMO,
     G_UNICODE_BREAK_HANGUL_L_JAMO, G_UNICODE_BREAK_HANGUL_L_JAMO,
     G_UNICODE_BREAK_HANGUL_L_JAMO, G_UNICODE_BREAK_HANGUL_L_JAMO,
@@ -2225,7 +2225,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_T_JAMO, G_UNICODE_BREAK_HANGUL_T_JAMO
   },
   { /* page 18, index 17 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -2355,7 +2355,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
   { /* page 19, index 18 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -2485,7 +2485,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 20, index 19 */
-     G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -2615,7 +2615,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
   { /* page 22, index 20 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -2745,7 +2745,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 23, index 21 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -2875,7 +2875,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 24, index 22 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_EXCLAMATION, G_UNICODE_BREAK_EXCLAMATION,
     G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_BEFORE,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_EXCLAMATION,
@@ -3005,7 +3005,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 25, index 23 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -3135,7 +3135,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
   { /* page 26, index 24 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -3265,33 +3265,25 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 27, index 25 */
-     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
-    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
@@ -3299,33 +3291,33 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
-    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN,
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_VIRAMA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC,
-    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC,
-    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC,
-    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC,
-    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_AFTER,
-    G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_AFTER,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_AFTER,
     G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
-    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_ALPHABETIC,
@@ -3359,32 +3351,32 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
+    G_UNICODE_BREAK_VIRAMA_FINAL, G_UNICODE_BREAK_VIRAMA_FINAL,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
@@ -3393,7 +3385,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
   { /* page 28, index 26 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -3522,7 +3514,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 29, index 27 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -3652,7 +3644,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK
   },
   { /* page 31, index 28 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -3782,7 +3774,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 32, index 29 */
-     G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER,
+    G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER,
     G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER,
     G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_NON_BREAKING_GLUE,
     G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER,
@@ -3901,7 +3893,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 33, index 30 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_POSTFIX,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_AMBIGUOUS,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -4031,7 +4023,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
   { /* page 34, index 31 */
-     G_UNICODE_BREAK_AMBIGUOUS, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_AMBIGUOUS, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_AMBIGUOUS, G_UNICODE_BREAK_AMBIGUOUS,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_AMBIGUOUS,
@@ -4161,7 +4153,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
   { /* page 35, index 32 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -4291,7 +4283,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
   { /* page 36, index 33 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -4421,7 +4413,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_AMBIGUOUS, G_UNICODE_BREAK_ALPHABETIC
   },
   { /* page 37, index 34 */
-     G_UNICODE_BREAK_AMBIGUOUS, G_UNICODE_BREAK_AMBIGUOUS,
+    G_UNICODE_BREAK_AMBIGUOUS, G_UNICODE_BREAK_AMBIGUOUS,
     G_UNICODE_BREAK_AMBIGUOUS, G_UNICODE_BREAK_AMBIGUOUS,
     G_UNICODE_BREAK_AMBIGUOUS, G_UNICODE_BREAK_AMBIGUOUS,
     G_UNICODE_BREAK_AMBIGUOUS, G_UNICODE_BREAK_AMBIGUOUS,
@@ -4551,7 +4543,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
   { /* page 38, index 35 */
-     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_AMBIGUOUS,
     G_UNICODE_BREAK_AMBIGUOUS, G_UNICODE_BREAK_ALPHABETIC,
@@ -4681,7 +4673,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC
   },
   { /* page 39, index 36 */
-     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -4811,7 +4803,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
   { /* page 41, index 37 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -4941,7 +4933,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
   { /* page 43, index 38 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -5071,7 +5063,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
   { /* page 44, index 39 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -5201,7 +5193,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_AFTER
   },
   { /* page 45, index 40 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -5331,7 +5323,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_COMBINING_MARK
   },
   { /* page 46, index 41 */
-     G_UNICODE_BREAK_QUOTATION, G_UNICODE_BREAK_QUOTATION,
+    G_UNICODE_BREAK_QUOTATION, G_UNICODE_BREAK_QUOTATION,
     G_UNICODE_BREAK_QUOTATION, G_UNICODE_BREAK_QUOTATION,
     G_UNICODE_BREAK_QUOTATION, G_UNICODE_BREAK_QUOTATION,
     G_UNICODE_BREAK_QUOTATION, G_UNICODE_BREAK_QUOTATION,
@@ -5455,7 +5447,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 47, index 42 */
-     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
@@ -5581,11 +5573,11 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC
   },
   { /* page 48, index 43 */
-     G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_CLOSE_PUNCTUATION,
+    G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_CLOSE_PUNCTUATION,
     G_UNICODE_BREAK_CLOSE_PUNCTUATION, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_NON_STARTER,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
@@ -5736,7 +5728,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC
   },
   { /* page 49, index 44 */
-     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
@@ -5855,7 +5847,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_CONDITIONAL_JAPANESE_STARTER,
     G_UNICODE_BREAK_CONDITIONAL_JAPANESE_STARTER,
     G_UNICODE_BREAK_CONDITIONAL_JAPANESE_STARTER,
@@ -5874,7 +5866,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_CONDITIONAL_JAPANESE_STARTER
   },
   { /* page 50, index 45 */
-     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
@@ -6004,7 +5996,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC
   },
   { /* page 77, index 46 */
-     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
@@ -6134,7 +6126,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
   { /* page 160, index 47 */
-     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
@@ -6264,7 +6256,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC
   },
   { /* page 164, index 48 */
-     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
@@ -6394,7 +6386,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER
   },
   { /* page 166, index 49 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -6523,7 +6515,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 167, index 50 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -6653,7 +6645,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
   { /* page 168, index 51 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_ALPHABETIC,
@@ -6782,7 +6774,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_COMBINING_MARK
   },
   { /* page 169, index 52 */
-     G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC,
+    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC,
     G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC,
     G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC,
     G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC,
@@ -6847,52 +6839,45 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
-    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC,
-    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC,
-    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC,
-    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC,
-    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC,
+    G_UNICODE_BREAK_VIRAMA, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_AFTER,
+    G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_AFTER,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT,
     G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT,
     G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT,
@@ -6911,27 +6896,27 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 170, index 53 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_COMBINING_MARK,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
@@ -6942,23 +6927,21 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_COMBINING_MARK,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC,
-    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC,
-    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC,
-    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC,
-    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC,
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER,
-    G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_COMPLEX_CONTEXT,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_AFTER,
+    G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER,
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_AFTER,
+    G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER,
+    G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER,
+    G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_COMBINING_MARK,
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_UNKNOWN,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_UNKNOWN,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER,
     G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT,
     G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT,
     G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT,
@@ -7008,6 +6991,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT,
     G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT,
     G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT,
+    G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
@@ -7019,19 +7003,18 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_COMPLEX_CONTEXT,
     G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT,
     G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT,
-    G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
-    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_AFTER,
-    G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
@@ -7041,7 +7024,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 171, index 54 */
-     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN,
@@ -7171,7 +7154,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 172, index 55 */
-     G_UNICODE_BREAK_HANGUL_LV_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LV_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -7301,7 +7284,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 173, index 56 */
-     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -7431,7 +7414,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 174, index 57 */
-     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -7561,7 +7544,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 175, index 58 */
-     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -7691,7 +7674,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 176, index 59 */
-     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -7821,7 +7804,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 177, index 60 */
-     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -7951,7 +7934,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 178, index 61 */
-     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LV_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -8081,7 +8064,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 179, index 62 */
-     G_UNICODE_BREAK_HANGUL_LV_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LV_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -8211,7 +8194,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 180, index 63 */
-     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -8341,7 +8324,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 181, index 64 */
-     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -8471,7 +8454,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 182, index 65 */
-     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -8601,7 +8584,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 183, index 66 */
-     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -8731,7 +8714,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 184, index 67 */
-     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -8861,7 +8844,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 185, index 68 */
-     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LV_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -8991,7 +8974,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 186, index 69 */
-     G_UNICODE_BREAK_HANGUL_LV_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LV_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -9121,7 +9104,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 187, index 70 */
-     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -9251,7 +9234,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 188, index 71 */
-     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -9381,7 +9364,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 189, index 72 */
-     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -9511,7 +9494,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 190, index 73 */
-     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -9641,7 +9624,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 191, index 74 */
-     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -9771,7 +9754,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 192, index 75 */
-     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LV_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -9901,7 +9884,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 193, index 76 */
-     G_UNICODE_BREAK_HANGUL_LV_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LV_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -10031,7 +10014,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 194, index 77 */
-     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -10161,7 +10144,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 195, index 78 */
-     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -10291,7 +10274,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 196, index 79 */
-     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -10421,7 +10404,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 197, index 80 */
-     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -10551,7 +10534,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 198, index 81 */
-     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -10681,7 +10664,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 199, index 82 */
-     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LV_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -10811,7 +10794,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 200, index 83 */
-     G_UNICODE_BREAK_HANGUL_LV_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LV_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -10941,7 +10924,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 201, index 84 */
-     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -11071,7 +11054,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 202, index 85 */
-     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -11201,7 +11184,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 203, index 86 */
-     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -11331,7 +11314,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 204, index 87 */
-     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -11461,7 +11444,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 205, index 88 */
-     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -11591,7 +11574,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 206, index 89 */
-     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LV_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -11721,7 +11704,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 207, index 90 */
-     G_UNICODE_BREAK_HANGUL_LV_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LV_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -11851,7 +11834,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 208, index 91 */
-     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -11981,7 +11964,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 209, index 92 */
-     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -12111,7 +12094,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 210, index 93 */
-     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -12241,7 +12224,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 211, index 94 */
-     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -12371,7 +12354,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 212, index 95 */
-     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -12501,7 +12484,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 213, index 96 */
-     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LV_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -12631,7 +12614,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 214, index 97 */
-     G_UNICODE_BREAK_HANGUL_LV_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LV_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -12761,7 +12744,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
   },
   { /* page 215, index 98 */
-     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
+    G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
     G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE, G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
@@ -12891,7 +12874,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 251, index 99 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN,
@@ -13021,7 +13004,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
   { /* page 253, index 100 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -13151,7 +13134,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
   { /* page 254, index 101 */
-     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
@@ -13281,7 +13264,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_WORD_JOINER
   },
   { /* page 255, index 102 */
-     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_EXCLAMATION,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_EXCLAMATION,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_PREFIX, G_UNICODE_BREAK_POSTFIX,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
@@ -13416,7 +13399,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 256, index 103 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -13546,7 +13529,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 257, index 104 */
-     G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER,
+    G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -13676,7 +13659,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 258, index 105 */
-     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
@@ -13806,7 +13789,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 259, index 106 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -13936,7 +13919,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 260, index 107 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -14066,7 +14049,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 261, index 108 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -14196,7 +14179,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 263, index 109 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -14326,7 +14309,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 264, index 110 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
@@ -14456,7 +14439,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
   { /* page 265, index 111 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -14586,7 +14569,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
   { /* page 266, index 112 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_COMBINING_MARK,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_UNKNOWN,
@@ -14714,7 +14697,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 267, index 113 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -14843,7 +14826,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 268, index 114 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -14973,7 +14956,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
   { /* page 269, index 115 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -15103,7 +15086,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 270, index 116 */
-     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
@@ -15233,7 +15216,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK
   },
   { /* page 271, index 117 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -15338,48 +15321,13 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
-  },
-  { /* page 272, index 118 */
-     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
-    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -15391,42 +15339,68 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
+  },
+  { /* page 272, index 118 */
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_AKSARA_PRE_BASE,
+    G_UNICODE_BREAK_AKSARA_PRE_BASE, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
-    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_AFTER,
-    G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC,
-    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC,
-    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC,
-    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC,
-    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC,
-    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_COMBINING_MARK,
-    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
+    G_UNICODE_BREAK_VIRAMA, G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_COMBINING_MARK,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_COMBINING_MARK,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_NON_BREAKING_GLUE,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -15457,7 +15431,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_NUMERIC,
     G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER,
     G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
@@ -15465,7 +15439,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN,
+    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -15493,7 +15467,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 273, index 119 */
-     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -15621,7 +15595,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 274, index 120 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -15750,37 +15724,28 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 275, index 121 */
-     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_COMBINING_MARK,
-    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_AFTER,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
@@ -15788,17 +15753,17 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_COMBINING_MARK,
-    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_VIRAMA,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_AFTER,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
@@ -15880,7 +15845,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 276, index 122 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -16009,7 +15974,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 277, index 123 */
-     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
@@ -16137,7 +16102,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 278, index 124 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -16265,7 +16230,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 279, index 125 */
-     G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT,
+    G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT,
     G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT,
     G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT,
     G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT,
@@ -16395,7 +16360,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 280, index 126 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -16525,30 +16490,22 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC
   },
   { /* page 281, index 127 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_UNKNOWN,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_UNKNOWN,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
@@ -16556,20 +16513,20 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
-    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_VIRAMA, G_UNICODE_BREAK_AKSARA_PRE_BASE,
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_AKSARA_PRE_BASE,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_NUMERIC,
-    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC,
-    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC,
-    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC,
-    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC,
-    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_UNKNOWN,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
@@ -16655,7 +16612,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 282, index 128 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_COMBINING_MARK,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
@@ -16783,7 +16740,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 283, index 129 */
-     G_UNICODE_BREAK_BEFORE, G_UNICODE_BREAK_BEFORE, G_UNICODE_BREAK_BEFORE,
+    G_UNICODE_BREAK_BEFORE, G_UNICODE_BREAK_BEFORE, G_UNICODE_BREAK_BEFORE,
     G_UNICODE_BREAK_BEFORE, G_UNICODE_BREAK_BEFORE, G_UNICODE_BREAK_BEFORE,
     G_UNICODE_BREAK_BEFORE, G_UNICODE_BREAK_BEFORE, G_UNICODE_BREAK_BEFORE,
     G_UNICODE_BREAK_BEFORE, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
@@ -16911,7 +16868,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 284, index 130 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -17040,7 +16997,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 285, index 131 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN,
@@ -17170,7 +17127,6 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 286, index 132 */
-     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
@@ -17282,50 +17238,43 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_COMBINING_MARK,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
-    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN,
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_AFTER,
+    G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
+    G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 287, index 133 */
-     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_COMBINING_MARK,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
+    G_UNICODE_BREAK_AKSARA_PRE_BASE, G_UNICODE_BREAK_COMBINING_MARK,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
+    G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA, G_UNICODE_BREAK_AKSARA,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
@@ -17333,19 +17282,18 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
-    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_AFTER,
-    G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_VIRAMA, G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
-    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC,
-    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC,
-    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC,
-    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC,
-    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC,
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_AKSARA_START,
+    G_UNICODE_BREAK_AKSARA_START, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
@@ -17388,7 +17336,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
@@ -17396,6 +17344,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -17410,9 +17359,8 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_POSTFIX,
     G_UNICODE_BREAK_POSTFIX, G_UNICODE_BREAK_POSTFIX,
-    G_UNICODE_BREAK_POSTFIX, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_POSTFIX, G_UNICODE_BREAK_POSTFIX,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -17421,16 +17369,16 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_AFTER
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_AFTER
   },
   { /* page 291, index 134 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -17560,7 +17508,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 292, index 135 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -17689,7 +17637,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
   { /* page 293, index 136 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -17819,7 +17767,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 303, index 137 */
-     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
@@ -17949,7 +17897,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 306, index 138 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -18079,7 +18027,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
   { /* page 307, index 139 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -18209,7 +18157,6 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
   { /* page 308, index 140 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -18233,6 +18180,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_OPEN_PUNCTUATION,
     G_UNICODE_BREAK_NON_BREAKING_GLUE, G_UNICODE_BREAK_NON_BREAKING_GLUE,
     G_UNICODE_BREAK_NON_BREAKING_GLUE, G_UNICODE_BREAK_NON_BREAKING_GLUE,
     G_UNICODE_BREAK_NON_BREAKING_GLUE, G_UNICODE_BREAK_NON_BREAKING_GLUE,
@@ -18339,7 +18287,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 325, index 141 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -18469,7 +18417,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
   { /* page 326, index 142 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -18599,7 +18547,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 362, index 143 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -18728,7 +18676,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 363, index 144 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -18858,7 +18806,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 366, index 145 */
-     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
@@ -18988,7 +18936,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 367, index 146 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -19118,7 +19066,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 391, index 147 */
-     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
@@ -19248,7 +19196,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 396, index 148 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -19378,7 +19326,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 397, index 149 */
-     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
@@ -19508,7 +19456,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 431, index 150 */
-     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
@@ -19638,7 +19586,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 433, index 151 */
-     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
@@ -19771,7 +19719,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC
   },
   { /* page 434, index 152 */
-     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
@@ -19901,7 +19849,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 444, index 153 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -20031,7 +19979,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 463, index 154 */
-     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
@@ -20161,7 +20109,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 464, index 155 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -20291,7 +20239,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 465, index 156 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -20421,7 +20369,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 466, index 157 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -20551,7 +20499,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 467, index 158 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -20681,7 +20629,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 468, index 159 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -20811,7 +20759,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
   { /* page 469, index 160 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC,
@@ -20941,7 +20889,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
   { /* page 470, index 161 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -21071,7 +21019,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
   { /* page 471, index 162 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -21201,7 +21149,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC
   },
   { /* page 474, index 163 */
-     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
@@ -21330,7 +21278,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 479, index 164 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -21460,7 +21408,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 480, index 165 */
-     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_UNKNOWN,
@@ -21590,7 +21538,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 481, index 166 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -21720,7 +21668,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 482, index 167 */
-     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
@@ -21850,7 +21798,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_PREFIX
   },
   { /* page 484, index 168 */
-     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
@@ -21980,7 +21928,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 487, index 169 */
-     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
@@ -22110,7 +22058,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 488, index 170 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -22240,7 +22188,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 489, index 171 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -22370,7 +22318,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 492, index 172 */
-     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
@@ -22500,7 +22448,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 493, index 173 */
-     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -22630,7 +22578,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 494, index 174 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -22760,7 +22708,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 497, index 175 */
-     G_UNICODE_BREAK_AMBIGUOUS, G_UNICODE_BREAK_AMBIGUOUS,
+    G_UNICODE_BREAK_AMBIGUOUS, G_UNICODE_BREAK_AMBIGUOUS,
     G_UNICODE_BREAK_AMBIGUOUS, G_UNICODE_BREAK_AMBIGUOUS,
     G_UNICODE_BREAK_AMBIGUOUS, G_UNICODE_BREAK_AMBIGUOUS,
     G_UNICODE_BREAK_AMBIGUOUS, G_UNICODE_BREAK_AMBIGUOUS,
@@ -22890,7 +22838,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_REGIONAL_INDICATOR, G_UNICODE_BREAK_REGIONAL_INDICATOR
   },
   { /* page 499, index 176 */
-     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
@@ -23020,7 +22968,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_EMOJI_MODIFIER, G_UNICODE_BREAK_EMOJI_MODIFIER
   },
   { /* page 500, index 177 */
-     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
@@ -23150,7 +23098,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC
   },
   { /* page 501, index 178 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_IDEOGRAPHIC,
@@ -23280,7 +23228,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC
   },
   { /* page 502, index 179 */
-     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
@@ -23410,7 +23358,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC
   },
   { /* page 503, index 180 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -23540,7 +23488,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC
   },
   { /* page 504, index 181 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -23670,7 +23618,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC
   },
   { /* page 505, index 182 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -23800,7 +23748,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC
   },
   { /* page 506, index 183 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -23930,7 +23878,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC
   },
   { /* page 507, index 184 */
-     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC,
@@ -24060,7 +24008,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 511, index 185 */
-     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
@@ -24190,7 +24138,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 767, index 186 */
-     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
@@ -24320,7 +24268,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 1023, index 187 */
-     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC,
@@ -24450,7 +24398,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 3584, index 188 */
-     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_COMBINING_MARK,
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN,
@@ -24580,7 +24528,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 3585, index 189 */
-     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK,
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gunichartables.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gunichartables.h
index 06a56ce4b6f..4559f119d6f 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gunichartables.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gunichartables.h
@@ -4,7 +4,7 @@
 #ifndef CHARTABLES_H
 #define CHARTABLES_H
 
-#define G_UNICODE_DATA_VERSION "15.0.0"
+#define G_UNICODE_DATA_VERSION "15.1.0"
 
 #define G_UNICODE_LAST_CHAR 0x10ffff
 
@@ -16,7 +16,7 @@
 
 static const char type_data[][256] = {
   { /* page 0, index 0 */
-     G_UNICODE_CONTROL, G_UNICODE_CONTROL, G_UNICODE_CONTROL,
+    G_UNICODE_CONTROL, G_UNICODE_CONTROL, G_UNICODE_CONTROL,
     G_UNICODE_CONTROL, G_UNICODE_CONTROL, G_UNICODE_CONTROL,
     G_UNICODE_CONTROL, G_UNICODE_CONTROL, G_UNICODE_CONTROL,
     G_UNICODE_CONTROL, G_UNICODE_CONTROL, G_UNICODE_CONTROL,
@@ -134,7 +134,7 @@ static const char type_data[][256] = {
     G_UNICODE_LOWERCASE_LETTER
   },
   { /* page 1, index 1 */
-     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
@@ -264,7 +264,7 @@ static const char type_data[][256] = {
     G_UNICODE_LOWERCASE_LETTER
   },
   { /* page 2, index 2 */
-     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
@@ -394,7 +394,7 @@ static const char type_data[][256] = {
     G_UNICODE_MODIFIER_SYMBOL, G_UNICODE_MODIFIER_SYMBOL
   },
   { /* page 3, index 3 */
-     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
@@ -522,7 +522,7 @@ static const char type_data[][256] = {
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER
   },
   { /* page 4, index 4 */
-     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER,
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER,
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER,
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER,
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER,
@@ -652,7 +652,7 @@ static const char type_data[][256] = {
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER
   },
   { /* page 5, index 5 */
-     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
@@ -772,7 +772,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 6, index 6 */
-     G_UNICODE_FORMAT, G_UNICODE_FORMAT, G_UNICODE_FORMAT, G_UNICODE_FORMAT,
+    G_UNICODE_FORMAT, G_UNICODE_FORMAT, G_UNICODE_FORMAT, G_UNICODE_FORMAT,
     G_UNICODE_FORMAT, G_UNICODE_FORMAT, G_UNICODE_MATH_SYMBOL,
     G_UNICODE_MATH_SYMBOL, G_UNICODE_MATH_SYMBOL,
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION,
@@ -877,7 +877,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER
   },
   { /* page 7, index 7 */
-     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION,
+    G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION,
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION,
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION,
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION,
@@ -978,7 +978,7 @@ static const char type_data[][256] = {
     G_UNICODE_CURRENCY_SYMBOL, G_UNICODE_CURRENCY_SYMBOL
   },
   { /* page 8, index 8 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -1084,7 +1084,7 @@ static const char type_data[][256] = {
     G_UNICODE_NON_SPACING_MARK
   },
   { /* page 9, index 9 */
-     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -1183,7 +1183,7 @@ static const char type_data[][256] = {
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_UNASSIGNED
   },
   { /* page 10, index 10 */
-     G_UNICODE_UNASSIGNED, G_UNICODE_NON_SPACING_MARK,
+    G_UNICODE_UNASSIGNED, G_UNICODE_NON_SPACING_MARK,
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK, G_UNICODE_UNASSIGNED,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -1279,7 +1279,7 @@ static const char type_data[][256] = {
     G_UNICODE_NON_SPACING_MARK
   },
   { /* page 11, index 11 */
-     G_UNICODE_UNASSIGNED, G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK,
+    G_UNICODE_UNASSIGNED, G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK,
     G_UNICODE_SPACING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -1372,7 +1372,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 12, index 12 */
-     G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK,
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK,
     G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK,
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -1468,7 +1468,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 13, index 13 */
-     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
     G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -1561,7 +1561,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 14, index 14 */
-     G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -1659,7 +1659,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 15, index 15 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_PUNCTUATION,
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION,
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION,
@@ -1768,7 +1768,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 16, index 16 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -1882,7 +1882,7 @@ static const char type_data[][256] = {
     G_UNICODE_LOWERCASE_LETTER
   },
   { /* page 18, index 17 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -1970,7 +1970,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER
   },
   { /* page 19, index 18 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -2075,7 +2075,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 20, index 19 */
-     G_UNICODE_DASH_PUNCTUATION, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_DASH_PUNCTUATION, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -2163,7 +2163,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER
   },
   { /* page 22, index 20 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -2253,7 +2253,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 23, index 21 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -2349,7 +2349,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 24, index 22 */
-     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION,
+    G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION,
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION,
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION,
     G_UNICODE_DASH_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION,
@@ -2441,7 +2441,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 25, index 23 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -2534,7 +2534,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL
   },
   { /* page 26, index 24 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -2639,7 +2639,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 27, index 25 */
-     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
     G_UNICODE_SPACING_MARK, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -2741,7 +2741,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION
   },
   { /* page 28, index 26 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -2852,7 +2852,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 29, index 27 */
-     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
@@ -2982,7 +2982,7 @@ static const char type_data[][256] = {
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK
   },
   { /* page 30, index 28 */
-     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
@@ -3112,7 +3112,7 @@ static const char type_data[][256] = {
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER
   },
   { /* page 31, index 29 */
-     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
@@ -3238,7 +3238,7 @@ static const char type_data[][256] = {
     G_UNICODE_MODIFIER_SYMBOL, G_UNICODE_UNASSIGNED
   },
   { /* page 32, index 30 */
-     G_UNICODE_SPACE_SEPARATOR, G_UNICODE_SPACE_SEPARATOR,
+    G_UNICODE_SPACE_SEPARATOR, G_UNICODE_SPACE_SEPARATOR,
     G_UNICODE_SPACE_SEPARATOR, G_UNICODE_SPACE_SEPARATOR,
     G_UNICODE_SPACE_SEPARATOR, G_UNICODE_SPACE_SEPARATOR,
     G_UNICODE_SPACE_SEPARATOR, G_UNICODE_SPACE_SEPARATOR,
@@ -3353,7 +3353,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 33, index 31 */
-     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_OTHER_SYMBOL,
@@ -3457,7 +3457,7 @@ static const char type_data[][256] = {
     G_UNICODE_MATH_SYMBOL, G_UNICODE_MATH_SYMBOL, G_UNICODE_MATH_SYMBOL
   },
   { /* page 35, index 32 */
-     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OPEN_PUNCTUATION, G_UNICODE_CLOSE_PUNCTUATION,
@@ -3546,7 +3546,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL
   },
   { /* page 36, index 33 */
-     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
@@ -3634,7 +3634,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_NUMBER
   },
   { /* page 37, index 34 */
-     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
@@ -3722,7 +3722,7 @@ static const char type_data[][256] = {
     G_UNICODE_MATH_SYMBOL
   },
   { /* page 38, index 35 */
-     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
@@ -3810,7 +3810,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_SYMBOL
   },
   { /* page 39, index 36 */
-     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
@@ -3903,7 +3903,7 @@ static const char type_data[][256] = {
     G_UNICODE_MATH_SYMBOL
   },
   { /* page 41, index 37 */
-     G_UNICODE_MATH_SYMBOL, G_UNICODE_MATH_SYMBOL, G_UNICODE_MATH_SYMBOL,
+    G_UNICODE_MATH_SYMBOL, G_UNICODE_MATH_SYMBOL, G_UNICODE_MATH_SYMBOL,
     G_UNICODE_MATH_SYMBOL, G_UNICODE_MATH_SYMBOL, G_UNICODE_MATH_SYMBOL,
     G_UNICODE_MATH_SYMBOL, G_UNICODE_MATH_SYMBOL, G_UNICODE_MATH_SYMBOL,
     G_UNICODE_MATH_SYMBOL, G_UNICODE_MATH_SYMBOL, G_UNICODE_MATH_SYMBOL,
@@ -3996,7 +3996,7 @@ static const char type_data[][256] = {
     G_UNICODE_MATH_SYMBOL
   },
   { /* page 43, index 38 */
-     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
@@ -4084,7 +4084,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_SYMBOL
   },
   { /* page 44, index 39 */
-     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER,
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER,
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER,
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER,
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER,
@@ -4213,7 +4213,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_PUNCTUATION
   },
   { /* page 45, index 40 */
-     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
@@ -4313,7 +4313,7 @@ static const char type_data[][256] = {
     G_UNICODE_NON_SPACING_MARK
   },
   { /* page 46, index 41 */
-     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION,
+    G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION,
     G_UNICODE_INITIAL_PUNCTUATION, G_UNICODE_FINAL_PUNCTUATION,
     G_UNICODE_INITIAL_PUNCTUATION, G_UNICODE_FINAL_PUNCTUATION,
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION,
@@ -4416,7 +4416,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 47, index 42 */
-     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
@@ -4500,11 +4500,11 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
-    G_UNICODE_UNASSIGNED
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
+    G_UNICODE_OTHER_SYMBOL
   },
   { /* page 48, index 43 */
-     G_UNICODE_SPACE_SEPARATOR, G_UNICODE_OTHER_PUNCTUATION,
+    G_UNICODE_SPACE_SEPARATOR, G_UNICODE_OTHER_PUNCTUATION,
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_MODIFIER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_LETTER_NUMBER,
@@ -4604,7 +4604,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER
   },
   { /* page 49, index 44 */
-     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -4683,7 +4683,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -4692,7 +4692,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER
   },
   { /* page 50, index 45 */
-     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
@@ -4780,7 +4780,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_SYMBOL
   },
   { /* page 77, index 46 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -4868,7 +4868,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_SYMBOL
   },
   { /* page 160, index 47 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -4956,7 +4956,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER
   },
   { /* page 164, index 48 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -5045,7 +5045,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION
   },
   { /* page 166, index 49 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -5154,7 +5154,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 167, index 50 */
-     G_UNICODE_MODIFIER_SYMBOL, G_UNICODE_MODIFIER_SYMBOL,
+    G_UNICODE_MODIFIER_SYMBOL, G_UNICODE_MODIFIER_SYMBOL,
     G_UNICODE_MODIFIER_SYMBOL, G_UNICODE_MODIFIER_SYMBOL,
     G_UNICODE_MODIFIER_SYMBOL, G_UNICODE_MODIFIER_SYMBOL,
     G_UNICODE_MODIFIER_SYMBOL, G_UNICODE_MODIFIER_SYMBOL,
@@ -5278,7 +5278,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER
   },
   { /* page 168, index 51 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_OTHER_LETTER,
@@ -5375,7 +5375,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_NON_SPACING_MARK
   },
   { /* page 169, index 52 */
-     G_UNICODE_DECIMAL_NUMBER, G_UNICODE_DECIMAL_NUMBER,
+    G_UNICODE_DECIMAL_NUMBER, G_UNICODE_DECIMAL_NUMBER,
     G_UNICODE_DECIMAL_NUMBER, G_UNICODE_DECIMAL_NUMBER,
     G_UNICODE_DECIMAL_NUMBER, G_UNICODE_DECIMAL_NUMBER,
     G_UNICODE_DECIMAL_NUMBER, G_UNICODE_DECIMAL_NUMBER,
@@ -5478,7 +5478,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 170, index 53 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -5577,7 +5577,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 171, index 54 */
-     G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -5691,7 +5691,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 215, index 55 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -5779,7 +5779,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 250, index 56 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -5867,7 +5867,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 251, index 57 */
-     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
@@ -5960,7 +5960,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER
   },
   { /* page 253, index 58 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -6049,7 +6049,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL
   },
   { /* page 254, index 59 */
-     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
@@ -6153,7 +6153,7 @@ static const char type_data[][256] = {
     G_UNICODE_FORMAT
   },
   { /* page 255, index 60 */
-     G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_PUNCTUATION,
+    G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_PUNCTUATION,
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION,
     G_UNICODE_CURRENCY_SYMBOL, G_UNICODE_OTHER_PUNCTUATION,
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION,
@@ -6260,7 +6260,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 256, index 61 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -6348,7 +6348,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 257, index 62 */
-     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION,
+    G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION,
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_NUMBER,
     G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER,
@@ -6444,7 +6444,7 @@ static const char type_data[][256] = {
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 258, index 63 */
-     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
@@ -6532,7 +6532,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 259, index 64 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -6622,7 +6622,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 260, index 65 */
-     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER,
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER,
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER,
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER,
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER,
@@ -6736,7 +6736,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 261, index 66 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -6837,7 +6837,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 263, index 67 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -6934,7 +6934,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 264, index 68 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER,
     G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -7022,7 +7022,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER
   },
   { /* page 265, index 69 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -7110,7 +7110,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER
   },
   { /* page 266, index 70 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_NON_SPACING_MARK,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_NON_SPACING_MARK,
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
     G_UNICODE_UNASSIGNED, G_UNICODE_NON_SPACING_MARK,
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
@@ -7203,7 +7203,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 267, index 71 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -7293,7 +7293,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 268, index 72 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -7398,7 +7398,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_NUMBER
   },
   { /* page 269, index 73 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -7488,7 +7488,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 270, index 74 */
-     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
@@ -7576,7 +7576,7 @@ static const char type_data[][256] = {
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK
   },
   { /* page 271, index 75 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -7668,7 +7668,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 272, index 76 */
-     G_UNICODE_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
+    G_UNICODE_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
     G_UNICODE_SPACING_MARK, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -7766,7 +7766,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 273, index 77 */
-     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -7867,7 +7867,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 274, index 78 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -7962,7 +7962,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 275, index 79 */
-     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
     G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, G_UNICODE_UNASSIGNED,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -8053,7 +8053,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 276, index 80 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -8151,7 +8151,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 277, index 81 */
-     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
@@ -8245,7 +8245,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 278, index 82 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -8343,7 +8343,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 279, index 83 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -8435,7 +8435,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 280, index 84 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -8537,7 +8537,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER
   },
   { /* page 281, index 85 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
@@ -8629,7 +8629,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 282, index 86 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_NON_SPACING_MARK,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_NON_SPACING_MARK,
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
@@ -8728,7 +8728,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 283, index 87 */
-     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION,
+    G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION,
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION,
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION,
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION,
@@ -8817,7 +8817,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 284, index 88 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -8916,7 +8916,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 285, index 89 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER,
@@ -9009,7 +9009,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 286, index 90 */
-     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
@@ -9098,7 +9098,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 287, index 91 */
-     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
     G_UNICODE_OTHER_LETTER, G_UNICODE_SPACING_MARK, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -9192,7 +9192,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_PUNCTUATION
   },
   { /* page 291, index 92 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -9280,7 +9280,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 292, index 93 */
-     G_UNICODE_LETTER_NUMBER, G_UNICODE_LETTER_NUMBER,
+    G_UNICODE_LETTER_NUMBER, G_UNICODE_LETTER_NUMBER,
     G_UNICODE_LETTER_NUMBER, G_UNICODE_LETTER_NUMBER,
     G_UNICODE_LETTER_NUMBER, G_UNICODE_LETTER_NUMBER,
     G_UNICODE_LETTER_NUMBER, G_UNICODE_LETTER_NUMBER,
@@ -9387,7 +9387,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER
   },
   { /* page 293, index 94 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -9475,7 +9475,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 303, index 95 */
-     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
@@ -9563,7 +9563,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 308, index 96 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -9652,7 +9652,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 326, index 97 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -9740,7 +9740,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 362, index 98 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -9832,7 +9832,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 363, index 99 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -9924,7 +9924,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 366, index 100 */
-     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
@@ -10023,7 +10023,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 367, index 101 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -10114,7 +10114,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 391, index 102 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -10202,7 +10202,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 396, index 103 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -10290,7 +10290,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 397, index 104 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
@@ -10378,7 +10378,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 431, index 105 */
-     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
@@ -10468,7 +10468,7 @@ static const char type_data[][256] = {
     G_UNICODE_MODIFIER_LETTER, G_UNICODE_UNASSIGNED
   },
   { /* page 433, index 106 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -10556,7 +10556,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER
   },
   { /* page 434, index 107 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -10644,7 +10644,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 444, index 108 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -10732,7 +10732,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 463, index 109 */
-     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
@@ -10831,7 +10831,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 464, index 110 */
-     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
@@ -10919,7 +10919,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 465, index 111 */
-     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
@@ -11011,7 +11011,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 466, index 112 */
-     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
@@ -11099,7 +11099,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 467, index 113 */
-     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
@@ -11187,7 +11187,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 468, index 114 */
-     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER,
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER,
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER,
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER,
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER,
@@ -11316,7 +11316,7 @@ static const char type_data[][256] = {
     G_UNICODE_LOWERCASE_LETTER
   },
   { /* page 469, index 115 */
-     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER,
     G_UNICODE_UNASSIGNED, G_UNICODE_UPPERCASE_LETTER,
@@ -11445,7 +11445,7 @@ static const char type_data[][256] = {
     G_UNICODE_LOWERCASE_LETTER
   },
   { /* page 470, index 116 */
-     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
@@ -11575,7 +11575,7 @@ static const char type_data[][256] = {
     G_UNICODE_LOWERCASE_LETTER
   },
   { /* page 471, index 117 */
-     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
@@ -11705,7 +11705,7 @@ static const char type_data[][256] = {
     G_UNICODE_DECIMAL_NUMBER
   },
   { /* page 474, index 118 */
-     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
@@ -11816,7 +11816,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 479, index 119 */
-     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER,
@@ -11910,7 +11910,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 480, index 120 */
-     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_UNASSIGNED,
@@ -12014,7 +12014,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 481, index 121 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -12105,7 +12105,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 482, index 122 */
-     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
@@ -12195,7 +12195,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_CURRENCY_SYMBOL
   },
   { /* page 484, index 123 */
-     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
@@ -12285,7 +12285,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 487, index 124 */
-     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
@@ -12373,7 +12373,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 488, index 125 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -12462,7 +12462,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 489, index 126 */
-     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER,
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER,
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER,
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER,
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER,
@@ -12564,7 +12564,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 492, index 127 */
-     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
@@ -12652,7 +12652,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 493, index 128 */
-     G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER,
+    G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER,
     G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER,
     G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER,
     G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER,
@@ -12740,7 +12740,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 494, index 129 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -12828,7 +12828,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 496, index 130 */
-     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
@@ -12916,7 +12916,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 497, index 131 */
-     G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER,
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER,
     G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER,
     G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER,
     G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER,
@@ -13004,7 +13004,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_SYMBOL
   },
   { /* page 498, index 132 */
-     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
@@ -13092,7 +13092,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 499, index 133 */
-     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
@@ -13181,7 +13181,7 @@ static const char type_data[][256] = {
     G_UNICODE_MODIFIER_SYMBOL
   },
   { /* page 502, index 134 */
-     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
@@ -13269,7 +13269,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 503, index 135 */
-     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
@@ -13357,7 +13357,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 504, index 136 */
-     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
@@ -13445,7 +13445,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 506, index 137 */
-     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
@@ -13533,7 +13533,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 507, index 138 */
-     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL,
@@ -13622,7 +13622,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 678, index 139 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -13710,7 +13710,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 695, index 140 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -13798,7 +13798,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER
   },
   { /* page 696, index 141 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -13886,7 +13886,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER
   },
   { /* page 718, index 142 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -13974,7 +13974,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER
   },
   { /* page 747, index 143 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -14054,6 +14054,94 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER
+  },
+  { /* page 750, index 144 */
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+    G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
@@ -14061,8 +14149,8 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED
   },
-  { /* page 762, index 144 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+  { /* page 762, index 145 */
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -14149,8 +14237,8 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED
   },
-  { /* page 787, index 145 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+  { /* page 787, index 146 */
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -14237,8 +14325,8 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER
   },
-  { /* page 803, index 146 */
-     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
+  { /* page 803, index 147 */
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER,
@@ -14325,8 +14413,8 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED
   },
-  { /* page 3584, index 147 */
-     G_UNICODE_UNASSIGNED, G_UNICODE_FORMAT, G_UNICODE_UNASSIGNED,
+  { /* page 3584, index 148 */
+    G_UNICODE_UNASSIGNED, G_UNICODE_FORMAT, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
@@ -14405,8 +14493,8 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
-  { /* page 3585, index 148 */
-     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
+  { /* page 3585, index 149 */
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK,
@@ -14533,8 +14621,8 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED
   },
-  { /* page 4095, index 149 */
-     G_UNICODE_PRIVATE_USE, G_UNICODE_PRIVATE_USE, G_UNICODE_PRIVATE_USE,
+  { /* page 4095, index 150 */
+    G_UNICODE_PRIVATE_USE, G_UNICODE_PRIVATE_USE, G_UNICODE_PRIVATE_USE,
     G_UNICODE_PRIVATE_USE, G_UNICODE_PRIVATE_USE, G_UNICODE_PRIVATE_USE,
     G_UNICODE_PRIVATE_USE, G_UNICODE_PRIVATE_USE, G_UNICODE_PRIVATE_USE,
     G_UNICODE_PRIVATE_USE, G_UNICODE_PRIVATE_USE, G_UNICODE_PRIVATE_USE,
@@ -14621,8 +14709,8 @@ static const char type_data[][256] = {
     G_UNICODE_PRIVATE_USE, G_UNICODE_PRIVATE_USE, G_UNICODE_UNASSIGNED,
     G_UNICODE_UNASSIGNED
   },
-  { /* page 4351, index 150 */
-     G_UNICODE_PRIVATE_USE, G_UNICODE_PRIVATE_USE, G_UNICODE_PRIVATE_USE,
+  { /* page 4351, index 151 */
+    G_UNICODE_PRIVATE_USE, G_UNICODE_PRIVATE_USE, G_UNICODE_PRIVATE_USE,
     G_UNICODE_PRIVATE_USE, G_UNICODE_PRIVATE_USE, G_UNICODE_PRIVATE_USE,
     G_UNICODE_PRIVATE_USE, G_UNICODE_PRIVATE_USE, G_UNICODE_PRIVATE_USE,
     G_UNICODE_PRIVATE_USE, G_UNICODE_PRIVATE_USE, G_UNICODE_PRIVATE_USE,
@@ -15461,9 +15549,9 @@ static const gint16 type_table_part1[804] = {
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   143 /* page 747 */,
-  G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
-  G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
-  G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
+  G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
+  G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
+  144 /* page 750 */,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
@@ -15475,7 +15563,7 @@ static const gint16 type_table_part1[804] = {
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
-  144 /* page 762 */,
+  145 /* page 762 */,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
@@ -15500,7 +15588,7 @@ static const gint16 type_table_part1[804] = {
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
-  145 /* page 787 */,
+  146 /* page 787 */,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
@@ -15516,13 +15604,13 @@ static const gint16 type_table_part1[804] = {
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
-  146 /* page 803 */
+  147 /* page 803 */
 };
 
 /* U+E0000 through U+10FFFF */
 static const gint16 type_table_part2[768] = {
-  147 /* page 3584 */,
-  148 /* page 3585 */,
+  148 /* page 3584 */,
+  149 /* page 3585 */,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
@@ -16032,7 +16120,7 @@ static const gint16 type_table_part2[768] = {
   G_UNICODE_PRIVATE_USE + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_PRIVATE_USE + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_PRIVATE_USE + G_UNICODE_MAX_TABLE_INDEX,
-  149 /* page 4095 */,
+  150 /* page 4095 */,
   G_UNICODE_PRIVATE_USE + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_PRIVATE_USE + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_PRIVATE_USE + G_UNICODE_MAX_TABLE_INDEX,
@@ -16288,12 +16376,12 @@ static const gint16 type_table_part2[768] = {
   G_UNICODE_PRIVATE_USE + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_PRIVATE_USE + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_PRIVATE_USE + G_UNICODE_MAX_TABLE_INDEX,
-  150 /* page 4351 */
+  151 /* page 4351 */
 };
 
 static const gunichar attr_data[][256] = {
   { /* page 0, index 0 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -16324,7 +16412,7 @@ static const gunichar attr_data[][256] = {
     0x00db, 0x00dc, 0x00dd, 0x00de, 0x0178
   },
   { /* page 1, index 1 */
-     0x0101, 0x0100, 0x0103, 0x0102, 0x0105, 0x0104, 0x0107, 0x0106, 0x0109,
+    0x0101, 0x0100, 0x0103, 0x0102, 0x0105, 0x0104, 0x0107, 0x0106, 0x0109,
     0x0108, 0x010b, 0x010a, 0x010d, 0x010c, 0x010f, 0x010e, 0x0111, 0x0110,
     0x0113, 0x0112, 0x0115, 0x0114, 0x0117, 0x0116, 0x0119, 0x0118, 0x011b,
     0x011a, 0x011d, 0x011c, 0x011f, 0x011e, 0x0121, 0x0120, 0x0123, 0x0122,
@@ -16355,7 +16443,7 @@ static const gunichar attr_data[][256] = {
     0x01f9, 0x01f8, 0x01fb, 0x01fa, 0x01fd, 0x01fc, 0x01ff, 0x01fe
   },
   { /* page 2, index 2 */
-     0x0201, 0x0200, 0x0203, 0x0202, 0x0205, 0x0204, 0x0207, 0x0206, 0x0209,
+    0x0201, 0x0200, 0x0203, 0x0202, 0x0205, 0x0204, 0x0207, 0x0206, 0x0209,
     0x0208, 0x020b, 0x020a, 0x020d, 0x020c, 0x020f, 0x020e, 0x0211, 0x0210,
     0x0213, 0x0212, 0x0215, 0x0214, 0x0217, 0x0216, 0x0219, 0x0218, 0x021b,
     0x021a, 0x021d, 0x021c, 0x021f, 0x021e, 0x019e, 0x0000, 0x0223, 0x0222,
@@ -16386,7 +16474,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 3, index 3 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -16417,7 +16505,7 @@ static const gunichar attr_data[][256] = {
     0x03fb, 0x03fa, 0x0000, 0x037b, 0x037c, 0x037d
   },
   { /* page 4, index 4 */
-     0x0450, 0x0451, 0x0452, 0x0453, 0x0454, 0x0455, 0x0456, 0x0457, 0x0458,
+    0x0450, 0x0451, 0x0452, 0x0453, 0x0454, 0x0455, 0x0456, 0x0457, 0x0458,
     0x0459, 0x045a, 0x045b, 0x045c, 0x045d, 0x045e, 0x045f, 0x0430, 0x0431,
     0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, 0x0438, 0x0439, 0x043a,
     0x043b, 0x043c, 0x043d, 0x043e, 0x043f, 0x0440, 0x0441, 0x0442, 0x0443,
@@ -16448,7 +16536,7 @@ static const gunichar attr_data[][256] = {
     0x04fd, 0x04fc, 0x04ff, 0x04fe
   },
   { /* page 5, index 5 */
-     0x0501, 0x0500, 0x0503, 0x0502, 0x0505, 0x0504, 0x0507, 0x0506, 0x0509,
+    0x0501, 0x0500, 0x0503, 0x0502, 0x0505, 0x0504, 0x0507, 0x0506, 0x0509,
     0x0508, 0x050b, 0x050a, 0x050d, 0x050c, 0x050f, 0x050e, 0x0511, 0x0510,
     0x0513, 0x0512, 0x0515, 0x0514, 0x0517, 0x0516, 0x0519, 0x0518, 0x051b,
     0x051a, 0x051d, 0x051c, 0x051f, 0x051e, 0x0521, 0x0520, 0x0523, 0x0522,
@@ -16479,7 +16567,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 6, index 6 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -16510,7 +16598,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 7, index 7 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -16541,7 +16629,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 9, index 8 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -16572,7 +16660,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 10, index 9 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -16603,7 +16691,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 11, index 10 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -16634,7 +16722,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 12, index 11 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -16665,7 +16753,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 13, index 12 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -16696,7 +16784,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 14, index 13 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -16727,7 +16815,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 15, index 14 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0002, 0x0003,
@@ -16758,7 +16846,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 16, index 15 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -16789,7 +16877,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x1cbd, 0x1cbe, 0x1cbf
   },
   { /* page 19, index 16 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -16820,7 +16908,7 @@ static const gunichar attr_data[][256] = {
     0x13f4, 0x13f5, 0x0000, 0x0000
   },
   { /* page 23, index 17 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -16851,7 +16939,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 24, index 18 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001,
     0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -16882,7 +16970,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 25, index 19 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -16913,7 +17001,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 26, index 20 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -16944,7 +17032,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 27, index 21 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -16975,7 +17063,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 28, index 22 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -17006,7 +17094,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 29, index 23 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -17037,7 +17125,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 30, index 24 */
-     0x1e01, 0x1e00, 0x1e03, 0x1e02, 0x1e05, 0x1e04, 0x1e07, 0x1e06, 0x1e09,
+    0x1e01, 0x1e00, 0x1e03, 0x1e02, 0x1e05, 0x1e04, 0x1e07, 0x1e06, 0x1e09,
     0x1e08, 0x1e0b, 0x1e0a, 0x1e0d, 0x1e0c, 0x1e0f, 0x1e0e, 0x1e11, 0x1e10,
     0x1e13, 0x1e12, 0x1e15, 0x1e14, 0x1e17, 0x1e16, 0x1e19, 0x1e18, 0x1e1b,
     0x1e1a, 0x1e1d, 0x1e1c, 0x1e1f, 0x1e1e, 0x1e21, 0x1e20, 0x1e23, 0x1e22,
@@ -17068,7 +17156,7 @@ static const gunichar attr_data[][256] = {
     0x1efb, 0x1efa, 0x1efd, 0x1efc, 0x1eff, 0x1efe
   },
   { /* page 31, index 25 */
-     0x1f08, 0x1f09, 0x1f0a, 0x1f0b, 0x1f0c, 0x1f0d, 0x1f0e, 0x1f0f, 0x1f00,
+    0x1f08, 0x1f09, 0x1f0a, 0x1f0b, 0x1f0c, 0x1f0d, 0x1f0e, 0x1f0f, 0x1f00,
     0x1f01, 0x1f02, 0x1f03, 0x1f04, 0x1f05, 0x1f06, 0x1f07, 0x1f18, 0x1f19,
     0x1f1a, 0x1f1b, 0x1f1c, 0x1f1d, 0x0000, 0x0000, 0x1f10, 0x1f11, 0x1f12,
     0x1f13, 0x1f14, 0x1f15, 0x0000, 0x0000, 0x1f28, 0x1f29, 0x1f2a, 0x1f2b,
@@ -17103,7 +17191,7 @@ static const gunichar attr_data[][256] = {
     0x1000415, 0x0000, 0x0000, 0x0000
   },
   { /* page 33, index 26 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -17134,7 +17222,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 44, index 27 */
-     0x2c30, 0x2c31, 0x2c32, 0x2c33, 0x2c34, 0x2c35, 0x2c36, 0x2c37, 0x2c38,
+    0x2c30, 0x2c31, 0x2c32, 0x2c33, 0x2c34, 0x2c35, 0x2c36, 0x2c37, 0x2c38,
     0x2c39, 0x2c3a, 0x2c3b, 0x2c3c, 0x2c3d, 0x2c3e, 0x2c3f, 0x2c40, 0x2c41,
     0x2c42, 0x2c43, 0x2c44, 0x2c45, 0x2c46, 0x2c47, 0x2c48, 0x2c49, 0x2c4a,
     0x2c4b, 0x2c4c, 0x2c4d, 0x2c4e, 0x2c4f, 0x2c50, 0x2c51, 0x2c52, 0x2c53,
@@ -17165,7 +17253,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 45, index 28 */
-     0x10a0, 0x10a1, 0x10a2, 0x10a3, 0x10a4, 0x10a5, 0x10a6, 0x10a7, 0x10a8,
+    0x10a0, 0x10a1, 0x10a2, 0x10a3, 0x10a4, 0x10a5, 0x10a6, 0x10a7, 0x10a8,
     0x10a9, 0x10aa, 0x10ab, 0x10ac, 0x10ad, 0x10ae, 0x10af, 0x10b0, 0x10b1,
     0x10b2, 0x10b3, 0x10b4, 0x10b5, 0x10b6, 0x10b7, 0x10b8, 0x10b9, 0x10ba,
     0x10bb, 0x10bc, 0x10bd, 0x10be, 0x10bf, 0x10c0, 0x10c1, 0x10c2, 0x10c3,
@@ -17196,7 +17284,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 166, index 29 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0002, 0x0003,
@@ -17227,7 +17315,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 167, index 30 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xa723, 0xa722,
@@ -17258,7 +17346,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 168, index 31 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -17289,7 +17377,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 169, index 32 */
-     0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008,
+    0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008,
     0x0009, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -17320,7 +17408,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 170, index 33 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -17351,7 +17439,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 171, index 34 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -17382,7 +17470,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 251, index 35 */
-     0x100000f, 0x1000016, 0x100001d, 0x1000024, 0x100002d, 0x1000036,
+    0x100000f, 0x1000016, 0x100001d, 0x1000024, 0x100002d, 0x1000036,
     0x100003d, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x100004f, 0x100005a, 0x1000065,
     0x1000070, 0x100007b, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -17414,7 +17502,7 @@ static const gunichar attr_data[][256] = {
     0x0000
   },
   { /* page 255, index 36 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001,
     0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xff41, 0xff42, 0xff43,
@@ -17445,7 +17533,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 260, index 37 */
-     0x10428, 0x10429, 0x1042a, 0x1042b, 0x1042c, 0x1042d, 0x1042e, 0x1042f,
+    0x10428, 0x10429, 0x1042a, 0x1042b, 0x1042c, 0x1042d, 0x1042e, 0x1042f,
     0x10430, 0x10431, 0x10432, 0x10433, 0x10434, 0x10435, 0x10436, 0x10437,
     0x10438, 0x10439, 0x1043a, 0x1043b, 0x1043c, 0x1043d, 0x1043e, 0x1043f,
     0x10440, 0x10441, 0x10442, 0x10443, 0x10444, 0x10445, 0x10446, 0x10447,
@@ -17478,7 +17566,7 @@ static const gunichar attr_data[][256] = {
     0x104d2, 0x104d3, 0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 261, index 38 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -17510,7 +17598,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 268, index 39 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -17542,7 +17630,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 269, index 40 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -17573,7 +17661,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 272, index 41 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -17604,7 +17692,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 273, index 42 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -17635,7 +17723,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 274, index 43 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -17666,7 +17754,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 276, index 44 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -17697,7 +17785,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 278, index 45 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -17728,7 +17816,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 279, index 46 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -17759,7 +17847,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 280, index 47 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -17791,7 +17879,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000
   },
   { /* page 281, index 48 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -17822,7 +17910,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 284, index 49 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -17853,7 +17941,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 285, index 50 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -17884,7 +17972,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 287, index 51 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -17915,7 +18003,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 362, index 52 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -17946,7 +18034,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 363, index 53 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -17977,7 +18065,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 366, index 54 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -18009,7 +18097,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000
   },
   { /* page 471, index 55 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -18040,7 +18128,7 @@ static const gunichar attr_data[][256] = {
     0x0006, 0x0007, 0x0008, 0x0009
   },
   { /* page 481, index 56 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -18071,7 +18159,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 482, index 57 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -18102,7 +18190,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 484, index 58 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -18133,7 +18221,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 489, index 59 */
-     0x1e922, 0x1e923, 0x1e924, 0x1e925, 0x1e926, 0x1e927, 0x1e928, 0x1e929,
+    0x1e922, 0x1e923, 0x1e924, 0x1e925, 0x1e926, 0x1e927, 0x1e928, 0x1e929,
     0x1e92a, 0x1e92b, 0x1e92c, 0x1e92d, 0x1e92e, 0x1e92f, 0x1e930, 0x1e931,
     0x1e932, 0x1e933, 0x1e934, 0x1e935, 0x1e936, 0x1e937, 0x1e938, 0x1e939,
     0x1e93a, 0x1e93b, 0x1e93c, 0x1e93d, 0x1e93e, 0x1e93f, 0x1e940, 0x1e941,
@@ -18165,7 +18253,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000
   },
   { /* page 507, index 60 */
-     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -20232,14 +20320,13 @@ static const struct Interval g_unicode_width_table_wide[] = {
 {0x2E80, 0x2E99},
 {0x2E9B, 0x2EF3},
 {0x2F00, 0x2FD5},
-{0x2FF0, 0x2FFB},
-{0x3000, 0x303E},
+{0x2FF0, 0x303E},
 {0x3041, 0x3096},
 {0x3099, 0x30FF},
 {0x3105, 0x312F},
 {0x3131, 0x318E},
 {0x3190, 0x31E3},
-{0x31F0, 0x321E},
+{0x31EF, 0x321E},
 {0x3220, 0x3247},
 {0x3250, 0x4DBF},
 {0x4E00, 0xA48C},
@@ -20319,6 +20406,7 @@ static const struct Interval g_unicode_width_table_wide[] = {
 {0x2B740, 0x2B81D},
 {0x2B820, 0x2CEA1},
 {0x2CEB0, 0x2EBE0},
+{0x2EBF0, 0x2EE5D},
 {0x2F800, 0x2FA1D},
 {0x30000, 0x3134A},
 {0x31350, 0x323AF},
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gunicode.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gunicode.h
index bbe137a5106..6f359e155c4 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gunicode.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gunicode.h
@@ -204,10 +204,15 @@ typedef enum
  * @G_UNICODE_BREAK_EMOJI_BASE: Emoji Base (EB). Since: 2.50
  * @G_UNICODE_BREAK_EMOJI_MODIFIER: Emoji Modifier (EM). Since: 2.50
  * @G_UNICODE_BREAK_ZERO_WIDTH_JOINER: Zero Width Joiner (ZWJ). Since: 2.50
+ * @G_UNICODE_BREAK_AKSARA: Aksara (AK). Since: 2.80
+ * @G_UNICODE_BREAK_AKSARA_PRE_BASE (AP). Since: 2.80
+ * @G_UNICODE_BREAK_AKSARA_START (AS). Since: 2.80
+ * @G_UNICODE_BREAK_VIRAMA_FINAL (VF). Since: 2.80
+ * @G_UNICODE_BREAK_VIRAMA (VI). Since: 2.80
  *
  * These are the possible line break classifications.
  *
- * Since new unicode versions may add new types here, applications should be ready
+ * Since new Unicode versions may add new types here, applications should be ready
  * to handle unknown values. They may be regarded as %G_UNICODE_BREAK_UNKNOWN.
  *
  * See [Unicode Line Breaking Algorithm](https://www.unicode.org/reports/tr14/).
@@ -257,7 +262,12 @@ typedef enum
   G_UNICODE_BREAK_REGIONAL_INDICATOR,
   G_UNICODE_BREAK_EMOJI_BASE,
   G_UNICODE_BREAK_EMOJI_MODIFIER,
-  G_UNICODE_BREAK_ZERO_WIDTH_JOINER
+  G_UNICODE_BREAK_ZERO_WIDTH_JOINER,
+  G_UNICODE_BREAK_AKSARA,
+  G_UNICODE_BREAK_AKSARA_PRE_BASE,
+  G_UNICODE_BREAK_AKSARA_START,
+  G_UNICODE_BREAK_VIRAMA_FINAL,
+  G_UNICODE_BREAK_VIRAMA
 } GUnicodeBreakType;
 
 /**
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gunicollate.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gunicollate.c
index bfeb9fcd834..af55dd8fb00 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gunicollate.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gunicollate.c
@@ -401,6 +401,8 @@ g_utf8_collate_key (const gchar *str,
 
   str_norm = _g_utf8_normalize_wc (str, len, G_NORMALIZE_ALL_COMPOSE);
 
+  g_return_val_if_fail (str_norm != NULL, NULL);
+
   xfrm_len = wcsxfrm (NULL, (wchar_t *)str_norm, 0);
   result_wc = g_new (wchar_t, xfrm_len + 1);
   wcsxfrm (result_wc, (wchar_t *)str_norm, xfrm_len + 1);
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gunicomp.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gunicomp.h
index f2fd759c17a..90fffb30951 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gunicomp.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gunicomp.h
@@ -7,7 +7,7 @@
 
 static const guint16 compose_data[][256] = {
   { /* page 0, index 0 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 149, 150, 151, 0, 0, 1, 2, 3, 4, 5,
     152, 6, 7, 8, 153, 9, 10, 11, 12, 13, 14, 0, 15, 16, 17, 18, 19, 20, 21,
@@ -21,7 +21,7 @@ static const guint16 compose_data[][256] = {
     164, 0, 0, 0, 0, 58, 59, 165, 0, 166, 0, 0, 0, 60, 0, 0, 0
   },
   { /* page 1, index 1 */
-     0, 0, 61, 62, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 63, 64, 0, 0, 0,
+    0, 0, 61, 62, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 63, 64, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 65, 66, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 167, 168, 0,
@@ -35,7 +35,7 @@ static const guint16 compose_data[][256] = {
     0
   },
   { /* page 2, index 2 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 179, 180, 181, 182, 0, 0, 0, 0,
     183, 184, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -48,7 +48,7 @@ static const guint16 compose_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 3, index 3 */
-     378, 379, 380, 381, 382, 0, 383, 384, 385, 386, 387, 388, 389, 0, 0, 390,
+    378, 379, 380, 381, 382, 0, 383, 384, 385, 386, 387, 388, 389, 0, 0, 390,
     0, 391, 0, 392, 393, 0, 0, 0, 0, 0, 0, 394, 0, 0, 0, 0, 0, 0, 0, 395,
     396, 397, 398, 399, 400, 0, 0, 0, 0, 401, 402, 0, 403, 404, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 405, 0, 0, 406, 0, 0, 0, 0, 0, 0, 0,
@@ -62,7 +62,7 @@ static const guint16 compose_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 4, index 4 */
-     0, 0, 0, 0, 0, 0, 190, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 0, 0, 191, 0, 90,
+    0, 0, 0, 0, 0, 0, 190, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 0, 0, 191, 0, 90,
     91, 192, 92, 0, 193, 0, 0, 0, 194, 0, 0, 0, 0, 93, 0, 0, 0, 195, 0, 0, 0,
     196, 0, 197, 0, 0, 94, 0, 0, 198, 0, 95, 96, 199, 97, 0, 200, 0, 0, 0,
     201, 0, 0, 0, 0, 98, 0, 0, 0, 202, 0, 0, 0, 203, 0, 204, 0, 0, 0, 0, 0,
@@ -76,7 +76,7 @@ static const guint16 compose_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 6, index 5 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 99, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     212, 0, 213, 0, 0, 0, 0, 0, 0, 0, 0, 409, 410, 411, 0, 0, 0, 0, 0, 0, 0,
@@ -89,7 +89,7 @@ static const guint16 compose_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 9, index 6 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 217, 0, 0, 0, 0, 0, 0, 0,
     218, 0, 0, 219, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -102,7 +102,7 @@ static const guint16 compose_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 11, index 7 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 414, 0, 0, 0, 0, 0, 0, 0, 0,
     101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 415, 416, 0, 0, 0, 0, 0,
@@ -115,7 +115,7 @@ static const guint16 compose_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 12, index 8 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 222, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -128,7 +128,7 @@ static const guint16 compose_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 13, index 9 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 422, 0, 0, 0, 0, 0, 0, 0, 104,
     225, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 423, 0, 0, 0, 0, 0, 0,
@@ -141,7 +141,7 @@ static const guint16 compose_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 16, index 10 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 227, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -154,7 +154,7 @@ static const guint16 compose_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 27, index 11 */
-     0, 0, 0, 0, 0, 228, 0, 229, 0, 230, 0, 231, 0, 232, 0, 0, 0, 233, 0, 0,
+    0, 0, 0, 0, 0, 228, 0, 229, 0, 230, 0, 231, 0, 232, 0, 0, 0, 233, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 234, 0, 235, 0, 236, 237, 0, 0,
     238, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -167,7 +167,7 @@ static const guint16 compose_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 30, index 12 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 239, 240, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 241, 242, 0, 0,
@@ -180,7 +180,7 @@ static const guint16 compose_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 31, index 13 */
-     108, 109, 249, 250, 251, 252, 253, 254, 110, 111, 255, 256, 257, 258,
+    108, 109, 249, 250, 251, 252, 253, 254, 110, 111, 255, 256, 257, 258,
     259, 260, 112, 113, 0, 0, 0, 0, 0, 0, 114, 115, 0, 0, 0, 0, 0, 0, 116,
     117, 261, 262, 263, 264, 265, 266, 118, 119, 267, 268, 269, 270, 271,
     272, 120, 121, 0, 0, 0, 0, 0, 0, 122, 123, 0, 0, 0, 0, 0, 0, 124, 125, 0,
@@ -195,7 +195,7 @@ static const guint16 compose_data[][256] = {
     0, 0, 0, 290, 0, 0, 0, 0, 0, 0, 0, 136, 0
   },
   { /* page 33, index 14 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -208,7 +208,7 @@ static const guint16 compose_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 34, index 15 */
-     0, 0, 0, 297, 0, 0, 0, 0, 298, 0, 0, 299, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 297, 0, 0, 0, 0, 298, 0, 0, 299, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 300, 0, 301, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 302, 0, 0, 0, 0, 0, 0, 303,
     0, 304, 0, 0, 305, 0, 0, 0, 0, 306, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -222,7 +222,7 @@ static const guint16 compose_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 48, index 16 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 332, 0,
     0, 0, 0, 333, 0, 334, 0, 335, 0, 336, 0, 337, 0, 338, 0, 339, 0, 340, 0,
@@ -236,7 +236,7 @@ static const guint16 compose_data[][256] = {
     0, 0, 365, 366, 367, 368, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 369, 0, 0
   },
   { /* page 272, index 17 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -249,7 +249,7 @@ static const guint16 compose_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 273, index 18 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 373, 374, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -262,7 +262,7 @@ static const guint16 compose_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 275, index 19 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 427, 0, 0, 0, 0, 0, 0, 0, 0,
     147, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 428, 0, 0, 0, 0, 0, 0,
@@ -275,7 +275,7 @@ static const guint16 compose_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 276, index 20 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -288,7 +288,7 @@ static const guint16 compose_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 277, index 21 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -301,7 +301,7 @@ static const guint16 compose_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 281, index 22 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 377, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gunidecomp.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gunidecomp.c
index 39709f75a56..3449aff15df 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gunidecomp.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gunidecomp.c
@@ -19,43 +19,6 @@
  * along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-/**
- * SECTION:unicode
- * @Title: Unicode Manipulation
- * @Short_description: functions operating on Unicode characters and
- *     UTF-8 strings
- * @See_also: g_locale_to_utf8(), g_locale_from_utf8()
- *
- * This section describes a number of functions for dealing with
- * Unicode characters and strings. There are analogues of the
- * traditional `ctype.h` character classification and case conversion
- * functions, UTF-8 analogues of some string utility functions,
- * functions to perform normalization, case conversion and collation
- * on UTF-8 strings and finally functions to convert between the UTF-8,
- * UTF-16 and UCS-4 encodings of Unicode.
- *
- * The implementations of the Unicode functions in GLib are based
- * on the Unicode Character Data tables, which are available from
- * [www.unicode.org](http://www.unicode.org/).
- *
- *  * Unicode 4.0 was added in GLib 2.8
- *  * Unicode 4.1 was added in GLib 2.10
- *  * Unicode 5.0 was added in GLib 2.12
- *  * Unicode 5.1 was added in GLib 2.16.3
- *  * Unicode 6.0 was added in GLib 2.30
- *  * Unicode 6.1 was added in GLib 2.32
- *  * Unicode 6.2 was added in GLib 2.36
- *  * Unicode 6.3 was added in GLib 2.40
- *  * Unicode 7.0 was added in GLib 2.42
- *  * Unicode 8.0 was added in GLib 2.48
- *  * Unicode 9.0 was added in GLib 2.50.1
- *  * Unicode 10.0 was added in GLib 2.54
- *  * Unicode 11.10 was added in GLib 2.58
- *  * Unicode 12.0 was added in GLib 2.62
- *  * Unicode 12.1 was added in GLib 2.62
- *  * Unicode 13.0 was added in GLib 2.66
- */
-
 #include "config.h"
 
 #include <stdlib.h>
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gunidecomp.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gunidecomp.h
index fdec1fd460f..d80247a8a8b 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gunidecomp.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gunidecomp.h
@@ -15,7 +15,7 @@
 
 static const guchar cclass_data[][256] = {
   { /* page 3, index 0 */
-     230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230,
+    230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230,
     230, 230, 230, 230, 230, 230, 230, 232, 220, 220, 220, 220, 232, 216,
     220, 220, 220, 220, 220, 202, 202, 220, 220, 220, 220, 202, 202, 220,
     220, 220, 220, 220, 220, 220, 220, 220, 220, 220, 1, 1, 1, 1, 1, 220,
@@ -31,7 +31,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 4, index 1 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -44,7 +44,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 5, index 2 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -58,7 +58,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 6, index 3 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 230, 230, 230, 230, 230,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 230, 230, 230, 230, 230,
     230, 230, 230, 30, 31, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 27, 28, 29, 30, 31, 32, 33, 34, 230, 230, 220,
@@ -72,7 +72,7 @@ static const guchar cclass_data[][256] = {
     230, 220, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 7, index 4 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     230, 220, 230, 230, 220, 230, 230, 220, 220, 220, 230, 220, 220, 230,
     220, 230, 230, 230, 220, 230, 220, 230, 220, 230, 220, 230, 230, 0, 0, 0,
@@ -86,7 +86,7 @@ static const guchar cclass_data[][256] = {
     220, 230, 0, 0, 0, 0, 0, 0, 0, 0, 0, 220, 0, 0
   },
   { /* page 8, index 5 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 230,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 230,
     230, 230, 230, 0, 230, 230, 230, 230, 230, 230, 230, 230, 230, 0, 230,
     230, 230, 0, 230, 230, 230, 230, 230, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -101,7 +101,7 @@ static const guchar cclass_data[][256] = {
     29, 230, 230, 230, 220, 230, 230, 220, 220, 230, 230, 230, 230, 230
   },
   { /* page 9, index 6 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 9, 0, 0, 0, 230, 220, 230, 230, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -114,7 +114,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 230, 0
   },
   { /* page 10, index 7 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -127,7 +127,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 11, index 8 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -140,7 +140,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 12, index 9 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 84, 91, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -153,7 +153,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 13, index 10 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -166,7 +166,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 14, index 11 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 103, 103, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 107, 107, 107, 107, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -179,7 +179,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 15, index 12 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     220, 220, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 220, 0, 220, 0, 216, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -193,7 +193,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0
   },
   { /* page 16, index 13 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 7, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -206,7 +206,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 19, index 14 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 230, 230,
@@ -219,7 +219,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 23, index 15 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -232,7 +232,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 24, index 16 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -245,7 +245,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 25, index 17 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 222, 230, 220, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -258,7 +258,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 26, index 18 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 230,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 230,
     220, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -272,7 +272,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 27, index 19 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -285,7 +285,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 28, index 20 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -299,7 +299,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0
   },
   { /* page 29, index 21 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -314,7 +314,7 @@ static const guchar cclass_data[][256] = {
     228, 220, 218, 230, 233, 220, 230, 220
   },
   { /* page 32, index 22 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -328,7 +328,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0
   },
   { /* page 44, index 23 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -341,7 +341,7 @@ static const guchar cclass_data[][256] = {
     230, 230, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 45, index 24 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -355,7 +355,7 @@ static const guchar cclass_data[][256] = {
     230, 230, 230, 230, 230, 230, 230, 230
   },
   { /* page 48, index 25 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 218, 228, 232, 222,
     224, 224, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -368,7 +368,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 166, index 26 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -382,7 +382,7 @@ static const guchar cclass_data[][256] = {
     0
   },
   { /* page 168, index 27 */
-     0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -396,7 +396,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0
   },
   { /* page 169, index 28 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 220, 220, 220,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -409,7 +409,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 170, index 29 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -422,7 +422,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 171, index 30 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -435,7 +435,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 251, index 31 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -448,7 +448,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 254, index 32 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 230, 230, 230, 230, 230, 230, 230, 220, 220, 220,
     220, 220, 220, 220, 230, 230, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -462,7 +462,7 @@ static const guchar cclass_data[][256] = {
     0, 0
   },
   { /* page 257, index 33 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -475,7 +475,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 220, 0, 0
   },
   { /* page 258, index 34 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -488,7 +488,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 259, index 35 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -501,7 +501,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 266, index 36 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 220, 0, 230, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 220, 0, 230, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 230, 1, 220, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -514,7 +514,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 269, index 37 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 230, 230, 230, 230, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -527,7 +527,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 270, index 38 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -540,7 +540,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 220, 220, 220
   },
   { /* page 271, index 39 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 220,
     220, 230, 230, 230, 220, 230, 220, 220, 220, 220, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -554,7 +554,7 @@ static const guchar cclass_data[][256] = {
     0
   },
   { /* page 272, index 40 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -567,7 +567,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 273, index 41 */
-     230, 230, 230, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    230, 230, 230, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -580,7 +580,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 274, index 42 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 9, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -593,7 +593,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 275, index 43 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -606,7 +606,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 276, index 44 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 7, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 230, 0,
@@ -619,7 +619,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 277, index 45 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -632,7 +632,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 278, index 46 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -645,7 +645,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 279, index 47 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -658,7 +658,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 280, index 48 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -671,7 +671,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 281, index 49 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0, 0, 7, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -684,7 +684,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 282, index 50 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -697,7 +697,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 284, index 51 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -710,7 +710,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 285, index 52 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 9, 9, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -723,7 +723,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 287, index 53 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -736,7 +736,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 362, index 54 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -749,7 +749,7 @@ static const guchar cclass_data[][256] = {
     1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 363, index 55 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     230, 230, 230, 230, 230, 230, 230, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -762,7 +762,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 367, index 56 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -775,7 +775,7 @@ static const guchar cclass_data[][256] = {
     6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 444, index 57 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -788,7 +788,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 465, index 58 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -802,7 +802,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 466, index 59 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 230, 230, 230, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -815,7 +815,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 480, index 60 */
-     230, 230, 230, 230, 230, 230, 230, 0, 230, 230, 230, 230, 230, 230, 230,
+    230, 230, 230, 230, 230, 230, 230, 0, 230, 230, 230, 230, 230, 230, 230,
     230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 0, 0, 230, 230, 230,
     230, 230, 230, 230, 0, 230, 230, 0, 230, 230, 230, 230, 230, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -829,7 +829,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 481, index 61 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     230, 230, 230, 230, 230, 230, 230, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -842,7 +842,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 482, index 62 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -855,7 +855,7 @@ static const guchar cclass_data[][256] = {
     230, 230, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 484, index 63 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -868,7 +868,7 @@ static const guchar cclass_data[][256] = {
     220, 230, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 488, index 64 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -881,7 +881,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
   { /* page 489, index 65 */
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 230, 230,
     230, 230, 230, 230, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/guri.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/guri.c
index 58725503dc0..592b7627d98 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/guri.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/guri.c
@@ -29,23 +29,74 @@
 #include "guriprivate.h"
 
 /**
- * SECTION:guri
- * @short_description: URI-handling utilities
- * @include: glib.h
+ * GUri:
  *
- * The #GUri type and related functions can be used to parse URIs into
+ * The `GUri` type and related functions can be used to parse URIs into
  * their components, and build valid URIs from individual components.
  *
- * Note that #GUri scope is to help manipulate URIs in various applications,
+ * Since `GUri` only represents absolute URIs, all `GUri`s will have a
+ * URI scheme, so [method@GLib.Uri.get_scheme] will always return a non-`NULL`
+ * answer. Likewise, by definition, all URIs have a path component, so
+ * [method@GLib.Uri.get_path] will always return a non-`NULL` string (which may
+ * be empty).
+ *
+ * If the URI string has an
+ * [‘authority’ component](https://tools.ietf.org/html/rfc3986#section-3) (that
+ * is, if the scheme is followed by `://` rather than just `:`), then the
+ * `GUri` will contain a hostname, and possibly a port and ‘userinfo’.
+ * Additionally, depending on how the `GUri` was constructed/parsed (for example,
+ * using the `G_URI_FLAGS_HAS_PASSWORD` and `G_URI_FLAGS_HAS_AUTH_PARAMS` flags),
+ * the userinfo may be split out into a username, password, and
+ * additional authorization-related parameters.
+ *
+ * Normally, the components of a `GUri` will have all `%`-encoded
+ * characters decoded. However, if you construct/parse a `GUri` with
+ * `G_URI_FLAGS_ENCODED`, then the `%`-encoding will be preserved instead in
+ * the userinfo, path, and query fields (and in the host field if also
+ * created with `G_URI_FLAGS_NON_DNS`). In particular, this is necessary if
+ * the URI may contain binary data or non-UTF-8 text, or if decoding
+ * the components might change the interpretation of the URI.
+ *
+ * For example, with the encoded flag:
+ *
+ * ```c
+ * g_autoptr(GUri) uri = g_uri_parse ("http://host/path?query=http%3A%2F%2Fhost%2Fpath%3Fparam%3Dvalue", G_URI_FLAGS_ENCODED, &err);
+ * g_assert_cmpstr (g_uri_get_query (uri), ==, "query=http%3A%2F%2Fhost%2Fpath%3Fparam%3Dvalue");
+ * ```
+ *
+ * While the default `%`-decoding behaviour would give:
+ *
+ * ```c
+ * g_autoptr(GUri) uri = g_uri_parse ("http://host/path?query=http%3A%2F%2Fhost%2Fpath%3Fparam%3Dvalue", G_URI_FLAGS_NONE, &err);
+ * g_assert_cmpstr (g_uri_get_query (uri), ==, "query=http://host/path?param=value");
+ * ```
+ *
+ * During decoding, if an invalid UTF-8 string is encountered, parsing will fail
+ * with an error indicating the bad string location:
+ *
+ * ```c
+ * g_autoptr(GUri) uri = g_uri_parse ("http://host/path?query=http%3A%2F%2Fhost%2Fpath%3Fbad%3D%00alue", G_URI_FLAGS_NONE, &err);
+ * g_assert_error (err, G_URI_ERROR, G_URI_ERROR_BAD_QUERY);
+ * ```
+ *
+ * You should pass `G_URI_FLAGS_ENCODED` or `G_URI_FLAGS_ENCODED_QUERY` if you
+ * need to handle that case manually. In particular, if the query string
+ * contains `=` characters that are `%`-encoded, you should let
+ * [func@GLib.Uri.parse_params] do the decoding once of the query.
+ *
+ * `GUri` is immutable once constructed, and can safely be accessed from
+ * multiple threads. Its reference counting is atomic.
+ *
+ * Note that the scope of `GUri` is to help manipulate URIs in various applications,
  * following [RFC 3986](https://tools.ietf.org/html/rfc3986). In particular,
- * it doesn't intend to cover web browser needs, and doesn't implement the
+ * it doesn't intend to cover web browser needs, and doesn’t implement the
  * [WHATWG URL](https://url.spec.whatwg.org/) standard. No APIs are provided to
  * help prevent
  * [homograph attacks](https://en.wikipedia.org/wiki/IDN_homograph_attack), so
- * #GUri is not suitable for formatting URIs for display to the user for making
+ * `GUri` is not suitable for formatting URIs for display to the user for making
  * security-sensitive decisions.
  *
- * ## Relative and absolute URIs # {#relative-absolute-uris}
+ * ## Relative and absolute URIs
  *
  * As defined in [RFC 3986](https://tools.ietf.org/html/rfc3986#section-4), the
  * hierarchical nature of URIs means that they can either be ‘relative
@@ -65,145 +116,85 @@
  *
  * Absolute URIs have a scheme specified. Any other components of the URI which
  * are missing are specified as explicitly unset in the URI, rather than being
- * resolved relative to a base URI using g_uri_parse_relative().
+ * resolved relative to a base URI using [method@GLib.Uri.parse_relative].
  *
  * For example, a valid absolute URI is `file:///home/bob` or
  * `https://search.com?query=string`.
  *
- * A #GUri instance is always an absolute URI. A string may be an absolute URI
+ * A `GUri` instance is always an absolute URI. A string may be an absolute URI
  * or a relative reference; see the documentation for individual functions as to
  * what forms they accept.
  *
  * ## Parsing URIs
  *
- * The most minimalist APIs for parsing URIs are g_uri_split() and
- * g_uri_split_with_user(). These split a URI into its component
+ * The most minimalist APIs for parsing URIs are [func@GLib.Uri.split] and
+ * [func@GLib.Uri.split_with_user]. These split a URI into its component
  * parts, and return the parts; the difference between the two is that
- * g_uri_split() treats the ‘userinfo’ component of the URI as a
- * single element, while g_uri_split_with_user() can (depending on the
- * #GUriFlags you pass) treat it as containing a username, password,
- * and authentication parameters. Alternatively, g_uri_split_network()
+ * [func@GLib.Uri.split] treats the ‘userinfo’ component of the URI as a
+ * single element, while [func@GLib.Uri.split_with_user] can (depending on the
+ * [flags@GLib.UriFlags] you pass) treat it as containing a username, password,
+ * and authentication parameters. Alternatively, [func@GLib.Uri.split_network]
  * can be used when you are only interested in the components that are
  * needed to initiate a network connection to the service (scheme,
  * host, and port).
  *
- * g_uri_parse() is similar to g_uri_split(), but instead of returning
- * individual strings, it returns a #GUri structure (and it requires
+ * [func@GLib.Uri.parse] is similar to [func@GLib.Uri.split], but instead of
+ * returning individual strings, it returns a `GUri` structure (and it requires
  * that the URI be an absolute URI).
  *
- * g_uri_resolve_relative() and g_uri_parse_relative() allow you to
- * resolve a relative URI relative to a base URI.
- * g_uri_resolve_relative() takes two strings and returns a string,
- * and g_uri_parse_relative() takes a #GUri and a string and returns a
- * #GUri.
+ * [func@GLib.Uri.resolve_relative] and [method@GLib.Uri.parse_relative] allow
+ * you to resolve a relative URI relative to a base URI.
+ * [func@GLib.Uri.resolve_relative] takes two strings and returns a string,
+ * and [method@GLib.Uri.parse_relative] takes a `GUri` and a string and returns a
+ * `GUri`.
  *
- * All of the parsing functions take a #GUriFlags argument describing
+ * All of the parsing functions take a [flags@GLib.UriFlags] argument describing
  * exactly how to parse the URI; see the documentation for that type
  * for more details on the specific flags that you can pass. If you
  * need to choose different flags based on the type of URI, you can
- * use g_uri_peek_scheme() on the URI string to check the scheme
+ * use [func@GLib.Uri.peek_scheme] on the URI string to check the scheme
  * first, and use that to decide what flags to parse it with.
  *
- * For example, you might want to use %G_URI_PARAMS_WWW_FORM when parsing the
- * params for a web URI, so compare the result of g_uri_peek_scheme() against
- * `http` and `https`.
+ * For example, you might want to use `G_URI_PARAMS_WWW_FORM` when parsing the
+ * params for a web URI, so compare the result of [func@GLib.Uri.peek_scheme]
+ * against `http` and `https`.
  *
  * ## Building URIs
  *
- * g_uri_join() and g_uri_join_with_user() can be used to construct
+ * [func@GLib.Uri.join] and [func@GLib.Uri.join_with_user] can be used to construct
  * valid URI strings from a set of component strings. They are the
- * inverse of g_uri_split() and g_uri_split_with_user().
+ * inverse of [func@GLib.Uri.split] and [func@GLib.Uri.split_with_user].
  *
- * Similarly, g_uri_build() and g_uri_build_with_user() can be used to
- * construct a #GUri from a set of component strings.
+ * Similarly, [func@GLib.Uri.build] and [func@GLib.Uri.build_with_user] can be
+ * used to construct a `GUri` from a set of component strings.
  *
  * As with the parsing functions, the building functions take a
- * #GUriFlags argument. In particular, it is important to keep in mind
+ * [flags@GLib.UriFlags] argument. In particular, it is important to keep in mind
  * whether the URI components you are using are already `%`-encoded. If so,
- * you must pass the %G_URI_FLAGS_ENCODED flag.
+ * you must pass the `G_URI_FLAGS_ENCODED` flag.
  *
  * ## `file://` URIs
  *
  * Note that Windows and Unix both define special rules for parsing
  * `file://` URIs (involving non-UTF-8 character sets on Unix, and the
- * interpretation of path separators on Windows). #GUri does not
- * implement these rules. Use g_filename_from_uri() and
- * g_filename_to_uri() if you want to properly convert between
+ * interpretation of path separators on Windows). `GUri` does not
+ * implement these rules. Use [func@GLib.filename_from_uri] and
+ * [func@GLib.filename_to_uri] if you want to properly convert between
  * `file://` URIs and local filenames.
  *
  * ## URI Equality
  *
  * Note that there is no `g_uri_equal ()` function, because comparing
- * URIs usefully requires scheme-specific knowledge that #GUri does
- * not have. #GUri can help with normalization if you use the various
- * encoded #GUriFlags as well as %G_URI_FLAGS_SCHEME_NORMALIZE however
- * it is not comprehensive.
+ * URIs usefully requires scheme-specific knowledge that `GUri` does
+ * not have. `GUri` can help with normalization if you use the various
+ * encoded [flags@GLib.UriFlags] as well as `G_URI_FLAGS_SCHEME_NORMALIZE`
+ * however it is not comprehensive.
  * For example, `data:,foo` and `data:;base64,Zm9v` resolve to the same
  * thing according to the `data:` URI specification which GLib does not
  * handle.
  *
  * Since: 2.66
  */
-
-/**
- * GUri:
- *
- * A parsed absolute URI.
- *
- * Since #GUri only represents absolute URIs, all #GUris will have a
- * URI scheme, so g_uri_get_scheme() will always return a non-%NULL
- * answer. Likewise, by definition, all URIs have a path component, so
- * g_uri_get_path() will always return a non-%NULL string (which may be empty).
- *
- * If the URI string has an
- * [‘authority’ component](https://tools.ietf.org/html/rfc3986#section-3) (that
- * is, if the scheme is followed by `://` rather than just `:`), then the
- * #GUri will contain a hostname, and possibly a port and ‘userinfo’.
- * Additionally, depending on how the #GUri was constructed/parsed (for example,
- * using the %G_URI_FLAGS_HAS_PASSWORD and %G_URI_FLAGS_HAS_AUTH_PARAMS flags),
- * the userinfo may be split out into a username, password, and
- * additional authorization-related parameters.
- *
- * Normally, the components of a #GUri will have all `%`-encoded
- * characters decoded. However, if you construct/parse a #GUri with
- * %G_URI_FLAGS_ENCODED, then the `%`-encoding will be preserved instead in
- * the userinfo, path, and query fields (and in the host field if also
- * created with %G_URI_FLAGS_NON_DNS). In particular, this is necessary if
- * the URI may contain binary data or non-UTF-8 text, or if decoding
- * the components might change the interpretation of the URI.
- *
- * For example, with the encoded flag:
- *
- * |[<!-- language="C" -->
- *   g_autoptr(GUri) uri = g_uri_parse ("http://host/path?query=http%3A%2F%2Fhost%2Fpath%3Fparam%3Dvalue", G_URI_FLAGS_ENCODED, &err);
- *   g_assert_cmpstr (g_uri_get_query (uri), ==, "query=http%3A%2F%2Fhost%2Fpath%3Fparam%3Dvalue");
- * ]|
- *
- * While the default `%`-decoding behaviour would give:
- *
- * |[<!-- language="C" -->
- *   g_autoptr(GUri) uri = g_uri_parse ("http://host/path?query=http%3A%2F%2Fhost%2Fpath%3Fparam%3Dvalue", G_URI_FLAGS_NONE, &err);
- *   g_assert_cmpstr (g_uri_get_query (uri), ==, "query=http://host/path?param=value");
- * ]|
- *
- * During decoding, if an invalid UTF-8 string is encountered, parsing will fail
- * with an error indicating the bad string location:
- *
- * |[<!-- language="C" -->
- *   g_autoptr(GUri) uri = g_uri_parse ("http://host/path?query=http%3A%2F%2Fhost%2Fpath%3Fbad%3D%00alue", G_URI_FLAGS_NONE, &err);
- *   g_assert_error (err, G_URI_ERROR, G_URI_ERROR_BAD_QUERY);
- * ]|
- *
- * You should pass %G_URI_FLAGS_ENCODED or %G_URI_FLAGS_ENCODED_QUERY if you
- * need to handle that case manually. In particular, if the query string
- * contains `=` characters that are `%`-encoded, you should let
- * g_uri_parse_params() do the decoding once of the query.
- *
- * #GUri is immutable once constructed, and can safely be accessed from
- * multiple threads. Its reference counting is atomic.
- *
- * Since: 2.66
- */
 struct _GUri {
   gchar     *scheme;
   gchar     *userinfo;
@@ -1072,7 +1063,7 @@ g_uri_split_internal (const gchar  *uri_string,
  * @error: #GError for error reporting, or %NULL to ignore.
  *
  * Parses @uri_ref (which can be an
- * [absolute or relative URI][relative-absolute-uris]) according to @flags, and
+ * [absolute or relative URI](#relative-and-absolute-uris)) according to @flags, and
  * returns the pieces. Any component that doesn't appear in @uri_ref will be
  * returned as %NULL (but note that all URIs always have a path component,
  * though it may be the empty string).
@@ -1139,7 +1130,7 @@ g_uri_split (const gchar  *uri_ref,
  * @error: #GError for error reporting, or %NULL to ignore.
  *
  * Parses @uri_ref (which can be an
- * [absolute or relative URI][relative-absolute-uris]) according to @flags, and
+ * [absolute or relative URI](#relative-and-absolute-uris)) according to @flags, and
  * returns the pieces. Any component that doesn't appear in @uri_ref will be
  * returned as %NULL (but note that all URIs always have a path component,
  * though it may be the empty string).
@@ -1191,7 +1182,7 @@ g_uri_split_with_user (const gchar  *uri_ref,
  *    port, or `-1`
  * @error: #GError for error reporting, or %NULL to ignore.
  *
- * Parses @uri_string (which must be an [absolute URI][relative-absolute-uris])
+ * Parses @uri_string (which must be an [absolute URI](#relative-and-absolute-uris))
  * according to @flags, and returns the pieces relevant to connecting to a host.
  * See the documentation for g_uri_split() for more details; this is
  * mostly a wrapper around that function with simpler arguments.
@@ -1260,7 +1251,7 @@ g_uri_split_network (const gchar  *uri_string,
  * @error: #GError for error reporting, or %NULL to ignore.
  *
  * Parses @uri_string according to @flags, to determine whether it is a valid
- * [absolute URI][relative-absolute-uris], i.e. it does not need to be resolved
+ * [absolute URI](#relative-and-absolute-uris), i.e. it does not need to be resolved
  * relative to another URI using g_uri_parse_relative().
  *
  * If it’s not a valid URI, an error is returned explaining how it’s invalid.
@@ -1398,7 +1389,7 @@ remove_dot_segments (gchar *path)
  * @error: #GError for error reporting, or %NULL to ignore.
  *
  * Parses @uri_string according to @flags. If the result is not a
- * valid [absolute URI][relative-absolute-uris], it will be discarded, and an
+ * valid [absolute URI](#relative-and-absolute-uris), it will be discarded, and an
  * error returned.
  *
  * Return value: (transfer full): a new #GUri, or NULL on error.
@@ -1424,7 +1415,7 @@ g_uri_parse (const gchar  *uri_string,
  * @error: #GError for error reporting, or %NULL to ignore.
  *
  * Parses @uri_ref according to @flags and, if it is a
- * [relative URI][relative-absolute-uris], resolves it relative to @base_uri.
+ * [relative URI](#relative-and-absolute-uris), resolves it relative to @base_uri.
  * If the result is not a valid absolute URI, it will be discarded, and an error
  * returned.
  *
@@ -1555,7 +1546,7 @@ g_uri_parse_relative (GUri         *base_uri,
  * @error: #GError for error reporting, or %NULL to ignore.
  *
  * Parses @uri_ref according to @flags and, if it is a
- * [relative URI][relative-absolute-uris], resolves it relative to
+ * [relative URI](#relative-and-absolute-uris), resolves it relative to
  * @base_uri_string. If the result is not a valid absolute URI, it will be
  * discarded, and an error returned.
  *
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gutils.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gutils.c
index 3c46db8d180..1bb47848a09 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gutils.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gutils.c
@@ -79,14 +79,6 @@
 #endif
 
 
-/**
- * SECTION:misc_utils
- * @title: Miscellaneous Utility Functions
- * @short_description: a selection of portable utility functions
- *
- * These are portable utility functions.
- */
-
 #ifdef G_PLATFORM_WIN32
 #  include <windows.h>
 #  ifndef GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS
@@ -671,7 +663,7 @@ g_get_user_database_entry (void)
 {
   static UserDatabaseEntry *entry;
 
-  if (g_once_init_enter (&entry))
+  if (g_once_init_enter_pointer (&entry))
     {
       static UserDatabaseEntry e;
 
@@ -680,12 +672,12 @@ g_get_user_database_entry (void)
         struct passwd *pw = NULL;
         gpointer buffer = NULL;
         gint error;
-        gchar *logname;
+        const char *logname;
 
 #  if defined (HAVE_GETPWUID_R)
         struct passwd pwd;
 #    ifdef _SC_GETPW_R_SIZE_MAX
-        /* This reurns the maximum length */
+        /* This returns the maximum length */
         glong bufsize = sysconf (_SC_GETPW_R_SIZE_MAX);
 
         if (bufsize < 0)
@@ -694,7 +686,7 @@ g_get_user_database_entry (void)
         glong bufsize = 64;
 #    endif /* _SC_GETPW_R_SIZE_MAX */
 
-        logname = (gchar *) g_getenv ("LOGNAME");
+        logname = g_getenv ("LOGNAME");
 
         do
           {
@@ -795,7 +787,7 @@ g_get_user_database_entry (void)
       if (!e.real_name)
         e.real_name = g_strdup ("Unknown");
 
-      g_once_init_leave (&entry, &e);
+      g_once_init_leave_pointer (&entry, &e);
     }
 
   return entry;
@@ -1073,7 +1065,7 @@ g_get_host_name (void)
 {
   static gchar *hostname;
 
-  if (g_once_init_enter (&hostname))
+  if (g_once_init_enter_pointer (&hostname))
     {
       gboolean failed;
       gchar *utmp = NULL;
@@ -1130,13 +1122,12 @@ g_get_host_name (void)
         failed = TRUE;
 #endif
 
-      g_once_init_leave (&hostname, failed ? g_strdup ("localhost") : utmp);
+      g_once_init_leave_pointer (&hostname, failed ? g_strdup ("localhost") : utmp);
     }
 
   return hostname;
 }
 
-G_LOCK_DEFINE_STATIC (g_prgname);
 static const gchar *g_prgname = NULL; /* always a quark */
 
 /**
@@ -1158,13 +1149,7 @@ static const gchar *g_prgname = NULL; /* always a quark */
 const gchar*
 g_get_prgname (void)
 {
-  const gchar* retval;
-
-  G_LOCK (g_prgname);
-  retval = g_prgname;
-  G_UNLOCK (g_prgname);
-
-  return retval;
+  return g_atomic_pointer_get (&g_prgname);
 }
 
 /**
@@ -1187,13 +1172,29 @@ g_get_prgname (void)
 void
 g_set_prgname (const gchar *prgname)
 {
-  GQuark qprgname = g_quark_from_string (prgname);
-  G_LOCK (g_prgname);
-  g_prgname = g_quark_to_string (qprgname);
-  G_UNLOCK (g_prgname);
+  prgname = g_intern_string (prgname);
+  g_atomic_pointer_set (&g_prgname, prgname);
+}
+
+/**
+ * g_set_prgname_once:
+ * @prgname: the name of the program.
+ *
+ * If g_get_prgname() is not set, this is the same as setting
+ * the name via g_set_prgname() and %TRUE is returned. Otherwise,
+ * does nothing and returns %FALSE. This is thread-safe.
+ *
+ * Returns: whether g_prgname was initialized by the call.
+ */
+gboolean
+g_set_prgname_once (const gchar *prgname)
+{
+  /* if @prgname is NULL, then this has the same effect as calling
+   * (g_get_prgname()==NULL). */
+  prgname = g_intern_string (prgname);
+  return g_atomic_pointer_compare_and_exchange (&g_prgname, NULL, prgname);
 }
 
-G_LOCK_DEFINE_STATIC (g_application_name);
 static gchar *g_application_name = NULL;
 
 /**
@@ -1215,16 +1216,14 @@ static gchar *g_application_name = NULL;
 const gchar *
 g_get_application_name (void)
 {
-  gchar* retval;
+  const char *retval;
 
-  G_LOCK (g_application_name);
-  retval = g_application_name;
-  G_UNLOCK (g_application_name);
+  retval = g_atomic_pointer_get (&g_application_name);
 
-  if (retval == NULL)
-    return g_get_prgname ();
+  if (retval)
+    return retval;
 
-  return retval;
+  return g_get_prgname ();
 }
 
 /**
@@ -1248,17 +1247,17 @@ g_get_application_name (void)
 void
 g_set_application_name (const gchar *application_name)
 {
-  gboolean already_set = FALSE;
+  char *name;
 
-  G_LOCK (g_application_name);
-  if (g_application_name)
-    already_set = TRUE;
-  else
-    g_application_name = g_strdup (application_name);
-  G_UNLOCK (g_application_name);
+  g_return_if_fail (application_name);
+
+  name = g_strdup (application_name);
 
-  if (already_set)
-    g_warning ("g_set_application_name() called multiple times");
+  if (!g_atomic_pointer_compare_and_exchange (&g_application_name, NULL, name))
+    {
+      g_warning ("g_set_application_name() called multiple times");
+      g_free (name);
+    }
 }
 
 #ifdef G_OS_WIN32
@@ -1884,6 +1883,7 @@ g_build_user_data_dir (void)
   if (!data_dir || !data_dir[0])
     {
       gchar *home_dir = g_build_home_dir ();
+      g_free (data_dir);
       data_dir = g_build_filename (home_dir, ".local", "share", NULL);
       g_free (home_dir);
     }
@@ -3005,32 +3005,32 @@ g_format_size_full (guint64          size,
       { EXBIBYTE_FACTOR, N_("EiB") }
     },
     {
-      /* Translators: A unit symbol for size formatting, showing for example: "13.0 kb" */
-      { KILOBYTE_FACTOR, N_("kb") },
-      /* Translators: A unit symbol for size formatting, showing for example: "13.0 Mb" */
-      { MEGABYTE_FACTOR, N_("Mb") },
-      /* Translators: A unit symbol for size formatting, showing for example: "13.0 Gb" */
-      { GIGABYTE_FACTOR, N_("Gb") },
-      /* Translators: A unit symbol for size formatting, showing for example: "13.0 Tb" */
-      { TERABYTE_FACTOR, N_("Tb") },
-      /* Translators: A unit symbol for size formatting, showing for example: "13.0 Pb" */
-      { PETABYTE_FACTOR, N_("Pb") },
-      /* Translators: A unit symbol for size formatting, showing for example: "13.0 Eb" */
-      { EXABYTE_FACTOR,  N_("Eb") }
+      /* Translators: A unit symbol for size formatting, showing for example: "13.0 kbit" */
+      { KILOBYTE_FACTOR, N_("kbit") },
+      /* Translators: A unit symbol for size formatting, showing for example: "13.0 Mbit" */
+      { MEGABYTE_FACTOR, N_("Mbit") },
+      /* Translators: A unit symbol for size formatting, showing for example: "13.0 Gbit" */
+      { GIGABYTE_FACTOR, N_("Gbit") },
+      /* Translators: A unit symbol for size formatting, showing for example: "13.0 Tbit" */
+      { TERABYTE_FACTOR, N_("Tbit") },
+      /* Translators: A unit symbol for size formatting, showing for example: "13.0 Pbit" */
+      { PETABYTE_FACTOR, N_("Pbit") },
+      /* Translators: A unit symbol for size formatting, showing for example: "13.0 Ebit" */
+      { EXABYTE_FACTOR,  N_("Ebit") }
     },
     {
-      /* Translators: A unit symbol for size formatting, showing for example: "13.0 Kib" */
-      { KIBIBYTE_FACTOR, N_("Kib") },
-      /* Translators: A unit symbol for size formatting, showing for example: "13.0 Mib" */
-      { MEBIBYTE_FACTOR, N_("Mib") },
-      /* Translators: A unit symbol for size formatting, showing for example: "13.0 Gib" */
-      { GIBIBYTE_FACTOR, N_("Gib") },
-      /* Translators: A unit symbol for size formatting, showing for example: "13.0 Tib" */
-      { TEBIBYTE_FACTOR, N_("Tib") },
-      /* Translators: A unit symbol for size formatting, showing for example: "13.0 Pib" */
-      { PEBIBYTE_FACTOR, N_("Pib") },
-      /* Translators: A unit symbol for size formatting, showing for example: "13.0 Eib" */
-      { EXBIBYTE_FACTOR, N_("Eib") }
+      /* Translators: A unit symbol for size formatting, showing for example: "13.0 Kibit" */
+      { KIBIBYTE_FACTOR, N_("Kibit") },
+      /* Translators: A unit symbol for size formatting, showing for example: "13.0 Mibit" */
+      { MEBIBYTE_FACTOR, N_("Mibit") },
+      /* Translators: A unit symbol for size formatting, showing for example: "13.0 Gibit" */
+      { GIBIBYTE_FACTOR, N_("Gibit") },
+      /* Translators: A unit symbol for size formatting, showing for example: "13.0 Tibit" */
+      { TEBIBYTE_FACTOR, N_("Tibit") },
+      /* Translators: A unit symbol for size formatting, showing for example: "13.0 Pibit" */
+      { PEBIBYTE_FACTOR, N_("Pibit") },
+      /* Translators: A unit symbol for size formatting, showing for example: "13.0 Eibit" */
+      { EXBIBYTE_FACTOR, N_("Eibit") }
     }
   };
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gutilsprivate.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gutilsprivate.h
index f79a4df4c8b..eebf79b1d82 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gutilsprivate.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gutilsprivate.h
@@ -59,6 +59,8 @@ void _g_unset_cached_tmp_dir (void);
 
 gboolean _g_localtime (time_t timet, struct tm *tm);
 
+gboolean g_set_prgname_once (const gchar *prgname);
+
 G_END_DECLS
 
 #endif /* __G_UTILS_PRIVATE_H__ */
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gvariant-core.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gvariant-core.c
index e8f8847928f..5d21e926a26 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gvariant-core.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gvariant-core.c
@@ -49,14 +49,6 @@
  * Most GVariant API functions are in gvariant.c.
  */
 
-/**
- * GVariant:
- *
- * #GVariant is an opaque data structure and can only be accessed
- * using the following functions.
- *
- * Since: 2.24
- **/
 struct _GVariant
 /* see below for field member documentation */
 {
@@ -643,8 +635,14 @@ g_variant_new_from_bytes (const GVariantType *type,
 
       /* posix_memalign() requires the alignment to be a multiple of
        * sizeof(void*), and a power of 2. See g_variant_type_info_query() for
-       * details on the alignment format. */
-      if (posix_memalign (&aligned_data, MAX (sizeof (void *), alignment + 1),
+       * details on the alignment format.
+       *
+       * While calling posix_memalign() with aligned_size==0 is safe on glibc,
+       * POSIX specifies that the behaviour is implementation-defined, so avoid
+       * that and leave aligned_data==NULL in that case.
+       * See https://pubs.opengroup.org/onlinepubs/9699919799/functions/posix_memalign.html */
+      if (aligned_size != 0 &&
+          posix_memalign (&aligned_data, MAX (sizeof (void *), alignment + 1),
                           aligned_size) != 0)
         g_error ("posix_memalign failed");
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gvariant-parser.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gvariant-parser.c
index 44aac1cde90..fffc4a9d1ec 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gvariant-parser.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gvariant-parser.c
@@ -2476,7 +2476,7 @@ parse (TokenStream  *stream,
  *
  * A single #GVariant is parsed from the content of @text.
  *
- * The format is described [here][gvariant-text].
+ * The format is described [here](gvariant-text-format.html).
  *
  * The memory at @limit will never be accessed and the parser behaves as
  * if the character at @limit is the nul terminator.  This has the
@@ -2496,13 +2496,14 @@ parse (TokenStream  *stream,
  *
  * In the event that the parsing is successful, the resulting #GVariant
  * is returned. It is never floating, and must be freed with
- * g_variant_unref().
+ * [method@GLib.Variant.unref].
  *
  * In case of any error, %NULL will be returned.  If @error is non-%NULL
  * then it will be set to reflect the error that occurred.
  *
- * Officially, the language understood by the parser is "any string
- * produced by g_variant_print()".
+ * Officially, the language understood by the parser is “any string
+ * produced by [method@GLib.Variant.print]”. This explicitly includes
+ * `g_variant_print()`’s annotated types like `int64 -1000`.
  *
  * There may be implementation specific restrictions on deeply nested values,
  * which would result in a %G_VARIANT_PARSE_ERROR_RECURSION error. #GVariant is
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gvariant-serialiser.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gvariant-serialiser.c
index 8685fee9420..8297868c711 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gvariant-serialiser.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gvariant-serialiser.c
@@ -762,7 +762,8 @@ gvs_variable_sized_array_get_child (GVariantSerialised value,
    * Don’t bother checking if the highest known-good offset is lower than the
    * highest checked offset, as that means there’s an invalid element at that
    * index, so there’s no need to check further. */
-  if (index_ > value.checked_offsets_up_to &&
+  if (offsets.array != NULL &&
+      index_ > value.checked_offsets_up_to &&
       value.ordered_offsets_up_to == value.checked_offsets_up_to)
     {
       switch (offsets.offset_size)
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gvariant.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gvariant.c
index 4509d2a75d7..0913deead0d 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gvariant.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gvariant.c
@@ -36,115 +36,114 @@
 #include <string.h>
 
 /**
- * SECTION:gvariant
- * @title: GVariant
- * @short_description: strongly typed value datatype
- * @see_also: GVariantType
+ * GVariant:
  *
- * #GVariant is a variant datatype; it can contain one or more values
+ * `GVariant` is a variant datatype; it can contain one or more values
  * along with information about the type of the values.
  *
- * A #GVariant may contain simple types, like an integer, or a boolean value;
+ * A `GVariant` may contain simple types, like an integer, or a boolean value;
  * or complex types, like an array of two strings, or a dictionary of key
- * value pairs. A #GVariant is also immutable: once it's been created neither
+ * value pairs. A `GVariant` is also immutable: once it’s been created neither
  * its type nor its content can be modified further.
  *
- * GVariant is useful whenever data needs to be serialized, for example when
- * sending method parameters in D-Bus, or when saving settings using GSettings.
+ * `GVariant` is useful whenever data needs to be serialized, for example when
+ * sending method parameters in D-Bus, or when saving settings using
+ * [`GSettings`](../gio/class.Settings.html).
  *
- * When creating a new #GVariant, you pass the data you want to store in it
+ * When creating a new `GVariant`, you pass the data you want to store in it
  * along with a string representing the type of data you wish to pass to it.
  *
- * For instance, if you want to create a #GVariant holding an integer value you
+ * For instance, if you want to create a `GVariant` holding an integer value you
  * can use:
  *
- * |[<!-- language="C" -->
- *   GVariant *v = g_variant_new ("u", 40);
- * ]|
+ * ```c
+ * GVariant *v = g_variant_new ("u", 40);
+ * ```
  *
- * The string "u" in the first argument tells #GVariant that the data passed to
- * the constructor (40) is going to be an unsigned integer.
+ * The string `u` in the first argument tells `GVariant` that the data passed to
+ * the constructor (`40`) is going to be an unsigned integer.
  *
- * More advanced examples of #GVariant in use can be found in documentation for
- * [GVariant format strings][gvariant-format-strings-pointers].
+ * More advanced examples of `GVariant` in use can be found in documentation for
+ * [`GVariant` format strings](gvariant-format-strings.html#pointers).
  *
  * The range of possible values is determined by the type.
  *
- * The type system used by #GVariant is #GVariantType.
+ * The type system used by `GVariant` is [type@GLib.VariantType].
  *
- * #GVariant instances always have a type and a value (which are given
- * at construction time).  The type and value of a #GVariant instance
- * can never change other than by the #GVariant itself being
- * destroyed.  A #GVariant cannot contain a pointer.
+ * `GVariant` instances always have a type and a value (which are given
+ * at construction time).  The type and value of a `GVariant` instance
+ * can never change other than by the `GVariant` itself being
+ * destroyed.  A `GVariant` cannot contain a pointer.
  *
- * #GVariant is reference counted using g_variant_ref() and
- * g_variant_unref().  #GVariant also has floating reference counts --
- * see g_variant_ref_sink().
+ * `GVariant` is reference counted using [method@GLib.Variant.ref] and
+ * [method@GLib.Variant.unref].  `GVariant` also has floating reference counts —
+ * see [method@GLib.Variant.ref_sink].
  *
- * #GVariant is completely threadsafe.  A #GVariant instance can be
+ * `GVariant` is completely threadsafe.  A `GVariant` instance can be
  * concurrently accessed in any way from any number of threads without
  * problems.
  *
- * #GVariant is heavily optimised for dealing with data in serialized
+ * `GVariant` is heavily optimised for dealing with data in serialized
  * form.  It works particularly well with data located in memory-mapped
  * files.  It can perform nearly all deserialization operations in a
  * small constant time, usually touching only a single memory page.
- * Serialized #GVariant data can also be sent over the network.
+ * Serialized `GVariant` data can also be sent over the network.
  *
- * #GVariant is largely compatible with D-Bus.  Almost all types of
- * #GVariant instances can be sent over D-Bus.  See #GVariantType for
- * exceptions.  (However, #GVariant's serialization format is not the same
- * as the serialization format of a D-Bus message body: use #GDBusMessage,
- * in the gio library, for those.)
+ * `GVariant` is largely compatible with D-Bus.  Almost all types of
+ * `GVariant` instances can be sent over D-Bus.  See [type@GLib.VariantType] for
+ * exceptions.  (However, `GVariant`’s serialization format is not the same
+ * as the serialization format of a D-Bus message body: use
+ * [GDBusMessage](../gio/class.DBusMessage.html), in the GIO library, for those.)
  *
- * For space-efficiency, the #GVariant serialization format does not
- * automatically include the variant's length, type or endianness,
+ * For space-efficiency, the `GVariant` serialization format does not
+ * automatically include the variant’s length, type or endianness,
  * which must either be implied from context (such as knowledge that a
  * particular file format always contains a little-endian
- * %G_VARIANT_TYPE_VARIANT which occupies the whole length of the file)
+ * `G_VARIANT_TYPE_VARIANT` which occupies the whole length of the file)
  * or supplied out-of-band (for instance, a length, type and/or endianness
  * indicator could be placed at the beginning of a file, network message
  * or network stream).
  *
- * A #GVariant's size is limited mainly by any lower level operating
- * system constraints, such as the number of bits in #gsize.  For
+ * A `GVariant`’s size is limited mainly by any lower level operating
+ * system constraints, such as the number of bits in `gsize`.  For
  * example, it is reasonable to have a 2GB file mapped into memory
- * with #GMappedFile, and call g_variant_new_from_data() on it.
+ * with [struct@GLib.MappedFile], and call [ctor@GLib.Variant.new_from_data] on
+ * it.
  *
- * For convenience to C programmers, #GVariant features powerful
+ * For convenience to C programmers, `GVariant` features powerful
  * varargs-based value construction and destruction.  This feature is
  * designed to be embedded in other libraries.
  *
- * There is a Python-inspired text language for describing #GVariant
- * values.  #GVariant includes a printer for this language and a parser
+ * There is a Python-inspired text language for describing `GVariant`
+ * values.  `GVariant` includes a printer for this language and a parser
  * with type inferencing.
  *
  * ## Memory Use
  *
- * #GVariant tries to be quite efficient with respect to memory use.
+ * `GVariant` tries to be quite efficient with respect to memory use.
  * This section gives a rough idea of how much memory is used by the
  * current implementation.  The information here is subject to change
  * in the future.
  *
- * The memory allocated by #GVariant can be grouped into 4 broad
+ * The memory allocated by `GVariant` can be grouped into 4 broad
  * purposes: memory for serialized data, memory for the type
  * information cache, buffer management memory and memory for the
- * #GVariant structure itself.
+ * `GVariant` structure itself.
  *
  * ## Serialized Data Memory
  *
- * This is the memory that is used for storing GVariant data in
+ * This is the memory that is used for storing `GVariant` data in
  * serialized form.  This is what would be sent over the network or
  * what would end up on disk, not counting any indicator of the
  * endianness, or of the length or type of the top-level variant.
  *
  * The amount of memory required to store a boolean is 1 byte. 16,
  * 32 and 64 bit integers and double precision floating point numbers
- * use their "natural" size.  Strings (including object path and
+ * use their ‘natural’ size.  Strings (including object path and
  * signature strings) are stored with a nul terminator, and as such
  * use the length of the string plus 1 byte.
  *
- * Maybe types use no space at all to represent the null value and
+ * ‘Maybe’ types use no space at all to represent the null value and
  * use the same amount of space (sometimes plus one byte) as the
  * equivalent non-maybe-typed value to represent the non-null case.
  *
@@ -170,39 +169,39 @@
  * In the case that the dictionary is empty, 0 bytes are required for
  * the serialization.
  *
- * If we add an item "width" that maps to the int32 value of 500 then
- * we will use 4 byte to store the int32 (so 6 for the variant
+ * If we add an item ‘width’ that maps to the int32 value of 500 then
+ * we will use 4 bytes to store the int32 (so 6 for the variant
  * containing it) and 6 bytes for the string.  The variant must be
- * aligned to 8 after the 6 bytes of the string, so that's 2 extra
+ * aligned to 8 after the 6 bytes of the string, so that’s 2 extra
  * bytes.  6 (string) + 2 (padding) + 6 (variant) is 14 bytes used
  * for the dictionary entry.  An additional 1 byte is added to the
  * array as a framing offset making a total of 15 bytes.
  *
- * If we add another entry, "title" that maps to a nullable string
+ * If we add another entry, ‘title’ that maps to a nullable string
  * that happens to have a value of null, then we use 0 bytes for the
  * null value (and 3 bytes for the variant to contain it along with
  * its type string) plus 6 bytes for the string.  Again, we need 2
  * padding bytes.  That makes a total of 6 + 2 + 3 = 11 bytes.
  *
  * We now require extra padding between the two items in the array.
- * After the 14 bytes of the first item, that's 2 bytes required.
+ * After the 14 bytes of the first item, that’s 2 bytes required.
  * We now require 2 framing offsets for an extra two
  * bytes. 14 + 2 + 11 + 2 = 29 bytes to encode the entire two-item
  * dictionary.
  *
  * ## Type Information Cache
  *
- * For each GVariant type that currently exists in the program a type
+ * For each `GVariant` type that currently exists in the program a type
  * information structure is kept in the type information cache.  The
  * type information structure is required for rapid deserialization.
  *
- * Continuing with the above example, if a #GVariant exists with the
- * type "a{sv}" then a type information struct will exist for
- * "a{sv}", "{sv}", "s", and "v".  Multiple uses of the same type
+ * Continuing with the above example, if a `GVariant` exists with the
+ * type `a{sv}` then a type information struct will exist for
+ * `a{sv}`, `{sv}`, `s`, and `v`.  Multiple uses of the same type
  * will share the same type information.  Additionally, all
  * single-digit types are stored in read-only static memory and do
  * not contribute to the writable memory footprint of a program using
- * #GVariant.
+ * `GVariant`.
  *
  * Aside from the type information structures stored in read-only
  * memory, there are two forms of type information.  One is used for
@@ -210,23 +209,23 @@
  * maybe types.  The other is used for container types where there
  * are multiple element types: tuples and dictionary entries.
  *
- * Array type info structures are 6 * sizeof (void *), plus the
+ * Array type info structures are `6 * sizeof (void *)`, plus the
  * memory required to store the type string itself.  This means that
- * on 32-bit systems, the cache entry for "a{sv}" would require 30
- * bytes of memory (plus malloc overhead).
+ * on 32-bit systems, the cache entry for `a{sv}` would require 30
+ * bytes of memory (plus allocation overhead).
  *
- * Tuple type info structures are 6 * sizeof (void *), plus 4 *
- * sizeof (void *) for each item in the tuple, plus the memory
+ * Tuple type info structures are `6 * sizeof (void *)`, plus `4 *
+ * sizeof (void *)` for each item in the tuple, plus the memory
  * required to store the type string itself.  A 2-item tuple, for
  * example, would have a type information structure that consumed
- * writable memory in the size of 14 * sizeof (void *) (plus type
+ * writable memory in the size of `14 * sizeof (void *)` (plus type
  * string)  This means that on 32-bit systems, the cache entry for
- * "{sv}" would require 61 bytes of memory (plus malloc overhead).
+ * `{sv}` would require 61 bytes of memory (plus allocation overhead).
  *
- * This means that in total, for our "a{sv}" example, 91 bytes of
+ * This means that in total, for our `a{sv}` example, 91 bytes of
  * type information would be allocated.
  *
- * The type information cache, additionally, uses a #GHashTable to
+ * The type information cache, additionally, uses a [struct@GLib.HashTable] to
  * store and look up the cached items and stores a pointer to this
  * hash table in static storage.  The hash table is freed when there
  * are zero items in the type cache.
@@ -238,34 +237,34 @@
  *
  * ## Buffer Management Memory
  *
- * #GVariant uses an internal buffer management structure to deal
+ * `GVariant` uses an internal buffer management structure to deal
  * with the various different possible sources of serialized data
  * that it uses.  The buffer is responsible for ensuring that the
  * correct call is made when the data is no longer in use by
- * #GVariant.  This may involve a g_free() or a g_slice_free() or
- * even g_mapped_file_unref().
+ * `GVariant`.  This may involve a [func@GLib.free] or
+ * even [method@GLib.MappedFile.unref].
  *
  * One buffer management structure is used for each chunk of
  * serialized data.  The size of the buffer management structure
- * is 4 * (void *).  On 32-bit systems, that's 16 bytes.
+ * is `4 * (void *)`.  On 32-bit systems, that’s 16 bytes.
  *
  * ## GVariant structure
  *
- * The size of a #GVariant structure is 6 * (void *).  On 32-bit
- * systems, that's 24 bytes.
+ * The size of a `GVariant` structure is `6 * (void *)`.  On 32-bit
+ * systems, that’s 24 bytes.
  *
- * #GVariant structures only exist if they are explicitly created
- * with API calls.  For example, if a #GVariant is constructed out of
+ * `GVariant` structures only exist if they are explicitly created
+ * with API calls.  For example, if a `GVariant` is constructed out of
  * serialized data for the example given above (with the dictionary)
  * then although there are 9 individual values that comprise the
  * entire dictionary (two keys, two values, two variants containing
  * the values, two dictionary entries, plus the dictionary itself),
- * only 1 #GVariant instance exists -- the one referring to the
+ * only 1 `GVariant` instance exists — the one referring to the
  * dictionary.
  *
  * If calls are made to start accessing the other values then
- * #GVariant instances will exist for those values only for as long
- * as they are in use (ie: until you call g_variant_unref()).  The
+ * `GVariant` instances will exist for those values only for as long
+ * as they are in use (ie: until you call [method@GLib.Variant.unref]).  The
  * type information is shared.  The serialized data and the buffer
  * management structure for that serialized data is shared by the
  * child.
@@ -276,13 +275,15 @@
  * strings to variants (with two entries, as given above), we are
  * using 91 bytes of memory for type information, 29 bytes of memory
  * for the serialized data, 16 bytes for buffer management and 24
- * bytes for the #GVariant instance, or a total of 160 bytes, plus
- * malloc overhead.  If we were to use g_variant_get_child_value() to
- * access the two dictionary entries, we would use an additional 48
+ * bytes for the `GVariant` instance, or a total of 160 bytes, plus
+ * allocation overhead.  If we were to use [method@GLib.Variant.get_child_value]
+ * to access the two dictionary entries, we would use an additional 48
  * bytes.  If we were to have other dictionaries of the same type, we
  * would use more memory for the serialized data and buffer
  * management for those dictionaries, but the type information would
  * be shared.
+ *
+ * Since: 2.24
  */
 
 /* definition of GVariant structure is in gvariant-core.c */
@@ -964,7 +965,7 @@ g_variant_new_dict_entry (GVariant *key,
  * @format_string determines the C types that are used for unpacking
  * the values and also determines if the values are copied or borrowed,
  * see the section on
- * [GVariant format strings][gvariant-format-strings-pointers].
+ * [`GVariant` format strings](gvariant-format-strings.html#pointers).
  *
  * This function is currently implemented with a linear scan.  If you
  * plan to do many lookups then #GVariantDict may be more efficient.
@@ -3995,7 +3996,11 @@ g_variant_dict_new (GVariant *from_asv)
 {
   GVariantDict *dict;
 
-  dict = g_slice_alloc (sizeof (struct heap_dict));
+  /* We actually want to treat the allocation as a `struct heap_dict`, but the
+   * compiler will warn if it’s not at least as big as `struct GVariantDict`. */
+  G_STATIC_ASSERT (sizeof (GVariantDict) >= sizeof (struct heap_dict));
+
+  dict = g_malloc (sizeof (GVariantDict));
   g_variant_dict_init (dict, from_asv);
   GVHD(dict)->magic = GVHD_MAGIC;
   GVHD(dict)->ref_count = 1;
@@ -4063,7 +4068,7 @@ g_variant_dict_init (GVariantDict *dict,
  *
  * @format_string determines the C types that are used for unpacking the
  * values and also determines if the values are copied or borrowed, see the
- * section on [GVariant format strings][gvariant-format-strings-pointers].
+ * section on [`GVariant` format strings](gvariant-format-strings.html#pointers).
  *
  * Returns: %TRUE if a value was unpacked
  *
@@ -4348,7 +4353,7 @@ g_variant_dict_unref (GVariantDict *dict)
   if (--GVHD(dict)->ref_count == 0)
     {
       g_variant_dict_clear (dict);
-      g_slice_free (struct heap_dict, (struct heap_dict *) dict);
+      g_free_sized (dict, sizeof (GVariantDict));
     }
 }
 
@@ -5523,7 +5528,7 @@ g_variant_new_va (const gchar  *format_string,
  * @format_string determines the C types that are used for unpacking
  * the values and also determines if the values are copied or borrowed,
  * see the section on
- * [GVariant format strings][gvariant-format-strings-pointers].
+ * [`GVariant` format strings](gvariant-format-strings.html#pointers).
  *
  * Since: 2.24
  **/
@@ -5577,7 +5582,7 @@ g_variant_get (GVariant    *value,
  * @format_string determines the C types that are used for unpacking
  * the values and also determines if the values are copied or borrowed,
  * see the section on
- * [GVariant format strings][gvariant-format-strings-pointers].
+ * [`GVariant` format strings](gvariant-format-strings.html#pointers).
  *
  * Since: 2.24
  **/
@@ -5672,7 +5677,7 @@ g_variant_builder_add (GVariantBuilder *builder,
  * @format_string determines the C types that are used for unpacking
  * the values and also determines if the values are copied or borrowed,
  * see the section on
- * [GVariant format strings][gvariant-format-strings-pointers].
+ * [`GVariant` format strings](gvariant-format-strings.html#pointers).
  *
  * Since: 2.24
  **/
@@ -5745,7 +5750,7 @@ g_variant_get_child (GVariant    *value,
  * the values and also determines if the values are copied or borrowed.
  *
  * See the section on
- * [GVariant format strings][gvariant-format-strings-pointers].
+ * [`GVariant` format strings](gvariant-format-strings.html#pointers).
  *
  * Returns: %TRUE if a value was unpacked, or %FALSE if there as no value
  *
@@ -5844,7 +5849,7 @@ g_variant_iter_next (GVariantIter *iter,
  * the values and also determines if the values are copied or borrowed.
  *
  * See the section on
- * [GVariant format strings][gvariant-format-strings-pointers].
+ * [`GVariant` format strings](gvariant-format-strings.html#pointers).
  *
  * Returns: %TRUE if a value was unpacked, or %FALSE if there was no
  *          value
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gvarianttype.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gvarianttype.c
index 4b0e150dc65..8f58fa1e4dd 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gvarianttype.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gvarianttype.c
@@ -32,158 +32,161 @@
 
 
 /**
- * SECTION:gvarianttype
- * @title: GVariantType
- * @short_description: introduction to the GVariant type system
- * @see_also: #GVariantType, #GVariant
+ * GVariantType:
  *
- * This section introduces the GVariant type system. It is based, in
+ * A type in the [type@GLib.Variant] type system.
+ *
+ * This section introduces the [type@GLib.Variant] type system. It is based, in
  * large part, on the D-Bus type system, with two major changes and
  * some minor lifting of restrictions. The
  * [D-Bus specification](http://dbus.freedesktop.org/doc/dbus-specification.html),
  * therefore, provides a significant amount of
- * information that is useful when working with GVariant.
+ * information that is useful when working with [type@GLib.Variant].
  *
  * The first major change with respect to the D-Bus type system is the
- * introduction of maybe (or "nullable") types.  Any type in GVariant can be
- * converted to a maybe type, in which case, "nothing" (or "null") becomes a
- * valid value.  Maybe types have been added by introducing the
- * character "m" to type strings.
+ * introduction of maybe (or ‘nullable’) types.  Any type in [type@GLib.Variant]
+ * can be converted to a maybe type, in which case, `nothing` (or `null`)
+ * becomes a valid value.  Maybe types have been added by introducing the
+ * character `m` to type strings.
  *
- * The second major change is that the GVariant type system supports the
- * concept of "indefinite types" -- types that are less specific than
+ * The second major change is that the [type@GLib.Variant] type system supports
+ * the concept of ‘indefinite types’ — types that are less specific than
  * the normal types found in D-Bus.  For example, it is possible to speak
- * of "an array of any type" in GVariant, where the D-Bus type system
- * would require you to speak of "an array of integers" or "an array of
- * strings".  Indefinite types have been added by introducing the
- * characters "*", "?" and "r" to type strings.
+ * of ‘an array of any type’ in [type@GLib.Variant], where the D-Bus type system
+ * would require you to speak of ‘an array of integers’ or ‘an array of
+ * strings’.  Indefinite types have been added by introducing the
+ * characters `*`, `?` and `r` to type strings.
  *
  * Finally, all arbitrary restrictions relating to the complexity of
  * types are lifted along with the restriction that dictionary entries
  * may only appear nested inside of arrays.
  *
- * Just as in D-Bus, GVariant types are described with strings ("type
- * strings").  Subject to the differences mentioned above, these strings
+ * Just as in D-Bus, [type@GLib.Variant] types are described with strings (‘type
+ * strings’).  Subject to the differences mentioned above, these strings
  * are of the same form as those found in D-Bus.  Note, however: D-Bus
  * always works in terms of messages and therefore individual type
- * strings appear nowhere in its interface.  Instead, "signatures"
+ * strings appear nowhere in its interface.  Instead, ‘signatures’
  * are a concatenation of the strings of the type of each argument in a
- * message.  GVariant deals with single values directly so GVariant type
- * strings always describe the type of exactly one value.  This means
- * that a D-Bus signature string is generally not a valid GVariant type
- * string -- except in the case that it is the signature of a message
- * containing exactly one argument.
+ * message.  [type@GLib.Variant] deals with single values directly so
+ * [type@GLib.Variant] type strings always describe the type of exactly one
+ * value.  This means that a D-Bus signature string is generally not a valid
+ * [type@GLib.Variant] type string — except in the case that it is the signature
+ * of a message containing exactly one argument.
  *
  * An indefinite type is similar in spirit to what may be called an
  * abstract type in other type systems.  No value can exist that has an
  * indefinite type as its type, but values can exist that have types
  * that are subtypes of indefinite types.  That is to say,
- * g_variant_get_type() will never return an indefinite type, but
- * calling g_variant_is_of_type() with an indefinite type may return
- * %TRUE.  For example, you cannot have a value that represents "an
- * array of no particular type", but you can have an "array of integers"
- * which certainly matches the type of "an array of no particular type",
- * since "array of integers" is a subtype of "array of no particular
- * type".
+ * [method@GLib.Variant.get_type] will never return an indefinite type, but
+ * calling [method@GLib.Variant.is_of_type] with an indefinite type may return
+ * true.  For example, you cannot have a value that represents ‘an
+ * array of no particular type’, but you can have an ‘array of integers’
+ * which certainly matches the type of ‘an array of no particular type’,
+ * since ‘array of integers’ is a subtype of ‘array of no particular
+ * type’.
  *
  * This is similar to how instances of abstract classes may not
  * directly exist in other type systems, but instances of their
  * non-abstract subtypes may.  For example, in GTK, no object that has
- * the type of #GtkBin can exist (since #GtkBin is an abstract class),
- * but a #GtkWindow can certainly be instantiated, and you would say
- * that the #GtkWindow is a #GtkBin (since #GtkWindow is a subclass of
- * #GtkBin).
+ * the type of [`GtkWidget`](https://docs.gtk.org/gtk4/class.Widget.html) can
+ * exist (since `GtkWidget` is an abstract class), but a [`GtkWindow`](https://docs.gtk.org/gtk4/class.Window.html)
+ * can certainly be instantiated, and you would say that a `GtkWindow` is a
+ * `GtkWidget` (since `GtkWindow` is a subclass of `GtkWidget`).
+ *
+ * Two types may not be compared by value; use [method@GLib.VariantType.equal]
+ * or [method@GLib.VariantType.is_subtype_of]  May be copied using
+ * [method@GLib.VariantType.copy] and freed using [method@GLib.VariantType.free].
  *
  * ## GVariant Type Strings
  *
- * A GVariant type string can be any of the following:
+ * A [type@GLib.Variant] type string can be any of the following:
  *
  * - any basic type string (listed below)
- *
- * - "v", "r" or "*"
- *
- * - one of the characters 'a' or 'm', followed by another type string
- *
- * - the character '(', followed by a concatenation of zero or more other
- *   type strings, followed by the character ')'
- *
- * - the character '{', followed by a basic type string (see below),
- *   followed by another type string, followed by the character '}'
+ * - `v`, `r` or `*`
+ * - one of the characters `a` or `m`, followed by another type string
+ * - the character `(`, followed by a concatenation of zero or more other
+ *   type strings, followed by the character `)`
+ * - the character `{`, followed by a basic type string (see below),
+ *   followed by another type string, followed by the character `}`
  *
  * A basic type string describes a basic type (as per
- * g_variant_type_is_basic()) and is always a single character in length.
- * The valid basic type strings are "b", "y", "n", "q", "i", "u", "x", "t",
- * "h", "d", "s", "o", "g" and "?".
- *
- * The above definition is recursive to arbitrary depth. "aaaaai" and
- * "(ui(nq((y)))s)" are both valid type strings, as is
- * "a(aa(ui)(qna{ya(yd)}))". In order to not hit memory limits, #GVariant
- * imposes a limit on recursion depth of 65 nested containers. This is the
- * limit in the D-Bus specification (64) plus one to allow a #GDBusMessage to
- * be nested in a top-level tuple.
+ * [method@GLib.VariantType.is_basic]) and is always a single character in
+ * length. The valid basic type strings are `b`, `y`, `n`, `q`, `i`, `u`, `x`,
+ * `t`, `h`, `d`, `s`, `o`, `g` and `?`.
+ *
+ * The above definition is recursive to arbitrary depth. `aaaaai` and
+ * `(ui(nq((y)))s)` are both valid type strings, as is
+ * `a(aa(ui)(qna{ya(yd)}))`. In order to not hit memory limits,
+ * [type@GLib.Variant] imposes a limit on recursion depth of 65 nested
+ * containers. This is the limit in the D-Bus specification (64) plus one to
+ * allow a [`GDBusMessage`](../gio/class.DBusMessage.html) to be nested in
+ * a top-level tuple.
  *
  * The meaning of each of the characters is as follows:
- * - `b`: the type string of %G_VARIANT_TYPE_BOOLEAN; a boolean value.
- * - `y`: the type string of %G_VARIANT_TYPE_BYTE; a byte.
- * - `n`: the type string of %G_VARIANT_TYPE_INT16; a signed 16 bit integer.
- * - `q`: the type string of %G_VARIANT_TYPE_UINT16; an unsigned 16 bit integer.
- * - `i`: the type string of %G_VARIANT_TYPE_INT32; a signed 32 bit integer.
- * - `u`: the type string of %G_VARIANT_TYPE_UINT32; an unsigned 32 bit integer.
- * - `x`: the type string of %G_VARIANT_TYPE_INT64; a signed 64 bit integer.
- * - `t`: the type string of %G_VARIANT_TYPE_UINT64; an unsigned 64 bit integer.
- * - `h`: the type string of %G_VARIANT_TYPE_HANDLE; a signed 32 bit value
+ *
+ * - `b`: the type string of `G_VARIANT_TYPE_BOOLEAN`; a boolean value.
+ * - `y`: the type string of `G_VARIANT_TYPE_BYTE`; a byte.
+ * - `n`: the type string of `G_VARIANT_TYPE_INT16`; a signed 16 bit integer.
+ * - `q`: the type string of `G_VARIANT_TYPE_UINT16`; an unsigned 16 bit integer.
+ * - `i`: the type string of `G_VARIANT_TYPE_INT32`; a signed 32 bit integer.
+ * - `u`: the type string of `G_VARIANT_TYPE_UINT32`; an unsigned 32 bit integer.
+ * - `x`: the type string of `G_VARIANT_TYPE_INT64`; a signed 64 bit integer.
+ * - `t`: the type string of `G_VARIANT_TYPE_UINT64`; an unsigned 64 bit integer.
+ * - `h`: the type string of `G_VARIANT_TYPE_HANDLE`; a signed 32 bit value
  *   that, by convention, is used as an index into an array of file
  *   descriptors that are sent alongside a D-Bus message.
- * - `d`: the type string of %G_VARIANT_TYPE_DOUBLE; a double precision
+ * - `d`: the type string of `G_VARIANT_TYPE_DOUBLE`; a double precision
  *   floating point value.
- * - `s`: the type string of %G_VARIANT_TYPE_STRING; a string.
- * - `o`: the type string of %G_VARIANT_TYPE_OBJECT_PATH; a string in the form
+ * - `s`: the type string of `G_VARIANT_TYPE_STRING`; a string.
+ * - `o`: the type string of `G_VARIANT_TYPE_OBJECT_PATH`; a string in the form
  *   of a D-Bus object path.
- * - `g`: the type string of %G_VARIANT_TYPE_SIGNATURE; a string in the form of
+ * - `g`: the type string of `G_VARIANT_TYPE_SIGNATURE`; a string in the form of
  *   a D-Bus type signature.
- * - `?`: the type string of %G_VARIANT_TYPE_BASIC; an indefinite type that
+ * - `?`: the type string of `G_VARIANT_TYPE_BASIC`; an indefinite type that
  *   is a supertype of any of the basic types.
- * - `v`: the type string of %G_VARIANT_TYPE_VARIANT; a container type that
+ * - `v`: the type string of `G_VARIANT_TYPE_VARIANT`; a container type that
  *   contain any other type of value.
  * - `a`: used as a prefix on another type string to mean an array of that
- *   type; the type string "ai", for example, is the type of an array of
+ *   type; the type string `ai`, for example, is the type of an array of
  *   signed 32-bit integers.
- * - `m`: used as a prefix on another type string to mean a "maybe", or
- *   "nullable", version of that type; the type string "ms", for example,
+ * - `m`: used as a prefix on another type string to mean a ‘maybe’, or
+ *   ‘nullable’, version of that type; the type string `ms`, for example,
  *   is the type of a value that maybe contains a string, or maybe contains
  *   nothing.
  * - `()`: used to enclose zero or more other concatenated type strings to
- *   create a tuple type; the type string "(is)", for example, is the type of
+ *   create a tuple type; the type string `(is)`, for example, is the type of
  *   a pair of an integer and a string.
- * - `r`: the type string of %G_VARIANT_TYPE_TUPLE; an indefinite type that is
+ * - `r`: the type string of `G_VARIANT_TYPE_TUPLE`; an indefinite type that is
  *   a supertype of any tuple type, regardless of the number of items.
  * - `{}`: used to enclose a basic type string concatenated with another type
  *   string to create a dictionary entry type, which usually appears inside of
- *   an array to form a dictionary; the type string "a{sd}", for example, is
+ *   an array to form a dictionary; the type string `a{sd}`, for example, is
  *   the type of a dictionary that maps strings to double precision floating
  *   point values.
  *
  *   The first type (the basic type) is the key type and the second type is
  *   the value type. The reason that the first type is restricted to being a
  *   basic type is so that it can easily be hashed.
- * - `*`: the type string of %G_VARIANT_TYPE_ANY; the indefinite type that is
+ * - `*`: the type string of `G_VARIANT_TYPE_ANY`; the indefinite type that is
  *   a supertype of all types.  Note that, as with all type strings, this
  *   character represents exactly one type. It cannot be used inside of tuples
- *   to mean "any number of items".
+ *   to mean ‘any number of items’.
  *
  * Any type string of a container that contains an indefinite type is,
- * itself, an indefinite type. For example, the type string "a*"
- * (corresponding to %G_VARIANT_TYPE_ARRAY) is an indefinite type
- * that is a supertype of every array type. "(*s)" is a supertype
+ * itself, an indefinite type. For example, the type string `a*`
+ * (corresponding to `G_VARIANT_TYPE_ARRAY`) is an indefinite type
+ * that is a supertype of every array type. `(*s)` is a supertype
  * of all tuples that contain exactly two items where the second
  * item is a string.
  *
- * "a{?*}" is an indefinite type that is a supertype of all arrays
+ * `a{?*}` is an indefinite type that is a supertype of all arrays
  * containing dictionary entries where the key is any basic type and
  * the value is any type at all.  This is, by definition, a dictionary,
- * so this type string corresponds to %G_VARIANT_TYPE_DICTIONARY. Note
+ * so this type string corresponds to `G_VARIANT_TYPE_DICTIONARY`. Note
  * that, due to the restriction that the key of a dictionary entry must
- * be a basic type, "{**}" is not a valid type string.
+ * be a basic type, `{**}` is not a valid type string.
+ *
+ * Since: 2.24
  */
 
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gvarianttype.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gvarianttype.h
index c5aba3d77e5..bb190c272a8 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gvarianttype.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gvarianttype.h
@@ -31,15 +31,6 @@
 
 G_BEGIN_DECLS
 
-/**
- * GVariantType:
- *
- * A type in the GVariant type system.
- *
- * Two types may not be compared by value; use g_variant_type_equal() or
- * g_variant_type_is_subtype_of().  May be copied using
- * g_variant_type_copy() and freed using g_variant_type_free().
- **/
 typedef struct _GVariantType GVariantType;
 
 /**
@@ -375,7 +366,7 @@ GVariantType *                  g_variant_type_new_dict_entry           (const G
 
 /*< private >*/
 GLIB_AVAILABLE_IN_ALL
-const GVariantType *            g_variant_type_checked_                 (const gchar *);
+const GVariantType *            g_variant_type_checked_                 (const gchar *type_string);
 GLIB_AVAILABLE_IN_2_60
 gsize                           g_variant_type_string_get_depth_        (const gchar *type_string);
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gversion.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gversion.c
index 7609bde265b..019ff43cf80 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gversion.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gversion.c
@@ -28,28 +28,6 @@
 
 #include "gversion.h"
 
-/**
- * SECTION:version
- * @Title: Version Information
- * @Short_description: variables and functions to check the GLib version
- *
- * GLib provides version information, primarily useful in configure
- * checks for builds that have a configure script. Applications will
- * not typically use the features described here.
- *
- * The GLib headers annotate deprecated APIs in a way that produces
- * compiler warnings if these deprecated APIs are used. The warnings
- * can be turned off by defining the macro %GLIB_DISABLE_DEPRECATION_WARNINGS
- * before including the glib.h header.
- *
- * GLib also provides support for building applications against
- * defined subsets of deprecated or new GLib APIs. Define the macro
- * %GLIB_VERSION_MIN_REQUIRED to specify up to what version of GLib
- * you want to receive warnings about deprecated APIs. Define the
- * macro %GLIB_VERSION_MAX_ALLOWED to specify the newest version of
- * GLib whose API you want to use.
- */
-
 /**
  * glib_major_version:
  *
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gwakeup.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gwakeup.c
index 3a2065d5041..039f48ead1a 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gwakeup.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gwakeup.c
@@ -38,11 +38,9 @@
 #include "gwakeup.h"
 
 /*< private >
- * SECTION:gwakeup
- * @title: GWakeup
- * @short_description: portable cross-thread event signal mechanism
+ * GWakeup:
  *
- * #GWakeup is a simple and portable way of signaling events between
+ * `GWakeup` is a simple and portable way of signaling events between
  * different threads in a way that integrates nicely with g_poll().
  * GLib uses it internally for cross-thread signalling in the
  * implementation of #GMainContext and #GCancellable.
@@ -59,7 +57,7 @@
  * is implemented with a pair of pipes.
  *
  * Since: 2.30
- **/
+ */
 #ifdef _WIN32
 
 #include <windows.h>
@@ -124,7 +122,7 @@ struct _GWakeup
   gint fds[2];
 };
 
-/**
+/*< private >
  * g_wakeup_new:
  *
  * Creates a new #GWakeup.
@@ -170,7 +168,7 @@ g_wakeup_new (void)
   return wakeup;
 }
 
-/**
+/*< private >
  * g_wakeup_get_pollfd:
  * @wakeup: a #GWakeup
  * @poll_fd: a #GPollFD
@@ -190,7 +188,7 @@ g_wakeup_get_pollfd (GWakeup *wakeup,
   poll_fd->events = G_IO_IN;
 }
 
-/**
+/*< private >
  * g_wakeup_acknowledge:
  * @wakeup: a #GWakeup
  *
@@ -229,7 +227,7 @@ g_wakeup_acknowledge (GWakeup *wakeup)
     }
 }
 
-/**
+/*< private >
  * g_wakeup_signal:
  * @wakeup: a #GWakeup
  *
@@ -270,7 +268,7 @@ g_wakeup_signal (GWakeup *wakeup)
     }
 }
 
-/**
+/*< private >
  * g_wakeup_free:
  * @wakeup: a #GWakeup
  *
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gmodule/gmodule-dl.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gmodule/gmodule-dl.c
index cedfe63d907..d9719373aa8 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gmodule/gmodule-dl.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gmodule/gmodule-dl.c
@@ -167,7 +167,7 @@ _g_module_self (void)
    * NULL is given, dlsym returns an appropriate pointer.
    */
   lock_dlerror ();
-#if defined(__BIONIC__) || defined(__NetBSD__)
+#if defined(__BIONIC__) || defined(__NetBSD__) || defined(__FreeBSD__)
   handle = RTLD_DEFAULT;
 #else
   handle = dlopen (NULL, RTLD_GLOBAL | RTLD_LAZY);
@@ -182,7 +182,7 @@ _g_module_self (void)
 static void
 _g_module_close (gpointer handle)
 {
-#if defined(__BIONIC__) || defined(__NetBSD__)
+#if defined(__BIONIC__) || defined(__NetBSD__) || defined(__FreeBSD__)
   if (handle != RTLD_DEFAULT)
 #endif
     {
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gmodule/gmodule-visibility.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gmodule/gmodule-visibility.h
index 796d1eedf67..c8dd748158a 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gmodule/gmodule-visibility.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gmodule/gmodule-visibility.h
@@ -950,3 +950,37 @@
 #define GMODULE_AVAILABLE_ENUMERATOR_IN_2_78
 #define GMODULE_AVAILABLE_TYPE_IN_2_78
 #endif
+
+#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_80
+#define GMODULE_DEPRECATED_IN_2_80 GMODULE_DEPRECATED
+#define GMODULE_DEPRECATED_IN_2_80_FOR(f) GMODULE_DEPRECATED_FOR (f)
+#define GMODULE_DEPRECATED_MACRO_IN_2_80 GLIB_DEPRECATED_MACRO
+#define GMODULE_DEPRECATED_MACRO_IN_2_80_FOR(f) GLIB_DEPRECATED_MACRO_FOR (f)
+#define GMODULE_DEPRECATED_ENUMERATOR_IN_2_80 GLIB_DEPRECATED_ENUMERATOR
+#define GMODULE_DEPRECATED_ENUMERATOR_IN_2_80_FOR(f) GLIB_DEPRECATED_ENUMERATOR_FOR (f)
+#define GMODULE_DEPRECATED_TYPE_IN_2_80 GLIB_DEPRECATED_TYPE
+#define GMODULE_DEPRECATED_TYPE_IN_2_80_FOR(f) GLIB_DEPRECATED_TYPE_FOR (f)
+#else
+#define GMODULE_DEPRECATED_IN_2_80 _GMODULE_EXTERN
+#define GMODULE_DEPRECATED_IN_2_80_FOR(f) _GMODULE_EXTERN
+#define GMODULE_DEPRECATED_MACRO_IN_2_80
+#define GMODULE_DEPRECATED_MACRO_IN_2_80_FOR(f)
+#define GMODULE_DEPRECATED_ENUMERATOR_IN_2_80
+#define GMODULE_DEPRECATED_ENUMERATOR_IN_2_80_FOR(f)
+#define GMODULE_DEPRECATED_TYPE_IN_2_80
+#define GMODULE_DEPRECATED_TYPE_IN_2_80_FOR(f)
+#endif
+
+#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_80
+#define GMODULE_AVAILABLE_IN_2_80 GMODULE_UNAVAILABLE (2, 80)
+#define GMODULE_AVAILABLE_STATIC_INLINE_IN_2_80 GLIB_UNAVAILABLE_STATIC_INLINE (2, 80)
+#define GMODULE_AVAILABLE_MACRO_IN_2_80 GLIB_UNAVAILABLE_MACRO (2, 80)
+#define GMODULE_AVAILABLE_ENUMERATOR_IN_2_80 GLIB_UNAVAILABLE_ENUMERATOR (2, 80)
+#define GMODULE_AVAILABLE_TYPE_IN_2_80 GLIB_UNAVAILABLE_TYPE (2, 80)
+#else
+#define GMODULE_AVAILABLE_IN_2_80 _GMODULE_EXTERN
+#define GMODULE_AVAILABLE_STATIC_INLINE_IN_2_80
+#define GMODULE_AVAILABLE_MACRO_IN_2_80
+#define GMODULE_AVAILABLE_ENUMERATOR_IN_2_80
+#define GMODULE_AVAILABLE_TYPE_IN_2_80
+#endif
\ No newline at end of file
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gmodule/gmodule.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gmodule/gmodule.c
index 3f9d9e4c087..a40673ccb9a 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gmodule/gmodule.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gmodule/gmodule.c
@@ -52,84 +52,6 @@
 #include "gmoduleconf.h"
 #include "gstdio.h"
 
-/**
- * SECTION:modules
- * @title: Dynamic Loading of Modules
- * @short_description: portable method for dynamically loading 'plug-ins'
- *
- * These functions provide a portable way to dynamically load object files
- * (commonly known as 'plug-ins'). The current implementation supports all
- * systems that provide an implementation of dlopen() (e.g. Linux/Sun), as
- * well as Windows platforms via DLLs.
- *
- * A program which wants to use these functions must be linked to the
- * libraries output by the command `pkg-config --libs gmodule-2.0`.
- *
- * To use them you must first determine whether dynamic loading
- * is supported on the platform by calling g_module_supported().
- * If it is, you can open a module with g_module_open(),
- * find the module's symbols (e.g. function names) with g_module_symbol(),
- * and later close the module with g_module_close().
- * g_module_name() will return the file name of a currently opened module.
- *
- * If any of the above functions fail, the error status can be found with
- * g_module_error().
- *
- * The #GModule implementation features reference counting for opened modules,
- * and supports hook functions within a module which are called when the
- * module is loaded and unloaded (see #GModuleCheckInit and #GModuleUnload).
- *
- * If your module introduces static data to common subsystems in the running
- * program, e.g. through calling
- * `g_quark_from_static_string ("my-module-stuff")`,
- * it must ensure that it is never unloaded, by calling g_module_make_resident().
- *
- * Example: Calling a function defined in a GModule
- * |[<!-- language="C" -->
- * // the function signature for 'say_hello'
- * typedef void (* SayHelloFunc) (const char *message);
- *
- * gboolean
- * just_say_hello (const char *filename, GError **error)
- * {
- *   SayHelloFunc  say_hello;
- *   GModule      *module;
- *
- *   module = g_module_open (filename, G_MODULE_BIND_LAZY);
- *   if (!module)
- *     {
- *       g_set_error (error, FOO_ERROR, FOO_ERROR_BLAH,
- *                    "%s", g_module_error ());
- *       return FALSE;
- *     }
- *
- *   if (!g_module_symbol (module, "say_hello", (gpointer *)&say_hello))
- *     {
- *       g_set_error (error, SAY_ERROR, SAY_ERROR_OPEN,
- *                    "%s: %s", filename, g_module_error ());
- *       if (!g_module_close (module))
- *         g_warning ("%s: %s", filename, g_module_error ());
- *       return FALSE;
- *     }
- *
- *   if (say_hello == NULL)
- *     {
- *       g_set_error (error, SAY_ERROR, SAY_ERROR_OPEN,
- *                    "symbol say_hello is NULL");
- *       if (!g_module_close (module))
- *         g_warning ("%s: %s", filename, g_module_error ());
- *       return FALSE;
- *     }
- *
- *   // call our function in the module
- *   say_hello ("Hello world!");
- *
- *   if (!g_module_close (module))
- *     g_warning ("%s: %s", filename, g_module_error ());
- *   return TRUE;
- *  }
- * ]|
- */
 
 /**
  * GModule:
@@ -516,7 +438,9 @@ static GRecMutex g_module_global_lock;
  * @error: #GError.
  *
  * Opens a module. If the module has already been opened, its reference count
- * is incremented. If not, the module is searched in the following order:
+ * is incremented. If not, the module is searched using @file_name.
+ *
+ * Since 2.76, the search order/behavior is as follows:
  *
  * 1. If @file_name exists as a regular file, it is used as-is; else
  * 2. If @file_name doesn't have the correct suffix and/or prefix for the
@@ -527,10 +451,15 @@ static GRecMutex g_module_global_lock;
  *    libtool archive is parsed to find the actual file name, and that is
  *    used.
  *
- * At the end of all this, we would have a file path that we can access on
- * disk, and it is opened as a module. If not, @file_name is opened as
- * a module verbatim in the hopes that the system implementation will somehow
- * be able to access it.
+ * If, at the end of all this, we have a file path that we can access on disk,
+ * it is opened as a module. If not, @file_name is attempted to be opened as a
+ * module verbatim in the hopes that the system implementation will somehow be
+ * able to access it. If that is not possible, %NULL is returned.
+ *
+ * Note that this behaviour was different prior to 2.76, but there is some
+ * overlap in functionality. If backwards compatibility is an issue, kindly
+ * consult earlier #GModule documentation for the prior search order/behavior
+ * of @file_name.
  *
  * Returns: a #GModule on success, or %NULL on failure
  *
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gbinding.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gbinding.c
index 57a90225a52..8c242e3af22 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gbinding.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gbinding.c
@@ -21,36 +21,33 @@
  */
 
 /**
- * SECTION:gbinding
- * @Title: GBinding
- * @Short_Description: Bind two object properties
+ * GBinding:
  *
- * #GBinding is the representation of a binding between a property on a
- * #GObject instance (or source) and another property on another #GObject
+ * `GObject` instance (or source) and another property on another `GObject`
  * instance (or target).
  *
  * Whenever the source property changes, the same value is applied to the
  * target property; for instance, the following binding:
  *
- * |[<!-- language="C" -->
+ * ```c
  *   g_object_bind_property (object1, "property-a",
  *                           object2, "property-b",
  *                           G_BINDING_DEFAULT);
- * ]|
+ * ```
  *
  * will cause the property named "property-b" of @object2 to be updated
- * every time g_object_set() or the specific accessor changes the value of
+ * every time [method@GObject.set] or the specific accessor changes the value of
  * the property "property-a" of @object1.
  *
  * It is possible to create a bidirectional binding between two properties
- * of two #GObject instances, so that if either property changes, the
+ * of two `GObject` instances, so that if either property changes, the
  * other is updated as well, for instance:
  *
- * |[<!-- language="C" -->
+ * ```c
  *   g_object_bind_property (object1, "property-a",
  *                           object2, "property-b",
  *                           G_BINDING_BIDIRECTIONAL);
- * ]|
+ * ```
  *
  * will keep the two properties in sync.
  *
@@ -59,14 +56,14 @@
  * transformation from the source value to the target value before
  * applying it; for instance, the following binding:
  *
- * |[<!-- language="C" -->
+ * ```c
  *   g_object_bind_property_full (adjustment1, "value",
  *                                adjustment2, "value",
  *                                G_BINDING_BIDIRECTIONAL,
  *                                celsius_to_fahrenheit,
  *                                fahrenheit_to_celsius,
  *                                NULL, NULL);
- * ]|
+ * ```
  *
  * will keep the "value" property of the two adjustments in sync; the
  * @celsius_to_fahrenheit function will be called whenever the "value"
@@ -80,29 +77,29 @@
  *
  * Note that #GBinding does not resolve cycles by itself; a cycle like
  *
- * |[
+ * ```
  *   object1:propertyA -> object2:propertyB
  *   object2:propertyB -> object3:propertyC
  *   object3:propertyC -> object1:propertyA
- * ]|
+ * ```
  *
  * might lead to an infinite loop. The loop, in this particular case,
- * can be avoided if the objects emit the #GObject::notify signal only
+ * can be avoided if the objects emit the `GObject::notify` signal only
  * if the value has effectively been changed. A binding is implemented
- * using the #GObject::notify signal, so it is susceptible to all the
- * various ways of blocking a signal emission, like g_signal_stop_emission()
- * or g_signal_handler_block().
+ * using the `GObject::notify` signal, so it is susceptible to all the
+ * various ways of blocking a signal emission, like [func@GObject.signal_stop_emission]
+ * or [func@GObject.signal_handler_block].
  *
  * A binding will be severed, and the resources it allocates freed, whenever
- * either one of the #GObject instances it refers to are finalized, or when
+ * either one of the `GObject` instances it refers to are finalized, or when
  * the #GBinding instance loses its last reference.
  *
  * Bindings for languages with garbage collection can use
- * g_binding_unbind() to explicitly release a binding between the source
+ * [method@GObject.Binding.unbind] to explicitly release a binding between the source
  * and target properties, instead of relying on the last reference on the
  * binding, source, and target instances to drop.
  *
- * #GBinding is available since GObject 2.26
+ * Since: 2.26
  */
 
 #include "config.h"
@@ -123,9 +120,9 @@
 GType
 g_binding_flags_get_type (void)
 {
-  static gsize static_g_define_type_id = 0;
+  static GType static_g_define_type_id = 0;
 
-  if (g_once_init_enter (&static_g_define_type_id))
+  if (g_once_init_enter_pointer (&static_g_define_type_id))
     {
       static const GFlagsValue values[] = {
         { G_BINDING_DEFAULT, "G_BINDING_DEFAULT", "default" },
@@ -136,7 +133,7 @@ g_binding_flags_get_type (void)
       };
       GType g_define_type_id =
         g_flags_register_static (g_intern_static_string ("GBindingFlags"), values);
-      g_once_init_leave (&static_g_define_type_id, g_define_type_id);
+      g_once_init_leave_pointer (&static_g_define_type_id, g_define_type_id);
     }
 
   return static_g_define_type_id;
@@ -889,9 +886,7 @@ g_binding_class_init (GBindingClass *klass)
    * Since: 2.26
    */
   g_object_class_install_property (gobject_class, PROP_SOURCE,
-                                   g_param_spec_object ("source",
-                                                        P_("Source"),
-                                                        P_("The source of the binding"),
+                                   g_param_spec_object ("source", NULL, NULL,
                                                         G_TYPE_OBJECT,
                                                         G_PARAM_CONSTRUCT_ONLY |
                                                         G_PARAM_READWRITE |
@@ -904,9 +899,7 @@ g_binding_class_init (GBindingClass *klass)
    * Since: 2.26
    */
   g_object_class_install_property (gobject_class, PROP_TARGET,
-                                   g_param_spec_object ("target",
-                                                        P_("Target"),
-                                                        P_("The target of the binding"),
+                                   g_param_spec_object ("target", NULL, NULL,
                                                         G_TYPE_OBJECT,
                                                         G_PARAM_CONSTRUCT_ONLY |
                                                         G_PARAM_READWRITE |
@@ -923,9 +916,7 @@ g_binding_class_init (GBindingClass *klass)
    * Since: 2.26
    */
   g_object_class_install_property (gobject_class, PROP_SOURCE_PROPERTY,
-                                   g_param_spec_string ("source-property",
-                                                        P_("Source Property"),
-                                                        P_("The property on the source to bind"),
+                                   g_param_spec_string ("source-property", NULL, NULL,
                                                         NULL,
                                                         G_PARAM_CONSTRUCT_ONLY |
                                                         G_PARAM_READWRITE |
@@ -942,9 +933,7 @@ g_binding_class_init (GBindingClass *klass)
    * Since: 2.26
    */
   g_object_class_install_property (gobject_class, PROP_TARGET_PROPERTY,
-                                   g_param_spec_string ("target-property",
-                                                        P_("Target Property"),
-                                                        P_("The property on the target to bind"),
+                                   g_param_spec_string ("target-property", NULL, NULL,
                                                         NULL,
                                                         G_PARAM_CONSTRUCT_ONLY |
                                                         G_PARAM_READWRITE |
@@ -957,9 +946,7 @@ g_binding_class_init (GBindingClass *klass)
    * Since: 2.26
    */
   g_object_class_install_property (gobject_class, PROP_FLAGS,
-                                   g_param_spec_flags ("flags",
-                                                       P_("Flags"),
-                                                       P_("The binding flags"),
+                                   g_param_spec_flags ("flags", NULL, NULL,
                                                        G_TYPE_BINDING_FLAGS,
                                                        G_BINDING_DEFAULT,
                                                        G_PARAM_CONSTRUCT_ONLY |
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gbinding.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gbinding.h
index 8504de21da8..4c7da7e246e 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gbinding.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gbinding.h
@@ -38,14 +38,6 @@ G_BEGIN_DECLS
 #define G_BINDING(obj)          (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_BINDING, GBinding))
 #define G_IS_BINDING(obj)       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_BINDING))
 
-/**
- * GBinding:
- *
- * GBinding is an opaque structure whose members
- * cannot be accessed directly.
- *
- * Since: 2.26
- */
 typedef struct _GBinding        GBinding;
 
 /**
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gboxed.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gboxed.c
index 14023f9f153..075357182ab 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gboxed.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gboxed.c
@@ -33,35 +33,6 @@
 #include "gvaluearray.h"
 #include "gvaluecollector.h"
 
-
-/**
- * SECTION:gboxed
- * @short_description: A mechanism to wrap opaque C structures registered
- *     by the type system
- * @see_also: #GParamSpecBoxed, g_param_spec_boxed()
- * @title: Boxed Types
- *
- * #GBoxed is a generic wrapper mechanism for arbitrary C structures.
- *
- * The only thing the type system needs to know about the structures is how to
- * copy them (a #GBoxedCopyFunc) and how to free them (a #GBoxedFreeFunc);
- * beyond that, they are treated as opaque chunks of memory.
- *
- * Boxed types are useful for simple value-holder structures like rectangles or
- * points. They can also be used for wrapping structures defined in non-#GObject
- * based libraries. They allow arbitrary structures to be handled in a uniform
- * way, allowing uniform copying (or referencing) and freeing (or unreferencing)
- * of them, and uniform representation of the type of the contained structure.
- * In turn, this allows any type which can be boxed to be set as the data in a
- * #GValue, which allows for polymorphic handling of a much wider range of data
- * types, and hence usage of such types as #GObject property values.
- *
- * #GBoxed is designed so that reference counted types can be boxed. Use the
- * type's 'ref' function as the #GBoxedCopyFunc, and its 'unref' function as the
- * #GBoxedFreeFunc. For example, for #GBytes, the #GBoxedCopyFunc is
- * g_bytes_ref(), and the #GBoxedFreeFunc is g_bytes_unref().
- */
-
 static inline void              /* keep this function in sync with gvalue.c */
 value_meminit (GValue *value,
          GType   value_type)
@@ -170,6 +141,9 @@ G_DEFINE_BOXED_TYPE (GKeyFile, g_key_file, g_key_file_ref, g_key_file_unref)
 G_DEFINE_BOXED_TYPE (GMappedFile, g_mapped_file, g_mapped_file_ref, g_mapped_file_unref)
 #ifndef GSTREAMER_LITE
 G_DEFINE_BOXED_TYPE (GBookmarkFile, g_bookmark_file, g_bookmark_file_copy, g_bookmark_file_free)
+G_DEFINE_BOXED_TYPE (GHmac, g_hmac, g_hmac_ref, g_hmac_unref)
+G_DEFINE_BOXED_TYPE (GDir, g_dir, g_dir_ref, g_dir_unref)
+G_DEFINE_BOXED_TYPE (GRand, g_rand, g_rand_copy, g_rand_free)
 #endif // GSTREAMER_LITE
 
 G_DEFINE_BOXED_TYPE (GMainLoop, g_main_loop, g_main_loop_ref, g_main_loop_unref)
@@ -185,20 +159,24 @@ G_DEFINE_BOXED_TYPE (GUri, g_uri, g_uri_ref, g_uri_unref)
 G_DEFINE_BOXED_TYPE (GOptionGroup, g_option_group, g_option_group_ref, g_option_group_unref)
 G_DEFINE_BOXED_TYPE (GPatternSpec, g_pattern_spec, g_pattern_spec_copy, g_pattern_spec_free);
 
+#ifndef GSTREAMER_LITE
+G_DEFINE_BOXED_TYPE (GStrvBuilder, g_strv_builder, g_strv_builder_ref, g_strv_builder_unref);
+#endif // GSTREAMER_LITE
+
 /* This one can't use G_DEFINE_BOXED_TYPE (GStrv, g_strv, g_strdupv, g_strfreev) */
 GType
 g_strv_get_type (void)
 {
-  static gsize static_g_define_type_id = 0;
+  static GType static_g_define_type_id = 0;
 
-  if (g_once_init_enter (&static_g_define_type_id))
+  if (g_once_init_enter_pointer (&static_g_define_type_id))
     {
       GType g_define_type_id =
         g_boxed_type_register_static (g_intern_static_string ("GStrv"),
                                       (GBoxedCopyFunc) g_strdupv,
                                       (GBoxedFreeFunc) g_strfreev);
 
-      g_once_init_leave (&static_g_define_type_id, g_define_type_id);
+      g_once_init_leave_pointer (&static_g_define_type_id, g_define_type_id);
     }
 
   return static_g_define_type_id;
@@ -284,8 +262,8 @@ boxed_proxy_lcopy_value (const GValue *value,
 /**
  * g_boxed_type_register_static:
  * @name: Name of the new boxed type.
- * @boxed_copy: Boxed structure copy function.
- * @boxed_free: Boxed structure free function.
+ * @boxed_copy: (scope forever): Boxed structure copy function.
+ * @boxed_free: (scope forever): Boxed structure free function.
  *
  * This function creates a new %G_TYPE_BOXED derived type id for a new
  * boxed type with name @name.
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gclosure.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gclosure.c
index dd03db102ee..30b087b214b 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gclosure.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gclosure.c
@@ -39,11 +39,13 @@
 
 
 /**
- * SECTION:gclosure
- * @short_description: Functions as first-class objects
- * @title: Closures
+ * GClosure:
+ * @in_marshal: Indicates whether the closure is currently being invoked with
+ *   g_closure_invoke()
+ * @is_invalid: Indicates whether the closure has been invalidated by
+ *   g_closure_invalidate()
  *
- * A #GClosure represents a callback supplied by the programmer.
+ * A `GClosure` represents a callback supplied by the programmer.
  *
  * It will generally comprise a function of some kind and a marshaller
  * used to call it. It is the responsibility of the marshaller to
@@ -1189,7 +1191,7 @@ g_signal_type_cclosure_new (GType    itype,
   g_return_val_if_fail (G_TYPE_IS_CLASSED (itype) || G_TYPE_IS_INTERFACE (itype), NULL);
   g_return_val_if_fail (struct_offset >= sizeof (GTypeClass), NULL);
 
-  closure = g_closure_new_simple (sizeof (GClosure), (gpointer) itype);
+  closure = g_closure_new_simple (sizeof (GClosure), GTYPE_TO_POINTER (itype));
   if (G_TYPE_IS_INTERFACE (itype))
     {
       g_closure_set_meta_marshal (closure, GUINT_TO_POINTER (struct_offset), g_type_iface_meta_marshal);
@@ -1689,320 +1691,3 @@ g_cclosure_marshal_generic_va (GClosure *closure,
   if (return_value && G_VALUE_TYPE (return_value))
     value_from_ffi_type (return_value, rvalue);
 }
-
-/**
- * g_cclosure_marshal_VOID__VOID:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: ignored
- * @n_param_values: 1
- * @param_values: a #GValue array holding only the instance
- * @invocation_hint: the invocation hint given as the last argument
- *  to g_closure_invoke()
- * @marshal_data: additional data specified when registering the marshaller
- *
- * A marshaller for a #GCClosure with a callback of type
- * `void (*callback) (gpointer instance, gpointer user_data)`.
- */
-
-/**
- * g_cclosure_marshal_VOID__BOOLEAN:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: ignored
- * @n_param_values: 2
- * @param_values: a #GValue array holding the instance and the #gboolean parameter
- * @invocation_hint: the invocation hint given as the last argument
- *  to g_closure_invoke()
- * @marshal_data: additional data specified when registering the marshaller
- *
- * A marshaller for a #GCClosure with a callback of type
- * `void (*callback) (gpointer instance, gboolean arg1, gpointer user_data)`.
- */
-
-/**
- * g_cclosure_marshal_VOID__CHAR:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: ignored
- * @n_param_values: 2
- * @param_values: a #GValue array holding the instance and the #gchar parameter
- * @invocation_hint: the invocation hint given as the last argument
- *  to g_closure_invoke()
- * @marshal_data: additional data specified when registering the marshaller
- *
- * A marshaller for a #GCClosure with a callback of type
- * `void (*callback) (gpointer instance, gchar arg1, gpointer user_data)`.
- */
-
-/**
- * g_cclosure_marshal_VOID__UCHAR:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: ignored
- * @n_param_values: 2
- * @param_values: a #GValue array holding the instance and the #guchar parameter
- * @invocation_hint: the invocation hint given as the last argument
- *  to g_closure_invoke()
- * @marshal_data: additional data specified when registering the marshaller
- *
- * A marshaller for a #GCClosure with a callback of type
- * `void (*callback) (gpointer instance, guchar arg1, gpointer user_data)`.
- */
-
-/**
- * g_cclosure_marshal_VOID__INT:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: ignored
- * @n_param_values: 2
- * @param_values: a #GValue array holding the instance and the #gint parameter
- * @invocation_hint: the invocation hint given as the last argument
- *  to g_closure_invoke()
- * @marshal_data: additional data specified when registering the marshaller
- *
- * A marshaller for a #GCClosure with a callback of type
- * `void (*callback) (gpointer instance, gint arg1, gpointer user_data)`.
- */
-
-/**
- * g_cclosure_marshal_VOID__UINT:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: ignored
- * @n_param_values: 2
- * @param_values: a #GValue array holding the instance and the #guint parameter
- * @invocation_hint: the invocation hint given as the last argument
- *  to g_closure_invoke()
- * @marshal_data: additional data specified when registering the marshaller
- *
- * A marshaller for a #GCClosure with a callback of type
- * `void (*callback) (gpointer instance, guint arg1, gpointer user_data)`.
- */
-
-/**
- * g_cclosure_marshal_VOID__LONG:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: ignored
- * @n_param_values: 2
- * @param_values: a #GValue array holding the instance and the #glong parameter
- * @invocation_hint: the invocation hint given as the last argument
- *  to g_closure_invoke()
- * @marshal_data: additional data specified when registering the marshaller
- *
- * A marshaller for a #GCClosure with a callback of type
- * `void (*callback) (gpointer instance, glong arg1, gpointer user_data)`.
- */
-
-/**
- * g_cclosure_marshal_VOID__ULONG:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: ignored
- * @n_param_values: 2
- * @param_values: a #GValue array holding the instance and the #gulong parameter
- * @invocation_hint: the invocation hint given as the last argument
- *  to g_closure_invoke()
- * @marshal_data: additional data specified when registering the marshaller
- *
- * A marshaller for a #GCClosure with a callback of type
- * `void (*callback) (gpointer instance, gulong arg1, gpointer user_data)`.
- */
-
-/**
- * g_cclosure_marshal_VOID__ENUM:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: ignored
- * @n_param_values: 2
- * @param_values: a #GValue array holding the instance and the enumeration parameter
- * @invocation_hint: the invocation hint given as the last argument
- *  to g_closure_invoke()
- * @marshal_data: additional data specified when registering the marshaller
- *
- * A marshaller for a #GCClosure with a callback of type
- * `void (*callback) (gpointer instance, gint arg1, gpointer user_data)` where the #gint parameter denotes an enumeration type..
- */
-
-/**
- * g_cclosure_marshal_VOID__FLAGS:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: ignored
- * @n_param_values: 2
- * @param_values: a #GValue array holding the instance and the flags parameter
- * @invocation_hint: the invocation hint given as the last argument
- *  to g_closure_invoke()
- * @marshal_data: additional data specified when registering the marshaller
- *
- * A marshaller for a #GCClosure with a callback of type
- * `void (*callback) (gpointer instance, gint arg1, gpointer user_data)` where the #gint parameter denotes a flags type.
- */
-
-/**
- * g_cclosure_marshal_VOID__FLOAT:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: ignored
- * @n_param_values: 2
- * @param_values: a #GValue array holding the instance and the #gfloat parameter
- * @invocation_hint: the invocation hint given as the last argument
- *  to g_closure_invoke()
- * @marshal_data: additional data specified when registering the marshaller
- *
- * A marshaller for a #GCClosure with a callback of type
- * `void (*callback) (gpointer instance, gfloat arg1, gpointer user_data)`.
- */
-
-/**
- * g_cclosure_marshal_VOID__DOUBLE:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: ignored
- * @n_param_values: 2
- * @param_values: a #GValue array holding the instance and the #gdouble parameter
- * @invocation_hint: the invocation hint given as the last argument
- *  to g_closure_invoke()
- * @marshal_data: additional data specified when registering the marshaller
- *
- * A marshaller for a #GCClosure with a callback of type
- * `void (*callback) (gpointer instance, gdouble arg1, gpointer user_data)`.
- */
-
-/**
- * g_cclosure_marshal_VOID__STRING:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: ignored
- * @n_param_values: 2
- * @param_values: a #GValue array holding the instance and the #gchar* parameter
- * @invocation_hint: the invocation hint given as the last argument
- *  to g_closure_invoke()
- * @marshal_data: additional data specified when registering the marshaller
- *
- * A marshaller for a #GCClosure with a callback of type
- * `void (*callback) (gpointer instance, const gchar *arg1, gpointer user_data)`.
- */
-
-/**
- * g_cclosure_marshal_VOID__PARAM:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: ignored
- * @n_param_values: 2
- * @param_values: a #GValue array holding the instance and the #GParamSpec* parameter
- * @invocation_hint: the invocation hint given as the last argument
- *  to g_closure_invoke()
- * @marshal_data: additional data specified when registering the marshaller
- *
- * A marshaller for a #GCClosure with a callback of type
- * `void (*callback) (gpointer instance, GParamSpec *arg1, gpointer user_data)`.
- */
-
-/**
- * g_cclosure_marshal_VOID__BOXED:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: ignored
- * @n_param_values: 2
- * @param_values: a #GValue array holding the instance and the #GBoxed* parameter
- * @invocation_hint: the invocation hint given as the last argument
- *  to g_closure_invoke()
- * @marshal_data: additional data specified when registering the marshaller
- *
- * A marshaller for a #GCClosure with a callback of type
- * `void (*callback) (gpointer instance, GBoxed *arg1, gpointer user_data)`.
- */
-
-/**
- * g_cclosure_marshal_VOID__POINTER:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: ignored
- * @n_param_values: 2
- * @param_values: a #GValue array holding the instance and the #gpointer parameter
- * @invocation_hint: the invocation hint given as the last argument
- *  to g_closure_invoke()
- * @marshal_data: additional data specified when registering the marshaller
- *
- * A marshaller for a #GCClosure with a callback of type
- * `void (*callback) (gpointer instance, gpointer arg1, gpointer user_data)`.
- */
-
-/**
- * g_cclosure_marshal_VOID__OBJECT:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: ignored
- * @n_param_values: 2
- * @param_values: a #GValue array holding the instance and the #GObject* parameter
- * @invocation_hint: the invocation hint given as the last argument
- *  to g_closure_invoke()
- * @marshal_data: additional data specified when registering the marshaller
- *
- * A marshaller for a #GCClosure with a callback of type
- * `void (*callback) (gpointer instance, GObject *arg1, gpointer user_data)`.
- */
-
-/**
- * g_cclosure_marshal_VOID__VARIANT:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: ignored
- * @n_param_values: 2
- * @param_values: a #GValue array holding the instance and the #GVariant* parameter
- * @invocation_hint: the invocation hint given as the last argument
- *  to g_closure_invoke()
- * @marshal_data: additional data specified when registering the marshaller
- *
- * A marshaller for a #GCClosure with a callback of type
- * `void (*callback) (gpointer instance, GVariant *arg1, gpointer user_data)`.
- *
- * Since: 2.26
- */
-
-/**
- * g_cclosure_marshal_VOID__UINT_POINTER:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: ignored
- * @n_param_values: 3
- * @param_values: a #GValue array holding instance, arg1 and arg2
- * @invocation_hint: the invocation hint given as the last argument
- *  to g_closure_invoke()
- * @marshal_data: additional data specified when registering the marshaller
- *
- * A marshaller for a #GCClosure with a callback of type
- * `void (*callback) (gpointer instance, guint arg1, gpointer arg2, gpointer user_data)`.
- */
-
-/**
- * g_cclosure_marshal_BOOLEAN__FLAGS:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: a #GValue which can store the returned #gboolean
- * @n_param_values: 2
- * @param_values: a #GValue array holding instance and arg1
- * @invocation_hint: the invocation hint given as the last argument
- *  to g_closure_invoke()
- * @marshal_data: additional data specified when registering the marshaller
- *
- * A marshaller for a #GCClosure with a callback of type
- * `gboolean (*callback) (gpointer instance, gint arg1, gpointer user_data)` where the #gint parameter
- * denotes a flags type.
- */
-
-/**
- * g_cclosure_marshal_BOOL__FLAGS:
- *
- * Another name for g_cclosure_marshal_BOOLEAN__FLAGS().
- */
-/**
- * g_cclosure_marshal_STRING__OBJECT_POINTER:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: a #GValue, which can store the returned string
- * @n_param_values: 3
- * @param_values: a #GValue array holding instance, arg1 and arg2
- * @invocation_hint: the invocation hint given as the last argument
- *  to g_closure_invoke()
- * @marshal_data: additional data specified when registering the marshaller
- *
- * A marshaller for a #GCClosure with a callback of type
- * `gchar* (*callback) (gpointer instance, GObject *arg1, gpointer arg2, gpointer user_data)`.
- */
-/**
- * g_cclosure_marshal_BOOLEAN__OBJECT_BOXED_BOXED:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: a #GValue, which can store the returned string
- * @n_param_values: 3
- * @param_values: a #GValue array holding instance, arg1 and arg2
- * @invocation_hint: the invocation hint given as the last argument
- *  to g_closure_invoke()
- * @marshal_data: additional data specified when registering the marshaller
- *
- * A marshaller for a #GCClosure with a callback of type
- * `gboolean (*callback) (gpointer instance, GBoxed *arg1, GBoxed *arg2, gpointer user_data)`.
- *
- * Since: 2.26
- */
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gclosure.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gclosure.h
index af19c5c4376..2f585744b91 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gclosure.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gclosure.h
@@ -169,15 +169,7 @@ struct _GClosureNotifyData
   gpointer       data;
   GClosureNotify notify;
 };
-/**
- * GClosure:
- * @in_marshal: Indicates whether the closure is currently being invoked with
- *  g_closure_invoke()
- * @is_invalid: Indicates whether the closure has been invalidated by
- *  g_closure_invalidate()
- *
- * A #GClosure represents a callback supplied by the programmer.
- */
+
 struct _GClosure
 {
   /*< private >*/
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/genums.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/genums.c
index d539cc40fc6..bf19abe7d66 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/genums.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/genums.c
@@ -31,43 +31,6 @@
 #include "gvaluecollector.h"
 
 
-/**
- * SECTION:enumerations_flags
- * @short_description: Enumeration and flags types
- * @title: Enumeration and Flag Types
- * @see_also:#GParamSpecEnum, #GParamSpecFlags, g_param_spec_enum(),
- * g_param_spec_flags()
- *
- * The GLib type system provides fundamental types for enumeration and
- * flags types. (Flags types are like enumerations, but allow their
- * values to be combined by bitwise or). A registered enumeration or
- * flags type associates a name and a nickname with each allowed
- * value, and the methods g_enum_get_value_by_name(),
- * g_enum_get_value_by_nick(), g_flags_get_value_by_name() and
- * g_flags_get_value_by_nick() can look up values by their name or
- * nickname.  When an enumeration or flags type is registered with the
- * GLib type system, it can be used as value type for object
- * properties, using g_param_spec_enum() or g_param_spec_flags().
- *
- * GObject ships with a utility called [glib-mkenums][glib-mkenums],
- * that can construct suitable type registration functions from C enumeration
- * definitions.
- *
- * Example of how to get a string representation of an enum value:
- * |[<!-- language="C" -->
- * GEnumClass *enum_class;
- * GEnumValue *enum_value;
- *
- * enum_class = g_type_class_ref (MAMAN_TYPE_MY_ENUM);
- * enum_value = g_enum_get_value (enum_class, MAMAN_MY_ENUM_FOO);
- *
- * g_print ("Name: %s\n", enum_value->value_name);
- *
- * g_type_class_unref (enum_class);
- * ]|
- */
-
-
 /* --- prototypes --- */
 static void g_enum_class_init       (GEnumClass *class,
                          gpointer    class_data);
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/genums.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/genums.h
index 285a48ce601..91cf98107da 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/genums.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/genums.h
@@ -320,14 +320,14 @@ void  g_flags_complete_type_info (GType        g_flags_type,
 #define G_DEFINE_ENUM_TYPE(TypeName, type_name, ...) \
 GType \
 type_name ## _get_type (void) { \
-  static gsize g_define_type__static = 0; \
-  if (g_once_init_enter (&g_define_type__static)) { \
+  static _g_type_once_init_type g_define_type__static = 0; \
+  if (_g_type_once_init_enter (&g_define_type__static)) { \
     static const GEnumValue enum_values[] = { \
       __VA_ARGS__ , \
       { 0, NULL, NULL }, \
     }; \
     GType g_define_type = g_enum_register_static (g_intern_static_string (#TypeName), enum_values); \
-    g_once_init_leave (&g_define_type__static, g_define_type); \
+    _g_type_once_init_leave (&g_define_type__static, g_define_type); \
   } \
   return g_define_type__static; \
 } \
@@ -363,14 +363,14 @@ type_name ## _get_type (void) { \
 #define G_DEFINE_FLAGS_TYPE(TypeName, type_name, ...) \
 GType \
 type_name ## _get_type (void) { \
-  static gsize g_define_type__static = 0; \
-  if (g_once_init_enter (&g_define_type__static)) { \
+  static _g_type_once_init_type g_define_type__static = 0; \
+  if (_g_type_once_init_enter (&g_define_type__static)) { \
     static const GFlagsValue flags_values[] = { \
       __VA_ARGS__ , \
       { 0, NULL, NULL }, \
     }; \
     GType g_define_type = g_flags_register_static (g_intern_static_string (#TypeName), flags_values); \
-    g_once_init_leave (&g_define_type__static, g_define_type); \
+    _g_type_once_init_leave (&g_define_type__static, g_define_type); \
   } \
   return g_define_type__static; \
 } \
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/glib-types.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/glib-types.h
index 4d55c8bc4f1..2ab7b128afd 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/glib-types.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/glib-types.h
@@ -338,6 +338,42 @@ typedef gsize GType;
 #define G_TYPE_BOOKMARK_FILE (g_bookmark_file_get_type ())
 #endif // GSTREAMER_LITE
 
+/**
+ * G_TYPE_HMAC:
+ *
+ * The #GType for a boxed type holding a #GHmac.
+ *
+ * Since: 2.80
+ */
+#define G_TYPE_HMAC (g_hmac_get_type ())
+
+/**
+ * G_TYPE_DIR:
+ *
+ * The #GType for a boxed type holding a #GDir.
+ *
+ * Since: 2.80
+ */
+#define G_TYPE_DIR (g_dir_get_type ())
+
+/**
+ * G_TYPE_RAND:
+ *
+ * The #GType for a boxed type holding a #GRand.
+ *
+ * Since: 2.80
+ */
+#define G_TYPE_RAND (g_rand_get_type ())
+
+/**
+ * G_TYPE_STRV_BUILDER:
+ *
+ * The #GType for a boxed type holding a #GStrvBuilder.
+ *
+ * Since: 2.80
+ */
+#define G_TYPE_STRV_BUILDER (g_strv_builder_get_type ())
+
 GOBJECT_AVAILABLE_IN_ALL
 GType   g_date_get_type            (void) G_GNUC_CONST;
 GOBJECT_AVAILABLE_IN_ALL
@@ -405,6 +441,14 @@ GType g_pattern_spec_get_type (void) G_GNUC_CONST;
 #ifndef GSTREAMER_LITE
 GOBJECT_AVAILABLE_IN_2_76
 GType   g_bookmark_file_get_type   (void) G_GNUC_CONST;
+GOBJECT_AVAILABLE_IN_2_80
+GType   g_hmac_get_type (void) G_GNUC_CONST;
+GOBJECT_AVAILABLE_IN_2_80
+GType   g_dir_get_type (void) G_GNUC_CONST;
+GOBJECT_AVAILABLE_IN_2_80
+GType   g_rand_get_type (void) G_GNUC_CONST;
+GOBJECT_AVAILABLE_IN_2_80
+GType   g_strv_builder_get_type (void) G_GNUC_CONST;
 #endif // GSTREAMER_LITE
 
 GOBJECT_DEPRECATED_FOR('G_TYPE_VARIANT')
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gobject-autocleanups.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gobject-autocleanups.h
index 9cf6253803f..c5992e128d5 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gobject-autocleanups.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gobject-autocleanups.h
@@ -23,6 +23,8 @@
 #error "Only <glib-object.h> can be included directly."
 #endif
 
+#ifndef __GI_SCANNER__
+
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GClosure, g_closure_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GEnumClass, g_type_class_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GFlagsClass, g_type_class_unref)
@@ -31,3 +33,5 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GInitiallyUnowned, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GParamSpec, g_param_spec_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GTypeClass, g_type_class_unref)
 G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(GValue, g_value_unset)
+
+#endif /* __GI_SCANNER__ */
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gobject-visibility.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gobject-visibility.h
index 08c9c54d8e0..4ed8625aa40 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gobject-visibility.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gobject-visibility.h
@@ -950,3 +950,37 @@
 #define GOBJECT_AVAILABLE_ENUMERATOR_IN_2_78
 #define GOBJECT_AVAILABLE_TYPE_IN_2_78
 #endif
+
+#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_80
+#define GOBJECT_DEPRECATED_IN_2_80 GOBJECT_DEPRECATED
+#define GOBJECT_DEPRECATED_IN_2_80_FOR(f) GOBJECT_DEPRECATED_FOR (f)
+#define GOBJECT_DEPRECATED_MACRO_IN_2_80 GLIB_DEPRECATED_MACRO
+#define GOBJECT_DEPRECATED_MACRO_IN_2_80_FOR(f) GLIB_DEPRECATED_MACRO_FOR (f)
+#define GOBJECT_DEPRECATED_ENUMERATOR_IN_2_80 GLIB_DEPRECATED_ENUMERATOR
+#define GOBJECT_DEPRECATED_ENUMERATOR_IN_2_80_FOR(f) GLIB_DEPRECATED_ENUMERATOR_FOR (f)
+#define GOBJECT_DEPRECATED_TYPE_IN_2_80 GLIB_DEPRECATED_TYPE
+#define GOBJECT_DEPRECATED_TYPE_IN_2_80_FOR(f) GLIB_DEPRECATED_TYPE_FOR (f)
+#else
+#define GOBJECT_DEPRECATED_IN_2_80 _GOBJECT_EXTERN
+#define GOBJECT_DEPRECATED_IN_2_80_FOR(f) _GOBJECT_EXTERN
+#define GOBJECT_DEPRECATED_MACRO_IN_2_80
+#define GOBJECT_DEPRECATED_MACRO_IN_2_80_FOR(f)
+#define GOBJECT_DEPRECATED_ENUMERATOR_IN_2_80
+#define GOBJECT_DEPRECATED_ENUMERATOR_IN_2_80_FOR(f)
+#define GOBJECT_DEPRECATED_TYPE_IN_2_80
+#define GOBJECT_DEPRECATED_TYPE_IN_2_80_FOR(f)
+#endif
+
+#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_80
+#define GOBJECT_AVAILABLE_IN_2_80 GOBJECT_UNAVAILABLE (2, 80)
+#define GOBJECT_AVAILABLE_STATIC_INLINE_IN_2_80 GLIB_UNAVAILABLE_STATIC_INLINE (2, 80)
+#define GOBJECT_AVAILABLE_MACRO_IN_2_80 GLIB_UNAVAILABLE_MACRO (2, 80)
+#define GOBJECT_AVAILABLE_ENUMERATOR_IN_2_80 GLIB_UNAVAILABLE_ENUMERATOR (2, 80)
+#define GOBJECT_AVAILABLE_TYPE_IN_2_80 GLIB_UNAVAILABLE_TYPE (2, 80)
+#else
+#define GOBJECT_AVAILABLE_IN_2_80 _GOBJECT_EXTERN
+#define GOBJECT_AVAILABLE_STATIC_INLINE_IN_2_80
+#define GOBJECT_AVAILABLE_MACRO_IN_2_80
+#define GOBJECT_AVAILABLE_ENUMERATOR_IN_2_80
+#define GOBJECT_AVAILABLE_TYPE_IN_2_80
+#endif
\ No newline at end of file
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gobject.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gobject.c
index 722712a6fe7..69ea338c9b8 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gobject.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gobject.c
@@ -38,102 +38,30 @@
 #include "gconstructor.h"
 
 /**
- * SECTION:objects
- * @title: GObject
- * @short_description: The base object type
- * @see_also: #GParamSpecObject, g_param_spec_object()
+ * GObject:
  *
- * GObject is the fundamental type providing the common attributes and
+ * The base object type.
+ *
+ * `GObject` is the fundamental type providing the common attributes and
  * methods for all object types in GTK, Pango and other libraries
- * based on GObject.  The GObject class provides methods for object
+ * based on GObject. The `GObject` class provides methods for object
  * construction and destruction, property access methods, and signal
- * support.  Signals are described in detail [here][gobject-Signals].
- *
- * For a tutorial on implementing a new GObject class, see [How to define and
- * implement a new GObject][howto-gobject]. For a list of naming conventions for
- * GObjects and their methods, see the [GType conventions][gtype-conventions].
- * For the high-level concepts behind GObject, read [Instantiatable classed types:
- * Objects][gtype-instantiatable-classed].
- *
- * ## Floating references # {#floating-ref}
- *
- * **Note**: Floating references are a C convenience API and should not be
- * used in modern GObject code. Language bindings in particular find the
- * concept highly problematic, as floating references are not identifiable
- * through annotations, and neither are deviations from the floating reference
- * behavior, like types that inherit from #GInitiallyUnowned and still return
- * a full reference from g_object_new().
- *
- * GInitiallyUnowned is derived from GObject. The only difference between
- * the two is that the initial reference of a GInitiallyUnowned is flagged
- * as a "floating" reference. This means that it is not specifically
- * claimed to be "owned" by any code portion. The main motivation for
- * providing floating references is C convenience. In particular, it
- * allows code to be written as:
- *
- * |[<!-- language="C" -->
- * container = create_container ();
- * container_add_child (container, create_child());
- * ]|
- *
- * If container_add_child() calls g_object_ref_sink() on the passed-in child,
- * no reference of the newly created child is leaked. Without floating
- * references, container_add_child() can only g_object_ref() the new child,
- * so to implement this code without reference leaks, it would have to be
- * written as:
- *
- * |[<!-- language="C" -->
- * Child *child;
- * container = create_container ();
- * child = create_child ();
- * container_add_child (container, child);
- * g_object_unref (child);
- * ]|
- *
- * The floating reference can be converted into an ordinary reference by
- * calling g_object_ref_sink(). For already sunken objects (objects that
- * don't have a floating reference anymore), g_object_ref_sink() is equivalent
- * to g_object_ref() and returns a new reference.
- *
- * Since floating references are useful almost exclusively for C convenience,
- * language bindings that provide automated reference and memory ownership
- * maintenance (such as smart pointers or garbage collection) should not
- * expose floating references in their API. The best practice for handling
- * types that have initially floating references is to immediately sink those
- * references after g_object_new() returns, by checking if the #GType
- * inherits from #GInitiallyUnowned. For instance:
- *
- * |[<!-- language="C" -->
- * GObject *res = g_object_new_with_properties (gtype,
- *                                              n_props,
- *                                              prop_names,
- *                                              prop_values);
+ * support. Signals are described in detail [here][gobject-Signals].
  *
- * // or: if (g_type_is_a (gtype, G_TYPE_INITIALLY_UNOWNED))
- * if (G_IS_INITIALLY_UNOWNED (res))
- *   g_object_ref_sink (res);
+ * For a tutorial on implementing a new `GObject` class, see [How to define and
+ * implement a new GObject](tutorial.html#how-to-define-and-implement-a-new-gobject).
+ * For a list of naming conventions for GObjects and their methods, see the
+ * [GType conventions](concepts.html#conventions). For the high-level concepts
+ * behind GObject, read
+ * [Instantiatable classed types: Objects](concepts.html#instantiatable-classed-types-objects).
  *
- * return res;
- * ]|
- *
- * Some object implementations may need to save an objects floating state
- * across certain code portions (an example is #GtkMenu), to achieve this,
- * the following sequence can be used:
- *
- * |[<!-- language="C" -->
- * // save floating state
- * gboolean was_floating = g_object_is_floating (object);
- * g_object_ref_sink (object);
- * // protected code portion
- *
- * ...
- *
- * // restore floating state
- * if (was_floating)
- *   g_object_force_floating (object);
- * else
- *   g_object_unref (object); // release previously acquired reference
- * ]|
+ * Since GLib 2.72, all `GObject`s are guaranteed to be aligned to at least the
+ * alignment of the largest basic GLib type (typically this is `guint64` or
+ * `gdouble`). If you need larger alignment for an element in a `GObject`, you
+ * should allocate it on the heap (aligned), or arrange for your `GObject` to be
+ * appropriately padded. This guarantee applies to the `GObject` (or derived)
+ * struct, the `GObjectClass` (or derived) struct, and any private data allocated
+ * by `G_ADD_PRIVATE()`.
  */
 
 /* --- macros --- */
@@ -174,12 +102,52 @@ enum {
   PROP_NONE
 };
 
+#define _OPTIONAL_BIT_LOCK               3
+
 #define OPTIONAL_FLAG_IN_CONSTRUCTION    (1 << 0)
 #define OPTIONAL_FLAG_HAS_SIGNAL_HANDLER (1 << 1) /* Set if object ever had a signal handler */
 #define OPTIONAL_FLAG_HAS_NOTIFY_HANDLER (1 << 2) /* Same, specifically for "notify" */
+#define OPTIONAL_FLAG_LOCK               (1 << 3) /* _OPTIONAL_BIT_LOCK */
+#define OPTIONAL_FLAG_EVER_HAD_WEAK_REF  (1 << 4) /* whether on the object ever g_weak_ref_set() was called. */
+
+/* We use g_bit_lock(), which only supports one lock per integer.
+ *
+ * Hence, while we have locks for different purposes, internally they all
+ * map to the same bit lock (_OPTIONAL_BIT_LOCK).
+ *
+ * This means you cannot take a lock (object_bit_lock()) while already holding
+ * another bit lock. There is an assert against that with G_ENABLE_DEBUG
+ * builds (_object_bit_is_locked).
+ *
+ * In the past, we had different global mutexes per topic. Now we have one
+ * per-object mutex for several topics. The downside is that we are not as
+ * parallel as possible. The alternative would be to add individual locking
+ * integers to GObjectPrivate. But increasing memory usage for more parallelism
+ * (per-object!) is not worth it. */
+#define OPTIONAL_BIT_LOCK_WEAK_REFS      1
+#define OPTIONAL_BIT_LOCK_NOTIFY         2
+#define OPTIONAL_BIT_LOCK_TOGGLE_REFS    3
+#define OPTIONAL_BIT_LOCK_CLOSURE_ARRAY  4
+
+#if SIZEOF_INT == 4 && GLIB_SIZEOF_VOID_P >= 8
+#define HAVE_OPTIONAL_FLAGS_IN_GOBJECT 1
+#else
+#define HAVE_OPTIONAL_FLAGS_IN_GOBJECT 0
+#endif
 
-#if SIZEOF_INT == 4 && GLIB_SIZEOF_VOID_P == 8
-#define HAVE_OPTIONAL_FLAGS
+/* For now we only create a private struct if we don't have optional flags in
+ * GObject. Currently we don't need it otherwise. In the future we might
+ * always add a private struct. */
+#define HAVE_PRIVATE (!HAVE_OPTIONAL_FLAGS_IN_GOBJECT)
+
+#if HAVE_PRIVATE
+typedef struct {
+#if !HAVE_OPTIONAL_FLAGS_IN_GOBJECT
+  guint optional_flags; /* (atomic) */
+#endif
+} GObjectPrivate;
+
+static int GObject_private_offset;
 #endif
 
 typedef struct
@@ -188,7 +156,7 @@ typedef struct
 
   /*< private >*/
   guint          ref_count;  /* (atomic) */
-#ifdef HAVE_OPTIONAL_FLAGS
+#if HAVE_OPTIONAL_FLAGS_IN_GOBJECT
   guint          optional_flags;  /* (atomic) */
 #endif
   GData         *qdata;
@@ -239,10 +207,11 @@ static void     g_object_dispatch_properties_changed    (GObject        *object,
                                                          GParamSpec    **pspecs);
 static guint               object_floating_flag_handler (GObject        *object,
                                                          gint            job);
+static inline void object_set_optional_flags (GObject *object,
+                                              guint flags);
 
 static void object_interface_check_properties           (gpointer        check_data,
                                                          gpointer        g_iface);
-static void                weak_locations_free_unlocked (GSList **weak_locations);
 
 /* --- typedefs --- */
 typedef struct _GObjectNotifyQueue            GObjectNotifyQueue;
@@ -255,24 +224,431 @@ struct _GObjectNotifyQueue
 };
 
 /* --- variables --- */
-G_LOCK_DEFINE_STATIC (closure_array_mutex);
-G_LOCK_DEFINE_STATIC (weak_refs_mutex);
-G_LOCK_DEFINE_STATIC (toggle_refs_mutex);
-static GQuark               quark_closure_array = 0;
-static GQuark               quark_weak_refs = 0;
-static GQuark               quark_toggle_refs = 0;
-static GQuark               quark_notify_queue;
-#ifndef HAVE_OPTIONAL_FLAGS
-static GQuark               quark_in_construction;
-#endif
+static GQuark             quark_closure_array = 0;
+static GQuark             quark_weak_notifies = 0;
+static GQuark             quark_toggle_refs = 0;
+static GQuark             quark_notify_queue;
 static GParamSpecPool      *pspec_pool = NULL;
-static gulong               gobject_signals[LAST_SIGNAL] = { 0, };
+static gulong             gobject_signals[LAST_SIGNAL] = { 0, };
 static guint (*floating_flag_handler) (GObject*, gint) = object_floating_flag_handler;
-/* qdata pointing to GSList<GWeakRef *>, protected by weak_locations_lock */
-static GQuark               quark_weak_locations = 0;
-static GRWLock              weak_locations_lock;
+static GQuark             quark_weak_locations = 0;
+
+#if HAVE_PRIVATE
+G_ALWAYS_INLINE static inline GObjectPrivate *
+g_object_get_instance_private (GObject *object)
+{
+  return G_STRUCT_MEMBER_P (object, GObject_private_offset);
+}
+#endif
+
+G_ALWAYS_INLINE static inline guint *
+object_get_optional_flags_p (GObject *object)
+{
+#if HAVE_OPTIONAL_FLAGS_IN_GOBJECT
+  return &(((GObjectReal *) object)->optional_flags);
+#else
+  return &g_object_get_instance_private (object)->optional_flags;
+#endif
+}
+
+/*****************************************************************************/
+
+/* For GWeakRef, we need to take a lock per-object. However, in various cases
+ * we cannot take a strong reference on the object to keep it alive. So the
+ * mutex cannot be in the object itself, because when we want to release the
+ * lock, we can no longer access object.
+ *
+ * Instead, the mutex is on the WeakRefData, which is itself ref-counted
+ * and has a separate lifetime from the object. */
+typedef struct
+{
+  /* This is both an atomic ref-count and bit 30 (WEAK_REF_DATA_LOCK_BIT) is
+   * used for g_bit_lock(). */
+  gint atomic_field;
+
+  guint16 len;
+
+  /* Only relevant when len > 1. In that case, it's the allocated size of
+   * "list.many" array.  */
+  guint16 alloc;
+
+  /* Only relevant when len > 0. In that case, either "one" or "many" union
+   * field is in use. */
+  union
+  {
+    GWeakRef *one;
+    GWeakRef **many;
+  } list;
+} WeakRefData;
+
+/* We choose bit 30, and not bit 31. Bit 31 would be the sign for gint, so it
+ * a bit awkward to use. Note that it probably also would work fine.
+ *
+ * But 30 is ok, because it still leaves us space for 2^30-1 references, which
+ * is more than we ever need. */
+#define WEAK_REF_DATA_LOCK_BIT 30
+
+static void weak_ref_data_clear_list (WeakRefData *wrdata, GObject *object);
+
+static WeakRefData *
+weak_ref_data_ref (WeakRefData *wrdata)
+{
+  gint ref;
+
+#if G_ENABLE_DEBUG
+  g_assert (wrdata);
+#endif
+
+  ref = g_atomic_int_add (&wrdata->atomic_field, 1);
+
+#if G_ENABLE_DEBUG
+  /* Overflow is almost impossible to happen, because the user would need to
+   * spawn that many operating system threads, that all call
+   * g_weak_ref_{set,get}() in parallel.
+   *
+   * Still, assert in debug mode. */
+  g_assert (ref < G_MAXINT32);
+
+  /* the real ref-count would be the following: */
+  ref = (ref + 1) & ~(1 << WEAK_REF_DATA_LOCK_BIT);
+
+  /* assert that the ref-count is still in the valid range. */
+  g_assert (ref > 0 && ref < (1 << WEAK_REF_DATA_LOCK_BIT));
+#endif
+  (void) ref;
+
+  return wrdata;
+}
+
+static void
+weak_ref_data_unref (WeakRefData *wrdata)
+{
+  if (!wrdata)
+    return;
+
+  /* Note that we also use WEAK_REF_DATA_LOCK_BIT on "atomic_field" as a bit
+   * lock. However, we will always keep the @wrdata alive (having a reference)
+   * while holding a lock (otherwise, we couldn't unlock anymore). Thus, at the
+   * point when we decrement the ref-count to zero, we surely also have the
+   * @wrdata unlocked.
+   *
+   * This means, using "aomit_field" both as ref-count and the lock bit is
+   * fine. */
+
+  if (!g_atomic_int_dec_and_test (&wrdata->atomic_field))
+    return;
+
+#if G_ENABLE_DEBUG
+  /* We expect that the list of weak locations is empty at this point.
+   * During g_object_unref() (_object_unref_clear_weak_locations()) it
+   * should have been cleared.
+   *
+   * Calling weak_ref_data_clear_list() should be unnecessary. */
+  g_assert (wrdata->len == 0);
+#endif
+
+  g_free_sized (wrdata, sizeof (WeakRefData));
+}
+
+static void
+weak_ref_data_lock (WeakRefData *wrdata)
+{
+  /* Note that while holding a _weak_ref_lock() on the @weak_ref, we MUST not acquire a
+   * weak_ref_data_lock() on the @wrdata. The other way around! */
+  if (wrdata)
+    g_bit_lock (&wrdata->atomic_field, WEAK_REF_DATA_LOCK_BIT);
+}
+
+static void
+weak_ref_data_unlock (WeakRefData *wrdata)
+{
+  if (wrdata)
+    g_bit_unlock (&wrdata->atomic_field, WEAK_REF_DATA_LOCK_BIT);
+}
+
+static gpointer
+weak_ref_data_get_or_create_cb (GQuark key_id,
+                                gpointer *data,
+                                GDestroyNotify *destroy_notify,
+                                gpointer user_data)
+{
+  WeakRefData *wrdata = *data;
+  GObject *object = user_data;
+
+  if (!wrdata)
+    {
+      wrdata = g_new (WeakRefData, 1);
+
+      /* The initial ref-count is 1. This one is owned by the GData until the
+       * object gets destroyed.
+       *
+       * The WEAK_REF_DATA_LOCK_BIT bit is of course initially unset.  */
+      wrdata->atomic_field = 1;
+      wrdata->len = 0;
+      /* Other fields are left uninitialized. They are only considered with a positive @len. */
+
+      *data = wrdata;
+      *destroy_notify = (GDestroyNotify) weak_ref_data_unref;
+
+      /* Mark the @object that it was ever involved with GWeakRef. This flag
+       * will stick until @object gets destroyed, just like the WeakRefData
+       * also won't be freed for the remainder of the life of @object. */
+      object_set_optional_flags (object, OPTIONAL_FLAG_EVER_HAD_WEAK_REF);
+    }
+
+  return wrdata;
+}
+
+static WeakRefData *
+weak_ref_data_get_or_create (GObject *object)
+{
+  if (!object)
+    return NULL;
+
+  return _g_datalist_id_update_atomic (&object->qdata,
+                                       quark_weak_locations,
+                                       weak_ref_data_get_or_create_cb,
+                                       object);
+}
+
+static WeakRefData *
+weak_ref_data_get (GObject *object)
+{
+  return g_datalist_id_get_data (&object->qdata, quark_weak_locations);
+}
+
+static WeakRefData *
+weak_ref_data_get_surely (GObject *object)
+{
+  WeakRefData *wrdata;
+
+  /* The "surely" part is about that we expect to have a WeakRefData.
+   *
+   * Note that once a GObject gets a WeakRefData (during g_weak_ref_set() and
+   * weak_ref_data_get_or_create()), it sticks and is not freed until the
+   * object gets destroyed.
+   *
+   * Maybe we could release the unused WeakRefData in g_weak_ref_set(), but
+   * then we would always need to take a reference during weak_ref_data_get().
+   * That is likely not worth it. */
+
+  wrdata = weak_ref_data_get (object);
+#if G_ENABLE_DEBUG
+  g_assert (wrdata);
+#endif
+  return wrdata;
+}
+
+static gint32
+weak_ref_data_list_find (WeakRefData *wrdata, GWeakRef *weak_ref)
+{
+  if (wrdata->len == 1u)
+    {
+      if (wrdata->list.one == weak_ref)
+        return 0;
+    }
+  else
+    {
+      guint16 i;
+
+      for (i = 0; i < wrdata->len; i++)
+        {
+          if (wrdata->list.many[i] == weak_ref)
+            return i;
+        }
+    }
+
+  return -1;
+}
+
+static gboolean
+weak_ref_data_list_add (WeakRefData *wrdata, GWeakRef *weak_ref)
+{
+  if (wrdata->len == 0u)
+    wrdata->list.one = weak_ref;
+  else
+    {
+      if (wrdata->len == 1u)
+        {
+          GWeakRef *weak_ref2 = wrdata->list.one;
+
+          wrdata->alloc = 4u;
+          wrdata->list.many = g_new (GWeakRef *, wrdata->alloc);
+          wrdata->list.many[0] = weak_ref2;
+        }
+      else if (wrdata->len == wrdata->alloc)
+        {
+          guint16 alloc;
+
+          alloc = wrdata->alloc * 2u;
+          if (G_UNLIKELY (alloc < wrdata->len))
+            {
+              if (wrdata->len == G_MAXUINT16)
+                return FALSE;
+              alloc = G_MAXUINT16;
+            }
+          wrdata->list.many = g_renew (GWeakRef *, wrdata->list.many, alloc);
+          wrdata->alloc = alloc;
+        }
+
+      wrdata->list.many[wrdata->len] = weak_ref;
+    }
+
+  wrdata->len++;
+  return TRUE;
+}
+
+static GWeakRef *
+weak_ref_data_list_remove (WeakRefData *wrdata, guint16 idx, gboolean allow_shrink)
+{
+  GWeakRef *weak_ref;
+
+#if G_ENABLE_DEBUG
+  g_assert (idx < wrdata->len);
+#endif
+
+  wrdata->len--;
+
+  if (wrdata->len == 0u)
+    {
+      weak_ref = wrdata->list.one;
+    }
+  else
+    {
+      weak_ref = wrdata->list.many[idx];
+
+      if (wrdata->len == 1u)
+        {
+          GWeakRef *weak_ref2 = wrdata->list.many[idx == 0 ? 1 : 0];
+
+          g_free (wrdata->list.many);
+          wrdata->list.one = weak_ref2;
+        }
+      else
+        {
+          wrdata->list.many[idx] = wrdata->list.many[wrdata->len];
+
+          if (allow_shrink && G_UNLIKELY (wrdata->len <= wrdata->alloc / 4u))
+            {
+              /* Shrink the buffer. When 75% are empty, shrink it to 50%. */
+              if (wrdata->alloc == G_MAXUINT16)
+                wrdata->alloc = ((guint32) G_MAXUINT16 + 1u) / 2u;
+              else
+                wrdata->alloc /= 2u;
+              wrdata->list.many = g_renew (GWeakRef *, wrdata->list.many, wrdata->alloc);
+            }
+        }
+    }
+
+  return weak_ref;
+}
+
+static gboolean
+weak_ref_data_has (GObject *object, WeakRefData *wrdata, WeakRefData **out_new_wrdata)
+{
+  WeakRefData *wrdata2;
+
+  /* Check whether @object has @wrdata as WeakRefData. Note that an GObject's
+   * WeakRefData never changes (until destruction, once it's allocated).
+   *
+   * If you thus hold a reference to a @wrdata, you can check that the @object
+   * is still the same as the object where we got the @wrdata originally from.
+   *
+   * You couldn't do this check by using pointer equality of the GObject pointers,
+   * when you cannot hold strong references on the objects involved. Because then
+   * the object pointer might be dangling (and even destroyed and recreated as another
+   * object at the same memory location).
+   *
+   * Basically, weak_ref_data_has() is to compare for equality of two GObject pointers,
+   * when we cannot hold a strong reference on both. Instead, we earlier took a reference
+   * on the @wrdata and compare that instead.
+   */
+
+  if (!object)
+    {
+      /* If @object is NULL, then it does have a NULL @wrdata, and we return
+       * TRUE in the case.  That's a convenient special case for some callers.
+       *
+       * In other words, weak_ref_data_has(NULL, NULL, out_new_wrdata) is TRUE.
+       */
+#if G_ENABLE_DEBUG
+      g_assert (!out_new_wrdata);
+#endif
+      return !wrdata;
+    }
+
+  if (!wrdata)
+    {
+      /* We only call this function with an @object that was previously
+       * registered as GWeakRef.
+       *
+       * That means, our @object will have a wrdata, and the result of the
+       * evaluation will be %FALSE. */
+      if (out_new_wrdata)
+        *out_new_wrdata = weak_ref_data_ref (weak_ref_data_get (object));
+#if G_ENABLE_DEBUG
+      g_assert (out_new_wrdata
+                    ? *out_new_wrdata
+                    : weak_ref_data_get (object));
+#endif
+      return FALSE;
+    }
+
+  wrdata2 = weak_ref_data_get_surely (object);
 
-G_LOCK_DEFINE_STATIC(notify_lock);
+  if (wrdata == wrdata2)
+    {
+      if (out_new_wrdata)
+        *out_new_wrdata = NULL;
+      return TRUE;
+    }
+
+  if (out_new_wrdata)
+    *out_new_wrdata = weak_ref_data_ref (wrdata2);
+  return FALSE;
+}
+
+/*****************************************************************************/
+
+#if defined(G_ENABLE_DEBUG) && defined(G_THREAD_LOCAL)
+/* Using this thread-local global is sufficient to guard the per-object
+ * locking, because while the current thread holds a lock on one object, it
+ * never calls out to another object (because doing so would would be prone to
+ * deadlock). */
+static G_THREAD_LOCAL guint _object_bit_is_locked;
+#endif
+
+static void
+object_bit_lock (GObject *object, guint lock_bit)
+{
+#if defined(G_ENABLE_DEBUG) && defined(G_THREAD_LOCAL)
+  /* all object_bit_lock() really use the same bit/mutex. The "lock_bit" argument
+   * only exists for asserting. object_bit_lock() is not re-entrant (also not with
+   * different "lock_bit" values). */
+  g_assert (lock_bit > 0);
+  g_assert (_object_bit_is_locked == 0);
+  _object_bit_is_locked = lock_bit;
+#endif
+
+  g_bit_lock ((gint *) object_get_optional_flags_p (object), _OPTIONAL_BIT_LOCK);
+}
+
+static void
+object_bit_unlock (GObject *object, guint lock_bit)
+{
+#if defined(G_ENABLE_DEBUG) && defined(G_THREAD_LOCAL)
+  /* All lock_bit map to the same mutex. We cannot use two different locks on
+   * the same integer. Assert against that. */
+  g_assert (lock_bit > 0);
+  g_assert (_object_bit_is_locked == lock_bit);
+  _object_bit_is_locked = 0;
+#endif
+
+  /* Warning: after unlock, @object may be a dangling pointer (destroyed on
+   * another thread) and must not be touched anymore. */
+
+  g_bit_unlock ((gint *) object_get_optional_flags_p (object), _OPTIONAL_BIT_LOCK);
+}
 
 /* --- functions --- */
 static void
@@ -281,28 +657,37 @@ g_object_notify_queue_free (gpointer data)
   GObjectNotifyQueue *nqueue = data;
 
   g_slist_free (nqueue->pspecs);
-  g_slice_free (GObjectNotifyQueue, nqueue);
+  g_free_sized (nqueue, sizeof (GObjectNotifyQueue));
 }
 
-static GObjectNotifyQueue*
-g_object_notify_queue_freeze (GObject  *object,
-                              gboolean  conditional)
+static GObjectNotifyQueue *
+g_object_notify_queue_create_queue_frozen (GObject *object)
 {
   GObjectNotifyQueue *nqueue;
 
-  G_LOCK(notify_lock);
+  nqueue = g_new0 (GObjectNotifyQueue, 1);
+
+  *nqueue = (GObjectNotifyQueue){
+    .freeze_count = 1,
+  };
+
+  g_datalist_id_set_data_full (&object->qdata, quark_notify_queue,
+                               nqueue, g_object_notify_queue_free);
+
+  return nqueue;
+}
+
+static GObjectNotifyQueue *
+g_object_notify_queue_freeze (GObject *object)
+{
+  GObjectNotifyQueue *nqueue;
+
+  object_bit_lock (object, OPTIONAL_BIT_LOCK_NOTIFY);
   nqueue = g_datalist_id_get_data (&object->qdata, quark_notify_queue);
   if (!nqueue)
     {
-      if (conditional)
-        {
-          G_UNLOCK(notify_lock);
-          return NULL;
-        }
-
-      nqueue = g_slice_new0 (GObjectNotifyQueue);
-      g_datalist_id_set_data_full (&object->qdata, quark_notify_queue,
-                                   nqueue, g_object_notify_queue_free);
+      nqueue = g_object_notify_queue_create_queue_frozen (object);
+      goto out;
     }
 
   if (nqueue->freeze_count >= 65535)
@@ -313,25 +698,33 @@ g_object_notify_queue_freeze (GObject  *object,
   else
     nqueue->freeze_count++;
 
-  G_UNLOCK(notify_lock);
+out:
+  object_bit_unlock (object, OPTIONAL_BIT_LOCK_NOTIFY);
 
   return nqueue;
 }
 
 static void
 g_object_notify_queue_thaw (GObject            *object,
-                            GObjectNotifyQueue *nqueue)
+                            GObjectNotifyQueue *nqueue,
+                            gboolean take_ref)
 {
   GParamSpec *pspecs_mem[16], **pspecs, **free_me = NULL;
   GSList *slist;
   guint n_pspecs = 0;
 
-  G_LOCK(notify_lock);
+  object_bit_lock (object, OPTIONAL_BIT_LOCK_NOTIFY);
+
+  if (!nqueue)
+    {
+      /* Caller didn't look up the queue yet. Do it now. */
+      nqueue = g_datalist_id_get_data (&object->qdata, quark_notify_queue);
+    }
 
   /* Just make sure we never get into some nasty race condition */
-  if (G_UNLIKELY (nqueue->freeze_count == 0))
+  if (G_UNLIKELY (!nqueue || nqueue->freeze_count == 0))
     {
-      G_UNLOCK (notify_lock);
+      object_bit_unlock (object, OPTIONAL_BIT_LOCK_NOTIFY);
       g_critical ("%s: property-changed notification for %s(%p) is not frozen",
                   G_STRFUNC, G_OBJECT_TYPE_NAME (object), object);
       return;
@@ -340,7 +733,7 @@ g_object_notify_queue_thaw (GObject            *object,
   nqueue->freeze_count--;
   if (nqueue->freeze_count)
     {
-      G_UNLOCK (notify_lock);
+      object_bit_unlock (object, OPTIONAL_BIT_LOCK_NOTIFY);
       return;
     }
 
@@ -352,19 +745,55 @@ g_object_notify_queue_thaw (GObject            *object,
     }
   g_datalist_id_set_data (&object->qdata, quark_notify_queue, NULL);
 
-  G_UNLOCK(notify_lock);
+  object_bit_unlock (object, OPTIONAL_BIT_LOCK_NOTIFY);
 
   if (n_pspecs)
-    G_OBJECT_GET_CLASS (object)->dispatch_properties_changed (object, n_pspecs, pspecs);
+    {
+      if (take_ref)
+        g_object_ref (object);
+
+      G_OBJECT_GET_CLASS (object)->dispatch_properties_changed (object, n_pspecs, pspecs);
+
+      if (take_ref)
+        g_object_unref (object);
+    }
   g_free (free_me);
 }
 
-static void
+static gboolean
 g_object_notify_queue_add (GObject            *object,
                            GObjectNotifyQueue *nqueue,
-                           GParamSpec         *pspec)
+                           GParamSpec         *pspec,
+                           gboolean            in_init)
 {
-  G_LOCK(notify_lock);
+  object_bit_lock (object, OPTIONAL_BIT_LOCK_NOTIFY);
+
+  if (!nqueue)
+    {
+      /* We are called without an nqueue. Figure out whether a notification
+       * should be queued. */
+      nqueue = g_datalist_id_get_data (&object->qdata, quark_notify_queue);
+
+      if (!nqueue)
+        {
+          if (!in_init)
+            {
+              /* We don't have a notify queue and are not in_init. The event
+               * is not to be queued. The caller will dispatch directly. */
+              object_bit_unlock (object, OPTIONAL_BIT_LOCK_NOTIFY);
+              return FALSE;
+            }
+
+          /* We are "in_init", but did not freeze the queue in g_object_init
+           * yet. Instead, we gained a notify handler in instance init, so now
+           * we need to freeze just-in-time.
+           *
+           * Note that this freeze will be balanced at the end of object
+           * initialization.
+           */
+          nqueue = g_object_notify_queue_create_queue_frozen (object);
+        }
+    }
 
   g_assert (nqueue->n_pspecs < 65535);
 
@@ -374,7 +803,9 @@ g_object_notify_queue_add (GObject            *object,
       nqueue->n_pspecs++;
     }
 
-  G_UNLOCK(notify_lock);
+  object_bit_unlock (object, OPTIONAL_BIT_LOCK_NOTIFY);
+
+  return TRUE;
 }
 
 #ifdef  G_ENABLE_DEBUG
@@ -472,6 +903,31 @@ _g_object_type_init (void)
 # endif /* G_HAS_CONSTRUCTORS */
     }
 #endif /* G_ENABLE_DEBUG */
+
+#if HAVE_PRIVATE
+  GObject_private_offset =
+      g_type_add_instance_private (G_TYPE_OBJECT, sizeof (GObjectPrivate));
+#endif
+}
+
+/* Initialize the global GParamSpecPool; this function needs to be
+ * called whenever we access the GParamSpecPool and we cannot guarantee
+ * that g_object_do_class_init() has been called: for instance, by the
+ * interface property API.
+ *
+ * To avoid yet another global lock, we use atomic pointer checks: the
+ * first caller of this function will win the race. Any other access to
+ * the GParamSpecPool is done under its own mutex.
+ */
+static inline void
+g_object_init_pspec_pool (void)
+{
+  if (G_UNLIKELY (g_atomic_pointer_get (&pspec_pool) == NULL))
+    {
+      GParamSpecPool *pool = g_param_spec_pool_new (TRUE);
+      if (!g_atomic_pointer_compare_and_exchange (&pspec_pool, NULL, pool))
+        g_param_spec_pool_free (pool);
+    }
 }
 
 static void
@@ -519,17 +975,13 @@ g_object_base_class_finalize (GObjectClass *class)
 static void
 g_object_do_class_init (GObjectClass *class)
 {
-  /* read the comment about typedef struct CArray; on why not to change this quark */
   quark_closure_array = g_quark_from_static_string ("GObject-closure-array");
-
-  quark_weak_refs = g_quark_from_static_string ("GObject-weak-references");
+  quark_weak_notifies = g_quark_from_static_string ("GObject-weak-notifies");
   quark_weak_locations = g_quark_from_static_string ("GObject-weak-locations");
   quark_toggle_refs = g_quark_from_static_string ("GObject-toggle-references");
   quark_notify_queue = g_quark_from_static_string ("GObject-notify-queue");
-#ifndef HAVE_OPTIONAL_FLAGS
-  quark_in_construction = g_quark_from_static_string ("GObject-in-construction");
-#endif
-  pspec_pool = g_param_spec_pool_new (TRUE);
+
+  g_object_init_pspec_pool ();
 
   class->constructor = g_object_constructor;
   class->constructed = g_object_constructed;
@@ -585,6 +1037,10 @@ g_object_do_class_init (GObjectClass *class)
    * implement an interface implement all properties for that interface
    */
   g_type_add_interface_check (NULL, object_interface_check_properties);
+
+#if HAVE_PRIVATE
+  g_type_class_adjust_private_offset (class, &GObject_private_offset);
+#endif
 }
 
 /* Sinks @pspec if it’s a floating ref. */
@@ -595,6 +1051,8 @@ install_property_internal (GType       g_type,
 {
   g_param_spec_ref_sink (pspec);
 
+  g_object_init_pspec_pool ();
+
   if (g_param_spec_pool_lookup (pspec_pool, pspec->name, g_type, FALSE))
     {
       g_critical ("When installing property: type '%s' already has a property named '%s'",
@@ -819,13 +1277,13 @@ find_pspec (GObjectClass *class,
  *   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
  *
  *   obj_properties[PROP_FOO] =
- *     g_param_spec_int ("foo", "Foo", "Foo",
+ *     g_param_spec_int ("foo", NULL, NULL,
  *                       -1, G_MAXINT,
  *                       0,
  *                       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
  *
  *   obj_properties[PROP_BAR] =
- *     g_param_spec_string ("bar", "Bar", "Bar",
+ *     g_param_spec_string ("bar", NULL, NULL,
  *                          NULL,
  *                          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
  *
@@ -1021,6 +1479,8 @@ g_object_interface_find_property (gpointer      g_iface,
   g_return_val_if_fail (G_TYPE_IS_INTERFACE (iface_class->g_type), NULL);
   g_return_val_if_fail (property_name != NULL, NULL);
 
+  g_object_init_pspec_pool ();
+
   return g_param_spec_pool_lookup (pspec_pool,
            property_name,
            iface_class->g_type,
@@ -1146,10 +1606,10 @@ g_object_class_list_properties (GObjectClass *class,
  * Since: 2.4
  *
  * Returns: (array length=n_properties_p) (transfer container): a
- *          pointer to an array of pointers to #GParamSpec
- *          structures. The paramspecs are owned by GLib, but the
- *          array should be freed with g_free() when you are done with
- *          it.
+ *   pointer to an array of pointers to #GParamSpec
+ *   structures. The paramspecs are owned by GLib, but the
+ *   array should be freed with g_free() when you are done with
+ *   it.
  */
 GParamSpec**
 g_object_interface_list_properties (gpointer      g_iface,
@@ -1161,6 +1621,8 @@ g_object_interface_list_properties (gpointer      g_iface,
 
   g_return_val_if_fail (G_TYPE_IS_INTERFACE (iface_class->g_type), NULL);
 
+  g_object_init_pspec_pool ();
+
   pspecs = g_param_spec_pool_list (pspec_pool,
            iface_class->g_type,
            &n);
@@ -1173,133 +1635,62 @@ g_object_interface_list_properties (gpointer      g_iface,
 static inline guint
 object_get_optional_flags (GObject *object)
 {
-#ifdef HAVE_OPTIONAL_FLAGS
-  GObjectReal *real = (GObjectReal *)object;
-  return (guint)g_atomic_int_get (&real->optional_flags);
-#else
-  return 0;
-#endif
-}
-
-/* Variant of object_get_optional_flags for when
- * we know that we have exclusive access (during
- * construction)
- */
-static inline guint
-object_get_optional_flags_X (GObject *object)
-{
-#ifdef HAVE_OPTIONAL_FLAGS
-  GObjectReal *real = (GObjectReal *)object;
-  return real->optional_flags;
-#else
-  return 0;
-#endif
+  return g_atomic_int_get (object_get_optional_flags_p (object));
 }
 
-#ifdef HAVE_OPTIONAL_FLAGS
 static inline void
 object_set_optional_flags (GObject *object,
                           guint flags)
 {
-  GObjectReal *real = (GObjectReal *)object;
-  g_atomic_int_or (&real->optional_flags, flags);
+  g_atomic_int_or (object_get_optional_flags_p (object), flags);
 }
 
-/* Variant for when we have exclusive access
- * (during construction)
- */
-static inline void
-object_set_optional_flags_X (GObject *object,
-                             guint flags)
-{
-  GObjectReal *real = (GObjectReal *)object;
-  real->optional_flags |= flags;
-}
-
-/* Variant for when we have exclusive access
- * (during construction)
- */
 static inline void
-object_unset_optional_flags_X (GObject *object,
+object_unset_optional_flags (GObject *object,
                                guint flags)
 {
-  GObjectReal *real = (GObjectReal *)object;
-  real->optional_flags &= ~flags;
+  g_atomic_int_and (object_get_optional_flags_p (object), ~flags);
 }
-#endif
 
 gboolean
 _g_object_has_signal_handler (GObject *object)
 {
-#ifdef HAVE_OPTIONAL_FLAGS
   return (object_get_optional_flags (object) & OPTIONAL_FLAG_HAS_SIGNAL_HANDLER) != 0;
-#else
-  return TRUE;
-#endif
 }
 
 static inline gboolean
 _g_object_has_notify_handler (GObject *object)
 {
-#ifdef HAVE_OPTIONAL_FLAGS
   return CLASS_NEEDS_NOTIFY (G_OBJECT_GET_CLASS (object)) ||
          (object_get_optional_flags (object) & OPTIONAL_FLAG_HAS_NOTIFY_HANDLER) != 0;
-#else
-  return TRUE;
-#endif
-}
-
-static inline gboolean
-_g_object_has_notify_handler_X (GObject *object)
-{
-#ifdef HAVE_OPTIONAL_FLAGS
-  return CLASS_NEEDS_NOTIFY (G_OBJECT_GET_CLASS (object)) ||
-         (object_get_optional_flags_X (object) & OPTIONAL_FLAG_HAS_NOTIFY_HANDLER) != 0;
-#else
-  return TRUE;
-#endif
 }
 
 void
 _g_object_set_has_signal_handler (GObject *object,
                                   guint    signal_id)
 {
-#ifdef HAVE_OPTIONAL_FLAGS
   guint flags = OPTIONAL_FLAG_HAS_SIGNAL_HANDLER;
   if (signal_id == gobject_signals[NOTIFY])
     flags |= OPTIONAL_FLAG_HAS_NOTIFY_HANDLER;
   object_set_optional_flags (object, flags);
-#endif
 }
 
 static inline gboolean
 object_in_construction (GObject *object)
 {
-#ifdef HAVE_OPTIONAL_FLAGS
   return (object_get_optional_flags (object) & OPTIONAL_FLAG_IN_CONSTRUCTION) != 0;
-#else
-  return g_datalist_id_get_data (&object->qdata, quark_in_construction) != NULL;
-#endif
 }
 
 static inline void
 set_object_in_construction (GObject *object)
 {
-#ifdef HAVE_OPTIONAL_FLAGS
-  object_set_optional_flags_X (object, OPTIONAL_FLAG_IN_CONSTRUCTION);
-#else
-  g_datalist_id_set_data (&object->qdata, quark_in_construction, object);
-#endif
+  object_set_optional_flags (object, OPTIONAL_FLAG_IN_CONSTRUCTION);
 }
 
 static inline void
 unset_object_in_construction (GObject *object)
 {
-#ifdef HAVE_OPTIONAL_FLAGS
-  object_unset_optional_flags_X (object, OPTIONAL_FLAG_IN_CONSTRUCTION);
-#else
-  g_datalist_id_set_data (&object->qdata, quark_in_construction, NULL);
-#endif
+  object_unset_optional_flags (object, OPTIONAL_FLAG_IN_CONSTRUCTION);
 }
 
 static void
@@ -1312,7 +1703,7 @@ g_object_init (GObject          *object,
   if (CLASS_HAS_PROPS (class) && CLASS_NEEDS_NOTIFY (class))
     {
       /* freeze object's notification queue, g_object_new_internal() preserves pairedness */
-      g_object_notify_queue_freeze (object, FALSE);
+      g_object_notify_queue_freeze (object);
     }
 
   /* mark object in-construction for notify_queue_thaw() and to allow construct-only properties */
@@ -1359,9 +1750,10 @@ static void
 g_object_real_dispose (GObject *object)
 {
   g_signal_handlers_destroy (object);
+
+  /* GWeakNotify and GClosure can call into user code */
+  g_datalist_id_set_data (&object->qdata, quark_weak_notifies, NULL);
   g_datalist_id_set_data (&object->qdata, quark_closure_array, NULL);
-  g_datalist_id_set_data (&object->qdata, quark_weak_refs, NULL);
-  g_datalist_id_set_data (&object->qdata, quark_weak_locations, NULL);
 }
 
 #ifdef G_ENABLE_DEBUG
@@ -1439,13 +1831,25 @@ g_object_dispatch_properties_changed (GObject     *object,
 void
 g_object_run_dispose (GObject *object)
 {
+  WeakRefData *wrdata;
+
   g_return_if_fail (G_IS_OBJECT (object));
   g_return_if_fail (g_atomic_int_get (&object->ref_count) > 0);
 
   g_object_ref (object);
+
   TRACE (GOBJECT_OBJECT_DISPOSE(object,G_TYPE_FROM_INSTANCE(object), 0));
   G_OBJECT_GET_CLASS (object)->dispose (object);
   TRACE (GOBJECT_OBJECT_DISPOSE_END(object,G_TYPE_FROM_INSTANCE(object), 0));
+
+  if ((object_get_optional_flags (object) & OPTIONAL_FLAG_EVER_HAD_WEAK_REF))
+    {
+      wrdata = weak_ref_data_get_surely (object);
+      weak_ref_data_lock (wrdata);
+      weak_ref_data_clear_list (wrdata, object);
+      weak_ref_data_unlock (wrdata);
+    }
+
   g_object_unref (object);
 }
 
@@ -1469,7 +1873,7 @@ g_object_freeze_notify (GObject *object)
   g_return_if_fail (G_IS_OBJECT (object));
 
 #ifndef G_DISABLE_CHECKS
-  if (G_UNLIKELY (g_atomic_int_get (&object->ref_count) == 0))
+  if (G_UNLIKELY (g_atomic_int_get (&object->ref_count) <= 0))
     {
       g_critical ("Attempting to freeze the notification queue for object %s[%p]; "
                   "Property notification does not work during instance finalization.",
@@ -1479,18 +1883,14 @@ g_object_freeze_notify (GObject *object)
 }
 #endif
 
-  g_object_ref (object);
-  g_object_notify_queue_freeze (object, FALSE);
-  g_object_unref (object);
+  g_object_notify_queue_freeze (object);
 }
 
 static inline void
 g_object_notify_by_spec_internal (GObject    *object,
           GParamSpec *pspec)
 {
-  #ifdef HAVE_OPTIONAL_FLAGS
   guint object_flags;
-#endif
   gboolean needs_notify;
   gboolean in_init;
 
@@ -1499,42 +1899,15 @@ g_object_notify_by_spec_internal (GObject    *object,
 
   param_spec_follow_override (&pspec);
 
-#ifdef HAVE_OPTIONAL_FLAGS
   /* get all flags we need with a single atomic read */
   object_flags = object_get_optional_flags (object);
   needs_notify = ((object_flags & OPTIONAL_FLAG_HAS_NOTIFY_HANDLER) != 0) ||
                   CLASS_NEEDS_NOTIFY (G_OBJECT_GET_CLASS (object));
   in_init = (object_flags & OPTIONAL_FLAG_IN_CONSTRUCTION) != 0;
-#else
-  needs_notify = TRUE;
-  in_init = object_in_construction (object);
-#endif
 
   if (pspec != NULL && needs_notify)
     {
-      GObjectNotifyQueue *nqueue;
-      gboolean need_thaw = TRUE;
-
-      /* conditional freeze: only increase freeze count if already frozen */
-      nqueue = g_object_notify_queue_freeze (object, TRUE);
-      if (in_init && !nqueue)
-        {
-          /* We did not freeze the queue in g_object_init, but
-           * we gained a notify handler in instance init, so
-           * now we need to freeze just-in-time
-           */
-          nqueue = g_object_notify_queue_freeze (object, FALSE);
-          need_thaw = FALSE;
-        }
-
-      if (nqueue != NULL)
-        {
-          /* we're frozen, so add to the queue and release our freeze */
-          g_object_notify_queue_add (object, nqueue, pspec);
-          if (need_thaw)
-            g_object_notify_queue_thaw (object, nqueue);
-        }
-      else
+      if (!g_object_notify_queue_add (object, NULL, pspec, in_init))
         {
           /*
            * Coverity doesn’t understand the paired ref/unref here and seems to
@@ -1628,7 +2001,7 @@ g_object_notify (GObject     *object,
  *   static void
  *   my_object_class_init (MyObjectClass *klass)
  *   {
- *     properties[PROP_FOO] = g_param_spec_int ("foo", "Foo", "The foo",
+ *     properties[PROP_FOO] = g_param_spec_int ("foo", NULL, NULL,
  *                                              0, 100,
  *                                              50,
  *                                              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
@@ -1674,12 +2047,10 @@ g_object_notify_by_pspec (GObject    *object,
 void
 g_object_thaw_notify (GObject *object)
 {
-  GObjectNotifyQueue *nqueue;
-
   g_return_if_fail (G_IS_OBJECT (object));
 
 #ifndef G_DISABLE_CHECKS
-  if (G_UNLIKELY (g_atomic_int_get (&object->ref_count) == 0))
+  if (G_UNLIKELY (g_atomic_int_get (&object->ref_count) <= 0))
     {
       g_critical ("Attempting to thaw the notification queue for object %s[%p]; "
                   "Property notification does not work during instance finalization.",
@@ -1689,17 +2060,7 @@ g_object_thaw_notify (GObject *object)
     }
 #endif
 
-
-  g_object_ref (object);
-
-  /* FIXME: Freezing is the only way to get at the notify queue.
-   * So we freeze once and then thaw twice.
-   */
-  nqueue = g_object_notify_queue_freeze (object, FALSE);
-  g_object_notify_queue_thaw (object, nqueue);
-  g_object_notify_queue_thaw (object, nqueue);
-
-  g_object_unref (object);
+  g_object_notify_queue_thaw (object, NULL, TRUE);
 }
 
 static void
@@ -1710,14 +2071,14 @@ maybe_issue_property_deprecation_warning (const GParamSpec *pspec)
   static GMutex already_warned_lock;
   gboolean already;
 
-  if (g_once_init_enter (&enable_diagnostic))
+  if (g_once_init_enter_pointer (&enable_diagnostic))
     {
       const gchar *value = g_getenv ("G_ENABLE_DIAGNOSTIC");
 
       if (!value)
         value = "0";
 
-      g_once_init_leave (&enable_diagnostic, value);
+      g_once_init_leave_pointer (&enable_diagnostic, value);
     }
 
   if (enable_diagnostic[0] == '0')
@@ -1843,7 +2204,7 @@ object_set_property (GObject             *object,
 
   if ((pspec->flags & (G_PARAM_EXPLICIT_NOTIFY | G_PARAM_READABLE)) == G_PARAM_READABLE &&
       nqueue != NULL)
-    g_object_notify_queue_add (object, nqueue, pspec);
+    g_object_notify_queue_add (object, nqueue, pspec, FALSE);
 }
 
 static void
@@ -2202,7 +2563,7 @@ g_object_new_with_custom_constructor (GObjectClass          *class,
 
   if (CLASS_HAS_PROPS (class))
     {
-      if ((newly_constructed && _g_object_has_notify_handler_X (object)) ||
+      if ((newly_constructed && _g_object_has_notify_handler (object)) ||
           _g_object_has_notify_handler (object))
         {
           /* This may or may not have been setup in g_object_init().
@@ -2210,7 +2571,7 @@ g_object_new_with_custom_constructor (GObjectClass          *class,
            */
           nqueue = g_datalist_id_get_data (&object->qdata, quark_notify_queue);
           if (!nqueue)
-            nqueue = g_object_notify_queue_freeze (object, FALSE);
+            nqueue = g_object_notify_queue_freeze (object);
         }
     }
 
@@ -2225,7 +2586,7 @@ g_object_new_with_custom_constructor (GObjectClass          *class,
 
   /* If nqueue is non-NULL then we are frozen.  Thaw it. */
   if (nqueue)
-    g_object_notify_queue_thaw (object, nqueue);
+    g_object_notify_queue_thaw (object, nqueue, FALSE);
 
   return object;
 }
@@ -2252,14 +2613,14 @@ g_object_new_internal (GObjectClass          *class,
     {
       GSList *node;
 
-      if (_g_object_has_notify_handler_X (object))
+      if (_g_object_has_notify_handler (object))
         {
           /* This may or may not have been setup in g_object_init().
            * If it hasn't, we do it now.
            */
           nqueue = g_datalist_id_get_data (&object->qdata, quark_notify_queue);
           if (!nqueue)
-            nqueue = g_object_notify_queue_freeze (object, FALSE);
+            nqueue = g_object_notify_queue_freeze (object);
         }
 
       /* We will set exactly n_construct_properties construct
@@ -2303,7 +2664,7 @@ g_object_new_internal (GObjectClass          *class,
       object_set_property (object, params[i].pspec, params[i].value, nqueue, TRUE);
 
   if (nqueue)
-    g_object_notify_queue_thaw (object, nqueue);
+    g_object_notify_queue_thaw (object, nqueue, FALSE);
 
   return object;
 }
@@ -2622,7 +2983,7 @@ g_object_constructor (GType                  type,
   /* set construction parameters */
   if (n_construct_properties)
     {
-      GObjectNotifyQueue *nqueue = g_object_notify_queue_freeze (object, FALSE);
+      GObjectNotifyQueue *nqueue = g_object_notify_queue_freeze (object);
 
       /* set construct properties */
       while (n_construct_properties--)
@@ -2633,7 +2994,7 @@ g_object_constructor (GType                  type,
     construct_params++;
     object_set_property (object, pspec, value, nqueue, TRUE);
   }
-      g_object_notify_queue_thaw (object, nqueue);
+      g_object_notify_queue_thaw (object, nqueue, FALSE);
       /* the notification queue is still frozen from g_object_init(), so
        * we don't need to handle it here, g_object_newv() takes
        * care of that
@@ -2710,7 +3071,7 @@ g_object_setv (GObject       *object,
   class = G_OBJECT_GET_CLASS (object);
 
   if (_g_object_has_notify_handler (object))
-    nqueue = g_object_notify_queue_freeze (object, FALSE);
+    nqueue = g_object_notify_queue_freeze (object);
 
   for (i = 0; i < n_properties; i++)
     {
@@ -2723,7 +3084,7 @@ g_object_setv (GObject       *object,
     }
 
   if (nqueue)
-    g_object_notify_queue_thaw (object, nqueue);
+    g_object_notify_queue_thaw (object, nqueue, FALSE);
 
   g_object_unref (object);
 }
@@ -2751,7 +3112,7 @@ g_object_set_valist (GObject     *object,
   g_object_ref (object);
 
   if (_g_object_has_notify_handler (object))
-    nqueue = g_object_notify_queue_freeze (object, FALSE);
+    nqueue = g_object_notify_queue_freeze (object);
 
   class = G_OBJECT_GET_CLASS (object);
 
@@ -2789,7 +3150,7 @@ g_object_set_valist (GObject     *object,
     }
 
   if (nqueue)
-    g_object_notify_queue_thaw (object, nqueue);
+    g_object_notify_queue_thaw (object, nqueue, FALSE);
 
   g_object_unref (object);
 }
@@ -3315,8 +3676,8 @@ g_object_weak_ref (GObject    *object,
   g_return_if_fail (notify != NULL);
   g_return_if_fail (g_atomic_int_get (&object->ref_count) >= 1);
 
-  G_LOCK (weak_refs_mutex);
-  wstack = g_datalist_id_remove_no_notify (&object->qdata, quark_weak_refs);
+  object_bit_lock (object, OPTIONAL_BIT_LOCK_WEAK_REFS);
+  wstack = g_datalist_id_remove_no_notify (&object->qdata, quark_weak_notifies);
   if (wstack)
     {
       i = wstack->n_weak_refs++;
@@ -3331,8 +3692,8 @@ g_object_weak_ref (GObject    *object,
     }
   wstack->weak_refs[i].notify = notify;
   wstack->weak_refs[i].data = data;
-  g_datalist_id_set_data_full (&object->qdata, quark_weak_refs, wstack, weak_refs_notify);
-  G_UNLOCK (weak_refs_mutex);
+  g_datalist_id_set_data_full (&object->qdata, quark_weak_notifies, wstack, weak_refs_notify);
+  object_bit_unlock (object, OPTIONAL_BIT_LOCK_WEAK_REFS);
 }
 
 /**
@@ -3354,8 +3715,8 @@ g_object_weak_unref (GObject    *object,
   g_return_if_fail (G_IS_OBJECT (object));
   g_return_if_fail (notify != NULL);
 
-  G_LOCK (weak_refs_mutex);
-  wstack = g_datalist_id_get_data (&object->qdata, quark_weak_refs);
+  object_bit_lock (object, OPTIONAL_BIT_LOCK_WEAK_REFS);
+  wstack = g_datalist_id_get_data (&object->qdata, quark_weak_notifies);
   if (wstack)
     {
       guint i;
@@ -3372,7 +3733,7 @@ g_object_weak_unref (GObject    *object,
       break;
     }
     }
-  G_UNLOCK (weak_refs_mutex);
+  object_bit_unlock (object, OPTIONAL_BIT_LOCK_WEAK_REFS);
   if (!found_one)
     g_critical ("%s: couldn't find weak ref %p(%p)", G_STRFUNC, notify, data);
 }
@@ -3438,7 +3799,7 @@ object_floating_flag_handler (GObject        *object,
       oldvalue = g_atomic_pointer_get (&object->qdata);
       while (!g_atomic_pointer_compare_and_exchange_full (
         (void**) &object->qdata, oldvalue,
-        (void *) ((gsize) oldvalue | OBJECT_FLOATING_FLAG),
+        (void *) ((guintptr) oldvalue | OBJECT_FLOATING_FLAG),
         &oldvalue))
         ;
       return (gsize) oldvalue & OBJECT_FLOATING_FLAG;
@@ -3446,7 +3807,7 @@ object_floating_flag_handler (GObject        *object,
       oldvalue = g_atomic_pointer_get (&object->qdata);
       while (!g_atomic_pointer_compare_and_exchange_full (
         (void**) &object->qdata, oldvalue,
-        (void *) ((gsize) oldvalue & ~(gsize) OBJECT_FLOATING_FLAG),
+        (void *) ((guintptr) oldvalue & ~(gsize) OBJECT_FLOATING_FLAG),
         &oldvalue))
         ;
       return (gsize) oldvalue & OBJECT_FLOATING_FLAG;
@@ -3584,7 +3945,6 @@ g_object_force_floating (GObject *object)
 }
 
 typedef struct {
-  GObject *object;
   guint n_toggle_refs;
   struct {
     GToggleNotify notify;
@@ -3592,32 +3952,68 @@ typedef struct {
   } toggle_refs[1];  /* flexible array */
 } ToggleRefStack;
 
-static void
-toggle_refs_notify (GObject *object,
-        gboolean is_last_ref)
+G_ALWAYS_INLINE static inline gboolean
+toggle_refs_check_and_ref_or_deref (GObject *object,
+                                    gboolean is_ref,
+                                    gint *old_ref,
+                                    GToggleNotify *toggle_notify,
+                                    gpointer *toggle_data)
 {
-  ToggleRefStack tstack, *tstackptr;
+  const gint ref_curr = is_ref ? 1 : 2;
+  const gint ref_next = is_ref ? 2 : 1;
+  gboolean success;
 
-  G_LOCK (toggle_refs_mutex);
-  /* If another thread removed the toggle reference on the object, while
-   * we were waiting here, there's nothing to notify.
-   * So let's check again if the object has toggle reference and in case return.
-   */
-  if (!OBJECT_HAS_TOGGLE_REF (object))
+#if G_ENABLE_DEBUG
+  g_assert (ref_curr == *old_ref);
+#endif
+
+  *toggle_notify = NULL;
+  *toggle_data = NULL;
+
+  object_bit_lock (object, OPTIONAL_BIT_LOCK_TOGGLE_REFS);
+
+  /* @old_ref is mainly an (out) parameter. On failure to compare-and-exchange,
+   * we MUST return the new value which the caller will use for retry.*/
+
+  success = g_atomic_int_compare_and_exchange_full ((int *) &object->ref_count,
+                                                    ref_curr,
+                                                    ref_next,
+                                                    old_ref);
+
+  /* Note that if we are called during g_object_unref (@is_ref set to FALSE),
+   * then we drop the ref count from 2 to 1 and give up our reference. We thus
+   * no longer hold a strong reference and another thread may race against
+   * destroying the object.
+   *
+   * After this point with is_ref=FALSE and success=TRUE, @object must no
+   * longer be accessed.
+   *
+   * The exception is here. While we still hold the object lock, we know that
+   * @object could not be destroyed, because g_object_unref() also needs to
+   * acquire the same lock during g_object_notify_queue_freeze(). Thus, we know
+   * object cannot yet be destroyed and we can access it until the unlock
+   * below. */
+
+  if (success && OBJECT_HAS_TOGGLE_REF (object))
     {
-      G_UNLOCK (toggle_refs_mutex);
-      return;
+      ToggleRefStack *tstackptr;
+
+      tstackptr = g_datalist_id_get_data (&object->qdata, quark_toggle_refs);
+
+      if (tstackptr->n_toggle_refs != 1)
+        {
+          g_critical ("Unexpected number of toggle-refs. g_object_add_toggle_ref() must be paired with g_object_remove_toggle_ref()");
+        }
+      else
+        {
+          *toggle_notify = tstackptr->toggle_refs[0].notify;
+          *toggle_data = tstackptr->toggle_refs[0].data;
+        }
     }
 
-  tstackptr = g_datalist_id_get_data (&object->qdata, quark_toggle_refs);
-  tstack = *tstackptr;
-  G_UNLOCK (toggle_refs_mutex);
+  object_bit_unlock (object, OPTIONAL_BIT_LOCK_TOGGLE_REFS);
 
-  /* Reentrancy here is not as tricky as it seems, because a toggle reference
-   * will only be notified when there is exactly one of them.
-   */
-  g_assert (tstack.n_toggle_refs == 1);
-  tstack.toggle_refs[0].notify (tstack.toggle_refs[0].data, tstack.object, is_last_ref);
+  return success;
 }
 
 /**
@@ -3657,6 +4053,13 @@ toggle_refs_notify (GObject *object,
  * this reason, you should only ever use a toggle reference if there
  * is important state in the proxy object.
  *
+ * Note that if you unref the object on another thread, then @notify might
+ * still be invoked after g_object_remove_toggle_ref(), and the object argument
+ * might be a dangling pointer. If the object is destroyed on other threads,
+ * you must take care of that yourself.
+ *
+ * A g_object_add_toggle_ref() must be released with g_object_remove_toggle_ref().
+ *
  * Since: 2.8
  */
 void
@@ -3673,7 +4076,7 @@ g_object_add_toggle_ref (GObject       *object,
 
   g_object_ref (object);
 
-  G_LOCK (toggle_refs_mutex);
+  object_bit_lock (object, OPTIONAL_BIT_LOCK_TOGGLE_REFS);
   tstack = g_datalist_id_remove_no_notify (&object->qdata, quark_toggle_refs);
   if (tstack)
     {
@@ -3685,7 +4088,6 @@ g_object_add_toggle_ref (GObject       *object,
   else
     {
       tstack = g_renew (ToggleRefStack, NULL, 1);
-      tstack->object = object;
       tstack->n_toggle_refs = 1;
       i = 0;
     }
@@ -3698,7 +4100,7 @@ g_object_add_toggle_ref (GObject       *object,
   tstack->toggle_refs[i].data = data;
   g_datalist_id_set_data_full (&object->qdata, quark_toggle_refs, tstack,
              (GDestroyNotify)g_free);
-  G_UNLOCK (toggle_refs_mutex);
+  object_bit_unlock (object, OPTIONAL_BIT_LOCK_TOGGLE_REFS);
 }
 
 /**
@@ -3713,6 +4115,11 @@ g_object_add_toggle_ref (GObject       *object,
  * Removes a reference added with g_object_add_toggle_ref(). The
  * reference count of the object is decreased by one.
  *
+ * Note that if you unref the object on another thread, then @notify might
+ * still be invoked after g_object_remove_toggle_ref(), and the object argument
+ * might be a dangling pointer. If the object is destroyed on other threads,
+ * you must take care of that yourself.
+ *
  * Since: 2.8
  */
 void
@@ -3726,7 +4133,7 @@ g_object_remove_toggle_ref (GObject       *object,
   g_return_if_fail (G_IS_OBJECT (object));
   g_return_if_fail (notify != NULL);
 
-  G_LOCK (toggle_refs_mutex);
+  object_bit_lock (object, OPTIONAL_BIT_LOCK_TOGGLE_REFS);
   tstack = g_datalist_id_get_data (&object->qdata, quark_toggle_refs);
    if (tstack)
     {
@@ -3742,17 +4149,70 @@ g_object_remove_toggle_ref (GObject       *object,
               tstack->toggle_refs[i] = tstack->toggle_refs[tstack->n_toggle_refs];
 
             if (tstack->n_toggle_refs == 0)
-              g_datalist_unset_flags (&object->qdata, OBJECT_HAS_TOGGLE_REF_FLAG);
+              {
+                g_datalist_unset_flags (&object->qdata, OBJECT_HAS_TOGGLE_REF_FLAG);
+                g_datalist_id_set_data_full (&object->qdata, quark_toggle_refs, NULL, NULL);
+              }
+
+            break;
+          }
+    }
+  object_bit_unlock (object, OPTIONAL_BIT_LOCK_TOGGLE_REFS);
+
+  if (found_one)
+    g_object_unref (object);
+  else
+    g_critical ("%s: couldn't find toggle ref %p(%p)", G_STRFUNC, notify, data);
+}
+
+/* Internal implementation of g_object_ref() which doesn't call out to user code.
+ * @out_toggle_notify and @out_toggle_data *must* be provided, and if non-`NULL`
+ * values are returned, then the caller *must* call that toggle notify function
+ * as soon as it is safe to do so. It may call (or be) user-provided code so should
+ * only be called once all locks are released. */
+static gpointer
+object_ref (GObject *object,
+            GToggleNotify *out_toggle_notify,
+            gpointer *out_toggle_data)
+{
+  GToggleNotify toggle_notify;
+  gpointer toggle_data;
+  gint old_ref;
+
+  old_ref = g_atomic_int_get (&object->ref_count);
+
+retry:
+  toggle_notify = NULL;
+  toggle_data = NULL;
+  if (old_ref > 1 && old_ref < G_MAXINT)
+    {
+      /* Fast-path. We have apparently more than 1 references already. No
+       * special handling for toggle references, just increment the ref count. */
+      if (!g_atomic_int_compare_and_exchange_full ((int *) &object->ref_count,
+                                                   old_ref, old_ref + 1, &old_ref))
+        goto retry;
+    }
+  else if (old_ref == 1)
+    {
+      /* With ref count 1, check whether we need to emit a toggle notification. */
+      if (!toggle_refs_check_and_ref_or_deref (object, TRUE, &old_ref, &toggle_notify, &toggle_data))
+        goto retry;
+    }
+  else
+    {
+      gboolean object_already_finalized = TRUE;
 
-            break;
-          }
+      *out_toggle_notify = NULL;
+      *out_toggle_data = NULL;
+      g_return_val_if_fail (!object_already_finalized, NULL);
+      return NULL;
     }
-  G_UNLOCK (toggle_refs_mutex);
 
-  if (found_one)
-    g_object_unref (object);
-  else
-    g_critical ("%s: couldn't find toggle ref %p(%p)", G_STRFUNC, notify, data);
+  TRACE (GOBJECT_OBJECT_REF (object, G_TYPE_FROM_INSTANCE (object), old_ref));
+
+  *out_toggle_notify = toggle_notify;
+  *out_toggle_data = toggle_data;
+  return object;
 }
 
 /**
@@ -3772,23 +4232,74 @@ gpointer
 (g_object_ref) (gpointer _object)
 {
   GObject *object = _object;
-  gint old_val;
-  gboolean object_already_finalized;
+  GToggleNotify toggle_notify;
+  gpointer toggle_data;
 
   g_return_val_if_fail (G_IS_OBJECT (object), NULL);
 
-  old_val = g_atomic_int_add (&object->ref_count, 1);
-  object_already_finalized = (old_val <= 0);
-  g_return_val_if_fail (!object_already_finalized, NULL);
-
-  if (old_val == 1 && OBJECT_HAS_TOGGLE_REF (object))
-    toggle_refs_notify (object, FALSE);
+  object = object_ref (object, &toggle_notify, &toggle_data);
 
-  TRACE (GOBJECT_OBJECT_REF(object,G_TYPE_FROM_INSTANCE(object),old_val));
+  if (toggle_notify)
+    toggle_notify (toggle_data, object, FALSE);
 
   return object;
 }
 
+static gboolean
+_object_unref_clear_weak_locations (GObject *object, gint *p_old_ref, gboolean do_unref)
+{
+  WeakRefData *wrdata;
+  gboolean success;
+
+  /* Fast path, for objects that never had a GWeakRef registered. */
+  if (!(object_get_optional_flags (object) & OPTIONAL_FLAG_EVER_HAD_WEAK_REF))
+    {
+      /* The caller previously just checked atomically that the ref-count was
+       * one.
+       *
+       * At this point still, @object never ever had a GWeakRef registered.
+       * That means, nobody else holds a strong reference and also nobody else
+       * can hold a weak reference, to race against obtaining another
+       * reference. We are good to proceed. */
+      if (do_unref)
+        {
+          if (!g_atomic_int_compare_and_exchange ((gint *) &object->ref_count, 1, 0))
+            {
+#if G_ENABLE_DEBUG
+              g_assert_not_reached ();
+#endif
+            }
+        }
+      return TRUE;
+    }
+
+  /* Slow path. We must obtain a lock on the @wrdata, to atomically release
+   * weak references and check that the ref count is as expected. */
+
+  wrdata = weak_ref_data_get_surely (object);
+
+  weak_ref_data_lock (wrdata);
+
+  if (do_unref)
+    {
+      success = g_atomic_int_compare_and_exchange_full ((gint *) &object->ref_count,
+                                                        1, 0,
+                                                        p_old_ref);
+    }
+  else
+    {
+      *p_old_ref = g_atomic_int_get ((gint *) &object->ref_count);
+      success = (*p_old_ref == 1);
+    }
+
+  if (success)
+    weak_ref_data_clear_list (wrdata, object);
+
+  weak_ref_data_unlock (wrdata);
+
+  return success;
+}
+
 /**
  * g_object_unref:
  * @object: (type GObject.Object): a #GObject
@@ -3806,140 +4317,172 @@ g_object_unref (gpointer _object)
 {
   GObject *object = _object;
   gint old_ref;
+  GToggleNotify toggle_notify;
+  gpointer toggle_data;
+  GObjectNotifyQueue *nqueue;
+  GType obj_gtype;
 
   g_return_if_fail (G_IS_OBJECT (object));
 
-  /* here we want to atomically do: if (ref_count>1) { ref_count--; return; } */
-  old_ref = g_atomic_int_get (&object->ref_count);
- retry_atomic_decrement1:
-  while (old_ref > 1)
-    {
-      /* valid if last 2 refs are owned by this call to unref and the toggle_ref */
+  /* obj_gtype will be needed for TRACE(GOBJECT_OBJECT_UNREF()) later. Note
+   * that we issue the TRACE() after decrementing the ref-counter. If at that
+   * point the reference counter does not reach zero, somebody else can race
+   * and destroy the object.
+   *
+   * This means, TRACE() can be called with a dangling object pointer. This
+   * could only be avoided, by emitting the TRACE before doing the actual
+   * unref, but at that point we wouldn't know the correct "old_ref" value.
+   * Maybe this should change.
+   *
+   * Anyway. At that later point we can also no longer safely get the GType for
+   * the TRACE(). Do it now.
+   */
+  obj_gtype = G_TYPE_FROM_INSTANCE (object);
+  (void) obj_gtype;
 
-      if (!g_atomic_int_compare_and_exchange_full ((int *)&object->ref_count,
-                                                   old_ref, old_ref - 1,
-                                                   &old_ref))
-        continue;
+  old_ref = g_atomic_int_get (&object->ref_count);
 
-      TRACE (GOBJECT_OBJECT_UNREF(object,G_TYPE_FROM_INSTANCE(object),old_ref));
+retry_beginning:
 
-      /* if we went from 2->1 we need to notify toggle refs if any */
-      if (old_ref == 2 && OBJECT_HAS_TOGGLE_REF (object))
-        {
-          /* The last ref being held in this case is owned by the toggle_ref */
-          toggle_refs_notify (object, TRUE);
-        }
+  if (old_ref > 2)
+    {
+      /* We have many references. If we can decrement the ref counter, we are done. */
+      if (!g_atomic_int_compare_and_exchange_full ((int *) &object->ref_count,
+                                                   old_ref, old_ref - 1, &old_ref))
+        goto retry_beginning;
 
+      /* Beware: object might be a dangling pointer. */
+      TRACE (GOBJECT_OBJECT_UNREF (object, obj_gtype, old_ref));
       return;
     }
 
+  if (old_ref == 2)
     {
-      GSList **weak_locations;
-      GObjectNotifyQueue *nqueue;
-
-      /* The only way that this object can live at this point is if
-       * there are outstanding weak references already established
-       * before we got here.
+      /* We are about to return the second-to-last reference. In that case we
+       * might need to notify a toggle reference.
        *
-       * If there were not already weak references then no more can be
-       * established at this time, because the other thread would have
-       * to hold a strong ref in order to call
-       * g_object_add_weak_pointer() and then we wouldn't be here.
+       * Note that a g_object_add_toggle_ref() MUST always be released
+       * via g_object_remove_toggle_ref(). Thus, if we are here with
+       * an old_ref of 2, then at most one of the references can be
+       * a toggle reference.
        *
-       * Other GWeakRef's (weak locations) instead may still be added
-       * before the object is finalized, but in such case we'll unset
-       * them as part of the qdata removal.
-       */
-      weak_locations = g_datalist_id_get_data (&object->qdata, quark_weak_locations);
+       * We need to take a lock, to avoid races. */
 
-      if (weak_locations != NULL)
-        {
-          g_rw_lock_writer_lock (&weak_locations_lock);
+      if (!toggle_refs_check_and_ref_or_deref (object, FALSE, &old_ref, &toggle_notify, &toggle_data))
+        goto retry_beginning;
 
-          /* It is possible that one of the weak references beat us to
-           * the lock. Make sure the refcount is still what we expected
-           * it to be.
-           */
-          old_ref = g_atomic_int_get (&object->ref_count);
-          if (old_ref != 1)
-            {
-              g_rw_lock_writer_unlock (&weak_locations_lock);
-              goto retry_atomic_decrement1;
-            }
+      /* Beware: object might be a dangling pointer. */
+      TRACE (GOBJECT_OBJECT_UNREF (object, obj_gtype, old_ref));
+      if (toggle_notify)
+        toggle_notify (toggle_data, object, TRUE);
+      return;
+    }
 
-          /* We got the lock first, so the object will definitely die
-           * now. Clear out all the weak references, if they're still set.
-           */
-          weak_locations = g_datalist_id_remove_no_notify (&object->qdata,
-                                                           quark_weak_locations);
-          g_clear_pointer (&weak_locations, weak_locations_free_unlocked);
+  if (G_UNLIKELY (old_ref != 1))
+    {
+      gboolean object_already_finalized = TRUE;
 
-          g_rw_lock_writer_unlock (&weak_locations_lock);
-        }
+      g_return_if_fail (!object_already_finalized);
+      return;
+    }
 
-      /* freeze the notification queue, so we don't accidentally emit
+  /* We only have one reference left. Proceed to (maybe) clear weak locations. */
+  if (!_object_unref_clear_weak_locations (object, &old_ref, FALSE))
+    goto retry_beginning;
+
+  /* At this point, we checked with an atomic read that we only hold only one
+   * reference. Weak locations are cleared (and toggle references are not to
+   * be considered in this case). Proceed with dispose().
+   *
+   * First, freeze the notification queue, so we don't accidentally emit
        * notifications during dispose() and finalize().
        *
-       * The notification queue stays frozen unless the instance acquires
-       * a reference during dispose(), in which case we thaw it and
-       * dispatch all the notifications. If the instance gets through
-       * to finalize(), the notification queue gets automatically
-       * drained when g_object_finalize() is reached and
-       * the qdata is cleared.
-       */
-      nqueue = g_object_notify_queue_freeze (object, FALSE);
+   * The notification queue stays frozen unless the instance acquires a
+   * reference during dispose(), in which case we thaw it and dispatch all the
+   * notifications. If the instance gets through to finalize(), the
+   * notification queue gets automatically drained when g_object_finalize() is
+   * reached and the qdata is cleared.
+   *
+   * Important: Note that g_object_notify_queue_freeze() takes a object_bit_lock(),
+   * which happens to be the same lock that is also taken by toggle_refs_check_and_ref(),
+   * that is very important. See also the code comment in toggle_refs_check_and_ref().
+   */
+  nqueue = g_object_notify_queue_freeze (object);
 
-      /* we are about to remove the last reference */
-      TRACE (GOBJECT_OBJECT_DISPOSE(object,G_TYPE_FROM_INSTANCE(object), 1));
+  TRACE (GOBJECT_OBJECT_DISPOSE (object, G_TYPE_FROM_INSTANCE (object), 1));
       G_OBJECT_GET_CLASS (object)->dispose (object);
-      TRACE (GOBJECT_OBJECT_DISPOSE_END(object,G_TYPE_FROM_INSTANCE(object), 1));
+  TRACE (GOBJECT_OBJECT_DISPOSE_END (object, G_TYPE_FROM_INSTANCE (object), 1));
+
+  /* Must re-fetch old-ref. _object_unref_clear_weak_locations() relies on
+   * that.  */
+  old_ref = g_atomic_int_get (&object->ref_count);
 
-      /* may have been re-referenced meanwhile */
-      old_ref = g_atomic_int_get ((int *)&object->ref_count);
+retry_decrement:
+  /* Here, old_ref is 1 if we just come from dispose(). If the object was resurrected,
+   * we can hit `goto retry_decrement` and be here with a larger old_ref. */
 
-      while (old_ref > 1)
+  if (old_ref > 1 && nqueue)
         {
-          /* valid if last 2 refs are owned by this call to unref and the toggle_ref */
+      /* If the object was resurrected, we need to unfreeze the notify
+       * queue. */
+      g_object_notify_queue_thaw (object, nqueue, FALSE);
+      nqueue = NULL;
+
+      /* Note at this point, @old_ref might be wrong.
+       *
+       * Also note that _object_unref_clear_weak_locations() requires that we
+       * atomically checked that @old_ref is 1. However, as @old_ref is larger
+       * than 1, that will not be called. Instead, all other code paths below,
+       * handle the possibility of a bogus @old_ref.
+       *
+       * No need to re-fetch. */
+    }
 
-          if (!g_atomic_int_compare_and_exchange_full ((int *)&object->ref_count,
+  if (old_ref > 2)
+    {
+      if (!g_atomic_int_compare_and_exchange_full ((int *) &object->ref_count,
                                                        old_ref, old_ref - 1,
                                                        &old_ref))
-            continue;
-
-          TRACE (GOBJECT_OBJECT_UNREF (object, G_TYPE_FROM_INSTANCE (object), old_ref));
+        goto retry_decrement;
 
-          /* emit all notifications that have been queued during dispose() */
-          g_object_notify_queue_thaw (object, nqueue);
-
-          /* if we went from 2->1 we need to notify toggle refs if any */
-          if (old_ref == 2 && OBJECT_HAS_TOGGLE_REF (object) &&
-              g_atomic_int_get ((int *)&object->ref_count) == 1)
-            {
-              /* The last ref being held in this case is owned by the toggle_ref */
-              toggle_refs_notify (object, TRUE);
-            }
+      /* Beware: object might be a dangling pointer. */
+      TRACE (GOBJECT_OBJECT_UNREF (object, obj_gtype, old_ref));
+      return;
+    }
 
+  if (old_ref == 2)
+    {
+      /* If the object was resurrected and the current ref-count is 2, then we
+       * are about to drop the ref-count to 1. We may need to emit a toggle
+       * notification. Take a lock and check for that.
+       *
+       * In that case, we need a lock to get the toggle notification. */
+      if (!toggle_refs_check_and_ref_or_deref (object, FALSE, &old_ref, &toggle_notify, &toggle_data))
+        goto retry_decrement;
+
+      /* Beware: object might be a dangling pointer. */
+      TRACE (GOBJECT_OBJECT_UNREF (object, obj_gtype, old_ref));
+      if (toggle_notify)
+        toggle_notify (toggle_data, object, TRUE);
           return;
         }
 
-      /* we are still in the process of taking away the last ref */
-      g_datalist_id_set_data (&object->qdata, quark_closure_array, NULL);
-      g_signal_handlers_destroy (object);
-      g_datalist_id_set_data (&object->qdata, quark_weak_refs, NULL);
-      g_datalist_id_set_data (&object->qdata, quark_weak_locations, NULL);
+  /* old_ref is (atomically!) checked to be 1, we are about to drop the
+   * reference count to zero in _object_unref_clear_weak_locations(). */
+  if (!_object_unref_clear_weak_locations (object, &old_ref, TRUE))
+    goto retry_decrement;
 
-      /* decrement the last reference */
-      old_ref = g_atomic_int_add (&object->ref_count, -1);
-      g_return_if_fail (old_ref > 0);
+  TRACE (GOBJECT_OBJECT_UNREF (object, obj_gtype, old_ref));
 
-      TRACE (GOBJECT_OBJECT_UNREF(object,G_TYPE_FROM_INSTANCE(object),old_ref));
+  /* The object is almost gone. Finalize. */
 
-      /* may have been re-referenced meanwhile */
-      if (G_LIKELY (old_ref == 1))
-  {
-    TRACE (GOBJECT_OBJECT_FINALIZE(object,G_TYPE_FROM_INSTANCE(object)));
+      g_datalist_id_set_data (&object->qdata, quark_closure_array, NULL);
+      g_signal_handlers_destroy (object);
+  g_datalist_id_set_data (&object->qdata, quark_weak_notifies, NULL);
+
+  TRACE (GOBJECT_OBJECT_FINALIZE (object, G_TYPE_FROM_INSTANCE (object)));
           G_OBJECT_GET_CLASS (object)->finalize (object);
-    TRACE (GOBJECT_OBJECT_FINALIZE_END(object,G_TYPE_FROM_INSTANCE(object)));
+  TRACE (GOBJECT_OBJECT_FINALIZE_END (object, G_TYPE_FROM_INSTANCE (object)));
 
           GOBJECT_IF_DEBUG (OBJECTS,
             {
@@ -3954,16 +4497,7 @@ g_object_unref (gpointer _object)
                 g_critical ("Object %p of type %s not finalized correctly.",
                             object, G_OBJECT_TYPE_NAME (object));
             });
-          g_type_free_instance ((GTypeInstance*) object);
-        }
-      else
-        {
-          /* The instance acquired a reference between dispose() and
-           * finalize(), so we need to thaw the notification queue
-           */
-          g_object_notify_queue_thaw (object, nqueue);
-    }
-}
+  g_type_free_instance ((GTypeInstance *) object);
 }
 
 /**
@@ -4651,24 +5185,6 @@ typedef struct {
   guint     n_closures;
   GClosure *closures[1]; /* flexible array */
 } CArray;
-/* don't change this structure without supplying an accessor for
- * watched closures, e.g.:
- * GSList* g_object_list_watched_closures (GObject *object)
- * {
- *   CArray *carray;
- *   g_return_val_if_fail (G_IS_OBJECT (object), NULL);
- *   carray = g_object_get_data (object, "GObject-closure-array");
- *   if (carray)
- *     {
- *       GSList *slist = NULL;
- *       guint i;
- *       for (i = 0; i < carray->n_closures; i++)
- *         slist = g_slist_prepend (slist, carray->closures[i]);
- *       return slist;
- *     }
- *   return NULL;
- * }
- */
 
 static void
 object_remove_closure (gpointer  data,
@@ -4678,7 +5194,7 @@ object_remove_closure (gpointer  data,
   CArray *carray;
   guint i;
 
-  G_LOCK (closure_array_mutex);
+  object_bit_lock (object, OPTIONAL_BIT_LOCK_CLOSURE_ARRAY);
   carray = g_object_get_qdata (object, quark_closure_array);
   for (i = 0; i < carray->n_closures; i++)
     if (carray->closures[i] == closure)
@@ -4686,10 +5202,10 @@ object_remove_closure (gpointer  data,
   carray->n_closures--;
   if (i < carray->n_closures)
     carray->closures[i] = carray->closures[carray->n_closures];
-  G_UNLOCK (closure_array_mutex);
+  object_bit_unlock (object, OPTIONAL_BIT_LOCK_CLOSURE_ARRAY);
   return;
       }
-  G_UNLOCK (closure_array_mutex);
+  object_bit_unlock (object, OPTIONAL_BIT_LOCK_CLOSURE_ARRAY);
   g_assert_not_reached ();
 }
 
@@ -4745,7 +5261,7 @@ g_object_watch_closure (GObject  *object,
   g_closure_add_marshal_guards (closure,
         object, (GClosureNotify) g_object_ref,
         object, (GClosureNotify) g_object_unref);
-  G_LOCK (closure_array_mutex);
+  object_bit_lock (object, OPTIONAL_BIT_LOCK_CLOSURE_ARRAY);
   carray = g_datalist_id_remove_no_notify (&object->qdata, quark_closure_array);
   if (!carray)
     {
@@ -4761,7 +5277,7 @@ g_object_watch_closure (GObject  *object,
     }
   carray->closures[i] = closure;
   g_datalist_id_set_data_full (&object->qdata, quark_closure_array, carray, destroy_closure_array);
-  G_UNLOCK (closure_array_mutex);
+  object_bit_unlock (object, OPTIONAL_BIT_LOCK_CLOSURE_ARRAY);
 }
 
 /**
@@ -4914,6 +5430,203 @@ g_initially_unowned_class_init (GInitiallyUnownedClass *klass)
  * without first having or creating a strong reference to the object.
  */
 
+#define WEAK_REF_LOCK_BIT 0
+
+static GObject *
+_weak_ref_clean_pointer (gpointer ptr)
+{
+  /* Drop the lockbit WEAK_REF_LOCK_BIT from @ptr (if set). */
+  return g_pointer_bit_lock_mask_ptr (ptr, WEAK_REF_LOCK_BIT, FALSE, 0, NULL);
+}
+
+static void
+_weak_ref_lock (GWeakRef *weak_ref, GObject **out_object)
+{
+  /* Note that while holding a _weak_ref_lock() on the @weak_ref, we MUST not acquire a
+   * weak_ref_data_lock() on the @wrdata. The other way around! */
+
+  if (out_object)
+    {
+      guintptr ptr;
+
+      g_pointer_bit_lock_and_get (&weak_ref->priv.p, WEAK_REF_LOCK_BIT, &ptr);
+      *out_object = _weak_ref_clean_pointer ((gpointer) ptr);
+    }
+  else
+    g_pointer_bit_lock (&weak_ref->priv.p, WEAK_REF_LOCK_BIT);
+}
+
+static void
+_weak_ref_unlock (GWeakRef *weak_ref)
+{
+  g_pointer_bit_unlock (&weak_ref->priv.p, WEAK_REF_LOCK_BIT);
+}
+
+static void
+_weak_ref_unlock_and_set (GWeakRef *weak_ref, GObject *object)
+{
+  g_pointer_bit_unlock_and_set (&weak_ref->priv.p, WEAK_REF_LOCK_BIT, object, 0);
+}
+
+static void
+weak_ref_data_clear_list (WeakRefData *wrdata, GObject *object)
+{
+  while (wrdata->len > 0u)
+    {
+      GWeakRef *weak_ref;
+      gpointer ptr;
+
+      /* pass "allow_shrink=FALSE", so we don't reallocate needlessly. We
+       * anyway are about to clear the entire list. */
+      weak_ref = weak_ref_data_list_remove (wrdata, wrdata->len - 1u, FALSE);
+
+      /* Fast-path. Most likely @weak_ref is currently not locked, so we can
+       * just atomically set the pointer to NULL. */
+      ptr = g_atomic_pointer_get (&weak_ref->priv.p);
+#if G_ENABLE_DEBUG
+      g_assert (G_IS_OBJECT (_weak_ref_clean_pointer (ptr)));
+      g_assert (!object || object == _weak_ref_clean_pointer (ptr));
+#endif
+      if (G_LIKELY (ptr == _weak_ref_clean_pointer (ptr)))
+        {
+          /* The pointer is unlocked. Try an atomic compare-and-exchange... */
+          if (g_atomic_pointer_compare_and_exchange (&weak_ref->priv.p, ptr, NULL))
+            {
+              /* Done. Go to the next. */
+              continue;
+            }
+        }
+
+      /* The @weak_ref is locked. Acquire the lock to set the pointer to NULL. */
+      _weak_ref_lock (weak_ref, NULL);
+      _weak_ref_unlock_and_set (weak_ref, NULL);
+    }
+}
+
+static void
+_weak_ref_set (GWeakRef *weak_ref,
+               GObject *new_object,
+               gboolean called_by_init)
+{
+  WeakRefData *old_wrdata;
+  WeakRefData *new_wrdata;
+  GObject *old_object;
+
+  new_wrdata = weak_ref_data_get_or_create (new_object);
+
+#if G_ENABLE_DEBUG
+  g_assert (!new_object || object_get_optional_flags (new_object) & OPTIONAL_FLAG_EVER_HAD_WEAK_REF);
+#endif
+
+  if (called_by_init)
+    {
+      /* The caller is g_weak_ref_init(). We know that the weak_ref should be
+       * NULL. We thus set @old_wrdata to NULL without checking.
+       *
+       * Also important, the caller ensured that @new_object is not NULL. So we
+       * are expected to set @weak_ref from NULL to a non-NULL @new_object. */
+      old_wrdata = NULL;
+#if G_ENABLE_DEBUG
+      g_assert (new_object);
+#endif
+    }
+  else
+    {
+      /* We must get a wrdata object @old_wrdata for the current @old_object. */
+      _weak_ref_lock (weak_ref, &old_object);
+
+      if (old_object == new_object)
+        {
+          /* Already set. We are done. */
+          _weak_ref_unlock (weak_ref);
+          return;
+        }
+
+      old_wrdata = old_object
+                       ? weak_ref_data_ref (weak_ref_data_get (old_object))
+                       : NULL;
+      _weak_ref_unlock (weak_ref);
+    }
+
+  /* We need a lock on @old_wrdata, @new_wrdata and @weak_ref. We need to take
+   * these locks in a certain order to avoid deadlock. We sort them by pointer
+   * value.
+   *
+   * Note that @old_wrdata or @new_wrdata may be NULL, which is handled
+   * correctly.
+   *
+   * Note that @old_wrdata and @new_wrdata are never identical at this point.
+   */
+  if (new_wrdata && old_wrdata && (((guintptr) (gpointer) old_wrdata) < ((guintptr) ((gpointer) new_wrdata))))
+    {
+      weak_ref_data_lock (old_wrdata);
+      weak_ref_data_lock (new_wrdata);
+    }
+  else
+    {
+      weak_ref_data_lock (new_wrdata);
+      weak_ref_data_lock (old_wrdata);
+    }
+  _weak_ref_lock (weak_ref, &old_object);
+
+  if (!weak_ref_data_has (old_object, old_wrdata, NULL))
+    {
+      /* A race. @old_object no longer has the expected @old_wrdata after
+       * getting all the locks. */
+      if (old_object)
+        {
+          /* We lost the race and find a different object set. It's fine, our
+           * action was lost in the race and we are done. No need to retry. */
+          weak_ref_data_unlock (old_wrdata);
+          weak_ref_data_unlock (new_wrdata);
+          _weak_ref_unlock (weak_ref);
+          weak_ref_data_unref (old_wrdata);
+          return;
+        }
+
+      /* @old_object is NULL after a race. We didn't expect that, but it's
+       * fine. Proceed to set @new_object... */
+    }
+
+  if (old_object)
+    {
+      gint32 idx;
+
+      idx = weak_ref_data_list_find (old_wrdata, weak_ref);
+      if (idx < 0)
+        g_critical ("unexpected missing GWeakRef data");
+      else
+        weak_ref_data_list_remove (old_wrdata, idx, TRUE);
+    }
+
+  weak_ref_data_unlock (old_wrdata);
+
+  if (new_object)
+    {
+#if G_ENABLE_DEBUG
+      g_assert (weak_ref_data_list_find (new_wrdata, weak_ref) < 0);
+#endif
+      if (g_atomic_int_get (&new_object->ref_count) < 1)
+        {
+          g_critical ("calling g_weak_ref_set() with already destroyed object");
+          new_object = NULL;
+        }
+      else
+        {
+          if (!weak_ref_data_list_add (new_wrdata, weak_ref))
+            {
+              g_critical ("Too many GWeakRef registered");
+              new_object = NULL;
+            }
+        }
+    }
+
+  _weak_ref_unlock_and_set (weak_ref, new_object);
+  weak_ref_data_unlock (new_wrdata);
+
+  weak_ref_data_unref (old_wrdata);
+}
+
 /**
  * g_weak_ref_init: (skip)
  * @weak_ref: (inout): uninitialized or empty location for a weak
@@ -4934,11 +5647,19 @@ g_initially_unowned_class_init (GInitiallyUnownedClass *klass)
  */
 void
 g_weak_ref_init (GWeakRef *weak_ref,
-                 gpointer  object)
+                 gpointer object)
 {
-  weak_ref->priv.p = NULL;
+  g_return_if_fail (weak_ref);
+  g_return_if_fail (object == NULL || G_IS_OBJECT (object));
 
-  g_weak_ref_set (weak_ref, object);
+  g_atomic_pointer_set (&weak_ref->priv.p, NULL);
+  if (object)
+    {
+      /* We give a hint that the weak_ref is currently NULL. Unlike
+       * g_weak_ref_set(), we then don't need the extra lock just to
+       * find out that we have no object. */
+      _weak_ref_set (weak_ref, object, TRUE);
+    }
 }
 
 /**
@@ -4985,49 +5706,91 @@ g_weak_ref_clear (GWeakRef *weak_ref)
 gpointer
 g_weak_ref_get (GWeakRef *weak_ref)
 {
-  gpointer object_or_null;
-
-  g_return_val_if_fail (weak_ref!= NULL, NULL);
+  WeakRefData *wrdata;
+  WeakRefData *new_wrdata;
+  GToggleNotify toggle_notify = NULL;
+  gpointer toggle_data = NULL;
+  GObject *object;
 
-  g_rw_lock_reader_lock (&weak_locations_lock);
+  g_return_val_if_fail (weak_ref, NULL);
 
-  object_or_null = weak_ref->priv.p;
+  /* We cannot take the strong reference on @object yet. Otherwise,
+   * _object_unref_clear_weak_locations() might have just taken the lock on
+   * @wrdata, see that the ref-count is 1 and plan to proceed clearing weak
+   * locations. If we then take a strong reference here, the object becomes
+   * alive and well, but _object_unref_clear_weak_locations() would proceed and
+   * clear the @weak_ref.
+   *
+   * We avoid that, by can only taking the strong reference when having a lock
+   * on @wrdata, so we are in sync with _object_unref_clear_weak_locations().
+   *
+   * But first we must get a reference to the @wrdata.
+   */
+  _weak_ref_lock (weak_ref, &object);
+  wrdata = object
+               ? weak_ref_data_ref (weak_ref_data_get (object))
+               : NULL;
+  _weak_ref_unlock (weak_ref);
 
-  if (object_or_null != NULL)
-    g_object_ref (object_or_null);
+  if (!wrdata)
+    {
+      /* There is no @wrdata and no object. We are done. */
+      return NULL;
+    }
 
-  g_rw_lock_reader_unlock (&weak_locations_lock);
+retry:
 
-  return object_or_null;
-}
+  /* Now proceed to get the strong reference. This time with acquiring a lock
+   * on the per-object @wrdata and on @weak_ref.
+   *
+   * As the order in which locks are taken is important, we previously had to
+   * get a _weak_ref_lock(), to obtain the @wrdata. Now we have to lock on the
+   * @wrdata first, and the @weak_ref again. */
+  weak_ref_data_lock (wrdata);
+  _weak_ref_lock (weak_ref, &object);
 
-static void
-weak_locations_free_unlocked (GSList **weak_locations)
-{
-  if (*weak_locations)
+  if (!object)
     {
-      GSList *weak_location;
-
-      for (weak_location = *weak_locations; weak_location;)
+      /* Object is gone in the meantime. That is fine. */
+      new_wrdata = NULL;
+    }
+  else
+    {
+      /* Check that @object still refers to the same object as before. We do
+       * that by comparing the @wrdata object. A GObject keeps its (unique!)
+       * wrdata instance until the end, and since @wrdata is still alive,
+       * @object is the same as before, if-and-only-if its @wrdata is the same.
+       */
+      if (weak_ref_data_has (object, wrdata, &new_wrdata))
         {
-          GWeakRef *weak_ref_location = weak_location->data;
-
-          weak_ref_location->priv.p = NULL;
-          weak_location = g_slist_delete_link (weak_location, weak_location);
+          /* We are (still) good. Take a strong ref while holding the necessary locks. */
+          object = object_ref (object, &toggle_notify, &toggle_data);
+        }
+      else
+        {
+          /* The @object changed and has no longer the same @wrdata. In this
+           * case, we need to start over.
+           *
+           * Note that @new_wrdata references the wrdata of the now current
+           * @object. We will use that during the retry. */
         }
     }
 
-  g_free (weak_locations);
-}
+  _weak_ref_unlock (weak_ref);
+  weak_ref_data_unlock (wrdata);
+  weak_ref_data_unref (wrdata);
 
-static void
-weak_locations_free (gpointer data)
-{
-  GSList **weak_locations = data;
+  if (new_wrdata)
+    {
+      /* There was a race. The object changed. Retry, with @new_wrdata. */
+      wrdata = new_wrdata;
+      goto retry;
+    }
+
+  if (toggle_notify)
+    toggle_notify (toggle_data, object, FALSE);
 
-  g_rw_lock_writer_lock (&weak_locations_lock);
-  weak_locations_free_unlocked (weak_locations);
-  g_rw_lock_writer_unlock (&weak_locations_lock);
+  return object;
 }
 
 /**
@@ -5045,78 +5808,10 @@ weak_locations_free (gpointer data)
  */
 void
 g_weak_ref_set (GWeakRef *weak_ref,
-                gpointer  object)
+                gpointer object)
 {
-  GSList **weak_locations;
-  GObject *new_object;
-  GObject *old_object;
-
   g_return_if_fail (weak_ref != NULL);
   g_return_if_fail (object == NULL || G_IS_OBJECT (object));
 
-  new_object = object;
-
-  g_rw_lock_writer_lock (&weak_locations_lock);
-
-  /* We use the extra level of indirection here so that if we have ever
-   * had a weak pointer installed at any point in time on this object,
-   * we can see that there is a non-NULL value associated with the
-   * weak-pointer quark and know that this value will not change at any
-   * point in the object's lifetime.
-   *
-   * Both properties are important for reducing the amount of times we
-   * need to acquire locks and for decreasing the duration of time the
-   * lock is held while avoiding some rather tricky races.
-   *
-   * Specifically: we can avoid having to do an extra unconditional lock
-   * in g_object_unref() without worrying about some extremely tricky
-   * races.
-   */
-
-  old_object = weak_ref->priv.p;
-  if (new_object != old_object)
-    {
-      weak_ref->priv.p = new_object;
-
-      /* Remove the weak ref from the old object */
-      if (old_object != NULL)
-        {
-          weak_locations = g_datalist_id_get_data (&old_object->qdata, quark_weak_locations);
-          if (weak_locations == NULL)
-            {
-#ifndef G_DISABLE_ASSERT
-              gboolean in_weak_refs_notify =
-                  g_datalist_id_get_data (&old_object->qdata, quark_weak_refs) == NULL;
-              g_assert (in_weak_refs_notify);
-#endif /* G_DISABLE_ASSERT */
-            }
-          else
-            {
-              *weak_locations = g_slist_remove (*weak_locations, weak_ref);
-
-              if (!*weak_locations)
-                {
-                  weak_locations_free_unlocked (weak_locations);
-                  g_datalist_id_remove_no_notify (&old_object->qdata, quark_weak_locations);
-                }
-            }
-        }
-
-      /* Add the weak ref to the new object */
-      if (new_object != NULL)
-        {
-          weak_locations = g_datalist_id_get_data (&new_object->qdata, quark_weak_locations);
-
-          if (weak_locations == NULL)
-            {
-              weak_locations = g_new0 (GSList *, 1);
-              g_datalist_id_set_data_full (&new_object->qdata, quark_weak_locations,
-                                           weak_locations, weak_locations_free);
-            }
-
-          *weak_locations = g_slist_prepend (*weak_locations, weak_ref);
-        }
-    }
-
-  g_rw_lock_writer_unlock (&weak_locations_lock);
+  _weak_ref_set (weak_ref, object, FALSE);
 }
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gobject.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gobject.h
index eab845ae7af..4d8076b6f4f 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gobject.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gobject.h
@@ -248,22 +248,7 @@ typedef void (*GObjectFinalizeFunc)     (GObject      *object);
  */
 typedef void (*GWeakNotify)             (gpointer      data,
                                          GObject      *where_the_object_was);
-/**
- * GObject:
- *
- * The base object type.
- *
- * All the fields in the 'GObject' structure are private to the implementation
- * and should never be accessed directly.
- *
- * Since GLib 2.72, all #GObjects are guaranteed to be aligned to at least the
- * alignment of the largest basic GLib type (typically this is #guint64 or
- * #gdouble). If you need larger alignment for an element in a #GObject, you
- * should allocate it on the heap (aligned), or arrange for your #GObject to be
- * appropriately padded. This guarantee applies to the #GObject (or derived)
- * struct, the #GObjectClass (or derived) struct, and any private data allocated
- * by G_ADD_PRIVATE().
- */
+
 struct  _GObject
 {
   GTypeInstance  g_type_instance;
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gparam.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gparam.c
index 5336cebe5c0..25f8678918a 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gparam.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gparam.c
@@ -31,29 +31,27 @@
 #include "gtype-private.h"
 
 /**
- * SECTION:gparamspec
- * @short_description: Metadata for parameter specifications
- * @see_also: g_object_class_install_property(), g_object_set(),
- *     g_object_get(), g_object_set_property(), g_object_get_property(),
- *     g_value_register_transform_func()
- * @title: GParamSpec
+ * GParamSpec: (ref-func g_param_spec_ref_sink) (unref-func g_param_spec_unref) (set-value-func g_value_set_param) (get-value-func g_value_get_param)
+ * @g_type_instance: private `GTypeInstance` portion
+ * @name: name of this parameter: always an interned string
+ * @flags: `GParamFlags` flags for this parameter
+ * @value_type: the `GValue` type for this parameter
+ * @owner_type: `GType` type that uses (introduces) this parameter
  *
- * #GParamSpec is an object structure that encapsulates the metadata
- * required to specify parameters, such as e.g. #GObject properties.
+ * `GParamSpec` encapsulates the metadata required to specify parameters, such as `GObject` properties.
  *
- * ## Parameter names # {#canonical-parameter-names}
+ * ## Parameter names
  *
  * A property name consists of one or more segments consisting of ASCII letters
  * and digits, separated by either the `-` or `_` character. The first
  * character of a property name must be a letter. These are the same rules as
- * for signal naming (see g_signal_new()).
+ * for signal naming (see [func@GObject.signal_new]).
  *
- * When creating and looking up a #GParamSpec, either separator can be
+ * When creating and looking up a `GParamSpec`, either separator can be
  * used, but they cannot be mixed. Using `-` is considerably more
  * efficient, and is the ‘canonical form’. Using `_` is discouraged.
  */
 
-
 /* --- defines --- */
 #define PARAM_FLOATING_FLAG                     0x2
 #define G_PARAM_USER_MASK                       (~0U << G_PARAM_USER_SHIFT)
@@ -257,7 +255,7 @@ g_param_spec_unref (GParamSpec *pspec)
 void
 g_param_spec_sink (GParamSpec *pspec)
 {
-  gsize oldvalue;
+  guintptr oldvalue;
   g_return_if_fail (G_IS_PARAM_SPEC (pspec));
 
   oldvalue = g_atomic_pointer_and (&pspec->qdata, ~(gsize)PARAM_FLOATING_FLAG);
@@ -277,7 +275,7 @@ g_param_spec_sink (GParamSpec *pspec)
 GParamSpec*
 g_param_spec_ref_sink (GParamSpec *pspec)
 {
-  gsize oldvalue;
+  guintptr oldvalue;
   g_return_val_if_fail (G_IS_PARAM_SPEC (pspec), NULL);
 
   oldvalue = g_atomic_pointer_and (&pspec->qdata, ~(gsize)PARAM_FLOATING_FLAG);
@@ -1000,11 +998,32 @@ g_param_spec_pool_new (gboolean type_prefixing)
 
   memcpy (&pool->mutex, &init_mutex, sizeof (init_mutex));
   pool->type_prefixing = type_prefixing != FALSE;
-  pool->hash_table = g_hash_table_new (param_spec_pool_hash, param_spec_pool_equals);
+  pool->hash_table = g_hash_table_new_full (param_spec_pool_hash,
+                                            param_spec_pool_equals,
+                                            (GDestroyNotify) g_param_spec_unref,
+                                            NULL);
 
   return pool;
 }
 
+/**
+ * g_param_spec_pool_free:
+ * @pool: (transfer full): a #GParamSpecPool
+ *
+ * Frees the resources allocated by a #GParamSpecPool.
+ *
+ * Since: 2.80
+ */
+void
+g_param_spec_pool_free (GParamSpecPool *pool)
+{
+  g_mutex_lock (&pool->mutex);
+  g_hash_table_unref (pool->hash_table);
+  g_mutex_unlock (&pool->mutex);
+  g_mutex_clear (&pool->mutex);
+  g_free (pool);
+}
+
 /**
  * g_param_spec_pool_insert:
  * @pool: a #GParamSpecPool.
@@ -1059,9 +1078,7 @@ g_param_spec_pool_remove (GParamSpecPool *pool,
   if (pool && pspec)
     {
       g_mutex_lock (&pool->mutex);
-      if (g_hash_table_remove (pool->hash_table, pspec))
-        g_param_spec_unref (pspec);
-      else
+      if (!g_hash_table_remove (pool->hash_table, pspec))
         g_critical (G_STRLOC ": attempt to remove unknown pspec '%s' from pool", pspec->name);
       g_mutex_unlock (&pool->mutex);
     }
@@ -1240,7 +1257,7 @@ g_param_spec_pool_list_owned (GParamSpecPool *pool,
 
   g_mutex_lock (&pool->mutex);
   data[0] = NULL;
-  data[1] = (gpointer) owner_type;
+  data[1] = GTYPE_TO_POINTER (owner_type);
   g_hash_table_foreach (pool->hash_table, pool_list, &data);
   g_mutex_unlock (&pool->mutex);
 
@@ -1379,7 +1396,7 @@ g_param_spec_pool_list (GParamSpecPool *pool,
   d = g_type_depth (owner_type);
   slists = g_new0 (GSList*, d);
   data[0] = slists;
-  data[1] = (gpointer) owner_type;
+  data[1] = GTYPE_TO_POINTER (owner_type);
   data[2] = pool->hash_table;
   data[3] = &n_pspecs;
 
@@ -1635,7 +1652,7 @@ g_param_spec_get_default_value (GParamSpec *pspec)
    * done before a g_once_init_enter() could take the fast path in
    * another thread.
    */
-  if (g_once_init_enter (&priv->default_value.g_type))
+  if (g_once_init_enter_pointer (&priv->default_value.g_type))
     {
       GValue default_value = G_VALUE_INIT;
 
@@ -1645,7 +1662,7 @@ g_param_spec_get_default_value (GParamSpec *pspec)
       /* store all but the type */
       memcpy (priv->default_value.data, default_value.data, sizeof (default_value.data));
 
-      g_once_init_leave (&priv->default_value.g_type, pspec->value_type);
+      g_once_init_leave_pointer (&priv->default_value.g_type, pspec->value_type);
     }
 
   return &priv->default_value;
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gparam.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gparam.h
index 17ac4763e58..ee2d037a5cf 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gparam.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gparam.h
@@ -203,17 +203,7 @@ typedef struct _GParamSpec      GParamSpec;
 typedef struct _GParamSpecClass GParamSpecClass;
 typedef struct _GParameter  GParameter GOBJECT_DEPRECATED_TYPE_IN_2_54;
 typedef struct _GParamSpecPool  GParamSpecPool;
-/**
- * GParamSpec: (ref-func g_param_spec_ref_sink) (unref-func g_param_spec_unref) (set-value-func g_value_set_param) (get-value-func g_value_get_param)
- * @g_type_instance: private #GTypeInstance portion
- * @name: name of this parameter: always an interned string
- * @flags: #GParamFlags flags for this parameter
- * @value_type: the #GValue type for this parameter
- * @owner_type: #GType type that uses (introduces) this parameter
- *
- * All other fields of the GParamSpec struct are private and
- * should not be used directly.
- */
+
 struct _GParamSpec
 {
   GTypeInstance  g_type_instance;
@@ -453,7 +443,8 @@ GOBJECT_AVAILABLE_IN_ALL
 GParamSpec**    g_param_spec_pool_list      (GParamSpecPool *pool,
                          GType       owner_type,
                          guint      *n_pspecs_p);
-
+GOBJECT_AVAILABLE_IN_2_80
+void            g_param_spec_pool_free          (GParamSpecPool *pool);
 
 /* contracts:
  *
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gparamspecs.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gparamspecs.c
index b5081f10544..cf655cc47f2 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gparamspecs.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gparamspecs.c
@@ -37,29 +37,6 @@
 #include "gvaluearray.h"
 
 
-/**
- * SECTION:param_value_types
- * @short_description: Standard Parameter and Value Types
- * @see_also: #GParamSpec, #GValue, g_object_class_install_property().
- * @title: Parameters and Values
- *
- * #GValue provides an abstract container structure which can be
- * copied, transformed and compared while holding a value of any
- * (derived) type, which is registered as a #GType with a
- * #GTypeValueTable in its #GTypeInfo structure.  Parameter
- * specifications for most value types can be created as #GParamSpec
- * derived instances, to implement e.g. #GObject properties which
- * operate on #GValue containers.
- *
- * Parameter names need to start with a letter (a-z or A-Z). Subsequent
- * characters can be letters, numbers or a '-'.
- * All other characters are replaced by a '-' during construction.
- *
- * See also #GValue for more information.
- *
- */
-
-
 #define G_FLOAT_EPSILON     (1e-30)
 #define G_DOUBLE_EPSILON    (1e-90)
 
@@ -1041,7 +1018,7 @@ param_value_array_validate (GParamSpec *pspec,
   guint changed = 0;
 
   if (!value->data[0].v_pointer && aspec->fixed_n_elements)
-    value->data[0].v_pointer = g_value_array_new (aspec->fixed_n_elements);
+    value_array = value->data[0].v_pointer = g_value_array_new (aspec->fixed_n_elements);
 
   if (value->data[0].v_pointer)
     {
@@ -1245,7 +1222,7 @@ param_gtype_set_default (GParamSpec *pspec,
 {
   GParamSpecGType *tspec = G_PARAM_SPEC_GTYPE (pspec);
 
-  value->data[0].v_pointer = GSIZE_TO_POINTER (tspec->is_a_type);
+  value->data[0].v_pointer = GTYPE_TO_POINTER (tspec->is_a_type);
 }
 
 static gboolean
@@ -1253,7 +1230,7 @@ param_gtype_is_valid (GParamSpec   *pspec,
                       const GValue *value)
 {
   GParamSpecGType *tspec = G_PARAM_SPEC_GTYPE (pspec);
-  GType gtype = GPOINTER_TO_SIZE (value->data[0].v_pointer);
+  GType gtype = GPOINTER_TO_TYPE (value->data[0].v_pointer);
 
   return tspec->is_a_type == G_TYPE_NONE ||
          g_type_is_a (gtype, tspec->is_a_type);
@@ -1264,12 +1241,12 @@ param_gtype_validate (GParamSpec *pspec,
           GValue     *value)
 {
   GParamSpecGType *tspec = G_PARAM_SPEC_GTYPE (pspec);
-  GType gtype = GPOINTER_TO_SIZE (value->data[0].v_pointer);
+  GType gtype = GPOINTER_TO_TYPE (value->data[0].v_pointer);
   guint changed = 0;
 
   if (tspec->is_a_type != G_TYPE_NONE && !g_type_is_a (gtype, tspec->is_a_type))
     {
-      value->data[0].v_pointer = GSIZE_TO_POINTER (tspec->is_a_type);
+      value->data[0].v_pointer = GTYPE_TO_POINTER (tspec->is_a_type);
       changed++;
     }
 
@@ -1281,8 +1258,8 @@ param_gtype_values_cmp (GParamSpec   *pspec,
       const GValue *value1,
       const GValue *value2)
 {
-  GType p1 = GPOINTER_TO_SIZE (value1->data[0].v_pointer);
-  GType p2 = GPOINTER_TO_SIZE (value2->data[0].v_pointer);
+  GType p1 = GPOINTER_TO_TYPE (value1->data[0].v_pointer);
+  GType p2 = GPOINTER_TO_TYPE (value2->data[0].v_pointer);
 
   /* not much to compare here, try to at least provide stable lesser/greater result */
 
@@ -1870,10 +1847,10 @@ GParamSpec*
 g_param_spec_char (const gchar *name,
                    const gchar *nick,
                    const gchar *blurb,
-           gint8    minimum,
-           gint8    maximum,
-           gint8    default_value,
-           GParamFlags  flags)
+                   gint8        minimum,
+                   gint8        maximum,
+                   gint8        default_value,
+                   GParamFlags  flags)
 {
   GParamSpecChar *cspec;
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gsignal.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gsignal.c
index 82eeab534cf..25481c12a65 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gsignal.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gsignal.c
@@ -39,99 +39,6 @@
 #include "gobject_trace.h"
 
 
-/**
- * SECTION:signals
- * @short_description: A means for customization of object behaviour
- *     and a general purpose notification mechanism
- * @title: Signals
- *
- * The basic concept of the signal system is that of the emission
- * of a signal. Signals are introduced per-type and are identified
- * through strings. Signals introduced for a parent type are available
- * in derived types as well, so basically they are a per-type facility
- * that is inherited.
- *
- * A signal emission mainly involves invocation of a certain set of
- * callbacks in precisely defined manner. There are two main categories
- * of such callbacks, per-object ones and user provided ones.
- * (Although signals can deal with any kind of instantiatable type, I'm
- * referring to those types as "object types" in the following, simply
- * because that is the context most users will encounter signals in.)
- * The per-object callbacks are most often referred to as "object method
- * handler" or "default (signal) handler", while user provided callbacks are
- * usually just called "signal handler".
- *
- * The object method handler is provided at signal creation time (this most
- * frequently happens at the end of an object class' creation), while user
- * provided handlers are frequently connected and disconnected to/from a
- * certain signal on certain object instances.
- *
- * A signal emission consists of five stages, unless prematurely stopped:
- *
- * 1. Invocation of the object method handler for %G_SIGNAL_RUN_FIRST signals
- *
- * 2. Invocation of normal user-provided signal handlers (where the @after
- *    flag is not set)
- *
- * 3. Invocation of the object method handler for %G_SIGNAL_RUN_LAST signals
- *
- * 4. Invocation of user provided signal handlers (where the @after flag is set)
- *
- * 5. Invocation of the object method handler for %G_SIGNAL_RUN_CLEANUP signals
- *
- * The user-provided signal handlers are called in the order they were
- * connected in.
- *
- * All handlers may prematurely stop a signal emission, and any number of
- * handlers may be connected, disconnected, blocked or unblocked during
- * a signal emission.
- *
- * There are certain criteria for skipping user handlers in stages 2 and 4
- * of a signal emission.
- *
- * First, user handlers may be blocked. Blocked handlers are omitted during
- * callback invocation, to return from the blocked state, a handler has to
- * get unblocked exactly the same amount of times it has been blocked before.
- *
- * Second, upon emission of a %G_SIGNAL_DETAILED signal, an additional
- * @detail argument passed in to g_signal_emit() has to match the detail
- * argument of the signal handler currently subject to invocation.
- * Specification of no detail argument for signal handlers (omission of the
- * detail part of the signal specification upon connection) serves as a
- * wildcard and matches any detail argument passed in to emission.
- *
- * While the @detail argument is typically used to pass an object property name
- * (as with #GObject::notify), no specific format is mandated for the detail
- * string, other than that it must be non-empty.
- *
- * ## Memory management of signal handlers # {#signal-memory-management}
- *
- * If you are connecting handlers to signals and using a #GObject instance as
- * your signal handler user data, you should remember to pair calls to
- * g_signal_connect() with calls to g_signal_handler_disconnect() or
- * g_signal_handlers_disconnect_by_func(). While signal handlers are
- * automatically disconnected when the object emitting the signal is finalised,
- * they are not automatically disconnected when the signal handler user data is
- * destroyed. If this user data is a #GObject instance, using it from a
- * signal handler after it has been finalised is an error.
- *
- * There are two strategies for managing such user data. The first is to
- * disconnect the signal handler (using g_signal_handler_disconnect() or
- * g_signal_handlers_disconnect_by_func()) when the user data (object) is
- * finalised; this has to be implemented manually. For non-threaded programs,
- * g_signal_connect_object() can be used to implement this automatically.
- * Currently, however, it is unsafe to use in threaded programs.
- *
- * The second is to hold a strong reference on the user data until after the
- * signal is disconnected for other reasons. This can be implemented
- * automatically using g_signal_connect_data().
- *
- * The first approach is recommended, as the second approach can result in
- * effective memory leaks of the user data if the signal handler is never
- * disconnected for some reason.
- */
-
-
 #define REPORT_BUG      "please report occurrence circumstances to https://gitlab.gnome.org/GNOME/glib/issues/new"
 
 /* --- typedefs --- */
@@ -488,17 +395,9 @@ handler_list_ensure (guint    signal_id,
   if (!hlbsa)
     {
       hlbsa = g_bsearch_array_create (&g_signal_hlbsa_bconfig);
-      hlbsa = g_bsearch_array_insert (hlbsa, &g_signal_hlbsa_bconfig, &key);
-      g_hash_table_insert (g_handler_list_bsa_ht, instance, hlbsa);
     }
-  else
-    {
-      GBSearchArray *o = hlbsa;
-
-      hlbsa = g_bsearch_array_insert (o, &g_signal_hlbsa_bconfig, &key);
-      if (hlbsa != o)
+  hlbsa = g_bsearch_array_insert (hlbsa, &g_signal_hlbsa_bconfig, &key);
   g_hash_table_insert (g_handler_list_bsa_ht, instance, hlbsa);
-    }
   return g_bsearch_array_lookup (hlbsa, &g_signal_hlbsa_bconfig, &key);
 }
 
@@ -1335,8 +1234,8 @@ g_signal_lookup (const gchar *name,
     {
       /* give elaborate warnings */
       if (!g_type_name (itype))
-        g_critical (G_STRLOC ": unable to look up signal \"%s\" for invalid type id '%"G_GSIZE_FORMAT"'",
-                   name, itype);
+        g_critical (G_STRLOC ": unable to look up signal \"%s\" for invalid type id '%"G_GUINTPTR_FORMAT"'",
+                   name, (guintptr) itype);
       else if (!g_signal_is_valid_name (name))
         g_critical (G_STRLOC ": unable to look up invalid signal name \"%s\" on type '%s'",
                    name, g_type_name (itype));
@@ -1390,8 +1289,8 @@ g_signal_list_ids (GType  itype,
     {
       /* give elaborate warnings */
       if (!g_type_name (itype))
-        g_critical (G_STRLOC ": unable to list signals for invalid type id '%"G_GSIZE_FORMAT"'",
-                   itype);
+        g_critical (G_STRLOC ": unable to list signals for invalid type id '%"G_GUINTPTR_FORMAT"'",
+                   (guintptr) itype);
       else if (!G_TYPE_IS_INSTANTIATABLE (itype) && !G_TYPE_IS_INTERFACE (itype))
         g_critical (G_STRLOC ": unable to list signals of non instantiatable type '%s'",
                    g_type_name (itype));
@@ -1476,7 +1375,7 @@ g_signal_query (guint         signal_id,
  * @class_offset: The offset of the function pointer in the class structure
  *  for this type. Used to invoke a class method generically. Pass 0 to
  *  not associate a class method slot with this signal.
- * @accumulator: (nullable): the accumulator for this signal; may be %NULL.
+ * @accumulator: (nullable) (scope forever): the accumulator for this signal; may be %NULL.
  * @accu_data: (nullable) (closure accumulator): user data for the @accumulator.
  * @c_marshaller: (nullable): the function to translate arrays of parameter
  *  values to signal emissions into C language callback invocations or %NULL.
@@ -1549,10 +1448,10 @@ g_signal_new (const gchar        *signal_name,
  * @signal_flags: a combination of #GSignalFlags specifying detail of when
  *  the default handler is to be invoked. You should at least specify
  *  %G_SIGNAL_RUN_FIRST or %G_SIGNAL_RUN_LAST.
- * @class_handler: (nullable): a #GCallback which acts as class implementation of
+ * @class_handler: (nullable) (scope forever): a #GCallback which acts as class implementation of
  *  this signal. Used to invoke a class method generically. Pass %NULL to
  *  not associate a class method with this signal.
- * @accumulator: (nullable): the accumulator for this signal; may be %NULL.
+ * @accumulator: (nullable) (scope forever): the accumulator for this signal; may be %NULL.
  * @accu_data: (nullable) (closure accumulator): user data for the @accumulator.
  * @c_marshaller: (nullable): the function to translate arrays of parameter
  *  values to signal emissions into C language callback invocations or %NULL.
@@ -1689,7 +1588,7 @@ signal_add_class_closure (SignalNode *node,
  *     %G_SIGNAL_RUN_FIRST or %G_SIGNAL_RUN_LAST
  * @class_closure: (nullable): The closure to invoke on signal emission;
  *     may be %NULL
- * @accumulator: (nullable): the accumulator for this signal; may be %NULL
+ * @accumulator: (nullable) (scope forever): the accumulator for this signal; may be %NULL
  * @accu_data: (nullable) (closure accumulator): user data for the @accumulator
  * @c_marshaller: (nullable): the function to translate arrays of
  *     parameter values to signal emissions into C language callback
@@ -1950,7 +1849,7 @@ g_signal_set_va_marshaller (guint              signal_id,
  *  the default handler is to be invoked. You should at least specify
  *  %G_SIGNAL_RUN_FIRST or %G_SIGNAL_RUN_LAST.
  * @class_closure: (nullable): The closure to invoke on signal emission; may be %NULL.
- * @accumulator: (nullable): the accumulator for this signal; may be %NULL.
+ * @accumulator: (nullable) (scope forever): the accumulator for this signal; may be %NULL.
  * @accu_data: (nullable) (closure accumulator): user data for the @accumulator.
  * @c_marshaller: (nullable): the function to translate arrays of parameter
  *  values to signal emissions into C language callback invocations or %NULL.
@@ -2116,7 +2015,7 @@ g_signal_override_class_closure (guint     signal_id,
  * @signal_name: the name for the signal
  * @instance_type: the instance type on which to override the class handler
  *  for the signal.
- * @class_handler: the handler.
+ * @class_handler: (scope forever): the handler.
  *
  * Overrides the class closure (i.e. the default handler) for the
  * given signal for emissions on instances of @instance_type with
@@ -2146,14 +2045,14 @@ g_signal_override_class_handler (const gchar *signal_name,
     g_signal_override_class_closure (signal_id, instance_type,
                                      g_cclosure_new (class_handler, NULL, NULL));
   else
-    g_critical ("%s: signal name '%s' is invalid for type id '%"G_GSIZE_FORMAT"'",
-                G_STRLOC, signal_name, instance_type);
+    g_critical ("%s: signal name '%s' is invalid for type id '%"G_GUINTPTR_FORMAT"'",
+                G_STRLOC, signal_name, (guintptr) instance_type);
 
 }
 
 /**
  * g_signal_chain_from_overridden:
- * @instance_and_params: (array) the argument list of the signal emission.
+ * @instance_and_params: (array): the argument list of the signal emission.
  *  The first element in the array is a #GValue for the instance the signal
  *  is being emitted on. The rest are any arguments to be passed to the signal.
  * @return_value: Location for the return value.
@@ -2421,7 +2320,10 @@ g_signal_get_invocation_hint (gpointer instance)
  * If @closure is a floating reference (see g_closure_sink()), this function
  * takes ownership of @closure.
  *
- * Returns: the handler ID (always greater than 0 for successful connections)
+ * This function cannot fail. If the given signal doesn’t exist, a critical
+ * warning is emitted.
+ *
+ * Returns: the handler ID (always greater than 0)
  */
 gulong
 g_signal_connect_closure_by_id (gpointer  instance,
@@ -2486,7 +2388,10 @@ g_signal_connect_closure_by_id (gpointer  instance,
  * If @closure is a floating reference (see g_closure_sink()), this function
  * takes ownership of @closure.
  *
- * Returns: the handler ID (always greater than 0 for successful connections)
+ * This function cannot fail. If the given signal doesn’t exist, a critical
+ * warning is emitted.
+ *
+ * Returns: the handler ID (always greater than 0)
  */
 gulong
 g_signal_connect_closure (gpointer     instance,
@@ -2582,7 +2487,10 @@ node_check_deprecated (const SignalNode *node)
  * used. Specify @connect_flags if you need `..._after()` or
  * `..._swapped()` variants of this function.
  *
- * Returns: the handler ID (always greater than 0 for successful connections)
+ * This function cannot fail. If the given signal doesn’t exist, a critical
+ * warning is emitted.
+ *
+ * Returns: the handler ID (always greater than 0)
  */
 gulong
 g_signal_connect_data (gpointer       instance,
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gsignal.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gsignal.h
index 20a9c0fc649..bdeb70e0b4e 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gsignal.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gsignal.h
@@ -500,14 +500,18 @@ void   g_signal_chain_from_overridden_handler (gpointer           instance,
  * @c_handler: the #GCallback to connect.
  * @data: data to pass to @c_handler calls.
  *
- * Connects a #GCallback function to a signal for a particular object.
+ * Connects a [type@GObject.Callback] function to a signal for a particular object.
  *
- * The handler will be called synchronously, before the default handler of the signal. g_signal_emit() will not return control until all handlers are called.
+ * The handler will be called synchronously, before the default handler of the signal.
+ * [func@GObject.signal_emit] will not return control until all handlers are called.
  *
- * See [memory management of signal handlers][signal-memory-management] for
+ * See [memory management of signal handlers](signals.html#Memory_management_of_signal_handlers) for
  * details on how to handle the return value and memory management of @data.
  *
- * Returns: the handler ID, of type #gulong (always greater than 0 for successful connections)
+ * This function cannot fail. If the given signal doesn’t exist, a critical
+ * warning is emitted.
+ *
+ * Returns: the handler ID, of type `gulong` (always greater than 0)
  */
 /* Intentionally not using G_CONNECT_DEFAULT here to avoid deprecation
  * warnings with older GLIB_VERSION_MAX_ALLOWED */
@@ -524,7 +528,10 @@ void   g_signal_chain_from_overridden_handler (gpointer           instance,
  *
  * The handler will be called synchronously, after the default handler of the signal.
  *
- * Returns: the handler ID, of type #gulong (always greater than 0 for successful connections)
+ * This function cannot fail. If the given signal doesn’t exist, a critical
+ * warning is emitted.
+ *
+ * Returns: the handler ID, of type `gulong` (always greater than 0)
  */
 #define g_signal_connect_after(instance, detailed_signal, c_handler, data) \
     g_signal_connect_data ((instance), (detailed_signal), (c_handler), (data), NULL, G_CONNECT_AFTER)
@@ -562,7 +569,10 @@ void   g_signal_chain_from_overridden_handler (gpointer           instance,
  *                   (GCallback) button_clicked_cb, other_widget);
  * ]|
  *
- * Returns: the handler ID, of type #gulong (always greater than 0 for successful connections)
+ * This function cannot fail. If the given signal doesn’t exist, a critical
+ * warning is emitted.
+ *
+ * Returns: the handler ID, of type `gulong` (always greater than 0)
  */
 #define g_signal_connect_swapped(instance, detailed_signal, c_handler, data) \
     g_signal_connect_data ((instance), (detailed_signal), (c_handler), (data), NULL, G_CONNECT_SWAPPED)
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gsourceclosure.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gsourceclosure.c
index 0c4f2f127c2..1666466340d 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gsourceclosure.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gsourceclosure.c
@@ -36,7 +36,7 @@ g_io_condition_get_type (void)
 {
   static GType etype = 0;
 
-  if (g_once_init_enter (&etype))
+  if (g_once_init_enter_pointer (&etype))
     {
       static const GFlagsValue values[] = {
   { G_IO_IN,   "G_IO_IN",   "in" },
@@ -48,7 +48,7 @@ g_io_condition_get_type (void)
   { 0, NULL, NULL }
       };
       GType type_id = g_flags_register_static ("GIOCondition", values);
-      g_once_init_leave (&etype, type_id);
+      g_once_init_leave_pointer (&etype, type_id);
     }
   return etype;
 }
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gtype.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gtype.c
index bc63eeea897..fd40d092247 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gtype.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gtype.c
@@ -44,65 +44,6 @@
 #define IF_DEBUG(debug_type)    if (_g_type_debug_flags & G_TYPE_DEBUG_ ## debug_type)
 #endif
 
-/**
- * SECTION:gtype
- * @short_description: The GLib Runtime type identification and
- *     management system
- * @title:Type Information
- *
- * The GType API is the foundation of the GObject system. It provides the
- * facilities for registering and managing all fundamental data types,
- * user-defined object and interface types.
- *
- * For type creation and registration purposes, all types fall into one of
- * two categories: static or dynamic.  Static types are never loaded or
- * unloaded at run-time as dynamic types may be.  Static types are created
- * with g_type_register_static() that gets type specific information passed
- * in via a #GTypeInfo structure.
- *
- * Dynamic types are created with g_type_register_dynamic() which takes a
- * #GTypePlugin structure instead. The remaining type information (the
- * #GTypeInfo structure) is retrieved during runtime through #GTypePlugin
- * and the g_type_plugin_*() API.
- *
- * These registration functions are usually called only once from a
- * function whose only purpose is to return the type identifier for a
- * specific class.  Once the type (or class or interface) is registered,
- * it may be instantiated, inherited, or implemented depending on exactly
- * what sort of type it is.
- *
- * There is also a third registration function for registering fundamental
- * types called g_type_register_fundamental() which requires both a #GTypeInfo
- * structure and a #GTypeFundamentalInfo structure but it is seldom used
- * since most fundamental types are predefined rather than user-defined.
- *
- * Type instance and class structs are limited to a total of 64 KiB,
- * including all parent types. Similarly, type instances' private data
- * (as created by G_ADD_PRIVATE()) are limited to a total of
- * 64 KiB. If a type instance needs a large static buffer, allocate it
- * separately (typically by using #GArray or #GPtrArray) and put a pointer
- * to the buffer in the structure.
- *
- * As mentioned in the [GType conventions][gtype-conventions], type names must
- * be at least three characters long. There is no upper length limit. The first
- * character must be a letter (a–z or A–Z) or an underscore (‘_’). Subsequent
- * characters can be letters, numbers or any of ‘-_+’.
- *
- * # Runtime Debugging
- *
- * When 'G_ENABLE_DEBUG' is defined during compilation, the GObject library
- * supports an environment variable 'GOBJECT_DEBUG' that can be set to a
- * combination of flags to trigger debugging messages about
- * object bookkeeping and signal emissions during runtime.
- *
- * The currently supported flags are:
- *  - 'objects': Tracks all #GObject instances in a global hash table called
- *    'debug_objects_ht', and prints the still-alive objects on exit.
- *  - 'instance-count': Tracks the number of instances of every #GType and makes
- *    it available via the g_type_get_instance_count() function.
- *  - 'signals': Currently unused.
- */
-
 
 /* NOTE: some functions (some internal variants and exported ones)
  * invalidate data portions of the TypeNodes. if external functions/callbacks
@@ -155,6 +96,9 @@
 #define g_assert_type_system_initialized() \
   g_assert (static_quark_type_flags)
 
+/* Make sure G_TYPE_IS_*() macros still end up inlined */
+#define g_type_test_flags(t,f) _g_type_test_flags(t,f)
+
 #define TYPE_FUNDAMENTAL_FLAG_MASK (G_TYPE_FLAG_CLASSED | \
             G_TYPE_FLAG_INSTANTIATABLE | \
             G_TYPE_FLAG_DERIVABLE | \
@@ -163,7 +107,9 @@
 
 /* List the flags that are directly accessible via the TypeNode struct flags */
 #define NODE_FLAG_MASK ( \
+  G_TYPE_FLAG_ABSTRACT | \
   G_TYPE_FLAG_CLASSED | \
+  G_TYPE_FLAG_DEPRECATED | \
   G_TYPE_FLAG_INSTANTIATABLE | \
   G_TYPE_FLAG_FINAL)
 
@@ -198,6 +144,8 @@ typedef struct _IFaceHolder     IFaceHolder;
 
 
 /* --- prototypes --- */
+static inline gboolean                  _g_type_test_flags              (GType                   type,
+                                                                         guint                   flags);
 static inline GTypeFundamentalInfo*     type_node_fundamental_info_I    (TypeNode               *node);
 static        void                      type_add_flags_W                (TypeNode               *node,
                                                                          GTypeFlags              flags);
@@ -252,7 +200,9 @@ struct _TypeNode
   guint        n_children; /* writable with lock */
   guint        n_supers : 8;
   guint        n_prerequisites : 9;
+  guint        is_abstract : 1;
   guint        is_classed : 1;
+  guint        is_deprecated : 1;
   guint        is_instantiatable : 1;
   guint        is_final : 1;
   guint        mutatable_check_cache : 1; /* combines some common path checks */
@@ -472,7 +422,7 @@ type_node_any_new_W (TypeNode             *pnode,
 #endif
     }
   else
-    type = (GType) node;
+    type = GPOINTER_TO_TYPE (node);
 
   g_assert ((type & TYPE_ID_MASK) == 0);
 
@@ -482,7 +432,9 @@ type_node_any_new_W (TypeNode             *pnode,
       node->supers[0] = type;
       node->supers[1] = 0;
 
+      node->is_abstract = (type_flags & G_TYPE_FLAG_ABSTRACT) != 0;
       node->is_classed = (type_flags & G_TYPE_FLAG_CLASSED) != 0;
+      node->is_deprecated = (type_flags & G_TYPE_FLAG_DEPRECATED) != 0;
       node->is_instantiatable = (type_flags & G_TYPE_FLAG_INSTANTIATABLE) != 0;
 
       if (NODE_IS_IFACE (node))
@@ -498,9 +450,13 @@ type_node_any_new_W (TypeNode             *pnode,
       node->supers[0] = type;
       memcpy (node->supers + 1, pnode->supers, sizeof (GType) * (1 + pnode->n_supers + 1));
 
+      node->is_abstract = (type_flags & G_TYPE_FLAG_ABSTRACT) != 0;
       node->is_classed = pnode->is_classed;
+      node->is_deprecated = (type_flags & G_TYPE_FLAG_DEPRECATED) != 0;
       node->is_instantiatable = pnode->is_instantiatable;
 
+      node->is_deprecated |= pnode->is_deprecated;
+
       if (NODE_IS_IFACE (node))
   {
     IFACE_NODE_N_PREREQUISITES (node) = 0;
@@ -541,7 +497,7 @@ type_node_any_new_W (TypeNode             *pnode,
   node->global_gdata = NULL;
   g_hash_table_insert (static_type_nodes_ht,
            (gpointer) g_quark_to_string (node->qname),
-           (gpointer) type);
+           GTYPE_TO_POINTER (type));
 
   g_atomic_int_inc ((gint *)&type_registration_serial);
 
@@ -573,12 +529,10 @@ type_node_fundamental_new_W (GType                 ftype,
   if (ftype >> G_TYPE_FUNDAMENTAL_SHIFT == static_fundamental_next)
     static_fundamental_next++;
 
-  type_flags &= TYPE_FUNDAMENTAL_FLAG_MASK;
-
   node = type_node_any_new_W (NULL, ftype, name, NULL, type_flags);
 
   finfo = type_node_fundamental_info_I (node);
-  finfo->type_flags = type_flags;
+  finfo->type_flags = type_flags & TYPE_FUNDAMENTAL_FLAG_MASK;
 
   return node;
 }
@@ -1863,14 +1817,14 @@ maybe_issue_deprecation_warning (GType type)
   gboolean already;
   const char *name;
 
-  if (g_once_init_enter (&enable_diagnostic))
+  if (g_once_init_enter_pointer (&enable_diagnostic))
     {
       const gchar *value = g_getenv ("G_ENABLE_DIAGNOSTIC");
 
       if (!value)
         value = "0";
 
-      g_once_init_leave (&enable_diagnostic, value);
+      g_once_init_leave_pointer (&enable_diagnostic, value);
     }
 
   if (enable_diagnostic[0] == '0')
@@ -2788,9 +2742,9 @@ g_type_register_fundamental (GType                       type_id,
   if ((type_id & TYPE_ID_MASK) ||
       type_id > G_TYPE_FUNDAMENTAL_MAX)
     {
-      g_critical ("attempt to register fundamental type '%s' with invalid type id (%" G_GSIZE_FORMAT ")",
+      g_critical ("attempt to register fundamental type '%s' with invalid type id (%" G_GUINTPTR_FORMAT ")",
       type_name,
-      type_id);
+      (guintptr) type_id);
       return 0;
     }
   if ((finfo->type_flags & G_TYPE_FLAG_INSTANTIATABLE) &&
@@ -3511,7 +3465,7 @@ g_type_from_name (const gchar *name)
   g_return_val_if_fail (name != NULL, 0);
 
   G_READ_LOCK (&type_rw_lock);
-  type = (GType) g_hash_table_lookup (static_type_nodes_ht, name);
+  type = GPOINTER_TO_TYPE (g_hash_table_lookup (static_type_nodes_ht, name));
   G_READ_UNLOCK (&type_rw_lock);
 
   return type;
@@ -3940,6 +3894,8 @@ type_add_flags_W (TypeNode  *node,
   dflags |= flags;
   type_set_qdata_W (node, static_quark_type_flags, GUINT_TO_POINTER (dflags));
 
+  node->is_abstract = (flags & G_TYPE_FLAG_ABSTRACT) != 0;
+  node->is_deprecated |= (flags & G_TYPE_FLAG_DEPRECATED) != 0;
   node->is_final = (flags & G_TYPE_FLAG_FINAL) != 0;
 }
 
@@ -4016,8 +3972,8 @@ g_type_get_instance_count (GType type)
 }
 
 /* --- implementation details --- */
-gboolean
-g_type_test_flags (GType type,
+static inline gboolean
+_g_type_test_flags (GType type,
        guint flags)
 {
   TypeNode *node;
@@ -4028,16 +3984,22 @@ g_type_test_flags (GType type,
     {
       if ((flags & ~NODE_FLAG_MASK) == 0)
         {
-          if (flags & G_TYPE_FLAG_CLASSED)
-            result |= node->is_classed;
+          if ((flags & G_TYPE_FLAG_CLASSED) && !node->is_classed)
+            return FALSE;
+
+          if ((flags & G_TYPE_FLAG_INSTANTIATABLE) && !node->is_instantiatable)
+            return FALSE;
 
-          if (flags & G_TYPE_FLAG_INSTANTIATABLE)
-            result |= node->is_instantiatable;
+          if ((flags & G_TYPE_FLAG_FINAL) && !node->is_final)
+            return FALSE;
 
-          if (flags & G_TYPE_FLAG_FINAL)
-            result |= node->is_final;
+          if ((flags & G_TYPE_FLAG_ABSTRACT) && !node->is_abstract)
+            return FALSE;
 
-          return result;
+          if ((flags & G_TYPE_FLAG_DEPRECATED) && !node->is_deprecated)
+            return FALSE;
+
+          return TRUE;
         }
 
       guint fflags = flags & TYPE_FUNDAMENTAL_FLAG_MASK;
@@ -4067,6 +4029,13 @@ g_type_test_flags (GType type,
   return result;
 }
 
+gboolean
+(g_type_test_flags) (GType type,
+                     guint flags)
+{
+  return _g_type_test_flags (type, flags);
+}
+
 /**
  * g_type_get_plugin:
  * @type: #GType to retrieve the plugin for
@@ -4442,7 +4411,7 @@ g_type_value_table_peek (GType type)
     return vtable;
 
   if (!node)
-    g_critical (G_STRLOC ": type id '%" G_GSIZE_FORMAT "' is invalid", type);
+    g_critical (G_STRLOC ": type id '%" G_GUINTPTR_FORMAT "' is invalid", (guintptr) type);
   if (!has_refed_data)
     g_critical ("can't peek value table for type '%s' which is not currently referenced",
                type_descriptive_name_I (type));
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gtype.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gtype.h
index 41715367520..dc87c99b65e 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gtype.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gtype.h
@@ -421,9 +421,11 @@ G_BEGIN_DECLS
  * A numerical value which represents the unique identifier of a registered
  * type.
  */
-#if     GLIB_SIZEOF_SIZE_T != GLIB_SIZEOF_LONG || !defined (G_CXX_STD_VERSION)
+#if     GLIB_SIZEOF_VOID_P > GLIB_SIZEOF_SIZE_T
+typedef guintptr                        GType;
+#elif     GLIB_SIZEOF_SIZE_T != GLIB_SIZEOF_LONG || !defined (G_CXX_STD_VERSION)
 typedef gsize                           GType;
-#else   /* for historic reasons, C++ links against gulong GTypes */
+#else   /* for historic reasons, C++ on non-Morello/CHERI systems links against gulong GTypes */
 typedef gulong                          GType;
 #endif
 typedef struct _GValue                  GValue;
@@ -2009,8 +2011,8 @@ guint     g_type_get_type_registration_serial (void);
  * GType
  * gtk_gadget_get_type (void)
  * {
- *   static gsize static_g_define_type_id = 0;
- *   if (g_once_init_enter (&static_g_define_type_id))
+ *   static GType static_g_define_type_id = 0;
+ *   if (g_once_init_enter_pointer (&static_g_define_type_id))
  *     {
  *       GType g_define_type_id =
  *         g_type_register_static_simple (GTK_TYPE_WIDGET,
@@ -2030,7 +2032,7 @@ guint     g_type_get_type_registration_serial (void);
  *         };
  *         g_type_add_interface_static (g_define_type_id, TYPE_GIZMO, &g_implement_interface_info);
  *       }
- *       g_once_init_leave (&static_g_define_type_id, g_define_type_id);
+ *       g_once_init_leave_pointer (&static_g_define_type_id, g_define_type_id);
  *     }
  *   return static_g_define_type_id;
  * }
@@ -2265,6 +2267,16 @@ static void     type_name##_class_intern_init (gpointer klass) \
 }
 #endif /* GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38 */
 
+#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_80
+#define _g_type_once_init_type GType
+#define _g_type_once_init_enter g_once_init_enter_pointer
+#define _g_type_once_init_leave g_once_init_leave_pointer
+#else  /* if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_80 */
+#define _g_type_once_init_type gsize
+#define _g_type_once_init_enter g_once_init_enter
+#define _g_type_once_init_leave g_once_init_leave
+#endif  /* GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_80 */
+
 /* Added for _G_DEFINE_TYPE_EXTENDED_WITH_PRELUDE */
 #define _G_DEFINE_TYPE_EXTENDED_BEGIN_PRE(TypeName, type_name, TYPE_PARENT) \
 \
@@ -2286,16 +2298,16 @@ type_name##_get_instance_private (TypeName *self) \
 GType \
 type_name##_get_type (void) \
 { \
-  static gsize static_g_define_type_id = 0;
+  static _g_type_once_init_type static_g_define_type_id = 0;
   /* Prelude goes here */
 
 /* Added for _G_DEFINE_TYPE_EXTENDED_WITH_PRELUDE */
 #define _G_DEFINE_TYPE_EXTENDED_BEGIN_REGISTER(TypeName, type_name, TYPE_PARENT, flags) \
-  if (g_once_init_enter (&static_g_define_type_id)) \
+  if (_g_type_once_init_enter (&static_g_define_type_id)) \
     { \
       GType g_define_type_id = type_name##_get_type_once (); \
-      g_once_init_leave (&static_g_define_type_id, g_define_type_id); \
-    }                                   \
+      _g_type_once_init_leave (&static_g_define_type_id, g_define_type_id); \
+    } \
   return static_g_define_type_id; \
 } /* closes type_name##_get_type() */ \
 \
@@ -2334,8 +2346,8 @@ static void     type_name##_default_init        (TypeName##Interface *klass); \
 GType \
 type_name##_get_type (void) \
 { \
-  static gsize static_g_define_type_id = 0; \
-  if (g_once_init_enter (&static_g_define_type_id)) \
+  static _g_type_once_init_type static_g_define_type_id = 0; \
+  if (_g_type_once_init_enter (&static_g_define_type_id)) \
     { \
       GType g_define_type_id = \
         g_type_register_static_simple (G_TYPE_INTERFACE, \
@@ -2460,11 +2472,11 @@ static GType type_name##_get_type_once (void); \
 GType \
 type_name##_get_type (void) \
 { \
-  static gsize static_g_define_type_id = 0; \
-  if (g_once_init_enter (&static_g_define_type_id)) \
+  static _g_type_once_init_type static_g_define_type_id = 0; \
+  if (_g_type_once_init_enter (&static_g_define_type_id)) \
     { \
       GType g_define_type_id = type_name##_get_type_once (); \
-      g_once_init_leave (&static_g_define_type_id, g_define_type_id); \
+      _g_type_once_init_leave (&static_g_define_type_id, g_define_type_id); \
     } \
   return static_g_define_type_id; \
 } \
@@ -2497,11 +2509,11 @@ static GType type_name##_get_type_once (void); \
 GType \
 type_name##_get_type (void) \
 { \
-  static gsize static_g_define_type_id = 0; \
-  if (g_once_init_enter (&static_g_define_type_id)) \
+  static _g_type_once_init_type static_g_define_type_id = 0; \
+  if (_g_type_once_init_enter (&static_g_define_type_id)) \
     { \
       GType g_define_type_id = type_name##_get_type_once (); \
-      g_once_init_leave (&static_g_define_type_id, g_define_type_id); \
+      _g_type_once_init_leave (&static_g_define_type_id, g_define_type_id); \
     } \
   return static_g_define_type_id; \
 } \
@@ -2550,11 +2562,11 @@ static GType type_name##_get_type_once (void); \
 GType \
 type_name##_get_type (void) \
 { \
-  static gsize static_g_define_type_id = 0; \
-  if (g_once_init_enter (&static_g_define_type_id)) \
+  static _g_type_once_init_type static_g_define_type_id = 0; \
+  if (_g_type_once_init_enter (&static_g_define_type_id)) \
     { \
       GType g_define_type_id = type_name##_get_type_once (); \
-      g_once_init_leave (&static_g_define_type_id, g_define_type_id); \
+      _g_type_once_init_leave (&static_g_define_type_id, g_define_type_id); \
     } \
   return static_g_define_type_id; \
 } \
@@ -2698,6 +2710,27 @@ const gchar *    g_type_name_from_class         (GTypeClass     *g_class);
  */
 #define G_TYPE_FLAG_RESERVED_ID_BIT     ((GType) (1 << 0))
 
+/**
+ * GPOINTER_TO_TYPE:
+ * @p: The pointer to convert to a #GType
+ *
+ * This macro should be used instead of GPOINTER_TO_SIZE() to ensure
+ * portability since #GType is not guaranteed to be the same as #gsize.
+ *
+ * Since: 2.80
+ */
+#define GPOINTER_TO_TYPE(p) ((GType) (guintptr) (p)) GOBJECT_AVAILABLE_MACRO_IN_2_80
+/**
+ * GTYPE_TO_POINTER:
+ * @t: The #GType to convert to a pointer
+ *
+ * This macro should be used instead of GSIZE_TO_POINTER() to ensure
+ * portability since #GType is not guaranteed to be the same as #gsize.
+ *
+ * Since: 2.80
+ */
+#define GTYPE_TO_POINTER(t) ((gpointer) (guintptr) (t)) GOBJECT_AVAILABLE_MACRO_IN_2_80
+
 G_END_DECLS
 
 #endif /* __G_TYPE_H__ */
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gtypemodule.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gtypemodule.c
index b8aeb5e17e1..5a792466751 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gtypemodule.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gtypemodule.c
@@ -26,41 +26,40 @@
 
 
 /**
- * SECTION:gtypemodule
- * @short_description: Type loading modules
- * @see_also: #GTypePlugin, #GModule
- * @title: GTypeModule
+ * GTypeModule:
+ * @name: the name of the module
  *
- * #GTypeModule provides a simple implementation of the #GTypePlugin
+ * `GTypeModule` provides a simple implementation of the `GTypePlugin`
  * interface.
  *
- * The model of #GTypeModule is a dynamically loaded module which
+ * The model of `GTypeModule` is a dynamically loaded module which
  * implements some number of types and interface implementations.
  *
  * When the module is loaded, it registers its types and interfaces
- * using g_type_module_register_type() and g_type_module_add_interface().
+ * using [method@GObject.TypeModule.register_type] and
+ * [method@GObject.TypeModule.add_interface].
  * As long as any instances of these types and interface implementations
  * are in use, the module is kept loaded. When the types and interfaces
  * are gone, the module may be unloaded. If the types and interfaces
  * become used again, the module will be reloaded. Note that the last
  * reference cannot be released from within the module code, since that
- * would lead to the caller's code being unloaded before g_object_unref()
+ * would lead to the caller's code being unloaded before `g_object_unref()`
  * returns to it.
  *
  * Keeping track of whether the module should be loaded or not is done by
  * using a use count - it starts at zero, and whenever it is greater than
  * zero, the module is loaded. The use count is maintained internally by
  * the type system, but also can be explicitly controlled by
- * g_type_module_use() and g_type_module_unuse(). Typically, when loading
- * a module for the first type, g_type_module_use() will be used to load
- * it so that it can initialize its types. At some later point, when the
- * module no longer needs to be loaded except for the type
- * implementations it contains, g_type_module_unuse() is called.
+ * [method@GObject.TypeModule.use] and [method@GObject.TypeModule.unuse].
+ * Typically, when loading a module for the first type, `g_type_module_use()`
+ * will be used to load it so that it can initialize its types. At some later
+ * point, when the module no longer needs to be loaded except for the type
+ * implementations it contains, `g_type_module_unuse()` is called.
  *
- * #GTypeModule does not actually provide any implementation of module
+ * `GTypeModule` does not actually provide any implementation of module
  * loading and unloading. To create a particular module type you must
- * derive from #GTypeModule and implement the load and unload functions
- * in #GTypeModuleClass.
+ * derive from `GTypeModule` and implement the load and unload functions
+ * in `GTypeModuleClass`.
  */
 
 typedef struct _ModuleTypeInfo ModuleTypeInfo;
@@ -116,6 +115,10 @@ g_type_module_finalize (GObject *object)
 
   g_free (module->name);
 
+  /* in case a subclass does not chain-up to parent in dispose() */
+  g_assert (module->type_infos == NULL);
+  g_assert (module->interface_infos == NULL);
+
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gtypemodule.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gtypemodule.h
index 9f60bc00321..c2097afc0bb 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gtypemodule.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gtypemodule.h
@@ -40,13 +40,6 @@ typedef struct _GTypeModuleClass GTypeModuleClass;
 
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GTypeModule, g_object_unref)
 
-/**
- * GTypeModule:
- * @name: the name of the module
- *
- * The members of the GTypeModule structure should not
- * be accessed directly, except for the @name field.
- */
 struct _GTypeModule
 {
   GObject parent_instance;
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gtypeplugin.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gtypeplugin.c
index 6c7a484432d..7778d193a69 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gtypeplugin.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gtypeplugin.c
@@ -23,10 +23,7 @@
 
 
 /**
- * SECTION:gtypeplugin
- * @short_description: An interface for dynamically loadable types
- * @see_also: #GTypeModule and g_type_register_dynamic().
- * @title: GTypePlugin
+ * GTypePlugin:
  *
  * An interface that handles the lifecycle of dynamically loaded types.
  *
@@ -36,45 +33,45 @@
  * 1. The type is initially introduced (usually upon loading the module
  *    the first time, or by your main application that knows what modules
  *    introduces what types), like this:
- *    |[<!-- language="C" -->
+ *    ```c
  *    new_type_id = g_type_register_dynamic (parent_type_id,
  *                                           "TypeName",
  *                                           new_type_plugin,
  *                                           type_flags);
- *    ]|
- *    where @new_type_plugin is an implementation of the
- *    #GTypePlugin interface.
+ *    ```
+ *    where `new_type_plugin` is an implementation of the
+ *    `GTypePlugin` interface.
  *
  * 2. The type's implementation is referenced, e.g. through
- *    g_type_class_ref() or through g_type_create_instance() (this is
- *    being called by g_object_new()) or through one of the above done on
- *    a type derived from @new_type_id.
+ *    [func@GObject.TypeClass.ref] or through [func@GObject.type_create_instance]
+ *    (this is being called by [ctor@GObject.Object.new]) or through one of the above
+ *    done on a type derived from `new_type_id`.
  *
- * 3. This causes the type system to load the type's implementation by
- *    calling g_type_plugin_use() and g_type_plugin_complete_type_info()
- *    on @new_type_plugin.
+ * 3. This causes the type system to load the type's implementation by calling
+ *    [method@GObject.TypePlugin.use] and [method@GObject.TypePlugin.complete_type_info]
+ *    on `new_type_plugin`.
  *
- * 4. At some point the type's implementation isn't required anymore,
- *    e.g. after g_type_class_unref() or g_type_free_instance() (called
- *    when the reference count of an instance drops to zero).
+ * 4. At some point the type's implementation isn't required anymore, e.g. after
+ *    [method@GObject.TypeClass.unref] or [func@GObject.type_free_instance]
+ *    (called when the reference count of an instance drops to zero).
  *
  * 5. This causes the type system to throw away the information retrieved
- *    from g_type_plugin_complete_type_info() and then it calls
- *    g_type_plugin_unuse() on @new_type_plugin.
+ *    from [method@GObject.TypePlugin.complete_type_info] and then it calls
+ *    [method@GObject.TypePlugin.unuse] on `new_type_plugin`.
  *
  * 6. Things may repeat from the second step.
  *
- * So basically, you need to implement a #GTypePlugin type that
+ * So basically, you need to implement a `GTypePlugin` type that
  * carries a use_count, once use_count goes from zero to one, you need
  * to load the implementation to successfully handle the upcoming
- * g_type_plugin_complete_type_info() call. Later, maybe after
+ * [method@GObject.TypePlugin.complete_type_info] call. Later, maybe after
  * succeeding use/unuse calls, once use_count drops to zero, you can
  * unload the implementation again. The type system makes sure to call
- * g_type_plugin_use() and g_type_plugin_complete_type_info() again
- * when the type is needed again.
+ * [method@GObject.TypePlugin.use] and [method@GObject.TypePlugin.complete_type_info]
+ * again when the type is needed again.
  *
- * #GTypeModule is an implementation of #GTypePlugin that already
- * implements most of this except for the actual module loading and
+ * [class@GObject.TypeModule] is an implementation of `GTypePlugin` that
+ * already implements most of this except for the actual module loading and
  * unloading. It even handles multiple registered types per module.
  */
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gtypeplugin.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gtypeplugin.h
index 8ac5073ba12..11739a107ef 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gtypeplugin.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gtypeplugin.h
@@ -80,12 +80,6 @@ typedef void  (*GTypePluginCompleteInterfaceInfo) (GTypePlugin     *plugin,
                GType            instance_type,
                GType            interface_type,
                GInterfaceInfo  *info);
-/**
- * GTypePlugin:
- *
- * The GTypePlugin typedef is used as a placeholder
- * for objects that implement the GTypePlugin interface.
- */
 /**
  * GTypePluginClass:
  * @use_plugin: Increases the use count of the plugin.
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gvalue.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gvalue.c
index aa77b7f3272..01f9c91df6f 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gvalue.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gvalue.c
@@ -31,122 +31,6 @@
 #include "gtype-private.h"
 
 
-/**
- * SECTION:generic_values
- * @short_description: A polymorphic type that can hold values of any
- *     other type
- * @see_also: The fundamental types which all support #GValue
- *     operations and thus can be used as a type initializer for
- *     g_value_init() are defined by a separate interface.  See the
- *     [standard values API][gobject-Standard-Parameter-and-Value-Types]
- *     for details
- * @title: Generic values
- *
- * The #GValue structure is basically a variable container that consists
- * of a type identifier and a specific value of that type.
- *
- * The type identifier within a #GValue structure always determines the
- * type of the associated value.
- *
- * To create an undefined #GValue structure, simply create a zero-filled
- * #GValue structure. To initialize the #GValue, use the g_value_init()
- * function. A #GValue cannot be used until it is initialized. Before
- * destruction you must always use g_value_unset() to make sure allocated
- * memory is freed.
- *
- * The basic type operations (such as freeing and copying) are determined
- * by the #GTypeValueTable associated with the type ID stored in the #GValue.
- * Other #GValue operations (such as converting values between types) are
- * provided by this interface.
- *
- * The code in the example program below demonstrates #GValue's
- * features.
- *
- * |[<!-- language="C" -->
- * #include <glib-object.h>
- *
- * static void
- * int2string (const GValue *src_value,
- *             GValue       *dest_value)
- * {
- *   if (g_value_get_int (src_value) == 42)
- *     g_value_set_static_string (dest_value, "An important number");
- *   else
- *     g_value_set_static_string (dest_value, "What's that?");
- * }
- *
- * int
- * main (int   argc,
- *       char *argv[])
- * {
- *   // GValues must be initialized
- *   GValue a = G_VALUE_INIT;
- *   GValue b = G_VALUE_INIT;
- *   const gchar *message;
- *
- *   // The GValue starts empty
- *   g_assert (!G_VALUE_HOLDS_STRING (&a));
- *
- *   // Put a string in it
- *   g_value_init (&a, G_TYPE_STRING);
- *   g_assert (G_VALUE_HOLDS_STRING (&a));
- *   g_value_set_static_string (&a, "Hello, world!");
- *   g_printf ("%s\n", g_value_get_string (&a));
- *
- *   // Reset it to its pristine state
- *   g_value_unset (&a);
- *
- *   // It can then be reused for another type
- *   g_value_init (&a, G_TYPE_INT);
- *   g_value_set_int (&a, 42);
- *
- *   // Attempt to transform it into a GValue of type STRING
- *   g_value_init (&b, G_TYPE_STRING);
- *
- *   // An INT is transformable to a STRING
- *   g_assert (g_value_type_transformable (G_TYPE_INT, G_TYPE_STRING));
- *
- *   g_value_transform (&a, &b);
- *   g_printf ("%s\n", g_value_get_string (&b));
- *
- *   // Attempt to transform it again using a custom transform function
- *   g_value_register_transform_func (G_TYPE_INT, G_TYPE_STRING, int2string);
- *   g_value_transform (&a, &b);
- *   g_printf ("%s\n", g_value_get_string (&b));
- *   return 0;
- * }
- * ]|
- *
- * See also [gobject-Standard-Parameter-and-Value-Types] for more information on
- * validation of #GValue.
- *
- * For letting a #GValue own (and memory manage) arbitrary types or pointers,
- * they need to become a [boxed type][gboxed]. The example below shows how
- * the pointer `mystruct` of type `MyStruct` is used as a [boxed type][gboxed].
- *
- * |[<!-- language="C" -->
- * typedef struct { ... } MyStruct;
- * G_DEFINE_BOXED_TYPE (MyStruct, my_struct, my_struct_copy, my_struct_free)
- *
- * // These two lines normally go in a public header. By GObject convention,
- * // the naming scheme is NAMESPACE_TYPE_NAME:
- * #define MY_TYPE_STRUCT (my_struct_get_type ())
- * GType my_struct_get_type (void);
- *
- * void
- * foo ()
- * {
- *   GValue *value = g_new0 (GValue, 1);
- *   g_value_init (value, MY_TYPE_STRUCT);
- *   g_value_set_boxed (value, mystruct);
- *   // [... your code ....]
- *   g_value_unset (value);
- *   g_free (value);
- * }
- * ]|
- */
-
-
 /* --- typedefs & structures --- */
 typedef struct {
   GType src_type;
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gvaluearray.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gvaluearray.c
index 1bf2cf6dfbf..176d8fed49a 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gvaluearray.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gvaluearray.c
@@ -30,35 +30,35 @@
 
 
 /**
- * SECTION:value_arrays
- * @short_description: A container structure to maintain an array of
- *     generic values
- * @see_also: #GValue, #GParamSpecValueArray, g_param_spec_value_array()
- * @title: Value arrays
- *
- * The prime purpose of a #GValueArray is for it to be used as an
- * object property that holds an array of values. A #GValueArray wraps
- * an array of #GValue elements in order for it to be used as a boxed
- * type through %G_TYPE_VALUE_ARRAY.
- *
- * #GValueArray is deprecated in favour of #GArray since GLib 2.32. It
- * is possible to create a #GArray that behaves like a #GValueArray by
- * using the size of #GValue as the element size, and by setting
- * g_value_unset() as the clear function using g_array_set_clear_func(),
- * for instance, the following code:
- *
- * |[<!-- language="C" -->
+ * GValueArray:
+ * @n_values: number of values contained in the array
+ * @values: array of values
+ *
+ * A `GValueArray` is a container structure to hold an array of generic values.
+ *
+ * The prime purpose of a `GValueArray` is for it to be used as an
+ * object property that holds an array of values. A `GValueArray` wraps
+ * an array of `GValue` elements in order for it to be used as a boxed
+ * type through `G_TYPE_VALUE_ARRAY`.
+ *
+ * `GValueArray` is deprecated in favour of `GArray` since GLib 2.32.
+ * It is possible to create a `GArray` that behaves like a `GValueArray`
+ * by using the size of `GValue` as the element size, and by setting
+ * [method@GObject.Value.unset] as the clear function using
+ * [func@GLib.Array.set_clear_func], for instance, the following code:
+ *
+ * ```c
  *   GValueArray *array = g_value_array_new (10);
- * ]|
+ * ```
  *
  * can be replaced by:
  *
- * |[<!-- language="C" -->
+ * ```c
  *   GArray *array = g_array_sized_new (FALSE, TRUE, sizeof (GValue), 10);
  *   g_array_set_clear_func (array, (GDestroyNotify) g_value_unset);
- * ]|
+ * ```
  *
- * Deprecated: 2.32: Use #GArray instead, if possible for the given use case,
+ * Deprecated: 2.32: Use `GArray` instead, if possible for the given use case,
  *    as described above.
  */
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gvaluearray.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gvaluearray.h
index ded2ab42b31..83aae14f65f 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gvaluearray.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gvaluearray.h
@@ -41,13 +41,6 @@ G_BEGIN_DECLS
 
 /* --- typedefs & structs --- */
 typedef struct _GValueArray GValueArray;
-/**
- * GValueArray:
- * @n_values: number of values contained in the array
- * @values: array of values
- *
- * A #GValueArray contains an array of #GValue elements.
- */
 struct _GValueArray
 {
   guint   n_values;
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gvaluecollector.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gvaluecollector.h
index 608360ac06e..010c5d0f3f8 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gvaluecollector.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gvaluecollector.h
@@ -18,17 +18,7 @@
  *
  * gvaluecollector.h: GValue varargs stubs
  */
-/**
- * SECTION:value_collection
- * @Short_description: Converting varargs to generic values
- * @Title: Varargs Value Collection
- *
- * The macros in this section provide the varargs parsing support needed
- * in variadic GObject functions such as g_object_new() or g_object_set().
- *
- * They currently support the collection of integral types, floating point
- * types and pointers.
- */
+
 #ifndef __G_VALUE_COLLECTOR_H__
 #define __G_VALUE_COLLECTOR_H__
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gvaluetypes.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gvaluetypes.c
index 4f0897b8f00..e1d87f53840 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gvaluetypes.c
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gvaluetypes.c
@@ -1159,6 +1159,41 @@ g_value_dup_string (const GValue *value)
   return g_strdup (value->data[0].v_pointer);
 }
 
+/**
+ * g_value_steal_string:
+ * @value: a valid #GValue of type %G_TYPE_STRING
+ *
+ * Steal ownership on contents of a %G_TYPE_STRING #GValue.
+ * As a result of this operation the value's contents will be reset to %NULL.
+ *
+ * The purpose of this call is to provide a way to avoid an extra copy
+ * when some object have been serialized into string through #GValue API.
+ *
+ * NOTE: for safety and compatibility purposes, if #GValue contains
+ * static string, or an interned one, this function will return a copy
+ * of the string. Otherwise the transfer notation would be ambiguous.
+ *
+ * Returns: (nullable) (transfer full): string content of @value;
+ *  Should be freed with g_free() when no longer needed.
+ *
+ * Since: 2.80
+ */
+gchar*
+g_value_steal_string (GValue *value)
+{
+  gchar *ret;
+
+  g_return_val_if_fail (G_VALUE_HOLDS_STRING (value), NULL);
+
+  ret = value->data[0].v_pointer;
+  value->data[0].v_pointer = NULL;
+
+  if (value->data[1].v_uint & G_VALUE_NOCOPY_CONTENTS)
+    return g_strdup (ret);
+
+  return ret;
+}
+
 /**
  * g_value_set_pointer:
  * @value: a valid #GValue of %G_TYPE_POINTER
@@ -1208,7 +1243,7 @@ g_value_set_gtype (GValue *value,
 {
   g_return_if_fail (G_VALUE_HOLDS_GTYPE (value));
 
-  value->data[0].v_pointer = GSIZE_TO_POINTER (v_gtype);
+  value->data[0].v_pointer = GTYPE_TO_POINTER (v_gtype);
 
 }
 
@@ -1227,7 +1262,7 @@ g_value_get_gtype (const GValue *value)
 {
   g_return_val_if_fail (G_VALUE_HOLDS_GTYPE (value), 0);
 
-  return GPOINTER_TO_SIZE (value->data[0].v_pointer);
+  return GPOINTER_TO_TYPE (value->data[0].v_pointer);
 }
 
 /**
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gvaluetypes.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gvaluetypes.h
index c783cd15f52..72e33448763 100644
--- a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gvaluetypes.h
+++ b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/gobject/gvaluetypes.h
@@ -263,6 +263,8 @@ GOBJECT_AVAILABLE_IN_ALL
 const gchar *         g_value_get_string    (const GValue *value);
 GOBJECT_AVAILABLE_IN_ALL
 gchar*            g_value_dup_string    (const GValue *value);
+GOBJECT_AVAILABLE_IN_2_80
+gchar*            g_value_steal_string  (GValue *value);
 GOBJECT_AVAILABLE_IN_ALL
 void              g_value_set_pointer   (GValue       *value,
              gpointer      v_pointer);
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/alsa/gstalsa.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/alsa/gstalsa.c
index 028d904e11b..815e739da33 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/alsa/gstalsa.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/alsa/gstalsa.c
@@ -18,6 +18,9 @@
 #include "gstalsa.h"
 
 #include <gst/audio/audio.h>
+#ifndef GSTREAMER_LITE
+#include <gst/audio/gstdsd.h>
+#endif // GSTREAMER_LITE
 
 static GstCaps *
 gst_alsa_detect_rates (GstObject * obj, snd_pcm_hw_params_t * hw_params,
@@ -238,6 +241,211 @@ gst_alsa_detect_formats (GstObject * obj, snd_pcm_hw_params_t * hw_params,
   return caps;
 }
 
+#ifndef GSTREAMER_LITE
+/* Notes about what the "rate" means in DSD:
+ *
+ * In DSD, "sample formats" don't actually exist. There is only the DSD bit;
+ * this is what could be considered the closest equivalent to a "sample format".
+ * But since it is impractical to deal with individual bits in software, the
+ * bits are typically grouped into words (8/16/32 bit words). These are the
+ * DSDU8, DSDU16LE etc. "grouping formats".
+ *
+ * The "rate" in DSD information refers to the number of DSD _bytes_ per second
+ * (not bits per second, because, as said, per-bit handling in software does
+ * not usually make sense). ALSA however interprets "rate" as the number of
+ * DSD _words_ per minute. If the word format is DSDU8, then there's no difference.
+ * But if for example it is DSDU16LE, then ALSA's rate is half of the rate
+ * from GstDsdInfo. For this reason, before setting the rate in the ALSA
+ * hw params, it is essential to divide the rate from the DSD info by the
+ * word length (in bytes).
+ */
+
+typedef struct
+{
+  snd_pcm_format_t alsa_format;
+  const char *gstreamer_format_name;
+} DsdFormatInfo;
+
+static GstCaps *
+gst_alsa_detect_dsd_formats (GstObject * obj, snd_pcm_hw_params_t * hw_params)
+{
+  snd_pcm_format_mask_t *mask;
+  GValue format_list_value = G_VALUE_INIT;
+  gint table_idx;
+  gboolean dsd_is_supported = FALSE;
+  GstCaps *caps = NULL;
+
+  const DsdFormatInfo format_table[] = {
+    {SND_PCM_FORMAT_DSD_U8, "DSDU8"},
+    {SND_PCM_FORMAT_DSD_U16_LE, "DSDU16LE"},
+    {SND_PCM_FORMAT_DSD_U16_BE, "DSDU16BE"},
+    {SND_PCM_FORMAT_DSD_U32_LE, "DSDU32LE"},
+    {SND_PCM_FORMAT_DSD_U32_BE, "DSDU32BE"}
+  };
+  const gint format_table_size = sizeof (format_table) / sizeof (DsdFormatInfo);
+
+  g_value_init (&format_list_value, GST_TYPE_LIST);
+
+  snd_pcm_format_mask_malloc (&mask);
+  snd_pcm_hw_params_get_format_mask (hw_params, mask);
+
+  for (table_idx = 0; table_idx < format_table_size; ++table_idx) {
+    const DsdFormatInfo *format_info = &(format_table[table_idx]);
+    gboolean format_supported = snd_pcm_format_mask_test (mask,
+        format_info->alsa_format);
+
+    GST_DEBUG_OBJECT (obj, "%s supported: %s",
+        format_info->gstreamer_format_name, format_supported ? "yes" : "no");
+
+    if (format_supported) {
+      GValue format_value = G_VALUE_INIT;
+
+      g_value_init (&format_value, G_TYPE_STRING);
+      g_value_set_string (&format_value, format_info->gstreamer_format_name);
+      gst_value_list_append_and_take_value (&format_list_value, &format_value);
+
+      dsd_is_supported = TRUE;
+    }
+  }
+
+  if (dsd_is_supported) {
+    GstStructure *structure;
+    structure = gst_structure_new_empty ("audio/x-dsd");
+
+    /* As a small optimization, if we only support exactly one
+     * format, store it directly instead of an 1-item list. */
+
+    if (gst_value_list_get_size (&format_list_value) == 1) {
+      const GValue *supported_format_value =
+          gst_value_list_get_value (&format_list_value, 0);
+
+      gst_structure_set_value (structure, "format", supported_format_value);
+      g_value_unset (&format_list_value);
+    } else
+      gst_structure_take_value (structure, "format", &format_list_value);
+
+    caps = gst_caps_new_full (structure, NULL);
+  } else {
+    g_value_unset (&format_list_value);
+  }
+
+  snd_pcm_format_mask_free (mask);
+
+  return caps;
+}
+
+static GstCaps *
+gst_alsa_detect_dsd_rates (GstObject * obj, snd_pcm_t * handle,
+    snd_pcm_hw_params_t * hw_params, GstCaps * in_caps)
+{
+  GstCaps *caps = NULL;
+  guint min_rate, max_rate;
+  gint err, dir, caps_idx;
+  int cur_dsd_multiplier;
+  gboolean keep_testing_rates;
+  GValue rate_list_value = G_VALUE_INIT;
+  GValue rate_value = G_VALUE_INIT;
+
+  GST_LOG_OBJECT (obj, "probing DSD sample rates ...");
+
+  g_value_init (&rate_list_value, GST_TYPE_LIST);
+  g_value_init (&rate_value, G_TYPE_INT);
+
+  if ((err = snd_pcm_hw_params_get_rate_min (hw_params, &min_rate, &dir)) < 0)
+    goto min_rate_err;
+
+  if ((err = snd_pcm_hw_params_get_rate_max (hw_params, &max_rate, &dir)) < 0)
+    goto max_rate_err;
+
+  /* In DSD, valid rates are an integer multiple of 44100 (DSD-44x) or
+   * 48000 (DSD-48x), and those multipliers must themselves be a power of
+   * 2. For example, "DSD64-44x" means 64*44100 = 2822400 bits per second.
+   * In software, we use bytes, so DSD64-44x equals 2822400/8 = 352800 bytes
+   * per second. DSD64 is the lowest valid rate. The next higher valid rate
+   * would be DSD128-4x, and DSD256-44x after that etc. DSD200-44x is not
+   * valid, for example. For this reason, it makes sense to check for the
+   * individual valid rates that lie within the range defined by min_rate
+   * and max_rate. */
+
+  cur_dsd_multiplier = ((gint64) min_rate) * 8 / 44100;
+  /* Multipliers below 64 are not valid. If the hardware can't handle
+   * at least DSD64-44x, we can't play DSD, so this is a good starting
+   * point for the rate tests below. */
+  if (cur_dsd_multiplier < 64)
+    cur_dsd_multiplier = 64;
+
+  keep_testing_rates = TRUE;
+  while (keep_testing_rates) {
+    const int rates_to_test[] = {
+      GST_DSD_MAKE_DSD_RATE_44x (cur_dsd_multiplier),
+      GST_DSD_MAKE_DSD_RATE_48x (cur_dsd_multiplier)
+    };
+    const gchar *rates_desc[] = { "44x", "48x" };
+
+    int i;
+
+    for (i = 0; i < G_N_ELEMENTS (rates_to_test); ++i) {
+      int rate_to_test = rates_to_test[i];
+      if (rate_to_test > max_rate) {
+        keep_testing_rates = FALSE;
+        break;
+      }
+
+      if (snd_pcm_hw_params_test_rate (handle, hw_params, rate_to_test, 0) == 0) {
+        GST_DEBUG_OBJECT (obj,
+            "DSD%d-%s available (equals rate of %d DSD bytes per second)",
+            cur_dsd_multiplier, rates_desc[i], rate_to_test);
+        g_value_set_int (&rate_value, rate_to_test);
+        gst_value_list_append_value (&rate_list_value, &rate_value);
+      }
+    }
+
+    cur_dsd_multiplier *= 2;
+  }
+
+  caps = gst_caps_make_writable (in_caps);
+
+  if (gst_value_list_get_size (&rate_list_value) == 1) {
+    /* As a small optimization, if we only support exactly one
+     * rate, store it directly instead of an 1-item list. */
+
+    const GValue *supported_rate_value =
+        gst_value_list_get_value (&rate_list_value, 0);
+
+    for (caps_idx = 0; caps_idx < gst_caps_get_size (caps); ++caps_idx) {
+      GstStructure *structure = gst_caps_get_structure (caps, caps_idx);
+      gst_structure_set_value (structure, "rate", supported_rate_value);
+    }
+  } else {
+    for (caps_idx = 0; caps_idx < gst_caps_get_size (caps); ++caps_idx) {
+      GstStructure *structure = gst_caps_get_structure (caps, caps_idx);
+      gst_structure_set_value (structure, "rate", &rate_list_value);
+    }
+  }
+
+finish:
+  g_value_unset (&rate_list_value);
+  g_value_unset (&rate_value);
+  return caps;
+
+  /* ERRORS */
+min_rate_err:
+  {
+    GST_ERROR_OBJECT (obj, "failed to query minimum sample rate: %s",
+        snd_strerror (err));
+    gst_caps_unref (in_caps);
+    goto finish;
+  }
+max_rate_err:
+  {
+    GST_ERROR_OBJECT (obj, "failed to query maximum sample rate: %s",
+        snd_strerror (err));
+    gst_caps_unref (in_caps);
+    goto finish;
+  }
+}
+#endif // GSTREAMER_LITE
+
 /* we don't have channel mappings for more than this many channels */
 #define GST_ALSA_MAX_CHANNELS 8
 
@@ -514,6 +722,9 @@ gst_alsa_probe_supported_formats (GstObject * obj, gchar * device,
   snd_pcm_hw_params_t *hw_params;
   snd_pcm_stream_t stream_type;
   GstCaps *caps;
+#ifndef GSTREAMER_LITE
+  GstCaps *dsd_caps;
+#endif // GSTREAMER_LITE
   gint err;
 
   snd_pcm_hw_params_malloc (&hw_params);
@@ -522,26 +733,57 @@ gst_alsa_probe_supported_formats (GstObject * obj, gchar * device,
 
   stream_type = snd_pcm_stream (handle);
 
+  /* Try detecting PCM */
+
   caps = gst_alsa_detect_formats (obj, hw_params,
       gst_caps_copy (template_caps), G_BYTE_ORDER);
 
   /* if there are no formats in native endianness, try non-native as well */
   if (caps == NULL) {
-    GST_INFO_OBJECT (obj, "no formats in native endianness detected");
+    GST_INFO_OBJECT (obj, "no PCM formats in native endianness detected");
 
     caps = gst_alsa_detect_formats (obj, hw_params,
         gst_caps_copy (template_caps),
         (G_BYTE_ORDER == G_LITTLE_ENDIAN) ? G_BIG_ENDIAN : G_LITTLE_ENDIAN);
 
-    if (caps == NULL)
+    if (caps == NULL) {
+      GST_ERROR_OBJECT (obj, "failed to detect PCM formats");
       goto subroutine_error;
+    }
   }
 
-  if (!(caps = gst_alsa_detect_rates (obj, hw_params, caps)))
+  if (!(caps = gst_alsa_detect_rates (obj, hw_params, caps))) {
+    GST_ERROR_OBJECT (obj, "failed to detect PCM rates");
     goto subroutine_error;
+  }
 
-  if (!(caps = gst_alsa_detect_channels (obj, hw_params, caps)))
+  if (!(caps = gst_alsa_detect_channels (obj, hw_params, caps))) {
+    GST_ERROR_OBJECT (obj, "failed to detect PCM channels");
     goto subroutine_error;
+  }
+
+  /* Try detecting DSD */
+#ifndef GSTREAMER_LITE
+  dsd_caps = gst_alsa_detect_dsd_formats (obj, hw_params);
+  if (dsd_caps != NULL) {
+    GST_INFO_OBJECT (obj, "DSD support detected");
+
+    if (!(dsd_caps =
+            gst_alsa_detect_dsd_rates (obj, handle, hw_params, dsd_caps))) {
+      GST_ERROR_OBJECT (obj, "failed to detect DSD rates");
+      goto subroutine_error;
+    }
+
+    if (!(dsd_caps = gst_alsa_detect_channels (obj, hw_params, dsd_caps))) {
+      GST_ERROR_OBJECT (obj, "failed to detect DSD channels");
+      goto subroutine_error;
+    }
+
+    gst_caps_append (caps, dsd_caps);
+  } else {
+    GST_INFO_OBJECT (obj, "DSD support not detected");
+  }
+#endif // GSTREAMER_LITE
 
   /* Try opening IEC958 device to see if we can support that format (playback
    * only for now but we could add SPDIF capture later) */
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/alsa/gstalsasink.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/alsa/gstalsasink.c
index ecb18678fae..342c9fec342 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/alsa/gstalsasink.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/alsa/gstalsasink.c
@@ -52,6 +52,9 @@
 #include "gstalsasink.h"
 
 #include <gst/audio/gstaudioiec61937.h>
+#ifndef GSTREAMER_LITE
+#include <gst/audio/gstdsd.h>
+#endif // GSTREAMER_LITE
 #include <glib/gi18n-lib.h>
 
 #ifndef ESTRPIPE
@@ -114,6 +117,13 @@ static GstStaticPadTemplate alsasink_sink_factory =
         "format = (string) " GST_AUDIO_FORMATS_ALL ", "
         "layout = (string) interleaved, "
         "rate = (int) [ 1, MAX ], " "channels = (int) [ 1, MAX ]; "
+#ifndef GSTREAMER_LITE
+        GST_DSD_MEDIA_TYPE ", "
+        "format = (string) " GST_DSD_FORMATS_ALL ", "
+        "layout = (string) interleaved, "
+        "reversed-bytes = (gboolean) false, "
+        "rate = (int) [ 1, MAX ], " "channels = (int) [ 1, MAX ]; "
+#endif // GSTREAMER_LITE
         PASSTHROUGH_CAPS)
     );
 
@@ -832,6 +842,29 @@ alsasink_parse_spec (GstAlsaSink * alsa, GstAudioRingBufferSpec * spec)
           goto error;
       }
       break;
+#ifndef GSTREAMER_LITE
+    case GST_AUDIO_RING_BUFFER_FORMAT_TYPE_DSD:
+      switch (GST_AUDIO_RING_BUFFER_SPEC_DSD_FORMAT (spec)) {
+        case GST_DSD_FORMAT_U8:
+          alsa->format = SND_PCM_FORMAT_DSD_U8;
+          break;
+        case GST_DSD_FORMAT_U16LE:
+          alsa->format = SND_PCM_FORMAT_DSD_U16_LE;
+          break;
+        case GST_DSD_FORMAT_U16BE:
+          alsa->format = SND_PCM_FORMAT_DSD_U16_BE;
+          break;
+        case GST_DSD_FORMAT_U32LE:
+          alsa->format = SND_PCM_FORMAT_DSD_U32_LE;
+          break;
+        case GST_DSD_FORMAT_U32BE:
+          alsa->format = SND_PCM_FORMAT_DSD_U32_BE;
+          break;
+        default:
+          goto error;
+      }
+      break;
+#endif // GSTREAMER_LITE
     case GST_AUDIO_RING_BUFFER_FORMAT_TYPE_A_LAW:
       alsa->format = SND_PCM_FORMAT_A_LAW;
       break;
@@ -855,7 +888,13 @@ alsasink_parse_spec (GstAlsaSink * alsa, GstAudioRingBufferSpec * spec)
   alsa->period_time = spec->latency_time;
   alsa->access = SND_PCM_ACCESS_RW_INTERLEAVED;
 
+#ifndef GSTREAMER_LITE
+  if ((spec->type == GST_AUDIO_RING_BUFFER_FORMAT_TYPE_RAW ||
+          spec->type == GST_AUDIO_RING_BUFFER_FORMAT_TYPE_DSD) &&
+      alsa->channels < 9)
+#else // GSTREAMER_LITE
   if (spec->type == GST_AUDIO_RING_BUFFER_FORMAT_TYPE_RAW && alsa->channels < 9)
+#endif // GSTREAMER_LITE
     gst_audio_ring_buffer_set_channel_positions (GST_AUDIO_BASE_SINK
         (alsa)->ringbuffer, alsa_position[alsa->channels - 1]);
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/app/gstappsink.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/app/gstappsink.c
index 406383a27d1..5474eab7422 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/app/gstappsink.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/app/gstappsink.c
@@ -40,8 +40,8 @@
  *
  * Appsink will internally use a queue to collect buffers from the streaming
  * thread. If the application is not pulling samples fast enough, this queue
- * will consume a lot of memory over time. The "max-buffers" property can be
- * used to limit the queue size. The "drop" property controls whether the
+ * will consume a lot of memory over time. The "max-buffers", "max-time" and "max-bytes"
+ * properties can be used to limit the queue size. The "drop" property controls whether the
  * streaming thread blocks or if older buffers are dropped when the maximum
  * queue size is reached. Note that blocking the streaming thread can negatively
  * affect real-time performance and should be avoided.
@@ -72,6 +72,7 @@
 #include <string.h>
 
 #include "gstappsink.h"
+#include "gstapputils.h"
 
 typedef enum
 {
@@ -112,12 +113,13 @@ struct _GstAppSinkPrivate
 {
   GstCaps *caps;
   gboolean emit_signals;
-  guint num_buffers;
-  guint num_events;
-  guint max_buffers;
+  guint64 max_buffers;
+  GstClockTime max_time;
+  guint64 max_bytes;
   gboolean drop;
   gboolean wait_on_eos;
   GstAppSinkWaitStatus wait_status;
+  GstQueueStatusInfo queue_status_info;
 
   GCond cond;
   GMutex mutex;
@@ -155,14 +157,17 @@ enum
   SIGNAL_TRY_PULL_PREROLL,
   SIGNAL_TRY_PULL_SAMPLE,
   SIGNAL_TRY_PULL_OBJECT,
+  SIGNAL_PROPOSE_ALLOCATION,
 
   LAST_SIGNAL
 };
 
-#define DEFAULT_PROP_EOS    TRUE
+#define DEFAULT_PROP_EOS          TRUE
 #define DEFAULT_PROP_EMIT_SIGNALS FALSE
 #define DEFAULT_PROP_MAX_BUFFERS  0
-#define DEFAULT_PROP_DROP   FALSE
+#define DEFAULT_PROP_MAX_TIME     0
+#define DEFAULT_PROP_MAX_BYTES    0
+#define DEFAULT_PROP_DROP         FALSE
 #define DEFAULT_PROP_WAIT_ON_EOS  TRUE
 #define DEFAULT_PROP_BUFFER_LIST  FALSE
 
@@ -176,6 +181,8 @@ enum
   PROP_DROP,
   PROP_WAIT_ON_EOS,
   PROP_BUFFER_LIST,
+  PROP_MAX_TIME,
+  PROP_MAX_BYTES,
   PROP_LAST
 };
 
@@ -212,6 +219,8 @@ static GstFlowReturn gst_app_sink_render_list (GstBaseSink * psink,
     GstBufferList * list);
 static gboolean gst_app_sink_setcaps (GstBaseSink * sink, GstCaps * caps);
 static GstCaps *gst_app_sink_getcaps (GstBaseSink * psink, GstCaps * filter);
+static gboolean gst_app_sink_propose_allocation (GstBaseSink * bsink,
+    GstQuery * query);
 
 static guint gst_app_sink_signals[LAST_SIGNAL] = { 0 };
 
@@ -252,12 +261,43 @@ gst_app_sink_class_init (GstAppSinkClass * klass)
           DEFAULT_PROP_EMIT_SIGNALS,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
+  /**
+   * GstAppSink:max-buffers:
+   *
+   * Maximum amount of buffers in the queue (0 = unlimited).
+   */
   g_object_class_install_property (gobject_class, PROP_MAX_BUFFERS,
       g_param_spec_uint ("max-buffers", "Max Buffers",
           "The maximum number of buffers to queue internally (0 = unlimited)",
           0, G_MAXUINT, DEFAULT_PROP_MAX_BUFFERS,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
+  /**
+   * GstAppSink:max-time:
+   *
+   * Maximum total duration of data in the queue (0 = unlimited)
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_MAX_TIME,
+      g_param_spec_uint64 ("max-time", "Max time",
+          "The maximum total duration to queue internally (in ns, 0 = unlimited)",
+          0, G_MAXUINT64, DEFAULT_PROP_MAX_TIME,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  /**
+   * GstAppSink:max-bytes:
+   *
+   * Maximum amount of bytes in the queue (0 = unlimited)
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_MAX_BYTES,
+      g_param_spec_uint64 ("max-bytes", "Max bytes",
+          "The maximum amount of bytes to queue internally (0 = unlimited)",
+          0, G_MAXUINT64, DEFAULT_PROP_MAX_BYTES,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
   g_object_class_install_property (gobject_class, PROP_DROP,
       g_param_spec_boolean ("drop", "Drop",
           "Drop old buffers when the buffer queue is filled", DEFAULT_PROP_DROP,
@@ -267,8 +307,9 @@ gst_app_sink_class_init (GstAppSinkClass * klass)
       g_param_spec_boolean ("buffer-list", "Buffer List",
           "Use buffer lists", DEFAULT_PROP_BUFFER_LIST,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
   /**
-   * GstAppSink::wait-on-eos:
+   * GstAppSink:wait-on-eos:
    *
    * Wait for all buffers to be processed after receiving an EOS.
    *
@@ -335,6 +376,22 @@ gst_app_sink_class_init (GstAppSinkClass * klass)
       G_STRUCT_OFFSET (GstAppSinkClass, new_sample),
       NULL, NULL, NULL, GST_TYPE_FLOW_RETURN, 0, G_TYPE_NONE);
 
+  /**
+   * GstAppSink::propose-allocation:
+   * @appsink: the appsink element that emitted the signal
+   * @query: the allocation query
+   *
+   * Signal that a new propose_allocation query is available.
+   *
+   * This signal is emitted from the streaming thread and only when the
+   * "emit-signals" property is %TRUE.
+   *
+   * Since: 1.24
+   */
+  gst_app_sink_signals[SIGNAL_PROPOSE_ALLOCATION] =
+      g_signal_new_class_handler ("propose-allocation",
+      G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, NULL, NULL, NULL, NULL,
+      G_TYPE_BOOLEAN, 1, GST_TYPE_QUERY | G_SIGNAL_TYPE_STATIC_SCOPE);
   /**
    * GstAppSink::new-serialized-event:
    * @appsink: the appsink element that emitted the signal
@@ -386,7 +443,7 @@ gst_app_sink_class_init (GstAppSinkClass * klass)
    * This function blocks until a preroll sample or EOS is received or the appsink
    * element is set to the READY/NULL state.
    *
-   * Returns: (nullable): a #GstSample or NULL when the appsink is stopped or EOS.
+   * Returns: (nullable) (transfer full): a #GstSample or %NULL when the appsink is stopped or EOS.
    */
   gst_app_sink_signals[SIGNAL_PULL_PREROLL] =
       g_signal_new ("pull-preroll", G_TYPE_FROM_CLASS (klass),
@@ -406,12 +463,12 @@ gst_app_sink_class_init (GstAppSinkClass * klass)
    * Note that when the application does not pull samples fast enough, the
    * queued samples could consume a lot of memory, especially when dealing with
    * raw video frames. It's possible to control the behaviour of the queue with
-   * the "drop" and "max-buffers" properties.
+   * the "drop" and "max-buffers" / "max-bytes" / "max-time" set of properties.
    *
    * If an EOS event was received before any buffers, this function returns
    * %NULL. Use gst_app_sink_is_eos () to check for the EOS condition.
    *
-   * Returns: (nullable): a #GstSample or NULL when the appsink is stopped or EOS.
+   * Returns: (nullable) (transfer full): a #GstSample or %NULL when the appsink is stopped or EOS.
    */
   gst_app_sink_signals[SIGNAL_PULL_SAMPLE] =
       g_signal_new ("pull-sample", G_TYPE_FROM_CLASS (klass),
@@ -443,7 +500,8 @@ gst_app_sink_class_init (GstAppSinkClass * klass)
    * This function blocks until a preroll sample or EOS is received, the appsink
    * element is set to the READY/NULL state, or the timeout expires.
    *
-   * Returns: (nullable): a #GstSample or NULL when the appsink is stopped or EOS or the timeout expires.
+   * Returns: (nullable) (transfer full): a #GstSample or %NULL when the appsink
+   * is stopped or EOS or the timeout expires.
    *
    * Since: 1.10
    */
@@ -467,7 +525,7 @@ gst_app_sink_class_init (GstAppSinkClass * klass)
    * Note that when the application does not pull samples fast enough, the
    * queued samples could consume a lot of memory, especially when dealing with
    * raw video frames. It's possible to control the behaviour of the queue with
-   * the "drop" and "max-buffers" properties.
+   * the "drop" and "max-buffers" / "max-bytes" / "max-time" set of properties.
    *
    * If an EOS event was received before any buffers or the timeout expires,
    * this function returns %NULL. Use gst_app_sink_is_eos () to check
@@ -499,7 +557,7 @@ gst_app_sink_class_init (GstAppSinkClass * klass)
    * Note that when the application does not pull samples fast enough, the
    * queued samples could consume a lot of memory, especially when dealing with
    * raw video frames. It's possible to control the behaviour of the queue with
-   * the "drop" and "max-buffers" properties.
+   * the "drop" and "max-buffers" / "max-bytes" / "max-time" set of properties.
    *
    * This function will only pull serialized events, excluding
    * the EOS event for which this functions returns
@@ -539,6 +597,7 @@ gst_app_sink_class_init (GstAppSinkClass * klass)
   basesink_class->get_caps = gst_app_sink_getcaps;
   basesink_class->set_caps = gst_app_sink_setcaps;
   basesink_class->query = gst_app_sink_query;
+  basesink_class->propose_allocation = gst_app_sink_propose_allocation;
 
   klass->pull_preroll = gst_app_sink_pull_preroll;
   klass->pull_sample = gst_app_sink_pull_sample;
@@ -561,6 +620,8 @@ gst_app_sink_init (GstAppSink * appsink)
 
   priv->emit_signals = DEFAULT_PROP_EMIT_SIGNALS;
   priv->max_buffers = DEFAULT_PROP_MAX_BUFFERS;
+  priv->max_bytes = DEFAULT_PROP_MAX_BYTES;
+  priv->max_time = DEFAULT_PROP_MAX_TIME;
   priv->drop = DEFAULT_PROP_DROP;
   priv->wait_on_eos = DEFAULT_PROP_WAIT_ON_EOS;
   priv->buffer_lists_supported = DEFAULT_PROP_BUFFER_LIST;
@@ -630,6 +691,12 @@ gst_app_sink_set_property (GObject * object, guint prop_id,
     case PROP_MAX_BUFFERS:
       gst_app_sink_set_max_buffers (appsink, g_value_get_uint (value));
       break;
+    case PROP_MAX_TIME:
+      gst_app_sink_set_max_time (appsink, g_value_get_uint64 (value));
+      break;
+    case PROP_MAX_BYTES:
+      gst_app_sink_set_max_bytes (appsink, g_value_get_uint64 (value));
+      break;
     case PROP_DROP:
       gst_app_sink_set_drop (appsink, g_value_get_boolean (value));
       break;
@@ -672,6 +739,12 @@ gst_app_sink_get_property (GObject * object, guint prop_id, GValue * value,
     case PROP_MAX_BUFFERS:
       g_value_set_uint (value, gst_app_sink_get_max_buffers (appsink));
       break;
+    case PROP_MAX_TIME:
+      g_value_set_uint64 (value, gst_app_sink_get_max_time (appsink));
+      break;
+    case PROP_MAX_BYTES:
+      g_value_set_uint64 (value, gst_app_sink_get_max_bytes (appsink));
+      break;
     case PROP_DROP:
       g_value_set_boolean (value, gst_app_sink_get_drop (appsink));
       break;
@@ -750,8 +823,9 @@ gst_app_sink_flush_unlocked (GstAppSink * appsink)
   while ((obj = gst_queue_array_pop_head (priv->queue)))
     gst_mini_object_unref (obj);
 #endif // GSTREAMER_LITE
-  priv->num_buffers = 0;
-  priv->num_events = 0;
+
+  gst_queue_status_info_reset (&priv->queue_status_info);
+
   gst_caps_replace (&priv->last_caps, NULL);
   g_cond_signal (&priv->cond);
 }
@@ -814,8 +888,10 @@ gst_app_sink_setcaps (GstBaseSink * sink, GstCaps * caps)
 
   g_mutex_lock (&priv->mutex);
   GST_DEBUG_OBJECT (appsink, "receiving CAPS");
+
   gst_queue_array_push_tail (priv->queue, gst_event_new_caps (caps));
-  priv->num_events++;
+  gst_queue_status_info_push_event (&priv->queue_status_info);
+
   if (!priv->preroll_buffer)
     gst_caps_replace (&priv->preroll_caps, caps);
   g_mutex_unlock (&priv->mutex);
@@ -850,11 +926,13 @@ gst_app_sink_event (GstBaseSink * sink, GstEvent * event)
       g_mutex_unlock (&priv->mutex);
 
       g_mutex_lock (&priv->mutex);
-      /* wait until all buffers are consumed or we're flushing.
-       * Otherwise we might signal EOS before all buffers are
+
+      /* Wait until all buffers are consumed, or we're flushing.
+       * Otherwise, we might signal EOS before all buffers are
        * consumed, which is a bit confusing for the application
        */
-      while (priv->num_buffers > 0 && !priv->flushing && priv->wait_on_eos) {
+      while (priv->queue_status_info.queued_buffers > 0 && !priv->flushing
+          && priv->wait_on_eos) {
         if (priv->unlock) {
           /* we are asked to unlock, call the wait_preroll method */
           g_mutex_unlock (&priv->mutex);
@@ -920,7 +998,10 @@ gst_app_sink_event (GstBaseSink * sink, GstEvent * event)
       callbacks = callbacks_ref (priv->callbacks);
 
     gst_queue_array_push_tail (priv->queue, gst_event_ref (event));
-    priv->num_events++;
+    gst_queue_status_info_push_event (&priv->queue_status_info);
+
+    if ((priv->wait_status & APP_WAITING))
+      g_cond_signal (&priv->cond);
 
     g_mutex_unlock (&priv->mutex);
 
@@ -998,12 +1079,9 @@ dequeue_object (GstAppSink * appsink)
 
   if (GST_IS_BUFFER (obj) || GST_IS_BUFFER_LIST (obj)) {
     GST_DEBUG_OBJECT (appsink, "dequeued buffer/list %p", obj);
-    priv->num_buffers--;
   } else if (GST_IS_EVENT (obj)) {
     GstEvent *event = GST_EVENT_CAST (obj);
 
-    priv->num_events--;
-
     switch (GST_EVENT_TYPE (obj)) {
       case GST_EVENT_CAPS:
       {
@@ -1028,6 +1106,10 @@ dequeue_object (GstAppSink * appsink)
     }
   }
 
+  /* We don't have last/current segment differentiation in appsink, so pass last_segment twice */
+  gst_queue_status_info_pop (&priv->queue_status_info, obj,
+      &priv->last_segment, &priv->last_segment, GST_OBJECT_CAST (appsink));
+
   return obj;
 }
 
@@ -1075,10 +1157,12 @@ gst_app_sink_render_common (GstBaseSink * psink, GstMiniObject * data,
         priv->last_caps);
   }
 
-  GST_DEBUG_OBJECT (appsink, "pushing render buffer/list %p on queue (%d)",
-      data, priv->num_buffers);
+  GST_DEBUG_OBJECT (appsink,
+      "pushing render buffer/list %p on queue (%" G_GUINT64_FORMAT ")", data,
+      priv->queue_status_info.queued_buffers);
 
-  while (priv->max_buffers > 0 && priv->num_buffers >= priv->max_buffers) {
+  while (gst_queue_status_info_is_full (&priv->queue_status_info,
+          priv->max_buffers, priv->max_bytes, priv->max_time)) {
     if (priv->drop) {
       GstMiniObject *old;
 
@@ -1088,8 +1172,13 @@ gst_app_sink_render_common (GstBaseSink * psink, GstMiniObject * data,
         gst_mini_object_unref (old);
       }
     } else {
-      GST_DEBUG_OBJECT (appsink, "waiting for free space, length %d >= %d",
-          priv->num_buffers, priv->max_buffers);
+      GST_DEBUG_OBJECT (appsink,
+          "waiting for free space: have %" G_GUINT64_FORMAT "  buffers (max %"
+          G_GUINT64_FORMAT "), %" G_GUINT64_FORMAT " bytes (max %"
+          G_GUINT64_FORMAT "), %" G_GUINT64_FORMAT " time (max %"
+          G_GUINT64_FORMAT ")", priv->queue_status_info.queued_buffers,
+          priv->max_buffers, priv->queue_status_info.queued_bytes,
+          priv->max_bytes, priv->queue_status_info.queued_time, priv->max_time);
 
       if (priv->unlock) {
         /* we are asked to unlock, call the wait_preroll method */
@@ -1112,7 +1201,8 @@ gst_app_sink_render_common (GstBaseSink * psink, GstMiniObject * data,
   }
   /* we need to ref the buffer/list when pushing it in the queue */
   gst_queue_array_push_tail (priv->queue, gst_mini_object_ref (data));
-  priv->num_buffers++;
+  gst_queue_status_info_push (&priv->queue_status_info, data,
+      &priv->last_segment, GST_OBJECT_CAST (appsink));
 
   if ((priv->wait_status & APP_WAITING))
     g_cond_signal (&priv->cond);
@@ -1215,7 +1305,7 @@ gst_app_sink_query (GstBaseSink * bsink, GstQuery * query)
     {
       g_mutex_lock (&priv->mutex);
       GST_DEBUG_OBJECT (appsink, "waiting buffers to be consumed");
-      while (priv->num_buffers > 0 || priv->preroll_buffer) {
+      while (priv->queue_status_info.queued_buffers > 0 || priv->preroll_buffer) {
         if (priv->unlock) {
           /* we are asked to unlock, call the wait_preroll method */
           g_mutex_unlock (&priv->mutex);
@@ -1346,7 +1436,7 @@ gst_app_sink_is_eos (GstAppSink * appsink)
   if (!priv->started)
     goto not_started;
 
-  if (priv->is_eos && priv->num_buffers == 0) {
+  if (priv->is_eos && priv->queue_status_info.queued_buffers == 0) {
     GST_DEBUG_OBJECT (appsink, "we are EOS and the queue is empty");
     ret = TRUE;
   } else {
@@ -1414,6 +1504,41 @@ gst_app_sink_get_emit_signals (GstAppSink * appsink)
   return result;
 }
 
+#define GST_APP_SINK_GET_PROPERTY(prop_name)               \
+G_STMT_START {                                             \
+  GstAppSinkPrivate *priv;                                 \
+  guint result;                                            \
+                                                           \
+  g_return_val_if_fail (GST_IS_APP_SINK (appsink), 0);     \
+                                                           \
+  priv = appsink->priv;                                    \
+                                                           \
+  g_mutex_lock (&priv->mutex);                             \
+  result = priv->prop_name;                                \
+  g_mutex_unlock (&priv->mutex);                           \
+                                                           \
+  return result;                                           \
+} G_STMT_END
+
+#define GST_APP_SINK_SET_PROPERTY(prop_name, value)        \
+G_STMT_START {                                             \
+  GstAppSinkPrivate *priv;                                 \
+                                                           \
+  g_return_if_fail (GST_IS_APP_SINK (appsink));            \
+                                                           \
+  priv = appsink->priv;                                    \
+                                                           \
+  g_mutex_lock (&priv->mutex);                             \
+                                                           \
+  if (value != priv->prop_name) {                          \
+    priv->prop_name = value;                               \
+    /* signal the change */                                \
+    g_cond_signal (&priv->cond);                           \
+  }                                                        \
+                                                           \
+  g_mutex_unlock (&priv->mutex);                           \
+} G_STMT_END
+
 /**
  * gst_app_sink_set_max_buffers:
  * @appsink: a #GstAppSink
@@ -1421,24 +1546,49 @@ gst_app_sink_get_emit_signals (GstAppSink * appsink)
  *
  * Set the maximum amount of buffers that can be queued in @appsink. After this
  * amount of buffers are queued in appsink, any more buffers will block upstream
- * elements until a sample is pulled from @appsink.
+ * elements until a sample is pulled from @appsink, unless 'drop' is set, in which
+ * case new buffers will be discarded.
  */
 void
 gst_app_sink_set_max_buffers (GstAppSink * appsink, guint max)
 {
-  GstAppSinkPrivate *priv;
-
-  g_return_if_fail (GST_IS_APP_SINK (appsink));
+  GST_APP_SINK_SET_PROPERTY (max_buffers, max);
+}
 
-  priv = appsink->priv;
+/**
+ * gst_app_sink_set_max_time:
+ * @appsink: a #GstAppSink
+ * @max: the maximum total duration to queue
+ *
+ * Set the maximum total duration that can be queued in @appsink. After this
+ * amount of buffers are queued in appsink, any more buffers will block upstream
+ * elements until a sample is pulled from @appsink, unless 'drop' is set, in which
+ * case new buffers will be discarded.
+ *
+ * Since: 1.24
+ */
+void
+gst_app_sink_set_max_time (GstAppSink * appsink, GstClockTime max)
+{
+  GST_APP_SINK_SET_PROPERTY (max_time, max);
+}
 
-  g_mutex_lock (&priv->mutex);
-  if (max != priv->max_buffers) {
-    priv->max_buffers = max;
-    /* signal the change */
-    g_cond_signal (&priv->cond);
-  }
-  g_mutex_unlock (&priv->mutex);
+/**
+ * gst_app_sink_set_max_bytes:
+ * @appsink: a #GstAppSink
+ * @max: the maximum total size of buffers to queue, in bytes
+ *
+ * Set the maximum total size that can be queued in @appsink. After this
+ * amount of buffers are queued in appsink, any more buffers will block upstream
+ * elements until a sample is pulled from @appsink, unless 'drop' is set, in which
+ * case new buffers will be discarded.
+ *
+ * Since: 1.24
+ */
+void
+gst_app_sink_set_max_bytes (GstAppSink * appsink, guint64 max)
+{
+  GST_APP_SINK_SET_PROPERTY (max_bytes, max);
 }
 
 /**
@@ -1452,27 +1602,51 @@ gst_app_sink_set_max_buffers (GstAppSink * appsink, guint max)
 guint
 gst_app_sink_get_max_buffers (GstAppSink * appsink)
 {
-  guint result;
-  GstAppSinkPrivate *priv;
-
-  g_return_val_if_fail (GST_IS_APP_SINK (appsink), 0);
-
-  priv = appsink->priv;
+  GST_APP_SINK_GET_PROPERTY (max_buffers);
+}
 
-  g_mutex_lock (&priv->mutex);
-  result = priv->max_buffers;
-  g_mutex_unlock (&priv->mutex);
+/**
+ * gst_app_sink_get_max_time:
+ * @appsink: a #GstAppSink
+ *
+ * Get the maximum total duration that can be queued in @appsink.
+ *
+ * Returns: The maximum total duration that can be queued.
+ *
+ * Since: 1.24
+ */
+GstClockTime
+gst_app_sink_get_max_time (GstAppSink * appsink)
+{
+  GST_APP_SINK_GET_PROPERTY (max_time);
+}
 
-  return result;
+/**
+ * gst_app_sink_get_max_bytes:
+ * @appsink: a #GstAppSink
+ *
+ * Get the maximum total size, in bytes, that can be queued in @appsink.
+ *
+ * Returns: The maximum amount of bytes that can be queued
+ *
+ * Since: 1.24
+ */
+guint64
+gst_app_sink_get_max_bytes (GstAppSink * appsink)
+{
+  GST_APP_SINK_GET_PROPERTY (max_bytes);
 }
 
+#undef GST_APP_SINK_GET_PROPERTY
+#undef GST_APP_SINK_SET_PROPERTY
+
 /**
  * gst_app_sink_set_drop:
  * @appsink: a #GstAppSink
  * @drop: the new state
  *
  * Instruct @appsink to drop old buffers when the maximum amount of queued
- * buffers is reached.
+ * data is reached, that is, when any configured limit is hit (max-buffers, max-time or max-bytes).
  */
 void
 gst_app_sink_set_drop (GstAppSink * appsink, gboolean drop)
@@ -1497,7 +1671,7 @@ gst_app_sink_set_drop (GstAppSink * appsink, gboolean drop)
  * @appsink: a #GstAppSink
  *
  * Check if @appsink will drop old buffers when the maximum amount of queued
- * buffers is reached.
+ * data is reached (meaning max buffers, time or bytes limit, whichever is hit first).
  *
  * Returns: %TRUE if @appsink is dropping old buffers when the queue is
  * filled.
@@ -1920,7 +2094,8 @@ gst_app_sink_try_pull_object (GstAppSink * appsink, GstClockTime timeout)
     if (!priv->started)
       goto not_started;
 
-    if (priv->num_buffers > 0 || priv->num_events > 0)
+    if (priv->queue_status_info.queued_buffers > 0
+        || priv->queue_status_info.num_events > 0)
       break;
 
     if (priv->is_eos)
@@ -2074,3 +2249,32 @@ gst_app_sink_uri_handler_init (gpointer g_iface, gpointer iface_data)
   iface->set_uri = gst_app_sink_uri_set_uri;
 
 }
+
+static gboolean
+gst_app_sink_propose_allocation (GstBaseSink * bsink, GstQuery * query)
+{
+  gboolean ret = FALSE;
+  GstAppSink *appsink = GST_APP_SINK_CAST (bsink);
+  GstAppSinkPrivate *priv = appsink->priv;
+  Callbacks *callbacks = NULL;
+  gboolean emit;
+
+  g_mutex_lock (&priv->mutex);
+  emit = priv->emit_signals;
+  if (priv->callbacks)
+    callbacks = callbacks_ref (priv->callbacks);
+  g_mutex_unlock (&priv->mutex);
+
+  if (callbacks && callbacks->callbacks.propose_allocation) {
+    ret =
+        callbacks->callbacks.propose_allocation (appsink, query,
+        callbacks->user_data);
+  } else if (emit) {
+    g_signal_emit (appsink, gst_app_sink_signals[SIGNAL_PROPOSE_ALLOCATION], 0,
+        query, &ret);
+  }
+
+  g_clear_pointer (&callbacks, callbacks_unref);
+
+  return ret;
+}
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/app/gstappsink.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/app/gstappsink.h
index 90e678f53f3..78e6d79bead 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/app/gstappsink.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/app/gstappsink.h
@@ -67,18 +67,25 @@ typedef struct _GstAppSinkPrivate GstAppSinkPrivate;
  *       The callback should return %TRUE if the event has been handled,
  *       %FALSE otherwise.
  *       Since: 1.20
+  * @propose_allocation: Called when the propose_allocation query is available.
+ *       This callback is called from the streaming thread.
+ *       The allocation query can be retrieved with
+ *       gst_app_sink_propose_allocation() either from this callback
+ *       or from any other thread.
+ *       Since: 1.24
  *
  * A set of callbacks that can be installed on the appsink with
  * gst_app_sink_set_callbacks().
  */
 typedef struct {
-  void          (*eos)              (GstAppSink *appsink, gpointer user_data);
-  GstFlowReturn (*new_preroll)      (GstAppSink *appsink, gpointer user_data);
-  GstFlowReturn (*new_sample)       (GstAppSink *appsink, gpointer user_data);
-  gboolean      (*new_event)        (GstAppSink *appsink, gpointer user_data);
+  void          (*eos)                  (GstAppSink *appsink, gpointer user_data);
+  GstFlowReturn (*new_preroll)          (GstAppSink *appsink, gpointer user_data);
+  GstFlowReturn (*new_sample)           (GstAppSink *appsink, gpointer user_data);
+  gboolean      (*new_event)            (GstAppSink *appsink, gpointer user_data);
+  gboolean      (*propose_allocation)   (GstAppSink *appsink, GstQuery *query, gpointer user_data);
 
   /*< private >*/
-  gpointer     _gst_reserved[GST_PADDING - 1];
+  gpointer     _gst_reserved[GST_PADDING - 2];
 } GstAppSinkCallbacks;
 
 struct _GstAppSink
@@ -97,16 +104,16 @@ struct _GstAppSinkClass
   GstBaseSinkClass basesink_class;
 
   /* signals */
-  void          (*eos)              (GstAppSink *appsink);
-  GstFlowReturn (*new_preroll)      (GstAppSink *appsink);
-  GstFlowReturn (*new_sample)       (GstAppSink *appsink);
+  void          (*eos)                (GstAppSink *appsink);
+  GstFlowReturn (*new_preroll)        (GstAppSink *appsink);
+  GstFlowReturn (*new_sample)         (GstAppSink *appsink);
   /* new_event is missing as we ran out padding */
 
   /* actions */
-  GstSample *   (*pull_preroll)      (GstAppSink *appsink);
-  GstSample *   (*pull_sample)       (GstAppSink *appsink);
-  GstSample *   (*try_pull_preroll)  (GstAppSink *appsink, GstClockTime timeout);
-  GstSample *   (*try_pull_sample)   (GstAppSink *appsink, GstClockTime timeout);
+  GstSample *   (*pull_preroll)       (GstAppSink *appsink);
+  GstSample *   (*pull_sample)        (GstAppSink *appsink);
+  GstSample *   (*try_pull_preroll)   (GstAppSink *appsink, GstClockTime timeout);
+  GstSample *   (*try_pull_sample)    (GstAppSink *appsink, GstClockTime timeout);
  /**
    * GstAppSinkClass::try_pull_object:
    *
@@ -114,8 +121,8 @@ struct _GstAppSinkClass
    *
    * Since: 1.20
    */
-  GstMiniObject * (*try_pull_object) (GstAppSink *appsink, GstClockTime timeout);
 
+  GstMiniObject * (*try_pull_object)    (GstAppSink *appsink, GstClockTime timeout);
   /*< private >*/
   gpointer     _gst_reserved[GST_PADDING - 3];
 };
@@ -144,6 +151,18 @@ void            gst_app_sink_set_max_buffers  (GstAppSink *appsink, guint max);
 GST_APP_API
 guint           gst_app_sink_get_max_buffers  (GstAppSink *appsink);
 
+GST_APP_API
+void            gst_app_sink_set_max_time (GstAppSink *appsink, GstClockTime max);
+
+GST_APP_API
+GstClockTime    gst_app_sink_get_max_time (GstAppSink *appsink);
+
+GST_APP_API
+void            gst_app_sink_set_max_bytes (GstAppSink *appsink, guint64 max);
+
+GST_APP_API
+guint64         gst_app_sink_get_max_bytes (GstAppSink *appsink);
+
 GST_APP_API
 void            gst_app_sink_set_drop         (GstAppSink *appsink, gboolean drop);
 
@@ -191,4 +210,3 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstAppSink, gst_object_unref)
 G_END_DECLS
 
 #endif
-
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/app/gstapputils.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/app/gstapputils.c
new file mode 100644
index 00000000000..1892ff0232d
--- /dev/null
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/app/gstapputils.c
@@ -0,0 +1,250 @@
+/* GStreamer
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "gstapputils.h"
+
+void
+gst_queue_status_info_reset (GstQueueStatusInfo * info)
+{
+  g_return_if_fail (info != NULL);
+
+  info->queued_bytes = 0;
+  info->queued_buffers = 0;
+  info->queued_time = 0;
+  info->num_events = 0;
+  info->last_in_running_time = GST_CLOCK_TIME_NONE;
+  info->last_out_running_time = GST_CLOCK_TIME_NONE;
+}
+
+gboolean
+gst_queue_status_info_is_full (const GstQueueStatusInfo * info,
+    guint64 max_buffers, guint64 max_bytes, GstClockTime max_time)
+{
+  g_return_val_if_fail (info != NULL, FALSE);
+
+  return (max_buffers > 0 && info->queued_buffers >= max_buffers)
+      || (max_bytes > 0 && info->queued_bytes >= max_bytes)
+      || (max_time > 0 && info->queued_time >= max_time);
+}
+
+void
+gst_queue_status_info_push_event (GstQueueStatusInfo * info)
+{
+  g_return_if_fail (info != NULL);
+
+  info->num_events++;
+}
+
+/* Update the currently queued bytes/buffers/time information for the item
+ * that was just added to the queue.
+ */
+void
+gst_queue_status_info_push (GstQueueStatusInfo * info, GstMiniObject * item,
+    GstSegment * last_segment, GstObject * log_context)
+{
+  GstClockTime start_buffer_ts = GST_CLOCK_TIME_NONE;
+  GstClockTime end_buffer_ts = GST_CLOCK_TIME_NONE;
+  guint buf_size = 0;
+  guint n_buffers = 0;
+
+  g_return_if_fail (info != NULL);
+
+  if (GST_IS_EVENT (item)) {
+    info->num_events++;
+    return;
+  }
+
+  if (GST_IS_BUFFER (item)) {
+    GstBuffer *buf = GST_BUFFER_CAST (item);
+
+    buf_size = gst_buffer_get_size (buf);
+    n_buffers = 1;
+
+    start_buffer_ts = end_buffer_ts = GST_BUFFER_DTS_OR_PTS (buf);
+    if (end_buffer_ts != GST_CLOCK_TIME_NONE
+        && GST_BUFFER_DURATION_IS_VALID (buf))
+      end_buffer_ts += GST_BUFFER_DURATION (buf);
+  } else if (GST_IS_BUFFER_LIST (item)) {
+    GstBufferList *buffer_list = GST_BUFFER_LIST_CAST (item);
+    guint i;
+
+    n_buffers = gst_buffer_list_length (buffer_list);
+
+    for (i = 0; i < n_buffers; i++) {
+      GstBuffer *tmp = gst_buffer_list_get (buffer_list, i);
+      GstClockTime ts = GST_BUFFER_DTS_OR_PTS (tmp);
+
+      buf_size += gst_buffer_get_size (tmp);
+
+      if (ts != GST_CLOCK_TIME_NONE) {
+        if (start_buffer_ts == GST_CLOCK_TIME_NONE)
+          start_buffer_ts = ts;
+        end_buffer_ts = ts;
+        if (GST_BUFFER_DURATION_IS_VALID (tmp))
+          end_buffer_ts += GST_BUFFER_DURATION (tmp);
+      }
+    }
+  }
+
+  info->queued_bytes += buf_size;
+  info->queued_buffers += n_buffers;
+
+  /* Update time level if working on a TIME segment */
+  if (last_segment->format == GST_FORMAT_TIME
+      && end_buffer_ts != GST_CLOCK_TIME_NONE) {
+    /* Clip to the last segment boundaries */
+    if (last_segment->stop != -1 && end_buffer_ts > last_segment->stop)
+      end_buffer_ts = last_segment->stop;
+    else if (last_segment->start > end_buffer_ts)
+      end_buffer_ts = last_segment->start;
+
+    info->last_in_running_time =
+        gst_segment_to_running_time (last_segment, GST_FORMAT_TIME,
+        end_buffer_ts);
+
+    /* If this is the only buffer then we can directly update the queued time
+     * here. This is especially useful if this was the first buffer because
+     * otherwise we would have to wait until it is actually unqueued to know
+     * the queued duration */
+    if (info->queued_buffers == 1) {
+      if (last_segment->stop != -1 && start_buffer_ts > last_segment->stop)
+        start_buffer_ts = last_segment->stop;
+      else if (last_segment->start > start_buffer_ts)
+        start_buffer_ts = last_segment->start;
+
+      info->last_out_running_time =
+          gst_segment_to_running_time (last_segment, GST_FORMAT_TIME,
+          start_buffer_ts);
+    }
+
+    GST_TRACE_OBJECT (log_context,
+        "Last in running time %" GST_TIME_FORMAT ", last out running time %"
+        GST_TIME_FORMAT, GST_TIME_ARGS (info->last_in_running_time),
+        GST_TIME_ARGS (info->last_out_running_time));
+
+    if (info->last_out_running_time != GST_CLOCK_TIME_NONE
+        && info->last_in_running_time != GST_CLOCK_TIME_NONE) {
+      if (info->last_out_running_time > info->last_in_running_time) {
+        info->queued_time = 0;
+      } else {
+        info->queued_time =
+            info->last_in_running_time - info->last_out_running_time;
+      }
+    }
+  }
+
+  GST_DEBUG_OBJECT (log_context,
+      "Currently queued: %" G_GUINT64_FORMAT " bytes, %" G_GUINT64_FORMAT
+      " buffers, %" GST_TIME_FORMAT, info->queued_bytes, info->queued_buffers,
+      GST_TIME_ARGS (info->queued_time));
+}
+
+void
+gst_queue_status_info_pop (GstQueueStatusInfo * info, GstMiniObject * item,
+    GstSegment * current_segment, GstSegment * last_segment,
+    GstObject * log_context)
+{
+  guint buf_size = 0;
+  guint n_buffers = 0;
+  GstClockTime end_buffer_ts = GST_CLOCK_TIME_NONE;
+
+  g_return_if_fail (info != NULL);
+
+  if (GST_IS_EVENT (item)) {
+    info->num_events--;
+    return;
+  }
+
+  if (GST_IS_BUFFER (item)) {
+    GstBuffer *buf = GST_BUFFER_CAST (item);
+    buf_size = gst_buffer_get_size (buf);
+    n_buffers = 1;
+
+    end_buffer_ts = GST_BUFFER_DTS_OR_PTS (buf);
+    if (end_buffer_ts != GST_CLOCK_TIME_NONE
+        && GST_BUFFER_DURATION_IS_VALID (buf))
+      end_buffer_ts += GST_BUFFER_DURATION (buf);
+
+    GST_LOG_OBJECT (log_context, "have buffer %p of size %u", buf, buf_size);
+  } else if (GST_IS_BUFFER_LIST (item)) {
+    GstBufferList *buffer_list = GST_BUFFER_LIST_CAST (item);
+    guint i;
+
+    n_buffers = gst_buffer_list_length (buffer_list);
+
+    for (i = 0; i < n_buffers; i++) {
+      GstBuffer *tmp = gst_buffer_list_get (buffer_list, i);
+      GstClockTime ts = GST_BUFFER_DTS_OR_PTS (tmp);
+
+      buf_size += gst_buffer_get_size (tmp);
+      /* Update to the last buffer's timestamp that is known */
+      if (ts != GST_CLOCK_TIME_NONE) {
+        end_buffer_ts = ts;
+        if (GST_BUFFER_DURATION_IS_VALID (tmp))
+          end_buffer_ts += GST_BUFFER_DURATION (tmp);
+      }
+    }
+  }
+
+  info->queued_bytes -= buf_size;
+  info->queued_buffers -= n_buffers;
+
+  /* Update time level if working on a TIME segment */
+  if ((current_segment->format == GST_FORMAT_TIME
+          || (current_segment->format == GST_FORMAT_UNDEFINED
+              && last_segment->format == GST_FORMAT_TIME))
+      && end_buffer_ts != GST_CLOCK_TIME_NONE) {
+    const GstSegment *segment =
+        current_segment->format ==
+        GST_FORMAT_TIME ? current_segment : last_segment;
+
+    /* Clip to the current segment boundaries */
+    if (segment->stop != -1 && end_buffer_ts > segment->stop)
+      end_buffer_ts = segment->stop;
+    else if (segment->start > end_buffer_ts)
+      end_buffer_ts = segment->start;
+
+    info->last_out_running_time =
+        gst_segment_to_running_time (segment, GST_FORMAT_TIME, end_buffer_ts);
+
+    GST_TRACE_OBJECT (log_context,
+        "Last in running time %" GST_TIME_FORMAT ", last out running time %"
+        GST_TIME_FORMAT, GST_TIME_ARGS (info->last_in_running_time),
+        GST_TIME_ARGS (info->last_out_running_time));
+
+    /* If timestamps on both sides are known, calculate the current
+     * fill level in time and consider the queue empty if the output
+     * running time is lower than the input one (i.e. some kind of reset
+     * has happened).
+     */
+    if (info->last_out_running_time != GST_CLOCK_TIME_NONE
+        && info->last_in_running_time != GST_CLOCK_TIME_NONE) {
+      if (info->last_out_running_time > info->last_in_running_time) {
+        info->queued_time = 0;
+      } else {
+        info->queued_time =
+            info->last_in_running_time - info->last_out_running_time;
+      }
+    }
+  }
+
+  GST_DEBUG_OBJECT (log_context,
+      "Currently queued: %" G_GUINT64_FORMAT " bytes, %" G_GUINT64_FORMAT
+      " buffers, %" GST_TIME_FORMAT, info->queued_bytes,
+      info->queued_buffers, GST_TIME_ARGS (info->queued_time));
+}
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/app/gstapputils.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/app/gstapputils.h
new file mode 100644
index 00000000000..3ac37325ed9
--- /dev/null
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/app/gstapputils.h
@@ -0,0 +1,47 @@
+/* GStreamer
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+#ifndef _GST_APP_UTILS_H_
+#define _GST_APP_UTILS_H_
+
+#include <gst/gst.h>
+
+typedef struct _GstQueueStatusInfo
+{
+  guint64 queued_bytes, queued_buffers;
+  /* Used to calculate the current time level */
+  GstClockTime last_in_running_time, last_out_running_time;
+  /* Updated based on the above whenever they change */
+  GstClockTime queued_time;
+  guint num_events;
+} GstQueueStatusInfo;
+
+void gst_queue_status_info_reset (GstQueueStatusInfo * info);
+
+gboolean gst_queue_status_info_is_full (const GstQueueStatusInfo * info,
+    guint64 max_buffers, guint64 max_bytes, GstClockTime max_time);
+
+void gst_queue_status_info_push (GstQueueStatusInfo * info,
+    GstMiniObject * item, GstSegment * last_segment, GstObject * log_context);
+
+void gst_queue_status_info_push_event (GstQueueStatusInfo * info);
+
+void gst_queue_status_info_pop (GstQueueStatusInfo * info, GstMiniObject * item,
+    GstSegment * current_segment, GstSegment * last_segment,
+    GstObject * log_context);
+
+#endif
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/audio-buffer.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/audio-buffer.c
index ddcfefa2d52..fc13f119dd9 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/audio-buffer.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/audio-buffer.c
@@ -37,9 +37,9 @@ gst_audio_buffer_unmap_internal (GstAudioBuffer * buffer, guint n_unmap)
     gst_buffer_unmap (buffer->buffer, &buffer->map_infos[i]);
   }
   if (buffer->planes != buffer->priv_planes_arr)
-    g_slice_free1 (buffer->n_planes * sizeof (gpointer), buffer->planes);
+    g_free (buffer->planes);
   if (buffer->map_infos != buffer->priv_map_infos_arr)
-    g_slice_free1 (buffer->n_planes * sizeof (GstMapInfo), buffer->map_infos);
+    g_free (buffer->map_infos);
 }
 
 /**
@@ -150,9 +150,8 @@ gst_audio_buffer_map (GstAudioBuffer * buffer, const GstAudioInfo * info,
     buffer->n_planes = GST_AUDIO_BUFFER_CHANNELS (buffer);
 
     if (G_UNLIKELY (buffer->n_planes > 8)) {
-      buffer->planes = g_slice_alloc (buffer->n_planes * sizeof (gpointer));
-      buffer->map_infos =
-          g_slice_alloc (buffer->n_planes * sizeof (GstMapInfo));
+      buffer->planes = g_new (gpointer, buffer->n_planes);
+      buffer->map_infos = g_new (GstMapInfo, buffer->n_planes);
     } else {
       buffer->planes = buffer->priv_planes_arr;
       buffer->map_infos = buffer->priv_map_infos_arr;
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/audio-channel-mixer.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/audio-channel-mixer.c
index a33298b28fe..8e851f5ff92 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/audio-channel-mixer.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/audio-channel-mixer.c
@@ -95,7 +95,7 @@ gst_audio_channel_mixer_free (GstAudioChannelMixer * mix)
   g_free (mix->matrix_int);
   mix->matrix_int = NULL;
 
-  g_slice_free (GstAudioChannelMixer, mix);
+  g_free (mix);
 }
 
 /*
@@ -146,21 +146,21 @@ gst_audio_channel_mixer_fill_compatible (gfloat ** matrix, gint in_channels,
     GstAudioChannelPosition pos2[1];
   } conv[] = {
     /* front: mono <-> stereo */
-    { {
-    GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
+    {{
+                GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
             GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT}, {
-    GST_AUDIO_CHANNEL_POSITION_MONO}},
-        /* front center: 2 <-> 1 */
-    { {
-    GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER,
+            GST_AUDIO_CHANNEL_POSITION_MONO}},
+    /* front center: 2 <-> 1 */
+    {{
+                GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER,
             GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER}, {
-    GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER}},
-        /* rear: 2 <-> 1 */
-    { {
-    GST_AUDIO_CHANNEL_POSITION_REAR_LEFT,
+            GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER}},
+    /* rear: 2 <-> 1 */
+    {{
+                GST_AUDIO_CHANNEL_POSITION_REAR_LEFT,
             GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT}, {
-    GST_AUDIO_CHANNEL_POSITION_REAR_CENTER}}, { {
-    GST_AUDIO_CHANNEL_POSITION_INVALID}}
+            GST_AUDIO_CHANNEL_POSITION_REAR_CENTER}}, {{
+            GST_AUDIO_CHANNEL_POSITION_INVALID}}
   };
   gint c;
 
@@ -833,10 +833,8 @@ gst_audio_channel_mixer_new_with_matrix (GstAudioChannelMixerFlags flags,
       || format == GST_AUDIO_FORMAT_S32
       || format == GST_AUDIO_FORMAT_F32
       || format == GST_AUDIO_FORMAT_F64, NULL);
-  g_return_val_if_fail (in_channels > 0 && in_channels <= 64, NULL);
-  g_return_val_if_fail (out_channels > 0 && out_channels <= 64, NULL);
 
-  mix = g_slice_new0 (GstAudioChannelMixer);
+  mix = g_new0 (GstAudioChannelMixer, 1);
   mix->in_channels = in_channels;
   mix->out_channels = out_channels;
 
@@ -995,8 +993,6 @@ gst_audio_channel_mixer_new (GstAudioChannelMixerFlags flags,
       || format == GST_AUDIO_FORMAT_S32
       || format == GST_AUDIO_FORMAT_F32
       || format == GST_AUDIO_FORMAT_F64, NULL);
-  g_return_val_if_fail (in_channels > 0 && in_channels <= 64, NULL);
-  g_return_val_if_fail (out_channels > 0 && out_channels <= 64, NULL);
 
   matrix =
       gst_audio_channel_mixer_setup_matrix (flags, in_channels, in_position,
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/audio-channels.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/audio-channels.c
index 8f18c285c0a..ea1b533c7f1 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/audio-channels.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/audio-channels.c
@@ -222,7 +222,6 @@ gst_audio_reorder_channels (gpointer data, gsize size, GstAudioFormat format,
   g_return_val_if_fail (info->width <= 8 * 64, FALSE);
   g_return_val_if_fail (size % ((info->width * channels) / 8) == 0, FALSE);
   g_return_val_if_fail (channels > 0, FALSE);
-  g_return_val_if_fail (channels <= 64, FALSE);
 
   if (size == 0)
     return TRUE;
@@ -230,6 +229,8 @@ gst_audio_reorder_channels (gpointer data, gsize size, GstAudioFormat format,
   if (gst_audio_channel_positions_equal (from, to, channels))
     return TRUE;
 
+  g_return_val_if_fail (channels <= 64, FALSE);
+
   if (!gst_audio_get_channel_reorder_map (channels, from, to, reorder_map))
     return FALSE;
 
@@ -454,6 +455,7 @@ gst_audio_get_channel_reorder_map (gint channels,
 
   g_return_val_if_fail (reorder_map != NULL, FALSE);
   g_return_val_if_fail (channels > 0, FALSE);
+  g_return_val_if_fail (channels <= 64, FALSE);
   g_return_val_if_fail (from != NULL, FALSE);
   g_return_val_if_fail (to != NULL, FALSE);
   g_return_val_if_fail (check_valid_channel_positions (from, channels, FALSE,
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/audio-converter.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/audio-converter.c
index 56aea51877f..fb4fda7d3cf 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/audio-converter.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/audio-converter.c
@@ -197,7 +197,7 @@ audio_chain_new (AudioChain * prev, GstAudioConverter * convert)
 {
   AudioChain *chain;
 
-  chain = g_slice_new0 (AudioChain);
+  chain = g_new0 (AudioChain, 1);
   chain->prev = prev;
 
   if (convert->current_layout == GST_AUDIO_LAYOUT_NON_INTERLEAVED) {
@@ -229,7 +229,7 @@ audio_chain_free (AudioChain * chain)
   if (chain->make_func_notify)
     chain->make_func_notify (chain->make_func_data);
   g_free (chain->tmp);
-  g_slice_free (AudioChain, chain);
+  g_free (chain);
 }
 
 static gpointer *
@@ -1347,7 +1347,7 @@ gst_audio_converter_new (GstAudioConverterFlags flags, GstAudioInfo * in_info,
       && !opt_matrix)
     goto unpositioned;
 
-  convert = g_slice_new0 (GstAudioConverter);
+  convert = g_new0 (GstAudioConverter, 1);
 
   convert->flags = flags;
   convert->in = *in_info;
@@ -1481,7 +1481,7 @@ gst_audio_converter_free (GstAudioConverter * convert)
 
   gst_structure_free (convert->config);
 
-  g_slice_free (GstAudioConverter, convert);
+  g_free (convert);
 }
 
 /**
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/audio-info.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/audio-info.c
index a37e3cf0250..748b4b5c8cb 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/audio-info.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/audio-info.c
@@ -25,6 +25,10 @@
 
 #include "audio.h"
 
+#ifdef GSTREAMER_LITE
+#include "gst/glib-compat-private.h"
+#endif // GSTREAMER_LITE
+
 #include <gst/gststructure.h>
 
 #ifndef GST_DISABLE_GST_DEBUG
@@ -61,7 +65,7 @@ ensure_debug_category (void)
 GstAudioInfo *
 gst_audio_info_copy (const GstAudioInfo * info)
 {
-  return g_slice_dup (GstAudioInfo, info);
+  return g_memdup2 (info, sizeof (GstAudioInfo));
 }
 
 /**
@@ -74,7 +78,7 @@ gst_audio_info_copy (const GstAudioInfo * info)
 void
 gst_audio_info_free (GstAudioInfo * info)
 {
-  g_slice_free (GstAudioInfo, info);
+  g_free (info);
 }
 
 G_DEFINE_BOXED_TYPE (GstAudioInfo, gst_audio_info,
@@ -93,7 +97,7 @@ gst_audio_info_new (void)
 {
   GstAudioInfo *info;
 
-  info = g_slice_new (GstAudioInfo);
+  info = g_new (GstAudioInfo, 1);
   gst_audio_info_init (info);
 
   return info;
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/audio-quantize.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/audio-quantize.c
index e4c33ba6a1d..82f8b066e2f 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/audio-quantize.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/audio-quantize.c
@@ -446,7 +446,7 @@ gst_audio_quantize_new (GstAudioDitherMethod dither,
   g_return_val_if_fail (format == GST_AUDIO_FORMAT_S32, NULL);
   g_return_val_if_fail (channels > 0, NULL);
 
-  quant = g_slice_new0 (GstAudioQuantize);
+  quant = g_new0 (GstAudioQuantize, 1);
   quant->dither = dither;
   quant->ns = ns;
   quant->flags = flags;
@@ -490,7 +490,7 @@ gst_audio_quantize_free (GstAudioQuantize * quant)
   g_free (quant->last_random);
   g_free (quant->dither_buf);
 
-  g_slice_free (GstAudioQuantize, quant);
+  g_free (quant);
 }
 
 /**
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/audio-resampler.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/audio-resampler.c
index a612d85ad2e..b2f7f201285 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/audio-resampler.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/audio-resampler.c
@@ -257,7 +257,7 @@ convert_taps_##type##_c (gdouble *tmp_taps, gpointer taps,              \
   for (j = 0; j < n_taps; j++)                                          \
     t[j] = floor (offset + tmp_taps[j] * multiplier / weight);          \
   if (!exact)                                                           \
-    GST_WARNING ("can't find exact taps");                              \
+    GST_DEBUG ("can't find exact taps");                                \
 }
 
 #define MAKE_CONVERT_TAPS_FLOAT_FUNC(type)                              \
@@ -1366,7 +1366,7 @@ gst_audio_resampler_new (GstAudioResamplerMethod method,
 
   audio_resampler_init ();
 
-  resampler = g_slice_new0 (GstAudioResampler);
+  resampler = g_new0 (GstAudioResampler, 1);
   resampler->method = method;
   resampler->flags = flags;
   resampler->format = format;
@@ -1634,7 +1634,7 @@ gst_audio_resampler_free (GstAudioResampler * resampler)
   g_free (resampler->sbuf);
   if (resampler->options)
     gst_structure_free (resampler->options);
-  g_slice_free (GstAudioResampler, resampler);
+  g_free (resampler);
 }
 
 /**
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/audio.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/audio.h
index 94eff60c297..9761866bae2 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/audio.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/audio.h
@@ -36,6 +36,7 @@
 #ifndef GSTREAMER_LITE
 #include <gst/audio/gstaudiostreamalign.h>
 #include <gst/audio/gstaudioaggregator.h>
+#include <gst/audio/gstdsd.h>
 #endif // GSTREAMER_LITE
 
 G_BEGIN_DECLS
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/gstaudiobasesink.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/gstaudiobasesink.c
index 586c8405de6..42a6a7dcc1d 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/gstaudiobasesink.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/gstaudiobasesink.c
@@ -1733,6 +1733,7 @@ gst_audio_base_sink_sync_latency (GstBaseSink * bsink, GstMiniObject * obj)
   }
 }
 
+#define ABSDIFF(a, b) ((a) > (b) ? (a) - (b) : (b) - (a))
 static gint64
 gst_audio_base_sink_get_alignment (GstAudioBaseSink * sink,
     GstClockTime sample_offset)
@@ -1769,10 +1770,16 @@ gst_audio_base_sink_get_alignment (GstAudioBaseSink * sink,
     if (sink->priv->discont_wait > 0) {
       GstClockTime time = gst_util_uint64_scale_int (sample_offset,
           GST_SECOND, rate);
+      GstClockTime expected_time = gst_util_uint64_scale_int (sink->next_sample,
+          GST_SECOND, rate);
+
       if (sink->priv->discont_time == -1) {
-        /* discont candidate */
-        sink->priv->discont_time = time;
-      } else if (time - sink->priv->discont_time >= sink->priv->discont_wait) {
+        if (ABSDIFF (expected_time, time) >= sink->priv->discont_wait)
+          discont = TRUE;
+        else
+          sink->priv->discont_time = expected_time;
+      } else if (ABSDIFF (time,
+              sink->priv->discont_time) >= sink->priv->discont_wait) {
         /* discont_wait expired, discontinuity detected */
         discont = TRUE;
         sink->priv->discont_time = -1;
@@ -1810,6 +1817,8 @@ gst_audio_base_sink_get_alignment (GstAudioBaseSink * sink,
   return align;
 }
 
+#undef ABSDIFF
+
 static GstFlowReturn
 gst_audio_base_sink_render (GstBaseSink * bsink, GstBuffer * buf)
 {
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/gstaudiobasesrc.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/gstaudiobasesrc.c
index 104570dec12..04916f36fdd 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/gstaudiobasesrc.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/gstaudiobasesrc.c
@@ -45,10 +45,6 @@
 GST_DEBUG_CATEGORY_STATIC (gst_audio_base_src_debug);
 #define GST_CAT_DEFAULT gst_audio_base_src_debug
 
-/* This function is public in >= 1.23, but internal in 1.22 */
-G_GNUC_INTERNAL
-    void __gst_audio_ring_buffer_set_errored (GstAudioRingBuffer * buf);
-
 struct _GstAudioBaseSrcPrivate
 {
   /* the clock slaving algorithm in use */
@@ -1233,7 +1229,7 @@ gst_audio_base_src_post_message (GstElement * element, GstMessage * message)
      * flow error message */
     ret = GST_ELEMENT_CLASS (parent_class)->post_message (element, message);
 
-    __gst_audio_ring_buffer_set_errored (ringbuffer);
+    gst_audio_ring_buffer_set_errored (ringbuffer);
     GST_AUDIO_RING_BUFFER_SIGNAL (ringbuffer);
     gst_object_unref (ringbuffer);
   } else {
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/gstaudiodecoder.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/gstaudiodecoder.c
index 9396a9ff49e..14a603e77de 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/gstaudiodecoder.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/gstaudiodecoder.c
@@ -957,7 +957,7 @@ gst_audio_decoder_setup (GstAudioDecoder * dec)
   gst_query_unref (query);
 
   /* normalize to bool */
-  dec->priv->agg = ! !res;
+  dec->priv->agg = !!res;
 }
 
 static GstFlowReturn
@@ -1423,9 +1423,23 @@ gst_audio_decoder_finish_frame_or_subframe (GstAudioDecoder * dec,
     frames = priv->frames.length;
   }
 
-  if (G_LIKELY (priv->frames.length))
+  if (G_LIKELY (buf))
+    buf = gst_buffer_make_writable (buf);
+
+  if (G_LIKELY (priv->frames.length)) {
     ts = GST_BUFFER_PTS (priv->frames.head->data);
-  else
+    if (G_LIKELY (buf)) {
+      /* propagate RESYNC flag to output buffer */
+      if (GST_BUFFER_FLAG_IS_SET (priv->frames.head->data,
+              GST_BUFFER_FLAG_RESYNC))
+        GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_RESYNC);
+      if (is_subframe) {
+        priv->frames.head->data =
+            gst_buffer_make_writable (priv->frames.head->data);
+        GST_BUFFER_FLAG_UNSET (priv->frames.head->data, GST_BUFFER_FLAG_RESYNC);
+      }
+    }
+  } else
     ts = GST_CLOCK_TIME_NONE;
 
   GST_DEBUG_OBJECT (dec, "leading frame ts %" GST_TIME_FORMAT,
@@ -1477,7 +1491,8 @@ gst_audio_decoder_finish_frame_or_subframe (GstAudioDecoder * dec,
        * discard buffer ts and carry on producing perfect stream,
        * otherwise resync to ts */
       if (G_UNLIKELY (diff < (gint64) - dec->priv->tolerance ||
-              diff > (gint64) dec->priv->tolerance)) {
+              diff > (gint64) dec->priv->tolerance ||
+              GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_RESYNC))) {
         GST_DEBUG_OBJECT (dec, "base_ts resync");
         priv->base_ts = ts;
         priv->samples = 0;
@@ -1501,7 +1516,6 @@ gst_audio_decoder_finish_frame_or_subframe (GstAudioDecoder * dec,
     priv->taglist_changed = FALSE;
   }
 
-  buf = gst_buffer_make_writable (buf);
   if (G_LIKELY (GST_CLOCK_TIME_IS_VALID (priv->base_ts))) {
     GST_BUFFER_PTS (buf) =
         priv->base_ts +
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/gstaudioencoder.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/gstaudioencoder.c
index 04da02e5efd..c49d3cca1b9 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/gstaudioencoder.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/gstaudioencoder.c
@@ -1154,12 +1154,9 @@ gst_audio_encoder_push_buffers (GstAudioEncoder * enc, gboolean force)
 
     priv->got_data = FALSE;
     if (G_LIKELY (need)) {
-      const guint8 *data;
-
-      data = gst_adapter_map (priv->adapter, priv->offset + need);
-      buf =
-          gst_buffer_new_wrapped_full (GST_MEMORY_FLAG_READONLY,
-          (gpointer) data, priv->offset + need, priv->offset, need, NULL, NULL);
+      buf = gst_adapter_get_buffer (priv->adapter, priv->offset + need);
+      buf = gst_buffer_make_writable (buf);
+      gst_buffer_resize (buf, priv->offset, -1);
     } else if (!priv->drainable) {
       GST_DEBUG_OBJECT (enc, "non-drainable and no more data");
       goto finish;
@@ -1186,7 +1183,6 @@ gst_audio_encoder_push_buffers (GstAudioEncoder * enc, gboolean force)
 
     if (G_LIKELY (buf)) {
       gst_buffer_unref (buf);
-      gst_adapter_unmap (priv->adapter);
     }
 
   finish:
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/gstaudiometa.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/gstaudiometa.c
index 5605dc7b4cb..5e5437523d7 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/gstaudiometa.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/gstaudiometa.c
@@ -30,10 +30,11 @@
 #include "config.h"
 #endif
 
-#include <string.h>
-
 #include "gstaudiometa.h"
 
+#include <string.h>
+#include <gst/base/base.h>
+
 static gboolean
 gst_audio_downmix_meta_init (GstMeta * meta, gpointer params,
     GstBuffer * buffer)
@@ -327,7 +328,7 @@ gst_audio_meta_free (GstMeta * meta, GstBuffer * buffer)
   GstAudioMeta *ameta = (GstAudioMeta *) meta;
 
   if (ameta->offsets && ameta->offsets != ameta->priv_offsets_arr)
-    g_slice_free1 (ameta->info.channels * sizeof (gsize), ameta->offsets);
+    g_free (ameta->offsets);
 }
 
 static gboolean
@@ -351,6 +352,111 @@ gst_audio_meta_transform (GstBuffer * dest, GstMeta * meta,
   return TRUE;
 }
 
+static gboolean
+gst_audio_meta_serialize (const GstMeta * meta, GstByteArrayInterface * data,
+    guint8 * version)
+{
+  GstAudioMeta *ameta = (GstAudioMeta *) meta;
+
+  /* Position is limited to 64 */
+  gint n_position = ameta->info.channels > 64 ? 0 : ameta->info.channels;
+
+  gsize size = 28 + n_position * 4 + ameta->info.channels * 8;
+  guint8 *ptr = gst_byte_array_interface_append (data, size);
+  if (ptr == NULL)
+    return FALSE;
+
+  GstByteWriter bw;
+  gboolean success = TRUE;
+  gst_byte_writer_init_with_data (&bw, ptr, size, FALSE);
+  success &= gst_byte_writer_put_int32_le (&bw, ameta->info.finfo->format);
+  success &= gst_byte_writer_put_int32_le (&bw, ameta->info.flags);
+  success &= gst_byte_writer_put_int32_le (&bw, ameta->info.layout);
+  success &= gst_byte_writer_put_int32_le (&bw, ameta->info.rate);
+  success &= gst_byte_writer_put_int32_le (&bw, ameta->info.channels);
+  for (int i = 0; i < n_position; i++)
+    success &= gst_byte_writer_put_int32_le (&bw, ameta->info.position[i]);
+  success &= gst_byte_writer_put_uint64_le (&bw, ameta->samples);
+  for (int i = 0; i < ameta->info.channels; i++)
+    success &= gst_byte_writer_put_uint64_le (&bw, ameta->offsets[i]);
+  g_assert (success);
+
+  return TRUE;
+}
+
+static GstMeta *
+gst_audio_meta_deserialize (const GstMetaInfo * info, GstBuffer * buffer,
+    const guint8 * data, gsize size, guint8 version)
+{
+  GstAudioMeta *ameta = NULL;
+  gint32 format;
+  gint32 flags;
+  gint32 layout;
+  gint32 rate;
+  gint32 channels;
+
+  if (version != 0)
+    return NULL;
+
+  GstByteReader br;
+  gboolean success = TRUE;
+  gst_byte_reader_init (&br, data, size);
+  success &= gst_byte_reader_get_int32_le (&br, &format);
+  success &= gst_byte_reader_get_int32_le (&br, &flags);
+  success &= gst_byte_reader_get_int32_le (&br, &layout);
+  success &= gst_byte_reader_get_int32_le (&br, &rate);
+  success &= gst_byte_reader_get_int32_le (&br, &channels);
+
+  if (!success)
+    return NULL;
+
+  /* Position is limited to 64 */
+  gint n_position = channels > 64 ? 0 : channels;
+  gint32 *position = g_new (gint32, n_position);
+  guint64 *offsets64 = g_new (guint64, channels);
+  guint64 samples = 0;
+
+  for (int i = 0; i < n_position; i++)
+    success &= gst_byte_reader_get_int32_le (&br, &position[i]);
+  success &= gst_byte_reader_get_uint64_le (&br, &samples);
+  for (int i = 0; i < channels; i++)
+    success &= gst_byte_reader_get_uint64_le (&br, &offsets64[i]);
+
+  if (!success) {
+    g_free (position);
+    g_free (offsets64);
+    return NULL;
+  }
+#if GLIB_SIZEOF_SIZE_T != 8
+  gsize *offsets = g_new (gsize, channels);
+  for (int i = 0; i < channels; i++) {
+    if (offsets64[i] > G_MAXSIZE) {
+      g_free (offsets64);
+      g_free (offsets);
+      g_free (position);
+      return NULL;
+    }
+    offsets[i] = offsets64[i];
+  }
+  g_free (offsets64);
+#else
+  gsize *offsets = (gsize *) offsets64;
+#endif
+
+  GstAudioInfo audio_info;
+  gst_audio_info_set_format (&audio_info, format, rate, channels,
+      (channels > 64) ? NULL : position);
+  audio_info.flags = flags;
+  audio_info.layout = layout;
+
+  ameta = gst_buffer_add_audio_meta (buffer, &audio_info, samples, offsets);
+
+  g_free (offsets);
+  g_free (position);
+
+  return (GstMeta *) ameta;
+}
+
 /**
  * gst_buffer_add_audio_meta:
  * @buffer: a #GstBuffer
@@ -413,7 +519,7 @@ gst_buffer_add_audio_meta (GstBuffer * buffer, const GstAudioInfo * info,
 #endif
 
     if (G_UNLIKELY (info->channels > 8))
-      meta->offsets = g_slice_alloc (info->channels * sizeof (gsize));
+      meta->offsets = g_new (gsize, info->channels);
     else
       meta->offsets = meta->priv_offsets_arr;
 
@@ -482,11 +588,16 @@ gst_audio_meta_get_info (void)
   static const GstMetaInfo *audio_meta_info = NULL;
 
   if (g_once_init_enter ((GstMetaInfo **) & audio_meta_info)) {
-    const GstMetaInfo *meta = gst_meta_register (GST_AUDIO_META_API_TYPE,
-        "GstAudioMeta", sizeof (GstAudioMeta),
-        gst_audio_meta_init,
-        gst_audio_meta_free,
-        gst_audio_meta_transform);
+    GstMetaInfo *info = gst_meta_info_new (GST_AUDIO_META_API_TYPE,
+        "GstAudioMeta", sizeof (GstAudioMeta));
+
+    info->init_func = gst_audio_meta_init;
+    info->free_func = gst_audio_meta_free;
+    info->transform_func = gst_audio_meta_transform;
+    info->serialize_func = gst_audio_meta_serialize;
+    info->deserialize_func = gst_audio_meta_deserialize;
+    const GstMetaInfo *meta = gst_meta_info_register (info);
+
     g_once_init_leave ((GstMetaInfo **) & audio_meta_info,
         (GstMetaInfo *) meta);
   }
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/gstaudiometa.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/gstaudiometa.h
index 94954d19407..5e54793f415 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/gstaudiometa.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/gstaudiometa.h
@@ -170,6 +170,9 @@ typedef struct _GstAudioMeta GstAudioMeta;
  * case to do so. It is, however, allowed to attach it, for some potential
  * future use case.
  *
+ * Since 1.24 it can be serialized using gst_meta_serialize() and
+ * gst_meta_deserialize().
+ *
  * Since: 1.16
  */
 struct _GstAudioMeta {
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/gstaudioringbuffer.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/gstaudioringbuffer.c
index 3573777571c..23e17d749c1 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/gstaudioringbuffer.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/gstaudioringbuffer.c
@@ -40,6 +40,9 @@
 #include <string.h>
 
 #include <gst/audio/audio.h>
+#ifndef GSTREAMER_LITE
+#include <gst/audio/gstdsd.h>
+#endif // GSTREAMER_LITE
 #include "gstaudioringbuffer.h"
 
 GST_DEBUG_CATEGORY_STATIC (gst_audio_ring_buffer_debug);
@@ -313,6 +316,62 @@ gst_audio_ring_buffer_parse_caps (GstAudioRingBufferSpec * spec, GstCaps * caps)
     gst_structure_get_int (structure, "channels", &info.channels);
     spec->type = GST_AUDIO_RING_BUFFER_FORMAT_TYPE_FLAC;
     info.bpf = 1;
+#ifndef GSTREAMER_LITE
+  } else if (g_str_equal (mimetype, GST_DSD_MEDIA_TYPE)) {
+
+    /* Notes about what the "rate" means in DSD:
+     *
+     * In DSD, "sample formats" don't actually exist. There is only the DSD bit;
+     * this is what could be considered the closest equivalent to a "sample format".
+     * But since it is impractical to deal with individual bits in software, the
+     * bits are typically grouped into words (8/16/32 bit words). These are the
+     * DSDU8, DSDU16LE etc. "grouping formats".
+     *
+     * The "rate" in DSD information refers to the number of DSD _bytes_ per second
+     * (not bits per second, because, as said, per-bit handling in software does
+     * not usually make sense). The way the GstAudioRingBuffer works however requires
+     * the rate to be interpreted as the number of DSD _words_ per minute. This is
+     * in part because that's how ALSA uses the rate.
+     *
+     * If the word format is DSDU8, then there's no difference to just using the
+     * original byte rate. But if for example it is DSDU16LE, then the ringbuffer's
+     * rate needs to be half of the rate from GstDsdInfo. For this reason, it is
+     * essential to divide the rate from the DSD info by the word length (in bytes).
+     *
+     * Furthermore, the BPF is set to the stride (= format width * num channels).
+     * The GstAudioRingBuffer can only handle interleaved DSD. This means that
+     * there is a "stride", that is, the DSD word of channel #1 is stored first,
+     * followed by the DSD word of channel #2 etc. and then again we get a DSD
+     * word from channel #1, and so forth. This is similar to how interleaved
+     * PCM works. The stride is then the size (in bytes) of the DSD words for
+     * each channel that are played at the same time. Using this as the BPF is
+     * very important. Otherweise, timestamp and duration figures can be off,
+     * the segment sizes may not be an integer multiple of the DSD stride, etc.
+     */
+
+    GstDsdInfo dsd_info;
+    guint format_width;
+
+    if (!gst_dsd_info_from_caps (&dsd_info, caps))
+      goto parse_error;
+
+    format_width = gst_dsd_format_get_width (dsd_info.format);
+
+    info.rate = dsd_info.rate / format_width;
+    info.channels = dsd_info.channels;
+    info.bpf = format_width * dsd_info.channels;
+
+    GST_INFO ("using DSD word rate %d instead of DSD byte rate %d "
+        "for ringbuffer", info.rate, dsd_info.rate);
+
+    memcpy (info.position, dsd_info.positions,
+        sizeof (GstAudioChannelPosition) * dsd_info.channels);
+
+    GST_AUDIO_RING_BUFFER_SPEC_DSD_FORMAT (spec) =
+        GST_DSD_INFO_FORMAT (&dsd_info);
+
+    spec->type = GST_AUDIO_RING_BUFFER_FORMAT_TYPE_DSD;
+#endif // GSTREAMER_LITE
   } else {
     goto parse_error;
   }
@@ -633,7 +692,7 @@ gst_audio_ring_buffer_acquire (GstAudioRingBuffer * buf,
 
   GST_INFO_OBJECT (buf, "Allocating an array for %d timestamps",
       spec->segtotal);
-  buf->timestamps = g_slice_alloc0 (sizeof (GstClockTime) * spec->segtotal);
+  buf->timestamps = g_new0 (GstClockTime, spec->segtotal);
   /* initialize array with invalid timestamps */
   for (i = 0; i < spec->segtotal; i++) {
     buf->timestamps[i] = GST_CLOCK_TIME_NONE;
@@ -655,13 +714,21 @@ gst_audio_ring_buffer_acquire (GstAudioRingBuffer * buf,
   g_free (buf->empty_seg);
   buf->empty_seg = g_malloc (segsize);
 
-  if (buf->spec.type == GST_AUDIO_RING_BUFFER_FORMAT_TYPE_RAW) {
-    gst_audio_format_info_fill_silence (buf->spec.info.finfo, buf->empty_seg,
-        segsize);
-  } else {
-    /* FIXME, non-raw formats get 0 as the empty sample */
-    memset (buf->empty_seg, 0, segsize);
+  switch (buf->spec.type) {
+    case GST_AUDIO_RING_BUFFER_FORMAT_TYPE_RAW:
+      gst_audio_format_info_fill_silence (buf->spec.info.finfo, buf->empty_seg,
+          segsize);
+      break;
+#ifndef GSTREAMER_LITE
+    case GST_AUDIO_RING_BUFFER_FORMAT_TYPE_DSD:
+      memset (buf->empty_seg, GST_DSD_SILENCE_PATTERN_BYTE, segsize);
+      break;
+#endif // GSTREAMER_LITE
+    default:
+      /* FIXME, non-raw formats get 0 as the empty sample */
+      memset (buf->empty_seg, 0, segsize);
   }
+
   GST_DEBUG_OBJECT (buf, "acquired device");
 
 done:
@@ -727,7 +794,7 @@ gst_audio_ring_buffer_release (GstAudioRingBuffer * buf)
   if (G_LIKELY (buf->timestamps)) {
     GST_INFO_OBJECT (buf, "Freeing timestamp buffer, %d entries",
         buf->spec.segtotal);
-    g_slice_free1 (sizeof (GstClockTime) * buf->spec.segtotal, buf->timestamps);
+    g_free (buf->timestamps);
     buf->timestamps = NULL;
   }
 
@@ -1036,20 +1103,18 @@ gst_audio_ring_buffer_start (GstAudioRingBuffer * buf)
   }
 }
 
-G_GNUC_INTERNAL
-    void __gst_audio_ring_buffer_set_errored (GstAudioRingBuffer * buf);
-
-/* __gst_audio_ring_buffer_set_errored:
+/**
+ * gst_audio_ring_buffer_set_errored:
  * @buf: the #GstAudioRingBuffer that has encountered an error
  *
  * Mark the ringbuffer as errored after it has started.
  *
  * MT safe.
 
- * Since: 1.24 (internal in 1.22)
+ * Since: 1.24
  */
 void
-__gst_audio_ring_buffer_set_errored (GstAudioRingBuffer * buf)
+gst_audio_ring_buffer_set_errored (GstAudioRingBuffer * buf)
 {
   gboolean res;
 
@@ -2086,6 +2151,11 @@ gst_audio_ring_buffer_set_channel_positions (GstAudioRingBuffer * buf,
   if (memcmp (position, to, channels * sizeof (to[0])) == 0)
     return;
 
+  if (channels == 1) {
+    GST_LOG_OBJECT (buf, "single channel, no need to reorder");
+    return;
+  }
+
   if (position_less_channels (position, channels)) {
     GST_LOG_OBJECT (buf, "position-less channels, no need to reorder");
     return;
@@ -2122,7 +2192,13 @@ gst_audio_ring_buffer_set_channel_positions (GstAudioRingBuffer * buf,
  * @readseg: the current data segment
  * @timestamp: The new timestamp of the buffer.
  *
- * Set a new timestamp on the buffer.
+ * Set a new timestamp on the buffer representing the time of the first sample
+ * in the ringbuffer segment. The timestamp is used by the #GstAudioSrc base
+ * class to set the timestamps on output buffers. Timestamps are
+ * expected to be taken directly from the pipeline clock and are
+ * actual clock timestamps. #GstAudioSrc will convert to running time
+ * by subtracting the base time, but otherwise does not adjust the
+ * outgoing timestamps if provided.
  *
  * MT safe.
  */
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/gstaudioringbuffer.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/gstaudioringbuffer.h
index 46716d8a1bf..7a69de24194 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/gstaudioringbuffer.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/gstaudioringbuffer.h
@@ -27,6 +27,10 @@
 #ifndef __GST_AUDIO_RING_BUFFER_H__
 #define __GST_AUDIO_RING_BUFFER_H__
 
+#ifndef GSTREAMER_LITE
+#include <gst/audio/gstdsdformat.h>
+#endif // GSTREAMER_LITE
+
 G_BEGIN_DECLS
 
 #define GST_TYPE_AUDIO_RING_BUFFER             (gst_audio_ring_buffer_get_type())
@@ -88,6 +92,7 @@ typedef enum {
  * @GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MPEG2_AAC_RAW: samples in MPEG-2 AAC raw format (Since: 1.12)
  * @GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MPEG4_AAC_RAW: samples in MPEG-4 AAC raw format (Since: 1.12)
  * @GST_AUDIO_RING_BUFFER_FORMAT_TYPE_FLAC: samples in FLAC format (Since: 1.12)
+ * @GST_AUDIO_RING_BUFFER_FORMAT_TYPE_DSD: samples in DSD format (Since: 1.24)
  *
  * The format of the samples in the ringbuffer.
  */
@@ -107,7 +112,8 @@ typedef enum
   GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MPEG4_AAC,
   GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MPEG2_AAC_RAW,
   GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MPEG4_AAC_RAW,
-  GST_AUDIO_RING_BUFFER_FORMAT_TYPE_FLAC
+  GST_AUDIO_RING_BUFFER_FORMAT_TYPE_FLAC,
+  GST_AUDIO_RING_BUFFER_FORMAT_TYPE_DSD
 } GstAudioRingBufferFormatType;
 
 /**
@@ -121,8 +127,13 @@ typedef enum
  * @segtotal: the total number of segments
  * @seglatency: number of segments queued in the lower level device,
  *  defaults to segtotal
+ * @dsd_format: the #GstDsdFormat (Since: 1.24)
  *
  * The structure containing the format specification of the ringbuffer.
+ *
+ * When @type is GST_AUDIO_RING_BUFFER_FORMAT_TYPE_DSD, the @dsd_format
+ * is valid (otherwise it is unused). Also, when DSD is the sample type,
+ * only the rate, channels, position, and bpf fields in @info are populated.
  */
 struct _GstAudioRingBufferSpec
 {
@@ -152,10 +163,30 @@ struct _GstAudioRingBufferSpec
   gint     seglatency;          /* number of segments queued in the lower
          * level device, defaults to segtotal. */
 
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
+#ifndef GSTREAMER_LITE
+  /* Union preserves padded struct size for backwards compat
+   * Consumer code should use the accessor macros for fields */
+  union {
+    struct { /* < skip > */
+      GstDsdFormat  dsd_format;
+    } abi;
+    /*< private >*/
+    gpointer _gst_reserved[GST_PADDING];
+  } ABI;
+#endif // GSTREAMER_LITE
 };
 
+#define GST_AUDIO_RING_BUFFER_SPEC_FORMAT_TYPE(spec)   ((spec)->type)
+#define GST_AUDIO_RING_BUFFER_SPEC_INFO(spec)          ((spec)->info)
+#define GST_AUDIO_RING_BUFFER_SPEC_LATENCY_TIME(spec)  ((spec)->latency_time)
+#define GST_AUDIO_RING_BUFFER_SPEC_BUFFER_TIME(spec)   ((spec)->buffer_time)
+#define GST_AUDIO_RING_BUFFER_SPEC_SEGSIZE(spec)       ((spec)->segsize)
+#define GST_AUDIO_RING_BUFFER_SPEC_SEGTOTAL(spec)      ((spec)->segtotal)
+#define GST_AUDIO_RING_BUFFER_SPEC_SEGLATENCY(spec)    ((spec)->seglatency)
+#ifndef GSTREAMER_LITE
+#define GST_AUDIO_RING_BUFFER_SPEC_DSD_FORMAT(spec)    ((spec)->ABI.abi.dsd_format)
+#endif // GSTREAMER_LITE
+
 #define GST_AUDIO_RING_BUFFER_GET_COND(buf) (&(((GstAudioRingBuffer *)buf)->cond))
 #define GST_AUDIO_RING_BUFFER_WAIT(buf)     (g_cond_wait (GST_AUDIO_RING_BUFFER_GET_COND (buf), GST_OBJECT_GET_LOCK (buf)))
 #define GST_AUDIO_RING_BUFFER_SIGNAL(buf)   (g_cond_signal (GST_AUDIO_RING_BUFFER_GET_COND (buf)))
@@ -354,6 +385,9 @@ gboolean        gst_audio_ring_buffer_pause           (GstAudioRingBuffer *buf);
 GST_AUDIO_API
 gboolean        gst_audio_ring_buffer_stop            (GstAudioRingBuffer *buf);
 
+GST_AUDIO_API
+void            gst_audio_ring_buffer_set_errored     (GstAudioRingBuffer *buf);
+
 /* get status */
 
 GST_AUDIO_API
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/gstaudiosink.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/gstaudiosink.c
index 02cac4ec1c3..abd914ecb3d 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/gstaudiosink.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/gstaudiosink.c
@@ -55,6 +55,9 @@
 #include <string.h>
 
 #include <gst/audio/audio.h>
+#ifndef GSTREAMER_LITE
+#include <gst/audio/gstdsd.h>
+#endif // GSTREAMER_LITE
 #include "gstaudiosink.h"
 #include "gstaudioutilsprivate.h"
 
@@ -429,12 +432,20 @@ gst_audio_sink_ring_buffer_acquire (GstAudioRingBuffer * buf,
 
   buf->memory = g_malloc (buf->size);
 
-  if (buf->spec.type == GST_AUDIO_RING_BUFFER_FORMAT_TYPE_RAW) {
-    gst_audio_format_info_fill_silence (buf->spec.info.finfo, buf->memory,
-        buf->size);
-  } else {
-    /* FIXME, non-raw formats get 0 as the empty sample */
-    memset (buf->memory, 0, buf->size);
+  switch (buf->spec.type) {
+    case GST_AUDIO_RING_BUFFER_FORMAT_TYPE_RAW:
+      gst_audio_format_info_fill_silence (buf->spec.info.finfo, buf->memory,
+          buf->size);
+      break;
+#ifndef GSTREAMER_LITE
+    case GST_AUDIO_RING_BUFFER_FORMAT_TYPE_DSD:
+      memset (buf->memory, GST_DSD_SILENCE_PATTERN_BYTE, buf->size);
+      break;
+#endif // GSTREAMER_LITE
+    default:
+      /* FIXME, non-raw formats get 0 as the empty sample */
+      memset (buf->memory, 0, buf->size);
+      break;
   }
 
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/fft/kiss_fft_f32.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/fft/kiss_fft_f32.c
index a42392c66e5..d90861d2f68 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/fft/kiss_fft_f32.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/fft/kiss_fft_f32.c
@@ -358,7 +358,7 @@ kf_factor (int n, int *facbuf)
  * It can be freed with free(), rather than a kiss_fft_f32-specific function.
  * */
 kiss_fft_f32_cfg
-kiss_fft_f32_alloc (int nfft, int inverse_fft, void *mem, size_t * lenmem)
+kiss_fft_f32_alloc (int nfft, int inverse_fft, void *mem, size_t *lenmem)
 {
   kiss_fft_f32_cfg st = NULL;
   size_t memneeded = sizeof (struct kiss_fft_f32_state)
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/fft/kiss_fftr_f32.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/fft/kiss_fftr_f32.c
index c03875a0c34..c3888bd7150 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/fft/kiss_fftr_f32.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/fft/kiss_fftr_f32.c
@@ -20,7 +20,7 @@ struct kiss_fftr_f32_state
 };
 
 kiss_fftr_f32_cfg
-kiss_fftr_f32_alloc (int nfft, int inverse_fft, void *mem, size_t * lenmem)
+kiss_fftr_f32_alloc (int nfft, int inverse_fft, void *mem, size_t *lenmem)
 {
   int i;
   kiss_fftr_f32_cfg st = NULL;
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/pbutils/codec-utils.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/pbutils/codec-utils.c
index 55af93d96f1..ac4cda066e7 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/pbutils/codec-utils.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/pbutils/codec-utils.c
@@ -2472,7 +2472,8 @@ vp9_caps_get_mime_codec (GstCaps * caps)
   GstStructure *caps_st;
   const char *profile_str, *chroma_format_str, *colorimetry_str;
   guint bitdepth_luma, bitdepth_chroma;
-  guint8 profile = -1, chroma_format = -1, level = -1;
+  guint8 profile = -1, chroma_format = -1, level = -1, color_primaries =
+      -1, color_transfer = -1, color_matrix = -1;
   gboolean video_full_range;
   GstVideoColorimetry cinfo = { 0, };
   GString *codec_string;
@@ -2540,11 +2541,16 @@ vp9_caps_get_mime_codec (GstCaps * caps)
     goto done;
   }
 
-  /* optional but all or nothing */
-  g_string_append_printf (codec_string, ".%02u.%02u.%02u.%02u.%02u",
-      chroma_format, gst_video_color_primaries_to_iso (cinfo.primaries),
-      gst_video_transfer_function_to_iso (cinfo.transfer),
-      gst_video_color_matrix_to_iso (cinfo.matrix), video_full_range);
+  /* optional but all or nothing. Include them if any parameter differs from the default value */
+  color_primaries = gst_video_color_primaries_to_iso (cinfo.primaries);
+  color_transfer = gst_video_transfer_function_to_iso (cinfo.transfer);
+  color_matrix = gst_video_color_matrix_to_iso (cinfo.matrix);
+  if (chroma_format != 1 || color_primaries != 1 || color_transfer != 1
+      || color_matrix != 1 || video_full_range) {
+    g_string_append_printf (codec_string, ".%02u.%02u.%02u.%02u.%02u",
+        chroma_format, color_primaries, color_transfer, color_matrix,
+        video_full_range);
+  }
 
 done:
   return g_string_free (codec_string, FALSE);
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/pbutils/descriptions.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/pbutils/descriptions.c
index 8e7356acbab..c822e817749 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/pbutils/descriptions.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/pbutils/descriptions.c
@@ -108,6 +108,7 @@ static const FormatInfo formats[] = {
   {"video/x-quicktime", "Quicktime", AVIS_CONTAINER, "mov"},
   {"video/quicktime", "Quicktime", AVIS_CONTAINER, "mov"},
   {"video/mj2", "Motion JPEG 2000", AVIS_CONTAINER, "mj2"},
+  {"video/x-ivf", "Indeo video format (IVF)", AVIS_CONTAINER, "ivf"},
 
   /* audio formats with static descriptions */
   {"audio/x-ac3", "AC-3 (ATSC A/52)", FLAG_AUDIO, "ac3"},
@@ -153,6 +154,7 @@ static const FormatInfo formats[] = {
   {"audio/x-mod", "Module Music Format (MOD)", FLAG_AUDIO, "mod"},
   {"audio/x-mulaw", "Mu-Law", FLAG_AUDIO, ""},
   {"audio/x-musepack", "Musepack (MPC)", FLAG_AUDIO, "mpc"},
+  {"audio/x-ffmpeg-parsed-musepack", "Musepack (MPC)", FLAG_AUDIO, "mpc"},
   {"audio/x-nellymoser", "Nellymoser Asao", FLAG_AUDIO, ""},
   {"audio/x-nist", "Sphere NIST", FLAG_AUDIO, ""},
   {"audio/x-nsf", "Nintendo NSF", FLAG_AUDIO, ""},
@@ -204,6 +206,7 @@ static const FormatInfo formats[] = {
       FLAG_VIDEO, ""},
   {"subpicture/x-dvd", "DVD subpicture", FLAG_VIDEO, ""},
   {"video/x-ffv", N_("FFMpeg v1"), FLAG_VIDEO, ""},
+  {"video/x-ffvhuff", "FFmpeg Huffman YUV variant", FLAG_VIDEO, ""},
   {"video/x-flash-screen", "Flash Screen Video", FLAG_VIDEO, ""},
   {"video/x-flash-video", "Sorenson Spark Video", FLAG_VIDEO, ""},
   {"video/x-h261", "H.261", FLAG_VIDEO, ""},
@@ -766,16 +769,17 @@ format_info_get_desc (const FormatInfo * info, const GstCaps * caps)
 
     switch (ver) {
       case 1:
-        gst_structure_get_int (s, "layer", &layer);
-        switch (layer) {
-          case 1:
-          case 2:
-          case 3:
-            return g_strdup_printf ("MPEG-1 Layer %d (MP%d)", layer, layer);
-          default:
-            break;
+        if (gst_structure_get_int (s, "layer", &layer)) {
+          switch (layer) {
+            case 1:
+            case 2:
+            case 3:
+              return g_strdup_printf ("MPEG-1 Layer %d (MP%d)", layer, layer);
+            default:
+              break;
+          }
+          GST_WARNING ("Unexpected MPEG-1 layer in %" GST_PTR_FORMAT, caps);
         }
-        GST_WARNING ("Unexpected MPEG-1 layer in %" GST_PTR_FORMAT, caps);
         return g_strdup ("MPEG-1 Audio");
       case 2:
         return g_strdup ("MPEG-2 AAC");
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/pbutils/gstaudiovisualizer.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/pbutils/gstaudiovisualizer.c
index 6e4fc0cfc9a..e46af8506d8 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/pbutils/gstaudiovisualizer.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/pbutils/gstaudiovisualizer.c
@@ -1050,10 +1050,9 @@ gst_audio_visualizer_chain (GstPad * pad, GstObject * parent,
   GstFlowReturn ret = GST_FLOW_OK;
   GstAudioVisualizer *scope;
   GstAudioVisualizerClass *klass;
-  GstBuffer *inbuf;
+  GstBuffer *inbuf, *databuf;
   guint64 dist, ts;
   guint avail, sbpf;
-  gpointer adata;
   gint bpf, rate;
 
   scope = GST_AUDIO_VISUALIZER (parent);
@@ -1165,7 +1164,7 @@ gst_audio_visualizer_chain (GstPad * pad, GstObject * parent,
     GST_BUFFER_DURATION (outbuf) = scope->priv->frame_duration;
 
     /* this can fail as the data size we need could have changed */
-    if (!(adata = (gpointer) gst_adapter_map (scope->priv->adapter, sbpf)))
+    if (!(databuf = gst_adapter_get_buffer (scope->priv->adapter, sbpf)))
       break;
 
     gst_video_frame_map (&outframe, &scope->vinfo, outbuf,
@@ -1182,9 +1181,9 @@ gst_audio_visualizer_chain (GstPad * pad, GstObject * parent,
       }
     }
 
-    gst_buffer_replace_all_memory (inbuf,
-        gst_memory_new_wrapped (GST_MEMORY_FLAG_READONLY, adata, sbpf, 0,
-            sbpf, NULL, NULL));
+    gst_buffer_remove_all_memory (inbuf);
+    gst_buffer_copy_into (inbuf, databuf, GST_BUFFER_COPY_MEMORY, 0, sbpf);
+    gst_buffer_unref (databuf);
 
     /* call class->render() vmethod */
     if (klass->render) {
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/pbutils/gstdiscoverer-types.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/pbutils/gstdiscoverer-types.c
index 05ea53bb576..1e1ea74a6fb 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/pbutils/gstdiscoverer-types.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/pbutils/gstdiscoverer-types.c
@@ -693,7 +693,7 @@ gst_discoverer_stream_info_get_toc (GstDiscovererStreamInfo * info)
  * gst_discoverer_stream_info_get_stream_id:
  * @info: a #GstDiscovererStreamInfo
  *
- * Returns: (transfer none): the stream ID of this stream. If you wish to
+ * Returns: (transfer none) (nullable): the stream ID of this stream. If you wish to
  * use the stream ID after the life-time of @info you will need to copy it.
  */
 const gchar *
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/pbutils/gstdiscoverer.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/pbutils/gstdiscoverer.c
index 6e9394e694c..f913f451c25 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/pbutils/gstdiscoverer.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/pbutils/gstdiscoverer.c
@@ -172,6 +172,7 @@ enum
   SIGNAL_STARTING,
   SIGNAL_DISCOVERED,
   SIGNAL_SOURCE_SETUP,
+  SIGNAL_LOAD_SERIALIZED_INFO,
   LAST_SIGNAL
 };
 
@@ -215,6 +216,23 @@ static GVariant *gst_discoverer_info_to_variant_recurse (GstDiscovererStreamInfo
     * sinfo, GstDiscovererSerializeFlags flags);
 static GstDiscovererStreamInfo *_parse_discovery (GVariant * variant,
     GstDiscovererInfo * info);
+static GstDiscovererInfo *load_serialized_info (GstDiscoverer * dc,
+    gchar * uri);
+
+static gboolean
+_gst_discoverer_info_accumulator (GSignalInvocationHint * ihint,
+    GValue * return_accu, const GValue * handler_return, gpointer dummy)
+{
+  GstDiscovererInfo *info;
+
+  info = g_value_get_object (handler_return);
+  GST_DEBUG ("got discoverer info %" GST_PTR_FORMAT, info);
+
+  g_value_set_object (return_accu, info);
+
+  /* stop emission if we have a discoverer info */
+  return (info == NULL);
+}
 
 static void
 gst_discoverer_class_init (GstDiscovererClass * klass)
@@ -227,6 +245,8 @@ gst_discoverer_class_init (GstDiscovererClass * klass)
   gobject_class->set_property = gst_discoverer_set_property;
   gobject_class->get_property = gst_discoverer_get_property;
 
+  klass->load_serialize_info = load_serialized_info;
+
 
   /* properties */
   /**
@@ -323,6 +343,26 @@ gst_discoverer_class_init (GstDiscovererClass * klass)
       g_signal_new ("source-setup", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstDiscovererClass, source_setup),
       NULL, NULL, NULL, G_TYPE_NONE, 1, GST_TYPE_ELEMENT);
+
+  /**
+   * GstDiscoverer::load-serialized-info:
+   * @discoverer: the #GstDiscoverer
+   * @uri: THe URI to load the serialized info for
+   *
+   * Retrieves information about a URI from and external source of information,
+   * like a cache file. This is used by the discoverer to speed up the
+   * discovery.
+   *
+   * Returns: (nullable) (transfer full): The #GstDiscovererInfo representing
+   * @uri, or %NULL if no information
+   *
+   * Since: 1.24
+   */
+  gst_discoverer_signals[SIGNAL_LOAD_SERIALIZED_INFO] =
+      g_signal_new ("load-serialized-info", G_TYPE_FROM_CLASS (klass),
+      G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstDiscovererClass,
+          load_serialize_info), _gst_discoverer_info_accumulator, NULL, NULL,
+      GST_TYPE_DISCOVERER_INFO, 1, G_TYPE_STRING);
 }
 
 static void
@@ -644,7 +684,7 @@ uridecodebin_pad_added_cb (GstElement * uridecodebin, GstPad * pad,
     DISCO_UNLOCK (dc);
     return;
   }
-  ps = g_slice_new0 (PrivateStream);
+  ps = g_new0 (PrivateStream, 1);
 
   ps->dc = dc;
   ps->pad = pad;
@@ -722,7 +762,7 @@ uridecodebin_pad_added_cb (GstElement * uridecodebin, GstPad * pad,
     gst_object_unref (ps->queue);
   if (ps->sink)
     gst_object_unref (ps->sink);
-  g_slice_free (PrivateStream, ps);
+  g_free (ps);
   DISCO_UNLOCK (dc);
   return;
 }
@@ -788,7 +828,7 @@ uridecodebin_pad_removed_cb (GstElement * uridecodebin, GstPad * pad,
   }
   g_free (ps->stream_id);
 
-  g_slice_free (PrivateStream, ps);
+  g_free (ps);
 
   GST_DEBUG ("Done handling pad");
 }
@@ -1323,7 +1363,8 @@ setup_next_uri_locked (GstDiscoverer * dc)
 
     if (!ready) {
       /* Start timeout */
-      handle_current_async (dc);
+      if (dc->priv->processing)
+        handle_current_async (dc);
     } else {
       g_idle_add_full (G_PRIORITY_DEFAULT_IDLE,
           (GSourceFunc) emit_discovererd_and_next, gst_object_ref (dc),
@@ -1825,51 +1866,67 @@ _get_info_from_cachefile (GstDiscoverer * dc, gchar * cachefile)
     if (info) {
       info->cachefile = cachefile;
       info->from_cache = (gpointer) 0x01;
+    } else {
+      g_free (cachefile);
     }
 
     GST_INFO_OBJECT (dc, "Got info from cache: %p", info);
     g_free (data);
 
     return info;
+  } else {
+    g_free (cachefile);
   }
 
   return NULL;
 }
 
+static GstDiscovererInfo *
+load_serialized_info (GstDiscoverer * dc, gchar * uri)
+{
+  GstDiscovererInfo *res = NULL;
+
+  if (dc->priv->use_cache) {
+    gchar *cachefile = _serialized_info_get_path (dc, uri);
+
+    if (cachefile) {
+      res = _get_info_from_cachefile (dc, cachefile);
+    }
+  }
+
+  return res;
+}
+
 static gboolean
 _setup_locked (GstDiscoverer * dc)
 {
   GstStateChangeReturn ret;
   gchar *uri = (gchar *) dc->priv->pending_uris->data;
-  gchar *cachefile = NULL;
 
   dc->priv->pending_uris =
       g_list_delete_link (dc->priv->pending_uris, dc->priv->pending_uris);
 
-  if (dc->priv->use_cache) {
-    cachefile = _serialized_info_get_path (dc, uri);
-    if (cachefile)
-      dc->priv->current_info = _get_info_from_cachefile (dc, cachefile);
 
-    if (dc->priv->current_info) {
-      /* Make sure the URI is exactly what the user passed in */
-      g_free (dc->priv->current_info->uri);
-      dc->priv->current_info->uri = uri;
+  GST_DEBUG ("Setting up");
 
-      dc->priv->current_info->cachefile = cachefile;
-      dc->priv->processing = FALSE;
-      dc->priv->target_state = GST_STATE_NULL;
+  g_signal_emit (dc, gst_discoverer_signals[SIGNAL_LOAD_SERIALIZED_INFO], 0,
+      uri, &dc->priv->current_info);
+  if (dc->priv->current_info) {
+    /* Make sure the URI is exactly what the user passed in */
+    g_free (dc->priv->current_info->uri);
+    dc->priv->current_info->uri = uri;
 
-      return TRUE;
-    }
-  }
+    dc->priv->processing = FALSE;
+    dc->priv->target_state = GST_STATE_NULL;
 
-  GST_DEBUG ("Setting up");
+    return TRUE;
+  }
 
   /* Pop URI off the pending URI list */
   dc->priv->current_info =
       (GstDiscovererInfo *) g_object_new (GST_TYPE_DISCOVERER_INFO, NULL);
-  dc->priv->current_info->cachefile = cachefile;
+  if (dc->priv->use_cache)
+    dc->priv->current_info->cachefile = _serialized_info_get_path (dc, uri);
   dc->priv->current_info->uri = uri;
 
   /* set uri on uridecodebin */
@@ -2039,8 +2096,8 @@ start_discovering (GstDiscoverer * dc)
       g_source_attach (source, dc->priv->ctx);
       goto beach;
     }
-
-    handle_current_async (dc);
+    if (dc->priv->processing)
+      handle_current_async (dc);
   } else {
     if (!ready)
       handle_current_sync (dc);
@@ -2187,11 +2244,14 @@ gst_discoverer_info_to_variant_recurse (GstDiscovererStreamInfo * sinfo,
     GstDiscovererStreamInfo *ninfo =
         gst_discoverer_stream_info_get_next (sinfo);
 
-    nextv = gst_discoverer_info_to_variant_recurse (ninfo, flags);
-
-    stream_variant =
-        g_variant_new ("(yvv)", 'n', common_stream_variant,
-        g_variant_new ("v", nextv));
+    if (ninfo) {
+      nextv = gst_discoverer_info_to_variant_recurse (ninfo, flags);
+      stream_variant =
+          g_variant_new ("(yvv)", 'n', common_stream_variant,
+          g_variant_new ("v", nextv));
+    } else {
+      stream_variant = g_variant_new ("(yv)", 'n', common_stream_variant);
+    }
   }
 
   return stream_variant;
@@ -2332,9 +2392,12 @@ _parse_discovery (GVariant * variant, GstDiscovererInfo * info)
 {
   gchar type;
   GVariant *common = g_variant_get_child_value (variant, 1);
-  GVariant *specific = g_variant_get_child_value (variant, 2);
+  GVariant *specific = NULL;
   GstDiscovererStreamInfo *sinfo = NULL;
 
+  if (g_variant_n_children (variant) > 2)
+    specific = g_variant_get_child_value (variant, 2);
+
   GET_FROM_TUPLE (variant, byte, 0, &type);
   switch (type) {
     case 'c':
@@ -2396,7 +2459,8 @@ _parse_discovery (GVariant * variant, GstDiscovererInfo * info)
 out:
 
   g_variant_unref (common);
-  g_variant_unref (specific);
+  if (specific)
+    g_variant_unref (specific);
   g_variant_unref (variant);
   return sinfo;
 }
@@ -2662,7 +2726,9 @@ gst_discoverer_info_to_variant (GstDiscovererInfo * info,
 
   g_return_val_if_fail (GST_IS_DISCOVERER_INFO (info), NULL);
   g_return_val_if_fail (gst_discoverer_info_get_result (info) ==
-      GST_DISCOVERER_OK, NULL);
+      GST_DISCOVERER_OK
+      || gst_discoverer_info_get_result (info) ==
+      GST_DISCOVERER_MISSING_PLUGINS, NULL);
 
   sinfo = gst_discoverer_info_get_stream_info (info);
   stream_variant = gst_discoverer_info_to_variant_recurse (sinfo, flags);
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/pbutils/gstdiscoverer.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/pbutils/gstdiscoverer.h
index 85c00cbf111..67c6c3571e4 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/pbutils/gstdiscoverer.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/pbutils/gstdiscoverer.h
@@ -386,8 +386,22 @@ struct _GstDiscovererClass {
           const GError *err);
   void        (*source_setup)    (GstDiscoverer *discoverer,
                                   GstElement *source);
-
-  gpointer _reserved[GST_PADDING];
+  /**
+   * GstDiscovererClass::load_serialize_info:
+   * @dc: the #GstDiscoverer
+   * @uri: the uri to load the info from
+   *
+   * Loads the serialized info from the given uri.
+   *
+   * Returns: (transfer full): the #GstDiscovererInfo or %NULL if it could not be loaded
+   *
+   * Since: 1.24
+   */
+  GstDiscovererInfo *
+  (*load_serialize_info)          (GstDiscoverer *dc,
+                                   gchar *uri);
+
+  gpointer _reserved[GST_PADDING - 1];
 };
 
 GST_PBUTILS_API
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/pbutils/missing-plugins.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/pbutils/missing-plugins.c
index 69330b933b3..c0ddbf9573d 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/pbutils/missing-plugins.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/pbutils/missing-plugins.c
@@ -121,11 +121,11 @@ static const struct
   const gchar type_string[12];
 } missing_type_mapping[] = {
   {
-  GST_MISSING_TYPE_URISOURCE, "urisource"}, {
-  GST_MISSING_TYPE_URISINK, "urisink"}, {
-  GST_MISSING_TYPE_ELEMENT, "element"}, {
-  GST_MISSING_TYPE_DECODER, "decoder"}, {
-  GST_MISSING_TYPE_ENCODER, "encoder"}
+      GST_MISSING_TYPE_URISOURCE, "urisource"}, {
+      GST_MISSING_TYPE_URISINK, "urisink"}, {
+      GST_MISSING_TYPE_ELEMENT, "element"}, {
+      GST_MISSING_TYPE_DECODER, "decoder"}, {
+      GST_MISSING_TYPE_ENCODER, "encoder"}
 };
 
 static GstMissingType
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/riff/riff-media.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/riff/riff-media.c
index 543bde14ef3..e0c9850c458 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/riff/riff-media.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/riff/riff-media.c
@@ -256,6 +256,16 @@ gst_riff_create_video_caps (guint32 codec_fcc,
         *codec_name = g_strdup ("Huffman Lossless Codec");
       break;
 
+    case GST_MAKE_FOURCC ('F', 'F', 'V', 'H'):
+      caps = gst_caps_new_empty_simple ("video/x-ffvhuff");
+      if (strf) {
+        gst_caps_set_simple (caps, "bpp",
+            G_TYPE_INT, (int) strf->bit_cnt, NULL);
+      }
+      if (codec_name)
+        *codec_name = g_strdup ("FFmpeg Huffman YUV variant");
+      break;
+
     case GST_MAKE_FOURCC ('M', 'P', 'E', 'G'):
     case GST_MAKE_FOURCC ('M', 'P', 'G', 'I'):
     case GST_MAKE_FOURCC ('m', 'p', 'g', '1'):
@@ -371,6 +381,10 @@ gst_riff_create_video_caps (guint32 codec_fcc,
     case GST_MAKE_FOURCC ('h', '2', '6', '5'):
     case GST_MAKE_FOURCC ('h', 'v', 'c', '1'):
     case GST_MAKE_FOURCC ('H', 'V', 'C', '1'):
+    case GST_MAKE_FOURCC ('h', 'e', 'v', 'c'):
+    case GST_MAKE_FOURCC ('H', 'E', 'V', 'C'):
+    case GST_MAKE_FOURCC ('h', 'e', 'v', '1'):
+    case GST_MAKE_FOURCC ('H', 'E', 'V', '1'):
       caps = gst_caps_new_empty_simple ("video/x-h265");
       if (codec_name)
         *codec_name = g_strdup ("H.265");
@@ -1038,24 +1052,24 @@ static const struct
   const GstAudioChannelPosition gst_pos;
 } layout_mapping[] = {
   {
-  0x00001, GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT}, {
-  0x00002, GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT}, {
-  0x00004, GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER}, {
-  0x00008, GST_AUDIO_CHANNEL_POSITION_LFE1}, {
-  0x00010, GST_AUDIO_CHANNEL_POSITION_REAR_LEFT}, {
-  0x00020, GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT}, {
-  0x00040, GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER}, {
-  0x00080, GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER}, {
-  0x00100, GST_AUDIO_CHANNEL_POSITION_REAR_CENTER}, {
-  0x00200, GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT}, {
-  0x00400, GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT}, {
-  0x00800, GST_AUDIO_CHANNEL_POSITION_TOP_CENTER}, {
-  0x01000, GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_LEFT}, {
-  0x02000, GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_CENTER}, {
-  0x04000, GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_RIGHT}, {
-  0x08000, GST_AUDIO_CHANNEL_POSITION_TOP_REAR_LEFT}, {
-  0x10000, GST_AUDIO_CHANNEL_POSITION_TOP_REAR_CENTER}, {
-  0x20000, GST_AUDIO_CHANNEL_POSITION_TOP_REAR_RIGHT}
+      0x00001, GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT}, {
+      0x00002, GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT}, {
+      0x00004, GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER}, {
+      0x00008, GST_AUDIO_CHANNEL_POSITION_LFE1}, {
+      0x00010, GST_AUDIO_CHANNEL_POSITION_REAR_LEFT}, {
+      0x00020, GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT}, {
+      0x00040, GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER}, {
+      0x00080, GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER}, {
+      0x00100, GST_AUDIO_CHANNEL_POSITION_REAR_CENTER}, {
+      0x00200, GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT}, {
+      0x00400, GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT}, {
+      0x00800, GST_AUDIO_CHANNEL_POSITION_TOP_CENTER}, {
+      0x01000, GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_LEFT}, {
+      0x02000, GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_CENTER}, {
+      0x04000, GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_RIGHT}, {
+      0x08000, GST_AUDIO_CHANNEL_POSITION_TOP_REAR_LEFT}, {
+      0x10000, GST_AUDIO_CHANNEL_POSITION_TOP_REAR_CENTER}, {
+      0x20000, GST_AUDIO_CHANNEL_POSITION_TOP_REAR_RIGHT}
 };
 
 #define MAX_CHANNEL_POSITIONS G_N_ELEMENTS (layout_mapping)
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/tag/gsttagdemux.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/tag/gsttagdemux.c
index 1619c6b9bd6..dc90b03adb9 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/tag/gsttagdemux.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/tag/gsttagdemux.c
@@ -892,7 +892,7 @@ gst_tag_demux_seek_pull (GstTagDemux * tagdemux, GstEvent * event)
   gst_segment_do_seek (&seeksegment, rate, format, flags,
       start_type, start, stop_type, stop, NULL);
 
-  flush = ! !(flags & GST_SEEK_FLAG_FLUSH);
+  flush = !!(flags & GST_SEEK_FLAG_FLUSH);
 
   GST_DEBUG_OBJECT (tagdemux, "New segment %" GST_SEGMENT_FORMAT, &seeksegment);
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/tag/id3v2.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/tag/id3v2.c
index c295ac89efd..7db2cb7e12b 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/tag/id3v2.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/tag/id3v2.c
@@ -313,67 +313,67 @@ static const struct ID3v2FrameIDConvert
 } frame_id_conversions[] = {
   /* 2.3.x frames */
   {
-  "TORY", "TDOR"}, {
-  "TYER", "TDRC"},
-      /* 2.2.x frames */
+      "TORY", "TDOR"}, {
+      "TYER", "TDRC"},
+  /* 2.2.x frames */
   {
-  "BUF", "RBUF"}, {
-  "CNT", "PCNT"}, {
-  "COM", "COMM"}, {
-  "CRA", "AENC"}, {
-  "ETC", "ETCO"}, {
-  "GEO", "GEOB"}, {
-  "IPL", "TIPL"}, {
-  "MCI", "MCDI"}, {
-  "MLL", "MLLT"}, {
-  "PIC", "APIC"}, {
-  "POP", "POPM"}, {
-  "REV", "RVRB"}, {
-  "SLT", "SYLT"}, {
-  "STC", "SYTC"}, {
-  "TAL", "TALB"}, {
-  "TBP", "TBPM"}, {
-  "TCM", "TCOM"}, {
-  "TCO", "TCON"}, {
-  "TCR", "TCOP"}, {
-  "TDA", "TDAT"}, {             /* obsolete, but we need to parse it anyway */
-  "TDY", "TDLY"}, {
-  "TEN", "TENC"}, {
-  "TFT", "TFLT"}, {
-  "TKE", "TKEY"}, {
-  "TLA", "TLAN"}, {
-  "TLE", "TLEN"}, {
-  "TMT", "TMED"}, {
-  "TOA", "TOAL"}, {
-  "TOF", "TOFN"}, {
-  "TOL", "TOLY"}, {
-  "TOR", "TDOR"}, {
-  "TOT", "TOAL"}, {
-  "TP1", "TPE1"}, {
-  "TP2", "TPE2"}, {
-  "TP3", "TPE3"}, {
-  "TP4", "TPE4"}, {
-  "TPA", "TPOS"}, {
-  "TPB", "TPUB"}, {
-  "TRC", "TSRC"}, {
-  "TRD", "TDRC"}, {
-  "TRK", "TRCK"}, {
-  "TSS", "TSSE"}, {
-  "TT1", "TIT1"}, {
-  "TT2", "TIT2"}, {
-  "TT3", "TIT3"}, {
-  "TXT", "TOLY"}, {
-  "TXX", "TXXX"}, {
-  "TYE", "TDRC"}, {
-  "UFI", "UFID"}, {
-  "ULT", "USLT"}, {
-  "WAF", "WOAF"}, {
-  "WAR", "WOAR"}, {
-  "WAS", "WOAS"}, {
-  "WCM", "WCOM"}, {
-  "WCP", "WCOP"}, {
-  "WPB", "WPUB"}, {
-  "WXX", "WXXX"}
+      "BUF", "RBUF"}, {
+      "CNT", "PCNT"}, {
+      "COM", "COMM"}, {
+      "CRA", "AENC"}, {
+      "ETC", "ETCO"}, {
+      "GEO", "GEOB"}, {
+      "IPL", "TIPL"}, {
+      "MCI", "MCDI"}, {
+      "MLL", "MLLT"}, {
+      "PIC", "APIC"}, {
+      "POP", "POPM"}, {
+      "REV", "RVRB"}, {
+      "SLT", "SYLT"}, {
+      "STC", "SYTC"}, {
+      "TAL", "TALB"}, {
+      "TBP", "TBPM"}, {
+      "TCM", "TCOM"}, {
+      "TCO", "TCON"}, {
+      "TCR", "TCOP"}, {
+      "TDA", "TDAT"}, {         /* obsolete, but we need to parse it anyway */
+      "TDY", "TDLY"}, {
+      "TEN", "TENC"}, {
+      "TFT", "TFLT"}, {
+      "TKE", "TKEY"}, {
+      "TLA", "TLAN"}, {
+      "TLE", "TLEN"}, {
+      "TMT", "TMED"}, {
+      "TOA", "TOAL"}, {
+      "TOF", "TOFN"}, {
+      "TOL", "TOLY"}, {
+      "TOR", "TDOR"}, {
+      "TOT", "TOAL"}, {
+      "TP1", "TPE1"}, {
+      "TP2", "TPE2"}, {
+      "TP3", "TPE3"}, {
+      "TP4", "TPE4"}, {
+      "TPA", "TPOS"}, {
+      "TPB", "TPUB"}, {
+      "TRC", "TSRC"}, {
+      "TRD", "TDRC"}, {
+      "TRK", "TRCK"}, {
+      "TSS", "TSSE"}, {
+      "TT1", "TIT1"}, {
+      "TT2", "TIT2"}, {
+      "TT3", "TIT3"}, {
+      "TXT", "TOLY"}, {
+      "TXX", "TXXX"}, {
+      "TYE", "TDRC"}, {
+      "UFI", "UFID"}, {
+      "ULT", "USLT"}, {
+      "WAF", "WOAF"}, {
+      "WAR", "WOAR"}, {
+      "WAS", "WOAS"}, {
+      "WCM", "WCOM"}, {
+      "WCP", "WCOP"}, {
+      "WPB", "WPUB"}, {
+      "WXX", "WXXX"}
 };
 
 static gboolean
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/convertframe.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/convertframe.c
index 144e23be893..fd14c6b4f4c 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/convertframe.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/convertframe.c
@@ -28,6 +28,28 @@
 #include <gst/gl/gstglmemory.h>
 #endif
 
+#ifndef GST_DISABLE_GST_DEBUG
+#define GST_CAT_DEFAULT ensure_debug_category()
+static GstDebugCategory *
+ensure_debug_category (void)
+{
+  static gsize cat_gonce = 0;
+
+  if (g_once_init_enter (&cat_gonce)) {
+    gsize cat_done;
+
+    cat_done = (gsize) _gst_debug_category_new ("video-frame-converter", 0,
+        "video-frame-converter object");
+
+    g_once_init_leave (&cat_gonce, cat_done);
+  }
+
+  return (GstDebugCategory *) cat_gonce;
+}
+#else
+#define ensure_debug_category() /* NOOP */
+#endif /* GST_DISABLE_GST_DEBUG */
+
 static gboolean
 caps_are_raw (const GstCaps * caps)
 {
@@ -409,7 +431,7 @@ build_convert_frame_pipeline (GstElement ** src_element,
  *
  * The width, height and pixel-aspect-ratio can also be specified in the output caps.
  *
- * Returns: The converted #GstSample, or %NULL if an error happened (in which case @err
+ * Returns: (nullable) (transfer full): The converted #GstSample, or %NULL if an error happened (in which case @err
  * will point to the #GError).
  */
 GstSample *
@@ -579,7 +601,7 @@ gst_video_convert_frame_context_unref (GstVideoConvertSampleContext * ctx)
    * must not end up here without finish() being called */
   g_warn_if_fail (ctx->pipeline == NULL);
 
-  g_slice_free (GstVideoConvertSampleContext, ctx);
+  g_free (ctx);
 }
 
 static gboolean
@@ -838,7 +860,7 @@ gst_video_convert_sample_async (GstSample * sample,
   /* There's a reference cycle between the context and the pipeline, which is
    * broken up once the finish() is called on the context. At latest when the
    * timeout triggers the context will be freed */
-  ctx = g_slice_new0 (GstVideoConvertSampleContext);
+  ctx = g_new0 (GstVideoConvertSampleContext, 1);
   ctx->ref_count = 1;
   g_mutex_init (&ctx->mutex);
   ctx->sample = gst_sample_ref (sample);
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/gstvideometa.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/gstvideometa.c
index f9f1a156a0d..f1918208181 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/gstvideometa.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/gstvideometa.c
@@ -23,6 +23,7 @@
 #include "gstvideometa.h"
 
 #include <string.h>
+#include <gst/base/base.h>
 
 /**
  * SECTION:gstvideometa
@@ -31,6 +32,12 @@
  *
  */
 
+static gboolean
+default_map (GstVideoMeta * meta, guint plane, GstMapInfo * info,
+    gpointer * data, gint * stride, GstMapFlags flags);
+static gboolean
+default_unmap (GstVideoMeta * meta, guint plane, GstMapInfo * info);
+
 #ifndef GST_DISABLE_GST_DEBUG
 #define GST_CAT_DEFAULT ensure_debug_category()
 static GstDebugCategory *
@@ -134,6 +141,110 @@ gst_video_meta_api_get_type (void)
   return type;
 }
 
+static gboolean
+video_meta_serialize (const GstMeta * meta, GstByteArrayInterface * data,
+    guint8 * version)
+{
+  GstVideoMeta *vmeta = (GstVideoMeta *) meta;
+
+  if (vmeta->map != default_map || vmeta->unmap != default_unmap) {
+    GST_WARNING ("Cannot serialize video meta with custom map/unmap functions");
+    return FALSE;
+  }
+
+  gsize size = 36 + vmeta->n_planes * 16;
+  guint8 *ptr = gst_byte_array_interface_append (data, size);
+  if (ptr == NULL)
+    return FALSE;
+
+  GstByteWriter bw;
+  gboolean success = TRUE;
+  gst_byte_writer_init_with_data (&bw, ptr, size, FALSE);
+  success &= gst_byte_writer_put_int32_le (&bw, vmeta->flags);
+  success &= gst_byte_writer_put_int32_le (&bw, vmeta->format);
+  success &= gst_byte_writer_put_uint32_le (&bw, vmeta->width);
+  success &= gst_byte_writer_put_uint32_le (&bw, vmeta->height);
+  success &= gst_byte_writer_put_uint32_le (&bw, vmeta->n_planes);
+  for (int n = 0; n < vmeta->n_planes; n++)
+    success &= gst_byte_writer_put_uint64_le (&bw, vmeta->offset[n]);
+  for (int n = 0; n < vmeta->n_planes; n++)
+    success &= gst_byte_writer_put_int32_le (&bw, vmeta->stride[n]);
+  success &= gst_byte_writer_put_uint32_le (&bw, vmeta->alignment.padding_top);
+  success &=
+      gst_byte_writer_put_uint32_le (&bw, vmeta->alignment.padding_bottom);
+  success &= gst_byte_writer_put_uint32_le (&bw, vmeta->alignment.padding_left);
+  success &=
+      gst_byte_writer_put_uint32_le (&bw, vmeta->alignment.padding_right);
+  for (int n = 0; n < vmeta->n_planes; n++)
+    success &=
+        gst_byte_writer_put_uint32_le (&bw, vmeta->alignment.stride_align[n]);
+  g_assert (success);
+
+  return TRUE;
+}
+
+static GstMeta *
+video_meta_deserialize (const GstMetaInfo * info, GstBuffer * buffer,
+    const guint8 * data, gsize size, guint8 version)
+{
+  GstVideoMeta *vmeta = NULL;
+  gint32 flags;
+  gint32 format;
+  guint width;
+  guint height;
+  guint n_planes;
+  GstVideoAlignment align;
+  guint64 offset64[GST_VIDEO_MAX_PLANES];
+  gint32 stride[GST_VIDEO_MAX_PLANES];
+
+  if (version != 0)
+    return NULL;
+
+  GstByteReader br;
+  gboolean success = TRUE;
+  gst_byte_reader_init (&br, data, size);
+  success &= gst_byte_reader_get_int32_le (&br, &flags);
+  success &= gst_byte_reader_get_int32_le (&br, &format);
+  success &= gst_byte_reader_get_uint32_le (&br, &width);
+  success &= gst_byte_reader_get_uint32_le (&br, &height);
+  success &= gst_byte_reader_get_uint32_le (&br, &n_planes);
+
+  if (!success || n_planes > GST_VIDEO_MAX_PLANES)
+    return NULL;
+
+  for (int n = 0; n < n_planes; n++)
+    success &= gst_byte_reader_get_uint64_le (&br, &offset64[n]);
+  for (int n = 0; n < n_planes; n++)
+    success &= gst_byte_reader_get_int32_le (&br, &stride[n]);
+  success &= gst_byte_reader_get_uint32_le (&br, &align.padding_top);
+  success &= gst_byte_reader_get_uint32_le (&br, &align.padding_bottom);
+  success &= gst_byte_reader_get_uint32_le (&br, &align.padding_left);
+  success &= gst_byte_reader_get_uint32_le (&br, &align.padding_right);
+  for (int n = 0; n < n_planes; n++)
+    success &= gst_byte_reader_get_uint32_le (&br, &align.stride_align[n]);
+
+  if (!success)
+    return NULL;
+
+#if GLIB_SIZEOF_SIZE_T != 8
+  gsize offset[GST_VIDEO_MAX_PLANES];
+  for (int i = 0; i < n_planes; i++) {
+    if (offset64[i] > G_MAXSIZE)
+      return NULL;
+    offset[i] = offset64[i];
+  }
+#else
+  gsize *offset = (gsize *) offset64;
+#endif
+
+  vmeta =
+      gst_buffer_add_video_meta_full (buffer, flags, format, width, height,
+      n_planes, offset, stride);
+  gst_video_meta_set_alignment (vmeta, align);
+
+  return (GstMeta *) vmeta;
+}
+
 /* video metadata */
 const GstMetaInfo *
 gst_video_meta_get_info (void)
@@ -141,10 +252,14 @@ gst_video_meta_get_info (void)
   static const GstMetaInfo *video_meta_info = NULL;
 
   if (g_once_init_enter ((GstMetaInfo **) & video_meta_info)) {
-    const GstMetaInfo *meta =
-        gst_meta_register (GST_VIDEO_META_API_TYPE, "GstVideoMeta",
-        sizeof (GstVideoMeta), (GstMetaInitFunction) gst_video_meta_init,
-        (GstMetaFreeFunction) NULL, gst_video_meta_transform);
+    GstMetaInfo *info = gst_meta_info_new (GST_VIDEO_META_API_TYPE,
+        "GstVideoMeta",
+        sizeof (GstVideoMeta));
+    info->init_func = gst_video_meta_init;
+    info->transform_func = gst_video_meta_transform;
+    info->serialize_func = video_meta_serialize;
+    info->deserialize_func = video_meta_deserialize;
+    const GstMetaInfo *meta = gst_meta_info_register (info);
     g_once_init_leave ((GstMetaInfo **) & video_meta_info,
         (GstMetaInfo *) meta);
   }
@@ -310,8 +425,8 @@ gst_buffer_add_video_meta (GstBuffer * buffer,
 GstVideoMeta *
 gst_buffer_add_video_meta_full (GstBuffer * buffer,
     GstVideoFrameFlags flags, GstVideoFormat format, guint width,
-    guint height, guint n_planes, gsize offset[GST_VIDEO_MAX_PLANES],
-    gint stride[GST_VIDEO_MAX_PLANES])
+    guint height, guint n_planes, const gsize offset[GST_VIDEO_MAX_PLANES],
+    const gint stride[GST_VIDEO_MAX_PLANES])
 {
   GstVideoMeta *meta;
   guint i;
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/gstvideometa.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/gstvideometa.h
index 0fae0729253..c05e74fd1ec 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/gstvideometa.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/gstvideometa.h
@@ -74,6 +74,9 @@ typedef struct _GstVideoCropMeta GstVideoCropMeta;
  * - padding-right (uint): extra pixels on the right side
  * The padding fields have the same semantic as #GstVideoMeta.alignment
  * and so represent the paddings requested on produced video buffers.
+ *
+ * Since 1.24 it can be serialized using gst_meta_serialize() and
+ * gst_meta_deserialize().
  */
 struct _GstVideoMeta {
   GstMeta            meta;
@@ -116,8 +119,8 @@ GstVideoMeta * gst_buffer_add_video_meta       (GstBuffer *buffer, GstVideoFrame
 GST_VIDEO_API
 GstVideoMeta * gst_buffer_add_video_meta_full  (GstBuffer *buffer, GstVideoFrameFlags flags,
                                                 GstVideoFormat format, guint width, guint height,
-                                                guint n_planes, gsize offset[GST_VIDEO_MAX_PLANES],
-                                                gint stride[GST_VIDEO_MAX_PLANES]);
+                                                guint n_planes, const gsize offset[GST_VIDEO_MAX_PLANES],
+                                                const gint stride[GST_VIDEO_MAX_PLANES]);
 
 GST_VIDEO_API
 gboolean       gst_video_meta_map        (GstVideoMeta *meta, guint plane, GstMapInfo *info,
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/gstvideoutils.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/gstvideoutils.c
index 579bffe4e79..f25f078697b 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/gstvideoutils.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/gstvideoutils.c
@@ -58,7 +58,7 @@ _gst_video_codec_frame_free (GstVideoCodecFrame * frame)
   if (frame->user_data_destroy_notify)
     frame->user_data_destroy_notify (frame->user_data);
 
-  g_slice_free (GstVideoCodecFrame, frame);
+  g_free (frame);
 }
 
 /**
@@ -172,10 +172,10 @@ _gst_video_codec_state_free (GstVideoCodecState * state)
   if (state->codec_data)
     gst_buffer_unref (state->codec_data);
   if (state->mastering_display_info)
-    g_slice_free (GstVideoMasteringDisplayInfo, state->mastering_display_info);
+    g_free (state->mastering_display_info);
   if (state->content_light_level)
-    g_slice_free (GstVideoContentLightLevel, state->content_light_level);
-  g_slice_free (GstVideoCodecState, state);
+    g_free (state->content_light_level);
+  g_free (state);
 }
 
 /**
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-chroma.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-chroma.c
index 6a2606d4310..48983d2979d 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-chroma.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-chroma.c
@@ -1094,7 +1094,7 @@ gst_video_chroma_resample_new (GstVideoChromaMethod method,
 
   GST_DEBUG ("v_resample %d, factor %d, cosite %d", v_index, v_factor, cosite);
 
-  result = g_slice_new (GstVideoChromaResample);
+  result = g_new (GstVideoChromaResample, 1);
   result->method = method;
   result->site = site;
   result->flags = flags;
@@ -1144,7 +1144,7 @@ gst_video_chroma_resample_free (GstVideoChromaResample * resample)
 {
   g_return_if_fail (resample != NULL);
 
-  g_slice_free (GstVideoChromaResample, resample);
+  g_free (resample);
 }
 
 /**
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-converter.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-converter.c
index 849d5875733..f8fe8185b90 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-converter.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-converter.c
@@ -520,7 +520,7 @@ gst_line_cache_new (GstLineCache * prev)
 {
   GstLineCache *result;
 
-  result = g_slice_new0 (GstLineCache);
+  result = g_new0 (GstLineCache, 1);
   result->lines = g_ptr_array_new ();
   result->prev = prev;
 
@@ -545,7 +545,7 @@ gst_line_cache_free (GstLineCache * cache)
     cache->alloc_line_notify (cache->alloc_line_data);
   gst_line_cache_clear (cache);
   g_ptr_array_unref (cache->lines);
-  g_slice_free (GstLineCache, cache);
+  g_free (cache);
 }
 
 static void
@@ -609,7 +609,7 @@ gst_line_cache_get_lines (GstLineCache * cache, gint idx, gint out_line,
             cache->need_line_data))
       break;
   }
-  GST_DEBUG ("no lines");
+  GST_LOG ("no lines");
   return NULL;
 }
 
@@ -673,8 +673,8 @@ converter_alloc_new (guint stride, guint n_lines, gpointer user_data,
 {
   ConverterAlloc *alloc;
 
-  GST_DEBUG ("stride %d, n_lines %d", stride, n_lines);
-  alloc = g_slice_new0 (ConverterAlloc);
+  GST_LOG ("stride %d, n_lines %d", stride, n_lines);
+  alloc = g_new0 (ConverterAlloc, 1);
   alloc->data = g_malloc (stride * n_lines);
   alloc->stride = stride;
   alloc->n_lines = n_lines;
@@ -691,7 +691,7 @@ converter_alloc_free (ConverterAlloc * alloc)
   if (alloc->notify)
     alloc->notify (alloc->user_data);
   g_free (alloc->data);
-  g_slice_free (ConverterAlloc, alloc);
+  g_free (alloc);
 }
 
 static void
@@ -712,7 +712,7 @@ get_temp_line (GstLineCache * cache, gint idx, gpointer user_data)
   ConverterAlloc *alloc = user_data;
   gpointer tmpline;
 
-  GST_DEBUG ("get temp line %d (%p %d)", idx, alloc, alloc->idx);
+  GST_LOG ("get temp line %d (%p %d)", idx, alloc, alloc->idx);
   tmpline = &alloc->data[alloc->stride * alloc->idx];
   alloc->idx = (alloc->idx + 1) % alloc->n_lines;
 
@@ -726,7 +726,7 @@ get_border_temp_line (GstLineCache * cache, gint idx, gpointer user_data)
   GstVideoConverter *convert = alloc->user_data;
   gpointer tmpline;
 
-  GST_DEBUG ("get temp line %d (%p %d)", idx, alloc, alloc->idx);
+  GST_LOG ("get temp line %d (%p %d)", idx, alloc, alloc->idx);
   tmpline = &alloc->data[alloc->stride * alloc->idx] +
       (convert->out_x * convert->pack_pstride);
   alloc->idx = (alloc->idx + 1) % alloc->n_lines;
@@ -868,7 +868,7 @@ chain_unpack_line (GstVideoConverter * convert, gint idx)
   convert->unpack_pstride = convert->current_pstride;
   convert->identity_unpack = (convert->current_format == info->finfo->format);
 
-  GST_DEBUG ("chain unpack line format %s, pstride %d, identity_unpack %d",
+  GST_LOG ("chain unpack line format %s, pstride %d, identity_unpack %d",
       gst_video_format_to_string (convert->current_format),
       convert->current_pstride, convert->identity_unpack);
 
@@ -888,7 +888,7 @@ chain_upsample (GstVideoConverter * convert, GstLineCache * prev, gint idx)
   video_converter_compute_resample (convert, idx);
 
   if (convert->upsample_p[idx] || convert->upsample_i[idx]) {
-    GST_DEBUG ("chain upsample");
+    GST_LOG ("chain upsample");
     prev = convert->upsample_lines[idx] = gst_line_cache_new (prev);
     prev->write_input = TRUE;
     prev->pass_alloc = TRUE;
@@ -998,14 +998,10 @@ color_matrix_scale_components (MatrixData * m, double a1, double a2, double a3)
 static void
 color_matrix_debug (const MatrixData * s)
 {
-  GST_DEBUG ("[%f %f %f %f]", s->dm[0][0], s->dm[0][1], s->dm[0][2],
-      s->dm[0][3]);
-  GST_DEBUG ("[%f %f %f %f]", s->dm[1][0], s->dm[1][1], s->dm[1][2],
-      s->dm[1][3]);
-  GST_DEBUG ("[%f %f %f %f]", s->dm[2][0], s->dm[2][1], s->dm[2][2],
-      s->dm[2][3]);
-  GST_DEBUG ("[%f %f %f %f]", s->dm[3][0], s->dm[3][1], s->dm[3][2],
-      s->dm[3][3]);
+  GST_LOG ("[%f %f %f %f]", s->dm[0][0], s->dm[0][1], s->dm[0][2], s->dm[0][3]);
+  GST_LOG ("[%f %f %f %f]", s->dm[1][0], s->dm[1][1], s->dm[1][2], s->dm[1][3]);
+  GST_LOG ("[%f %f %f %f]", s->dm[2][0], s->dm[2][1], s->dm[2][2], s->dm[2][3]);
+  GST_LOG ("[%f %f %f %f]", s->dm[3][0], s->dm[3][1], s->dm[3][2], s->dm[3][3]);
 }
 
 static void
@@ -1017,13 +1013,13 @@ color_matrix_convert (MatrixData * s)
     for (j = 0; j < 4; j++)
       s->im[i][j] = rint (s->dm[i][j]);
 
-  GST_DEBUG ("[%6d %6d %6d %6d]", s->im[0][0], s->im[0][1], s->im[0][2],
+  GST_LOG ("[%6d %6d %6d %6d]", s->im[0][0], s->im[0][1], s->im[0][2],
       s->im[0][3]);
-  GST_DEBUG ("[%6d %6d %6d %6d]", s->im[1][0], s->im[1][1], s->im[1][2],
+  GST_LOG ("[%6d %6d %6d %6d]", s->im[1][0], s->im[1][1], s->im[1][2],
       s->im[1][3]);
-  GST_DEBUG ("[%6d %6d %6d %6d]", s->im[2][0], s->im[2][1], s->im[2][2],
+  GST_LOG ("[%6d %6d %6d %6d]", s->im[2][0], s->im[2][1], s->im[2][2],
       s->im[2][3]);
-  GST_DEBUG ("[%6d %6d %6d %6d]", s->im[3][0], s->im[3][1], s->im[3][2],
+  GST_LOG ("[%6d %6d %6d %6d]", s->im[3][0], s->im[3][1], s->im[3][2],
       s->im[3][3]);
 }
 
@@ -1347,16 +1343,16 @@ prepare_matrix (GstVideoConverter * convert, MatrixData * data)
   if (convert->current_bits == 8) {
     if (!convert->unpack_rgb && convert->pack_rgb
         && is_ayuv_to_rgb_matrix (data)) {
-      GST_DEBUG ("use fast AYUV -> RGB matrix");
+      GST_LOG ("use fast AYUV -> RGB matrix");
       data->matrix_func = video_converter_matrix8_AYUV_ARGB;
     } else if (is_no_clip_matrix (data)) {
-      GST_DEBUG ("use 8bit table");
+      GST_LOG ("use 8bit table");
       data->matrix_func = video_converter_matrix8_table;
       videoconvert_convert_init_tables (data);
     } else {
       gint a03, a13, a23;
 
-      GST_DEBUG ("use 8bit matrix");
+      GST_LOG ("use 8bit matrix");
       data->matrix_func = video_converter_matrix8;
 
       data->orc_p1 = (((guint64) (guint16) data->im[2][0]) << 48) |
@@ -1377,7 +1373,7 @@ prepare_matrix (GstVideoConverter * convert, MatrixData * data)
           (((guint64) (guint16) a13) << 32) | (((guint64) (guint16) a03) << 16);
     }
   } else {
-    GST_DEBUG ("use 16bit matrix");
+    GST_LOG ("use 16bit matrix");
     data->matrix_func = video_converter_matrix16;
   }
 }
@@ -1517,9 +1513,9 @@ setup_gamma_decode (GstVideoConverter * convert)
 
   convert->gamma_dec.width = convert->current_width;
   if (convert->gamma_dec.gamma_table) {
-    GST_DEBUG ("gamma decode already set up");
+    GST_LOG ("gamma decode already set up");
   } else if (convert->current_bits == 8) {
-    GST_DEBUG ("gamma decode 8->16: %d", func);
+    GST_LOG ("gamma decode 8->16: %d", func);
     convert->gamma_dec.gamma_func = gamma_convert_u8_u16;
     t = convert->gamma_dec.gamma_table = g_malloc (sizeof (guint16) * 256);
 
@@ -1527,7 +1523,7 @@ setup_gamma_decode (GstVideoConverter * convert)
       t[i] =
           rint (gst_video_transfer_function_decode (func, i / 255.0) * 65535.0);
   } else {
-    GST_DEBUG ("gamma decode 16->16: %d", func);
+    GST_LOG ("gamma decode 16->16: %d", func);
     convert->gamma_dec.gamma_func = gamma_convert_u16_u16;
     t = convert->gamma_dec.gamma_table = g_malloc (sizeof (guint16) * 65536);
 
@@ -1551,11 +1547,11 @@ setup_gamma_encode (GstVideoConverter * convert, gint target_bits)
 
   convert->gamma_enc.width = convert->current_width;
   if (convert->gamma_enc.gamma_table) {
-    GST_DEBUG ("gamma encode already set up");
+    GST_LOG ("gamma encode already set up");
   } else if (target_bits == 8) {
     guint8 *t;
 
-    GST_DEBUG ("gamma encode 16->8: %d", func);
+    GST_LOG ("gamma encode 16->8: %d", func);
     convert->gamma_enc.gamma_func = gamma_convert_u16_u8;
     t = convert->gamma_enc.gamma_table = g_malloc (sizeof (guint8) * 65536);
 
@@ -1565,7 +1561,7 @@ setup_gamma_encode (GstVideoConverter * convert, gint target_bits)
   } else {
     guint16 *t;
 
-    GST_DEBUG ("gamma encode 16->16: %d", func);
+    GST_LOG ("gamma encode 16->16: %d", func);
     convert->gamma_enc.gamma_func = gamma_convert_u16_u16;
     t = convert->gamma_enc.gamma_table = g_malloc (sizeof (guint16) * 65536);
 
@@ -1593,7 +1589,7 @@ chain_convert_to_RGB (GstVideoConverter * convert, GstLineCache * prev,
       compute_matrix_to_RGB (convert, &convert->to_RGB_matrix);
 
       /* matrix is in 0..1 range, scale to current bits */
-      GST_DEBUG ("chain RGB convert");
+      GST_LOG ("chain RGB convert");
       scale = 1 << convert->current_bits;
       color_matrix_scale_components (&convert->to_RGB_matrix,
           (float) scale, (float) scale, (float) scale);
@@ -1614,7 +1610,7 @@ chain_convert_to_RGB (GstVideoConverter * convert, GstLineCache * prev,
     gst_line_cache_set_need_line_func (prev,
         do_convert_to_RGB_lines, idx, convert, NULL);
 
-    GST_DEBUG ("chain gamma decode");
+    GST_LOG ("chain gamma decode");
     setup_gamma_decode (convert);
   }
   return prev;
@@ -1635,7 +1631,7 @@ chain_hscale (GstVideoConverter * convert, GstLineCache * prev, gint idx)
 
   gst_video_scaler_get_coeff (convert->h_scaler[idx], 0, NULL, &taps);
 
-  GST_DEBUG ("chain hscale %d->%d, taps %d, method %d",
+  GST_LOG ("chain hscale %d->%d, taps %d, method %d",
       convert->in_width, convert->out_width, taps, method);
 
   convert->current_width = convert->out_width;
@@ -1680,7 +1676,7 @@ chain_vscale (GstVideoConverter * convert, GstLineCache * prev, gint idx)
 
   gst_video_scaler_get_coeff (convert->v_scaler_p[idx], 0, NULL, &taps);
 
-  GST_DEBUG ("chain vscale %d->%d, taps %d, method %d, backlog %d",
+  GST_LOG ("chain vscale %d->%d, taps %d, method %d, backlog %d",
       convert->in_height, convert->out_height, taps, method, backlog);
 
   prev->backlog = backlog;
@@ -1703,14 +1699,14 @@ chain_scale (GstVideoConverter * convert, GstLineCache * prev, gboolean force,
   s0 = convert->current_width * convert->current_height;
   s3 = convert->out_width * convert->out_height;
 
-  GST_DEBUG ("in pixels %d <> out pixels %d", s0, s3);
+  GST_LOG ("in pixels %d <> out pixels %d", s0, s3);
 
   if (s3 <= s0 || force) {
     /* we are making the image smaller or are forced to resample */
     s1 = convert->out_width * convert->current_height;
     s2 = convert->current_width * convert->out_height;
 
-    GST_DEBUG ("%d <> %d", s1, s2);
+    GST_LOG ("%d <> %d", s1, s2);
 
     if (s1 <= s2) {
       /* h scaling first produces less pixels */
@@ -1753,11 +1749,11 @@ chain_convert (GstVideoConverter * convert, GstLineCache * prev, gint idx)
         colorimetry.primaries, convert->out_info.colorimetry.primaries);
   }
 
-  GST_DEBUG ("matrix %d -> %d (%d)", convert->in_info.colorimetry.matrix,
+  GST_LOG ("matrix %d -> %d (%d)", convert->in_info.colorimetry.matrix,
       convert->out_info.colorimetry.matrix, same_matrix);
-  GST_DEBUG ("bits %d -> %d (%d)", convert->unpack_bits, convert->pack_bits,
+  GST_LOG ("bits %d -> %d (%d)", convert->unpack_bits, convert->pack_bits,
       same_bits);
-  GST_DEBUG ("primaries %d -> %d (%d)", convert->in_info.colorimetry.primaries,
+  GST_LOG ("primaries %d -> %d (%d)", convert->in_info.colorimetry.primaries,
       convert->out_info.colorimetry.primaries, same_primaries);
 
   color_matrix_set_identity (&convert->convert_matrix);
@@ -1780,9 +1776,9 @@ chain_convert (GstVideoConverter * convert, GstLineCache * prev, gint idx)
     /* Get the RGB_TO_XYZ_input_matrix */
     color_matrix_RGB_to_XYZ (&p1, pi->Rx, pi->Ry, pi->Gx, pi->Gy, pi->Bx,
         pi->By, pi->Wx, pi->Wy);
-    GST_DEBUG ("to XYZ matrix");
+    GST_LOG ("to XYZ matrix");
     color_matrix_debug (&p1);
-    GST_DEBUG ("current matrix");
+    GST_LOG ("current matrix");
     /* convert_matrix = RGB_TO_XYZ_input_matrix * input_RGB */
     color_matrix_multiply (&convert->convert_matrix, &convert->convert_matrix,
         &p1);
@@ -1799,7 +1795,7 @@ chain_convert (GstVideoConverter * convert, GstLineCache * prev, gint idx)
     color_matrix_RGB_to_XYZ (&p2, pi->Rx, pi->Ry, pi->Gx, pi->Gy, pi->Bx,
         pi->By, pi->Wx, pi->Wy);
     color_matrix_invert (&p2, &p2);
-    GST_DEBUG ("to RGB matrix");
+    GST_LOG ("to RGB matrix");
     color_matrix_debug (&p2);
     /* Finally:
      * convert_matrix = XYZ_to_RGB_output_matrix * RGB_TO_XYZ_input_matrix * RGB_input
@@ -1808,7 +1804,7 @@ chain_convert (GstVideoConverter * convert, GstLineCache * prev, gint idx)
      */
     color_matrix_multiply (&convert->convert_matrix, &p2,
         &convert->convert_matrix);
-    GST_DEBUG ("current matrix");
+    GST_LOG ("current matrix");
     color_matrix_debug (&convert->convert_matrix);
   }
 
@@ -1825,14 +1821,14 @@ chain_convert (GstVideoConverter * convert, GstLineCache * prev, gint idx)
         color_matrix_scale_components (&convert->convert_matrix,
             1 / (float) scale, 1 / (float) scale, 1 / (float) scale);
       }
-      GST_DEBUG ("to RGB matrix");
+      GST_LOG ("to RGB matrix");
       compute_matrix_to_RGB (convert, &convert->convert_matrix);
-      GST_DEBUG ("current matrix");
+      GST_LOG ("current matrix");
       color_matrix_debug (&convert->convert_matrix);
 
-      GST_DEBUG ("to YUV matrix");
+      GST_LOG ("to YUV matrix");
       compute_matrix_to_YUV (convert, &convert->convert_matrix, FALSE);
-      GST_DEBUG ("current matrix");
+      GST_LOG ("current matrix");
       color_matrix_debug (&convert->convert_matrix);
       if (convert->in_bits > convert->out_bits) {
         gint scale = 1 << (convert->in_bits - convert->out_bits);
@@ -1868,7 +1864,7 @@ chain_convert (GstVideoConverter * convert, GstLineCache * prev, gint idx)
   }
 
   if (do_conversion) {
-    GST_DEBUG ("chain conversion");
+    GST_LOG ("chain conversion");
     prev = convert->convert_lines[idx] = gst_line_cache_new (prev);
     prev->write_input = TRUE;
     prev->pass_alloc = pass_alloc;
@@ -1954,7 +1950,7 @@ chain_alpha (GstVideoConverter * convert, GstLineCache * prev, gint idx)
       break;
   }
 
-  GST_DEBUG ("chain alpha mode %d", convert->alpha_mode);
+  GST_LOG ("chain alpha mode %d", convert->alpha_mode);
   prev = convert->alpha_lines[idx] = gst_line_cache_new (prev);
   prev->write_input = TRUE;
   prev->pass_alloc = TRUE;
@@ -1976,7 +1972,7 @@ chain_convert_to_YUV (GstVideoConverter * convert, GstLineCache * prev,
   if (do_gamma) {
     gint scale;
 
-    GST_DEBUG ("chain gamma encode");
+    GST_LOG ("chain gamma encode");
     setup_gamma_encode (convert, convert->pack_bits);
 
     convert->current_bits = convert->pack_bits;
@@ -2005,7 +2001,7 @@ chain_convert_to_YUV (GstVideoConverter * convert, GstLineCache * prev,
        * to expected scale here, otherwise offset of the matrix would be
        * very wrong
        */
-      GST_DEBUG ("chain YUV convert");
+      GST_LOG ("chain YUV convert");
       scale = 1 << convert->pack_bits;
       color_matrix_scale_components (&convert->to_YUV_matrix,
           1 / (float) scale, 1 / (float) scale, 1 / (float) scale);
@@ -2031,7 +2027,7 @@ static GstLineCache *
 chain_downsample (GstVideoConverter * convert, GstLineCache * prev, gint idx)
 {
   if (convert->downsample_p[idx] || convert->downsample_i[idx]) {
-    GST_DEBUG ("chain downsample");
+    GST_LOG ("chain downsample");
     prev = convert->downsample_lines[idx] = gst_line_cache_new (prev);
     prev->write_input = TRUE;
     prev->pass_alloc = TRUE;
@@ -2058,7 +2054,7 @@ chain_dither (GstVideoConverter * convert, GstLineCache * prev, gint idx)
     return prev;
 
   target_quant = GET_OPT_DITHER_QUANTIZATION (convert);
-  GST_DEBUG ("method %d, target-quantization %d", method, target_quant);
+  GST_LOG ("method %d, target-quantization %d", method, target_quant);
 
   if (convert->pack_pal) {
     quant[0] = 47;
@@ -2092,7 +2088,7 @@ chain_dither (GstVideoConverter * convert, GstLineCache * prev, gint idx)
   }
 
   if (do_dither) {
-    GST_DEBUG ("chain dither");
+    GST_LOG ("chain dither");
 
     convert->dither[idx] = gst_video_dither_new (method,
         flags, convert->pack_format, quant, convert->current_width);
@@ -2116,7 +2112,7 @@ chain_pack (GstVideoConverter * convert, GstLineCache * prev, gint idx)
   convert->identity_pack =
       (convert->out_info.finfo->format ==
       convert->out_info.finfo->unpack_format);
-  GST_DEBUG ("chain pack line format %s, pstride %d, identity_pack %d (%d %d)",
+  GST_LOG ("chain pack line format %s, pstride %d, identity_pack %d (%d %d)",
       gst_video_format_to_string (convert->current_format),
       convert->current_pstride, convert->identity_pack,
       convert->out_info.finfo->format, convert->out_info.finfo->unpack_format);
@@ -2160,11 +2156,11 @@ setup_allocators (GstVideoConverter * convert)
      * keep track of the maximum number of lines we need for each intermediate
      * step.  */
     for (prev = cache = convert->pack_lines[i]; cache; cache = cache->prev) {
-      GST_DEBUG ("looking at cache %p, %d lines, %d backlog", cache,
+      GST_LOG ("looking at cache %p, %d lines, %d backlog", cache,
           cache->n_lines, cache->backlog);
       prev->n_lines = MAX (prev->n_lines, cache->n_lines);
       if (!cache->pass_alloc) {
-        GST_DEBUG ("cache %p, needs %d lines", prev, prev->n_lines);
+        GST_LOG ("cache %p, needs %d lines", prev, prev->n_lines);
         prev = cache;
       }
     }
@@ -2343,7 +2339,7 @@ gst_video_converter_new_with_pool (const GstVideoInfo * in_info,
   g_return_val_if_fail (in_info->interlace_mode == out_info->interlace_mode,
       NULL);
 
-  convert = g_slice_new0 (GstVideoConverter);
+  convert = g_new0 (GstVideoConverter, 1);
 
   fin = in_info->finfo;
   fout = out_info->finfo;
@@ -2691,7 +2687,7 @@ gst_video_converter_free (GstVideoConverter * convert)
     g_free (convert->tasks_p[i]);
   }
 
-  g_slice_free (GstVideoConverter, convert);
+  g_free (convert);
 }
 
 static gboolean
@@ -2849,7 +2845,7 @@ video_converter_compute_resample (GstVideoConverter * convert, gint idx)
   sfinfo = in_info->finfo;
   dfinfo = out_info->finfo;
 
-  GST_DEBUG ("site: %d->%d, w_sub: %d->%d, h_sub: %d->%d", in_info->chroma_site,
+  GST_LOG ("site: %d->%d, w_sub: %d->%d, h_sub: %d->%d", in_info->chroma_site,
       out_info->chroma_site, sfinfo->w_sub[2], dfinfo->w_sub[2],
       sfinfo->h_sub[2], dfinfo->h_sub[2]);
 
@@ -2935,7 +2931,7 @@ get_dest_line (GstLineCache * cache, gint idx, gpointer user_data)
   cline = CLAMP (idx, 0, convert->out_maxheight - 1);
 
   line = FRAME_GET_LINE (convert->dest, cline);
-  GST_DEBUG ("get dest line %d %p", cline, line);
+  GST_LOG ("get dest line %d %p", cline, line);
 
   if (convert->borderline) {
     gint r_border = (out_x + convert->out_width) * pstride;
@@ -2962,13 +2958,13 @@ do_unpack_lines (GstLineCache * cache, gint idx, gint out_line, gint in_line,
 
   if (cache->alloc_writable || !convert->identity_unpack) {
     tmpline = gst_line_cache_alloc_line (cache, out_line);
-    GST_DEBUG ("unpack line %d (%u) %p", in_line, cline, tmpline);
+    GST_LOG ("unpack line %d (%u) %p", in_line, cline, tmpline);
     UNPACK_FRAME (convert->src, tmpline, cline, convert->in_x,
         convert->in_width);
   } else {
     tmpline = ((guint8 *) FRAME_GET_LINE (convert->src, cline)) +
         convert->in_x * convert->unpack_pstride;
-    GST_DEBUG ("get src line %d (%u) %p", in_line, cline, tmpline);
+    GST_LOG ("get src line %d (%u) %p", in_line, cline, tmpline);
   }
   gst_line_cache_add_line (cache, in_line, tmpline);
 
@@ -2996,7 +2992,7 @@ do_upsample_lines (GstLineCache * cache, gint idx, gint out_line, gint in_line,
       n_lines);
 
   if (convert->upsample[idx]) {
-    GST_DEBUG ("doing upsample %d-%d %p", start_line, start_line + n_lines - 1,
+    GST_LOG ("doing upsample %d-%d %p", start_line, start_line + n_lines - 1,
         lines[0]);
     gst_video_chroma_resample (convert->upsample[idx], lines,
         convert->in_width);
@@ -3020,13 +3016,13 @@ do_convert_to_RGB_lines (GstLineCache * cache, gint idx, gint out_line,
   destline = lines[0];
 
   if (data->matrix_func) {
-    GST_DEBUG ("to RGB line %d %p", in_line, destline);
+    GST_LOG ("to RGB line %d %p", in_line, destline);
     data->matrix_func (data, destline);
   }
   if (convert->gamma_dec.gamma_func) {
     destline = gst_line_cache_alloc_line (cache, out_line);
 
-    GST_DEBUG ("gamma decode line %d %p->%p", in_line, lines[0], destline);
+    GST_LOG ("gamma decode line %d %p->%p", in_line, lines[0], destline);
     convert->gamma_dec.gamma_func (&convert->gamma_dec, destline, lines[0]);
   }
   gst_line_cache_add_line (cache, in_line, destline);
@@ -3045,7 +3041,7 @@ do_hscale_lines (GstLineCache * cache, gint idx, gint out_line, gint in_line,
 
   destline = gst_line_cache_alloc_line (cache, out_line);
 
-  GST_DEBUG ("hresample line %d %p->%p", in_line, lines[0], destline);
+  GST_LOG ("hresample line %d %p->%p", in_line, lines[0], destline);
   gst_video_scaler_horizontal (convert->h_scaler[idx], convert->h_scale_format,
       lines[0], destline, 0, convert->out_width);
 
@@ -3070,7 +3066,7 @@ do_vscale_lines (GstLineCache * cache, gint idx, gint out_line, gint in_line,
 
   destline = gst_line_cache_alloc_line (cache, out_line);
 
-  GST_DEBUG ("vresample line %d %d-%d %p->%p", in_line, sline,
+  GST_LOG ("vresample line %d %d-%d %p->%p", in_line, sline,
       sline + n_lines - 1, lines[0], destline);
   gst_video_scaler_vertical (convert->v_scaler[idx], convert->v_scale_format,
       lines, destline, cline, convert->v_scale_width);
@@ -3107,24 +3103,24 @@ do_convert_lines (GstLineCache * cache, gint idx, gint out_line, gint in_line,
 
     /* FIXME, we can scale in the conversion matrix */
     if (in_bits == 8) {
-      GST_DEBUG ("8->16 line %d %p->%p", in_line, srcline, destline);
+      GST_LOG ("8->16 line %d %p->%p", in_line, srcline, destline);
       video_orc_convert_u8_to_u16 (destline, srcline, width * 4);
       srcline = destline;
     }
 
     if (data->matrix_func) {
-      GST_DEBUG ("matrix line %d %p", in_line, srcline);
+      GST_LOG ("matrix line %d %p", in_line, srcline);
       data->matrix_func (data, srcline);
     }
 
     /* FIXME, dither here */
     if (out_bits == 8) {
-      GST_DEBUG ("16->8 line %d %p->%p", in_line, srcline, destline);
+      GST_LOG ("16->8 line %d %p->%p", in_line, srcline, destline);
       video_orc_convert_u16_to_u8 (destline, srcline, width * 4);
     }
   } else {
     if (data->matrix_func) {
-      GST_DEBUG ("matrix line %d %p", in_line, destline);
+      GST_LOG ("matrix line %d %p", in_line, destline);
       data->matrix_func (data, destline);
     }
   }
@@ -3144,7 +3140,7 @@ do_alpha_lines (GstLineCache * cache, gint idx, gint out_line, gint in_line,
   lines = gst_line_cache_get_lines (cache->prev, idx, out_line, in_line, 1);
   destline = lines[0];
 
-  GST_DEBUG ("alpha line %d %p", in_line, destline);
+  GST_LOG ("alpha line %d %p", in_line, destline);
   convert->alpha_func (convert, destline, width);
 
   gst_line_cache_add_line (cache, in_line, destline);
@@ -3166,11 +3162,11 @@ do_convert_to_YUV_lines (GstLineCache * cache, gint idx, gint out_line,
   if (convert->gamma_enc.gamma_func) {
     destline = gst_line_cache_alloc_line (cache, out_line);
 
-    GST_DEBUG ("gamma encode line %d %p->%p", in_line, lines[0], destline);
+    GST_LOG ("gamma encode line %d %p->%p", in_line, lines[0], destline);
     convert->gamma_enc.gamma_func (&convert->gamma_enc, destline, lines[0]);
   }
   if (data->matrix_func) {
-    GST_DEBUG ("to YUV line %d %p", in_line, destline);
+    GST_LOG ("to YUV line %d %p", in_line, destline);
     data->matrix_func (data, destline);
   }
   gst_line_cache_add_line (cache, in_line, destline);
@@ -3197,7 +3193,7 @@ do_downsample_lines (GstLineCache * cache, gint idx, gint out_line,
       n_lines);
 
   if (convert->downsample[idx]) {
-    GST_DEBUG ("downsample line %d %d-%d %p", in_line, start_line,
+    GST_LOG ("downsample line %d %d-%d %p", in_line, start_line,
         start_line + n_lines - 1, lines[0]);
     gst_video_chroma_resample (convert->downsample[idx], lines,
         convert->out_width);
@@ -3220,7 +3216,7 @@ do_dither_lines (GstLineCache * cache, gint idx, gint out_line, gint in_line,
   destline = lines[0];
 
   if (convert->dither[idx]) {
-    GST_DEBUG ("Dither line %d %p", in_line, destline);
+    GST_LOG ("Dither line %d %p", in_line, destline);
     gst_video_dither_line (convert->dither[idx], destline, 0, out_line,
         convert->out_width);
   }
@@ -3258,7 +3254,7 @@ convert_generic_task (ConvertTask * task)
       /* take away the border */
       guint8 *l = ((guint8 *) lines[0]) - task->lb_width;
       /* and pack into destination */
-      GST_DEBUG ("pack line %d %p (%p)", i + task->out_y, lines[0], l);
+      GST_LOG ("pack line %d %p (%p)", i + task->out_y, lines[0], l);
       PACK_FRAME (task->dest, l, i + task->out_y, task->out_maxwidth);
     }
   }
@@ -3289,12 +3285,12 @@ video_converter_generic (GstVideoConverter * convert, const GstVideoFrame * src,
   convert->dest = dest;
 
   if (GST_VIDEO_FRAME_IS_INTERLACED (src)) {
-    GST_DEBUG ("setup interlaced frame");
+    GST_LOG ("setup interlaced frame");
     convert->upsample = convert->upsample_i;
     convert->downsample = convert->downsample_i;
     convert->v_scaler = convert->v_scaler_i;
   } else {
-    GST_DEBUG ("setup progressive frame");
+    GST_LOG ("setup progressive frame");
     convert->upsample = convert->upsample_p;
     convert->downsample = convert->downsample_p;
     convert->v_scaler = convert->v_scaler_p;
@@ -7249,6 +7245,8 @@ get_scale_format (GstVideoFormat format, gint plane)
     case GST_VIDEO_FORMAT_Y444:
     case GST_VIDEO_FORMAT_GRAY8:
     case GST_VIDEO_FORMAT_A420:
+    case GST_VIDEO_FORMAT_A422:
+    case GST_VIDEO_FORMAT_A444:
     case GST_VIDEO_FORMAT_YUV9:
     case GST_VIDEO_FORMAT_YVU9:
     case GST_VIDEO_FORMAT_GBR:
@@ -7289,6 +7287,7 @@ get_scale_format (GstVideoFormat format, gint plane)
     case GST_VIDEO_FORMAT_ABGR64_BE:
     case GST_VIDEO_FORMAT_ABGR64_LE:
     case GST_VIDEO_FORMAT_AYUV64:
+    case GST_VIDEO_FORMAT_RBGA:
       res = format;
       break;
     case GST_VIDEO_FORMAT_RGB15:
@@ -7338,6 +7337,8 @@ get_scale_format (GstVideoFormat format, gint plane)
     case GST_VIDEO_FORMAT_GBR_12LE:
     case GST_VIDEO_FORMAT_GBRA_12BE:
     case GST_VIDEO_FORMAT_GBRA_12LE:
+    case GST_VIDEO_FORMAT_GBR_16BE:
+    case GST_VIDEO_FORMAT_GBR_16LE:
     case GST_VIDEO_FORMAT_NV12_64Z32:
     case GST_VIDEO_FORMAT_NV12_4L4:
     case GST_VIDEO_FORMAT_NV12_32L32:
@@ -7348,6 +7349,18 @@ get_scale_format (GstVideoFormat format, gint plane)
     case GST_VIDEO_FORMAT_A422_10LE:
     case GST_VIDEO_FORMAT_A444_10BE:
     case GST_VIDEO_FORMAT_A444_10LE:
+    case GST_VIDEO_FORMAT_A444_12BE:
+    case GST_VIDEO_FORMAT_A444_12LE:
+    case GST_VIDEO_FORMAT_A422_12BE:
+    case GST_VIDEO_FORMAT_A422_12LE:
+    case GST_VIDEO_FORMAT_A420_12BE:
+    case GST_VIDEO_FORMAT_A420_12LE:
+    case GST_VIDEO_FORMAT_A444_16BE:
+    case GST_VIDEO_FORMAT_A444_16LE:
+    case GST_VIDEO_FORMAT_A422_16BE:
+    case GST_VIDEO_FORMAT_A422_16LE:
+    case GST_VIDEO_FORMAT_A420_16BE:
+    case GST_VIDEO_FORMAT_A420_16LE:
     case GST_VIDEO_FORMAT_P010_10BE:
     case GST_VIDEO_FORMAT_P010_10LE:
     case GST_VIDEO_FORMAT_GRAY10_LE32:
@@ -7368,6 +7381,10 @@ get_scale_format (GstVideoFormat format, gint plane)
     case GST_VIDEO_FORMAT_Y412_LE:
     case GST_VIDEO_FORMAT_NV12_8L128:
     case GST_VIDEO_FORMAT_NV12_10BE_8L128:
+    case GST_VIDEO_FORMAT_NV12_10LE40_4L4:
+    case GST_VIDEO_FORMAT_DMA_DRM:
+    case GST_VIDEO_FORMAT_MT2110T:
+    case GST_VIDEO_FORMAT_MT2110R:
       res = format;
       g_assert_not_reached ();
       break;
@@ -7434,7 +7451,7 @@ setup_scale (GstVideoConverter * convert)
     case GST_VIDEO_FORMAT_GRAY16_LE:
 #endif
       if (method != GST_VIDEO_RESAMPLER_METHOD_NEAREST) {
-        GST_DEBUG ("%s only with nearest resampling",
+        GST_LOG ("%s only with nearest resampling",
             gst_video_format_to_string (in_format));
         return FALSE;
       }
@@ -7567,11 +7584,11 @@ setup_scale (GstVideoConverter * convert)
       convert->fout_y[i] = GST_VIDEO_FORMAT_INFO_SCALE_HEIGHT (out_finfo,
           out_comp[0], convert->out_y);
 
-      GST_DEBUG ("plane %d: %dx%d -> %dx%d", i, iw, ih, ow, oh);
-      GST_DEBUG ("plane %d: pstride %d", i, pstride);
-      GST_DEBUG ("plane %d: in_x %d, in_y %d", i, convert->fin_x[i],
+      GST_LOG ("plane %d: %dx%d -> %dx%d", i, iw, ih, ow, oh);
+      GST_LOG ("plane %d: pstride %d", i, pstride);
+      GST_LOG ("plane %d: in_x %d, in_y %d", i, convert->fin_x[i],
           convert->fin_y[i]);
-      GST_DEBUG ("plane %d: out_x %d, out_y %d", i, convert->fout_x[i],
+      GST_LOG ("plane %d: out_x %d, out_y %d", i, convert->fout_x[i],
           convert->fout_y[i]);
 
       if (comp == -1) {
@@ -7589,11 +7606,11 @@ setup_scale (GstVideoConverter * convert)
           else
             convert->ffill[i] = 0x00;
         }
-        GST_DEBUG ("plane %d fill %02x", i, convert->ffill[i]);
+        GST_LOG ("plane %d fill %02x", i, convert->ffill[i]);
         continue;
       } else {
         convert->fsplane[i] = GST_VIDEO_FORMAT_INFO_PLANE (in_finfo, comp);
-        GST_DEBUG ("plane %d -> %d (comp %d)", i, convert->fsplane[i], comp);
+        GST_LOG ("plane %d -> %d (comp %d)", i, convert->fsplane[i], comp);
       }
 
       config = gst_structure_copy (convert->config);
@@ -7605,46 +7622,46 @@ setup_scale (GstVideoConverter * convert)
       if (iw == ow) {
         if (!interlaced && ih == oh) {
           convert->fconvert[i] = convert_plane_hv;
-          GST_DEBUG ("plane %d: copy", i);
+          GST_LOG ("plane %d: copy", i);
         } else if (!interlaced && ih == 2 * oh && pstride == 1
             && resample_method == GST_VIDEO_RESAMPLER_METHOD_LINEAR) {
           convert->fconvert[i] = convert_plane_v_halve;
-          GST_DEBUG ("plane %d: vertical halve", i);
+          GST_LOG ("plane %d: vertical halve", i);
         } else if (!interlaced && 2 * ih == oh && pstride == 1
             && resample_method == GST_VIDEO_RESAMPLER_METHOD_NEAREST) {
           convert->fconvert[i] = convert_plane_v_double;
-          GST_DEBUG ("plane %d: vertical double", i);
+          GST_LOG ("plane %d: vertical double", i);
         } else {
           convert->fconvert[i] = convert_plane_hv;
-          GST_DEBUG ("plane %d: vertical scale", i);
+          GST_LOG ("plane %d: vertical scale", i);
           need_v_scaler = TRUE;
         }
       } else if (ih == oh) {
         if (!interlaced && iw == 2 * ow && pstride == 1
             && resample_method == GST_VIDEO_RESAMPLER_METHOD_LINEAR) {
           convert->fconvert[i] = convert_plane_h_halve;
-          GST_DEBUG ("plane %d: horizontal halve", i);
+          GST_LOG ("plane %d: horizontal halve", i);
         } else if (!interlaced && 2 * iw == ow && pstride == 1
             && resample_method == GST_VIDEO_RESAMPLER_METHOD_NEAREST) {
           convert->fconvert[i] = convert_plane_h_double;
-          GST_DEBUG ("plane %d: horizontal double", i);
+          GST_LOG ("plane %d: horizontal double", i);
         } else {
           convert->fconvert[i] = convert_plane_hv;
-          GST_DEBUG ("plane %d: horizontal scale", i);
+          GST_LOG ("plane %d: horizontal scale", i);
           need_h_scaler = TRUE;
         }
       } else {
         if (!interlaced && iw == 2 * ow && ih == 2 * oh && pstride == 1
             && resample_method == GST_VIDEO_RESAMPLER_METHOD_LINEAR) {
           convert->fconvert[i] = convert_plane_hv_halve;
-          GST_DEBUG ("plane %d: horizontal/vertical halve", i);
+          GST_LOG ("plane %d: horizontal/vertical halve", i);
         } else if (!interlaced && 2 * iw == ow && 2 * ih == oh && pstride == 1
             && resample_method == GST_VIDEO_RESAMPLER_METHOD_NEAREST) {
           convert->fconvert[i] = convert_plane_hv_double;
-          GST_DEBUG ("plane %d: horizontal/vertical double", i);
+          GST_LOG ("plane %d: horizontal/vertical double", i);
         } else {
           convert->fconvert[i] = convert_plane_hv;
-          GST_DEBUG ("plane %d: horizontal/vertical scale", i);
+          GST_LOG ("plane %d: horizontal/vertical scale", i);
           need_v_scaler = TRUE;
           need_h_scaler = TRUE;
         }
@@ -8202,7 +8219,7 @@ video_converter_lookup_fastpath (GstVideoConverter * convert)
   need_copy = (convert->alpha_mode & ALPHA_MODE_COPY) == ALPHA_MODE_COPY;
   need_set = (convert->alpha_mode & ALPHA_MODE_SET) == ALPHA_MODE_SET;
   need_mult = (convert->alpha_mode & ALPHA_MODE_MULT) == ALPHA_MODE_MULT;
-  GST_DEBUG ("alpha copy %d, set %d, mult %d", need_copy, need_set, need_mult);
+  GST_LOG ("alpha copy %d, set %d, mult %d", need_copy, need_set, need_mult);
 
   in_format = GST_VIDEO_INFO_FORMAT (&convert->in_info);
   out_format = GST_VIDEO_INFO_FORMAT (&convert->out_info);
@@ -8253,7 +8270,7 @@ video_converter_lookup_fastpath (GstVideoConverter * convert)
         && (transforms[i].alpha_mult || !need_mult)) {
       guint j;
 
-      GST_DEBUG ("using fastpath");
+      GST_LOG ("using fastpath");
       if (transforms[i].needs_color_matrix)
         video_converter_compute_matrix (convert);
       convert->convert = transforms[i].convert;
@@ -8271,7 +8288,7 @@ video_converter_lookup_fastpath (GstVideoConverter * convert)
       return TRUE;
     }
   }
-  GST_DEBUG ("no fastpath found");
+  GST_LOG ("no fastpath found");
   return FALSE;
 }
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-dither.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-dither.c
index c55b4b29fe8..76c4b28f5ff 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-dither.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-dither.c
@@ -384,7 +384,7 @@ gst_video_dither_new (GstVideoDitherMethod method, GstVideoDitherFlags flags,
   GstVideoDither *dither;
   gint i;
 
-  dither = g_slice_new0 (GstVideoDither);
+  dither = g_new0 (GstVideoDither, 1);
   dither->method = method;
   dither->flags = flags;
   dither->format = format;
@@ -402,7 +402,7 @@ gst_video_dither_new (GstVideoDitherMethod method, GstVideoDitherFlags flags,
       dither->depth = 16;
       break;
     default:
-      g_slice_free (GstVideoDither, dither);
+      g_free (dither);
       g_return_val_if_reached (NULL);
       break;
   }
@@ -474,7 +474,7 @@ gst_video_dither_free (GstVideoDither * dither)
   g_return_if_fail (dither != NULL);
 
   g_free (dither->errors);
-  g_slice_free (GstVideoDither, dither);
+  g_free (dither);
 }
 
 /**
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-format.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-format.c
index 57442e1b50c..57c83c0cdff 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-format.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-format.c
@@ -3256,6 +3256,110 @@ pack_GBR_12BE (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
   }
 }
 
+#define PACK_GBR_16LE GST_VIDEO_FORMAT_ARGB64, unpack_GBR_16LE, 1, pack_GBR_16LE
+static void
+unpack_GBR_16LE (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
+    gpointer dest, const gpointer data[GST_VIDEO_MAX_PLANES],
+    const gint stride[GST_VIDEO_MAX_PLANES], gint x, gint y, gint width)
+{
+  int i;
+  const guint16 *sg = GET_G_LINE (y);
+  const guint16 *sb = GET_B_LINE (y);
+  const guint16 *sr = GET_R_LINE (y);
+  guint16 *d = dest, G, B, R;
+
+  sg += x;
+  sb += x;
+  sr += x;
+
+  for (i = 0; i < width; i++) {
+    G = GST_READ_UINT16_LE (sg + i);
+    B = GST_READ_UINT16_LE (sb + i);
+    R = GST_READ_UINT16_LE (sr + i);
+
+    d[i * 4 + 0] = 0xffff;
+    d[i * 4 + 1] = R;
+    d[i * 4 + 2] = G;
+    d[i * 4 + 3] = B;
+  }
+}
+
+static void
+pack_GBR_16LE (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
+    const gpointer src, gint sstride, gpointer data[GST_VIDEO_MAX_PLANES],
+    const gint stride[GST_VIDEO_MAX_PLANES], GstVideoChromaSite chroma_site,
+    gint y, gint width)
+{
+  int i;
+  guint16 *restrict dg = GET_G_LINE (y);
+  guint16 *restrict db = GET_B_LINE (y);
+  guint16 *restrict dr = GET_R_LINE (y);
+  guint16 G, B, R;
+  const guint16 *restrict s = src;
+
+  for (i = 0; i < width; i++) {
+    G = (s[i * 4 + 2]);
+    B = (s[i * 4 + 3]);
+    R = (s[i * 4 + 1]);
+
+    GST_WRITE_UINT16_LE (dg + i, G);
+    GST_WRITE_UINT16_LE (db + i, B);
+    GST_WRITE_UINT16_LE (dr + i, R);
+  }
+}
+
+#define PACK_GBR_16BE GST_VIDEO_FORMAT_ARGB64, unpack_GBR_16BE, 1, pack_GBR_16BE
+static void
+unpack_GBR_16BE (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
+    gpointer dest, const gpointer data[GST_VIDEO_MAX_PLANES],
+    const gint stride[GST_VIDEO_MAX_PLANES], gint x, gint y, gint width)
+{
+  int i;
+  const guint16 *restrict sg = GET_G_LINE (y);
+  const guint16 *restrict sb = GET_B_LINE (y);
+  const guint16 *restrict sr = GET_R_LINE (y);
+  guint16 *restrict d = dest, G, B, R;
+
+  sg += x;
+  sb += x;
+  sr += x;
+
+  for (i = 0; i < width; i++) {
+    G = GST_READ_UINT16_BE (sg + i);
+    B = GST_READ_UINT16_BE (sb + i);
+    R = GST_READ_UINT16_BE (sr + i);
+
+    d[i * 4 + 0] = 0xffff;
+    d[i * 4 + 1] = R;
+    d[i * 4 + 2] = G;
+    d[i * 4 + 3] = B;
+  }
+}
+
+static void
+pack_GBR_16BE (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
+    const gpointer src, gint sstride, gpointer data[GST_VIDEO_MAX_PLANES],
+    const gint stride[GST_VIDEO_MAX_PLANES], GstVideoChromaSite chroma_site,
+    gint y, gint width)
+{
+  int i;
+  guint16 *restrict dg = GET_G_LINE (y);
+  guint16 *restrict db = GET_B_LINE (y);
+  guint16 *restrict dr = GET_R_LINE (y);
+  guint16 G, B, R;
+  const guint16 *restrict s = src;
+
+  for (i = 0; i < width; i++) {
+    G = s[i * 4 + 2];
+    B = s[i * 4 + 3];
+    R = s[i * 4 + 1];
+
+    GST_WRITE_UINT16_BE (dg + i, G);
+    GST_WRITE_UINT16_BE (db + i, B);
+    GST_WRITE_UINT16_BE (dr + i, R);
+  }
+}
+
 #define PACK_GBRA_12LE GST_VIDEO_FORMAT_ARGB64, unpack_GBRA_12LE, 1, pack_GBRA_12LE
 static void
 unpack_GBRA_12LE (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
@@ -4254,18 +4358,18 @@ pack_I422_12BE (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
   }
 }
 
-#define PACK_A444_10LE GST_VIDEO_FORMAT_AYUV64, unpack_A444_10LE, 1, pack_A444_10LE
+#define PACK_A444 GST_VIDEO_FORMAT_AYUV, unpack_A444, 1, pack_A444
 static void
-unpack_A444_10LE (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
+unpack_A444 (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
     gpointer dest, const gpointer data[GST_VIDEO_MAX_PLANES],
     const gint stride[GST_VIDEO_MAX_PLANES], gint x, gint y, gint width)
 {
   int i;
-  guint16 *restrict sa = GET_A_LINE (y);
-  guint16 *restrict sy = GET_Y_LINE (y);
-  guint16 *restrict su = GET_U_LINE (y);
-  guint16 *restrict sv = GET_V_LINE (y);
-  guint16 *restrict d = dest, A, Y, U, V;
+  guint8 *restrict sa = GET_A_LINE (y);
+  guint8 *restrict sy = GET_Y_LINE (y);
+  guint8 *restrict su = GET_U_LINE (y);
+  guint8 *restrict sv = GET_V_LINE (y);
+  guint8 *restrict d = dest, A, Y, U, V;
 
   sa += x;
   sy += x;
@@ -4273,17 +4377,10 @@ unpack_A444_10LE (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
   sv += x;
 
   for (i = 0; i < width; i++) {
-    A = GST_READ_UINT16_LE (sa + i) << 6;
-    Y = GST_READ_UINT16_LE (sy + i) << 6;
-    U = GST_READ_UINT16_LE (su + i) << 6;
-    V = GST_READ_UINT16_LE (sv + i) << 6;
-
-    if (!(flags & GST_VIDEO_PACK_FLAG_TRUNCATE_RANGE)) {
-      A |= (A >> 10);
-      Y |= (Y >> 10);
-      U |= (U >> 10);
-      V |= (V >> 10);
-    }
+    A = sa[i];
+    Y = sy[i];
+    U = su[i];
+    V = sv[i];
 
     d[i * 4 + 0] = A;
     d[i * 4 + 1] = Y;
@@ -4293,43 +4390,42 @@ unpack_A444_10LE (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
 }
 
 static void
-pack_A444_10LE (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
+pack_A444 (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
     const gpointer src, gint sstride, gpointer data[GST_VIDEO_MAX_PLANES],
     const gint stride[GST_VIDEO_MAX_PLANES], GstVideoChromaSite chroma_site,
     gint y, gint width)
 {
   int i;
-  guint16 *restrict da = GET_A_LINE (y);
-  guint16 *restrict dy = GET_Y_LINE (y);
-  guint16 *restrict du = GET_U_LINE (y);
-  guint16 *restrict dv = GET_V_LINE (y);
-  guint16 A, Y, U, V;
-  const guint16 *restrict s = src;
+  guint8 *restrict da = GET_A_LINE (y);
+  guint8 *restrict dy = GET_Y_LINE (y);
+  guint8 *restrict du = GET_U_LINE (y);
+  guint8 *restrict dv = GET_V_LINE (y);
+  guint8 A, Y, U, V;
+  const guint8 *restrict s = src;
 
   for (i = 0; i < width; i++) {
-    A = (s[i * 4 + 0]) >> 6;
-    Y = (s[i * 4 + 1]) >> 6;
-    U = (s[i * 4 + 2]) >> 6;
-    V = (s[i * 4 + 3]) >> 6;
+    A = (s[i * 4 + 0]);
+    Y = (s[i * 4 + 1]);
+    U = (s[i * 4 + 2]);
+    V = (s[i * 4 + 3]);
 
-    GST_WRITE_UINT16_LE (da + i, A);
-    GST_WRITE_UINT16_LE (dy + i, Y);
-    GST_WRITE_UINT16_LE (du + i, U);
-    GST_WRITE_UINT16_LE (dv + i, V);
+    da[i] = A;
+    dy[i] = Y;
+    du[i] = U;
+    dv[i] = V;
   }
 }
 
-#define PACK_A444_10BE GST_VIDEO_FORMAT_AYUV64, unpack_A444_10BE, 1, pack_A444_10BE
 static void
-unpack_A444_10BE (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
+unpack_A444_16 (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
     gpointer dest, const gpointer data[GST_VIDEO_MAX_PLANES],
     const gint stride[GST_VIDEO_MAX_PLANES], gint x, gint y, gint width)
 {
   int i;
-  const guint16 *restrict sa = GET_A_LINE (y);
-  const guint16 *restrict sy = GET_Y_LINE (y);
-  const guint16 *restrict su = GET_U_LINE (y);
-  const guint16 *restrict sv = GET_V_LINE (y);
+  guint16 *restrict sa = GET_A_LINE (y);
+  guint16 *restrict sy = GET_Y_LINE (y);
+  guint16 *restrict su = GET_U_LINE (y);
+  guint16 *restrict sv = GET_V_LINE (y);
   guint16 *restrict d = dest, A, Y, U, V;
 
   sa += x;
@@ -4338,16 +4434,23 @@ unpack_A444_10BE (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
   sv += x;
 
   for (i = 0; i < width; i++) {
-    A = GST_READ_UINT16_BE (sa + i) << 6;
-    Y = GST_READ_UINT16_BE (sy + i) << 6;
-    U = GST_READ_UINT16_BE (su + i) << 6;
-    V = GST_READ_UINT16_BE (sv + i) << 6;
+    if (info->flags & GST_VIDEO_FORMAT_FLAG_LE) {
+      A = GST_READ_UINT16_LE (sa + i) << (16 - info->bits);
+      Y = GST_READ_UINT16_LE (sy + i) << (16 - info->bits);
+      U = GST_READ_UINT16_LE (su + i) << (16 - info->bits);
+      V = GST_READ_UINT16_LE (sv + i) << (16 - info->bits);
+    } else {
+      A = GST_READ_UINT16_BE (sa + i) << (16 - info->bits);
+      Y = GST_READ_UINT16_BE (sy + i) << (16 - info->bits);
+      U = GST_READ_UINT16_BE (su + i) << (16 - info->bits);
+      V = GST_READ_UINT16_BE (sv + i) << (16 - info->bits);
+    }
 
     if (!(flags & GST_VIDEO_PACK_FLAG_TRUNCATE_RANGE)) {
-      A |= (A >> 10);
-      Y |= (Y >> 10);
-      U |= (U >> 10);
-      V |= (V >> 10);
+      A |= (A >> info->bits);
+      Y |= (Y >> info->bits);
+      U |= (U >> info->bits);
+      V |= (V >> info->bits);
     }
 
     d[i * 4 + 0] = A;
@@ -4358,7 +4461,7 @@ unpack_A444_10BE (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
 }
 
 static void
-pack_A444_10BE (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
+pack_A444_16 (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
     const gpointer src, gint sstride, gpointer data[GST_VIDEO_MAX_PLANES],
     const gint stride[GST_VIDEO_MAX_PLANES], GstVideoChromaSite chroma_site,
     gint y, gint width)
@@ -4372,118 +4475,34 @@ pack_A444_10BE (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
   const guint16 *restrict s = src;
 
   for (i = 0; i < width; i++) {
-    A = s[i * 4 + 0] >> 6;
-    Y = s[i * 4 + 1] >> 6;
-    U = s[i * 4 + 2] >> 6;
-    V = s[i * 4 + 3] >> 6;
-
-    GST_WRITE_UINT16_BE (da + i, A);
-    GST_WRITE_UINT16_BE (dy + i, Y);
-    GST_WRITE_UINT16_BE (du + i, U);
-    GST_WRITE_UINT16_BE (dv + i, V);
-  }
-}
-
-#define PACK_A420_10LE GST_VIDEO_FORMAT_AYUV64, unpack_A420_10LE, 1, pack_A420_10LE
-static void
-unpack_A420_10LE (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
-    gpointer dest, const gpointer data[GST_VIDEO_MAX_PLANES],
-    const gint stride[GST_VIDEO_MAX_PLANES], gint x, gint y, gint width)
-{
-  int i;
-  gint uv = GET_UV_420 (y, flags);
-  const guint16 *restrict sa = GET_A_LINE (y);
-  const guint16 *restrict sy = GET_Y_LINE (y);
-  const guint16 *restrict su = GET_U_LINE (uv);
-  const guint16 *restrict sv = GET_V_LINE (uv);
-  guint16 *restrict d = dest, A, Y, U, V;
-
-  sa += x;
-  sy += x;
-  su += x >> 1;
-  sv += x >> 1;
-
-  for (i = 0; i < width; i++) {
-    A = GST_READ_UINT16_LE (sa + i) << 6;
-    Y = GST_READ_UINT16_LE (sy + i) << 6;
-    U = GST_READ_UINT16_LE (su + (i >> 1)) << 6;
-    V = GST_READ_UINT16_LE (sv + (i >> 1)) << 6;
-
-    if (!(flags & GST_VIDEO_PACK_FLAG_TRUNCATE_RANGE)) {
-      A |= (A >> 10);
-      Y |= (Y >> 10);
-      U |= (U >> 10);
-      V |= (V >> 10);
-    }
-
-    d[i * 4 + 0] = A;
-    d[i * 4 + 1] = Y;
-    d[i * 4 + 2] = U;
-    d[i * 4 + 3] = V;
-
-    if (x & 1) {
-      x = 0;
-      su++;
-      sv++;
+    A = (s[i * 4 + 0]) >> (16 - info->bits);
+    Y = (s[i * 4 + 1]) >> (16 - info->bits);
+    U = (s[i * 4 + 2]) >> (16 - info->bits);
+    V = (s[i * 4 + 3]) >> (16 - info->bits);
+
+    if (info->flags & GST_VIDEO_FORMAT_FLAG_LE) {
+      GST_WRITE_UINT16_LE (da + i, A);
+      GST_WRITE_UINT16_LE (dy + i, Y);
+      GST_WRITE_UINT16_LE (du + i, U);
+      GST_WRITE_UINT16_LE (dv + i, V);
+    } else {
+      GST_WRITE_UINT16_BE (da + i, A);
+      GST_WRITE_UINT16_BE (dy + i, Y);
+      GST_WRITE_UINT16_BE (du + i, U);
+      GST_WRITE_UINT16_BE (dv + i, V);
     }
   }
 }
 
-static void
-pack_A420_10LE (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
-    const gpointer src, gint sstride, gpointer data[GST_VIDEO_MAX_PLANES],
-    const gint stride[GST_VIDEO_MAX_PLANES], GstVideoChromaSite chroma_site,
-    gint y, gint width)
-{
-  int i;
-  gint uv = GET_UV_420 (y, flags);
-  guint16 *restrict da = GET_A_LINE (y);
-  guint16 *restrict dy = GET_Y_LINE (y);
-  guint16 *restrict du = GET_U_LINE (uv);
-  guint16 *restrict dv = GET_V_LINE (uv);
-  guint16 A0, Y0, A1, Y1, U, V;
-  const guint16 *restrict s = src;
-
-  if (IS_CHROMA_LINE_420 (y, flags)) {
-    for (i = 0; i < width - 1; i += 2) {
-      A0 = s[i * 4 + 0] >> 6;
-      Y0 = s[i * 4 + 1] >> 6;
-      A1 = s[i * 4 + 4] >> 6;
-      Y1 = s[i * 4 + 5] >> 6;
-      U = s[i * 4 + 2] >> 6;
-      V = s[i * 4 + 3] >> 6;
-
-      GST_WRITE_UINT16_LE (da + i + 0, A0);
-      GST_WRITE_UINT16_LE (dy + i + 0, Y0);
-      GST_WRITE_UINT16_LE (da + i + 1, A1);
-      GST_WRITE_UINT16_LE (dy + i + 1, Y1);
-      GST_WRITE_UINT16_LE (du + (i >> 1), U);
-      GST_WRITE_UINT16_LE (dv + (i >> 1), V);
-    }
-    if (i == width - 1) {
-      A0 = s[i * 4 + 0] >> 6;
-      Y0 = s[i * 4 + 1] >> 6;
-      U = s[i * 4 + 2] >> 6;
-      V = s[i * 4 + 3] >> 6;
+#define PACK_A444_10BE GST_VIDEO_FORMAT_AYUV64, unpack_A444_16, 1, pack_A444_16
+#define PACK_A444_10LE GST_VIDEO_FORMAT_AYUV64, unpack_A444_16, 1, pack_A444_16
+#define PACK_A444_12BE GST_VIDEO_FORMAT_AYUV64, unpack_A444_16, 1, pack_A444_16
+#define PACK_A444_12LE GST_VIDEO_FORMAT_AYUV64, unpack_A444_16, 1, pack_A444_16
+#define PACK_A444_16BE GST_VIDEO_FORMAT_AYUV64, unpack_A444_16, 1, pack_A444_16
+#define PACK_A444_16LE GST_VIDEO_FORMAT_AYUV64, unpack_A444_16, 1, pack_A444_16
 
-      GST_WRITE_UINT16_LE (da + i, A0);
-      GST_WRITE_UINT16_LE (dy + i, Y0);
-      GST_WRITE_UINT16_LE (du + (i >> 1), U);
-      GST_WRITE_UINT16_LE (dv + (i >> 1), V);
-    }
-  } else {
-    for (i = 0; i < width; i++) {
-      A0 = s[i * 4 + 0] >> 6;
-      Y0 = s[i * 4 + 1] >> 6;
-      GST_WRITE_UINT16_LE (da + i, A0);
-      GST_WRITE_UINT16_LE (dy + i, Y0);
-    }
-  }
-}
-
-#define PACK_A420_10BE GST_VIDEO_FORMAT_AYUV64, unpack_A420_10BE, 1, pack_A420_10BE
 static void
-unpack_A420_10BE (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
+unpack_A420_16 (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
     gpointer dest, const gpointer data[GST_VIDEO_MAX_PLANES],
     const gint stride[GST_VIDEO_MAX_PLANES], gint x, gint y, gint width)
 {
@@ -4501,23 +4520,28 @@ unpack_A420_10BE (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
   sv += x >> 1;
 
   for (i = 0; i < width; i++) {
-    A = GST_READ_UINT16_BE (sa + i) << 6;
-    Y = GST_READ_UINT16_BE (sy + i) << 6;
-    U = GST_READ_UINT16_BE (su + (i >> 1)) << 6;
-    V = GST_READ_UINT16_BE (sv + (i >> 1)) << 6;
-
+    if (info->flags & GST_VIDEO_FORMAT_FLAG_LE) {
+      A = GST_READ_UINT16_LE (sa + i) << (16 - info->bits);
+      Y = GST_READ_UINT16_LE (sy + i) << (16 - info->bits);
+      U = GST_READ_UINT16_LE (su + (i >> 1)) << (16 - info->bits);
+      V = GST_READ_UINT16_LE (sv + (i >> 1)) << (16 - info->bits);
+    } else {
+      A = GST_READ_UINT16_BE (sa + i) << (16 - info->bits);
+      Y = GST_READ_UINT16_BE (sy + i) << (16 - info->bits);
+      U = GST_READ_UINT16_BE (su + (i >> 1)) << (16 - info->bits);
+      V = GST_READ_UINT16_BE (sv + (i >> 1)) << (16 - info->bits);
+    }
     if (!(flags & GST_VIDEO_PACK_FLAG_TRUNCATE_RANGE)) {
-      A |= (A >> 10);
-      Y |= (Y >> 10);
-      U |= (U >> 10);
-      V |= (V >> 10);
+      A |= (A >> info->bits);
+      Y |= (Y >> info->bits);
+      U |= (U >> info->bits);
+      V |= (V >> info->bits);
     }
 
     d[i * 4 + 0] = A;
     d[i * 4 + 1] = Y;
     d[i * 4 + 2] = U;
     d[i * 4 + 3] = V;
-
     if (x & 1) {
       x = 0;
       su++;
@@ -4527,7 +4551,7 @@ unpack_A420_10BE (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
 }
 
 static void
-pack_A420_10BE (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
+pack_A420_16 (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
     const gpointer src, gint sstride, gpointer data[GST_VIDEO_MAX_PLANES],
     const gint stride[GST_VIDEO_MAX_PLANES], GstVideoChromaSite chroma_site,
     gint y, gint width)
@@ -4542,54 +4566,81 @@ pack_A420_10BE (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
   const guint16 *restrict s = src;
 
   if (IS_CHROMA_LINE_420 (y, flags)) {
-    for (i = 0; i < width - 1; i += 2) {
-      A0 = s[i * 4 + 0] >> 6;
-      Y0 = s[i * 4 + 1] >> 6;
-      A1 = s[i * 4 + 4] >> 6;
-      Y1 = s[i * 4 + 5] >> 6;
-      U = s[i * 4 + 2] >> 6;
-      V = s[i * 4 + 3] >> 6;
-
-      GST_WRITE_UINT16_BE (da + i + 0, A0);
-      GST_WRITE_UINT16_BE (dy + i + 0, Y0);
-      GST_WRITE_UINT16_BE (da + i + 1, A1);
-      GST_WRITE_UINT16_BE (dy + i + 1, Y1);
-      GST_WRITE_UINT16_BE (du + (i >> 1), U);
-      GST_WRITE_UINT16_BE (dv + (i >> 1), V);
+    for (i = 0; i < width - 1; i += 2) {
+      A0 = s[i * 4 + 0] >> (16 - info->bits);
+      Y0 = s[i * 4 + 1] >> (16 - info->bits);
+      A1 = s[i * 4 + 4] >> (16 - info->bits);
+      Y1 = s[i * 4 + 5] >> (16 - info->bits);
+      U = s[i * 4 + 2] >> (16 - info->bits);
+      V = s[i * 4 + 3] >> (16 - info->bits);
+
+      if (info->flags & GST_VIDEO_FORMAT_FLAG_LE) {
+        GST_WRITE_UINT16_LE (da + i + 0, A0);
+        GST_WRITE_UINT16_LE (dy + i + 0, Y0);
+        GST_WRITE_UINT16_LE (da + i + 1, A1);
+        GST_WRITE_UINT16_LE (dy + i + 1, Y1);
+        GST_WRITE_UINT16_LE (du + (i >> 1), U);
+        GST_WRITE_UINT16_LE (dv + (i >> 1), V);
+      } else {
+        GST_WRITE_UINT16_BE (da + i + 0, A0);
+        GST_WRITE_UINT16_BE (dy + i + 0, Y0);
+        GST_WRITE_UINT16_BE (da + i + 1, A1);
+        GST_WRITE_UINT16_BE (dy + i + 1, Y1);
+        GST_WRITE_UINT16_BE (du + (i >> 1), U);
+        GST_WRITE_UINT16_BE (dv + (i >> 1), V);
+      }
     }
     if (i == width - 1) {
-      A0 = s[i * 4 + 0] >> 6;
-      Y0 = s[i * 4 + 1] >> 6;
-      U = s[i * 4 + 2] >> 6;
-      V = s[i * 4 + 3] >> 6;
-
-      GST_WRITE_UINT16_BE (da + i, A0);
-      GST_WRITE_UINT16_BE (dy + i, Y0);
-      GST_WRITE_UINT16_BE (du + (i >> 1), U);
-      GST_WRITE_UINT16_BE (dv + (i >> 1), V);
+      A0 = s[i * 4 + 0] >> (16 - info->bits);
+      Y0 = s[i * 4 + 1] >> (16 - info->bits);
+      U = s[i * 4 + 2] >> (16 - info->bits);
+      V = s[i * 4 + 3] >> (16 - info->bits);
+      if (info->flags & GST_VIDEO_FORMAT_FLAG_LE) {
+        GST_WRITE_UINT16_LE (da + i, A0);
+        GST_WRITE_UINT16_LE (dy + i, Y0);
+        GST_WRITE_UINT16_LE (du + (i >> 1), U);
+        GST_WRITE_UINT16_LE (dv + (i >> 1), V);
+      } else {
+        GST_WRITE_UINT16_BE (da + i, A0);
+        GST_WRITE_UINT16_BE (dy + i, Y0);
+        GST_WRITE_UINT16_BE (du + (i >> 1), U);
+        GST_WRITE_UINT16_BE (dv + (i >> 1), V);
+      }
     }
   } else {
     for (i = 0; i < width; i++) {
-      A0 = s[i * 4 + 0] >> 6;
-      Y0 = s[i * 4 + 1] >> 6;
-      GST_WRITE_UINT16_BE (da + i, A0);
-      GST_WRITE_UINT16_BE (dy + i, Y0);
+      A0 = s[i * 4 + 0] >> (16 - info->bits);
+      Y0 = s[i * 4 + 1] >> (16 - info->bits);
+      if (info->flags & GST_VIDEO_FORMAT_FLAG_LE) {
+        GST_WRITE_UINT16_LE (da + i, A0);
+        GST_WRITE_UINT16_LE (dy + i, Y0);
+      } else {
+        GST_WRITE_UINT16_BE (da + i, A0);
+        GST_WRITE_UINT16_BE (dy + i, Y0);
+      }
     }
   }
 }
 
-#define PACK_A422_10LE GST_VIDEO_FORMAT_AYUV64, unpack_A422_10LE, 1, pack_A422_10LE
+#define PACK_A420_10LE GST_VIDEO_FORMAT_AYUV64, unpack_A420_16, 1, pack_A420_16
+#define PACK_A420_10BE GST_VIDEO_FORMAT_AYUV64, unpack_A420_16, 1, pack_A420_16
+#define PACK_A420_12LE GST_VIDEO_FORMAT_AYUV64, unpack_A420_16, 1, pack_A420_16
+#define PACK_A420_12BE GST_VIDEO_FORMAT_AYUV64, unpack_A420_16, 1, pack_A420_16
+#define PACK_A420_16LE GST_VIDEO_FORMAT_AYUV64, unpack_A420_16, 1, pack_A420_16
+#define PACK_A420_16BE GST_VIDEO_FORMAT_AYUV64, unpack_A420_16, 1, pack_A420_16
+
+#define PACK_A422 GST_VIDEO_FORMAT_AYUV, unpack_A422, 1, pack_A422
 static void
-unpack_A422_10LE (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
+unpack_A422 (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
     gpointer dest, const gpointer data[GST_VIDEO_MAX_PLANES],
     const gint stride[GST_VIDEO_MAX_PLANES], gint x, gint y, gint width)
 {
   int i;
-  const guint16 *restrict sa = GET_A_LINE (y);
-  const guint16 *restrict sy = GET_Y_LINE (y);
-  const guint16 *restrict su = GET_U_LINE (y);
-  const guint16 *restrict sv = GET_V_LINE (y);
-  guint16 *restrict d = dest, A, Y, U, V;
+  const guint8 *restrict sa = GET_A_LINE (y);
+  const guint8 *restrict sy = GET_Y_LINE (y);
+  const guint8 *restrict su = GET_U_LINE (y);
+  const guint8 *restrict sv = GET_V_LINE (y);
+  guint8 *restrict d = dest, A, Y, U, V;
 
   sa += x;
   sy += x;
@@ -4597,17 +4648,10 @@ unpack_A422_10LE (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
   sv += x >> 1;
 
   for (i = 0; i < width; i++) {
-    A = GST_READ_UINT16_LE (sa + i) << 6;
-    Y = GST_READ_UINT16_LE (sy + i) << 6;
-    U = GST_READ_UINT16_LE (su + (i >> 1)) << 6;
-    V = GST_READ_UINT16_LE (sv + (i >> 1)) << 6;
-
-    if (!(flags & GST_VIDEO_PACK_FLAG_TRUNCATE_RANGE)) {
-      A |= (A >> 10);
-      Y |= (Y >> 10);
-      U |= (U >> 10);
-      V |= (V >> 10);
-    }
+    A = sa[i];
+    Y = sy[i];
+    U = su[(i >> 1)];
+    V = sv[(i >> 1)];
 
     d[i * 4 + 0] = A;
     d[i * 4 + 1] = Y;
@@ -4623,50 +4667,49 @@ unpack_A422_10LE (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
 }
 
 static void
-pack_A422_10LE (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
+pack_A422 (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
     const gpointer src, gint sstride, gpointer data[GST_VIDEO_MAX_PLANES],
     const gint stride[GST_VIDEO_MAX_PLANES], GstVideoChromaSite chroma_site,
     gint y, gint width)
 {
   int i;
-  guint16 *restrict da = GET_A_LINE (y);
-  guint16 *restrict dy = GET_Y_LINE (y);
-  guint16 *restrict du = GET_U_LINE (y);
-  guint16 *restrict dv = GET_V_LINE (y);
-  guint16 A0, Y0, A1, Y1, U, V;
-  const guint16 *restrict s = src;
+  guint8 *restrict da = GET_A_LINE (y);
+  guint8 *restrict dy = GET_Y_LINE (y);
+  guint8 *restrict du = GET_U_LINE (y);
+  guint8 *restrict dv = GET_V_LINE (y);
+  guint8 A0, Y0, A1, Y1, U, V;
+  const guint8 *restrict s = src;
 
   for (i = 0; i < width - 1; i += 2) {
-    A0 = s[i * 4 + 0] >> 6;
-    Y0 = s[i * 4 + 1] >> 6;
-    A1 = s[i * 4 + 4] >> 6;
-    Y1 = s[i * 4 + 5] >> 6;
-    U = s[i * 4 + 2] >> 6;
-    V = s[i * 4 + 3] >> 6;
+    A0 = s[i * 4 + 0];
+    Y0 = s[i * 4 + 1];
+    A1 = s[i * 4 + 4];
+    Y1 = s[i * 4 + 5];
+    U = s[i * 4 + 2];
+    V = s[i * 4 + 3];
 
-    GST_WRITE_UINT16_LE (da + i + 0, A0);
-    GST_WRITE_UINT16_LE (dy + i + 0, Y0);
-    GST_WRITE_UINT16_LE (da + i + 1, A1);
-    GST_WRITE_UINT16_LE (dy + i + 1, Y1);
-    GST_WRITE_UINT16_LE (du + (i >> 1), U);
-    GST_WRITE_UINT16_LE (dv + (i >> 1), V);
+    da[i + 0] = A0;
+    dy[i + 0] = Y0;
+    da[i + 1] = A1;
+    dy[i + 1] = Y1;
+    du[i >> 1] = U;
+    dv[i >> 1] = V;
   }
   if (i == width - 1) {
-    A0 = s[i * 4 + 0] >> 6;
-    Y0 = s[i * 4 + 1] >> 6;
-    U = s[i * 4 + 2] >> 6;
-    V = s[i * 4 + 3] >> 6;
+    A0 = s[i * 4 + 0];
+    Y0 = s[i * 4 + 1];
+    U = s[i * 4 + 2];
+    V = s[i * 4 + 3];
 
-    GST_WRITE_UINT16_LE (da + i, A0);
-    GST_WRITE_UINT16_LE (dy + i, Y0);
-    GST_WRITE_UINT16_LE (du + (i >> 1), U);
-    GST_WRITE_UINT16_LE (dv + (i >> 1), V);
+    da[i + 0] = A0;
+    dy[i + 0] = Y0;
+    du[i >> 1] = U;
+    dv[i >> 1] = V;
   }
 }
 
-#define PACK_A422_10BE GST_VIDEO_FORMAT_AYUV64, unpack_A422_10BE, 1, pack_A422_10BE
 static void
-unpack_A422_10BE (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
+unpack_A422_16 (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
     gpointer dest, const gpointer data[GST_VIDEO_MAX_PLANES],
     const gint stride[GST_VIDEO_MAX_PLANES], gint x, gint y, gint width)
 {
@@ -4683,16 +4726,23 @@ unpack_A422_10BE (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
   sv += x >> 1;
 
   for (i = 0; i < width; i++) {
-    A = GST_READ_UINT16_BE (sa + i) << 6;
-    Y = GST_READ_UINT16_BE (sy + i) << 6;
-    U = GST_READ_UINT16_BE (su + (i >> 1)) << 6;
-    V = GST_READ_UINT16_BE (sv + (i >> 1)) << 6;
+    if (info->flags & GST_VIDEO_FORMAT_FLAG_LE) {
+      A = GST_READ_UINT16_LE (sa + i) << (16 - info->bits);
+      Y = GST_READ_UINT16_LE (sy + i) << (16 - info->bits);
+      U = GST_READ_UINT16_LE (su + (i >> 1)) << (16 - info->bits);
+      V = GST_READ_UINT16_LE (sv + (i >> 1)) << (16 - info->bits);
+    } else {
+      A = GST_READ_UINT16_BE (sa + i) << (16 - info->bits);
+      Y = GST_READ_UINT16_BE (sy + i) << (16 - info->bits);
+      U = GST_READ_UINT16_BE (su + (i >> 1)) << (16 - info->bits);
+      V = GST_READ_UINT16_BE (sv + (i >> 1)) << (16 - info->bits);
+    }
 
     if (!(flags & GST_VIDEO_PACK_FLAG_TRUNCATE_RANGE)) {
-      A |= (A >> 10);
-      Y |= (Y >> 10);
-      U |= (U >> 10);
-      V |= (V >> 10);
+      A |= (A >> info->bits);
+      Y |= (Y >> info->bits);
+      U |= (U >> info->bits);
+      V |= (V >> info->bits);
     }
 
     d[i * 4 + 0] = A;
@@ -4709,7 +4759,7 @@ unpack_A422_10BE (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
 }
 
 static void
-pack_A422_10BE (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
+pack_A422_16 (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
     const gpointer src, gint sstride, gpointer data[GST_VIDEO_MAX_PLANES],
     const gint stride[GST_VIDEO_MAX_PLANES], GstVideoChromaSite chroma_site,
     gint y, gint width)
@@ -4723,33 +4773,58 @@ pack_A422_10BE (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
   const guint16 *restrict s = src;
 
   for (i = 0; i < width - 1; i += 2) {
-    A0 = s[i * 4 + 0] >> 6;
-    Y0 = s[i * 4 + 1] >> 6;
-    A1 = s[i * 4 + 4] >> 6;
-    Y1 = s[i * 4 + 5] >> 6;
-    U = s[i * 4 + 2] >> 6;
-    V = s[i * 4 + 3] >> 6;
-
-    GST_WRITE_UINT16_BE (da + i + 0, A0);
-    GST_WRITE_UINT16_BE (dy + i + 0, Y0);
-    GST_WRITE_UINT16_BE (da + i + 1, A1);
-    GST_WRITE_UINT16_BE (dy + i + 1, Y1);
-    GST_WRITE_UINT16_BE (du + (i >> 1), U);
-    GST_WRITE_UINT16_BE (dv + (i >> 1), V);
+    A0 = s[i * 4 + 0] >> (16 - info->bits);
+    Y0 = s[i * 4 + 1] >> (16 - info->bits);
+    A1 = s[i * 4 + 4] >> (16 - info->bits);
+    Y1 = s[i * 4 + 5] >> (16 - info->bits);
+    U = s[i * 4 + 2] >> (16 - info->bits);
+    V = s[i * 4 + 3] >> (16 - info->bits);
+
+    if (info->flags & GST_VIDEO_FORMAT_FLAG_LE) {
+      GST_WRITE_UINT16_LE (da + i + 0, A0);
+      GST_WRITE_UINT16_LE (dy + i + 0, Y0);
+      GST_WRITE_UINT16_LE (da + i + 1, A1);
+      GST_WRITE_UINT16_LE (dy + i + 1, Y1);
+      GST_WRITE_UINT16_LE (du + (i >> 1), U);
+      GST_WRITE_UINT16_LE (dv + (i >> 1), V);
+    } else {
+      GST_WRITE_UINT16_BE (da + i + 0, A0);
+      GST_WRITE_UINT16_BE (dy + i + 0, Y0);
+      GST_WRITE_UINT16_BE (da + i + 1, A1);
+      GST_WRITE_UINT16_BE (dy + i + 1, Y1);
+      GST_WRITE_UINT16_BE (du + (i >> 1), U);
+      GST_WRITE_UINT16_BE (dv + (i >> 1), V);
+    }
   }
+
   if (i == width - 1) {
-    A0 = s[i * 4 + 0] >> 6;
-    Y0 = s[i * 4 + 1] >> 6;
-    U = s[i * 4 + 2] >> 6;
-    V = s[i * 4 + 3] >> 6;
+    A0 = s[i * 4 + 0] >> (16 - info->bits);
+    Y0 = s[i * 4 + 1] >> (16 - info->bits);
+    U = s[i * 4 + 2] >> (16 - info->bits);
+    V = s[i * 4 + 3] >> (16 - info->bits);
 
-    GST_WRITE_UINT16_BE (da + i, A0);
-    GST_WRITE_UINT16_BE (dy + i, Y0);
-    GST_WRITE_UINT16_BE (du + (i >> 1), U);
-    GST_WRITE_UINT16_BE (dv + (i >> 1), V);
+    if (info->flags & GST_VIDEO_FORMAT_FLAG_LE) {
+      GST_WRITE_UINT16_LE (da + i, A0);
+      GST_WRITE_UINT16_LE (dy + i, Y0);
+      GST_WRITE_UINT16_LE (du + (i >> 1), U);
+      GST_WRITE_UINT16_LE (dv + (i >> 1), V);
+    } else {
+      GST_WRITE_UINT16_BE (da + i, A0);
+      GST_WRITE_UINT16_BE (dy + i, Y0);
+      GST_WRITE_UINT16_BE (du + (i >> 1), U);
+      GST_WRITE_UINT16_BE (dv + (i >> 1), V);
+    }
   }
 }
 
+#define PACK_A422_10LE GST_VIDEO_FORMAT_AYUV64, unpack_A422_16, 1, pack_A422_16
+#define PACK_A422_10BE GST_VIDEO_FORMAT_AYUV64, unpack_A422_16, 1, pack_A422_16
+#define PACK_A422_12LE GST_VIDEO_FORMAT_AYUV64, unpack_A422_16, 1, pack_A422_16
+#define PACK_A422_12BE GST_VIDEO_FORMAT_AYUV64, unpack_A422_16, 1, pack_A422_16
+#define PACK_A422_16LE GST_VIDEO_FORMAT_AYUV64, unpack_A422_16, 1, pack_A422_16
+#define PACK_A422_16BE GST_VIDEO_FORMAT_AYUV64, unpack_A422_16, 1, pack_A422_16
+
+/* Helpers for the most common tile format */
 static void
 get_tile_NV12 (const GstVideoFormatInfo * info, gint tx, gint ty,
     const gpointer data[GST_VIDEO_MAX_PLANES],
@@ -4780,9 +4855,9 @@ get_tile_NV12 (const GstVideoFormatInfo * info, gint tx, gint ty,
   tile_stride[1] = GST_VIDEO_FORMAT_INFO_TILE_STRIDE (info, 1);
 }
 
-#define PACK_NV12_TILED GST_VIDEO_FORMAT_AYUV, unpack_NV12_TILED, 1, pack_NV12_TILED
-static void
-unpack_NV12_TILED (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
+static inline void
+unpack_TILED (GstVideoFormat inner_format,
+    const GstVideoFormatInfo * info, GstVideoPackFlags flags,
     gpointer dest, const gpointer data[GST_VIDEO_MAX_PLANES],
     const gint stride[GST_VIDEO_MAX_PLANES], gint x, gint y, gint width)
 {
@@ -4796,7 +4871,7 @@ unpack_NV12_TILED (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
   tile_height = GST_VIDEO_FORMAT_INFO_TILE_HEIGHT (info, 0);
 
   /* we reuse these unpack functions */
-  tile_finfo = gst_video_format_get_info (GST_VIDEO_FORMAT_NV12);
+  tile_finfo = gst_video_format_get_info (inner_format);
 
   /* get pstride of unpacked format */
   unpack_info = gst_video_format_get_info (info->unpack_format);
@@ -4821,7 +4896,7 @@ unpack_NV12_TILED (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
 
     get_tile_NV12 (info, tx, ty, data, stride, tdata, tstride);
 
-    /* the number of bytes left to unpack */
+    /* the number of pixels left to unpack */
     unpack_width = MIN (width - x, tile_width - x);
 
     tile_finfo->unpack_func (tile_finfo, flags, line, tdata, tstride, x, y,
@@ -4833,8 +4908,9 @@ unpack_NV12_TILED (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
   }
 }
 
-static void
-pack_NV12_TILED (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
+static inline void
+pack_TILED (GstVideoFormat inner_format,
+    const GstVideoFormatInfo * info, GstVideoPackFlags flags,
     const gpointer src, gint sstride, gpointer data[GST_VIDEO_MAX_PLANES],
     const gint stride[GST_VIDEO_MAX_PLANES], GstVideoChromaSite chroma_site,
     gint y, gint width)
@@ -4849,7 +4925,7 @@ pack_NV12_TILED (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
   tile_height = GST_VIDEO_FORMAT_INFO_TILE_HEIGHT (info, 0);
 
   /* we reuse these pack functions */
-  tile_finfo = gst_video_format_get_info (GST_VIDEO_FORMAT_NV12);
+  tile_finfo = gst_video_format_get_info (inner_format);
 
   /* get pstride of packed format */
   pack_info = gst_video_format_get_info (info->unpack_format);
@@ -4881,6 +4957,27 @@ pack_NV12_TILED (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
   }
 }
 
+#define PACK_NV12_TILED GST_VIDEO_FORMAT_AYUV, unpack_NV12_TILED, 1, pack_NV12_TILED
+static void
+unpack_NV12_TILED (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
+    gpointer dest, const gpointer data[GST_VIDEO_MAX_PLANES],
+    const gint stride[GST_VIDEO_MAX_PLANES], gint x, gint y, gint width)
+{
+  unpack_TILED (GST_VIDEO_FORMAT_NV12, info, flags, dest, data, stride,
+      x, y, width);
+}
+
+static void
+pack_NV12_TILED (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
+    const gpointer src, gint sstride, gpointer data[GST_VIDEO_MAX_PLANES],
+    const gint stride[GST_VIDEO_MAX_PLANES], GstVideoChromaSite chroma_site,
+    gint y, gint width)
+{
+  pack_TILED (GST_VIDEO_FORMAT_NV12, info, flags, src, sstride, data, stride,
+      chroma_site, y, width);
+}
+
+
 #define PACK_P010_10BE GST_VIDEO_FORMAT_AYUV64, unpack_P010_10BE, 1, pack_P010_10BE
 static void
 unpack_P010_10BE (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
@@ -6890,6 +6987,358 @@ pack_NV12_10BE_8L128 (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
   }
 }
 
+#define PACK_NV12_10LE40_TILED  GST_VIDEO_FORMAT_AYUV64, unpack_NV12_10LE40_TILED, 1, pack_NV12_10LE40_TILED
+static void
+unpack_NV12_10LE40_TILED (const GstVideoFormatInfo * info,
+    GstVideoPackFlags flags, gpointer dest,
+    const gpointer data[GST_VIDEO_MAX_PLANES],
+    const gint stride[GST_VIDEO_MAX_PLANES], gint x, gint y, gint width)
+{
+  unpack_TILED (GST_VIDEO_FORMAT_NV12_10LE40, info, flags, dest, data, stride,
+      x, y, width);
+}
+
+static void
+pack_NV12_10LE40_TILED (const GstVideoFormatInfo * info,
+    GstVideoPackFlags flags, const gpointer src, gint sstride,
+    gpointer data[GST_VIDEO_MAX_PLANES],
+    const gint stride[GST_VIDEO_MAX_PLANES], GstVideoChromaSite chroma_site,
+    gint y, gint width)
+{
+  pack_TILED (GST_VIDEO_FORMAT_NV12_10LE40, info, flags, src, sstride, data,
+      stride, chroma_site, y, width);
+}
+
+#define PACK_MT2110T_TILED  GST_VIDEO_FORMAT_AYUV64, unpack_MT2110T, 1, pack_MT2110T
+
+static void
+unpack_MT2110T (const GstVideoFormatInfo * info,
+    GstVideoPackFlags flags, gpointer dest,
+    const gpointer data[GST_VIDEO_MAX_PLANES],
+    const gint stride[GST_VIDEO_MAX_PLANES], gint x, gint y, gint width)
+{
+  const gsize TILE_SIZE = 640;
+  guint16 *restrict d = dest;
+
+  /* TODO not supported yet */
+  g_assert (x == 0);
+
+  /* Position in the partition grid */
+  guint ty = y / 32;
+  guint tx;
+
+  /* Vertical position within the tile */
+  gint tile_y = y % 32;
+
+  /* Tiles are split into partitions of 16 bytes of lower 2bit and 64 bytes
+   * of higher 8 bits. It contains 64 pixels, so 4 lines per parititons. The
+   * chroma tiles have half the number of parititons. */
+  gint partition_luma = tile_y / 4;
+  gint partition_chroma = partition_luma / 2;
+  gint partition_line_luma = tile_y % 4;
+  gint partition_line_chroma = (tile_y / 2) % 4;
+  gint partition_skip_luma = partition_luma * 80;
+  gint partition_skip_chroma = partition_chroma * 80;
+
+  for (tx = 0; tx < (width / 16); tx++) {
+    const guint8 *y_tile = data[0];
+    const guint8 *uv_tile = data[1];
+    gsize offset;
+    gint tile_x;
+    gint num_pixels = MIN (16, width - (tx * 16));
+
+    offset = gst_video_tile_get_index (info->tile_mode, tx, ty,
+        GST_VIDEO_TILE_X_TILES (stride[0]),
+        GST_VIDEO_TILE_Y_TILES (stride[0])) * TILE_SIZE;
+    y_tile = y_tile + offset + partition_skip_luma;
+
+    offset = gst_video_tile_get_index (info->tile_mode, tx, ty,
+        GST_VIDEO_TILE_X_TILES (stride[1]),
+        GST_VIDEO_TILE_Y_TILES (stride[1])) * (TILE_SIZE / 2);
+    uv_tile = uv_tile + offset + partition_skip_chroma;
+
+    for (tile_x = 0; tile_x < num_pixels; tile_x++) {
+      guint high_i = partition_line_luma * 16 + tile_x;
+      guint low_i = tile_x;
+      guint low_shift = partition_line_luma * 2;
+      guint low_mask = 0x03 << low_shift;
+      guint low_y = (y_tile[low_i] & low_mask) >> low_shift;
+      guint16 Y = (y_tile[16 + high_i] << 2) | low_y;
+
+      high_i = partition_line_chroma * 16 + GST_ROUND_DOWN_2 (tile_x);
+      low_i = GST_ROUND_DOWN_2 (tile_x);
+      low_shift = partition_line_chroma * 2;
+      low_mask = 0x03 << low_shift;
+      guint low_u = (uv_tile[low_i] & low_mask) >> low_shift;
+      guint low_v = (uv_tile[low_i + 1] & low_mask) >> low_shift;
+      guint16 U = (uv_tile[16 + high_i] << 2) | low_u;
+      guint16 V = (uv_tile[16 + high_i + 1] << 2) | low_v;
+
+      d[0] = 0xffff;
+      d[1] = Y << 6;
+      d[2] = U << 6;
+      d[3] = V << 6;
+      d += 4;
+    }
+  }
+}
+
+static void
+pack_MT2110T (const GstVideoFormatInfo * info,
+    GstVideoPackFlags flags, const gpointer src, gint sstride,
+    gpointer data[GST_VIDEO_MAX_PLANES],
+    const gint stride[GST_VIDEO_MAX_PLANES], GstVideoChromaSite chroma_site,
+    gint y, gint width)
+{
+  const gsize TILE_SIZE = 640;
+  const guint16 *restrict s = src;
+
+  /* Position in the partition grid */
+  guint ty = y / 32;
+  guint tx;
+
+  /* Vertical position within the tile */
+  gint tile_y = y % 32;
+
+  /* Tiles are split into paritions of 16 bytes of lower 2bit and 64 bytes
+   * of higher 8 bits. It contains 64 pixels, so 4 lines per parititons. The
+   * chroma tiles have half the number of parititons. */
+  gint partition_luma = tile_y / 4;
+  gint partition_chroma = partition_luma / 2;
+  gint partition_line_luma = tile_y % 4;
+  gint partition_line_chroma = (tile_y / 2) % 4;
+  gint partition_skip_luma = partition_luma * 80;
+  gint partition_skip_chroma = partition_chroma * 80;
+
+  for (tx = 0; tx < (width / 16); tx++) {
+    guint8 *y_tile = data[0];
+    guint8 *uv_tile = data[1];
+    gsize offset;
+    gint tile_x;
+    gint num_pixels = MIN (16, width - (tx * 16));
+
+    offset = gst_video_tile_get_index (info->tile_mode, tx, ty,
+        GST_VIDEO_TILE_X_TILES (stride[0]),
+        GST_VIDEO_TILE_Y_TILES (stride[0])) * TILE_SIZE;
+    y_tile = y_tile + offset + partition_skip_luma;
+
+    offset = gst_video_tile_get_index (info->tile_mode, tx, ty,
+        GST_VIDEO_TILE_X_TILES (stride[1]),
+        GST_VIDEO_TILE_Y_TILES (stride[1])) * (TILE_SIZE / 2);
+    uv_tile = uv_tile + offset + partition_skip_chroma;
+
+    for (tile_x = 0; tile_x < num_pixels; tile_x++) {
+      const guint16 Y = s[1] >> 6;
+      const guint16 U = s[2] >> 6;
+      const guint16 V = s[3] >> 6;
+
+      guint high_i = partition_line_luma * 16 + tile_x;
+      guint low_i = tile_x;
+      guint low_shift = partition_line_luma * 2;
+      guint low_mask = 0x03 << low_shift;
+
+      y_tile[low_i] = (y_tile[low_i] & ~low_mask) | ((Y & 0x03) << low_shift);
+      y_tile[16 + high_i] = Y >> 2;
+
+      if (IS_CHROMA_LINE_420 (y, flags) && (tile_x & 1) == 0) {
+        high_i = partition_line_chroma * 16 + GST_ROUND_DOWN_2 (tile_x);
+        low_i = GST_ROUND_DOWN_2 (tile_x);
+        low_shift = partition_line_chroma * 2;
+        low_mask = 0x03 << low_shift;
+
+        uv_tile[low_i] =
+            (uv_tile[low_i] & ~low_mask) | ((U & 0x03) << low_shift);
+        uv_tile[low_i + 1] =
+            (uv_tile[low_i + 1] & ~low_mask) | ((V & 0x03) << low_shift);
+        uv_tile[16 + high_i] = U >> 2;
+        uv_tile[16 + high_i + 1] = V >> 2;
+      }
+
+      s += 4;
+    }
+  }
+}
+
+#define PACK_MT2110R_TILED  GST_VIDEO_FORMAT_AYUV64, unpack_MT2110R, 1, pack_MT2110R
+
+static void
+unpack_MT2110R (const GstVideoFormatInfo * info,
+    GstVideoPackFlags flags, gpointer dest,
+    const gpointer data[GST_VIDEO_MAX_PLANES],
+    const gint stride[GST_VIDEO_MAX_PLANES], gint x, gint y, gint width)
+{
+  const gsize TILE_SIZE = 640;
+  guint16 *restrict d = dest;
+
+  /* TODO not supported yet */
+  g_assert (x == 0);
+
+  /* Position in the partition grid */
+  guint ty = y / 32;
+  guint tx;
+
+  /* Vertical position within the tile */
+  gint tile_y = y % 32;
+
+  /* Tiles are split into partitions of 16 bytes of lower 2bit and 64 bytes
+   * of higher 8 bits. It contains 64 pixels, so 4 lines per parititons. The
+   * chroma tiles have half the number of parititons. */
+  gint partition_luma = tile_y / 4;
+  gint partition_chroma = partition_luma / 2;
+  gint partition_line_luma = tile_y % 4;
+  gint partition_line_chroma = (tile_y / 2) % 4;
+  gint partition_skip_luma = partition_luma * 80;
+  gint partition_skip_chroma = partition_chroma * 80;
+
+  for (tx = 0; tx < (width / 16); tx++) {
+    const guint8 *y_tile = data[0];
+    const guint8 *uv_tile = data[1];
+    gsize offset;
+    gint tile_x;
+    gint num_pixels = MIN (16, width - (tx * 16));
+
+    offset = gst_video_tile_get_index (info->tile_mode, tx, ty,
+        GST_VIDEO_TILE_X_TILES (stride[0]),
+        GST_VIDEO_TILE_Y_TILES (stride[0])) * TILE_SIZE;
+    y_tile = y_tile + offset + partition_skip_luma;
+
+    offset = gst_video_tile_get_index (info->tile_mode, tx, ty,
+        GST_VIDEO_TILE_X_TILES (stride[1]),
+        GST_VIDEO_TILE_Y_TILES (stride[1])) * (TILE_SIZE / 2);
+    uv_tile = uv_tile + offset + partition_skip_chroma;
+
+    for (tile_x = 0; tile_x < num_pixels; tile_x++) {
+      guint high_i = partition_line_luma * 16 + tile_x;
+      guint low_i = partition_line_luma * 4 + tile_x / 4;
+      guint low_shift = tile_x % 4 * 2;
+      guint low_mask = 0x03 << low_shift;
+      guint low_y = (y_tile[low_i] & low_mask) >> low_shift;
+      guint16 Y = (y_tile[16 + high_i] << 2) | low_y;
+
+      high_i = partition_line_chroma * 16 + GST_ROUND_DOWN_2 (tile_x);
+      low_i = partition_line_chroma * 4 + tile_x / 4;
+      low_shift = GST_ROUND_DOWN_2 (tile_x % 4) * 2;
+      low_mask = 0x03 << low_shift;
+      guint low_u = (uv_tile[low_i] & low_mask) >> low_shift;
+      guint low_v = (uv_tile[low_i] & (low_mask << 2)) >> (low_shift + 2);
+      guint16 U = (uv_tile[16 + high_i] << 2) | low_u;
+      guint16 V = (uv_tile[16 + high_i + 1] << 2) | low_v;
+
+      d[0] = 0xffff;
+      d[1] = Y << 6;
+      d[2] = U << 6;
+      d[3] = V << 6;
+      d += 4;
+    }
+  }
+}
+
+static void
+pack_MT2110R (const GstVideoFormatInfo * info,
+    GstVideoPackFlags flags, const gpointer src, gint sstride,
+    gpointer data[GST_VIDEO_MAX_PLANES],
+    const gint stride[GST_VIDEO_MAX_PLANES], GstVideoChromaSite chroma_site,
+    gint y, gint width)
+{
+  const gsize TILE_SIZE = 640;
+  const guint16 *restrict s = src;
+
+  /* Position in the partition grid */
+  guint ty = y / 32;
+  guint tx;
+
+  /* Vertical position within the tile */
+  gint tile_y = y % 32;
+
+  /* Tiles are split into paritions of 16 bytes of lower 2bit and 64 bytes
+   * of higher 8 bits. It contains 64 pixels, so 4 lines per parititons. The
+   * chroma tiles have half the number of parititons. */
+  gint partition_luma = tile_y / 4;
+  gint partition_chroma = partition_luma / 2;
+  gint partition_line_luma = tile_y % 4;
+  gint partition_line_chroma = (tile_y / 2) % 4;
+  gint partition_skip_luma = partition_luma * 80;
+  gint partition_skip_chroma = partition_chroma * 80;
+
+  for (tx = 0; tx < (width / 16); tx++) {
+    guint8 *y_tile = data[0];
+    guint8 *uv_tile = data[1];
+    gsize offset;
+    gint tile_x;
+    gint num_pixels = MIN (16, width - (tx * 16));
+
+    offset = gst_video_tile_get_index (info->tile_mode, tx, ty,
+        GST_VIDEO_TILE_X_TILES (stride[0]),
+        GST_VIDEO_TILE_Y_TILES (stride[0])) * TILE_SIZE;
+    y_tile = y_tile + offset + partition_skip_luma;
+
+    offset = gst_video_tile_get_index (info->tile_mode, tx, ty,
+        GST_VIDEO_TILE_X_TILES (stride[1]),
+        GST_VIDEO_TILE_Y_TILES (stride[1])) * (TILE_SIZE / 2);
+    uv_tile = uv_tile + offset + partition_skip_chroma;
+
+    for (tile_x = 0; tile_x < num_pixels; tile_x++) {
+      const guint16 Y = s[1] >> 6;
+      const guint16 U = s[2] >> 6;
+      const guint16 V = s[3] >> 6;
+
+      guint high_i = partition_line_luma * 16 + tile_x;
+      guint low_i = partition_line_luma * 4 + tile_x / 4;
+      guint low_shift = tile_x % 4 * 2;
+      guint low_mask = 0x03 << low_shift;
+
+      y_tile[low_i] = (y_tile[low_i] & ~low_mask) | ((Y & 0x03) << low_shift);
+      y_tile[16 + high_i] = Y >> 2;
+
+      if (IS_CHROMA_LINE_420 (y, flags) && (tile_x & 1) == 0) {
+        high_i = partition_line_chroma * 16 + GST_ROUND_DOWN_2 (tile_x);
+        low_i = partition_line_chroma * 4 + tile_x / 4;
+        low_shift = GST_ROUND_DOWN_2 (tile_x % 4) * 2;
+        low_mask = 0x0f << low_shift;
+
+        uv_tile[low_i] = (uv_tile[low_i] & ~(low_mask)) |
+            ((U & 0x03) << low_shift) | ((V & 0x03) << (low_shift + 2));
+        uv_tile[16 + high_i] = U >> 2;
+        uv_tile[16 + high_i + 1] = V >> 2;
+      }
+
+      s += 4;
+    }
+  }
+}
+
+#define PACK_RBGA GST_VIDEO_FORMAT_ARGB, unpack_RBGA, 1, pack_RBGA
+static void
+unpack_RBGA (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
+    gpointer dest, const gpointer data[GST_VIDEO_MAX_PLANES],
+    const gint stride[GST_VIDEO_MAX_PLANES], gint x, gint y, gint width)
+{
+  const guint8 *restrict s = GET_LINE (y);
+
+  s += x * 4;
+
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+  video_orc_unpack_RBGA_le (dest, s, width);
+#else
+  video_orc_unpack_RBGA_be (dest, s, width);
+#endif
+}
+
+static void
+pack_RBGA (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
+    const gpointer src, gint sstride, gpointer data[GST_VIDEO_MAX_PLANES],
+    const gint stride[GST_VIDEO_MAX_PLANES], GstVideoChromaSite chroma_site,
+    gint y, gint width)
+{
+  guint8 *restrict d = GET_LINE (y);
+
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+  video_orc_pack_RBGA_le (d, src, width);
+#else
+  video_orc_pack_RBGA_be (d, src, width);
+#endif
+}
+
 typedef struct
 {
   guint32 fourcc;
@@ -6959,6 +7408,7 @@ typedef struct
 #define OFFS123           { 1, 2, 3, 0 }
 #define OFFS321           { 3, 2, 1, 0 }
 #define OFFS0123          { 0, 1, 2, 3 }
+#define OFFS0213          { 0, 2, 1, 3 }
 #define OFFS2103          { 2, 1, 0, 3 }
 #define OFFS3210          { 3, 2, 1, 0 }
 #define OFFS031           { 0, 3, 1, 0 }
@@ -6984,12 +7434,14 @@ typedef struct
 #define SUB4224           { 0, 1, 1, 0 }, { 0, 0, 0, 0 }
 
 /* tile_mode, tile_ws (width shift), tile_hs (height shift), tile_info[] */
-#define TILE_4x4(mode) GST_VIDEO_TILE_MODE_ ##mode, 2, 2, { {4, 4, 4, 16}, {4, 4, 4, 16}, }
-#define TILE_16x32s(mode) GST_VIDEO_TILE_MODE_ ##mode, 4, 5, { {16, 32, 16, 512}, {16, 16, 16, 256}, }
-#define TILE_32x32(mode) GST_VIDEO_TILE_MODE_ ##mode, 5, 5, { {32, 32, 32, 1024}, {32, 32, 32, 1024}, }
-#define TILE_64x32(mode) GST_VIDEO_TILE_MODE_ ##mode, 6, 5, { {64, 32, 64, 2048}, {64, 32, 64, 2048}, }
-#define TILE_8x128(mode) GST_VIDEO_TILE_MODE_ ##mode, 3, 7, { {8, 128, 8, 1024}, {8, 128, 8, 1024}, }
+#define TILE_4x4(mode) GST_VIDEO_TILE_MODE_ ##mode, 2, 2, { {4, 4, 4, 16}, {2, 4, 4, 16}, }
+#define TILE_16x32s(mode) GST_VIDEO_TILE_MODE_ ##mode, 4, 5, { {16, 32, 16, 512}, {8, 16, 16, 256}, }
+#define TILE_32x32(mode) GST_VIDEO_TILE_MODE_ ##mode, 5, 5, { {32, 32, 32, 1024}, {16, 32, 32, 1024}, }
+#define TILE_64x32(mode) GST_VIDEO_TILE_MODE_ ##mode, 6, 5, { {64, 32, 64, 2048}, {32, 32, 64, 2048}, }
+#define TILE_8x128(mode) GST_VIDEO_TILE_MODE_ ##mode, 3, 7, { {8, 128, 8, 1024}, {4, 128, 8, 1024}, }
+#define TILE_10bit_16x32s(mode) GST_VIDEO_TILE_MODE_ ##mode, 4, 5, { {16, 32, 20, 640}, {8, 16, 20, 320}, }
 #define TILE_10bit_8x128(mode) GST_VIDEO_TILE_MODE_ ##mode, 3, 7, { {0, 128, 8, 1024}, {0, 128, 8, 1024}, }
+#define TILE_10bit_4x4(mode) GST_VIDEO_TILE_MODE_ ##mode, 2, 2, { {4, 4, 5, 20}, {2, 4, 5, 20}, }
 
 #define MAKE_YUV_FORMAT(name, desc, fourcc, depth, pstride, plane, offs, sub, pack ) \
  { fourcc, {GST_VIDEO_FORMAT_ ##name, G_STRINGIFY(name), desc, GST_VIDEO_FORMAT_FLAG_YUV, depth, pstride, plane, offs, sub, pack } }
@@ -7297,6 +7749,51 @@ static const VideoFormat formats[] = {
   MAKE_YUV_T_FORMAT (NV12_10BE_8L128, "raw video",
       GST_MAKE_FOURCC ('N', 'T', '1', '2'), DPTH10_10_10, PSTR0, PLANE011,
       OFFS001, SUB420, PACK_NV12_10BE_8L128, TILE_10bit_8x128 (LINEAR)),
+  MAKE_YUV_T_FORMAT (NV12_10LE40_4L4, "raw video",
+      GST_MAKE_FOURCC ('M', 'H', '2', '1'), DPTH10_10_10, PSTR0, PLANE011,
+      OFFS001, SUB420, PACK_NV12_10LE40_TILED, TILE_10bit_4x4 (LINEAR)),
+  {0x00000000, {GST_VIDEO_FORMAT_DMA_DRM, "DMA_DRM", "DMA DRM video",
+          GST_VIDEO_FORMAT_FLAG_COMPLEX, DPTH0, PSTR0, PLANE_NA, OFFS0}},
+  MAKE_YUV_ST_FORMAT (MT2110T, "raw video",
+      GST_MAKE_FOURCC ('M', 'T', '2', 'T'), DPTH10_10_10, PSTR0, PLANE011,
+      OFFS001, SUB420, PACK_MT2110T_TILED, TILE_10bit_16x32s (LINEAR)),
+  MAKE_YUV_ST_FORMAT (MT2110R, "raw video",
+      GST_MAKE_FOURCC ('M', 'T', '2', 'R'), DPTH10_10_10, PSTR0, PLANE011,
+      OFFS001, SUB420, PACK_MT2110R_TILED, TILE_10bit_16x32s (LINEAR)),
+  MAKE_YUVA_FORMAT (A422, "raw video", GST_MAKE_FOURCC ('A', '4', '2', '2'),
+      DPTH8888, PSTR1111, PLANE0123, OFFS0, SUB4224, PACK_A422),
+  MAKE_YUVA_FORMAT (A444, "raw video", GST_MAKE_FOURCC ('A', '4', '4', '4'),
+      DPTH8888, PSTR1111, PLANE0123, OFFS0, SUB4444, PACK_A444),
+  MAKE_YUVA_LE_FORMAT (A444_12LE, "raw video", 0x00000000, DPTH12_12_12_12,
+      PSTR2222, PLANE0123, OFFS0, SUB4444, PACK_A444_12LE),
+  MAKE_YUVA_FORMAT (A444_12BE, "raw video", 0x00000000, DPTH12_12_12_12,
+      PSTR2222, PLANE0123, OFFS0, SUB4444, PACK_A444_12BE),
+  MAKE_YUVA_LE_FORMAT (A422_12LE, "raw video", 0x00000000, DPTH12_12_12_12,
+      PSTR2222, PLANE0123, OFFS0, SUB4224, PACK_A422_12LE),
+  MAKE_YUVA_FORMAT (A422_12BE, "raw video", 0x00000000, DPTH12_12_12_12,
+      PSTR2222, PLANE0123, OFFS0, SUB4224, PACK_A422_12BE),
+  MAKE_YUVA_LE_FORMAT (A420_12LE, "raw video", 0x00000000, DPTH12_12_12_12,
+      PSTR2222, PLANE0123, OFFS0, SUB4204, PACK_A420_12LE),
+  MAKE_YUVA_FORMAT (A420_12BE, "raw video", 0x00000000, DPTH12_12_12_12,
+      PSTR2222, PLANE0123, OFFS0, SUB4204, PACK_A420_12BE),
+  MAKE_YUVA_LE_FORMAT (A444_16LE, "raw video", 0x00000000, DPTH16_16_16_16,
+      PSTR2222, PLANE0123, OFFS0, SUB4444, PACK_A444_16LE),
+  MAKE_YUVA_FORMAT (A444_16BE, "raw video", 0x00000000, DPTH16_16_16_16,
+      PSTR2222, PLANE0123, OFFS0, SUB4444, PACK_A444_16BE),
+  MAKE_YUVA_LE_FORMAT (A422_16LE, "raw video", 0x00000000, DPTH16_16_16_16,
+      PSTR2222, PLANE0123, OFFS0, SUB4224, PACK_A422_16LE),
+  MAKE_YUVA_FORMAT (A422_16BE, "raw video", 0x00000000, DPTH16_16_16_16,
+      PSTR2222, PLANE0123, OFFS0, SUB4224, PACK_A422_16BE),
+  MAKE_YUVA_LE_FORMAT (A420_16LE, "raw video", 0x00000000, DPTH16_16_16_16,
+      PSTR2222, PLANE0123, OFFS0, SUB4204, PACK_A420_16LE),
+  MAKE_YUVA_FORMAT (A420_16BE, "raw video", 0x00000000, DPTH16_16_16_16,
+      PSTR2222, PLANE0123, OFFS0, SUB4204, PACK_A420_16BE),
+  MAKE_RGB_LE_FORMAT (GBR_16LE, "raw video", DPTH16_16_16, PSTR222, PLANE201,
+      OFFS0, SUB444, PACK_GBR_16LE),
+  MAKE_RGB_FORMAT (GBR_16BE, "raw video", DPTH16_16_16, PSTR222, PLANE201,
+      OFFS0, SUB444, PACK_GBR_16BE),
+  MAKE_RGBA_FORMAT (RBGA, "raw video", DPTH8888, PSTR4444, PLANE0, OFFS0213,
+      SUB4444, PACK_RBGA),
 };
 
 G_GNUC_END_IGNORE_DEPRECATIONS;
@@ -7583,6 +8080,7 @@ gst_video_format_from_string (const gchar * format)
     if (strcmp (GST_VIDEO_FORMAT_INFO_NAME (&formats[i].info), format) == 0)
       return GST_VIDEO_FORMAT_INFO_FORMAT (&formats[i].info);
   }
+
   return GST_VIDEO_FORMAT_UNKNOWN;
 }
 
@@ -7746,8 +8244,8 @@ struct RawVideoFormats
   guint n;
 };
 
-static gpointer
-generate_raw_video_formats (gpointer data)
+static struct RawVideoFormats *
+generate_video_formats (const gchar * formats)
 {
   GValue list = G_VALUE_INIT;
   struct RawVideoFormats *all = g_new (struct RawVideoFormats, 1);
@@ -7759,7 +8257,7 @@ generate_raw_video_formats (gpointer data)
   /* Workaround a bug in our parser that would lead to segfaults
    * when deserializing container types using static strings,
    * see https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/446 */
-  tmp = g_strdup (GST_VIDEO_FORMATS_ALL);
+  tmp = g_strdup (formats);
   res = gst_value_deserialize (&list, tmp);
   g_assert (res);
   g_free (tmp);
@@ -7780,6 +8278,18 @@ generate_raw_video_formats (gpointer data)
   return all;
 }
 
+static gpointer
+generate_raw_video_formats (gpointer data)
+{
+  return generate_video_formats (GST_VIDEO_FORMATS_ALL);
+}
+
+static gpointer
+generate_any_video_formats (gpointer data)
+{
+  return generate_video_formats (GST_VIDEO_FORMATS_ANY);
+}
+
 /**
  * gst_video_formats_raw:
  * @len: (out): the number of elements in the returned array
@@ -7804,6 +8314,33 @@ gst_video_formats_raw (guint * len)
   return all->formats;
 }
 
+/**
+ * gst_video_formats_any:
+ * @len: (out): the number of elements in the returned array
+ *
+ * Return all the raw video formats supported by GStreamer including
+ * special opaque formats such as %GST_VIDEO_FORMAT_DMA_DRM for which
+ * no software conversion exists. This should be use for passthrough
+ * template cpas.
+ *
+ * Returns: (transfer none) (array length=len): an array of #GstVideoFormat
+ * Since: 1.24
+ */
+const GstVideoFormat *
+gst_video_formats_any (guint * len)
+{
+  static GOnce any_video_formats_once = G_ONCE_INIT;
+  struct RawVideoFormats *all;
+
+  g_return_val_if_fail (len, NULL);
+
+  g_once (&any_video_formats_once, generate_any_video_formats, NULL);
+
+  all = any_video_formats_once.retval;
+  *len = all->n;
+  return all->formats;
+}
+
 /**
  * gst_video_make_raw_caps:
  * @formats: (array length=len) (nullable): an array of raw #GstVideoFormat, or %NULL
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-format.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-format.h
index 7a645ccaab7..b853485329e 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-format.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-format.h
@@ -145,6 +145,30 @@ G_BEGIN_DECLS
  * @GST_VIDEO_FORMAT_NV12_16L32S: NV12 with 16x32 Y tiles and 16x16 UV tiles. (Since: 1.22)
  * @GST_VIDEO_FORMAT_NV12_8L128 : NV12 with 8x128 tiles in linear order (Since: 1.22)
  * @GST_VIDEO_FORMAT_NV12_10BE_8L128 : NV12 10bit big endian with 8x128 tiles in linear order (Since: 1.22)
+ * @GST_VIDEO_FORMAT_NV12_10LE40_4L4: @GST_VIDEO_FORMAT_NV12_10LE40 with 4x4 pixels tiles (5 bytes per tile row) (Since: 1.24)
+ * @GST_VIDEO_FORMAT_DMA_DRM: DMA DRM special format. It's only used with
+ *                            memory:DMABuf #GstCapsFeatures, where an extra
+ *                            parameter (drm-format) is required to define the
+ *                            image format and its memory layout.
+ * @GST_VIDEO_FORMAT_MT2110T : Mediatek 10bit NV12 little endian with 16x32 tiles in linear order, tiled 2 bits (Since: 1.24)
+ * @GST_VIDEO_FORMAT_MT2110R : Mediatek 10bit NV12 little endian with 16x32 tiles in linear order, raster 2 bits (Since: 1.24)
+ * @GST_VIDEO_FORMAT_A422: planar 4:4:2:2 YUV, 8 bits per channel (Since: 1.24)
+ * @GST_VIDEO_FORMAT_A444: planar 4:4:4:4 YUV, 8 bits per channel (Since: 1.24)
+ * @GST_VIDEO_FORMAT_A444_12LE: planar 4:4:4:4 YUV, 12 bits per channel (Since: 1.24)
+ * @GST_VIDEO_FORMAT_A444_12BE: planar 4:4:4:4 YUV, 12 bits per channel (Since: 1.24)
+ * @GST_VIDEO_FORMAT_A422_12LE: planar 4:4:2:2 YUV, 12 bits per channel (Since: 1.24)
+ * @GST_VIDEO_FORMAT_A422_12BE: planar 4:4:2:2 YUV, 12 bits per channel (Since: 1.24)
+ * @GST_VIDEO_FORMAT_A420_12LE: planar 4:4:2:0 YUV, 12 bits per channel (Since: 1.24)
+ * @GST_VIDEO_FORMAT_A420_12BE: planar 4:4:2:0 YUV, 12 bits per channel (Since: 1.24)
+ * @GST_VIDEO_FORMAT_A444_16LE: planar 4:4:4:4 YUV, 16 bits per channel (Since: 1.24)
+ * @GST_VIDEO_FORMAT_A444_16BE: planar 4:4:4:4 YUV, 16 bits per channel (Since: 1.24)
+ * @GST_VIDEO_FORMAT_A422_16LE: planar 4:4:2:2 YUV, 16 bits per channel (Since: 1.24)
+ * @GST_VIDEO_FORMAT_A422_16BE: planar 4:4:2:2 YUV, 16 bits per channel (Since: 1.24)
+ * @GST_VIDEO_FORMAT_A420_16LE: planar 4:4:2:0 YUV, 16 bits per channel (Since: 1.24)
+ * @GST_VIDEO_FORMAT_A420_16BE: planar 4:4:2:0 YUV, 16 bits per channel (Since: 1.24)
+ * @GST_VIDEO_FORMAT_GBR_16LE: planar 4:4:4 RGB, 16 bits per channel (Since: 1.24)
+ * @GST_VIDEO_FORMAT_GBR_16BE: planar 4:4:4 RGB, 16 bits per channel (Since: 1.24)
+ * @GST_VIDEO_FORMAT_RBGA: packed RGB with alpha, 8 bits per channel (Since: 1.24)
  *
  * Enum value describing the most common video formats.
  *
@@ -400,6 +424,201 @@ typedef enum {
    * Since: 1.22
    */
   GST_VIDEO_FORMAT_NV12_10BE_8L128,
+
+  /**
+   * GST_VIDEO_FORMAT_NV12_10LE40_4L4:
+   *
+   *  @GST_VIDEO_FORMAT_NV12_10LE40 with 4x4 pixels tiles (5 bytes
+   *  per tile row). This format is produced by Verisilicon/Hantro decoders.
+   *
+   * Since: 1.24
+   */
+  GST_VIDEO_FORMAT_NV12_10LE40_4L4,
+
+  /**
+   * GST_VIDEO_FORMAT_DMA_DRM:
+   *
+   * @GST_VIDEO_FORMAT_DMA_DRM represent the DMA DRM special format. It's
+   * only used with memory:DMABuf #GstCapsFeatures, where an extra
+   * parameter (drm-format) is required to define the image format and
+   * its memory layout.
+   *
+   * Since: 1.24
+   */
+  GST_VIDEO_FORMAT_DMA_DRM,
+
+  /**
+   * GST_VIDEO_FORMAT_MT2110T:
+   *
+   * Mediatek 10bit NV12 little endian with 16x32 tiles in linear order, tile 2
+   * bits.
+   *
+   * Since: 1.24
+   */
+  GST_VIDEO_FORMAT_MT2110T,
+
+  /**
+   * GST_VIDEO_FORMAT_MT2110R:
+   *
+   * Mediatek 10bit NV12 little endian with 16x32 tiles in linear order, raster
+   * 2 bits.
+   *
+   * Since: 1.24
+   */
+  GST_VIDEO_FORMAT_MT2110R,
+
+  /**
+   * GST_VIDEO_FORMAT_A422:
+   *
+   * planar 4:4:2:2 YUV, 8 bits per channel
+   *
+   * Since: 1.24
+   */
+  GST_VIDEO_FORMAT_A422,
+
+  /**
+   * GST_VIDEO_FORMAT_A444:
+   *
+   * planar 4:4:4:4 YUV, 8 bits per channel
+   *
+   * Since: 1.24
+   */
+  GST_VIDEO_FORMAT_A444,
+
+  /**
+   * GST_VIDEO_FORMAT_A444_12LE:
+   *
+   * planar 4:4:4:4 YUV, 12 bits per channel
+   *
+   * Since: 1.24
+   */
+  GST_VIDEO_FORMAT_A444_12LE,
+
+  /**
+   * GST_VIDEO_FORMAT_A444_12BE:
+   *
+   * planar 4:4:4:4 YUV, 12 bits per channel
+   *
+   * Since: 1.24
+   */
+  GST_VIDEO_FORMAT_A444_12BE,
+
+  /**
+   * GST_VIDEO_FORMAT_A422_12LE:
+   *
+   * planar 4:4:2:2 YUV, 12 bits per channel
+   *
+   * Since: 1.24
+   */
+  GST_VIDEO_FORMAT_A422_12LE,
+
+  /**
+   * GST_VIDEO_FORMAT_A422_12BE:
+   *
+   * planar 4:4:2:2 YUV, 12 bits per channel
+   *
+   * Since: 1.24
+   */
+  GST_VIDEO_FORMAT_A422_12BE,
+
+  /**
+   * GST_VIDEO_FORMAT_A420_12LE:
+   *
+   * planar 4:4:2:0 YUV, 12 bits per channel
+   *
+   * Since: 1.24
+   */
+  GST_VIDEO_FORMAT_A420_12LE,
+
+  /**
+   * GST_VIDEO_FORMAT_A420_12BE:
+   *
+   * planar 4:4:2:0 YUV, 12 bits per channel
+   *
+   * Since: 1.24
+   */
+  GST_VIDEO_FORMAT_A420_12BE,
+
+  /**
+   * GST_VIDEO_FORMAT_A444_16LE:
+   *
+   * planar 4:4:4:4 YUV, 16 bits per channel
+   *
+   * Since: 1.24
+   */
+  GST_VIDEO_FORMAT_A444_16LE,
+
+  /**
+   * GST_VIDEO_FORMAT_A444_16BE:
+   *
+   * planar 4:4:4:4 YUV, 16 bits per channel
+   *
+   * Since: 1.24
+   */
+  GST_VIDEO_FORMAT_A444_16BE,
+
+  /**
+   * GST_VIDEO_FORMAT_A422_16LE:
+   *
+   * planar 4:4:2:2 YUV, 16 bits per channel
+   *
+   * Since: 1.24
+   */
+  GST_VIDEO_FORMAT_A422_16LE,
+
+  /**
+   * GST_VIDEO_FORMAT_A422_16BE:
+   *
+   * planar 4:4:2:2 YUV, 16 bits per channel
+   *
+   * Since: 1.24
+   */
+  GST_VIDEO_FORMAT_A422_16BE,
+
+  /**
+   * GST_VIDEO_FORMAT_A420_16LE:
+   *
+   * planar 4:4:2:0 YUV, 16 bits per channel
+   *
+   * Since: 1.24
+   */
+  GST_VIDEO_FORMAT_A420_16LE,
+
+  /**
+   * GST_VIDEO_FORMAT_A420_16BE:
+   *
+   * planar 4:4:2:0 YUV, 16 bits per channel
+   *
+   * Since: 1.24
+   */
+  GST_VIDEO_FORMAT_A420_16BE,
+
+  /**
+   * GST_VIDEO_FORMAT_GBR_16LE:
+   *
+   * planar 4:4:4 RGB, 16 bits per channel
+   *
+   * Since: 1.24
+   */
+  GST_VIDEO_FORMAT_GBR_16LE,
+
+  /**
+   * GST_VIDEO_FORMAT_GBR_16BE:
+   *
+   * planar 4:4:4 RGB, 16 bits per channel
+   *
+   * Since: 1.24
+   */
+  GST_VIDEO_FORMAT_GBR_16BE,
+
+  /**
+   * GST_VIDEO_FORMAT_RBGA:
+   *
+   * packed RGB with alpha, 8 bits per channel
+   *
+   * Since: 1.24
+   */
+  GST_VIDEO_FORMAT_RBGA,
 } GstVideoFormat;
 
 #define GST_VIDEO_MAX_PLANES 4
@@ -847,9 +1066,9 @@ gconstpointer  gst_video_format_get_palette          (GstVideoFormat format, gsi
 #endif
 
 /**
- * GST_VIDEO_FORMATS_ALL:
+ * GST_VIDEO_FORMATS_ALL_STR:
  *
- * List of all video formats, for use in template caps strings.
+ * Declare all video formats as a string.
  *
  * Formats are sorted by decreasing "quality", using these criteria by priority:
  *   - number of components
@@ -864,38 +1083,98 @@ gconstpointer  gst_video_format_get_palette          (GstVideoFormat format, gsi
  *   - prefer YUV formats over RGB ones
  *   - prefer I420 over YV12
  *   - format name
+ *
+ * Since: 1.24
  */
 #if G_BYTE_ORDER == G_BIG_ENDIAN
-#define GST_VIDEO_FORMATS_ALL "{ ABGR64_BE, BGRA64_BE, AYUV64, ARGB64_BE, ARGB64, " \
-    "RGBA64_BE, ABGR64_LE, BGRA64_LE, ARGB64_LE, RGBA64_LE, GBRA_12BE, GBRA_12LE, Y412_BE, " \
-    "Y412_LE, A444_10BE, GBRA_10BE, A444_10LE, GBRA_10LE, A422_10BE, A422_10LE, " \
-    "A420_10BE, A420_10LE, Y410, RGB10A2_LE, BGR10A2_LE, GBRA, ABGR, VUYA, BGRA, " \
-    "AYUV, ARGB, RGBA, A420, AV12, Y444_16BE, Y444_16LE, v216, P016_BE, P016_LE, Y444_12BE, " \
-    "GBR_12BE, Y444_12LE, GBR_12LE, I422_12BE, I422_12LE, Y212_BE, Y212_LE, I420_12BE, " \
-    "I420_12LE, P012_BE, P012_LE, Y444_10BE, GBR_10BE, Y444_10LE, GBR_10LE, r210, " \
-    "I422_10BE, I422_10LE, NV16_10LE32, Y210, v210, UYVP, I420_10BE, I420_10LE, " \
-    "P010_10BE, P010_10LE, NV12_10LE32, NV12_10LE40, NV12_10BE_8L128, Y444, RGBP, GBR, BGRP, NV24, xBGR, BGRx, " \
-    "xRGB, RGBx, BGR, IYU2, v308, RGB, Y42B, NV61, NV16, VYUY, UYVY, YVYU, YUY2, I420, " \
-    "YV12, NV21, NV12, NV12_8L128, NV12_64Z32, NV12_4L4, NV12_32L32, NV12_16L32S, Y41B, IYU1, YVU9, YUV9, RGB16, " \
-    "BGR16, RGB15, BGR15, RGB8P, GRAY16_BE, GRAY16_LE, GRAY10_LE32, GRAY8 }"
+#define GST_VIDEO_FORMATS_ALL_STR "A444_16BE, A444_16LE, AYUV64, ARGB64, " \
+    "RGBA64_BE, ARGB64_BE, BGRA64_BE, ABGR64_BE, RGBA64_LE, ARGB64_LE, " \
+    "BGRA64_LE, ABGR64_LE, A422_16BE, A422_16LE, A420_16BE, A420_16LE, " \
+    "A444_12BE, GBRA_12BE, A444_12LE, GBRA_12LE, Y412_BE, Y412_LE, A422_12BE, " \
+    "A422_12LE, A420_12BE, A420_12LE, A444_10BE, GBRA_10BE, A444_10LE, " \
+    "GBRA_10LE, A422_10BE, A422_10LE, A420_10BE, A420_10LE, Y410, BGR10A2_LE, " \
+    "RGB10A2_LE, A444, GBRA, AYUV, VUYA, RGBA, RBGA, ARGB, BGRA, ABGR, A422, " \
+    "A420, AV12, Y444_16BE, GBR_16BE, Y444_16LE, GBR_16LE, v216, P016_BE, " \
+    "P016_LE, Y444_12BE, GBR_12BE, Y444_12LE, GBR_12LE, I422_12BE, I422_12LE, " \
+    "Y212_BE, Y212_LE, I420_12BE, I420_12LE, P012_BE, P012_LE, Y444_10BE, " \
+    "GBR_10BE, Y444_10LE, GBR_10LE, r210, I422_10BE, I422_10LE, NV16_10LE32, " \
+    "Y210, UYVP, v210, I420_10BE, I420_10LE, P010_10BE, MT2110R, MT2110T, " \
+    "NV12_10BE_8L128, NV12_10LE40_4L4, P010_10LE, NV12_10LE40, NV12_10LE32, " \
+    "Y444, BGRP, GBR, RGBP, NV24, v308, IYU2, RGBx, xRGB, BGRx, xBGR, RGB, " \
+    "BGR, Y42B, NV16, NV61, YUY2, YVYU, UYVY, VYUY, I420, YV12, NV12, NV21, " \
+    "NV12_16L32S, NV12_32L32, NV12_4L4, NV12_64Z32, NV12_8L128, Y41B, IYU1, " \
+    "YUV9, YVU9, BGR16, RGB16, BGR15, RGB15, RGB8P, GRAY16_BE, GRAY16_LE, " \
+    "GRAY10_LE32, GRAY8"
 #elif G_BYTE_ORDER == G_LITTLE_ENDIAN
-#define GST_VIDEO_FORMATS_ALL "{ ABGR64_LE, BGRA64_LE, AYUV64, ARGB64_LE, ARGB64, " \
-    "RGBA64_LE, ABGR64_BE, BGRA64_BE, ARGB64_BE, RGBA64_BE, GBRA_12LE, GBRA_12BE, Y412_LE, " \
-    "Y412_BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, " \
-    "A420_10LE, A420_10BE, RGB10A2_LE, BGR10A2_LE, Y410, GBRA, ABGR, VUYA, BGRA, " \
-    "AYUV, ARGB, RGBA, A420, AV12, Y444_16LE, Y444_16BE, v216, P016_LE, P016_BE, Y444_12LE, " \
-    "GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, " \
-    "I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, " \
-    "I422_10LE, I422_10BE, NV16_10LE32, Y210, v210, UYVP, I420_10LE, I420_10BE, " \
-    "P010_10LE, NV12_10LE32, NV12_10LE40, P010_10BE, NV12_10BE_8L128, Y444, RGBP, GBR, BGRP, NV24, xBGR, BGRx, " \
-    "xRGB, RGBx, BGR, IYU2, v308, RGB, Y42B, NV61, NV16, VYUY, UYVY, YVYU, YUY2, I420, " \
-    "YV12, NV21, NV12, NV12_8L128, NV12_64Z32, NV12_4L4, NV12_32L32, NV12_16L32S, Y41B, IYU1, YVU9, YUV9, RGB16, " \
-    "BGR16, RGB15, BGR15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }"
+#define GST_VIDEO_FORMATS_ALL_STR "A444_16LE, A444_16BE, AYUV64, RGBA64_LE, " \
+    "ARGB64, ARGB64_LE, BGRA64_LE, ABGR64_LE, RGBA64_BE, ARGB64_BE, BGRA64_BE, " \
+    "ABGR64_BE, A422_16LE, A422_16BE, A420_16LE, A420_16BE, A444_12LE, " \
+    "GBRA_12LE, A444_12BE, GBRA_12BE, Y412_LE, Y412_BE, A422_12LE, A422_12BE, " \
+    "A420_12LE, A420_12BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, " \
+    "A422_10LE, A422_10BE, A420_10LE, A420_10BE, BGR10A2_LE, RGB10A2_LE, Y410, " \
+    "A444, GBRA, AYUV, VUYA, RGBA, RBGA, ARGB, BGRA, ABGR, A422, A420, AV12, " \
+    "Y444_16LE, GBR_16LE, Y444_16BE, GBR_16BE, v216, P016_LE, P016_BE, " \
+    "Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, " \
+    "Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, " \
+    "Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, UYVP, " \
+    "v210, I420_10LE, I420_10BE, P010_10LE, NV12_10LE40, NV12_10LE32, " \
+    "P010_10BE, MT2110R, MT2110T, NV12_10BE_8L128, NV12_10LE40_4L4, Y444, " \
+    "BGRP, GBR, RGBP, NV24, v308, IYU2, RGBx, xRGB, BGRx, xBGR, RGB, BGR, " \
+    "Y42B, NV16, NV61, YUY2, YVYU, UYVY, VYUY, I420, YV12, NV12, NV21, " \
+    "NV12_16L32S, NV12_32L32, NV12_4L4, NV12_64Z32, NV12_8L128, Y41B, IYU1, " \
+    "YUV9, YVU9, BGR16, RGB16, BGR15, RGB15, RGB8P, GRAY16_LE, GRAY16_BE, " \
+    "GRAY10_LE32, GRAY8"
 #endif
 
+/**
+ * GST_VIDEO_FORMATS_ANY_STR:
+ *
+ * This is similar to %GST_VIDEO_FORMATS_ALL_STR but includes formats like
+ * DMA_DRM for which no software converter exists. This should be used for
+ * passthrough template caps.
+ *
+ * Since: 1.24
+ */
+#define GST_VIDEO_FORMATS_ANY_STR "DMA_DRM, " GST_VIDEO_FORMATS_ALL_STR
+
+/**
+ * GST_VIDEO_FORMATS_ALL:
+ *
+ * List of all video formats, for use in template caps strings.
+ *
+ * Formats are sorted by decreasing "quality", using these criteria by priority:
+ *   - number of components
+ *   - depth
+ *   - subsampling factor of the width
+ *   - subsampling factor of the height
+ *   - number of planes
+ *   - native endianness preferred
+ *   - pixel stride
+ *   - poffset
+ *   - prefer non-complex formats
+ *   - prefer YUV formats over RGB ones
+ *   - prefer I420 over YV12
+ *   - format name
+ */
+#define GST_VIDEO_FORMATS_ALL "{ " GST_VIDEO_FORMATS_ALL_STR " }"
+
+/**
+ * GST_VIDEO_FORMATS_ANY:
+ *
+ * This is similar to %GST_VIDEO_FORMATS_ALL but includes formats like DMA_DRM
+ * that do not have a software converter. This should be used for passthrough
+ * template caps.
+ *
+ * Since: 1.24
+ */
+#define GST_VIDEO_FORMATS_ANY "{ " GST_VIDEO_FORMATS_ANY_STR " }"
+
 GST_VIDEO_API
 const GstVideoFormat * gst_video_formats_raw (guint * len);
 
+GST_VIDEO_API
+const GstVideoFormat * gst_video_formats_any (guint * len);
+
 /**
  * GST_VIDEO_CAPS_MAKE:
  * @format: string format that describes the pixel layout, as string
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-frame.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-frame.c
index bfb57e47e12..fdd1b89de0e 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-frame.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-frame.c
@@ -39,7 +39,7 @@ video_frame_get_perf_category (void)
   static GstDebugCategory *cat = NULL;
 
   if (g_once_init_enter (&cat)) {
-    GstDebugCategory *c;
+    GstDebugCategory *c = NULL;
 
     GST_DEBUG_CATEGORY_GET (c, "GST_PERFORMANCE");
     g_once_init_leave (&cat, c);
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-info.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-info.c
index d543e31267d..50b2f730bf7 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-info.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-info.c
@@ -32,6 +32,10 @@
 #include <string.h>
 #include <stdio.h>
 
+#ifdef GSTREAMER_LITE
+#include "gst/glib-compat-private.h"
+#endif // GSTREAMER_LITE
+
 #include "video-info.h"
 #include "video-tile.h"
 
@@ -70,7 +74,7 @@ ensure_debug_category (void)
 GstVideoInfo *
 gst_video_info_copy (const GstVideoInfo * info)
 {
-  return g_slice_dup (GstVideoInfo, info);
+  return g_memdup2 (info, sizeof (GstVideoInfo));
 }
 
 /**
@@ -85,7 +89,7 @@ gst_video_info_copy (const GstVideoInfo * info)
 void
 gst_video_info_free (GstVideoInfo * info)
 {
-  g_slice_free (GstVideoInfo, info);
+  g_free (info);
 }
 
 G_DEFINE_BOXED_TYPE (GstVideoInfo, gst_video_info,
@@ -106,7 +110,7 @@ gst_video_info_new (void)
 {
   GstVideoInfo *info;
 
-  info = g_slice_new (GstVideoInfo);
+  info = g_new (GstVideoInfo, 1);
   gst_video_info_init (info);
 
   return info;
@@ -605,6 +609,10 @@ gst_video_info_is_equal (const GstVideoInfo * info, const GstVideoInfo * other)
 {
   gint i;
 
+  if (info == other)
+    return TRUE;
+  if (info->finfo == NULL || other->finfo == NULL)
+    return FALSE;
   if (GST_VIDEO_INFO_FORMAT (info) != GST_VIDEO_INFO_FORMAT (other))
     return FALSE;
   if (GST_VIDEO_INFO_INTERLACE_MODE (info) !=
@@ -825,6 +833,7 @@ fill_planes (GstVideoInfo * info, gsize plane_size[GST_VIDEO_MAX_PLANES])
     case GST_VIDEO_FORMAT_VUYA:
     case GST_VIDEO_FORMAT_BGR10A2_LE:
     case GST_VIDEO_FORMAT_RGB10A2_LE:
+    case GST_VIDEO_FORMAT_RBGA:
       info->stride[0] = width * 4;
       info->offset[0] = 0;
       info->size = info->stride[0] * height;
@@ -1009,6 +1018,32 @@ fill_planes (GstVideoInfo * info, gsize plane_size[GST_VIDEO_MAX_PLANES])
       info->offset[3] = info->offset[2] + info->stride[2] * cr_h;
       info->size = info->offset[3] + info->stride[0] * GST_ROUND_UP_2 (height);
       break;
+    case GST_VIDEO_FORMAT_A422:
+      info->stride[0] = GST_ROUND_UP_4 (width);
+      info->stride[1] = GST_ROUND_UP_8 (width) / 2;
+      info->stride[2] = info->stride[1];
+      info->stride[3] = info->stride[0];
+      info->offset[0] = 0;
+      info->offset[1] = info->stride[0] * GST_ROUND_UP_2 (height);
+      info->offset[2] = info->offset[1] +
+          info->stride[1] * GST_ROUND_UP_2 (height);
+      info->offset[3] =
+          info->offset[2] + info->stride[2] * GST_ROUND_UP_2 (height);
+      info->size = info->offset[3] + info->stride[0] * GST_ROUND_UP_2 (height);
+      break;
+    case GST_VIDEO_FORMAT_A444:
+      info->stride[0] = GST_ROUND_UP_4 (width);
+      info->stride[1] = info->stride[0];
+      info->stride[2] = info->stride[0];
+      info->stride[3] = info->stride[0];
+      info->offset[0] = 0;
+      info->offset[1] = info->stride[0] * GST_ROUND_UP_2 (height);
+      info->offset[2] = info->offset[1] +
+          info->stride[1] * GST_ROUND_UP_2 (height);
+      info->offset[3] =
+          info->offset[2] + info->stride[2] * GST_ROUND_UP_2 (height);
+      info->size = info->offset[3] + info->stride[0] * GST_ROUND_UP_2 (height);
+      break;
     case GST_VIDEO_FORMAT_YUV9:
     case GST_VIDEO_FORMAT_YVU9:
       info->stride[0] = GST_ROUND_UP_4 (width);
@@ -1058,6 +1093,8 @@ fill_planes (GstVideoInfo * info, gsize plane_size[GST_VIDEO_MAX_PLANES])
     case GST_VIDEO_FORMAT_GBR_10BE:
     case GST_VIDEO_FORMAT_GBR_12LE:
     case GST_VIDEO_FORMAT_GBR_12BE:
+    case GST_VIDEO_FORMAT_GBR_16LE:
+    case GST_VIDEO_FORMAT_GBR_16BE:
     case GST_VIDEO_FORMAT_Y444_16LE:
     case GST_VIDEO_FORMAT_Y444_16BE:
       info->stride[0] = GST_ROUND_UP_4 (width * 2);
@@ -1096,6 +1133,7 @@ fill_planes (GstVideoInfo * info, gsize plane_size[GST_VIDEO_MAX_PLANES])
       break;
     case GST_VIDEO_FORMAT_NV12_4L4:
     case GST_VIDEO_FORMAT_NV12_32L32:
+    case GST_VIDEO_FORMAT_NV12_10LE40_4L4:
     {
       const gsize tile_size = GST_VIDEO_FORMAT_INFO_TILE_SIZE (info->finfo, 0);
       gint tile_width = GST_VIDEO_FORMAT_INFO_TILE_WIDTH (info->finfo, 0);
@@ -1116,7 +1154,7 @@ fill_planes (GstVideoInfo * info, gsize plane_size[GST_VIDEO_MAX_PLANES])
       const gsize y_tile_size =
           GST_VIDEO_FORMAT_INFO_TILE_SIZE (info->finfo, 0);
       const gsize uv_tile_size =
-          GST_VIDEO_FORMAT_INFO_TILE_SIZE (info->finfo, 0);
+          GST_VIDEO_FORMAT_INFO_TILE_SIZE (info->finfo, 1);
       gint tile_width = GST_VIDEO_FORMAT_INFO_TILE_WIDTH (info->finfo, 0);
       gint tile_height = GST_VIDEO_FORMAT_INFO_TILE_HEIGHT (info->finfo, 0);
       gint n_tile_x = GST_ROUND_UP_N (info->width, tile_width) / tile_width;
@@ -1135,6 +1173,10 @@ fill_planes (GstVideoInfo * info, gsize plane_size[GST_VIDEO_MAX_PLANES])
     }
     case GST_VIDEO_FORMAT_A420_10LE:
     case GST_VIDEO_FORMAT_A420_10BE:
+    case GST_VIDEO_FORMAT_A420_12LE:
+    case GST_VIDEO_FORMAT_A420_12BE:
+    case GST_VIDEO_FORMAT_A420_16LE:
+    case GST_VIDEO_FORMAT_A420_16BE:
       info->stride[0] = GST_ROUND_UP_4 (width * 2);
       info->stride[1] = GST_ROUND_UP_4 (width);
       info->stride[2] = info->stride[1];
@@ -1150,6 +1192,10 @@ fill_planes (GstVideoInfo * info, gsize plane_size[GST_VIDEO_MAX_PLANES])
       break;
     case GST_VIDEO_FORMAT_A422_10LE:
     case GST_VIDEO_FORMAT_A422_10BE:
+    case GST_VIDEO_FORMAT_A422_12LE:
+    case GST_VIDEO_FORMAT_A422_12BE:
+    case GST_VIDEO_FORMAT_A422_16LE:
+    case GST_VIDEO_FORMAT_A422_16BE:
       info->stride[0] = GST_ROUND_UP_4 (width * 2);
       info->stride[1] = GST_ROUND_UP_4 (width);
       info->stride[2] = info->stride[1];
@@ -1164,6 +1210,10 @@ fill_planes (GstVideoInfo * info, gsize plane_size[GST_VIDEO_MAX_PLANES])
       break;
     case GST_VIDEO_FORMAT_A444_10LE:
     case GST_VIDEO_FORMAT_A444_10BE:
+    case GST_VIDEO_FORMAT_A444_12LE:
+    case GST_VIDEO_FORMAT_A444_12BE:
+    case GST_VIDEO_FORMAT_A444_16LE:
+    case GST_VIDEO_FORMAT_A444_16BE:
       info->stride[0] = GST_ROUND_UP_4 (width * 2);
       info->stride[1] = info->stride[0];
       info->stride[2] = info->stride[0];
@@ -1266,7 +1316,22 @@ fill_planes (GstVideoInfo * info, gsize plane_size[GST_VIDEO_MAX_PLANES])
       info->size = info->offset[1] + n_tile_x * uv_n_tile_y * tile_size;
       break;
     }
+    case GST_VIDEO_FORMAT_MT2110T:
+    case GST_VIDEO_FORMAT_MT2110R:
+    {
+      const gsize tile_size = GST_VIDEO_FORMAT_INFO_TILE_SIZE (info->finfo, 0);
+      gint n_tile_x = GST_ROUND_UP_16 (info->width) / 16;
+      gint n_tile_y = GST_ROUND_UP_32 (info->height) / 32;
+
+      info->stride[0] = GST_VIDEO_TILE_MAKE_STRIDE (n_tile_x, n_tile_y);
+      info->stride[1] = info->stride[0];
+      info->offset[0] = 0;
+      info->offset[1] = tile_size * n_tile_x * n_tile_y;
+      info->size = info->offset[1] + info->offset[1] / 2;
+      break;
+    }
     case GST_VIDEO_FORMAT_ENCODED:
+    case GST_VIDEO_FORMAT_DMA_DRM:
       break;
     case GST_VIDEO_FORMAT_UNKNOWN:
       GST_ERROR ("invalid format");
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-multiview.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-multiview.c
index 854bf0f8476..0881be0d1b5 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-multiview.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-multiview.c
@@ -46,19 +46,19 @@ static const struct mview_map_t
   GstVideoMultiviewMode mode;
 } gst_multiview_modes[] = {
   {
-  "mono", GST_VIDEO_MULTIVIEW_MODE_MONO}, {
-  "left", GST_VIDEO_MULTIVIEW_MODE_LEFT}, {
-  "right", GST_VIDEO_MULTIVIEW_MODE_RIGHT}, {
-  "side-by-side", GST_VIDEO_MULTIVIEW_MODE_SIDE_BY_SIDE}, {
-  "side-by-side-quincunx", GST_VIDEO_MULTIVIEW_MODE_SIDE_BY_SIDE_QUINCUNX}, {
-  "column-interleaved", GST_VIDEO_MULTIVIEW_MODE_COLUMN_INTERLEAVED}, {
-  "row-interleaved", GST_VIDEO_MULTIVIEW_MODE_ROW_INTERLEAVED}, {
-  "top-bottom", GST_VIDEO_MULTIVIEW_MODE_TOP_BOTTOM}, {
-  "checkerboard", GST_VIDEO_MULTIVIEW_MODE_CHECKERBOARD}, {
-  "frame-by-frame", GST_VIDEO_MULTIVIEW_MODE_FRAME_BY_FRAME}, {
-  "multiview-frame-by-frame",
-        GST_VIDEO_MULTIVIEW_MODE_MULTIVIEW_FRAME_BY_FRAME}, {
-  "separated", GST_VIDEO_MULTIVIEW_MODE_SEPARATED}
+      "mono", GST_VIDEO_MULTIVIEW_MODE_MONO}, {
+      "left", GST_VIDEO_MULTIVIEW_MODE_LEFT}, {
+      "right", GST_VIDEO_MULTIVIEW_MODE_RIGHT}, {
+      "side-by-side", GST_VIDEO_MULTIVIEW_MODE_SIDE_BY_SIDE}, {
+      "side-by-side-quincunx", GST_VIDEO_MULTIVIEW_MODE_SIDE_BY_SIDE_QUINCUNX}, {
+      "column-interleaved", GST_VIDEO_MULTIVIEW_MODE_COLUMN_INTERLEAVED}, {
+      "row-interleaved", GST_VIDEO_MULTIVIEW_MODE_ROW_INTERLEAVED}, {
+      "top-bottom", GST_VIDEO_MULTIVIEW_MODE_TOP_BOTTOM}, {
+      "checkerboard", GST_VIDEO_MULTIVIEW_MODE_CHECKERBOARD}, {
+      "frame-by-frame", GST_VIDEO_MULTIVIEW_MODE_FRAME_BY_FRAME}, {
+        "multiview-frame-by-frame",
+      GST_VIDEO_MULTIVIEW_MODE_MULTIVIEW_FRAME_BY_FRAME}, {
+      "separated", GST_VIDEO_MULTIVIEW_MODE_SEPARATED}
 };
 
 /**
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-orc-dist.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-orc-dist.c
index 8cd7dc553e9..2203abc5a62 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-orc-dist.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-orc-dist.c
@@ -234,6 +234,14 @@ void video_orc_pack_BGR16_le (guint16 * ORC_RESTRICT d1,
     const guint32 * ORC_RESTRICT s1, int n);
 void video_orc_pack_BGR16_be (guint16 * ORC_RESTRICT d1,
     const guint32 * ORC_RESTRICT s1, int n);
+void video_orc_unpack_RBGA_le (guint8 * ORC_RESTRICT d1,
+    const guint8 * ORC_RESTRICT s1, int n);
+void video_orc_unpack_RBGA_be (guint8 * ORC_RESTRICT d1,
+    const guint8 * ORC_RESTRICT s1, int n);
+void video_orc_pack_RBGA_le (guint8 * ORC_RESTRICT d1,
+    const guint8 * ORC_RESTRICT s1, int n);
+void video_orc_pack_RBGA_be (guint8 * ORC_RESTRICT d1,
+    const guint8 * ORC_RESTRICT s1, int n);
 void video_orc_resample_bilinear_u32 (guint8 * ORC_RESTRICT d1,
     const guint8 * ORC_RESTRICT s1, int p1, int p2, int n);
 void video_orc_merge_linear_u8 (orc_uint8 * ORC_RESTRICT d1,
@@ -14278,6 +14286,1026 @@ video_orc_pack_BGR16_be (guint16 * ORC_RESTRICT d1,
 #endif
 
 
+/* video_orc_unpack_RBGA_le */
+#ifdef DISABLE_ORC
+void
+video_orc_unpack_RBGA_le (guint8 * ORC_RESTRICT d1,
+    const guint8 * ORC_RESTRICT s1, int n)
+{
+  int i;
+  orc_union32 *ORC_RESTRICT ptr0;
+  const orc_union32 *ORC_RESTRICT ptr4;
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var38;
+#else
+  orc_union32 var38;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var39;
+#else
+  orc_union32 var39;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var40;
+#else
+  orc_union32 var40;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var41;
+#else
+  orc_union32 var41;
+#endif
+  orc_union32 var42;
+  orc_union32 var43;
+  orc_union32 var44;
+  orc_union32 var45;
+  orc_union32 var46;
+  orc_union32 var47;
+  orc_union32 var48;
+  orc_union32 var49;
+  orc_union32 var50;
+  orc_union32 var51;
+  orc_union32 var52;
+
+  ptr0 = (orc_union32 *) d1;
+  ptr4 = (orc_union32 *) s1;
+
+  /* 1: loadpl */
+  var38.i = 0xff000000;         /* -16777216 or 2.11371e-314f */
+  /* 3: loadpl */
+  var39.i = 0x000000ff;         /* 255 or 1.25987e-321f */
+  /* 5: loadpl */
+  var40.i = 0x00ff0000;         /* 16711680 or 8.25667e-317f */
+  /* 7: loadpl */
+  var41.i = 0x0000ff00;         /* 65280 or 3.22526e-319f */
+
+  for (i = 0; i < n; i++) {
+    /* 0: loadl */
+    var43 = ptr4[i];
+    /* 2: andl */
+    var44.i = var43.i & var38.i;
+    /* 4: andl */
+    var45.i = var43.i & var39.i;
+    /* 6: andl */
+    var46.i = var43.i & var40.i;
+    /* 8: andl */
+    var47.i = var43.i & var41.i;
+    /* 9: shrul */
+    var48.i = ((orc_uint32) var44.i) >> 24;
+    /* 10: shll */
+    var49.i = ((orc_uint32) var45.i) << 8;
+    /* 11: shll */
+    var50.i = ((orc_uint32) var47.i) << 16;
+    /* 12: orl */
+    var51.i = var48.i | var49.i;
+    /* 13: orl */
+    var52.i = var51.i | var46.i;
+    /* 14: orl */
+    var42.i = var52.i | var50.i;
+    /* 15: storel */
+    ptr0[i] = var42;
+  }
+
+}
+
+#else
+static void
+_backup_video_orc_unpack_RBGA_le (OrcExecutor * ORC_RESTRICT ex)
+{
+  int i;
+  int n = ex->n;
+  orc_union32 *ORC_RESTRICT ptr0;
+  const orc_union32 *ORC_RESTRICT ptr4;
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var38;
+#else
+  orc_union32 var38;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var39;
+#else
+  orc_union32 var39;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var40;
+#else
+  orc_union32 var40;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var41;
+#else
+  orc_union32 var41;
+#endif
+  orc_union32 var42;
+  orc_union32 var43;
+  orc_union32 var44;
+  orc_union32 var45;
+  orc_union32 var46;
+  orc_union32 var47;
+  orc_union32 var48;
+  orc_union32 var49;
+  orc_union32 var50;
+  orc_union32 var51;
+  orc_union32 var52;
+
+  ptr0 = (orc_union32 *) ex->arrays[0];
+  ptr4 = (orc_union32 *) ex->arrays[4];
+
+  /* 1: loadpl */
+  var38.i = 0xff000000;         /* -16777216 or 2.11371e-314f */
+  /* 3: loadpl */
+  var39.i = 0x000000ff;         /* 255 or 1.25987e-321f */
+  /* 5: loadpl */
+  var40.i = 0x00ff0000;         /* 16711680 or 8.25667e-317f */
+  /* 7: loadpl */
+  var41.i = 0x0000ff00;         /* 65280 or 3.22526e-319f */
+
+  for (i = 0; i < n; i++) {
+    /* 0: loadl */
+    var43 = ptr4[i];
+    /* 2: andl */
+    var44.i = var43.i & var38.i;
+    /* 4: andl */
+    var45.i = var43.i & var39.i;
+    /* 6: andl */
+    var46.i = var43.i & var40.i;
+    /* 8: andl */
+    var47.i = var43.i & var41.i;
+    /* 9: shrul */
+    var48.i = ((orc_uint32) var44.i) >> 24;
+    /* 10: shll */
+    var49.i = ((orc_uint32) var45.i) << 8;
+    /* 11: shll */
+    var50.i = ((orc_uint32) var47.i) << 16;
+    /* 12: orl */
+    var51.i = var48.i | var49.i;
+    /* 13: orl */
+    var52.i = var51.i | var46.i;
+    /* 14: orl */
+    var42.i = var52.i | var50.i;
+    /* 15: storel */
+    ptr0[i] = var42;
+  }
+
+}
+
+void
+video_orc_unpack_RBGA_le (guint8 * ORC_RESTRICT d1,
+    const guint8 * ORC_RESTRICT s1, int n)
+{
+  OrcExecutor _ex, *ex = &_ex;
+  static volatile int p_inited = 0;
+  static OrcCode *c = 0;
+  void (*func) (OrcExecutor *);
+
+  if (!p_inited) {
+    orc_once_mutex_lock ();
+    if (!p_inited) {
+      OrcProgram *p;
+
+#if 1
+      static const orc_uint8 bc[] = {
+        1, 9, 24, 118, 105, 100, 101, 111, 95, 111, 114, 99, 95, 117, 110, 112,
+        97, 99, 107, 95, 82, 66, 71, 65, 95, 108, 101, 11, 4, 4, 12, 4,
+        4, 14, 4, 0, 0, 0, 255, 14, 4, 255, 0, 0, 0, 14, 4, 0,
+        0, 255, 0, 14, 4, 0, 255, 0, 0, 14, 4, 24, 0, 0, 0, 14,
+        4, 8, 0, 0, 0, 14, 4, 16, 0, 0, 0, 20, 4, 20, 4, 20,
+        4, 20, 4, 20, 4, 20, 4, 113, 32, 4, 106, 33, 32, 16, 106, 34,
+        32, 17, 106, 35, 32, 18, 106, 36, 32, 19, 126, 33, 33, 20, 124, 34,
+        34, 21, 124, 36, 36, 22, 123, 37, 33, 34, 123, 37, 37, 35, 123, 0,
+        37, 36, 2, 0,
+      };
+      p = orc_program_new_from_static_bytecode (bc);
+      orc_program_set_backup_function (p, _backup_video_orc_unpack_RBGA_le);
+#else
+      p = orc_program_new ();
+      orc_program_set_name (p, "video_orc_unpack_RBGA_le");
+      orc_program_set_backup_function (p, _backup_video_orc_unpack_RBGA_le);
+      orc_program_add_destination (p, 4, "d1");
+      orc_program_add_source (p, 4, "s1");
+      orc_program_add_constant (p, 4, 0xff000000, "c1");
+      orc_program_add_constant (p, 4, 0x000000ff, "c2");
+      orc_program_add_constant (p, 4, 0x00ff0000, "c3");
+      orc_program_add_constant (p, 4, 0x0000ff00, "c4");
+      orc_program_add_constant (p, 4, 0x00000018, "c5");
+      orc_program_add_constant (p, 4, 0x00000008, "c6");
+      orc_program_add_constant (p, 4, 0x00000010, "c7");
+      orc_program_add_temporary (p, 4, "t1");
+      orc_program_add_temporary (p, 4, "t2");
+      orc_program_add_temporary (p, 4, "t3");
+      orc_program_add_temporary (p, 4, "t4");
+      orc_program_add_temporary (p, 4, "t5");
+      orc_program_add_temporary (p, 4, "t6");
+
+      orc_program_append_2 (p, "loadl", 0, ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_D1,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "andl", 0, ORC_VAR_T2, ORC_VAR_T1, ORC_VAR_C1,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "andl", 0, ORC_VAR_T3, ORC_VAR_T1, ORC_VAR_C2,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "andl", 0, ORC_VAR_T4, ORC_VAR_T1, ORC_VAR_C3,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "andl", 0, ORC_VAR_T5, ORC_VAR_T1, ORC_VAR_C4,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "shrul", 0, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_C5,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "shll", 0, ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_C6,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "shll", 0, ORC_VAR_T5, ORC_VAR_T5, ORC_VAR_C7,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "orl", 0, ORC_VAR_T6, ORC_VAR_T2, ORC_VAR_T3,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "orl", 0, ORC_VAR_T6, ORC_VAR_T6, ORC_VAR_T4,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "orl", 0, ORC_VAR_D1, ORC_VAR_T6, ORC_VAR_T5,
+          ORC_VAR_D1);
+#endif
+
+      orc_program_compile (p);
+      c = orc_program_take_code (p);
+      orc_program_free (p);
+    }
+    p_inited = TRUE;
+    orc_once_mutex_unlock ();
+  }
+  ex->arrays[ORC_VAR_A2] = c;
+  ex->program = 0;
+
+  ex->n = n;
+  ex->arrays[ORC_VAR_D1] = d1;
+  ex->arrays[ORC_VAR_S1] = (void *) s1;
+
+  func = c->exec;
+  func (ex);
+}
+#endif
+
+
+/* video_orc_unpack_RBGA_be */
+#ifdef DISABLE_ORC
+void
+video_orc_unpack_RBGA_be (guint8 * ORC_RESTRICT d1,
+    const guint8 * ORC_RESTRICT s1, int n)
+{
+  int i;
+  orc_union32 *ORC_RESTRICT ptr0;
+  const orc_union32 *ORC_RESTRICT ptr4;
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var38;
+#else
+  orc_union32 var38;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var39;
+#else
+  orc_union32 var39;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var40;
+#else
+  orc_union32 var40;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var41;
+#else
+  orc_union32 var41;
+#endif
+  orc_union32 var42;
+  orc_union32 var43;
+  orc_union32 var44;
+  orc_union32 var45;
+  orc_union32 var46;
+  orc_union32 var47;
+  orc_union32 var48;
+  orc_union32 var49;
+  orc_union32 var50;
+  orc_union32 var51;
+  orc_union32 var52;
+
+  ptr0 = (orc_union32 *) d1;
+  ptr4 = (orc_union32 *) s1;
+
+  /* 1: loadpl */
+  var38.i = 0x000000ff;         /* 255 or 1.25987e-321f */
+  /* 3: loadpl */
+  var39.i = 0xff000000;         /* -16777216 or 2.11371e-314f */
+  /* 5: loadpl */
+  var40.i = 0x0000ff00;         /* 65280 or 3.22526e-319f */
+  /* 7: loadpl */
+  var41.i = 0x00ff0000;         /* 16711680 or 8.25667e-317f */
+
+  for (i = 0; i < n; i++) {
+    /* 0: loadl */
+    var43 = ptr4[i];
+    /* 2: andl */
+    var44.i = var43.i & var38.i;
+    /* 4: andl */
+    var45.i = var43.i & var39.i;
+    /* 6: andl */
+    var46.i = var43.i & var40.i;
+    /* 8: andl */
+    var47.i = var43.i & var41.i;
+    /* 9: shll */
+    var48.i = ((orc_uint32) var44.i) << 24;
+    /* 10: shrul */
+    var49.i = ((orc_uint32) var45.i) >> 8;
+    /* 11: shrul */
+    var50.i = ((orc_uint32) var47.i) >> 16;
+    /* 12: orl */
+    var51.i = var48.i | var49.i;
+    /* 13: orl */
+    var52.i = var51.i | var46.i;
+    /* 14: orl */
+    var42.i = var52.i | var50.i;
+    /* 15: storel */
+    ptr0[i] = var42;
+  }
+
+}
+
+#else
+static void
+_backup_video_orc_unpack_RBGA_be (OrcExecutor * ORC_RESTRICT ex)
+{
+  int i;
+  int n = ex->n;
+  orc_union32 *ORC_RESTRICT ptr0;
+  const orc_union32 *ORC_RESTRICT ptr4;
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var38;
+#else
+  orc_union32 var38;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var39;
+#else
+  orc_union32 var39;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var40;
+#else
+  orc_union32 var40;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var41;
+#else
+  orc_union32 var41;
+#endif
+  orc_union32 var42;
+  orc_union32 var43;
+  orc_union32 var44;
+  orc_union32 var45;
+  orc_union32 var46;
+  orc_union32 var47;
+  orc_union32 var48;
+  orc_union32 var49;
+  orc_union32 var50;
+  orc_union32 var51;
+  orc_union32 var52;
+
+  ptr0 = (orc_union32 *) ex->arrays[0];
+  ptr4 = (orc_union32 *) ex->arrays[4];
+
+  /* 1: loadpl */
+  var38.i = 0x000000ff;         /* 255 or 1.25987e-321f */
+  /* 3: loadpl */
+  var39.i = 0xff000000;         /* -16777216 or 2.11371e-314f */
+  /* 5: loadpl */
+  var40.i = 0x0000ff00;         /* 65280 or 3.22526e-319f */
+  /* 7: loadpl */
+  var41.i = 0x00ff0000;         /* 16711680 or 8.25667e-317f */
+
+  for (i = 0; i < n; i++) {
+    /* 0: loadl */
+    var43 = ptr4[i];
+    /* 2: andl */
+    var44.i = var43.i & var38.i;
+    /* 4: andl */
+    var45.i = var43.i & var39.i;
+    /* 6: andl */
+    var46.i = var43.i & var40.i;
+    /* 8: andl */
+    var47.i = var43.i & var41.i;
+    /* 9: shll */
+    var48.i = ((orc_uint32) var44.i) << 24;
+    /* 10: shrul */
+    var49.i = ((orc_uint32) var45.i) >> 8;
+    /* 11: shrul */
+    var50.i = ((orc_uint32) var47.i) >> 16;
+    /* 12: orl */
+    var51.i = var48.i | var49.i;
+    /* 13: orl */
+    var52.i = var51.i | var46.i;
+    /* 14: orl */
+    var42.i = var52.i | var50.i;
+    /* 15: storel */
+    ptr0[i] = var42;
+  }
+
+}
+
+void
+video_orc_unpack_RBGA_be (guint8 * ORC_RESTRICT d1,
+    const guint8 * ORC_RESTRICT s1, int n)
+{
+  OrcExecutor _ex, *ex = &_ex;
+  static volatile int p_inited = 0;
+  static OrcCode *c = 0;
+  void (*func) (OrcExecutor *);
+
+  if (!p_inited) {
+    orc_once_mutex_lock ();
+    if (!p_inited) {
+      OrcProgram *p;
+
+#if 1
+      static const orc_uint8 bc[] = {
+        1, 9, 24, 118, 105, 100, 101, 111, 95, 111, 114, 99, 95, 117, 110, 112,
+        97, 99, 107, 95, 82, 66, 71, 65, 95, 98, 101, 11, 4, 4, 12, 4,
+        4, 14, 4, 255, 0, 0, 0, 14, 4, 0, 0, 0, 255, 14, 4, 0,
+        255, 0, 0, 14, 4, 0, 0, 255, 0, 14, 4, 24, 0, 0, 0, 14,
+        4, 8, 0, 0, 0, 14, 4, 16, 0, 0, 0, 20, 4, 20, 4, 20,
+        4, 20, 4, 20, 4, 20, 4, 113, 32, 4, 106, 33, 32, 16, 106, 34,
+        32, 17, 106, 35, 32, 18, 106, 36, 32, 19, 124, 33, 33, 20, 126, 34,
+        34, 21, 126, 36, 36, 22, 123, 37, 33, 34, 123, 37, 37, 35, 123, 0,
+        37, 36, 2, 0,
+      };
+      p = orc_program_new_from_static_bytecode (bc);
+      orc_program_set_backup_function (p, _backup_video_orc_unpack_RBGA_be);
+#else
+      p = orc_program_new ();
+      orc_program_set_name (p, "video_orc_unpack_RBGA_be");
+      orc_program_set_backup_function (p, _backup_video_orc_unpack_RBGA_be);
+      orc_program_add_destination (p, 4, "d1");
+      orc_program_add_source (p, 4, "s1");
+      orc_program_add_constant (p, 4, 0x000000ff, "c1");
+      orc_program_add_constant (p, 4, 0xff000000, "c2");
+      orc_program_add_constant (p, 4, 0x0000ff00, "c3");
+      orc_program_add_constant (p, 4, 0x00ff0000, "c4");
+      orc_program_add_constant (p, 4, 0x00000018, "c5");
+      orc_program_add_constant (p, 4, 0x00000008, "c6");
+      orc_program_add_constant (p, 4, 0x00000010, "c7");
+      orc_program_add_temporary (p, 4, "t1");
+      orc_program_add_temporary (p, 4, "t2");
+      orc_program_add_temporary (p, 4, "t3");
+      orc_program_add_temporary (p, 4, "t4");
+      orc_program_add_temporary (p, 4, "t5");
+      orc_program_add_temporary (p, 4, "t6");
+
+      orc_program_append_2 (p, "loadl", 0, ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_D1,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "andl", 0, ORC_VAR_T2, ORC_VAR_T1, ORC_VAR_C1,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "andl", 0, ORC_VAR_T3, ORC_VAR_T1, ORC_VAR_C2,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "andl", 0, ORC_VAR_T4, ORC_VAR_T1, ORC_VAR_C3,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "andl", 0, ORC_VAR_T5, ORC_VAR_T1, ORC_VAR_C4,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "shll", 0, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_C5,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "shrul", 0, ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_C6,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "shrul", 0, ORC_VAR_T5, ORC_VAR_T5, ORC_VAR_C7,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "orl", 0, ORC_VAR_T6, ORC_VAR_T2, ORC_VAR_T3,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "orl", 0, ORC_VAR_T6, ORC_VAR_T6, ORC_VAR_T4,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "orl", 0, ORC_VAR_D1, ORC_VAR_T6, ORC_VAR_T5,
+          ORC_VAR_D1);
+#endif
+
+      orc_program_compile (p);
+      c = orc_program_take_code (p);
+      orc_program_free (p);
+    }
+    p_inited = TRUE;
+    orc_once_mutex_unlock ();
+  }
+  ex->arrays[ORC_VAR_A2] = c;
+  ex->program = 0;
+
+  ex->n = n;
+  ex->arrays[ORC_VAR_D1] = d1;
+  ex->arrays[ORC_VAR_S1] = (void *) s1;
+
+  func = c->exec;
+  func (ex);
+}
+#endif
+
+
+/* video_orc_pack_RBGA_le */
+#ifdef DISABLE_ORC
+void
+video_orc_pack_RBGA_le (guint8 * ORC_RESTRICT d1,
+    const guint8 * ORC_RESTRICT s1, int n)
+{
+  int i;
+  orc_union32 *ORC_RESTRICT ptr0;
+  const orc_union32 *ORC_RESTRICT ptr4;
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var38;
+#else
+  orc_union32 var38;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var39;
+#else
+  orc_union32 var39;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var40;
+#else
+  orc_union32 var40;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var41;
+#else
+  orc_union32 var41;
+#endif
+  orc_union32 var42;
+  orc_union32 var43;
+  orc_union32 var44;
+  orc_union32 var45;
+  orc_union32 var46;
+  orc_union32 var47;
+  orc_union32 var48;
+  orc_union32 var49;
+  orc_union32 var50;
+  orc_union32 var51;
+  orc_union32 var52;
+
+  ptr0 = (orc_union32 *) d1;
+  ptr4 = (orc_union32 *) s1;
+
+  /* 1: loadpl */
+  var38.i = 0x000000ff;         /* 255 or 1.25987e-321f */
+  /* 3: loadpl */
+  var39.i = 0x0000ff00;         /* 65280 or 3.22526e-319f */
+  /* 5: loadpl */
+  var40.i = 0x00ff0000;         /* 16711680 or 8.25667e-317f */
+  /* 7: loadpl */
+  var41.i = 0xff000000;         /* -16777216 or 2.11371e-314f */
+
+  for (i = 0; i < n; i++) {
+    /* 0: loadl */
+    var43 = ptr4[i];
+    /* 2: andl */
+    var44.i = var43.i & var38.i;
+    /* 4: andl */
+    var45.i = var43.i & var39.i;
+    /* 6: andl */
+    var46.i = var43.i & var40.i;
+    /* 8: andl */
+    var47.i = var43.i & var41.i;
+    /* 9: shll */
+    var48.i = ((orc_uint32) var44.i) << 24;
+    /* 10: shrul */
+    var49.i = ((orc_uint32) var45.i) >> 8;
+    /* 11: shrul */
+    var50.i = ((orc_uint32) var47.i) >> 16;
+    /* 12: orl */
+    var51.i = var48.i | var49.i;
+    /* 13: orl */
+    var52.i = var51.i | var46.i;
+    /* 14: orl */
+    var42.i = var52.i | var50.i;
+    /* 15: storel */
+    ptr0[i] = var42;
+  }
+
+}
+
+#else
+static void
+_backup_video_orc_pack_RBGA_le (OrcExecutor * ORC_RESTRICT ex)
+{
+  int i;
+  int n = ex->n;
+  orc_union32 *ORC_RESTRICT ptr0;
+  const orc_union32 *ORC_RESTRICT ptr4;
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var38;
+#else
+  orc_union32 var38;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var39;
+#else
+  orc_union32 var39;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var40;
+#else
+  orc_union32 var40;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var41;
+#else
+  orc_union32 var41;
+#endif
+  orc_union32 var42;
+  orc_union32 var43;
+  orc_union32 var44;
+  orc_union32 var45;
+  orc_union32 var46;
+  orc_union32 var47;
+  orc_union32 var48;
+  orc_union32 var49;
+  orc_union32 var50;
+  orc_union32 var51;
+  orc_union32 var52;
+
+  ptr0 = (orc_union32 *) ex->arrays[0];
+  ptr4 = (orc_union32 *) ex->arrays[4];
+
+  /* 1: loadpl */
+  var38.i = 0x000000ff;         /* 255 or 1.25987e-321f */
+  /* 3: loadpl */
+  var39.i = 0x0000ff00;         /* 65280 or 3.22526e-319f */
+  /* 5: loadpl */
+  var40.i = 0x00ff0000;         /* 16711680 or 8.25667e-317f */
+  /* 7: loadpl */
+  var41.i = 0xff000000;         /* -16777216 or 2.11371e-314f */
+
+  for (i = 0; i < n; i++) {
+    /* 0: loadl */
+    var43 = ptr4[i];
+    /* 2: andl */
+    var44.i = var43.i & var38.i;
+    /* 4: andl */
+    var45.i = var43.i & var39.i;
+    /* 6: andl */
+    var46.i = var43.i & var40.i;
+    /* 8: andl */
+    var47.i = var43.i & var41.i;
+    /* 9: shll */
+    var48.i = ((orc_uint32) var44.i) << 24;
+    /* 10: shrul */
+    var49.i = ((orc_uint32) var45.i) >> 8;
+    /* 11: shrul */
+    var50.i = ((orc_uint32) var47.i) >> 16;
+    /* 12: orl */
+    var51.i = var48.i | var49.i;
+    /* 13: orl */
+    var52.i = var51.i | var46.i;
+    /* 14: orl */
+    var42.i = var52.i | var50.i;
+    /* 15: storel */
+    ptr0[i] = var42;
+  }
+
+}
+
+void
+video_orc_pack_RBGA_le (guint8 * ORC_RESTRICT d1,
+    const guint8 * ORC_RESTRICT s1, int n)
+{
+  OrcExecutor _ex, *ex = &_ex;
+  static volatile int p_inited = 0;
+  static OrcCode *c = 0;
+  void (*func) (OrcExecutor *);
+
+  if (!p_inited) {
+    orc_once_mutex_lock ();
+    if (!p_inited) {
+      OrcProgram *p;
+
+#if 1
+      static const orc_uint8 bc[] = {
+        1, 9, 22, 118, 105, 100, 101, 111, 95, 111, 114, 99, 95, 112, 97, 99,
+        107, 95, 82, 66, 71, 65, 95, 108, 101, 11, 4, 4, 12, 4, 4, 14,
+        4, 255, 0, 0, 0, 14, 4, 0, 255, 0, 0, 14, 4, 0, 0, 255,
+        0, 14, 4, 0, 0, 0, 255, 14, 4, 24, 0, 0, 0, 14, 4, 8,
+        0, 0, 0, 14, 4, 16, 0, 0, 0, 20, 4, 20, 4, 20, 4, 20,
+        4, 20, 4, 20, 4, 113, 32, 4, 106, 33, 32, 16, 106, 34, 32, 17,
+        106, 35, 32, 18, 106, 36, 32, 19, 124, 33, 33, 20, 126, 34, 34, 21,
+        126, 36, 36, 22, 123, 37, 33, 34, 123, 37, 37, 35, 123, 0, 37, 36,
+        2, 0,
+      };
+      p = orc_program_new_from_static_bytecode (bc);
+      orc_program_set_backup_function (p, _backup_video_orc_pack_RBGA_le);
+#else
+      p = orc_program_new ();
+      orc_program_set_name (p, "video_orc_pack_RBGA_le");
+      orc_program_set_backup_function (p, _backup_video_orc_pack_RBGA_le);
+      orc_program_add_destination (p, 4, "d1");
+      orc_program_add_source (p, 4, "s1");
+      orc_program_add_constant (p, 4, 0x000000ff, "c1");
+      orc_program_add_constant (p, 4, 0x0000ff00, "c2");
+      orc_program_add_constant (p, 4, 0x00ff0000, "c3");
+      orc_program_add_constant (p, 4, 0xff000000, "c4");
+      orc_program_add_constant (p, 4, 0x00000018, "c5");
+      orc_program_add_constant (p, 4, 0x00000008, "c6");
+      orc_program_add_constant (p, 4, 0x00000010, "c7");
+      orc_program_add_temporary (p, 4, "t1");
+      orc_program_add_temporary (p, 4, "t2");
+      orc_program_add_temporary (p, 4, "t3");
+      orc_program_add_temporary (p, 4, "t4");
+      orc_program_add_temporary (p, 4, "t5");
+      orc_program_add_temporary (p, 4, "t6");
+
+      orc_program_append_2 (p, "loadl", 0, ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_D1,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "andl", 0, ORC_VAR_T2, ORC_VAR_T1, ORC_VAR_C1,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "andl", 0, ORC_VAR_T3, ORC_VAR_T1, ORC_VAR_C2,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "andl", 0, ORC_VAR_T4, ORC_VAR_T1, ORC_VAR_C3,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "andl", 0, ORC_VAR_T5, ORC_VAR_T1, ORC_VAR_C4,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "shll", 0, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_C5,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "shrul", 0, ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_C6,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "shrul", 0, ORC_VAR_T5, ORC_VAR_T5, ORC_VAR_C7,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "orl", 0, ORC_VAR_T6, ORC_VAR_T2, ORC_VAR_T3,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "orl", 0, ORC_VAR_T6, ORC_VAR_T6, ORC_VAR_T4,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "orl", 0, ORC_VAR_D1, ORC_VAR_T6, ORC_VAR_T5,
+          ORC_VAR_D1);
+#endif
+
+      orc_program_compile (p);
+      c = orc_program_take_code (p);
+      orc_program_free (p);
+    }
+    p_inited = TRUE;
+    orc_once_mutex_unlock ();
+  }
+  ex->arrays[ORC_VAR_A2] = c;
+  ex->program = 0;
+
+  ex->n = n;
+  ex->arrays[ORC_VAR_D1] = d1;
+  ex->arrays[ORC_VAR_S1] = (void *) s1;
+
+  func = c->exec;
+  func (ex);
+}
+#endif
+
+
+/* video_orc_pack_RBGA_be */
+#ifdef DISABLE_ORC
+void
+video_orc_pack_RBGA_be (guint8 * ORC_RESTRICT d1,
+    const guint8 * ORC_RESTRICT s1, int n)
+{
+  int i;
+  orc_union32 *ORC_RESTRICT ptr0;
+  const orc_union32 *ORC_RESTRICT ptr4;
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var38;
+#else
+  orc_union32 var38;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var39;
+#else
+  orc_union32 var39;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var40;
+#else
+  orc_union32 var40;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var41;
+#else
+  orc_union32 var41;
+#endif
+  orc_union32 var42;
+  orc_union32 var43;
+  orc_union32 var44;
+  orc_union32 var45;
+  orc_union32 var46;
+  orc_union32 var47;
+  orc_union32 var48;
+  orc_union32 var49;
+  orc_union32 var50;
+  orc_union32 var51;
+  orc_union32 var52;
+
+  ptr0 = (orc_union32 *) d1;
+  ptr4 = (orc_union32 *) s1;
+
+  /* 1: loadpl */
+  var38.i = 0xff000000;         /* -16777216 or 2.11371e-314f */
+  /* 3: loadpl */
+  var39.i = 0x00ff0000;         /* 16711680 or 8.25667e-317f */
+  /* 5: loadpl */
+  var40.i = 0x0000ff00;         /* 65280 or 3.22526e-319f */
+  /* 7: loadpl */
+  var41.i = 0x000000ff;         /* 255 or 1.25987e-321f */
+
+  for (i = 0; i < n; i++) {
+    /* 0: loadl */
+    var43 = ptr4[i];
+    /* 2: andl */
+    var44.i = var43.i & var38.i;
+    /* 4: andl */
+    var45.i = var43.i & var39.i;
+    /* 6: andl */
+    var46.i = var43.i & var40.i;
+    /* 8: andl */
+    var47.i = var43.i & var41.i;
+    /* 9: shrul */
+    var48.i = ((orc_uint32) var44.i) >> 24;
+    /* 10: shll */
+    var49.i = ((orc_uint32) var45.i) << 8;
+    /* 11: shll */
+    var50.i = ((orc_uint32) var47.i) << 16;
+    /* 12: orl */
+    var51.i = var48.i | var49.i;
+    /* 13: orl */
+    var52.i = var51.i | var46.i;
+    /* 14: orl */
+    var42.i = var52.i | var50.i;
+    /* 15: storel */
+    ptr0[i] = var42;
+  }
+
+}
+
+#else
+static void
+_backup_video_orc_pack_RBGA_be (OrcExecutor * ORC_RESTRICT ex)
+{
+  int i;
+  int n = ex->n;
+  orc_union32 *ORC_RESTRICT ptr0;
+  const orc_union32 *ORC_RESTRICT ptr4;
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var38;
+#else
+  orc_union32 var38;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var39;
+#else
+  orc_union32 var39;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var40;
+#else
+  orc_union32 var40;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var41;
+#else
+  orc_union32 var41;
+#endif
+  orc_union32 var42;
+  orc_union32 var43;
+  orc_union32 var44;
+  orc_union32 var45;
+  orc_union32 var46;
+  orc_union32 var47;
+  orc_union32 var48;
+  orc_union32 var49;
+  orc_union32 var50;
+  orc_union32 var51;
+  orc_union32 var52;
+
+  ptr0 = (orc_union32 *) ex->arrays[0];
+  ptr4 = (orc_union32 *) ex->arrays[4];
+
+  /* 1: loadpl */
+  var38.i = 0xff000000;         /* -16777216 or 2.11371e-314f */
+  /* 3: loadpl */
+  var39.i = 0x00ff0000;         /* 16711680 or 8.25667e-317f */
+  /* 5: loadpl */
+  var40.i = 0x0000ff00;         /* 65280 or 3.22526e-319f */
+  /* 7: loadpl */
+  var41.i = 0x000000ff;         /* 255 or 1.25987e-321f */
+
+  for (i = 0; i < n; i++) {
+    /* 0: loadl */
+    var43 = ptr4[i];
+    /* 2: andl */
+    var44.i = var43.i & var38.i;
+    /* 4: andl */
+    var45.i = var43.i & var39.i;
+    /* 6: andl */
+    var46.i = var43.i & var40.i;
+    /* 8: andl */
+    var47.i = var43.i & var41.i;
+    /* 9: shrul */
+    var48.i = ((orc_uint32) var44.i) >> 24;
+    /* 10: shll */
+    var49.i = ((orc_uint32) var45.i) << 8;
+    /* 11: shll */
+    var50.i = ((orc_uint32) var47.i) << 16;
+    /* 12: orl */
+    var51.i = var48.i | var49.i;
+    /* 13: orl */
+    var52.i = var51.i | var46.i;
+    /* 14: orl */
+    var42.i = var52.i | var50.i;
+    /* 15: storel */
+    ptr0[i] = var42;
+  }
+
+}
+
+void
+video_orc_pack_RBGA_be (guint8 * ORC_RESTRICT d1,
+    const guint8 * ORC_RESTRICT s1, int n)
+{
+  OrcExecutor _ex, *ex = &_ex;
+  static volatile int p_inited = 0;
+  static OrcCode *c = 0;
+  void (*func) (OrcExecutor *);
+
+  if (!p_inited) {
+    orc_once_mutex_lock ();
+    if (!p_inited) {
+      OrcProgram *p;
+
+#if 1
+      static const orc_uint8 bc[] = {
+        1, 9, 22, 118, 105, 100, 101, 111, 95, 111, 114, 99, 95, 112, 97, 99,
+        107, 95, 82, 66, 71, 65, 95, 98, 101, 11, 4, 4, 12, 4, 4, 14,
+        4, 0, 0, 0, 255, 14, 4, 0, 0, 255, 0, 14, 4, 0, 255, 0,
+        0, 14, 4, 255, 0, 0, 0, 14, 4, 24, 0, 0, 0, 14, 4, 8,
+        0, 0, 0, 14, 4, 16, 0, 0, 0, 20, 4, 20, 4, 20, 4, 20,
+        4, 20, 4, 20, 4, 113, 32, 4, 106, 33, 32, 16, 106, 34, 32, 17,
+        106, 35, 32, 18, 106, 36, 32, 19, 126, 33, 33, 20, 124, 34, 34, 21,
+        124, 36, 36, 22, 123, 37, 33, 34, 123, 37, 37, 35, 123, 0, 37, 36,
+        2, 0,
+      };
+      p = orc_program_new_from_static_bytecode (bc);
+      orc_program_set_backup_function (p, _backup_video_orc_pack_RBGA_be);
+#else
+      p = orc_program_new ();
+      orc_program_set_name (p, "video_orc_pack_RBGA_be");
+      orc_program_set_backup_function (p, _backup_video_orc_pack_RBGA_be);
+      orc_program_add_destination (p, 4, "d1");
+      orc_program_add_source (p, 4, "s1");
+      orc_program_add_constant (p, 4, 0xff000000, "c1");
+      orc_program_add_constant (p, 4, 0x00ff0000, "c2");
+      orc_program_add_constant (p, 4, 0x0000ff00, "c3");
+      orc_program_add_constant (p, 4, 0x000000ff, "c4");
+      orc_program_add_constant (p, 4, 0x00000018, "c5");
+      orc_program_add_constant (p, 4, 0x00000008, "c6");
+      orc_program_add_constant (p, 4, 0x00000010, "c7");
+      orc_program_add_temporary (p, 4, "t1");
+      orc_program_add_temporary (p, 4, "t2");
+      orc_program_add_temporary (p, 4, "t3");
+      orc_program_add_temporary (p, 4, "t4");
+      orc_program_add_temporary (p, 4, "t5");
+      orc_program_add_temporary (p, 4, "t6");
+
+      orc_program_append_2 (p, "loadl", 0, ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_D1,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "andl", 0, ORC_VAR_T2, ORC_VAR_T1, ORC_VAR_C1,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "andl", 0, ORC_VAR_T3, ORC_VAR_T1, ORC_VAR_C2,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "andl", 0, ORC_VAR_T4, ORC_VAR_T1, ORC_VAR_C3,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "andl", 0, ORC_VAR_T5, ORC_VAR_T1, ORC_VAR_C4,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "shrul", 0, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_C5,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "shll", 0, ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_C6,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "shll", 0, ORC_VAR_T5, ORC_VAR_T5, ORC_VAR_C7,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "orl", 0, ORC_VAR_T6, ORC_VAR_T2, ORC_VAR_T3,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "orl", 0, ORC_VAR_T6, ORC_VAR_T6, ORC_VAR_T4,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "orl", 0, ORC_VAR_D1, ORC_VAR_T6, ORC_VAR_T5,
+          ORC_VAR_D1);
+#endif
+
+      orc_program_compile (p);
+      c = orc_program_take_code (p);
+      orc_program_free (p);
+    }
+    p_inited = TRUE;
+    orc_once_mutex_unlock ();
+  }
+  ex->arrays[ORC_VAR_A2] = c;
+  ex->program = 0;
+
+  ex->n = n;
+  ex->arrays[ORC_VAR_D1] = d1;
+  ex->arrays[ORC_VAR_S1] = (void *) s1;
+
+  func = c->exec;
+  func (ex);
+}
+#endif
+
+
 /* video_orc_resample_bilinear_u32 */
 #ifdef DISABLE_ORC
 void
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-orc-dist.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-orc-dist.h
index 4f060205bdd..35a6b7fae08 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-orc-dist.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-orc-dist.h
@@ -143,6 +143,10 @@ void video_orc_unpack_BGR16 (guint32 * ORC_RESTRICT d1, const guint16 * ORC_REST
 void video_orc_unpack_BGR16_trunc (guint32 * ORC_RESTRICT d1, const guint16 * ORC_RESTRICT s1, int n);
 void video_orc_pack_BGR16_le (guint16 * ORC_RESTRICT d1, const guint32 * ORC_RESTRICT s1, int n);
 void video_orc_pack_BGR16_be (guint16 * ORC_RESTRICT d1, const guint32 * ORC_RESTRICT s1, int n);
+void video_orc_unpack_RBGA_le (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, int n);
+void video_orc_unpack_RBGA_be (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, int n);
+void video_orc_pack_RBGA_le (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, int n);
+void video_orc_pack_RBGA_be (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, int n);
 void video_orc_resample_bilinear_u32 (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, int p1, int p2, int n);
 void video_orc_merge_linear_u8 (orc_uint8 * ORC_RESTRICT d1, const orc_uint8 * ORC_RESTRICT s1, const orc_uint8 * ORC_RESTRICT s2, int p1, int n);
 void video_orc_memset_2d (guint8 * ORC_RESTRICT d1, int d1_stride, int p1, int n, int m);
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-orc.orc b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-orc.orc
index edc431899f9..63bb4d8e6d0 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-orc.orc
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-orc.orc
@@ -1022,6 +1022,94 @@ orl t2, r, g
 orl t2, t2, b
 select1lw rgb15, t2
 
+.function video_orc_unpack_RBGA_le
+.dest 4 argb guint8
+.source 4 rbga guint8
+.temp 4 t
+.temp 4 a
+.temp 4 r
+.temp 4 g
+.temp 4 b
+.temp 4 t2
+
+loadl t, rbga
+andl a, t, 0xff000000
+andl r, t, 0xff
+andl g, t, 0xff0000
+andl b, t, 0xff00
+shrul a, a, 24
+shll r, r, 8
+shll b, b, 16
+orl t2, a, r
+orl t2, t2, g
+orl argb, t2, b
+
+.function video_orc_unpack_RBGA_be
+.dest 4 argb guint8
+.source 4 rbga guint8
+.temp 4 t
+.temp 4 a
+.temp 4 r
+.temp 4 g
+.temp 4 b
+.temp 4 t2
+
+loadl t, rbga
+andl a, t, 0xff
+andl r, t, 0xff000000
+andl g, t, 0xff00
+andl b, t, 0xff0000
+shll a, a, 24
+shrul r, r, 8
+shrul b, b, 16
+orl t2, a, r
+orl t2, t2, g
+orl argb, t2, b
+
+.function video_orc_pack_RBGA_le
+.dest 4 rbga guint8
+.source 4 argb guint8
+.temp 4 t
+.temp 4 a
+.temp 4 r
+.temp 4 g
+.temp 4 b
+.temp 4 t2
+
+loadl t, argb
+andl a, t, 0xff
+andl r, t, 0xff00
+andl g, t, 0xff0000
+andl b, t, 0xff000000
+shll a, a, 24
+shrul r, r, 8
+shrul b, b, 16
+orl t2, a, r
+orl t2, t2, g
+orl rbga, t2, b
+
+.function video_orc_pack_RBGA_be
+.dest 4 rbga guint8
+.source 4 argb guint8
+.temp 4 t
+.temp 4 a
+.temp 4 r
+.temp 4 g
+.temp 4 b
+.temp 4 t2
+
+loadl t, argb
+andl a, t, 0xff000000
+andl r, t, 0xff0000
+andl g, t, 0xff00
+andl b, t, 0xff
+shrul a, a, 24
+shll r, r, 8
+shll b, b, 16
+orl t2, a, r
+orl t2, t2, g
+orl rbga, t2, b
+
 .function video_orc_resample_bilinear_u32
 .dest 4 d1 guint8
 .source 4 s1 guint8
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-overlay-composition.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-overlay-composition.c
index ea5484ecde0..c6cfc8b4c1d 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-overlay-composition.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video-overlay-composition.c
@@ -322,7 +322,7 @@ gst_video_overlay_composition_free (GstMiniObject * mini_obj)
   comp->rectangles = NULL;
   comp->num_rectangles = 0;
 
-  g_slice_free (GstVideoOverlayComposition, comp);
+  g_free (comp);
 }
 
 /**
@@ -346,7 +346,7 @@ gst_video_overlay_composition_new (GstVideoOverlayRectangle * rectangle)
   g_return_val_if_fail (GST_IS_VIDEO_OVERLAY_RECTANGLE (rectangle)
       || rectangle == NULL, NULL);
 
-  comp = g_slice_new0 (GstVideoOverlayComposition);
+  comp = g_new0 (GstVideoOverlayComposition, 1);
 
   gst_mini_object_init (GST_MINI_OBJECT_CAST (comp), 0,
       GST_TYPE_VIDEO_OVERLAY_COMPOSITION,
@@ -649,7 +649,7 @@ gst_video_overlay_rectangle_free (GstMiniObject * mini_obj)
   g_free (rect->initial_alpha);
   g_mutex_clear (&rect->lock);
 
-  g_slice_free (GstVideoOverlayRectangle, rect);
+  g_free (rect);
 }
 
 static inline gboolean
@@ -726,7 +726,7 @@ gst_video_overlay_rectangle_new_raw (GstBuffer * pixels,
       NULL);
   g_return_val_if_fail (height > 0 && width > 0, NULL);
 
-  rect = g_slice_new0 (GstVideoOverlayRectangle);
+  rect = g_new0 (GstVideoOverlayRectangle, 1);
 
   gst_mini_object_init (GST_MINI_OBJECT_CAST (rect), 0,
       GST_TYPE_VIDEO_OVERLAY_RECTANGLE,
@@ -1053,7 +1053,7 @@ gst_video_overlay_rectangle_apply_global_alpha (GstVideoOverlayRectangle * rect,
     for (j = 0; j < w; j++) {
       guint8 na = (guint8) (*src * global_alpha);
 
-      if (! !(rect->flags & GST_VIDEO_OVERLAY_FORMAT_FLAG_PREMULTIPLIED_ALPHA)) {
+      if (!!(rect->flags & GST_VIDEO_OVERLAY_FORMAT_FLAG_PREMULTIPLIED_ALPHA)) {
         dst[argb_r] =
             (guint8) ((double) (dst[argb_r] * 255) / (double) dst[argb_a]) *
             na / 255;
@@ -1201,11 +1201,11 @@ gst_video_overlay_rectangle_get_pixels_raw_internal (GstVideoOverlayRectangle *
   format = GST_VIDEO_INFO_FORMAT (&rectangle->info);
 
   apply_global_alpha =
-      (! !(rectangle->flags & GST_VIDEO_OVERLAY_FORMAT_FLAG_GLOBAL_ALPHA)
+      (!!(rectangle->flags & GST_VIDEO_OVERLAY_FORMAT_FLAG_GLOBAL_ALPHA)
       && !(flags & GST_VIDEO_OVERLAY_FORMAT_FLAG_GLOBAL_ALPHA));
   revert_global_alpha =
-      (! !(rectangle->flags & GST_VIDEO_OVERLAY_FORMAT_FLAG_GLOBAL_ALPHA)
-      && ! !(flags & GST_VIDEO_OVERLAY_FORMAT_FLAG_GLOBAL_ALPHA));
+      (!!(rectangle->flags & GST_VIDEO_OVERLAY_FORMAT_FLAG_GLOBAL_ALPHA)
+      && !!(flags & GST_VIDEO_OVERLAY_FORMAT_FLAG_GLOBAL_ALPHA));
 
   /* This assumes we don't need to adjust the format */
   if (wanted_width == width &&
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video.h
index b96db6b3cb2..c8ca5ae01ba 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/video.h
@@ -37,6 +37,9 @@ typedef struct _GstVideoAlignment GstVideoAlignment;
 #include <gst/video/video-scaler.h>
 #endif // GSTREAMER_LITE
 #include <gst/video/video-multiview.h>
+#ifndef GSTREAMER_LITE
+#include <gst/video/video-info-dma.h>
+#endif // GSTREAMER_LITE
 
 G_BEGIN_DECLS
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/videoorientation.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/videoorientation.c
index 31c75e7c7ce..6f6f5bad508 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/videoorientation.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/video/videoorientation.c
@@ -41,7 +41,6 @@
  * (aka making up for GstImplementsInterface removal) (probably yes) */
 
 G_DEFINE_INTERFACE (GstVideoOrientation, gst_video_orientation, 0)
-
      static void
          gst_video_orientation_default_init (GstVideoOrientationInterface *
     iface)
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst/audioconvert/gstaudioconvert.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst/audioconvert/gstaudioconvert.c
index 474dcaea8f9..4cf55ffc719 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst/audioconvert/gstaudioconvert.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst/audioconvert/gstaudioconvert.c
@@ -46,6 +46,9 @@
  *
  * A mix matrix can be passed to audioconvert, that will govern the
  * remapping of input to output channels.
+ * This is required if the input channels are unpositioned and no standard layout can be determined.
+ * If an empty mix matrix is specified, a (potentially truncated) identity matrix will be generated.
+ *
  * ## Example matrix generation code
  * To generate the matrix using code:
  *
@@ -73,8 +76,6 @@
  * gst-launch-1.0 audiotestsrc ! audio/x-raw, channels=4 ! audioconvert mix-matrix="<<(float)1.0, (float)0.0, (float)0.0, (float)0.0>, <(float)0.0, (float)1.0, (float)0.0, (float)0.0>>" ! audio/x-raw,channels=2 ! autoaudiosink
  * ]|
  *
- * > If an empty mix matrix is specified, a (potentially truncated)
- * > identity matrix will be generated.
  *
  * ## Example empty matrix generation code
  * |[
@@ -214,10 +215,18 @@ gst_audio_convert_class_init (GstAudioConvertClass * klass)
           GST_TYPE_AUDIO_NOISE_SHAPING_METHOD, GST_AUDIO_NOISE_SHAPING_NONE,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
+  /**
+   * GstAudioConvert:mix-matrix:
+   *
+   * Transformation matrix for input/output channels.
+   * Required if the input channels are unpositioned and no standard layout can be determined.
+   * Setting an empty matrix like \"< >\" will generate an identity matrix."
+   *
+   */
   g_object_class_install_property (gobject_class, PROP_MIX_MATRIX,
       gst_param_spec_array ("mix-matrix",
           "Input/output channel matrix",
-          "Transformation matrix for input/output channels",
+          "Transformation matrix for input/output channels.",
           gst_param_spec_array ("matrix-rows", "rows", "rows",
               g_param_spec_float ("matrix-cols", "cols", "cols",
                   -1, 1, 0,
@@ -310,13 +319,13 @@ gst_audio_convert_get_unit_size (GstBaseTransform * base, GstCaps * caps,
     goto parse_error;
 
   *size = info.bpf;
-  GST_INFO_OBJECT (base, "unit_size = %" G_GSIZE_FORMAT, *size);
+  GST_DEBUG_OBJECT (base, "unit_size = %" G_GSIZE_FORMAT, *size);
 
   return TRUE;
 
 parse_error:
   {
-    GST_INFO_OBJECT (base, "failed to parse caps to get unit_size");
+    GST_WARNING_OBJECT (base, "failed to parse caps to get unit_size");
     return FALSE;
   }
 }
@@ -345,8 +354,9 @@ remove_channels_from_structure (GstCapsFeatures * features, GstStructure * s,
   gint channels;
   GstAudioConvert *this = GST_AUDIO_CONVERT (user_data);
 
-  /* Only remove the channels and channel-mask for non-NONE layouts,
-   * or if a mix matrix was manually specified */
+  /* Only remove the channels and channel-mask if a (empty) mix matrix was manually specified,
+   * if no channel-mask is specified, for non-NONE channel layouts or for a single channel layout
+   */
   if (this->mix_matrix_is_set ||
       !gst_structure_get (s, "channel-mask", GST_TYPE_BITMASK, &mask, NULL) ||
       (mask != 0 || (gst_structure_get_int (s, "channels", &channels)
@@ -1006,7 +1016,8 @@ gst_audio_convert_set_property (GObject * object, guint prop_id,
       break;
     case PROP_MIX_MATRIX:
       if (!gst_value_array_get_size (value)) {
-        this->mix_matrix_is_set = FALSE;
+        g_value_copy (value, &this->mix_matrix);
+        this->mix_matrix_is_set = TRUE;
       } else {
         const GValue *first_row = gst_value_array_get_value (value, 0);
 
@@ -1017,7 +1028,8 @@ gst_audio_convert_set_property (GObject * object, guint prop_id,
           /* issue a reconfigure upstream */
           gst_base_transform_reconfigure_sink (GST_BASE_TRANSFORM (this));
         } else {
-          g_warning ("Empty mix matrix's first row");
+          g_warning ("Empty mix matrix's first row.");
+          this->mix_matrix_is_set = FALSE;
         }
       }
       break;
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst/typefind/gsttypefindfunctions.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst/typefind/gsttypefindfunctions.c
index fa90165dd5f..aeabd39db90 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst/typefind/gsttypefindfunctions.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst/typefind/gsttypefindfunctions.c
@@ -1047,8 +1047,8 @@ flac_type_find (GstTypeFind * tf, gpointer unused)
     return;
   }
 
-/* disabled because it happily typefinds /dev/urandom as audio/x-flac, and
- * because I yet have to see header-less flac in the wild */
+  /* disabled because it happily typefinds /dev/urandom as audio/x-flac, and
+   * because I yet have to see header-less flac in the wild */
 #if 0
   /* flac without headers (subset format) */
   /* 64K should be enough */
@@ -2073,9 +2073,6 @@ wavpack_type_find (GstTypeFind * tf, gpointer unused)
    * work in pull-mode */
   blocksize = GST_READ_UINT32_LE (data + 4);
   GST_LOG ("wavpack header, blocksize=0x%04x", blocksize);
-  /* If bigger than maximum allowed blocksize, refuse */
-  if (blocksize > 131072)
-    return;
   count_wv = 0;
   count_wvc = 0;
   offset = 32;
@@ -2088,32 +2085,39 @@ wavpack_type_find (GstTypeFind * tf, gpointer unused)
     if (data == NULL)
       break;
     sublen = ((guint32) data[1]) << 1;
+
+    // ID_LARGE
     if (data[0] & 0x80) {
       sublen |= (((guint32) data[2]) << 9) | (((guint32) data[3]) << 17);
       sublen += 1 + 3;          /* id + length */
     } else {
       sublen += 1 + 1;          /* id + length */
     }
+
+    // ID_ODD_SIZE only affects how much of the chunk is valid. The next one
+    // still starts at an even position, so it's ignored here.
+
     if (offset + sublen > 8 + blocksize) {
       GST_LOG ("chunk length too big (%u > %" G_GUINT64_FORMAT ")", sublen,
           blocksize - offset);
       break;
     }
-    if ((data[0] & 0x20) == 0) {
-      switch (data[0] & 0x0f) {
-        case 0xa:              /* ID_WV_BITSTREAM  */
-        case 0xc:              /* ID_WVX_BITSTREAM */
-          ++count_wv;
-          break;
-        case 0xb:              /* ID_WVC_BITSTREAM */
-          ++count_wvc;
-          break;
-        default:
-          break;
-      }
-      if (count_wv >= 5 || count_wvc >= 5)
+
+    switch (data[0] & 0x3f) {
+      case 0xa:                /* ID_WV_BITSTREAM  */
+      case 0xc:                /* ID_WVX_BITSTREAM */
+      case 0x2c:               /* ID_WVX_NEW_BITSTREAM */
+        ++count_wv;
+        break;
+      case 0xb:                /* ID_WVC_BITSTREAM */
+        ++count_wvc;
+        break;
+      default:
         break;
     }
+    if (count_wv >= 5 || count_wvc >= 5)
+      break;
+
     offset += sublen;
   }
 
@@ -4864,24 +4868,24 @@ ogganx_type_find (GstTypeFind * tf, gpointer private)
     GstOggStreamType stream_type;
   } markers[] = {
     {
-    "\001vorbis", 7, OGG_AUDIO}, {
-    "\200theora", 7, OGG_VIDEO}, {
-    "fLaC", 4, OGG_AUDIO}, {
-    "\177FLAC", 5, OGG_AUDIO}, {
-    "Speex", 5, OGG_AUDIO}, {
-    "CMML\0\0\0\0", 8, OGG_OTHER}, {
-    "PCM     ", 8, OGG_AUDIO}, {
-    "Annodex", 7, OGG_ANNODEX}, {
-    "fishead", 7, OGG_SKELETON}, {
-    "AnxData", 7, OGG_ANNODEX}, {
-    "CELT    ", 8, OGG_AUDIO}, {
-    "\200kate\0\0\0", 8, OGG_KATE}, {
-    "BBCD\0", 5, OGG_VIDEO}, {
-    "OVP80\1\1", 7, OGG_VIDEO}, {
-    "OpusHead", 8, OGG_AUDIO}, {
-    "\001audio\0\0\0", 9, OGG_AUDIO}, {
-    "\001video\0\0\0", 9, OGG_VIDEO}, {
-    "\001text\0\0\0", 9, OGG_OTHER}
+        "\001vorbis", 7, OGG_AUDIO}, {
+        "\200theora", 7, OGG_VIDEO}, {
+        "fLaC", 4, OGG_AUDIO}, {
+        "\177FLAC", 5, OGG_AUDIO}, {
+        "Speex", 5, OGG_AUDIO}, {
+        "CMML\0\0\0\0", 8, OGG_OTHER}, {
+        "PCM     ", 8, OGG_AUDIO}, {
+        "Annodex", 7, OGG_ANNODEX}, {
+        "fishead", 7, OGG_SKELETON}, {
+        "AnxData", 7, OGG_ANNODEX}, {
+        "CELT    ", 8, OGG_AUDIO}, {
+        "\200kate\0\0\0", 8, OGG_KATE}, {
+        "BBCD\0", 5, OGG_VIDEO}, {
+        "OVP80\1\1", 7, OGG_VIDEO}, {
+        "OpusHead", 8, OGG_AUDIO}, {
+        "\001audio\0\0\0", 9, OGG_AUDIO}, {
+        "\001video\0\0\0", 9, OGG_VIDEO}, {
+        "\001text\0\0\0", 9, OGG_OTHER}
   };
 
   while (c.offset < 4096 && data_scan_ctx_ensure_data (tf, &c, 64)) {
@@ -5508,6 +5512,699 @@ tap_type_find (GstTypeFind * tf, gpointer unused)
   }
 }
 
+/*** audio/x-brstm ***/
+
+static GstStaticCaps brstm_caps = GST_STATIC_CAPS ("audio/x-brstm");
+
+#define BRSTM_CAPS (gst_static_caps_get(&brstm_caps))
+static void
+brstm_type_find (GstTypeFind * tf, gpointer unused)
+{
+  const guint8 *data = gst_type_find_peek (tf, 0, 8);
+
+  if (data) {
+    if (GST_READ_UINT32_LE (data) != GST_MAKE_FOURCC ('R', 'S', 'T', 'M'))
+      return;
+    if (GST_READ_UINT32_LE (data + 4) != 0xfffe
+        && GST_READ_UINT32_LE (data + 4) != 0xfeff)
+      return;
+    gst_type_find_suggest (tf, GST_TYPE_FIND_MAXIMUM, BRSTM_CAPS);
+  }
+}
+
+/*** audio/x-bfstm ***/
+
+static GstStaticCaps bfstm_caps = GST_STATIC_CAPS ("audio/x-bfstm");
+
+#define BFSTM_CAPS (gst_static_caps_get(&bfstm_caps))
+static void
+bfstm_type_find (GstTypeFind * tf, gpointer unused)
+{
+  const guint8 *data = gst_type_find_peek (tf, 0, 8);
+
+  if (data) {
+    if (GST_READ_UINT32_LE (data) != GST_MAKE_FOURCC ('F', 'S', 'T', 'M') &&
+        GST_READ_UINT32_LE (data) != GST_MAKE_FOURCC ('C', 'S', 'T', 'M'))
+      return;
+    if (GST_READ_UINT32_LE (data + 4) != 0xfffe
+        && GST_READ_UINT32_LE (data + 4) != 0xfeff)
+      return;
+    gst_type_find_suggest (tf, GST_TYPE_FIND_MAXIMUM, BFSTM_CAPS);
+  }
+}
+
+/*** audio/x-dsf ***/
+
+static GstStaticCaps dsf_caps = GST_STATIC_CAPS ("audio/x-dsf");
+
+#define DSF_CAPS (gst_static_caps_get(&dsf_caps))
+static void
+dsf_type_find (GstTypeFind * tf, gpointer unused)
+{
+  const guint8 *data = gst_type_find_peek (tf, 0, 12);
+
+  if (data) {
+    if (memcmp (data, "DSD ", 4) != 0)
+      return;
+    if (GST_READ_UINT64_BE (data + 4) == 28)
+      return;
+
+    gst_type_find_suggest (tf, GST_TYPE_FIND_MAXIMUM, DSF_CAPS);
+  }
+}
+
+/*** video/x-ea ***/
+
+static GstStaticCaps ea_caps = GST_STATIC_CAPS ("video/x-ea");
+
+#define EA_CAPS (gst_static_caps_get(&ea_caps))
+static void
+ea_type_find (GstTypeFind * tf, gpointer unused)
+{
+  const guint8 *data = gst_type_find_peek (tf, 0, 8);
+
+  if (data) {
+    static const guint32 ea_fourccs[] = {
+      GST_MAKE_FOURCC ('I', 'S', 'N', 'h'),
+      GST_MAKE_FOURCC ('S', 'C', 'H', 'l'),
+      GST_MAKE_FOURCC ('S', 'E', 'A', 'D'),
+      GST_MAKE_FOURCC ('S', 'H', 'E', 'N'),
+      GST_MAKE_FOURCC ('k', 'V', 'G', 'T'),
+      GST_MAKE_FOURCC ('M', 'A', 'D', 'k'),
+      GST_MAKE_FOURCC ('M', 'P', 'C', 'h'),
+      GST_MAKE_FOURCC ('M', 'V', 'h', 'd'),
+      GST_MAKE_FOURCC ('M', 'V', 'I', 'h'),
+      GST_MAKE_FOURCC ('A', 'V', 'P', '6'),
+    };
+
+    guint32 fourcc = GST_READ_UINT32_LE (data);
+    gboolean found = FALSE;
+
+    for (gsize i = 0; i < G_N_ELEMENTS (ea_fourccs); i++) {
+      if (fourcc == ea_fourccs[i]) {
+        found = TRUE;
+        break;
+      }
+    }
+    if (!found)
+      return;
+
+    guint32 size = GST_READ_UINT32_LE (data + 4);
+    gboolean big_endian = size > 0x000fffff;
+    if (big_endian)
+      size = GUINT32_SWAP_LE_BE (size);
+    if (size > 0xfffff || size < 8)
+      return;
+
+    gst_type_find_suggest (tf, GST_TYPE_FIND_MAXIMUM, EA_CAPS);
+  }
+}
+
+/*** video/x-film-cpk ***/
+
+static GstStaticCaps film_cpk_caps = GST_STATIC_CAPS ("video/x-film-cpk");
+
+#define FILM_CPK_CAPS (gst_static_caps_get(&film_cpk_caps))
+static void
+film_cpk_type_find (GstTypeFind * tf, gpointer unused)
+{
+  const guint8 *data = gst_type_find_peek (tf, 0, 20);
+
+  if (data) {
+    if (GST_READ_UINT32_LE (data) != GST_MAKE_FOURCC ('F', 'I', 'L', 'M'))
+      return;
+    if (GST_READ_UINT32_LE (data + 16) != GST_MAKE_FOURCC ('F', 'D', 'S', 'C'))
+      return;
+
+    gst_type_find_suggest (tf, GST_TYPE_FIND_MAXIMUM, FILM_CPK_CAPS);
+  }
+}
+
+/*** application/gxf ***/
+
+static GstStaticCaps gxf_caps = GST_STATIC_CAPS ("application/gxf");
+
+#define GXF_CAPS (gst_static_caps_get(&gxf_caps))
+static void
+gxf_type_find (GstTypeFind * tf, gpointer unused)
+{
+  const guint8 *data = gst_type_find_peek (tf, 0, 16);
+
+  if (data) {
+    if (memcmp (data, "\x00\x00\x00\x00\x01\xbc", 6) != 0)
+      return;
+    if (memcmp (data + 10, "\x00\x00\x00\x00\xe1\xe2", 6) != 0)
+      return;
+    gst_type_find_suggest (tf, GST_TYPE_FIND_MAXIMUM, GXF_CAPS);
+  }
+}
+
+/*** application/x-iff ***/
+
+static GstStaticCaps iff_caps = GST_STATIC_CAPS ("application/x-iff");
+
+#define IFF_CAPS (gst_static_caps_get(&iff_caps))
+static void
+iff_type_find (GstTypeFind * tf, gpointer unused)
+{
+  const guint8 *data = gst_type_find_peek (tf, 0, 16);
+
+  if (data) {
+    if (GST_READ_UINT32_LE (data) == GST_MAKE_FOURCC ('F', 'O', 'R', 'M') &&
+        (GST_READ_UINT32_LE (data + 8) == GST_MAKE_FOURCC ('8', 'S', 'V', 'X')
+            || GST_READ_UINT32_LE (data + 8) == GST_MAKE_FOURCC ('1', '6', 'S',
+                'V')
+            || GST_READ_UINT32_LE (data + 8) == GST_MAKE_FOURCC ('M', 'A', 'U',
+                'D')
+            || GST_READ_UINT32_LE (data + 8) == GST_MAKE_FOURCC ('P', 'B', 'M',
+                ' ')
+            || GST_READ_UINT32_LE (data + 8) == GST_MAKE_FOURCC ('A', 'C', 'B',
+                'M')
+            || GST_READ_UINT32_LE (data + 8) == GST_MAKE_FOURCC ('D', 'E', 'E',
+                'P')
+            || GST_READ_UINT32_LE (data + 8) == GST_MAKE_FOURCC ('I', 'L', 'B',
+                'M')
+            || GST_READ_UINT32_LE (data + 8) == GST_MAKE_FOURCC ('R', 'G', 'B',
+                '8')
+            || GST_READ_UINT32_LE (data + 8) == GST_MAKE_FOURCC ('A', 'N', 'I',
+                'M')
+            || GST_READ_UINT32_LE (data + 8) == GST_MAKE_FOURCC ('R', 'G', 'B',
+                'N'))) {
+      gst_type_find_suggest (tf, GST_TYPE_FIND_MAXIMUM, IFF_CAPS);
+      return;
+    }
+
+    if (GST_READ_UINT32_LE (data) == GST_MAKE_FOURCC ('F', 'R', 'M', '8')
+        && GST_READ_UINT32_LE (data + 12) == GST_MAKE_FOURCC ('D', 'S', 'D',
+            ' ')) {
+      gst_type_find_suggest (tf, GST_TYPE_FIND_MAXIMUM, IFF_CAPS);
+      return;
+    }
+  }
+}
+
+/*** video/x-idcin ***/
+
+static GstStaticCaps idcin_caps = GST_STATIC_CAPS ("video/x-idcin");
+
+#define IDCIN_CAPS (gst_static_caps_get(&idcin_caps))
+static void
+idcin_type_find (GstTypeFind * tf, gpointer unused)
+{
+  const guint8 *data = gst_type_find_peek (tf, 0, 20 + 64 * 1024 + 4);
+  if (!data)
+    return;
+
+  // See ffmpeg/libavformat/idcin.c:idcin_probe() for details
+
+  guint number, sample_rate;
+  guint w, h;
+  gint i;
+
+  w = GST_READ_UINT32_LE (data);
+  if (w == 0 || w > 1024)
+    return;
+
+  h = GST_READ_UINT32_LE (data + 4);
+  if (h == 0 || h > 1024)
+    return;
+
+  sample_rate = GST_READ_UINT32_LE (data + 8);
+  if (sample_rate && (sample_rate < 8000 || sample_rate > 48000))
+    return;
+
+  number = GST_READ_UINT32_LE (data + 12);
+  if (number > 2 || (sample_rate && !number))
+    return;
+
+  number = GST_READ_UINT32_LE (data + 16);
+  if (number > 2 || (sample_rate && !number))
+    return;
+
+  i = 20 + 64 * 1024;
+  if (GST_READ_UINT32_LE (data + i) == 1)
+    i += 768;
+
+  data = gst_type_find_peek (tf, 0, 20 + 64 * 1024 + 768 + 12);
+  if (!data)
+    return;
+
+  if (GST_READ_UINT32_LE (data + i + 8) != w * h)
+    return;
+
+  gst_type_find_suggest (tf, GST_TYPE_FIND_POSSIBLE, IDCIN_CAPS);
+}
+
+/*** video/x-idcin ***/
+
+static GstStaticCaps mm_caps = GST_STATIC_CAPS ("application/x-mm");
+
+#define MM_CAPS (gst_static_caps_get(&mm_caps))
+static void
+mm_type_find (GstTypeFind * tf, gpointer unused)
+{
+  const guint8 *data = gst_type_find_peek (tf, 0, 24 + 6);
+  if (!data)
+    return;
+
+  // See ffmpeg/libavformat/mm.c:probe() for details
+  gint len, type, fps, w, h;
+
+  if (GST_READ_UINT16_LE (&data[0]) != 0x00)
+    return;
+  len = GST_READ_UINT32_LE (&data[2]);
+  if (len != 22 && len != 24)
+    return;
+  fps = GST_READ_UINT16_LE (&data[8]);
+  w = GST_READ_UINT16_LE (&data[12]);
+  h = GST_READ_UINT16_LE (&data[14]);
+  if (!fps || fps > 60 || !w || w > 2048 || !h || h > 2048)
+    return;
+  type = GST_READ_UINT16_LE (&data[len]);
+  if (!type || type > 0x31)
+    return;
+
+  gst_type_find_suggest (tf, GST_TYPE_FIND_POSSIBLE, MM_CAPS);
+}
+
+/*** video/x-ipmovie ***/
+
+static GstStaticCaps ipmovie_caps = GST_STATIC_CAPS ("video/x-ipmovie");
+
+#define IPMOVIE_CAPS (gst_static_caps_get(&ipmovie_caps))
+static void
+ipmovie_type_find (GstTypeFind * tf, gpointer unused)
+{
+  const guint8 *data;
+  guint64 length;
+
+  length = gst_type_find_get_length (tf);
+  if (length == 0 || length > 4096)
+    length = 4096;
+
+  static const char signature[] = "Interplay MVE File\x1A\0\x1A";
+  if (length < sizeof (signature))
+    return;
+
+  data = gst_type_find_peek (tf, 0, length);
+  if (!data)
+    return;
+
+  for (gsize i = 0; i < length - sizeof (signature); i++) {
+    if (memcmp (data + i, signature, sizeof (signature)) != 0) {
+      gst_type_find_suggest (tf, GST_TYPE_FIND_LIKELY, IPMOVIE_CAPS);
+      return;
+    }
+  }
+}
+
+/*** application/vnd.smaf ***/
+
+static GstStaticCaps mmf_caps = GST_STATIC_CAPS ("application/vnd.smaf");
+
+#define MMF_CAPS (gst_static_caps_get(&mmf_caps))
+static void
+mmf_type_find (GstTypeFind * tf, gpointer unused)
+{
+  const guint8 *data = gst_type_find_peek (tf, 0, 12);
+  if (!data)
+    return;
+
+  if (data[0] == 'M' && data[1] == 'M' &&
+      data[2] == 'M' && data[3] == 'D' &&
+      data[8] == 'C' && data[9] == 'N' && data[10] == 'T' && data[11] == 'I')
+    gst_type_find_suggest (tf, GST_TYPE_FIND_LIKELY, MMF_CAPS);
+}
+
+/*** video/x-nsv ***/
+
+static GstStaticCaps nsv_caps = GST_STATIC_CAPS ("video/x-nsv");
+
+#define NSV_CAPS (gst_static_caps_get(&nsv_caps))
+static void
+nsv_type_find (GstTypeFind * tf, gpointer unused)
+{
+  static const guint8 marker[4] = { 'N', 'S', 'V', 's', };
+  const guint8 *data;
+  guint64 length;
+  gsize i;
+
+  length = gst_type_find_get_length (tf);
+  if (length == 0 || length > 4096)
+    length = 4096;
+
+  data = gst_type_find_peek (tf, 0, length);
+  if (!data)
+    return;
+
+  if (length < 4)
+    return;
+
+  if (data[0] == 'N' && data[1] == 'S' &&
+      data[2] == 'V' && (data[3] == 'f' || data[3] == 's')) {
+    gst_type_find_suggest (tf, GST_TYPE_FIND_MAXIMUM, NSV_CAPS);
+    return;
+  }
+
+  if (length < 24)
+    return;
+
+  for (i = 1; i < length - 23; i++) {
+    if (memcmp (&data[i], marker, sizeof (marker)) == 0) {
+      gsize offset = i + 23;
+      if (offset < length) {
+        guint32 vsize = GST_READ_UINT24_LE (&data[i + 19]) >> 4;
+        guint32 asize = GST_READ_UINT16_LE (&data[i + 22]) >> 4;
+        offset += asize + vsize;
+        if (offset + 1 < length && GST_READ_UINT16_LE (&data[offset]) == 0xBEEF) {
+          gst_type_find_suggest (tf, GST_TYPE_FIND_NEARLY_CERTAIN, NSV_CAPS);
+          return;
+        }
+      }
+      gst_type_find_suggest (tf, GST_TYPE_FIND_MINIMUM, NSV_CAPS);
+      return;
+    }
+  }
+}
+
+/*** application/x-nut ***/
+
+static GstStaticCaps nut_caps = GST_STATIC_CAPS ("application/x-nut");
+
+#define NUT_CAPS (gst_static_caps_get(&nut_caps))
+static void
+nut_type_find (GstTypeFind * tf, gpointer unused)
+{
+  guint64 marker = (0x7A561F5F04ADULL + (((guint64) ('N' << 8) + 'M') << 48));
+  const guint8 *data;
+  guint64 length;
+  gsize i;
+
+  length = gst_type_find_get_length (tf);
+  if (length == 0 || length > 4096)
+    length = 4096;
+
+  data = gst_type_find_peek (tf, 0, length);
+  if (!data)
+    return;
+
+  if (length < 8)
+    return;
+
+  for (i = 0; i < length - 8; i++) {
+    if (GST_READ_UINT64_BE (&data[i]) == marker) {
+      gst_type_find_suggest (tf, GST_TYPE_FIND_MAXIMUM, NUT_CAPS);
+      return;
+    }
+  }
+}
+
+/*** application/x-pxstr ***/
+
+static GstStaticCaps pxstr_caps = GST_STATIC_CAPS ("application/x-pxstr");
+
+#define PXSTR_CAPS (gst_static_caps_get(&pxstr_caps))
+static void
+pxstr_type_find (GstTypeFind * tf, gpointer unused)
+{
+  static const guint8 sync_header[] =
+      { 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0x00
+  };
+  static const gsize raw_cd_sector_size = 2352;
+  const guint8 *data;
+  guint64 length;
+  int n_vid = 0, n_aud = 0;
+  gsize i;
+
+  length = gst_type_find_get_length (tf);
+  if (length == 0 || length > raw_cd_sector_size * 5)
+    length = raw_cd_sector_size * 5;
+
+  data = gst_type_find_peek (tf, 0, length);
+  if (!data)
+    return;
+
+  if (length < 12)
+    return;
+
+  if (GST_READ_UINT32_LE (data) == GST_MAKE_FOURCC ('R', 'I', 'F', 'F')
+      && GST_READ_UINT32_LE (&data[8]) == GST_MAKE_FOURCC ('C', 'D', 'X', 'A')) {
+    length -= 0x2C;
+    data = &data[0x2C];
+  }
+
+  // minimum CD sector size
+  if (length < raw_cd_sector_size)
+    return;
+
+  for (i = 0; i < length;) {
+    if (length - i > 0x25)
+      break;
+
+    if (memcmp (&data[i], sync_header, sizeof (sync_header)) != 0)
+      return;
+
+    if (data[i + 0x11] >= 32)
+      return;
+
+    switch (data[i + 0x12] & 0x0E) {
+        /* data and video */
+      case 0x08:
+      case 0x02:{
+        gint16 current_sector = (gint16) GST_READ_UINT16_LE (&data[i + 0x1C]);
+        gint16 sector_count = (gint16) GST_READ_UINT16_LE (&data[i + 0x1E]);
+        gint16 frame_size = (gint16) GST_READ_UINT16_LE (&data[i + 0x24]);
+
+        if (!(frame_size > 0
+                && current_sector < sector_count
+                && sector_count * 0x780 >= frame_size))
+          return;
+
+        n_vid++;
+        break;
+      }
+        /* audio */
+      case 0x04:{
+        if (data[i + 0x13] & 0x2A)
+          return;
+        n_aud++;
+        break;
+      }
+      default:
+        if (data[i + 0x12] & 0x0E)
+          return;
+        break;
+    }
+    i += raw_cd_sector_size;
+  }
+
+  if (n_aud + n_vid > 3)
+    gst_type_find_suggest (tf, GST_TYPE_FIND_POSSIBLE, PXSTR_CAPS);
+  else if (n_aud + n_vid)
+    gst_type_find_suggest (tf, GST_TYPE_FIND_MINIMUM, PXSTR_CAPS);
+}
+
+/*** application/x-smk ***/
+
+static GstStaticCaps smk_caps = GST_STATIC_CAPS ("application/x-smk");
+
+#define SMK_CAPS (gst_static_caps_get(&smk_caps))
+static void
+smk_type_find (GstTypeFind * tf, gpointer unused)
+{
+  const guint8 *data;
+  guint64 length;
+
+  length = gst_type_find_get_length (tf);
+  if (length == 0 || length > 12)
+    length = 12;
+
+  data = gst_type_find_peek (tf, 0, length);
+  if (!data)
+    return;
+
+  if (length < 12)
+    return;
+
+  if (GST_READ_UINT32_LE (data) != GST_MAKE_FOURCC ('S', 'M', 'K', '2')
+      && GST_READ_UINT32_LE (data) != GST_MAKE_FOURCC ('S', 'M', 'K', '4')) {
+    return;
+  }
+
+  if (GST_READ_UINT32_LE (&data[4]) > 32768
+      || GST_READ_UINT32_LE (&data[8]) > 32768) {
+    gst_type_find_suggest (tf, GST_TYPE_FIND_MINIMUM, SMK_CAPS);
+  } else {
+    gst_type_find_suggest (tf, GST_TYPE_FIND_MAXIMUM, SMK_CAPS);
+  }
+}
+
+/*** application/x-sol ***/
+
+static GstStaticCaps sol_caps = GST_STATIC_CAPS ("application/x-sol");
+
+#define SOL_CAPS (gst_static_caps_get(&sol_caps))
+static void
+sol_type_find (GstTypeFind * tf, gpointer unused)
+{
+  const guint8 *data;
+  guint64 length;
+  guint16 magic;
+
+  length = gst_type_find_get_length (tf);
+  if (length == 0 || length > 8)
+    length = 8;
+
+  data = gst_type_find_peek (tf, 0, length);
+  if (!data)
+    return;
+
+  if (length < 8)
+    return;
+
+  magic = (guint16) GST_READ_UINT32_LE (data);
+  if (magic != 0x0b8d && magic != 0x0c0d && magic != 0x0c8d)
+    return;
+
+  if (GST_READ_UINT32_BE (&data[4]) != GST_MAKE_FOURCC ('S', 'O', 'L', 0))
+    return;
+
+  gst_type_find_suggest (tf, GST_TYPE_FIND_MAXIMUM, SOL_CAPS);
+}
+
+/*** application/x-vmd ***/
+
+static GstStaticCaps vmd_caps = GST_STATIC_CAPS ("application/x-vmd");
+
+#define VMD_CAPS (gst_static_caps_get(&vmd_caps))
+static void
+vmd_type_find (GstTypeFind * tf, gpointer unused)
+{
+  const guint8 *data;
+  guint64 length;
+  int w, h, rate;
+
+  length = gst_type_find_get_length (tf);
+  if (length == 0 || length > 806)
+    length = 806;
+
+  data = gst_type_find_peek (tf, 0, length);
+  if (!data)
+    return;
+
+  if (length < 806)
+    return;
+
+  if (GST_READ_UINT16_LE (data) != 0x0330 - 2)
+    return;
+
+  w = GST_READ_UINT16_LE (&data[12]);
+  h = GST_READ_UINT16_LE (&data[14]);
+  rate = GST_READ_UINT16_LE (&data[804]);
+  if ((!w || w > 2048 || !h || h > 2048)
+      && rate != 22050)
+    return;
+  gst_type_find_suggest (tf, GST_TYPE_FIND_POSSIBLE, VMD_CAPS);
+}
+
+/*** application/x-wc3movie ***/
+
+static GstStaticCaps wc3movie_caps = GST_STATIC_CAPS ("application/x-wc3movie");
+
+#define WC3MOVIE_CAPS (gst_static_caps_get(&wc3movie_caps))
+static void
+wc3movie_type_find (GstTypeFind * tf, gpointer unused)
+{
+  const guint8 *data;
+  guint64 length;
+
+  length = gst_type_find_get_length (tf);
+  if (length == 0 || length > 12)
+    length = 12;
+
+  data = gst_type_find_peek (tf, 0, length);
+  if (!data)
+    return;
+
+  if (length < 12)
+    return;
+
+  if (GST_READ_UINT32_LE (data) != GST_MAKE_FOURCC ('F', 'O', 'R', 'M')
+      || GST_READ_UINT32_LE (&data[8]) != GST_MAKE_FOURCC ('M', 'O', 'V', 'E'))
+    return;
+
+  gst_type_find_suggest (tf, GST_TYPE_FIND_MAXIMUM, WC3MOVIE_CAPS);
+}
+
+/*** application/x-wsaud ***/
+
+static GstStaticCaps wsaud_caps = GST_STATIC_CAPS ("application/x-wsaud");
+
+#define WSAUD_CAPS (gst_static_caps_get(&wsaud_caps))
+static void
+wsaud_type_find (GstTypeFind * tf, gpointer unused)
+{
+  const guint8 *data;
+  guint64 length;
+  int rate;
+
+  length = gst_type_find_get_length (tf);
+  if (length == 0 || length > 20)
+    length = 20;
+
+  data = gst_type_find_peek (tf, 0, length);
+  if (!data)
+    return;
+
+  if (length < 20)
+    return;
+
+  rate = GST_READ_UINT16_LE (data);
+  if (rate < 8000 || rate > 48000)
+    return;
+
+  if (data[10] & 0xfc)
+    return;
+
+  if (data[11] != 99 && data[11] != 1)
+    return;
+
+  if (GST_READ_UINT32_LE (&data[16]) != 0x0000DEAF)
+    return;
+
+  gst_type_find_suggest (tf, GST_TYPE_FIND_POSSIBLE, WSAUD_CAPS);
+}
+
+/*** application/x-wsvqa ***/
+
+static GstStaticCaps wsvqa_caps = GST_STATIC_CAPS ("application/x-wsvqa");
+
+#define WSVQA_CAPS (gst_static_caps_get(&wsvqa_caps))
+static void
+wsvqa_type_find (GstTypeFind * tf, gpointer unused)
+{
+  const guint8 *data;
+  guint64 length;
+
+  length = gst_type_find_get_length (tf);
+  if (length == 0 || length > 12)
+    length = 12;
+
+  data = gst_type_find_peek (tf, 0, length);
+  if (!data)
+    return;
+
+  if (length < 12)
+    return;
+
+  if (GST_READ_UINT32_BE (data) != GST_MAKE_FOURCC ('F', 'O', 'R', 'M')
+      || GST_READ_UINT32_BE (&data[8]) != GST_MAKE_FOURCC ('W', 'V', 'Q', 'A'))
+    return;
+
+  gst_type_find_suggest (tf, GST_TYPE_FIND_MAXIMUM, WSVQA_CAPS);
+}
+
 /*** video/vivo ***/
 
 static GstStaticCaps vivo_caps = GST_STATIC_CAPS ("video/vivo");
@@ -6209,4 +6906,45 @@ GST_TYPE_FIND_REGISTER_DEFINE (aa, "audio/audible", GST_RANK_MARGINAL,
     aa_type_find, "aa,aax", AA_CAPS, NULL, NULL);
 GST_TYPE_FIND_REGISTER_DEFINE (tap, "audio/x-tap-tap", GST_RANK_PRIMARY,
     tap_type_find, "tap", TAP_CAPS, NULL, NULL);
-#endif // GSTREAMER_LITE
\ No newline at end of file
+GST_TYPE_FIND_REGISTER_DEFINE (brstm, "audio/x-brstm", GST_RANK_SECONDARY,
+    brstm_type_find, "brstm", BRSTM_CAPS, NULL, NULL);
+GST_TYPE_FIND_REGISTER_DEFINE (bfstm, "audio/x-bfstm", GST_RANK_SECONDARY,
+    bfstm_type_find, "bfstm,bcstm", BFSTM_CAPS, NULL, NULL);
+GST_TYPE_FIND_REGISTER_DEFINE (dsf, "audio/x-dsf", GST_RANK_PRIMARY,
+    dsf_type_find, NULL, DSF_CAPS, NULL, NULL);
+GST_TYPE_FIND_REGISTER_DEFINE (ea, "video/x-ea", GST_RANK_SECONDARY,
+    ea_type_find, NULL, EA_CAPS, NULL, NULL);
+GST_TYPE_FIND_REGISTER_DEFINE (film_cpk, "video/x-film-cpk", GST_RANK_SECONDARY,
+    film_cpk_type_find, "cpk", FILM_CPK_CAPS, NULL, NULL);
+GST_TYPE_FIND_REGISTER_DEFINE (gxf, "application/gxf", GST_RANK_SECONDARY,
+    gxf_type_find, NULL, GXF_CAPS, NULL, NULL);
+GST_TYPE_FIND_REGISTER_DEFINE (iff, "application/x-iff", GST_RANK_SECONDARY,
+    iff_type_find, NULL, IFF_CAPS, NULL, NULL);
+GST_TYPE_FIND_REGISTER_DEFINE (ipmovie, "application/x-ipmovie",
+    GST_RANK_SECONDARY, ipmovie_type_find, NULL, IPMOVIE_CAPS, NULL, NULL);
+GST_TYPE_FIND_REGISTER_DEFINE (idcin, "video/x-idcin", GST_RANK_MARGINAL,
+    idcin_type_find, NULL, IDCIN_CAPS, NULL, NULL);
+GST_TYPE_FIND_REGISTER_DEFINE (mm, "application/x-mm", GST_RANK_MARGINAL,
+    mm_type_find, NULL, MM_CAPS, NULL, NULL);
+GST_TYPE_FIND_REGISTER_DEFINE (mmf, "application/vnd.smaf", GST_RANK_SECONDARY,
+    mmf_type_find, "mmf", MMF_CAPS, NULL, NULL);
+GST_TYPE_FIND_REGISTER_DEFINE (nsv, "video/x-nsv", GST_RANK_MARGINAL,
+    nsv_type_find, "nsv", NSV_CAPS, NULL, NULL);
+GST_TYPE_FIND_REGISTER_DEFINE (nut, "application/x-nut", GST_RANK_MARGINAL,
+    nut_type_find, "nut", NUT_CAPS, NULL, NULL);
+GST_TYPE_FIND_REGISTER_DEFINE (pxstr, "application/x-pxstr", GST_RANK_MARGINAL,
+    pxstr_type_find, "pxstr", PXSTR_CAPS, NULL, NULL);
+GST_TYPE_FIND_REGISTER_DEFINE (smk, "application/x-smk", GST_RANK_MARGINAL,
+    smk_type_find, "smk", SMK_CAPS, NULL, NULL);
+GST_TYPE_FIND_REGISTER_DEFINE (sol, "application/x-sol", GST_RANK_MARGINAL,
+    sol_type_find, "sol", SOL_CAPS, NULL, NULL);
+GST_TYPE_FIND_REGISTER_DEFINE (vmd, "application/x-vmd", GST_RANK_MARGINAL,
+    vmd_type_find, "vmd", VMD_CAPS, NULL, NULL);
+GST_TYPE_FIND_REGISTER_DEFINE (wc3movie, "application/x-wc3movie",
+    GST_RANK_MARGINAL, wc3movie_type_find, "wc3movie", WC3MOVIE_CAPS, NULL,
+    NULL);
+GST_TYPE_FIND_REGISTER_DEFINE (wsaud, "application/x-wsaud", GST_RANK_MARGINAL,
+    wsaud_type_find, "wsaud", WSAUD_CAPS, NULL, NULL);
+GST_TYPE_FIND_REGISTER_DEFINE (wsvqa, "application/x-wsvqa", GST_RANK_MARGINAL,
+    wsvqa_type_find, "wsvqa", WSVQA_CAPS, NULL, NULL);
+#endif // GSTREAMER_LITE
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst/typefind/gsttypefindfunctionsdata.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst/typefind/gsttypefindfunctionsdata.c
index b2c3d87ee57..55a78313961 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst/typefind/gsttypefindfunctionsdata.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst/typefind/gsttypefindfunctionsdata.c
@@ -35,5 +35,5 @@ sw_data_destroy (GstTypeFindData * sw_data)
 {
   if (G_LIKELY (sw_data->caps != NULL))
     gst_caps_unref (sw_data->caps);
-  g_slice_free (GstTypeFindData, sw_data);
+  g_free (sw_data);
 }
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst/typefind/gsttypefindfunctionsplugin.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst/typefind/gsttypefindfunctionsplugin.c
index c1a6d7e668a..f71e8498cff 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst/typefind/gsttypefindfunctionsplugin.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst/typefind/gsttypefindfunctionsplugin.c
@@ -48,15 +48,18 @@ plugin_init (GstPlugin * plugin)
 
 #ifndef GSTREAMER_LITE
   /*Riff Type find register */
+  GST_TYPE_FIND_REGISTER (fourxm, plugin);
   GST_TYPE_FIND_REGISTER (avi, plugin);
   GST_TYPE_FIND_REGISTER (qcp, plugin);
   GST_TYPE_FIND_REGISTER (cdxa, plugin);
   GST_TYPE_FIND_REGISTER (riff_mid, plugin);
   GST_TYPE_FIND_REGISTER (wav, plugin);
   GST_TYPE_FIND_REGISTER (webp, plugin);
+  GST_TYPE_FIND_REGISTER (xwma, plugin);
 
   /*'Start with' Type find register */
   GST_TYPE_FIND_REGISTER (asf, plugin);
+  GST_TYPE_FIND_REGISTER (avs, plugin);
   GST_TYPE_FIND_REGISTER (vcd, plugin);
   GST_TYPE_FIND_REGISTER (imelody, plugin);
   GST_TYPE_FIND_REGISTER (scc, plugin);
@@ -209,6 +212,13 @@ plugin_init (GstPlugin * plugin)
   GST_TYPE_FIND_REGISTER (pva, plugin);
   GST_TYPE_FIND_REGISTER (aa, plugin);
   GST_TYPE_FIND_REGISTER (tap, plugin);
+  GST_TYPE_FIND_REGISTER (brstm, plugin);
+  GST_TYPE_FIND_REGISTER (bfstm, plugin);
+  GST_TYPE_FIND_REGISTER (dsf, plugin);
+  GST_TYPE_FIND_REGISTER (ea, plugin);
+  GST_TYPE_FIND_REGISTER (film_cpk, plugin);
+  GST_TYPE_FIND_REGISTER (gxf, plugin);
+  GST_TYPE_FIND_REGISTER (iff, plugin);
 #endif // GSTREAMER_LITE
 
   return TRUE;
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst/typefind/gsttypefindfunctionsplugin.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst/typefind/gsttypefindfunctionsplugin.h
index 0dfbc700b00..f23b99e4583 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst/typefind/gsttypefindfunctionsplugin.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst/typefind/gsttypefindfunctionsplugin.h
@@ -41,9 +41,12 @@ GST_TYPE_FIND_REGISTER_DECLARE (cdxa);
 GST_TYPE_FIND_REGISTER_DECLARE (riff_mid);
 GST_TYPE_FIND_REGISTER_DECLARE (wav);
 GST_TYPE_FIND_REGISTER_DECLARE (webp);
+GST_TYPE_FIND_REGISTER_DECLARE (fourxm);
+GST_TYPE_FIND_REGISTER_DECLARE (xwma);
 
 /*'Start with' type find declaration */
 GST_TYPE_FIND_REGISTER_DECLARE (asf);
+GST_TYPE_FIND_REGISTER_DECLARE (avs);
 GST_TYPE_FIND_REGISTER_DECLARE (vcd);
 GST_TYPE_FIND_REGISTER_DECLARE (imelody);
 GST_TYPE_FIND_REGISTER_DECLARE (scc);
@@ -91,6 +94,7 @@ GST_TYPE_FIND_REGISTER_DECLARE (ds_store);
 GST_TYPE_FIND_REGISTER_DECLARE (psd);
 GST_TYPE_FIND_REGISTER_DECLARE (xi);
 GST_TYPE_FIND_REGISTER_DECLARE (dmp);
+GST_TYPE_FIND_REGISTER_DECLARE (yuv4mpeg);
 
 /*Type find declaration by functions */
 GST_TYPE_FIND_REGISTER_DECLARE (musepack);
@@ -195,5 +199,25 @@ GST_TYPE_FIND_REGISTER_DECLARE (ssa);
 GST_TYPE_FIND_REGISTER_DECLARE (pva);
 GST_TYPE_FIND_REGISTER_DECLARE (aa);
 GST_TYPE_FIND_REGISTER_DECLARE (tap);
+GST_TYPE_FIND_REGISTER_DECLARE (brstm);
+GST_TYPE_FIND_REGISTER_DECLARE (bfstm);
+GST_TYPE_FIND_REGISTER_DECLARE (dsf);
+GST_TYPE_FIND_REGISTER_DECLARE (ea);
+GST_TYPE_FIND_REGISTER_DECLARE (film_cpk);
+GST_TYPE_FIND_REGISTER_DECLARE (gxf);
+GST_TYPE_FIND_REGISTER_DECLARE (iff);
+GST_TYPE_FIND_REGISTER_DECLARE (idcin);
+GST_TYPE_FIND_REGISTER_DECLARE (ipmovie);
+GST_TYPE_FIND_REGISTER_DECLARE (mm);
+GST_TYPE_FIND_REGISTER_DECLARE (mmf);
+GST_TYPE_FIND_REGISTER_DECLARE (nsv);
+GST_TYPE_FIND_REGISTER_DECLARE (nut);
+GST_TYPE_FIND_REGISTER_DECLARE (pxstr);
+GST_TYPE_FIND_REGISTER_DECLARE (smk);
+GST_TYPE_FIND_REGISTER_DECLARE (sol);
+GST_TYPE_FIND_REGISTER_DECLARE (vmd);
+GST_TYPE_FIND_REGISTER_DECLARE (wc3movie);
+GST_TYPE_FIND_REGISTER_DECLARE (wsaud);
+GST_TYPE_FIND_REGISTER_DECLARE (wsvqa);
 
 #endif //__GST_TYPE_FIND_FUNCTIONS_PLUGIN_H__
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst/typefind/gsttypefindfunctionsriff.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst/typefind/gsttypefindfunctionsriff.c
index fb9308d7c05..98823c43700 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst/typefind/gsttypefindfunctionsriff.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst/typefind/gsttypefindfunctionsriff.c
@@ -52,7 +52,7 @@ G_BEGIN_DECLS \
 static gboolean \
 G_PASTE(_private_type_find_riff_, typefind_name) (GstPlugin * plugin) \
 { \
-  GstTypeFindData *sw_data = g_slice_new (GstTypeFindData);             \
+  GstTypeFindData *sw_data = g_new (GstTypeFindData, 1);             \
   sw_data->data = (gpointer)_data;                                      \
   sw_data->size = 4;                                                    \
   sw_data->probability = GST_TYPE_FIND_MAXIMUM;                         \
@@ -81,3 +81,7 @@ TYPE_FIND_REGISTER_RIFF_DEFINE (wav, "audio/x-wav", GST_RANK_PRIMARY, "wav",
     "WAVE");
 TYPE_FIND_REGISTER_RIFF_DEFINE (webp, "image/webp", GST_RANK_PRIMARY,
     "webp", "WEBP");
+TYPE_FIND_REGISTER_RIFF_DEFINE (fourxm, "video/x-4xm", GST_RANK_PRIMARY,
+    NULL, "4XMV");
+TYPE_FIND_REGISTER_RIFF_DEFINE (xwma, "audio/x-xwma", GST_RANK_PRIMARY,
+    NULL, "XWMA");
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst/typefind/gsttypefindfunctionsstartwith.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst/typefind/gsttypefindfunctionsstartwith.c
index 14092e9cc86..c3e3e286db9 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst/typefind/gsttypefindfunctionsstartwith.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst/typefind/gsttypefindfunctionsstartwith.c
@@ -53,7 +53,7 @@ G_BEGIN_DECLS \
 static gboolean \
 G_PASTE(_private_type_find_start_with_, typefind_name) (GstPlugin * plugin) \
 { \
-  GstTypeFindData *sw_data = g_slice_new (GstTypeFindData);             \
+  GstTypeFindData *sw_data = g_new (GstTypeFindData, 1);             \
   sw_data->data = (const guint8 *)_data;                                \
   sw_data->size = _size;                                                \
   sw_data->probability = _probability;                                  \
@@ -177,3 +177,7 @@ TYPE_FIND_REGISTER_START_WITH_DEFINE (xi, "audio/x-xi", GST_RANK_SECONDARY,
     "xi", "Extended Instrument: ", 21, GST_TYPE_FIND_MAXIMUM);
 TYPE_FIND_REGISTER_START_WITH_DEFINE (dmp, "audio/x-tap-dmp",
     GST_RANK_SECONDARY, "dmp", "DC2N-TAP-RAW", 12, GST_TYPE_FIND_LIKELY);
+TYPE_FIND_REGISTER_START_WITH_DEFINE (avs, "video/x-avs",
+    GST_RANK_SECONDARY, NULL, "wW\x10\x00", 4, GST_TYPE_FIND_LIKELY);
+TYPE_FIND_REGISTER_START_WITH_DEFINE (yuv4mpeg, "application/x-yuv4mpeg",
+    GST_RANK_MARGINAL, NULL, "YUV4MPEG2", 9, GST_TYPE_FIND_MAXIMUM);
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst/volume/gstvolume.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst/volume/gstvolume.c
index a6a80a8e2a0..a8f04d73b9b 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst/volume/gstvolume.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst/volume/gstvolume.c
@@ -62,8 +62,7 @@
 #include "gstvolume.h"
 
 /* some defines for audio processing */
-/* the volume factor is a range from 0.0 to (arbitrary) VOLUME_MAX_DOUBLE = 10.0
- * we map 1.0 to VOLUME_UNITY_INT*
+/* we map VOLUME_UNITY_INT* to volume = 1.0
  */
 #define VOLUME_UNITY_INT8            8  /* internal int for unity 2^(8-5) */
 #define VOLUME_UNITY_INT8_BIT_SHIFT  3  /* number of bits to shift for unity */
@@ -73,7 +72,6 @@
 #define VOLUME_UNITY_INT24_BIT_SHIFT 19 /* number of bits to shift for unity */
 #define VOLUME_UNITY_INT32           134217728  /* internal int for unity 2^(32-5) */
 #define VOLUME_UNITY_INT32_BIT_SHIFT 27
-#define VOLUME_MAX_DOUBLE            10.0
 #define VOLUME_MAX_INT8              G_MAXINT8
 #define VOLUME_MIN_INT8              G_MININT8
 #define VOLUME_MAX_INT16             G_MAXINT16
@@ -82,6 +80,8 @@
 #define VOLUME_MIN_INT24             -8388608
 #define VOLUME_MAX_INT32             G_MAXINT32
 #define VOLUME_MIN_INT32             G_MININT32
+#define VOLUME_MAX_INT64             G_MAXINT64
+#define VOLUME_MIN_INT64             G_MININT64
 
 #define GST_CAT_DEFAULT gst_volume_debug
 GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
@@ -100,7 +100,8 @@ enum
 {
   PROP_0,
   PROP_MUTE,
-  PROP_VOLUME
+  PROP_VOLUME,
+  PROP_VOLUME_FULL_RANGE
 };
 
 #if G_BYTE_ORDER == G_LITTLE_ENDIAN
@@ -144,24 +145,32 @@ static void volume_process_int32 (GstVolume * self, gpointer bytes,
     guint n_bytes);
 static void volume_process_int32_clamp (GstVolume * self, gpointer bytes,
     guint n_bytes);
+static void volume_process_int32_via_double_with_clamp (GstVolume * self,
+    gpointer bytes, guint n_bytes);
 static void volume_process_controlled_int32_clamp (GstVolume * self,
     gpointer bytes, gdouble * volume, guint channels, guint n_bytes);
 static void volume_process_int24 (GstVolume * self, gpointer bytes,
     guint n_bytes);
 static void volume_process_int24_clamp (GstVolume * self, gpointer bytes,
     guint n_bytes);
+static void volume_process_int24_via_float_with_clamp (GstVolume * self,
+    gpointer bytes, guint n_bytes);
 static void volume_process_controlled_int24_clamp (GstVolume * self,
     gpointer bytes, gdouble * volume, guint channels, guint n_bytes);
 static void volume_process_int16 (GstVolume * self, gpointer bytes,
     guint n_bytes);
 static void volume_process_int16_clamp (GstVolume * self, gpointer bytes,
     guint n_bytes);
+static void volume_process_int16_via_float_with_clamp (GstVolume * self,
+    gpointer bytes, guint n_bytes);
 static void volume_process_controlled_int16_clamp (GstVolume * self,
     gpointer bytes, gdouble * volume, guint channels, guint n_bytes);
 static void volume_process_int8 (GstVolume * self, gpointer bytes,
     guint n_bytes);
 static void volume_process_int8_clamp (GstVolume * self, gpointer bytes,
     guint n_bytes);
+static void volume_process_int8_via_float_with_clamp (GstVolume * self,
+    gpointer bytes, guint n_bytes);
 static void volume_process_controlled_int8_clamp (GstVolume * self,
     gpointer bytes, gdouble * volume, guint channels, guint n_bytes);
 
@@ -185,7 +194,12 @@ volume_choose_func (GstVolume * self, const GstAudioInfo * info)
     case GST_AUDIO_FORMAT_S32:
       /* only clamp if the gain is greater than 1.0 */
       if (self->current_vol_i32 > VOLUME_UNITY_INT32) {
-        self->process = volume_process_int32_clamp;
+        /* Fixed-point multiplication only supports small subset of volumes */
+        if (self->current_vol_i32 > VOLUME_MAX_INT32) {
+          self->process = volume_process_int32_via_double_with_clamp;
+        } else {
+          self->process = volume_process_int32_clamp;
+        }
       } else {
         self->process = volume_process_int32;
       }
@@ -194,7 +208,12 @@ volume_choose_func (GstVolume * self, const GstAudioInfo * info)
     case GST_AUDIO_FORMAT_S24:
       /* only clamp if the gain is greater than 1.0 */
       if (self->current_vol_i24 > VOLUME_UNITY_INT24) {
-        self->process = volume_process_int24_clamp;
+        /* Fixed-point multiplication only supports small subset of volumes */
+        if (self->current_vol_i24 > VOLUME_MAX_INT24) {
+          self->process = volume_process_int24_via_float_with_clamp;
+        } else {
+          self->process = volume_process_int24_clamp;
+        }
       } else {
         self->process = volume_process_int24;
       }
@@ -203,7 +222,12 @@ volume_choose_func (GstVolume * self, const GstAudioInfo * info)
     case GST_AUDIO_FORMAT_S16:
       /* only clamp if the gain is greater than 1.0 */
       if (self->current_vol_i16 > VOLUME_UNITY_INT16) {
-        self->process = volume_process_int16_clamp;
+        /* Fixed-point multiplication only supports small subset of volumes */
+        if (self->current_vol_i16 > VOLUME_MAX_INT16) {
+          self->process = volume_process_int16_via_float_with_clamp;
+        } else {
+          self->process = volume_process_int16_clamp;
+        }
       } else {
         self->process = volume_process_int16;
       }
@@ -212,7 +236,12 @@ volume_choose_func (GstVolume * self, const GstAudioInfo * info)
     case GST_AUDIO_FORMAT_S8:
       /* only clamp if the gain is greater than 1.0 */
       if (self->current_vol_i8 > VOLUME_UNITY_INT8) {
-        self->process = volume_process_int8_clamp;
+        /* Fixed-point multiplication only supports small subset of volumes */
+        if (self->current_vol_i8 > VOLUME_MAX_INT8) {
+          self->process = volume_process_int8_via_float_with_clamp;
+        } else {
+          self->process = volume_process_int8_clamp;
+        }
       } else {
         self->process = volume_process_int8;
       }
@@ -256,16 +285,49 @@ volume_update_volume (GstVolume * self, const GstAudioInfo * info,
     self->current_mute = FALSE;
     self->current_volume = volume;
 
-    self->current_vol_i8 =
-        (gint) ((gdouble) volume * (gdouble) VOLUME_UNITY_INT8);
-    self->current_vol_i16 =
-        (gint) ((gdouble) volume * (gdouble) VOLUME_UNITY_INT16);
-    self->current_vol_i24 =
-        (gint) ((gdouble) volume * (gdouble) VOLUME_UNITY_INT24);
-    self->current_vol_i32 =
-        (gint) ((gdouble) volume * (gdouble) VOLUME_UNITY_INT32);
-
-    passthrough = (self->current_vol_i16 == VOLUME_UNITY_INT16);
+    gdouble current_fp_vol_i8 = (gdouble) volume * (gdouble) VOLUME_UNITY_INT8;
+    gdouble current_fp_vol_i16 =
+        (gdouble) volume * (gdouble) VOLUME_UNITY_INT16;
+    gdouble current_fp_vol_i24 =
+        (gdouble) volume * (gdouble) VOLUME_UNITY_INT24;
+    gdouble current_fp_vol_i32 =
+        (gdouble) volume * (gdouble) VOLUME_UNITY_INT32;
+
+    /* Perform "saturating" FP->int conversion.
+     * We want to be able to tell when current_fp_vol_i32 is *larger* than
+     * VOLUME_MAX_INT32, *and* don't have UB on FP->int cast overflow,
+     * `2 * VOLUME_MAX_INT32` achieves both of these points.
+     */
+    self->current_vol_i8 = (glong) (CLAMP (current_fp_vol_i8, (gdouble) 0,
+            (gdouble) 2 * VOLUME_MAX_INT32));
+    self->current_vol_i16 = (glong) (CLAMP (current_fp_vol_i16, (gdouble) 0,
+            (gdouble) 2 * VOLUME_MAX_INT32));
+    self->current_vol_i24 = (glong) (CLAMP (current_fp_vol_i24, (gdouble) 0,
+            (gdouble) 2 * VOLUME_MAX_INT32));
+    self->current_vol_i32 = (glong) (CLAMP (current_fp_vol_i32, (gdouble) 0,
+            (gdouble) 2 * VOLUME_MAX_INT32));
+
+    switch (GST_AUDIO_INFO_FORMAT (info)) {
+      case GST_AUDIO_FORMAT_F32:
+      case GST_AUDIO_FORMAT_F64:
+        passthrough = (self->current_volume == 1.0);
+        break;
+      case GST_AUDIO_FORMAT_S8:
+        passthrough = (self->current_vol_i8 == VOLUME_UNITY_INT8);
+        break;
+      case GST_AUDIO_FORMAT_S16:
+        passthrough = (self->current_vol_i16 == VOLUME_UNITY_INT16);
+        break;
+      case GST_AUDIO_FORMAT_S24:
+        passthrough = (self->current_vol_i24 == VOLUME_UNITY_INT24);
+        break;
+      case GST_AUDIO_FORMAT_S32:
+        passthrough = (self->current_vol_i32 == VOLUME_UNITY_INT32);
+        break;
+      default:
+        passthrough = FALSE;
+        break;
+    }
   }
 
   /* If a controller is used, never use passthrough mode
@@ -323,9 +385,26 @@ gst_volume_class_init (GstVolumeClass * klass)
           DEFAULT_PROP_MUTE,
           G_PARAM_READWRITE | GST_PARAM_CONTROLLABLE | G_PARAM_STATIC_STRINGS));
 
+  /**
+   * GstVolume:volume-full-range:
+   *
+   * The volume-full-range factor is a range from 0.0 to G_MAXDOUBLE so
+   * it is *very* inclusive, e.g. gain of +48 dB is very reasonable. This
+   * property allows setting higher value than the #GstVolume:volume property.
+   *
+   * Since: 1.24
+   */
+  /* This property has been exposed as another property to keep the backward compatibility
+   * when using #GstDirectControlBinding with GstDirectControlBinding:absolute set to FALSE. */
+  g_object_class_install_property (gobject_class, PROP_VOLUME_FULL_RANGE,
+      g_param_spec_double ("volume-full-range", "Volume",
+          "volume factor with a full range of values, 1.0=100%", 0.0,
+          G_MAXDOUBLE, DEFAULT_PROP_VOLUME,
+          G_PARAM_READWRITE | GST_PARAM_CONTROLLABLE | G_PARAM_STATIC_STRINGS));
+
   g_object_class_install_property (gobject_class, PROP_VOLUME,
       g_param_spec_double ("volume", "Volume", "volume factor, 1.0=100%",
-          0.0, VOLUME_MAX_DOUBLE, DEFAULT_PROP_VOLUME,
+          0.0, 10.0, DEFAULT_PROP_VOLUME,
           G_PARAM_READWRITE | GST_PARAM_CONTROLLABLE | G_PARAM_STATIC_STRINGS));
 
   gst_element_class_set_static_metadata (element_class, "Volume",
@@ -441,6 +520,26 @@ volume_process_int32_clamp (GstVolume * self, gpointer bytes, guint n_bytes)
   volume_orc_process_int32_clamp (data, self->current_vol_i32, num_samples);
 }
 
+// TODO: Add ORC implementation for this
+static void
+volume_process_int32_via_double_with_clamp (GstVolume * self,
+    gpointer bytes, guint n_bytes)
+{
+  gint32 *data = (gint32 *) bytes;
+  guint i;
+  guint num_samples = n_bytes / sizeof (gint32);
+  /* Cast between the 32-bit integer and 32-bit floating point is lossy,
+   * but not between 64-bit floating point, so use it instead. */
+  /* WARNING: (gint32)((gfloat)VOLUME_MAX_INT32)) is UB! */
+  gdouble vol = self->current_volume;
+  gdouble val;
+
+  for (i = 0; i < num_samples; i++) {
+    val = *data * vol;
+    *data++ = (gint32) CLAMP (val, VOLUME_MIN_INT32, VOLUME_MAX_INT32);
+  }
+}
+
 static void
 volume_process_controlled_int32_clamp (GstVolume * self, gpointer bytes,
     gdouble * volume, guint channels, guint n_bytes)
@@ -464,6 +563,7 @@ volume_process_controlled_int32_clamp (GstVolume * self, gpointer bytes,
 }
 
 #if (G_BYTE_ORDER == G_LITTLE_ENDIAN)
+/* NOTE: does not sign-extend, result is an 24-bit unsigned integer! */
 #define get_unaligned_i24(_x) ( (((guint8*)_x)[0]) | ((((guint8*)_x)[1]) << 8) | ((((gint8*)_x)[2]) << 16) )
 
 #define write_unaligned_u24(_x,samp) \
@@ -474,6 +574,7 @@ G_STMT_START { \
 } G_STMT_END
 
 #else /* BIG ENDIAN */
+/* NOTE: does not sign-extend, result is an 24-bit unsigned integer! */
 #define get_unaligned_i24(_x) ( (((guint8*)_x)[2]) | ((((guint8*)_x)[1]) << 8) | ((((gint8*)_x)[0]) << 16) )
 #define write_unaligned_u24(_x,samp) \
 G_STMT_START { \
@@ -483,6 +584,9 @@ G_STMT_START { \
 } G_STMT_END
 #endif
 
+#define sign_extend_i24(_x)                                                    \
+  (((gint32)(((guint32)(_x)) << (32 - 24))) >> (32 - 24))
+
 static void
 volume_process_int24 (GstVolume * self, gpointer bytes, guint n_bytes)
 {
@@ -529,6 +633,30 @@ volume_process_int24_clamp (GstVolume * self, gpointer bytes, guint n_bytes)
   }
 }
 
+static void
+volume_process_int24_via_float_with_clamp (GstVolume * self,
+    gpointer bytes, guint n_bytes)
+{
+  gint8 *data = (gint8 *) bytes;        /* treat the data as a byte stream */
+  guint i, num_samples;
+  guint32 samp;
+  gfloat vol = self->current_volume;
+  gfloat val;
+
+  num_samples = n_bytes / (sizeof (gint8) * 3);
+  for (i = 0; i < num_samples; i++) {
+    samp = get_unaligned_i24 (data);    /* NOT SIGN-EXTENDED!!! */
+
+    val = (gfloat) (sign_extend_i24 (samp));
+    val *= vol;
+    /* NOTE: we *MUST* first cast FP to int, and only then to unsigned. */
+    samp = (guint32) ((gint32) CLAMP (val, VOLUME_MIN_INT24, VOLUME_MAX_INT24));
+
+    /* write the value back into the stream */
+    write_unaligned_u24 (data, samp);
+  }
+}
+
 static void
 volume_process_controlled_int24_clamp (GstVolume * self, gpointer bytes,
     gdouble * volume, guint channels, guint n_bytes)
@@ -572,6 +700,23 @@ volume_process_int16_clamp (GstVolume * self, gpointer bytes, guint n_bytes)
   volume_orc_process_int16_clamp (data, self->current_vol_i16, num_samples);
 }
 
+// TODO: Add ORC implementation for this
+static void
+volume_process_int16_via_float_with_clamp (GstVolume * self,
+    gpointer bytes, guint n_bytes)
+{
+  gint16 *data = (gint16 *) bytes;
+  guint i;
+  guint num_samples = n_bytes / sizeof (gint16);
+  gfloat vol = self->current_volume;
+  gfloat val;
+
+  for (i = 0; i < num_samples; i++) {
+    val = *data * vol;
+    *data++ = (gint16) CLAMP (val, VOLUME_MIN_INT16, VOLUME_MAX_INT16);
+  }
+}
+
 static void
 volume_process_controlled_int16_clamp (GstVolume * self, gpointer bytes,
     gdouble * volume, guint channels, guint n_bytes)
@@ -620,6 +765,24 @@ volume_process_int8_clamp (GstVolume * self, gpointer bytes, guint n_bytes)
   volume_orc_process_int8_clamp (data, self->current_vol_i8, num_samples);
 }
 
+// TODO: Add ORC implementation for this
+static void
+volume_process_int8_via_float_with_clamp (GstVolume * self,
+    gpointer bytes, guint n_bytes)
+{
+  gint8 *data = (gint8 *) bytes;
+  guint i;
+  guint num_samples = n_bytes / sizeof (gint8);
+  gfloat vol = self->current_volume;
+  gfloat val;
+
+  for (i = 0; i < num_samples; i++) {
+    val = *data;
+    val *= vol;
+    *data++ = (gint8) CLAMP (val, VOLUME_MIN_INT8, VOLUME_MAX_INT8);
+  }
+}
+
 static void
 volume_process_controlled_int8_clamp (GstVolume * self, gpointer bytes,
     gdouble * volume, guint channels, guint n_bytes)
@@ -836,6 +999,11 @@ volume_set_property (GObject * object, guint prop_id, const GValue * value,
       self->volume = g_value_get_double (value);
       GST_OBJECT_UNLOCK (self);
       break;
+    case PROP_VOLUME_FULL_RANGE:
+      GST_OBJECT_LOCK (self);
+      self->volume = g_value_get_double (value);
+      GST_OBJECT_UNLOCK (self);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -855,6 +1023,17 @@ volume_get_property (GObject * object, guint prop_id, GValue * value,
       GST_OBJECT_UNLOCK (self);
       break;
     case PROP_VOLUME:
+      GST_OBJECT_LOCK (self);
+      if (self->volume > 10.0) {
+        GST_WARNING_OBJECT (object,
+            "Volume is greater than its max value 10.0, reporting as 10.0");
+        g_value_set_double (value, 10.0);
+      } else {
+        g_value_set_double (value, self->volume);
+      }
+      GST_OBJECT_UNLOCK (self);
+      break;
+    case PROP_VOLUME_FULL_RANGE:
       GST_OBJECT_LOCK (self);
       g_value_set_double (value, self->volume);
       GST_OBJECT_UNLOCK (self);
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst/volume/gstvolume.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst/volume/gstvolume.h
index 886812a0843..5ba858a0cb5 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst/volume/gstvolume.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst/volume/gstvolume.h
@@ -52,10 +52,10 @@ struct _GstVolume {
   gboolean current_mute;
   gdouble current_volume;
 
-  gint   current_vol_i32;
-  gint   current_vol_i24; /* the _i(nt) values get synchronized with the */
-  gint   current_vol_i16; /* the _i(nt) values get synchronized with the */
-  gint   current_vol_i8;   /* the _i(nt) values get synchronized with the */
+  gint64 current_vol_i32;
+  gint64 current_vol_i24; /* the _i(nt) values get synchronized with the */
+  gint64 current_vol_i16; /* the _i(nt) values get synchronized with the */
+  gint64 current_vol_i8;  /* the _i(nt) values get synchronized with the */
 
   GList *tracklist;
   gboolean negotiated;
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/gst/audioparsers/gstaacparse.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/gst/audioparsers/gstaacparse.c
index 28e953ef58a..eb3ee985bfd 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/gst/audioparsers/gstaacparse.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/gst/audioparsers/gstaacparse.c
@@ -544,6 +544,70 @@ gst_aac_parse_get_audio_sample_rate (GstAacParse * aacparse, GstBitReader * br,
   return TRUE;
 }
 
+static gboolean
+gst_aac_parse_program_config_element (GstAacParse * aacparse,
+    GstBitReader * br, gint * channels)
+{
+  guint8 G_GNUC_UNUSED element_instance_tag;
+  guint8 G_GNUC_UNUSED object_type;
+  guint8 G_GNUC_UNUSED sampling_frequency_index;
+  guint8 num_front_channel_elements;
+  guint8 num_side_channel_elements;
+  guint8 num_back_channel_elements;
+  guint8 num_lfe_channel_elements;
+
+  if (!gst_bit_reader_get_bits_uint8 (br, &element_instance_tag, 4))
+    return FALSE;
+  if (!gst_bit_reader_get_bits_uint8 (br, &object_type, 2))
+    return FALSE;
+  if (!gst_bit_reader_get_bits_uint8 (br, &sampling_frequency_index, 4))
+    return FALSE;
+  if (!gst_bit_reader_get_bits_uint8 (br, &num_front_channel_elements, 4))
+    return FALSE;
+  if (!gst_bit_reader_get_bits_uint8 (br, &num_side_channel_elements, 4))
+    return FALSE;
+  if (!gst_bit_reader_get_bits_uint8 (br, &num_back_channel_elements, 4))
+    return FALSE;
+  if (!gst_bit_reader_get_bits_uint8 (br, &num_lfe_channel_elements, 4))
+    return FALSE;
+  GST_LOG_OBJECT (aacparse, "channels front %d side %d back %d lfe %d ",
+      num_front_channel_elements, num_side_channel_elements,
+      num_back_channel_elements, num_lfe_channel_elements);
+  *channels = num_front_channel_elements + num_side_channel_elements +
+      num_back_channel_elements + num_lfe_channel_elements;
+
+  return TRUE;
+}
+
+static gboolean
+gst_aac_parse_ga_specific_config (GstAacParse * aacparse,
+    GstBitReader * br, gint * channels, guint8 channel_configuration)
+{
+  guint8 G_GNUC_UNUSED frame_length_flag;
+  guint8 depends_on_core_coder;
+  guint32 G_GNUC_UNUSED core_coder_delay;
+  guint8 G_GNUC_UNUSED extension_flag;
+
+  if (!gst_bit_reader_get_bits_uint8 (br, &frame_length_flag, 1))
+    return FALSE;
+  if (!gst_bit_reader_get_bits_uint8 (br, &depends_on_core_coder, 1))
+    return FALSE;
+
+  if (depends_on_core_coder) {
+    if (!gst_bit_reader_get_bits_uint32 (br, &core_coder_delay, 14))
+      return FALSE;
+  }
+
+  if (!gst_bit_reader_get_bits_uint8 (br, &extension_flag, 1))
+    return FALSE;
+
+  if (!channel_configuration) {
+    return gst_aac_parse_program_config_element (aacparse, br, channels);
+  }
+
+  return TRUE;
+}
+
 /* See table 1.13 in ISO/IEC 14496-3 */
 static gboolean
 gst_aac_parse_read_audio_specific_config (GstAacParse * aacparse,
@@ -567,8 +631,6 @@ gst_aac_parse_read_audio_specific_config (GstAacParse * aacparse,
     return FALSE;
   *channels = loas_channels_table[channel_configuration];
   GST_LOG_OBJECT (aacparse, "channel_configuration: %d", channel_configuration);
-  if (!*channels)
-    return FALSE;
 
   if (audio_object_type == 5 || audio_object_type == 29) {
     extension_audio_object_type = 5;
@@ -618,6 +680,32 @@ gst_aac_parse_read_audio_specific_config (GstAacParse * aacparse,
     *frame_samples = frame_flag ? 960 : 1024;
   }
 
+  switch (audio_object_type) {
+    case 1:
+    case 2:
+    case 3:
+    case 4:
+    case 6:
+    case 7:
+    case 17:
+    case 19:
+    case 20:
+    case 21:
+    case 22:
+    case 23:
+      if (!gst_aac_parse_ga_specific_config (aacparse, br, channels,
+              channel_configuration)) {
+        GST_WARNING_OBJECT (aacparse, "Error parsing GASpecificConfig");
+        return FALSE;
+      }
+      break;
+    default:
+      break;
+  }
+
+  if (!*channels)
+    return FALSE;
+
   /* There's LOTS of stuff next, but we ignore it for now as we have
      what we want (sample rate and number of channels */
   GST_DEBUG_OBJECT (aacparse,
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/gst/isomp4/fourcc.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/gst/isomp4/fourcc.h
index 0831b4cf2aa..0865a18c9d0 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/gst/isomp4/fourcc.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/gst/isomp4/fourcc.h
@@ -304,6 +304,16 @@ G_BEGIN_DECLS
 #define FOURCC_av1m     GST_MAKE_FOURCC('a','v','1','m')
 #define FOURCC_av1s     GST_MAKE_FOURCC('a','v','1','s')
 #define FOURCC_av1M     GST_MAKE_FOURCC('a','v','1','M')
+#define FOURCC_SHQ0     GST_MAKE_FOURCC('S','H','Q','0')
+#define FOURCC_SHQ1     GST_MAKE_FOURCC('S','H','Q','1')
+#define FOURCC_SHQ2     GST_MAKE_FOURCC('S','H','Q','2')
+#define FOURCC_SHQ3     GST_MAKE_FOURCC('S','H','Q','3')
+#define FOURCC_SHQ4     GST_MAKE_FOURCC('S','H','Q','4')
+#define FOURCC_SHQ5     GST_MAKE_FOURCC('S','H','Q','5')
+#define FOURCC_SHQ6     GST_MAKE_FOURCC('S','H','Q','6')
+#define FOURCC_SHQ7     GST_MAKE_FOURCC('S','H','Q','7')
+#define FOURCC_SHQ8     GST_MAKE_FOURCC('S','H','Q','8')
+#define FOURCC_SHQ9     GST_MAKE_FOURCC('S','H','Q','9')
 
 #define FOURCC_cfhd     GST_MAKE_FOURCC('C','F','H','D')
 #define FOURCC_ap4x     GST_MAKE_FOURCC('a','p','4','x')
@@ -425,6 +435,9 @@ G_BEGIN_DECLS
 #define FOURCC_tenc     GST_MAKE_FOURCC('t','e','n','c')
 #define FOURCC_cenc     GST_MAKE_FOURCC('c','e','n','c')
 #define FOURCC_cbcs     GST_MAKE_FOURCC('c','b','c','s')
+#define FOURCC_sbgp     GST_MAKE_FOURCC('s','b','g','p')
+#define FOURCC_sgpd     GST_MAKE_FOURCC('s','g','p','d')
+#define FOURCC_seig     GST_MAKE_FOURCC('s','e','i','g')
 
 /* Audible AAX encrypted audio */
 #define FOURCC_aavd     GST_MAKE_FOURCC('a','a','v','d')
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/gst/isomp4/qtdemux.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/gst/isomp4/qtdemux.c
index db4eb7e91a9..4848b6701b5 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/gst/isomp4/qtdemux.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/gst/isomp4/qtdemux.c
@@ -242,6 +242,11 @@ struct _QtDemuxCencSampleSetInfo
 {
   GstStructure *default_properties;
 
+  /* sample groups */
+  GPtrArray *track_group_properties;
+  GPtrArray *fragment_group_properties;
+  GPtrArray *sample_to_group_map;
+
   /* @crypto_info holds one GstStructure per sample */
   GPtrArray *crypto_info;
 };
@@ -396,6 +401,8 @@ static gboolean gst_qtdemux_stream_update_segment (GstQTDemux * qtdemux,
 static void gst_qtdemux_send_gap_for_segment (GstQTDemux * demux,
     QtDemuxStream * stream, gint segment_index, GstClockTime pos);
 
+static void qtdemux_check_if_is_gapless_audio (GstQTDemux * qtdemux);
+
 static gboolean qtdemux_pull_mfro_mfra (GstQTDemux * qtdemux);
 static void check_update_duration (GstQTDemux * qtdemux, GstClockTime duration);
 
@@ -484,6 +491,11 @@ gst_qtdemux_finalize (GObject * object)
   GstQTDemux *qtdemux = GST_QTDEMUX (object);
 
   g_free (qtdemux->redirect_location);
+  g_free (qtdemux->cenc_aux_info_sizes);
+  g_mutex_clear (&qtdemux->expose_lock);
+
+  g_ptr_array_free (qtdemux->active_streams, TRUE);
+  g_ptr_array_free (qtdemux->old_streams, TRUE);
 
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
@@ -493,12 +505,9 @@ gst_qtdemux_dispose (GObject * object)
 {
   GstQTDemux *qtdemux = GST_QTDEMUX (object);
 
-  if (qtdemux->adapter) {
-    g_object_unref (G_OBJECT (qtdemux->adapter));
-    qtdemux->adapter = NULL;
-  }
-  gst_tag_list_unref (qtdemux->tag_list);
-  gst_flow_combiner_free (qtdemux->flowcombiner);
+  g_clear_object (&qtdemux->adapter);
+  gst_clear_tag_list (&qtdemux->tag_list);
+  g_clear_pointer (&qtdemux->flowcombiner, gst_flow_combiner_unref);
 #if defined (GSTREAMER_LITE) && defined(LINUX)
   // g_queue_clear_full() is available staring with 2.60, but we need
   // to support older GLib versions.
@@ -510,13 +519,6 @@ gst_qtdemux_dispose (GObject * object)
       (GDestroyNotify) gst_event_unref);
 #endif // GSTREAMER_LITE
 
-  g_free (qtdemux->cenc_aux_info_sizes);
-  qtdemux->cenc_aux_info_sizes = NULL;
-  g_mutex_clear (&qtdemux->expose_lock);
-
-  g_ptr_array_free (qtdemux->active_streams, TRUE);
-  g_ptr_array_free (qtdemux->old_streams, TRUE);
-
   G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
@@ -681,7 +683,12 @@ gst_qtdemux_get_duration (GstQTDemux * qtdemux, GstClockTime * duration)
 
   if (qtdemux->duration != 0 &&
       qtdemux->duration != G_MAXINT64 && qtdemux->timescale != 0) {
-    *duration = QTTIME_TO_GSTTIME (qtdemux, qtdemux->duration);
+    /* If this is single-stream audio media with gapless data,
+     * report the duration of the valid subset of the overall data. */
+    if (qtdemux->gapless_audio_info.type != GAPLESS_AUDIO_INFO_TYPE_NONE)
+      *duration = qtdemux->gapless_audio_info.valid_duration;
+    else
+      *duration = QTTIME_TO_GSTTIME (qtdemux, qtdemux->duration);
     res = TRUE;
   } else {
     *duration = GST_CLOCK_TIME_NONE;
@@ -1172,6 +1179,10 @@ gst_qtdemux_adjust_seek (GstQTDemux * qtdemux, gint64 desired_time,
     if (CUR_STREAM (str)->sparse && !use_sparse)
       continue;
 
+    /* raw audio streams can be ignored as we can seek anywhere within them */
+    if (str->subtype == FOURCC_soun && str->need_clip)
+      continue;
+
     seg_idx = gst_qtdemux_find_segment (qtdemux, str, desired_time);
     GST_DEBUG_OBJECT (qtdemux, "align segment %d", seg_idx);
 
@@ -1454,8 +1465,8 @@ gst_qtdemux_perform_seek (GstQTDemux * qtdemux, GstSegment * segment,
     gint64 min_offset;
     gboolean next, before, after;
 
-    before = ! !(flags & GST_SEEK_FLAG_SNAP_BEFORE);
-    after = ! !(flags & GST_SEEK_FLAG_SNAP_AFTER);
+    before = !!(flags & GST_SEEK_FLAG_SNAP_BEFORE);
+    after = !!(flags & GST_SEEK_FLAG_SNAP_AFTER);
     next = after && !before;
     if (segment->rate < 0)
       next = !next;
@@ -1535,8 +1546,8 @@ gst_qtdemux_do_seek (GstQTDemux * qtdemux, GstPad * pad, GstEvent * event)
 
   GST_DEBUG_OBJECT (qtdemux, "seek format %s", gst_format_get_name (format));
 
-  flush = ! !(flags & GST_SEEK_FLAG_FLUSH);
-  instant_rate_change = ! !(flags & GST_SEEK_FLAG_INSTANT_RATE_CHANGE);
+  flush = !!(flags & GST_SEEK_FLAG_FLUSH);
+  instant_rate_change = !!(flags & GST_SEEK_FLAG_INSTANT_RATE_CHANGE);
 
   /* Directly send the instant-rate-change event here before taking the
    * stream-lock so that it can be applied as soon as possible */
@@ -1683,7 +1694,7 @@ gst_qtdemux_handle_src_event (GstPad * pad, GstObject * parent,
 
       gst_event_parse_seek (event, NULL, &seek_format, &flags, NULL, NULL, NULL,
           NULL);
-      instant_rate_change = ! !(flags & GST_SEEK_FLAG_INSTANT_RATE_CHANGE);
+      instant_rate_change = !!(flags & GST_SEEK_FLAG_INSTANT_RATE_CHANGE);
 
       if (seqnum == qtdemux->segment_seqnum) {
         GST_LOG_OBJECT (pad,
@@ -2034,7 +2045,8 @@ gst_qtdemux_reset (GstQTDemux * qtdemux, gboolean hard)
 
   GST_DEBUG_OBJECT (qtdemux, "Resetting demux");
 
-  if (hard || qtdemux->upstream_format_is_time) {
+  if (hard || qtdemux->upstream_format_is_time
+      || qtdemux->variant == VARIANT_MSE_BYTESTREAM) {
     qtdemux->state = QTDEMUX_STATE_INITIAL;
     qtdemux->neededbytes = 16;
     qtdemux->todrop = 0;
@@ -2087,6 +2099,11 @@ gst_qtdemux_reset (GstQTDemux * qtdemux, gboolean hard)
     qtdemux->have_group_id = FALSE;
     qtdemux->group_id = G_MAXUINT;
 
+    qtdemux->gapless_audio_info.type = GAPLESS_AUDIO_INFO_TYPE_NONE;
+    qtdemux->gapless_audio_info.num_start_padding_pcm_frames = 0;
+    qtdemux->gapless_audio_info.num_end_padding_pcm_frames = 0;
+    qtdemux->gapless_audio_info.num_valid_pcm_frames = 0;
+
 #if defined (GSTREAMER_LITE) && defined(LINUX)
     // g_queue_clear_full() is available staring with 2.60, but we need
     // to support older GLib versions.
@@ -2142,6 +2159,8 @@ gst_qtdemux_reset (GstQTDemux * qtdemux, gboolean hard)
     gst_flow_combiner_reset (qtdemux->flowcombiner);
     g_ptr_array_foreach (qtdemux->active_streams,
         (GFunc) gst_qtdemux_stream_clear, NULL);
+  } else if (qtdemux->variant == VARIANT_MSE_BYTESTREAM) {
+    /* Do nothing */
   } else {
     gst_flow_combiner_reset (qtdemux->flowcombiner);
     for (i = 0; i < QTDEMUX_N_STREAMS (qtdemux); i++) {
@@ -2634,6 +2653,12 @@ gst_qtdemux_stream_clear (QtDemuxStream * stream)
         gst_structure_free (info->default_properties);
       if (info->crypto_info)
         g_ptr_array_free (info->crypto_info, TRUE);
+      if (info->fragment_group_properties)
+        g_ptr_array_free (info->fragment_group_properties, TRUE);
+      if (info->track_group_properties)
+        g_ptr_array_free (info->track_group_properties, TRUE);
+      if (info->sample_to_group_map)
+        g_ptr_array_free (info->sample_to_group_map, FALSE);
     }
     if (stream->protection_scheme_type == FOURCC_aavd) {
       QtDemuxAavdEncryptionInfo *info =
@@ -3308,7 +3333,7 @@ qtdemux_parse_trex (GstQTDemux * qtdemux, QtDemuxStream * stream,
 
   /* even then, above values are better than random ... */
   if (G_UNLIKELY (!stream->parsed_trex)) {
-    GST_WARNING_OBJECT (qtdemux,
+    GST_INFO_OBJECT (qtdemux,
         "failed to find fragment defaults for stream %d", stream->track_id);
     return FALSE;
   }
@@ -3395,7 +3420,7 @@ qtdemux_parse_trun (GstQTDemux * qtdemux, GstByteReader * trun,
     QtDemuxStream * stream, guint32 d_sample_duration, guint32 d_sample_size,
     guint32 d_sample_flags, gint64 moof_offset, gint64 moof_length,
     gint64 * base_offset, gint64 * running_offset, gint64 decode_ts,
-    gboolean has_tfdt)
+    gboolean has_tfdt, guint trun_node_total)
 {
   GstClockTime gst_ts = GST_CLOCK_TIME_NONE;
   guint64 timestamp;
@@ -3439,6 +3464,17 @@ qtdemux_parse_trun (GstQTDemux * qtdemux, GstByteReader * trun,
     /* note this is really signed */
     if (!gst_byte_reader_get_int32_be (trun, &data_offset))
       goto fail;
+
+    if (qtdemux->variant == VARIANT_MSS_FRAGMENTED
+        && data_offset <= moof_length
+        && *base_offset == -1 && trun_node_total == 1) {
+      /* MSS spec states that, if only one TrunBox is specified, then the
+       * DataOffset field MUST be the sum of the lengths of the MoofBox and all
+       * the fields in the MdatBox field */
+      GST_WARNING_OBJECT (qtdemux,
+          "trun offset is less than the moof size, assuming offset is after moof");
+      data_offset = moof_length + 8;
+    }
     GST_LOG_OBJECT (qtdemux, "trun data offset %d", data_offset);
     /* default base offset = first byte of moof */
     if (*base_offset == -1) {
@@ -3840,6 +3876,7 @@ qtdemux_get_cenc_sample_properties (GstQTDemux * qtdemux,
     QtDemuxStream * stream, guint sample_index)
 {
   QtDemuxCencSampleSetInfo *info = NULL;
+  GstStructure *properties = NULL;
 
   g_return_val_if_fail (stream != NULL, NULL);
   g_return_val_if_fail (stream->protected, NULL);
@@ -3847,9 +3884,264 @@ qtdemux_get_cenc_sample_properties (GstQTDemux * qtdemux,
 
   info = (QtDemuxCencSampleSetInfo *) stream->protection_scheme_info;
 
-  /* Currently, cenc properties for groups of samples are not supported, so
-   * simply return a copy of the default sample properties */
-  return gst_structure_copy (info->default_properties);
+  /* First check if the sample is associated with the 'seig' sample group. */
+  if (info->sample_to_group_map
+      && sample_index < info->sample_to_group_map->len)
+    properties = g_ptr_array_index (info->sample_to_group_map, sample_index);
+
+  /* If not, use the default properties for this sample. */
+  if (!properties)
+    properties = info->default_properties;
+
+  return gst_structure_copy (properties);
+}
+
+static gboolean
+qtdemux_parse_sbgp (GstQTDemux * qtdemux, QtDemuxStream * stream,
+    GstByteReader * br, guint32 group, GPtrArray ** sample_to_group_array,
+    GstStructure * default_properties, GPtrArray * tack_properties_array,
+    GPtrArray * group_properties_array)
+{
+  guint32 flags = 0;
+  guint8 version = 0;
+  guint32 count = 0;
+  const guint8 *grouping_type_data = NULL;
+  guint32 grouping_type = 0;
+
+  g_return_val_if_fail (qtdemux != NULL, FALSE);
+  g_return_val_if_fail (stream != NULL, FALSE);
+  g_return_val_if_fail (br != NULL, FALSE);
+  g_return_val_if_fail (*sample_to_group_array == NULL, FALSE);
+  g_return_val_if_fail (group_properties_array != NULL, FALSE);
+
+  if (!gst_byte_reader_get_uint32_be (br, &flags))
+    return FALSE;
+
+  if (!gst_byte_reader_get_data (br, 4, &grouping_type_data))
+    return FALSE;
+
+  grouping_type = QT_FOURCC (grouping_type_data);
+  if (grouping_type != group) {
+    /* There may be other groups, so just log this... */
+    GST_DEBUG_OBJECT (qtdemux, "Unsupported grouping type: '%"
+        GST_FOURCC_FORMAT "'", GST_FOURCC_ARGS (grouping_type));
+    return FALSE;
+  }
+
+  version = (flags >> 24);
+  if (version > 0) {
+    GST_WARNING_OBJECT (qtdemux, "Unsupported 'sbgp' box version: %hhu",
+        version);
+    return FALSE;
+  }
+
+  if (!gst_byte_reader_get_uint32_be (br, &count))
+    return FALSE;
+
+  GST_LOG_OBJECT (qtdemux, "flags: %08x, type: '%" GST_FOURCC_FORMAT
+      "', count: %u", flags, GST_FOURCC_ARGS (grouping_type), count);
+
+  if (count > 0)
+    *sample_to_group_array = g_ptr_array_sized_new (count);
+
+  while (count--) {
+    guint32 samples;
+    guint32 index;
+    GstStructure *properties = NULL;
+
+    if (!gst_byte_reader_get_uint32_be (br, &samples))
+      goto error;
+
+    if (!gst_byte_reader_get_uint32_be (br, &index))
+      goto error;
+
+    if (index > 0x10000) {
+      /* Index is referring the current fragment. */
+      index -= 0x10001;
+      if (index < group_properties_array->len)
+        properties = g_ptr_array_index (group_properties_array, index);
+      else
+        GST_ERROR_OBJECT (qtdemux, "invalid group index %u", index);
+    } else if (index > 0) {
+      /* Index is referring to the whole track. */
+      index--;
+      if (index < tack_properties_array->len)
+        properties = g_ptr_array_index (tack_properties_array, index);
+      else
+        GST_ERROR_OBJECT (qtdemux, "invalid group index %u", index);
+    } else {
+      /* If zero, then this range of samples does not belong to this group,
+         perhaps to another one or to none at all. */
+    }
+
+    GST_DEBUG_OBJECT (qtdemux, "assigning group '%" GST_FOURCC_FORMAT
+        "' index %i for the next %i samples: %" GST_PTR_FORMAT,
+        GST_FOURCC_ARGS (grouping_type), index, samples, properties);
+
+    while (samples--)
+      g_ptr_array_add (*sample_to_group_array, properties);
+  }
+
+  return TRUE;
+
+error:
+  g_ptr_array_free (*sample_to_group_array, TRUE);
+  *sample_to_group_array = NULL;
+  return FALSE;
+}
+
+static gboolean
+qtdemux_parse_sgpd (GstQTDemux * qtdemux, QtDemuxStream * stream,
+    GstByteReader * br, guint32 group, GPtrArray ** properties)
+{
+  guint32 flags = 0;
+  guint8 version = 0;
+  guint32 default_length = 0;
+  guint32 count = 0;
+  const guint8 *grouping_type_data = NULL;
+  guint32 grouping_type = 0;
+  const guint32 min_entry_size = 20;
+
+  g_return_val_if_fail (qtdemux != NULL, FALSE);
+  g_return_val_if_fail (stream != NULL, FALSE);
+  g_return_val_if_fail (br != NULL, FALSE);
+  g_return_val_if_fail (*properties == NULL, FALSE);
+
+  if (!gst_byte_reader_get_uint32_be (br, &flags))
+    return FALSE;
+
+  if (!gst_byte_reader_get_data (br, 4, &grouping_type_data))
+    return FALSE;
+
+  grouping_type = QT_FOURCC (grouping_type_data);
+  if (grouping_type != group) {
+    GST_WARNING_OBJECT (qtdemux, "Unhandled grouping type: '%"
+        GST_FOURCC_FORMAT "'", GST_FOURCC_ARGS (grouping_type));
+    return FALSE;
+  }
+
+  version = (flags >> 24);
+  if (version == 1) {
+    if (!gst_byte_reader_get_uint32_be (br, &default_length))
+      return FALSE;
+  } else if (version > 1) {
+    GST_WARNING_OBJECT (qtdemux, "Unsupported 'sgpd' box version: %hhu",
+        version);
+    return FALSE;
+  }
+
+  if (!gst_byte_reader_get_uint32_be (br, &count))
+    return FALSE;
+
+  GST_LOG_OBJECT (qtdemux, "flags: %08x, type: '%" GST_FOURCC_FORMAT
+      "', count: %u", flags, GST_FOURCC_ARGS (grouping_type), count);
+
+  if (count)
+    *properties = g_ptr_array_sized_new (count);
+
+  for (guint32 index = 0; index < count; index++) {
+    GstStructure *props = NULL;
+    guint32 length = default_length;
+    const guint8 *entry_data = NULL;
+    guint8 is_encrypted = 0;
+    guint8 iv_size = 0;
+    guint8 constant_iv_size = 0;
+    const guint8 *kid = NULL;
+    guint8 crypt_byte_block = 0;
+    guint8 skip_byte_block = 0;
+    const guint8 *constant_iv = NULL;
+    GstBuffer *kid_buf;
+
+    if (version == 1 && length == 0) {
+      if (!gst_byte_reader_get_uint32_be (br, &length))
+        goto error;
+    }
+
+    if (G_UNLIKELY (length < min_entry_size)) {
+      GST_ERROR_OBJECT (qtdemux, "Invalid entry size: %u", length);
+      goto error;
+    }
+
+    if (!gst_byte_reader_get_data (br, length, &entry_data))
+      goto error;
+
+    /* Follows tenc format... */
+    is_encrypted = QT_UINT8 (entry_data + 2);
+    iv_size = QT_UINT8 (entry_data + 3);
+    kid = (entry_data + 4);
+
+    if (stream->protection_scheme_type == FOURCC_cbcs) {
+      guint8 possible_pattern_info;
+
+      if (iv_size == 0) {
+        if (G_UNLIKELY (length < min_entry_size + 1)) {
+          GST_ERROR_OBJECT (qtdemux, "Invalid entry size: %u", length);
+          goto error;
+        }
+
+        constant_iv_size = QT_UINT8 (entry_data + 20);
+        if (G_UNLIKELY (constant_iv_size != 8 && constant_iv_size != 16)) {
+          GST_ERROR_OBJECT (qtdemux,
+              "constant IV size should be 8 or 16, not %hhu", constant_iv_size);
+          goto error;
+        }
+
+        if (G_UNLIKELY (length < min_entry_size + 1 + constant_iv_size)) {
+          GST_ERROR_OBJECT (qtdemux, "Invalid entry size: %u", length);
+          goto error;
+        }
+
+        constant_iv = (entry_data + 21);
+      }
+
+      possible_pattern_info = QT_UINT8 (entry_data + 1);
+      crypt_byte_block = (possible_pattern_info >> 4) & 0x0f;
+      skip_byte_block = possible_pattern_info & 0x0f;
+    }
+
+    kid_buf = gst_buffer_new_memdup (kid, 16);
+
+    props = gst_structure_new ("application/x-cenc",
+        "iv_size", G_TYPE_UINT, iv_size,
+        "encrypted", G_TYPE_BOOLEAN, is_encrypted == 1,
+        "kid", GST_TYPE_BUFFER, kid_buf, NULL);
+
+    gst_buffer_unref (kid_buf);
+
+    if (stream->protection_scheme_type == FOURCC_cbcs) {
+      if (crypt_byte_block != 0 || skip_byte_block != 0) {
+        gst_structure_set (props,
+            "crypt_byte_block", G_TYPE_UINT, crypt_byte_block,
+            "skip_byte_block", G_TYPE_UINT, skip_byte_block, NULL);
+      }
+
+      if (constant_iv != NULL) {
+        GstBuffer *constant_iv_buf = gst_buffer_new_memdup (
+            (guint8 *) constant_iv, constant_iv_size);
+        gst_structure_set (props,
+            "constant_iv_size", G_TYPE_UINT, constant_iv_size,
+            "iv", GST_TYPE_BUFFER, constant_iv_buf, NULL);
+        gst_buffer_unref (constant_iv_buf);
+      }
+
+      gst_structure_set (props, "cipher-mode", G_TYPE_STRING, "cbcs", NULL);
+    } else {
+      gst_structure_set (props, "cipher-mode", G_TYPE_STRING, "cenc", NULL);
+    }
+
+    GST_INFO_OBJECT (qtdemux, "properties for group '%"
+        GST_FOURCC_FORMAT "' at index %u: %" GST_PTR_FORMAT,
+        GST_FOURCC_ARGS (grouping_type), index, props);
+
+    g_ptr_array_add (*properties, props);
+  }
+
+  return TRUE;
+
+error:
+  g_ptr_array_free (*properties, TRUE);
+  *properties = NULL;
+  return FALSE;
 }
 
 /* Parses the sizes of sample auxiliary information contained within a stream,
@@ -4205,6 +4497,7 @@ qtdemux_parse_moof (GstQTDemux * qtdemux, const guint8 * buffer, guint length,
   traf_node = qtdemux_tree_get_child_by_type (moof_node, FOURCC_traf);
   while (traf_node) {
     guint64 decode_time = 0;
+    guint trun_node_total = 0;
 
     /* Fragment Header node */
     tfhd_node =
@@ -4216,6 +4509,55 @@ qtdemux_parse_moof (GstQTDemux * qtdemux, const guint8 * buffer, guint length,
             &ds_size, &ds_flags, &base_offset))
       goto missing_tfhd;
 
+    /* Sample grouping support */
+    if (stream != NULL && stream->protected
+        && (stream->protection_scheme_type == FOURCC_cenc
+            || stream->protection_scheme_type == FOURCC_cbcs)) {
+      QtDemuxCencSampleSetInfo *info = stream->protection_scheme_info;
+      GNode *sgpd_node;
+      GstByteReader sgpd_data;
+
+      if (info->fragment_group_properties) {
+        g_ptr_array_free (info->fragment_group_properties, TRUE);
+        info->fragment_group_properties = NULL;
+      }
+
+      if (info->sample_to_group_map) {
+        g_ptr_array_free (info->sample_to_group_map, FALSE);
+        info->sample_to_group_map = NULL;
+      }
+
+      /* Check if sample grouping information is present for this segment. */
+      /* However look only for 'seig' (CENC encryption) grouping type... */
+      sgpd_node = qtdemux_tree_get_child_by_type_full (traf_node, FOURCC_sgpd,
+          &sgpd_data);
+      while (sgpd_node) {
+        if (qtdemux_parse_sgpd (qtdemux, stream, &sgpd_data, FOURCC_seig,
+                &info->fragment_group_properties)) {
+          /* CENC encryption grouping found, don't look further. */
+          break;
+        }
+        sgpd_node = qtdemux_tree_get_sibling_by_type_full (sgpd_node,
+            FOURCC_sgpd, &sgpd_data);
+      }
+
+      if (info->fragment_group_properties) {
+        GstByteReader sbgp_data;
+        GNode *sbgp_node = qtdemux_tree_get_child_by_type_full (traf_node,
+            FOURCC_sbgp, &sbgp_data);
+        while (sbgp_node) {
+          if (qtdemux_parse_sbgp (qtdemux, stream, &sbgp_data, FOURCC_seig,
+                  &info->sample_to_group_map, info->default_properties,
+                  info->track_group_properties,
+                  info->fragment_group_properties)) {
+            break;
+          }
+          sbgp_node = qtdemux_tree_get_sibling_by_type_full (sbgp_node,
+              FOURCC_sgpd, &sbgp_data);
+        }
+      }
+    }
+
     /* The following code assumes at most a single set of sample auxiliary
      * data in the fragment (consisting of a saiz box and a corresponding saio
      * box); in theory, however, there could be multiple sets of sample
@@ -4324,6 +4666,20 @@ qtdemux_parse_moof (GstQTDemux * qtdemux, const guint8 * buffer, guint length,
     stream->duration_last_moof = stream->duration_moof;
     stream->duration_moof = 0;
 
+    /* Count the number of trun nodes */
+    if (qtdemux->variant == VARIANT_MSS_FRAGMENTED) {
+      trun_node =
+          qtdemux_tree_get_child_by_type_full (traf_node, FOURCC_trun,
+          &trun_data);
+      while (trun_node) {
+        trun_node_total++;
+        trun_node =
+            qtdemux_tree_get_sibling_by_type_full (trun_node, FOURCC_trun,
+            &trun_data);
+      }
+      GST_LOG_OBJECT (qtdemux, "%u trun node(s) available", trun_node_total);
+    }
+
     /* Track Run node */
     trun_node =
         qtdemux_tree_get_child_by_type_full (traf_node, FOURCC_trun,
@@ -4331,7 +4687,7 @@ qtdemux_parse_moof (GstQTDemux * qtdemux, const guint8 * buffer, guint length,
     while (trun_node) {
       qtdemux_parse_trun (qtdemux, &trun_data, stream,
           ds_duration, ds_size, ds_flags, moof_offset, length, &base_offset,
-          &running_offset, decode_time, (tfdt_node != NULL));
+          &running_offset, decode_time, (tfdt_node != NULL), trun_node_total);
       /* iterate all siblings */
       trun_node = qtdemux_tree_get_sibling_by_type_full (trun_node, FOURCC_trun,
           &trun_data);
@@ -5091,7 +5447,12 @@ gst_qtdemux_seek_to_previous_keyframe (GstQTDemux * qtdemux)
     }
 
     /* Remember until where we want to go */
-    str->to_sample = str->from_sample - 1;
+    if (str->from_sample == 0) {
+      GST_LOG_OBJECT (qtdemux, "already at sample 0");
+      str->to_sample = 0;
+    } else {
+      str->to_sample = str->from_sample - 1;
+    }
     /* Define our time position */
     target_ts =
         str->samples[k_index].timestamp + str->samples[k_index].pts_offset;
@@ -5244,6 +5605,14 @@ gst_qtdemux_stream_update_segment (GstQTDemux * qtdemux, QtDemuxStream * stream,
   stream->segment.time = time;
   stream->segment.position = stream->segment.start;
 
+  /* Gapless audio requires adjustments to the segment
+   * to reflect the actual playtime length. In
+   * particular, this must exclude padding data. */
+  if (qtdemux->gapless_audio_info.type != GAPLESS_AUDIO_INFO_TYPE_NONE) {
+    stream->segment.stop = stream->segment.start +
+        qtdemux->gapless_audio_info.valid_duration;
+  }
+
   GST_DEBUG_OBJECT (stream->pad, "New segment: %" GST_SEGMENT_FORMAT,
       &stream->segment);
 
@@ -6151,6 +6520,83 @@ gst_qtdemux_push_buffer (GstQTDemux * qtdemux, QtDemuxStream * stream,
       GST_ERROR_OBJECT (qtdemux, "failed to attach aavd metadata to buffer");
   }
 
+  if (qtdemux->gapless_audio_info.type != GAPLESS_AUDIO_INFO_TYPE_NONE) {
+    guint64 num_start_padding_pcm_frames;
+    guint64 audio_sample_offset;
+    guint64 audio_sample_offset_end;
+    guint64 start_of_trailing_padding;
+    guint64 start_clip = 0, end_clip = 0;
+    guint64 total_num_clipped_samples;
+    GstClockTime timestamp_decrement;
+
+    /* Attach GstAudioClippingMeta to exclude padding data. */
+
+    num_start_padding_pcm_frames =
+        qtdemux->gapless_audio_info.num_start_padding_pcm_frames;
+
+    audio_sample_offset = stream->sample_index * stream->stts_duration;
+    audio_sample_offset_end = audio_sample_offset + stream->stts_duration;
+    start_of_trailing_padding = num_start_padding_pcm_frames +
+        qtdemux->gapless_audio_info.num_valid_pcm_frames;
+
+    if (audio_sample_offset < num_start_padding_pcm_frames) {
+      guint64 num_padding_audio_samples =
+          num_start_padding_pcm_frames - audio_sample_offset;
+      start_clip = MIN (num_padding_audio_samples, stream->stts_duration);
+    }
+
+    timestamp_decrement = qtdemux->gapless_audio_info.start_padding_duration;
+
+    if (audio_sample_offset >= start_of_trailing_padding) {
+      /* This case happens when the buffer is located fully past
+       * the beginning of the padding area at the end of the stream.
+       * Add the end padding to the decrement amount to ensure
+       * continuous timestamps when transitioning from gapless
+       * media to gapless media. */
+      end_clip = stream->stts_duration;
+      timestamp_decrement += qtdemux->gapless_audio_info.end_padding_duration;
+    } else if (audio_sample_offset_end >= start_of_trailing_padding) {
+      /* This case happens when the beginning of the padding area that
+       * is located at the end of the stream intersects the buffer. */
+      end_clip = audio_sample_offset_end - start_of_trailing_padding;
+    }
+
+    total_num_clipped_samples = start_clip + end_clip;
+
+    if (total_num_clipped_samples != 0) {
+      GST_DEBUG_OBJECT (qtdemux, "adding audio clipping meta: start / "
+          "end clip: %" G_GUINT64_FORMAT " / %" G_GUINT64_FORMAT,
+          start_clip, end_clip);
+      gst_buffer_add_audio_clipping_meta (buf, GST_FORMAT_DEFAULT,
+          start_clip, end_clip);
+
+      if (total_num_clipped_samples >= stream->stts_duration) {
+        GST_BUFFER_DURATION (buf) = 0;
+        GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_DECODE_ONLY);
+        GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_DROPPABLE);
+      } else {
+        guint64 num_valid_samples =
+            stream->stts_duration - total_num_clipped_samples;
+        GST_BUFFER_DURATION (buf) =
+            QTSTREAMTIME_TO_GSTTIME (stream, num_valid_samples);
+      }
+    }
+
+    /* The timestamps need to be shifted to factor in the skipped padding data. */
+
+    if (GST_BUFFER_PTS_IS_VALID (buf)) {
+      GstClockTime ts = GST_BUFFER_PTS (buf);
+      GST_BUFFER_PTS (buf) =
+          (ts >= timestamp_decrement) ? (ts - timestamp_decrement) : 0;
+    }
+
+    if (GST_BUFFER_DTS_IS_VALID (buf)) {
+      GstClockTime ts = GST_BUFFER_DTS (buf);
+      GST_BUFFER_DTS (buf) =
+          (ts >= timestamp_decrement) ? (ts - timestamp_decrement) : 0;
+    }
+  }
+
   if (stream->protected && (stream->protection_scheme_type == FOURCC_cenc
           || stream->protection_scheme_type == FOURCC_cbcs)) {
     GstStructure *crypto_info;
@@ -7303,6 +7749,129 @@ gst_qtdemux_send_gap_for_segment (GstQTDemux * demux,
   }
 }
 
+static void
+qtdemux_check_if_is_gapless_audio (GstQTDemux * qtdemux)
+{
+  QtDemuxStream *stream;
+
+  if (QTDEMUX_N_STREAMS (qtdemux) != 1)
+    goto incompatible_stream;
+
+  stream = QTDEMUX_NTH_STREAM (qtdemux, 0);
+
+  if (stream->subtype != FOURCC_soun || stream->n_segments != 1)
+    goto incompatible_stream;
+
+  /* Gapless audio info from revdns tags (most notably iTunSMPB) is
+   * detected in the main udta node. If it isn't present, try as
+   * fallback to recognize the encoder name, and apply known priming
+   * and padding quantities specific to the encoder. */
+  if (qtdemux->gapless_audio_info.type == GAPLESS_AUDIO_INFO_TYPE_NONE) {
+    const gchar *orig_encoder_name = NULL;
+
+    if (gst_tag_list_peek_string_index (qtdemux->tag_list, GST_TAG_ENCODER, 0,
+            &orig_encoder_name) && orig_encoder_name != NULL) {
+      gchar *lowercase_encoder_name = g_ascii_strdown (orig_encoder_name, -1);
+
+      if (strstr (lowercase_encoder_name, "nero") != NULL)
+        qtdemux->gapless_audio_info.type = GAPLESS_AUDIO_INFO_TYPE_NERO;
+
+      g_free (lowercase_encoder_name);
+
+      switch (qtdemux->gapless_audio_info.type) {
+        case GAPLESS_AUDIO_INFO_TYPE_NERO:{
+          guint64 total_length;
+          guint64 valid_length;
+          guint64 start_padding;
+
+          /* The Nero AAC encoder always uses a lead-in of 1600 PCM frames.
+           * Also, in Nero AAC's case, stream->duration contains the number
+           * of PCM frames with start padding but without end padding.
+           * The decoder delay equals 1 frame length, which is covered by
+           * factoring stream->stts_duration into the start padding. */
+          start_padding = 1600 + stream->stts_duration;
+
+          if (G_UNLIKELY (stream->duration < start_padding)) {
+            GST_ERROR_OBJECT (qtdemux, "stream duration is %" G_GUINT64_FORMAT
+                " but start_padding is %" G_GUINT64_FORMAT, stream->duration,
+                start_padding);
+            goto invalid_gapless_audio_info;
+          }
+          valid_length = stream->duration - start_padding;
+
+          qtdemux->gapless_audio_info.num_start_padding_pcm_frames =
+              start_padding;
+          qtdemux->gapless_audio_info.num_valid_pcm_frames = valid_length;
+
+          total_length = stream->n_samples * stream->stts_duration;
+
+          if (G_LIKELY (total_length >= valid_length)) {
+            guint64 total_padding = total_length - valid_length;
+            if (G_UNLIKELY (total_padding < start_padding)) {
+              GST_ERROR_OBJECT (qtdemux, "total_padding is %" G_GUINT64_FORMAT
+                  " but start_padding is %" G_GUINT64_FORMAT, total_padding,
+                  start_padding);
+              goto invalid_gapless_audio_info;
+            }
+
+            qtdemux->gapless_audio_info.num_end_padding_pcm_frames =
+                total_padding - start_padding;
+          } else {
+            qtdemux->gapless_audio_info.num_end_padding_pcm_frames = 0;
+          }
+
+          GST_DEBUG_OBJECT (qtdemux, "media was encoded with Nero AAC encoder; "
+              "using encoder specific lead-in and padding figures");
+        }
+
+        default:
+          break;
+      }
+    }
+  }
+
+  if (qtdemux->gapless_audio_info.type != GAPLESS_AUDIO_INFO_TYPE_NONE) {
+    qtdemux->gapless_audio_info.start_padding_duration =
+        QTSTREAMTIME_TO_GSTTIME (stream,
+        qtdemux->gapless_audio_info.num_start_padding_pcm_frames);
+    qtdemux->gapless_audio_info.end_padding_duration =
+        QTSTREAMTIME_TO_GSTTIME (stream,
+        qtdemux->gapless_audio_info.num_end_padding_pcm_frames);
+    qtdemux->gapless_audio_info.valid_duration =
+        QTSTREAMTIME_TO_GSTTIME (stream,
+        qtdemux->gapless_audio_info.num_valid_pcm_frames);
+  }
+
+  GST_DEBUG_OBJECT (qtdemux, "found valid gapless audio info: num start / end "
+      "PCM padding frames: %" G_GUINT64_FORMAT " / %" G_GUINT64_FORMAT "; "
+      "start / end padding durations: %" GST_TIME_FORMAT " / %" GST_TIME_FORMAT
+      "; num valid PCM frames: %" G_GUINT64_FORMAT "; valid duration: %"
+      GST_TIME_FORMAT, qtdemux->gapless_audio_info.num_start_padding_pcm_frames,
+      qtdemux->gapless_audio_info.num_end_padding_pcm_frames,
+      GST_TIME_ARGS (qtdemux->gapless_audio_info.start_padding_duration),
+      GST_TIME_ARGS (qtdemux->gapless_audio_info.end_padding_duration),
+      qtdemux->gapless_audio_info.num_valid_pcm_frames,
+      GST_TIME_ARGS (qtdemux->gapless_audio_info.valid_duration));
+
+  return;
+
+incompatible_stream:
+  if (G_UNLIKELY (qtdemux->gapless_audio_info.type !=
+          GAPLESS_AUDIO_INFO_TYPE_NONE)) {
+    GST_WARNING_OBJECT (qtdemux,
+        "media contains gapless audio info, but it is not suitable for "
+        "gapless audio playback (media must be audio-only, single-stream, "
+        "single-segment; ignoring unusable gapless info");
+    qtdemux->gapless_audio_info.type = GAPLESS_AUDIO_INFO_TYPE_NONE;
+  }
+  return;
+
+invalid_gapless_audio_info:
+  GST_WARNING_OBJECT (qtdemux,
+      "media contains invalid/unusable gapless audio info");
+  return;
+}
+
 static GstFlowReturn
 gst_qtdemux_chain (GstPad * sinkpad, GstObject * parent, GstBuffer * inbuf)
 {
@@ -7580,7 +8149,7 @@ gst_qtdemux_process_adapter (GstQTDemux * demux, gboolean force)
           /* in usual fragmented setup we could try to scan for more
            * and end up at the the moov (after mdat) again */
 #ifdef GSTREAMER_LITE
-if (demux->got_moov && QTDEMUX_N_STREAMS (demux) > 0 &&
+          if (demux->got_moov && QTDEMUX_N_STREAMS (demux) > 0 &&
               !demux->fragmented) { // Do not skip moov for fMP4, otherwise
               // downstream will not receive header during stream switch.
               // Might need better solution, but fine for our current use
@@ -7976,24 +8545,16 @@ if (demux->got_moov && QTDEMUX_N_STREAMS (demux) > 0 &&
           keyframe = QTSAMPLE_KEYFRAME (stream, sample);
 
           /* check for segment end */
-          if (G_UNLIKELY (demux->segment.stop != -1
-                  && demux->segment.stop <= stream_pts && keyframe)
-              && !(demux->upstream_format_is_time && demux->segment.rate < 0)) {
+          if (G_UNLIKELY (stream->segment.stop != -1
+                  && stream->segment.stop <= stream_pts && keyframe)
+              && !(demux->upstream_format_is_time && stream->segment.rate < 0)) {
             GST_DEBUG_OBJECT (demux, "we reached the end of our segment.");
             stream->time_position = GST_CLOCK_TIME_NONE;        /* this means EOS */
 
             /* skip this data, stream is EOS */
             gst_adapter_flush (demux->adapter, demux->neededbytes);
-            demux->offset += demux->neededbytes;
 
-            /* check if all streams are eos */
             ret = GST_FLOW_EOS;
-            for (i = 0; i < QTDEMUX_N_STREAMS (demux); i++) {
-              if (!STREAM_IS_EOS (QTDEMUX_NTH_STREAM (demux, i))) {
-                ret = GST_FLOW_OK;
-                break;
-              }
-            }
           } else {
             GstBuffer *outbuf;
 
@@ -9114,13 +9675,8 @@ gst_qtdemux_configure_stream (GstQTDemux * qtdemux, QtDemuxStream * stream)
       if (CUR_STREAM (stream)->n_channels > 0)
         gst_caps_set_simple (CUR_STREAM (stream)->caps,
             "channels", G_TYPE_INT, CUR_STREAM (stream)->n_channels, NULL);
-      if (CUR_STREAM (stream)->n_channels > 2) {
-        /* FIXME: Need to parse the 'chan' atom to get channel layouts
-         * correctly; this is just the minimum we can do - assume
-         * we don't actually have any channel positions. */
-        gst_caps_set_simple (CUR_STREAM (stream)->caps,
-            "channel-mask", GST_TYPE_BITMASK, G_GUINT64_CONSTANT (0), NULL);
-      }
+      /* FIXME: Need to parse the 'chan' atom to get channel layouts
+       * correctly. */
     }
   }
 
@@ -9695,7 +10251,7 @@ qtdemux_stbl_init (GstQTDemux * qtdemux, QtDemuxStream * stream, GNode * stbl)
   /* sync sample atom */
   stream->stps_present = FALSE;
   if ((stream->stss_present =
-          ! !qtdemux_tree_get_child_by_type_full (stbl, FOURCC_stss,
+          !!qtdemux_tree_get_child_by_type_full (stbl, FOURCC_stss,
               &stream->stss) ? TRUE : FALSE) == TRUE) {
     /* copy atom data into a new buffer for later use */
     stream->stss.data = g_memdup2 (stream->stss.data, stream->stss.size);
@@ -9713,7 +10269,7 @@ qtdemux_stbl_init (GstQTDemux * qtdemux, QtDemuxStream * stream, GNode * stbl)
 
     /* partial sync sample atom */
     if ((stream->stps_present =
-            ! !qtdemux_tree_get_child_by_type_full (stbl, FOURCC_stps,
+            !!qtdemux_tree_get_child_by_type_full (stbl, FOURCC_stps,
                 &stream->stps) ? TRUE : FALSE) == TRUE) {
       /* copy atom data into a new buffer for later use */
       stream->stps.data = g_memdup2 (stream->stps.data, stream->stps.size);
@@ -9813,7 +10369,7 @@ qtdemux_stbl_init (GstQTDemux * qtdemux, QtDemuxStream * stream, GNode * stbl)
 
   /* composition time-to-sample */
   if ((stream->ctts_present =
-          ! !qtdemux_tree_get_child_by_type_full (stbl, FOURCC_ctts,
+          !!qtdemux_tree_get_child_by_type_full (stbl, FOURCC_ctts,
               &stream->ctts) ? TRUE : FALSE) == TRUE) {
     GstByteReader cslg = GST_BYTE_READER_INIT (NULL, 0);
     guint8 ctts_version;
@@ -11736,7 +12292,7 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
             guint16 primaries = GST_READ_UINT16_BE (colr_data + 12);
             guint16 transfer_function = GST_READ_UINT16_BE (colr_data + 14);
             guint16 matrix = GST_READ_UINT16_BE (colr_data + 16);
-            gboolean full_range = len == 19 ? colr_data[17] >> 7 : FALSE;
+            gboolean full_range = len == 19 ? colr_data[18] >> 7 : FALSE;
 
             CUR_STREAM (stream)->colorimetry.primaries =
                 gst_video_color_primaries_from_iso (primaries);
@@ -13639,7 +14195,30 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
 
     stsd_entry_data += len;
     remaining_stsd_len -= len;
+  }
+
+  /* Sample grouping support */
+  if (stream->protected && (stream->protection_scheme_type == FOURCC_cenc
+          || stream->protection_scheme_type == FOURCC_cbcs)) {
+    QtDemuxCencSampleSetInfo *info = stream->protection_scheme_info;
+    GNode *sgpd_node;
+    GstByteReader sgpd_data;
+
+    if (info->track_group_properties) {
+      g_ptr_array_free (info->fragment_group_properties, TRUE);
+      info->fragment_group_properties = NULL;
+    }
 
+    sgpd_node = qtdemux_tree_get_child_by_type_full (stbl, FOURCC_sgpd,
+        &sgpd_data);
+    while (sgpd_node) {
+      if (qtdemux_parse_sgpd (qtdemux, stream, &sgpd_data, FOURCC_seig,
+              &info->track_group_properties)) {
+        break;
+      }
+      sgpd_node = qtdemux_tree_get_sibling_by_type_full (sgpd_node,
+          FOURCC_sgpd, &sgpd_data);
+    }
   }
 
   /* collect sample information */
@@ -13681,6 +14260,18 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
         GST_TAG_LANGUAGE_CODE, (lang_code) ? lang_code : stream->lang_id, NULL);
   }
 
+  /* https://dev.w3.org/html5/html-sourcing-inband-tracks/#mpeg4
+   * FIXME: For CEA 608 and CEA 708 we should use the channel_number and
+   * service_number respectively.
+   */
+  if (stream->track_id) {
+    gchar *track_id_str =
+        g_strdup_printf ("%" G_GUINT32_FORMAT, stream->track_id);
+    gst_tag_list_add (stream->stream_tags, GST_TAG_MERGE_REPLACE,
+        GST_TAG_CONTAINER_SPECIFIC_TRACK_ID, track_id_str, NULL);
+    g_free (track_id_str);
+  }
+
   /* Check for UDTA tags */
   if ((udta = qtdemux_tree_get_child_by_type (trak, FOURCC_udta))) {
     qtdemux_parse_udta (qtdemux, stream->stream_tags, udta);
@@ -13896,6 +14487,8 @@ qtdemux_prepare_streams (GstQTDemux * qtdemux)
     }
   }
 
+  qtdemux_check_if_is_gapless_audio (qtdemux);
+
   return ret;
 }
 
@@ -15419,6 +16012,25 @@ qtdemux_video_caps (GstQTDemux * qtdemux, QtDemuxStream * stream,
           "stream-format", G_TYPE_STRING, "obu-stream",
           "alignment", G_TYPE_STRING, "tu", NULL);
       break;
+    case FOURCC_SHQ0:
+    case FOURCC_SHQ1:
+    case FOURCC_SHQ2:
+    case FOURCC_SHQ3:
+    case FOURCC_SHQ4:
+    case FOURCC_SHQ5:
+    case FOURCC_SHQ6:
+    case FOURCC_SHQ7:
+    case FOURCC_SHQ8:
+    case FOURCC_SHQ9:{
+      gchar *format =
+          g_strdup_printf ("%" GST_FOURCC_FORMAT, GST_FOURCC_ARGS (fourcc));
+      _codec ("SpeedHQ");
+      caps =
+          gst_caps_new_simple ("video/x-speedhq", "variant", G_TYPE_STRING,
+          format, NULL);
+      g_free (format);
+      break;
+    }
     case GST_MAKE_FOURCC ('k', 'p', 'c', 'd'):
     default:
     {
@@ -15791,7 +16403,7 @@ qtdemux_audio_caps (GstQTDemux * qtdemux, QtDemuxStream * stream,
   if (g_str_has_prefix (name, "audio/x-raw")) {
     stream->need_clip = TRUE;
     stream->min_buffer_size = 1024 * entry->bytes_per_frame;
-    stream->max_buffer_size = 4096 * entry->bytes_per_frame;
+    stream->max_buffer_size = entry->rate * entry->bytes_per_frame;
     GST_DEBUG ("setting min/max buffer sizes to %d/%d", stream->min_buffer_size,
         stream->max_buffer_size);
   }
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/gst/isomp4/qtdemux.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/gst/isomp4/qtdemux.h
index a49fa472d16..7da641e04b9 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/gst/isomp4/qtdemux.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/gst/isomp4/qtdemux.h
@@ -54,6 +54,7 @@ typedef struct _QtDemuxSample QtDemuxSample;
 typedef struct _QtDemuxSegment QtDemuxSegment;
 typedef struct _QtDemuxRandomAccessEntry QtDemuxRandomAccessEntry;
 typedef struct _QtDemuxStreamStsdEntry QtDemuxStreamStsdEntry;
+typedef struct _QtDemuxGaplessAudioInfo QtDemuxGaplessAudioInfo;
 
 typedef GstBuffer * (*QtDemuxProcessFunc)(GstQTDemux * qtdemux, QtDemuxStream * stream, GstBuffer * buf);
 
@@ -78,6 +79,36 @@ typedef enum {
   VARIANT_MSS_FRAGMENTED,
 } Variant;
 
+typedef enum {
+  /* No valid gapless audio info present. Types other than this one
+   * are used only if all of these apply:
+   *
+   * 1. There is embedded gapless audio information available
+   * 2. Only one stream exists
+   * 3. Said stream has only one segment
+   * 4. Said stream is an audio stream
+   */
+  GAPLESS_AUDIO_INFO_TYPE_NONE,
+  /* Using information from the iTunes iTunSMPB revdns tag. */
+  GAPLESS_AUDIO_INFO_TYPE_ITUNES,
+  /* Using known Nero encoder delay information. */
+  GAPLESS_AUDIO_INFO_TYPE_NERO
+} QtDemuxGaplessAudioInfoType;
+
+/* Gapless audio information, only used for single-stream audio-only media. */
+struct _QtDemuxGaplessAudioInfo {
+  QtDemuxGaplessAudioInfoType type;
+
+  guint64 num_start_padding_pcm_frames;
+  guint64 num_end_padding_pcm_frames;
+  guint64 num_valid_pcm_frames;
+
+  /* PCM frame amounts converted to nanoseconds. */
+  GstClockTime start_padding_duration;
+  GstClockTime end_padding_duration;
+  GstClockTime valid_duration;
+};
+
 struct _GstQTDemux {
   GstElement element;
 
@@ -177,6 +208,8 @@ struct _GstQTDemux {
 
   gint64 chapters_track_id;
 
+  QtDemuxGaplessAudioInfo gapless_audio_info;
+
   /* protection support */
   GPtrArray *protection_system_ids; /* Holds identifiers of all content protection systems for all tracks */
   GQueue protection_event_queue; /* holds copy of upstream protection events */
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/gst/isomp4/qtdemux_tags.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/gst/isomp4/qtdemux_tags.c
index 4390a99162f..1b57b6327ff 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/gst/isomp4/qtdemux_tags.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/gst/isomp4/qtdemux_tags.c
@@ -44,8 +44,11 @@
 #include "qtdemux_tags.h"
 #include "qtdemux_tree.h"
 #include "qtdemux_types.h"
+#include "qtdemux_debug.h"
 #include "fourcc.h"
 
+#define GST_CAT_DEFAULT qtdemux_debug
+
 static GstBuffer *
 _gst_buffer_new_wrapped (gpointer mem, gsize size, GFreeFunc free_func)
 {
@@ -720,14 +723,14 @@ qtdemux_tag_add_revdns (GstQTDemux * demux, GstTagList * taglist,
       const gchar tag[28];
     } tags[] = {
       {
-      "replaygain_track_gain", GST_TAG_TRACK_GAIN}, {
-      "replaygain_track_peak", GST_TAG_TRACK_PEAK}, {
-      "replaygain_album_gain", GST_TAG_ALBUM_GAIN}, {
-      "replaygain_album_peak", GST_TAG_ALBUM_PEAK}, {
-      "MusicBrainz Track Id", GST_TAG_MUSICBRAINZ_TRACKID}, {
-      "MusicBrainz Artist Id", GST_TAG_MUSICBRAINZ_ARTISTID}, {
-      "MusicBrainz Album Id", GST_TAG_MUSICBRAINZ_ALBUMID}, {
-      "MusicBrainz Album Artist Id", GST_TAG_MUSICBRAINZ_ALBUMARTISTID}
+          "replaygain_track_gain", GST_TAG_TRACK_GAIN}, {
+          "replaygain_track_peak", GST_TAG_TRACK_PEAK}, {
+          "replaygain_album_gain", GST_TAG_ALBUM_GAIN}, {
+          "replaygain_album_peak", GST_TAG_ALBUM_PEAK}, {
+          "MusicBrainz Track Id", GST_TAG_MUSICBRAINZ_TRACKID}, {
+          "MusicBrainz Artist Id", GST_TAG_MUSICBRAINZ_ARTISTID}, {
+          "MusicBrainz Album Id", GST_TAG_MUSICBRAINZ_ALBUMID}, {
+          "MusicBrainz Album Artist Id", GST_TAG_MUSICBRAINZ_ALBUMARTISTID}
     };
     int i;
 
@@ -748,12 +751,111 @@ qtdemux_tag_add_revdns (GstQTDemux * demux, GstTagList * taglist,
         break;
       }
     }
-    if (i == G_N_ELEMENTS (tags))
-      goto unknown_tag;
+
+    /* Some tags might not actually be used for metadata about the media,
+     * but for other purposes. One such tag is iTunSMPB, which contains
+     * padding information for gapless playback. Scan these separately. */
+    if (i == G_N_ELEMENTS (tags)) {
+      if (!g_ascii_strncasecmp ("iTunSMPB", namestr, 8)) {
+        /* iTunSMPB tag format goes as follows:
+         *
+         * " 00000000 xxxxxxxx yyyyyyyy zzzzzzzzzzzzzzzz 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000"
+         *
+         * The data is actually an ASCII string containing these hex fields.
+         * The description above is _not_ a description of a binary format!
+         * These need to be parsed with g_ascii_strtoull() and base 16.
+         *
+         * (The quotes are not part of it; they just emphasize the
+         * whitespace at the beginning of the string).
+         *
+         * Only the fields marked with x/y/z are of interest here.
+         *
+         * The x field is the priming, in samples.
+         * These are the padding samples at the beginning of the stream.
+         *
+         * The y field is the remainder, in samples.
+         * These are the padding samples at the end of the stream.
+         *
+         * The z field is the number of valid PCM frames, excluding the
+         * priming and remainder. (In other words, the number of PCM
+         * frames that make up the actual audio, without the padding.)
+         *
+         * The data starts at offset 16. All access to it must therefore skip
+         * the first 16 bytes.
+         */
+
+        const gsize start_offset = 16;
+        const gsize priming_offset = start_offset + 10;
+        const gsize remainder_offset = start_offset + 19;
+        const gsize num_valid_pcm_frames_offset = start_offset + 28;
+        const gsize total_length = 44;
+        const gchar *str;
+        guint64 priming;
+        guint64 remainder;
+        guint64 num_valid_pcm_frames;
+        /* Temporary buffer for g_ascii_strtoull() calls.
+         * Add extra +1 space for nullbyte. */
+        gchar tmp[16 + 1];
+
+        /* Use the iTunSMPB info if no other info has been found yet. */
+        if (demux->gapless_audio_info.type != GAPLESS_AUDIO_INFO_TYPE_NONE) {
+          GST_DEBUG_OBJECT (demux, "iTunSMPB information found, "
+              "but other gapless audio info was already read");
+          goto finish;
+        }
+
+        if (G_UNLIKELY (datasize < (start_offset + total_length))) {
+          GST_WARNING_OBJECT (demux,
+              "iTunSMPB tag data size too small - not parsing");
+          goto finish;
+        }
+
+        str = (gchar *) ((guint8 *) data->data);
+
+#define PARSE_ITUNSMPB_FIELD(FIELD_NAME, NUM_DIGITS) \
+        G_STMT_START \
+        { \
+          gint str_idx; \
+\
+          for (str_idx = 0; str_idx < (NUM_DIGITS); ++str_idx) { \
+            gchar ch = str[FIELD_NAME ## _offset + str_idx]; \
+            if (!g_ascii_isxdigit (ch)) { \
+              GST_WARNING_OBJECT (demux, #FIELD_NAME " field in iTunSMPB " \
+                  "tag data has invalid character '%c'", ch); \
+              goto finish; \
+            } \
+            tmp[str_idx] = ch; \
+          } \
+          tmp[NUM_DIGITS] = 0; \
+\
+          FIELD_NAME = g_ascii_strtoull (tmp, NULL, 16); \
+        } \
+        G_STMT_END
+
+        PARSE_ITUNSMPB_FIELD (priming, 8);
+        PARSE_ITUNSMPB_FIELD (remainder, 8);
+        PARSE_ITUNSMPB_FIELD (num_valid_pcm_frames, 16);
+
+#undef PARSE_ITUNSMPB_FIELD
+
+        GST_DEBUG_OBJECT (demux, "iTunSMPB information: priming %"
+            G_GUINT64_FORMAT " remainder %" G_GUINT64_FORMAT
+            " num valid PCM frames %" G_GUINT64_FORMAT, priming, remainder,
+            num_valid_pcm_frames);
+
+        demux->gapless_audio_info.type = GAPLESS_AUDIO_INFO_TYPE_ITUNES;
+        demux->gapless_audio_info.num_start_padding_pcm_frames = priming;
+        demux->gapless_audio_info.num_end_padding_pcm_frames = remainder;
+        demux->gapless_audio_info.num_valid_pcm_frames = num_valid_pcm_frames;
+      } else {
+        goto unknown_tag;
+      }
+    }
   } else {
     goto unknown_tag;
   }
 
+finish:
   return;
 
 /* errors */
@@ -767,7 +869,8 @@ qtdemux_tag_add_revdns (GstQTDemux * demux, GstTagList * taglist,
     namestr_dbg = g_strndup (namestr, namesize);
 
     GST_WARNING_OBJECT (demux, "This tag %s:%s type:%u is not mapped, "
-        "file a bug at bugzilla.gnome.org", meanstr_dbg, namestr_dbg, datatype);
+        "file a bug at %s", meanstr_dbg, namestr_dbg, datatype,
+        PACKAGE_BUGREPORT);
 
     g_free (namestr_dbg);
     g_free (meanstr_dbg);
@@ -827,63 +930,64 @@ static const struct
   const GstQTDemuxAddTagFunc func;
 } add_funcs[] = {
   {
-  FOURCC__nam, GST_TAG_TITLE, NULL, qtdemux_tag_add_str}, {
-  FOURCC_titl, GST_TAG_TITLE, NULL, qtdemux_tag_add_str}, {
-  FOURCC__grp, GST_TAG_GROUPING, NULL, qtdemux_tag_add_str}, {
-  FOURCC__wrt, GST_TAG_COMPOSER, NULL, qtdemux_tag_add_str}, {
-  FOURCC__ART, GST_TAG_ARTIST, NULL, qtdemux_tag_add_str}, {
-  FOURCC_aART, GST_TAG_ALBUM_ARTIST, NULL, qtdemux_tag_add_str}, {
-  FOURCC_perf, GST_TAG_ARTIST, NULL, qtdemux_tag_add_str}, {
-  FOURCC_auth, GST_TAG_COMPOSER, NULL, qtdemux_tag_add_str}, {
-  FOURCC__alb, GST_TAG_ALBUM, NULL, qtdemux_tag_add_str}, {
-  FOURCC_albm, GST_TAG_ALBUM, NULL, qtdemux_tag_add_str}, {
-  FOURCC_cprt, GST_TAG_COPYRIGHT, NULL, qtdemux_tag_add_str}, {
-  FOURCC__cpy, GST_TAG_COPYRIGHT, NULL, qtdemux_tag_add_str}, {
-  FOURCC__cmt, GST_TAG_COMMENT, NULL, qtdemux_tag_add_str}, {
-  FOURCC__des, GST_TAG_DESCRIPTION, NULL, qtdemux_tag_add_str}, {
-  FOURCC_desc, GST_TAG_DESCRIPTION, NULL, qtdemux_tag_add_str}, {
-  FOURCC_dscp, GST_TAG_DESCRIPTION, NULL, qtdemux_tag_add_str}, {
-  FOURCC__lyr, GST_TAG_LYRICS, NULL, qtdemux_tag_add_str}, {
-  FOURCC__day, GST_TAG_DATE, NULL, qtdemux_tag_add_date}, {
-  FOURCC_yrrc, GST_TAG_DATE, NULL, qtdemux_tag_add_year}, {
-  FOURCC__too, GST_TAG_ENCODER, NULL, qtdemux_tag_add_str}, {
-  FOURCC__inf, GST_TAG_COMMENT, NULL, qtdemux_tag_add_str}, {
-  FOURCC_trkn, GST_TAG_TRACK_NUMBER, GST_TAG_TRACK_COUNT, qtdemux_tag_add_num}, {
-  FOURCC_disk, GST_TAG_ALBUM_VOLUME_NUMBER, GST_TAG_ALBUM_VOLUME_COUNT,
-        qtdemux_tag_add_num}, {
-  FOURCC_disc, GST_TAG_ALBUM_VOLUME_NUMBER, GST_TAG_ALBUM_VOLUME_COUNT,
-        qtdemux_tag_add_num}, {
-  FOURCC__gen, GST_TAG_GENRE, NULL, qtdemux_tag_add_str}, {
-  FOURCC_gnre, GST_TAG_GENRE, NULL, qtdemux_tag_add_gnre}, {
-  FOURCC_tmpo, GST_TAG_BEATS_PER_MINUTE, NULL, qtdemux_tag_add_tmpo}, {
-  FOURCC_covr, GST_TAG_IMAGE, NULL, qtdemux_tag_add_covr}, {
-  FOURCC_sonm, GST_TAG_TITLE_SORTNAME, NULL, qtdemux_tag_add_str}, {
-  FOURCC_soal, GST_TAG_ALBUM_SORTNAME, NULL, qtdemux_tag_add_str}, {
-  FOURCC_soar, GST_TAG_ARTIST_SORTNAME, NULL, qtdemux_tag_add_str}, {
-  FOURCC_soaa, GST_TAG_ALBUM_ARTIST_SORTNAME, NULL, qtdemux_tag_add_str}, {
-  FOURCC_soco, GST_TAG_COMPOSER_SORTNAME, NULL, qtdemux_tag_add_str}, {
-  FOURCC_sosn, GST_TAG_SHOW_SORTNAME, NULL, qtdemux_tag_add_str}, {
-  FOURCC_tvsh, GST_TAG_SHOW_NAME, NULL, qtdemux_tag_add_str}, {
-  FOURCC_tvsn, GST_TAG_SHOW_SEASON_NUMBER, NULL, qtdemux_tag_add_uint32}, {
-  FOURCC_tves, GST_TAG_SHOW_EPISODE_NUMBER, NULL, qtdemux_tag_add_uint32}, {
-  FOURCC_kywd, GST_TAG_KEYWORDS, NULL, qtdemux_tag_add_keywords}, {
-  FOURCC_keyw, GST_TAG_KEYWORDS, NULL, qtdemux_tag_add_str}, {
-  FOURCC__enc, GST_TAG_ENCODER, NULL, qtdemux_tag_add_str}, {
-  FOURCC_loci, GST_TAG_GEO_LOCATION_NAME, NULL, qtdemux_tag_add_location}, {
-  FOURCC_clsf, GST_QT_DEMUX_CLASSIFICATION_TAG, NULL,
-        qtdemux_tag_add_classification}, {
-  FOURCC__mak, GST_TAG_DEVICE_MANUFACTURER, NULL, qtdemux_tag_add_str}, {
-  FOURCC__mod, GST_TAG_DEVICE_MODEL, NULL, qtdemux_tag_add_str}, {
-  FOURCC__swr, GST_TAG_APPLICATION_NAME, NULL, qtdemux_tag_add_str}, {
-
-    /* This is a special case, some tags are stored in this
-     * 'reverse dns naming', according to:
-     * http://atomicparsley.sourceforge.net/mpeg-4files.html and
-     * bug #614471
-     */
-  FOURCC_____, "", NULL, qtdemux_tag_add_revdns}, {
-    /* see http://www.mp4ra.org/specs.html for ID32 in meta box */
-  FOURCC_ID32, "", NULL, qtdemux_tag_add_id32}
+      FOURCC__nam, GST_TAG_TITLE, NULL, qtdemux_tag_add_str}, {
+      FOURCC_titl, GST_TAG_TITLE, NULL, qtdemux_tag_add_str}, {
+      FOURCC__grp, GST_TAG_GROUPING, NULL, qtdemux_tag_add_str}, {
+      FOURCC__wrt, GST_TAG_COMPOSER, NULL, qtdemux_tag_add_str}, {
+      FOURCC__ART, GST_TAG_ARTIST, NULL, qtdemux_tag_add_str}, {
+      FOURCC_aART, GST_TAG_ALBUM_ARTIST, NULL, qtdemux_tag_add_str}, {
+      FOURCC_perf, GST_TAG_ARTIST, NULL, qtdemux_tag_add_str}, {
+      FOURCC_auth, GST_TAG_COMPOSER, NULL, qtdemux_tag_add_str}, {
+      FOURCC__alb, GST_TAG_ALBUM, NULL, qtdemux_tag_add_str}, {
+      FOURCC_albm, GST_TAG_ALBUM, NULL, qtdemux_tag_add_str}, {
+      FOURCC_cprt, GST_TAG_COPYRIGHT, NULL, qtdemux_tag_add_str}, {
+      FOURCC__cpy, GST_TAG_COPYRIGHT, NULL, qtdemux_tag_add_str}, {
+      FOURCC__cmt, GST_TAG_COMMENT, NULL, qtdemux_tag_add_str}, {
+      FOURCC__des, GST_TAG_DESCRIPTION, NULL, qtdemux_tag_add_str}, {
+      FOURCC_desc, GST_TAG_DESCRIPTION, NULL, qtdemux_tag_add_str}, {
+      FOURCC_dscp, GST_TAG_DESCRIPTION, NULL, qtdemux_tag_add_str}, {
+      FOURCC__lyr, GST_TAG_LYRICS, NULL, qtdemux_tag_add_str}, {
+      FOURCC__day, GST_TAG_DATE, NULL, qtdemux_tag_add_date}, {
+      FOURCC_yrrc, GST_TAG_DATE, NULL, qtdemux_tag_add_year}, {
+      FOURCC__too, GST_TAG_ENCODER, NULL, qtdemux_tag_add_str}, {
+      FOURCC__inf, GST_TAG_COMMENT, NULL, qtdemux_tag_add_str}, {
+        FOURCC_trkn, GST_TAG_TRACK_NUMBER, GST_TAG_TRACK_COUNT,
+      qtdemux_tag_add_num}, {
+        FOURCC_disk, GST_TAG_ALBUM_VOLUME_NUMBER, GST_TAG_ALBUM_VOLUME_COUNT,
+      qtdemux_tag_add_num}, {
+        FOURCC_disc, GST_TAG_ALBUM_VOLUME_NUMBER, GST_TAG_ALBUM_VOLUME_COUNT,
+      qtdemux_tag_add_num}, {
+      FOURCC__gen, GST_TAG_GENRE, NULL, qtdemux_tag_add_str}, {
+      FOURCC_gnre, GST_TAG_GENRE, NULL, qtdemux_tag_add_gnre}, {
+      FOURCC_tmpo, GST_TAG_BEATS_PER_MINUTE, NULL, qtdemux_tag_add_tmpo}, {
+      FOURCC_covr, GST_TAG_IMAGE, NULL, qtdemux_tag_add_covr}, {
+      FOURCC_sonm, GST_TAG_TITLE_SORTNAME, NULL, qtdemux_tag_add_str}, {
+      FOURCC_soal, GST_TAG_ALBUM_SORTNAME, NULL, qtdemux_tag_add_str}, {
+      FOURCC_soar, GST_TAG_ARTIST_SORTNAME, NULL, qtdemux_tag_add_str}, {
+      FOURCC_soaa, GST_TAG_ALBUM_ARTIST_SORTNAME, NULL, qtdemux_tag_add_str}, {
+      FOURCC_soco, GST_TAG_COMPOSER_SORTNAME, NULL, qtdemux_tag_add_str}, {
+      FOURCC_sosn, GST_TAG_SHOW_SORTNAME, NULL, qtdemux_tag_add_str}, {
+      FOURCC_tvsh, GST_TAG_SHOW_NAME, NULL, qtdemux_tag_add_str}, {
+      FOURCC_tvsn, GST_TAG_SHOW_SEASON_NUMBER, NULL, qtdemux_tag_add_uint32}, {
+      FOURCC_tves, GST_TAG_SHOW_EPISODE_NUMBER, NULL, qtdemux_tag_add_uint32}, {
+      FOURCC_kywd, GST_TAG_KEYWORDS, NULL, qtdemux_tag_add_keywords}, {
+      FOURCC_keyw, GST_TAG_KEYWORDS, NULL, qtdemux_tag_add_str}, {
+      FOURCC__enc, GST_TAG_ENCODER, NULL, qtdemux_tag_add_str}, {
+      FOURCC_loci, GST_TAG_GEO_LOCATION_NAME, NULL, qtdemux_tag_add_location}, {
+        FOURCC_clsf, GST_QT_DEMUX_CLASSIFICATION_TAG, NULL,
+      qtdemux_tag_add_classification}, {
+      FOURCC__mak, GST_TAG_DEVICE_MANUFACTURER, NULL, qtdemux_tag_add_str}, {
+      FOURCC__mod, GST_TAG_DEVICE_MODEL, NULL, qtdemux_tag_add_str}, {
+      FOURCC__swr, GST_TAG_APPLICATION_NAME, NULL, qtdemux_tag_add_str}, {
+
+        /* This is a special case, some tags are stored in this
+         * 'reverse dns naming', according to:
+         * http://atomicparsley.sourceforge.net/mpeg-4files.html and
+         * bug #614471
+         */
+      FOURCC_____, "", NULL, qtdemux_tag_add_revdns}, {
+        /* see http://www.mp4ra.org/specs.html for ID32 in meta box */
+      FOURCC_ID32, "", NULL, qtdemux_tag_add_id32}
 };
 
 struct _GstQtDemuxTagList
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/gst/isomp4/qtdemux_types.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/gst/isomp4/qtdemux_types.c
index 9c73224c81a..f6dc28f36fe 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/gst/isomp4/qtdemux_types.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/gst/isomp4/qtdemux_types.c
@@ -233,6 +233,8 @@ static const QtNodeType qt_node_types[] = {
   {FOURCC_schi, "scheme information", QT_FLAG_CONTAINER},
   {FOURCC_pssh, "protection system specific header", 0},
   {FOURCC_tenc, "track encryption", 0},
+  {FOURCC_sgpd, "sample group description", 0},
+  {FOURCC_sbgp, "sample to group", 0},
   {FOURCC_stpp, "XML subtitle sample entry", 0},
   {FOURCC_wvtt, "WebVTT subtitle sample entry", 0},
   {FOURCC_clcp, "Closed Caption", 0},
@@ -263,7 +265,7 @@ qtdemux_type_get (guint32 fourcc)
       return qt_node_types + i;
   }
 
-  GST_WARNING ("unknown QuickTime node type %" GST_FOURCC_FORMAT,
+  GST_FIXME ("unknown QuickTime node type %" GST_FOURCC_FORMAT,
       GST_FOURCC_ARGS (fourcc));
 
   return qt_node_types + n_qt_node_types - 1;
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/gst/wavparse/gstwavparse.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/gst/wavparse/gstwavparse.c
index 4cd4ed95532..91a76f2cb30 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/gst/wavparse/gstwavparse.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/gst/wavparse/gstwavparse.c
@@ -1607,6 +1607,7 @@ gst_wavparse_stream_headers (GstWavParse * wav)
               gst_wavparse_adtl_chunk (wav, (const guint8 *) map.data,
                   data_size);
               gst_buffer_unmap (buf, &map);
+              gst_buffer_unref (buf);
             }
             wav->offset += GST_ROUND_UP_2 (data_size);
             break;
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxaudio.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxaudio.c
index e455cc1fbe6..85bf0081ccb 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxaudio.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxaudio.c
@@ -44,27 +44,21 @@ static gboolean
 plugin_init (GstPlugin * plugin)
 #endif // GSTREAMER_LITE
 {
-  if (!gst_element_register (plugin, "osxaudiosink", GST_RANK_PRIMARY,
-          GST_TYPE_OSX_AUDIO_SINK)) {
-    return FALSE;
-  }
+  gboolean ret = FALSE;
 
 #ifdef GSTREAMER_LITE_TEST
-  if (!gst_element_register (plugin, "osxaudiosrc", GST_RANK_PRIMARY,
-          GST_TYPE_OSX_AUDIO_SRC)) {
-    return FALSE;
-  }
+  ret |= GST_ELEMENT_REGISTER (osxaudiosrc, plugin);
 #endif // GSTREAMER_LITE_TEST
 
+ret |= GST_ELEMENT_REGISTER (osxaudiosink, plugin);
+
 #ifndef GSTREAMER_LITE
 #ifndef HAVE_IOS
-  if (!gst_device_provider_register (plugin, "osxaudiodeviceprovider",
-          GST_RANK_PRIMARY, GST_TYPE_OSX_AUDIO_DEVICE_PROVIDER))
-    return FALSE;
+  ret |= GST_DEVICE_PROVIDER_REGISTER (osxaudiodeviceprovider, plugin);
 #endif
 #endif // GSTREAMER_LITE
 
-  return TRUE;
+  return ret;
 }
 
 #ifndef GSTREAMER_LITE
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxaudioringbuffer.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxaudioringbuffer.c
index 32eb120fd52..5a8e58214dc 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxaudioringbuffer.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxaudioringbuffer.c
@@ -174,7 +174,8 @@ gst_osx_audio_ring_buffer_acquire (GstAudioRingBuffer * buf,
 {
   gboolean ret = FALSE, is_passthrough = FALSE;
   GstOsxAudioRingBuffer *osxbuf;
-  AudioStreamBasicDescription format;
+  AudioStreamBasicDescription format = { 0 };
+  guint32 frames_per_packet = 0;
 
   osxbuf = GST_OSX_AUDIO_RING_BUFFER (buf);
 
@@ -225,6 +226,8 @@ gst_osx_audio_ring_buffer_acquire (GstAudioRingBuffer * buf,
         (spec->latency_time * GST_AUDIO_INFO_RATE (&spec->info) /
         G_USEC_PER_SEC) * GST_AUDIO_INFO_BPF (&spec->info);
     spec->segtotal = spec->buffer_time / spec->latency_time;
+    frames_per_packet = spec->segsize / GST_AUDIO_INFO_BPF (&spec->info);
+
     is_passthrough = FALSE;
   }
 
@@ -239,7 +242,7 @@ gst_osx_audio_ring_buffer_acquire (GstAudioRingBuffer * buf,
   buf->memory = g_malloc0 (buf->size);
 
   ret = gst_core_audio_initialize (osxbuf->core_audio, format, spec->caps,
-      is_passthrough);
+      frames_per_packet, is_passthrough);
 
   if (!ret) {
     g_free (buf->memory);
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxaudiosink.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxaudiosink.c
index 42930babaeb..8b39eed1ec7 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxaudiosink.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxaudiosink.c
@@ -151,6 +151,8 @@ gst_osx_audio_sink_do_init (GType type)
 #define gst_osx_audio_sink_parent_class parent_class
 G_DEFINE_TYPE_WITH_CODE (GstOsxAudioSink, gst_osx_audio_sink,
     GST_TYPE_AUDIO_BASE_SINK, gst_osx_audio_sink_do_init (g_define_type_id));
+GST_ELEMENT_REGISTER_DEFINE (osxaudiosink, "osxaudiosink", GST_RANK_PRIMARY,
+    GST_TYPE_OSX_AUDIO_SINK);
 
 static void
 gst_osx_audio_sink_class_init (GstOsxAudioSinkClass * klass)
@@ -562,7 +564,13 @@ gst_osx_audio_sink_io_proc (GstOsxAudioRingBuffer * buf,
       gst_audio_ring_buffer_clear (GST_AUDIO_RING_BUFFER (buf), readseg);
 
       /* we wrote one segment */
+      CORE_AUDIO_TIMING_LOCK (buf->core_audio);
       gst_audio_ring_buffer_advance (GST_AUDIO_RING_BUFFER (buf), 1);
+      /* FIXME: Update the timestamp and reported frames in smaller increments
+       * when the segment size is larger than the total inNumberFrames */
+      gst_core_audio_update_timing (buf->core_audio, inTimeStamp,
+          inNumberFrames);
+      CORE_AUDIO_TIMING_UNLOCK (buf->core_audio);
 
       buf->segoffset = 0;
     }
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxaudiosink.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxaudiosink.h
index 2f55c4d2e6e..a15b0ec3c30 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxaudiosink.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxaudiosink.h
@@ -96,6 +96,8 @@ struct _GstOsxAudioSinkClass
 
 GType gst_osx_audio_sink_get_type (void);
 
+GST_ELEMENT_REGISTER_DECLARE (osxaudiosink);
+
 G_END_DECLS
 
 #endif /* __GST_OSXAUDIOSINK_H__ */
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxaudiosrc.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxaudiosrc.c
index 0ae5e9ce62b..75793bb6928 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxaudiosrc.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxaudiosrc.c
@@ -123,6 +123,8 @@ gst_osx_audio_src_do_init (GType type)
 #define gst_osx_audio_src_parent_class parent_class
 G_DEFINE_TYPE_WITH_CODE (GstOsxAudioSrc, gst_osx_audio_src,
     GST_TYPE_AUDIO_BASE_SRC, gst_osx_audio_src_do_init (g_define_type_id));
+GST_ELEMENT_REGISTER_DEFINE (osxaudiosrc, "osxaudiosrc", GST_RANK_PRIMARY,
+    GST_TYPE_OSX_AUDIO_SRC);
 
 static void
 gst_osx_audio_src_class_init (GstOsxAudioSrcClass * klass)
@@ -339,6 +341,12 @@ gst_osx_audio_src_io_proc (GstOsxAudioRingBuffer * buf,
   gint remaining;
   UInt32 n;
   gint offset = 0;
+  guint64 sample_position;
+  GstAudioRingBufferSpec *spec = &GST_AUDIO_RING_BUFFER (buf)->spec;
+  guint bpf = GST_AUDIO_INFO_BPF (&spec->info);
+
+  GST_LOG_OBJECT (buf, "in sample position %f frames %u",
+      inTimeStamp->mSampleTime, inNumberFrames);
 
   /* Previous invoke of AudioUnitRender changed mDataByteSize into
    * number of bytes actually read. Reset the members. */
@@ -359,6 +367,7 @@ gst_osx_audio_src_io_proc (GstOsxAudioRingBuffer * buf,
    *       not just the first one. */
 
   remaining = buf->core_audio->recBufferList->mBuffers[0].mDataByteSize;
+  sample_position = inTimeStamp->mSampleTime;
 
   while (remaining) {
     if (!gst_audio_ring_buffer_prepare_read (GST_AUDIO_RING_BUFFER (buf),
@@ -377,10 +386,24 @@ gst_osx_audio_src_io_proc (GstOsxAudioRingBuffer * buf,
     buf->segoffset += len;
     offset += len;
     remaining -= len;
+    sample_position += len / bpf;
 
     if ((gint) buf->segoffset == GST_AUDIO_RING_BUFFER (buf)->spec.segsize) {
+      /* Calculate the timestamp corresponding to the first sample in the segment */
+      guint64 seg_sample_pos = sample_position - (spec->segsize / bpf);
+      GstClockTime ts = gst_util_uint64_scale_int (seg_sample_pos, GST_SECOND,
+          GST_AUDIO_INFO_RATE (&spec->info));
+      gst_audio_ring_buffer_set_timestamp (GST_AUDIO_RING_BUFFER (buf),
+          writeseg, ts);
+
       /* we wrote one segment */
+      CORE_AUDIO_TIMING_LOCK (buf->core_audio);
       gst_audio_ring_buffer_advance (GST_AUDIO_RING_BUFFER (buf), 1);
+      /* FIXME: Update the timestamp and reported frames in smaller increments
+       * when the segment size is larger than the total inNumberFrames */
+      gst_core_audio_update_timing (buf->core_audio, inTimeStamp,
+          inNumberFrames);
+      CORE_AUDIO_TIMING_UNLOCK (buf->core_audio);
 
       buf->segoffset = 0;
     }
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxaudiosrc.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxaudiosrc.h
index 9d825b02862..980cf917227 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxaudiosrc.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxaudiosrc.h
@@ -82,6 +82,8 @@ struct _GstOsxAudioSrcClass
 
 GType gst_osx_audio_src_get_type (void);
 
+GST_ELEMENT_REGISTER_DECLARE (osxaudiosrc);
+
 G_END_DECLS
 
 #endif /* __GST_OSXAUDIOSRC_H__ */
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxcoreaudio.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxcoreaudio.c
index 08a52e4f339..3d6a88a63be 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxcoreaudio.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxcoreaudio.c
@@ -24,8 +24,8 @@
 #include "gstosxcoreaudio.h"
 #include "gstosxcoreaudiocommon.h"
 
-GST_DEBUG_CATEGORY_STATIC (osx_audio_debug);
-#define GST_CAT_DEFAULT osx_audio_debug
+GST_DEBUG_CATEGORY (osx_coreaudio_debug);
+#define GST_CAT_DEFAULT osx_coreaudio_debug
 
 G_DEFINE_TYPE (GstCoreAudio, gst_core_audio, G_TYPE_OBJECT);
 
@@ -35,10 +35,20 @@ G_DEFINE_TYPE (GstCoreAudio, gst_core_audio, G_TYPE_OBJECT);
 #include "gstosxcoreaudiohal.c"
 #endif
 
+static void
+gst_core_audio_finalize (GObject * object)
+{
+  GstCoreAudio *core_audio = GST_CORE_AUDIO (object);
+  g_mutex_clear (&core_audio->timing_lock);
+
+  G_OBJECT_CLASS (gst_core_audio_parent_class)->finalize (object);
+}
 
 static void
 gst_core_audio_class_init (GstCoreAudioClass * klass)
 {
+  GObjectClass *object_klass = G_OBJECT_CLASS (klass);
+  object_klass->finalize = gst_core_audio_finalize;
 }
 
 static void
@@ -54,6 +64,9 @@ gst_core_audio_init (GstCoreAudio * core_audio)
   core_audio->hog_pid = -1;
   core_audio->disabled_mixing = FALSE;
 #endif
+
+  mach_timebase_info (&core_audio->timebase);
+  g_mutex_init (&core_audio->timing_lock);
 }
 
 static gboolean
@@ -96,6 +109,21 @@ _audio_unit_property_listener (void *inRefCon, AudioUnit inUnit,
   }
 }
 
+static GstClockTime
+_current_time_ns (GstCoreAudio * core_audio)
+{
+  guint64 mach_t = mach_absolute_time ();
+  return gst_util_uint64_scale (mach_t, core_audio->timebase.numer,
+      core_audio->timebase.denom);
+}
+
+static GstClockTime
+_host_time_to_ns (GstCoreAudio * core_audio, uint64_t host_time)
+{
+  return gst_util_uint64_scale (host_time, core_audio->timebase.numer,
+      core_audio->timebase.denom);
+}
+
 /**************************
  *       Public API       *
  *************************/
@@ -202,28 +230,118 @@ gboolean
 gst_core_audio_get_samples_and_latency (GstCoreAudio * core_audio,
     gdouble rate, guint * samples, gdouble * latency)
 {
-  return gst_core_audio_get_samples_and_latency_impl (core_audio, rate,
+  uint64_t now_ns = _current_time_ns (core_audio);
+  gboolean ret = gst_core_audio_get_samples_and_latency_impl (core_audio, rate,
       samples, latency);
+
+  if (!ret)
+    return FALSE;
+
+  CORE_AUDIO_TIMING_LOCK (core_audio);
+
+  uint32_t samples_remain = 0;
+  uint64_t anchor_ns = core_audio->anchor_hosttime_ns;
+
+  if (core_audio->is_src) {
+    int64_t captured_ns =
+        core_audio->rate_scalar * (int64_t) (now_ns - anchor_ns);
+
+    /* src, the anchor time is the timestamp of the first sample in the last
+     * packet received, and we increment up from there, unless the device gets stopped. */
+    if (captured_ns > 0) {
+      if (core_audio->io_proc_active) {
+        samples_remain = (uint32_t) (captured_ns * rate / GST_SECOND);
+      } else {
+        samples_remain = core_audio->anchor_pend_samples;
+      }
+    } else {
+      /* Time went backward. This shouldn't happen for sources, but report something anyway */
+      samples_remain =
+          (uint32_t) (-captured_ns * rate / GST_SECOND) +
+          core_audio->anchor_pend_samples;
+    }
+
+    GST_DEBUG_OBJECT (core_audio,
+        "now_ns %" G_GUINT64_FORMAT " anchor %" G_GUINT64_FORMAT " elapsed ns %"
+        G_GINT64_FORMAT " rate %f captured_ns %" G_GINT64_FORMAT
+        " anchor_pend_samples %u samples_remain %u", now_ns, anchor_ns,
+        now_ns - anchor_ns, rate, captured_ns, core_audio->anchor_pend_samples,
+        samples_remain);
+  } else {
+    /* Sink, the anchor time is the time the most recent buffer will commence play out,
+     * and we count down to 0 for unplayed samples beyond that */
+    int64_t unplayed_ns =
+        core_audio->rate_scalar * (int64_t) (anchor_ns - now_ns);
+    if (unplayed_ns > 0) {
+      samples_remain =
+          (uint32_t) (unplayed_ns * rate / GST_SECOND) +
+          core_audio->anchor_pend_samples;
+    } else {
+      uint32_t samples_played = (uint32_t) (-unplayed_ns * rate / GST_SECOND);
+      if (samples_played < core_audio->anchor_pend_samples) {
+        samples_remain = core_audio->anchor_pend_samples - samples_played;
+      }
+    }
+
+    GST_DEBUG_OBJECT (core_audio,
+        "now_ns %" G_GUINT64_FORMAT " anchor %" G_GUINT64_FORMAT " elapsed ns %"
+        G_GINT64_FORMAT " rate %f unplayed_ns %" G_GINT64_FORMAT
+        " anchor_pend_samples %u", now_ns, anchor_ns, now_ns - anchor_ns, rate,
+        unplayed_ns, core_audio->anchor_pend_samples);
+  }
+
+  CORE_AUDIO_TIMING_UNLOCK (core_audio);
+
+  GST_DEBUG_OBJECT (core_audio, "samples = %u latency %f", samples_remain,
+      *latency);
+
+  *samples = samples_remain;
+  return TRUE;
+}
+
+void
+gst_core_audio_update_timing (GstCoreAudio * core_audio,
+    const AudioTimeStamp * inTimeStamp, unsigned int inNumberFrames)
+{
+  AudioTimeStampFlags target_flags =
+      kAudioTimeStampSampleHostTimeValid | kAudioTimeStampRateScalarValid;
+
+  if ((inTimeStamp->mFlags & target_flags) == target_flags) {
+    core_audio->anchor_hosttime_ns =
+        _host_time_to_ns (core_audio, inTimeStamp->mHostTime);
+    core_audio->anchor_pend_samples = inNumberFrames;
+    core_audio->rate_scalar = inTimeStamp->mRateScalar;
+
+    GST_DEBUG_OBJECT (core_audio,
+        "anchor hosttime_ns %" G_GUINT64_FORMAT
+        " scalar_rate %f anchor_pend_samples %u",
+        core_audio->anchor_hosttime_ns,
+        core_audio->rate_scalar, core_audio->anchor_pend_samples);
+  }
 }
 
 gboolean
 gst_core_audio_initialize (GstCoreAudio * core_audio,
-    AudioStreamBasicDescription format, GstCaps * caps, gboolean is_passthrough)
+    AudioStreamBasicDescription format, GstCaps * caps,
+    guint32 frames_per_packet, gboolean is_passthrough)
 {
-  guint32 frame_size;
-
   GST_DEBUG_OBJECT (core_audio,
       "Initializing: passthrough:%d caps:%" GST_PTR_FORMAT, is_passthrough,
       caps);
 
   if (!gst_core_audio_initialize_impl (core_audio, format, caps,
-          is_passthrough, &frame_size)) {
+          is_passthrough, &frames_per_packet)) {
     return FALSE;
   }
 
   if (core_audio->is_src) {
     /* create AudioBufferList needed for recording */
-    core_audio->recBufferSize = frame_size * format.mBytesPerFrame;
+    core_audio->recBufferSize = frames_per_packet * format.mBytesPerFrame;
+
+    GST_DEBUG_OBJECT (core_audio,
+        "Allocating record buffers %u bytes %u frames",
+        core_audio->recBufferSize, frames_per_packet);
+
     core_audio->recBufferList =
         buffer_list_alloc (format.mChannelsPerFrame, core_audio->recBufferSize,
         /* Currently always TRUE (i.e. interleaved) */
@@ -256,7 +374,7 @@ gst_core_audio_select_device (GstCoreAudio * core_audio)
 void
 gst_core_audio_init_debug (void)
 {
-  GST_DEBUG_CATEGORY_INIT (osx_audio_debug, "osxaudio", 0,
+  GST_DEBUG_CATEGORY_INIT (osx_coreaudio_debug, "osxaudio", 0,
       "OSX Audio Elements");
 }
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxcoreaudio.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxcoreaudio.h
index 4319434d49b..2ea32f2e3b0 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxcoreaudio.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxcoreaudio.h
@@ -45,6 +45,7 @@
   #endif
 #endif
 #include <AudioUnit/AudioUnit.h>
+#include <mach/mach_time.h>
 #include "gstosxaudioelement.h"
 
 
@@ -77,6 +78,9 @@ G_BEGIN_DECLS
 typedef struct _GstCoreAudio GstCoreAudio;
 typedef struct _GstCoreAudioClass GstCoreAudioClass;
 
+#define CORE_AUDIO_TIMING_LOCK(core_audio) (g_mutex_lock(&(core_audio->timing_lock)))
+#define CORE_AUDIO_TIMING_UNLOCK(core_audio) (g_mutex_unlock(&(core_audio->timing_lock)))
+
 struct _GstCoreAudio
 {
   GObject object;
@@ -107,6 +111,12 @@ struct _GstCoreAudio
   AudioStreamBasicDescription original_format, stream_format;
   AudioDeviceIOProcID procID;
 #endif
+
+  mach_timebase_info_data_t timebase;
+  GMutex timing_lock;
+  uint64_t anchor_hosttime_ns;
+  uint32_t anchor_pend_samples;
+  float rate_scalar;
 };
 
 struct _GstCoreAudioClass
@@ -127,6 +137,7 @@ gboolean gst_core_audio_close                                (GstCoreAudio *core
 gboolean gst_core_audio_initialize                           (GstCoreAudio *core_audio,
                                                               AudioStreamBasicDescription format,
                                                               GstCaps *caps,
+                                                              guint32 frames_per_packet,
                                                               gboolean is_passthrough);
 
 void gst_core_audio_uninitialize                             (GstCoreAudio *core_audio);
@@ -142,6 +153,10 @@ gboolean gst_core_audio_get_samples_and_latency              (GstCoreAudio * cor
                                                               guint *samples,
                                                               gdouble *latency);
 
+void gst_core_audio_update_timing                            (GstCoreAudio * core_audio,
+                                                              const AudioTimeStamp * inTimeStamp,
+                                                              unsigned int inNumberFrames);
+
 void  gst_core_audio_set_volume                              (GstCoreAudio *core_audio,
                                                               gfloat volume);
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxcoreaudiocommon.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxcoreaudiocommon.c
index 39d03ac5b42..b3c77a7cd19 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxcoreaudiocommon.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxcoreaudiocommon.c
@@ -23,6 +23,9 @@
 
 #include "gstosxcoreaudiocommon.h"
 
+GST_DEBUG_CATEGORY_EXTERN (osx_coreaudio_debug);
+#define GST_CAT_DEFAULT osx_coreaudio_debug
+
 void
 gst_core_audio_remove_render_callback (GstCoreAudio * core_audio)
 {
@@ -385,9 +388,9 @@ gst_audio_channel_position_to_core_audio (GstAudioChannelPosition
     case GST_AUDIO_CHANNEL_POSITION_REAR_CENTER:
       return kAudioChannelLabel_CenterSurround;
     case GST_AUDIO_CHANNEL_POSITION_REAR_LEFT:
-      return kAudioChannelLabel_LeftSurround;
+      return kAudioChannelLabel_RearSurroundLeft;
     case GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT:
-      return kAudioChannelLabel_RightSurround;
+      return kAudioChannelLabel_RearSurroundRight;
     case GST_AUDIO_CHANNEL_POSITION_LFE1:
       return kAudioChannelLabel_LFEScreen;
     case GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER:
@@ -418,6 +421,12 @@ gst_audio_channel_position_to_core_audio (GstAudioChannelPosition
       return kAudioChannelLabel_VerticalHeightRight;
     case GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_CENTER:
       return kAudioChannelLabel_VerticalHeightCenter;
+    case GST_AUDIO_CHANNEL_POSITION_TOP_CENTER:
+      return kAudioChannelLabel_TopCenterSurround;
+    case GST_AUDIO_CHANNEL_POSITION_SURROUND_LEFT:
+      return kAudioChannelLabel_LeftSurround;
+    case GST_AUDIO_CHANNEL_POSITION_SURROUND_RIGHT:
+      return kAudioChannelLabel_RightSurround;
 
       /* Special position values */
     case GST_AUDIO_CHANNEL_POSITION_NONE:
@@ -427,14 +436,11 @@ gst_audio_channel_position_to_core_audio (GstAudioChannelPosition
 
       /* Following positions are unmapped --
        * i.e. mapped to kAudioChannelLabel_Unknown: */
-    case GST_AUDIO_CHANNEL_POSITION_TOP_CENTER:
     case GST_AUDIO_CHANNEL_POSITION_TOP_SIDE_LEFT:
     case GST_AUDIO_CHANNEL_POSITION_TOP_SIDE_RIGHT:
     case GST_AUDIO_CHANNEL_POSITION_BOTTOM_FRONT_CENTER:
     case GST_AUDIO_CHANNEL_POSITION_BOTTOM_FRONT_LEFT:
     case GST_AUDIO_CHANNEL_POSITION_BOTTOM_FRONT_RIGHT:
-    case GST_AUDIO_CHANNEL_POSITION_SURROUND_LEFT:
-    case GST_AUDIO_CHANNEL_POSITION_SURROUND_RIGHT:
     default:
       return kAudioChannelLabel_Unknown;
   }
@@ -455,9 +461,9 @@ gst_core_audio_channel_label_to_gst (AudioChannelLabel label,
     case kAudioChannelLabel_LFEScreen:
       return GST_AUDIO_CHANNEL_POSITION_LFE1;
     case kAudioChannelLabel_LeftSurround:
-      return GST_AUDIO_CHANNEL_POSITION_REAR_LEFT;
+      return GST_AUDIO_CHANNEL_POSITION_SURROUND_LEFT;
     case kAudioChannelLabel_RightSurround:
-      return GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT;
+      return GST_AUDIO_CHANNEL_POSITION_SURROUND_RIGHT;
     case kAudioChannelLabel_LeftSurroundDirect:
       return GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT;
     case kAudioChannelLabel_RightSurroundDirect:
@@ -486,6 +492,12 @@ gst_core_audio_channel_label_to_gst (AudioChannelLabel label,
       return GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_RIGHT;
     case kAudioChannelLabel_VerticalHeightCenter:
       return GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_CENTER;
+    case kAudioChannelLabel_RearSurroundLeft:
+      return GST_AUDIO_CHANNEL_POSITION_REAR_LEFT;
+    case kAudioChannelLabel_RearSurroundRight:
+      return GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT;
+    case kAudioChannelLabel_TopCenterSurround:
+      return GST_AUDIO_CHANNEL_POSITION_TOP_CENTER;
 
       /* Special position values */
 
@@ -499,9 +511,6 @@ gst_core_audio_channel_label_to_gst (AudioChannelLabel label,
          Following labels are unmapped --
          i.e. mapped to GST_AUDIO_CHANNEL_POSITION_INVALID:
        */
-    case kAudioChannelLabel_RearSurroundLeft:
-    case kAudioChannelLabel_RearSurroundRight:
-    case kAudioChannelLabel_TopCenterSurround:
     case kAudioChannelLabel_LeftTotal:
     case kAudioChannelLabel_RightTotal:
     case kAudioChannelLabel_HearingImpaired:
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxcoreaudiocommon.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxcoreaudiocommon.h
index c4602a6b301..ba6dcffd3e0 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxcoreaudiocommon.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxcoreaudiocommon.h
@@ -24,6 +24,8 @@
 #include "gstosxcoreaudio.h"
 #include <gst/audio/audio-channels.h>
 
+G_BEGIN_DECLS
+
 typedef struct
 {
   GMutex lock;
@@ -64,3 +66,5 @@ OSStatus gst_core_audio_render_notify                     (GstCoreAudio * core_a
 AudioChannelLabel gst_audio_channel_position_to_core_audio (GstAudioChannelPosition position, int channel);
 
 GstAudioChannelPosition gst_core_audio_channel_label_to_gst (AudioChannelLabel label, int channel, gboolean warn);
+
+G_END_DECLS
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxcoreaudiohal.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxcoreaudiohal.c
index 7e41f59aac0..2eb27e2b490 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxcoreaudiohal.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/sys/osxaudio/gstosxcoreaudiohal.c
@@ -1162,7 +1162,7 @@ gst_core_audio_initialize_impl (GstCoreAudio * core_audio,
     _monitorize_spdif (core_audio);
   } else {
     OSStatus status;
-    UInt32 propertySize;
+    UInt32 propertySize = sizeof (*frame_size);
 
     core_audio->stream_idx = 0;
     if (!gst_core_audio_set_format (core_audio, format))
@@ -1172,17 +1172,31 @@ gst_core_audio_initialize_impl (GstCoreAudio * core_audio,
             format.mChannelsPerFrame, caps))
       goto done;
 
-    if (core_audio->is_src) {
-      propertySize = sizeof (*frame_size);
+    // Attempt to configure the requested frame size if smaller than the device's
+    // This will apparently modify the size for all audio devices in the current process so should
+    // be done conservatively
+    if (frame_size != 0) {
+      guint32 cur_frame_size;
       status = AudioUnitGetProperty (core_audio->audiounit, kAudioDevicePropertyBufferFrameSize, kAudioUnitScope_Global, 0,     /* N/A for global */
-          frame_size, &propertySize);
-
-      if (status) {
-        GST_WARNING_OBJECT (core_audio->osxbuf, "Failed to get frame size: %d",
-            (int) status);
-        goto done;
+          &cur_frame_size, &propertySize);
+      if (!status && *frame_size < cur_frame_size) {
+        status = AudioUnitSetProperty (core_audio->audiounit, kAudioDevicePropertyBufferFrameSize, kAudioUnitScope_Global, 0,   /* N/A for global */
+            frame_size, propertySize);
+        if (status) {
+          GST_WARNING_OBJECT (core_audio->osxbuf,
+              "Failed to set desired frame size of %u: %d", *frame_size,
+              (int) status);
+        }
       }
     }
+    status = AudioUnitGetProperty (core_audio->audiounit, kAudioDevicePropertyBufferFrameSize, kAudioUnitScope_Global, 0,       /* N/A for global */
+        frame_size, &propertySize);
+
+    if (status) {
+      GST_WARNING_OBJECT (core_audio->osxbuf, "Failed to get frame size: %d",
+          (int) status);
+      goto done;
+    }
   }
 
   ret = TRUE;
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gst.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gst.c
index 554d5274770..4c561e35110 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gst.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gst.c
@@ -123,6 +123,10 @@
 #include "gstplugins-lite.h"
 #endif // GSTREAMER_LITE
 
+#ifdef GST_FULL_STATIC_COMPILATION
+void gst_init_static_plugins ();
+#endif
+
 #include <glib/gi18n-lib.h>
 #include <locale.h>             /* for LC_ALL */
 
@@ -191,7 +195,6 @@ enum
   ARG_DEBUG_COLOR_MODE,
   ARG_DEBUG_HELP,
 #endif
-  ARG_PLUGIN_SPEW,
   ARG_PLUGIN_PATH,
   ARG_PLUGIN_LOAD,
   ARG_SEGTRAP_DISABLE,
@@ -206,24 +209,21 @@ enum
  */
 
 #ifndef GSTREAMER_LITE
-#ifdef G_OS_WIN32
+#if defined(G_OS_WIN32) && !defined(GST_STATIC_COMPILATION)
 /* Note: DllMain is only called when DLLs are loaded or unloaded, so this will
  * never be called if libgstreamer-1.0 is linked statically. Do not add any code
  * here to, say, initialize variables or set things up since that will only
  * happen for dynamically-built GStreamer.
- *
- * Also, ideally this should not be defined when GStreamer is built statically.
- * i.e., it should be conditional on #ifdef DLL_EXPORT. It will be ignored, but
- * if other libraries make the same mistake of defining it when building
- * statically, there will be a symbol collision during linking. Fixing this
- * requires one to build two object files: one for static linking and another
- * for dynamic linking. */
+ */
 BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved);
 BOOL WINAPI
 DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
-  if (fdwReason == DLL_PROCESS_ATTACH)
+  if (fdwReason == DLL_PROCESS_ATTACH) {
     _priv_gst_dll_handle = (HMODULE) hinstDLL;
+    priv_gst_clock_init ();
+  }
+
   return TRUE;
 }
 
@@ -284,10 +284,6 @@ gst_init_get_option_group (void)
     {"gst-debug-disable", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK,
         (gpointer) parse_goption_arg, N_("Disable debugging"), NULL},
 #endif
-    {"gst-plugin-spew", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK,
-          (gpointer) parse_goption_arg,
-          N_("Enable verbose plugin loading diagnostics"),
-        NULL},
     {"gst-plugin-path", 0, 0, G_OPTION_ARG_CALLBACK,
           (gpointer) parse_goption_arg,
         N_("Colon-separated paths containing plugins"), N_("PATHS")},
@@ -567,6 +563,8 @@ init_pre (GOptionContext * context, GOptionGroup * group, gpointer data,
   g_type_init ();
 #endif // GSTREAMER_LITE
 
+  priv_gst_clock_init ();
+
   find_executable_path ();
 
   _priv_gst_start_time = gst_util_get_timestamp ();
@@ -654,6 +652,9 @@ gst_register_core_elements (GstPlugin * plugin)
 static void
 init_static_plugins (void)
 {
+#ifdef GST_FULL_STATIC_COMPILATION
+  gst_init_static_plugins ();
+#else
   GModule *module;
 
   /* Call gst_init_static_plugins() defined in libgstreamer-full-1.0 in the case
@@ -667,6 +668,7 @@ init_static_plugins (void)
     }
     g_module_close (module);
   }
+#endif
 }
 
 /*
@@ -1036,8 +1038,6 @@ parse_one_option (gint opt, const gchar * arg, GError ** err)
       gst_debug_help ();
       exit (0);
 #endif
-    case ARG_PLUGIN_SPEW:
-      break;
     case ARG_PLUGIN_PATH:
 #ifndef GST_DISABLE_REGISTRY
       if (!_priv_gst_disable_registry)
@@ -1091,7 +1091,6 @@ parse_goption_arg (const gchar * opt,
     "--gst-debug-help", ARG_DEBUG_HELP},
 #endif
     {
-    "--gst-plugin-spew", ARG_PLUGIN_SPEW}, {
     "--gst-plugin-path", ARG_PLUGIN_PATH}, {
     "--gst-plugin-load", ARG_PLUGIN_LOAD}, {
     "--gst-disable-segtrap", ARG_SEGTRAP_DISABLE}, {
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gst.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gst.h
index 5c62f899dbe..e037411e9a5 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gst.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gst.h
@@ -36,6 +36,7 @@
 #include <gst/gstbuffer.h>
 #include <gst/gstbufferlist.h>
 #include <gst/gstbufferpool.h>
+#include <gst/gstbytearrayinterface.h>
 #include <gst/gstcaps.h>
 #include <gst/gstcapsfeatures.h>
 #include <gst/gstchildproxy.h>
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gst_private.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gst_private.h
index 5a31b033495..9a8c298c590 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gst_private.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gst_private.h
@@ -90,7 +90,8 @@ typedef struct {
 } GstPluginDep;
 
 struct _GstPluginPrivate {
-  GList *deps;    /* list of GstPluginDep structures */
+  GList *deps;                 /* list of GstPluginDep structures */
+  GstStructure *status_info;
   GstStructure *cache_data;
 };
 
@@ -160,7 +161,7 @@ gboolean _priv_gst_registry_remove_cache_plugins (GstRegistry *registry);
 G_GNUC_INTERNAL  void _priv_gst_registry_cleanup (void);
 
 GST_API
-gboolean _gst_plugin_loader_client_run (void);
+gboolean _gst_plugin_loader_client_run (const gchar * pipe_name);
 
 G_GNUC_INTERNAL  GstPlugin * _priv_gst_plugin_load_file_for_registry (const gchar *filename,
                                                                       GstRegistry * registry,
@@ -539,6 +540,11 @@ struct _GstClockEntryImpl
 };
 
 char * priv_gst_get_relocated_libgstreamer (void);
+gint   priv_gst_count_directories (const char *filepath);
+
+void priv_gst_clock_init (void);
+GstClockTime priv_gst_get_monotonic_time (void);
+GstClockTime priv_gst_get_real_time (void);
 
 G_END_DECLS
 #endif /* __GST_PRIVATE_H__ */
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstallocator.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstallocator.c
index 49bf59cbaf5..08f8852c9b1 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstallocator.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstallocator.c
@@ -46,6 +46,7 @@
 #endif
 
 #include "gst_private.h"
+#include "glib-compat-private.h"
 #include "gstmemory.h"
 
 GST_DEBUG_CATEGORY_STATIC (gst_allocator_debug);
@@ -109,13 +110,14 @@ _fallback_mem_copy (GstMemory * mem, gssize offset, gssize size)
 
   /* use the same allocator as the memory we copy  */
   allocator = mem->allocator;
-  if (GST_OBJECT_FLAG_IS_SET (allocator, GST_ALLOCATOR_FLAG_CUSTOM_ALLOC))
+  if (GST_OBJECT_FLAG_IS_SET (allocator, GST_ALLOCATOR_FLAG_CUSTOM_ALLOC) ||
+      GST_OBJECT_FLAG_IS_SET (allocator, GST_ALLOCATOR_FLAG_NO_COPY))
     allocator = NULL;
   copy = gst_allocator_alloc (allocator, size, &params);
 
   if (!gst_memory_map (copy, &dinfo, GST_MAP_WRITE)) {
     GST_CAT_WARNING (GST_CAT_MEMORY, "could not write map memory %p", copy);
-    gst_allocator_free (mem->allocator, copy);
+    gst_allocator_free (copy->allocator, copy);
     gst_memory_unmap (mem, &sinfo);
     return NULL;
   }
@@ -168,7 +170,7 @@ gst_allocation_params_new (void)
 {
   /* Call new() and then init(), rather than calling new0(), in case
    * init() ever changes to something other than a memset(). */
-  GstAllocationParams *result = g_slice_new (GstAllocationParams);
+  GstAllocationParams *result = g_new (GstAllocationParams, 1);
   gst_allocation_params_init (result);
   return result;
 }
@@ -202,8 +204,8 @@ gst_allocation_params_copy (const GstAllocationParams * params)
 
   if (params) {
     result =
-        (GstAllocationParams *) g_slice_copy (sizeof (GstAllocationParams),
-        params);
+        (GstAllocationParams *) g_memdup2 (params,
+        sizeof (GstAllocationParams));
   }
   return result;
 }
@@ -217,7 +219,7 @@ gst_allocation_params_copy (const GstAllocationParams * params)
 void
 gst_allocation_params_free (GstAllocationParams * params)
 {
-  g_slice_free (GstAllocationParams, params);
+  g_free (params);
 }
 
 /**
@@ -370,7 +372,6 @@ typedef struct
 {
   GstMemory mem;
 
-  gsize slice_size;
   guint8 *data;
 
   gpointer user_data;
@@ -393,14 +394,13 @@ G_DEFINE_TYPE (GstAllocatorSysmem, gst_allocator_sysmem, GST_TYPE_ALLOCATOR);
 /* initialize the fields */
 static inline void
 _sysmem_init (GstMemorySystem * mem, GstMemoryFlags flags,
-    GstMemory * parent, gsize slice_size,
+    GstMemory * parent,
     gpointer data, gsize maxsize, gsize align, gsize offset, gsize size,
     gpointer user_data, GDestroyNotify notify)
 {
   gst_memory_init (GST_MEMORY_CAST (mem),
       flags, _sysmem_allocator, parent, maxsize, align, offset, size);
 
-  mem->slice_size = slice_size;
   mem->data = data;
   mem->user_data = user_data;
   mem->notify = notify;
@@ -413,12 +413,9 @@ _sysmem_new (GstMemoryFlags flags,
     gsize size, gpointer user_data, GDestroyNotify notify)
 {
   GstMemorySystem *mem;
-  gsize slice_size;
 
-  slice_size = sizeof (GstMemorySystem);
-
-  mem = g_slice_alloc (slice_size);
-  _sysmem_init (mem, flags, parent, slice_size,
+  mem = g_new (GstMemorySystem, 1);
+  _sysmem_init (mem, flags, parent,
       data, maxsize, align, offset, size, user_data, notify);
 
   return mem;
@@ -440,7 +437,7 @@ _sysmem_new_block (GstMemoryFlags flags,
   /* alloc header and data in one block */
   slice_size = sizeof (GstMemorySystem) + maxsize;
 
-  mem = g_slice_alloc (slice_size);
+  mem = g_malloc (slice_size);
   if (mem == NULL)
     return NULL;
 
@@ -460,7 +457,7 @@ _sysmem_new_block (GstMemoryFlags flags,
   if (padding && (flags & GST_MEMORY_FLAG_ZERO_PADDED))
     memset (data + offset + size, 0, padding);
 
-  _sysmem_init (mem, flags, NULL, slice_size, data, maxsize,
+  _sysmem_init (mem, flags, NULL, data, maxsize,
       align, offset, size, NULL, NULL);
 
   return mem;
@@ -551,19 +548,16 @@ static void
 default_free (GstAllocator * allocator, GstMemory * mem)
 {
   GstMemorySystem *dmem = (GstMemorySystem *) mem;
-  gsize slice_size;
 
   if (dmem->notify)
     dmem->notify (dmem->user_data);
 
-  slice_size = dmem->slice_size;
-
 #ifdef USE_POISONING
   /* just poison the structs, not all the data */
   memset (mem, 0xff, sizeof (GstMemorySystem));
 #endif
 
-  g_slice_free1 (slice_size, mem);
+  g_free (mem);
 }
 
 static void
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstallocator.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstallocator.h
index be1bf7e92ae..ab069f836eb 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstallocator.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstallocator.h
@@ -88,12 +88,30 @@ struct _GstAllocationParams {
 /**
  * GstAllocatorFlags:
  * @GST_ALLOCATOR_FLAG_CUSTOM_ALLOC: The allocator has a custom alloc function.
+ *    Only elements designed to work with this allocator should be using it,
+ *    other elements should ignore it from allocation propositions.
+ *    This implies %GST_ALLOCATOR_FLAG_NO_COPY.
+ * @GST_ALLOCATOR_FLAG_NO_COPY: When copying a #GstMemory allocated with this
+ *    allocator, the copy will instead be allocated using the default allocator.
+ *    Use this when allocating a new memory is an heavy opperation that should
+ *    only be done with a #GstBufferPool for example. (Since: 1.24)
  * @GST_ALLOCATOR_FLAG_LAST: first flag that can be used for custom purposes
  *
  * Flags for allocators.
  */
+/**
+ * GST_ALLOCATOR_FLAG_NO_COPY:
+ *
+ * When copying a #GstMemory allocated with this allocator, the copy will
+ * instead be allocated using the default allocator. Use this when allocating a
+ * new memory is an heavy opperation that should only be done with a
+ * #GstBufferPool for example.
+ *
+ * Since: 1.24
+ */
 typedef enum {
   GST_ALLOCATOR_FLAG_CUSTOM_ALLOC  = (GST_OBJECT_FLAG_LAST << 0),
+  GST_ALLOCATOR_FLAG_NO_COPY       = (GST_OBJECT_FLAG_LAST << 1),
 
   GST_ALLOCATOR_FLAG_LAST          = (GST_OBJECT_FLAG_LAST << 16)
 } GstAllocatorFlags;
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstbin.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstbin.c
index ef79e7ed973..437adcae7a7 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstbin.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstbin.c
@@ -124,7 +124,7 @@
  *   sink is in the bin, the query fails.
  *
  * A #GstBin will by default forward any event sent to it to all sink
- * ( %GST_EVENT_TYPE_DOWNSTREAM ) or source ( %GST_EVENT_TYPE_UPSTREAM ) elements
+ * ( %GST_EVENT_TYPE_UPSTREAM ) or source ( %GST_EVENT_TYPE_DOWNSTREAM ) elements
  * depending on the event type.
  *
  * If all the elements return %TRUE, the bin will also return %TRUE, else %FALSE
@@ -2888,10 +2888,13 @@ gst_bin_change_state_func (GstElement * element, GstStateChange transition)
       GST_DEBUG_OBJECT (element, "clearing all cached messages");
       bin_remove_messages (bin, NULL, GST_MESSAGE_ANY);
       GST_OBJECT_UNLOCK (bin);
-      /* We might not have reached PAUSED yet due to async errors,
-       * make sure to always deactivate the pads nonetheless */
-      if (!(gst_bin_src_pads_activate (bin, FALSE)))
-        goto activate_failure;
+      /* Pads can be activated in PULL mode before in NULL state */
+      if (current != GST_STATE_NULL) {
+        /* We might not have reached PAUSED yet due to async errors,
+         * make sure to always deactivate the pads nonetheless */
+        if (!gst_bin_src_pads_activate (bin, FALSE))
+          goto activate_failure;
+      }
       break;
     case GST_STATE_NULL:
       /* Clear message list on next NULL */
@@ -3279,7 +3282,7 @@ bin_bus_handler (GstBus * bus, GstMessage * message, GstBin * bin)
 static void
 free_bin_continue_data (BinContinueData * data)
 {
-  g_slice_free (BinContinueData, data);
+  g_free (data);
 }
 
 static void
@@ -3449,7 +3452,7 @@ bin_handle_async_done (GstBin * bin, GstStateChangeReturn ret,
         "continue state change, pending %s",
         gst_element_state_get_name (pending));
 
-    cont = g_slice_new (BinContinueData);
+    cont = g_new (BinContinueData, 1);
 
     /* cookie to detect concurrent state change */
     cont->cookie = GST_ELEMENT_CAST (bin)->state_cookie;
@@ -3505,6 +3508,13 @@ bin_handle_async_done (GstBin * bin, GstStateChangeReturn ret,
 nothing_pending:
   {
     GST_CAT_INFO_OBJECT (GST_CAT_STATES, bin, "nothing pending");
+
+    amessage = gst_message_new_async_done (GST_OBJECT_CAST (bin), running_time);
+
+    GST_OBJECT_UNLOCK (bin);
+    gst_element_post_message (GST_ELEMENT_CAST (bin), amessage);
+    GST_OBJECT_LOCK (bin);
+
     return;
   }
 }
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstbuffer.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstbuffer.c
index 1a0b69d5d43..5ca6d89197b 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstbuffer.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstbuffer.c
@@ -145,7 +145,6 @@ GType _gst_buffer_type = 0;
 
 #define GST_BUFFER_MEM_MAX         16
 
-#define GST_BUFFER_SLICE_SIZE(b)   (((GstBufferImpl *)(b))->slice_size)
 #define GST_BUFFER_MEM_LEN(b)      (((GstBufferImpl *)(b))->len)
 #define GST_BUFFER_MEM_ARRAY(b)    (((GstBufferImpl *)(b))->mem)
 #define GST_BUFFER_MEM_PTR(b,i)    (((GstBufferImpl *)(b))->mem[i])
@@ -157,8 +156,6 @@ typedef struct
 {
   GstBuffer buffer;
 
-  gsize slice_size;
-
   /* the memory blocks */
   guint len;
   GstMemory *mem[GST_BUFFER_MEM_MAX];
@@ -546,6 +543,7 @@ gst_buffer_copy_into (GstBuffer * dest, GstBuffer * src,
   GstMetaItem *walk;
   gsize bufsize;
   gboolean region = FALSE;
+  gboolean sharing_mem = FALSE;
 
   g_return_val_if_fail (dest != NULL, FALSE);
   g_return_val_if_fail (src != NULL, FALSE);
@@ -649,6 +647,9 @@ gst_buffer_copy_into (GstBuffer * dest, GstBuffer * src,
           return FALSE;
         }
 
+        /* Indicates if dest references any of src memories. */
+        sharing_mem |= (newmem == mem);
+
         _memory_add (dest, -1, newmem);
         left -= tocopy;
       }
@@ -662,6 +663,10 @@ gst_buffer_copy_into (GstBuffer * dest, GstBuffer * src,
         gst_buffer_remove_memory_range (dest, dest_len, -1);
         return FALSE;
       }
+
+      /* If we were sharing memory and the merge is no-op, we are still sharing. */
+      sharing_mem &= (mem == GST_BUFFER_MEM_PTR (dest, 0));
+
       _replace_memory (dest, len, 0, len, mem);
     }
   }
@@ -710,6 +715,14 @@ gst_buffer_copy_into (GstBuffer * dest, GstBuffer * src,
     }
   }
 
+  if (sharing_mem && src->pool != NULL) {
+    /* The new buffer references some of src's memories. We have to ensure that
+     * src buffer does not return to its buffer pool as long as its memories are
+     * used by other buffers. That would cause the buffer to be discarted by the
+     * pool because its memories are not writable. */
+    gst_buffer_add_parent_buffer_meta (dest, src);
+  }
+
   return TRUE;
 }
 
@@ -783,12 +796,20 @@ _gst_buffer_free (GstBuffer * buffer)
 {
   GstMetaItem *walk, *next;
   guint i, len;
-  gsize msize;
 
   g_return_if_fail (buffer != NULL);
 
   GST_CAT_LOG (GST_CAT_BUFFER, "finalize %p", buffer);
 
+  /* free our memory */
+  len = GST_BUFFER_MEM_LEN (buffer);
+  for (i = 0; i < len; i++) {
+    gst_memory_unlock (GST_BUFFER_MEM_PTR (buffer, i), GST_LOCK_FLAG_EXCLUSIVE);
+    gst_mini_object_remove_parent (GST_MINI_OBJECT_CAST (GST_BUFFER_MEM_PTR
+            (buffer, i)), GST_MINI_OBJECT_CAST (buffer));
+    gst_memory_unref (GST_BUFFER_MEM_PTR (buffer, i));
+  }
+
   /* free metadata */
   for (walk = GST_BUFFER_META (buffer); walk; walk = next) {
     GstMeta *meta = &walk->meta;
@@ -800,43 +821,23 @@ _gst_buffer_free (GstBuffer * buffer)
 
     next = walk->next;
     /* and free the slice */
-    g_slice_free1 (ITEM_SIZE (info), walk);
-  }
-
-  /* get the size, when unreffing the memory, we could also unref the buffer
-   * itself */
-  msize = GST_BUFFER_SLICE_SIZE (buffer);
-
-  /* free our memory */
-  len = GST_BUFFER_MEM_LEN (buffer);
-  for (i = 0; i < len; i++) {
-    gst_memory_unlock (GST_BUFFER_MEM_PTR (buffer, i), GST_LOCK_FLAG_EXCLUSIVE);
-    gst_mini_object_remove_parent (GST_MINI_OBJECT_CAST (GST_BUFFER_MEM_PTR
-            (buffer, i)), GST_MINI_OBJECT_CAST (buffer));
-    gst_memory_unref (GST_BUFFER_MEM_PTR (buffer, i));
+    g_free (walk);
   }
 
-  /* we set msize to 0 when the buffer is part of the memory block */
-  if (msize) {
 #ifdef USE_POISONING
-    memset (buffer, 0xff, msize);
+  memset (buffer, 0xff, sizeof (GstBufferImpl));
 #endif
-    g_slice_free1 (msize, buffer);
-  } else {
-    gst_memory_unref (GST_BUFFER_BUFMEM (buffer));
-  }
+  g_free (buffer);
 }
 
 static void
-gst_buffer_init (GstBufferImpl * buffer, gsize size)
+gst_buffer_init (GstBufferImpl * buffer)
 {
   gst_mini_object_init (GST_MINI_OBJECT_CAST (buffer), 0, _gst_buffer_type,
       (GstMiniObjectCopyFunction) _gst_buffer_copy,
       (GstMiniObjectDisposeFunction) _gst_buffer_dispose,
       (GstMiniObjectFreeFunction) _gst_buffer_free);
 
-  GST_BUFFER_SLICE_SIZE (buffer) = size;
-
   GST_BUFFER (buffer)->pool = NULL;
   GST_BUFFER_PTS (buffer) = GST_CLOCK_TIME_NONE;
   GST_BUFFER_DTS (buffer) = GST_CLOCK_TIME_NONE;
@@ -860,10 +861,10 @@ gst_buffer_new (void)
 {
   GstBufferImpl *newbuf;
 
-  newbuf = g_slice_new (GstBufferImpl);
+  newbuf = g_new (GstBufferImpl, 1);
   GST_CAT_LOG (GST_CAT_BUFFER, "new %p", newbuf);
 
-  gst_buffer_init (newbuf, sizeof (GstBufferImpl));
+  gst_buffer_init (newbuf);
 
   return GST_BUFFER_CAST (newbuf);
 }
@@ -919,7 +920,7 @@ gst_buffer_new_allocate (GstAllocator * allocator, gsize size,
 
 #if 0
   asize = sizeof (GstBufferImpl) + size;
-  data = g_slice_alloc (asize);
+  data = g_malloc (asize);
   if (G_UNLIKELY (data == NULL))
     goto no_memory;
 
@@ -2356,9 +2357,9 @@ gst_buffer_add_meta (GstBuffer * buffer, const GstMetaInfo * info,
    * uninitialized memory
    */
   if (!info->init_func)
-    item = g_slice_alloc0 (size);
+    item = g_malloc0 (size);
   else
-    item = g_slice_alloc (size);
+    item = g_malloc (size);
   result = &item->meta;
   result->info = info;
   result->flags = GST_META_FLAG_NONE;
@@ -2386,7 +2387,7 @@ gst_buffer_add_meta (GstBuffer * buffer, const GstMetaInfo * info,
 
 init_failed:
   {
-    g_slice_free1 (size, item);
+    g_free (item);
     return NULL;
   }
 }
@@ -2437,7 +2438,7 @@ gst_buffer_remove_meta (GstBuffer * buffer, GstMeta * meta)
         info->free_func (m, buffer);
 
       /* and free the slice */
-      g_slice_free1 (ITEM_SIZE (info), walk);
+      g_free (walk);
       break;
     }
     prev = walk;
@@ -2585,7 +2586,7 @@ gst_buffer_foreach_meta (GstBuffer * buffer, GstBufferForeachMetaFunc func,
         info->free_func (m, buffer);
 
       /* and free the slice */
-      g_slice_free1 (ITEM_SIZE (info), walk);
+      g_free (walk);
     } else {
       prev = walk;
     }
@@ -2903,6 +2904,49 @@ gst_reference_timestamp_meta_api_get_type (void)
   return type;
 }
 
+static gboolean
+timestamp_meta_serialize (const GstMeta * meta, GstByteArrayInterface * data,
+    guint8 * version)
+{
+  const GstReferenceTimestampMeta *rtmeta =
+      (const GstReferenceTimestampMeta *) meta;
+  gchar *caps_str = gst_caps_to_string (rtmeta->reference);
+  gsize caps_str_len = strlen (caps_str);
+
+  gsize size = 16 + caps_str_len + 1;
+  guint8 *ptr = gst_byte_array_interface_append (data, size);
+  if (ptr == NULL) {
+    g_free (caps_str);
+    return FALSE;
+  }
+
+  GST_WRITE_UINT64_LE (ptr, rtmeta->timestamp);
+  GST_WRITE_UINT64_LE (ptr + 8, rtmeta->duration);
+  memcpy (ptr + 16, caps_str, caps_str_len + 1);
+  g_free (caps_str);
+
+  return TRUE;
+}
+
+static GstMeta *
+timestamp_meta_deserialize (const GstMetaInfo * info, GstBuffer * buffer,
+    const guint8 * data, gsize size, guint8 version)
+{
+  /* Sanity check: caps_str must be 0-terminated. */
+  if (version != 0 || size < 2 * sizeof (guint64) + 1 || data[size - 1] != '\0')
+    return NULL;
+
+  guint64 timestamp = GST_READ_UINT64_LE (data);
+  guint64 duration = GST_READ_UINT64_LE (data + 8);
+  const gchar *caps_str = (const gchar *) data + 16;
+  GstCaps *reference = gst_caps_from_string (caps_str);
+  GstMeta *meta = (GstMeta *) gst_buffer_add_reference_timestamp_meta (buffer,
+      reference, timestamp, duration);
+  gst_caps_unref (reference);
+
+  return meta;
+}
+
 /**
  * gst_reference_timestamp_meta_get_info:
  *
@@ -2918,13 +2962,17 @@ gst_reference_timestamp_meta_get_info (void)
   static const GstMetaInfo *meta_info = NULL;
 
   if (g_once_init_enter ((GstMetaInfo **) & meta_info)) {
-    const GstMetaInfo *meta =
-        gst_meta_register (gst_reference_timestamp_meta_api_get_type (),
+    const GstMetaInfo *meta = NULL;
+    GstMetaInfo *info =
+        gst_meta_info_new (gst_reference_timestamp_meta_api_get_type (),
         "GstReferenceTimestampMeta",
-        sizeof (GstReferenceTimestampMeta),
-        (GstMetaInitFunction) _gst_reference_timestamp_meta_init,
-        (GstMetaFreeFunction) _gst_reference_timestamp_meta_free,
-        _gst_reference_timestamp_meta_transform);
+        sizeof (GstReferenceTimestampMeta));
+    info->init_func = (GstMetaInitFunction) _gst_reference_timestamp_meta_init;
+    info->free_func = (GstMetaFreeFunction) _gst_reference_timestamp_meta_free;
+    info->transform_func = _gst_reference_timestamp_meta_transform;
+    info->serialize_func = timestamp_meta_serialize;
+    info->deserialize_func = timestamp_meta_deserialize;
+    meta = gst_meta_info_register (info);
     g_once_init_leave ((GstMetaInfo **) & meta_info, (GstMetaInfo *) meta);
   }
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstbuffer.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstbuffer.h
index 2d4dd885387..755c3b94584 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstbuffer.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstbuffer.h
@@ -767,6 +767,9 @@ typedef struct _GstReferenceTimestampMeta GstReferenceTimestampMeta;
  *  * `timestamp/x-unix`: for timestamps based on the UNIX epoch according to
  *    the local clock.
  *
+ * Since 1.24 it can be serialized using gst_meta_serialize() and
+ * gst_meta_deserialize().
+ *
  * Since: 1.14
  */
 struct _GstReferenceTimestampMeta
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstbufferlist.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstbufferlist.c
index dca4335e856..140c9cf2ea2 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstbufferlist.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstbufferlist.c
@@ -61,8 +61,6 @@ struct _GstBufferList
   guint n_buffers;
   guint n_allocated;
 
-  gsize slice_size;
-
   /* one-item array, in reality more items are pre-allocated
    * as part of the GstBufferList structure, and that
    * pre-allocated array extends beyond the declared struct */
@@ -104,7 +102,6 @@ static void
 _gst_buffer_list_free (GstBufferList * list)
 {
   guint i, len;
-  gsize slice_size;
 
   GST_LOG ("free %p", list);
 
@@ -119,17 +116,15 @@ _gst_buffer_list_free (GstBufferList * list)
   if (GST_BUFFER_LIST_IS_USING_DYNAMIC_ARRAY (list))
     g_free (list->buffers);
 
-  slice_size = list->slice_size;
-
 #ifdef USE_POISONING
-  memset (list, 0xff, slice_size);
+  memset (list, 0xff, sizeof (GstBufferList));
 #endif
 
-  g_slice_free1 (slice_size, list);
+  g_free (list);
 }
 
 static void
-gst_buffer_list_init (GstBufferList * list, guint n_allocated, gsize slice_size)
+gst_buffer_list_init (GstBufferList * list, guint n_allocated)
 {
   gst_mini_object_init (GST_MINI_OBJECT_CAST (list), 0, _gst_buffer_list_type,
       (GstMiniObjectCopyFunction) _gst_buffer_list_copy, NULL,
@@ -138,7 +133,6 @@ gst_buffer_list_init (GstBufferList * list, guint n_allocated, gsize slice_size)
   list->buffers = &list->arr[0];
   list->n_buffers = 0;
   list->n_allocated = n_allocated;
-  list->slice_size = slice_size;
 
   GST_LOG ("init %p", list);
 }
@@ -166,11 +160,11 @@ gst_buffer_list_new_sized (guint size)
 
   slice_size = sizeof (GstBufferList) + (n_allocated - 1) * sizeof (gpointer);
 
-  list = g_slice_alloc0 (slice_size);
+  list = g_malloc0 (slice_size);
 
   GST_LOG ("new %p", list);
 
-  gst_buffer_list_init (list, n_allocated, slice_size);
+  gst_buffer_list_init (list, n_allocated);
 
   return list;
 }
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstbufferpool.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstbufferpool.c
index a1bfd3cba93..d7da0cd4ada 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstbufferpool.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstbufferpool.c
@@ -1217,6 +1217,12 @@ remove_meta_unpooled (GstBuffer * buffer, GstMeta ** meta, gpointer user_data)
   if (!GST_META_FLAG_IS_SET (*meta, GST_META_FLAG_POOLED)) {
     GST_META_FLAG_UNSET (*meta, GST_META_FLAG_LOCKED);
     *meta = NULL;
+  } else {
+    const GstMetaInfo *info = (*meta)->info;
+
+    /* If we can clear it, don't free it */
+    if (info->clear_func)
+      info->clear_func (buffer, *meta);
   }
   return TRUE;
 }
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstbus.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstbus.c
index 15cf16b93c6..0549349eabd 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstbus.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstbus.c
@@ -97,6 +97,7 @@ enum
 };
 
 #define DEFAULT_ENABLE_ASYNC (TRUE)
+#define WARN_QUEUE_SIZE 1024
 
 enum
 {
@@ -365,10 +366,13 @@ gst_bus_post (GstBus * bus, GstMessage * message)
 
   g_clear_pointer (&sync_handler, sync_handler_unref);
 
-  /* If this is a bus without async message delivery
-   * always drop the message */
-  if (!bus->priv->poll)
+  /* If this is a bus without async message delivery always drop the message.
+   * If the sync handler returned GST_BUS_DROP it is responsible of unreffing
+   * the message, otherwise do it ourself. */
+  if (!bus->priv->poll && reply != GST_BUS_DROP) {
     reply = GST_BUS_DROP;
+    gst_message_unref (message);
+  }
 
   /* now see what we should do with the message */
   switch (reply) {
@@ -376,7 +380,14 @@ gst_bus_post (GstBus * bus, GstMessage * message)
       /* drop the message */
       GST_DEBUG_OBJECT (bus, "[msg %p] dropped", message);
       break;
-    case GST_BUS_PASS:
+    case GST_BUS_PASS:{
+      guint length = gst_atomic_queue_length (bus->priv->queue);
+      if (G_UNLIKELY (length > 0 && length % WARN_QUEUE_SIZE == 0)) {
+        GST_WARNING_OBJECT (bus, "queue overflows with %d messages. "
+            "Application is too slow or is not handling messages. "
+            "Please add a message handler, otherwise the queue will grow "
+            "infinitely.", length);
+      }
       /* pass the message to the async queue, refcount passed in the queue */
       GST_DEBUG_OBJECT (bus, "[msg %p] pushing on async queue", message);
       gst_atomic_queue_push (bus->priv->queue, message);
@@ -384,6 +395,7 @@ gst_bus_post (GstBus * bus, GstMessage * message)
       GST_DEBUG_OBJECT (bus, "[msg %p] pushed on async queue", message);
 
       break;
+    }
     case GST_BUS_ASYNC:
     {
       /* async delivery, we need a mutex and a cond to block
@@ -424,6 +436,7 @@ gst_bus_post (GstBus * bus, GstMessage * message)
     }
     default:
       g_warning ("invalid return from bus sync handler");
+      gst_message_unref (message);
       break;
   }
   return TRUE;
@@ -834,7 +847,6 @@ gst_bus_source_dispatch (GSource * source, GSourceFunc callback,
   }
 }
 
-#if GLIB_CHECK_VERSION(2,63,3)
 static void
 gst_bus_source_dispose (GSource * source)
 {
@@ -850,22 +862,17 @@ gst_bus_source_dispose (GSource * source)
     bus->priv->gsource = NULL;
   GST_OBJECT_UNLOCK (bus);
 }
-#endif
 
 static void
 gst_bus_source_finalize (GSource * source)
 {
   GstBusSource *bsource = (GstBusSource *) source;
-#if !GLIB_CHECK_VERSION(2,63,3)
-  GstBus *bus = bsource->bus;
 
-  GST_DEBUG_OBJECT (bus, "finalize source %p", source);
-
-  GST_OBJECT_LOCK (bus);
-  if (bus->priv->gsource == source)
-    bus->priv->gsource = NULL;
-  GST_OBJECT_UNLOCK (bus);
-#endif
+#ifdef GSTREAMER_LITE
+  // Use g_source_set_dispose_function() instead, once
+  // we no longer need to support older GLib.
+  gst_bus_source_dispose(source);
+#endif // GSTREAMER_LITE
 
   gst_clear_object (&bsource->bus);
 }
@@ -894,9 +901,12 @@ gst_bus_create_watch_unlocked (GstBus * bus)
   source = (GstBusSource *) bus->priv->gsource;
 
   g_source_set_name ((GSource *) source, "GStreamer message bus watch");
-#if GLIB_CHECK_VERSION(2,63,3)
+#ifndef GSTREAMER_LITE
+  // Remove usage of g_source_set_dispose_function(), so we can run on
+  // older GLib.
+  // https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/654f3370a01dfe96f962fbbadba34b865d123a90
   g_source_set_dispose_function ((GSource *) source, gst_bus_source_dispose);
-#endif
+#endif // GSTREAMER_LITE
 
   source->bus = gst_object_ref (bus);
   g_source_add_poll ((GSource *) source, &bus->priv->pollfd);
@@ -1149,7 +1159,7 @@ poll_destroy (GstBusPollData * poll_data, gpointer unused)
   poll_data->source_running = FALSE;
   if (!poll_data->timeout_id) {
     g_main_loop_unref (poll_data->loop);
-    g_slice_free (GstBusPollData, poll_data);
+    g_free (poll_data);
   }
 }
 
@@ -1159,7 +1169,7 @@ poll_destroy_timeout (GstBusPollData * poll_data)
   poll_data->timeout_id = 0;
   if (!poll_data->source_running) {
     g_main_loop_unref (poll_data->loop);
-    g_slice_free (GstBusPollData, poll_data);
+    g_free (poll_data);
   }
 }
 
@@ -1217,7 +1227,7 @@ gst_bus_poll (GstBus * bus, GstMessageType events, GstClockTime timeout)
 
   g_return_val_if_fail (GST_IS_BUS (bus), NULL);
 
-  poll_data = g_slice_new (GstBusPollData);
+  poll_data = g_new (GstBusPollData, 1);
   poll_data->source_running = TRUE;
   poll_data->loop = g_main_loop_new (NULL, FALSE);
   poll_data->events = events;
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstbytearrayinterface.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstbytearrayinterface.h
new file mode 100644
index 00000000000..2748ebce5be
--- /dev/null
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstbytearrayinterface.h
@@ -0,0 +1,133 @@
+/* Copyright (C) 2023 Netflix Inc.
+ *  Author: Xavier Claessens <xavier.claessens@collabora.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <glib.h>
+#include <gst/gstconfig.h>
+
+#ifdef GSTREAMER_LITE
+#include <string.h>
+#endif // GSTREAMER_LITE
+
+G_BEGIN_DECLS
+
+/**
+ * GstByteArrayInterface:
+ * @data: A pointer to an array of bytes.
+ * @len: Number of bytes in @data.
+ * @resize: Reallocate @data.
+ *
+ * Interface for an array of bytes. It is expected to be subclassed to implement
+ * @resize virtual method using language native array implementation, such as
+ * GLib's #GByteArray, C++'s `std::vector<uint8_t>` or Rust's `Vec<u8>`.
+ *
+ * @resize implementation could allocate more than requested to avoid repeated
+ * reallocations. It can return %FALSE, or be set to %NULL, in the case the
+ * array cannot grow.
+ *
+ * Since: 1.24
+ */
+typedef struct _GstByteArrayInterface GstByteArrayInterface;
+struct _GstByteArrayInterface
+{
+  guint8 *data;
+  gsize len;
+  gboolean (*resize) (GstByteArrayInterface *self, gsize length);
+
+  /* < private > */
+  gpointer _gst_reserved[GST_PADDING];
+};
+
+/**
+ * gst_byte_array_interface_init:
+ * @self: A #GstByteArrayInterface.
+ * @length: New size.
+ *
+ * Initialize #GstByteArrayInterface structure.
+ *
+ * Since: 1.24
+ */
+static inline void
+gst_byte_array_interface_init (GstByteArrayInterface *self)
+{
+  memset (self, 0, sizeof (GstByteArrayInterface));
+}
+
+/**
+ * gst_byte_array_interface_set_size:
+ * @self: A #GstByteArrayInterface.
+ * @length: New size.
+ *
+ * Reallocate data pointer to fit at least @length bytes. @self->len is updated
+ * to @length.
+ *
+ * Returns: %TRUE on success, %FALSE otherwise.
+ * Since: 1.24
+ */
+static inline gboolean
+gst_byte_array_interface_set_size (GstByteArrayInterface *self, gsize length)
+{
+  if (self->resize == NULL || !self->resize (self, length))
+    return FALSE;
+  self->len = length;
+  return TRUE;
+}
+
+/**
+ * gst_byte_array_interface_append:
+ * @self: A #GstByteArrayInterface.
+ * @size: Number of bytes to append to the array.
+ *
+ * Grow the array by @size bytes and return a pointer to the newly added memory.
+ *
+ * Returns: Pointer to added memory, or %NULL if reallocation failed.
+ * Since: 1.24
+ */
+static inline guint8 *
+gst_byte_array_interface_append (GstByteArrayInterface *self, gsize size)
+{
+  gsize orig = self->len;
+  if (!gst_byte_array_interface_set_size (self, self->len + size))
+    return NULL;
+  return self->data + orig;
+}
+
+/**
+ * gst_byte_array_interface_append_data:
+ * @self: A #GstByteArrayInterface.
+ * @data: Source data.
+ * @size: Size of @data.
+ *
+ * Append @size bytes from @data, reallocating @self->data pointer if necessary.
+ *
+ * Returns: %TRUE on success, %FALSE otherwise.
+ * Since: 1.24
+ */
+static inline gboolean
+gst_byte_array_interface_append_data (GstByteArrayInterface *self, const guint8 *data, gsize size)
+{
+  guint8 *ptr = gst_byte_array_interface_append (self, size);
+  if (ptr == NULL)
+    return FALSE;
+  memcpy (ptr, data, size);
+  return TRUE;
+}
+
+G_END_DECLS
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstcaps.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstcaps.c
index 7cfbf09913f..f45f1593f2d 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstcaps.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstcaps.c
@@ -222,7 +222,7 @@ _gst_caps_free (GstCaps * caps)
   memset (caps, 0xff, sizeof (GstCapsImpl));
 #endif
 
-  g_slice_free1 (sizeof (GstCapsImpl), caps);
+  g_free (caps);
 }
 
 static void
@@ -255,7 +255,7 @@ gst_caps_new_empty (void)
 {
   GstCaps *caps;
 
-  caps = (GstCaps *) g_slice_new (GstCapsImpl);
+  caps = (GstCaps *) g_new (GstCapsImpl, 1);
 
   gst_caps_init (caps);
 
@@ -2650,10 +2650,9 @@ gst_caps_map_in_place (GstCaps * caps, GstCapsMapFunc func, gpointer user_data)
  *
  * Calls the provided function once for each structure and caps feature in the
  * #GstCaps. In contrast to gst_caps_foreach(), the function may modify the
- * structure and features. In contrast to gst_caps_filter_and_map_in_place(),
- * the structure and features are removed from the caps if %FALSE is returned
- * from the function.
- * The caps must be mutable.
+ * structure and features. In contrast to gst_caps_map_in_place(), the structure
+ * and features are removed from the caps if %FALSE is returned from the
+ * function. The caps must be mutable.
  *
  * Since: 1.6
  */
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstcapsfeatures.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstcapsfeatures.c
index 243837f487a..d81169c7335 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstcapsfeatures.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstcapsfeatures.c
@@ -180,7 +180,7 @@ gst_caps_features_new_empty (void)
 {
   GstCapsFeatures *features;
 
-  features = g_slice_new (GstCapsFeatures);
+  features = g_new (GstCapsFeatures, 1);
   features->type = _gst_caps_features_type;
   features->parent_refcount = NULL;
   features->array = g_array_new (FALSE, FALSE, sizeof (GQuark));
@@ -431,7 +431,7 @@ gst_caps_features_free (GstCapsFeatures * features)
 #endif
   GST_TRACE ("free caps features %p", features);
 
-  g_slice_free (GstCapsFeatures, features);
+  g_free (features);
 }
 
 /**
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstclock.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstclock.c
index 455a24b4093..0bb58875aaf 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstclock.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstclock.c
@@ -254,7 +254,7 @@ gst_clock_entry_new (GstClock * clock, GstClockTime time,
 {
   GstClockEntry *entry;
 
-  entry = (GstClockEntry *) g_slice_new0 (GstClockEntryImpl);
+  entry = (GstClockEntry *) g_new0 (GstClockEntryImpl, 1);
 
   /* FIXME: add tracer hook for struct allocations such as clock entries */
 
@@ -398,7 +398,7 @@ _gst_clock_id_free (GstClockID id)
 
   /* FIXME: add tracer hook for struct allocations such as clock entries */
 
-  g_slice_free (GstClockEntryImpl, (GstClockEntryImpl *) id);
+  g_free (id);
 }
 
 /**
@@ -1778,11 +1778,11 @@ gst_clock_set_synced (GstClock * clock, gboolean synced)
           GST_CLOCK_FLAG_NEEDS_STARTUP_SYNC));
 
   GST_OBJECT_LOCK (clock);
-  if (clock->priv->synced != ! !synced) {
-    clock->priv->synced = ! !synced;
+  if (clock->priv->synced != !!synced) {
+    clock->priv->synced = !!synced;
     g_cond_signal (&clock->priv->sync_cond);
     GST_OBJECT_UNLOCK (clock);
-    g_signal_emit (clock, gst_clock_signals[SIGNAL_SYNCED], 0, ! !synced);
+    g_signal_emit (clock, gst_clock_signals[SIGNAL_SYNCED], 0, !!synced);
   } else {
     GST_OBJECT_UNLOCK (clock);
   }
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstclock.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstclock.h
index 29b8e90621e..42ad313d0e7 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstclock.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstclock.h
@@ -175,18 +175,22 @@ typedef gpointer GstClockID;
  *
  * Converts a #GstClockTime to a GTimeVal
  *
- * > on 32-bit systems, a timeval has a range of only 2^32 - 1 seconds,
- * > which is about 68 years.  Expect trouble if you want to schedule stuff
- * > in your pipeline for 2038.
- */
-#define GST_TIME_TO_TIMEVAL(t,tv)                               \
-G_STMT_START {                                                  \
-  g_assert ("Value of time " #t " is out of timeval's range" && \
-      ((t) / GST_SECOND) < G_MAXLONG);                          \
-  (tv).tv_sec  = (glong) (((GstClockTime) (t)) / GST_SECOND);   \
-  (tv).tv_usec = (glong) ((((GstClockTime) (t)) -               \
-                  ((GstClockTime) (tv).tv_sec) * GST_SECOND)    \
-                 / GST_USECOND);                                \
+ * > on many 32-bit systems, a timeval has a range of only 2^32 - 1 seconds,
+ * > which is about 68 years. Expect trouble if you want to schedule stuff
+ * > in your pipeline for 2038. This macro asserts that this case does not
+ * > happen.
+ */
+#define GST_TIME_TO_TIMEVAL(t,tv)                                           \
+G_STMT_START {                                                              \
+  G_STATIC_ASSERT (sizeof ((tv).tv_sec) == 4 || sizeof ((tv).tv_sec) == 8); \
+  if (sizeof ((tv).tv_sec) == 4) {                                          \
+    g_assert ("Value of time " #t " is out of timeval's range" &&           \
+        ((t) / GST_SECOND) < G_MAXINT32);                                   \
+  }                                                                         \
+  (tv).tv_sec  = (((GstClockTime) (t)) / GST_SECOND);                       \
+  (tv).tv_usec = ((((GstClockTime) (t)) -                                   \
+                  ((GstClockTime) (tv).tv_sec) * GST_SECOND)                \
+                 / GST_USECOND);                                            \
 } G_STMT_END
 
 /**
@@ -203,12 +207,15 @@ G_STMT_START {                                                  \
  *
  * Converts a #GstClockTime to a struct timespec (see `man pselect`)
  */
-#define GST_TIME_TO_TIMESPEC(t,ts)                                \
-G_STMT_START {                                                    \
-  g_assert ("Value of time " #t " is out of timespec's range" &&  \
-      ((t) / GST_SECOND) < G_MAXLONG);                            \
-  (ts).tv_sec  =  (glong) ((t) / GST_SECOND);                     \
-  (ts).tv_nsec = (glong) (((t) - (ts).tv_sec * GST_SECOND) / GST_NSECOND);        \
+#define GST_TIME_TO_TIMESPEC(t,ts)                                          \
+G_STMT_START {                                                              \
+  G_STATIC_ASSERT (sizeof ((ts).tv_sec) == 4 || sizeof ((ts).tv_sec) == 8); \
+  if (sizeof ((ts).tv_sec) == 4) {                                          \
+    g_assert ("Value of time " #t " is out of timespec's range" &&          \
+        ((t) / GST_SECOND) < G_MAXINT32);                                   \
+  }                                                                         \
+  (ts).tv_sec  =  ((t) / GST_SECOND);                                       \
+  (ts).tv_nsec = (((t) - (ts).tv_sec * GST_SECOND) / GST_NSECOND);          \
 } G_STMT_END
 
 /* timestamp debugging macros */
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstcontext.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstcontext.c
index 8d71c00c35e..a1b90be2cd6 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstcontext.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstcontext.c
@@ -114,7 +114,7 @@ _gst_context_free (GstContext * context)
   memset (context, 0xff, sizeof (GstContext));
 #endif
 
-  g_slice_free1 (sizeof (GstContext), context);
+  g_free (context);
 }
 
 static void gst_context_init (GstContext * context);
@@ -128,7 +128,7 @@ _gst_context_copy (GstContext * context)
   GST_CAT_LOG (GST_CAT_CONTEXT, "copy context %p: %" GST_PTR_FORMAT, context,
       GST_CONTEXT_STRUCTURE (context));
 
-  copy = g_slice_new0 (GstContext);
+  copy = g_new0 (GstContext, 1);
 
   gst_context_init (copy);
 
@@ -171,7 +171,7 @@ gst_context_new (const gchar * context_type, gboolean persistent)
 
   g_return_val_if_fail (context_type != NULL, NULL);
 
-  context = g_slice_new0 (GstContext);
+  context = g_new0 (GstContext, 1);
 
   GST_CAT_LOG (GST_CAT_CONTEXT, "creating new context %p", context);
 
@@ -316,6 +316,25 @@ gst_context_unref (GstContext * context)
   gst_mini_object_unref (GST_MINI_OBJECT_CAST (context));
 }
 
+/**
+ * gst_clear_context: (skip)
+ * @context_ptr: a pointer to a #GstContext reference
+ *
+ * Clears a reference to a #GstContext.
+ *
+ * @context_ptr must not be `NULL`.
+ *
+ * If the reference is `NULL` then this function does nothing. Otherwise, the
+ * reference count of the context is decreased and the pointer is set to `NULL`.
+ *
+ * Since: 1.24
+ */
+void
+gst_clear_context (GstContext ** context_ptr)
+{
+  gst_clear_mini_object ((GstMiniObject **) context_ptr);
+}
+
 /**
  * gst_context_copy:
  * @context: the context to copy
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstcontext.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstcontext.h
index 09a42cf20b0..077e04d0c0c 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstcontext.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstcontext.h
@@ -63,6 +63,12 @@ gst_context_unref (GstContext * context)
   gst_mini_object_unref (GST_MINI_OBJECT_CAST (context));
 }
 
+static inline void
+gst_clear_context (GstContext ** context_ptr)
+{
+  gst_clear_mini_object ((GstMiniObject **) context_ptr);
+}
+
 /* copy context */
 static inline GstContext *
 gst_context_copy (const GstContext * context)
@@ -76,6 +82,9 @@ GstContext * gst_context_ref    (GstContext * context);
 GST_API
 void         gst_context_unref  (GstContext * context);
 
+GST_API
+void         gst_clear_context  (GstContext ** context_ptr);
+
 GST_API
 GstContext * gst_context_copy   (const GstContext * context);
 #endif /* GST_DISABLE_MINIOBJECT_INLINE_FUNCTIONS */
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstcontrolbinding.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstcontrolbinding.c
index 42c32f10651..9715aa2afd4 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstcontrolbinding.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstcontrolbinding.c
@@ -491,5 +491,5 @@ gboolean
 gst_control_binding_is_disabled (GstControlBinding * binding)
 {
   g_return_val_if_fail (GST_IS_CONTROL_BINDING (binding), TRUE);
-  return ! !binding->disabled;
+  return !!binding->disabled;
 }
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstdatetime.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstdatetime.c
index 2440f516f47..8e7563a58b1 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstdatetime.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstdatetime.c
@@ -87,7 +87,7 @@ gst_date_time_new_from_g_date_time (GDateTime * dt)
   if (!dt)
     return NULL;
 
-  gst_dt = g_slice_new (GstDateTime);
+  gst_dt = g_new (GstDateTime, 1);
 
   gst_mini_object_init (GST_MINI_OBJECT_CAST (gst_dt), 0, GST_TYPE_DATE_TIME,
       NULL, NULL, (GstMiniObjectFreeFunction) gst_date_time_free);
@@ -1051,7 +1051,7 @@ gst_date_time_free (GstDateTime * datetime)
   memset (datetime, 0xff, sizeof (GstDateTime));
 #endif
 
-  g_slice_free (GstDateTime, datetime);
+  g_free (datetime);
 }
 
 /**
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstdebugutils.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstdebugutils.c
index 8ca334afba6..b646eef6d0c 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstdebugutils.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstdebugutils.c
@@ -922,6 +922,13 @@ gst_debug_bin_to_dot_file_with_ts (GstBin * bin,
 }
 #else /* !GST_DISABLE_GST_DEBUG */
 #ifndef GST_REMOVE_DISABLED
+
+gchar *
+gst_debug_bin_to_dot_data (GstBin * bin, GstDebugGraphDetails details)
+{
+  return g_strdup ("");
+}
+
 void
 gst_debug_bin_to_dot_file (GstBin * bin, GstDebugGraphDetails details,
     const gchar * file_name)
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstelement.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstelement.c
index cc961175e52..2f34f6d0995 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstelement.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstelement.c
@@ -2502,72 +2502,80 @@ gst_element_get_state_func (GstElement * element,
 {
   GstStateChangeReturn ret = GST_STATE_CHANGE_FAILURE;
   GstState old_pending;
+  gint64 end_time;
 
   GST_CAT_DEBUG_OBJECT (GST_CAT_STATES, element, "getting state, timeout %"
       GST_TIME_FORMAT, GST_TIME_ARGS (timeout));
 
   GST_OBJECT_LOCK (element);
-  ret = GST_STATE_RETURN (element);
-  GST_CAT_DEBUG_OBJECT (GST_CAT_STATES, element, "RETURN is %s",
-      gst_element_state_change_return_get_name (ret));
 
-  /* we got an error, report immediately */
-  if (ret == GST_STATE_CHANGE_FAILURE)
-    goto done;
+  if (timeout != GST_CLOCK_TIME_NONE) {
+    /* make timeout absolute */
+    end_time = g_get_monotonic_time () + (timeout / 1000);
+  }
 
-  /* we got no_preroll, report immediately */
-  if (ret == GST_STATE_CHANGE_NO_PREROLL)
-    goto done;
+  do {
+    ret = GST_STATE_RETURN (element);
+    GST_CAT_DEBUG_OBJECT (GST_CAT_STATES, element, "RETURN is %s",
+        gst_element_state_change_return_get_name (ret));
 
-  /* no need to wait async if we are not async */
-  if (ret != GST_STATE_CHANGE_ASYNC)
-    goto done;
+    /* we got an error, report immediately */
+    if (ret == GST_STATE_CHANGE_FAILURE)
+      goto done;
 
-  old_pending = GST_STATE_PENDING (element);
-  if (old_pending != GST_STATE_VOID_PENDING) {
-    gboolean signaled;
-    guint32 cookie;
+    /* we got no_preroll, report immediately */
+    if (ret == GST_STATE_CHANGE_NO_PREROLL)
+      goto done;
 
-    /* get cookie to detect state changes during waiting */
-    cookie = element->state_cookie;
+    /* no need to wait async if we are not async */
+    if (ret != GST_STATE_CHANGE_ASYNC)
+      goto done;
 
-    GST_CAT_INFO_OBJECT (GST_CAT_STATES, element,
-        "waiting for element to commit state");
-
-    /* we have a pending state change, wait for it to complete */
-    if (timeout != GST_CLOCK_TIME_NONE) {
-      gint64 end_time;
-      /* make timeout absolute */
-      end_time = g_get_monotonic_time () + (timeout / 1000);
-      signaled = GST_STATE_WAIT_UNTIL (element, end_time);
-    } else {
-      GST_STATE_WAIT (element);
-      signaled = TRUE;
-    }
+    old_pending = GST_STATE_PENDING (element);
+    if (old_pending != GST_STATE_VOID_PENDING) {
+      gboolean signaled = TRUE;
+      guint32 cookie;
 
-    if (!signaled) {
-      GST_CAT_INFO_OBJECT (GST_CAT_STATES, element, "timed out");
-      /* timeout triggered */
-      ret = GST_STATE_CHANGE_ASYNC;
-    } else {
-      if (cookie != element->state_cookie)
-        goto interrupted;
+      /* get cookie to detect state changes during waiting */
+      cookie = element->state_cookie;
 
-      /* could be success or failure */
-      if (old_pending == GST_STATE (element)) {
-        GST_CAT_DEBUG_OBJECT (GST_CAT_STATES, element, "got success");
-        ret = GST_STATE_CHANGE_SUCCESS;
+      GST_CAT_INFO_OBJECT (GST_CAT_STATES, element,
+          "waiting for element to commit state");
+
+      /* we have a pending state change, wait for it to complete or for
+         an interruption */
+      if (timeout != GST_CLOCK_TIME_NONE) {
+        signaled = GST_STATE_WAIT_UNTIL (element, end_time);
       } else {
-        GST_CAT_DEBUG_OBJECT (GST_CAT_STATES, element, "got failure");
-        ret = GST_STATE_CHANGE_FAILURE;
+        GST_STATE_WAIT (element);
+        signaled = TRUE;
+      }
+
+      if (!signaled) {
+        GST_CAT_INFO_OBJECT (GST_CAT_STATES, element, "timed out");
+        /* timeout triggered */
+        ret = GST_STATE_CHANGE_ASYNC;
+        goto done;
+      } else {
+        if (cookie != element->state_cookie)
+          goto interrupted;
+
+        /* could be success or failure */
+        if (old_pending == GST_STATE (element)) {
+          GST_CAT_DEBUG_OBJECT (GST_CAT_STATES, element, "got success");
+          ret = GST_STATE_CHANGE_SUCCESS;
+        } else {
+          GST_CAT_DEBUG_OBJECT (GST_CAT_STATES, element, "got failure");
+          ret = GST_STATE_CHANGE_FAILURE;
+        }
+      }
+      /* if nothing is pending anymore we can return SUCCESS */
+      if (GST_STATE_PENDING (element) == GST_STATE_VOID_PENDING) {
+        GST_CAT_LOG_OBJECT (GST_CAT_STATES, element, "nothing pending");
+        ret = GST_STATE_CHANGE_SUCCESS;
       }
     }
-    /* if nothing is pending anymore we can return SUCCESS */
-    if (GST_STATE_PENDING (element) == GST_STATE_VOID_PENDING) {
-      GST_CAT_LOG_OBJECT (GST_CAT_STATES, element, "nothing pending");
-      ret = GST_STATE_CHANGE_SUCCESS;
-    }
-  }
+  } while (old_pending != GST_STATE (element));
 
 done:
   if (state)
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstelementfactory.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstelementfactory.c
index b7b27f2e934..d5bca9078e1 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstelementfactory.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstelementfactory.c
@@ -163,7 +163,7 @@ gst_element_factory_cleanup (GstElementFactory * factory)
     GstStaticPadTemplate *templ = item->data;
 
     gst_static_caps_cleanup (&templ->static_caps);
-    g_slice_free (GstStaticPadTemplate, templ);
+    g_free (templ);
   }
   g_list_free (factory->staticpadtemplates);
   factory->staticpadtemplates = NULL;
@@ -257,7 +257,7 @@ gst_element_register (GstPlugin * plugin, const gchar * name, guint rank,
     GstStaticPadTemplate *newt;
     gchar *caps_string = gst_caps_to_string (templ->caps);
 
-    newt = g_slice_new (GstStaticPadTemplate);
+    newt = g_new (GstStaticPadTemplate, 1);
     newt->name_template = g_intern_string (templ->name_template);
     newt->direction = templ->direction;
     newt->presence = templ->presence;
@@ -1219,6 +1219,10 @@ gst_element_factory_list_is_type (GstElementFactory * factory,
     res = ((strstr (klass, "Parser") != NULL)
         && (strstr (klass, "Codec") != NULL));
 
+  if (!res && (type & GST_ELEMENT_FACTORY_TYPE_TIMESTAMPER))
+    res = ((strstr (klass, "Timestamper") != NULL)
+        && (strstr (klass, "Codec") != NULL));
+
   if (!res && (type & GST_ELEMENT_FACTORY_TYPE_DEPAYLOADER))
     res = (strstr (klass, "Depayloader") != NULL);
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstelementfactory.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstelementfactory.h
index 8877b90cd54..1efa71b675e 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstelementfactory.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstelementfactory.h
@@ -169,6 +169,14 @@ typedef guint64 GstElementFactoryListType;
 #define  GST_ELEMENT_FACTORY_TYPE_DECRYPTOR      ((GstElementFactoryListType)(G_GUINT64_CONSTANT (1) << 10))
 #define  GST_ELEMENT_FACTORY_TYPE_ENCRYPTOR      ((GstElementFactoryListType)(G_GUINT64_CONSTANT (1) << 11))
 #define  GST_ELEMENT_FACTORY_TYPE_HARDWARE      ((GstElementFactoryListType)(G_GUINT64_CONSTANT (1) << 12))
+/**
+ * GST_ELEMENT_FACTORY_TYPE_TIMESTAMPER:
+ *
+ * Timestamp correcting elements
+ *
+ * Since: 1.24
+ */
+#define  GST_ELEMENT_FACTORY_TYPE_TIMESTAMPER    ((GstElementFactoryListType)(G_GUINT64_CONSTANT (1) << 13))
 
 #define  GST_ELEMENT_FACTORY_TYPE_MAX_ELEMENTS   ((GstElementFactoryListType)(G_GUINT64_CONSTANT (1) << 48))
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstevent.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstevent.c
index 4bb4430a2d4..4e35cf579b2 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstevent.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstevent.c
@@ -261,7 +261,7 @@ _gst_event_free (GstEvent * event)
   memset (event, 0xff, sizeof (GstEventImpl));
 #endif
 
-  g_slice_free1 (sizeof (GstEventImpl), event);
+  g_free (event);
 }
 
 static void gst_event_init (GstEventImpl * event, GstEventType type);
@@ -272,7 +272,7 @@ _gst_event_copy (GstEvent * event)
   GstEventImpl *copy;
   GstStructure *s;
 
-  copy = g_slice_new0 (GstEventImpl);
+  copy = g_new0 (GstEventImpl, 1);
 
   gst_event_init (copy, GST_EVENT_TYPE (event));
 
@@ -332,7 +332,7 @@ gst_event_new_custom (GstEventType type, GstStructure * structure)
 {
   GstEventImpl *event;
 
-  event = g_slice_new0 (GstEventImpl);
+  event = g_new0 (GstEventImpl, 1);
 
   GST_CAT_DEBUG (GST_CAT_EVENT, "creating new event %p %s %d", event,
       gst_event_type_get_name (type), type);
@@ -353,7 +353,7 @@ gst_event_new_custom (GstEventType type, GstStructure * structure)
   /* ERRORS */
 had_parent:
   {
-    g_slice_free1 (sizeof (GstEventImpl), event);
+    g_free (event);
     g_warning ("structure is already owned by another object");
     return NULL;
   }
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstformat.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstformat.c
index 130fc77f185..b9f2560dfc1 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstformat.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstformat.c
@@ -153,7 +153,7 @@ gst_format_register (const gchar * nick, const gchar * description)
     return query;
 
   g_mutex_lock (&mutex);
-  format = g_slice_new (GstFormatDefinition);
+  format = g_new (GstFormatDefinition, 1);
   format->value = (GstFormat) _n_values;
   format->nick = g_strdup (nick);
   format->description = g_strdup (description);
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstinfo.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstinfo.c
index a653e3c8fe9..ef272d74872 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstinfo.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstinfo.c
@@ -106,9 +106,6 @@
 #include "gstvalue.h"
 #include "gstcapsfeatures.h"
 
-#ifdef HAVE_VALGRIND_VALGRIND_H
-#  include <valgrind/valgrind.h>
-#endif
 #endif /* GST_DISABLE_GST_DEBUG */
 
 #include <glib/gprintf.h>       /* g_sprintf */
@@ -1739,7 +1736,7 @@ gst_debug_add_log_function (GstLogFunction func, gpointer user_data,
   if (func == NULL)
     func = gst_debug_log_default;
 
-  entry = g_slice_new (LogFuncEntry);
+  entry = g_new (LogFuncEntry, 1);
   entry->func = func;
   entry->user_data = user_data;
   entry->notify = notify;
@@ -1806,7 +1803,7 @@ gst_debug_remove_with_compare_func (GCompareFunc func, gpointer data)
     if (entry->notify)
       entry->notify (entry->user_data);
 
-    g_slice_free (LogFuncEntry, entry);
+    g_free (entry);
     cleanup = g_slist_delete_link (cleanup, cleanup);
   }
   return removals;
@@ -2091,7 +2088,7 @@ gst_debug_set_threshold_for_name (const gchar * name, GstDebugLevel level)
   g_return_if_fail (name != NULL);
 
   pat = g_pattern_spec_new (name);
-  entry = g_slice_new (LevelNameEntry);
+  entry = g_new (LevelNameEntry, 1);
   entry->pat = pat;
   entry->level = level;
   g_mutex_lock (&__level_name_mutex);
@@ -2126,7 +2123,7 @@ gst_debug_unset_threshold_for_name (const gchar * name)
     if (g_pattern_spec_equal (entry->pat, pat)) {
       __level_name = g_slist_remove_link (__level_name, walk);
       g_pattern_spec_free (entry->pat);
-      g_slice_free (LevelNameEntry, entry);
+      g_free (entry);
       g_slist_free_1 (walk);
       walk = __level_name;
     } else {
@@ -2146,7 +2143,7 @@ _gst_debug_category_new (const gchar * name, guint color,
 
   g_return_val_if_fail (name != NULL, NULL);
 
-  cat = g_slice_new (GstDebugCategory);
+  cat = g_new (GstDebugCategory, 1);
   cat->name = g_strdup (name);
   cat->color = color;
   if (description != NULL) {
@@ -2163,7 +2160,7 @@ _gst_debug_category_new (const gchar * name, guint color,
   if (catfound) {
     g_free ((gpointer) cat->name);
     g_free ((gpointer) cat->description);
-    g_slice_free (GstDebugCategory, cat);
+    g_free (cat);
     cat = catfound;
   } else {
     __categories = g_slist_prepend (__categories, cat);
@@ -2528,7 +2525,7 @@ clear_level_names (void)
   while (__level_name) {
     LevelNameEntry *level_name_entry = __level_name->data;
     g_pattern_spec_free (level_name_entry->pat);
-    g_slice_free (LevelNameEntry, level_name_entry);
+    g_free (level_name_entry);
     __level_name = g_slist_delete_link (__level_name, __level_name);
   }
   g_mutex_unlock (&__level_name_mutex);
@@ -2551,7 +2548,7 @@ _priv_gst_debug_cleanup (void)
     GstDebugCategory *cat = __categories->data;
     g_free ((gpointer) cat->name);
     g_free ((gpointer) cat->description);
-    g_slice_free (GstDebugCategory, cat);
+    g_free (cat);
     __categories = g_slist_delete_link (__categories, __categories);
   }
   g_mutex_unlock (&__cat_mutex);
@@ -2563,7 +2560,7 @@ _priv_gst_debug_cleanup (void)
     LogFuncEntry *log_func_entry = __log_functions->data;
     if (log_func_entry->notify)
       log_func_entry->notify (log_func_entry->user_data);
-    g_slice_free (LogFuncEntry, log_func_entry);
+    g_free (log_func_entry);
     __log_functions = g_slist_delete_link (__log_functions, __log_functions);
   }
   g_mutex_unlock (&__log_func_mutex);
@@ -2704,6 +2701,13 @@ gst_debug_log_literal (GstDebugCategory * category, GstDebugLevel level,
 {
 }
 
+void
+gst_debug_log_id_literal (GstDebugCategory * category, GstDebugLevel level,
+    const gchar * file, const gchar * function, gint line,
+    const gchar * id, const gchar * message_string)
+{
+}
+
 const gchar *
 gst_debug_message_get (GstDebugMessage * message)
 {
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstiterator.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstiterator.c
index af8d2b170d6..b661aadc652 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstiterator.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstiterator.c
@@ -68,6 +68,7 @@
  */
 
 #include "gst_private.h"
+#include "glib-compat-private.h"
 #include <gst/gstiterator.h>
 
 /**
@@ -83,7 +84,7 @@ gst_iterator_copy (const GstIterator * it)
 {
   GstIterator *copy;
 
-  copy = g_slice_copy (it->size, it);
+  copy = g_memdup2 (it, it->size);
   if (it->copy)
     it->copy (it, copy);
 
@@ -159,7 +160,7 @@ gst_iterator_new (guint size,
   g_return_val_if_fail (resync != NULL, NULL);
   g_return_val_if_fail (free != NULL, NULL);
 
-  result = g_slice_alloc0 (size);
+  result = g_malloc0 (size);
   gst_iterator_init (result, size, type, lock, master_cookie, copy, next, item,
       resync, free);
 
@@ -422,7 +423,7 @@ gst_iterator_free (GstIterator * it)
 
   it->free (it);
 
-  g_slice_free1 (it->size, it);
+  g_free (it);
 }
 
 /**
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstmessage.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstmessage.c
index 4474a09178f..c7cfe67cd7d 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstmessage.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstmessage.c
@@ -223,7 +223,7 @@ _gst_message_free (GstMessage * message)
   memset (message, 0xff, sizeof (GstMessageImpl));
 #endif
 
-  g_slice_free1 (sizeof (GstMessageImpl), message);
+  g_free (message);
 }
 
 static void
@@ -240,7 +240,7 @@ _gst_message_copy (GstMessage * message)
       GST_MESSAGE_TYPE_NAME (message),
       GST_OBJECT_NAME (GST_MESSAGE_SRC (message)));
 
-  copy = g_slice_new0 (GstMessageImpl);
+  copy = g_new0 (GstMessageImpl, 1);
 
   gst_message_init (copy, GST_MESSAGE_TYPE (message),
       GST_MESSAGE_SRC (message));
@@ -299,7 +299,7 @@ gst_message_new_custom (GstMessageType type, GstObject * src,
 {
   GstMessageImpl *message;
 
-  message = g_slice_new0 (GstMessageImpl);
+  message = g_new0 (GstMessageImpl, 1);
 
   GST_CAT_LOG (GST_CAT_MESSAGE, "source %s: creating new message %p %s",
       (src ? GST_OBJECT_NAME (src) : "NULL"), message,
@@ -320,7 +320,7 @@ gst_message_new_custom (GstMessageType type, GstObject * src,
   /* ERRORS */
 had_parent:
   {
-    g_slice_free1 (sizeof (GstMessageImpl), message);
+    g_free (message);
     g_warning ("structure is already owned by another object");
     return NULL;
   }
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstmeta.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstmeta.c
index 9fc619860f2..6667aff8441 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstmeta.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstmeta.c
@@ -59,13 +59,6 @@ GQuark _gst_meta_transform_copy;
 GQuark _gst_meta_tag_memory;
 GQuark _gst_meta_tag_memory_reference;
 
-typedef struct
-{
-  GstCustomMeta meta;
-
-  GstStructure *structure;
-} GstCustomMetaImpl;
-
 typedef struct
 {
   GstMetaInfo info;
@@ -78,7 +71,7 @@ typedef struct
 static void
 free_info (gpointer data)
 {
-  g_slice_free (GstMetaInfoImpl, data);
+  g_free (data);
 }
 
 void
@@ -154,7 +147,7 @@ gst_meta_api_type_register (const gchar * api, const gchar ** tags)
 static gboolean
 custom_init_func (GstMeta * meta, gpointer params, GstBuffer * buffer)
 {
-  GstCustomMetaImpl *cmeta = (GstCustomMetaImpl *) meta;
+  GstCustomMeta *cmeta = (GstCustomMeta *) meta;
 
   cmeta->structure = gst_structure_new_empty (g_type_name (meta->info->type));
 
@@ -167,7 +160,7 @@ custom_init_func (GstMeta * meta, gpointer params, GstBuffer * buffer)
 static void
 custom_free_func (GstMeta * meta, GstBuffer * buffer)
 {
-  GstCustomMetaImpl *cmeta = (GstCustomMetaImpl *) meta;
+  GstCustomMeta *cmeta = (GstCustomMeta *) meta;
 
   gst_structure_set_parent_refcount (cmeta->structure, NULL);
   gst_structure_free (cmeta->structure);
@@ -177,16 +170,15 @@ static gboolean
 custom_transform_func (GstBuffer * transbuf, GstMeta * meta,
     GstBuffer * buffer, GQuark type, gpointer data)
 {
-  GstCustomMetaImpl *custom, *cmeta = (GstCustomMetaImpl *) meta;
+  GstCustomMeta *custom, *cmeta = (GstCustomMeta *) meta;
   GstMetaInfoImpl *info = (GstMetaInfoImpl *) meta->info;
 
   if (info->custom_transform_func)
-    return info->custom_transform_func (transbuf, (GstCustomMeta *) meta,
+    return info->custom_transform_func (transbuf, cmeta,
         buffer, type, data, info->custom_transform_user_data);
 
   if (GST_META_TRANSFORM_IS_COPY (type)) {
-    custom =
-        (GstCustomMetaImpl *) gst_buffer_add_meta (transbuf, meta->info, NULL);
+    custom = (GstCustomMeta *) gst_buffer_add_meta (transbuf, meta->info, NULL);
     gst_structure_set_parent_refcount (custom->structure, NULL);
     gst_structure_take (&custom->structure,
         gst_structure_copy (cmeta->structure));
@@ -199,6 +191,46 @@ custom_transform_func (GstBuffer * transbuf, GstMeta * meta,
   return TRUE;
 }
 
+static gboolean
+custom_serialize_func (const GstMeta * meta, GstByteArrayInterface * data,
+    guint8 * version)
+{
+  const GstCustomMeta *cmeta = (const GstCustomMeta *) meta;
+  gchar *str = gst_structure_serialize_full (cmeta->structure,
+      GST_SERIALIZE_FLAG_STRICT);
+  if (str == NULL)
+    return FALSE;
+
+  gboolean ret = gst_byte_array_interface_append_data (data, (guint8 *) str,
+      strlen (str) + 1);
+  g_free (str);
+
+  return ret;
+}
+
+static GstMeta *
+custom_deserialize_func (const GstMetaInfo * info, GstBuffer * buffer,
+    const guint8 * data, gsize size, guint8 version)
+{
+  if (version != 0 || size < 1 || data[size - 1] != '\0')
+    return NULL;
+
+  GstStructure *structure =
+      gst_structure_new_from_string ((const gchar *) data);
+  if (structure == NULL)
+    return NULL;
+
+  GstMeta *meta = gst_buffer_add_meta (buffer, info, NULL);
+  GstCustomMeta *cmeta = (GstCustomMeta *) meta;
+
+  gst_structure_set_parent_refcount (cmeta->structure, NULL);
+  gst_structure_take (&cmeta->structure, structure);
+  gst_structure_set_parent_refcount (cmeta->structure,
+      &GST_MINI_OBJECT_REFCOUNT (buffer));
+
+  return meta;
+}
+
 /**
  * gst_custom_meta_get_structure:
  *
@@ -215,7 +247,7 @@ gst_custom_meta_get_structure (GstCustomMeta * meta)
   g_return_val_if_fail (gst_meta_info_is_custom (((GstMeta *) meta)->info),
       NULL);
 
-  return ((GstCustomMetaImpl *) meta)->structure;
+  return meta->structure;
 }
 
 /**
@@ -233,7 +265,7 @@ gst_custom_meta_has_name (GstCustomMeta * meta, const gchar * name)
   g_return_val_if_fail (gst_meta_info_is_custom (((GstMeta *) meta)->info),
       FALSE);
 
-  return gst_structure_has_name (((GstCustomMetaImpl *) meta)->structure, name);
+  return gst_structure_has_name (meta->structure, name);
 }
 
 /**
@@ -269,8 +301,9 @@ gst_meta_register_custom (const gchar * name, const gchar ** tags,
 {
   gchar *api_name = g_strdup_printf ("%s-api", name);
   GType api;
-  GstMetaInfoImpl *info;
-  GstMetaInfo *ret = NULL;
+  GstMetaInfo *info;
+  GstMetaInfoImpl *impl;
+  const GstMetaInfo *ret = NULL;
 
   g_return_val_if_fail (tags != NULL, NULL);
   g_return_val_if_fail (name != NULL, NULL);
@@ -280,24 +313,46 @@ gst_meta_register_custom (const gchar * name, const gchar ** tags,
   if (api == G_TYPE_INVALID)
     goto done;
 
-  info = (GstMetaInfoImpl *) gst_meta_register (api, name,
-      sizeof (GstCustomMetaImpl),
-      custom_init_func, custom_free_func, custom_transform_func);
-
-  if (!info)
+  info = gst_meta_info_new (api, name, sizeof (GstCustomMeta));
+  if (info == NULL)
     goto done;
 
-  info->is_custom = TRUE;
-  info->custom_transform_func = transform_func;
-  info->custom_transform_user_data = user_data;
-  info->custom_transform_destroy_notify = destroy_data;
+  impl = (GstMetaInfoImpl *) info;
+
+  info->init_func = custom_init_func;
+  info->free_func = custom_free_func;
+  info->transform_func = custom_transform_func;
+  info->serialize_func = custom_serialize_func;
+  info->deserialize_func = custom_deserialize_func;
 
-  ret = (GstMetaInfo *) info;
+  impl->is_custom = TRUE;
+  impl->custom_transform_func = transform_func;
+  impl->custom_transform_user_data = user_data;
+  impl->custom_transform_destroy_notify = destroy_data;
+
+  ret = gst_meta_info_register (info);
 
 done:
   return ret;
 }
 
+/**
+ * gst_meta_register_custom_simple:
+ * @name: the name of the #GstMeta implementation
+ *
+ * Simplified version of gst_meta_register_custom(), with no tags and no
+ * transform function.
+ *
+ * Returns: (transfer none): a #GstMetaInfo that can be used to access metadata.
+ * Since: 1.24
+ */
+const GstMetaInfo *
+gst_meta_register_custom_simple (const gchar * name)
+{
+  const gchar *tags[] = { NULL };
+  return gst_meta_register_custom (name, tags, NULL, NULL, NULL);
+}
+
 /**
  * gst_meta_info_is_custom:
  *
@@ -353,14 +408,40 @@ gst_meta_api_type_get_tags (GType api)
   return (const gchar * const *) tags;
 }
 
+static const GstMetaInfo *
+gst_meta_register_internal (GType api, const gchar * impl, gsize size,
+    GstMetaInitFunction init_func, GstMetaFreeFunction free_func,
+    GstMetaTransformFunction transform_func,
+    GstMetaSerializeFunction serialize_func,
+    GstMetaDeserializeFunction deserialize_func)
+{
+  GstMetaInfo *info;
+  if (init_func == NULL)
+    g_critical ("Registering meta implementation '%s' without init function",
+        impl);
+
+  info = gst_meta_info_new (api, impl, size);
+  if (info == NULL)
+    return NULL;
+
+  info->init_func = init_func;
+  info->free_func = free_func;
+  info->transform_func = transform_func;
+  info->serialize_func = serialize_func;
+  info->deserialize_func = deserialize_func;
+  ((GstMetaInfoImpl *) info)->is_custom = FALSE;
+
+  return gst_meta_info_register (info);
+}
+
 /**
- * gst_meta_register:
+ * gst_meta_register: (skip):
  * @api: the type of the #GstMeta API
  * @impl: the name of the #GstMeta implementation
  * @size: the size of the #GstMeta structure
- * @init_func: (scope async): a #GstMetaInitFunction
- * @free_func: (scope async): a #GstMetaFreeFunction
- * @transform_func: (scope async): a #GstMetaTransformFunction
+ * @init_func: a #GstMetaInitFunction
+ * @free_func: a #GstMetaFreeFunction
+ * @transform_func: a #GstMetaTransformFunction
  *
  * Register a new #GstMeta implementation.
  *
@@ -370,46 +451,110 @@ gst_meta_api_type_get_tags (GType api)
  * Returns: (transfer none): a #GstMetaInfo that can be used to
  * access metadata.
  */
-
 const GstMetaInfo *
 gst_meta_register (GType api, const gchar * impl, gsize size,
     GstMetaInitFunction init_func, GstMetaFreeFunction free_func,
     GstMetaTransformFunction transform_func)
 {
-  GstMetaInfo *info;
+  return gst_meta_register_internal (api, impl, size, init_func, free_func,
+      transform_func, NULL, NULL);
+}
+
+/**
+ * gst_meta_info_new: (skip):
+ * @api:  the type of the #GstMeta API
+ * @impl: the name of the #GstMeta implementation
+ * @size: the size of the #GstMeta structure
+ *
+ * Creates a new structure that needs to be filled before being
+ * registered.  This structure should filled and then registered with
+ * gst_meta_info_register().
+ *
+ * Example:
+ * ```c
+ * const GstMetaInfo *
+ * gst_my_meta_get_info (void)
+ * {
+ *   static const GstMetaInfo *meta_info = NULL;
+ *
+ *   if (g_once_init_enter ((GstMetaInfo **) & meta_info)) {
+ *     GstMetaInfo *info = gst_meta_info_new (
+ *       gst_my_meta_api_get_type (),
+ *         "GstMyMeta",
+ *        sizeof (GstMyMeta));
+ *     const GstMetaInfo *meta = NULL;
+ *
+ *     info->init_func = my_meta_init;
+ *     info->free_func = my_meta_free;
+ *     info->transform_func = my_meta_transform;
+ *     info->serialize_func = my_meta_serialize;
+ *     info->deserialize_func = my_meta_deserialize;
+ *     meta = gst_meta_info_register (info);
+ *     g_once_init_leave ((GstMetaInfo **) & meta_info, (GstMetaInfo *) meta);
+ *   }
+ *
+ *   return meta_info;
+ * }
+ * ```
+ *
+ * Returns: a new #GstMetaInfo that needs to be filled
+ *
+ * Since: 1.24
+ */
+
+GstMetaInfo *
+gst_meta_info_new (GType api, const gchar * impl, gsize size)
+{
   GType type;
+  GstMetaInfo *info;
 
   g_return_val_if_fail (api != 0, NULL);
   g_return_val_if_fail (impl != NULL, NULL);
   g_return_val_if_fail (size != 0, NULL);
 
-  if (init_func == NULL)
-    g_critical ("Registering meta implementation '%s' without init function",
-        impl);
-
   /* first try to register the implementation name. It's possible
    * that this fails because it was already registered. Don't warn,
    * glib did this for us already. */
   type = g_pointer_type_register_static (impl);
-  if (type == G_TYPE_INVALID)
-    return NULL;
 
-  info = (GstMetaInfo *) g_slice_new (GstMetaInfoImpl);
+  info = (GstMetaInfo *) g_new0 (GstMetaInfoImpl, 1);
   info->api = api;
   info->type = type;
   info->size = size;
-  info->init_func = init_func;
-  info->free_func = free_func;
-  info->transform_func = transform_func;
-  ((GstMetaInfoImpl *) info)->is_custom = FALSE;
+
+  return info;
+}
+
+/**
+ * gst_meta_info_register:
+ * @info: (transfer full): a new #GstMetaInfo created by gst_meta_info_new()
+ *
+ * Registers a new meta.
+ *
+ * Use the structure returned by gst_meta_info_new(), it consumes it and the
+ * structure shouldnt be used after. The one returned by the function can be
+ * kept.
+ *
+ * Returns: (transfer none): the registered meta
+ *
+ * Since: 1.24
+ */
+
+const GstMetaInfo *
+gst_meta_info_register (GstMetaInfo * info)
+{
+  if (info->type == G_TYPE_INVALID) {
+    g_free (info);
+    return NULL;
+  }
 
   GST_CAT_DEBUG (GST_CAT_META,
-      "register \"%s\" implementing \"%s\" of size %" G_GSIZE_FORMAT, impl,
-      g_type_name (api), size);
+      "register \"%s\" implementing \"%s\" of size %" G_GSIZE_FORMAT,
+      g_type_name (info->type), g_type_name (info->api), info->size);
 
   g_rw_lock_writer_lock (&lock);
-  g_hash_table_insert (metainfo, (gpointer) g_intern_string (impl),
-      (gpointer) info);
+  g_hash_table_insert (metainfo,
+      (gpointer) g_intern_string (g_type_name (info->type)), (gpointer) info);
   g_rw_lock_writer_unlock (&lock);
 
   return info;
@@ -486,3 +631,180 @@ gst_meta_compare_seqnum (const GstMeta * meta1, const GstMeta * meta2)
 
   return (seqnum1 < seqnum2) ? -1 : 1;
 }
+
+/**
+ * gst_meta_serialize:
+ * @meta: a #GstMeta
+ * @data: #GstByteArrayInterface to append serialization data
+ *
+ * Serialize @meta into a format that can be stored or transmitted and later
+ * deserialized by gst_meta_deserialize().
+ *
+ * This is only supported for meta that implements #GstMetaInfo.serialize_func,
+ * %FALSE is returned otherwise.
+ *
+ * Upon failure, @data->data pointer could have been reallocated, but @data->len
+ * won't be modified. This is intended to be able to append multiple metas
+ * into the same #GByteArray.
+ *
+ * Since serialization size is often the same for every buffer, caller may want
+ * to remember the size of previous data to preallocate the next.
+ *
+ * Returns: %TRUE on success, %FALSE otherwise.
+ *
+ * Since: 1.24
+ */
+gboolean
+gst_meta_serialize (const GstMeta * meta, GstByteArrayInterface * data)
+{
+  g_return_val_if_fail (meta != NULL, FALSE);
+  g_return_val_if_fail (data != NULL, FALSE);
+
+  if (meta->info->serialize_func != NULL) {
+    const gchar *name = g_type_name (meta->info->type);
+    guint32 name_len = strlen (name);
+    guint32 orig_len = data->len;
+    guint8 version = 0;
+
+    /* Format: [total size][name_len][name][\0][version][payload]
+     * Preallocate space for header but only write it on success because we
+     * don't have every info yet.
+     */
+    guint8 header_size = 2 * sizeof (guint32) + name_len + 2;
+    if (!gst_byte_array_interface_set_size (data, data->len + header_size))
+      return FALSE;
+    if (meta->info->serialize_func (meta, data, &version)) {
+      guint8 *header = data->data + orig_len;
+      GST_WRITE_UINT32_LE (header + 0, data->len - orig_len);
+      GST_WRITE_UINT32_LE (header + 4, name_len);
+      memcpy (header + 8, name, name_len + 1);
+      header[header_size - 1] = version;
+      return TRUE;
+    }
+    // Serialization failed, rollback.
+    gst_byte_array_interface_set_size (data, orig_len);
+  }
+
+  return FALSE;
+}
+
+typedef struct
+{
+  GstByteArrayInterface parent;
+  GByteArray *data;
+} ByteArrayImpl;
+
+static gboolean
+byte_array_impl_resize (GstByteArrayInterface * parent, gsize length)
+{
+  ByteArrayImpl *self = (ByteArrayImpl *) parent;
+
+  g_byte_array_set_size (self->data, length);
+  parent->data = self->data->data;
+  return TRUE;
+}
+
+/**
+ * gst_meta_serialize_simple:
+ * @meta: a #GstMeta
+ * @data: #GByteArray to append serialization data
+ *
+ * Same as gst_meta_serialize() but with a #GByteArray instead of
+ * #GstByteArrayInterface.
+ *
+ * Returns: %TRUE on success, %FALSE otherwise.
+ *
+ * Since: 1.24
+ */
+gboolean
+gst_meta_serialize_simple (const GstMeta * meta, GByteArray * data)
+{
+  ByteArrayImpl impl;
+
+  gst_byte_array_interface_init (&impl.parent);
+  impl.parent.data = data->data;
+  impl.parent.len = data->len;
+  impl.parent.resize = byte_array_impl_resize;
+  impl.data = data;
+  return gst_meta_serialize (meta, (GstByteArrayInterface *) & impl);
+}
+
+/**
+ * gst_meta_deserialize:
+ * @buffer: a #GstBuffer
+ * @data: serialization data obtained from gst_meta_serialize()
+ * @size: size of @data
+ * @consumed: (out): total size used by this meta, could be less than @size
+ *
+ * Recreate a #GstMeta from serialized data returned by
+ * gst_meta_serialize() and add it to @buffer.
+ *
+ * Note that the meta must have been previously registered by calling one of
+ * `gst_*_meta_get_info ()` functions.
+ *
+ * @consumed is set to the number of bytes that can be skipped from @data to
+ * find the next meta serialization, if any. In case of parsing error that does
+ * not allow to determine that size, @consumed is set to 0.
+ *
+ * Returns: (transfer none) (nullable): the metadata owned by @buffer, or %NULL.
+ *
+ * Since: 1.24
+ */
+GstMeta *
+gst_meta_deserialize (GstBuffer * buffer, const guint8 * data, gsize size,
+    guint32 * consumed)
+{
+  g_return_val_if_fail (GST_IS_BUFFER (buffer), NULL);
+  g_return_val_if_fail (data != NULL, NULL);
+  g_return_val_if_fail (consumed != NULL, NULL);
+
+  *consumed = 0;
+
+  /* Format: [total size][name_len][name][\0][version][payload] */
+  if (size < 2 * sizeof (guint32))
+    goto bad_header;
+
+  guint32 total_size = GST_READ_UINT32_LE (data + 0);
+  guint32 name_len = GST_READ_UINT32_LE (data + 4);
+  guint32 header_size = 2 * sizeof (guint32) + name_len + 2;
+  if (size < total_size || total_size < header_size)
+    goto bad_header;
+
+  guint8 version = data[header_size - 1];
+  const gchar *name = (const gchar *) (data + 2 * sizeof (guint32));
+  if (name[name_len] != '\0')
+    goto bad_header;
+
+  *consumed = total_size;
+
+  const GstMetaInfo *info = gst_meta_get_info (name);
+  if (info == NULL) {
+    GST_CAT_WARNING (GST_CAT_META,
+        "%s does not correspond to a registered meta", name);
+    return NULL;
+  }
+
+  if (info->deserialize_func == NULL) {
+    GST_CAT_WARNING (GST_CAT_META, "Meta %s does not support deserialization",
+        name);
+    return NULL;
+  }
+
+  const guint8 *payload = data + header_size;
+  guint32 payload_size = total_size - header_size;
+  GstMeta *meta =
+      info->deserialize_func (info, buffer, payload, payload_size, version);
+  if (meta == NULL) {
+    GST_CAT_WARNING (GST_CAT_META, "Failed to deserialize %s payload", name);
+    GST_CAT_MEMDUMP (GST_CAT_META, "Meta serialization payload", payload,
+        payload_size);
+    return NULL;
+  }
+
+  return meta;
+
+bad_header:
+  GST_CAT_WARNING (GST_CAT_META, "Could not parse meta serialization header");
+  GST_CAT_MEMDUMP (GST_CAT_META, "Meta serialization data", data, size);
+  return NULL;
+}
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstmeta.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstmeta.h
index 64002ebab6a..990e623128f 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstmeta.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstmeta.h
@@ -25,6 +25,9 @@
 
 #include <glib.h>
 
+#include <gst/gstbytearrayinterface.h>
+
+
 G_BEGIN_DECLS
 
 typedef struct _GstMeta GstMeta;
@@ -80,6 +83,7 @@ typedef enum {
  * @flag: the #GstMetaFlags to clear.
  *
  * Clears a metadata flag.
+ *
  */
 #define GST_META_FLAG_UNSET(meta,flag)         (GST_META_FLAGS (meta) &= ~(flag))
 
@@ -115,15 +119,31 @@ struct _GstMeta {
   const GstMetaInfo *info;
 };
 
+/**
+ * GstCustomMeta.structure:
+ *
+ * #GstStructure containing custom metadata.
+ *
+ * Since: 1.24
+ */
+
 /**
  * GstCustomMeta:
+ * @meta: parent #GstMeta
+ * @structure: a #GstStructure containing custom metadata. (Since: 1.24)
+ *
+ * Extra custom metadata. The @structure field is the same as returned by
+ * gst_custom_meta_get_structure().
  *
- * Simple typing wrapper around #GstMeta
+ * Since 1.24 it can be serialized using gst_meta_serialize() and
+ * gst_meta_deserialize(), but only if the #GstStructure does not contain any
+ * fields that cannot be serialized, see %GST_SERIALIZE_FLAG_STRICT.
  *
  * Since: 1.20
  */
 typedef struct {
   GstMeta meta;
+  GstStructure *structure;
 } GstCustomMeta;
 
 #include <gst/gstbuffer.h>
@@ -227,6 +247,83 @@ typedef gboolean (*GstCustomMetaTransformFunction) (GstBuffer *transbuf,
                                                     GstCustomMeta *meta, GstBuffer *buffer,
                                                     GQuark type, gpointer data, gpointer user_data);
 
+/**
+ * GstMetaSerializeFunction:
+ * @meta: a #GstMeta
+ * @data: #GstByteArrayInterface to append serialization data
+ * @version: (out): version of the serialization format
+ *
+ * Serialize @meta into a format that can be stored or transmitted and later
+ * deserialized by #GstMetaDeserializeFunction.
+ *
+ * By default version is set to 0, it should be bumped if incompatible changes
+ * are made to the format so %GstMetaDeserializeFunction can deserialize each
+ * version.
+ *
+ * Returns: %TRUE on success, %FALSE otherwise.
+ *
+ * Since: 1.24
+ */
+typedef gboolean (*GstMetaSerializeFunction) (const GstMeta *meta,
+    GstByteArrayInterface *data, guint8 *version);
+
+/**
+ * GstMetaDeserializeFunction:
+ * @info: #GstMetaInfo of the meta
+ * @buffer: a #GstBuffer
+ * @data: data obtained from #GstMetaSerializeFunction
+ * @size: size of data to avoid buffer overflow
+ *
+ * Recreate a #GstMeta from serialized data returned by
+ * #GstMetaSerializeFunction and add it to @buffer.
+ *
+ * Returns: (transfer none) (nullable): the metadata owned by @buffer, or %NULL.
+ *
+ * Since: 1.24
+ */
+typedef GstMeta *(*GstMetaDeserializeFunction) (const GstMetaInfo *info,
+    GstBuffer *buffer, const guint8 *data, gsize size, guint8 version);
+
+/**
+ * GstMetaClearFunction:
+ * @buffer: a #GstBuffer
+ * @meta: a #GstMeta
+ *
+ * Clears the content of the meta. This will be called by the GstBufferPool
+ * when a pooled buffer is returned.
+ *
+ * Since: 1.24
+ */
+typedef void (*GstMetaClearFunction) (GstBuffer *buffer, GstMeta *meta);
+
+/**
+ * GstMetaInfo.serialize_func:
+ *
+ * Function for serializing the metadata, or %NULL if not supported by this
+ * meta.
+ *
+ * Since: 1.24
+ */
+
+/**
+ * GstMetaInfo.deserialize_func:
+ *
+ * Function for deserializing the metadata, or %NULL if not supported by this
+ * meta.
+ *
+ * Since: 1.24
+ */
+
+/**
+ * GstMetaInfo.clear_func:
+ *
+ * Function for clearing the metadata, or %NULL if not supported by this
+ * meta. This is called by the buffer pool when a buffer is returned for
+ * pooled metas.
+ *
+ * Since: 1.24
+ */
+
 /**
  * GstMetaInfo:
  * @api: tag identifying the metadata structure and api
@@ -235,6 +332,10 @@ typedef gboolean (*GstCustomMetaTransformFunction) (GstBuffer *transbuf,
  * @init_func: function for initializing the metadata
  * @free_func: function for freeing the metadata
  * @transform_func: function for transforming the metadata
+ * @serialize_func: function for serializing the metadata into a #GstStructure,
+ *  or %NULL if not supported by this meta. (Since 1.24)
+ * @deserialize_func: function for deserializing the metadata from a
+ *  #GstStructure, or %NULL if not supported by this meta. (Since 1.24)
  *
  * The #GstMetaInfo provides information about a specific metadata
  * structure.
@@ -247,6 +348,9 @@ struct _GstMetaInfo {
   GstMetaInitFunction        init_func;
   GstMetaFreeFunction        free_func;
   GstMetaTransformFunction   transform_func;
+  GstMetaSerializeFunction   serialize_func;
+  GstMetaDeserializeFunction deserialize_func;
+  GstMetaClearFunction       clear_func;
 
   /* No padding needed, GstMetaInfo is always allocated by GStreamer and is
    * not subclassable or stack-allocatable, so we can extend it as we please
@@ -266,11 +370,21 @@ const GstMetaInfo *  gst_meta_register          (GType api, const gchar *impl,
                                                  GstMetaFreeFunction      free_func,
                                                  GstMetaTransformFunction transform_func);
 
+GST_API
+GstMetaInfo *        gst_meta_info_new (GType api,
+                                        const gchar *impl,
+                                        gsize size);
+GST_API
+const GstMetaInfo *  gst_meta_info_register (GstMetaInfo *info);
+
 GST_API
 const GstMetaInfo *  gst_meta_register_custom   (const gchar *name, const gchar **tags,
                                                  GstCustomMetaTransformFunction transform_func,
                                                  gpointer user_data, GDestroyNotify destroy_data);
 
+GST_API
+const GstMetaInfo *  gst_meta_register_custom_simple (const gchar *name);
+
 GST_API
 gboolean             gst_meta_info_is_custom    (const GstMetaInfo *info);
 
@@ -293,6 +407,18 @@ GST_API
 gint                 gst_meta_compare_seqnum    (const GstMeta * meta1,
                                                  const GstMeta * meta2);
 
+GST_API
+gboolean             gst_meta_serialize         (const GstMeta *meta,
+                                                 GstByteArrayInterface *data);
+GST_API
+gboolean             gst_meta_serialize_simple  (const GstMeta *meta,
+                                                 GByteArray *data);
+GST_API
+GstMeta *            gst_meta_deserialize       (GstBuffer *buffer,
+                                                 const guint8 *data,
+                                                 gsize size,
+                                                 guint32 *consumed);
+
 /* some default tags */
 
 #ifndef GSTREAMER_LITE
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstobject.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstobject.c
index 2b7146dd546..1a57459b38c 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstobject.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstobject.c
@@ -138,6 +138,8 @@ G_DEFINE_ABSTRACT_TYPE (GstObject, gst_object, G_TYPE_INITIALLY_UNOWNED);
 static void
 gst_object_constructed (GObject * object)
 {
+  GST_OBJECT_FLAG_SET (object, GST_OBJECT_FLAG_CONSTRUCTED);
+
   GST_TRACER_OBJECT_CREATED (GST_OBJECT_CAST (object));
 
   ((GObjectClass *) gst_object_parent_class)->constructed (object);
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstobject.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstobject.h
index d2f69edd146..477b3a6219c 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstobject.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstobject.h
@@ -45,11 +45,30 @@ G_BEGIN_DECLS
 #define GST_OBJECT_CAST(obj)            ((GstObject*)(obj))
 #define GST_OBJECT_CLASS_CAST(klass)    ((GstObjectClass*)(klass))
 
+/**
+ * GST_OBJECT_FLAG_CONSTRUCTED:
+ *
+ * Flag that's set when the object has been constructed. This can be used by
+ * API such as base class setters to differentiate between the case where
+ * they're called from a subclass's instance init function (and where the
+ * object isn't fully constructed yet, and so one shouldn't do anything but
+ * set values in the instance structure), and the case where the object is
+ * constructed.
+ *
+ * Since: 1.24
+ */
+
 /**
  * GstObjectFlags:
  * @GST_OBJECT_FLAG_MAY_BE_LEAKED: the object is expected to stay alive even
  * after gst_deinit() has been called and so should be ignored by leak
  * detection tools. (Since: 1.10)
+ * @GST_OBJECT_FLAG_CONSTRUCTED: flag that's set when the object has been
+ * constructed. This can be used by API such as base class setters to
+ * differentiate between the case where they're called from a subclass's
+ * instance init function (and where the object isn't fully constructed yet,
+ * and so one shouldn't do anything but set values in the instance structure),
+ * and the case where the object is constructed. (Since: 1.24)
  * @GST_OBJECT_FLAG_LAST: subclasses can add additional flags starting from this flag
  *
  * The standard flags that an gstobject may have.
@@ -57,6 +76,7 @@ G_BEGIN_DECLS
 typedef enum
 {
   GST_OBJECT_FLAG_MAY_BE_LEAKED = (1 << 0),
+  GST_OBJECT_FLAG_CONSTRUCTED = (1 << 1),
   /* padding */
   GST_OBJECT_FLAG_LAST = (1<<4)
 } GstObjectFlags;
@@ -94,6 +114,34 @@ typedef enum
  * It blocks until the lock can be obtained.
  */
 #define GST_OBJECT_LOCK(obj)                   g_mutex_lock(GST_OBJECT_GET_LOCK(obj))
+
+/**
+ * GST_OBJECT_AUTO_LOCK:
+ * @obj: a #GstObject to lock
+ * @var: a variable name to be declared
+ *
+ * Declare a #GMutexLocker variable with g_autoptr() and lock the object. The
+ * mutex will be unlocked automatically when leaving the scope.
+ *
+ * ``` c
+ * {
+ *   GST_OBJECT_AUTO_LOCK (obj, locker);
+ *
+ *   obj->stuff_with_lock();
+ *   if (cond) {
+ *     // No need to unlock
+ *     return;
+ *   }
+ *
+ *   // Unlock before end of scope
+ *   g_clear_pointer (&locker, g_mutex_locker_free);
+ *   obj->stuff_without_lock();
+ * }
+ * ```
+ * Since: 1.24.0
+ */
+#define GST_OBJECT_AUTO_LOCK(obj, var) g_autoptr(GMutexLocker) G_GNUC_UNUSED var = g_mutex_locker_new(GST_OBJECT_GET_LOCK(obj))
+
 /**
  * GST_OBJECT_TRYLOCK:
  * @obj: a #GstObject.
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstpad.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstpad.c
index 364bea37e23..4dcde503ce3 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstpad.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstpad.c
@@ -659,15 +659,18 @@ _apply_pad_offset (GstPad * pad, GstEvent * event, gboolean upstream,
 
   if (GST_EVENT_TYPE (event) == GST_EVENT_SEGMENT) {
     GstSegment segment;
+    guint32 seqnum;
 
     g_assert (!upstream);
 
     /* copy segment values */
     gst_event_copy_segment (event, &segment);
+    seqnum = gst_event_get_seqnum (event);
     gst_event_unref (event);
 
     gst_segment_offset_running_time (&segment, segment.format, pad_offset);
     event = gst_event_new_segment (&segment);
+    gst_event_set_seqnum (event, seqnum);
   }
 
   event = gst_event_make_writable (event);
@@ -2378,22 +2381,18 @@ gst_pad_link_check_hierarchy (GstPad * src, GstPad * sink)
   }
 }
 
-/* FIXME leftover from an attempt at refactoring... */
-/* call with the two pads unlocked, when this function returns GST_PAD_LINK_OK,
- * the two pads will be locked in the srcpad, sinkpad order. */
+/* check that pads does not have any exisiting links
+ * and that hierarchy is valid for linking.
+ *
+ * The LOCK should be held on both pads
+ */
 static GstPadLinkReturn
-gst_pad_link_prepare (GstPad * srcpad, GstPad * sinkpad, GstPadLinkCheck flags)
+gst_pad_link_check_relations (GstPad * srcpad, GstPad * sinkpad,
+    GstPadLinkCheck flags)
 {
-  GST_CAT_INFO (GST_CAT_PADS, "trying to link %s:%s and %s:%s",
-      GST_DEBUG_PAD_NAME (srcpad), GST_DEBUG_PAD_NAME (sinkpad));
-
-  GST_OBJECT_LOCK (srcpad);
-
   if (G_UNLIKELY (GST_PAD_PEER (srcpad) != NULL))
     goto src_was_linked;
 
-  GST_OBJECT_LOCK (sinkpad);
-
   if (G_UNLIKELY (GST_PAD_PEER (sinkpad) != NULL))
     goto sink_was_linked;
 
@@ -2403,12 +2402,6 @@ gst_pad_link_prepare (GstPad * srcpad, GstPad * sinkpad, GstPadLinkCheck flags)
       && !gst_pad_link_check_hierarchy (srcpad, sinkpad))
     goto wrong_hierarchy;
 
-  /* check pad caps for non-empty intersection */
-  if (!gst_pad_link_check_compatible_unlocked (srcpad, sinkpad, flags))
-    goto no_format;
-
-  /* FIXME check pad scheduling for non-empty intersection */
-
   return GST_PAD_LINK_OK;
 
 src_was_linked:
@@ -2418,7 +2411,6 @@ gst_pad_link_prepare (GstPad * srcpad, GstPad * sinkpad, GstPadLinkCheck flags)
         GST_DEBUG_PAD_NAME (GST_PAD_PEER (srcpad)));
     /* we do not emit a warning in this case because unlinking cannot
      * be made MT safe.*/
-    GST_OBJECT_UNLOCK (srcpad);
     return GST_PAD_LINK_WAS_LINKED;
   }
 sink_was_linked:
@@ -2428,23 +2420,57 @@ gst_pad_link_prepare (GstPad * srcpad, GstPad * sinkpad, GstPadLinkCheck flags)
         GST_DEBUG_PAD_NAME (GST_PAD_PEER (sinkpad)));
     /* we do not emit a warning in this case because unlinking cannot
      * be made MT safe.*/
-    GST_OBJECT_UNLOCK (sinkpad);
-    GST_OBJECT_UNLOCK (srcpad);
     return GST_PAD_LINK_WAS_LINKED;
   }
 wrong_hierarchy:
   {
     GST_CAT_INFO (GST_CAT_PADS, "pads have wrong hierarchy");
-    GST_OBJECT_UNLOCK (sinkpad);
-    GST_OBJECT_UNLOCK (srcpad);
     return GST_PAD_LINK_WRONG_HIERARCHY;
   }
-no_format:
-  {
+}
+
+/* FIXME leftover from an attempt at refactoring... */
+/* call with the two pads unlocked, when this function returns GST_PAD_LINK_OK,
+ * the two pads will be locked in the srcpad, sinkpad order. */
+static GstPadLinkReturn
+gst_pad_link_prepare (GstPad * srcpad, GstPad * sinkpad, GstPadLinkCheck flags)
+{
+  GstPadLinkReturn result;
+
+  GST_CAT_INFO (GST_CAT_PADS, "trying to link %s:%s and %s:%s",
+      GST_DEBUG_PAD_NAME (srcpad), GST_DEBUG_PAD_NAME (sinkpad));
+
+  GST_OBJECT_LOCK (srcpad);
+  GST_OBJECT_LOCK (sinkpad);
+
+  /* Check pads state, not already linked and correct hierachy. */
+  result = gst_pad_link_check_relations (srcpad, sinkpad, flags);
+  if (result != GST_PAD_LINK_OK)
+    goto unlock_and_return;
+
+  /* check pad caps for non-empty intersection */
+  if (!gst_pad_link_check_compatible_unlocked (srcpad, sinkpad, flags)) {
     GST_CAT_INFO (GST_CAT_PADS, "caps are incompatible");
+    result = GST_PAD_LINK_NOFORMAT;
+    goto unlock_and_return;
+  }
+
+  /* Need to recheck our pads since gst_pad_link_check_compatible_unlocked might have temporarily unlocked them.
+     Keeping the first check, because gst_pad_link_check_compatible_unlocked potentially is an expensive operation
+     which gst_pad_link_check_relations is not. */
+  result = gst_pad_link_check_relations (srcpad, sinkpad, flags);
+  if (result != GST_PAD_LINK_OK)
+    goto unlock_and_return;
+
+  /* FIXME check pad scheduling for non-empty intersection */
+
+  return GST_PAD_LINK_OK;
+
+unlock_and_return:
+  {
     GST_OBJECT_UNLOCK (sinkpad);
     GST_OBJECT_UNLOCK (srcpad);
-    return GST_PAD_LINK_NOFORMAT;
+    return result;
   }
 }
 
@@ -4161,7 +4187,7 @@ gboolean
 gst_pad_query (GstPad * pad, GstQuery * query)
 {
   GstObject *parent;
-  gboolean res, serialized;
+  gboolean res = FALSE, serialized;
   GstPadQueryFunction func;
   GstPadProbeType type;
   GstFlowReturn ret;
@@ -4205,7 +4231,6 @@ gst_pad_query (GstPad * pad, GstQuery * query)
 
   GST_DEBUG_OBJECT (pad, "sent query %p (%s), result %d", query,
       GST_QUERY_TYPE_NAME (query), res);
-  GST_TRACER_PAD_QUERY_POST (pad, query, res);
 
   if (res != TRUE)
     goto query_failed;
@@ -4214,6 +4239,8 @@ gst_pad_query (GstPad * pad, GstQuery * query)
   PROBE_PUSH (pad, type | GST_PAD_PROBE_TYPE_PULL, query, probe_stopped);
   GST_OBJECT_UNLOCK (pad);
 
+  GST_TRACER_PAD_QUERY_POST (pad, query, res);
+
   if (G_UNLIKELY (serialized))
     GST_PAD_STREAM_UNLOCK (pad);
 
@@ -4235,6 +4262,7 @@ gst_pad_query (GstPad * pad, GstQuery * query)
   {
     GST_DEBUG_OBJECT (pad, "had no parent");
     GST_OBJECT_UNLOCK (pad);
+    GST_TRACER_PAD_QUERY_POST (pad, query, res);
     if (G_UNLIKELY (serialized))
       GST_PAD_STREAM_UNLOCK (pad);
     return FALSE;
@@ -4243,6 +4271,7 @@ gst_pad_query (GstPad * pad, GstQuery * query)
   {
     GST_DEBUG_OBJECT (pad, "had no query function");
     RELEASE_PARENT (parent);
+    GST_TRACER_PAD_QUERY_POST (pad, query, res);
     if (G_UNLIKELY (serialized))
       GST_PAD_STREAM_UNLOCK (pad);
     return FALSE;
@@ -4250,6 +4279,7 @@ gst_pad_query (GstPad * pad, GstQuery * query)
 query_failed:
   {
     GST_DEBUG_OBJECT (pad, "query failed");
+    GST_TRACER_PAD_QUERY_POST (pad, query, res);
     if (G_UNLIKELY (serialized))
       GST_PAD_STREAM_UNLOCK (pad);
     return FALSE;
@@ -4258,6 +4288,7 @@ gst_pad_query (GstPad * pad, GstQuery * query)
   {
     GST_DEBUG_OBJECT (pad, "probe stopped: %s", gst_flow_get_name (ret));
     GST_OBJECT_UNLOCK (pad);
+    GST_TRACER_PAD_QUERY_POST (pad, query, res);
     if (G_UNLIKELY (serialized))
       GST_PAD_STREAM_UNLOCK (pad);
 
@@ -5566,8 +5597,9 @@ gst_pad_push_event_unchecked (GstPad * pad, GstEvent * event,
   pad->priv->using++;
   GST_OBJECT_UNLOCK (pad);
 
-  GST_LOG_OBJECT (pad, "sending event %p (%s) to peerpad %" GST_PTR_FORMAT,
-      event, gst_event_type_get_name (event_type), peerpad);
+  GST_LOG_OBJECT (pad,
+      "sending event %" GST_PTR_FORMAT " to peerpad %" GST_PTR_FORMAT,
+      event, peerpad);
 
   ret = gst_pad_send_event_unchecked (peerpad, event, type);
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstpad.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstpad.h
index 4a506cfff17..191e7aa221d 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstpad.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstpad.h
@@ -1249,6 +1249,34 @@ struct _GstPadClass {
  * when buffers or serialized downstream events are pushed on a pad.
  */
 #define GST_PAD_STREAM_LOCK(pad)        g_rec_mutex_lock(GST_PAD_GET_STREAM_LOCK(pad))
+
+/**
+ * GST_PAD_STREAM_AUTO_LOCK
+ * @pad: a #GstPad
+ * @var: a variable name to be declared
+ *
+ * Declare a #GRecMutexLocker variable with g_autoptr() and lock the pad. The
+ * recursive mutex will be unlocked automatically when leaving the scope.
+ *
+ * ``` c
+ * {
+ *   GST_PAD_STREAM_AUTO_LOCK (pad, locker);
+ *
+ *   gst_pad_push_event(pad, event1);
+ *   if (cond) {
+ *     // No need to unlock
+ *     return;
+ *   }
+ *
+ *   // Unlock before end of scope
+ *   g_clear_pointer (&locker, g_rec_mutex_locker_free);
+ *   gst_pad_push_event(pad, event2);
+ * }
+ * ```
+ * Since: 1.24.0
+ */
+#define GST_PAD_STREAM_AUTO_LOCK(pad, var) g_autoptr(GRecMutexLocker) G_GNUC_UNUSED var = g_rec_mutex_locker_new(GST_PAD_GET_STREAM_LOCK(pad))
+
 /**
  * GST_PAD_STREAM_TRYLOCK:
  * @pad: a #GstPad
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstparse.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstparse.c
index 1810b5c9e01..3f59e303aeb 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstparse.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstparse.c
@@ -84,7 +84,7 @@ gst_parse_context_new (void)
 #ifndef GST_DISABLE_PARSE
   GstParseContext *ctx;
 
-  ctx = g_slice_new (GstParseContext);
+  ctx = g_new (GstParseContext, 1);
   ctx->missing_elements = NULL;
 
   return ctx;
@@ -136,7 +136,7 @@ gst_parse_context_free (GstParseContext * context)
   if (context) {
     g_list_foreach (context->missing_elements, (GFunc) g_free, NULL);
     g_list_free (context->missing_elements);
-    g_slice_free (GstParseContext, context);
+    g_free (context);
   }
 #endif
 }
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstpipeline.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstpipeline.c
index f2e694fc0a9..c1418336df7 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstpipeline.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstpipeline.c
@@ -114,6 +114,7 @@ struct _GstPipelinePrivate
   /* with LOCK */
   gboolean auto_flush_bus;
   gboolean is_live;
+  GstClockTime min_latency;
 
   /* when we need to update stream_time or clock when going back to
    * PLAYING*/
@@ -234,6 +235,7 @@ gst_pipeline_init (GstPipeline * pipeline)
   pipeline->priv->latency = DEFAULT_LATENCY;
 
   pipeline->priv->is_live = FALSE;
+  pipeline->priv->min_latency = GST_CLOCK_TIME_NONE;
 
   /* create and set a default bus */
   bus = gst_bus_new ();
@@ -519,7 +521,10 @@ gst_pipeline_change_state (GstElement * element, GstStateChange transition)
       break;
     }
     case GST_STATE_CHANGE_PAUSED_TO_READY:
+      GST_OBJECT_LOCK (element);
       pipeline->priv->is_live = FALSE;
+      pipeline->priv->min_latency = GST_CLOCK_TIME_NONE;
+      GST_OBJECT_UNLOCK (element);
       reset_start_time (pipeline, 0);
       break;
     case GST_STATE_CHANGE_READY_TO_NULL:
@@ -529,9 +534,11 @@ gst_pipeline_change_state (GstElement * element, GstStateChange transition)
   result = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 
   if (GST_STATE_TRANSITION_NEXT (transition) == GST_STATE_PAUSED) {
+    GST_OBJECT_LOCK (element);
     pipeline->priv->is_live = result == GST_STATE_CHANGE_NO_PREROLL;
     GST_INFO_OBJECT (pipeline, "pipeline is%slive",
         pipeline->priv->is_live ? " " : " not ");
+    GST_OBJECT_UNLOCK (element);
   }
 
   switch (transition) {
@@ -621,6 +628,7 @@ gst_pipeline_handle_message (GstBin * bin, GstMessage * message)
     case GST_MESSAGE_RESET_TIME:
     {
       GstClockTime running_time;
+      gboolean is_live;
 
       gst_message_parse_reset_time (message, &running_time);
 
@@ -628,9 +636,12 @@ gst_pipeline_handle_message (GstBin * bin, GstMessage * message)
        * children. */
       reset_start_time (pipeline, running_time);
 
+      GST_OBJECT_LOCK (pipeline);
+      is_live = pipeline->priv->is_live;
+      GST_OBJECT_UNLOCK (pipeline);
+
       /* If we are live, sample a new base_time immediately */
-      if (pipeline->priv->is_live
-          && GST_STATE_TARGET (pipeline) == GST_STATE_PLAYING) {
+      if (is_live && GST_STATE_TARGET (pipeline) == GST_STATE_PLAYING) {
         gst_pipeline_change_state (GST_ELEMENT (pipeline),
             GST_STATE_CHANGE_PAUSED_TO_PLAYING);
       }
@@ -693,6 +704,10 @@ gst_pipeline_do_latency (GstBin * bin)
 
     gst_query_parse_latency (query, &live, &min_latency, &max_latency);
 
+    GST_OBJECT_LOCK (pipeline);
+    pipeline->priv->min_latency = min_latency;
+    GST_OBJECT_UNLOCK (pipeline);
+
     GST_DEBUG_OBJECT (pipeline,
         "got min latency %" GST_TIME_FORMAT ", max latency %"
         GST_TIME_FORMAT ", live %d", GST_TIME_ARGS (min_latency),
@@ -1168,3 +1183,52 @@ gst_pipeline_handle_instant_rate (GstPipeline * pipeline, gdouble rate,
 
   return gst_element_send_event (GST_ELEMENT_CAST (pipeline), event);
 }
+
+/**
+ * gst_pipeline_is_live:
+ * @pipeline: a #GstPipeline
+ *
+ * Check if @pipeline is live.
+ *
+ * Returns: %TRUE if @pipeline is live, %FALSE if not or if it did not reach the PAUSED state yet.
+ *
+ * MT safe.
+ *
+ * Since: 1.24
+ */
+gboolean
+gst_pipeline_is_live (GstPipeline * pipeline)
+{
+  gboolean is_live;
+
+  GST_OBJECT_LOCK (pipeline);
+  is_live = pipeline->priv->is_live;
+  GST_OBJECT_UNLOCK (pipeline);
+
+  return is_live;
+}
+
+/**
+ * gst_pipeline_get_configured_latency:
+ * @pipeline: a #GstPipeline
+ *
+ * Return the configured latency on @pipeline.
+ *
+ * Returns: @pipeline configured latency, or %GST_CLOCK_TIME_NONE if none has been configured
+ * because @pipeline did not reach the PLAYING state yet.
+ *
+ * MT safe.
+ *
+ * Since: 1.24
+ */
+GstClockTime
+gst_pipeline_get_configured_latency (GstPipeline * pipeline)
+{
+  GstClockTime min_latency;
+
+  GST_OBJECT_LOCK (pipeline);
+  min_latency = pipeline->priv->min_latency;
+  GST_OBJECT_UNLOCK (pipeline);
+
+  return min_latency;
+}
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstpipeline.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstpipeline.h
index 6406fb86d3f..5227c9bdd32 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstpipeline.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstpipeline.h
@@ -130,6 +130,12 @@ void            gst_pipeline_set_auto_flush_bus (GstPipeline *pipeline, gboolean
 GST_API
 gboolean        gst_pipeline_get_auto_flush_bus (GstPipeline *pipeline);
 
+GST_API
+gboolean        gst_pipeline_is_live            (GstPipeline *pipeline);
+
+GST_API
+GstClockTime    gst_pipeline_get_configured_latency    (GstPipeline * pipeline);
+
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstPipeline, gst_object_unref)
 
 G_END_DECLS
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstplugin.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstplugin.c
index 0a783555eae..492c1bdf29e 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstplugin.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstplugin.c
@@ -166,6 +166,10 @@ gst_plugin_finalize (GObject * object)
     gst_structure_free (plugin->priv->cache_data);
   }
 
+  if (plugin->priv->status_info) {
+    gst_structure_free (plugin->priv->status_info);
+  }
+
   G_OBJECT_CLASS (gst_plugin_parent_class)->finalize (object);
 }
 
@@ -355,7 +359,8 @@ _priv_gst_plugin_initialize (void)
  *   plugin1,plugin2 or
  *   source-package@pathprefix or
  *   source-package@* or just
- *   source-package
+ *   source-package or
+ *   *
  *
  * ie. the bit before the path will be checked against both the plugin
  * name and the plugin's source package name, to keep the format simple.
@@ -371,6 +376,9 @@ gst_plugin_desc_matches_whitelist_entry (const GstPluginDesc * desc,
   GST_LOG ("Whitelist pattern '%s', plugin: %s of %s@%s", pattern, desc->name,
       desc->source, GST_STR_NULL (filename));
 
+  if (strcmp (pattern, "*") == 0)
+    return TRUE;
+
   /* do we have a path prefix? */
   sep = strchr (pattern, '@');
   if (sep != NULL && strcmp (sep, "@*") != 0 && strcmp (sep, "@") != 0) {
@@ -1629,8 +1637,9 @@ gst_plugin_ext_dep_extract_env_vars_paths (GstPlugin * plugin,
         gchar *full_path;
 
         if (!g_path_is_absolute (arr[i])) {
-          GST_INFO_OBJECT (plugin, "ignoring environment variable content '%s'"
-              ": either not an absolute path or not a path at all", arr[i]);
+          GST_INFO_OBJECT (plugin, "ignoring environment variable '%s' with "
+              "content #%u '%s': either not an absolute path or not a path at all",
+              components[0], i, arr[i]);
           continue;
         }
 
@@ -1712,7 +1721,7 @@ gst_plugin_ext_dep_scan_dir_and_match_names (GstPlugin * plugin,
   GDir *dir;
   guint hash = 0;
 
-  recurse_dirs = ! !(flags & GST_PLUGIN_DEPENDENCY_FLAG_RECURSE);
+  recurse_dirs = !!(flags & GST_PLUGIN_DEPENDENCY_FLAG_RECURSE);
 
   dir = g_dir_open (path, 0, &err);
   if (dir == NULL) {
@@ -1774,7 +1783,7 @@ gst_plugin_ext_dep_scan_path_with_filenames (GstPlugin * plugin,
   if (filenames == NULL || *filenames == NULL)
     filenames = empty_filenames;
 
-  recurse_into_dirs = ! !(flags & GST_PLUGIN_DEPENDENCY_FLAG_RECURSE);
+  recurse_into_dirs = !!(flags & GST_PLUGIN_DEPENDENCY_FLAG_RECURSE);
 
   if ((flags & GST_PLUGIN_DEPENDENCY_FLAG_FILE_NAME_IS_SUFFIX) ||
       (flags & GST_PLUGIN_DEPENDENCY_FLAG_FILE_NAME_IS_PREFIX))
@@ -1891,7 +1900,7 @@ gst_plugin_ext_dep_free (GstPluginDep * dep)
   g_strfreev (dep->env_vars);
   g_strfreev (dep->paths);
   g_strfreev (dep->names);
-  g_slice_free (GstPluginDep, dep);
+  g_free (dep);
 }
 
 static gboolean
@@ -1970,7 +1979,7 @@ gst_plugin_add_dependency (GstPlugin * plugin, const gchar ** env_vars,
     }
   }
 
-  dep = g_slice_new (GstPluginDep);
+  dep = g_new (GstPluginDep, 1);
 
   dep->env_vars = g_strdupv ((gchar **) env_vars);
   dep->paths = g_strdupv ((gchar **) paths);
@@ -2044,3 +2053,148 @@ gst_plugin_add_dependency_simple (GstPlugin * plugin,
   if (a_names)
     g_strfreev (a_names);
 }
+
+static void
+gst_plugin_add_status_message (GstPlugin * plugin, const gchar * field_name,
+    const gchar * message)
+{
+  const GValue *val = NULL;
+  GValue str_val = G_VALUE_INIT;
+
+  g_return_if_fail (GST_IS_PLUGIN (plugin));
+  g_return_if_fail (message != NULL);
+
+  g_value_init (&str_val, G_TYPE_STRING);
+  g_value_set_string (&str_val, message);
+
+  if (plugin->priv->status_info == NULL)
+    plugin->priv->status_info = gst_structure_new_empty ("plugin-status-info");
+  else
+    val = gst_structure_get_value (plugin->priv->status_info, field_name);
+
+  if (val != NULL) {
+    gst_value_list_append_and_take_value ((GValue *) val, &str_val);
+  } else {
+    GValue list_val = G_VALUE_INIT;
+
+    gst_value_list_init (&list_val, 1);
+    gst_value_list_append_and_take_value (&list_val, &str_val);
+    gst_structure_take_value (plugin->priv->status_info, field_name, &list_val);
+  }
+
+  GST_TRACE_OBJECT (plugin, "Status info now: %" GST_PTR_FORMAT,
+      plugin->priv->status_info);
+}
+
+/**
+ * gst_plugin_add_status_error:
+ * @plugin: a #GstPlugin
+ * @message: the status error message
+ *
+ * Since: 1.24
+ */
+void
+gst_plugin_add_status_error (GstPlugin * plugin, const gchar * message)
+{
+  gst_plugin_add_status_message (plugin, "error-message", message);
+}
+
+/**
+ * gst_plugin_add_status_warning:
+ * @plugin: a #GstPlugin
+ * @message: the status warning message
+ *
+ * Since: 1.24
+ */
+void
+gst_plugin_add_status_warning (GstPlugin * plugin, const gchar * message)
+{
+  gst_plugin_add_status_message (plugin, "warning-message", message);
+}
+
+/**
+ * gst_plugin_add_status_info:
+ * @plugin: a #GstPlugin
+ * @message: the status info message
+ *
+ * Since: 1.24
+ */
+void
+gst_plugin_add_status_info (GstPlugin * plugin, const gchar * message)
+{
+  gst_plugin_add_status_message (plugin, "info-message", message);
+}
+
+static gchar **
+gst_plugin_get_status_messages (GstPlugin * plugin, const gchar * field_name)
+{
+  const GValue *list_val;
+  guint n_vals, i;
+  gchar **arr;
+
+  g_return_val_if_fail (GST_IS_PLUGIN (plugin), NULL);
+
+  if (plugin->priv->status_info == NULL)
+    return NULL;
+
+  list_val = gst_structure_get_value (plugin->priv->status_info, field_name);
+
+  if (list_val == NULL)
+    return NULL;
+
+  n_vals = gst_value_list_get_size (list_val);
+
+  if (n_vals == 0)
+    return NULL;
+
+  arr = g_new0 (gchar *, n_vals + 1);
+
+  for (i = 0; i < n_vals; ++i) {
+    const GValue *str_val = gst_value_list_get_value (list_val, i);
+    arr[i] = g_value_dup_string (str_val);
+  }
+
+  return arr;
+}
+
+/**
+ * gst_plugin_get_status_errors:
+ * @plugin: a #GstPlugin
+ *
+ * Returns: (transfer full) (nullable): an array of plugin status error messages, or NULL
+ *
+ * Since: 1.24
+ */
+gchar **
+gst_plugin_get_status_errors (GstPlugin * plugin)
+{
+  return gst_plugin_get_status_messages (plugin, "error-message");
+}
+
+/**
+ * gst_plugin_get_status_warnings:
+ * @plugin: a #GstPlugin
+ *
+ * Returns: (transfer full) (nullable): an array of plugin status warning messages, or NULL
+ *
+ * Since: 1.24
+ */
+gchar **
+gst_plugin_get_status_warnings (GstPlugin * plugin)
+{
+  return gst_plugin_get_status_messages (plugin, "warning-message");
+}
+
+/**
+ * gst_plugin_get_status_infos:
+ * @plugin: a #GstPlugin
+ *
+ * Returns: (transfer full) (nullable): an array of plugin status info messages, or NULL
+ *
+ * Since: 1.24
+ */
+gchar **
+gst_plugin_get_status_infos (GstPlugin * plugin)
+{
+  return gst_plugin_get_status_messages (plugin, "info-message");
+}
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstplugin.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstplugin.h
index e905431ac17..01ec6e66539 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstplugin.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstplugin.h
@@ -392,6 +392,24 @@ void                    gst_plugin_add_dependency_simple (GstPlugin   * plugin,
                                                           const gchar * paths,
                                                           const gchar * names,
                                                           GstPluginDependencyFlags flags);
+GST_API
+void                    gst_plugin_add_status_error      (GstPlugin   * plugin,
+                                                          const gchar * message);
+GST_API
+void                    gst_plugin_add_status_warning    (GstPlugin   * plugin,
+                                                          const gchar * message);
+GST_API
+void                    gst_plugin_add_status_info       (GstPlugin   * plugin,
+                                                          const gchar * message);
+GST_API
+gchar **                gst_plugin_get_status_errors     (GstPlugin   * plugin);
+
+GST_API
+gchar **                gst_plugin_get_status_warnings   (GstPlugin   * plugin);
+
+GST_API
+gchar **                gst_plugin_get_status_infos      (GstPlugin   * plugin);
+
 GST_API
 void                    gst_plugin_list_free (GList *list);
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstpluginfeature.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstpluginfeature.c
index bdcabb47345..714dda2b9da 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstpluginfeature.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstpluginfeature.c
@@ -310,8 +310,13 @@ gst_plugin_feature_list_debug (GList * list)
  * @min_minor: minimum required minor version
  * @min_micro: minimum required micro version
  *
- * Checks whether the given plugin feature is at least
- *  the required version
+ * Checks whether the given plugin feature is at least the required version.
+ *
+ * Note: Since version 1.24 this function no longer returns %TRUE if the
+ * version is a git development version (e.g. 1.23.0.1) and the check is
+ * for the "next" micro version, that is it will no longer return %TRUE for
+ * e.g. 1.23.0.1 if the check is for 1.23.1. It is still possible to parse
+ * the nano version from the string and do this check that way if needed.
  *
  * Returns: %TRUE if the plugin feature has at least
  *  the required version, otherwise %FALSE.
@@ -355,10 +360,6 @@ gst_plugin_feature_check_version (GstPluginFeature * feature,
         ret = FALSE;
       else if (micro > min_micro)
         ret = TRUE;
-      /* micro is 1 smaller but we have a nano version, this is the upcoming
-       * release of the requested version and we're ok then */
-      else if (nscan == 4 && nano > 0 && (micro + 1 == min_micro))
-        ret = TRUE;
       else
         ret = (micro == min_micro);
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstpluginloader.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstpluginloader.c
deleted file mode 100644
index 7814392e779..00000000000
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstpluginloader.c
+++ /dev/null
@@ -1,1191 +0,0 @@
-/* GStreamer
- * Copyright (C) 2008 Jan Schmidt <jan.schmidt@sun.com>
- *
- * gstpluginloader.c: GstPluginLoader helper for loading plugin files
- * out of process.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#include <gst/gst_private.h>
-
-#ifndef G_OS_WIN32
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#else
-#define WIN32_LEAN_AND_MEAN
-
-#define fsync(fd) _commit(fd)
-#include <io.h>
-
-#include <windows.h>
-extern HMODULE _priv_gst_dll_handle;
-#endif
-
-#ifdef HAVE_SYS_UTSNAME_H
-#include <sys/utsname.h>
-#endif
-
-#include <errno.h>
-
-#include <gst/gstconfig.h>
-
-#include <gst/gstpoll.h>
-#include <gst/gstutils.h>
-
-#include <gst/gstpluginloader.h>
-#include <gst/gstregistrychunks.h>
-#include <gst/gstregistrybinary.h>
-
-/* IMPORTANT: Bump the version number if the plugin loader packet protocol
- * changes. Changes in the binary registry format itself are handled by
- * bumping the GST_MAGIC_BINARY_VERSION_STR
- */
-static const guint32 loader_protocol_version = 3;
-
-#define GST_CAT_DEFAULT GST_CAT_PLUGIN_LOADING
-
-static GstPluginLoader *plugin_loader_new (GstRegistry * registry);
-static gboolean plugin_loader_free (GstPluginLoader * loader);
-static gboolean plugin_loader_load (GstPluginLoader * loader,
-    const gchar * filename, off_t file_size, time_t file_mtime);
-
-/* functions used in GstRegistry scanning */
-const GstPluginLoaderFuncs _priv_gst_plugin_loader_funcs = {
-  plugin_loader_new, plugin_loader_free, plugin_loader_load
-};
-
-typedef struct _PendingPluginEntry
-{
-  /* sequence number */
-  guint32 tag;
-  gchar *filename;
-  off_t file_size;
-  time_t file_mtime;
-} PendingPluginEntry;
-
-struct _GstPluginLoader
-{
-  GstRegistry *registry;
-  GstPoll *fdset;
-
-  gboolean child_running;
-  GPid child_pid;
-  GstPollFD fd_w;
-  GstPollFD fd_r;
-
-  gboolean is_child;
-  gboolean got_plugin_details;
-
-  /* Transmit buffer */
-  guint8 *tx_buf;
-  guint tx_buf_size;
-  guint tx_buf_write;
-  guint tx_buf_read;
-
-  /* next sequence number (for PendingPluginEntry) */
-  guint32 next_tag;
-
-  guint8 *rx_buf;
-  guint rx_buf_size;
-  gboolean rx_done;
-  gboolean rx_got_sync;
-
-  /* Head and tail of the pending plugins list. List of
-     PendingPluginEntry structs */
-  GList *pending_plugins;
-  GList *pending_plugins_tail;
-};
-
-#define PACKET_EXIT 1
-#define PACKET_LOAD_PLUGIN 2
-#define PACKET_SYNC 3
-#define PACKET_PLUGIN_DETAILS 4
-#define PACKET_VERSION 5
-
-#define BUF_INIT_SIZE 512
-#define BUF_GROW_EXTRA 512
-#define BUF_MAX_SIZE (32 * 1024 * 1024)
-
-#define HEADER_SIZE 12
-/* 4 magic hex bytes to mark each packet */
-#define HEADER_MAGIC 0xbefec0ae
-#define ALIGNMENT   (sizeof (void *))
-
-static gboolean gst_plugin_loader_spawn (GstPluginLoader * loader);
-static void put_packet (GstPluginLoader * loader, guint type, guint32 tag,
-    const guint8 * payload, guint32 payload_len);
-static gboolean exchange_packets (GstPluginLoader * l);
-static gboolean plugin_loader_replay_pending (GstPluginLoader * l);
-static gboolean plugin_loader_load_and_sync (GstPluginLoader * l,
-    PendingPluginEntry * entry);
-static void plugin_loader_create_blacklist_plugin (GstPluginLoader * l,
-    PendingPluginEntry * entry);
-static void plugin_loader_cleanup_child (GstPluginLoader * loader);
-static gboolean plugin_loader_sync_with_child (GstPluginLoader * l);
-
-static GstPluginLoader *
-plugin_loader_new (GstRegistry * registry)
-{
-  GstPluginLoader *l = g_slice_new0 (GstPluginLoader);
-
-  if (registry)
-    l->registry = gst_object_ref (registry);
-  l->fdset = gst_poll_new (FALSE);
-  gst_poll_fd_init (&l->fd_w);
-  gst_poll_fd_init (&l->fd_r);
-
-  l->tx_buf_size = BUF_INIT_SIZE;
-  l->tx_buf = g_malloc (BUF_INIT_SIZE);
-
-  l->next_tag = 0;
-
-  l->rx_buf_size = BUF_INIT_SIZE;
-  l->rx_buf = g_malloc (BUF_INIT_SIZE);
-
-  return l;
-}
-
-static gboolean
-plugin_loader_free (GstPluginLoader * loader)
-{
-  GList *cur;
-  gboolean got_plugin_details;
-  gint fsync_ret;
-
-  do {
-    fsync_ret = fsync (loader->fd_w.fd);
-  } while (fsync_ret < 0 && errno == EINTR);
-
-  if (loader->child_running) {
-    put_packet (loader, PACKET_EXIT, 0, NULL, 0);
-
-    /* Swap packets with the child until it exits cleanly */
-    while (!loader->rx_done) {
-      if (exchange_packets (loader) || loader->rx_done)
-        continue;
-
-      if (!plugin_loader_replay_pending (loader))
-        break;
-      put_packet (loader, PACKET_EXIT, 0, NULL, 0);
-    }
-
-    plugin_loader_cleanup_child (loader);
-  } else {
-    close (loader->fd_w.fd);
-    close (loader->fd_r.fd);
-  }
-
-  gst_poll_free (loader->fdset);
-
-  g_free (loader->rx_buf);
-  g_free (loader->tx_buf);
-
-  if (loader->registry)
-    gst_object_unref (loader->registry);
-
-  got_plugin_details = loader->got_plugin_details;
-
-  /* Free any pending plugin entries */
-  cur = loader->pending_plugins;
-  while (cur) {
-    PendingPluginEntry *entry = (PendingPluginEntry *) (cur->data);
-    g_free (entry->filename);
-    g_slice_free (PendingPluginEntry, entry);
-
-    cur = g_list_delete_link (cur, cur);
-  }
-
-  g_slice_free (GstPluginLoader, loader);
-
-  return got_plugin_details;
-}
-
-static gboolean
-plugin_loader_load (GstPluginLoader * loader, const gchar * filename,
-    off_t file_size, time_t file_mtime)
-{
-  gint len;
-  PendingPluginEntry *entry;
-
-  if (!gst_plugin_loader_spawn (loader))
-    return FALSE;
-
-  /* Send a packet to the child requesting that it load the given file */
-  GST_LOG_OBJECT (loader->registry,
-      "Sending file %s to child. tag %u", filename, loader->next_tag);
-
-  entry = g_slice_new (PendingPluginEntry);
-  entry->tag = loader->next_tag++;
-  entry->filename = g_strdup (filename);
-  entry->file_size = file_size;
-  entry->file_mtime = file_mtime;
-  loader->pending_plugins_tail =
-      g_list_append (loader->pending_plugins_tail, entry);
-
-  if (loader->pending_plugins == NULL)
-    loader->pending_plugins = loader->pending_plugins_tail;
-  else
-    loader->pending_plugins_tail = g_list_next (loader->pending_plugins_tail);
-
-  len = strlen (filename);
-  put_packet (loader, PACKET_LOAD_PLUGIN, entry->tag,
-      (guint8 *) filename, len + 1);
-
-  if (!exchange_packets (loader)) {
-    if (!plugin_loader_replay_pending (loader))
-      return FALSE;
-  }
-
-  return TRUE;
-}
-
-static gboolean
-plugin_loader_replay_pending (GstPluginLoader * l)
-{
-  GList *cur, *next;
-
-restart:
-  if (!gst_plugin_loader_spawn (l))
-    return FALSE;
-
-  /* Load each plugin one by one synchronously until we find the
-   * crashing one */
-  while ((cur = l->pending_plugins)) {
-    PendingPluginEntry *entry = (PendingPluginEntry *) (cur->data);
-
-    if (!plugin_loader_load_and_sync (l, entry)) {
-      /* Create dummy plugin entry to block re-scanning this file */
-      GST_ERROR ("Plugin file %s failed to load. Blacklisting",
-          entry->filename);
-      plugin_loader_create_blacklist_plugin (l, entry);
-      l->got_plugin_details = TRUE;
-      /* Now remove this crashy plugin from the head of the list */
-      l->pending_plugins = g_list_delete_link (cur, cur);
-      g_free (entry->filename);
-      g_slice_free (PendingPluginEntry, entry);
-      if (l->pending_plugins == NULL)
-        l->pending_plugins_tail = NULL;
-      if (!gst_plugin_loader_spawn (l))
-        return FALSE;
-      break;
-    }
-  }
-
-  /* We exited after finding the crashing one. If there's any more pending,
-   * dispatch them post-haste, but don't wait */
-  for (cur = l->pending_plugins; cur != NULL; cur = next) {
-    PendingPluginEntry *entry = (PendingPluginEntry *) (cur->data);
-
-    next = g_list_next (cur);
-
-    put_packet (l, PACKET_LOAD_PLUGIN, entry->tag,
-        (guint8 *) entry->filename, strlen (entry->filename) + 1);
-
-    /* This might invalidate cur, which is why we grabbed 'next' above */
-    if (!exchange_packets (l))
-      goto restart;
-  }
-
-  return TRUE;
-}
-
-static gboolean
-plugin_loader_sync_with_child (GstPluginLoader * l)
-{
-  put_packet (l, PACKET_SYNC, 0, NULL, 0);
-
-  l->rx_got_sync = FALSE;
-  while (!l->rx_got_sync) {
-    if (!exchange_packets (l))
-      return FALSE;
-  }
-  return TRUE;
-}
-
-static gboolean
-plugin_loader_load_and_sync (GstPluginLoader * l, PendingPluginEntry * entry)
-{
-  gint len;
-
-  GST_DEBUG_OBJECT (l->registry, "Synchronously loading plugin file %s",
-      entry->filename);
-
-  len = strlen (entry->filename);
-  put_packet (l, PACKET_LOAD_PLUGIN, entry->tag,
-      (guint8 *) entry->filename, len + 1);
-
-  return plugin_loader_sync_with_child (l);
-}
-
-static void
-plugin_loader_create_blacklist_plugin (GstPluginLoader * l,
-    PendingPluginEntry * entry)
-{
-  GstPlugin *plugin = g_object_new (GST_TYPE_PLUGIN, NULL);
-
-  plugin->filename = g_strdup (entry->filename);
-  plugin->file_mtime = entry->file_mtime;
-  plugin->file_size = entry->file_size;
-  GST_OBJECT_FLAG_SET (plugin, GST_PLUGIN_FLAG_BLACKLISTED);
-
-  plugin->basename = g_path_get_basename (plugin->filename);
-  plugin->desc.name = g_intern_string (plugin->basename);
-  plugin->desc.description = "Plugin for blacklisted file";
-  plugin->desc.version = "0.0.0";
-  plugin->desc.license = "BLACKLIST";
-  plugin->desc.source = plugin->desc.license;
-  plugin->desc.package = plugin->desc.license;
-  plugin->desc.origin = plugin->desc.license;
-
-  GST_DEBUG ("Adding blacklist plugin '%s'", plugin->desc.name);
-  gst_registry_add_plugin (l->registry, plugin);
-}
-
-#ifdef __APPLE__
-#if defined(__x86_64__)
-#define USR_BIN_ARCH_SWITCH "-x86_64"
-#elif defined(__i386__)
-#define USR_BIN_ARCH_SWITCH "-i386"
-#elif defined(__ppc__)
-#define USR_BIN_ARCH_SWITCH "-ppc"
-#elif defined(__ppc64__)
-#define USR_BIN_ARCH_SWITCH "-ppc64"
-#endif
-#endif
-
-#define YES_MULTIARCH 1
-#define NO_MULTIARCH  2
-
-#if defined (__APPLE__) && defined (USR_BIN_ARCH_SWITCH)
-static gboolean
-gst_plugin_loader_use_usr_bin_arch (void)
-{
-  static gsize multiarch = 0;
-
-  if (g_once_init_enter (&multiarch)) {
-    gsize res = NO_MULTIARCH;
-
-#ifdef HAVE_SYS_UTSNAME_H
-    {
-      struct utsname uname_data;
-
-      if (uname (&uname_data) == 0) {
-        /* Check for OS X >= 10.5 (darwin kernel 9.0) */
-        GST_LOG ("%s %s", uname_data.sysname, uname_data.release);
-        if (g_ascii_strcasecmp (uname_data.sysname, "Darwin") == 0 &&
-            g_strtod (uname_data.release, NULL) >= 9.0) {
-          res = YES_MULTIARCH;
-        }
-      }
-    }
-#endif
-
-    GST_INFO ("multiarch: %s", (res == YES_MULTIARCH) ? "yes" : "no");
-    g_once_init_leave (&multiarch, res);
-  }
-  return (multiarch == YES_MULTIARCH);
-}
-#endif /* __APPLE__ && USR_BIN_ARCH_SWITCH */
-
-static gboolean
-gst_plugin_loader_try_helper (GstPluginLoader * loader, gchar * location)
-{
-  char *argv[6] = { NULL, };
-  int c = 0;
-  GError *error = NULL;
-
-#if defined (__APPLE__) && defined (USR_BIN_ARCH_SWITCH)
-  if (gst_plugin_loader_use_usr_bin_arch ()) {
-    argv[c++] = (char *) "/usr/bin/arch";
-    argv[c++] = (char *) USR_BIN_ARCH_SWITCH;
-  }
-#endif
-  argv[c++] = location;
-  argv[c++] = (char *) "-l";
-  argv[c++] = _gst_executable_path;
-  argv[c++] = NULL;
-
-  if (c > 4) {
-    GST_LOG ("Trying to spawn gst-plugin-scanner helper at %s with arch %s",
-        location, argv[1]);
-  } else {
-    GST_LOG ("Trying to spawn gst-plugin-scanner helper at %s", location);
-  }
-
-  g_spawn_async_with_pipes (NULL, argv, NULL,
-      G_SPAWN_DO_NOT_REAP_CHILD /* | G_SPAWN_STDERR_TO_DEV_NULL */ ,
-      NULL, NULL, &loader->child_pid, &loader->fd_w.fd, &loader->fd_r.fd,
-      NULL, &error);
-
-  if (error) {
-    GST_ERROR ("Spawning gst-plugin-scanner helper failed: %s", error->message);
-    g_clear_error (&error);
-    return FALSE;
-  }
-
-  gst_poll_add_fd (loader->fdset, &loader->fd_w);
-  gst_poll_add_fd (loader->fdset, &loader->fd_r);
-
-  gst_poll_fd_ctl_read (loader->fdset, &loader->fd_r, TRUE);
-
-  loader->tx_buf_write = loader->tx_buf_read = 0;
-
-  put_packet (loader, PACKET_VERSION, 0, NULL, 0);
-  if (!plugin_loader_sync_with_child (loader))
-    return FALSE;
-
-  loader->child_running = TRUE;
-
-  return TRUE;
-}
-
-static int
-count_directories (const char *filepath)
-{
-  int i = 0;
-  char *tmp;
-  gsize len;
-
-  g_return_val_if_fail (!g_path_is_absolute (filepath), 0);
-
-  tmp = g_strdup (filepath);
-  len = strlen (tmp);
-
-#if defined(G_OS_WIN32)
-  /* ignore UNC share paths entirely */
-  if (len >= 3 && G_IS_DIR_SEPARATOR (tmp[0]) && G_IS_DIR_SEPARATOR (tmp[1])
-      && !G_IS_DIR_SEPARATOR (tmp[2])) {
-    GST_WARNING ("found a UNC share path, ignoring");
-    return 0;
-  }
-#endif
-
-  /* remove trailing slashes if they exist */
-  while (
-#if defined(G_OS_WIN32)
-      /* don't remove the trailing slash for C:\.
-       * UNC paths are at least \\s\s */
-      len > 3
-#else
-      /* don't remove the trailing slash for / */
-      len > 1
-#endif
-      && G_IS_DIR_SEPARATOR (tmp[len - 1])) {
-    tmp[len - 1] = '\0';
-    len--;
-  }
-
-  while (tmp) {
-    char *dirname, *basename;
-    len = strlen (tmp);
-
-    if (g_strcmp0 (tmp, ".") == 0)
-      break;
-    if (g_strcmp0 (tmp, "/") == 0)
-      break;
-#if defined(G_OS_WIN32)
-    /* g_path_get_dirname() may return something of the form 'C:.', where C is
-     * a drive letter */
-    if (len == 3 && g_ascii_isalpha (tmp[0]) && tmp[1] == ':' && tmp[2] == '.')
-      break;
-#endif
-
-    basename = g_path_get_basename (tmp);
-    dirname = g_path_get_dirname (tmp);
-
-    if (g_strcmp0 (basename, "..") == 0) {
-      i--;
-    } else if (g_strcmp0 (basename, ".") == 0) {
-      /* nothing to do */
-    } else {
-      i++;
-    }
-
-    g_clear_pointer (&basename, g_free);
-    g_clear_pointer (&tmp, g_free);
-    tmp = dirname;
-  }
-
-  g_clear_pointer (&tmp, g_free);
-
-  if (i < 0) {
-    g_critical ("path counting resulted in a negative directory count!");
-    return 0;
-  }
-
-  return i;
-}
-
-static gboolean
-gst_plugin_loader_spawn (GstPluginLoader * loader)
-{
-#ifdef GSTREAMER_LITE
-  return FALSE;
-#else // GSTREAMER_LITE
-  const gchar *env;
-  char *helper_bin;
-  gboolean res = FALSE;
-
-  if (loader->child_running)
-    return TRUE;
-
-  /* Find the gst-plugin-scanner */
-  env = g_getenv ("GST_PLUGIN_SCANNER_1_0");
-  if (env == NULL)
-    env = g_getenv ("GST_PLUGIN_SCANNER");
-
-  if (env != NULL && *env != '\0') {
-    /* use the env-var if it is set */
-    GST_LOG ("Trying GST_PLUGIN_SCANNER env var: %s", env);
-    helper_bin = g_strdup (env);
-    res = gst_plugin_loader_try_helper (loader, helper_bin);
-    g_free (helper_bin);
-  } else {
-    char *relocated_libgstreamer;
-
-    /* use the installed version */
-    GST_LOG ("Trying installed plugin scanner");
-
-#ifdef G_OS_WIN32
-#define EXESUFFIX ".exe"
-#else
-#define EXESUFFIX
-#endif
-
-#define MAX_PATH_DEPTH 64
-
-    relocated_libgstreamer = priv_gst_get_relocated_libgstreamer ();
-    if (relocated_libgstreamer) {
-      int plugin_subdir_depth = count_directories (GST_PLUGIN_SUBDIR);
-
-      GST_DEBUG ("found libgstreamer-" GST_API_VERSION " library "
-          "at %s", relocated_libgstreamer);
-
-      if (plugin_subdir_depth < MAX_PATH_DEPTH) {
-        const char *filenamev[MAX_PATH_DEPTH + 5];
-        int i = 0, j;
-
-        filenamev[i++] = relocated_libgstreamer;
-        for (j = 0; j < plugin_subdir_depth; j++)
-          filenamev[i++] = "..";
-        filenamev[i++] = GST_PLUGIN_SCANNER_SUBDIR;
-        filenamev[i++] = "gstreamer-" GST_API_VERSION;
-        filenamev[i++] = "gst-plugin-scanner" EXESUFFIX;
-        filenamev[i++] = NULL;
-        g_assert (i <= MAX_PATH_DEPTH + 5);
-
-        GST_DEBUG ("constructing path to system plugin scanner using "
-            "plugin dir: \'%s\', plugin scanner dir: \'%s\'",
-            GST_PLUGIN_SUBDIR, GST_PLUGIN_SCANNER_SUBDIR);
-
-        helper_bin = g_build_filenamev ((char **) filenamev);
-      } else {
-        GST_WARNING ("GST_PLUGIN_SUBDIR: \'%s\' has too many path segments",
-            GST_PLUGIN_SUBDIR);
-        helper_bin = g_strdup (GST_PLUGIN_SCANNER_INSTALLED);
-      }
-    } else {
-      helper_bin = g_strdup (GST_PLUGIN_SCANNER_INSTALLED);
-    }
-
-    GST_DEBUG ("using system plugin scanner at %s", helper_bin);
-
-    res = gst_plugin_loader_try_helper (loader, helper_bin);
-    g_free (helper_bin);
-    g_free (relocated_libgstreamer);
-  }
-
-  if (!res) {
-    GST_INFO ("No gst-plugin-scanner available, or not working");
-  }
-
-  return loader->child_running;
-#endif // GSTREAMER_LITE
-}
-
-static void
-plugin_loader_cleanup_child (GstPluginLoader * l)
-{
-  if (!l->child_running || l->is_child)
-    return;
-
-  gst_poll_remove_fd (l->fdset, &l->fd_w);
-  gst_poll_remove_fd (l->fdset, &l->fd_r);
-
-  close (l->fd_w.fd);
-  close (l->fd_r.fd);
-
-#ifndef G_OS_WIN32
-  GST_LOG ("waiting for child process to exit");
-  waitpid (l->child_pid, NULL, 0);
-#else
-  g_warning ("FIXME: Implement child process shutdown for Win32");
-#endif
-  g_spawn_close_pid (l->child_pid);
-
-  l->child_running = FALSE;
-}
-
-gboolean
-_gst_plugin_loader_client_run (void)
-{
-  gboolean res = TRUE;
-  GstPluginLoader *l;
-
-  l = plugin_loader_new (NULL);
-  if (l == NULL)
-    return FALSE;
-
-  /* On entry, the inward pipe is STDIN, and outward is STDOUT.
-   * Dup those somewhere better so that plugins printing things
-   * won't interfere with anything */
-#ifndef G_OS_WIN32
-  {
-    int dup_fd;
-
-    dup_fd = dup (0);           /* STDIN */
-    if (dup_fd == -1) {
-      GST_ERROR ("Failed to start. Could not dup STDIN, errno %d", errno);
-      res = FALSE;
-      goto beach;
-    }
-    l->fd_r.fd = dup_fd;
-    close (0);
-
-    dup_fd = dup (1);           /* STDOUT */
-    if (dup_fd == -1) {
-      GST_ERROR ("Failed to start. Could not dup STDOUT, errno %d", errno);
-      res = FALSE;
-      goto beach;
-    }
-    l->fd_w.fd = dup_fd;
-    close (1);
-
-    /* Dup stderr down to stdout so things that plugins print are visible,
-     * but don't care if it fails */
-    dup2 (2, 1);
-  }
-#else
-  /* FIXME: Use DuplicateHandle and friends on win32 */
-  l->fd_w.fd = 1;               /* STDOUT */
-  l->fd_r.fd = 0;               /* STDIN */
-#endif
-
-  gst_poll_add_fd (l->fdset, &l->fd_w);
-  gst_poll_add_fd (l->fdset, &l->fd_r);
-  gst_poll_fd_ctl_read (l->fdset, &l->fd_r, TRUE);
-
-  l->is_child = TRUE;
-
-  GST_DEBUG ("Plugin scanner child running. Waiting for instructions");
-
-  /* Loop, listening for incoming packets on the fd and writing responses */
-  while (!l->rx_done && exchange_packets (l));
-
-#ifndef G_OS_WIN32
-beach:
-#endif
-
-  plugin_loader_free (l);
-
-  return res;
-}
-
-static void
-put_packet (GstPluginLoader * l, guint type, guint32 tag,
-    const guint8 * payload, guint32 payload_len)
-{
-  guint8 *out;
-  guint len = payload_len + HEADER_SIZE;
-
-  if (l->tx_buf_write + len >= l->tx_buf_size) {
-    GST_LOG ("Expanding tx buf from %d to %d for packet of size %d",
-        l->tx_buf_size, l->tx_buf_write + len + BUF_GROW_EXTRA, len);
-    l->tx_buf_size = l->tx_buf_write + len + BUF_GROW_EXTRA;
-    l->tx_buf = g_realloc (l->tx_buf, l->tx_buf_size);
-  }
-
-  out = l->tx_buf + l->tx_buf_write;
-
-  /* one byte packet type */
-  out[0] = type;
-  /* 3 byte packet tag number */
-  GST_WRITE_UINT24_BE (out + 1, tag);
-  /* 4 bytes packet length */
-  GST_WRITE_UINT32_BE (out + 4, payload_len);
-  /* payload */
-  if (payload && payload_len)
-    memcpy (out + HEADER_SIZE, payload, payload_len);
-  /* Write magic into the header */
-  GST_WRITE_UINT32_BE (out + 8, HEADER_MAGIC);
-
-  l->tx_buf_write += len;
-  gst_poll_fd_ctl_write (l->fdset, &l->fd_w, TRUE);
-}
-
-static void
-put_chunk (GstPluginLoader * l, GstRegistryChunk * chunk, guint * pos)
-{
-  guint padsize = 0;
-  guint len;
-  guint8 *out;
-
-  /* Might need to align the chunk */
-  if (chunk->align && ((*pos) % ALIGNMENT) != 0)
-    padsize = ALIGNMENT - ((*pos) % ALIGNMENT);
-
-  len = padsize + chunk->size;
-
-  if (G_UNLIKELY (l->tx_buf_write + len >= l->tx_buf_size)) {
-    guint new_size = MAX (l->tx_buf_write + len,
-        l->tx_buf_size + l->tx_buf_size / 4) + BUF_GROW_EXTRA;
-    GST_LOG ("Expanding tx buf from %d to %d for chunk of size %d",
-        l->tx_buf_size, new_size, chunk->size);
-    l->tx_buf_size = new_size;
-    l->tx_buf = g_realloc (l->tx_buf, l->tx_buf_size);
-  }
-
-  out = l->tx_buf + l->tx_buf_write;
-  /* Clear the padding */
-  if (padsize)
-    memset (out, 0, padsize);
-  memcpy (out + padsize, chunk->data, chunk->size);
-
-  l->tx_buf_write += len;
-  *pos += len;
-
-  gst_poll_fd_ctl_write (l->fdset, &l->fd_w, TRUE);
-};
-
-static gboolean
-write_one (GstPluginLoader * l)
-{
-  guint8 *out;
-  guint32 to_write, magic;
-  int res;
-
-  if (l->tx_buf_read + HEADER_SIZE > l->tx_buf_write)
-    return FALSE;
-
-  out = l->tx_buf + l->tx_buf_read;
-
-  magic = GST_READ_UINT32_BE (out + 8);
-  if (magic != HEADER_MAGIC) {
-    GST_ERROR ("Packet magic number is missing. Memory corruption detected");
-    goto fail_and_cleanup;
-  }
-
-  to_write = GST_READ_UINT32_BE (out + 4) + HEADER_SIZE;
-  /* Check that the magic is intact, and the size is sensible */
-  if (to_write > l->tx_buf_size) {
-    GST_ERROR ("Indicated packet size is too large. Corruption detected");
-    goto fail_and_cleanup;
-  }
-
-  l->tx_buf_read += to_write;
-
-  GST_LOG ("Writing packet of size %d bytes to fd %d", to_write, l->fd_w.fd);
-
-  do {
-    res = write (l->fd_w.fd, out, to_write);
-    if (G_UNLIKELY (res < 0)) {
-      if (errno == EAGAIN || errno == EINTR)
-        continue;
-      /* Failed to write -> child died */
-      goto fail_and_cleanup;
-    } else if (G_UNLIKELY (res == 0)) {
-      /* FD closed -> child died */
-      goto fail_and_cleanup;
-    }
-    to_write -= res;
-    out += res;
-  } while (to_write > 0);
-
-  if (l->tx_buf_read == l->tx_buf_write) {
-    gst_poll_fd_ctl_write (l->fdset, &l->fd_w, FALSE);
-    l->tx_buf_read = l->tx_buf_write = 0;
-  }
-
-  return TRUE;
-
-fail_and_cleanup:
-  plugin_loader_cleanup_child (l);
-  return FALSE;
-}
-
-static gboolean
-do_plugin_load (GstPluginLoader * l, const gchar * filename, guint tag)
-{
-  GstPlugin *newplugin;
-  GList *chunks = NULL;
-
-  GST_DEBUG ("Plugin scanner loading file %s. tag %u", filename, tag);
-
-#if 0                           /* Test code - crash based on filename */
-  if (strstr (filename, "coreelements") == NULL) {
-    g_printerr ("Crashing on file %s\n", filename);
-    g_printerr ("%d", *(gint *) (NULL));
-  }
-#endif
-
-  newplugin = gst_plugin_load_file ((gchar *) filename, NULL);
-  if (newplugin) {
-    guint hdr_pos;
-    guint offset;
-
-    /* Now serialise the plugin details and send */
-    if (!_priv_gst_registry_chunks_save_plugin (&chunks,
-            gst_registry_get (), newplugin))
-      goto fail;
-
-    /* Store where the header is, write an empty one, then write
-     * all the payload chunks, then fix up the header size */
-    hdr_pos = l->tx_buf_write;
-    offset = HEADER_SIZE;
-    put_packet (l, PACKET_PLUGIN_DETAILS, tag, NULL, 0);
-
-    if (chunks) {
-      GList *walk;
-      for (walk = chunks; walk; walk = g_list_next (walk)) {
-        GstRegistryChunk *cur = walk->data;
-        put_chunk (l, cur, &offset);
-
-        _priv_gst_registry_chunk_free (cur);
-      }
-
-      g_list_free (chunks);
-
-      /* Store the size of the written payload */
-      GST_WRITE_UINT32_BE (l->tx_buf + hdr_pos + 4, offset - HEADER_SIZE);
-    }
-#if 0                           /* Test code - corrupt the tx buffer based on filename */
-    if (strstr (filename, "sink") != NULL) {
-      int fd, res;
-      g_printerr ("Corrupting tx buf on file %s\n", filename);
-      fd = open ("/dev/urandom", O_RDONLY);
-      res = read (fd, l->tx_buf, l->tx_buf_size);
-      close (fd);
-    }
-#endif
-
-    gst_object_unref (newplugin);
-  } else {
-    put_packet (l, PACKET_PLUGIN_DETAILS, tag, NULL, 0);
-  }
-
-  return TRUE;
-fail:
-  put_packet (l, PACKET_PLUGIN_DETAILS, tag, NULL, 0);
-  if (chunks) {
-    GList *walk;
-    for (walk = chunks; walk; walk = g_list_next (walk)) {
-      GstRegistryChunk *cur = walk->data;
-
-      _priv_gst_registry_chunk_free (cur);
-    }
-
-    g_list_free (chunks);
-  }
-
-  return FALSE;
-}
-
-static gboolean
-check_protocol_version (GstPluginLoader * l, guint8 * payload,
-    guint payload_len)
-{
-  guint32 got_version;
-  guint8 *binary_reg_ver;
-
-  if (payload_len < sizeof (guint32) + GST_MAGIC_BINARY_VERSION_LEN)
-    return FALSE;
-
-  got_version = GST_READ_UINT32_BE (payload);
-  GST_LOG ("Got VERSION %u from child. Ours is %u", got_version,
-      loader_protocol_version);
-  if (got_version != loader_protocol_version)
-    return FALSE;
-
-  binary_reg_ver = payload + sizeof (guint32);
-  if (strcmp ((gchar *) binary_reg_ver, GST_MAGIC_BINARY_VERSION_STR)) {
-    GST_LOG ("Binary chunk format of child is different. Ours: %s, child %s\n",
-        GST_MAGIC_BINARY_VERSION_STR, binary_reg_ver);
-    return FALSE;
-  }
-
-  return TRUE;
-};
-
-static gboolean
-handle_rx_packet (GstPluginLoader * l,
-    guint pack_type, guint32 tag, guint8 * payload, guint payload_len)
-{
-  gboolean res = TRUE;
-
-  switch (pack_type) {
-    case PACKET_EXIT:
-      gst_poll_fd_ctl_read (l->fdset, &l->fd_r, FALSE);
-      if (l->is_child) {
-        /* Respond */
-        put_packet (l, PACKET_EXIT, 0, NULL, 0);
-      }
-      l->rx_done = TRUE;
-      return TRUE;
-    case PACKET_LOAD_PLUGIN:{
-      if (!l->is_child)
-        return TRUE;
-
-      /* Payload is the filename to load */
-      res = do_plugin_load (l, (gchar *) payload, tag);
-
-      break;
-    }
-    case PACKET_PLUGIN_DETAILS:{
-      gchar *tmp = (gchar *) payload;
-      PendingPluginEntry *entry = NULL;
-      GList *cur;
-
-      GST_DEBUG_OBJECT (l->registry,
-          "Received plugin details from child w/ tag %u. %d bytes info",
-          tag, payload_len);
-
-      /* Assume that tagged details come back in the order
-       * we requested, and delete anything before (but not
-       * including) this one */
-      cur = l->pending_plugins;
-      while (cur) {
-        PendingPluginEntry *e = (PendingPluginEntry *) (cur->data);
-
-        if (e->tag > tag)
-          break;
-
-        if (e->tag == tag) {
-          entry = e;
-          break;
-        } else {
-          cur = g_list_delete_link (cur, cur);
-          g_free (e->filename);
-          g_slice_free (PendingPluginEntry, e);
-        }
-      }
-
-      l->pending_plugins = cur;
-      if (cur == NULL)
-        l->pending_plugins_tail = NULL;
-
-      if (payload_len > 0) {
-        GstPlugin *newplugin = NULL;
-        if (!_priv_gst_registry_chunks_load_plugin (l->registry, &tmp,
-                tmp + payload_len, &newplugin)) {
-          /* Got garbage from the child, so fail and trigger replay of plugins */
-          GST_ERROR_OBJECT (l->registry,
-              "Problems loading plugin details with tag %u from scanner", tag);
-          return FALSE;
-        }
-
-        GST_OBJECT_FLAG_UNSET (newplugin, GST_PLUGIN_FLAG_CACHED);
-        GST_LOG_OBJECT (l->registry,
-            "marking plugin %p as registered as %s", newplugin,
-            newplugin->filename);
-        newplugin->registered = TRUE;
-
-        /* We got a set of plugin details - remember it for later */
-        l->got_plugin_details = TRUE;
-      } else if (entry != NULL) {
-        /* Create a blacklist entry for this file to prevent scanning every time */
-        plugin_loader_create_blacklist_plugin (l, entry);
-        l->got_plugin_details = TRUE;
-      }
-
-      if (entry != NULL) {
-        g_free (entry->filename);
-        g_slice_free (PendingPluginEntry, entry);
-      }
-
-      /* Remove the plugin entry we just loaded */
-      cur = l->pending_plugins;
-      if (cur != NULL)
-        cur = g_list_delete_link (cur, cur);
-      l->pending_plugins = cur;
-      if (cur == NULL)
-        l->pending_plugins_tail = NULL;
-
-      break;
-    }
-    case PACKET_SYNC:
-      if (l->is_child) {
-        /* Respond with our reply - also a sync */
-        put_packet (l, PACKET_SYNC, tag, NULL, 0);
-        GST_LOG ("Got SYNC in child - replying");
-      } else
-        l->rx_got_sync = TRUE;
-      break;
-    case PACKET_VERSION:
-      if (l->is_child) {
-        /* Respond with our reply - a version packet, with the version */
-        const gint version_len =
-            sizeof (guint32) + GST_MAGIC_BINARY_VERSION_LEN;
-        guint8 version_info[sizeof (guint32) + GST_MAGIC_BINARY_VERSION_LEN];
-        memset (version_info, 0, version_len);
-        GST_WRITE_UINT32_BE (version_info, loader_protocol_version);
-        memcpy (version_info + sizeof (guint32), GST_MAGIC_BINARY_VERSION_STR,
-            strlen (GST_MAGIC_BINARY_VERSION_STR));
-        put_packet (l, PACKET_VERSION, tag, version_info, version_len);
-        GST_LOG ("Got VERSION in child - replying %u", loader_protocol_version);
-      } else {
-        res = check_protocol_version (l, payload, payload_len);
-      }
-      break;
-    default:
-      return FALSE;             /* Invalid packet -> something is wrong */
-  }
-
-  return res;
-}
-
-static gboolean
-read_one (GstPluginLoader * l)
-{
-  guint64 magic;
-  guint32 to_read, packet_len, tag;
-  guint8 *in;
-  gint res;
-
-  to_read = HEADER_SIZE;
-  in = l->rx_buf;
-  do {
-    res = read (l->fd_r.fd, in, to_read);
-    if (G_UNLIKELY (res < 0)) {
-      if (errno == EAGAIN || errno == EINTR)
-        continue;
-      GST_LOG ("Failed reading packet header");
-      return FALSE;
-    } else if (G_UNLIKELY (res == 0)) {
-      GST_LOG ("Failed reading packet header: Unexpected EOF");
-      return FALSE;
-    }
-    to_read -= res;
-    in += res;
-  } while (to_read > 0);
-
-  magic = GST_READ_UINT32_BE (l->rx_buf + 8);
-  if (magic != HEADER_MAGIC) {
-    GST_WARNING
-        ("Invalid packet (bad magic number) received from plugin scanner subprocess");
-    return FALSE;
-  }
-
-  packet_len = GST_READ_UINT32_BE (l->rx_buf + 4);
-  if (packet_len + HEADER_SIZE > BUF_MAX_SIZE) {
-    GST_WARNING
-        ("Received excessively large packet for plugin scanner subprocess");
-    return FALSE;
-  }
-  tag = GST_READ_UINT24_BE (l->rx_buf + 1);
-
-  if (packet_len > 0) {
-    if (packet_len + HEADER_SIZE >= l->rx_buf_size) {
-      GST_LOG ("Expanding rx buf from %d to %d",
-          l->rx_buf_size, packet_len + HEADER_SIZE + BUF_GROW_EXTRA);
-      l->rx_buf_size = packet_len + HEADER_SIZE + BUF_GROW_EXTRA;
-      l->rx_buf = g_realloc (l->rx_buf, l->rx_buf_size);
-    }
-
-    in = l->rx_buf + HEADER_SIZE;
-    to_read = packet_len;
-    do {
-      res = read (l->fd_r.fd, in, to_read);
-      if (G_UNLIKELY (res < 0)) {
-        if (errno == EAGAIN || errno == EINTR)
-          continue;
-        GST_ERROR ("Packet payload read failed");
-        return FALSE;
-      } else if (G_UNLIKELY (res == 0)) {
-        GST_ERROR ("Packet payload read failed: Unexpected EOF");
-        return FALSE;
-      }
-      to_read -= res;
-      in += res;
-    } while (to_read > 0);
-  } else {
-    GST_LOG ("No payload to read for 0 length packet type %d tag %u",
-        l->rx_buf[0], tag);
-  }
-
-  return handle_rx_packet (l, l->rx_buf[0], tag,
-      l->rx_buf + HEADER_SIZE, packet_len);
-}
-
-static gboolean
-exchange_packets (GstPluginLoader * l)
-{
-  gint res;
-
-  /* Wait for activity on our FDs */
-  do {
-    do {
-      res = gst_poll_wait (l->fdset, GST_SECOND);
-    } while (res == -1 && (errno == EINTR || errno == EAGAIN));
-
-    if (res < 0)
-      return FALSE;
-
-    GST_LOG ("Poll res = %d. %d bytes pending for write", res,
-        l->tx_buf_write - l->tx_buf_read);
-
-    if (!l->rx_done) {
-      if (gst_poll_fd_has_error (l->fdset, &l->fd_r)) {
-        GST_LOG ("read fd %d errored", l->fd_r.fd);
-        goto fail_and_cleanup;
-      }
-
-      if (gst_poll_fd_can_read (l->fdset, &l->fd_r)) {
-        if (!read_one (l))
-          goto fail_and_cleanup;
-      } else if (gst_poll_fd_has_closed (l->fdset, &l->fd_r)) {
-        GST_LOG ("read fd %d closed", l->fd_r.fd);
-        goto fail_and_cleanup;
-      }
-    }
-
-    if (l->tx_buf_read < l->tx_buf_write) {
-      if (gst_poll_fd_has_error (l->fdset, &l->fd_w)) {
-        GST_ERROR ("write fd %d errored", l->fd_w.fd);
-        goto fail_and_cleanup;
-      }
-      if (gst_poll_fd_can_write (l->fdset, &l->fd_w)) {
-        if (!write_one (l))
-          goto fail_and_cleanup;
-      } else if (gst_poll_fd_has_closed (l->fdset, &l->fd_w)) {
-        GST_LOG ("write fd %d closed", l->fd_w.fd);
-        goto fail_and_cleanup;
-      }
-    }
-  } while (l->tx_buf_read < l->tx_buf_write);
-
-  return TRUE;
-fail_and_cleanup:
-  plugin_loader_cleanup_child (l);
-  return FALSE;
-}
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstpluginloader.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstpluginloader.h
deleted file mode 100644
index dfbac597547..00000000000
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstpluginloader.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* GStreamer
- * Copyright (C) 2008 Jan Schmidt <jan.schmidt@sun.com>
- *
- * gstpluginloader.h: Helper for out-of-process plugin loading. Private header.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-#ifndef __GST_PLUGINLOADER_H__
-#define __GST_PLUGINLOADER_H__
-
-#include <glib.h>
-#include <gst/gstregistry.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GstPluginLoader GstPluginLoader;
-
-typedef struct _GstPluginLoaderFuncs {
-  GstPluginLoader * (*create)   (GstRegistry *registry);
-  gboolean          (*destroy)  (GstPluginLoader *loader);
-  gboolean          (*load)     (GstPluginLoader *loader, const gchar *filename,
-                                 off_t file_size, time_t file_mtime);
-} GstPluginLoaderFuncs;
-
-extern const GstPluginLoaderFuncs _priv_gst_plugin_loader_funcs;
-
-G_END_DECLS
-
-#endif /* __GST_PLUGINLOADER_H__ */
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstpoll.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstpoll.c
index f5f10bc5e18..b6e72a99814 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstpoll.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstpoll.c
@@ -677,7 +677,7 @@ gst_poll_new (gboolean controllable)
 {
   GstPoll *nset;
 
-  nset = g_slice_new0 (GstPoll);
+  nset = g_new0 (GstPoll, 1);
   GST_DEBUG ("%p: new controllable : %d", nset, controllable);
   g_mutex_init (&nset->lock);
 #ifndef G_OS_WIN32
@@ -794,7 +794,7 @@ gst_poll_free (GstPoll * set)
   g_array_free (set->active_fds, TRUE);
   g_array_free (set->fds, TRUE);
   g_mutex_clear (&set->lock);
-  g_slice_free (GstPoll, set);
+  g_free (set);
 }
 
 /**
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstprotection.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstprotection.c
index 73deed811f0..f174da6aebb 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstprotection.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstprotection.c
@@ -35,6 +35,15 @@
  * used by a downstream decrypter element to recover the original unencrypted
  * frame.
  *
+ * In addition to the #GstProtectionMeta demuxers signal encrypted streams with
+ * specific caps. The caps #GstStructure name will usually depend on the
+ * encryption scheme, for instance Common Encryption will be signaled with
+ * `application/x-cenc`. To prevent loss of information the media type of the
+ * decrypted stream will be stored in a `original-media-type` string field.
+ * Downstream elements can re-use that information, for instance decryptors can
+ * set their source pad caps according to the `original-media-type` received on
+ * their sink pad.
+ *
  * Since: 1.6
  */
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstquery.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstquery.c
index b96fe2b407c..3c2490f716f 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstquery.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstquery.c
@@ -201,7 +201,7 @@ _gst_query_free (GstQuery * query)
   memset (query, 0xff, sizeof (GstQueryImpl));
 #endif
 
-  g_slice_free1 (sizeof (GstQueryImpl), query);
+  g_free (query);
 }
 
 static GstQuery *
@@ -675,7 +675,7 @@ gst_query_new_custom (GstQueryType type, GstStructure * structure)
 {
   GstQueryImpl *query;
 
-  query = g_slice_new0 (GstQueryImpl);
+  query = g_new0 (GstQueryImpl, 1);
 
   GST_DEBUG ("creating new query %p %s", query, gst_query_type_get_name (type));
 
@@ -698,7 +698,7 @@ gst_query_new_custom (GstQueryType type, GstStructure * structure)
   /* ERRORS */
 had_parent:
   {
-    g_slice_free1 (sizeof (GstQueryImpl), query);
+    g_free (query);
     g_warning ("structure is already owned by another object");
     return NULL;
   }
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c
index 22c8be9300c..1d9c0179fc5 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c
@@ -110,9 +110,9 @@
 #include "gstregistry.h"
 #ifndef GSTREAMER_LITE
 #include "gstdeviceproviderfactory.h"
-#endif // GSTREAMER_LITE
 
 #include "gstpluginloader.h"
+#endif // GSTREAMER_LITE
 
 #include <glib/gi18n-lib.h>
 
@@ -1182,7 +1182,9 @@ typedef struct
 {
   GstRegistry *registry;
   GstRegistryScanHelperState helper_state;
+#ifndef GSTREAMER_LITE
   GstPluginLoader *helper;
+#endif // GSTREAMER_LITE
   gboolean changed;
 } GstRegistryScanContext;
 
@@ -1210,17 +1212,21 @@ init_scan_context (GstRegistryScanContext * context, GstRegistry * registry)
   else
     context->helper_state = REGISTRY_SCAN_HELPER_DISABLED;
 
+#ifndef GSTREAMER_LITE
   context->helper = NULL;
+#endif // GSTREAMER_LITE
   context->changed = FALSE;
 }
 
 static void
 clear_scan_context (GstRegistryScanContext * context)
 {
+#ifndef GSTREAMER_LITE
   if (context->helper) {
     context->changed |= _priv_gst_plugin_loader_funcs.destroy (context->helper);
     context->helper = NULL;
   }
+#endif // GSTREAMER_LITE
 }
 
 static gboolean
@@ -1230,12 +1236,7 @@ gst_registry_scan_plugin_file (GstRegistryScanContext * context,
   gboolean changed = FALSE;
   GstPlugin *newplugin = NULL;
 
-#ifdef G_OS_WIN32
-  /* Disable external plugin loader on Windows until it is ported properly. */
-  context->helper_state = REGISTRY_SCAN_HELPER_DISABLED;
-#endif
-
-
+#ifndef GSTREAMER_LITE
   /* Have a plugin to load - see if the scan-helper needs starting */
   if (context->helper_state == REGISTRY_SCAN_HELPER_NOT_STARTED) {
     GST_DEBUG ("Starting plugin scanner for file %s", filename);
@@ -1260,6 +1261,9 @@ gst_registry_scan_plugin_file (GstRegistryScanContext * context,
       context->helper_state = REGISTRY_SCAN_HELPER_DISABLED;
     }
   }
+#else // GSTREAMER_LITE
+  context->helper_state = REGISTRY_SCAN_HELPER_DISABLED;
+#endif // GSTREAMER_LITE
 
   /* Check if the helper is disabled (or just got disabled above) */
   if (context->helper_state == REGISTRY_SCAN_HELPER_DISABLED) {
@@ -1842,6 +1846,8 @@ priv_gst_get_relocated_libgstreamer (void)
 #elif defined(HAVE_DLADDR)
   {
     Dl_info info;
+    char *real_fname = NULL;
+    long path_max = 0;
 
     GST_DEBUG ("attempting to retrieve libgstreamer-1.0 location using "
         "dladdr()");
@@ -1852,8 +1858,25 @@ priv_gst_get_relocated_libgstreamer (void)
       if (!info.dli_fname) {
         return NULL;
       }
+#ifdef PATH_MAX
+      path_max = PATH_MAX;
+#else
+      path_max = pathconf (info.dli_fname, _PC_PATH_MAX);
+      if (path_max <= 0)
+        path_max = 4096;
+#endif
+
+      real_fname = g_malloc (path_max);
+      if (realpath (info.dli_fname, real_fname)) {
+        dir = g_path_get_dirname (real_fname);
+        GST_DEBUG ("real directory location: %s", dir);
+      } else {
+        GST_ERROR ("could not canonicalize path %s: %s", info.dli_fname,
+            g_strerror (errno));
+        dir = g_path_get_dirname (info.dli_fname);
+      }
+      g_free (real_fname);
 
-      dir = g_path_get_dirname (info.dli_fname);
     } else {
       GST_LOG ("dladdr() failed");
       return NULL;
@@ -1870,6 +1893,75 @@ priv_gst_get_relocated_libgstreamer (void)
 }
 #endif // GSTREAMER_LITE
 
+int
+priv_gst_count_directories (const char *filepath)
+{
+  int i = 0;
+  char *tmp;
+  gsize len;
+
+  g_return_val_if_fail (!g_path_is_absolute (filepath), 0);
+
+  tmp = g_strdup (filepath);
+  len = strlen (tmp);
+
+  /* ignore UNC share paths entirely */
+  if (len >= 3 && G_IS_DIR_SEPARATOR (tmp[0]) && G_IS_DIR_SEPARATOR (tmp[1])
+      && !G_IS_DIR_SEPARATOR (tmp[2])) {
+    GST_WARNING ("found a UNC share path, ignoring");
+    g_clear_pointer (&tmp, g_free);
+    return 0;
+  }
+
+  /* remove trailing slashes if they exist */
+  while (
+      /* don't remove the trailing slash for C:\.
+       * UNC paths are at least \\s\s */
+      len > 3 && G_IS_DIR_SEPARATOR (tmp[len - 1])) {
+    tmp[len - 1] = '\0';
+    len--;
+  }
+
+  while (tmp) {
+    char *dirname, *basename;
+    len = strlen (tmp);
+
+    if (g_strcmp0 (tmp, ".") == 0)
+      break;
+    if (g_strcmp0 (tmp, "/") == 0)
+      break;
+
+    /* g_path_get_dirname() may return something of the form 'C:.', where C is
+     * a drive letter */
+    if (len == 3 && g_ascii_isalpha (tmp[0]) && tmp[1] == ':' && tmp[2] == '.')
+      break;
+
+    basename = g_path_get_basename (tmp);
+    dirname = g_path_get_dirname (tmp);
+
+    if (g_strcmp0 (basename, "..") == 0) {
+      i--;
+    } else if (g_strcmp0 (basename, ".") == 0) {
+      /* nothing to do */
+    } else {
+      i++;
+    }
+
+    g_clear_pointer (&basename, g_free);
+    g_clear_pointer (&tmp, g_free);
+    tmp = dirname;
+  }
+
+  g_clear_pointer (&tmp, g_free);
+
+  if (i < 0) {
+    g_critical ("path counting resulted in a negative directory count!");
+    return 0;
+  }
+
+  return i;
+}
+
 #ifndef GST_DISABLE_REGISTRY
 /* Unref all plugins marked 'cached', to clear old plugins that no
  * longer exist. Returns %TRUE if any plugins were removed */
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistrybinary.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistrybinary.c
index 8e679969a66..e9545d91f0d 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistrybinary.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistrybinary.c
@@ -105,7 +105,7 @@ typedef struct BinaryRegistryCache
 static BinaryRegistryCache *
 gst_registry_binary_cache_init (GstRegistry * registry, const char *location)
 {
-  BinaryRegistryCache *cache = g_slice_new0 (BinaryRegistryCache);
+  BinaryRegistryCache *cache = g_new0 (BinaryRegistryCache, 1);
   cache->location = location;
   return cache;
 }
@@ -159,7 +159,7 @@ gst_registry_binary_cache_finish (BinaryRegistryCache * cache, gboolean success)
   }
 
   g_free (cache->mem);
-  g_slice_free (BinaryRegistryCache, cache);
+  g_free (cache);
   return ret;
 }
 
@@ -175,7 +175,7 @@ typedef struct BinaryRegistryCache
 static BinaryRegistryCache *
 gst_registry_binary_cache_init (GstRegistry * registry, const char *location)
 {
-  BinaryRegistryCache *cache = g_slice_new0 (BinaryRegistryCache);
+  BinaryRegistryCache *cache = g_new0 (BinaryRegistryCache, 1);
   int fd;
 
   cache->location = location;
@@ -205,7 +205,7 @@ gst_registry_binary_cache_init (GstRegistry * registry, const char *location)
     if (fd == -1) {
       GST_DEBUG ("g_mkstemp() failed: %s", g_strerror (errno));
       g_free (cache->tmp_location);
-      g_slice_free (BinaryRegistryCache, cache);
+      g_free (cache);
       return NULL;
     }
 
@@ -220,7 +220,7 @@ gst_registry_binary_cache_init (GstRegistry * registry, const char *location)
     GST_DEBUG ("fdopen() failed: %s", g_strerror (errno));
     close (fd);
     g_free (cache->tmp_location);
-    g_slice_free (BinaryRegistryCache, cache);
+    g_free (cache);
     return NULL;
   }
 
@@ -312,7 +312,7 @@ gst_registry_binary_cache_finish (BinaryRegistryCache * cache, gboolean success)
   }
 
   g_free (cache->tmp_location);
-  g_slice_free (BinaryRegistryCache, cache);
+  g_free (cache);
   GST_INFO ("Wrote binary registry cache");
   return TRUE;
 
@@ -326,7 +326,7 @@ gst_registry_binary_cache_finish (BinaryRegistryCache * cache, gboolean success)
   {
     g_unlink (cache->tmp_location);
     g_free (cache->tmp_location);
-    g_slice_free (BinaryRegistryCache, cache);
+    g_free (cache);
     return FALSE;
   }
 fflush_failed:
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistrybinary.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistrybinary.h
index 22e56d19615..6bf712c87ea 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistrybinary.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistrybinary.h
@@ -55,7 +55,7 @@ G_BEGIN_DECLS
  * This _must_ be updated whenever the registry format changes,
  * we currently use the core version where this change happened.
  */
-#define GST_MAGIC_BINARY_VERSION_STR "1.3.0"
+#define GST_MAGIC_BINARY_VERSION_STR "1.23.90"
 
 /*
  * GST_MAGIC_BINARY_VERSION_LEN:
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistrychunks.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistrychunks.c
index 39dfe6b0930..97abf318017 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistrychunks.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistrychunks.c
@@ -118,12 +118,9 @@ void
 _priv_gst_registry_chunk_free (GstRegistryChunk * chunk)
 {
   if (!(chunk->flags & GST_REGISTRY_CHUNK_FLAG_CONST)) {
-    if ((chunk->flags & GST_REGISTRY_CHUNK_FLAG_MALLOC))
-      g_free (chunk->data);
-    else
-      g_slice_free1 (chunk->size, chunk->data);
+    g_free (chunk->data);
   }
-  g_slice_free (GstRegistryChunk, chunk);
+  g_free (chunk);
 }
 
 /*
@@ -143,7 +140,7 @@ gst_registry_chunks_save_const_string (GList ** list, const gchar * str)
     str = "";
   }
 
-  chunk = g_slice_new (GstRegistryChunk);
+  chunk = g_new (GstRegistryChunk, 1);
   chunk->data = (gpointer) str;
   chunk->size = strlen ((gchar *) chunk->data) + 1;
   chunk->flags = GST_REGISTRY_CHUNK_FLAG_CONST;
@@ -164,10 +161,10 @@ gst_registry_chunks_save_string (GList ** list, gchar * str)
 {
   GstRegistryChunk *chunk;
 
-  chunk = g_slice_new (GstRegistryChunk);
+  chunk = g_new (GstRegistryChunk, 1);
   chunk->data = str;
   chunk->size = strlen ((gchar *) chunk->data) + 1;
-  chunk->flags = GST_REGISTRY_CHUNK_FLAG_MALLOC;
+  chunk->flags = GST_REGISTRY_CHUNK_FLAG_NONE;
   chunk->align = FALSE;
   *list = g_list_prepend (*list, chunk);
   return TRUE;
@@ -185,7 +182,7 @@ gst_registry_chunks_make_data (gpointer data, gulong size)
 {
   GstRegistryChunk *chunk;
 
-  chunk = g_slice_new (GstRegistryChunk);
+  chunk = g_new (GstRegistryChunk, 1);
   chunk->data = data;
   chunk->size = size;
   chunk->flags = GST_REGISTRY_CHUNK_FLAG_NONE;
@@ -208,7 +205,7 @@ gst_registry_chunks_save_pad_template (GList ** list,
   GstRegistryChunkPadTemplate *pt;
   GstRegistryChunk *chk;
 
-  pt = g_slice_new (GstRegistryChunkPadTemplate);
+  pt = g_new (GstRegistryChunkPadTemplate, 1);
   chk =
       gst_registry_chunks_make_data (pt, sizeof (GstRegistryChunkPadTemplate));
 
@@ -253,7 +250,7 @@ gst_registry_chunks_save_feature (GList ** list, GstPluginFeature * feature)
     /* Initialize with zeroes because of struct padding and
      * valgrind complaining about copying uninitialized memory
      */
-    ef = g_slice_new0 (GstRegistryChunkElementFactory);
+    ef = g_new0 (GstRegistryChunkElementFactory, 1);
     pf_size = sizeof (GstRegistryChunkElementFactory);
     chk = gst_registry_chunks_make_data (ef, pf_size);
     ef->npadtemplates = ef->ninterfaces = ef->nuriprotocols = 0;
@@ -313,7 +310,7 @@ gst_registry_chunks_save_feature (GList ** list, GstPluginFeature * feature)
     /* Initialize with zeroes because of struct padding and
      * valgrind complaining about copying uninitialized memory
      */
-    tff = g_slice_new0 (GstRegistryChunkTypeFindFactory);
+    tff = g_new0 (GstRegistryChunkTypeFindFactory, 1);
     pf_size = sizeof (GstRegistryChunkTypeFindFactory);
     chk = gst_registry_chunks_make_data (tff, pf_size);
     tff->nextensions = 0;
@@ -348,7 +345,7 @@ gst_registry_chunks_save_feature (GList ** list, GstPluginFeature * feature)
     /* Initialize with zeroes because of struct padding and
      * valgrind complaining about copying uninitialized memory
      */
-    tff = g_slice_new0 (GstRegistryChunkDeviceProviderFactory);
+    tff = g_new0 (GstRegistryChunkDeviceProviderFactory, 1);
     chk =
         gst_registry_chunks_make_data (tff,
         sizeof (GstRegistryChunkDeviceProviderFactory));
@@ -363,13 +360,13 @@ gst_registry_chunks_save_feature (GList ** list, GstPluginFeature * feature)
     /* Initialize with zeroes because of struct padding and
      * valgrind complaining about copying uninitialized memory
      */
-    pf = g_slice_new0 (GstRegistryChunkPluginFeature);
+    pf = g_new0 (GstRegistryChunkPluginFeature, 1);
     pf_size = sizeof (GstRegistryChunkPluginFeature);
     chk = gst_registry_chunks_make_data (pf, pf_size);
   } else if (GST_IS_DYNAMIC_TYPE_FACTORY (feature)) {
     GstRegistryChunkDynamicTypeFactory *tmp;
 
-    tmp = g_slice_new0 (GstRegistryChunkDynamicTypeFactory);
+    tmp = g_new0 (GstRegistryChunkDynamicTypeFactory, 1);
     chk =
         gst_registry_chunks_make_data (tmp,
         sizeof (GstRegistryChunkDynamicTypeFactory));
@@ -391,8 +388,8 @@ gst_registry_chunks_save_feature (GList ** list, GstPluginFeature * feature)
 
   /* Errors */
 fail:
-  g_slice_free (GstRegistryChunk, chk);
-  g_slice_free1 (pf_size, pf);
+  g_free (chk);
+  g_free (pf);
   return FALSE;
 }
 
@@ -403,7 +400,7 @@ gst_registry_chunks_save_plugin_dep (GList ** list, GstPluginDep * dep)
   GstRegistryChunk *chk;
   gchar **s;
 
-  ed = g_slice_new (GstRegistryChunkDep);
+  ed = g_new (GstRegistryChunkDep, 1);
   chk = gst_registry_chunks_make_data (ed, sizeof (GstRegistryChunkDep));
 
   ed->flags = dep->flags;
@@ -445,7 +442,7 @@ _priv_gst_registry_chunks_save_plugin (GList ** list, GstRegistry * registry,
   GList *plugin_features = NULL;
   GList *walk;
 
-  pe = g_slice_new (GstRegistryChunkPluginElement);
+  pe = g_new (GstRegistryChunkPluginElement, 1);
   chk =
       gst_registry_chunks_make_data (pe,
       sizeof (GstRegistryChunkPluginElement));
@@ -485,6 +482,14 @@ _priv_gst_registry_chunks_save_plugin (GList ** list, GstRegistry * registry,
     gst_registry_chunks_save_const_string (list, "");
   }
 
+  /* pack status info */
+  if (plugin->priv->status_info) {
+    gchar *status_str = gst_structure_to_string (plugin->priv->status_info);
+    gst_registry_chunks_save_string (list, status_str);
+  } else {
+    gst_registry_chunks_save_const_string (list, "");
+  }
+
   /* pack plugin element strings */
   gst_registry_chunks_save_const_string (list,
       (plugin->desc.release_datetime) ? plugin->desc.release_datetime : "");
@@ -506,8 +511,8 @@ _priv_gst_registry_chunks_save_plugin (GList ** list, GstRegistry * registry,
   /* Errors */
 fail:
   gst_plugin_feature_list_free (plugin_features);
-  g_slice_free (GstRegistryChunk, chk);
-  g_slice_free (GstRegistryChunkPluginElement, pe);
+  g_free (chk);
+  g_free (pe);
   return FALSE;
 }
 
@@ -531,7 +536,7 @@ gst_registry_chunks_load_pad_template (GstElementFactory * factory, gchar ** in,
       *in);
   unpack_element (*in, pt, GstRegistryChunkPadTemplate, end, fail);
 
-  template = g_slice_new (GstStaticPadTemplate);
+  template = g_new (GstStaticPadTemplate, 1);
   template->presence = pt->presence;
   template->direction = (GstPadDirection) pt->direction;
   template->static_caps.caps = NULL;
@@ -547,7 +552,7 @@ gst_registry_chunks_load_pad_template (GstElementFactory * factory, gchar ** in,
 fail:
   GST_INFO ("Reading pad template failed");
   if (template)
-    g_slice_free (GstStaticPadTemplate, template);
+    g_free (template);
   return FALSE;
 }
 
@@ -790,7 +795,7 @@ gst_registry_chunks_load_plugin_dep (GstPlugin * plugin, gchar ** in,
   GST_LOG_OBJECT (plugin, "Unpacking GstRegistryChunkDep from %p", *in);
   unpack_element (*in, d, GstRegistryChunkDep, end, fail);
 
-  dep = g_slice_new (GstPluginDep);
+  dep = g_new (GstPluginDep, 1);
 
   dep->env_hash = d->env_hash;
   dep->stat_hash = d->stat_hash;
@@ -835,6 +840,7 @@ _priv_gst_registry_chunks_load_plugin (GstRegistry * registry, gchar ** in,
   gchar *start = *in;
 #endif
   GstRegistryChunkPluginElement *pe;
+  const gchar *status_str = NULL;
   const gchar *cache_str = NULL;
   GstPlugin *plugin = NULL;
   guint i, n;
@@ -875,6 +881,11 @@ _priv_gst_registry_chunks_load_plugin (GstRegistry * registry, gchar ** in,
   if (plugin->desc.release_datetime[0] == '\0')
     plugin->desc.release_datetime = NULL;
 
+  /* unpack status info */
+  unpack_string_nocopy (*in, status_str, end, fail);
+  if (status_str != NULL && *status_str != '\0')
+    plugin->priv->status_info = gst_structure_from_string (status_str, NULL);
+
   /* unpack cache data */
   unpack_string_nocopy (*in, cache_str, end, fail);
   if (cache_str != NULL && *cache_str != '\0')
@@ -932,7 +943,7 @@ _priv_gst_registry_chunks_save_global_header (GList ** list,
   GstRegistryChunkGlobalHeader *hdr;
   GstRegistryChunk *chk;
 
-  hdr = g_slice_new (GstRegistryChunkGlobalHeader);
+  hdr = g_new (GstRegistryChunkGlobalHeader, 1);
   chk = gst_registry_chunks_make_data (hdr,
       sizeof (GstRegistryChunkGlobalHeader));
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistrychunks.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistrychunks.h
index 6942d0c9850..9ad84d9ba9c 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistrychunks.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistrychunks.h
@@ -28,13 +28,11 @@
 
 /*
  * we reference strings directly from the plugins and in this case set CONST to
- * avoid freeing them. If g_free() should be used, the MALLOC flag is set,
- * otherwise g_slice_free1() will be used!
+ * avoid freeing them.
  */
 enum {
   GST_REGISTRY_CHUNK_FLAG_NONE = 0,
   GST_REGISTRY_CHUNK_FLAG_CONST = 1,
-  GST_REGISTRY_CHUNK_FLAG_MALLOC = 2,
 };
 
 /*
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstsample.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstsample.c
index 57a328557dc..09e3f036912 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstsample.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstsample.c
@@ -106,7 +106,7 @@ _gst_sample_free (GstSample * sample)
   memset (sample, 0xff, sizeof (GstSample));
 #endif
 
-  g_slice_free1 (sizeof (GstSample), sample);
+  g_free (sample);
 }
 
 /**
@@ -129,7 +129,7 @@ gst_sample_new (GstBuffer * buffer, GstCaps * caps, const GstSegment * segment,
 {
   GstSample *sample;
 
-  sample = g_slice_new0 (GstSample);
+  sample = g_new0 (GstSample, 1);
 
   GST_LOG ("new %p", sample);
 
@@ -463,18 +463,38 @@ gst_sample_unref (GstSample * sample)
 
 /**
  * gst_sample_copy: (skip)
- * @buf: a #GstSample.
+ * @sample: a #GstSample.
  *
  * Create a copy of the given sample. This will also make a newly allocated
  * copy of the data the source sample contains.
  *
- * Returns: (transfer full): a new copy of @buf.
+ * Returns: (transfer full): a new copy of @sample.
  *
  * Since: 1.2
  */
 GstSample *
-gst_sample_copy (const GstSample * buf)
+gst_sample_copy (const GstSample * sample)
 {
   return
-      GST_SAMPLE_CAST (gst_mini_object_copy (GST_MINI_OBJECT_CONST_CAST (buf)));
+      GST_SAMPLE_CAST (gst_mini_object_copy (GST_MINI_OBJECT_CONST_CAST
+          (sample)));
+}
+
+/**
+ * gst_clear_sample: (skip)
+ * @sample_ptr: a pointer to a #GstSample reference
+ *
+ * Clears a reference to a #GstSample
+ *
+ * @sample_ptr must not be %NULL.
+ *
+ * If the reference is %NULL then this function does nothing. Otherwise, the
+ * reference count of the sample is decreased and the pointer is set to %NULL.
+ *
+ * Since: 1.24
+ */
+void
+gst_clear_sample (GstSample ** sample_ptr)
+{
+  gst_clear_mini_object ((GstMiniObject **) sample_ptr);
 }
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstsample.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstsample.h
index d68e645f8c7..ef557e13df0 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstsample.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstsample.h
@@ -154,13 +154,22 @@ void        gst_sample_unref  (GstSample * sample);
 #ifndef GST_DISABLE_MINIOBJECT_INLINE_FUNCTIONS
 /* copy sample */
 static inline GstSample *
-gst_sample_copy (const GstSample * buf)
+gst_sample_copy (const GstSample * sample)
 {
-  return GST_SAMPLE_CAST (gst_mini_object_copy (GST_MINI_OBJECT_CONST_CAST (buf)));
+  return GST_SAMPLE_CAST (gst_mini_object_copy (GST_MINI_OBJECT_CONST_CAST (sample)));
+}
+
+static inline void
+gst_clear_sample (GstSample ** sample_ptr)
+{
+  gst_clear_mini_object ((GstMiniObject **) sample_ptr);
 }
 #else /* GST_DISABLE_MINIOBJECT_INLINE_FUNCTIONS */
 GST_API
-GstSample *   gst_sample_copy(const GstSample * buf);
+GstSample *   gst_sample_copy (const GstSample * sample);
+
+GST_API
+void          gst_clear_sample (GstSample ** sample_ptr);
 #endif /* GST_DISABLE_MINIOBJECT_INLINE_FUNCTIONS */
 
 /**
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstsegment.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstsegment.c
index 861bd69c1b1..2eb42ecdce9 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstsegment.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstsegment.c
@@ -20,6 +20,7 @@
  */
 
 #include "gst_private.h"
+#include "glib-compat-private.h"
 
 #include <math.h>
 
@@ -103,7 +104,7 @@ gst_segment_copy (const GstSegment * segment)
   GstSegment *result = NULL;
 
   if (segment) {
-    result = (GstSegment *) g_slice_copy (sizeof (GstSegment), segment);
+    result = (GstSegment *) g_memdup2 (segment, sizeof (GstSegment));
   }
   return result;
 }
@@ -139,7 +140,7 @@ gst_segment_new (void)
 {
   GstSegment *result;
 
-  result = g_slice_new0 (GstSegment);
+  result = g_new0 (GstSegment, 1);
   gst_segment_init (result, GST_FORMAT_UNDEFINED);
 
   return result;
@@ -154,7 +155,7 @@ gst_segment_new (void)
 void
 gst_segment_free (GstSegment * segment)
 {
-  g_slice_free (GstSegment, segment);
+  g_free (segment);
 }
 
 /**
@@ -774,8 +775,8 @@ gst_segment_to_running_time_full (const GstSegment * segment, GstFormat format,
       stop = segment->start + segment->duration;
 
     /* cannot continue if no stop position set or invalid offset */
-    g_return_val_if_fail (stop != -1, 0);
-    g_return_val_if_fail (stop >= offset, 0);
+    if (stop == -1 || stop < offset)
+      return 0;
 
     stop -= offset;
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gststreamcollection.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gststreamcollection.c
index 96c320a6222..afe43281ac3 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gststreamcollection.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gststreamcollection.c
@@ -97,7 +97,7 @@ gst_stream_collection_class_init (GstStreamCollectionClass * klass)
   gobject_class->get_property = gst_stream_collection_get_property;
 
   /**
-   * GstStream:upstream-id:
+   * GstStreamCollection:upstream-id:
    *
    * stream-id
    */
@@ -108,7 +108,7 @@ gst_stream_collection_class_init (GstStreamCollectionClass * klass)
           G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
 
   /**
-   * GstStream::stream-notify:
+   * GstStreamCollection::stream-notify:
    * @collection: a #GstStreamCollection
    * @prop_stream: the #GstStream that originated the signal
    * @prop: the property that changed
@@ -189,6 +189,7 @@ gst_stream_collection_set_upstream_id (GstStreamCollection * collection,
 {
   g_return_if_fail (collection->upstream_id == NULL);
 
+  GST_OBJECT_LOCK (collection);
   /* Upstream ID should only be set once on construction, but let's
    * not leak in case someone does something silly */
   if (collection->upstream_id)
@@ -196,6 +197,15 @@ gst_stream_collection_set_upstream_id (GstStreamCollection * collection,
 
   if (upstream_id)
     collection->upstream_id = g_strdup (upstream_id);
+
+  /* We hold the object lock, replace directly */
+  g_free (GST_OBJECT_NAME (collection));
+  if (upstream_id)
+    GST_OBJECT_NAME (collection) = g_strdup (upstream_id);
+  else
+    GST_OBJECT_NAME (collection) = g_strdup ("unparented");
+
+  GST_OBJECT_UNLOCK (collection);
 }
 
 /**
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gststructure.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gststructure.c
index aa314e82ca7..dc8607cf897 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gststructure.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gststructure.c
@@ -127,7 +127,7 @@
  * ```
  *
  * > *note*: gst_structure_to_string() won't use that syntax for backward
- * > compatibility reason, gst_structure_serialize() has been added for
+ * > compatibility reason, gst_structure_serialize_full() has been added for
  * > that purpose.
  */
 
@@ -2035,6 +2035,7 @@ priv_gst_structure_append_to_gstring (const GstStructure * structure,
   guint i, len;
   gboolean nested_structs_brackets =
       !(flags & GST_SERIALIZE_FLAG_BACKWARD_COMPAT);
+  gboolean strict = (flags & GST_SERIALIZE_FLAG_STRICT) != 0;
 
   g_return_val_if_fail (s != NULL, FALSE);
 
@@ -2071,7 +2072,8 @@ priv_gst_structure_append_to_gstring (const GstStructure * structure,
 
       g_string_append_c (s, '[');
       g_string_append (s, g_quark_to_string (substruct->name));
-      priv_gst_structure_append_to_gstring (substruct, s, flags);
+      if (!priv_gst_structure_append_to_gstring (substruct, s, flags))
+        return FALSE;
       g_string_append_c (s, ']');
     } else if (nested_structs_brackets
         && G_VALUE_TYPE (&field->value) == GST_TYPE_CAPS) {
@@ -2083,9 +2085,13 @@ priv_gst_structure_append_to_gstring (const GstStructure * structure,
     } else if (t) {
       g_string_append (s, t);
       g_free (t);
+      if (strict && G_VALUE_HOLDS_OBJECT (&field->value))
+        return FALSE;
     } else if (G_TYPE_CHECK_VALUE_TYPE (&field->value, G_TYPE_POINTER)) {
       gpointer ptr = g_value_get_pointer (&field->value);
 
+      if (strict)
+        return FALSE;
       if (!ptr)
         g_string_append (s, "NULL");
       else
@@ -2095,6 +2101,8 @@ priv_gst_structure_append_to_gstring (const GstStructure * structure,
         GST_WARNING ("No value transform to serialize field '%s' of type '%s'",
             g_quark_to_string (field->name),
             _priv_gst_value_gtype_to_abbr (type));
+      if (strict)
+        return FALSE;
       /* TODO(ensonic): don't print NULL if field->value is not empty */
       g_string_append (s, "NULL");
     }
@@ -2170,7 +2178,10 @@ structure_serialize (const GstStructure * structure, GstSerializeFlags flags)
    * avoid unnecessary reallocs within GString */
   s = g_string_sized_new (STRUCTURE_ESTIMATED_STRING_LEN (structure));
   g_string_append (s, g_quark_to_string (structure->name));
-  priv_gst_structure_append_to_gstring (structure, s, flags);
+  if (!priv_gst_structure_append_to_gstring (structure, s, flags)) {
+    g_string_free (s, TRUE);
+    return NULL;
+  }
   return g_string_free (s, FALSE);
 
 }
@@ -2188,7 +2199,7 @@ structure_serialize (const GstStructure * structure, GstSerializeFlags flags)
  *
  * This function will lead to unexpected results when there are nested #GstCaps
  * / #GstStructure deeper than one level, you should user
- * gst_structure_serialize() instead for those cases.
+ * gst_structure_serialize_full() instead for those cases.
  *
  * Free-function: g_free
  *
@@ -2213,16 +2224,42 @@ gst_structure_to_string (const GstStructure * structure)
  * GStreamer prior to 1.20 unless #GST_SERIALIZE_FLAG_BACKWARD_COMPAT is passed
  * as @flag.
  *
+ * %GST_SERIALIZE_FLAG_STRICT flags is not allowed because it would make this
+ * function nullable which is an API break for bindings.
+ * Use gst_structure_serialize_full() instead.
+ *
  * Free-function: g_free
  *
  * Returns: (transfer full): a pointer to string allocated by g_malloc().
  *     g_free() after usage.
  *
  * Since: 1.20
+ * Deprecated: Use gst_structure_serialize_full() instead.
  */
 gchar *
 gst_structure_serialize (const GstStructure * structure,
     GstSerializeFlags flags)
+{
+  g_return_val_if_fail ((flags & GST_SERIALIZE_FLAG_STRICT) == 0, NULL);
+  return structure_serialize (structure, flags);
+}
+
+/**
+ * gst_structure_serialize_full:
+ * @structure: a #GstStructure
+ * @flags: The flags to use to serialize structure
+ *
+ * Alias for gst_structure_serialize() but with nullable annotation because it
+ * can return %NULL when %GST_SERIALIZE_FLAG_STRICT flag is set.
+ *
+ * Returns: (transfer full) (nullable): a pointer to string allocated by g_malloc().
+ *     g_free() after usage.
+ *
+ * Since: 1.24
+ */
+gchar *
+gst_structure_serialize_full (const GstStructure * structure,
+    GstSerializeFlags flags)
 {
   return structure_serialize (structure, flags);
 }
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gststructure.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gststructure.h
index d75bbb8f9a2..f4c69a425e9 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gststructure.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gststructure.h
@@ -36,11 +36,23 @@ GST_EXPORT GType _gst_structure_type;
 
 typedef struct _GstStructure GstStructure;
 
+/**
+ * GST_SERIALIZE_FLAG_STRICT:
+ *
+ * Serialization fails if a value cannot be serialized instead of using
+ * placeholder "NULL" value (e.g. pointers, objects).
+ *
+ * Since: 1.24
+ */
+
 /**
  * GstSerializeFlags:
  * @GST_SERIALIZE_FLAG_NONE: No special flags specified.
  * @GST_SERIALIZE_FLAG_BACKWARD_COMPAT: Serialize using the old format for
  *                                      nested structures.
+ * @GST_SERIALIZE_FLAG_STRICT: Serialization fails if a value cannot be
+ *  serialized instead of using placeholder "NULL" value (e.g. pointers,
+ *  objects). (Since 1.24)
  *
  * Since: 1.20
  */
@@ -48,6 +60,7 @@ typedef enum
 {
   GST_SERIALIZE_FLAG_NONE = 0,
   GST_SERIALIZE_FLAG_BACKWARD_COMPAT = (1 << 0),
+  GST_SERIALIZE_FLAG_STRICT = (1 << 1),
 } GstSerializeFlags;
 
 #define GST_TYPE_STRUCTURE             (_gst_structure_type)
@@ -355,9 +368,12 @@ gboolean              gst_structure_get_flags            (const GstStructure  *
 
 GST_API
 gchar *               gst_structure_to_string            (const GstStructure * structure) G_GNUC_MALLOC;
-GST_API
+GST_DEPRECATED_FOR(gst_structure_serialize_full)
 gchar *               gst_structure_serialize            (const GstStructure * structure,
                                                           GstSerializeFlags flags) G_GNUC_MALLOC;
+GST_API
+gchar *               gst_structure_serialize_full       (const GstStructure * structure,
+                                                          GstSerializeFlags flags) G_GNUC_MALLOC;
 
 GST_API
 GstStructure *        gst_structure_from_string  (const gchar * string,
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstsystemclock.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstsystemclock.c
index 3a97ad402ef..482367220b0 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstsystemclock.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstsystemclock.c
@@ -66,6 +66,129 @@
 #include <mach/mach_time.h>
 #endif
 
+#if defined __APPLE__
+static struct mach_timebase_info mach_timebase;
+#endif
+
+#if defined G_OS_WIN32
+static LARGE_INTEGER performance_counter_frequency;
+#endif
+
+/* Small helper to make the atomics below cheaper.
+ *
+ * GLib always uses SEQ_CST atomic ops while here it's more than enough to use
+ * ACQUIRE/RELEASE atomic ops. On x86 / x86-64 the ACQUIRE load is compiling
+ * to a simple memory read.
+ */
+#if defined __APPLE__ || defined G_OS_WIN32
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && !defined(__STDC_NO_ATOMICS__)
+#include <stdatomic.h>
+
+typedef atomic_int gst_atomic_int;
+
+static inline int
+gst_atomic_int_get_acquire (gst_atomic_int * x)
+{
+  return atomic_load_explicit (x, memory_order_acquire);
+}
+
+static inline void
+gst_atomic_int_set_release (gst_atomic_int * x, gint val)
+{
+  atomic_store_explicit (x, val, memory_order_release);
+}
+#elif defined G_OS_WIN32
+/* MSVC's C11 atomic might require special cflags
+ * https://devblogs.microsoft.com/cppblog/c11-atomics-in-visual-studio-2022-version-17-5-preview-2/
+ *
+ * Can remove this code once below GLib MR is merged
+ * https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3436
+ */
+
+typedef LONG gst_atomic_int;
+
+static inline int
+gst_atomic_int_get_acquire (gst_atomic_int * x)
+{
+  return InterlockedAndAcquire (x, 1);
+}
+
+static inline void
+gst_atomic_int_set_release (gst_atomic_int * x, gint val)
+{
+  InterlockedOrRelease (x, 1);
+}
+#else /* defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && !defined(__STDC_NO_ATOMICS__) */
+typedef int gst_atomic_int;
+#define gst_atomic_int_get_acquire(x) g_atomic_int_get(x)
+#define gst_atomic_int_set_release(x, val) g_atomic_int_set(x, val)
+#endif /* defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && !defined(__STDC_NO_ATOMICS__) */
+#endif /* defined __APPLE__ || defined G_OS_WIN32 */
+
+/* priv_gst_clock_init:
+ *
+ * Initialize internal state of the clock. This is safe to call multiple
+ * times.
+ */
+void
+priv_gst_clock_init (void)
+{
+#if defined __APPLE__
+  static gst_atomic_int inited = FALSE;
+
+  if (!gst_atomic_int_get_acquire (&inited)) {
+    mach_timebase_info (&mach_timebase);
+    gst_atomic_int_set_release (&inited, TRUE);
+  }
+#endif
+
+#if defined G_OS_WIN32
+  static gst_atomic_int inited = FALSE;
+
+  if (!gst_atomic_int_get_acquire (&inited)) {
+    QueryPerformanceFrequency (&performance_counter_frequency);
+    gst_atomic_int_set_release (&inited, TRUE);
+  }
+#endif
+}
+
+GstClockTime
+priv_gst_get_monotonic_time (void)
+{
+#if defined __APPLE__
+  guint64 mach_t = mach_absolute_time ();
+  return gst_util_uint64_scale (mach_t, mach_timebase.numer,
+      mach_timebase.denom);
+#elif defined G_OS_WIN32
+  LARGE_INTEGER now;
+  QueryPerformanceCounter (&now);
+
+  return gst_util_uint64_scale (now.QuadPart, GST_SECOND,
+      performance_counter_frequency.QuadPart);
+#elif defined (HAVE_POSIX_TIMERS) && defined(HAVE_MONOTONIC_CLOCK) &&\
+    defined (HAVE_CLOCK_GETTIME)
+  struct timespec now;
+
+  clock_gettime (CLOCK_MONOTONIC, &now);
+  return GST_TIMESPEC_TO_TIME (now);
+#else
+  return g_get_monotonic_time () * 1000;
+#endif
+}
+
+GstClockTime
+priv_gst_get_real_time (void)
+{
+#if defined (HAVE_POSIX_TIMERS) && defined (HAVE_CLOCK_GETTIME)
+  struct timespec now;
+
+  clock_gettime (CLOCK_REALTIME, &now);
+  return GST_TIMESPEC_TO_TIME (now);
+#else
+  return g_get_real_time () * 1000;
+#endif
+}
+
 /* Define this to get some extra debug about jitter from each clock_wait */
 #undef WAIT_DEBUGGING
 
@@ -133,8 +256,12 @@ gst_futex_cond_broadcast (guint * cond_val)
 {
   g_atomic_int_inc (cond_val);
 
-#if defined(__NR_futex_time64)
+#if defined(HAVE_FUTEX_TIME64)
+#if defined(__BIONIC__)
+  if (__builtin_available (android 30, *)) {
+#else
   {
+#endif
     int res;
     res = syscall (__NR_futex_time64, cond_val, (gsize) FUTEX_WAKE_PRIVATE,
         (gsize) INT_MAX, NULL);
@@ -143,7 +270,7 @@ gst_futex_cond_broadcast (guint * cond_val)
      * normal `futex` syscall. This can happen if newer kernel headers are
      * used than the kernel that is actually running.
      */
-#ifdef __NR_futex
+#if defined(HAVE_FUTEX)
     if (res >= 0 || errno != ENOSYS) {
 #else
     {
@@ -153,7 +280,7 @@ gst_futex_cond_broadcast (guint * cond_val)
   }
 #endif
 
-#if defined(__NR_futex)
+#if defined(HAVE_FUTEX)
   syscall (__NR_futex, cond_val, (gsize) FUTEX_WAKE_PRIVATE, (gsize) INT_MAX,
       NULL);
 #endif
@@ -191,8 +318,12 @@ gst_futex_cond_wait_until (guint * cond_val, GMutex * mutex, gint64 end_time)
    * define `__NR_futex_time64`.
    */
 
-#ifdef __NR_futex_time64
+#if defined(HAVE_FUTEX_TIME64)
+#if defined(__BIONIC__)
+  if (__builtin_available (android 30, *)) {
+#else
   {
+#endif
     struct
     {
       gint64 tv_sec;
@@ -212,7 +343,7 @@ gst_futex_cond_wait_until (guint * cond_val, GMutex * mutex, gint64 end_time)
      * normal `futex` syscall. This can happen if newer kernel headers are
      * used than the kernel that is actually running.
      */
-#ifdef __NR_futex
+#if defined(HAVE_FUTEX)
     if (res >= 0 || errno != ENOSYS) {
 #else
     {
@@ -225,7 +356,7 @@ gst_futex_cond_wait_until (guint * cond_val, GMutex * mutex, gint64 end_time)
   }
 #endif
 
-#ifdef __NR_futex
+#if defined(HAVE_FUTEX)
   {
     struct
     {
@@ -306,7 +437,7 @@ gst_pthread_cond_wait_until (pthread_cond_t * cond, pthread_mutex_t * lock,
    * Since this pthreads wants the relative time, convert it back again.
    */
   {
-    gint64 now = g_get_monotonic_time () * 1000;
+    gint64 now = priv_gst_get_monotonic_time ();
     gint64 relative;
 
     if (end_time <= now)
@@ -452,13 +583,6 @@ struct _GstSystemClockPrivate
   GCond entries_changed;
 
   GstClockType clock_type;
-
-#ifdef G_OS_WIN32
-  LARGE_INTEGER frequency;
-#endif                          /* G_OS_WIN32 */
-#ifdef __APPLE__
-  struct mach_timebase_info mach_timebase;
-#endif
 };
 
 #ifdef HAVE_POSIX_TIMERS
@@ -489,10 +613,6 @@ static void gst_system_clock_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
 
 static GstClockTime gst_system_clock_get_internal_time (GstClock * clock);
-#if !defined HAVE_POSIX_TIMERS || !defined HAVE_CLOCK_GETTIME
-static GstClockTime gst_system_clock_get_mono_time (GstSystemClock * clock);
-static GstClockTime gst_system_clock_get_real_time ();
-#endif
 static guint64 gst_system_clock_get_resolution (GstClock * clock);
 static GstClockReturn gst_system_clock_id_wait_jitter (GstClock * clock,
     GstClockEntry * entry, GstClockTimeDiff * jitter);
@@ -557,14 +677,6 @@ gst_system_clock_init (GstSystemClock * clock)
   priv->entries = NULL;
   g_cond_init (&priv->entries_changed);
 
-#ifdef G_OS_WIN32
-  QueryPerformanceFrequency (&priv->frequency);
-#endif /* G_OS_WIN32 */
-
-#ifdef __APPLE__
-  mach_timebase_info (&priv->mach_timebase);
-#endif
-
 #if 0
   /* Uncomment this to start the async clock thread straight away */
   GST_SYSTEM_CLOCK_LOCK (clock);
@@ -915,7 +1027,6 @@ clock_type_to_posix_id (GstClockType clock_type)
 #ifdef HAVE_MONOTONIC_CLOCK
   if (clock_type == GST_CLOCK_TYPE_MONOTONIC)
     return CLOCK_MONOTONIC;
-  else
 #endif
   if (clock_type == GST_CLOCK_TYPE_TAI)
 #ifdef CLOCK_TAI
@@ -933,6 +1044,16 @@ static GstClockTime
 gst_system_clock_get_internal_time (GstClock * clock)
 {
   GstSystemClock *sysclock = GST_SYSTEM_CLOCK_CAST (clock);
+
+  /* For the monotonic and realtime clock, always directly call the specific
+   * helper functions above */
+  if (sysclock->priv->clock_type == GST_CLOCK_TYPE_MONOTONIC)
+    return priv_gst_get_monotonic_time ();
+  else if (sysclock->priv->clock_type == GST_CLOCK_TYPE_REALTIME)
+    return priv_gst_get_real_time ();
+
+  /* If POSIX timers are available, use those for any other clock,
+   * or otherwise return the monotonic time */
 #if defined HAVE_POSIX_TIMERS && defined HAVE_CLOCK_GETTIME
   // BSD and Linux' Posix timers and clock_gettime cover all of the different clock types
   // without need for special handling so we'll use those.
@@ -945,90 +1066,49 @@ gst_system_clock_get_internal_time (GstClock * clock)
     return GST_CLOCK_TIME_NONE;
 
   return GST_TIMESPEC_TO_TIME (ts);
-#else
-  if (sysclock->priv->clock_type == GST_CLOCK_TYPE_REALTIME) {
-    return gst_system_clock_get_real_time ();
-  } else {
-    return gst_system_clock_get_mono_time (sysclock);
-  }
+#else /* !HAVE_POSIX_TIMERS || !HAVE_CLOCK_GETTIME */
+  return priv_gst_get_monotonic_time ();
 #endif /* !HAVE_POSIX_TIMERS || !HAVE_CLOCK_GETTIME */
 }
 
-#if !defined HAVE_POSIX_TIMERS || !defined HAVE_CLOCK_GETTIME
-static GstClockTime
-gst_system_clock_get_real_time ()
-{
-  gint64 rt_micros = g_get_real_time ();
-  // g_get_real_time returns microseconds but we need nanos, so we'll multiply by 1000
-  return ((guint64) rt_micros) * 1000;
-}
-
-static GstClockTime
-gst_system_clock_get_mono_time (GstSystemClock * sysclock)
-{
-#if defined __APPLE__
-  uint64_t mach_t = mach_absolute_time ();
-  return gst_util_uint64_scale (mach_t, sysclock->priv->mach_timebase.numer,
-      sysclock->priv->mach_timebase.denom);
-#else
-#if defined G_OS_WIN32
-  if (sysclock->priv->frequency.QuadPart != 0) {
-    LARGE_INTEGER now;
-
-    /* we prefer the highly accurate performance counters on windows */
-    QueryPerformanceCounter (&now);
-
-    return gst_util_uint64_scale (now.QuadPart,
-        GST_SECOND, sysclock->priv->frequency.QuadPart);
-  } else
-#endif /* G_OS_WIN32 */
-  {
-    gint64 monotime;
-
-    monotime = g_get_monotonic_time ();
-
-    return monotime * 1000;
-  }
-#endif /* __APPLE__ */
-}
-#endif /* !HAVE_POSIX_TIMERS || !HAVE_CLOCK_GETTIME */
-
 static guint64
 gst_system_clock_get_resolution (GstClock * clock)
 {
   GstSystemClock *sysclock = GST_SYSTEM_CLOCK_CAST (clock);
-#if defined __APPLE__ || defined G_OS_WIN32
+
+#if defined G_OS_WIN32
   if (sysclock->priv->clock_type == GST_CLOCK_TYPE_REALTIME) {
     return 1 * GST_USECOND;
-  } else
+  } else {
+    return GST_SECOND / performance_counter_frequency.QuadPart;
+  }
 #endif
+
 #if defined __APPLE__
-  {
+  // On Apple platforms we want to use mach_absolute_time() unconditionally
+  // for the monotonic clock even if clock_gettime() support is available.
+  // Only use the latter for other clock types there.
+  if (sysclock->priv->clock_type == GST_CLOCK_TYPE_MONOTONIC) {
     return gst_util_uint64_scale (GST_NSECOND,
-        sysclock->priv->mach_timebase.numer,
-        sysclock->priv->mach_timebase.denom);
+        mach_timebase.numer, mach_timebase.denom);
   }
-#elif defined G_OS_WIN32
+#endif
+
+#if defined(HAVE_POSIX_TIMERS) && defined(HAVE_CLOCK_GETTIME)
   {
-    if (sysclock->priv->frequency.QuadPart != 0) {
-      return GST_SECOND / sysclock->priv->frequency.QuadPart;
-    } else {
-      return 1 * GST_USECOND;
-    }
-  }
-#elif defined(HAVE_POSIX_TIMERS) && defined(HAVE_CLOCK_GETTIME)
     clockid_t ptype;
-  struct timespec ts;
+    struct timespec ts;
 
-  ptype = clock_type_to_posix_id (sysclock->priv->clock_type);
+    ptype = clock_type_to_posix_id (sysclock->priv->clock_type);
 
-  if (G_UNLIKELY (clock_getres (ptype, &ts)))
-    return GST_CLOCK_TIME_NONE;
+    if (G_UNLIKELY (clock_getres (ptype, &ts)))
+      return GST_CLOCK_TIME_NONE;
 
-  return GST_TIMESPEC_TO_TIME (ts);
-#else
-    return 1 * GST_USECOND;
-#endif /* __APPLE__ */
+    return GST_TIMESPEC_TO_TIME (ts);
+  }
+#endif /* HAVE_POSIX_TIMERS && HAVE_CLOCK_GETTIME */
+
+  return 1 * GST_USECOND;
 }
 
 /* synchronously wait on the given GstClockEntry.
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gsttaglist.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gsttaglist.c
index 456580c7777..222c350223f 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gsttaglist.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gsttaglist.c
@@ -410,7 +410,9 @@ _priv_gst_tag_initialize (void)
   gst_tag_register_static (GST_TAG_PRIVATE_DATA, GST_TAG_FLAG_META,
       GST_TYPE_SAMPLE,
       _("private-data"), _("Private data"), gst_tag_merge_use_first);
-
+  gst_tag_register_static (GST_TAG_CONTAINER_SPECIFIC_TRACK_ID,
+      GST_TAG_FLAG_META, G_TYPE_STRING,
+      _("container-specific-track-id"), _("Container-specific Track ID"), NULL);
 }
 
 /**
@@ -548,7 +550,7 @@ gst_tag_register_static (const gchar * name, GstTagFlag flag, GType type,
     return;
   }
 
-  info = g_slice_new (GstTagInfo);
+  info = g_new (GstTagInfo, 1);
   info->flag = flag;
   info->type = type;
   info->name_quark = g_quark_from_static_string (name);
@@ -692,7 +694,7 @@ gst_tag_list_new_internal (GstStructure * s, GstTagScope scope)
 
   g_assert (s != NULL);
 
-  tag_list = (GstTagList *) g_slice_new (GstTagListImpl);
+  tag_list = (GstTagList *) g_new (GstTagListImpl, 1);
 
   gst_mini_object_init (GST_MINI_OBJECT_CAST (tag_list), 0, GST_TYPE_TAG_LIST,
       (GstMiniObjectCopyFunction) __gst_tag_list_copy, NULL,
@@ -723,7 +725,7 @@ __gst_tag_list_free (GstTagList * list)
   memset (list, 0xff, sizeof (GstTagListImpl));
 #endif
 
-  g_slice_free1 (sizeof (GstTagListImpl), list);
+  g_free (list);
 }
 
 static GstTagList *
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gsttaglist.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gsttaglist.h
index 5c357613b0d..a640837f2de 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gsttaglist.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gsttaglist.h
@@ -1119,6 +1119,18 @@ gboolean  gst_tag_list_take    (GstTagList ** old_taglist,
  */
 #define GST_TAG_PRIVATE_DATA                         "private-data"
 
+/**
+ * GST_TAG_CONTAINER_SPECIFIC_TRACK_ID:
+ *
+ * Unique identifier for the audio, video or text track this tag is associated
+ * with. The mappings for several container formats are defined in the [Sourcing
+ * In-band Media Resource Tracks from Media Containers into HTML
+ * specification](https://dev.w3.org/html5/html-sourcing-inband-tracks/).
+ *
+ * Since: 1.24
+ */
+#define GST_TAG_CONTAINER_SPECIFIC_TRACK_ID "container-specific-track-id"
+
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstTagList, gst_tag_list_unref)
 
 G_END_DECLS
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gsttagsetter.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gsttagsetter.c
index ea54c3574ef..71c73d20a41 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gsttagsetter.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gsttagsetter.c
@@ -108,7 +108,7 @@ gst_tag_data_free (gpointer p)
 
   g_mutex_clear (&data->lock);
 
-  g_slice_free (GstTagData, data);
+  g_free (data);
 }
 
 static GstTagData *
@@ -125,7 +125,7 @@ gst_tag_setter_get_data (GstTagSetter * setter)
 
     data = g_object_get_qdata (G_OBJECT (setter), gst_tag_key);
     if (!data) {
-      data = g_slice_new (GstTagData);
+      data = g_new (GstTagData, 1);
       g_mutex_init (&data->lock);
       data->list = NULL;
       data->mode = GST_TAG_MERGE_KEEP;
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gsttask.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gsttask.c
index da8182014a0..c1356450844 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gsttask.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gsttask.c
@@ -89,6 +89,21 @@ GST_DEBUG_CATEGORY_STATIC (task_debug);
 #define SET_TASK_STATE(t,s) (g_atomic_int_set (&GST_TASK_STATE(t), (s)))
 #define GET_TASK_STATE(t)   ((GstTaskState) g_atomic_int_get (&GST_TASK_STATE(t)))
 
+static const char *
+task_state_to_string (GstTaskState state)
+{
+  switch (state) {
+    case GST_TASK_STARTED:
+      return "started";
+    case GST_TASK_PAUSED:
+      return "paused";
+    case GST_TASK_STOPPED:
+      return "stopped";
+    default:
+      return "(unknown)";
+  }
+}
+
 struct _GstTaskPrivate
 {
   /* callbacks for managing the thread of this task */
@@ -162,7 +177,7 @@ gst_task_win32_load_library (void)
   }
 #endif
 
-  return ! !SetThreadDescriptionFunc;
+  return !!SetThreadDescriptionFunc;
 }
 
 static gboolean
@@ -726,7 +741,8 @@ gst_task_set_state_unlocked (GstTask * task, GstTaskState state)
   GstTaskState old;
   gboolean res = TRUE;
 
-  GST_DEBUG_OBJECT (task, "Changing task %p to state %d", task, state);
+  GST_DEBUG_OBJECT (task, "Changing task %p to state %s", task,
+      task_state_to_string (state));
 
   if (state != GST_TASK_STOPPED)
     if (G_UNLIKELY (GST_TASK_GET_LOCK (task) == NULL))
@@ -759,8 +775,10 @@ gst_task_set_state_unlocked (GstTask * task, GstTaskState state)
   /* ERRORS */
 no_lock:
   {
-    GST_WARNING_OBJECT (task, "state %d set on task without a lock", state);
-    g_warning ("task without a lock can't be set to state %d", state);
+    GST_WARNING_OBJECT (task, "state %s set on task without a lock",
+        task_state_to_string (state));
+    g_warning ("task without a lock can't be set to state %s",
+        task_state_to_string (state));
     return FALSE;
   }
 }
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gsttaskpool.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gsttaskpool.c
index 3116cc7c678..020a1d2db38 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gsttaskpool.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gsttaskpool.c
@@ -65,7 +65,7 @@ default_func (TaskData * tdata, GstTaskPool * pool)
 
   func = tdata->func;
   user_data = tdata->user_data;
-  g_slice_free (TaskData, tdata);
+  g_free (tdata);
 
   func (user_data);
 }
@@ -102,7 +102,7 @@ default_push (GstTaskPool * pool, GstTaskPoolFunction func,
 {
   TaskData *tdata;
 
-  tdata = g_slice_new (TaskData);
+  tdata = g_new (TaskData, 1);
   tdata->func = func;
   tdata->user_data = user_data;
 
@@ -110,10 +110,9 @@ default_push (GstTaskPool * pool, GstTaskPoolFunction func,
   if (pool->pool)
     g_thread_pool_push (pool->pool, tdata, error);
   else {
-    g_slice_free (TaskData, tdata);
+    g_free (tdata);
     g_set_error_literal (error, GST_CORE_ERROR, GST_CORE_ERROR_FAILED,
         "No thread pool");
-
   }
   GST_OBJECT_UNLOCK (pool);
 
@@ -349,7 +348,7 @@ shared_task_data_unref (SharedTaskData * tdata)
   if (g_atomic_int_dec_and_test (&tdata->refcount)) {
     g_mutex_clear (&tdata->done_lock);
     g_cond_clear (&tdata->done_cond);
-    g_slice_free (SharedTaskData, tdata);
+    g_free (tdata);
   }
 }
 
@@ -389,7 +388,7 @@ shared_push (GstTaskPool * pool, GstTaskPoolFunction func,
     goto done;
   }
 
-  ret = g_slice_new (SharedTaskData);
+  ret = g_new (SharedTaskData, 1);
 
   ret->done = FALSE;
   ret->func = func;
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gsttoc.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gsttoc.c
index 7e8ba17be50..bee32244872 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gsttoc.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gsttoc.c
@@ -140,7 +140,7 @@ gst_toc_new (GstTocScope scope)
   g_return_val_if_fail (scope == GST_TOC_SCOPE_GLOBAL ||
       scope == GST_TOC_SCOPE_CURRENT, NULL);
 
-  toc = g_slice_new0 (GstToc);
+  toc = g_new0 (GstToc, 1);
 
   gst_mini_object_init (GST_MINI_OBJECT_CAST (toc), 0, GST_TYPE_TOC,
       (GstMiniObjectCopyFunction) gst_toc_copy, NULL,
@@ -269,7 +269,7 @@ gst_toc_entry_new_internal (GstTocEntryType type, const gchar * uid)
 {
   GstTocEntry *entry;
 
-  entry = g_slice_new0 (GstTocEntry);
+  entry = g_new0 (GstTocEntry, 1);
 
   gst_mini_object_init (GST_MINI_OBJECT_CAST (entry), 0, GST_TYPE_TOC_ENTRY,
       (GstMiniObjectCopyFunction) gst_toc_entry_copy, NULL,
@@ -313,7 +313,7 @@ gst_toc_free (GstToc * toc)
   memset (toc, 0xff, sizeof (GstToc));
 #endif
 
-  g_slice_free (GstToc, toc);
+  g_free (toc);
 }
 
 static void
@@ -333,7 +333,7 @@ gst_toc_entry_free (GstTocEntry * entry)
   memset (entry, 0xff, sizeof (GstTocEntry));
 #endif
 
-  g_slice_free (GstTocEntry, entry);
+  g_free (entry);
 }
 
 static GstTocEntry *
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gsttocsetter.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gsttocsetter.c
index c746f23f0d2..5be2a0ba271 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gsttocsetter.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gsttocsetter.c
@@ -78,7 +78,7 @@ gst_toc_data_free (gpointer p)
 
   g_mutex_clear (&data->lock);
 
-  g_slice_free (GstTocData, data);
+  g_free (data);
 }
 
 static GstTocData *
@@ -94,7 +94,7 @@ gst_toc_setter_get_data (GstTocSetter * setter)
     g_mutex_lock (&create_mutex);
     data = g_object_get_qdata (G_OBJECT (setter), gst_toc_key);
     if (!data) {
-      data = g_slice_new (GstTocData);
+      data = g_new (GstTocData, 1);
       g_mutex_init (&data->lock);
       data->toc = NULL;
       g_object_set_qdata_full (G_OBJECT (setter), gst_toc_key, data,
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gsttracerutils.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gsttracerutils.c
index ba9a826b101..eccf6602a38 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gsttracerutils.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gsttracerutils.c
@@ -169,7 +169,7 @@ _priv_gst_tracing_deinit (void)
     for (t_node = h_node->data; t_node; t_node = g_list_next (t_node)) {
       hook = (GstTracerHook *) t_node->data;
       gst_object_unref (hook->tracer);
-      g_slice_free (GstTracerHook, hook);
+      g_free (hook);
     }
     g_list_free (h_node->data);
   }
@@ -183,7 +183,7 @@ gst_tracing_register_hook_id (GstTracer * tracer, GQuark detail, GCallback func)
 {
   gpointer key = GINT_TO_POINTER (detail);
   GList *list = g_hash_table_lookup (_priv_tracers, key);
-  GstTracerHook *hook = g_slice_new0 (GstTracerHook);
+  GstTracerHook *hook = g_new0 (GstTracerHook, 1);
   hook->tracer = gst_object_ref (tracer);
   hook->func = func;
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gsturi.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gsturi.c
index 32eac43d007..973428d4230 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gsturi.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gsturi.c
@@ -564,8 +564,12 @@ search_by_entry (GstPluginFeature * feature, gpointer search_entry)
 static gint
 sort_by_rank (GstPluginFeature * first, GstPluginFeature * second)
 {
-  return gst_plugin_feature_get_rank (second) -
+  int diff = gst_plugin_feature_get_rank (second) -
       gst_plugin_feature_get_rank (first);
+  if (diff == 0)
+    diff = g_strcmp0 (gst_plugin_feature_get_name (first),
+        gst_plugin_feature_get_name (second));
+  return diff;
 }
 
 static GList *
@@ -1004,7 +1008,7 @@ _gst_uri_new (void)
 
   g_return_val_if_fail (gst_is_initialized (), NULL);
 
-  uri = GST_URI_CAST (g_slice_new0 (GstUri));
+  uri = g_new0 (GstUri, 1);
 
   if (uri)
     gst_mini_object_init (GST_MINI_OBJECT_CAST (uri), 0, gst_uri_get_type (),
@@ -1031,7 +1035,7 @@ _gst_uri_free (GstUri * uri)
   memset (uri, 0xff, sizeof (*uri));
 #endif
 
-  g_slice_free1 (sizeof (*uri), uri);
+  g_free (uri);
 }
 
 static GHashTable *
@@ -1994,10 +1998,13 @@ gst_uri_make_writable (GstUri * uri)
 }
 
 /**
- * gst_uri_to_string:
- * @uri: This #GstUri to convert to a string.
+ * gst_uri_to_string_with_keys:
+ * @uri: (nullable): This #GstUri to convert to a string.
+ * @keys: (transfer none) (nullable) (element-type utf8): A GList containing
+ *   the query argument key strings.
  *
- * Convert the URI to a string.
+ * Convert the URI to a string, with the query arguments in a specific order.
+ * Only the keys in the @keys list will be added to the resulting string.
  *
  * Returns the URI as held in this object as a #gchar* nul-terminated string.
  * The caller should g_free() the string once they are finished with it.
@@ -2005,10 +2012,10 @@ gst_uri_make_writable (GstUri * uri)
  *
  * Returns: (transfer full): The string version of the URI.
  *
- * Since: 1.6
+ * Since: 1.24
  */
 gchar *
-gst_uri_to_string (const GstUri * uri)
+gst_uri_to_string_with_keys (const GstUri * uri, const GList * keys)
 {
   GString *uri_str;
   gchar *escaped;
@@ -2052,10 +2059,15 @@ gst_uri_to_string (const GstUri * uri)
   }
 
   if (uri->query) {
-    g_string_append (uri_str, "?");
-    escaped = gst_uri_get_query_string (uri);
-    g_string_append (uri_str, escaped);
-    g_free (escaped);
+    if (keys != NULL)
+      escaped = gst_uri_get_query_string_ordered (uri, keys);
+    else
+      escaped = gst_uri_get_query_string (uri);
+    if (escaped) {
+      g_string_append (uri_str, "?");
+      g_string_append (uri_str, escaped);
+      g_free (escaped);
+    }
   }
 
   if (uri->fragment != NULL) {
@@ -2067,6 +2079,26 @@ gst_uri_to_string (const GstUri * uri)
   return g_string_free (uri_str, FALSE);
 }
 
+/**
+ * gst_uri_to_string:
+ * @uri: This #GstUri to convert to a string.
+ *
+ * Convert the URI to a string.
+ *
+ * Returns the URI as held in this object as a #gchar* nul-terminated string.
+ * The caller should g_free() the string once they are finished with it.
+ * The string is put together as described in RFC 3986.
+ *
+ * Returns: (transfer full): The string version of the URI.
+ *
+ * Since: 1.6
+ */
+gchar *
+gst_uri_to_string (const GstUri * uri)
+{
+  return gst_uri_to_string_with_keys (uri, NULL);
+}
+
 /**
  * gst_uri_is_normalized:
  * @uri: (nullable): The #GstUri to test to see if it is normalized.
@@ -2636,6 +2668,67 @@ gst_uri_set_query_string (GstUri * uri, const gchar * query)
   return TRUE;
 }
 
+/**
+ * gst_uri_get_query_string_ordered:
+ * @uri: (nullable): The #GstUri to get the query string from.
+ * @keys: (transfer none) (nullable) (element-type utf8): A GList containing the
+ *   query argument key strings.
+ *
+ * Get a percent encoded URI query string from the @uri, with query parameters
+ * in the order provided by the @keys list. Only parameter keys in the list will
+ * be added to the resulting URI string. This method can be used by retrieving
+ * the keys with gst_uri_get_query_keys() and then sorting the list, for
+ * example.
+ *
+ * Returns: (transfer full) (nullable): A percent encoded query string. Use
+ * g_free() when no longer needed.
+ *
+ * Since: 1.24
+ */
+gchar *
+gst_uri_get_query_string_ordered (const GstUri * uri, const GList * keys)
+{
+  const gchar *sep = "";
+  gchar *escaped;
+  GString *ret = NULL;
+  const GList *key;
+
+  if (!uri)
+    return NULL;
+  g_return_val_if_fail (GST_IS_URI (uri), NULL);
+  if (!uri->query)
+    return NULL;
+
+  for (key = keys; key; key = key->next) {
+    const gchar *query_key = key->data;
+    const gchar *arg;
+
+    /* Key isn't present, skip */
+    if (!g_hash_table_contains (uri->query, query_key))
+      continue;
+
+    if (ret == NULL)
+      ret = g_string_new (NULL);
+
+    /* Append the key */
+    g_string_append (ret, sep);
+    escaped = _gst_uri_escape_http_query_element (query_key);
+    g_string_append (ret, escaped);
+    g_free (escaped);
+
+    if ((arg = g_hash_table_lookup (uri->query, query_key))) {
+      /* Append the argument */
+      escaped = _gst_uri_escape_http_query_element (arg);
+      g_string_append_printf (ret, "=%s", escaped);
+      g_free (escaped);
+    }
+    sep = "&";
+  }
+
+  /* If no keys were seen, return NULL string instead of empty string */
+  return ret ? g_string_free (ret, FALSE) : NULL;
+}
+
 /**
  * gst_uri_get_query_table:
  * @uri: (nullable): The #GstUri to get the query table from.
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gsturi.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gsturi.h
index 0ae305fa7b2..2c4f16c6a00 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gsturi.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gsturi.h
@@ -259,6 +259,9 @@ GstUri * gst_uri_make_writable         (GstUri * uri) G_GNUC_WARN_UNUSED_RESULT;
 GST_API
 gchar *  gst_uri_to_string             (const GstUri * uri) G_GNUC_MALLOC;
 
+GST_API
+gchar * gst_uri_to_string_with_keys    (const GstUri * uri, const GList *keys);
+
 GST_API
 gboolean gst_uri_is_normalized         (const GstUri * uri);
 
@@ -316,6 +319,9 @@ gboolean gst_uri_append_path_segment   (GstUri * uri,
 GST_API
 gchar * gst_uri_get_query_string       (const GstUri * uri);
 
+GST_API
+gchar * gst_uri_get_query_string_ordered (const GstUri * uri, const GList *keys);
+
 GST_API
 gboolean gst_uri_set_query_string      (GstUri * uri, const gchar * query);
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstutils.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstutils.c
index 24ee5749646..fc135cd5642 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstutils.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstutils.c
@@ -3546,15 +3546,12 @@ gst_parse_bin_from_description_full (const gchar * bin_description,
 GstClockTime
 gst_util_get_timestamp (void)
 {
-#if defined (HAVE_POSIX_TIMERS) && defined(HAVE_MONOTONIC_CLOCK) &&\
-    defined (HAVE_CLOCK_GETTIME)
-  struct timespec now;
-
-  clock_gettime (CLOCK_MONOTONIC, &now);
-  return GST_TIMESPEC_TO_TIME (now);
+#if defined(G_OS_WIN32) && !defined(GST_STATIC_COMPILATION)
+  /* priv_gst_clock_init() is called in DllMain */
 #else
-  return g_get_monotonic_time () * 1000;
+  priv_gst_clock_init ();
 #endif
+  return priv_gst_get_monotonic_time ();
 }
 
 /**
@@ -3694,6 +3691,73 @@ gst_util_greatest_common_divisor_int64 (gint64 a, gint64 b)
   return ABS (a);
 }
 
+/**
+ * gst_util_simplify_fraction:
+ * @numerator: First value as #gint
+ * @denominator: Second value as #gint
+ * @n_terms: non-significative terms (typical value: 8)
+ * @threshold: threshold (typical value: 333)
+ *
+ * Calculates the simpler representation of @numerator and @denominator and
+ * update both values with the resulting simplified fraction.
+ *
+ * Simplify a fraction using a simple continued fraction decomposition.
+ * The idea here is to convert fractions such as 333333/10000000 to 1/30
+ * using 32 bit arithmetic only. The algorithm is not perfect and relies
+ * upon two arbitrary parameters to remove non-significative terms from
+ * the simple continued fraction decomposition. Using 8 and 333 for
+ * @n_terms and @threshold respectively seems to give nice results.
+ *
+ * Since: 1.24
+ */
+void
+gst_util_simplify_fraction (gint * numerator, gint * denominator,
+    guint n_terms, guint threshold)
+{
+  guint *an;
+  guint x, y, r;
+  guint i, n;
+
+  an = g_malloc_n (n_terms, sizeof (*an));
+  if (an == NULL)
+    return;
+
+  /*
+   * Convert the fraction to a simple continued fraction. See
+   * https://en.wikipedia.org/wiki/Continued_fraction
+   * Stop if the current term is bigger than or equal to the given
+   * threshold.
+   */
+  x = *numerator;
+  y = *denominator;
+
+  for (n = 0; n < n_terms && y != 0; ++n) {
+    an[n] = x / y;
+    if (an[n] >= threshold) {
+      if (n < 2)
+        n++;
+      break;
+    }
+
+    r = x - an[n] * y;
+    x = y;
+    y = r;
+  }
+
+  /* Expand the simple continued fraction back to an integer fraction. */
+  x = 0;
+  y = 1;
+
+  for (i = n; i > 0; --i) {
+    r = y;
+    y = an[i - 1] * y + x;
+    x = r;
+  }
+
+  *numerator = y;
+  *denominator = x;
+  g_free (an);
+}
 
 /**
  * gst_util_fraction_to_double:
@@ -3991,28 +4055,16 @@ gst_util_fraction_compare (gint a_n, gint a_d, gint b_n, gint b_d)
 }
 
 static gchar *
-gst_pad_create_stream_id_internal (GstPad * pad, GstElement * parent,
+gst_element_decorate_stream_id_internal (GstElement * element,
     const gchar * stream_id)
 {
   GstEvent *upstream_event;
   gchar *upstream_stream_id = NULL, *new_stream_id;
   GstPad *sinkpad;
 
-  g_return_val_if_fail (GST_IS_PAD (pad), NULL);
-  g_return_val_if_fail (GST_PAD_IS_SRC (pad), NULL);
-  g_return_val_if_fail (GST_IS_ELEMENT (parent), NULL);
-
-  g_return_val_if_fail (parent->numsinkpads <= 1, NULL);
-
-  /* If the element has multiple source pads it must
-   * provide a stream-id for every source pad, otherwise
-   * all source pads will have the same and are not
-   * distinguishable */
-  g_return_val_if_fail (parent->numsrcpads <= 1 || stream_id, NULL);
-
   /* First try to get the upstream stream-start stream-id from the sinkpad.
    * This will only work for non-source elements */
-  sinkpad = gst_element_get_static_pad (parent, "sink");
+  sinkpad = gst_element_get_static_pad (element, "sink");
   if (sinkpad) {
     upstream_event =
         gst_pad_get_sticky_event (sinkpad, GST_EVENT_STREAM_START, 0);
@@ -4036,7 +4088,7 @@ gst_pad_create_stream_id_internal (GstPad * pad, GstElement * parent,
     /* Try to generate one from the URI query and
      * if it fails take a random number instead */
     query = gst_query_new_uri ();
-    if (gst_element_query (parent, query)) {
+    if (gst_element_query (element, query)) {
       gst_query_parse_uri (query, &uri);
     }
 
@@ -4051,7 +4103,7 @@ gst_pad_create_stream_id_internal (GstPad * pad, GstElement * parent,
       g_checksum_free (cs);
     } else {
       /* Just get some random number if the URI query fails */
-      GST_FIXME_OBJECT (pad, "Creating random stream-id, consider "
+      GST_FIXME_OBJECT (element, "Creating random stream-id, consider "
           "implementing a deterministic way of creating a stream-id");
       upstream_stream_id =
           g_strdup_printf ("%08x%08x%08x%08x", g_random_int (), g_random_int (),
@@ -4072,6 +4124,139 @@ gst_pad_create_stream_id_internal (GstPad * pad, GstElement * parent,
   return new_stream_id;
 }
 
+/**
+ * gst_element_decorate_stream_id_printf_valist:
+ * @element: The  #GstElement to create a stream-id for
+ * @format: (not nullable): The stream-id
+ * @var_args: parameters for the @format string
+ *
+ * Creates a stream-id for @element by combining the upstream information with
+ * the @format.
+ *
+ * This function generates an unique stream-id by getting the upstream
+ * stream-start event stream ID and appending @format to it. If the element
+ * has no sinkpad it will generate an upstream stream-id by doing an URI query
+ * on the element and in the worst case just uses a random number. Source
+ * elements that don't implement the URI handler interface should ideally
+ * generate a unique, deterministic stream-id manually instead.
+ *
+ * Since stream IDs are sorted alphabetically, any numbers in the stream ID
+ * should be printed with a fixed number of characters, preceded by 0's, such as
+ * by using the format \%03u instead of \%u.
+ *
+ * Returns: (transfer full): A stream-id for @element.
+ *
+ * Since: 1.24
+ */
+gchar *
+gst_element_decorate_stream_id_printf_valist (GstElement * element,
+    const gchar * format, va_list var_args)
+{
+  gchar *stream_id, *res;
+
+  g_return_val_if_fail (format, NULL);
+
+  stream_id = g_strdup_vprintf (format, var_args);
+
+  res = gst_element_decorate_stream_id_internal (element, stream_id);
+
+  g_free (stream_id);
+
+  return res;
+}
+
+/**
+ * gst_element_decorate_stream_id_printf:
+ * @element: The  #GstElement to create a stream-id for
+ * @format: (not nullable): The stream-id
+ *
+ * Creates a stream-id for @element by combining the upstream information with
+ * the @format.
+ *
+ * This function generates an unique stream-id by getting the upstream
+ * stream-start event stream ID and appending the stream-id to it. If the element
+ * has no sinkpad it will generate an upstream stream-id by doing an URI query
+ * on the element and in the worst case just uses a random number. Source
+ * elements that don't implement the URI handler interface should ideally
+ * generate a unique, deterministic stream-id manually instead.
+ *
+ * Since stream IDs are sorted alphabetically, any numbers in the stream ID
+ * should be printed with a fixed number of characters, preceded by 0's, such as
+ * by using the format \%03u instead of \%u.
+ *
+ * Returns: (transfer full): A stream-id for @element.
+ *
+ * Since: 1.24
+ */
+gchar *
+gst_element_decorate_stream_id_printf (GstElement * element,
+    const gchar * format, ...)
+{
+  gchar *res;
+  va_list var_args;
+
+  g_return_val_if_fail (format, NULL);
+
+  va_start (var_args, format);
+  res =
+      gst_element_decorate_stream_id_printf_valist (element, format, var_args);
+  va_end (var_args);
+
+  return res;
+}
+
+
+/**
+ * gst_element_decorate_stream_id:
+ * @element: The  #GstElement to create a stream-id for
+ * @stream_id: (not nullable): The stream-id
+ *
+ * Creates a stream-id for @element by combining the upstream information with
+ * the @stream_id.
+ *
+ * This function generates an unique stream-id by getting the upstream
+ * stream-start event stream ID and appending @stream_id to it. If the element
+ * has no sinkpad it will generate an upstream stream-id by doing an URI query
+ * on the element and in the worst case just uses a random number. Source
+ * elements that don't implement the URI handler interface should ideally
+ * generate a unique, deterministic stream-id manually instead.
+ *
+ * Since stream IDs are sorted alphabetically, any numbers in the stream ID
+ * should be printed with a fixed number of characters, preceded by 0's, such as
+ * by using the format \%03u instead of \%u.
+ *
+ * Returns: (transfer full): A stream-id for @element.
+ *
+ * Since: 1.24
+ */
+gchar *
+gst_element_decorate_stream_id (GstElement * element, const gchar * stream_id)
+{
+  g_return_val_if_fail (stream_id, NULL);
+  g_return_val_if_fail (GST_IS_ELEMENT (element), NULL);
+
+  return gst_element_decorate_stream_id_internal (element, stream_id);
+}
+
+static gchar *
+gst_pad_create_stream_id_internal (GstPad * pad, GstElement * parent,
+    const gchar * stream_id)
+{
+  g_return_val_if_fail (GST_IS_PAD (pad), NULL);
+  g_return_val_if_fail (GST_PAD_IS_SRC (pad), NULL);
+  g_return_val_if_fail (GST_IS_ELEMENT (parent), NULL);
+
+  g_return_val_if_fail (parent->numsinkpads <= 1, NULL);
+
+  /* If the element has multiple source pads it must
+   * provide a stream-id for every source pad, otherwise
+   * all source pads will have the same and are not
+   * distinguishable */
+  g_return_val_if_fail (parent->numsrcpads <= 1 || stream_id, NULL);
+
+  return gst_element_decorate_stream_id_internal (parent, stream_id);
+}
+
 /**
  * gst_pad_create_stream_id_printf_valist:
  * @pad: A source #GstPad
@@ -4306,6 +4491,42 @@ gst_log2 (GstClockTime in)
   return count;
 }
 
+#ifndef GSTREAMER_LITE
+/**
+ * gst_util_ceil_log2:
+ * @v: a #guint32 value.
+ *
+ * Return a max num of log2.
+ *
+ * Returns: a computed #guint val.
+ *
+ * Since: 1.24
+ */
+guint
+gst_util_ceil_log2 (guint32 v)
+{
+  /* Compute Ceil(Log2(v)) */
+  /* Derived from branchless code for integer log2(v) from:
+     <http://graphics.stanford.edu/~seander/bithacks.html#IntegerLog> */
+  guint r, shift;
+
+  v--;
+  r = (v > 0xFFFF) << 4;
+  v >>= r;
+  shift = (v > 0xFF) << 3;
+  v >>= shift;
+  r |= shift;
+  shift = (v > 0xF) << 2;
+  v >>= shift;
+  r |= shift;
+  shift = (v > 0x3) << 1;
+  v >>= shift;
+  r |= shift;
+  r |= (v >> 1);
+  return r + 1;
+}
+#endif // GSTREAMER_LITE
+
 /**
  * gst_calculate_linear_regression: (skip)
  * @xy: Pairs of (x,y) values
@@ -4591,7 +4812,7 @@ gboolean
 gst_type_is_plugin_api (GType type, GstPluginAPIFlags * flags)
 {
   gboolean ret =
-      ! !GPOINTER_TO_INT (g_type_get_qdata (type, GST_QUARK (PLUGIN_API)));
+      !!GPOINTER_TO_INT (g_type_get_qdata (type, GST_QUARK (PLUGIN_API)));
 
   if (ret && flags) {
     *flags =
@@ -4600,3 +4821,41 @@ gst_type_is_plugin_api (GType type, GstPluginAPIFlags * flags)
 
   return ret;
 }
+
+#ifndef GSTREAMER_LITE
+/**
+ * gst_util_filename_compare:
+ * @a: (type filename): a filename to compare with @b
+ * @b: (type filename): a filename to compare with @a
+ *
+ * Compares the given filenames using natural ordering.
+ *
+ * Since: 1.24
+ */
+gint
+gst_util_filename_compare (const gchar * a, const gchar * b)
+{
+  gchar *a_utf8, *b_utf8;
+  gchar *a1, *b1;
+  gint ret;
+
+  /* Filenames in GLib are only guaranteed to be UTF-8 on Windows */
+  a_utf8 = g_filename_to_utf8 (a, -1, NULL, NULL, NULL);
+  b_utf8 = g_filename_to_utf8 (b, -1, NULL, NULL, NULL);
+
+  if (a_utf8 == NULL || b_utf8 == NULL) {
+    return strcmp (a, b);
+  }
+
+  a1 = g_utf8_collate_key_for_filename (a_utf8, -1);
+  b1 = g_utf8_collate_key_for_filename (b_utf8, -1);
+  ret = strcmp (a1, b1);
+  g_free (a1);
+  g_free (b1);
+
+  g_free (a_utf8);
+  g_free (b_utf8);
+
+  return ret;
+}
+#endif // GSTREAMER_LITE
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstutils.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstutils.h
index b88539d8c6b..f183b08f730 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstutils.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstutils.h
@@ -1034,6 +1034,17 @@ gboolean                gst_element_seek_simple         (GstElement   *element,
                                                          GstSeekFlags  seek_flags,
                                                          gint64        seek_pos);
 
+GST_API
+gchar *                 gst_element_decorate_stream_id  (GstElement   *element,
+                                                         const gchar  *stream_id);
+GST_API
+gchar *   gst_element_decorate_stream_id_printf_valist  (GstElement * element,
+                                                         const gchar * format,
+                                                         va_list var_args) G_GNUC_PRINTF (2, 0) G_GNUC_MALLOC;
+GST_API
+gchar *          gst_element_decorate_stream_id_printf  (GstElement * element,
+                                                         const gchar * format,
+                                                         ...) G_GNUC_PRINTF (2, 3) G_GNUC_MALLOC;
 /* util elementfactory functions */
 
 GST_API
@@ -1197,6 +1208,10 @@ gint          gst_util_greatest_common_divisor  (gint a, gint b);
 GST_API
 gint64        gst_util_greatest_common_divisor_int64 (gint64 a, gint64 b);
 
+GST_API
+void          gst_util_simplify_fraction        (gint *numerator, gint *denominator,
+                                                 guint n_terms, guint threshold);
+
 GST_API
 void          gst_util_fraction_to_double       (gint src_n, gint src_d, gdouble *dest);
 
@@ -1225,6 +1240,14 @@ void          gst_type_mark_as_plugin_api       (GType type, GstPluginAPIFlags f
 GST_API
 gboolean      gst_type_is_plugin_api            (GType type, GstPluginAPIFlags *flags);
 
+#ifndef GSTREAMER_LITE
+GST_API
+guint         gst_util_ceil_log2                (guint32 v);
+
+GST_API
+gint          gst_util_filename_compare        (const gchar *a, const gchar *b);
+#endif // GSTREAMER_LITE
+
 G_END_DECLS
 
 #endif /* __GST_UTILS_H__ */
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstvalue.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstvalue.c
index 754aa558f33..f3635ca0261 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstvalue.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstvalue.c
@@ -369,7 +369,8 @@ _priv_gst_value_serialize_any_list (const GValue * value, const gchar * begin,
       s_val = gst_value_serialize (v);
     } else {
       if (GST_VALUE_HOLDS_STRUCTURE (v))
-        s_val = gst_structure_serialize (gst_value_get_structure (v), flags);
+        s_val =
+            gst_structure_serialize_full (gst_value_get_structure (v), flags);
       else if (GST_VALUE_HOLDS_CAPS (v))
         s_val = gst_caps_serialize (gst_value_get_caps (v), flags);
     }
@@ -1529,7 +1530,7 @@ gst_value_deserialize_int_range (GValue * dest, const gchar * s)
 static void
 gst_value_init_int64_range (GValue * value)
 {
-  gint64 *vals = g_slice_alloc0 (3 * sizeof (gint64));
+  gint64 *vals = g_malloc0 (3 * sizeof (gint64));
   value->data[0].v_pointer = vals;
   INT64_RANGE_MIN (value) = 0;
   INT64_RANGE_MAX (value) = 0;
@@ -1540,7 +1541,7 @@ static void
 gst_value_free_int64_range (GValue * value)
 {
   g_return_if_fail (GST_VALUE_HOLDS_INT64_RANGE (value));
-  g_slice_free1 (3 * sizeof (gint64), value->data[0].v_pointer);
+  g_free (value->data[0].v_pointer);
   value->data[0].v_pointer = NULL;
 }
 
@@ -1915,7 +1916,7 @@ gst_value_init_fraction_range (GValue * value)
 
   ftype = GST_TYPE_FRACTION;
 
-  value->data[0].v_pointer = vals = g_slice_alloc0 (2 * sizeof (GValue));
+  value->data[0].v_pointer = vals = g_malloc0 (2 * sizeof (GValue));
   g_value_init (&vals[0], ftype);
   g_value_init (&vals[1], ftype);
 }
@@ -1929,7 +1930,7 @@ gst_value_free_fraction_range (GValue * value)
     /* we know the two values contain fractions without internal allocs */
     /* g_value_unset (&vals[0]); */
     /* g_value_unset (&vals[1]); */
-    g_slice_free1 (2 * sizeof (GValue), vals);
+    g_free (vals);
     value->data[0].v_pointer = NULL;
   }
 }
@@ -4810,6 +4811,104 @@ gst_value_union_structure_structure (GValue * dest, const GValue * src1,
   return ret;
 }
 
+static gboolean
+gst_value_union_fraction_fraction_range (GValue * dest, const GValue * src1,
+    const GValue * src2)
+{
+  GValue *vals;
+  int f_n, f_d, fr_start_n, fr_start_d, fr_end_n, fr_end_d;
+
+  g_return_val_if_fail (GST_VALUE_HOLDS_FRACTION (src1), FALSE);
+  g_return_val_if_fail (GST_VALUE_HOLDS_FRACTION_RANGE (src2), FALSE);
+
+  /* Fraction */
+  f_n = src1->data[0].v_int;
+  f_d = src1->data[1].v_int;
+
+  vals = src2->data[0].v_pointer;
+  /* Fraction range start */
+  fr_start_n = vals[0].data[0].v_int;
+  fr_start_d = vals[0].data[1].v_int;
+  /* Fraction range end */
+  fr_end_n = vals[1].data[0].v_int;
+  fr_end_d = vals[1].data[1].v_int;
+
+  /* Check if it's already in the range. This is the only case in which we can
+   * successfully perform a union. */
+  if (gst_util_fraction_compare (f_n, f_d, fr_start_n, fr_start_d) >= 0 &&
+      gst_util_fraction_compare (f_n, f_d, fr_end_n, fr_end_d) <= 0) {
+    if (dest)
+      gst_value_init_and_copy (dest, src2);
+    return TRUE;
+  }
+
+  return FALSE;
+}
+
+static gboolean
+gst_value_union_fraction_range_fraction_range (GValue * dest,
+    const GValue * src1, const GValue * src2)
+{
+  GValue *vals1, *vals2;
+  int fr1_start_n, fr1_start_d, fr1_end_n, fr1_end_d;
+  int fr2_start_n, fr2_start_d, fr2_end_n, fr2_end_d;
+  int fr_start_n, fr_start_d, fr_end_n, fr_end_d;
+
+  g_return_val_if_fail (GST_VALUE_HOLDS_FRACTION_RANGE (src1), FALSE);
+  g_return_val_if_fail (GST_VALUE_HOLDS_FRACTION_RANGE (src2), FALSE);
+
+  vals1 = src1->data[0].v_pointer;
+  g_return_val_if_fail (vals1 != NULL, FALSE);
+
+  fr1_start_n = vals1[0].data[0].v_int;
+  fr1_start_d = vals1[0].data[1].v_int;
+  fr1_end_n = vals1[1].data[0].v_int;
+  fr1_end_d = vals1[1].data[1].v_int;
+
+  vals2 = src2->data[0].v_pointer;
+  g_return_val_if_fail (vals2 != NULL, FALSE);
+
+  fr2_start_n = vals2[0].data[0].v_int;
+  fr2_start_d = vals2[0].data[1].v_int;
+  fr2_end_n = vals2[1].data[0].v_int;
+  fr2_end_d = vals2[1].data[1].v_int;
+
+  /* Ranges are completely disjoint: end of one range is less than the start of
+   * other range */
+  if (gst_util_fraction_compare (fr2_end_n, fr2_end_d, fr1_start_n,
+          fr1_start_d) < 0
+      || gst_util_fraction_compare (fr1_end_n, fr1_end_d, fr2_start_n,
+          fr2_start_d) < 0)
+    return FALSE;
+
+  /* Ranges overlap, union is trivial */
+  if (!dest)
+    return TRUE;
+
+  if (gst_util_fraction_compare (fr1_start_n, fr1_start_d, fr2_start_n,
+          fr2_start_d) < 0) {
+    fr_start_n = fr1_start_n;
+    fr_start_d = fr1_start_d;
+  } else {
+    fr_start_n = fr2_start_n;
+    fr_start_d = fr2_start_d;
+  }
+
+  if (gst_util_fraction_compare (fr1_end_n, fr1_end_d, fr2_end_n,
+          fr2_end_d) > 0) {
+    fr_end_n = fr1_end_n;
+    fr_end_d = fr1_end_d;
+  } else {
+    fr_end_n = fr2_end_n;
+    fr_end_d = fr2_end_d;
+  }
+
+  g_value_init (dest, GST_TYPE_FRACTION_RANGE);
+  gst_value_set_fraction_range_full (dest, fr_start_n, fr_start_d, fr_end_n,
+      fr_end_d);
+  return TRUE;
+}
+
 /****************
  * intersection *
  ****************/
@@ -7815,6 +7914,16 @@ gst_value_deserialize_flagset (GValue * dest, const gchar * s)
   if (G_UNLIKELY ((mask == 0 && errno == EINVAL) || cur == next))
     goto try_as_flags_string;
 
+  if (g_str_has_prefix (cur, "0x") || g_str_has_prefix (cur, "0X"))
+    cur += 2;
+
+  /* Flagsets are 32 bits hex numbers, so do not accept any number that has more
+   * then 8 characters. strtoul() accepts unlimited number of leading zeros and
+   * 64bit numbers on 64bit platforms.
+   */
+  if ((next - cur) > 8)
+    return FALSE;
+
   /* Next char should be NULL terminator, or a ':'. If ':', we need the flag string after */
   if (G_UNLIKELY (next[0] == 0)) {
     res = TRUE;
@@ -8362,6 +8471,10 @@ _priv_gst_value_initialize (void)
       gst_value_union_flagset_flagset);
   gst_value_register_union_func (GST_TYPE_STRUCTURE, GST_TYPE_STRUCTURE,
       gst_value_union_structure_structure);
+  gst_value_register_union_func (GST_TYPE_FRACTION, GST_TYPE_FRACTION_RANGE,
+      gst_value_union_fraction_fraction_range);
+  gst_value_register_union_func (GST_TYPE_FRACTION_RANGE,
+      GST_TYPE_FRACTION_RANGE, gst_value_union_fraction_range_fraction_range);
 
 #if GST_VERSION_NANO == 1
   /* If building from git master, check starting array sizes matched actual size
@@ -8387,14 +8500,6 @@ _priv_gst_value_initialize (void)
         gst_value_subtract_funcs->len);
   }
 #endif
-
-#if 0
-  /* Implement these if needed */
-  gst_value_register_union_func (GST_TYPE_FRACTION, GST_TYPE_FRACTION_RANGE,
-      gst_value_union_fraction_fraction_range);
-  gst_value_register_union_func (GST_TYPE_FRACTION_RANGE,
-      GST_TYPE_FRACTION_RANGE, gst_value_union_fraction_range_fraction_range);
-#endif
 }
 
 static void
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstadapter.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstadapter.c
index 89f2e7160fb..12d7569842f 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstadapter.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstadapter.c
@@ -581,7 +581,7 @@ gst_adapter_unmap (GstAdapter * adapter)
  * @dest: (out caller-allocates) (array length=size) (element-type guint8):
  *     the memory to copy into
  * @offset: the bytes offset in the adapter to start from
- * @size: the number of bytes to copy
+ * @size: (in): the number of bytes to copy
  *
  * Copies @size bytes of data starting at @offset out of the buffers
  * contained in #GstAdapter into an array @dest provided by the caller.
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstbaseparse.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstbaseparse.c
index 5902a65cbd1..2c6333c6c31 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstbaseparse.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstbaseparse.c
@@ -699,7 +699,7 @@ gst_base_parse_frame_copy (GstBaseParseFrame * frame)
 {
   GstBaseParseFrame *copy;
 
-  copy = g_slice_dup (GstBaseParseFrame, frame);
+  copy = g_memdup2 (frame, sizeof (GstBaseParseFrame));
   copy->buffer = gst_buffer_ref (frame->buffer);
   copy->_private_flags &= ~GST_BASE_PARSE_FRAME_PRIVATE_FLAG_NOALLOC;
 
@@ -725,7 +725,7 @@ gst_base_parse_frame_free (GstBaseParseFrame * frame)
   }
 
   if (!(frame->_private_flags & GST_BASE_PARSE_FRAME_PRIVATE_FLAG_NOALLOC)) {
-    g_slice_free (GstBaseParseFrame, frame);
+    g_free (frame);
   } else {
     memset (frame, 0, sizeof (*frame));
   }
@@ -774,7 +774,7 @@ gst_base_parse_frame_new (GstBuffer * buffer, GstBaseParseFrameFlags flags,
 {
   GstBaseParseFrame *frame;
 
-  frame = g_slice_new0 (GstBaseParseFrame);
+  frame = g_new0 (GstBaseParseFrame, 1);
   frame->buffer = gst_buffer_ref (buffer);
 
   GST_TRACE ("created frame %p", frame);
@@ -2297,6 +2297,10 @@ gst_base_parse_handle_buffer (GstBaseParse * parse, GstBuffer * buffer,
       outbuf = gst_buffer_make_writable (outbuf);
       GST_BUFFER_PTS (outbuf) = pts;
       GST_BUFFER_DTS (outbuf) = dts;
+      GST_BUFFER_OFFSET (outbuf) = GST_BUFFER_OFFSET_NONE;
+      GST_BUFFER_DURATION (outbuf) = GST_CLOCK_TIME_NONE;
+      GST_BUFFER_OFFSET_END (outbuf) = GST_BUFFER_OFFSET_NONE;
+      GST_BUFFER_FLAGS (outbuf) = 0;
       parse->priv->buffers_head =
           g_slist_prepend (parse->priv->buffers_head, outbuf);
       outbuf = NULL;
@@ -2689,10 +2693,13 @@ gst_base_parse_push_frame (GstBaseParse * parse, GstBaseParseFrame * frame)
  * @frame: a #GstBaseParseFrame
  * @size: consumed input data represented by frame
  *
- * Collects parsed data and pushes this downstream.
+ * Collects parsed data and pushes it downstream.
  * Source pad caps must be set when this is called.
  *
- * If @frame's out_buffer is set, that will be used as subsequent frame data.
+ * If @frame's out_buffer is set, that will be used as subsequent frame data,
+ * and @size amount will be flushed from the input data. The output_buffer size
+ * can differ from the consumed size indicated by @size.
+ *
  * Otherwise, @size samples will be taken from the input and used for output,
  * and the output's metadata (timestamps etc) will be taken as (optionally)
  * set by the subclass on @frame's (input) buffer (which is otherwise
@@ -2739,6 +2746,7 @@ gst_base_parse_finish_frame (GstBaseParse * parse, GstBaseParseFrame * frame,
     GstBuffer *src, *dest;
 
     frame->out_buffer = gst_adapter_take_buffer (parse->priv->adapter, size);
+    frame->out_buffer = gst_buffer_make_writable (frame->out_buffer);
     dest = frame->out_buffer;
     src = frame->buffer;
     GST_BUFFER_PTS (dest) = GST_BUFFER_PTS (src);
@@ -2746,7 +2754,7 @@ gst_base_parse_finish_frame (GstBaseParse * parse, GstBaseParseFrame * frame,
     GST_BUFFER_OFFSET (dest) = GST_BUFFER_OFFSET (src);
     GST_BUFFER_DURATION (dest) = GST_BUFFER_DURATION (src);
     GST_BUFFER_OFFSET_END (dest) = GST_BUFFER_OFFSET_END (src);
-    GST_MINI_OBJECT_FLAGS (dest) = GST_MINI_OBJECT_FLAGS (src);
+    GST_BUFFER_FLAGS (dest) = GST_BUFFER_FLAGS (src);
   } else {
     gst_adapter_flush (parse->priv->adapter, size);
   }
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstbasesink.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstbasesink.c
index 875f9a5652e..e94a9572a52 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstbasesink.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstbasesink.c
@@ -2185,7 +2185,11 @@ gst_base_sink_get_sync_times (GstBaseSink * basesink, GstMiniObject * obj,
       }
       goto do_times;
     }
-    goto out_of_segment;
+    if (basesink->priv->drop_out_of_segment)
+      goto out_of_segment;
+
+    cstart = start;
+    cstop = stop;
   }
 
   if (G_UNLIKELY (start != cstart || stop != cstop)) {
@@ -3953,6 +3957,11 @@ gst_base_sink_chain_unlocked (GstBaseSink * basesink, GstPad * pad,
 
     if (bclass->render)
       ret = bclass->render (basesink, GST_BUFFER_CAST (obj));
+
+    if (ret == GST_BASE_SINK_FLOW_DROPPED) {
+      ret = GST_FLOW_OK;
+      goto dropped;
+    }
   } else {
     GstBufferList *buffer_list = GST_BUFFER_LIST_CAST (obj);
 
@@ -3962,6 +3971,9 @@ gst_base_sink_chain_unlocked (GstBaseSink * basesink, GstPad * pad,
     /* Set the first buffer and buffer list to be included in last sample */
     gst_base_sink_set_last_buffer (basesink, sync_buf);
     gst_base_sink_set_last_buffer_list (basesink, buffer_list);
+
+    /* Not currently supported */
+    g_assert (ret != GST_BASE_SINK_FLOW_DROPPED);
   }
 
   if (ret == GST_FLOW_STEP)
@@ -5144,8 +5156,17 @@ gst_base_sink_get_position (GstBaseSink * basesink, GstFormat format,
 
   GST_OBJECT_LOCK (basesink);
   /* we can only get the segment when we are not NULL or READY */
-  if (!basesink->have_newsegment)
+  if (GST_STATE (basesink) <= GST_STATE_READY &&
+      GST_STATE_PENDING (basesink) <= GST_STATE_READY) {
     goto wrong_state;
+  }
+
+  segment = &basesink->segment;
+  /* get the format in the segment */
+  oformat = segment->format;
+
+  if (oformat == GST_FORMAT_UNDEFINED)
+    goto no_segment;
 
   in_paused = FALSE;
   /* when not in PLAYING or when we're busy with a state change, we
@@ -5156,11 +5177,6 @@ gst_base_sink_get_position (GstBaseSink * basesink, GstFormat format,
     in_paused = TRUE;
   }
 
-  segment = &basesink->segment;
-
-  /* get the format in the segment */
-  oformat = segment->format;
-
   /* report with last seen position when EOS */
   last_seen = basesink->eos;
 
@@ -5359,6 +5375,15 @@ gst_base_sink_get_position (GstBaseSink * basesink, GstFormat format,
     GST_OBJECT_UNLOCK (basesink);
     goto done;
   }
+no_segment:
+  {
+    GST_DEBUG_OBJECT (basesink,
+        "haven't received a segment yet, can't anwser position, return -1");
+    res = FALSE;
+    *cur = -1;
+    GST_OBJECT_UNLOCK (basesink);
+    goto done;
+  }
 convert_failed:
   {
     GST_DEBUG_OBJECT (basesink, "convert failed, try upstream");
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstbasesink.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstbasesink.h
index f380723603a..d3c5a9356dd 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstbasesink.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstbasesink.h
@@ -58,6 +58,20 @@ G_BEGIN_DECLS
 #define GST_BASE_SINK_PREROLL_SIGNAL(obj)     g_cond_signal (GST_BASE_SINK_GET_PREROLL_COND (obj));
 #define GST_BASE_SINK_PREROLL_BROADCAST(obj)  g_cond_broadcast (GST_BASE_SINK_GET_PREROLL_COND (obj));
 
+/**
+ * GST_BASE_SINK_FLOW_DROPPED:
+ *
+ * A #GstFlowReturn that can be returned from
+ * #GstBaseSinkClass::render to indicate that the output buffer was not
+ * rendered.
+ *
+ * Note that this is currently not support for #GstBaseSinkClass::render_list
+ * virtual method.
+ *
+ * Since: 1.24
+ */
+#define GST_BASE_SINK_FLOW_DROPPED     GST_FLOW_CUSTOM_SUCCESS
+
 typedef struct _GstBaseSink GstBaseSink;
 typedef struct _GstBaseSinkClass GstBaseSinkClass;
 typedef struct _GstBaseSinkPrivate GstBaseSinkPrivate;
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstbasesrc.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstbasesrc.c
index e47d14581eb..a840b4ac24f 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstbasesrc.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstbasesrc.c
@@ -189,6 +189,9 @@ enum
 #define DEFAULT_BLOCKSIZE       4096
 #define DEFAULT_NUM_BUFFERS     -1
 #define DEFAULT_DO_TIMESTAMP    FALSE
+/* FIXME 2.0: automatic_eos should probably be disabled by default,
+ * see https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1330 */
+#define DEFAULT_AUTOMATIC_EOS   TRUE
 
 enum
 {
@@ -198,7 +201,8 @@ enum
 #ifndef GST_REMOVE_DEPRECATED
   PROP_TYPEFIND,
 #endif
-  PROP_DO_TIMESTAMP
+  PROP_DO_TIMESTAMP,
+  PROP_AUTOMATIC_EOS
 };
 
 /* The basesrc implementation need to respect the following locking order:
@@ -261,6 +265,9 @@ struct _GstBaseSrcPrivate
 
   /* for _submit_buffer_list() */
   GstBufferList *pending_bufferlist;
+
+  /* to delay unlock_stop */
+  gboolean pending_unlock_stop;
 };
 
 #define BASE_SRC_HAS_PENDING_BUFFER_LIST(src) \
@@ -404,6 +411,18 @@ gst_base_src_class_init (GstBaseSrcClass * klass)
           "Apply current stream time to buffers", DEFAULT_DO_TIMESTAMP,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
+  /**
+   * GstBaseSrc:automatic-eos:
+   *
+   * See gst_base_src_set_automatic_eos()
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_AUTOMATIC_EOS,
+      g_param_spec_boolean ("automatic-eos", "Automatic EOS",
+          "Automatically EOS when the segment is done", DEFAULT_AUTOMATIC_EOS,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
   gstelement_class->change_state =
       GST_DEBUG_FUNCPTR (gst_base_src_change_state);
   gstelement_class->send_event = GST_DEBUG_FUNCPTR (gst_base_src_send_event);
@@ -442,7 +461,7 @@ gst_base_src_init (GstBaseSrc * basesrc, gpointer g_class)
   g_cond_init (&basesrc->live_cond);
   basesrc->num_buffers = DEFAULT_NUM_BUFFERS;
   basesrc->num_buffers_left = -1;
-  g_atomic_int_set (&basesrc->priv->automatic_eos, TRUE);
+  g_atomic_int_set (&basesrc->priv->automatic_eos, DEFAULT_AUTOMATIC_EOS);
 
   basesrc->can_activate_push = TRUE;
 
@@ -2204,6 +2223,9 @@ gst_base_src_set_property (GObject * object, guint prop_id,
     case PROP_DO_TIMESTAMP:
       gst_base_src_set_do_timestamp (src, g_value_get_boolean (value));
       break;
+    case PROP_AUTOMATIC_EOS:
+      gst_base_src_set_automatic_eos (src, g_value_get_boolean (value));
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -2233,6 +2255,9 @@ gst_base_src_get_property (GObject * object, guint prop_id, GValue * value,
     case PROP_DO_TIMESTAMP:
       g_value_set_boolean (value, gst_base_src_get_do_timestamp (src));
       break;
+    case PROP_AUTOMATIC_EOS:
+      g_value_set_boolean (value, g_atomic_int_get (&src->priv->automatic_eos));
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -2538,6 +2563,7 @@ gst_base_src_get_range (GstBaseSrc * src, guint64 offset, guint length,
   GstBuffer *res_buf;
   GstBuffer *in_buf;
   gboolean own_res_buf;
+  gboolean pending_unlock_stop;
 
   bclass = GST_BASE_SRC_GET_CLASS (src);
 
@@ -2588,7 +2614,19 @@ gst_base_src_get_range (GstBaseSrc * src, guint64 offset, guint length,
   res_buf = in_buf = *buf;
   own_res_buf = (*buf == NULL);
 
+retry_create:
   GST_LIVE_UNLOCK (src);
+
+  /* Undo our unlocking initiated from set_playing function. This is done here
+   * since we require the stream lock to call this virtual function. */
+  GST_OBJECT_LOCK (src);
+  pending_unlock_stop = src->priv->pending_unlock_stop;
+  src->priv->pending_unlock_stop = FALSE;
+  GST_OBJECT_UNLOCK (src);
+
+  if (pending_unlock_stop && bclass->unlock_stop)
+    bclass->unlock_stop (src);
+
   ret = bclass->create (src, offset, length, &res_buf);
   GST_LIVE_LOCK (src);
 
@@ -2596,13 +2634,19 @@ gst_base_src_get_range (GstBaseSrc * src, guint64 offset, guint length,
   if (src->is_live) {
     if (G_UNLIKELY (!src->live_running)) {
       GstFlowReturn wait_ret;
+
+      /* no need keep old buffer while in pause */
+      if (ret == GST_FLOW_OK && own_res_buf)
+        gst_clear_buffer (&res_buf);
+      gst_clear_buffer_list (&src->priv->pending_bufferlist);
+
       wait_ret = gst_base_src_wait_playing_unlocked (src);
       if (wait_ret != GST_FLOW_OK) {
-        if (ret == GST_FLOW_OK && own_res_buf)
-          gst_buffer_unref (res_buf);
         ret = wait_ret;
         goto stopped;
       }
+
+      goto retry_create;
     }
   }
 
@@ -2612,7 +2656,8 @@ gst_base_src_get_range (GstBaseSrc * src, guint64 offset, guint length,
   if (G_UNLIKELY (g_atomic_int_get (&src->priv->has_pending_eos))) {
     if (ret == GST_FLOW_OK) {
       if (own_res_buf)
-        gst_buffer_unref (res_buf);
+        gst_clear_buffer (&res_buf);
+      gst_clear_buffer_list (&src->priv->pending_bufferlist);
     }
     src->priv->forced_eos = TRUE;
     goto eos;
@@ -3690,7 +3735,7 @@ gst_base_src_start_complete (GstBaseSrc * basesrc, GstFlowReturn ret)
   {
     GST_PAD_STREAM_UNLOCK (basesrc->srcpad);
     gst_base_src_stop (basesrc);
-    GST_WARNING_OBJECT (basesrc, "pad not activated yet");
+    GST_INFO_OBJECT (basesrc, "pad not activated yet");
     ret = GST_FLOW_ERROR;
     goto error;
   }
@@ -3845,12 +3890,23 @@ gst_base_src_set_flushing (GstBaseSrc * basesrc, gboolean flushing)
 static gboolean
 gst_base_src_set_playing (GstBaseSrc * basesrc, gboolean live_play)
 {
+  GstBaseSrcClass *bclass;
+
+  bclass = GST_BASE_SRC_GET_CLASS (basesrc);
+
   /* we are now able to grab the LIVE lock, when we get it, we can be
    * waiting for PLAYING while blocked in the LIVE cond or we can be waiting
    * for the clock. */
   GST_LIVE_LOCK (basesrc);
   GST_DEBUG_OBJECT (basesrc, "unschedule clock");
 
+  /* unlock subclasses locked in ::create, we only do this when we stop playing. */
+  if (!live_play) {
+    GST_DEBUG_OBJECT (basesrc, "unlock");
+    if (bclass->unlock)
+      bclass->unlock (basesrc);
+  }
+
   /* unblock clock sync (if any) */
   if (basesrc->clock_id)
     gst_clock_id_unschedule (basesrc->clock_id);
@@ -3865,6 +3921,7 @@ gst_base_src_set_playing (GstBaseSrc * basesrc, gboolean live_play)
     /* for live sources we restart the timestamp correction */
     GST_OBJECT_LOCK (basesrc);
     basesrc->priv->latency = -1;
+    basesrc->priv->pending_unlock_stop = TRUE;
     GST_OBJECT_UNLOCK (basesrc);
     /* have to restart the task in case it stopped because of the unlock when
      * we went to PAUSED. Only do this if we operating in push mode. */
@@ -4142,3 +4199,66 @@ gst_base_src_submit_buffer_list (GstBaseSrc * src, GstBufferList * buffer_list)
   GST_LOG_OBJECT (src, "%u buffers submitted in buffer list",
       gst_buffer_list_length (buffer_list));
 }
+
+/**
+ * gst_base_src_push_segment:
+ * @src: a #GstBaseSrc
+ * @segment: a pointer to a #GstSegment
+ *
+ * Send a new segment downstream. This function must
+ * only be called by derived sub-classes, and only from the #GstBaseSrcClass::create function,
+ * as the stream-lock needs to be held.
+ * This method also requires that an out caps has been configured, so
+ * gst_base_src_set_caps() needs to have been called before.
+ *
+ * The format for the @segment must be identical with the current format
+ * of the source, as configured with gst_base_src_set_format().
+ *
+ * The format of @src must not be %GST_FORMAT_UNDEFINED and the format
+ * should be configured via gst_base_src_set_format() before calling this method.
+ *
+ * This is a variant of gst_base_src_new_segment() sending the segment right away,
+ * which can be useful to ensure events ordering.
+ *
+ * Returns: %TRUE if sending of new segment succeeded.
+ *
+ * Since: 1.24
+*/
+gboolean
+gst_base_src_push_segment (GstBaseSrc * src, const GstSegment * segment)
+{
+  GstEvent *seg_event;
+
+  g_return_val_if_fail (GST_IS_BASE_SRC (src), FALSE);
+  g_return_val_if_fail (segment != NULL, FALSE);
+
+  GST_OBJECT_LOCK (src);
+
+  if (src->segment.format == GST_FORMAT_UNDEFINED) {
+    /* subclass must set valid format before calling this method */
+    GST_WARNING_OBJECT (src, "segment format is not configured yet, ignore");
+    GST_OBJECT_UNLOCK (src);
+    return FALSE;
+  }
+
+  if (src->segment.format != segment->format) {
+    GST_WARNING_OBJECT (src, "segment format mismatched, ignore");
+    GST_OBJECT_UNLOCK (src);
+    return FALSE;
+  }
+
+  gst_segment_copy_into (segment, &src->segment);
+  seg_event = gst_event_new_segment (&src->segment);
+  src->priv->segment_pending = FALSE;
+  src->priv->segment_seqnum = gst_util_seqnum_next ();
+  gst_event_set_seqnum (seg_event, src->priv->segment_seqnum);
+
+  GST_OBJECT_UNLOCK (src);
+
+  GST_DEBUG_OBJECT (src, "Sending new segment %" GST_SEGMENT_FORMAT, segment);
+  gst_pad_push_event (src->srcpad, seg_event);
+
+  src->running = TRUE;
+
+  return TRUE;
+}
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstbasesrc.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstbasesrc.h
index 4207ffc3ffe..0784aaf5447 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstbasesrc.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstbasesrc.h
@@ -347,6 +347,10 @@ GST_BASE_API
 void            gst_base_src_submit_buffer_list (GstBaseSrc    * src,
                                                  GstBufferList * buffer_list);
 
+GST_BASE_API
+gboolean gst_base_src_push_segment              (GstBaseSrc * src,
+                                                 const GstSegment * segment);
+
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstBaseSrc, gst_object_unref)
 
 G_END_DECLS
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstbitreader.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstbitreader.c
index db97ad51a27..405f2e1c5ce 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstbitreader.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstbitreader.c
@@ -63,7 +63,7 @@
 GstBitReader *
 gst_bit_reader_new (const guint8 * data, guint size)
 {
-  GstBitReader *ret = g_slice_new0 (GstBitReader);
+  GstBitReader *ret = g_new0 (GstBitReader, 1);
 
   ret->data = data;
   ret->size = size;
@@ -83,7 +83,7 @@ gst_bit_reader_free (GstBitReader * reader)
 {
   g_return_if_fail (reader != NULL);
 
-  g_slice_free (GstBitReader, reader);
+  g_free (reader);
 }
 
 /**
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstbytereader.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstbytereader.c
index c0a16efe3a0..c08f5616866 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstbytereader.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstbytereader.c
@@ -99,7 +99,7 @@
 GstByteReader *
 gst_byte_reader_new (const guint8 * data, guint size)
 {
-  GstByteReader *ret = g_slice_new0 (GstByteReader);
+  GstByteReader *ret = g_new0 (GstByteReader, 1);
 
   ret->data = data;
   ret->size = size;
@@ -119,7 +119,7 @@ gst_byte_reader_free (GstByteReader * reader)
 {
   g_return_if_fail (reader != NULL);
 
-  g_slice_free (GstByteReader, reader);
+  g_free (reader);
 }
 
 /**
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstbytewriter.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstbytewriter.c
index aec10932e45..c5111b59b8d 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstbytewriter.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstbytewriter.c
@@ -78,7 +78,7 @@
 GstByteWriter *
 gst_byte_writer_new (void)
 {
-  GstByteWriter *ret = g_slice_new0 (GstByteWriter);
+  GstByteWriter *ret = g_new0 (GstByteWriter, 1);
 
   ret->owned = TRUE;
   return ret;
@@ -289,7 +289,7 @@ gst_byte_writer_free (GstByteWriter * writer)
   g_return_if_fail (writer != NULL);
 
   gst_byte_writer_reset (writer);
-  g_slice_free (GstByteWriter, writer);
+  g_free (writer);
 }
 
 /**
@@ -311,7 +311,7 @@ gst_byte_writer_free_and_get_data (GstByteWriter * writer)
   g_return_val_if_fail (writer != NULL, NULL);
 
   data = gst_byte_writer_reset_and_get_data (writer);
-  g_slice_free (GstByteWriter, writer);
+  g_free (writer);
 
   return data;
 }
@@ -336,7 +336,7 @@ gst_byte_writer_free_and_get_buffer (GstByteWriter * writer)
   g_return_val_if_fail (writer != NULL, NULL);
 
   buffer = gst_byte_writer_reset_and_get_buffer (writer);
-  g_slice_free (GstByteWriter, writer);
+  g_free (writer);
 
   return buffer;
 }
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstcollectpads.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstcollectpads.c
index b6f92159c0e..abbae449565 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstcollectpads.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstcollectpads.c
@@ -1224,7 +1224,7 @@ gst_collect_pads_set_waiting (GstCollectPads * pads, GstCollectData * data,
   /* Do something only on a change and if not locked */
   if (!GST_COLLECT_PADS_STATE_IS_SET (data, GST_COLLECT_PADS_STATE_LOCKED) &&
       (GST_COLLECT_PADS_STATE_IS_SET (data, GST_COLLECT_PADS_STATE_WAITING) !=
-          ! !waiting)) {
+          !!waiting)) {
     /* Set waiting state for this pad */
     if (waiting)
       GST_COLLECT_PADS_STATE_SET (data, GST_COLLECT_PADS_STATE_WAITING);
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstflowcombiner.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstflowcombiner.c
index d353eae4aa8..fc251c61e98 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstflowcombiner.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstflowcombiner.c
@@ -95,7 +95,7 @@ G_DEFINE_BOXED_TYPE_WITH_CODE (GstFlowCombiner, gst_flow_combiner,
 GstFlowCombiner *
 gst_flow_combiner_new (void)
 {
-  GstFlowCombiner *combiner = g_slice_new (GstFlowCombiner);
+  GstFlowCombiner *combiner = g_new (GstFlowCombiner, 1);
 
   g_queue_init (&combiner->pads);
   combiner->last_ret = GST_FLOW_OK;
@@ -161,7 +161,7 @@ gst_flow_combiner_unref (GstFlowCombiner * combiner)
     while ((pad = g_queue_pop_head (&combiner->pads)))
       gst_object_unref (pad);
 
-    g_slice_free (GstFlowCombiner, combiner);
+    g_free (combiner);
   }
 }
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstindex.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstindex.c
index 964508e0ac1..a4bae64c9e9 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstindex.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstindex.c
@@ -272,7 +272,7 @@ gst_index_get_property (GObject * object, guint prop_id,
 static GstIndexGroup *
 gst_index_group_new (guint groupnum)
 {
-  GstIndexGroup *indexgroup = g_slice_new (GstIndexGroup);
+  GstIndexGroup *indexgroup = g_new (GstIndexGroup, 1);
 
   indexgroup->groupnum = groupnum;
   indexgroup->entries = NULL;
@@ -287,7 +287,7 @@ gst_index_group_new (guint groupnum)
 static void
 gst_index_group_free (GstIndexGroup * group)
 {
-  g_slice_free (GstIndexGroup, group);
+  g_free (group);
 }
 
 /* do not resurrect this, add a derived dummy index class instead */
@@ -528,7 +528,7 @@ gst_index_set_resolver_full (GstIndex * index, GstIndexResolver resolver,
 GstIndexEntry *
 gst_index_entry_copy (GstIndexEntry * entry)
 {
-  GstIndexEntry *new_entry = g_slice_new (GstIndexEntry);
+  GstIndexEntry *new_entry = g_new (GstIndexEntry, 1);
 
   memcpy (new_entry, entry, sizeof (GstIndexEntry));
   return new_entry;
@@ -562,7 +562,7 @@ gst_index_entry_free (GstIndexEntry * entry)
       break;
   }
 
-  g_slice_free (GstIndexEntry, entry);
+  g_free (entry);
 }
 
 #if 0
@@ -592,7 +592,7 @@ gst_index_add_format (GstIndex * index, gint id, GstFormat format)
   if (!GST_INDEX_IS_WRITABLE (index) || id == -1)
     return NULL;
 
-  entry = g_slice_new (GstIndexEntry);
+  entry = g_new (GstIndexEntry, 1);
   entry->type = GST_INDEX_ENTRY_FORMAT;
   entry->id = id;
   entry->data.format.format = format;
@@ -627,7 +627,7 @@ gst_index_add_id (GstIndex * index, gint id, gchar * description)
   if (!GST_INDEX_IS_WRITABLE (index) || id == -1)
     return NULL;
 
-  entry = g_slice_new (GstIndexEntry);
+  entry = g_new (GstIndexEntry, 1);
   entry->type = GST_INDEX_ENTRY_ID;
   entry->id = id;
   entry->data.id.description = description;
@@ -742,7 +742,7 @@ gst_index_get_writer_id (GstIndex * index, GstObject * writer, gint * id)
     if (!entry) {
       /* index is probably not writable, make an entry anyway
        * to keep it in our cache */
-      entry = g_slice_new (GstIndexEntry);
+      entry = g_new (GstIndexEntry, 1);
       entry->type = GST_INDEX_ENTRY_ID;
       entry->id = *id;
       entry->data.id.description = writer_string;
@@ -794,7 +794,7 @@ gst_index_add_associationv (GstIndex * index, gint id,
   if (!GST_INDEX_IS_WRITABLE (index) || id == -1)
     return NULL;
 
-  entry = g_slice_new (GstIndexEntry);
+  entry = g_new (GstIndexEntry, 1);
 
   entry->type = GST_INDEX_ENTRY_ASSOCIATION;
   entry->id = id;
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstmemindex.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstmemindex.c
index b6674475239..66b6c667099 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstmemindex.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstmemindex.c
@@ -140,7 +140,7 @@ gst_mem_index_free_format (gpointer key, gpointer value, gpointer user_data)
     g_tree_destroy (index->tree);
   }
 
-  g_slice_free (GstMemIndexFormatIndex, index);
+  g_free (index);
 }
 
 static void
@@ -155,7 +155,7 @@ gst_mem_index_free_id (gpointer key, gpointer value, gpointer user_data)
     id_index->format_index = NULL;
   }
 
-  g_slice_free (GstMemIndexId, id_index);
+  g_free (id_index);
 }
 
 static void
@@ -189,7 +189,7 @@ gst_mem_index_add_id (GstIndex * index, GstIndexEntry * entry)
   id_index = g_hash_table_lookup (memindex->id_index, &entry->id);
 
   if (!id_index) {
-    id_index = g_slice_new0 (GstMemIndexId);
+    id_index = g_new0 (GstMemIndexId, 1);
 
     id_index->id = entry->id;
     id_index->format_index = g_hash_table_new (g_int_hash, g_int_equal);
@@ -224,7 +224,7 @@ gst_mem_index_index_format (GstMemIndexId * id_index, GstIndexEntry * entry,
   index = g_hash_table_lookup (id_index->format_index, format);
 
   if (!index) {
-    index = g_slice_new0 (GstMemIndexFormatIndex);
+    index = g_new0 (GstMemIndexFormatIndex, 1);
 
     index->format = *format;
     index->offset = assoc;
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstqueuearray.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstqueuearray.c
index 20450373c82..69ae3d88513 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstqueuearray.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstqueuearray.c
@@ -37,6 +37,9 @@
 #include <gst/gst.h>
 #include "gstqueuearray.h"
 
+#define gst_queue_array_idx(a, i) \
+  ((a)->array + (((a)->head + (i)) % (a)->size) * (a)->elt_size)
+
 struct _GstQueueArray
 {
   /* < private > */
@@ -50,6 +53,12 @@ struct _GstQueueArray
   GDestroyNotify clear_func;
 };
 
+typedef struct
+{
+  GCompareDataFunc func;
+  gpointer user_data;
+} QueueSortData;
+
 /**
  * gst_queue_array_new_for_struct: (skip)
  * @struct_size: Size of each element (e.g. structure) in the array
@@ -69,7 +78,7 @@ gst_queue_array_new_for_struct (gsize struct_size, guint initial_size)
 
   g_return_val_if_fail (struct_size > 0, NULL);
 
-  array = g_slice_new (GstQueueArray);
+  array = g_new (GstQueueArray, 1);
   array->elt_size = struct_size;
   array->size = initial_size;
   array->array = g_malloc0 (struct_size * initial_size);
@@ -116,7 +125,7 @@ gst_queue_array_free (GstQueueArray * array)
   g_return_if_fail (array != NULL);
   gst_queue_array_clear (array);
   g_free (array->array);
-  g_slice_free (GstQueueArray, array);
+  g_free (array);
 }
 
 /**
@@ -431,6 +440,212 @@ gst_queue_array_push_tail (GstQueueArray * array, gpointer data)
   array->length++;
 }
 
+/* Moves all elements in the queue placed after the given position in the internal array */
+static void
+gst_queue_array_move_data_after_position (GstQueueArray * array, guint pos)
+{
+  guint elt_size = array->elt_size;
+
+  /* If the array does not wrap around OR if it does, but we're inserting past that point */
+  if (array->head < array->tail ||
+      (array->head >= array->tail && pos < array->head)) {
+    memmove (array->array + (pos + 1) * elt_size, array->array + pos * elt_size,
+        (array->tail - pos) * elt_size);
+    return;
+  }
+
+  /* Otherwise, array wraps around and we're inserting before the breaking point.
+   * First, move everything past that point by one place. */
+  memmove (array->array + elt_size, array->array, array->tail * elt_size);
+
+  /* Then move the last element from before the wrap-around point to right after it. */
+  memcpy (array->array, array->array + (array->size - 1) * elt_size, elt_size);
+
+  /* If we're inserting right before the breaking point, no further action is needed.
+   * Otherwise, move data between insertion point and the breaking point by one place. */
+  if (pos != array->size - 1) {
+    memmove (array->array + (pos + 1) * elt_size, array->array + pos * elt_size,
+        (array->size - pos - 1) * elt_size);
+  }
+}
+
+/**
+ * gst_queue_array_push_sorted: (skip)
+ * @array: a #GstQueueArray object
+ * @data: object to push
+ * @func: comparison function
+ * @user_data: (nullable): data for comparison function
+ *
+ * Pushes @data to the queue @array, finding the correct position
+ * by comparing @data with each array element using @func.
+ *
+ * This has a time complexity of O(n), so depending on the size of the queue
+ * and expected access patterns, a different data structure might be better.
+ *
+ * Assumes that the array is already sorted. If it is not, make sure
+ * to call gst_queue_array_sort() first.
+ *
+ * Since: 1.24
+ */
+void
+gst_queue_array_push_sorted (GstQueueArray * array, gpointer data,
+    GCompareDataFunc func, gpointer user_data)
+{
+  guint i;
+  gpointer *p_element;
+
+  g_return_if_fail (array != NULL);
+  g_return_if_fail (func != NULL);
+
+  /* Check if we need to make room */
+  if (G_UNLIKELY (array->length == array->size))
+    gst_queue_array_do_expand (array);
+
+  /* Compare against each element, assuming they're already sorted */
+  for (i = 0; i < array->length; i++) {
+    p_element = (gpointer *) gst_queue_array_idx (array, i);
+
+    if (func (*p_element, data, user_data) > 0) {
+      guint pos = (array->head + i) % array->size;
+      gst_queue_array_move_data_after_position (array, pos);
+
+      *p_element = data;
+      goto finish;
+    }
+  }
+
+  /* No 'bigger' element found - append to tail */
+  *(gpointer *) (array->array + array->elt_size * array->tail) = data;
+
+finish:
+  array->tail++;
+  array->tail %= array->size;
+  array->length++;
+}
+
+/**
+ * gst_queue_array_push_sorted_struct: (skip)
+ * @array: a #GstQueueArray object
+ * @p_struct: address of element or structure to push into the queue
+ * @func: comparison function
+ * @user_data: (nullable): data for comparison function
+ *
+ * Pushes the element at address @p_struct into the queue @array
+ * (copying the contents of a structure of the struct_size specified
+ * when creating the queue into the array), finding the correct position
+ * by comparing the element at @p_struct with each element in the array using @func.
+ *
+ * This has a time complexity of O(n), so depending on the size of the queue
+ * and expected access patterns, a different data structure might be better.
+ *
+ * Assumes that the array is already sorted. If it is not, make sure
+ * to call gst_queue_array_sort() first.
+ *
+ * Since: 1.24
+ */
+void
+gst_queue_array_push_sorted_struct (GstQueueArray * array, gpointer p_struct,
+    GCompareDataFunc func, gpointer user_data)
+{
+  guint i;
+  gpointer p_element;
+
+  g_return_if_fail (array != NULL);
+  g_return_if_fail (p_struct != NULL);
+  g_return_if_fail (func != NULL);
+
+  /* Check if we need to make room */
+  if (G_UNLIKELY (array->length == array->size))
+    gst_queue_array_do_expand (array);
+
+  /* Compare against each element, assuming they're already sorted */
+  for (i = 0; i < array->length; i++) {
+    p_element = gst_queue_array_idx (array, i);
+
+    if (func (p_element, p_struct, user_data) > 0) {
+      guint pos = (array->head + i) % array->size;
+      gst_queue_array_move_data_after_position (array, pos);
+
+      memcpy (p_element, p_struct, array->elt_size);
+      goto finish;
+    }
+  }
+
+  /* No 'bigger' element found - append to tail */
+  memcpy (array->array + array->elt_size * array->tail, p_struct,
+      array->elt_size);
+
+finish:
+  array->tail++;
+  array->tail %= array->size;
+  array->length++;
+}
+
+static int
+compare_wrapper (gpointer * a, gpointer * b, QueueSortData * sort_data)
+{
+  return sort_data->func (*a, *b, sort_data->user_data);
+}
+
+/**
+ * gst_queue_array_sort: (skip)
+ * @array: a #GstQueueArray object
+ * @compare_func: comparison function
+ * @user_data: (nullable): data for comparison function
+ *
+ * Sorts the queue @array by comparing elements against each other using
+ * the provided @compare_func.
+ *
+ * Since: 1.24
+ */
+void
+gst_queue_array_sort (GstQueueArray * array, GCompareDataFunc compare_func,
+    gpointer user_data)
+{
+  g_return_if_fail (array != NULL);
+  g_return_if_fail (compare_func != NULL);
+
+  if (array->length == 0)
+    return;
+
+  /* To be able to use g_qsort_with_data, we might need to rearrange:
+   * [0-----TAIL][HEAD-----SIZE] -> [HEAD-------TAIL] */
+  if (array->head >= array->tail) {
+    gsize t1 = array->head;
+    gsize t2 = array->size - array->head;
+    gsize elt_size = array->elt_size;
+
+    /* Copy [0-------TAIL] part to a temporary buffer */
+    guint8 *tmp = g_malloc0_n (t1, elt_size);
+    memcpy (tmp, array->array, t1 * elt_size);
+
+    /* Move [HEAD-----SIZE] part to the beginning of the original array */
+    memmove (array->array, array->array + (elt_size * array->head),
+        t2 * elt_size);
+
+    /* Copy the temporary buffer to the end of the original array */
+    memmove (array->array + (t2 * elt_size), tmp, t1 * elt_size);
+    g_free (tmp);
+
+    array->head = 0;
+    array->tail = array->length % array->size;
+  }
+
+  if (array->struct_array) {
+    g_qsort_with_data (array->array +
+        (array->head % array->size) * array->elt_size, array->length,
+        array->elt_size, compare_func, user_data);
+  } else {
+    /* For non-struct arrays, we need to wrap the provided compare function
+     * to dereference our pointers before passing them for comparison.
+     * This matches the behaviour of gst_queue_array_find(). */
+    QueueSortData sort_data = { compare_func, user_data };
+    g_qsort_with_data (array->array +
+        (array->head % array->size) * array->elt_size, array->length,
+        array->elt_size, (GCompareDataFunc) compare_wrapper, &sort_data);
+  }
+}
+
 /**
  * gst_queue_array_peek_tail: (skip)
  * @array: a #GstQueueArray object
@@ -718,7 +933,7 @@ gst_queue_array_drop_element (GstQueueArray * array, guint idx)
 /**
  * gst_queue_array_find: (skip)
  * @array: a #GstQueueArray object
- * @func: (allow-none): comparison function, or %NULL to find @data by value
+ * @func: (nullable): comparison function, or %NULL to find @data by value
  * @data: data for comparison function
  *
  * Finds an element in the queue @array, either by comparing every element
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstqueuearray.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstqueuearray.h
index 77edec09909..37d22acc661 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstqueuearray.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gstqueuearray.h
@@ -104,6 +104,23 @@ gpointer        gst_queue_array_pop_tail_struct  (GstQueueArray * array);
 GST_BASE_API
 gpointer        gst_queue_array_peek_tail_struct (GstQueueArray * array);
 
+GST_BASE_API
+void            gst_queue_array_push_sorted (GstQueueArray * array,
+                                             gpointer data,
+                                             GCompareDataFunc func,
+                                             gpointer user_data);
+
+GST_BASE_API
+void            gst_queue_array_push_sorted_struct (GstQueueArray * array,
+                                                    gpointer p_struct,
+                                                    GCompareDataFunc func,
+                                                    gpointer user_data);
+
+GST_BASE_API
+void            gst_queue_array_sort (GstQueueArray *array,
+                                      GCompareDataFunc compare_func,
+                                      gpointer user_data);
+
 G_END_DECLS
 
 #endif
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gsttypefindhelper.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gsttypefindhelper.c
index c5c765078c4..455b22911e6 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gsttypefindhelper.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/base/gsttypefindhelper.c
@@ -181,7 +181,7 @@ helper_find_peek (gpointer data, gint64 offset, guint size)
     return NULL;
   }
 
-  bmap = g_slice_new0 (GstMappedBuffer);
+  bmap = g_new0 (GstMappedBuffer, 1);
 
   if (!gst_buffer_map (buffer, &bmap->map, GST_MAP_READ))
     goto map_failed;
@@ -210,7 +210,7 @@ helper_find_peek (gpointer data, gint64 offset, guint size)
   {
     GST_ERROR ("map failed");
     gst_buffer_unref (buffer);
-    g_slice_free (GstMappedBuffer, bmap);
+    g_free (bmap);
     return NULL;
   }
 }
@@ -436,7 +436,7 @@ gst_type_find_helper_get_range_full (GstObject * obj, GstObject * parent,
 
     gst_buffer_unmap (bmap->buffer, &bmap->map);
     gst_buffer_unref (bmap->buffer);
-    g_slice_free (GstMappedBuffer, bmap);
+    g_free (bmap);
   }
   g_slist_free (helper.buffers);
 
@@ -728,10 +728,9 @@ gst_type_find_helper_for_data_with_caps (GstObject * obj,
 {
   GstTypeFind *find;
   GstTypeFindData *find_data;
-  GstTypeFindFactory *factory;
   GList *l, *factories = NULL;
   GstCaps *result = NULL;
-  GstTypeFindProbability found_probability, last_found_probability;
+  GstTypeFindProbability last_found_probability;
 
   g_return_val_if_fail (data != NULL, NULL);
   g_return_val_if_fail (caps != NULL, NULL);
@@ -747,11 +746,11 @@ gst_type_find_helper_for_data_with_caps (GstObject * obj,
     goto out;
   }
 
-  found_probability = GST_TYPE_FIND_NONE;
   last_found_probability = GST_TYPE_FIND_NONE;
 
   for (l = factories; l; l = l->next) {
-    factory = GST_TYPE_FIND_FACTORY (l->data);
+    GstTypeFindProbability found_probability;
+    GstTypeFindFactory *factory = GST_TYPE_FIND_FACTORY (l->data);
 
     gst_type_find_factory_call_function (factory, find);
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/controller/gstinterpolationcontrolsource.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/controller/gstinterpolationcontrolsource.c
index c0b6c86c551..5d473a76042 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/controller/gstinterpolationcontrolsource.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/controller/gstinterpolationcontrolsource.c
@@ -607,15 +607,16 @@ static struct
   GstControlSourceGetValueArray get_value_array;
 } interpolation_modes[] = {
   {
-  (GstControlSourceGetValue) interpolate_none_get,
-        (GstControlSourceGetValueArray) interpolate_none_get_value_array}, {
-  (GstControlSourceGetValue) interpolate_linear_get,
-        (GstControlSourceGetValueArray) interpolate_linear_get_value_array}, {
-  (GstControlSourceGetValue) interpolate_cubic_get,
-        (GstControlSourceGetValueArray) interpolate_cubic_get_value_array}, {
-    (GstControlSourceGetValue) interpolate_cubic_monotonic_get,
+        (GstControlSourceGetValue) interpolate_none_get,
+      (GstControlSourceGetValueArray) interpolate_none_get_value_array}, {
+        (GstControlSourceGetValue) interpolate_linear_get,
+      (GstControlSourceGetValueArray) interpolate_linear_get_value_array}, {
+        (GstControlSourceGetValue) interpolate_cubic_get,
+      (GstControlSourceGetValueArray) interpolate_cubic_get_value_array}, {
+        (GstControlSourceGetValue) interpolate_cubic_monotonic_get,
         (GstControlSourceGetValueArray)
-interpolate_cubic_monotonic_get_value_array}};
+      interpolate_cubic_monotonic_get_value_array}
+};
 
 static const guint num_interpolation_modes = G_N_ELEMENTS (interpolation_modes);
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/controller/gstlfocontrolsource.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/controller/gstlfocontrolsource.c
index 1706efddfc7..582b7ecf5c3 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/controller/gstlfocontrolsource.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/controller/gstlfocontrolsource.c
@@ -352,16 +352,16 @@ static struct
   GstControlSourceGetValueArray get_value_array;
 } waveforms[] = {
   {
-  (GstControlSourceGetValue) waveform_sine_get,
-        (GstControlSourceGetValueArray) waveform_sine_get_value_array}, {
-  (GstControlSourceGetValue) waveform_square_get,
-        (GstControlSourceGetValueArray) waveform_square_get_value_array}, {
-  (GstControlSourceGetValue) waveform_saw_get,
-        (GstControlSourceGetValueArray) waveform_saw_get_value_array}, {
-  (GstControlSourceGetValue) waveform_rsaw_get,
-        (GstControlSourceGetValueArray) waveform_rsaw_get_value_array}, {
-  (GstControlSourceGetValue) waveform_triangle_get,
-        (GstControlSourceGetValueArray) waveform_triangle_get_value_array}
+        (GstControlSourceGetValue) waveform_sine_get,
+      (GstControlSourceGetValueArray) waveform_sine_get_value_array}, {
+        (GstControlSourceGetValue) waveform_square_get,
+      (GstControlSourceGetValueArray) waveform_square_get_value_array}, {
+        (GstControlSourceGetValue) waveform_saw_get,
+      (GstControlSourceGetValueArray) waveform_saw_get_value_array}, {
+        (GstControlSourceGetValue) waveform_rsaw_get,
+      (GstControlSourceGetValueArray) waveform_rsaw_get_value_array}, {
+        (GstControlSourceGetValue) waveform_triangle_get,
+      (GstControlSourceGetValueArray) waveform_triangle_get_value_array}
 };
 
 static const guint num_waveforms = G_N_ELEMENTS (waveforms);
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/controller/gsttimedvaluecontrolsource.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/controller/gsttimedvaluecontrolsource.c
index 080df327ec9..7325f42f3c6 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/controller/gsttimedvaluecontrolsource.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/libs/gst/controller/gsttimedvaluecontrolsource.c
@@ -78,7 +78,7 @@ gst_control_point_free (GstControlPoint * cp)
 {
   g_return_if_fail (cp);
 
-  g_slice_free (GstControlPoint, cp);
+  g_free (cp);
 }
 
 /**
@@ -92,7 +92,7 @@ gst_control_point_free (GstControlPoint * cp)
 GstControlPoint *
 gst_control_point_copy (GstControlPoint * cp)
 {
-  return g_slice_dup (GstControlPoint, cp);
+  return g_memdup2 (cp, sizeof (GstControlPoint));
 }
 
 GType
@@ -171,7 +171,7 @@ _make_new_cp (GstTimedValueControlSource * self, GstClockTime timestamp,
   GstControlPoint *cp;
 
   /* create a new GstControlPoint */
-  cp = g_slice_new0 (GstControlPoint);
+  cp = g_new0 (GstControlPoint, 1);
   cp->timestamp = timestamp;
   cp->value = value;
 
@@ -343,7 +343,7 @@ gst_timed_value_control_source_unset (GstTimedValueControlSource * self,
     /* Iter contains the iter right after timestamp, i.e.
      * we need to get the previous one and check the timestamp
      */
-    cp = g_slice_dup (GstControlPoint, g_sequence_get (iter));
+    cp = g_memdup2 (g_sequence_get (iter), sizeof (GstControlPoint));
     g_sequence_remove (iter);
     self->nvalues--;
     self->valid_cache = FALSE;
@@ -354,7 +354,7 @@ gst_timed_value_control_source_unset (GstTimedValueControlSource * self,
   if (cp) {
     g_signal_emit (self,
         gst_timed_value_control_source_signals[VALUE_REMOVED_SIGNAL], 0, cp);
-    g_slice_free (GstControlPoint, cp);
+    g_free (cp);
   }
 
   return res;
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/plugins/elements/gstqueue.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/plugins/elements/gstqueue.c
index ec16927ef70..38187030683 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/plugins/elements/gstqueue.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/plugins/elements/gstqueue.c
@@ -479,9 +479,10 @@ gst_queue_init (GstQueue * queue)
 
   queue->sinktime = GST_CLOCK_STIME_NONE;
   queue->srctime = GST_CLOCK_STIME_NONE;
+  queue->sink_start_time = GST_CLOCK_STIME_NONE;
 
-  queue->sink_tainted = TRUE;
-  queue->src_tainted = TRUE;
+  queue->sink_tainted = FALSE;
+  queue->src_tainted = FALSE;
 
   queue->newseg_applied_to_src = FALSE;
 
@@ -535,7 +536,7 @@ my_segment_to_running_time (GstSegment * segment, GstClockTime val)
 static void
 update_time_level (GstQueue * queue)
 {
-  gint64 sink_time, src_time;
+  gint64 sink_time, src_time, sink_start_time;
 
   if (queue->sink_tainted) {
     GST_LOG_OBJECT (queue, "update sink time");
@@ -545,6 +546,7 @@ update_time_level (GstQueue * queue)
     queue->sink_tainted = FALSE;
   }
   sink_time = queue->sinktime;
+  sink_start_time = queue->sink_start_time;
 
   if (queue->src_tainted) {
     GST_LOG_OBJECT (queue, "update src time");
@@ -555,21 +557,31 @@ update_time_level (GstQueue * queue)
   }
   src_time = queue->srctime;
 
-  GST_LOG_OBJECT (queue, "sink %" GST_STIME_FORMAT ", src %" GST_STIME_FORMAT,
-      GST_STIME_ARGS (sink_time), GST_STIME_ARGS (src_time));
-
-  if (GST_CLOCK_STIME_IS_VALID (src_time)
-      && GST_CLOCK_STIME_IS_VALID (sink_time) && sink_time >= src_time)
-    queue->cur_level.time = sink_time - src_time;
-  else
+  GST_LOG_OBJECT (queue, "sink %" GST_STIME_FORMAT ", src %" GST_STIME_FORMAT
+      ", sink-start-time %" GST_STIME_FORMAT,
+      GST_STIME_ARGS (sink_time), GST_STIME_ARGS (src_time),
+      GST_STIME_ARGS (sink_start_time));
+
+  if (GST_CLOCK_STIME_IS_VALID (sink_time)) {
+    if (!GST_CLOCK_STIME_IS_VALID (src_time) &&
+        GST_CLOCK_STIME_IS_VALID (sink_start_time) &&
+        sink_time >= sink_start_time) {
+      /* If we got input buffers but output thread didn't push any buffer yet */
+      queue->cur_level.time = sink_time - sink_start_time;
+    } else if (GST_CLOCK_STIME_IS_VALID (src_time) && sink_time >= src_time) {
+      queue->cur_level.time = sink_time - src_time;
+    } else {
+      queue->cur_level.time = 0;
+    }
+  } else {
     queue->cur_level.time = 0;
+  }
 }
 
-/* take a SEGMENT event and apply the values to segment, updating the time
- * level of queue. */
+/* take a SEGMENT event and apply the values to segment */
 static void
 apply_segment (GstQueue * queue, GstEvent * event, GstSegment * segment,
-    gboolean sink)
+    gboolean is_sink)
 {
   gst_event_copy_segment (event, segment);
 
@@ -583,15 +595,15 @@ apply_segment (GstQueue * queue, GstEvent * event, GstSegment * segment,
     segment->stop = -1;
     segment->time = 0;
   }
-  if (sink)
-    queue->sink_tainted = TRUE;
-  else
-    queue->src_tainted = TRUE;
 
-  GST_DEBUG_OBJECT (queue, "configured SEGMENT %" GST_SEGMENT_FORMAT, segment);
+  /* Will be updated on buffer flows */
+  if (is_sink) {
+    queue->sink_tainted = FALSE;
+  } else {
+    queue->src_tainted = FALSE;
+  }
 
-  /* segment can update the time level of the queue */
-  update_time_level (queue);
+  GST_DEBUG_OBJECT (queue, "configured SEGMENT %" GST_SEGMENT_FORMAT, segment);
 }
 
 static void
@@ -603,63 +615,79 @@ apply_gap (GstQueue * queue, GstEvent * event,
 
   gst_event_parse_gap (event, &timestamp, &duration);
 
-  if (GST_CLOCK_TIME_IS_VALID (timestamp)) {
+  g_return_if_fail (GST_CLOCK_TIME_IS_VALID (timestamp));
 
-    if (GST_CLOCK_TIME_IS_VALID (duration)) {
-      timestamp += duration;
-    }
+  if (is_sink && !GST_CLOCK_STIME_IS_VALID (queue->sink_start_time)) {
+    queue->sink_start_time = my_segment_to_running_time (segment, timestamp);
+    GST_DEBUG_OBJECT (queue, "Start time updated to %" GST_STIME_FORMAT,
+        GST_STIME_ARGS (queue->sink_start_time));
+  }
 
-    segment->position = timestamp;
+  if (GST_CLOCK_TIME_IS_VALID (duration)) {
+    timestamp += duration;
+  }
 
-    if (is_sink)
-      queue->sink_tainted = TRUE;
-    else
-      queue->src_tainted = TRUE;
+  segment->position = timestamp;
 
-    /* calc diff with other end */
-    update_time_level (queue);
-  }
+  if (is_sink)
+    queue->sink_tainted = TRUE;
+  else
+    queue->src_tainted = TRUE;
+
+  /* calc diff with other end */
+  update_time_level (queue);
 }
 
 
 /* take a buffer and update segment, updating the time level of the queue. */
 static void
 apply_buffer (GstQueue * queue, GstBuffer * buffer, GstSegment * segment,
-    gboolean sink)
+    gboolean is_sink)
 {
   GstClockTime duration, timestamp;
 
   timestamp = GST_BUFFER_DTS_OR_PTS (buffer);
   duration = GST_BUFFER_DURATION (buffer);
 
-  /* if no timestamp is set, assume it's continuous with the previous
-   * time */
+  /* if no timestamp is set, assume it didn't change compared to the previous
+   * buffer and simply return here */
   if (timestamp == GST_CLOCK_TIME_NONE)
-    timestamp = segment->position;
+    return;
+
+  if (is_sink && !GST_CLOCK_STIME_IS_VALID (queue->sink_start_time) &&
+      GST_CLOCK_TIME_IS_VALID (timestamp)) {
+    queue->sink_start_time = my_segment_to_running_time (segment, timestamp);
+    GST_DEBUG_OBJECT (queue, "Start time updated to %" GST_STIME_FORMAT,
+        GST_STIME_ARGS (queue->sink_start_time));
+  }
 
   /* add duration */
   if (duration != GST_CLOCK_TIME_NONE)
     timestamp += duration;
 
   GST_LOG_OBJECT (queue, "%s position updated to %" GST_TIME_FORMAT,
-      segment == &queue->sink_segment ? "sink" : "src",
-      GST_TIME_ARGS (timestamp));
+      is_sink ? "sink" : "src", GST_TIME_ARGS (timestamp));
 
   segment->position = timestamp;
-  if (sink)
+  if (is_sink)
     queue->sink_tainted = TRUE;
   else
     queue->src_tainted = TRUE;
 
-
   /* calc diff with other end */
   update_time_level (queue);
 }
 
+typedef struct
+{
+  GstClockTime first_timestamp;
+  GstClockTime timestamp;
+} BufListData;
+
 static gboolean
 buffer_list_apply_time (GstBuffer ** buf, guint idx, gpointer user_data)
 {
-  GstClockTime *timestamp = user_data;
+  BufListData *data = user_data;
   GstClockTime btime;
 
   GST_TRACE ("buffer %u has pts %" GST_TIME_FORMAT " dts %" GST_TIME_FORMAT
@@ -668,13 +696,18 @@ buffer_list_apply_time (GstBuffer ** buf, guint idx, gpointer user_data)
       GST_TIME_ARGS (GST_BUFFER_DURATION (*buf)));
 
   btime = GST_BUFFER_DTS_OR_PTS (*buf);
-  if (GST_CLOCK_TIME_IS_VALID (btime))
-    *timestamp = btime;
+  if (GST_CLOCK_TIME_IS_VALID (btime)) {
+    if (!GST_CLOCK_TIME_IS_VALID (data->first_timestamp))
+      data->first_timestamp = btime;
+
+    data->timestamp = btime;
+  }
 
-  if (GST_BUFFER_DURATION_IS_VALID (*buf))
-    *timestamp += GST_BUFFER_DURATION (*buf);
+  if (GST_BUFFER_DURATION_IS_VALID (*buf)
+      && GST_CLOCK_TIME_IS_VALID (data->timestamp))
+    data->timestamp += GST_BUFFER_DURATION (*buf);
 
-  GST_TRACE ("ts now %" GST_TIME_FORMAT, GST_TIME_ARGS (*timestamp));
+  GST_TRACE ("ts now %" GST_TIME_FORMAT, GST_TIME_ARGS (data->timestamp));
 
   return TRUE;
 }
@@ -682,21 +715,35 @@ buffer_list_apply_time (GstBuffer ** buf, guint idx, gpointer user_data)
 /* take a buffer list and update segment, updating the time level of the queue */
 static void
 apply_buffer_list (GstQueue * queue, GstBufferList * buffer_list,
-    GstSegment * segment, gboolean sink)
+    GstSegment * segment, gboolean is_sink)
 {
-  GstClockTime timestamp;
+  BufListData data;
+
+  data.first_timestamp = GST_CLOCK_TIME_NONE;
 
-  /* if no timestamp is set, assume it's continuous with the previous time */
-  timestamp = segment->position;
+  /* if no timestamp is set, assume it didn't change compared to the previous
+   * buffer and simply return here without updating */
+  data.timestamp = GST_CLOCK_TIME_NONE;
 
-  gst_buffer_list_foreach (buffer_list, buffer_list_apply_time, &timestamp);
+  gst_buffer_list_foreach (buffer_list, buffer_list_apply_time, &data);
+
+  if (!GST_CLOCK_TIME_IS_VALID (data.timestamp))
+    return;
+
+  if (is_sink && !GST_CLOCK_STIME_IS_VALID (queue->sink_start_time) &&
+      GST_CLOCK_TIME_IS_VALID (data.first_timestamp)) {
+    queue->sink_start_time = my_segment_to_running_time (segment,
+        data.first_timestamp);
+    GST_DEBUG_OBJECT (queue, "Start time updated to %" GST_STIME_FORMAT,
+        GST_STIME_ARGS (queue->sink_start_time));
+  }
 
   GST_DEBUG_OBJECT (queue, "position updated to %" GST_TIME_FORMAT,
-      GST_TIME_ARGS (timestamp));
+      GST_TIME_ARGS (data.timestamp));
 
-  segment->position = timestamp;
+  segment->position = data.timestamp;
 
-  if (sink)
+  if (is_sink)
     queue->sink_tainted = TRUE;
   else
     queue->src_tainted = TRUE;
@@ -734,7 +781,8 @@ gst_queue_locked_flush (GstQueue * queue, gboolean full)
   queue->head_needs_discont = queue->tail_needs_discont = FALSE;
 
   queue->sinktime = queue->srctime = GST_CLOCK_STIME_NONE;
-  queue->sink_tainted = queue->src_tainted = TRUE;
+  queue->sink_start_time = GST_CLOCK_STIME_NONE;
+  queue->sink_tainted = queue->src_tainted = FALSE;
 
   /* we deleted a lot of something */
   GST_QUEUE_SIGNAL_DEL (queue);
@@ -1583,7 +1631,11 @@ gst_queue_loop (GstPad * pad)
 
     GST_CAT_LOG_OBJECT (queue_dataflow, queue,
         "pause task, reason:  %s", gst_flow_get_name (ret));
-    if (ret == GST_FLOW_FLUSHING) {
+
+    /* flush internal queue except for not-linked and eos
+     * not-linked: reconfigure event will start srcpad task
+     * eos: stream-start can clear eos and will start srcpad task again */
+    if (ret != GST_FLOW_NOT_LINKED && ret != GST_FLOW_EOS) {
       gst_queue_locked_flush (queue, FALSE);
     } else {
       GST_QUEUE_SIGNAL_DEL (queue);
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/plugins/elements/gstqueue.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/plugins/elements/gstqueue.h
index 2a9cb3612a9..cc632ad3557 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/plugins/elements/gstqueue.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/plugins/elements/gstqueue.h
@@ -99,6 +99,7 @@ struct _GstQueue {
 
   /* position of src/sink */
   GstClockTimeDiff sinktime, srctime;
+  GstClockTimeDiff sink_start_time;
   /* TRUE if either position needs to be recalculated */
   gboolean sink_tainted, src_tainted;
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/plugins/elements/gsttypefindelement.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/plugins/elements/gsttypefindelement.c
index 7ba30c386b8..6cd4e4b6bd1 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/plugins/elements/gsttypefindelement.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/plugins/elements/gsttypefindelement.c
@@ -490,7 +490,7 @@ gst_type_find_element_seek (GstTypeFindElement * typefind, GstEvent * event)
   gst_segment_do_seek (&seeksegment, rate, format, flags,
       start_type, start, stop_type, stop, NULL);
 
-  flush = ! !(flags & GST_SEEK_FLAG_FLUSH);
+  flush = !!(flags & GST_SEEK_FLAG_FLUSH);
 
   GST_DEBUG_OBJECT (typefind, "New segment %" GST_SEGMENT_FORMAT, &seeksegment);
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/projects/build/linux/common/config.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/projects/build/linux/common/config.h
index 00fc99d2408..1ca1ebf1102 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/projects/build/linux/common/config.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/projects/build/linux/common/config.h
@@ -470,7 +470,7 @@
 #define PACKAGE_NAME "GStreamer"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "GStreamer 1.22.6"
+#define PACKAGE_STRING "GStreamer 1.24.6"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "gstreamer"
@@ -479,7 +479,7 @@
 #undef PACKAGE_URL
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.22.6"
+#define PACKAGE_VERSION "1.24.6"
 
 /* directory where plugins are located */
 #undef PLUGINDIR
@@ -519,7 +519,7 @@
 #undef USE_POISONING
 
 /* Version number of package */
-#define VERSION "1.22.6"
+#define VERSION "1.24.6"
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/projects/build/osx/common/x86_64/config.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/projects/build/osx/common/x86_64/config.h
index 6d88c77c4f9..7b6836891d7 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/projects/build/osx/common/x86_64/config.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/projects/build/osx/common/x86_64/config.h
@@ -474,7 +474,7 @@
 #define PACKAGE_NAME "GStreamer"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "GStreamer 1.22.6"
+#define PACKAGE_STRING "GStreamer 1.24.6"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "gstreamer"
@@ -483,7 +483,7 @@
 #undef PACKAGE_URL
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.22.6"
+#define PACKAGE_VERSION "1.24.6"
 
 /* directory where plugins are located */
 #undef PLUGINDIR
@@ -523,7 +523,7 @@
 #undef USE_POISONING
 
 /* Version number of package */
-#define VERSION "1.22.6"
+#define VERSION "1.24.6"
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/projects/build/win32/common/config.h b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/projects/build/win32/common/config.h
index 73c0b13057a..69b53edcc78 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/projects/build/win32/common/config.h
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/projects/build/win32/common/config.h
@@ -475,7 +475,7 @@
 #define PACKAGE_NAME "GStreamer"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "GStreamer 1.22.6"
+#define PACKAGE_STRING "GStreamer 1.24.6"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "gstreamer"
@@ -484,7 +484,7 @@
 #undef PACKAGE_URL
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.22.6"
+#define PACKAGE_VERSION "1.24.6"
 
 /* directory where plugins are located */
 #undef PLUGINDIR
@@ -524,7 +524,7 @@
 #undef USE_POISONING
 
 /* Version number of package */
-#define VERSION "1.22.6"
+#define VERSION "1.24.6"
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */
diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
index 374f50982d4..e350322a6c7 100644
--- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
+++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
@@ -127,7 +127,6 @@ SOURCES = gstreamer/gst/gst.c \
           gstreamer/gst/gstpipeline.c \
           gstreamer/gst/gstplugin.c \
           gstreamer/gst/gstpluginfeature.c \
-          gstreamer/gst/gstpluginloader.c \
           gstreamer/gst/gstpoll.c \
           gstreamer/gst/gstprotection.c \
           gstreamer/gst/gstquark.c \
@@ -172,6 +171,7 @@ SOURCES = gstreamer/gst/gst.c \
           gstreamer/libs/gst/base/gsttypefindhelper.c \
           gst-plugins-base/gst-libs/gst/app/gstapp-marshal.c \
           gst-plugins-base/gst-libs/gst/app/gstappsink.c \
+          gst-plugins-base/gst-libs/gst/app/gstapputils.c \
           gst-plugins-base/gst-libs/gst/audio/audio.c \
           gst-plugins-base/gst-libs/gst/audio/audio-channels.c \
           gst-plugins-base/gst-libs/gst/audio/audio-channel-mixer.c \
diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/mac/glib-lite/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/mac/glib-lite/Makefile
index 40b1eb3b4a9..85cb4a3ed93 100644
--- a/modules/javafx.media/src/main/native/gstreamer/projects/mac/glib-lite/Makefile
+++ b/modules/javafx.media/src/main/native/gstreamer/projects/mac/glib-lite/Makefile
@@ -77,6 +77,7 @@ C_SOURCES = glib/garcbox.c \
             glib/gdataset.c \
             glib/gdate.c \
             glib/gdatetime.c \
+            glib/gdatetime-private.c \
             glib/gdir.c \
             glib/gerror.c \
             glib/genviron.c \
diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile
index b382fd8c108..24db4910f20 100644
--- a/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile
+++ b/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile
@@ -122,7 +122,6 @@ C_SOURCES = gstreamer/gst/gst.c \
             gstreamer/gst/gstpipeline.c \
             gstreamer/gst/gstplugin.c \
             gstreamer/gst/gstpluginfeature.c \
-            gstreamer/gst/gstpluginloader.c \
             gstreamer/gst/gstpoll.c \
             gstreamer/gst/gstprotection.c \
             gstreamer/gst/gstquark.c \
@@ -167,6 +166,7 @@ C_SOURCES = gstreamer/gst/gst.c \
             gstreamer/libs/gst/base/gsttypefindhelper.c \
             gst-plugins-base/gst-libs/gst/app/gstapp-marshal.c \
             gst-plugins-base/gst-libs/gst/app/gstappsink.c \
+            gst-plugins-base/gst-libs/gst/app/gstapputils.c \
             gst-plugins-base/gst-libs/gst/audio/audio.c \
             gst-plugins-base/gst-libs/gst/audio/audio-channels.c \
             gst-plugins-base/gst-libs/gst/audio/audio-channel-mixer.c \
diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/win/glib-lite/Makefile.glib b/modules/javafx.media/src/main/native/gstreamer/projects/win/glib-lite/Makefile.glib
index 9acf552341e..12db4749bf4 100644
--- a/modules/javafx.media/src/main/native/gstreamer/projects/win/glib-lite/Makefile.glib
+++ b/modules/javafx.media/src/main/native/gstreamer/projects/win/glib-lite/Makefile.glib
@@ -30,6 +30,7 @@ C_SOURCES = \
         gdataset.c \
         gdate.c \
         gdatetime.c \
+        gdatetime-private.c \
         gdir.c \
         genviron.c \
         gerror.c \
diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/win/gstreamer-lite/Makefile.gstreamer b/modules/javafx.media/src/main/native/gstreamer/projects/win/gstreamer-lite/Makefile.gstreamer
index 64b11cece2a..eb4d4fbc150 100644
--- a/modules/javafx.media/src/main/native/gstreamer/projects/win/gstreamer-lite/Makefile.gstreamer
+++ b/modules/javafx.media/src/main/native/gstreamer/projects/win/gstreamer-lite/Makefile.gstreamer
@@ -61,7 +61,6 @@ C_SOURCES = gstreamer/gst/gst.c \
             gstreamer/gst/gstpipeline.c \
             gstreamer/gst/gstplugin.c \
             gstreamer/gst/gstpluginfeature.c \
-            gstreamer/gst/gstpluginloader.c \
             gstreamer/gst/gstpoll.c \
             gstreamer/gst/gstprotection.c \
             gstreamer/gst/gstquark.c \
@@ -106,6 +105,7 @@ C_SOURCES = gstreamer/gst/gst.c \
             gstreamer/libs/gst/base/gsttypefindhelper.c \
             gst-plugins-base/gst-libs/gst/app/gstapp-marshal.c \
             gst-plugins-base/gst-libs/gst/app/gstappsink.c \
+            gst-plugins-base/gst-libs/gst/app/gstapputils.c \
             gst-plugins-base/gst-libs/gst/audio/audio.c \
             gst-plugins-base/gst-libs/gst/audio/audio-channels.c \
             gst-plugins-base/gst-libs/gst/audio/audio-channel-mixer.c \
diff --git a/modules/javafx.media/src/main/native/vs_project/glib/glib.vcxproj b/modules/javafx.media/src/main/native/vs_project/glib/glib.vcxproj
index c72bf500013..5526bf105b9 100644
--- a/modules/javafx.media/src/main/native/vs_project/glib/glib.vcxproj
+++ b/modules/javafx.media/src/main/native/vs_project/glib/glib.vcxproj
@@ -44,6 +44,9 @@
     <ClCompile Include="..\..\gstreamer\3rd_party\glib\glib\gdatetime.c">
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_WINDOWS;_USRDLL;GLIB_COMPILATION;GSTREAMER_LITE;HAVE_CONFIG_H;G_LOG_DOMAIN=\"Glib\";G_DISABLE_DEPRECATED;PCRE_STATIC;LINK_SIZE=2;MAX_NAME_SIZE=32;MAX_NAME_COUNT=10000;NEWLINE=-1;POSIX_MALLOC_THRESHOLD=10;MATCH_LIMIT=10000000;MATCH_LIMIT_RECURSION=10000000;HAVE_LONG_LONG;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
+    <ClCompile Include="..\..\gstreamer\3rd_party\glib\glib\gdatetime-private.c">
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_WINDOWS;_USRDLL;GLIB_COMPILATION;GSTREAMER_LITE;HAVE_CONFIG_H;G_LOG_DOMAIN=\"Glib\";G_DISABLE_DEPRECATED;PCRE_STATIC;LINK_SIZE=2;MAX_NAME_SIZE=32;MAX_NAME_COUNT=10000;NEWLINE=-1;POSIX_MALLOC_THRESHOLD=10;MATCH_LIMIT=10000000;MATCH_LIMIT_RECURSION=10000000;HAVE_LONG_LONG;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
     <ClCompile Include="..\..\gstreamer\3rd_party\glib\glib\gdir.c">
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_WINDOWS;_USRDLL;GLIB_COMPILATION;GSTREAMER_LITE;HAVE_CONFIG_H;G_LOG_DOMAIN=\"Glib\";G_DISABLE_DEPRECATED;PCRE_STATIC;LINK_SIZE=2;MAX_NAME_SIZE=32;MAX_NAME_COUNT=10000;NEWLINE=-1;POSIX_MALLOC_THRESHOLD=10;MATCH_LIMIT=10000000;MATCH_LIMIT_RECURSION=10000000;HAVE_LONG_LONG;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
diff --git a/modules/javafx.media/src/main/native/vs_project/glib/glib.vcxproj.filters b/modules/javafx.media/src/main/native/vs_project/glib/glib.vcxproj.filters
index 8320ebc2aeb..effcc46030c 100644
--- a/modules/javafx.media/src/main/native/vs_project/glib/glib.vcxproj.filters
+++ b/modules/javafx.media/src/main/native/vs_project/glib/glib.vcxproj.filters
@@ -12,6 +12,7 @@
     <ClCompile Include="..\..\gstreamer\3rd_party\glib\glib\gdataset.c" />
     <ClCompile Include="..\..\gstreamer\3rd_party\glib\glib\gdate.c" />
     <ClCompile Include="..\..\gstreamer\3rd_party\glib\glib\gdatetime.c" />
+    <ClCompile Include="..\..\gstreamer\3rd_party\glib\glib\gdatetime-private.c" />
     <ClCompile Include="..\..\gstreamer\3rd_party\glib\glib\gdir.c" />
     <ClCompile Include="..\..\gstreamer\3rd_party\glib\glib\gerror.c" />
     <ClCompile Include="..\..\gstreamer\3rd_party\glib\glib\gfileutils.c" />
diff --git a/modules/javafx.media/src/main/native/vs_project/gstreamer/gstreamer.vcxproj b/modules/javafx.media/src/main/native/vs_project/gstreamer/gstreamer.vcxproj
index 5b51dfd1566..896164b8b13 100644
--- a/modules/javafx.media/src/main/native/vs_project/gstreamer/gstreamer.vcxproj
+++ b/modules/javafx.media/src/main/native/vs_project/gstreamer/gstreamer.vcxproj
@@ -11,18 +11,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\gstreamer\gstreamer-lite\gst-plugins-bad\gst\aiff\aiff.c">
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_WINDOWS;LIBGSTELEMENTS_EXPORTS;HAVE_CONFIG_H;_WIN32_DCOM;COBJMACROS;GSTREAMER_LITE;GST_REMOVE_DEPRECATED;GST_DISABLE_GST_DEBUG;GST_DISABLE_LOADSAVE;_USE_MATH_DEFINES;_USRDLL;_WINDLL;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\gstreamer\gstreamer-lite\gst-plugins-bad\gst\aiff\aiffparse.c">
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_WINDOWS;LIBGSTELEMENTS_EXPORTS;HAVE_CONFIG_H;_WIN32_DCOM;COBJMACROS;GSTREAMER_LITE;GST_REMOVE_DEPRECATED;GST_DISABLE_GST_DEBUG;GST_DISABLE_LOADSAVE;_USE_MATH_DEFINES;_USRDLL;_WINDLL;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\gstreamer\gstreamer-lite\gst-plugins-base\gst-libs\gst\app\gstappbuffer.c">
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">LIBGSTREAMER_EXPORTS;HAVE_CONFIG_H;HAVE_WIN32;LIBDSHOW_EXPORTS;GSTREAMER_LITE;GST_REMOVE_DEPRECATED;GST_REMOVE_DISABLED;GST_DISABLE_GST_DEBUG;GST_DISABLE_LOADSAVE;_USE_MATH_DEFINES;_USRDLL;_WINDLL;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\gstreamer\gstreamer-lite\gst-plugins-base\gst-libs\gst\app\gstappsink.c">
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">LIBGSTREAMER_EXPORTS;HAVE_CONFIG_H;HAVE_WIN32;LIBDSHOW_EXPORTS;GSTREAMER_LITE;GST_REMOVE_DEPRECATED;GST_REMOVE_DISABLED;GST_DISABLE_GST_DEBUG;GST_DISABLE_LOADSAVE;_USE_MATH_DEFINES;_USRDLL;_WINDLL;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
+    <ClCompile Include="..\..\gstreamer\gstreamer-lite\gst-plugins-bad\gst\aiff\aiff.c" />
+    <ClCompile Include="..\..\gstreamer\gstreamer-lite\gst-plugins-bad\gst\aiff\aiffparse.c" />
+    <ClCompile Include="..\..\gstreamer\gstreamer-lite\gst-plugins-base\gst-libs\gst\app\gstappbuffer.c" />
+    <ClCompile Include="..\..\gstreamer\gstreamer-lite\gst-plugins-base\gst-libs\gst\app\gstappsink.c" />
+    <ClCompile Include="..\..\gstreamer\gstreamer-lite\gst-plugins-base\gst-libs\gst\app\gstapputils.c" />
     <ClCompile Include="..\..\gstreamer\gstreamer-lite\gst-plugins-base\gst-libs\gst\audio\audio-channels.c" />
     <ClCompile Include="..\..\gstreamer\gstreamer-lite\gst-plugins-base\gst-libs\gst\audio\audio-enumtypes.c" />
     <ClCompile Include="..\..\gstreamer\gstreamer-lite\gst-plugins-base\gst-libs\gst\audio\audio-format.c" />
@@ -333,9 +326,6 @@
     <ClCompile Include="..\..\gstreamer\gstreamer-lite\gstreamer\gst\gstpluginfeature.c">
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_WINDOWS;LIBGSTREAMER_EXPORTS;HAVE_CONFIG_H;HAVE_WIN32;LIBDSHOW_EXPORTS;GSTREAMER_LITE;GST_REMOVE_DEPRECATED;GST_REMOVE_DISABLED;GST_DISABLE_GST_DEBUG;GST_DISABLE_LOADSAVE;_USE_MATH_DEFINES;_USRDLL;_WINDLL;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\gstreamer\gstreamer-lite\gstreamer\gst\gstpluginloader.c">
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_WINDOWS;LIBGSTREAMER_EXPORTS;HAVE_CONFIG_H;HAVE_WIN32;LIBDSHOW_EXPORTS;GSTREAMER_LITE;GST_REMOVE_DEPRECATED;GST_REMOVE_DISABLED;GST_DISABLE_GST_DEBUG;GST_DISABLE_LOADSAVE;_USE_MATH_DEFINES;_USRDLL;_WINDLL;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
     <ClCompile Include="..\..\gstreamer\gstreamer-lite\gstreamer\gst\gstpoll.c">
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_WINDOWS;LIBGSTREAMER_EXPORTS;HAVE_CONFIG_H;HAVE_WIN32;LIBDSHOW_EXPORTS;GSTREAMER_LITE;GST_REMOVE_DEPRECATED;GST_REMOVE_DISABLED;GST_DISABLE_GST_DEBUG;GST_DISABLE_LOADSAVE;_USE_MATH_DEFINES;_USRDLL;_WINDLL;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
diff --git a/modules/javafx.media/src/main/native/vs_project/gstreamer/gstreamer.vcxproj.filters b/modules/javafx.media/src/main/native/vs_project/gstreamer/gstreamer.vcxproj.filters
index 56e65589e6b..2158b1838f1 100644
--- a/modules/javafx.media/src/main/native/vs_project/gstreamer/gstreamer.vcxproj.filters
+++ b/modules/javafx.media/src/main/native/vs_project/gstreamer/gstreamer.vcxproj.filters
@@ -216,9 +216,6 @@
     <ClCompile Include="..\..\gstreamer\gstreamer-lite\gstreamer\gst\gstpluginfeature.c">
       <Filter>gstreamer\gst</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\gstreamer\gstreamer-lite\gstreamer\gst\gstpluginloader.c">
-      <Filter>gstreamer\gst</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\gstreamer\gstreamer-lite\gstreamer\gst\gstpoll.c">
       <Filter>gstreamer\gst</Filter>
     </ClCompile>
@@ -324,6 +321,9 @@
     <ClCompile Include="..\..\gstreamer\gstreamer-lite\gst-plugins-base\gst-libs\gst\app\gstappsink.c">
       <Filter>gst-plugins-base\gst-libs\gst\app</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\gstreamer\gstreamer-lite\gst-plugins-base\gst-libs\gst\app\gstapputils.c">
+      <Filter>gst-plugins-base\gst-libs\gst\app</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\gstreamer\gstreamer-lite\gst-plugins-base\gst-libs\gst\fft\gstfft.c">
       <Filter>gst-plugins-base\gst-libs\gst\fft</Filter>
     </ClCompile>

From a53bc589ac37d490b1406a2b977097a06bf5ac74 Mon Sep 17 00:00:00 2001
From: Jose Pereda <jpereda@openjdk.org>
Date: Thu, 29 Aug 2024 14:26:58 +0000
Subject: [PATCH 26/75] 8339236: Suppress removal warnings for Security Manager
 methods in iOS sources

Reviewed-by: kcr, jvos
---
 .../ios/java/javafx/scene/web/ExportedJavaObject.java    | 4 +++-
 .../src/ios/java/javafx/scene/web/HTMLEditorSkin.java    | 3 +++
 .../src/ios/java/javafx/scene/web/JS2JavaBridge.java     | 1 +
 .../src/ios/java/javafx/scene/web/WebEngine.java         | 9 +++++++--
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/modules/javafx.web/src/ios/java/javafx/scene/web/ExportedJavaObject.java b/modules/javafx.web/src/ios/java/javafx/scene/web/ExportedJavaObject.java
index 4196d538e6a..348d28dca20 100644
--- a/modules/javafx.web/src/ios/java/javafx/scene/web/ExportedJavaObject.java
+++ b/modules/javafx.web/src/ios/java/javafx/scene/web/ExportedJavaObject.java
@@ -172,12 +172,14 @@ private Object cast(Class<?> desiredType, Object value) throws Exception {
     // returns JSON-encoded result
     public String call(final String methodName, final String args) throws CallException {
         try {
-            return AccessController.doPrivileged(new PrivilegedExceptionAction<String>() {
+            @SuppressWarnings("removal")
+            String result = AccessController.doPrivileged(new PrivilegedExceptionAction<String>() {
                 @Override
                 public String run() throws Exception {
                     return callWorker(methodName, args);
                 }
             }, getJSBridge().getAccessControlContext());
+            return result;
         } catch (Exception e) {
             if (e instanceof CallException) {
                 throw (CallException) e;
diff --git a/modules/javafx.web/src/ios/java/javafx/scene/web/HTMLEditorSkin.java b/modules/javafx.web/src/ios/java/javafx/scene/web/HTMLEditorSkin.java
index ef4a43beb57..b803cae26d2 100644
--- a/modules/javafx.web/src/ios/java/javafx/scene/web/HTMLEditorSkin.java
+++ b/modules/javafx.web/src/ios/java/javafx/scene/web/HTMLEditorSkin.java
@@ -823,6 +823,7 @@ private Button addButton(ToolBar toolbar, final String iconName, String tooltipT
         button.getStyleClass().add(styleClass);
         toolbar.getItems().add(button);
 
+        @SuppressWarnings("removal")
         Image icon = AccessController.doPrivileged(new PrivilegedAction<Image>() {
             @Override public Image run() {
                 return new Image(HTMLEditorSkin.class.getResource(iconName).toString());
@@ -854,6 +855,7 @@ private ToggleButton addToggleButton(ToolBar toolbar, ToggleGroup toggleGroup,
             toggleButton.setToggleGroup(toggleGroup);
         }
 
+        @SuppressWarnings("removal")
         Image icon = AccessController.doPrivileged(new PrivilegedAction<Image>() {
             @Override public Image run() {
                 return new Image(HTMLEditorSkin.class.getResource(iconName).toString());
@@ -901,6 +903,7 @@ private void updateNodeOrientation() {
         if (orientation == RIGHT_TO_LEFT) {
             try {
                 final String iconName = resources.getString("numbersIcon-rtl");
+                @SuppressWarnings("removal")
                 Image icon = AccessController.doPrivileged(new PrivilegedAction<Image>() {
                     @Override public Image run() {
                         return new Image(HTMLEditorSkin.class.getResource(iconName).toString());
diff --git a/modules/javafx.web/src/ios/java/javafx/scene/web/JS2JavaBridge.java b/modules/javafx.web/src/ios/java/javafx/scene/web/JS2JavaBridge.java
index 43c9d2d1b3d..9fb0a7fe6b4 100644
--- a/modules/javafx.web/src/ios/java/javafx/scene/web/JS2JavaBridge.java
+++ b/modules/javafx.web/src/ios/java/javafx/scene/web/JS2JavaBridge.java
@@ -103,6 +103,7 @@ String getJavaBridge() {
         return javaBridge;
     }
 
+    @SuppressWarnings("removal")
     AccessControlContext getAccessControlContext() {
         return webEngine.getAccessControlContext();
     }
diff --git a/modules/javafx.web/src/ios/java/javafx/scene/web/WebEngine.java b/modules/javafx.web/src/ios/java/javafx/scene/web/WebEngine.java
index da8236f7793..8a0d34a77fc 100644
--- a/modules/javafx.web/src/ios/java/javafx/scene/web/WebEngine.java
+++ b/modules/javafx.web/src/ios/java/javafx/scene/web/WebEngine.java
@@ -517,7 +517,9 @@ public WebEngine() {
      * Creates a new engine and loads a Web page into it.
      */
     public WebEngine(String url) {
-        accessControlContext = AccessController.getContext();
+        @SuppressWarnings("removal")
+        AccessControlContext tmpAcc = AccessController.getContext();
+        accessControlContext = tmpAcc;
         js2javaBridge = new JS2JavaBridge(this);
         load(url);
     }
@@ -947,14 +949,17 @@ void onAlertNotify(String text) {
         }
     }
 
+    @SuppressWarnings("removal")
     final private AccessControlContext accessControlContext;
 
+    @SuppressWarnings("removal")
     AccessControlContext getAccessControlContext() {
         return accessControlContext;
     }
 
     private void dispatchWebEvent(final EventHandler handler, final WebEvent ev) {
-        AccessController.doPrivileged(new PrivilegedAction<Void>() {
+        @SuppressWarnings("removal")
+        Void result = AccessController.doPrivileged(new PrivilegedAction<Void>() {
             @Override
             public Void run() {
                 handler.handle(ev);

From ca70a07b3ee712b1d06baf8a3901e6ae96070124 Mon Sep 17 00:00:00 2001
From: Oliver Schmidtmer <O.Schmidtmer@elo.com>
Date: Fri, 30 Aug 2024 19:45:56 +0000
Subject: [PATCH 27/75] 8337481: File API: file.name contains path instead of
 name

Reviewed-by: arapte, hmeda
---
 .../Source/WTF/wtf/java/FileSystemJava.cpp    |  9 +--
 .../native/Source/WebCore/fileapi/File.cpp    |  5 --
 .../Source/WebCore/fileapi/FileCocoa.mm       |  4 +-
 .../java/test/javafx/scene/web/FileTest.java  | 76 +++++++++++++++++++
 4 files changed, 79 insertions(+), 15 deletions(-)
 create mode 100644 modules/javafx.web/src/test/java/test/javafx/scene/web/FileTest.java

diff --git a/modules/javafx.web/src/main/native/Source/WTF/wtf/java/FileSystemJava.cpp b/modules/javafx.web/src/main/native/Source/WTF/wtf/java/FileSystemJava.cpp
index 11130c0b64d..bdbcd978c5e 100644
--- a/modules/javafx.web/src/main/native/Source/WTF/wtf/java/FileSystemJava.cpp
+++ b/modules/javafx.web/src/main/native/Source/WTF/wtf/java/FileSystemJava.cpp
@@ -273,7 +273,7 @@ int readFromFile(PlatformFileHandle handle, void* data, int length)
     return result;
 }
 
-String pathGetFileName(const String& path)
+String pathFileName(const String& path)
 {
     JNIEnv* env = WTF::GetJavaEnv();
 
@@ -441,13 +441,6 @@ bool isHiddenFile(const String& path)
     return false;
 }
 
-String pathFileName(const String& path)
-{
-    UNUSED_PARAM(path);
-   // return path.substring(path.reverseFind('/') + 1);
-   return nullString();
-}
-
 bool hardLinkOrCopyFile(const String& targetPath, const String& linkPath)
 {
     fprintf(stderr, "hardLinkOrCopyFile(const String& targetPath, const String& linkPath) NOT IMPLEMENTED\n");
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/fileapi/File.cpp b/modules/javafx.web/src/main/native/Source/WebCore/fileapi/File.cpp
index 85e1f378f36..700c558d3a0 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/fileapi/File.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/fileapi/File.cpp
@@ -135,12 +135,7 @@ void File::computeNameAndContentType(const String& path, const String& nameOverr
     }
 #endif
 
-#if !PLATFORM(JAVA)
     effectiveName = nameOverride.isEmpty() ? FileSystem::pathFileName(path) : nameOverride;
-#else
-    // Use simple path not from std::FileSystem
-    effectiveName = nameOverride.isEmpty() ? path : nameOverride;
-#endif
     size_t index = effectiveName.reverseFind('.');
     if (index != notFound) {
         callOnMainThreadAndWait([&effectiveContentType, &effectiveName, index] {
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/fileapi/FileCocoa.mm b/modules/javafx.web/src/main/native/Source/WebCore/fileapi/FileCocoa.mm
index 664f9a53613..64988d4a0e1 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/fileapi/FileCocoa.mm
+++ b/modules/javafx.web/src/main/native/Source/WebCore/fileapi/FileCocoa.mm
@@ -59,9 +59,9 @@
 
 void File::computeNameAndContentTypeForReplacedFile(const String& path, const String& nameOverride, String& effectiveName, String& effectiveContentType)
 {
-    ASSERT(!FileSystem::pathGetFileName(path).endsWith('/')); // Expecting to get a path without trailing slash, even for directories.
+    ASSERT(!FileSystem::pathFileName(path).endsWith('/')); // Expecting to get a path without trailing slash, even for directories.
     effectiveContentType = "application/zip"_s;
-    effectiveName = makeString((nameOverride.isNull() ? FileSystem::pathGetFileName(path) : nameOverride), ".zip"_s);
+    effectiveName = makeString((nameOverride.isNull() ? FileSystem::pathFileName(path) : nameOverride), ".zip"_s);
 }
 
 }
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/FileTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/FileTest.java
new file mode 100644
index 00000000000..515a20ef28e
--- /dev/null
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/FileTest.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+
+package test.javafx.scene.web;
+
+import java.io.File;
+
+import com.sun.javafx.webkit.UIClientImplShim;
+import com.sun.webkit.WebPage;
+import com.sun.webkit.WebPageShim;
+import javafx.concurrent.Worker.State;
+import javafx.scene.web.WebEngineShim;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class FileTest extends TestBase {
+    private final WebPage page = WebEngineShim.getPage(getEngine());
+    private final String[] fileList = { new File("src/test/resources/test/html/HelloWorld.txt").getAbsolutePath() };
+    private final String script = String.format("<script type='text/javascript'>" +
+                                    "var result;" +
+                                    "window.addEventListener('click', (e) => {" +
+                                        "document.getElementById('file').click();" +
+                                    "});" +
+                                    "function readFile()" +
+                                    "{" +
+                                        "file = event.target.files[0];" +
+                                        "result = file.name;" +
+                                    "}" +
+                                    "</script>" +
+                                    "<body> <input type='file' id='file' onchange='readFile()'/> </body>");
+    @Before
+    public void before() {
+        UIClientImplShim.test_setChooseFiles(fileList);
+    }
+
+    private void loadFileReaderTestScript(String testScript) {
+        loadContent(testScript);
+        submit(() -> {
+            // Send a dummy mouse click event at (0,0) to simulate click on file chooser button.
+            WebPageShim.click(page, 0, 0);
+        });
+    }
+
+    @Test
+    public void testFileName() {
+        loadFileReaderTestScript(script);
+        submit(() -> {
+            assertEquals("Unexpected file name received", "HelloWorld.txt", getEngine().executeScript("window.result"));
+        });
+    }
+}

From e0ceafb7dba15b4faa683c336828e79f19a59d30 Mon Sep 17 00:00:00 2001
From: Oliver Schmidtmer <O.Schmidtmer@elo.com>
Date: Sun, 1 Sep 2024 03:50:17 +0000
Subject: [PATCH 28/75] 8334124: Rendering issues with CSS "text-shadow" in
 WebView

Reviewed-by: kcr, jbhaskar
---
 .../graphics/java/GraphicsContextJava.cpp     |  5 ++
 .../test/javafx/scene/web/ShadowTest.java     | 79 +++++++++++++++++++
 2 files changed, 84 insertions(+)
 create mode 100644 modules/javafx.web/src/test/java/test/javafx/scene/web/ShadowTest.java

diff --git a/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/java/GraphicsContextJava.cpp b/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/java/GraphicsContextJava.cpp
index 0ac67ab890d..8715e7de396 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/java/GraphicsContextJava.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/java/GraphicsContextJava.cpp
@@ -1025,6 +1025,11 @@ void GraphicsContextJava::didUpdateState(GraphicsContextState& state)
         if (dropShadowOpt.has_value()) {
             const auto& dropShadow = dropShadowOpt.value();
             setPlatformShadow(dropShadow.offset,dropShadow.radius, dropShadow.color);
+        } else {
+            float clr = 0.0f;
+            platformContext()->rq().freeSpace(32)
+            << (jint)com_sun_webkit_graphics_GraphicsDecoder_SETSHADOW
+            << clr << clr << clr << clr << clr << clr << clr;
         }
     }
 
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/ShadowTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/ShadowTest.java
new file mode 100644
index 00000000000..ffdfcded351
--- /dev/null
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/ShadowTest.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+
+package test.javafx.scene.web;
+
+import com.sun.webkit.WebPage;
+import com.sun.webkit.WebPageShim;
+import javafx.scene.web.WebEngineShim;
+import org.junit.Test;
+
+import java.awt.Color;
+import java.awt.image.BufferedImage;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+public class ShadowTest extends TestBase {
+    /**
+     * @test
+     * @bug 8334124
+     * summary
+     * Paints an text with a red shadow, and another text without shadow.
+     * Checks by red pixel count if the shadow exists and only exists on the first text.
+     */
+    @Test public void testShadow() {
+        loadContent("<html>\n" +
+                    "<body style='margin: 0px;'>\n" +
+                    "<p style='text-shadow:5px 5px 0 #FF0000;height: 100px;'>text</p>\n" +
+                    "<p style='height: 100px'>text</p>\n" +
+                    "</body>\n" +
+                    "</html>");
+        submit(() -> {
+                final WebPage webPage = WebEngineShim.getPage(getEngine());
+                assertNotNull(webPage);
+                final BufferedImage img = WebPageShim.paint(webPage, 0, 0, 800, 600);
+                assertNotNull(img);
+
+                int redShadowCnt = 0;
+                int noShadowCnt = 0;
+                for (int x = 0; x < 100; x++) {
+                    for (int y = 0; y < 200; y++) {
+                        Color pixelColor = new Color(img.getRGB(x, y), true);
+                        if (isColorsSimilar(Color.RED, pixelColor, 1)) {
+                            if (y < 100) {
+                                redShadowCnt++;
+                            } else {
+                                noShadowCnt++;
+                            }
+                        }
+                    }
+                }
+
+                assertTrue("no shadow found", redShadowCnt > 0);
+                assertTrue("wrong shadow found", noShadowCnt == 0);
+        });
+    }
+}

From 2bf8ffc411d404be2a3f9107a62ffa7a72fcccbd Mon Sep 17 00:00:00 2001
From: ANUPAM DEV <anupam.dev@oracle.com>
Date: Tue, 3 Sep 2024 16:19:36 +0000
Subject: [PATCH 29/75] 8339212: gradle downloads x64 binary of SWT on
 Linux/aarch64

Reviewed-by: kcr, sykora
---
 build.gradle                     | 3 ++-
 gradle/verification-metadata.xml | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 13178a974f6..7f970aade15 100644
--- a/build.gradle
+++ b/build.gradle
@@ -501,7 +501,8 @@ ext.SWT_FILE_NAME =
     IS_MAC && IS_AARCH64 ? "org.eclipse.swt.cocoa.macosx.aarch64_3.124.200.v20231113-1355" :
     IS_MAC && !IS_AARCH64 ? "org.eclipse.swt.cocoa.macosx.x86_64_3.124.200.v20231113-1355" :
     IS_WINDOWS ? "org.eclipse.swt.win32.win32.x86_64_3.124.200.v20231113-1355" :
-    IS_LINUX ? "org.eclipse.swt.gtk.linux.x86_64_3.124.200.v20231113-1355" : ""
+    IS_LINUX && IS_AARCH64 ? "org.eclipse.swt.gtk.linux.aarch64_3.124.200.v20231113-1355" :
+    IS_LINUX && !IS_AARCH64 ? "org.eclipse.swt.gtk.linux.x86_64_3.124.200.v20231113-1355" : ""
 
 // Specifies whether to run full tests (true) or smoke tests (false)
 defineProperty("FULL_TEST", "false")
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index b7e5141abd8..7681a89b872 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -81,6 +81,12 @@
          </artifact>
       </component>
 
+      <component group="" name="org.eclipse.swt.gtk.linux.aarch64_3.124.200.v20231113-1355" version="">
+         <artifact name="org.eclipse.swt.gtk.linux.aarch64_3.124.200.v20231113-1355-.jar">
+            <sha256 value="8fdf324aae5b4f11476c324acd63193fe91f52a7a4594d6361424d0f2360f63b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+
       <component group="" name="org.eclipse.swt.win32.win32.x86_64_3.124.200.v20231113-1355" version="">
          <artifact name="org.eclipse.swt.win32.win32.x86_64_3.124.200.v20231113-1355-.jar">
             <sha256 value="377447fabe2d6732992b8c396c94d06dbc83910e221d49c1b7ccb57f330b8187" origin="Generated by Gradle"/>

From 465228269ba1d9ad4e902e9f161b79b8a1ebcd81 Mon Sep 17 00:00:00 2001
From: Kevin Rushforth <kcr@openjdk.org>
Date: Tue, 3 Sep 2024 19:16:55 +0000
Subject: [PATCH 30/75] 8339178: [macos] Swing InterOp Platform.exit() crash
 8339183: [macos] Premature exit in Swing interop when last JFrame is disposed

Reviewed-by: psadhukhan, azvegint
---
 .../com/sun/glass/ui/mac/MacApplication.java  | 39 +++++++++
 .../main/native-glass/mac/GlassApplication.m  |  9 +-
 .../test/launchertest/MainLauncherTest.java   |  5 +-
 .../test/launchertest/PlatformExitApp.java    | 30 +------
 .../test/launchertest/TestAWTAppDaemon.java   | 85 +++++++++++++++++++
 .../java/test/launchertest/TestAppDaemon.java | 74 ++++++++++++++++
 .../launchertest/TestAppPlatformExitAWT.java  | 77 +++++++++++++++++
 .../src/test/java/test/launchertest/Util.java | 57 +++++++++++++
 8 files changed, 341 insertions(+), 35 deletions(-)
 create mode 100644 tests/system/src/test/java/test/launchertest/TestAWTAppDaemon.java
 create mode 100644 tests/system/src/test/java/test/launchertest/TestAppDaemon.java
 create mode 100644 tests/system/src/test/java/test/launchertest/TestAppPlatformExitAWT.java
 create mode 100644 tests/system/src/test/java/test/launchertest/Util.java

diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/mac/MacApplication.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/mac/MacApplication.java
index 13e72f82853..fedd40bef09 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/mac/MacApplication.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/mac/MacApplication.java
@@ -63,6 +63,40 @@ final class MacApplication extends Application implements InvokeLaterDispatcher.
     private boolean isTaskbarApplication = false;
     private final InvokeLaterDispatcher invokeLaterDispatcher;
 
+    private static final CountDownLatch keepAliveLatch = new CountDownLatch(1);
+
+    /**
+     * Starts a non-daemon KeepAlive thread to ensure that the
+     * JavaFX toolkit keeps running until the toolkit exits. On
+     * other platforms, the JavaFX Application Thread is created
+     * as a non-daemon Java thread when the toolkit starts. On
+     * macOS, we use the existing AppKit thread as the JavaFX
+     * Application thread, and attach it to the JVM as a daemon
+     * thread. In the case of Swing / JavaFX interop, AWT attaches
+     * the AppKit thread as a daemon thread. Since there is no other
+     * non-daemon thread, we create one so that the JavaFX toolkit
+     * will not exit prematurely.
+     */
+    private static void startKeepAliveThread() {
+        Thread thr = new Thread(() -> {
+            try {
+                keepAliveLatch.await();
+            } catch (InterruptedException ex) {
+                throw new RuntimeException("Unexpected exception: ", ex);
+            }
+        });
+        thr.setName("JavaFX-KeepAlive");
+        thr.setDaemon(false);
+        thr.start();
+    }
+
+    /**
+     * Terminates the KeepAlive thread.
+     */
+    private static void finishKeepAliveThread() {
+        keepAliveLatch.countDown();
+    }
+
     MacApplication() {
         // Embedded in SWT, with shared event thread
         @SuppressWarnings("removal")
@@ -104,6 +138,10 @@ protected void runLoop(final Runnable launchable) {
             });
         isTaskbarApplication = tmp;
 
+        // Create a non-daemon KeepAlive thread so the FX toolkit
+        // doesn't exit prematurely.
+        startKeepAliveThread();
+
         ClassLoader classLoader = MacApplication.class.getClassLoader();
         _runLoop(classLoader, wrappedRunnable, isTaskbarApplication);
     }
@@ -135,6 +173,7 @@ void waitForReactivation() {
     @Override
     protected void finishTerminating() {
         _finishTerminating();
+        finishKeepAliveThread();
 
         super.finishTerminating();
     }
diff --git a/modules/javafx.graphics/src/main/native-glass/mac/GlassApplication.m b/modules/javafx.graphics/src/main/native-glass/mac/GlassApplication.m
index b7560f2f9e6..b6194226bb7 100644
--- a/modules/javafx.graphics/src/main/native-glass/mac/GlassApplication.m
+++ b/modules/javafx.graphics/src/main/native-glass/mac/GlassApplication.m
@@ -536,8 +536,7 @@ - (void)runLoop:(id)selector
 
     NSAutoreleasePool *pool1 = [[NSAutoreleasePool alloc] init];
 
-    jint error = (*jVM)->AttachCurrentThread(jVM, (void **)&jEnv, NULL);
-    //jint error = (*jVM)->AttachCurrentThreadAsDaemon(jVM, (void **)&jEnv, NULL);
+    jint error = (*jVM)->AttachCurrentThreadAsDaemon(jVM, (void **)&jEnv, NULL);
     if (error == 0)
     {
         NSAutoreleasePool *pool2 = [[NSAutoreleasePool alloc] init];
@@ -736,12 +735,6 @@ - (void)runLoop:(id)selector
             (*jEnv)->CallVoidMethod(jEnv, self->jApplication, javaIDs.MacApplication.notifyApplicationDidTerminate);
             GLASS_CHECK_EXCEPTION(jEnv);
 
-            jint err = (*jVM)->DetachCurrentThread(jVM);
-            if (err < 0)
-            {
-                NSLog(@"Unable to detach from JVM. Error code: %d\n", (int)err);
-            }
-
             jEnv = NULL;
         }
         else // event loop is not started
diff --git a/tests/system/src/test/java/test/launchertest/MainLauncherTest.java b/tests/system/src/test/java/test/launchertest/MainLauncherTest.java
index da34455ea8a..eb6d2db1629 100644
--- a/tests/system/src/test/java/test/launchertest/MainLauncherTest.java
+++ b/tests/system/src/test/java/test/launchertest/MainLauncherTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -100,6 +100,9 @@ public TestData(String appName, String pldrName, boolean headless, int exitCode)
         new TestData("TestAppNoMainCCL3", ERROR_NONE),
         new TestData("TestNotApplicationCCL", ERROR_NONE),
         new TestData("TestHeadlessApp", true, ERROR_NONE),
+        new TestData("TestAWTAppDaemon", ERROR_NONE),
+        new TestData("TestAppDaemon", ERROR_NONE),
+        new TestData("TestAppPlatformExitAWT", ERROR_NONE),
     };
 
     @Parameters
diff --git a/tests/system/src/test/java/test/launchertest/PlatformExitApp.java b/tests/system/src/test/java/test/launchertest/PlatformExitApp.java
index 1a9d34c7a3e..a9127977c52 100644
--- a/tests/system/src/test/java/test/launchertest/PlatformExitApp.java
+++ b/tests/system/src/test/java/test/launchertest/PlatformExitApp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,28 +42,6 @@
  */
 public class PlatformExitApp extends Application {
 
-    // Timeout in milliseconds (must be at least 15 seconds)
-    private static final int TIMEOUT = 20000;
-
-    public static void sleep(long msec) {
-        try {
-            Thread.sleep(msec);
-        } catch (InterruptedException ex) {
-            ex.printStackTrace();
-            System.exit(ERROR_UNEXPECTED_EXCEPTION);
-        }
-    }
-
-    public static void setupTimeoutThread() {
-        // Timeout thread
-        Thread th = new Thread(() -> {
-            sleep(TIMEOUT);
-            System.exit(ERROR_TIMEOUT);
-        });
-        th.setDaemon(true);
-        th.start();
-    }
-
     @Override public void start(Stage stage) throws Exception {
         StackPane root = new StackPane();
         Scene scene = new Scene(root, 400, 300);
@@ -77,7 +55,7 @@ public static void setupTimeoutThread() {
 
         // Show window for 1 second before calling Platform.exit
         Thread thr = new Thread(() -> {
-            sleep(1000);
+            Util.sleep(1000);
             Platform.exit();
         });
         thr.start();
@@ -87,11 +65,11 @@ public static void setupTimeoutThread() {
      * @param args the command line arguments
      */
     public static void main(String[] args) {
-        setupTimeoutThread();
+        Util.setupTimeoutThread();
         Application.launch(args);
 
         // Short delay to allow any pending output to be flushed
-        sleep(500);
+        Util.sleep(500);
         System.exit(ERROR_NONE);
     }
 
diff --git a/tests/system/src/test/java/test/launchertest/TestAWTAppDaemon.java b/tests/system/src/test/java/test/launchertest/TestAWTAppDaemon.java
new file mode 100644
index 00000000000..8663c51a5e4
--- /dev/null
+++ b/tests/system/src/test/java/test/launchertest/TestAWTAppDaemon.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+
+package test.launchertest;
+
+import java.awt.BorderLayout;
+
+import javafx.application.Platform;
+
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+
+import static test.launchertest.Constants.*;
+
+/**
+ * Test that an AWT app that starts the JavaFX Platform with only daemon
+ * threads doesn't exit prematurely. It should remain alive until
+ * Platform.exit is called.
+ *
+ * This is launched by MainLauncherTest.
+ */
+public class TestAWTAppDaemon {
+
+    private static void createSwing() {
+        // Start up FX platform
+        Platform.startup(() -> {});
+
+        final JFrame frame = new JFrame("TestAWTAppDaemon");
+        frame.setLayout(new BorderLayout());
+
+        JPanel swingPanel = new JPanel();
+        frame.getContentPane().add(swingPanel, BorderLayout.CENTER);
+
+        // show frame
+        frame.pack();
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
+
+        // Show window for 1 second then close and dispost it
+        Util.sleep(1000);
+        frame.setVisible(false);
+        frame.dispose();
+
+        // Sleep for 5 seconds to ensure that we don't exit prematurely,
+        // then exit normally.
+        Thread thr = new Thread(() -> {
+            Util.sleep(5000);
+            System.exit(ERROR_NONE);
+        });
+        thr.setDaemon(true);
+        thr.start();
+    }
+
+    /**
+     * @param args the command line arguments
+     */
+    public static void main(String[] args) {
+        Util.setupTimeoutThread();
+        SwingUtilities.invokeLater(TestAWTAppDaemon::createSwing);
+    }
+
+}
diff --git a/tests/system/src/test/java/test/launchertest/TestAppDaemon.java b/tests/system/src/test/java/test/launchertest/TestAppDaemon.java
new file mode 100644
index 00000000000..1b487bdbe18
--- /dev/null
+++ b/tests/system/src/test/java/test/launchertest/TestAppDaemon.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+
+package test.launchertest;
+
+import javafx.application.Application;
+import javafx.application.Platform;
+import javafx.stage.Stage;
+import javax.swing.JDialog;
+import javax.swing.SwingUtilities;
+
+import static test.launchertest.Constants.*;
+
+/**
+ * Test application launcher with daemon threads to verify that the
+ * the platform doesn't exit prematurely. It should remain alive until
+ * Platform.exit is called.
+ *
+ * This is launched by MainLauncherTest.
+ */
+public class TestAppDaemon extends Application {
+
+    @Override
+    public void stop() {
+        // If we get here then the test passed.
+        System.exit(ERROR_NONE);
+    }
+
+    @Override
+    public void start(Stage st) {
+        // Wait for 3 seconds then call Platform.exit
+        Thread thr = new Thread(() -> {
+            Util.sleep(3000);
+            Platform.exit();
+        });
+        thr.setDaemon(true);
+        thr.start();
+    }
+
+    /**
+     * @param args the command line arguments
+     */
+    public static void main(String[] args) {
+        Util.setupTimeoutThread();
+
+        // Launch the application from a daemon thread
+        Thread thr = new Thread(() -> Application.launch(args));
+        thr.setDaemon(true);
+        thr.start();
+    }
+
+}
diff --git a/tests/system/src/test/java/test/launchertest/TestAppPlatformExitAWT.java b/tests/system/src/test/java/test/launchertest/TestAppPlatformExitAWT.java
new file mode 100644
index 00000000000..d3062839868
--- /dev/null
+++ b/tests/system/src/test/java/test/launchertest/TestAppPlatformExitAWT.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+
+package test.launchertest;
+
+import javafx.application.Application;
+import javafx.application.Platform;
+import javafx.stage.Stage;
+import javax.swing.JDialog;
+import javax.swing.SwingUtilities;
+
+import static test.launchertest.Constants.*;
+
+/**
+ * Test application, also using AWT, that calls Platform.exit and then
+ * tries to show an AWT window. The test might hang after the call to
+ * Platform.exit, but should not crash.
+ *
+ * This is launched by MainLauncherTest.
+ */
+public class TestAppPlatformExitAWT extends Application {
+
+    private void createSwing() {
+        JDialog d = new JDialog();
+        Platform.runLater(()-> {
+            Platform.exit();
+            SwingUtilities.invokeLater(() -> d.setVisible(true));
+        });
+    }
+
+    @Override
+    public void stop() {
+        // Sleep for 5 seconds to ensure no crash, then exit normally.
+        Thread thr = new Thread(() -> {
+            Util.sleep(5000);
+            System.exit(ERROR_NONE);
+        });
+        thr.setDaemon(true);
+        thr.start();
+    }
+
+    @Override
+    public void start(Stage st) {
+        SwingUtilities.invokeLater(this::createSwing);
+    }
+
+    /**
+     * @param args the command line arguments
+     */
+    public static void main(String[] args) {
+        Util.setupTimeoutThread();
+        Application.launch(args);
+    }
+
+}
diff --git a/tests/system/src/test/java/test/launchertest/Util.java b/tests/system/src/test/java/test/launchertest/Util.java
new file mode 100644
index 00000000000..11a3caa2da0
--- /dev/null
+++ b/tests/system/src/test/java/test/launchertest/Util.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+
+package test.launchertest;
+
+import static test.launchertest.Constants.*;
+
+public class Util {
+
+    // Timeout in milliseconds (must be at least 15 seconds)
+    private static final int TIMEOUT = 20000;
+
+    public static void sleep(long msec) {
+        try {
+            Thread.sleep(msec);
+        } catch (InterruptedException ex) {
+            ex.printStackTrace();
+            System.exit(ERROR_UNEXPECTED_EXCEPTION);
+        }
+    }
+
+    public static void setupTimeoutThread() {
+        // Timeout thread
+        Thread th = new Thread(() -> {
+            sleep(TIMEOUT);
+            System.exit(ERROR_TIMEOUT);
+        });
+        th.setDaemon(true);
+        th.start();
+    }
+
+    // No need to ever create an instance of this class
+    private Util() {}
+
+}

From 6115b396bacf62f39dcaa93c7c0adcd60b428b8c Mon Sep 17 00:00:00 2001
From: Alexander Matveev <almatvee@openjdk.org>
Date: Tue, 3 Sep 2024 20:13:30 +0000
Subject: [PATCH 31/75] 8338701: Provide media support for libavcodec version
 61

Reviewed-by: sykora, arapte
---
 build.gradle                                  |  7 ++--
 gradle/verification-metadata.xml              |  5 +++
 .../jfxmediaimpl/NativeMediaManager.java      |  3 +-
 .../gstreamer/gst/gstregistry.c               |  2 +-
 .../native/gstreamer/plugins/av/avdefines.h   | 10 ++++-
 .../gstreamer/plugins/av/videodecoder.c       | 40 ++++++++++++++++---
 6 files changed, 56 insertions(+), 11 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7f970aade15..a7b9005df25 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3010,6 +3010,7 @@ project(":media") {
             media name: "ffmpeg-4.0.2", ext: "tar.gz"
             media name: "ffmpeg-5.1.2", ext: "tar.gz"
             media name: "ffmpeg-6.0", ext: "tar.gz"
+            media name: "ffmpeg-7.0.2", ext: "tar.gz"
         }
         implementation project(":base")
         implementation project(":graphics")
@@ -3356,8 +3357,8 @@ project(":media") {
                     doLast {
                         project.ext.libav = [:]
                         project.ext.libav.basedir = "${buildDir}/native/linux/ffmpeg"
-                        project.ext.libav.versions = [ "3.3.3", "4.0.2", "5.1.2", "6.0" ]
-                        project.ext.libav.versionmap = [ "3.3.3" : "57", "4.0.2" : "58", "5.1.2" : "59", "6.0" : "60" ]
+                        project.ext.libav.versions = [ "3.3.3", "4.0.2", "5.1.2", "6.0", "7.0.2" ]
+                        project.ext.libav.versionmap = [ "3.3.3" : "57", "4.0.2" : "58", "5.1.2" : "59", "6.0" : "60", "7.0.2" : "61" ]
 
                         libav.versions.each { version ->
                             def libavDir = "${libav.basedir}/ffmpeg-${version}"
@@ -3437,7 +3438,7 @@ project(":media") {
                             project.ext.libav.libavffmpeg.versions = [ "56" ]
                             project.ext.libav.ffmpeg = [:]
                             project.ext.libav.ffmpeg.basedir = "${buildDir}/native/linux/ffmpeg/ffmpeg"
-                            project.ext.libav.ffmpeg.versions = [ "57", "58", "59", "60" ]
+                            project.ext.libav.ffmpeg.versions = [ "57", "58", "59", "60", "61" ]
 
                             project.ext.libav.versions.each { version ->
                                 def libavDir = "${project.ext.libav.basedir}-${version}"
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 7681a89b872..3fcdc0770f6 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -28,6 +28,11 @@
             <sha256 value="f4ccf961403752c93961927715f524576d1f4dd02cd76d8c76aed3bbe6686656" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="" name="ffmpeg-7.0.2" version="">
+         <artifact name="ffmpeg-7.0.2-.tar.gz">
+            <sha256 value="1233b3a93dd7517cc3c56b72a67f64041c044848d981e3deff4bebffa25f1054" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="" name="icu4c-74_2-data-bin-l" version="">
          <artifact name="icu4c-74_2-data-bin-l-.zip">
             <sha256 value="2acdb1b982228040963d183b2dd9d321252c613e0f4db213d4bbc10417cde569" origin="Generated by Gradle"/>
diff --git a/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java b/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java
index 097004bd17a..0c2ae1ddbce 100644
--- a/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java
+++ b/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -127,6 +127,7 @@ protected NativeMediaManager() {
                     dependencies.add("avplugin-ffmpeg-58");
                     dependencies.add("avplugin-ffmpeg-59");
                     dependencies.add("avplugin-ffmpeg-60");
+                    dependencies.add("avplugin-ffmpeg-61");
                 }
                 if (PlatformUtil.isMac()) {
                     dependencies.add("fxplugins");
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c
index 1d9c0179fc5..57b46f9ca3b 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c
@@ -146,7 +146,7 @@ static const int AVCODEC_LIBAV_EXPLICIT_VERSIONS[] = { 54, 56 };
 // For ffmpeg (libavcodec-ffmpeg.so)
 static const int AVCODEC_FFMPEG_EXPLICIT_VERSIONS[] = { 56 };
 // For libav or ffmpeg (libavcodec.so)
-static const int AVCODEC_EXPLICIT_VERSIONS[] = { 57, 58, 59, 60 };
+static const int AVCODEC_EXPLICIT_VERSIONS[] = { 57, 58, 59, 60, 61 };
 
 /*
  * Callback passed to dl_iterate_phdr(): finds the path of
diff --git a/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h b/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h
index 60fa7b631cf..f49ad56e1eb 100644
--- a/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h
+++ b/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -53,5 +53,13 @@
 // Not required since 58 and removed in 59
 #define NO_REGISTER_ALL        (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(59,0,0))
 
+// Do not use reordered_opaque to pass PTS. Use AVPacket.pts/AVFrame.pts instead.
+// reordered_opaque is removed since 61.
+#define NO_REORDERED_OPAQUE    (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61,0,0))
+
+// Use AVCodecContext.frame_num instead of AVCodecContext.frame_number. They same
+// except frame_num is 64-bit and frame_number is 32-bit. Since 61.
+#define USE_FRAME_NUM          (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61,0,0))
+
 #endif  /* AVDEFINES_H */
 
diff --git a/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c b/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c
index 569449694ce..184b2cc0a3d 100644
--- a/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c
+++ b/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c
@@ -554,7 +554,11 @@ static gboolean videodecoder_convert_frame(VideoDecoder *decoder)
     if (ret < 0)
         return FALSE;
 
+#if NO_REORDERED_OPAQUE
+    decoder->dest_frame->pts = base->frame->pts;
+#else // NO_REORDERED_OPAQUE
     decoder->dest_frame->reordered_opaque = base->frame->reordered_opaque;
+#endif // NO_REORDERED_OPAQUE
 
     return TRUE;
 }
@@ -679,7 +683,7 @@ static GstFlowReturn videodecoder_chain(GstPad *pad, GstObject *parent, GstBuffe
     GstMapInfo     info2;
     gboolean       unmap_buf = FALSE;
     gboolean       set_frame_values = TRUE;
-    int64_t        reordered_opaque = AV_NOPTS_VALUE;
+    int64_t        pts = AV_NOPTS_VALUE;
     unsigned int   out_buf_size = 0;
     gboolean       copy_error = FALSE;
     uint8_t*       data0 = NULL;
@@ -711,10 +715,17 @@ static GstFlowReturn videodecoder_chain(GstPad *pad, GstObject *parent, GstBuffe
         if (av_new_packet(&decoder->packet, info.size) == 0)
         {
             memcpy(decoder->packet.data, info.data, info.size);
+#if NO_REORDERED_OPAQUE
+            if (GST_BUFFER_TIMESTAMP_IS_VALID(buf))
+                decoder->packet.pts = (int64_t)GST_BUFFER_TIMESTAMP(buf);
+            else
+                decoder->packet.pts = AV_NOPTS_VALUE;
+#else // NO_REORDERED_OPAQUE
             if (GST_BUFFER_TIMESTAMP_IS_VALID(buf))
                 base->context->reordered_opaque = GST_BUFFER_TIMESTAMP(buf);
             else
                 base->context->reordered_opaque = AV_NOPTS_VALUE;
+#endif // NO_REORDERED_OPAQUE
 #if USE_SEND_RECEIVE
             num_dec = avcodec_send_packet(base->context, &decoder->packet);
             if (num_dec == 0)
@@ -746,10 +757,17 @@ static GstFlowReturn videodecoder_chain(GstPad *pad, GstObject *parent, GstBuffe
         av_init_packet(&decoder->packet);
         decoder->packet.data = info.data;
         decoder->packet.size = info.size;
+#if NO_REORDERED_OPAQUE
+        if (GST_BUFFER_TIMESTAMP_IS_VALID(buf))
+            decoder->packet.pts = (int64_t)GST_BUFFER_TIMESTAMP(buf);
+        else
+            decoder->packet.pts = AV_NOPTS_VALUE;
+#else // NO_REORDERED_OPAQUE
         if (GST_BUFFER_TIMESTAMP_IS_VALID(buf))
             base->context->reordered_opaque = GST_BUFFER_TIMESTAMP(buf);
         else
             base->context->reordered_opaque = AV_NOPTS_VALUE;
+#endif // NO_REORDERED_OPAQUE
 
 #if USE_SEND_RECEIVE
         num_dec = avcodec_send_packet(base->context, &decoder->packet);
@@ -796,7 +814,11 @@ static GstFlowReturn videodecoder_chain(GstPad *pad, GstObject *parent, GstBuffe
                     goto _exit;
                 }
 
-                reordered_opaque = decoder->dest_frame->reordered_opaque;
+#if NO_REORDERED_OPAQUE
+                pts = decoder->dest_frame->pts;
+#else // NO_REORDERED_OPAQUE
+                pts = decoder->dest_frame->reordered_opaque;
+#endif // NO_REORDERED_OPAQUE
                 data0 = decoder->dest_frame->data[0];
                 data1 = decoder->dest_frame->data[1];
                 data2 = decoder->dest_frame->data[2];
@@ -806,7 +828,11 @@ static GstFlowReturn videodecoder_chain(GstPad *pad, GstObject *parent, GstBuffe
 
             if (set_frame_values)
             {
-                reordered_opaque = base->frame->reordered_opaque;
+#if NO_REORDERED_OPAQUE
+                pts = base->frame->pts;
+#else // NO_REORDERED_OPAQUE
+                pts = base->frame->reordered_opaque;
+#endif // NO_REORDERED_OPAQUE
                 data0 = base->frame->data[0];
                 data1 = base->frame->data[1];
                 data2 = base->frame->data[2];
@@ -825,10 +851,14 @@ static GstFlowReturn videodecoder_chain(GstPad *pad, GstObject *parent, GstBuffe
             }
             else
             {
+#if USE_FRAME_NUM
+                GST_BUFFER_OFFSET(outbuf) = base->context->frame_num;
+#else // USE_FRAME_NUM
                 GST_BUFFER_OFFSET(outbuf) = base->context->frame_number;
-                if (reordered_opaque != AV_NOPTS_VALUE)
+#endif // USE_FRAME_NUM
+                if (pts != AV_NOPTS_VALUE)
                 {
-                    GST_BUFFER_TIMESTAMP(outbuf) = reordered_opaque;
+                    GST_BUFFER_TIMESTAMP(outbuf) = pts;
                     GST_BUFFER_DURATION(outbuf) = GST_BUFFER_DURATION(buf); // Duration for video usually same
                 }
 

From 4647367ce4590440fbb85675055225c869502314 Mon Sep 17 00:00:00 2001
From: Johan Vos <jvos@openjdk.org>
Date: Wed, 4 Sep 2024 12:07:18 +0000
Subject: [PATCH 32/75] 8339335: set number of parallel jobs when building
 webkit 8339505: Enable parallel compilation of native code on macOS

Reviewed-by: angorya, kcr
---
 build.gradle | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index a7b9005df25..00bc804083e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -618,13 +618,8 @@ ext.DO_JCOV = Boolean.parseBoolean(JCOV)
 defineProperty("USE_CYGWIN", "true")
 ext.IS_USE_CYGWIN = Boolean.parseBoolean(USE_CYGWIN)
 
-// Define the number of threads to use when compiling (specifically for native compilation)
-// On Mac we limit it to 1 by default due to problems running gcc in parallel
-if (IS_MAC) {
-    defineProperty("NUM_COMPILE_THREADS", "1")
-} else {
-    defineProperty("NUM_COMPILE_THREADS", "${Runtime.runtime.availableProcessors()}")
-}
+// Define the number of threads to use when compiling (specifically for native compilation, including webkit)
+defineProperty("NUM_COMPILE_THREADS", "${Runtime.runtime.availableProcessors()}")
 
 //
 // The next three sections of properties are used to generate the
@@ -3724,6 +3719,7 @@ project(":web") {
                 exec {
                     workingDir("$webkitOutputDir")
                     def cmakeArgs = "-DENABLE_TOOLS=1"
+                    def makeArgs = "-j $NUM_COMPILE_THREADS"
                     if (IS_STATIC_BUILD) {
                         cmakeArgs = " $cmakeArgs -DSTATIC_BUILD=1 -DUSE_THIN_ARCHIVES=OFF";
                     }
@@ -3794,6 +3790,7 @@ project(":web") {
                     cmakeArgs += " -DJAVAFX_RELEASE_VERSION=${jfxReleaseMajorVersion}"
                     commandLine("perl", "$projectDir/src/main/native/Tools/Scripts/build-webkit",
                         "--java", "--icu-unicode", targetCpuBitDepthSwitch,
+                        "--makeArgs=${makeArgs}",
                         "--no-experimental-features", "--cmakeargs=${cmakeArgs}")
                 }
             }

From 66401aed01206258431ad923d28b1593bf27acb8 Mon Sep 17 00:00:00 2001
From: John Hendrikx <jhendrikx@openjdk.org>
Date: Tue, 10 Sep 2024 23:27:18 +0000
Subject: [PATCH 33/75] 8339726: Remove pausing code (used for testing) from
 AbstractPrimaryTimer

Reviewed-by: angorya, mstrauss, kcr, mhanl
---
 .../animation/AbstractPrimaryTimer.java       | 29 +--------
 .../animation/AbstractPrimaryTimerShim.java   | 42 -------------
 .../sun/javafx/pgstub/StubPrimaryTimer.java   |  6 --
 .../animation/AbstractPrimaryTimerTest.java   | 59 -------------------
 4 files changed, 1 insertion(+), 135 deletions(-)
 delete mode 100644 modules/javafx.graphics/src/shims/java/com/sun/scenario/animation/AbstractPrimaryTimerShim.java

diff --git a/modules/javafx.graphics/src/main/java/com/sun/scenario/animation/AbstractPrimaryTimer.java b/modules/javafx.graphics/src/main/java/com/sun/scenario/animation/AbstractPrimaryTimer.java
index d52ec396d15..d5120d5c49f 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/scenario/animation/AbstractPrimaryTimer.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/scenario/animation/AbstractPrimaryTimer.java
@@ -79,15 +79,6 @@ public abstract class AbstractPrimaryTimer {
         return null;
     };
 
-    private boolean paused = false;
-    private long totalPausedTime;
-    private long startPauseTime;
-
-    // These methods only exist for the sake of testing.
-    boolean isPaused() { return paused; }
-    long getTotalPausedTime() { return totalPausedTime; }
-    long getStartPauseTime() { return startPauseTime; }
-
     private PulseReceiver receivers[] = new PulseReceiver[2];
     private int receiversLength;
     private boolean receiversLocked;
@@ -121,27 +112,12 @@ public int getDefaultResolution() {
         return PULSE_DURATION_TICKS;
     }
 
-    public void pause() {
-        if (!paused) {
-            startPauseTime = nanos();
-            paused = true;
-        }
-    }
-
-    public void resume() {
-        if (paused) {
-            paused = false;
-            totalPausedTime += nanos() - startPauseTime;
-        }
-    }
-
     public long nanos() {
         if (fixedPulseLength > 0) {
             return debugNanos;
         }
 
-        return paused ? startPauseTime :
-                        System.nanoTime() - totalPausedTime;
+        return System.nanoTime();
     }
 
     public boolean isFullspeed() {
@@ -258,9 +234,6 @@ private final class MainLoop implements DelayedRunnable {
 
         @Override
         public void run() {
-            if (paused) {
-                return;
-            }
             final long now = nanos();
             recordStart((nextPulseTime - now) / 1000000);
             timePulseImpl(now);
diff --git a/modules/javafx.graphics/src/shims/java/com/sun/scenario/animation/AbstractPrimaryTimerShim.java b/modules/javafx.graphics/src/shims/java/com/sun/scenario/animation/AbstractPrimaryTimerShim.java
deleted file mode 100644
index be13cc0ec21..00000000000
--- a/modules/javafx.graphics/src/shims/java/com/sun/scenario/animation/AbstractPrimaryTimerShim.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * 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.
- */
-
-package com.sun.scenario.animation;
-
-public class AbstractPrimaryTimerShim {
-
-    public static boolean isPaused(AbstractPrimaryTimer amt) {
-        return amt.isPaused();
-    }
-
-    public static long getTotalPausedTime(AbstractPrimaryTimer amt) {
-        return amt.getTotalPausedTime();
-    }
-
-    public static long getStartPauseTime(AbstractPrimaryTimer amt) {
-        return amt.getStartPauseTime();
-    }
-
-}
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/pgstub/StubPrimaryTimer.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/pgstub/StubPrimaryTimer.java
index 4cf52d847e4..4657d8c2f72 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/pgstub/StubPrimaryTimer.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/pgstub/StubPrimaryTimer.java
@@ -61,10 +61,4 @@ public long getCurrentTime() {
     public long nanos() {
         return currentTimeMillis * 1000000;
     }
-
-    @Override
-    public void pause() { }
-
-    @Override
-    public void resume() { }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/scenario/animation/AbstractPrimaryTimerTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/scenario/animation/AbstractPrimaryTimerTest.java
index c60c8856a4d..f6f51530a1f 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/scenario/animation/AbstractPrimaryTimerTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/scenario/animation/AbstractPrimaryTimerTest.java
@@ -28,7 +28,6 @@
 import javafx.animation.AnimationTimer;
 import com.sun.scenario.DelayedRunnable;
 import com.sun.scenario.animation.AbstractPrimaryTimer;
-import com.sun.scenario.animation.AbstractPrimaryTimerShim;
 import com.sun.scenario.animation.shared.PulseReceiver;
 import com.sun.scenario.animation.shared.TimerReceiver;
 import org.junit.Before;
@@ -46,53 +45,6 @@ public void setUp() {
         timer = new AbstractPrimaryTimerStub();
     }
 
-    @Test
-    public void testPauseResume() {
-        // pause timer
-        timer.setNanos(2L);
-        assertEquals(2L, timer.nanos());
-        timer.pause();
-        assertEquals(2L, timer.nanos());
-
-        // test nanos during pause
-        timer.setNanos(5L);
-        assertEquals(2L, timer.nanos());
-
-        // pause again
-        timer.setNanos(10L);
-        timer.pause();
-        assertEquals(2L, timer.nanos());
-
-        // resume
-        timer.setNanos(17L);
-        timer.resume();
-        assertEquals(2L, timer.nanos());
-        timer.setNanos(28L);
-        assertEquals(13L, timer.nanos());
-
-        // resume again
-        timer.setNanos(41L);
-        timer.resume();
-        assertEquals(26L, timer.nanos());
-
-        // pause again
-        timer.setNanos(58L);
-        assertEquals(43L, timer.nanos());
-        timer.pause();
-        assertEquals(43L, timer.nanos());
-
-        // test nanos during pause
-        timer.setNanos(77L);
-        assertEquals(43L, timer.nanos());
-
-        // resume
-        timer.setNanos(100L);
-        timer.resume();
-        assertEquals(43L, timer.nanos());
-        timer.setNanos(129L);
-        assertEquals(72L, timer.nanos());
-    }
-
     @Test
     public void testPulseReceiver() {
         final Flag flag = new Flag();
@@ -155,25 +107,14 @@ public boolean isFlagged() {
 
     private static class AbstractPrimaryTimerStub extends AbstractPrimaryTimer {
 
-        private long nanos;
         private DelayedRunnable animationRunnable;
 
-        public void setNanos(long nanos) {
-            this.nanos = nanos;
-        }
-
         public void simulatePulse() {
             if (animationRunnable != null) {
                 animationRunnable.run();
             }
         }
 
-        @Override public long nanos() {
-            return AbstractPrimaryTimerShim.isPaused(this) ?
-                    AbstractPrimaryTimerShim.getStartPauseTime(this) :
-                    nanos - AbstractPrimaryTimerShim.getTotalPausedTime(this);
-        }
-
         @Override
         protected void postUpdateAnimationRunnable(
                 DelayedRunnable animationRunnable) {

From dad80e9284fcde36aa0cac4e6459b6dbfd43ee13 Mon Sep 17 00:00:00 2001
From: John Hendrikx <jhendrikx@openjdk.org>
Date: Tue, 10 Sep 2024 23:28:56 +0000
Subject: [PATCH 34/75] 8323706: Remove SimpleSelector and CompoundSelector
 classes

Move SimpleSelector and CompoundSelector to internal packages

Reviewed-by: kcr, angorya
---
 .../com/sun/javafx/css/BinarySerializer.java  | 190 ++++++++++++++++++
 .../sun}/javafx/css/CompoundSelector.java     |  87 ++------
 .../sun/javafx/css/SelectorPartitioning.java  |   2 -
 .../sun}/javafx/css/SimpleSelector.java       |  73 +------
 .../src/main/java/javafx/css/CssParser.java   |   2 +
 .../src/main/java/javafx/css/Match.java       |  42 +++-
 .../src/main/java/javafx/css/Rule.java        |   5 +-
 .../src/main/java/javafx/css/Selector.java    |  55 +----
 .../java/javafx/css/SimpleSelectorShim.java   |  42 ----
 .../java/test/javafx/css/CssMetaDataTest.java |  56 +++---
 .../javafx/css/SelectorPartitioningTest.java  |   6 +-
 .../java/test/javafx/css/StylesheetTest.java  |   2 +-
 12 files changed, 293 insertions(+), 269 deletions(-)
 create mode 100644 modules/javafx.graphics/src/main/java/com/sun/javafx/css/BinarySerializer.java
 rename modules/javafx.graphics/src/main/java/{ => com/sun}/javafx/css/CompoundSelector.java (80%)
 rename modules/javafx.graphics/src/main/java/{ => com/sun}/javafx/css/SimpleSelector.java (82%)
 delete mode 100644 modules/javafx.graphics/src/shims/java/javafx/css/SimpleSelectorShim.java

diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/css/BinarySerializer.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/BinarySerializer.java
new file mode 100644
index 00000000000..92554f13759
--- /dev/null
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/BinarySerializer.java
@@ -0,0 +1,190 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+
+package com.sun.javafx.css;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import javafx.css.PseudoClass;
+import javafx.css.Selector;
+import javafx.css.StyleConverter;
+import javafx.geometry.NodeOrientation;
+
+import static javafx.geometry.NodeOrientation.LEFT_TO_RIGHT;
+import static javafx.geometry.NodeOrientation.RIGHT_TO_LEFT;
+
+/**
+ * Class which can read and write selectors in a binary format.
+ */
+public class BinarySerializer {
+    private static final int TYPE_SIMPLE = 1;
+    private static final int TYPE_COMPOUND = 2;
+
+    public static Selector read(DataInputStream is, String[] strings) throws IOException {
+        int type = is.readByte();
+
+        if (type == TYPE_SIMPLE) {
+            return readSimpleSelector(is, strings);
+        }
+
+        // Backwards compatible, if it is not TYPE_SIMPLE any other value is considered TYPE_COMPOUND
+        return readCompoundSelector(is, strings);
+    }
+
+    public static void write(Selector selector, DataOutputStream os, StyleConverter.StringStore stringStore) throws IOException {
+        if (selector instanceof SimpleSelector s) {
+            writeSimpleSelector(s, os, stringStore);
+        }
+        else if(selector instanceof CompoundSelector s) {
+            writeCompoundSelector(s, os, stringStore);
+        }
+        else {
+            throw new IllegalStateException("support missing for selector type: " + (selector == null ? "null" : selector.getClass()));
+        }
+    }
+
+    private static SimpleSelector readSimpleSelector(DataInputStream is, String[] strings) throws IOException {
+        String name = strings[is.readShort()];
+        int nStyleClasses = is.readShort();
+        List<String> styleClasses = new ArrayList<>();
+
+        for (int n = 0; n < nStyleClasses; n++) {
+            styleClasses.add(strings[is.readShort()]);
+        }
+
+        String id = strings[is.readShort()];
+        int nPseudoclasses = is.readShort();
+        List<String> pseudoclasses = new ArrayList<>();
+
+        for (int n = 0; n < nPseudoclasses; n++) {
+            pseudoclasses.add(strings[is.readShort()]);
+        }
+
+        return new SimpleSelector(name, styleClasses, pseudoclasses, id);
+    }
+
+    private static CompoundSelector readCompoundSelector(DataInputStream is, String[] strings) throws IOException {
+        int nSelectors = is.readShort();
+        List<SimpleSelector> selectors = new ArrayList<>();
+
+        for (int n = 0; n < nSelectors; n++) {
+
+            /*
+             * An extra byte is part of the binary format containing TYPE_SIMPLE that
+             * isn't strictly needed. However, to remain backwards compatible with the
+             * first (and only) supported binary format, this byte must be skipped over
+             * before attempting to read what is known to be a simple selector.
+             */
+
+            byte type = is.readByte();
+
+            if (type != TYPE_SIMPLE) {
+                throw new IllegalStateException("Expected compound selector to consist of simple selectors only, but found type: " + type);
+            }
+
+            selectors.add(readSimpleSelector(is, strings));
+        }
+
+        int nRelationships = is.readShort();
+
+        List<Combinator> relationships = new ArrayList<>();
+
+        for (int n = 0; n < nRelationships; n++) {
+            int ordinal = is.readByte();
+
+            if (ordinal == Combinator.CHILD.ordinal()) {
+                relationships.add(Combinator.CHILD);
+            }
+            else if (ordinal == Combinator.DESCENDANT.ordinal()) {
+                relationships.add(Combinator.DESCENDANT);
+            }
+            else {
+                assert false : "error deserializing CompoundSelector: Combinator = " + ordinal;
+                relationships.add(Combinator.DESCENDANT);
+            }
+        }
+
+        return new CompoundSelector(selectors, relationships);
+    }
+
+    private static void writeCompoundSelector(CompoundSelector selector, DataOutputStream os, StyleConverter.StringStore stringStore) throws IOException {
+        os.writeByte(TYPE_COMPOUND);
+
+        List<SimpleSelector> selectors = selector.getSelectors();
+
+        os.writeShort(selectors.size());
+
+        for (int n = 0; n < selectors.size(); n++) {
+            writeSimpleSelector(selectors.get(n), os, stringStore);
+        }
+
+        List<Combinator> relationships = selector.getRelationships();
+
+        os.writeShort(relationships.size());
+
+        for (int n = 0; n < relationships.size(); n++) {
+            os.writeByte(relationships.get(n).ordinal());
+        }
+    }
+
+    private static void writeSimpleSelector(SimpleSelector selector, DataOutputStream os, StyleConverter.StringStore stringStore) throws IOException {
+        os.writeByte(TYPE_SIMPLE);
+
+        List<String> selectorStyleClassNames = selector.getStyleClasses();
+
+        os.writeShort(stringStore.addString(selector.getName()));
+        os.writeShort(selectorStyleClassNames.size());
+
+        for (String sc : selectorStyleClassNames) {
+            os.writeShort(stringStore.addString(sc));
+        }
+
+        os.writeShort(stringStore.addString(selector.getId()));
+
+        Set<PseudoClass> pseudoClassStates = selector.getPseudoClassStates();
+        NodeOrientation nodeOrientation = selector.getNodeOrientation();
+
+        int pclassSize = pseudoClassStates.size()
+                + (nodeOrientation == RIGHT_TO_LEFT || nodeOrientation == LEFT_TO_RIGHT ? 1 : 0);
+
+        os.writeShort(pclassSize);
+
+        for (PseudoClass pc : pseudoClassStates) {
+            os.writeShort(stringStore.addString(pc.getPseudoClassName()));
+        }
+
+        if (nodeOrientation == RIGHT_TO_LEFT) {
+            os.writeShort(stringStore.addString("dir(rtl)"));
+        }
+        else if (nodeOrientation == LEFT_TO_RIGHT) {
+            os.writeShort(stringStore.addString("dir(ltr)"));
+        }
+    }
+}
diff --git a/modules/javafx.graphics/src/main/java/javafx/css/CompoundSelector.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/CompoundSelector.java
similarity index 80%
rename from modules/javafx.graphics/src/main/java/javafx/css/CompoundSelector.java
rename to modules/javafx.graphics/src/main/java/com/sun/javafx/css/CompoundSelector.java
index d7c6614b716..c4422b8b202 100644
--- a/modules/javafx.graphics/src/main/java/javafx/css/CompoundSelector.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/CompoundSelector.java
@@ -23,21 +23,17 @@
  * questions.
  */
 
-package javafx.css;
+package com.sun.javafx.css;
 
-import com.sun.javafx.css.Combinator;
-import com.sun.javafx.css.PseudoClassState;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import javafx.css.PseudoClass;
+import javafx.css.Selector;
+import javafx.css.Styleable;
 
 /**
  * A compound selector which behaves according to the CSS standard. The selector is
@@ -60,12 +56,7 @@
  * between selector1 and selector2 specifies a direct CHILD, whereas the
  * whitespace between selector2 and selector3 corresponds to
  * <code>Combinator.DESCENDANT</code>.
- *
- * @since 9
- * @deprecated This class was exposed erroneously and will be removed in a future version
  */
-@Deprecated(since = "23", forRemoval = true)
-@SuppressWarnings("removal")
 final public class CompoundSelector extends Selector {
 
     private final List<SimpleSelector> selectors;
@@ -78,20 +69,21 @@ public List<SimpleSelector> getSelectors() {
     }
 
     private final List<Combinator> relationships;
-    // /**
-    //  * The relationships between the selectors
-    //  * @return Immutable List&lt;Combinator&gt;
-    //  */
-    // public List<Combinator> getRelationships() {
-    //     return relationships;
-    // }
+
+    /**
+     * The relationships between the selectors
+     * @return Immutable {@code List<Combinator>}
+     */
+    List<Combinator> getRelationships() {
+        return relationships;
+    }
 
     /**
      * Creates a <code>CompoundSelector</code> from a list of selectors and a
      * list of <code>Combinator</code> relationships.  There must be exactly one
      * less <code>Combinator</code> than there are selectors.
      */
-    CompoundSelector(List<SimpleSelector> selectors, List<Combinator> relationships) {
+    public CompoundSelector(List<SimpleSelector> selectors, List<Combinator> relationships) {
         this.selectors =
             (selectors != null)
                 ? Collections.unmodifiableList(selectors)
@@ -110,22 +102,6 @@ public Set<String> getStyleClassNames() {
             .collect(Collectors.toUnmodifiableSet());
     }
 
-    @Override public Match createMatch() {
-        final PseudoClassState allPseudoClasses = new PseudoClassState();
-        int idCount = 0;
-        int styleClassCount = 0;
-
-        for(int n=0, nMax=selectors.size(); n<nMax; n++) {
-            Selector sel = selectors.get(n);
-            Match match = sel.createMatch();
-            allPseudoClasses.addAll(match.getPseudoClasses());
-            idCount += match.idCount;
-            styleClassCount += match.styleClassCount;
-        }
-
-        return new Match(this, allPseudoClasses, idCount, styleClassCount);
-    }
-
     @Override public boolean applies(final Styleable styleable) {
         return applies(styleable, selectors.size()-1, null, 0);
     }
@@ -305,41 +281,4 @@ private boolean stateMatches(Styleable styleable, Set<PseudoClass> states, int i
         }
         return sbuf.toString();
     }
-
-    @Override protected final void writeBinary(final DataOutputStream os, final StyleConverter.StringStore stringStore)
-            throws IOException
-    {
-        super.writeBinary(os, stringStore);
-        os.writeShort(selectors.size());
-        for (int n=0; n< selectors.size(); n++) selectors.get(n).writeBinary(os,stringStore);
-        os.writeShort(relationships.size());
-        for (int n=0; n< relationships.size(); n++) os.writeByte(relationships.get(n).ordinal());
-    }
-
-    static CompoundSelector readBinary(int bssVersion, final DataInputStream is, final String[] strings)
-            throws IOException
-    {
-
-        final int nSelectors = is.readShort();
-        final List<SimpleSelector> selectors = new ArrayList<>();
-        for (int n=0; n<nSelectors; n++) {
-            selectors.add((SimpleSelector)Selector.readBinary(bssVersion, is,strings));
-        }
-
-        final int nRelationships = is.readShort();
-
-        final List<Combinator> relationships = new ArrayList<>();
-        for (int n=0; n<nRelationships; n++) {
-            final int ordinal = is.readByte();
-            if (ordinal == Combinator.CHILD.ordinal())
-                relationships.add(Combinator.CHILD);
-            else if (ordinal == Combinator.DESCENDANT.ordinal())
-                relationships.add(Combinator.DESCENDANT);
-            else {
-                assert false : "error deserializing CompoundSelector: Combinator = " + ordinal;
-                relationships.add(Combinator.DESCENDANT);
-            }
-        }
-        return new CompoundSelector(selectors, relationships);
-    }
 }
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/css/SelectorPartitioning.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/SelectorPartitioning.java
index 8cd69f2e5ed..8421ef3fbe9 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/javafx/css/SelectorPartitioning.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/SelectorPartitioning.java
@@ -25,9 +25,7 @@
 
 package com.sun.javafx.css;
 
-import javafx.css.CompoundSelector;
 import javafx.css.Selector;
-import javafx.css.SimpleSelector;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/modules/javafx.graphics/src/main/java/javafx/css/SimpleSelector.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/SimpleSelector.java
similarity index 82%
rename from modules/javafx.graphics/src/main/java/javafx/css/SimpleSelector.java
rename to modules/javafx.graphics/src/main/java/com/sun/javafx/css/SimpleSelector.java
index ee049b10981..f5d0e264342 100644
--- a/modules/javafx.graphics/src/main/java/javafx/css/SimpleSelector.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/SimpleSelector.java
@@ -23,14 +23,15 @@
  * questions.
  */
 
-package javafx.css;
+package com.sun.javafx.css;
 
+import javafx.css.PseudoClass;
+import javafx.css.Selector;
+import javafx.css.StyleClass;
+import javafx.css.Styleable;
 import javafx.geometry.NodeOrientation;
 import javafx.scene.Node;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -39,22 +40,13 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import com.sun.javafx.css.FixedCapacitySet;
-import com.sun.javafx.css.ImmutablePseudoClassSetsCache;
-import com.sun.javafx.css.PseudoClassState;
-
 import static javafx.geometry.NodeOrientation.INHERIT;
 import static javafx.geometry.NodeOrientation.LEFT_TO_RIGHT;
 import static javafx.geometry.NodeOrientation.RIGHT_TO_LEFT;
 
 /**
  * A simple selector which behaves according to the CSS standard.
- *
- * @since 9
- * @deprecated This class was exposed erroneously and will be removed in a future version
  */
-@Deprecated(since = "23", forRemoval = true)
-@SuppressWarnings("removal")
 final public class SimpleSelector extends Selector {
 
     /**
@@ -154,7 +146,7 @@ public String getId() {
     private final Set<PseudoClass> pseudoClassState;
 
     // for test purposes
-    Set<PseudoClass> getPseudoClassStates() {
+    public Set<PseudoClass> getPseudoClassStates() {
         return pseudoClassState;
     }
 
@@ -181,7 +173,7 @@ public NodeOrientation getNodeOrientation() {
     }
 
     // TODO: The parser passes styleClasses as a List. Should be array?
-    SimpleSelector(final String name, final List<String> styleClasses,
+    public SimpleSelector(final String name, final List<String> styleClasses,
             final List<String> pseudoClasses, final String id)
     {
         this.name = name == null ? "*" : name;
@@ -243,12 +235,6 @@ private FixedCapacitySet<String> convertStyleClassNamesToSet(List<String> styleC
         return scs;
     }
 
-    @Override public Match createMatch() {
-        final int idCount = (matchOnId) ? 1 : 0;
-        int styleClassCount = selectorStyleClassNames.size();
-        return new Match(this, pseudoClassState, idCount, styleClassCount);
-    }
-
     @Override public boolean applies(Styleable styleable) {
 
         // handle functional pseudo-class :dir()
@@ -402,49 +388,4 @@ private boolean matchesStyleClasses(List<String> styleClassNames) {
 
         return sbuf.toString();
     }
-
-    @Override protected final void writeBinary(final DataOutputStream os, final StyleConverter.StringStore stringStore)
-        throws IOException
-    {
-        super.writeBinary(os, stringStore);
-        os.writeShort(stringStore.addString(name));
-        os.writeShort(selectorStyleClassNames.size());
-        Iterator<String> iter1 = selectorStyleClassNames.iterator();
-        while(iter1.hasNext()) {
-            final String sc = iter1.next();
-            os.writeShort(stringStore.addString(sc));
-        }
-        os.writeShort(stringStore.addString(id));
-        int pclassSize = pseudoClassState.size()
-                + (nodeOrientation == RIGHT_TO_LEFT || nodeOrientation == LEFT_TO_RIGHT ? 1 : 0);
-        os.writeShort(pclassSize);
-        Iterator<PseudoClass> iter2 = pseudoClassState.iterator();
-        while(iter2.hasNext()) {
-            final PseudoClass pc = iter2.next();
-            os.writeShort(stringStore.addString(pc.getPseudoClassName()));
-        }
-        if (nodeOrientation == RIGHT_TO_LEFT) {
-            os.writeShort(stringStore.addString("dir(rtl)"));
-        } else if (nodeOrientation == LEFT_TO_RIGHT) {
-            os.writeShort(stringStore.addString("dir(ltr)"));
-        }
-    }
-
-    static SimpleSelector readBinary(int bssVersion, final DataInputStream is, final String[] strings)
-        throws IOException
-    {
-        final String name = strings[is.readShort()];
-        final int nStyleClasses = is.readShort();
-        final List<String> styleClasses = new ArrayList<>();
-        for (int n=0; n < nStyleClasses; n++) {
-            styleClasses.add(strings[is.readShort()]);
-        }
-        final String id = strings[is.readShort()];
-        final int nPseudoclasses = is.readShort();
-        final List<String> pseudoclasses = new ArrayList<>();
-        for(int n=0; n < nPseudoclasses; n++) {
-            pseudoclasses.add(strings[is.readShort()]);
-        }
-        return new SimpleSelector(name, styleClasses, pseudoclasses, id);
-    }
 }
diff --git a/modules/javafx.graphics/src/main/java/javafx/css/CssParser.java b/modules/javafx.graphics/src/main/java/javafx/css/CssParser.java
index c7b6545f3c3..274ffd973fc 100644
--- a/modules/javafx.graphics/src/main/java/javafx/css/CssParser.java
+++ b/modules/javafx.graphics/src/main/java/javafx/css/CssParser.java
@@ -26,9 +26,11 @@
 package javafx.css;
 
 import com.sun.javafx.css.Combinator;
+import com.sun.javafx.css.CompoundSelector;
 import com.sun.javafx.css.FontFaceImpl;
 import com.sun.javafx.css.InterpolatorConverter;
 import com.sun.javafx.css.ParsedValueImpl;
+import com.sun.javafx.css.SimpleSelector;
 import com.sun.javafx.css.StyleManager;
 import com.sun.javafx.css.TransitionDefinition;
 import com.sun.javafx.css.TransitionDefinitionConverter;
diff --git a/modules/javafx.graphics/src/main/java/javafx/css/Match.java b/modules/javafx.graphics/src/main/java/javafx/css/Match.java
index 981350dd8b6..8bfbc015d57 100644
--- a/modules/javafx.graphics/src/main/java/javafx/css/Match.java
+++ b/modules/javafx.graphics/src/main/java/javafx/css/Match.java
@@ -27,8 +27,12 @@
 
 import static javafx.geometry.NodeOrientation.INHERIT;
 
+import com.sun.javafx.css.CompoundSelector;
 import com.sun.javafx.css.ImmutablePseudoClassSetsCache;
+import com.sun.javafx.css.PseudoClassState;
+import com.sun.javafx.css.SimpleSelector;
 
+import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 
@@ -42,17 +46,47 @@
  */
 public final class Match implements Comparable<Match> {
 
+    static Match of(Selector selector) {
+        return switch(selector) {
+            case SimpleSelector s -> ofSimpleSelector(s);
+            case CompoundSelector cs -> ofCompoundSelector(cs);
+        };
+    }
+
+    private static Match ofCompoundSelector(CompoundSelector selector) {
+        PseudoClassState pseudoClasses = new PseudoClassState();
+        int idCount = 0;
+        int styleClassCount = 0;
+        List<SimpleSelector> containedSelectors = selector.getSelectors();
+
+        for (int n = 0, max = containedSelectors.size(); n < max; n++) {
+            Match match = ofSimpleSelector(containedSelectors.get(n));
+
+            pseudoClasses.addAll(match.getPseudoClasses());
+            idCount += match.idCount;
+            styleClassCount += match.styleClassCount;
+        }
+
+        return new Match(selector, pseudoClasses, idCount, styleClassCount);
+    }
+
+    private static Match ofSimpleSelector(SimpleSelector selector) {
+        int idCount = selector.getId().isEmpty() ? 0 : 1;
+        int styleClassCount = selector.getStyleClassSet().size();
+
+        return new Match(selector, selector.getPseudoClassStates(), idCount, styleClassCount);
+    }
+
     private final Selector selector;
     private final Set<PseudoClass> pseudoClasses;
 
-    final int styleClassCount;
-    final int idCount;
+    private final int styleClassCount;
+    private final int idCount;
 
     // CSS3 spec gives weight to id count, then style class count,
     // then pseudoclass count, and finally matching types (i.e., java name count)
-    final int specificity;
+    private final int specificity;
 
-    @SuppressWarnings("removal")
     Match(final Selector selector, Set<PseudoClass> pseudoClasses, int idCount, int styleClassCount) {
         Objects.requireNonNull(selector);
         Objects.requireNonNull(pseudoClasses);
diff --git a/modules/javafx.graphics/src/main/java/javafx/css/Rule.java b/modules/javafx.graphics/src/main/java/javafx/css/Rule.java
index 4c9ea7077da..6b99bb91569 100644
--- a/modules/javafx.graphics/src/main/java/javafx/css/Rule.java
+++ b/modules/javafx.graphics/src/main/java/javafx/css/Rule.java
@@ -30,6 +30,7 @@
 import javafx.scene.Node;
 
 import com.sun.javafx.collections.TrackableObservableList;
+import com.sun.javafx.css.BinarySerializer;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -331,7 +332,7 @@ final void writeBinary(DataOutputStream os, StyleConverter.StringStore stringSto
         os.writeShort(nSelectors);
         for (int i = 0; i < nSelectors; i++) {
             Selector sel = this.selectors.get(i);
-            sel.writeBinary(os, stringStore);
+            BinarySerializer.write(sel, os, stringStore);
         }
 
         List<Declaration> decls = getUnobservedDeclarationList();
@@ -363,7 +364,7 @@ static Rule readBinary(int bssVersion, DataInputStream is, String[] strings)
         short nSelectors = is.readShort();
         List<Selector> selectors = new ArrayList<>(nSelectors);
         for (int i = 0; i < nSelectors; i++) {
-            Selector s = Selector.readBinary(bssVersion, is, strings);
+            Selector s = BinarySerializer.read(is, strings);
             selectors.add(s);
         }
 
diff --git a/modules/javafx.graphics/src/main/java/javafx/css/Selector.java b/modules/javafx.graphics/src/main/java/javafx/css/Selector.java
index ed7ea8733f8..94069c6fc5b 100644
--- a/modules/javafx.graphics/src/main/java/javafx/css/Selector.java
+++ b/modules/javafx.graphics/src/main/java/javafx/css/Selector.java
@@ -26,10 +26,9 @@
 package javafx.css;
 
 import com.sun.javafx.css.Combinator;
+import com.sun.javafx.css.CompoundSelector;
+import com.sun.javafx.css.SimpleSelector;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -40,16 +39,17 @@
  *
  * @since 9
  */
-abstract public class Selector {
+public abstract sealed class Selector permits SimpleSelector, CompoundSelector {
 
     /**
-     * Package scoped constructor.
+     * Constructor for subclasses to call.
+     *
+     * @since 24
      */
-    Selector() {
+    protected Selector() {
     }
 
     private static class UniversalSelector {
-        @SuppressWarnings("removal")
         private static final Selector INSTANCE =
             new SimpleSelector("*", null, null, null);
     }
@@ -106,7 +106,9 @@ public int getOrdinal() {
      *
      * @return a match, never {@code null}
      */
-    public abstract Match createMatch();
+    public final Match createMatch() {
+        return Match.of(this);
+    }
 
     /**
      * Gets whether this {@code Selector} applies to the given {@code Styleable}.
@@ -137,48 +139,11 @@ public int getOrdinal() {
      */
     public abstract boolean stateMatches(Styleable styleable, Set<PseudoClass> state);
 
-    private static final int TYPE_SIMPLE = 1;
-    private static final int TYPE_COMPOUND = 2;
-
-    /**
-     * Writes {@code Selector} data in binary form to given {@code DataOutputStream}.
-     * @param os {@code DataOutputStream} to write {@code Selector} data to
-     * @param stringStore unused
-     * @throws IOException if writing to {@code DataOutputStream} fails
-     */
-    @SuppressWarnings("removal")
-    protected void writeBinary(DataOutputStream os, StyleConverter.StringStore stringStore)
-        throws IOException {
-        if (this instanceof SimpleSelector) {
-            os.writeByte(TYPE_SIMPLE);
-        } else {
-            os.writeByte(TYPE_COMPOUND);
-        }
-    }
-
-    /**
-     * Reads binary {@code Selector} data from a given {@code DataInputStream}.
-     * @param bssVersion bss version identifier
-     * @param is {@code DataInputStream} to read {@code Selector} data from
-     * @param strings string array containing selector details
-     * @throws IOException if reading from {@code DataInputStream} fails
-     */
-    @SuppressWarnings("removal")
-    static Selector readBinary(int bssVersion, DataInputStream is, String[] strings)
-        throws IOException {
-        final int type = is.readByte();
-        if (type == TYPE_SIMPLE)
-            return SimpleSelector.readBinary(bssVersion, is,strings);
-        else
-            return CompoundSelector.readBinary(bssVersion, is,strings);
-    }
-
     /**
      * Creates a {@code Selector} object.
      * @param cssSelector CSS selector string
      * @return a {@code Selector}
      */
-    @SuppressWarnings("removal")
     public static Selector createSelector(final String cssSelector) {
         if (cssSelector == null || cssSelector.length() == 0) {
             return null; // actually return a default no-match selector
diff --git a/modules/javafx.graphics/src/shims/java/javafx/css/SimpleSelectorShim.java b/modules/javafx.graphics/src/shims/java/javafx/css/SimpleSelectorShim.java
deleted file mode 100644
index e4b107186ed..00000000000
--- a/modules/javafx.graphics/src/shims/java/javafx/css/SimpleSelectorShim.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * 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.
- */
-package javafx.css;
-
-import java.util.List;
-import java.util.Set;
-
-public class SimpleSelectorShim {
-
-    public static SimpleSelector getSimpleSelector(
-            final String name, final List<String> styleClasses,
-            final List<String> pseudoClasses, final String id) {
-        return new SimpleSelector(name, styleClasses, pseudoClasses, id);
-    }
-
-    public static Set<PseudoClass> getPseudoClassStates(SimpleSelector ss) {
-        return ss.getPseudoClassStates();
-    }
-
-}
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/css/CssMetaDataTest.java b/modules/javafx.graphics/src/test/java/test/javafx/css/CssMetaDataTest.java
index c531c1e95d8..a8c8245c7c8 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/css/CssMetaDataTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/css/CssMetaDataTest.java
@@ -54,7 +54,8 @@
 import javafx.stage.Stage;
 import javafx.css.converter.BooleanConverter;
 import com.sun.javafx.scene.NodeHelper;
-import javafx.css.CompoundSelector;
+import com.sun.javafx.css.CompoundSelector;
+import com.sun.javafx.css.SimpleSelector;
 import javafx.css.CssMetaData;
 import javafx.css.CssParser;
 import javafx.css.CssParserShim;
@@ -67,8 +68,6 @@
 import javafx.css.RuleShim;
 import javafx.css.Selector;
 import javafx.css.SelectorShim;
-import javafx.css.SimpleSelector;
-import javafx.css.SimpleSelectorShim;
 import javafx.css.Style;
 import javafx.css.StyleConverter;
 import javafx.css.StyleOrigin;
@@ -252,16 +251,15 @@ public void testEquals() {
     static CascadingStyle createCascadingStyle(Selector selector, Declaration declaration) {
 
         Set<PseudoClass> pseudoClasses = null;
-        if (selector instanceof SimpleSelector) {
+        if (selector instanceof SimpleSelector s) {
 
-            pseudoClasses =
-                    SimpleSelectorShim.getPseudoClassStates((SimpleSelector)selector);
+            pseudoClasses = s.getPseudoClassStates();
         } else {
 
             pseudoClasses = new PseudoClassState();
             for (SimpleSelector sel : ((CompoundSelector)selector).getSelectors()) {
 
-                Set<PseudoClass> selectorPseudoClasses = SimpleSelectorShim.getPseudoClassStates(sel);
+                Set<PseudoClass> selectorPseudoClasses = sel.getPseudoClassStates();
                 pseudoClasses.addAll(selectorPseudoClasses);
             }
         }
@@ -291,7 +289,7 @@ public void testGetMatchingStyles() {
         List<String> rootStyleClass = new ArrayList<>();
         rootStyleClass.add("root");
 
-        Selector root = SimpleSelectorShim.getSimpleSelector("*", rootStyleClass, null, null);
+        Selector root = new SimpleSelector("*", rootStyleClass, null, null);
 
         ParsedValue fxBaseValue = new CssParserShim().parseExpr("-fx-base", "red");
         Declaration fxBase = DeclarationShim.getDeclaration("-fx-base", fxBaseValue, false);
@@ -314,7 +312,7 @@ public void testGetMatchingStyles() {
         List<String> rectStyleClass = new ArrayList<>();
         rectStyleClass.add("rect");
 
-        Selector rect = SimpleSelectorShim.getSimpleSelector("*", rectStyleClass, null, null);
+        Selector rect = new SimpleSelector("*", rectStyleClass, null, null);
 
         ParsedValue fxFillValue = new CssParserShim().parseExpr("-fx-fill", "-fx-color");
         Declaration fxFill = DeclarationShim.getDeclaration("-fx-fill", fxFillValue, false);
@@ -332,7 +330,7 @@ public void testGetMatchingStyles() {
         List<String> pseudoclasses = new ArrayList<>();
         pseudoclasses.add("hover");
 
-        Selector rectHover = SimpleSelectorShim.getSimpleSelector("*", rectStyleClass, pseudoclasses, null);
+        Selector rectHover = new SimpleSelector("*", rectStyleClass, pseudoclasses, null);
 
         ParsedValueImpl<Color,Color> fxFillHoverValue = new ParsedValueImpl<>(Color.YELLOW, null);
         Declaration fxFillHover = DeclarationShim.getDeclaration("-fx-fill", fxFillHoverValue, false);
@@ -396,7 +394,7 @@ public void testGetMatchingStylesWithInlineStyleOnParent() {
         List<String> rootStyleClass = new ArrayList<>();
         rootStyleClass.add("root");
 
-        Selector root = SimpleSelectorShim.getSimpleSelector("*", rootStyleClass, null, null);
+        Selector root = new SimpleSelector("*", rootStyleClass, null, null);
 
         ParsedValue fxBaseValue = new CssParserShim().parseExpr("-fx-base", "red");
         Declaration fxBase = DeclarationShim.getDeclaration("-fx-base", fxBaseValue, false);
@@ -419,7 +417,7 @@ public void testGetMatchingStylesWithInlineStyleOnParent() {
         List<String> rectStyleClass = new ArrayList<>();
         rectStyleClass.add("rect");
 
-        Selector rect = SimpleSelectorShim.getSimpleSelector("*", rectStyleClass, null, null);
+        Selector rect = new SimpleSelector("*", rectStyleClass, null, null);
 
         ParsedValue fxFillValue = new CssParserShim().parseExpr("-fx-fill", "-fx-color");
         Declaration fxFill = DeclarationShim.getDeclaration("-fx-fill", fxFillValue, false);
@@ -437,7 +435,7 @@ public void testGetMatchingStylesWithInlineStyleOnParent() {
         List<String> pseudoclasses = new ArrayList<>();
         pseudoclasses.add("hover");
 
-        Selector rectHover = SimpleSelectorShim.getSimpleSelector("*", rectStyleClass, pseudoclasses, null);
+        Selector rectHover = new SimpleSelector("*", rectStyleClass, pseudoclasses, null);
 
         ParsedValueImpl<Color,Color> fxFillHoverValue = new ParsedValueImpl<>(Color.YELLOW, null);
         Declaration fxFillHover = DeclarationShim.getDeclaration("-fx-fill", fxFillHoverValue, false);
@@ -520,7 +518,7 @@ public void testGetMatchingStylesWithInlineStyleOnLeaf() {
         List<String> rootStyleClass = new ArrayList<>();
         rootStyleClass.add("root");
 
-        Selector root = SimpleSelectorShim.getSimpleSelector("*", rootStyleClass, null, null);
+        Selector root = new SimpleSelector("*", rootStyleClass, null, null);
 
         ParsedValue fxBaseValue = new CssParserShim().parseExpr("-fx-base", "red");
         Declaration fxBase = DeclarationShim.getDeclaration("-fx-base", fxBaseValue, false);
@@ -543,7 +541,7 @@ public void testGetMatchingStylesWithInlineStyleOnLeaf() {
         List<String> rectStyleClass = new ArrayList<>();
         rectStyleClass.add("rect");
 
-        Selector rect = SimpleSelectorShim.getSimpleSelector("*", rectStyleClass, null, null);
+        Selector rect = new SimpleSelector("*", rectStyleClass, null, null);
 
         ParsedValue fxFillValue = new CssParserShim().parseExpr("-fx-fill", "-fx-color");
         Declaration fxFill = DeclarationShim.getDeclaration("-fx-fill", fxFillValue, false);
@@ -561,7 +559,7 @@ public void testGetMatchingStylesWithInlineStyleOnLeaf() {
         List<String> pseudoclasses = new ArrayList<>();
         pseudoclasses.add("hover");
 
-        Selector rectHover = SimpleSelectorShim.getSimpleSelector("*", rectStyleClass, pseudoclasses, null);
+        Selector rectHover = new SimpleSelector("*", rectStyleClass, pseudoclasses, null);
 
         ParsedValueImpl<Color,Color> fxFillHoverValue = new ParsedValueImpl<>(Color.YELLOW, null);
         Declaration fxFillHover = DeclarationShim.getDeclaration("-fx-fill", fxFillHoverValue, false);
@@ -644,7 +642,7 @@ public void testGetMatchingStylesWithInlineStyleOnRootAndLeaf() {
         List<String> rootStyleClass = new ArrayList<>();
         rootStyleClass.add("root");
 
-        Selector root = SimpleSelectorShim.getSimpleSelector("*", rootStyleClass, null, null);
+        Selector root = new SimpleSelector("*", rootStyleClass, null, null);
 
         ParsedValue fxBaseValue = new CssParserShim().parseExpr("-fx-base", "red");
         Declaration fxBase = DeclarationShim.getDeclaration("-fx-base", fxBaseValue, false);
@@ -667,7 +665,7 @@ public void testGetMatchingStylesWithInlineStyleOnRootAndLeaf() {
         List<String> rectStyleClass = new ArrayList<>();
         rectStyleClass.add("rect");
 
-        Selector rect = SimpleSelectorShim.getSimpleSelector("*", rectStyleClass, null, null);
+        Selector rect = new SimpleSelector("*", rectStyleClass, null, null);
 
         ParsedValue fxFillValue = new CssParserShim().parseExpr("-fx-fill", "-fx-color");
         Declaration fxFill = DeclarationShim.getDeclaration("-fx-fill", fxFillValue, false);
@@ -685,7 +683,7 @@ public void testGetMatchingStylesWithInlineStyleOnRootAndLeaf() {
         List<String> pseudoclasses = new ArrayList<>();
         pseudoclasses.add("hover");
 
-        Selector rectHover = SimpleSelectorShim.getSimpleSelector("*", rectStyleClass, pseudoclasses, null);
+        Selector rectHover = new SimpleSelector("*", rectStyleClass, pseudoclasses, null);
 
         ParsedValueImpl<Color,Color> fxFillHoverValue = new ParsedValueImpl<>(Color.YELLOW, null);
         Declaration fxFillHover = DeclarationShim.getDeclaration("-fx-fill", fxFillHoverValue, false);
@@ -772,7 +770,7 @@ public void testGetMatchingStylesShouldNotReturnAncestorPropertyIfNotInherited()
         List<String> rootStyleClass = new ArrayList<>();
         rootStyleClass.add("root");
 
-        Selector root = SimpleSelectorShim.getSimpleSelector("*", rootStyleClass, null, null);
+        Selector root = new SimpleSelector("*", rootStyleClass, null, null);
 
         ParsedValue fxBaseValue = new CssParserShim().parseExpr("-fx-base", "red");
         Declaration fxBase = DeclarationShim.getDeclaration("-fx-base", fxBaseValue, false);
@@ -798,7 +796,7 @@ public void testGetMatchingStylesShouldNotReturnAncestorPropertyIfNotInherited()
         List<String> rectStyleClass = new ArrayList<>();
         rectStyleClass.add("rect");
 
-        Selector rect = SimpleSelectorShim.getSimpleSelector("*", rectStyleClass, null, null);
+        Selector rect = new SimpleSelector("*", rectStyleClass, null, null);
 
         ParsedValue fxFillValue = new CssParserShim().parseExpr("-fx-fill", "-fx-color");
         Declaration fxFill = DeclarationShim.getDeclaration("-fx-fill", fxFillValue, false);
@@ -816,7 +814,7 @@ public void testGetMatchingStylesShouldNotReturnAncestorPropertyIfNotInherited()
         List<String> pseudoclasses = new ArrayList<>();
         pseudoclasses.add("hover");
 
-        Selector rectHover = SimpleSelectorShim.getSimpleSelector("*", rectStyleClass, pseudoclasses, null);
+        Selector rectHover = new SimpleSelector("*", rectStyleClass, pseudoclasses, null);
 
         ParsedValueImpl<Color,Color> fxFillHoverValue = new ParsedValueImpl<>(Color.YELLOW, null);
         Declaration fxFillHover = DeclarationShim.getDeclaration("-fx-fill", fxFillHoverValue, false);
@@ -883,7 +881,7 @@ public void testGetMatchingStylesShouldNotReturnInlineAncestorPropertyIfNotInher
         //
         // .root { -fx-base: red; -fx-color: -fx-base; }
         //
-        Selector root = SimpleSelectorShim.getSimpleSelector("*", rootStyleClass, null, null);
+        Selector root = new SimpleSelector("*", rootStyleClass, null, null);
 
         ParsedValue fxBaseValue = new CssParserShim().parseExpr("-fx-base", "red");
         Declaration fxBase = DeclarationShim.getDeclaration("-fx-base", fxBaseValue, false);
@@ -906,7 +904,7 @@ public void testGetMatchingStylesShouldNotReturnInlineAncestorPropertyIfNotInher
         //
         // .rect { -fx-fill: -fx-color; }
         //
-        Selector rect = SimpleSelectorShim.getSimpleSelector("*", rectStyleClass, null, null);
+        Selector rect = new SimpleSelector("*", rectStyleClass, null, null);
 
         ParsedValue fxFillValue = new CssParserShim().parseExpr("-fx-fill", "-fx-color");
         Declaration fxFill = DeclarationShim.getDeclaration("-fx-fill", fxFillValue, false);
@@ -924,7 +922,7 @@ public void testGetMatchingStylesShouldNotReturnInlineAncestorPropertyIfNotInher
         List<String> pseudoclasses = new ArrayList<>();
         pseudoclasses.add("hover");
 
-        Selector rectHover = SimpleSelectorShim.getSimpleSelector("*", rectStyleClass, pseudoclasses, null);
+        Selector rectHover = new SimpleSelector("*", rectStyleClass, pseudoclasses, null);
 
         ParsedValueImpl<Color,Color> fxFillHoverValue = new ParsedValueImpl<>(Color.YELLOW, null);
         Declaration fxFillHover = DeclarationShim.getDeclaration("-fx-fill", fxFillHoverValue, false);
@@ -986,7 +984,7 @@ public void testGetMatchingStylesReturnsInheritedProperty() {
         List<String> rootStyleClass = new ArrayList<>();
         rootStyleClass.add("root");
 
-        Selector root = SimpleSelectorShim.getSimpleSelector("*", rootStyleClass, null, null);
+        Selector root = new SimpleSelector("*", rootStyleClass, null, null);
 
         ParsedValue<Color,Color> fxFontShouldInheritValue = new CssParserShim().parseExpr("-fx-font", "12px system");
         Declaration fxFontShouldInherit = DeclarationShim.getDeclaration("-fx-font", fxFontShouldInheritValue, false);
@@ -1006,7 +1004,7 @@ public void testGetMatchingStylesReturnsInheritedProperty() {
         List<String> textStyleClass = new ArrayList<>();
         textStyleClass.add("text");
 
-        Selector textSelector = SimpleSelectorShim.getSimpleSelector("*", textStyleClass, null, null);
+        Selector textSelector = new SimpleSelector("*", textStyleClass, null, null);
 
         ParsedValue fxFillValue = new CssParserShim().parseExpr("-fx-fill", "red");
         Declaration fxFill = DeclarationShim.getDeclaration("-fx-fill", fxFillValue, false);
@@ -1067,7 +1065,7 @@ public void testGetMatchingStylesReturnsSubProperty() {
         List<String> rootStyleClass = new ArrayList<>();
         rootStyleClass.add("root");
 
-        Selector root = SimpleSelectorShim.getSimpleSelector("*", rootStyleClass, null, null);
+        Selector root = new SimpleSelector("*", rootStyleClass, null, null);
 
         ParsedValue<Color,Color> fxFontShouldInheritValue = new CssParserShim().parseExpr("-fx-font", "12px system");
         Declaration fxFontShouldInherit = DeclarationShim.getDeclaration("-fx-font", fxFontShouldInheritValue, false);
@@ -1087,7 +1085,7 @@ public void testGetMatchingStylesReturnsSubProperty() {
         List<String> rectStyleClass = new ArrayList<>();
         rectStyleClass.add("text");
 
-        Selector textSelector = SimpleSelectorShim.getSimpleSelector("*", rectStyleClass, null, null);
+        Selector textSelector = new SimpleSelector("*", rectStyleClass, null, null);
 
         ParsedValue fxFillValue = new CssParserShim().parseExpr("-fx-fill", "red");
         Declaration fxFill = DeclarationShim.getDeclaration("-fx-fill", fxFillValue, false);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/css/SelectorPartitioningTest.java b/modules/javafx.graphics/src/test/java/test/javafx/css/SelectorPartitioningTest.java
index de699fe43be..47771bec293 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/css/SelectorPartitioningTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/css/SelectorPartitioningTest.java
@@ -26,6 +26,7 @@
 package test.javafx.css;
 
 import com.sun.javafx.css.SelectorPartitioning;
+import com.sun.javafx.css.SimpleSelector;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -36,8 +37,6 @@
 import javafx.css.Rule;
 import javafx.css.RuleShim;
 import javafx.css.Selector;
-import javafx.css.SimpleSelector;
-import javafx.css.SimpleSelectorShim;
 import javafx.css.Stylesheet;
 import javafx.scene.paint.Color;
 import org.junit.Test;
@@ -88,8 +87,7 @@ private static class SimpleData extends Data {
                 ).toString());
             List<String> styleClasses =
                 styleClass != null ? Arrays.asList(styleClass.split("\\.")) : null;
-            this.selector =
-                SimpleSelectorShim.getSimpleSelector(type, styleClasses, null, id);
+            this.selector = new SimpleSelector(type, styleClasses, null, id);
             this.matches = matches;
         }
     }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/css/StylesheetTest.java b/modules/javafx.graphics/src/test/java/test/javafx/css/StylesheetTest.java
index 09e2ba56ff0..6311d4466d6 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/css/StylesheetTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/css/StylesheetTest.java
@@ -25,6 +25,7 @@
 
 package test.javafx.css;
 
+import com.sun.javafx.css.SimpleSelector;
 import com.sun.javafx.css.StyleManager;
 import javafx.css.StyleConverter.StringStore;
 import javafx.css.converter.EnumConverter;
@@ -49,7 +50,6 @@
 import javafx.css.Rule;
 import javafx.css.RuleShim;
 import javafx.css.Selector;
-import javafx.css.SimpleSelector;
 import javafx.css.StyleConverter;
 import javafx.css.StyleOrigin;
 import javafx.css.StyleableProperty;

From 463fdab5cffe88c6f8ce5465795d579d45342fac Mon Sep 17 00:00:00 2001
From: Ambarish Rapte <arapte@openjdk.org>
Date: Wed, 11 Sep 2024 03:54:35 +0000
Subject: [PATCH 35/75] 8337328: JavaFX build uses deprecated features that
 will be removed in gradle 9

Reviewed-by: kcr, angorya
---
 build.gradle                     | 9 ++++++---
 gradle/verification-metadata.xml | 8 ++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 00bc804083e..99dd37a9331 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2108,7 +2108,9 @@ allprojects {
     // Set sourceCompatibility to the target release of Java. Most modules
     // set compiler.options.release (to the same target version), which will
     // override this setting, but it is needed for those modules that can't.
-    sourceCompatibility = JAVA_TARGET_VERSION
+    java {
+        sourceCompatibility = JAVA_TARGET_VERSION
+    }
 
     // By default all of our projects require junit for testing so we can just
     // setup this dependency here.
@@ -2123,6 +2125,7 @@ allprojects {
         testRuntimeOnly group: "org.junit.jupiter", name: "junit-jupiter-engine", version: "5.8.1"
         testRuntimeOnly group: "org.junit.platform", name: "junit-platform-commons", version: "1.8.1"
         testRuntimeOnly group: "org.junit.platform", name: "junit-platform-engine", version: "1.8.1"
+        testRuntimeOnly group: "org.junit.platform", name: "junit-platform-launcher", version: "1.8.1"
         testRuntimeOnly group: "org.junit.vintage", name: "junit-vintage-engine", version: "5.8.1"
 
         if (BUILD_CLOSED && DO_JCOV)  {
@@ -4723,8 +4726,8 @@ compileTargets { t ->
             includeEmptyDirs = false
             // Sets directory and file permissions in archive for Windows
             if (IS_WINDOWS && IS_USE_CYGWIN) {
-                dirMode = 0755
-                fileMode = 0755
+                dirPermissions { unix(0755) }
+                filePermissions { unix(0755) }
             }
             from sdkArtifactsDir
             into "${sdkBundleName}"
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 3fcdc0770f6..1f0db6f19ff 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -358,6 +358,14 @@
             <sha256 value="d9f420a64539a3edf60f80df0c6fd722b750725744c79ca40f7d25ae56ca4ba4" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit.platform" name="junit-platform-launcher" version="1.8.1">
+         <artifact name="junit-platform-launcher-1.8.1.jar">
+            <sha256 value="83a9ed68adcb76e60316a4d682fc48507865df2f0ab35f82695cc9995410e05e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-platform-launcher-1.8.1.module">
+            <sha256 value="6108932af9febe85e8ab758dc02af1d3a931a972100dad460b10961cbe361763" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.junit.vintage" name="junit-vintage-engine" version="5.8.1">
          <artifact name="junit-vintage-engine-5.8.1.jar">
             <sha256 value="176b53cd1bdbf9233e96c8b0c7a9e5b864282fbbdeba43b5ceafdedb29a49156" origin="Generated by Gradle"/>

From 639f138380a4091befa3046f7211aab77f8d77dd Mon Sep 17 00:00:00 2001
From: Kevin Rushforth <kcr@openjdk.org>
Date: Thu, 12 Sep 2024 11:17:28 +0000
Subject: [PATCH 36/75] 8339247: Create release notes for JavaFX 23

Reviewed-by: angorya
---
 doc-files/release-notes-23.md | 145 ++++++++++++++++++++++++++++++++++
 1 file changed, 145 insertions(+)
 create mode 100644 doc-files/release-notes-23.md

diff --git a/doc-files/release-notes-23.md b/doc-files/release-notes-23.md
new file mode 100644
index 00000000000..2d4efe7bfdb
--- /dev/null
+++ b/doc-files/release-notes-23.md
@@ -0,0 +1,145 @@
+# Release Notes for JavaFX 23
+
+## Introduction
+
+The following notes describe important changes and information about this release. In some cases, the descriptions provide links to additional detailed information about an issue or a change.
+
+These release notes cover the standalone JavaFX 23 release. JavaFX 23 requires JDK 21 or later.
+
+## Important Changes
+
+### JavaFX 23 Requires JDK 21 or Later
+
+JavaFX 23 is compiled with `--release 21` and thus requires JDK 21 or later in order to run. If you attempt to run with an older JDK, the Java launcher will exit with an error message indicating that the `javafx.base` module cannot be read.
+
+See [JDK-8321603](https://bugs.openjdk.org/browse/JDK-8321603) for more information.
+
+### Clicking on the Scrollbar Track of Virtualized Controls Scrolls by Viewport Length
+
+Clicking on the scrollbar track of virtualized controls, such as `ListView`, `TreeView`, `TableView`, and `TreeTableView`, now scrolls by the viewport length rather than the length of the empty cell. Furthermore, cells are no longer aligned to the top or bottom of the viewport after scrolling.
+
+See [JDK-8323511](https://bugs.openjdk.org/browse/JDK-8323511) for more information.
+
+### Keyboard Scrolling in Virtualized Controls
+
+Keyboard scrolling key bindings, `alt-ctrl-arrows` (`option-command-arrows` on macOS), have been added to virtualized controls such as  `ListView`, `TreeView`, `TableView`, and `TreeTableView` to improve accessibility.
+
+See [JDK-8313138](https://bugs.openjdk.org/browse/JDK-8313138) for more information.
+
+## List of New Features
+
+Issue Key|Summary|Subcomponent
+---------|-------|------------
+[JDK-8092102](https://bugs.openjdk.org/browse/JDK-8092102)|Labeled: textTruncated property|controls
+[JDK-8313138](https://bugs.openjdk.org/browse/JDK-8313138)|Scrollbar Keyboard enhancement|controls
+[JDK-8267565](https://bugs.openjdk.org/browse/JDK-8267565)|Support "@3x" and greater high-density image naming convention|graphics
+[JDK-8311895](https://bugs.openjdk.org/browse/JDK-8311895)|CSS Transitions|graphics
+[JDK-8282999](https://bugs.openjdk.org/browse/JDK-8282999)|Add support for EXT-X-MEDIA tag in HTTP Live Streaming|media
+
+## List of Other Enhancements
+
+Issue Key|Summary|Subcomponent
+---------|-------|------------
+[JDK-8321603](https://bugs.openjdk.org/browse/JDK-8321603)|Bump minimum JDK version for JavaFX to JDK 21|build
+[JDK-8322748](https://bugs.openjdk.org/browse/JDK-8322748)|Caret blinking in JavaFX should only stop when caret moves|controls
+[JDK-8322964](https://bugs.openjdk.org/browse/JDK-8322964)|Optimize performance of CSS selector matching|graphics
+[JDK-8324182](https://bugs.openjdk.org/browse/JDK-8324182)|Deprecate for removal SimpleSelector and CompoundSelector classes|graphics
+[JDK-8325900](https://bugs.openjdk.org/browse/JDK-8325900)|Emit a warning on macOS if AWT has set the NSAppearance|graphics
+
+## List of Fixed Bugs
+
+Issue Key|Summary|Subcomponent
+---------|-------|------------
+[JDK-8309374](https://bugs.openjdk.org/browse/JDK-8309374)|Accessibility Focus Rectangle on ListItem is not drawn when ListView is shown for first time|accessibility
+[JDK-8329705](https://bugs.openjdk.org/browse/JDK-8329705)|Add missing Application thread checks to platform specific a11y methods|accessibility
+[JDK-8330462](https://bugs.openjdk.org/browse/JDK-8330462)|StringIndexOutOfBoundException when typing anything into TextField|accessibility
+[JDK-8332748](https://bugs.openjdk.org/browse/JDK-8332748)|Grammatical errors in animation API docs|animation
+[JDK-8271865](https://bugs.openjdk.org/browse/JDK-8271865)|SortedList::getViewIndex behaves not correctly for some index values|base
+[JDK-8324797](https://bugs.openjdk.org/browse/JDK-8324797)|Code example in JavaDoc of ObservableValue#when doesn't compile|base
+[JDK-8331616](https://bugs.openjdk.org/browse/JDK-8331616)|ChangeListener is not triggered when the InvalidationListener is removed|base
+[JDK-8088923](https://bugs.openjdk.org/browse/JDK-8088923)|IOOBE when adding duplicate categories to the BarChart|controls
+[JDK-8186188](https://bugs.openjdk.org/browse/JDK-8186188)|TableColumHeader: initial auto-size broken if has graphic|controls
+[JDK-8193286](https://bugs.openjdk.org/browse/JDK-8193286)|IntegerSpinnerFactory does not wrap value correctly|controls
+[JDK-8198830](https://bugs.openjdk.org/browse/JDK-8198830)|BarChart: auto-range of CategoryAxis not working on dynamically setting data|controls
+[JDK-8242553](https://bugs.openjdk.org/browse/JDK-8242553)|IntegerSpinner and DoubleSpinner do not wrap around values correctly in some cases|controls
+[JDK-8273349](https://bugs.openjdk.org/browse/JDK-8273349)|Check uses of Stream::peek in controls and replace as needed|controls
+[JDK-8273657](https://bugs.openjdk.org/browse/JDK-8273657)|TextField: all text content must be selected initially|controls
+[JDK-8279140](https://bugs.openjdk.org/browse/JDK-8279140)|ComboBox can lose selected value on item change via setAll|controls
+[JDK-8301900](https://bugs.openjdk.org/browse/JDK-8301900)|TextArea: Committing text with ENTER in an IME window inserts newline|controls
+[JDK-8307117](https://bugs.openjdk.org/browse/JDK-8307117)|TextArea: wrapText property ignored when changing font|controls
+[JDK-8314754](https://bugs.openjdk.org/browse/JDK-8314754)|Minor ticks are not getting updated both the axes in LineChart|controls
+[JDK-8319844](https://bugs.openjdk.org/browse/JDK-8319844)|Text/TextFlow.hitTest() is incorrect in RTL orientation|controls
+[JDK-8323511](https://bugs.openjdk.org/browse/JDK-8323511)|Scrollbar Click jumps inconsistent amount of pixels|controls
+[JDK-8323615](https://bugs.openjdk.org/browse/JDK-8323615)|PopupControl.skin.setSkin(Skin) fails to call dispose() on discarded Skin|controls
+[JDK-8324327](https://bugs.openjdk.org/browse/JDK-8324327)|ColorPicker shows a white rectangle on clicking on picker|controls
+[JDK-8324939](https://bugs.openjdk.org/browse/JDK-8324939)|Editable TableView loses focus after commit|controls
+[JDK-8325154](https://bugs.openjdk.org/browse/JDK-8325154)|resizeColumnToFitContent is slower than it needs to be|controls
+[JDK-8325402](https://bugs.openjdk.org/browse/JDK-8325402)|TreeTableRow updateItem() does not check item with isItemChanged(..)|controls
+[JDK-8325798](https://bugs.openjdk.org/browse/JDK-8325798)|Spinner throws uncatchable exception on tab out from garbled text|controls
+[JDK-8327727](https://bugs.openjdk.org/browse/JDK-8327727)|Changing the row factory of a TableView does not recreate the rows|controls
+[JDK-8328577](https://bugs.openjdk.org/browse/JDK-8328577)|Toolbar's overflow button overlaps the items|controls
+[JDK-8330304](https://bugs.openjdk.org/browse/JDK-8330304)|MenuBar: Invisible Menu works incorrectly with keyboard arrows|controls
+[JDK-8330590](https://bugs.openjdk.org/browse/JDK-8330590)|TextInputControl: previous word fails with Bhojpuri characters|controls
+[JDK-8331214](https://bugs.openjdk.org/browse/JDK-8331214)|Doc: update spec for SpinnerFactory classes|controls
+[JDK-8334739](https://bugs.openjdk.org/browse/JDK-8334739)|XYChart and (Stacked)AreaChart properties return incorrect beans|controls
+[JDK-8089373](https://bugs.openjdk.org/browse/JDK-8089373)|Translation from character to key code is not sufficient|graphics
+[JDK-8260013](https://bugs.openjdk.org/browse/JDK-8260013)|Snapshot does not work for nodes in a subscene|graphics
+[JDK-8289115](https://bugs.openjdk.org/browse/JDK-8289115)|Touch events is not dispatched after upgrade to JAVAFX17+|graphics
+[JDK-8307980](https://bugs.openjdk.org/browse/JDK-8307980)|Rotate Transformation never invalidates inverseCache|graphics
+[JDK-8311124](https://bugs.openjdk.org/browse/JDK-8311124)|[Windows] User installed font 8281327 fix does not work for all cases |graphics
+[JDK-8311492](https://bugs.openjdk.org/browse/JDK-8311492)|FontSmoothingType LCD produces wrong color when transparency is used|graphics
+[JDK-8312603](https://bugs.openjdk.org/browse/JDK-8312603)|ArrayIndexOutOfBoundsException in Marlin when scaleX is 0|graphics
+[JDK-8314215](https://bugs.openjdk.org/browse/JDK-8314215)|Trailing Spaces before Line Breaks Affect the Center Alignment of Text|graphics
+[JDK-8322251](https://bugs.openjdk.org/browse/JDK-8322251)|[Linux] JavaFX is not displaying CJK on Ubuntu 23.10 and later|graphics
+[JDK-8322619](https://bugs.openjdk.org/browse/JDK-8322619)|Parts of SG no longer update during rendering - overlapping - culling - dirty|graphics
+[JDK-8324233](https://bugs.openjdk.org/browse/JDK-8324233)|Update JPEG Image Decoding Software to 9f|graphics
+[JDK-8331603](https://bugs.openjdk.org/browse/JDK-8331603)|Cleanup native AbstractSurface methods getRGBImpl, setRGBImpl|graphics
+[JDK-8332251](https://bugs.openjdk.org/browse/JDK-8332251)|javadoc: incorrect method references in Region and PopupControl|graphics
+[JDK-8332863](https://bugs.openjdk.org/browse/JDK-8332863)|Crash in JPEG decoder if we enable MEM_STATS|graphics
+[JDK-8338478](https://bugs.openjdk.org/browse/JDK-8338478)|[macos] Crash in CoreText with certain strings using JDK 22 or later|graphics
+[JDK-8320912](https://bugs.openjdk.org/browse/JDK-8320912)|IME should commit on focus change|localization
+[JDK-8146918](https://bugs.openjdk.org/browse/JDK-8146918)|ConcurrentModificationException in MediaPlayer|media
+[JDK-8308955](https://bugs.openjdk.org/browse/JDK-8308955)|MediaPlayer/AudioClip skip data on seek/loop|media
+[JDK-8328603](https://bugs.openjdk.org/browse/JDK-8328603)|HLS video stream fails to render consistently|media
+[JDK-8270996](https://bugs.openjdk.org/browse/JDK-8270996)|javadoc: missing comments in serialized classes|other
+[JDK-8325073](https://bugs.openjdk.org/browse/JDK-8325073)|javadoc warnings: missing @param tags and other issues|other
+[JDK-8087444](https://bugs.openjdk.org/browse/JDK-8087444)|CornerRadii with different horizontal and vertical values treated as uniform|scenegraph
+[JDK-8090267](https://bugs.openjdk.org/browse/JDK-8090267)|JFXPanel Input Problem|swing
+[JDK-8322784](https://bugs.openjdk.org/browse/JDK-8322784)|JFXPanel calls InputMethodRequests on wrong thread|swing
+[JDK-8324239](https://bugs.openjdk.org/browse/JDK-8324239)|JFXPanelHiDPITest fails on Windows 11|swing
+[JDK-8318614](https://bugs.openjdk.org/browse/JDK-8318614)|Update WebKit to 617.1|web
+[JDK-8322703](https://bugs.openjdk.org/browse/JDK-8322703)|Intermittent crash in WebView in a JFXPanel from IME calls on macOS|web
+[JDK-8323879](https://bugs.openjdk.org/browse/JDK-8323879)|constructor Path(Path) which takes another Path object fail to draw on canvas html|web
+[JDK-8323880](https://bugs.openjdk.org/browse/JDK-8323880)|Caret rendered at wrong position in case of a click event on RTL text|web
+[JDK-8324326](https://bugs.openjdk.org/browse/JDK-8324326)|Update ICU4C to 74.2|web
+[JDK-8324337](https://bugs.openjdk.org/browse/JDK-8324337)|Cherry-pick WebKit 617.1 stabilization fixes|web
+[JDK-8325258](https://bugs.openjdk.org/browse/JDK-8325258)|Additional WebKit 617.1 fixes from WebKitGTK 2.42.5|web
+[JDK-8326989](https://bugs.openjdk.org/browse/JDK-8326989)|Text selection issues on WebView after WebKit 617.1|web
+[JDK-8329011](https://bugs.openjdk.org/browse/JDK-8329011)|Update SQLite to 3.45.3|web
+[JDK-8331748](https://bugs.openjdk.org/browse/JDK-8331748)|Update libxml2 to 2.12.6|web
+[JDK-8331765](https://bugs.openjdk.org/browse/JDK-8331765)|Websocket callbacks are not executed after WebKit 617.1 update|web
+[JDK-8332539](https://bugs.openjdk.org/browse/JDK-8332539)|Update libxml2 to 2.12.7|web
+[JDK-8334713](https://bugs.openjdk.org/browse/JDK-8334713)|WebKit build failed on LoongArch64 because currentStackPointer is undefined|web
+[JDK-8088172](https://bugs.openjdk.org/browse/JDK-8088172)|Mac: On German keyboard, pressing <+><q> inserts two apostrophes instead of one|window-toolkit
+[JDK-8089803](https://bugs.openjdk.org/browse/JDK-8089803)|[Mac, TextArea] Japanese IME, caret moves to the next line when pressing Return to select a candidate|window-toolkit
+[JDK-8299738](https://bugs.openjdk.org/browse/JDK-8299738)|ISE if Platform::exit called with fullScreen Stage on macOS 13|window-toolkit
+[JDK-8320965](https://bugs.openjdk.org/browse/JDK-8320965)|Scrolling on a touch enabled display fails on Wayland |window-toolkit
+[JDK-8324232](https://bugs.openjdk.org/browse/JDK-8324232)|KeyEvent.getCode() is null inside JFXPanel|window-toolkit
+[JDK-8325591](https://bugs.openjdk.org/browse/JDK-8325591)|[Mac] DRAG_DONE reports null transferMode when destination is external|window-toolkit
+[JDK-8326619](https://bugs.openjdk.org/browse/JDK-8326619)|Stage.sizeToScene() on maximized/fullscreen Stage breaks the Window|window-toolkit
+[JDK-8326712](https://bugs.openjdk.org/browse/JDK-8326712)|Robot tests fail on XWayland|window-toolkit
+[JDK-8327177](https://bugs.openjdk.org/browse/JDK-8327177)|macOS: wrong GlobalRef deleted in GlassMenu|window-toolkit
+[JDK-8329821](https://bugs.openjdk.org/browse/JDK-8329821)|[Linux] When using i3 WM, menus are incorrectly sized|window-toolkit
+[JDK-8335216](https://bugs.openjdk.org/browse/JDK-8335216)|[windows] Missing error check for GetSystemDirectory in glass|window-toolkit
+[JDK-8335630](https://bugs.openjdk.org/browse/JDK-8335630)|Crash if Platform::exit called with fullScreen Stage on macOS 14|window-toolkit
+
+## List of Security fixes
+
+Issue Key|Summary|Subcomponent
+---------|-------|------------
+JDK-8313040 (not public)|Enhanced Font handling|graphics
+JDK-8313064 (not public)|General enhancements of image handling|graphics
+JDK-8313072 (not public)|Enhanced handling of Fonts|graphics
+JDK-8322236 (not public)|Build failure after JDK-8313064|graphics
+JDK-8313032 (not public)|Enhanced handling of Glass|window-toolkit
+JDK-8320441 (not public)|Additonal fix for JDK-8313032|window-toolkit

From 4f1d42af38ba494bf083ca3647f9b285f1886cbd Mon Sep 17 00:00:00 2001
From: Kevin Rushforth <kcr@openjdk.org>
Date: Fri, 13 Sep 2024 17:05:54 +0000
Subject: [PATCH 37/75] 8339517: Add --enable-native-access flag when running
 tests

Reviewed-by: arapte
---
 build.gradle                                  | 40 ++++++++++++++++---
 .../sun/webkit/LocalStorageAccessTest.java    |  1 +
 .../test/com/sun/webkit/MainThreadTest.java   |  1 +
 .../DataUrlWithModuleLayerLauncher.java       | 12 +++++-
 ...lStorageAccessWithModuleLayerLauncher.java | 12 +++++-
 5 files changed, 59 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 99dd37a9331..13de7ff0a40 100644
--- a/build.gradle
+++ b/build.gradle
@@ -362,6 +362,10 @@ ext.IS_LINUX = OS_NAME.contains("linux")
 
 ext.MAVEN_GROUP_ID = "org.openjfx"
 
+// Enable native access from modules with native code
+ext.enableNativeGraphics='--enable-native-access=javafx.graphics'
+ext.enableNativeAll='--enable-native-access=javafx.graphics,javafx.media,javafx.web'
+
 // Verify that the architecture & OS are supported configurations. Note that
 // at present building on PI is not supported, but we would only need to make
 // some changes on assumptions on what should be built (like SWT / Swing) and
@@ -1120,7 +1124,7 @@ List<String> computeModulePathArgs(String  pname, List<String> deps, boolean tes
 }
 
 
-void writeRunArgsFile(File dest, List<String> libpath, List<String> modpath, List<String> modules) {
+void writeArgsFile(boolean isCompile, File dest, List<String> libpath, List<String> modpath, List<String> modules) {
 
     dest.delete()
 
@@ -1164,9 +1168,21 @@ void writeRunArgsFile(File dest, List<String> libpath, List<String> modpath, Lis
         dest <<  "--add-modules="
         dest << modules.join(",")
         dest << "\n"
+        if (!isCompile) {
+            dest << enableNativeAll
+            dest << "\n"
+        }
     }
 }
 
+void writeCompileArgsFile(File dest, List<String> libpath, List<String> modpath, List<String> modules) {
+    writeArgsFile(true, dest, libpath, modpath, modules)
+}
+
+void writeRunArgsFile(File dest, List<String> libpath, List<String> modpath, List<String> modules) {
+    writeArgsFile(false, dest, libpath, modpath, modules)
+}
+
 // perform common project manipulation for modules
 void commonModuleSetup(Project p, List<String> moduleChain) {
 
@@ -2677,6 +2693,7 @@ project(":graphics") {
 
     test {
         def cssDir = file("$buildDir/classes/java/main/${moduleName}/javafx")
+        jvmArgs enableNativeGraphics
         jvmArgs "-Djavafx.toolkit=test.com.sun.javafx.pgstub.StubToolkit",
             "-DCSS_META_DATA_TEST_DIR=$cssDir"
         enableAssertions = true
@@ -2765,6 +2782,7 @@ project(":controls") {
 
     test {
         def cssDir = file("$buildDir/classes/java/main/${moduleName}/javafx")
+        jvmArgs enableNativeGraphics
         jvmArgs "-Djavafx.toolkit=test.com.sun.javafx.pgstub.StubToolkit",
             "-DCSS_META_DATA_TEST_DIR=$cssDir"
     }
@@ -2856,6 +2874,8 @@ project(":swing") {
 
     test {
         enabled = IS_FULL_TEST && IS_AWT_TEST
+
+        jvmArgs enableNativeGraphics
     }
 
     if (COMPILE_SWING) {
@@ -2917,6 +2937,8 @@ project(":swt") {
         enabled = false // FIXME: JIGSAW -- support this with modules
         logger.info("JIGSAW Testing disabled for swt")
 
+        jvmArgs enableNativeGraphics
+
         if (IS_MAC) {
             enabled = false
             logger.info("SWT tests are disabled on MAC, because Gradle test runner does not handle -XstartOnFirstThread properly (https://issues.gradle.org/browse/GRADLE-3290).")
@@ -2965,6 +2987,7 @@ project(":fxml") {
         // StubToolkit is not *really* needed here, but because some code inadvertently invokes performance
         // tracker and this attempts to fire up the toolkit and this looks for native libraries and fails,
         // we have to use the stub toolkit for now.
+        jvmArgs enableNativeGraphics
         jvmArgs "-Djavafx.toolkit=test.com.sun.javafx.pgstub.StubToolkit"
         // FIXME: change this to also allow JDK 9 boot jdk
         classpath += files("$JDK_HOME/jre/lib/ext/nashorn.jar")
@@ -3679,6 +3702,10 @@ project(":web") {
                 println "******************************************************"
             }
         }
+
+        // enable native access for all modules with native code
+        jvmArgs enableNativeAll
+
         // Run web tests in headless mode
         systemProperty 'glass.platform', 'Monocle'
         systemProperty 'monocle.platform', 'Headless'
@@ -4051,6 +4078,9 @@ project(":systemTests") {
     test {
         enabled = IS_FULL_TEST
 
+        // enable native access for all modules with native code
+        jvmArgs enableNativeAll
+
         // Parse testPatchModuleArgs looking for "--module-path".
         // Save path if found so we can pass it to the module launcher tests
         def pendingModulePath = false
@@ -5168,7 +5198,7 @@ compileTargets { t ->
 
             if (HAS_JAVAFX_MODULES) {
                 writeRunArgsFile(runArgsFile, computeLibraryPath(true), modpath, null)
-                writeRunArgsFile(compileArgsFile, null, modpath, null)
+                writeCompileArgsFile(compileArgsFile, null, modpath, null)
 
                 if (rootProject.hasProperty("EXTRA_ADDEXPORTS_STRING")) {
                     runArgsFile << EXTRA_ADDEXPORTS_STRING
@@ -5177,7 +5207,7 @@ compileTargets { t ->
             } else {
                 modpath = [ cygpath("${standaloneLibDir}") ]
                 writeRunArgsFile(runArgsFile, null, modpath, modnames)
-                writeRunArgsFile(compileArgsFile, null, modpath, modnames)
+                writeCompileArgsFile(compileArgsFile, null, modpath, modnames)
             }
         }
     }
@@ -5678,7 +5708,7 @@ compileTargets { t ->
                     }
                 }
 
-                writeRunArgsFile(testCompileArgsFile, null, modpath, null)
+                writeCompileArgsFile(testCompileArgsFile, null, modpath, null)
                 writeRunArgsFile(testRunArgsFile, computeLibraryPath(true), modpath, null)
 
                 if (rootProject.hasProperty("EXTRA_ADDEXPORTS_STRING")) {
@@ -5713,7 +5743,7 @@ compileTargets { t ->
                     }
                 }
 
-                writeRunArgsFile(testCompileArgsFile, null, modpath, modnames)
+                writeCompileArgsFile(testCompileArgsFile, null, modpath, modnames)
                 writeRunArgsFile(testRunArgsFile, computeLibraryPath(true), modpath, modnames)
 
             }
diff --git a/tests/system/src/test/java/test/com/sun/webkit/LocalStorageAccessTest.java b/tests/system/src/test/java/test/com/sun/webkit/LocalStorageAccessTest.java
index 23d933cce12..f79e971424e 100644
--- a/tests/system/src/test/java/test/com/sun/webkit/LocalStorageAccessTest.java
+++ b/tests/system/src/test/java/test/com/sun/webkit/LocalStorageAccessTest.java
@@ -64,6 +64,7 @@ public void testMainThreadDoesNotSegfault() throws Exception {
 
         final List<String> cmd = asList(
             workerJavaCmd,
+            "--enable-native-access=ALL-UNNAMED",
             "-cp", appModulePath + "/mymod",
             "-Djava.library.path=" + javaLibraryPath,
             "-Dmodule.path=" + appModulePath + "/mymod" + File.pathSeparator + workerModulePath,
diff --git a/tests/system/src/test/java/test/com/sun/webkit/MainThreadTest.java b/tests/system/src/test/java/test/com/sun/webkit/MainThreadTest.java
index 9bcc0c00db1..401064cf3b2 100644
--- a/tests/system/src/test/java/test/com/sun/webkit/MainThreadTest.java
+++ b/tests/system/src/test/java/test/com/sun/webkit/MainThreadTest.java
@@ -57,6 +57,7 @@ public void testMainThreadDoesNotSegfault() throws Exception {
 
         final List<String> cmd = asList(
             workerJavaCmd,
+            "--enable-native-access=ALL-UNNAMED",
             "-cp", appModulePath + "/mymod",
             "-Djava.library.path=" + javaLibraryPath,
             "-Dmodule.path=" + appModulePath + "/mymod" + File.pathSeparator + workerModulePath,
diff --git a/tests/system/src/testapp7/java/mymod/myapp7/DataUrlWithModuleLayerLauncher.java b/tests/system/src/testapp7/java/mymod/myapp7/DataUrlWithModuleLayerLauncher.java
index 38599dffd9b..e1f5af21a22 100644
--- a/tests/system/src/testapp7/java/mymod/myapp7/DataUrlWithModuleLayerLauncher.java
+++ b/tests/system/src/testapp7/java/mymod/myapp7/DataUrlWithModuleLayerLauncher.java
@@ -72,10 +72,20 @@ public void run() {
         ModuleLayer parent = ModuleLayer.boot();
         Configuration cf = parent.configuration().resolve(finder, ModuleFinder.of(), Set.of("mymod"));
         ClassLoader scl = ClassLoader.getSystemClassLoader();
-        ModuleLayer layer = parent.defineModulesWithOneLoader(cf, scl);
+        ModuleLayer.Controller controller = ModuleLayer.defineModulesWithOneLoader(cf, List.of(parent), scl);
+        // Remove reflection once JDK 22 is minimum. See JDK-8340004.
+        Method enableNativeAccessMethod = ModuleLayer.Controller.class.getMethod("enableNativeAccess", Module.class);
+        ModuleLayer layer = controller.layer();
         ClassLoader moduleClassLoader = layer.findLoader("mymod");
         Class appClass = moduleClassLoader.loadClass("javafx.application.Application");
+        Class webClass = moduleClassLoader.loadClass("javafx.scene.web.WebView");
+        // Remove reflection once JDK 22 is minimum. See JDK-8340004.
+        //controller.enableNativeAccess(webClass.getModule());
+        enableNativeAccessMethod.invoke(controller, new Object[]{webClass.getModule()});
         Class testClass = moduleClassLoader.loadClass("myapp7.DataUrlWithModuleLayer");
+        // Remove reflection once JDK 22 is minimum. See JDK-8340004.
+        //controller.enableNativeAccess(appClass.getModule());
+        enableNativeAccessMethod.invoke(controller, new Object[]{appClass.getModule()});
         Method launchMethod = appClass.getMethod("launch", Class.class, String[].class);
         launchMethod.invoke(null, new Object[]{testClass, args});
         System.exit(DataUrlWithModuleLayer.ERROR_UNEXPECTED_EXIT);
diff --git a/tests/system/src/testapp7/java/mymod/myapp7/LocalStorageAccessWithModuleLayerLauncher.java b/tests/system/src/testapp7/java/mymod/myapp7/LocalStorageAccessWithModuleLayerLauncher.java
index 62432063b9e..de31506c6f7 100644
--- a/tests/system/src/testapp7/java/mymod/myapp7/LocalStorageAccessWithModuleLayerLauncher.java
+++ b/tests/system/src/testapp7/java/mymod/myapp7/LocalStorageAccessWithModuleLayerLauncher.java
@@ -72,9 +72,19 @@ public void run() {
         ModuleLayer parent = ModuleLayer.boot();
         Configuration cf = parent.configuration().resolve(finder, ModuleFinder.of(), Set.of("mymod"));
         ClassLoader scl = ClassLoader.getSystemClassLoader();
-        ModuleLayer layer = parent.defineModulesWithOneLoader(cf, scl);
+        ModuleLayer.Controller controller = ModuleLayer.defineModulesWithOneLoader(cf, List.of(parent), scl);
+        // Remove reflection once JDK 22 is minimum. See JDK-8340004.
+        Method enableNativeAccessMethod = ModuleLayer.Controller.class.getMethod("enableNativeAccess", Module.class);
+        ModuleLayer layer = controller.layer();
         ClassLoader moduleClassLoader = layer.findLoader("mymod");
+        Class webClass = moduleClassLoader.loadClass("javafx.scene.web.WebView");
+        // Remove reflection once JDK 22 is minimum. See JDK-8340004.
+        //controller.enableNativeAccess(webClass.getModule());
+        enableNativeAccessMethod.invoke(controller, new Object[]{webClass.getModule()});
         Class appClass = moduleClassLoader.loadClass("javafx.application.Application");
+        // Remove reflection once JDK 22 is minimum. See JDK-8340004.
+        //controller.enableNativeAccess(appClass.getModule());
+        enableNativeAccessMethod.invoke(controller, new Object[]{appClass.getModule()});
         Class testClass = moduleClassLoader.loadClass("myapp7.LocalStorageAccessWithModuleLayer");
         Method launchMethod = appClass.getMethod("launch", Class.class, String[].class);
         launchMethod.invoke(null, new Object[]{testClass, args});

From 3e6a27240abcffd500a7150a8e934918683d6173 Mon Sep 17 00:00:00 2001
From: Kevin Rushforth <kcr@openjdk.org>
Date: Mon, 16 Sep 2024 12:47:02 +0000
Subject: [PATCH 38/75] 8339550: Enable javac lint options for tests 8338340:
 [TestBug] fix varargs parameter type warnings

Reviewed-by: angorya, mhanl
---
 build.gradle                                              | 8 +++++---
 .../javafx/util/converter/NumberStringConverterShim.java  | 1 +
 .../test/java/test/javafx/scene/web/FileReaderTest.java   | 2 +-
 .../src/test/java/test/robot/javafx/scene/RobotTest.java  | 6 +++---
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 13de7ff0a40..91880b241c9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -577,7 +577,9 @@ def defaultToolLintOptions = ""
 defineProperty("TOOL_LINT", defaultToolLintOptions)
 ext.IS_TOOL_LINT = TOOL_LINT != ""
 
-def defaultTestLintOptions = ""
+def defaultTestLintOptions =
+        "-options" + "," +
+        "removal"
 defineProperty("TEST_LINT", defaultTestLintOptions)
 ext.IS_TEST_LINT = TEST_LINT != ""
 
@@ -587,7 +589,7 @@ ext.IS_JAVAC_WERROR = Boolean.parseBoolean(JAVAC_WERROR)
 defineProperty("TOOL_JAVAC_WERROR", "false")
 ext.IS_TOOL_JAVAC_WERROR = Boolean.parseBoolean(TOOL_JAVAC_WERROR)
 
-defineProperty("TEST_JAVAC_WERROR", "false")
+defineProperty("TEST_JAVAC_WERROR", "true")
 ext.IS_TEST_JAVAC_WERROR = Boolean.parseBoolean(TEST_JAVAC_WERROR)
 
 // Doclint options (all enabled by default)
@@ -2137,7 +2139,7 @@ allprojects {
         testImplementation group: "org.junit.jupiter", name: "junit-jupiter-api", version: "5.8.1"
         testImplementation group: "org.junit.jupiter", name: "junit-jupiter-params", version: "5.8.1"
         testImplementation group: "org.opentest4j", name: "opentest4j", version: "1.2.0"
-        testRuntimeOnly group: "org.apiguardian", name: "apiguardian-api", version: "1.1.2"
+        testImplementation group: "org.apiguardian", name: "apiguardian-api", version: "1.1.2"
         testRuntimeOnly group: "org.junit.jupiter", name: "junit-jupiter-engine", version: "5.8.1"
         testRuntimeOnly group: "org.junit.platform", name: "junit-platform-commons", version: "1.8.1"
         testRuntimeOnly group: "org.junit.platform", name: "junit-platform-engine", version: "1.8.1"
diff --git a/modules/javafx.base/src/shims/java/javafx/util/converter/NumberStringConverterShim.java b/modules/javafx.base/src/shims/java/javafx/util/converter/NumberStringConverterShim.java
index d7248928817..9487aaa25d3 100644
--- a/modules/javafx.base/src/shims/java/javafx/util/converter/NumberStringConverterShim.java
+++ b/modules/javafx.base/src/shims/java/javafx/util/converter/NumberStringConverterShim.java
@@ -34,6 +34,7 @@ public static NumberFormat getNumberFormatVar(NumberStringConverter nsc) {
         return nsc.numberFormat;
     }
 
+    @SuppressWarnings("removal")
     public static NumberFormat getNumberFormat(NumberStringConverter nsc) {
         return nsc.getNumberFormat();
     }
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/FileReaderTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/FileReaderTest.java
index e92e269617c..efe94a75aff 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/FileReaderTest.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/FileReaderTest.java
@@ -226,7 +226,7 @@ private void testLatch(CountDownLatch latch) {
             final byte[] expectedArrayBuffer = in.readAllBytes();
             submit(() -> {
                 final JSObject obj = (JSObject) getEngine().executeScript("new Uint8Array(window.result)");
-                assertEquals(String.format("%s length must be equal in both Java & JavaScript", fileList),
+                assertEquals(String.format("%s length must be equal in both Java & JavaScript", fileList[0]),
                                        expectedArrayBuffer.length, obj.getMember("length"));
                 for (int i = 0; i < expectedArrayBuffer.length; i++) {
                     assertEquals("Unexpected file content received", expectedArrayBuffer[i], ((Number)(obj.getSlot(i))).byteValue());
diff --git a/tests/system/src/test/java/test/robot/javafx/scene/RobotTest.java b/tests/system/src/test/java/test/robot/javafx/scene/RobotTest.java
index 08f9e1cd79b..99f6466cb5d 100644
--- a/tests/system/src/test/java/test/robot/javafx/scene/RobotTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/scene/RobotTest.java
@@ -444,7 +444,7 @@ public void testMousePressThrowsISEOnWrongThread() {
     public void testMousePressThrowsNPEForNullArgument() {
         Util.runAndWait(() -> {
             try {
-                robot.mousePress(null);
+                robot.mousePress((MouseButton[])null);
             } catch (NullPointerException e) {
                 return;
             }
@@ -466,7 +466,7 @@ public void testMouseReleaseThrowsISEOnWrongThread() {
     public void testMouseReleaseThrowsNPEForNullArgument() {
         Util.runAndWait(() -> {
             try {
-                robot.mouseRelease(null);
+                robot.mouseRelease((MouseButton[])null);
             } catch (NullPointerException e) {
                 return;
             }
@@ -488,7 +488,7 @@ public void testMouseClickThrowsISEOnWrongThread() {
     public void testMouseClickThrowsNPEForNullArgument() {
         Util.runAndWait(() -> {
             try {
-                robot.mouseClick(null);
+                robot.mouseClick((MouseButton[])null);
             } catch (NullPointerException e) {
                 return;
             }

From 5993c09eb21136d7371d355b72cb4b2e5b77c49d Mon Sep 17 00:00:00 2001
From: Ajit Ghaisas <aghaisas@openjdk.org>
Date: Mon, 16 Sep 2024 16:41:36 +0000
Subject: [PATCH 39/75] 8339513: [TestBug] Convert fxml tests to JUnit 5

Reviewed-by: kcr, angorya, mhanl
---
 .../javafx/fxml/builder/ProxyBuilderTest.java | 15 ++++---
 .../test/java/test/javafx/fxml/AlertTest.java |  6 +--
 .../test/javafx/fxml/CompareVersionsTest.java |  6 +--
 .../FXMLLoaderTest_FieldInjectionTest.java    | 11 ++---
 .../javafx/fxml/FXMLLoader_BuilderTest.java   |  8 ++--
 .../javafx/fxml/FXMLLoader_EventsTest.java    | 40 +++++++++++--------
 .../fxml/FXMLLoader_ExpressionTest.java       |  6 +--
 .../javafx/fxml/FXMLLoader_ScriptTest.java    | 13 +++---
 .../java/test/javafx/fxml/RT_15524Test.java   |  7 ++--
 .../java/test/javafx/fxml/RT_16724Test.java   |  4 +-
 .../java/test/javafx/fxml/RT_16815Test.java   |  6 +--
 .../java/test/javafx/fxml/RT_16977Test.java   |  6 +--
 .../java/test/javafx/fxml/RT_18218Test.java   |  7 ++--
 .../java/test/javafx/fxml/RT_18933Test.java   | 14 ++++---
 .../java/test/javafx/fxml/RT_19008Test.java   | 12 ++++--
 .../java/test/javafx/fxml/RT_19112Test.java   |  6 +--
 .../java/test/javafx/fxml/RT_19139Test.java   |  6 +--
 .../java/test/javafx/fxml/RT_19228Test.java   |  6 +--
 .../java/test/javafx/fxml/RT_19329Test.java   | 12 ++++--
 .../java/test/javafx/fxml/RT_19870Test.java   |  6 +--
 .../java/test/javafx/fxml/RT_20082Test.java   |  6 +--
 .../java/test/javafx/fxml/RT_20471Test.java   |  7 ++--
 .../java/test/javafx/fxml/RT_22971Test.java   |  6 +--
 .../java/test/javafx/fxml/RT_23519Test.java   |  6 +--
 .../java/test/javafx/fxml/RT_24380Test.java   |  4 +-
 .../fxml/RT_25494_Cycle_DetectionTest.java    | 23 +++++++----
 .../java/test/javafx/fxml/RT_26449Test.java   | 13 +++---
 .../java/test/javafx/fxml/RT_27529Test.java   |  7 ++--
 .../java/test/javafx/fxml/RT_34146Test.java   |  8 ++--
 .../java/test/javafx/fxml/RT_36633Test.java   |  6 +--
 .../java/test/javafx/fxml/RT_40335Test.java   |  6 +--
 31 files changed, 165 insertions(+), 124 deletions(-)

diff --git a/modules/javafx.fxml/src/test/java/test/com/sun/javafx/fxml/builder/ProxyBuilderTest.java b/modules/javafx.fxml/src/test/java/test/com/sun/javafx/fxml/builder/ProxyBuilderTest.java
index 5b8beb82d70..8d03be00a22 100644
--- a/modules/javafx.fxml/src/test/java/test/com/sun/javafx/fxml/builder/ProxyBuilderTest.java
+++ b/modules/javafx.fxml/src/test/java/test/com/sun/javafx/fxml/builder/ProxyBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,9 +31,14 @@
 import javafx.scene.paint.Color;
 import javafx.scene.paint.Paint;
 import javafx.stage.StageStyle;
-import org.junit.Test;
-import static org.junit.Assert.*;
-import org.junit.Ignore;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Disabled;
 
 public class ProxyBuilderTest {
 
@@ -97,7 +102,7 @@ public void testImmutableWithList() {
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testImmutableTwoConstructorsWithSameArgNames() {
         ProxyBuilder pb = new ProxyBuilder(ImmutableClass.class);
         pb.put("a", 123);
diff --git a/modules/javafx.fxml/src/test/java/test/javafx/fxml/AlertTest.java b/modules/javafx.fxml/src/test/java/test/javafx/fxml/AlertTest.java
index 7fb7dc802f1..b834d97740e 100644
--- a/modules/javafx.fxml/src/test/java/test/javafx/fxml/AlertTest.java
+++ b/modules/javafx.fxml/src/test/java/test/javafx/fxml/AlertTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024 Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,8 +28,8 @@
 import javafx.fxml.FXMLLoader;
 import javafx.scene.control.Alert;
 import javafx.scene.control.ButtonType;
-import static org.junit.Assert.assertArrayEquals;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import org.junit.jupiter.api.Test;
 
 public class AlertTest {
 
diff --git a/modules/javafx.fxml/src/test/java/test/javafx/fxml/CompareVersionsTest.java b/modules/javafx.fxml/src/test/java/test/javafx/fxml/CompareVersionsTest.java
index ec47d79c05e..6bb9a23cf56 100644
--- a/modules/javafx.fxml/src/test/java/test/javafx/fxml/CompareVersionsTest.java
+++ b/modules/javafx.fxml/src/test/java/test/javafx/fxml/CompareVersionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,9 +26,9 @@
 package test.javafx.fxml;
 
 import javafx.fxml.FXMLLoaderShim;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class CompareVersionsTest {
     @Test
diff --git a/modules/javafx.fxml/src/test/java/test/javafx/fxml/FXMLLoaderTest_FieldInjectionTest.java b/modules/javafx.fxml/src/test/java/test/javafx/fxml/FXMLLoaderTest_FieldInjectionTest.java
index bc61fd168ba..e63a25a4eab 100644
--- a/modules/javafx.fxml/src/test/java/test/javafx/fxml/FXMLLoaderTest_FieldInjectionTest.java
+++ b/modules/javafx.fxml/src/test/java/test/javafx/fxml/FXMLLoaderTest_FieldInjectionTest.java
@@ -1,6 +1,5 @@
-package test.javafx.fxml;
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,17 +23,19 @@
  * questions.
  */
 
+package test.javafx.fxml;
+
 import javafx.scene.Node;
 import javafx.scene.Parent;
 import javafx.scene.shape.Rectangle;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class FXMLLoaderTest_FieldInjectionTest {
 
diff --git a/modules/javafx.fxml/src/test/java/test/javafx/fxml/FXMLLoader_BuilderTest.java b/modules/javafx.fxml/src/test/java/test/javafx/fxml/FXMLLoader_BuilderTest.java
index 1c7980dabe1..3fe3fd3fdee 100644
--- a/modules/javafx.fxml/src/test/java/test/javafx/fxml/FXMLLoader_BuilderTest.java
+++ b/modules/javafx.fxml/src/test/java/test/javafx/fxml/FXMLLoader_BuilderTest.java
@@ -1,6 +1,5 @@
-package test.javafx.fxml;
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,11 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+package test.javafx.fxml;
 
 import javafx.scene.shape.TriangleMesh;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 import java.io.IOException;
 import javafx.fxml.FXMLLoader;
diff --git a/modules/javafx.fxml/src/test/java/test/javafx/fxml/FXMLLoader_EventsTest.java b/modules/javafx.fxml/src/test/java/test/javafx/fxml/FXMLLoader_EventsTest.java
index d38d63af20c..0323981566b 100644
--- a/modules/javafx.fxml/src/test/java/test/javafx/fxml/FXMLLoader_EventsTest.java
+++ b/modules/javafx.fxml/src/test/java/test/javafx/fxml/FXMLLoader_EventsTest.java
@@ -1,18 +1,5 @@
-package test.javafx.fxml;
-
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
-import javafx.util.Callback;
-import org.junit.Test;
-
-import java.io.IOException;
-import javafx.fxml.FXMLLoader;
-import javafx.fxml.LoadException;
-
-import static org.junit.Assert.*;
-
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,6 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
+package test.javafx.fxml;
+
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.util.Callback;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import javafx.fxml.FXMLLoader;
+import javafx.fxml.LoadException;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 public class FXMLLoader_EventsTest {
     @Test
     public void testListEvents() throws Exception {
@@ -201,10 +205,12 @@ public void changed(ObservableValue<? extends Object> ov, Object o, Object n) {
     }
 
 
-    @Test(expected = LoadException.class)
+    @Test
     public void testPropertyEvents_testExpressionHandler_NA() throws IOException {
-        FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("property_events_test_expression_na.fxml"));
-        fxmlLoader.load();
+        assertThrows(LoadException.class, () -> {
+            FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("property_events_test_expression_na.fxml"));
+            fxmlLoader.load();
+        });
     }
 
     @Test
diff --git a/modules/javafx.fxml/src/test/java/test/javafx/fxml/FXMLLoader_ExpressionTest.java b/modules/javafx.fxml/src/test/java/test/javafx/fxml/FXMLLoader_ExpressionTest.java
index 592e887070e..2253799eee6 100644
--- a/modules/javafx.fxml/src/test/java/test/javafx/fxml/FXMLLoader_ExpressionTest.java
+++ b/modules/javafx.fxml/src/test/java/test/javafx/fxml/FXMLLoader_ExpressionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
 import com.sun.javafx.fxml.expression.Expression;
 import com.sun.javafx.fxml.expression.KeyPath;
 import javafx.collections.ObservableList;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -37,7 +37,7 @@
 import static com.sun.javafx.fxml.expression.Expression.*;
 import static com.sun.javafx.fxml.expression.Expression.set;
 import static com.sun.javafx.fxml.expression.Expression.valueOf;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class FXMLLoader_ExpressionTest {
 
diff --git a/modules/javafx.fxml/src/test/java/test/javafx/fxml/FXMLLoader_ScriptTest.java b/modules/javafx.fxml/src/test/java/test/javafx/fxml/FXMLLoader_ScriptTest.java
index 79051201307..bd19acd475c 100644
--- a/modules/javafx.fxml/src/test/java/test/javafx/fxml/FXMLLoader_ScriptTest.java
+++ b/modules/javafx.fxml/src/test/java/test/javafx/fxml/FXMLLoader_ScriptTest.java
@@ -1,6 +1,5 @@
-package test.javafx.fxml;
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,9 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+package test.javafx.fxml;
 
 import com.sun.javafx.fxml.FXMLLoaderHelper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -34,8 +34,11 @@
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptEngine;
 
-import static org.junit.Assert.*;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 public class FXMLLoader_ScriptTest {
     @Test
diff --git a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_15524Test.java b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_15524Test.java
index b06140450b3..e1a98ebc2a4 100644
--- a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_15524Test.java
+++ b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_15524Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,9 +28,10 @@
 import java.io.IOException;
 import java.util.Arrays;
 import javafx.fxml.FXMLLoader;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class RT_15524Test {
     @Test
diff --git a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_16724Test.java b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_16724Test.java
index 53a33fbd9f3..65adc1977ec 100644
--- a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_16724Test.java
+++ b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_16724Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
 
 import java.io.IOException;
 import javafx.fxml.FXMLLoader;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class RT_16724Test {
     @Test
diff --git a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_16815Test.java b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_16815Test.java
index 981b6ce1a71..99985b698d5 100644
--- a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_16815Test.java
+++ b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_16815Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,9 +28,9 @@
 import java.io.IOException;
 import java.util.ResourceBundle;
 import javafx.fxml.FXMLLoader;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class RT_16815Test {
     @Test
diff --git a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_16977Test.java b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_16977Test.java
index f02b6ef6f0e..e7ae4d26bef 100644
--- a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_16977Test.java
+++ b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_16977Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,9 +26,9 @@
 package test.javafx.fxml;
 
 import javafx.fxml.FXMLLoader;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class RT_16977Test {
     @Test
diff --git a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_18218Test.java b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_18218Test.java
index 3ad3e992460..07cf51e71bd 100644
--- a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_18218Test.java
+++ b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_18218Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,9 +30,10 @@
 import java.util.Map;
 import javafx.fxml.FXMLLoader;
 import javafx.fxml.LoadListener;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class RT_18218Test {
     @Test
diff --git a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_18933Test.java b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_18933Test.java
index 3eddd47e24b..80916c93bcb 100644
--- a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_18933Test.java
+++ b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_18933Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,12 +28,16 @@
 import java.io.IOException;
 import javafx.fxml.FXMLLoader;
 import javafx.fxml.LoadException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class RT_18933Test {
-    @Test(expected=LoadException.class)
+    @Test
     public void testDefaultListProperty() throws IOException {
-        FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("rt_18933.fxml"));
-        fxmlLoader.load();
+        assertThrows(LoadException.class, () -> {
+            FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("rt_18933.fxml"));
+            fxmlLoader.load();
+        });
     }
 }
diff --git a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_19008Test.java b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_19008Test.java
index e86b88e28f8..7bad02f2c59 100644
--- a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_19008Test.java
+++ b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_19008Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,11 +27,15 @@
 
 import java.io.IOException;
 import javafx.fxml.FXMLLoader;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class RT_19008Test {
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testMissingResource() throws IOException {
-        FXMLLoader.load(getClass().getResource("rt_19008.fxml"));
+        assertThrows(NullPointerException.class, () -> {
+            FXMLLoader.load(getClass().getResource("rt_19008.fxml"));
+        });
     }
 }
diff --git a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_19112Test.java b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_19112Test.java
index f3162a95d9f..3998a04bbb2 100644
--- a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_19112Test.java
+++ b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_19112Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,9 +27,9 @@
 
 import java.io.IOException;
 import javafx.fxml.FXMLLoader;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class RT_19112Test {
     @Test
diff --git a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_19139Test.java b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_19139Test.java
index 1fd93d950f0..325d36e1a24 100644
--- a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_19139Test.java
+++ b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_19139Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,9 +28,9 @@
 import java.io.IOException;
 import java.util.Arrays;
 import javafx.fxml.FXMLLoader;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class RT_19139Test {
     @Test
diff --git a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_19228Test.java b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_19228Test.java
index 47257980077..e719618aa1d 100644
--- a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_19228Test.java
+++ b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_19228Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,9 +27,9 @@
 
 import java.io.IOException;
 import javafx.fxml.FXMLLoader;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class RT_19228Test {
     @Test
diff --git a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_19329Test.java b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_19329Test.java
index 326725ebd3c..4bf39984354 100644
--- a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_19329Test.java
+++ b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_19329Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,11 +27,15 @@
 
 import java.io.IOException;
 import javafx.fxml.FXMLLoader;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class RT_19329Test {
-    @Test(expected=IOException.class)
+    @Test
     public void testIncludeException() throws IOException {
-        FXMLLoader.load(getClass().getResource("rt_19329.fxml"));
+        assertThrows(IOException.class, () -> {
+            FXMLLoader.load(getClass().getResource("rt_19329.fxml"));
+        });
     }
 }
diff --git a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_19870Test.java b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_19870Test.java
index 00b125a1bff..97e1bd15797 100644
--- a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_19870Test.java
+++ b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_19870Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,9 @@
 
 package test.javafx.fxml;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class RT_19870Test {
     @Test
diff --git a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_20082Test.java b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_20082Test.java
index ca02f57e6eb..fe222acac7d 100644
--- a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_20082Test.java
+++ b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_20082Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,9 +27,9 @@
 
 import java.io.IOException;
 import javafx.fxml.FXMLLoader;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class RT_20082Test {
     @Test
diff --git a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_20471Test.java b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_20471Test.java
index b63a9c119ba..9af30fa3c65 100644
--- a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_20471Test.java
+++ b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_20471Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,9 +29,10 @@
 import java.net.URL;
 import java.util.ResourceBundle;
 import javafx.fxml.FXMLLoader;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class RT_20471Test {
     @Test
diff --git a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_22971Test.java b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_22971Test.java
index 3b9fa584ea0..4403d8d182f 100644
--- a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_22971Test.java
+++ b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_22971Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,9 +28,9 @@
 import java.io.IOException;
 import java.net.URL;
 import javafx.fxml.FXMLLoader;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class RT_22971Test {
     @Test
diff --git a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_23519Test.java b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_23519Test.java
index 75d35ab5be5..8633bffb2e4 100644
--- a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_23519Test.java
+++ b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_23519Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,9 +28,9 @@
 import java.io.IOException;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.control.Button;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class RT_23519Test {
 
diff --git a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_24380Test.java b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_24380Test.java
index fbb9249550e..0025dc75364 100644
--- a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_24380Test.java
+++ b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_24380Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
 import java.io.IOException;
 import javafx.fxml.FXMLLoader;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class RT_24380Test {
     @Test
diff --git a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_25494_Cycle_DetectionTest.java b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_25494_Cycle_DetectionTest.java
index b56e6b0d65f..cef7673a57c 100644
--- a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_25494_Cycle_DetectionTest.java
+++ b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_25494_Cycle_DetectionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,22 +27,29 @@
 
 import java.io.IOException;
 import javafx.fxml.FXMLLoader;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class RT_25494_Cycle_DetectionTest {
 
-    @Test(expected=IOException.class)
+    @Test
     public void test_dummy_cycle() throws Exception {
-        FXMLLoader.load(RT_25494_Cycle_DetectionTest.class.getResource("dummy-cycle.fxml"));
+        assertThrows(IOException.class, () -> {
+            FXMLLoader.load(RT_25494_Cycle_DetectionTest.class.getResource("dummy-cycle.fxml"));
+        });
     }
 
-    @Test(expected=IOException.class)
+    @Test
     public void test_one_2_one_cycle() throws Exception {
-        FXMLLoader.load(RT_25494_Cycle_DetectionTest.class.getResource("one-2-one-cycle.fxml"));
+        assertThrows(IOException.class, () -> {
+            FXMLLoader.load(RT_25494_Cycle_DetectionTest.class.getResource("one-2-one-cycle.fxml"));
+        });
     }
 
-    @Test(expected=IOException.class)
+    @Test
     public void test_cycle() throws Exception {
-        FXMLLoader.load(RT_25494_Cycle_DetectionTest.class.getResource("cycle.fxml"));
+        assertThrows(IOException.class, () -> {
+            FXMLLoader.load(RT_25494_Cycle_DetectionTest.class.getResource("cycle.fxml"));
+        });
     }
 }
diff --git a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_26449Test.java b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_26449Test.java
index dfb2a4e6bf1..a010da0a82a 100644
--- a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_26449Test.java
+++ b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_26449Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,12 +29,15 @@
 import javafx.fxml.FXMLLoader;
 import javafx.fxml.LoadException;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class RT_26449Test {
-    @Test(expected=LoadException.class)
+    @Test
     public void testRootNotSet() throws IOException {
-        FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("rt_26449.fxml"));
-        fxmlLoader.load();
+        assertThrows(LoadException.class, () -> {
+            FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("rt_26449.fxml"));
+            fxmlLoader.load();
+        });
     }
 }
diff --git a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_27529Test.java b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_27529Test.java
index 109ff7432b5..a30cdc6fa66 100644
--- a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_27529Test.java
+++ b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_27529Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,9 +30,10 @@
 import java.util.Arrays;
 import java.util.ResourceBundle;
 import javafx.fxml.FXMLLoader;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class RT_27529Test {
 
diff --git a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_34146Test.java b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_34146Test.java
index 8de2bb6b93a..1894af1d06c 100644
--- a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_34146Test.java
+++ b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_34146Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,8 +28,8 @@
 import java.io.IOException;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public final class RT_34146Test {
     @Test
@@ -43,7 +43,7 @@ public void testCanCallAbstractMethodFromPrivateClass() throws IOException {
         final Widget widget = fxmlLoader.<Widget>load();
         widget.fire();
 
-        Assert.assertTrue(concreteController.getActionHandlerCalled());
+        assertTrue(concreteController.getActionHandlerCalled());
     }
 
     private static abstract class AbstractController {
diff --git a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_36633Test.java b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_36633Test.java
index 82812721618..0a4677bae46 100644
--- a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_36633Test.java
+++ b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_36633Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,9 +34,9 @@
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 import javafx.scene.layout.VBox;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class RT_36633Test {
     @Test public void test_rt36633_tableColumn() throws Exception {
diff --git a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_40335Test.java b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_40335Test.java
index d9415c101b8..f73cc66e67a 100644
--- a/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_40335Test.java
+++ b/modules/javafx.fxml/src/test/java/test/javafx/fxml/RT_40335Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,9 +29,9 @@
 import javafx.scene.control.Button;
 import javafx.scene.control.Spinner;
 import javafx.scene.layout.VBox;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class RT_40335Test {
     @Test public void test_rt_40335() throws Exception {

From f8a20056f4b19b45d311b96126b0a5fcfbe96923 Mon Sep 17 00:00:00 2001
From: Jayathirth D V <jdv@openjdk.org>
Date: Wed, 18 Sep 2024 10:48:10 +0000
Subject: [PATCH 40/75] 8211247: Open-source simple test programs for FX / SWT
 interop

Reviewed-by: kcr
---
 apps/toys/HelloFXCanvas/README.txt            |    9 +
 apps/toys/HelloFXCanvas/build.xml             |   74 ++
 apps/toys/HelloFXCanvas/manifest.mf           |    3 +
 .../HelloFXCanvas/nbproject/build-impl.xml    | 1044 +++++++++++++++++
 .../nbproject/genfiles.properties             |    8 +
 .../nbproject/project.properties              |   79 ++
 apps/toys/HelloFXCanvas/nbproject/project.xml |   15 +
 .../src/hellofxcanvas/HelloFXCanvas.java      |  106 ++
 apps/toys/build.xml                           |    2 +
 9 files changed, 1340 insertions(+)
 create mode 100644 apps/toys/HelloFXCanvas/README.txt
 create mode 100644 apps/toys/HelloFXCanvas/build.xml
 create mode 100644 apps/toys/HelloFXCanvas/manifest.mf
 create mode 100644 apps/toys/HelloFXCanvas/nbproject/build-impl.xml
 create mode 100644 apps/toys/HelloFXCanvas/nbproject/genfiles.properties
 create mode 100644 apps/toys/HelloFXCanvas/nbproject/project.properties
 create mode 100644 apps/toys/HelloFXCanvas/nbproject/project.xml
 create mode 100644 apps/toys/HelloFXCanvas/src/hellofxcanvas/HelloFXCanvas.java

diff --git a/apps/toys/HelloFXCanvas/README.txt b/apps/toys/HelloFXCanvas/README.txt
new file mode 100644
index 00000000000..45510754dae
--- /dev/null
+++ b/apps/toys/HelloFXCanvas/README.txt
@@ -0,0 +1,9 @@
+====================================
+HOW TO RUN
+====================================
+
+1) Build HelloFXCanvas by running "gradle apps" task in root folder
+2) Run "java @build/run.args --add-modules javafx.swt --enable-native-access=ALL-UNNAMED -cp apps/toys/HelloFXCanvas/dist/HelloFXCanvas.jar:build/libs/swt-debug.jar hellofxcanvas.HelloFXCanvas"
+3) In case of macOS we also need to pass -XstartOnFirstThread JVM argument to make SWT work with JavaFX
+4) In case of Windows path separator should be changed from ':' to ';'
+=================================================================================================================
diff --git a/apps/toys/HelloFXCanvas/build.xml b/apps/toys/HelloFXCanvas/build.xml
new file mode 100644
index 00000000000..48a79281c79
--- /dev/null
+++ b/apps/toys/HelloFXCanvas/build.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See commented blocks below for -->
+<!-- some examples of how to customize the build. -->
+<!-- (If you delete it and reopen the project it will be recreated.) -->
+<!-- By default, only the Clean and Build commands use this build script. -->
+<!-- Commands such as Run, Debug, and Test only use this build script if -->
+<!-- the Compile on Save feature is turned off for the project. -->
+<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
+<!-- in the project's Project Properties dialog box.-->
+<project name="HelloFXCanvas" default="default" basedir=".">
+    <description>Builds, tests, and runs the project HelloFXCanvas.</description>
+    <import file="nbproject/build-impl.xml"/>
+    <!--
+
+    There exist several targets which are by default empty and which can be 
+    used for execution of your tasks. These targets are usually executed 
+    before and after some main targets. They are: 
+
+      -pre-init:                 called before initialization of project properties
+      -post-init:                called after initialization of project properties
+      -pre-compile:              called before javac compilation
+      -post-compile:             called after javac compilation
+      -pre-compile-single:       called before javac compilation of single file
+      -post-compile-single:      called after javac compilation of single file
+      -pre-compile-test:         called before javac compilation of JUnit tests
+      -post-compile-test:        called after javac compilation of JUnit tests
+      -pre-compile-test-single:  called before javac compilation of single JUnit test
+      -post-compile-test-single: called after javac compilation of single JUunit test
+      -pre-jar:                  called before JAR building
+      -post-jar:                 called after JAR building
+      -post-clean:               called after cleaning build products
+
+    (Targets beginning with '-' are not intended to be called on their own.)
+
+    Example of inserting an obfuscator after compilation could look like this:
+
+        <target name="-post-compile">
+            <obfuscate>
+                <fileset dir="${build.classes.dir}"/>
+            </obfuscate>
+        </target>
+
+    For list of available properties check the imported 
+    nbproject/build-impl.xml file. 
+
+
+    Another way to customize the build is by overriding existing main targets.
+    The targets of interest are: 
+
+      -init-macrodef-javac:     defines macro for javac compilation
+      -init-macrodef-junit:     defines macro for junit execution
+      -init-macrodef-debug:     defines macro for class debugging
+      -init-macrodef-java:      defines macro for class execution
+      -do-jar-with-manifest:    JAR building (if you are using a manifest)
+      -do-jar-without-manifest: JAR building (if you are not using a manifest)
+      run:                      execution of project 
+      -javadoc-build:           Javadoc generation
+      test-report:              JUnit report generation
+
+    An example of overriding the target for project execution could look like this:
+
+        <target name="run" depends="HelloFXCanvas-impl.jar">
+            <exec dir="bin" executable="launcher.exe">
+                <arg file="${dist.jar}"/>
+            </exec>
+        </target>
+
+    Notice that the overridden target depends on the jar target and not only on 
+    the compile target as the regular run target does. Again, for a list of available 
+    properties which you can use, check the target you are overriding in the
+    nbproject/build-impl.xml file. 
+
+    -->
+</project>
diff --git a/apps/toys/HelloFXCanvas/manifest.mf b/apps/toys/HelloFXCanvas/manifest.mf
new file mode 100644
index 00000000000..328e8e5bc3b
--- /dev/null
+++ b/apps/toys/HelloFXCanvas/manifest.mf
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+X-COMMENT: Main-Class will be added automatically by build
+
diff --git a/apps/toys/HelloFXCanvas/nbproject/build-impl.xml b/apps/toys/HelloFXCanvas/nbproject/build-impl.xml
new file mode 100644
index 00000000000..4972707f22d
--- /dev/null
+++ b/apps/toys/HelloFXCanvas/nbproject/build-impl.xml
@@ -0,0 +1,1044 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+*** GENERATED FROM project.xml - DO NOT EDIT  ***
+***         EDIT ../build.xml INSTEAD         ***
+
+For the purpose of easier reading the script
+is divided into following sections:
+
+  - initialization
+  - compilation
+  - jar
+  - execution
+  - debugging
+  - javadoc
+  - junit compilation
+  - junit execution
+  - junit debugging
+  - applet
+  - cleanup
+
+        -->
+<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="HelloFXCanvas-impl">
+    <fail message="Please build using Ant 1.8.0 or higher.">
+        <condition>
+            <not>
+                <antversion atleast="1.8.0"/>
+            </not>
+        </condition>
+    </fail>
+    <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
+    <!-- 
+                ======================
+                INITIALIZATION SECTION 
+                ======================
+            -->
+    <target name="-pre-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="-pre-init" name="-init-private">
+        <property file="nbproject/private/config.properties"/>
+        <property file="nbproject/private/configs/${config}.properties"/>
+        <property file="nbproject/private/private.properties"/>
+    </target>
+    <target depends="-pre-init,-init-private" name="-init-user">
+        <property file="${user.properties.file}"/>
+        <!-- The two properties below are usually overridden -->
+        <!-- by the active platform. Just a fallback. -->
+        <property name="default.javac.source" value="1.4"/>
+        <property name="default.javac.target" value="1.4"/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user" name="-init-project">
+        <property file="nbproject/configs/${config}.properties"/>
+        <property file="nbproject/project.properties"/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
+        <available file="${manifest.file}" property="manifest.available"/>
+        <condition property="splashscreen.available">
+            <and>
+                <not>
+                    <equals arg1="${application.splash}" arg2="" trim="true"/>
+                </not>
+                <available file="${application.splash}"/>
+            </and>
+        </condition>
+        <condition property="main.class.available">
+            <and>
+                <isset property="main.class"/>
+                <not>
+                    <equals arg1="${main.class}" arg2="" trim="true"/>
+                </not>
+            </and>
+        </condition>
+        <condition property="manifest.available+main.class">
+            <and>
+                <isset property="manifest.available"/>
+                <isset property="main.class.available"/>
+            </and>
+        </condition>
+        <condition property="do.archive">
+            <not>
+                <istrue value="${jar.archive.disabled}"/>
+            </not>
+        </condition>
+        <condition property="do.mkdist">
+            <and>
+                <isset property="do.archive"/>
+                <isset property="libs.CopyLibs.classpath"/>
+                <not>
+                    <istrue value="${mkdist.disabled}"/>
+                </not>
+            </and>
+        </condition>
+        <condition property="manifest.available+main.class+mkdist.available">
+            <and>
+                <istrue value="${manifest.available+main.class}"/>
+                <isset property="do.mkdist"/>
+            </and>
+        </condition>
+        <condition property="do.archive+manifest.available">
+            <and>
+                <isset property="manifest.available"/>
+                <istrue value="${do.archive}"/>
+            </and>
+        </condition>
+        <condition property="do.archive+main.class.available">
+            <and>
+                <isset property="main.class.available"/>
+                <istrue value="${do.archive}"/>
+            </and>
+        </condition>
+        <condition property="do.archive+splashscreen.available">
+            <and>
+                <isset property="splashscreen.available"/>
+                <istrue value="${do.archive}"/>
+            </and>
+        </condition>
+        <condition property="do.archive+manifest.available+main.class">
+            <and>
+                <istrue value="${manifest.available+main.class}"/>
+                <istrue value="${do.archive}"/>
+            </and>
+        </condition>
+        <condition property="manifest.available-mkdist.available">
+            <or>
+                <istrue value="${manifest.available}"/>
+                <isset property="do.mkdist"/>
+            </or>
+        </condition>
+        <condition property="manifest.available+main.class-mkdist.available">
+            <or>
+                <istrue value="${manifest.available+main.class}"/>
+                <isset property="do.mkdist"/>
+            </or>
+        </condition>
+        <condition property="have.tests">
+            <or>
+                <available file="${test.src.dir}"/>
+            </or>
+        </condition>
+        <condition property="have.sources">
+            <or>
+                <available file="${src.dir}"/>
+            </or>
+        </condition>
+        <condition property="netbeans.home+have.tests">
+            <and>
+                <isset property="netbeans.home"/>
+                <isset property="have.tests"/>
+            </and>
+        </condition>
+        <condition property="no.javadoc.preview">
+            <and>
+                <isset property="javadoc.preview"/>
+                <isfalse value="${javadoc.preview}"/>
+            </and>
+        </condition>
+        <property name="run.jvmargs" value=""/>
+        <property name="javac.compilerargs" value=""/>
+        <property name="work.dir" value="${basedir}"/>
+        <condition property="no.deps">
+            <and>
+                <istrue value="${no.dependencies}"/>
+            </and>
+        </condition>
+        <property name="javac.debug" value="true"/>
+        <property name="javadoc.preview" value="true"/>
+        <property name="application.args" value=""/>
+        <property name="source.encoding" value="${file.encoding}"/>
+        <property name="runtime.encoding" value="${source.encoding}"/>
+        <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
+            <and>
+                <isset property="javadoc.encoding"/>
+                <not>
+                    <equals arg1="${javadoc.encoding}" arg2=""/>
+                </not>
+            </and>
+        </condition>
+        <property name="javadoc.encoding.used" value="${source.encoding}"/>
+        <property name="includes" value="**"/>
+        <property name="excludes" value=""/>
+        <property name="do.depend" value="false"/>
+        <condition property="do.depend.true">
+            <istrue value="${do.depend}"/>
+        </condition>
+        <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
+        <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
+            <length length="0" string="${endorsed.classpath}" when="greater"/>
+        </condition>
+        <condition else="false" property="jdkBug6558476">
+            <and>
+                <matches pattern="1\.[56]" string="${java.specification.version}"/>
+                <not>
+                    <os family="unix"/>
+                </not>
+            </and>
+        </condition>
+        <property name="javac.fork" value="${jdkBug6558476}"/>
+        <property name="jar.index" value="false"/>
+        <property name="jar.index.metainf" value="${jar.index}"/>
+        <property name="copylibs.rebase" value="true"/>
+        <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
+    </target>
+    <target name="-post-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
+        <fail unless="src.dir">Must set src.dir</fail>
+        <fail unless="test.src.dir">Must set test.src.dir</fail>
+        <fail unless="build.dir">Must set build.dir</fail>
+        <fail unless="dist.dir">Must set dist.dir</fail>
+        <fail unless="build.classes.dir">Must set build.classes.dir</fail>
+        <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
+        <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
+        <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
+        <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
+        <fail unless="dist.jar">Must set dist.jar</fail>
+    </target>
+    <target name="-init-macrodef-property">
+        <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute name="name"/>
+            <attribute name="value"/>
+            <sequential>
+                <property name="@{name}" value="${@{value}}"/>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
+        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}" name="classpath"/>
+            <attribute default="${javac.processorpath}" name="processorpath"/>
+            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="${javac.debug}" name="debug"/>
+            <attribute default="${empty.dir}" name="sourcepath"/>
+            <attribute default="${empty.dir}" name="gensrcdir"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property location="${build.dir}/empty" name="empty.dir"/>
+                <mkdir dir="${empty.dir}"/>
+                <mkdir dir="@{apgeneratedsrcdir}"/>
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+                    <src>
+                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
+                            <include name="*"/>
+                        </dirset>
+                    </src>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <compilerarg line="${javac.compilerargs}"/>
+                    <compilerarg value="-processorpath"/>
+                    <compilerarg path="@{processorpath}:${empty.dir}"/>
+                    <compilerarg line="${ap.processors.internal}"/>
+                    <compilerarg line="${annotation.processing.processor.options}"/>
+                    <compilerarg value="-s"/>
+                    <compilerarg path="@{apgeneratedsrcdir}"/>
+                    <compilerarg line="${ap.proc.none.internal}"/>
+                    <customize/>
+                </javac>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
+        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}" name="classpath"/>
+            <attribute default="${javac.processorpath}" name="processorpath"/>
+            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="${javac.debug}" name="debug"/>
+            <attribute default="${empty.dir}" name="sourcepath"/>
+            <attribute default="${empty.dir}" name="gensrcdir"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property location="${build.dir}/empty" name="empty.dir"/>
+                <mkdir dir="${empty.dir}"/>
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+                    <src>
+                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
+                            <include name="*"/>
+                        </dirset>
+                    </src>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <compilerarg line="${javac.compilerargs}"/>
+                    <customize/>
+                </javac>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
+        <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}" name="classpath"/>
+            <sequential>
+                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                </depend>
+            </sequential>
+        </macrodef>
+        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <sequential>
+                <fail unless="javac.includes">Must set javac.includes</fail>
+                <pathconvert pathsep="${line.separator}" property="javac.includes.binary">
+                    <path>
+                        <filelist dir="@{destdir}" files="${javac.includes}"/>
+                    </path>
+                    <globmapper from="*.java" to="*.class"/>
+                </pathconvert>
+                <tempfile deleteonexit="true" property="javac.includesfile.binary"/>
+                <echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/>
+                <delete>
+                    <files includesfile="${javac.includesfile.binary}"/>
+                </delete>
+                <delete>
+                    <fileset file="${javac.includesfile.binary}"/>
+                </delete>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-junit">
+        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <sequential>
+                <property name="junit.forkmode" value="perTest"/>
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
+                    <batchtest todir="${build.test.results.dir}">
+                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+                            <filename name="@{testincludes}"/>
+                        </fileset>
+                    </batchtest>
+                    <classpath>
+                        <path path="${run.test.classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="test-sys-prop."/>
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <formatter type="brief" usefile="false"/>
+                    <formatter type="xml"/>
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <jvmarg value="-ea"/>
+                    <jvmarg line="${run.jvmargs}"/>
+                </junit>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" name="profile-init"/>
+    <target name="-profile-pre-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target name="-profile-post-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target name="-profile-init-macrodef-profile">
+        <macrodef name="resolve">
+            <attribute name="name"/>
+            <attribute name="value"/>
+            <sequential>
+                <property name="@{name}" value="${env.@{value}}"/>
+            </sequential>
+        </macrodef>
+        <macrodef name="profile">
+            <attribute default="${main.class}" name="classname"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property environment="env"/>
+                <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
+                <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <jvmarg value="${profiler.info.jvmargs.agent}"/>
+                    <jvmarg line="${profiler.info.jvmargs}"/>
+                    <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
+                    <arg line="${application.args}"/>
+                    <classpath>
+                        <path path="${run.classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" name="-profile-init-check">
+        <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
+        <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
+    </target>
+    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
+        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${main.class}" name="name"/>
+            <attribute default="${debug.classpath}" name="classpath"/>
+            <attribute default="" name="stopclassname"/>
+            <sequential>
+                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                </nbjpdastart>
+            </sequential>
+        </macrodef>
+        <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${build.classes.dir}" name="dir"/>
+            <sequential>
+                <nbjpdareload>
+                    <fileset dir="@{dir}" includes="${fix.classes}">
+                        <include name="${fix.includes}*.class"/>
+                    </fileset>
+                </nbjpdareload>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-debug-args">
+        <property name="version-output" value="java version &quot;${ant.java.version}"/>
+        <condition property="have-jdk-older-than-1.4">
+            <or>
+                <contains string="${version-output}" substring="java version &quot;1.0"/>
+                <contains string="${version-output}" substring="java version &quot;1.1"/>
+                <contains string="${version-output}" substring="java version &quot;1.2"/>
+                <contains string="${version-output}" substring="java version &quot;1.3"/>
+            </or>
+        </condition>
+        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
+            <istrue value="${have-jdk-older-than-1.4}"/>
+        </condition>
+        <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
+            <os family="windows"/>
+        </condition>
+        <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
+            <isset property="debug.transport"/>
+        </condition>
+    </target>
+    <target depends="-init-debug-args" name="-init-macrodef-debug">
+        <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${main.class}" name="classname"/>
+            <attribute default="${debug.classpath}" name="classpath"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <java classname="@{classname}" dir="${work.dir}" fork="true">
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <jvmarg line="${debug-args-line}"/>
+                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
+                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
+                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
+                    <jvmarg line="${run.jvmargs}"/>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-java">
+        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${main.class}" name="classname"/>
+            <attribute default="${run.classpath}" name="classpath"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <java classname="@{classname}" dir="${work.dir}" fork="true">
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
+                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
+                    <jvmarg line="${run.jvmargs}"/>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-copylibs">
+        <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${manifest.file}" name="manifest"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
+                <pathconvert property="run.classpath.without.build.classes.dir">
+                    <path path="${run.classpath}"/>
+                    <map from="${build.classes.dir.resolved}" to=""/>
+                </pathconvert>
+                <pathconvert pathsep=" " property="jar.classpath">
+                    <path path="${run.classpath.without.build.classes.dir}"/>
+                    <chainedmapper>
+                        <flattenmapper/>
+                        <globmapper from="*" to="lib/*"/>
+                    </chainedmapper>
+                </pathconvert>
+                <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
+                <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
+                    <fileset dir="${build.classes.dir}"/>
+                    <manifest>
+                        <attribute name="Class-Path" value="${jar.classpath}"/>
+                        <customize/>
+                    </manifest>
+                </copylibs>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-presetdef-jar">
+        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
+                <j2seproject1:fileset dir="${build.classes.dir}"/>
+            </jar>
+        </presetdef>
+    </target>
+    <target name="-init-ap-cmdline-properties">
+        <property name="annotation.processing.enabled" value="true"/>
+        <property name="annotation.processing.processors.list" value=""/>
+        <property name="annotation.processing.processor.options" value=""/>
+        <property name="annotation.processing.run.all.processors" value="true"/>
+        <property name="javac.processorpath" value="${javac.classpath}"/>
+        <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
+        <condition property="ap.supported.internal" value="true">
+            <not>
+                <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
+            </not>
+        </condition>
+    </target>
+    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
+        <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
+            <isfalse value="${annotation.processing.run.all.processors}"/>
+        </condition>
+        <condition else="" property="ap.proc.none.internal" value="-proc:none">
+            <isfalse value="${annotation.processing.enabled}"/>
+        </condition>
+    </target>
+    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
+        <property name="ap.cmd.line.internal" value=""/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
+    <!--
+                ===================
+                COMPILATION SECTION
+                ===================
+            -->
+    <target name="-deps-jar-init" unless="built-jar.properties">
+        <property location="${build.dir}/built-jar.properties" name="built-jar.properties"/>
+        <delete file="${built-jar.properties}" quiet="true"/>
+    </target>
+    <target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
+        <echo level="warn" message="Cycle detected: HelloFXCanvas was already built"/>
+    </target>
+    <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
+        <mkdir dir="${build.dir}"/>
+        <touch file="${built-jar.properties}" verbose="false"/>
+        <property file="${built-jar.properties}" prefix="already.built.jar."/>
+        <antcall target="-warn-already-built-jar"/>
+        <propertyfile file="${built-jar.properties}">
+            <entry key="${basedir}" value=""/>
+        </propertyfile>
+    </target>
+    <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
+    <target depends="init" name="-check-automatic-build">
+        <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
+    </target>
+    <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
+        <antcall target="clean"/>
+    </target>
+    <target depends="init,deps-jar" name="-pre-pre-compile">
+        <mkdir dir="${build.classes.dir}"/>
+    </target>
+    <target name="-pre-compile">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target if="do.depend.true" name="-compile-depend">
+        <pathconvert property="build.generated.subdirs">
+            <dirset dir="${build.generated.sources.dir}" erroronmissingdir="false">
+                <include name="*"/>
+            </dirset>
+        </pathconvert>
+        <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>
+    </target>
+    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
+        <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
+        <copy todir="${build.classes.dir}">
+            <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target if="has.persistence.xml" name="-copy-persistence-xml">
+        <mkdir dir="${build.classes.dir}/META-INF"/>
+        <copy todir="${build.classes.dir}/META-INF">
+            <fileset dir="${meta.inf.dir}" includes="persistence.xml"/>
+        </copy>
+    </target>
+    <target name="-post-compile">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
+    <target name="-pre-compile-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
+        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+        <j2seproject3:force-recompile/>
+        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>
+    </target>
+    <target name="-post-compile-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
+    <!--
+                ====================
+                JAR BUILDING SECTION
+                ====================
+            -->
+    <target depends="init" name="-pre-pre-jar">
+        <dirname file="${dist.jar}" property="dist.jar.dir"/>
+        <mkdir dir="${dist.jar.dir}"/>
+    </target>
+    <target name="-pre-jar">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available">
+        <j2seproject1:jar/>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class-mkdist.available">
+        <j2seproject1:jar manifest="${manifest.file}"/>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
+        <j2seproject1:jar manifest="${manifest.file}">
+            <j2seproject1:manifest>
+                <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
+            </j2seproject1:manifest>
+        </j2seproject1:jar>
+        <echo level="info">To run this application from the command line without Ant, try:</echo>
+        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
+        <property location="${dist.jar}" name="dist.jar.resolved"/>
+        <pathconvert property="run.classpath.with.dist.jar">
+            <path path="${run.classpath}"/>
+            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
+        </pathconvert>
+        <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
+    </target>
+    <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available">
+        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
+        <touch file="${tmp.manifest.file}" verbose="false"/>
+    </target>
+    <target depends="init" if="do.archive+manifest.available" name="-do-jar-with-libraries-copy-manifest">
+        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
+        <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
+    </target>
+    <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+main.class.available" name="-do-jar-with-libraries-set-main">
+        <manifest file="${tmp.manifest.file}" mode="update">
+            <attribute name="Main-Class" value="${main.class}"/>
+        </manifest>
+    </target>
+    <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-with-libraries-set-splashscreen">
+        <basename file="${application.splash}" property="splashscreen.basename"/>
+        <mkdir dir="${build.classes.dir}/META-INF"/>
+        <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
+        <manifest file="${tmp.manifest.file}" mode="update">
+            <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
+        </manifest>
+    </target>
+    <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen" if="do.mkdist" name="-do-jar-with-libraries-pack">
+        <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
+        <echo level="info">To run this application from the command line without Ant, try:</echo>
+        <property location="${dist.jar}" name="dist.jar.resolved"/>
+        <echo level="info">java -jar "${dist.jar.resolved}"</echo>
+    </target>
+    <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">
+        <delete>
+            <fileset file="${tmp.manifest.file}"/>
+        </delete>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen,-do-jar-with-libraries-pack,-do-jar-with-libraries-delete-manifest" name="-do-jar-with-libraries"/>
+    <target name="-post-jar">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
+    <!--
+                =================
+                EXECUTION SECTION
+                =================
+            -->
+    <target depends="init,compile" description="Run a main class." name="run">
+        <j2seproject1:java>
+            <customize>
+                <arg line="${application.args}"/>
+            </customize>
+        </j2seproject1:java>
+    </target>
+    <target name="-do-not-recompile">
+        <property name="javac.includes.binary" value=""/>
+    </target>
+    <target depends="init,compile-single" name="run-single">
+        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+        <j2seproject1:java classname="${run.class}"/>
+    </target>
+    <target depends="init,compile-test-single" name="run-test-with-main">
+        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+        <j2seproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
+    </target>
+    <!--
+                =================
+                DEBUGGING SECTION
+                =================
+            -->
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger">
+        <j2seproject1:nbjpdastart name="${debug.class}"/>
+    </target>
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
+        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
+    </target>
+    <target depends="init,compile" name="-debug-start-debuggee">
+        <j2seproject3:debug>
+            <customize>
+                <arg line="${application.args}"/>
+            </customize>
+        </j2seproject3:debug>
+    </target>
+    <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto">
+        <j2seproject1:nbjpdastart stopclassname="${main.class}"/>
+    </target>
+    <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/>
+    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
+        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
+        <j2seproject3:debug classname="${debug.class}"/>
+    </target>
+    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
+    <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
+        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
+        <j2seproject3:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
+    </target>
+    <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
+    <target depends="init" name="-pre-debug-fix">
+        <fail unless="fix.includes">Must set fix.includes</fail>
+        <property name="javac.includes" value="${fix.includes}.java"/>
+    </target>
+    <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
+        <j2seproject1:nbjpdareload/>
+    </target>
+    <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
+    <!--
+                =================
+                PROFILING SECTION
+                =================
+            -->
+    <target depends="profile-init,compile" description="Profile a project in the IDE." if="netbeans.home" name="profile">
+        <nbprofiledirect>
+            <classpath>
+                <path path="${run.classpath}"/>
+            </classpath>
+        </nbprofiledirect>
+        <profile/>
+    </target>
+    <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="netbeans.home" name="profile-single">
+        <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail>
+        <nbprofiledirect>
+            <classpath>
+                <path path="${run.classpath}"/>
+            </classpath>
+        </nbprofiledirect>
+        <profile classname="${profile.class}"/>
+    </target>
+    <!--
+                =========================
+                APPLET PROFILING  SECTION
+                =========================
+            -->
+    <target depends="profile-init,compile-single" if="netbeans.home" name="profile-applet">
+        <nbprofiledirect>
+            <classpath>
+                <path path="${run.classpath}"/>
+            </classpath>
+        </nbprofiledirect>
+        <profile classname="sun.applet.AppletViewer">
+            <customize>
+                <arg value="${applet.url}"/>
+            </customize>
+        </profile>
+    </target>
+    <!--
+                =========================
+                TESTS PROFILING  SECTION
+                =========================
+            -->
+    <target depends="profile-init,compile-test-single" if="netbeans.home" name="profile-test-single">
+        <nbprofiledirect>
+            <classpath>
+                <path path="${run.test.classpath}"/>
+            </classpath>
+        </nbprofiledirect>
+        <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">
+            <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
+            <jvmarg value="${profiler.info.jvmargs.agent}"/>
+            <jvmarg line="${profiler.info.jvmargs}"/>
+            <test name="${profile.class}"/>
+            <classpath>
+                <path path="${run.test.classpath}"/>
+            </classpath>
+            <syspropertyset>
+                <propertyref prefix="test-sys-prop."/>
+                <mapper from="test-sys-prop.*" to="*" type="glob"/>
+            </syspropertyset>
+            <formatter type="brief" usefile="false"/>
+            <formatter type="xml"/>
+        </junit>
+    </target>
+    <!--
+                ===============
+                JAVADOC SECTION
+                ===============
+            -->
+    <target depends="init" if="have.sources" name="-javadoc-build">
+        <mkdir dir="${dist.javadoc.dir}"/>
+        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
+            <classpath>
+                <path path="${javac.classpath}"/>
+            </classpath>
+            <fileset dir="${src.dir}" excludes="*.java,${excludes}" includes="${includes}">
+                <filename name="**/*.java"/>
+            </fileset>
+            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
+                <include name="**/*.java"/>
+                <exclude name="*.java"/>
+            </fileset>
+        </javadoc>
+        <copy todir="${dist.javadoc.dir}">
+            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/doc-files/**"/>
+            </fileset>
+            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
+                <include name="**/doc-files/**"/>
+            </fileset>
+        </copy>
+    </target>
+    <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
+        <nbbrowse file="${dist.javadoc.dir}/index.html"/>
+    </target>
+    <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
+    <!--
+                =========================
+                JUNIT COMPILATION SECTION
+                =========================
+            -->
+    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
+        <mkdir dir="${build.test.classes.dir}"/>
+    </target>
+    <target name="-pre-compile-test">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target if="do.depend.true" name="-compile-test-depend">
+        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
+    </target>
+    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
+        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.src.dir}"/>
+        <copy todir="${build.test.classes.dir}">
+            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target name="-post-compile-test">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
+    <target name="-pre-compile-test-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
+        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+        <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
+        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
+        <copy todir="${build.test.classes.dir}">
+            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target name="-post-compile-test-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
+    <!--
+                =======================
+                JUNIT EXECUTION SECTION
+                =======================
+            -->
+    <target depends="init" if="have.tests" name="-pre-test-run">
+        <mkdir dir="${build.test.results.dir}"/>
+    </target>
+    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
+        <j2seproject3:junit testincludes="**/*Test.java"/>
+    </target>
+    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
+        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
+    </target>
+    <target depends="init" if="have.tests" name="test-report"/>
+    <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
+    <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
+    <target depends="init" if="have.tests" name="-pre-test-run-single">
+        <mkdir dir="${build.test.results.dir}"/>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
+        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
+        <j2seproject3:junit excludes="" includes="${test.includes}"/>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
+        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
+    <!--
+                =======================
+                JUNIT DEBUGGING SECTION
+                =======================
+            -->
+    <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
+        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
+        <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
+        <delete file="${test.report.file}"/>
+        <mkdir dir="${build.test.results.dir}"/>
+        <j2seproject3:debug classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}">
+            <customize>
+                <syspropertyset>
+                    <propertyref prefix="test-sys-prop."/>
+                    <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                </syspropertyset>
+                <arg value="${test.class}"/>
+                <arg value="showoutput=true"/>
+                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
+                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
+            </customize>
+        </j2seproject3:debug>
+    </target>
+    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
+        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
+    </target>
+    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
+    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
+        <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
+    </target>
+    <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
+    <!--
+                =========================
+                APPLET EXECUTION SECTION
+                =========================
+            -->
+    <target depends="init,compile-single" name="run-applet">
+        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
+        <j2seproject1:java classname="sun.applet.AppletViewer">
+            <customize>
+                <arg value="${applet.url}"/>
+            </customize>
+        </j2seproject1:java>
+    </target>
+    <!--
+                =========================
+                APPLET DEBUGGING  SECTION
+                =========================
+            -->
+    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
+        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
+        <j2seproject3:debug classname="sun.applet.AppletViewer">
+            <customize>
+                <arg value="${applet.url}"/>
+            </customize>
+        </j2seproject3:debug>
+    </target>
+    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
+    <!--
+                ===============
+                CLEANUP SECTION
+                ===============
+            -->
+    <target name="-deps-clean-init" unless="built-clean.properties">
+        <property location="${build.dir}/built-clean.properties" name="built-clean.properties"/>
+        <delete file="${built-clean.properties}" quiet="true"/>
+    </target>
+    <target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
+        <echo level="warn" message="Cycle detected: HelloFXCanvas was already built"/>
+    </target>
+    <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
+        <mkdir dir="${build.dir}"/>
+        <touch file="${built-clean.properties}" verbose="false"/>
+        <property file="${built-clean.properties}" prefix="already.built.clean."/>
+        <antcall target="-warn-already-built-clean"/>
+        <propertyfile file="${built-clean.properties}">
+            <entry key="${basedir}" value=""/>
+        </propertyfile>
+    </target>
+    <target depends="init" name="-do-clean">
+        <delete dir="${build.dir}"/>
+        <delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/>
+    </target>
+    <target name="-post-clean">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
+    <target name="-check-call-dep">
+        <property file="${call.built.properties}" prefix="already.built."/>
+        <condition property="should.call.dep">
+            <not>
+                <isset property="already.built.${call.subproject}"/>
+            </not>
+        </condition>
+    </target>
+    <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
+        <ant antfile="${call.script}" inheritall="false" target="${call.target}">
+            <propertyset>
+                <propertyref prefix="transfer."/>
+                <mapper from="transfer.*" to="*" type="glob"/>
+            </propertyset>
+        </ant>
+    </target>
+</project>
diff --git a/apps/toys/HelloFXCanvas/nbproject/genfiles.properties b/apps/toys/HelloFXCanvas/nbproject/genfiles.properties
new file mode 100644
index 00000000000..b903d7392f8
--- /dev/null
+++ b/apps/toys/HelloFXCanvas/nbproject/genfiles.properties
@@ -0,0 +1,8 @@
+build.xml.data.CRC32=be03dc1c
+build.xml.script.CRC32=ccdf0651
+build.xml.stylesheet.CRC32=28e38971@1.44.1.45
+# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
+# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
+nbproject/build-impl.xml.data.CRC32=be03dc1c
+nbproject/build-impl.xml.script.CRC32=f90c0c6c
+nbproject/build-impl.xml.stylesheet.CRC32=c12040a1@1.47.1.46
diff --git a/apps/toys/HelloFXCanvas/nbproject/project.properties b/apps/toys/HelloFXCanvas/nbproject/project.properties
new file mode 100644
index 00000000000..7c23a6d744f
--- /dev/null
+++ b/apps/toys/HelloFXCanvas/nbproject/project.properties
@@ -0,0 +1,79 @@
+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=false
+annotation.processing.run.all.processors=true
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+application.title=HelloFXCanvas
+application.vendor=steve
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+# Uncomment to specify the preferred debugger connection transport:
+#debug.transport=dt_socket
+debug.classpath=\
+    ${run.classpath}
+debug.test.classpath=\
+    ${run.test.classpath}
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.jar=${dist.dir}/HelloFXCanvas.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+endorsed.classpath=
+excludes=
+file.reference.standalone.javafx-swt.jar=../../../build/sdk/lib/javafx-swt.jar
+file.reference.swt-debug.jar=../../../build/libs/swt-debug.jar
+includes=**
+jar.compress=false
+javac.classpath=\
+    ${file.reference.bundled.javafx-swt.jar}:\
+    ${file.reference.standalone.javafx-swt.jar}:\
+    ${file.reference.swt-debug.jar}
+# Space-separated list of extra javac options
+compile.patch=@${basedir}/../../../build/compile.args
+javac.compilerargs=${compile.patch}
+javac.deprecation=false
+javac.processorpath=\
+    ${javac.classpath}
+javac.source=1.9
+javac.target=1.9
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+javac.test.processorpath=\
+    ${javac.test.classpath}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+main.class=hellofxcanvas.HelloFXCanvas
+manifest.file=manifest.mf
+meta.inf.dir=${src.dir}/META-INF
+mkdist.disabled=false
+platform.active=JDK_1.9
+run.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+# Space-separated list of JVM arguments used when running the project
+# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
+# or test-sys-prop.name=value to set system properties for unit tests):
+run.patch=@${basedir}/../../../build/run.args
+run.jvmargs=${run.patch}
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
+source.encoding=UTF-8
+src.dir=src
+test.src.dir=test
diff --git a/apps/toys/HelloFXCanvas/nbproject/project.xml b/apps/toys/HelloFXCanvas/nbproject/project.xml
new file mode 100644
index 00000000000..df919ef26fa
--- /dev/null
+++ b/apps/toys/HelloFXCanvas/nbproject/project.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.java.j2seproject</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
+            <name>HelloFXCanvas</name>
+            <source-roots>
+                <root id="src.dir"/>
+            </source-roots>
+            <test-roots>
+                <root id="test.src.dir"/>
+            </test-roots>
+        </data>
+    </configuration>
+</project>
diff --git a/apps/toys/HelloFXCanvas/src/hellofxcanvas/HelloFXCanvas.java b/apps/toys/HelloFXCanvas/src/hellofxcanvas/HelloFXCanvas.java
new file mode 100644
index 00000000000..c18bdbe4454
--- /dev/null
+++ b/apps/toys/HelloFXCanvas/src/hellofxcanvas/HelloFXCanvas.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+
+package hellofxcanvas;
+
+import javafx.scene.Group;
+import javafx.scene.Scene;
+import javafx.scene.paint.Color;
+import javafx.scene.shape.Rectangle;
+import javafx.animation.Timeline;
+import javafx.animation.KeyValue;
+import javafx.animation.KeyFrame;
+import javafx.util.Duration;
+
+import javafx.embed.swt.FXCanvas;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.FillLayout;
+
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Shell;
+
+/**
+ * @author Artem Ananiev
+ */
+public class HelloFXCanvas {
+
+    private static void createScene(final FXCanvas fxCanvas) {
+        Group root = new Group();
+        final Scene scene = new Scene(root);
+        scene.setFill(Color.LIGHTGREEN);
+
+        Rectangle rect = new Rectangle();
+        rect.setX(25);
+        rect.setY(40);
+        rect.setWidth(100);
+        rect.setHeight(50);
+        rect.setFill(Color.BLUE);
+
+        root.getChildren().add(rect);
+
+        final Timeline timeline = new Timeline();
+        timeline.setCycleCount(Timeline.INDEFINITE);
+        timeline.setAutoReverse(true);
+        final KeyValue kv = new KeyValue(rect.xProperty(), 200);
+        final KeyFrame kf = new KeyFrame(Duration.millis(500), kv);
+        timeline.getKeyFrames().add(kf);
+        timeline.play();
+
+        // add scene to panel
+        fxCanvas.setScene(scene);
+    }
+
+    public static void main(String[] args) {
+        Display display = new Display();
+        final Shell shell = new Shell(display);
+        shell.setSize(400, 400);
+        shell.setLayout(new FillLayout());
+
+        Button button = new Button(shell, SWT.NONE);
+        button.setText("SWT Button (press to close)");
+        button.addListener(SWT.Selection, new Listener() {
+            public void handleEvent (Event e) {
+                shell.close();
+            }
+        });
+
+        // Create javafx panel
+        final FXCanvas fxCanvas = new FXCanvas(shell, SWT.NONE);
+
+        // create JavaFX scene
+        createScene(fxCanvas);
+
+        shell.open();
+        while (!shell.isDisposed()) {
+            if (!display.readAndDispatch()) {
+                display.sleep();
+            }
+        }
+    }
+}
diff --git a/apps/toys/build.xml b/apps/toys/build.xml
index b6728d7e0bf..e7fd84bcd4d 100644
--- a/apps/toys/build.xml
+++ b/apps/toys/build.xml
@@ -7,6 +7,7 @@
           -->
         <ant dir="ColorCube" target="jar" inheritAll="true"/>
         <ant dir="DragDrop" target="jar" inheritAll="true"/>
+        <ant dir="HelloFXCanvas" target="jar" inheritAll="true"/>
     </target>
 
     <target description="Build the toys" name="jar" depends="swingJar">
@@ -23,6 +24,7 @@
         <ant dir="LayoutDemo" target="clean" inheritAll="true"/>
         <ant dir="PickTest3D" target="clean" inheritAll="true"/>
         <ant dir="DragDrop" target="clean" inheritAll="true"/>
+        <ant dir="HelloFXCanvas" target="clean" inheritAll="true"/>
     </target>
 
 </project>

From 6d1dd293d690f34dc87e86edc6ec2490f6d48967 Mon Sep 17 00:00:00 2001
From: Jayathirth D V <jdv@openjdk.org>
Date: Wed, 18 Sep 2024 14:09:37 +0000
Subject: [PATCH 41/75] 8211234: Open-source simple test programs for FX /
 Swing interop

Reviewed-by: kcr
---
 apps/toys/EmbeddedSwing/build.xml             |   76 ++
 apps/toys/EmbeddedSwing/manifest.mf           |    3 +
 .../EmbeddedSwing/nbproject/build-impl.xml    | 1042 ++++++++++++++++
 .../nbproject/genfiles.properties             |    8 +
 .../nbproject/project.properties              |   74 ++
 apps/toys/EmbeddedSwing/nbproject/project.xml |   15 +
 .../src/embeddedswing/EmbeddedSwing.java      |   95 ++
 .../src/embeddedswing/MusicRegister.java      |  120 ++
 .../src/embeddedswing/resources/tree.txt      |  628 ++++++++++
 apps/toys/HelloWorld/build.xml                |   74 ++
 apps/toys/HelloWorld/manifest.mf              |    3 +
 apps/toys/HelloWorld/nbproject/build-impl.xml | 1044 +++++++++++++++++
 .../HelloWorld/nbproject/genfiles.properties  |    8 +
 .../HelloWorld/nbproject/project.properties   |   88 ++
 apps/toys/HelloWorld/nbproject/project.xml    |   16 +
 .../src/helloworld/HelloJFXPanel.java         |  123 ++
 .../src/helloworld/HelloJFXPanel2.java        |  114 ++
 apps/toys/build.xml                           |    4 +
 18 files changed, 3535 insertions(+)
 create mode 100644 apps/toys/EmbeddedSwing/build.xml
 create mode 100644 apps/toys/EmbeddedSwing/manifest.mf
 create mode 100644 apps/toys/EmbeddedSwing/nbproject/build-impl.xml
 create mode 100644 apps/toys/EmbeddedSwing/nbproject/genfiles.properties
 create mode 100644 apps/toys/EmbeddedSwing/nbproject/project.properties
 create mode 100644 apps/toys/EmbeddedSwing/nbproject/project.xml
 create mode 100644 apps/toys/EmbeddedSwing/src/embeddedswing/EmbeddedSwing.java
 create mode 100644 apps/toys/EmbeddedSwing/src/embeddedswing/MusicRegister.java
 create mode 100644 apps/toys/EmbeddedSwing/src/embeddedswing/resources/tree.txt
 create mode 100644 apps/toys/HelloWorld/build.xml
 create mode 100644 apps/toys/HelloWorld/manifest.mf
 create mode 100644 apps/toys/HelloWorld/nbproject/build-impl.xml
 create mode 100644 apps/toys/HelloWorld/nbproject/genfiles.properties
 create mode 100644 apps/toys/HelloWorld/nbproject/project.properties
 create mode 100644 apps/toys/HelloWorld/nbproject/project.xml
 create mode 100644 apps/toys/HelloWorld/src/helloworld/HelloJFXPanel.java
 create mode 100644 apps/toys/HelloWorld/src/helloworld/HelloJFXPanel2.java

diff --git a/apps/toys/EmbeddedSwing/build.xml b/apps/toys/EmbeddedSwing/build.xml
new file mode 100644
index 00000000000..3fc286ec000
--- /dev/null
+++ b/apps/toys/EmbeddedSwing/build.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See commented blocks below for -->
+<!-- some examples of how to customize the build. -->
+<!-- (If you delete it and reopen the project it will be recreated.) -->
+<!-- By default, only the Clean and Build commands use this build script. -->
+<!-- Commands such as Run, Debug, and Test only use this build script if -->
+<!-- the Compile on Save feature is turned off for the project. -->
+<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
+<!-- in the project's Project Properties dialog box.-->
+<project name="EmbeddedSwing" default="default" basedir=".">
+    <description>Builds, tests, and runs the project EmbeddedSwing.</description>
+    <import file="nbproject/build-impl.xml"/>
+    <!--
+
+    There exist several targets which are by default empty and which can be 
+    used for execution of your tasks. These targets are usually executed 
+    before and after some main targets. They are: 
+
+      -pre-init:                 called before initialization of project properties
+      -post-init:                called after initialization of project properties
+      -pre-compile:              called before javac compilation
+      -post-compile:             called after javac compilation
+      -pre-compile-single:       called before javac compilation of single file
+      -post-compile-single:      called after javac compilation of single file
+      -pre-compile-test:         called before javac compilation of JUnit tests
+      -post-compile-test:        called after javac compilation of JUnit tests
+      -pre-compile-test-single:  called before javac compilation of single JUnit test
+      -post-compile-test-single: called after javac compilation of single JUunit test
+      -pre-jar:                  called before JAR building
+      -post-jar:                 called after JAR building
+      -post-clean:               called after cleaning build products
+
+    (Targets beginning with '-' are not intended to be called on their own.)
+
+    Example of inserting an obfuscator after compilation could look like this:
+
+        <target name="-post-compile">
+            <obfuscate>
+                <fileset dir="${build.classes.dir}"/>
+            </obfuscate>
+        </target>
+
+    For list of available properties check the imported 
+    nbproject/build-impl.xml file. 
+
+
+    Another way to customize the build is by overriding existing main targets.
+    The targets of interest are: 
+
+      -init-macrodef-javac:     defines macro for javac compilation
+      -init-macrodef-junit:     defines macro for junit execution
+      -init-macrodef-debug:     defines macro for class debugging
+      -init-macrodef-java:      defines macro for class execution
+      -do-jar-with-manifest:    JAR building (if you are using a manifest)
+      -do-jar-without-manifest: JAR building (if you are not using a manifest)
+      run:                      execution of project 
+      -javadoc-build:           Javadoc generation
+      test-report:              JUnit report generation
+
+    An example of overriding the target for project execution could look like this:
+
+        <target name="run" depends="EmbeddedSwing-impl.jar">
+            <exec dir="bin" executable="launcher.exe">
+                <arg file="${dist.jar}"/>
+            </exec>
+        </target>
+
+    Notice that the overridden target depends on the jar target and not only on 
+    the compile target as the regular run target does. Again, for a list of available 
+    properties which you can use, check the target you are overriding in the
+    nbproject/build-impl.xml file. 
+
+    -->
+    <target name="-pre-compile">
+    </target>
+</project>
diff --git a/apps/toys/EmbeddedSwing/manifest.mf b/apps/toys/EmbeddedSwing/manifest.mf
new file mode 100644
index 00000000000..328e8e5bc3b
--- /dev/null
+++ b/apps/toys/EmbeddedSwing/manifest.mf
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+X-COMMENT: Main-Class will be added automatically by build
+
diff --git a/apps/toys/EmbeddedSwing/nbproject/build-impl.xml b/apps/toys/EmbeddedSwing/nbproject/build-impl.xml
new file mode 100644
index 00000000000..ea79568e42e
--- /dev/null
+++ b/apps/toys/EmbeddedSwing/nbproject/build-impl.xml
@@ -0,0 +1,1042 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+*** GENERATED FROM project.xml - DO NOT EDIT  ***
+***         EDIT ../build.xml INSTEAD         ***
+
+For the purpose of easier reading the script
+is divided into following sections:
+
+  - initialization
+  - compilation
+  - jar
+  - execution
+  - debugging
+  - javadoc
+  - junit compilation
+  - junit execution
+  - junit debugging
+  - applet
+  - cleanup
+
+        -->
+<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="EmbeddedSwing-impl">
+    <fail message="Please build using Ant 1.7.1 or higher.">
+        <condition>
+            <not>
+                <antversion atleast="1.7.1"/>
+            </not>
+        </condition>
+    </fail>
+    <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
+    <!-- 
+                ======================
+                INITIALIZATION SECTION 
+                ======================
+            -->
+    <target name="-pre-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="-pre-init" name="-init-private">
+        <property file="nbproject/private/config.properties"/>
+        <property file="nbproject/private/configs/${config}.properties"/>
+        <property file="nbproject/private/private.properties"/>
+    </target>
+    <target depends="-pre-init,-init-private" name="-init-user">
+        <property file="${user.properties.file}"/>
+        <!-- The two properties below are usually overridden -->
+        <!-- by the active platform. Just a fallback. -->
+        <property name="default.javac.source" value="1.4"/>
+        <property name="default.javac.target" value="1.4"/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user" name="-init-project">
+        <property file="nbproject/configs/${config}.properties"/>
+        <property file="nbproject/project.properties"/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
+        <available file="${manifest.file}" property="manifest.available"/>
+        <condition property="splashscreen.available">
+            <and>
+                <not>
+                    <equals arg1="${application.splash}" arg2="" trim="true"/>
+                </not>
+                <available file="${application.splash}"/>
+            </and>
+        </condition>
+        <condition property="main.class.available">
+            <and>
+                <isset property="main.class"/>
+                <not>
+                    <equals arg1="${main.class}" arg2="" trim="true"/>
+                </not>
+            </and>
+        </condition>
+        <condition property="manifest.available+main.class">
+            <and>
+                <isset property="manifest.available"/>
+                <isset property="main.class.available"/>
+            </and>
+        </condition>
+        <condition property="do.archive">
+            <not>
+                <istrue value="${jar.archive.disabled}"/>
+            </not>
+        </condition>
+        <condition property="do.mkdist">
+            <and>
+                <isset property="do.archive"/>
+                <isset property="libs.CopyLibs.classpath"/>
+                <not>
+                    <istrue value="${mkdist.disabled}"/>
+                </not>
+            </and>
+        </condition>
+        <condition property="manifest.available+main.class+mkdist.available">
+            <and>
+                <istrue value="${manifest.available+main.class}"/>
+                <isset property="do.mkdist"/>
+            </and>
+        </condition>
+        <condition property="do.archive+manifest.available">
+            <and>
+                <isset property="manifest.available"/>
+                <istrue value="${do.archive}"/>
+            </and>
+        </condition>
+        <condition property="do.archive+main.class.available">
+            <and>
+                <isset property="main.class.available"/>
+                <istrue value="${do.archive}"/>
+            </and>
+        </condition>
+        <condition property="do.archive+splashscreen.available">
+            <and>
+                <isset property="splashscreen.available"/>
+                <istrue value="${do.archive}"/>
+            </and>
+        </condition>
+        <condition property="do.archive+manifest.available+main.class">
+            <and>
+                <istrue value="${manifest.available+main.class}"/>
+                <istrue value="${do.archive}"/>
+            </and>
+        </condition>
+        <condition property="manifest.available-mkdist.available">
+            <or>
+                <istrue value="${manifest.available}"/>
+                <isset property="do.mkdist"/>
+            </or>
+        </condition>
+        <condition property="manifest.available+main.class-mkdist.available">
+            <or>
+                <istrue value="${manifest.available+main.class}"/>
+                <isset property="do.mkdist"/>
+            </or>
+        </condition>
+        <condition property="have.tests">
+            <or>
+                <available file="${test.src.dir}"/>
+            </or>
+        </condition>
+        <condition property="have.sources">
+            <or>
+                <available file="${src.dir}"/>
+            </or>
+        </condition>
+        <condition property="netbeans.home+have.tests">
+            <and>
+                <isset property="netbeans.home"/>
+                <isset property="have.tests"/>
+            </and>
+        </condition>
+        <condition property="no.javadoc.preview">
+            <and>
+                <isset property="javadoc.preview"/>
+                <isfalse value="${javadoc.preview}"/>
+            </and>
+        </condition>
+        <property name="run.jvmargs" value=""/>
+        <property name="javac.compilerargs" value=""/>
+        <property name="work.dir" value="${basedir}"/>
+        <condition property="no.deps">
+            <and>
+                <istrue value="${no.dependencies}"/>
+            </and>
+        </condition>
+        <property name="javac.debug" value="true"/>
+        <property name="javadoc.preview" value="true"/>
+        <property name="application.args" value=""/>
+        <property name="source.encoding" value="${file.encoding}"/>
+        <property name="runtime.encoding" value="${source.encoding}"/>
+        <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
+            <and>
+                <isset property="javadoc.encoding"/>
+                <not>
+                    <equals arg1="${javadoc.encoding}" arg2=""/>
+                </not>
+            </and>
+        </condition>
+        <property name="javadoc.encoding.used" value="${source.encoding}"/>
+        <property name="includes" value="**"/>
+        <property name="excludes" value=""/>
+        <property name="do.depend" value="false"/>
+        <condition property="do.depend.true">
+            <istrue value="${do.depend}"/>
+        </condition>
+        <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
+        <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
+            <length length="0" string="${endorsed.classpath}" when="greater"/>
+        </condition>
+        <condition else="false" property="jdkBug6558476">
+            <and>
+                <matches pattern="1\.[56]" string="${java.specification.version}"/>
+                <not>
+                    <os family="unix"/>
+                </not>
+            </and>
+        </condition>
+        <property name="javac.fork" value="${jdkBug6558476}"/>
+        <property name="jar.index" value="false"/>
+        <property name="jar.index.metainf" value="${jar.index}"/>
+        <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
+    </target>
+    <target name="-post-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
+        <fail unless="src.dir">Must set src.dir</fail>
+        <fail unless="test.src.dir">Must set test.src.dir</fail>
+        <fail unless="build.dir">Must set build.dir</fail>
+        <fail unless="dist.dir">Must set dist.dir</fail>
+        <fail unless="build.classes.dir">Must set build.classes.dir</fail>
+        <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
+        <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
+        <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
+        <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
+        <fail unless="dist.jar">Must set dist.jar</fail>
+    </target>
+    <target name="-init-macrodef-property">
+        <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute name="name"/>
+            <attribute name="value"/>
+            <sequential>
+                <property name="@{name}" value="${@{value}}"/>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
+        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}" name="classpath"/>
+            <attribute default="${javac.processorpath}" name="processorpath"/>
+            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="${javac.debug}" name="debug"/>
+            <attribute default="${empty.dir}" name="sourcepath"/>
+            <attribute default="${empty.dir}" name="gensrcdir"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property location="${build.dir}/empty" name="empty.dir"/>
+                <mkdir dir="${empty.dir}"/>
+                <mkdir dir="@{apgeneratedsrcdir}"/>
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+                    <src>
+                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
+                            <include name="*"/>
+                        </dirset>
+                    </src>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <compilerarg line="${javac.compilerargs}"/>
+                    <compilerarg value="-processorpath"/>
+                    <compilerarg path="@{processorpath}:${empty.dir}"/>
+                    <compilerarg line="${ap.processors.internal}"/>
+                    <compilerarg line="${annotation.processing.processor.options}"/>
+                    <compilerarg value="-s"/>
+                    <compilerarg path="@{apgeneratedsrcdir}"/>
+                    <compilerarg line="${ap.proc.none.internal}"/>
+                    <customize/>
+                </javac>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
+        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}" name="classpath"/>
+            <attribute default="${javac.processorpath}" name="processorpath"/>
+            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="${javac.debug}" name="debug"/>
+            <attribute default="${empty.dir}" name="sourcepath"/>
+            <attribute default="${empty.dir}" name="gensrcdir"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property location="${build.dir}/empty" name="empty.dir"/>
+                <mkdir dir="${empty.dir}"/>
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+                    <src>
+                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
+                            <include name="*"/>
+                        </dirset>
+                    </src>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <compilerarg line="${javac.compilerargs}"/>
+                    <customize/>
+                </javac>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
+        <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}" name="classpath"/>
+            <sequential>
+                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                </depend>
+            </sequential>
+        </macrodef>
+        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <sequential>
+                <fail unless="javac.includes">Must set javac.includes</fail>
+                <pathconvert pathsep="${line.separator}" property="javac.includes.binary">
+                    <path>
+                        <filelist dir="@{destdir}" files="${javac.includes}"/>
+                    </path>
+                    <globmapper from="*.java" to="*.class"/>
+                </pathconvert>
+                <tempfile deleteonexit="true" property="javac.includesfile.binary"/>
+                <echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/>
+                <delete>
+                    <files includesfile="${javac.includesfile.binary}"/>
+                </delete>
+                <delete>
+                    <fileset file="${javac.includesfile.binary}"/>
+                </delete>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-junit">
+        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <sequential>
+                <property name="junit.forkmode" value="perTest"/>
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
+                    <batchtest todir="${build.test.results.dir}">
+                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+                            <filename name="@{testincludes}"/>
+                        </fileset>
+                    </batchtest>
+                    <classpath>
+                        <path path="${run.test.classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="test-sys-prop."/>
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <formatter type="brief" usefile="false"/>
+                    <formatter type="xml"/>
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <jvmarg value="-ea"/>
+                    <jvmarg line="${run.jvmargs}"/>
+                </junit>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" name="profile-init"/>
+    <target name="-profile-pre-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target name="-profile-post-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target name="-profile-init-macrodef-profile">
+        <macrodef name="resolve">
+            <attribute name="name"/>
+            <attribute name="value"/>
+            <sequential>
+                <property name="@{name}" value="${env.@{value}}"/>
+            </sequential>
+        </macrodef>
+        <macrodef name="profile">
+            <attribute default="${main.class}" name="classname"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property environment="env"/>
+                <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
+                <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
+                    <jvmarg value="${profiler.info.jvmargs.agent}"/>
+                    <jvmarg line="${profiler.info.jvmargs}"/>
+                    <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
+                    <arg line="${application.args}"/>
+                    <classpath>
+                        <path path="${run.classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" name="-profile-init-check">
+        <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
+        <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
+    </target>
+    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
+        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${main.class}" name="name"/>
+            <attribute default="${debug.classpath}" name="classpath"/>
+            <attribute default="" name="stopclassname"/>
+            <sequential>
+                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                </nbjpdastart>
+            </sequential>
+        </macrodef>
+        <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${build.classes.dir}" name="dir"/>
+            <sequential>
+                <nbjpdareload>
+                    <fileset dir="@{dir}" includes="${fix.classes}">
+                        <include name="${fix.includes}*.class"/>
+                    </fileset>
+                </nbjpdareload>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-debug-args">
+        <property name="version-output" value="java version &quot;${ant.java.version}"/>
+        <condition property="have-jdk-older-than-1.4">
+            <or>
+                <contains string="${version-output}" substring="java version &quot;1.0"/>
+                <contains string="${version-output}" substring="java version &quot;1.1"/>
+                <contains string="${version-output}" substring="java version &quot;1.2"/>
+                <contains string="${version-output}" substring="java version &quot;1.3"/>
+            </or>
+        </condition>
+        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
+            <istrue value="${have-jdk-older-than-1.4}"/>
+        </condition>
+        <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
+            <os family="windows"/>
+        </condition>
+        <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
+            <isset property="debug.transport"/>
+        </condition>
+    </target>
+    <target depends="-init-debug-args" name="-init-macrodef-debug">
+        <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${main.class}" name="classname"/>
+            <attribute default="${debug.classpath}" name="classpath"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <java classname="@{classname}" dir="${work.dir}" fork="true">
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <jvmarg line="${debug-args-line}"/>
+                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
+                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
+                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
+                    <jvmarg line="${run.jvmargs}"/>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-java">
+        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${main.class}" name="classname"/>
+            <attribute default="${run.classpath}" name="classpath"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <java classname="@{classname}" dir="${work.dir}" fork="true">
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
+                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
+                    <jvmarg line="${run.jvmargs}"/>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-copylibs">
+        <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${manifest.file}" name="manifest"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
+                <pathconvert property="run.classpath.without.build.classes.dir">
+                    <path path="${run.classpath}"/>
+                    <map from="${build.classes.dir.resolved}" to=""/>
+                </pathconvert>
+                <pathconvert pathsep=" " property="jar.classpath">
+                    <path path="${run.classpath.without.build.classes.dir}"/>
+                    <chainedmapper>
+                        <flattenmapper/>
+                        <globmapper from="*" to="lib/*"/>
+                    </chainedmapper>
+                </pathconvert>
+                <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
+                <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
+                    <fileset dir="${build.classes.dir}"/>
+                    <manifest>
+                        <attribute name="Class-Path" value="${jar.classpath}"/>
+                        <customize/>
+                    </manifest>
+                </copylibs>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-presetdef-jar">
+        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
+                <j2seproject1:fileset dir="${build.classes.dir}"/>
+            </jar>
+        </presetdef>
+    </target>
+    <target name="-init-ap-cmdline-properties">
+        <property name="annotation.processing.enabled" value="true"/>
+        <property name="annotation.processing.processors.list" value=""/>
+        <property name="annotation.processing.processor.options" value=""/>
+        <property name="annotation.processing.run.all.processors" value="true"/>
+        <property name="javac.processorpath" value="${javac.classpath}"/>
+        <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
+        <condition property="ap.supported.internal" value="true">
+            <not>
+                <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
+            </not>
+        </condition>
+    </target>
+    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
+        <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
+            <isfalse value="${annotation.processing.run.all.processors}"/>
+        </condition>
+        <condition else="" property="ap.proc.none.internal" value="-proc:none">
+            <isfalse value="${annotation.processing.enabled}"/>
+        </condition>
+    </target>
+    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
+        <property name="ap.cmd.line.internal" value=""/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
+    <!--
+                ===================
+                COMPILATION SECTION
+                ===================
+            -->
+    <target name="-deps-jar-init" unless="built-jar.properties">
+        <property location="${build.dir}/built-jar.properties" name="built-jar.properties"/>
+        <delete file="${built-jar.properties}" quiet="true"/>
+    </target>
+    <target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
+        <echo level="warn" message="Cycle detected: EmbeddedSwing was already built"/>
+    </target>
+    <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
+        <mkdir dir="${build.dir}"/>
+        <touch file="${built-jar.properties}" verbose="false"/>
+        <property file="${built-jar.properties}" prefix="already.built.jar."/>
+        <antcall target="-warn-already-built-jar"/>
+        <propertyfile file="${built-jar.properties}">
+            <entry key="${basedir}" value=""/>
+        </propertyfile>
+    </target>
+    <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
+    <target depends="init" name="-check-automatic-build">
+        <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
+    </target>
+    <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
+        <antcall target="clean"/>
+    </target>
+    <target depends="init,deps-jar" name="-pre-pre-compile">
+        <mkdir dir="${build.classes.dir}"/>
+    </target>
+    <target name="-pre-compile">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target if="do.depend.true" name="-compile-depend">
+        <pathconvert property="build.generated.subdirs">
+            <dirset dir="${build.generated.sources.dir}" erroronmissingdir="false">
+                <include name="*"/>
+            </dirset>
+        </pathconvert>
+        <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>
+    </target>
+    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
+        <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
+        <copy todir="${build.classes.dir}">
+            <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target if="has.persistence.xml" name="-copy-persistence-xml">
+        <mkdir dir="${build.classes.dir}/META-INF"/>
+        <copy todir="${build.classes.dir}/META-INF">
+            <fileset dir="${meta.inf.dir}" includes="persistence.xml"/>
+        </copy>
+    </target>
+    <target name="-post-compile">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
+    <target name="-pre-compile-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
+        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+        <j2seproject3:force-recompile/>
+        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>
+    </target>
+    <target name="-post-compile-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
+    <!--
+                ====================
+                JAR BUILDING SECTION
+                ====================
+            -->
+    <target depends="init" name="-pre-pre-jar">
+        <dirname file="${dist.jar}" property="dist.jar.dir"/>
+        <mkdir dir="${dist.jar.dir}"/>
+    </target>
+    <target name="-pre-jar">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available">
+        <j2seproject1:jar/>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class-mkdist.available">
+        <j2seproject1:jar manifest="${manifest.file}"/>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
+        <j2seproject1:jar manifest="${manifest.file}">
+            <j2seproject1:manifest>
+                <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
+            </j2seproject1:manifest>
+        </j2seproject1:jar>
+        <echo level="info">To run this application from the command line without Ant, try:</echo>
+        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
+        <property location="${dist.jar}" name="dist.jar.resolved"/>
+        <pathconvert property="run.classpath.with.dist.jar">
+            <path path="${run.classpath}"/>
+            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
+        </pathconvert>
+        <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
+    </target>
+    <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available">
+        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
+        <touch file="${tmp.manifest.file}" verbose="false"/>
+    </target>
+    <target depends="init" if="do.archive+manifest.available" name="-do-jar-with-libraries-copy-manifest">
+        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
+        <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
+    </target>
+    <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+main.class.available" name="-do-jar-with-libraries-set-main">
+        <manifest file="${tmp.manifest.file}" mode="update">
+            <attribute name="Main-Class" value="${main.class}"/>
+        </manifest>
+    </target>
+    <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-with-libraries-set-splashscreen">
+        <basename file="${application.splash}" property="splashscreen.basename"/>
+        <mkdir dir="${build.classes.dir}/META-INF"/>
+        <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
+        <manifest file="${tmp.manifest.file}" mode="update">
+            <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
+        </manifest>
+    </target>
+    <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen" if="do.mkdist" name="-do-jar-with-libraries-pack">
+        <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
+        <echo level="info">To run this application from the command line without Ant, try:</echo>
+        <property location="${dist.jar}" name="dist.jar.resolved"/>
+        <echo level="info">java -jar "${dist.jar.resolved}"</echo>
+    </target>
+    <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">
+        <delete>
+            <fileset file="${tmp.manifest.file}"/>
+        </delete>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen,-do-jar-with-libraries-pack,-do-jar-with-libraries-delete-manifest" name="-do-jar-with-libraries"/>
+    <target name="-post-jar">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
+    <!--
+                =================
+                EXECUTION SECTION
+                =================
+            -->
+    <target depends="init,compile" description="Run a main class." name="run">
+        <j2seproject1:java>
+            <customize>
+                <arg line="${application.args}"/>
+            </customize>
+        </j2seproject1:java>
+    </target>
+    <target name="-do-not-recompile">
+        <property name="javac.includes.binary" value=""/>
+    </target>
+    <target depends="init,compile-single" name="run-single">
+        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+        <j2seproject1:java classname="${run.class}"/>
+    </target>
+    <target depends="init,compile-test-single" name="run-test-with-main">
+        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+        <j2seproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
+    </target>
+    <!--
+                =================
+                DEBUGGING SECTION
+                =================
+            -->
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger">
+        <j2seproject1:nbjpdastart name="${debug.class}"/>
+    </target>
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
+        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
+    </target>
+    <target depends="init,compile" name="-debug-start-debuggee">
+        <j2seproject3:debug>
+            <customize>
+                <arg line="${application.args}"/>
+            </customize>
+        </j2seproject3:debug>
+    </target>
+    <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto">
+        <j2seproject1:nbjpdastart stopclassname="${main.class}"/>
+    </target>
+    <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/>
+    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
+        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
+        <j2seproject3:debug classname="${debug.class}"/>
+    </target>
+    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
+    <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
+        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
+        <j2seproject3:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
+    </target>
+    <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
+    <target depends="init" name="-pre-debug-fix">
+        <fail unless="fix.includes">Must set fix.includes</fail>
+        <property name="javac.includes" value="${fix.includes}.java"/>
+    </target>
+    <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
+        <j2seproject1:nbjpdareload/>
+    </target>
+    <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
+    <!--
+                =================
+                PROFILING SECTION
+                =================
+            -->
+    <target depends="profile-init,compile" description="Profile a project in the IDE." if="netbeans.home" name="profile">
+        <nbprofiledirect>
+            <classpath>
+                <path path="${run.classpath}"/>
+            </classpath>
+        </nbprofiledirect>
+        <profile/>
+    </target>
+    <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="netbeans.home" name="profile-single">
+        <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail>
+        <nbprofiledirect>
+            <classpath>
+                <path path="${run.classpath}"/>
+            </classpath>
+        </nbprofiledirect>
+        <profile classname="${profile.class}"/>
+    </target>
+    <!--
+                =========================
+                APPLET PROFILING  SECTION
+                =========================
+            -->
+    <target depends="profile-init,compile-single" if="netbeans.home" name="profile-applet">
+        <nbprofiledirect>
+            <classpath>
+                <path path="${run.classpath}"/>
+            </classpath>
+        </nbprofiledirect>
+        <profile classname="sun.applet.AppletViewer">
+            <customize>
+                <arg value="${applet.url}"/>
+            </customize>
+        </profile>
+    </target>
+    <!--
+                =========================
+                TESTS PROFILING  SECTION
+                =========================
+            -->
+    <target depends="profile-init,compile-test-single" if="netbeans.home" name="profile-test-single">
+        <nbprofiledirect>
+            <classpath>
+                <path path="${run.test.classpath}"/>
+            </classpath>
+        </nbprofiledirect>
+        <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">
+            <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
+            <jvmarg value="${profiler.info.jvmargs.agent}"/>
+            <jvmarg line="${profiler.info.jvmargs}"/>
+            <test name="${profile.class}"/>
+            <classpath>
+                <path path="${run.test.classpath}"/>
+            </classpath>
+            <syspropertyset>
+                <propertyref prefix="test-sys-prop."/>
+                <mapper from="test-sys-prop.*" to="*" type="glob"/>
+            </syspropertyset>
+            <formatter type="brief" usefile="false"/>
+            <formatter type="xml"/>
+        </junit>
+    </target>
+    <!--
+                ===============
+                JAVADOC SECTION
+                ===============
+            -->
+    <target depends="init" if="have.sources" name="-javadoc-build">
+        <mkdir dir="${dist.javadoc.dir}"/>
+        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
+            <classpath>
+                <path path="${javac.classpath}"/>
+            </classpath>
+            <fileset dir="${src.dir}" excludes="*.java,${excludes}" includes="${includes}">
+                <filename name="**/*.java"/>
+            </fileset>
+            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
+                <include name="**/*.java"/>
+                <exclude name="*.java"/>
+            </fileset>
+        </javadoc>
+        <copy todir="${dist.javadoc.dir}">
+            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/doc-files/**"/>
+            </fileset>
+            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
+                <include name="**/doc-files/**"/>
+            </fileset>
+        </copy>
+    </target>
+    <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
+        <nbbrowse file="${dist.javadoc.dir}/index.html"/>
+    </target>
+    <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
+    <!--
+                =========================
+                JUNIT COMPILATION SECTION
+                =========================
+            -->
+    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
+        <mkdir dir="${build.test.classes.dir}"/>
+    </target>
+    <target name="-pre-compile-test">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target if="do.depend.true" name="-compile-test-depend">
+        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
+    </target>
+    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
+        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.src.dir}"/>
+        <copy todir="${build.test.classes.dir}">
+            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target name="-post-compile-test">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
+    <target name="-pre-compile-test-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
+        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+        <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
+        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
+        <copy todir="${build.test.classes.dir}">
+            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target name="-post-compile-test-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
+    <!--
+                =======================
+                JUNIT EXECUTION SECTION
+                =======================
+            -->
+    <target depends="init" if="have.tests" name="-pre-test-run">
+        <mkdir dir="${build.test.results.dir}"/>
+    </target>
+    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
+        <j2seproject3:junit testincludes="**/*Test.java"/>
+    </target>
+    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
+        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
+    </target>
+    <target depends="init" if="have.tests" name="test-report"/>
+    <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
+    <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
+    <target depends="init" if="have.tests" name="-pre-test-run-single">
+        <mkdir dir="${build.test.results.dir}"/>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
+        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
+        <j2seproject3:junit excludes="" includes="${test.includes}"/>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
+        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
+    <!--
+                =======================
+                JUNIT DEBUGGING SECTION
+                =======================
+            -->
+    <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
+        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
+        <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
+        <delete file="${test.report.file}"/>
+        <mkdir dir="${build.test.results.dir}"/>
+        <j2seproject3:debug classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}">
+            <customize>
+                <syspropertyset>
+                    <propertyref prefix="test-sys-prop."/>
+                    <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                </syspropertyset>
+                <arg value="${test.class}"/>
+                <arg value="showoutput=true"/>
+                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
+                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
+            </customize>
+        </j2seproject3:debug>
+    </target>
+    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
+        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
+    </target>
+    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
+    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
+        <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
+    </target>
+    <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
+    <!--
+                =========================
+                APPLET EXECUTION SECTION
+                =========================
+            -->
+    <target depends="init,compile-single" name="run-applet">
+        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
+        <j2seproject1:java classname="sun.applet.AppletViewer">
+            <customize>
+                <arg value="${applet.url}"/>
+            </customize>
+        </j2seproject1:java>
+    </target>
+    <!--
+                =========================
+                APPLET DEBUGGING  SECTION
+                =========================
+            -->
+    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
+        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
+        <j2seproject3:debug classname="sun.applet.AppletViewer">
+            <customize>
+                <arg value="${applet.url}"/>
+            </customize>
+        </j2seproject3:debug>
+    </target>
+    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
+    <!--
+                ===============
+                CLEANUP SECTION
+                ===============
+            -->
+    <target name="-deps-clean-init" unless="built-clean.properties">
+        <property location="${build.dir}/built-clean.properties" name="built-clean.properties"/>
+        <delete file="${built-clean.properties}" quiet="true"/>
+    </target>
+    <target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
+        <echo level="warn" message="Cycle detected: EmbeddedSwing was already built"/>
+    </target>
+    <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
+        <mkdir dir="${build.dir}"/>
+        <touch file="${built-clean.properties}" verbose="false"/>
+        <property file="${built-clean.properties}" prefix="already.built.clean."/>
+        <antcall target="-warn-already-built-clean"/>
+        <propertyfile file="${built-clean.properties}">
+            <entry key="${basedir}" value=""/>
+        </propertyfile>
+    </target>
+    <target depends="init" name="-do-clean">
+        <delete dir="${build.dir}"/>
+        <delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/>
+    </target>
+    <target name="-post-clean">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
+    <target name="-check-call-dep">
+        <property file="${call.built.properties}" prefix="already.built."/>
+        <condition property="should.call.dep">
+            <not>
+                <isset property="already.built.${call.subproject}"/>
+            </not>
+        </condition>
+    </target>
+    <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
+        <ant antfile="${call.script}" inheritall="false" target="${call.target}">
+            <propertyset>
+                <propertyref prefix="transfer."/>
+                <mapper from="transfer.*" to="*" type="glob"/>
+            </propertyset>
+        </ant>
+    </target>
+</project>
diff --git a/apps/toys/EmbeddedSwing/nbproject/genfiles.properties b/apps/toys/EmbeddedSwing/nbproject/genfiles.properties
new file mode 100644
index 00000000000..b62f204a634
--- /dev/null
+++ b/apps/toys/EmbeddedSwing/nbproject/genfiles.properties
@@ -0,0 +1,8 @@
+build.xml.data.CRC32=38abba93
+build.xml.script.CRC32=1237008f
+build.xml.stylesheet.CRC32=28e38971@1.44.1.45
+# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
+# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
+nbproject/build-impl.xml.data.CRC32=38abba93
+nbproject/build-impl.xml.script.CRC32=a38f3ad8
+nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45
diff --git a/apps/toys/EmbeddedSwing/nbproject/project.properties b/apps/toys/EmbeddedSwing/nbproject/project.properties
new file mode 100644
index 00000000000..61242b5d83a
--- /dev/null
+++ b/apps/toys/EmbeddedSwing/nbproject/project.properties
@@ -0,0 +1,74 @@
+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=false
+annotation.processing.run.all.processors=true
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+application.title=EmbeddedSwing
+application.vendor=tav
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+# Uncomment to specify the preferred debugger connection transport:
+#debug.transport=dt_socket
+debug.classpath=\
+    ${run.classpath}
+debug.test.classpath=\
+    ${run.test.classpath}
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.jar=${dist.dir}/EmbeddedSwing.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+endorsed.classpath=
+excludes=
+includes=**
+jar.compress=false
+javac.classpath=
+# Space-separated list of extra javac options
+compile.patch=@${basedir}/../../../build/compile.args
+javac.compilerargs=${compile.patch} 
+javac.deprecation=false
+javac.processorpath=\
+    ${javac.classpath}
+javac.source=1.9
+javac.target=1.9
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+javac.test.processorpath=\
+    ${javac.test.classpath}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+main.class=embeddedswing.EmbeddedSwing
+manifest.file=manifest.mf
+meta.inf.dir=${src.dir}/META-INF
+mkdist.disabled=false
+platform.active=JDK_1.9
+run.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+# Space-separated list of JVM arguments used when running the project
+# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
+# or test-sys-prop.name=value to set system properties for unit tests):
+run.patch=@${basedir}/../../../build/run.args
+run.jvmargs=${run.patch} 
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
+source.encoding=UTF-8
+src.dir=src
+test.src.dir=test
diff --git a/apps/toys/EmbeddedSwing/nbproject/project.xml b/apps/toys/EmbeddedSwing/nbproject/project.xml
new file mode 100644
index 00000000000..a8bebae8e46
--- /dev/null
+++ b/apps/toys/EmbeddedSwing/nbproject/project.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.java.j2seproject</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
+            <name>EmbeddedSwing</name>
+            <source-roots>
+                <root id="src.dir"/>
+            </source-roots>
+            <test-roots>
+                <root id="test.src.dir"/>
+            </test-roots>
+        </data>
+    </configuration>
+</project>
diff --git a/apps/toys/EmbeddedSwing/src/embeddedswing/EmbeddedSwing.java b/apps/toys/EmbeddedSwing/src/embeddedswing/EmbeddedSwing.java
new file mode 100644
index 00000000000..341e64e2e63
--- /dev/null
+++ b/apps/toys/EmbeddedSwing/src/embeddedswing/EmbeddedSwing.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+
+package embeddedswing;
+
+import javafx.application.Application;
+import javafx.application.Platform;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.collections.FXCollections;
+import javafx.embed.swing.SwingNode;
+import javafx.scene.Scene;
+import javafx.scene.control.ListView;
+import javafx.scene.control.Tooltip;
+import javafx.scene.layout.BorderPane;
+import javafx.stage.Stage;
+import javax.swing.JComponent;
+import javax.swing.SwingUtilities;
+
+
+public class EmbeddedSwing extends Application {
+    private volatile SwingNode swingNode;
+    private ListView<String> listNode;
+
+    public static void main(String[] args) {
+        launch(args);
+    }
+
+    @Override
+    public void start(Stage stage) {
+        swingNode = new SwingNode();
+
+        createAndShowSwingContent(stage);
+
+        BorderPane pane = new BorderPane();
+        pane.setCenter(swingNode);
+
+        listNode = new ListView<String>();
+        listNode.setPrefWidth(100);
+        listNode.getSelectionModel().selectedItemProperty().addListener(
+            new ChangeListener<String>() {
+                @Override
+                public void changed(ObservableValue<? extends String> observable,
+                                    String oldValue,
+                                    final String newValue)
+                {
+                    SwingUtilities.invokeLater(() -> {
+                        MusicRegister.select(newValue);
+                    });
+                }
+            });
+        listNode.setTooltip(new Tooltip("ListView"));
+        pane.setLeft(listNode);
+
+        stage.setScene(new Scene(pane, 400, 300));
+        stage.setTitle("JavaFX/Swing Music Register");
+        stage.show();
+    }
+
+    private void createAndShowSwingContent(final Stage stage) {
+        SwingUtilities.invokeLater(() -> {
+            JComponent content = MusicRegister.create();
+            content.setToolTipText("SwingNode");
+            swingNode.setContent(content);
+
+            Platform.runLater(() -> {
+                listNode.setItems(
+                    FXCollections.observableArrayList(
+                        MusicRegister.items()));
+            });
+        });
+    }
+}
diff --git a/apps/toys/EmbeddedSwing/src/embeddedswing/MusicRegister.java b/apps/toys/EmbeddedSwing/src/embeddedswing/MusicRegister.java
new file mode 100644
index 00000000000..288312c1de1
--- /dev/null
+++ b/apps/toys/EmbeddedSwing/src/embeddedswing/MusicRegister.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+
+package embeddedswing;
+
+import java.awt.Insets;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.swing.JComponent;
+import javax.swing.JScrollPane;
+import javax.swing.JTabbedPane;
+import javax.swing.JTree;
+import javax.swing.tree.DefaultMutableTreeNode;
+
+public class MusicRegister {
+
+    private static final Map<String, JScrollPane> map = new HashMap<String, JScrollPane>();
+    private static final JTabbedPane tabbedPane = new JTabbedPane();
+
+    public static JComponent create() {
+        //
+        // SwingSet2 extract
+        //
+        DefaultMutableTreeNode catagory = null ;
+        DefaultMutableTreeNode artist = null;
+        DefaultMutableTreeNode record = null;
+
+        URL url = MusicRegister.class.getResource("resources/tree.txt");
+
+        try {
+            InputStream is = url.openStream();
+            InputStreamReader isr = new InputStreamReader(is, "UTF-8");
+            BufferedReader reader = new BufferedReader(isr);
+
+            String line = reader.readLine();
+            while (line != null) {
+                char linetype = line.charAt(0);
+                switch (linetype) {
+                    case 'C':
+                        String key = line.substring(2);
+                        catagory = new DefaultMutableTreeNode(key);
+                        JTree tree = new JTree(catagory) {
+                            public Insets getInsets() {
+                                return new Insets(5, 5, 5, 5);
+                            }
+                        };
+                        tree.setEditable(true);
+                        map.put(key, new JScrollPane(tree));
+                        break;
+                    case 'A':
+                        if (catagory != null) {
+                            catagory.add(artist = new DefaultMutableTreeNode(line.substring(2)));
+                        }
+                        break;
+                    case 'R':
+                        if (artist != null) {
+                            artist.add(record = new DefaultMutableTreeNode(line.substring(2)));
+                        }
+                        break;
+                    case 'S':
+                        if (record != null) {
+                            record.add(new DefaultMutableTreeNode(line.substring(2)));
+                        }
+                        break;
+                    default:
+                        break;
+                }
+                line = reader.readLine();
+            }
+        } catch (IOException e) {
+        }
+        for (String item : items()) {
+            tabbedPane.addTab(item, null, map.get(item));
+        }
+        return tabbedPane;
+    }
+
+    public static Collection<String> items() {
+        assert !map.isEmpty() : "create first";
+        List<String> list = new ArrayList<String>(map.keySet());
+        Collections.sort(list);
+        return list;
+    }
+
+    public static void select(String key) {
+        assert !map.isEmpty() : "create first";
+        tabbedPane.setSelectedComponent(map.get(key));
+    }
+}
diff --git a/apps/toys/EmbeddedSwing/src/embeddedswing/resources/tree.txt b/apps/toys/EmbeddedSwing/src/embeddedswing/resources/tree.txt
new file mode 100644
index 00000000000..2c92fcab4b7
--- /dev/null
+++ b/apps/toys/EmbeddedSwing/src/embeddedswing/resources/tree.txt
@@ -0,0 +1,628 @@
+################################################################################
+# Note: do not add blank lines, the data parser in TreeDemo.java cannot        #
+# handle them.                                                                 #
+#                                                                              #
+# Key:                                                                         #
+#     Popular   / Classical                                                    #
+# ----------------------------                                                 #
+# A = Artist    / Composer                                                     #
+# R = Record    / Style                                                        #
+# S = Song Name / Composition                                                  #
+# C = Catagory                                                                 #
+#                                                                              #
+################################################################################
+C Classical
+A Beethoven
+R concertos
+S No. 1 - C
+S No. 2 - B-Flat Major
+S No. 3 - C Minor
+S No. 4 - G Major
+S No. 5 - E-Flat Major
+R Quartets
+S Six String Quartets
+S Three String Quartets
+S Grosse Fugue for String Quartets
+R Sonatas
+S Sonata in A Minor
+S Sonata in F Major
+R Symphonies
+S No. 1 - C Major
+S No. 2 - D Major
+S No. 3 - E-Flat Major
+S No. 4 - B-Flat Major
+S No. 5 - C Minor
+S No. 6 - F Major
+S No. 7 - A Major
+S No. 8 - F Major
+S No. 9 - D Minor
+A Brahms
+R Concertos
+S Violin Concerto
+S Double Concerto - A Minor
+S Piano Concerto No. 1 - D Minor
+S Piano Concerto No. 2 - B-Flat Major
+R Quartets
+S Piano Quartet No. 1 - G Minor
+S Piano Quartet No. 2 - A Major
+S Piano Quartet No. 3 - C Minor
+S String Quartet No. 3 - B-Flat Minor
+R Sonatas
+S Two Sonatas for Clarinet - F Minor
+S Two Sonatas for Clarinet - E-Flat Major
+R Symphonies
+S No. 1 - C Minor
+S No. 2 - D Minor
+S No. 3 - F Major
+S No. 4 - E Minor
+A Mozart
+R Concertos
+S Piano Concerto No. 12
+S Piano Concerto No. 17
+S Clarinet Concerto
+S Violin Concerto No. 5
+S Violin Concerto No. 4
+C Jazz
+A Albert Ayler
+R My Name is Albert Ayler
+S Bye Bye Blackbird
+S Billie's Bounce
+S Summertime
+S On Green Dolphin Street
+S C.T.
+R Swing Low Sweet Spiritual
+S Goin' Home
+S Old Man River
+S When The Saints Go Marching In
+S Deep River
+S Down By The Riverside
+S Spirits
+S Witches and Devils
+S Holy, Holy
+S Saints
+R Prophesy
+S Spirits
+S Wizard
+S Ghosts
+S Prophecy
+R New Grass
+S Free At Last
+S Everybody's Movin'
+S New Generation
+S Heart Love
+S Sun Watcher
+A Chet Baker
+R Sings and Plays
+S Let's Get Lost
+S This Is Always
+S Long Ago and Far Away
+S I Wish I Knew
+S Daybreak
+S Grey December
+S I Remember You
+R My Funny Valentine
+S My Funny Valentine
+S Someone To Watch Over Me
+S Moonlight Becomes You
+S I'm Glad There is You
+S This is Always
+S Time After Time
+S Sweet Lorraine
+S It's Always You
+S Moon Love
+S Like Someone In Love
+S I've Never Been In Love Before
+S Isn't it Romantic
+S I Fall In Love Too Easily
+R Grey December
+S Grey December
+S I Wish I Knew
+S Someone To Watch Over Me
+S Headline
+S Bockhanal
+S A Dandy Line
+S Pro Defunctus
+S Little Old Lady
+S Goodbye
+R The Route
+S Tynan Time
+S The Route
+S Minor Yours
+S Little Girl
+S Ol' Croix
+S The Great Lie
+S Sweet Lorrain
+S If I Should Lose You
+A John Coltrane
+R Blue Train
+S Blue Train
+S Moment's Notice
+S Locomotion
+S I'm Old Fashioned
+S Lazy Bird
+R Giant Steps
+S Giant Steps
+S Cousin Mary Steps
+S Countdown
+S Spiral
+S Syeeda's Song Flute
+S Naima
+S Mr. P.C.
+R My Favorite Things
+S My Favorite Things
+S Everytime We Say Goodbye
+S Summertime
+S But Not For Me
+R Crescent
+S Crescent
+S Wise One
+S Bessie's Blues
+S Lonnie's Lament
+S The Drum Thing
+R Interstellar Space
+S Mars
+S Leo
+S Venus
+S Jupiter Variation
+S Jupiter
+S Saturn
+A Miles Davis
+R Transition
+S Autumn Leaves
+S Two Bass Hit
+S Love, I've Found You
+S I Thought About You
+S All Blues
+S Seven Steps To Heaven
+R Quiet Nights
+S Once Upon a Summertime
+S Aos Pes Da Cruz
+S Wait Till You See Her
+S Corcovado
+S Summer Nights
+R My Funny Valentine
+S All of You
+S Stella By Starlight
+S All Blues
+S I Thought About You
+R Voodoo Down
+S Automn Leaves
+S Footprints
+S Directions
+S Bitches Brew
+S Hush
+C Rock
+A The Beatles
+R A Hard Day's Night
+S A Hard Day's Night
+S I Should Have Known Better 
+S If I Fell 
+S I'm Happy Just To Dance With You 
+S And I Love Her 
+S Tell Me Why 
+S Can't Buy Me Love 
+S Any Time At All 
+S I'll Cry Instead 
+S Things We Said Today 
+S When I Get Home 
+S You Can't Do That 
+R Beatles For Sale
+S No Reply 
+S I'm a Loser 
+S Baby's In Black 
+S Rock And Roll Music 
+S I'll Follow the Sun 
+S Mr. Moonlight 
+S Kansas City/Hey Hey Hey Hey 
+S Eight Days a Week 
+S Words Of Love 
+S Honey Don't 
+S Every Little Thing 
+S I Don't Want To Spoil the Party 
+S What You're Doing 
+S Everybody's Trying To Be My Baby 
+R Help!
+S Help! 
+S The Night Before 
+S You've Got To Hide Your Love Away 
+S I Need You 
+S Another Girl 
+S You're Going To Lose That Girl 
+S Ticket To Ride 
+S Act Naturally 
+S It's Only Love 
+S You Like Me Too Much 
+S Tell Me What You See 
+S I've Just Seen a Face 
+S Yesterday 
+S Dizzy Miss Lizzie 
+R Rubber Soul
+S Drive My Car 
+S Norwegian Wood
+S You Won't See Me
+S Nowhere Man
+S Think For Yourself
+S The Word
+S Michelle
+S What Goes On?
+S Girl 
+S I'm Looking Through You 
+S In My Life 
+S Wait 
+S If I Needed Someone 
+S Run For Your Life 
+R Revolver
+S Taxman 
+S Rigby 
+S I'm Only Sleeping 
+S For You To 
+S Here There And Everywhere 
+S Yellow Submarine
+S She Said She Said 
+S Good Day Sunshine 
+S And Your Bird Can Sing 
+S For No One 
+S Doctor Robert 
+S I Want To Tell You 
+S Got To Get You Into My Life 
+S Tomorrow Never Knows 
+R Sgt. Pepper's Lonely Hearts Club Band
+S Sgt. Pepper's Lonely Hearts Club Band
+S With a Little Help From My Friends
+S Lucy in the Sky With Diamonds
+S Getting Better
+S Fixing a Hole
+S She's Leaving Home
+S Being For the Benefit of Mr. Kite
+S Within You Without You
+S When I'm Sixty Four
+S Lovely Rita
+S Good Morning
+S Sgt. Pepper's Reprise
+S A Day In The Life
+R Magical Mystery Tour
+S Magical Mystery Tour
+S Fool on the Hill
+S Flying
+S Blue Jay Way
+S Your Mother Should Know
+S I Am The Walrus
+S Hello Goodbye
+S Strawberry Fields Forever
+S Penny Lane
+S Baby You're a Rich Man
+S All You Need Is Love
+R The White Album
+S Back in the USSR
+S Dear Prudence
+S Glass Onion
+S Wild Honey Pie
+S Bungalow Bill
+S While My Guitar Gently Weeps
+S Martha My Dear
+S I'm So Tired
+S Blackbird
+S Piggies
+S Rocky Raccoon
+S Don't Pass Me By
+S Why Don't We Do It In The Road
+S I Will
+S Julia
+S Birthday
+S Yer Blues
+S Mother Nature's Son
+S Sexy Sadie
+S Helter Skelter
+S Long Long Long
+S Revolution 1
+S Honey Pie
+S Savoy Truffle
+S Cry Baby Cry
+S Revolution 9
+S Good Night
+R Abbey Road
+S Come Together
+S Something
+S Maxwell's Silver Hammer
+S Octopus's Garden
+S She's So Heavy
+S Here Comes The Sun
+S Because
+S You Never Give Me Your Money
+S Sun King
+S Mean Mr. Mustard
+S Polythene Pam
+S She Came In Through The Bathroom Window
+S Golden Slumbers
+S Carry That Weight
+S The End
+S Her Majesty
+R Let It Be
+S Two of Us
+S Dig A Pony
+S Across the Universe
+S I Me Mine
+S Dig It
+S Let It Be
+S Maggie Mae
+S I've Got A Feeling
+S One After 909
+S The Long and Winding Road
+S For You Blue
+S Get Back
+A Crowded House
+R Crowded House
+S Mean To Me
+S World Where You Live
+S Now We're Getting Somewhere
+S Don't Dream It's Over
+S Love You Til The Day I Die
+S Something So Strong
+S Hole In The River
+S Can't Carry On
+S I Walk Away
+S Tombstone
+S That's What I Call Live
+R Temple of Low Men
+S I Feel Possessed
+S Kill Eye
+S Into Temptation
+S Mansion In The Slums
+S When You Come
+S Never Be The Same
+S Love This Life
+S Sister Madly
+S In The Lowlands
+S Better Be Home Soon
+R Woodface
+S Chocolate Cake
+S It's Only Natural
+S Fall At Your Feet
+S Tall Trees
+S Weather With You
+S Whispers and Moans
+S Four Seasons in One Day
+S There Goes God
+S Fame Is
+S All I Ask
+S As Sure As I Am
+S Italian Plastic
+S She Goes On
+S How Will You Go
+R Together Alone
+S Kare Kare
+S In My Command
+S Nails In My Feet
+S Black & White Boy
+S Fingers of Love
+S Pineapple Head
+S Locked Out
+S Private Universe
+S Walking on the Spot
+S Distant Sun
+S Catherine Wheels
+S Skin Feeling
+S Together Alone
+A The Fixx
+R Shuttered Room
+S Some People
+S Stand or Fall
+S Cameras In Paris
+S Shuttered Room
+S The Fool
+S Lost Planes
+S I Live
+S Sinking Island
+S Time in a Glass
+S Red Skies
+R Reach The Beach
+S One Thing Leads To Another
+S The Sign of Fire
+S Running
+S Saved By Zero
+S Opinions
+S Reach The Beach
+S Changing
+S Liner
+S Privilege
+S Outside
+R Phantoms
+S Lose Face
+S Less Cities, More Moving People
+S Sunshine in the Shade
+S Woman on a Train
+S Wish
+S Lost in Battle Overseas
+S Question
+S In Suspense
+S Facing the Wind
+S Are We Ourselves
+S I Will
+S Phantom Living
+R Walkabout
+S Secret Separation
+S Built for the Future
+S Treasure It
+S Can't Finish
+S Walkabout
+S One Look Up
+S Read Between The Lines
+S Sense The Adventure
+S Camphor
+S Peace On Earth/Do What You Can
+R Calm Animals
+S I'm Life
+S Driven Out
+S Subterranean
+S Precious Stone
+S Gypsy Feet
+S Calm Animals
+S Shred of Evidence
+S The Flow
+S World Weary
+S Caused To Be Alarmed
+R Ink
+S All is Fair
+S How much Is Enough
+S No One Has To Cry
+S Crucified
+S Falling In Love
+S Shut It Out
+S Still Around
+S All The Best Things
+S Yesterday, Today
+S One Jungle
+S Climb The Hill
+S Make No Plans
+R Elemental
+S Two Different Views
+S Going Without
+S Is That It?
+S Happy Landings
+S Silent House
+S Fatal Shore
+S Ocean Blue
+S You Know Me
+S We Once Held Hands
+S Life's What's Killing Me
+A Harvin Garvel
+R Harvin Garvel I
+S Body
+S What You Said
+S All Rights Reserved
+S High Purity
+S Lies
+S Get Real
+S Gradma Cries
+S First Feel
+S Somethings wrong
+S Shoes
+S Spice Rack
+S Dark Feel
+S Tug of War
+S Ant Song
+R Harvin Garvel II
+S We Ain't Through
+S Trash and Spend
+S Kick
+S The Garden
+S One & Only
+S Squid Frenzy
+S Soul In Soul
+S The Desert
+S He Grew Up
+S Talk
+S Image
+S Tomorrow
+S R70
+R Full Grown Dog
+S I Am
+S Say
+S Is This Real
+S What She Said
+S Mirror Lies
+S Girls
+S Your Will
+S Slow Motion Sunday
+S Simple Life
+S The Road Song
+S The Same Way
+S Stop Tryin
+R Persia
+S Exonic
+S Drift
+S Cruise
+S MugWump
+S Smear
+S Everything
+S Keep
+S Circle
+R Sensative Beak
+S Whatcha Gotta Do
+S Somewhere In This World
+S Awaken
+S Just A Dog
+S I Can Dance
+S Tomorrow
+S Love Who?
+S Is There Something
+S I Like It
+S Easy Chair
+S As We Are One
+S Far Away
+S Leaving Science
+S What A Life
+A Komeda
+R Plan 714 Till
+S Fuego De La Vida 
+S Herbamore 
+S Som I Fjol 
+S En Spricka I Taket
+R Genius Of
+S More Is More 
+S Fire 
+S Rocket Plane (Music On The Moon) 
+S Boogie Woogie/Rock 'N' Roll 
+S Disko 
+S Top Star 
+S Light O' My Life 
+S If 
+S Frolic 
+S In Orbit 
+S Arbogast 
+S New New No
+R What Makes It Go
+S Binario 
+S It's Alright, Baby 
+S Curious 
+S Cul de Sac 
+S Living Things 
+S Flabbergast 
+S Campfire 
+S Happyment 
+S Our Hospitality 
+S Focus 
+S A Simple Formality 
+A Steve Miller Band
+R Circle Of Love
+S Heart Like A Wheel
+S Get On Home
+S Baby Wanna Dance
+S Circle Of Love
+S Macho City
+R Fly Like An Eagle
+S Space Intro
+S Fly Like An Eagle
+S Wild Mountain Honey
+S Serenade
+S Dance, Dance, Dance
+S Mercury Blues
+S Take the Money and Run
+S Rockin' Me
+S You Send Me
+S Blue Odyssey
+S Sweet Maree
+S The Window
+R Book Of Dreams
+S Threshold
+S Jet Airliner
+S Winter Time
+S Swingtown
+S True Fine Love
+S Wish Upon A Star
+S Jungle Love
+S Electrolux Imbroglio
+S Sacrifice
+S The Stake
+S My Own Space
+S Babes In The Wood
+R Joker
+S Sugar, Babe
+S Mary Lou
+S Shu Ba Da Du Ma
+S Your Cash Ain't Nothin' But Trash
+S The Joker
+S The Lovin' Cup
+S Come On In My Kitchen
+S Evil
+S Something To Believe In
diff --git a/apps/toys/HelloWorld/build.xml b/apps/toys/HelloWorld/build.xml
new file mode 100644
index 00000000000..a4f9c9ea3c8
--- /dev/null
+++ b/apps/toys/HelloWorld/build.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See commented blocks below for -->
+<!-- some examples of how to customize the build. -->
+<!-- (If you delete it and reopen the project it will be recreated.) -->
+<!-- By default, only the Clean and Build commands use this build script. -->
+<!-- Commands such as Run, Debug, and Test only use this build script if -->
+<!-- the Compile on Save feature is turned off for the project. -->
+<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
+<!-- in the project's Project Properties dialog box.-->
+<project name="HelloWorld" default="default" basedir=".">
+    <description>Builds, tests, and runs the project HelloWorld.</description>
+    <import file="nbproject/build-impl.xml"/>
+    <!--
+
+    There exist several targets which are by default empty and which can be 
+    used for execution of your tasks. These targets are usually executed 
+    before and after some main targets. They are: 
+
+      -pre-init:                 called before initialization of project properties
+      -post-init:                called after initialization of project properties
+      -pre-compile:              called before javac compilation
+      -post-compile:             called after javac compilation
+      -pre-compile-single:       called before javac compilation of single file
+      -post-compile-single:      called after javac compilation of single file
+      -pre-compile-test:         called before javac compilation of JUnit tests
+      -post-compile-test:        called after javac compilation of JUnit tests
+      -pre-compile-test-single:  called before javac compilation of single JUnit test
+      -post-compile-test-single: called after javac compilation of single JUunit test
+      -pre-jar:                  called before JAR building
+      -post-jar:                 called after JAR building
+      -post-clean:               called after cleaning build products
+
+    (Targets beginning with '-' are not intended to be called on their own.)
+
+    Example of inserting an obfuscator after compilation could look like this:
+
+        <target name="-post-compile">
+            <obfuscate>
+                <fileset dir="${build.classes.dir}"/>
+            </obfuscate>
+        </target>
+
+    For list of available properties check the imported 
+    nbproject/build-impl.xml file. 
+
+
+    Another way to customize the build is by overriding existing main targets.
+    The targets of interest are: 
+
+      -init-macrodef-javac:     defines macro for javac compilation
+      -init-macrodef-junit:     defines macro for junit execution
+      -init-macrodef-debug:     defines macro for class debugging
+      -init-macrodef-java:      defines macro for class execution
+      -do-jar-with-manifest:    JAR building (if you are using a manifest)
+      -do-jar-without-manifest: JAR building (if you are not using a manifest)
+      run:                      execution of project 
+      -javadoc-build:           Javadoc generation
+      test-report:              JUnit report generation
+
+    An example of overriding the target for project execution could look like this:
+
+        <target name="run" depends="HelloWorld-impl.jar">
+            <exec dir="bin" executable="launcher.exe">
+                <arg file="${dist.jar}"/>
+            </exec>
+        </target>
+
+    Notice that the overridden target depends on the jar target and not only on 
+    the compile target as the regular run target does. Again, for a list of available 
+    properties which you can use, check the target you are overriding in the
+    nbproject/build-impl.xml file. 
+
+    -->
+</project>
diff --git a/apps/toys/HelloWorld/manifest.mf b/apps/toys/HelloWorld/manifest.mf
new file mode 100644
index 00000000000..328e8e5bc3b
--- /dev/null
+++ b/apps/toys/HelloWorld/manifest.mf
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+X-COMMENT: Main-Class will be added automatically by build
+
diff --git a/apps/toys/HelloWorld/nbproject/build-impl.xml b/apps/toys/HelloWorld/nbproject/build-impl.xml
new file mode 100644
index 00000000000..4342645420e
--- /dev/null
+++ b/apps/toys/HelloWorld/nbproject/build-impl.xml
@@ -0,0 +1,1044 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+*** GENERATED FROM project.xml - DO NOT EDIT  ***
+***         EDIT ../build.xml INSTEAD         ***
+
+For the purpose of easier reading the script
+is divided into following sections:
+
+  - initialization
+  - compilation
+  - jar
+  - execution
+  - debugging
+  - javadoc
+  - junit compilation
+  - junit execution
+  - junit debugging
+  - applet
+  - cleanup
+
+        -->
+<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="HelloWorld-impl">
+    <fail message="Please build using Ant 1.7.0 or higher.">
+        <condition>
+            <not>
+                <antversion atleast="1.7.0"/>
+            </not>
+        </condition>
+    </fail>
+    <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
+    <!-- 
+                ======================
+                INITIALIZATION SECTION 
+                ======================
+            -->
+    <target name="-pre-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="-pre-init" name="-init-private">
+        <property file="nbproject/private/config.properties"/>
+        <property file="nbproject/private/configs/${config}.properties"/>
+        <property file="nbproject/private/private.properties"/>
+    </target>
+    <target depends="-pre-init,-init-private" name="-init-user">
+        <property file="${user.properties.file}"/>
+        <!-- The two properties below are usually overridden -->
+        <!-- by the active platform. Just a fallback. -->
+        <property name="default.javac.source" value="1.4"/>
+        <property name="default.javac.target" value="1.4"/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user" name="-init-project">
+        <property file="nbproject/configs/${config}.properties"/>
+        <property file="nbproject/project.properties"/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
+        <available file="${manifest.file}" property="manifest.available"/>
+        <condition property="splashscreen.available">
+            <and>
+                <not>
+                    <equals arg1="${application.splash}" arg2="" trim="true"/>
+                </not>
+                <available file="${application.splash}"/>
+            </and>
+        </condition>
+        <condition property="main.class.available">
+            <and>
+                <isset property="main.class"/>
+                <not>
+                    <equals arg1="${main.class}" arg2="" trim="true"/>
+                </not>
+            </and>
+        </condition>
+        <condition property="manifest.available+main.class">
+            <and>
+                <isset property="manifest.available"/>
+                <isset property="main.class.available"/>
+            </and>
+        </condition>
+        <condition property="do.archive">
+            <not>
+                <istrue value="${jar.archive.disabled}"/>
+            </not>
+        </condition>
+        <condition property="do.mkdist">
+            <and>
+                <isset property="do.archive"/>
+                <isset property="libs.CopyLibs.classpath"/>
+                <not>
+                    <istrue value="${mkdist.disabled}"/>
+                </not>
+            </and>
+        </condition>
+        <condition property="manifest.available+main.class+mkdist.available">
+            <and>
+                <istrue value="${manifest.available+main.class}"/>
+                <isset property="do.mkdist"/>
+            </and>
+        </condition>
+        <condition property="do.archive+manifest.available">
+            <and>
+                <isset property="manifest.available"/>
+                <istrue value="${do.archive}"/>
+            </and>
+        </condition>
+        <condition property="do.archive+main.class.available">
+            <and>
+                <isset property="main.class.available"/>
+                <istrue value="${do.archive}"/>
+            </and>
+        </condition>
+        <condition property="do.archive+splashscreen.available">
+            <and>
+                <isset property="splashscreen.available"/>
+                <istrue value="${do.archive}"/>
+            </and>
+        </condition>
+        <condition property="do.archive+manifest.available+main.class">
+            <and>
+                <istrue value="${manifest.available+main.class}"/>
+                <istrue value="${do.archive}"/>
+            </and>
+        </condition>
+        <condition property="manifest.available-mkdist.available">
+            <or>
+                <istrue value="${manifest.available}"/>
+                <isset property="do.mkdist"/>
+            </or>
+        </condition>
+        <condition property="manifest.available+main.class-mkdist.available">
+            <or>
+                <istrue value="${manifest.available+main.class}"/>
+                <isset property="do.mkdist"/>
+            </or>
+        </condition>
+        <condition property="have.tests">
+            <or>
+                <available file="${test.src.dir}"/>
+            </or>
+        </condition>
+        <condition property="have.sources">
+            <or>
+                <available file="${src.dir}"/>
+            </or>
+        </condition>
+        <condition property="netbeans.home+have.tests">
+            <and>
+                <isset property="netbeans.home"/>
+                <isset property="have.tests"/>
+            </and>
+        </condition>
+        <condition property="no.javadoc.preview">
+            <and>
+                <isset property="javadoc.preview"/>
+                <isfalse value="${javadoc.preview}"/>
+            </and>
+        </condition>
+        <property name="run.jvmargs" value=""/>
+        <property name="javac.compilerargs" value=""/>
+        <property name="work.dir" value="${basedir}"/>
+        <condition property="no.deps">
+            <and>
+                <istrue value="${no.dependencies}"/>
+            </and>
+        </condition>
+        <property name="javac.debug" value="true"/>
+        <property name="javadoc.preview" value="true"/>
+        <property name="application.args" value=""/>
+        <property name="source.encoding" value="${file.encoding}"/>
+        <property name="runtime.encoding" value="${source.encoding}"/>
+        <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
+            <and>
+                <isset property="javadoc.encoding"/>
+                <not>
+                    <equals arg1="${javadoc.encoding}" arg2=""/>
+                </not>
+            </and>
+        </condition>
+        <property name="javadoc.encoding.used" value="${source.encoding}"/>
+        <property name="includes" value="**"/>
+        <property name="excludes" value=""/>
+        <property name="do.depend" value="false"/>
+        <condition property="do.depend.true">
+            <istrue value="${do.depend}"/>
+        </condition>
+        <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
+        <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
+            <length length="0" string="${endorsed.classpath}" when="greater"/>
+        </condition>
+        <condition else="false" property="jdkBug6558476">
+            <and>
+                <matches pattern="1\.[56]" string="${java.specification.version}"/>
+                <not>
+                    <os family="unix"/>
+                </not>
+            </and>
+        </condition>
+        <property name="javac.fork" value="${jdkBug6558476}"/>
+        <property name="jar.index" value="false"/>
+        <property name="jar.index.metainf" value="${jar.index}"/>
+        <property name="copylibs.rebase" value="true"/>
+        <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
+    </target>
+    <target name="-post-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
+        <fail unless="src.dir">Must set src.dir</fail>
+        <fail unless="test.src.dir">Must set test.src.dir</fail>
+        <fail unless="build.dir">Must set build.dir</fail>
+        <fail unless="dist.dir">Must set dist.dir</fail>
+        <fail unless="build.classes.dir">Must set build.classes.dir</fail>
+        <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
+        <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
+        <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
+        <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
+        <fail unless="dist.jar">Must set dist.jar</fail>
+    </target>
+    <target name="-init-macrodef-property">
+        <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute name="name"/>
+            <attribute name="value"/>
+            <sequential>
+                <property name="@{name}" value="${@{value}}"/>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
+        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}" name="classpath"/>
+            <attribute default="${javac.processorpath}" name="processorpath"/>
+            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="${javac.debug}" name="debug"/>
+            <attribute default="${empty.dir}" name="sourcepath"/>
+            <attribute default="${empty.dir}" name="gensrcdir"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property location="${build.dir}/empty" name="empty.dir"/>
+                <mkdir dir="${empty.dir}"/>
+                <mkdir dir="@{apgeneratedsrcdir}"/>
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+                    <src>
+                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
+                            <include name="*"/>
+                        </dirset>
+                    </src>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <compilerarg line="${javac.compilerargs}"/>
+                    <compilerarg value="-processorpath"/>
+                    <compilerarg path="@{processorpath}:${empty.dir}"/>
+                    <compilerarg line="${ap.processors.internal}"/>
+                    <compilerarg line="${annotation.processing.processor.options}"/>
+                    <compilerarg value="-s"/>
+                    <compilerarg path="@{apgeneratedsrcdir}"/>
+                    <compilerarg line="${ap.proc.none.internal}"/>
+                    <customize/>
+                </javac>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
+        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}" name="classpath"/>
+            <attribute default="${javac.processorpath}" name="processorpath"/>
+            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="${javac.debug}" name="debug"/>
+            <attribute default="${empty.dir}" name="sourcepath"/>
+            <attribute default="${empty.dir}" name="gensrcdir"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property location="${build.dir}/empty" name="empty.dir"/>
+                <mkdir dir="${empty.dir}"/>
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+                    <src>
+                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
+                            <include name="*"/>
+                        </dirset>
+                    </src>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <compilerarg line="${javac.compilerargs}"/>
+                    <customize/>
+                </javac>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
+        <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}" name="classpath"/>
+            <sequential>
+                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                </depend>
+            </sequential>
+        </macrodef>
+        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <sequential>
+                <fail unless="javac.includes">Must set javac.includes</fail>
+                <pathconvert pathsep="${line.separator}" property="javac.includes.binary">
+                    <path>
+                        <filelist dir="@{destdir}" files="${javac.includes}"/>
+                    </path>
+                    <globmapper from="*.java" to="*.class"/>
+                </pathconvert>
+                <tempfile deleteonexit="true" property="javac.includesfile.binary"/>
+                <echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/>
+                <delete>
+                    <files includesfile="${javac.includesfile.binary}"/>
+                </delete>
+                <delete>
+                    <fileset file="${javac.includesfile.binary}"/>
+                </delete>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-junit">
+        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <sequential>
+                <property name="junit.forkmode" value="perTest"/>
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
+                    <batchtest todir="${build.test.results.dir}">
+                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+                            <filename name="@{testincludes}"/>
+                        </fileset>
+                    </batchtest>
+                    <classpath>
+                        <path path="${run.test.classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="test-sys-prop."/>
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <formatter type="brief" usefile="false"/>
+                    <formatter type="xml"/>
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <jvmarg value="-ea"/>
+                    <jvmarg line="${run.jvmargs}"/>
+                </junit>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" name="profile-init"/>
+    <target name="-profile-pre-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target name="-profile-post-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target name="-profile-init-macrodef-profile">
+        <macrodef name="resolve">
+            <attribute name="name"/>
+            <attribute name="value"/>
+            <sequential>
+                <property name="@{name}" value="${env.@{value}}"/>
+            </sequential>
+        </macrodef>
+        <macrodef name="profile">
+            <attribute default="${main.class}" name="classname"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property environment="env"/>
+                <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
+                <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <jvmarg value="${profiler.info.jvmargs.agent}"/>
+                    <jvmarg line="${profiler.info.jvmargs}"/>
+                    <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
+                    <arg line="${application.args}"/>
+                    <classpath>
+                        <path path="${run.classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" name="-profile-init-check">
+        <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
+        <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
+    </target>
+    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
+        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${main.class}" name="name"/>
+            <attribute default="${debug.classpath}" name="classpath"/>
+            <attribute default="" name="stopclassname"/>
+            <sequential>
+                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                </nbjpdastart>
+            </sequential>
+        </macrodef>
+        <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${build.classes.dir}" name="dir"/>
+            <sequential>
+                <nbjpdareload>
+                    <fileset dir="@{dir}" includes="${fix.classes}">
+                        <include name="${fix.includes}*.class"/>
+                    </fileset>
+                </nbjpdareload>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-debug-args">
+        <property name="version-output" value="java version &quot;${ant.java.version}"/>
+        <condition property="have-jdk-older-than-1.4">
+            <or>
+                <contains string="${version-output}" substring="java version &quot;1.0"/>
+                <contains string="${version-output}" substring="java version &quot;1.1"/>
+                <contains string="${version-output}" substring="java version &quot;1.2"/>
+                <contains string="${version-output}" substring="java version &quot;1.3"/>
+            </or>
+        </condition>
+        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
+            <istrue value="${have-jdk-older-than-1.4}"/>
+        </condition>
+        <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
+            <os family="windows"/>
+        </condition>
+        <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
+            <isset property="debug.transport"/>
+        </condition>
+    </target>
+    <target depends="-init-debug-args" name="-init-macrodef-debug">
+        <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${main.class}" name="classname"/>
+            <attribute default="${debug.classpath}" name="classpath"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <java classname="@{classname}" dir="${work.dir}" fork="true">
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <jvmarg line="${debug-args-line}"/>
+                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
+                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
+                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
+                    <jvmarg line="${run.jvmargs}"/>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-java">
+        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${main.class}" name="classname"/>
+            <attribute default="${run.classpath}" name="classpath"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <java classname="@{classname}" dir="${work.dir}" fork="true">
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
+                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
+                    <jvmarg line="${run.jvmargs}"/>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-copylibs">
+        <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${manifest.file}" name="manifest"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
+                <pathconvert property="run.classpath.without.build.classes.dir">
+                    <path path="${run.classpath}"/>
+                    <map from="${build.classes.dir.resolved}" to=""/>
+                </pathconvert>
+                <pathconvert pathsep=" " property="jar.classpath">
+                    <path path="${run.classpath.without.build.classes.dir}"/>
+                    <chainedmapper>
+                        <flattenmapper/>
+                        <globmapper from="*" to="lib/*"/>
+                    </chainedmapper>
+                </pathconvert>
+                <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
+                <copylibs compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifest="@{manifest}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
+                    <fileset dir="${build.classes.dir}"/>
+                    <manifest>
+                        <attribute name="Class-Path" value="${jar.classpath}"/>
+                        <customize/>
+                    </manifest>
+                </copylibs>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-presetdef-jar">
+        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
+                <j2seproject1:fileset dir="${build.classes.dir}"/>
+            </jar>
+        </presetdef>
+    </target>
+    <target name="-init-ap-cmdline-properties">
+        <property name="annotation.processing.enabled" value="true"/>
+        <property name="annotation.processing.processors.list" value=""/>
+        <property name="annotation.processing.processor.options" value=""/>
+        <property name="annotation.processing.run.all.processors" value="true"/>
+        <property name="javac.processorpath" value="${javac.classpath}"/>
+        <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
+        <condition property="ap.supported.internal" value="true">
+            <not>
+                <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
+            </not>
+        </condition>
+    </target>
+    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
+        <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
+            <isfalse value="${annotation.processing.run.all.processors}"/>
+        </condition>
+        <condition else="" property="ap.proc.none.internal" value="-proc:none">
+            <isfalse value="${annotation.processing.enabled}"/>
+        </condition>
+    </target>
+    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
+        <property name="ap.cmd.line.internal" value=""/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
+    <!--
+                ===================
+                COMPILATION SECTION
+                ===================
+            -->
+    <target name="-deps-jar-init" unless="built-jar.properties">
+        <property location="${build.dir}/built-jar.properties" name="built-jar.properties"/>
+        <delete file="${built-jar.properties}" quiet="true"/>
+    </target>
+    <target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
+        <echo level="warn" message="Cycle detected: HelloWorld was already built"/>
+    </target>
+    <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
+        <mkdir dir="${build.dir}"/>
+        <touch file="${built-jar.properties}" verbose="false"/>
+        <property file="${built-jar.properties}" prefix="already.built.jar."/>
+        <antcall target="-warn-already-built-jar"/>
+        <propertyfile file="${built-jar.properties}">
+            <entry key="${basedir}" value=""/>
+        </propertyfile>
+    </target>
+    <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
+    <target depends="init" name="-check-automatic-build">
+        <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
+    </target>
+    <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
+        <antcall target="clean"/>
+    </target>
+    <target depends="init,deps-jar" name="-pre-pre-compile">
+        <mkdir dir="${build.classes.dir}"/>
+    </target>
+    <target name="-pre-compile">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target if="do.depend.true" name="-compile-depend">
+        <pathconvert property="build.generated.subdirs">
+            <dirset dir="${build.generated.sources.dir}" erroronmissingdir="false">
+                <include name="*"/>
+            </dirset>
+        </pathconvert>
+        <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>
+    </target>
+    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
+        <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
+        <copy todir="${build.classes.dir}">
+            <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target if="has.persistence.xml" name="-copy-persistence-xml">
+        <mkdir dir="${build.classes.dir}/META-INF"/>
+        <copy todir="${build.classes.dir}/META-INF">
+            <fileset dir="${meta.inf.dir}" includes="persistence.xml"/>
+        </copy>
+    </target>
+    <target name="-post-compile">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
+    <target name="-pre-compile-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
+        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+        <j2seproject3:force-recompile/>
+        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>
+    </target>
+    <target name="-post-compile-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
+    <!--
+                ====================
+                JAR BUILDING SECTION
+                ====================
+            -->
+    <target depends="init" name="-pre-pre-jar">
+        <dirname file="${dist.jar}" property="dist.jar.dir"/>
+        <mkdir dir="${dist.jar.dir}"/>
+    </target>
+    <target name="-pre-jar">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available">
+        <j2seproject1:jar/>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class-mkdist.available">
+        <j2seproject1:jar manifest="${manifest.file}"/>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
+        <j2seproject1:jar manifest="${manifest.file}">
+            <j2seproject1:manifest>
+                <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
+            </j2seproject1:manifest>
+        </j2seproject1:jar>
+        <echo level="info">To run this application from the command line without Ant, try:</echo>
+        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
+        <property location="${dist.jar}" name="dist.jar.resolved"/>
+        <pathconvert property="run.classpath.with.dist.jar">
+            <path path="${run.classpath}"/>
+            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
+        </pathconvert>
+        <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
+    </target>
+    <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available">
+        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
+        <touch file="${tmp.manifest.file}" verbose="false"/>
+    </target>
+    <target depends="init" if="do.archive+manifest.available" name="-do-jar-with-libraries-copy-manifest">
+        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
+        <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
+    </target>
+    <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+main.class.available" name="-do-jar-with-libraries-set-main">
+        <manifest file="${tmp.manifest.file}" mode="update">
+            <attribute name="Main-Class" value="${main.class}"/>
+        </manifest>
+    </target>
+    <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-with-libraries-set-splashscreen">
+        <basename file="${application.splash}" property="splashscreen.basename"/>
+        <mkdir dir="${build.classes.dir}/META-INF"/>
+        <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
+        <manifest file="${tmp.manifest.file}" mode="update">
+            <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
+        </manifest>
+    </target>
+    <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen" if="do.mkdist" name="-do-jar-with-libraries-pack">
+        <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
+        <echo level="info">To run this application from the command line without Ant, try:</echo>
+        <property location="${dist.jar}" name="dist.jar.resolved"/>
+        <echo level="info">java -jar "${dist.jar.resolved}"</echo>
+    </target>
+    <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">
+        <delete>
+            <fileset file="${tmp.manifest.file}"/>
+        </delete>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen,-do-jar-with-libraries-pack,-do-jar-with-libraries-delete-manifest" name="-do-jar-with-libraries"/>
+    <target name="-post-jar">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
+    <!--
+                =================
+                EXECUTION SECTION
+                =================
+            -->
+    <target depends="init,compile" description="Run a main class." name="run">
+        <j2seproject1:java>
+            <customize>
+                <arg line="${application.args}"/>
+            </customize>
+        </j2seproject1:java>
+    </target>
+    <target name="-do-not-recompile">
+        <property name="javac.includes.binary" value=""/>
+    </target>
+    <target depends="init,compile-single" name="run-single">
+        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+        <j2seproject1:java classname="${run.class}"/>
+    </target>
+    <target depends="init,compile-test-single" name="run-test-with-main">
+        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+        <j2seproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
+    </target>
+    <!--
+                =================
+                DEBUGGING SECTION
+                =================
+            -->
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger">
+        <j2seproject1:nbjpdastart name="${debug.class}"/>
+    </target>
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
+        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
+    </target>
+    <target depends="init,compile" name="-debug-start-debuggee">
+        <j2seproject3:debug>
+            <customize>
+                <arg line="${application.args}"/>
+            </customize>
+        </j2seproject3:debug>
+    </target>
+    <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto">
+        <j2seproject1:nbjpdastart stopclassname="${main.class}"/>
+    </target>
+    <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/>
+    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
+        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
+        <j2seproject3:debug classname="${debug.class}"/>
+    </target>
+    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
+    <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
+        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
+        <j2seproject3:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
+    </target>
+    <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
+    <target depends="init" name="-pre-debug-fix">
+        <fail unless="fix.includes">Must set fix.includes</fail>
+        <property name="javac.includes" value="${fix.includes}.java"/>
+    </target>
+    <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
+        <j2seproject1:nbjpdareload/>
+    </target>
+    <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
+    <!--
+                =================
+                PROFILING SECTION
+                =================
+            -->
+    <target depends="profile-init,compile" description="Profile a project in the IDE." if="netbeans.home" name="profile">
+        <nbprofiledirect>
+            <classpath>
+                <path path="${run.classpath}"/>
+            </classpath>
+        </nbprofiledirect>
+        <profile/>
+    </target>
+    <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="netbeans.home" name="profile-single">
+        <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail>
+        <nbprofiledirect>
+            <classpath>
+                <path path="${run.classpath}"/>
+            </classpath>
+        </nbprofiledirect>
+        <profile classname="${profile.class}"/>
+    </target>
+    <!--
+                =========================
+                APPLET PROFILING  SECTION
+                =========================
+            -->
+    <target depends="profile-init,compile-single" if="netbeans.home" name="profile-applet">
+        <nbprofiledirect>
+            <classpath>
+                <path path="${run.classpath}"/>
+            </classpath>
+        </nbprofiledirect>
+        <profile classname="sun.applet.AppletViewer">
+            <customize>
+                <arg value="${applet.url}"/>
+            </customize>
+        </profile>
+    </target>
+    <!--
+                =========================
+                TESTS PROFILING  SECTION
+                =========================
+            -->
+    <target depends="profile-init,compile-test-single" if="netbeans.home" name="profile-test-single">
+        <nbprofiledirect>
+            <classpath>
+                <path path="${run.test.classpath}"/>
+            </classpath>
+        </nbprofiledirect>
+        <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">
+            <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
+            <jvmarg value="${profiler.info.jvmargs.agent}"/>
+            <jvmarg line="${profiler.info.jvmargs}"/>
+            <test name="${profile.class}"/>
+            <classpath>
+                <path path="${run.test.classpath}"/>
+            </classpath>
+            <syspropertyset>
+                <propertyref prefix="test-sys-prop."/>
+                <mapper from="test-sys-prop.*" to="*" type="glob"/>
+            </syspropertyset>
+            <formatter type="brief" usefile="false"/>
+            <formatter type="xml"/>
+        </junit>
+    </target>
+    <!--
+                ===============
+                JAVADOC SECTION
+                ===============
+            -->
+    <target depends="init" if="have.sources" name="-javadoc-build">
+        <mkdir dir="${dist.javadoc.dir}"/>
+        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
+            <classpath>
+                <path path="${javac.classpath}"/>
+            </classpath>
+            <fileset dir="${src.dir}" excludes="*.java,${excludes}" includes="${includes}">
+                <filename name="**/*.java"/>
+            </fileset>
+            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
+                <include name="**/*.java"/>
+                <exclude name="*.java"/>
+            </fileset>
+        </javadoc>
+        <copy todir="${dist.javadoc.dir}">
+            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/doc-files/**"/>
+            </fileset>
+            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
+                <include name="**/doc-files/**"/>
+            </fileset>
+        </copy>
+    </target>
+    <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
+        <nbbrowse file="${dist.javadoc.dir}/index.html"/>
+    </target>
+    <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
+    <!--
+                =========================
+                JUNIT COMPILATION SECTION
+                =========================
+            -->
+    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
+        <mkdir dir="${build.test.classes.dir}"/>
+    </target>
+    <target name="-pre-compile-test">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target if="do.depend.true" name="-compile-test-depend">
+        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
+    </target>
+    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
+        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.src.dir}"/>
+        <copy todir="${build.test.classes.dir}">
+            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target name="-post-compile-test">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
+    <target name="-pre-compile-test-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
+        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+        <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
+        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
+        <copy todir="${build.test.classes.dir}">
+            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target name="-post-compile-test-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
+    <!--
+                =======================
+                JUNIT EXECUTION SECTION
+                =======================
+            -->
+    <target depends="init" if="have.tests" name="-pre-test-run">
+        <mkdir dir="${build.test.results.dir}"/>
+    </target>
+    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
+        <j2seproject3:junit testincludes="**/*Test.java"/>
+    </target>
+    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
+        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
+    </target>
+    <target depends="init" if="have.tests" name="test-report"/>
+    <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
+    <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
+    <target depends="init" if="have.tests" name="-pre-test-run-single">
+        <mkdir dir="${build.test.results.dir}"/>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
+        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
+        <j2seproject3:junit excludes="" includes="${test.includes}"/>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
+        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
+    <!--
+                =======================
+                JUNIT DEBUGGING SECTION
+                =======================
+            -->
+    <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
+        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
+        <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
+        <delete file="${test.report.file}"/>
+        <mkdir dir="${build.test.results.dir}"/>
+        <j2seproject3:debug classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}">
+            <customize>
+                <syspropertyset>
+                    <propertyref prefix="test-sys-prop."/>
+                    <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                </syspropertyset>
+                <arg value="${test.class}"/>
+                <arg value="showoutput=true"/>
+                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
+                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
+            </customize>
+        </j2seproject3:debug>
+    </target>
+    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
+        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
+    </target>
+    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
+    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
+        <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
+    </target>
+    <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
+    <!--
+                =========================
+                APPLET EXECUTION SECTION
+                =========================
+            -->
+    <target depends="init,compile-single" name="run-applet">
+        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
+        <j2seproject1:java classname="sun.applet.AppletViewer">
+            <customize>
+                <arg value="${applet.url}"/>
+            </customize>
+        </j2seproject1:java>
+    </target>
+    <!--
+                =========================
+                APPLET DEBUGGING  SECTION
+                =========================
+            -->
+    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
+        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
+        <j2seproject3:debug classname="sun.applet.AppletViewer">
+            <customize>
+                <arg value="${applet.url}"/>
+            </customize>
+        </j2seproject3:debug>
+    </target>
+    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
+    <!--
+                ===============
+                CLEANUP SECTION
+                ===============
+            -->
+    <target name="-deps-clean-init" unless="built-clean.properties">
+        <property location="${build.dir}/built-clean.properties" name="built-clean.properties"/>
+        <delete file="${built-clean.properties}" quiet="true"/>
+    </target>
+    <target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
+        <echo level="warn" message="Cycle detected: HelloWorld was already built"/>
+    </target>
+    <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
+        <mkdir dir="${build.dir}"/>
+        <touch file="${built-clean.properties}" verbose="false"/>
+        <property file="${built-clean.properties}" prefix="already.built.clean."/>
+        <antcall target="-warn-already-built-clean"/>
+        <propertyfile file="${built-clean.properties}">
+            <entry key="${basedir}" value=""/>
+        </propertyfile>
+    </target>
+    <target depends="init" name="-do-clean">
+        <delete dir="${build.dir}"/>
+        <delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/>
+    </target>
+    <target name="-post-clean">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
+    <target name="-check-call-dep">
+        <property file="${call.built.properties}" prefix="already.built."/>
+        <condition property="should.call.dep">
+            <not>
+                <isset property="already.built.${call.subproject}"/>
+            </not>
+        </condition>
+    </target>
+    <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
+        <ant antfile="${call.script}" inheritall="false" target="${call.target}">
+            <propertyset>
+                <propertyref prefix="transfer."/>
+                <mapper from="transfer.*" to="*" type="glob"/>
+            </propertyset>
+        </ant>
+    </target>
+</project>
diff --git a/apps/toys/HelloWorld/nbproject/genfiles.properties b/apps/toys/HelloWorld/nbproject/genfiles.properties
new file mode 100644
index 00000000000..c6054d167e7
--- /dev/null
+++ b/apps/toys/HelloWorld/nbproject/genfiles.properties
@@ -0,0 +1,8 @@
+build.xml.data.CRC32=f91f021f
+build.xml.script.CRC32=462e7dcb
+build.xml.stylesheet.CRC32=28e38971@1.38.2.45
+# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
+# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
+nbproject/build-impl.xml.data.CRC32=f91f021f
+nbproject/build-impl.xml.script.CRC32=36428af8
+nbproject/build-impl.xml.stylesheet.CRC32=c12040a1@1.47.1.46
diff --git a/apps/toys/HelloWorld/nbproject/project.properties b/apps/toys/HelloWorld/nbproject/project.properties
new file mode 100644
index 00000000000..b6116d271b3
--- /dev/null
+++ b/apps/toys/HelloWorld/nbproject/project.properties
@@ -0,0 +1,88 @@
+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=false
+annotation.processing.processors.list=
+annotation.processing.run.all.processors=true
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+application.title=HelloWorld
+application.vendor=kcr
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+# Uncomment to specify the preferred debugger connection transport:
+#debug.transport=dt_socket
+debug.classpath=\
+    ${run.classpath}
+debug.test.classpath=\
+    ${run.test.classpath}
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.jar=${dist.dir}/HelloWorld.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+endorsed.classpath=
+excludes=
+includes=**
+jar.archive.disabled=${jnlp.enabled}
+jar.compress=false
+jar.index=${jnlp.enabled}
+javac.classpath=
+# Space-separated list of extra javac options
+compile.patch=@${basedir}/../../../build/compile.args
+javac.compilerargs=${compile.patch}
+javac.deprecation=false
+javac.processorpath=\
+    ${javac.classpath}
+javac.source=1.9
+javac.target=1.9
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}:\
+    ${libs.junit.classpath}:\
+    ${libs.junit_4.classpath}
+javac.test.processorpath=\
+    ${javac.test.classpath}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+jnlp.codebase.type=no.codebase
+jnlp.descriptor=application
+jnlp.enabled=false
+jnlp.mixed.code=default
+jnlp.offline-allowed=false
+jnlp.signed=false
+jnlp.signing=
+jnlp.signing.alias=
+jnlp.signing.keystore=
+main.class=helloworld.HelloJFXPanel
+manifest.file=manifest.mf
+meta.inf.dir=${src.dir}/META-INF
+mkdist.disabled=false
+platform.active=JDK_1.9
+run.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+# Space-separated list of JVM arguments used when running the project
+# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
+# or test-sys-prop.name=value to set system properties for unit tests):
+run.patch=@${basedir}/../../../build/run.args
+run.jvmargs=${run.patch} -ea
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
+source.encoding=UTF-8
+src.dir=src
+test.src.dir=test
diff --git a/apps/toys/HelloWorld/nbproject/project.xml b/apps/toys/HelloWorld/nbproject/project.xml
new file mode 100644
index 00000000000..e2d720bae40
--- /dev/null
+++ b/apps/toys/HelloWorld/nbproject/project.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.java.j2seproject</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
+            <name>HelloWorld</name>
+            <source-roots>
+                <root id="src.dir"/>
+            </source-roots>
+            <test-roots>
+                <root id="test.src.dir"/>
+            </test-roots>
+        </data>
+        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1"/>
+    </configuration>
+</project>
diff --git a/apps/toys/HelloWorld/src/helloworld/HelloJFXPanel.java b/apps/toys/HelloWorld/src/helloworld/HelloJFXPanel.java
new file mode 100644
index 00000000000..9f5b04ca348
--- /dev/null
+++ b/apps/toys/HelloWorld/src/helloworld/HelloJFXPanel.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+
+package helloworld;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javafx.animation.KeyFrame;
+import javafx.animation.KeyValue;
+import javafx.animation.Timeline;
+import javafx.application.Platform;
+import javafx.embed.swing.JFXPanel;
+import javafx.scene.Group;
+import javafx.scene.Scene;
+import javafx.scene.paint.Color;
+import javafx.scene.shape.Rectangle;
+import javafx.util.Duration;
+
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+
+/**
+ * @author kcr
+ */
+public class HelloJFXPanel {
+
+    public HelloJFXPanel() {
+        final JFrame frame = new JFrame("Hello JFXPanel");
+        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        frame.setLayout(new BorderLayout());
+
+        JPanel swingPanel = new JPanel();
+        swingPanel.setLayout(new FlowLayout());
+        frame.getContentPane().add(swingPanel, BorderLayout.NORTH);
+
+        JButton swingButton = new JButton("A Swing Button (press to close the window)");
+        swingButton.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                frame.dispose();
+            }
+        });
+
+        swingPanel.add(swingButton);
+
+        // Create javafx panel
+        final JFXPanel fxPanel = new JFXPanel();
+        fxPanel.setPreferredSize(new Dimension(550,400));
+        frame.getContentPane().add(fxPanel, BorderLayout.CENTER);
+
+        // create JavaFX scene
+        createScene(fxPanel);
+
+        // show frame
+        frame.pack();
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
+    }
+
+    private void createScene(final JFXPanel fxPanel) {
+        System.err.println("createScene: calling Platform.runLater");
+        Platform.runLater(() -> {
+            System.err.println("Platform.runLater :: run");
+            Group root = new Group();
+            final Scene scene = new Scene(root);
+            scene.setFill(Color.LIGHTGREEN);
+
+            Rectangle rect = new Rectangle();
+            rect.setX(25);
+            rect.setY(40);
+            rect.setWidth(100);
+            rect.setHeight(50);
+            rect.setFill(Color.RED);
+
+            root.getChildren().add(rect);
+
+            final Timeline timeline = new Timeline();
+            timeline.setCycleCount(Timeline.INDEFINITE);
+            timeline.setAutoReverse(true);
+            final KeyValue kv = new KeyValue(rect.xProperty(), 200);
+            final KeyFrame kf = new KeyFrame(Duration.millis(500), kv);
+            timeline.getKeyFrames().add(kf);
+            timeline.play();
+
+            // add scene to panel
+            fxPanel.setScene(scene);
+        });
+        System.err.println("PlatformImpl.runLater returns");
+    }
+
+    public static void main(String[] args) {
+        SwingUtilities.invokeLater(() -> {
+            new HelloJFXPanel();
+        });
+    }
+}
diff --git a/apps/toys/HelloWorld/src/helloworld/HelloJFXPanel2.java b/apps/toys/HelloWorld/src/helloworld/HelloJFXPanel2.java
new file mode 100644
index 00000000000..b7199100c96
--- /dev/null
+++ b/apps/toys/HelloWorld/src/helloworld/HelloJFXPanel2.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+
+package helloworld;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javafx.application.Platform;
+import javafx.embed.swing.JFXPanel;
+import javafx.scene.Scene;
+import javafx.scene.control.Button;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.Tooltip;
+import javafx.scene.layout.VBox;
+
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+
+/**
+ * @author kcr
+ */
+public class HelloJFXPanel2 {
+
+    public HelloJFXPanel2() {
+        final JFrame frame = new JFrame("Hello JFXPanel");
+        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        frame.setLayout(new BorderLayout());
+
+        JPanel swingPanel = new JPanel();
+        swingPanel.setLayout(new FlowLayout());
+        frame.getContentPane().add(swingPanel, BorderLayout.NORTH);
+
+        JButton swingButton = new JButton("A Swing Button (press to close the window)");
+        swingButton.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                frame.dispose();
+            }
+        });
+
+        swingPanel.add(swingButton);
+
+        // Create javafx panel
+        final JFXPanel fxPanel = new JFXPanel();
+        fxPanel.setPreferredSize(new Dimension(550,400));
+        frame.getContentPane().add(fxPanel, BorderLayout.CENTER);
+
+        // create JavaFX scene
+        createScene(fxPanel);
+
+        // show frame
+        frame.pack();
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
+    }
+
+    private void createScene(final JFXPanel fxPanel) {
+        System.err.println("createScene: calling Platform.runLater");
+        Platform.runLater(() -> {
+            System.err.println("Platform.runLater :: run");
+            VBox root = new VBox(10);
+            final Scene scene = new Scene(root);
+
+            Button button = new Button("Click me");
+            button.setTooltip(new Tooltip("button tooltip"));
+
+            ComboBox<String> comboBox = new ComboBox<String>();
+            comboBox.getItems().add("Item 1");
+            comboBox.getItems().add("Item 2");
+            comboBox.getItems().add("Item 3");
+            comboBox.setPromptText("Choose One");
+            comboBox.setTooltip(new Tooltip("combobox tooltip"));
+
+            root.getChildren().addAll(button, comboBox);
+
+            // add scene to panel
+            fxPanel.setScene(scene);
+        });
+        System.err.println("PlatformImpl.runLater returns");
+    }
+
+    public static void main(String[] args) {
+        SwingUtilities.invokeLater(() -> {
+            new HelloJFXPanel2();
+        });
+    }
+}
diff --git a/apps/toys/build.xml b/apps/toys/build.xml
index e7fd84bcd4d..f96f7f35642 100644
--- a/apps/toys/build.xml
+++ b/apps/toys/build.xml
@@ -7,6 +7,8 @@
           -->
         <ant dir="ColorCube" target="jar" inheritAll="true"/>
         <ant dir="DragDrop" target="jar" inheritAll="true"/>
+        <ant dir="HelloWorld" target="jar" inheritAll="true"/>
+        <ant dir="EmbeddedSwing" target="jar" inheritAll="true"/>
         <ant dir="HelloFXCanvas" target="jar" inheritAll="true"/>
     </target>
 
@@ -24,6 +26,8 @@
         <ant dir="LayoutDemo" target="clean" inheritAll="true"/>
         <ant dir="PickTest3D" target="clean" inheritAll="true"/>
         <ant dir="DragDrop" target="clean" inheritAll="true"/>
+        <ant dir="HelloWorld" target="clean" inheritAll="true"/>
+        <ant dir="EmbeddedSwing" target="clean" inheritAll="true"/>
         <ant dir="HelloFXCanvas" target="clean" inheritAll="true"/>
     </target>
 

From e81b676629f281e526f2e37af2b5a82b6c28bc6e Mon Sep 17 00:00:00 2001
From: Jay Bhaskar <jbhaskar@openjdk.org>
Date: Thu, 19 Sep 2024 00:55:53 +0000
Subject: [PATCH 42/75] 8339515: [TestBug] Convert web tests to JUnit 5

Reviewed-by: mhanl, arapte
---
 .../test/com/sun/webkit/SharedBufferTest.java |  26 +--
 .../SimpleSharedBufferInputStreamTest.java    |  30 +--
 .../sun/webkit/network/CookieManagerTest.java |  54 ++---
 .../com/sun/webkit/network/CookieTest.java    |  54 ++---
 .../sun/webkit/network/DateParserTest.java    |  11 +-
 .../webkit/network/PublicSuffixesTest.java    |   8 +-
 .../test/com/sun/webkit/network/UtilTest.java |   6 +-
 .../network/data/DataURLConnectionTest.java   |  24 +-
 .../webkit/text/TextBreakIteratorTest.java    |  13 +-
 .../test/javafx/scene/web/BindingTest.java    |  60 ++---
 .../java/test/javafx/scene/web/CSSTest.java   |  30 +--
 .../test/javafx/scene/web/CallbackTest.java   |  20 +-
 .../test/javafx/scene/web/CanvasTest.java     | 111 +++++-----
 .../javafx/scene/web/CheckFxThreadTest.java   |   4 +-
 .../java/test/javafx/scene/web/DOMTest.java   | 185 ++++++++--------
 .../test/javafx/scene/web/DebuggerTest.java   |  10 +-
 .../javafx/scene/web/DirectoryLockTest.java   |  20 +-
 .../scene/web/EventListenerLeakTest.java      | 106 +++++----
 .../test/javafx/scene/web/FileReaderTest.java |  85 ++++---
 .../java/test/javafx/scene/web/FileTest.java  |  32 +--
 .../javafx/scene/web/FormControlsTest.java    | 102 ++++-----
 .../javafx/scene/web/HTMLEditingTest.java     |  23 +-
 .../javafx/scene/web/HistoryStateTest.java    |  71 +++---
 .../test/javafx/scene/web/HistoryTest.java    |  46 ++--
 .../scene/web/IrresponsiveScriptTest.java     |   6 +-
 .../scene/web/JavaScriptBridgeTest.java       |  47 ++--
 .../java/test/javafx/scene/web/LeakTest.java  |  32 +--
 .../scene/web/LoadNotificationsTest.java      |  94 ++++----
 .../java/test/javafx/scene/web/LoadTest.java  | 207 ++++++++++--------
 .../javafx/scene/web/LocalStorageTest.java    |  22 +-
 .../javafx/scene/web/MathMLRenderTest.java    |   6 +-
 .../javafx/scene/web/MiscellaneousTest.java   |  63 +++---
 .../test/javafx/scene/web/OpacityTest.java    |  38 ++--
 .../javafx/scene/web/PathContructorTest.java  |   9 +-
 .../scene/web/SVGPointerEventsTest.java       |  10 +-
 .../java/test/javafx/scene/web/SVGTest.java   |  68 +++---
 .../javafx/scene/web/ScreenAndWindowTest.java |  28 +--
 .../test/javafx/scene/web/ShadowTest.java     |  50 ++---
 .../scene/web/SubresourceIntegrityTest.java   |  98 ++++-----
 .../javafx/scene/web/SwingDependencyTest.java |  53 +++--
 .../java/test/javafx/scene/web/TestBase.java  |   6 +-
 .../scene/web/UserDataDirectoryTest.java      |  30 +--
 .../test/javafx/scene/web/WebPageTest.java    |  35 +--
 .../scene/web/WebViewResizabilityTest.java    |   8 +-
 .../test/javafx/scene/web/WebViewTest.java    |  40 ++--
 .../test/javafx/scene/web/WebWorkerTest.java  |   8 +-
 46 files changed, 1032 insertions(+), 1057 deletions(-)

diff --git a/modules/javafx.web/src/test/java/test/com/sun/webkit/SharedBufferTest.java b/modules/javafx.web/src/test/java/test/com/sun/webkit/SharedBufferTest.java
index 2c7e30fbbbd..055b36697a2 100644
--- a/modules/javafx.web/src/test/java/test/com/sun/webkit/SharedBufferTest.java
+++ b/modules/javafx.web/src/test/java/test/com/sun/webkit/SharedBufferTest.java
@@ -33,16 +33,16 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Random;
-import org.junit.After;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.Ignore;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-@Ignore("JDK-8290292")
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Disabled;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+@Disabled("JDK-8290292")
 public class SharedBufferTest {
 
     private static final int SEGMENT_SIZE = 0x1000;
@@ -52,7 +52,7 @@ public class SharedBufferTest {
     private SharedBuffer sb = SharedBufferShim.createSharedBuffer();
 
 
-    @BeforeClass
+    @BeforeAll
     public static void beforeClass() throws ClassNotFoundException {
         if (PlatformUtil.isWindows()) {
             // Must load Microsoft libs before loading jfxwebkit.dll
@@ -458,7 +458,7 @@ public void testDisposeZeroNativePointer() {
     }
 
 
-    @After
+    @AfterEach
     public void after() {
         if (sb != null) {
             SharedBufferShim.dispose(sb);
@@ -484,7 +484,7 @@ private byte[] getSomeData(double position, int length) {
         int extraLength = random.nextBoolean() ? random.nextInt(200) : 0;
         byte[] buffer = g(0, offset + length + extraLength);
         int len = SharedBufferShim.getSomeData(sb, (long) position, buffer, offset, length);
-        assertTrue("Unexpected len: " + len, len >= 0);
+        assertTrue(len >= 0, "Unexpected len: " + len);
         for (int i = 0; i < offset; i++) {
             assertEquals((byte) (i & 0xff), buffer[i]);
         }
diff --git a/modules/javafx.web/src/test/java/test/com/sun/webkit/SimpleSharedBufferInputStreamTest.java b/modules/javafx.web/src/test/java/test/com/sun/webkit/SimpleSharedBufferInputStreamTest.java
index db2237dcb68..4922748a052 100644
--- a/modules/javafx.web/src/test/java/test/com/sun/webkit/SimpleSharedBufferInputStreamTest.java
+++ b/modules/javafx.web/src/test/java/test/com/sun/webkit/SimpleSharedBufferInputStreamTest.java
@@ -33,17 +33,17 @@
 import com.sun.webkit.WebPage;
 import java.io.IOException;
 import java.util.Random;
-import org.junit.After;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.Ignore;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-@Ignore("JDK-8290292")
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Disabled;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+@Disabled("JDK-8290292")
 public class SimpleSharedBufferInputStreamTest {
 
     private static final int SEGMENT_SIZE = 0x1000;
@@ -54,7 +54,7 @@ public class SimpleSharedBufferInputStreamTest {
             new SimpleSharedBufferInputStream(sb);
 
 
-    @BeforeClass
+    @BeforeAll
     public static void beforeClass() throws ClassNotFoundException {
         if (PlatformUtil.isWindows()) {
             // Must load Microsoft libs before loading jfxwebkit.dll
@@ -560,7 +560,7 @@ public void testMarkSupported() {
     }
 
 
-    @After
+    @AfterEach
     public void after() {
         SharedBufferShim.dispose(sb);
     }
@@ -597,7 +597,7 @@ private byte[] read(int length) {
         byte[] buffer = g(0, offset + length + extraLength);
         int len = is.read(buffer, offset, length);
         if (length == 0) {
-            assertEquals("Unexpected len", 0, len);
+            assertEquals(0, len, "Unexpected len");
         }
         if (len == -1) {
             for (int i = 0; i < buffer.length; i++) {
@@ -605,7 +605,7 @@ private byte[] read(int length) {
             }
             return null;
         }
-        assertTrue("Unexpected len: " + len, len >= 0);
+        assertTrue(len >= 0, "Unexpected len: " + len);
         for (int i = 0; i < offset; i++) {
             assertEquals((byte) (i & 0xff), buffer[i]);
         }
diff --git a/modules/javafx.web/src/test/java/test/com/sun/webkit/network/CookieManagerTest.java b/modules/javafx.web/src/test/java/test/com/sun/webkit/network/CookieManagerTest.java
index e48889f308c..32eafbaf32d 100644
--- a/modules/javafx.web/src/test/java/test/com/sun/webkit/network/CookieManagerTest.java
+++ b/modules/javafx.web/src/test/java/test/com/sun/webkit/network/CookieManagerTest.java
@@ -37,9 +37,9 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * A test for the {@link CookieManager} class.
@@ -67,8 +67,7 @@ public void testGetMultipleCookies() {
                 "foo=bar",
                 "baz=qux; Domain=example.org",
                 "quux=corge; Path=/grault");
-        assertEquals("quux=corge; foo=bar; baz=qux",
-                get("http://example.org/grault"));
+        assertEquals("quux=corge; foo=bar; baz=qux", get("http://example.org/grault"));
     }
 
     /**
@@ -128,10 +127,8 @@ public void testGetHostCaseInsensitiveness() {
                 "foo=bar",
                 "baz=qux; Domain=example.org",
                 "quux=corge; Path=/grault");
-        assertEquals("quux=corge; foo=bar; baz=qux",
-                get("http://Example.org/grault"));
-        assertEquals("quux=corge; foo=bar; baz=qux",
-                get("http://EXAMPLE.ORG/grault"));
+        assertEquals("quux=corge; foo=bar; baz=qux", get("http://Example.org/grault"));
+        assertEquals("quux=corge; foo=bar; baz=qux", get("http://EXAMPLE.ORG/grault"));
     }
 
     /**
@@ -144,18 +141,12 @@ public void testGetPathMismatch() {
                 "baz=qux; Path=/",
                 "quux=courge; Path=/lvl1",
                 "grault=garply; Path=/lvl1/lvl2");
-        assertEquals("grault=garply; quux=courge; foo=bar; baz=qux",
-                get("http://example.org/lvl1/lvl2/lvl3/lvl4"));
-        assertEquals("grault=garply; quux=courge; foo=bar; baz=qux",
-                get("http://example.org/lvl1/lvl2/lvl3"));
-        assertEquals("grault=garply; quux=courge; foo=bar; baz=qux",
-                get("http://example.org/lvl1/lvl2"));
-        assertEquals("quux=courge; foo=bar; baz=qux",
-                get("http://example.org/lvl1/lvl2A"));
-        assertEquals("quux=courge; foo=bar; baz=qux",
-                get("http://example.org/lvl1/lvlA"));
-        assertEquals("quux=courge; foo=bar; baz=qux",
-                get("http://example.org/lvl1"));
+        assertEquals("grault=garply; quux=courge; foo=bar; baz=qux", get("http://example.org/lvl1/lvl2/lvl3/lvl4"));
+        assertEquals("grault=garply; quux=courge; foo=bar; baz=qux", get("http://example.org/lvl1/lvl2/lvl3"));
+        assertEquals("grault=garply; quux=courge; foo=bar; baz=qux", get("http://example.org/lvl1/lvl2"));
+        assertEquals("quux=courge; foo=bar; baz=qux", get("http://example.org/lvl1/lvl2A"));
+        assertEquals("quux=courge; foo=bar; baz=qux", get("http://example.org/lvl1/lvlA"));
+        assertEquals("quux=courge; foo=bar; baz=qux", get("http://example.org/lvl1"));
         assertEquals("foo=bar; baz=qux", get("http://example.org/lvl1A"));
         assertEquals("foo=bar; baz=qux", get("http://example.org/lvlA"));
         assertEquals("foo=bar; baz=qux", get("http://example.org/"));
@@ -173,8 +164,7 @@ public void testGetSecureOnlyAndHttpOnly() {
                 "quux=courge; HttpOnly",
                 "grault=garply; Secure; HttpOnly");
         assertEquals("foo=bar; quux=courge", get("http://example.org/"));
-        assertEquals("foo=bar; baz=qux; quux=courge; grault=garply",
-                get("https://example.org/"));
+        assertEquals("foo=bar; baz=qux; quux=courge; grault=garply", get("https://example.org/"));
         assertEquals("foo=bar", get("javascript://example.org/"));
         assertEquals("foo=bar; baz=qux", get("javascripts://example.org/"));
     }
@@ -188,8 +178,7 @@ public void testPathSorting() {
                 "foo=bar",
                 "baz=qux; Path=/lvl1",
                 "quux=courge; Path=/lvl1/lvl2");
-        assertEquals("quux=courge; baz=qux; foo=bar",
-                get("http://example.org/lvl1/lvl2"));
+        assertEquals("quux=courge; baz=qux; foo=bar", get("http://example.org/lvl1/lvl2"));
     }
 
     /**
@@ -198,15 +187,13 @@ public void testPathSorting() {
     @Test
     public void testCreationTimeSorting() {
         put("http://example.org/", "foo=bar", "baz=qux", "quux=courge");
-        assertEquals("foo=bar; baz=qux; quux=courge",
-                get("http://example.org/"));
+        assertEquals("foo=bar; baz=qux; quux=courge", get("http://example.org/"));
 
         sleep(10);
 
         put("http://example.org/", "foo=discard; Max-Age=0");
         put("http://example.org/", "foo=bar");
-        assertEquals("baz=qux; quux=courge; foo=bar",
-                get("http://example.org/"));
+        assertEquals("baz=qux; quux=courge; foo=bar", get("http://example.org/"));
     }
 
     /**
@@ -219,8 +206,7 @@ public void testPathAndCreationTimeSorting() {
                 "baz=qux; Path=/lvl1",
                 "quux=courge",
                 "grault=garply; Path=/lvl1/lvl2");
-        assertEquals("grault=garply; baz=qux; foo=bar; quux=courge",
-                get("http://example.org/lvl1/lvl2"));
+        assertEquals("grault=garply; baz=qux; foo=bar; quux=courge", get("http://example.org/lvl1/lvl2"));
     }
 
     /**
@@ -267,15 +253,13 @@ public void testPutHostCaseInsensitiveness() {
                 "foo=bar",
                 "baz=qux; Domain=example.org",
                 "quux=corge; Path=/grault");
-        assertEquals("quux=corge; foo=bar; baz=qux",
-                get("http://example.org/grault"));
+        assertEquals("quux=corge; foo=bar; baz=qux", get("http://example.org/grault"));
 
         put("http://EXAMPLE.ORG/",
                 "foo=bar2",
                 "baz=qux2; Domain=example.org",
                 "quux=corge2; Path=/grault");
-        assertEquals("quux=corge2; foo=bar2; baz=qux2",
-                get("http://example.org/grault"));
+        assertEquals("quux=corge2; foo=bar2; baz=qux2", get("http://example.org/grault"));
     }
 
     /**
diff --git a/modules/javafx.web/src/test/java/test/com/sun/webkit/network/CookieTest.java b/modules/javafx.web/src/test/java/test/com/sun/webkit/network/CookieTest.java
index 6a745e7978b..4bed3ca25a0 100644
--- a/modules/javafx.web/src/test/java/test/com/sun/webkit/network/CookieTest.java
+++ b/modules/javafx.web/src/test/java/test/com/sun/webkit/network/CookieTest.java
@@ -29,11 +29,11 @@
 import com.sun.webkit.network.ExtendedTimeShim;
 import java.net.URI;
 import java.net.URISyntaxException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import static java.lang.System.currentTimeMillis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * A test for the {@link Cookie} class.
@@ -443,33 +443,25 @@ public CookieModel(String name, String value) {
     }
 
     private static void assertAsExpected(String testString,
-            CookieModel expected, CookieShim actual)
+                                         CookieModel expected, CookieShim actual)
     {
         String s = ", test string: [" + testString + "],";
         if (expected == null) {
-            assertEquals("Unexpected cookie" + s, expected, actual);
+            assertEquals(expected, actual,"Unexpected cookie" + s);
             return;
         }
 
-        assertEquals("Unexpected name" + s, expected.name, actual.getName());
-        assertEquals("Unexpected value" + s, expected.value, actual.getValue());
-        assertEquals("Unexpected expiryTime" + s,
-                expected.expiryTime, actual.getExpiryTime());
-        assertEquals("Unexpected domain" + s,
-                expected.domain, actual.getDomain());
-        assertEquals("Unexpected path" + s, expected.path, actual.getPath());
-        assertTrue("Unexpected creationTime" + s,
-                expected.creationTime.equals(actual.getCreationTime()));
-        assertEquals("Unexpected lastAccessTime" + s,
-                expected.creationTime.baseTime(), actual.getLastAccessTime());
-        assertEquals("Unexpected persistent flag" + s,
-                expected.persistent, actual.getPersistent());
-        assertEquals("Unexpected hostOnly flag" + s,
-                false, actual.getHostOnly());
-        assertEquals("Unexpected secureOnly flag" + s,
-                expected.secureOnly, actual.getSecureOnly());
-        assertEquals("Unexpected httpOnly flag" + s,
-                expected.httpOnly, actual.getHttpOnly());
+        assertEquals(expected.name, actual.getName(), "Unexpected name" + s);
+        assertEquals(expected.value, actual.getValue(), "Unexpected value" + s);
+        assertEquals(expected.expiryTime, actual.getExpiryTime(), "Unexpected expiryTime" + s);
+        assertEquals(expected.domain, actual.getDomain(), "Unexpected domain" + s);
+        assertEquals(expected.path, actual.getPath(), "Unexpected path" + s);
+        assertTrue(expected.creationTime.equals(actual.getCreationTime()), "Unexpected creationTime" + s);
+        assertEquals(expected.creationTime.baseTime(), actual.getLastAccessTime(), "Unexpected lastAccessTime" + s);
+        assertEquals(expected.persistent, actual.getPersistent(), "Unexpected persistent flag" + s);
+        assertEquals(false, actual.getHostOnly(), "Unexpected hostOnly flag" + s);
+        assertEquals(expected.secureOnly, actual.getSecureOnly(), "Unexpected secureOnly flag" + s);
+        assertEquals(expected.httpOnly, actual.getHttpOnly(), "Unexpected httpOnly flag" + s);
     }
 
     /**
@@ -583,14 +575,10 @@ public void testDomainMatches() {
      */
     @Test
     public void testDefaultPath() {
-        assertEquals("/foo",
-                CookieShim.defaultPath(uri("http://hostname/foo/bar")));
-        assertEquals("/foo",
-                CookieShim.defaultPath(uri("http://hostname/foo/bar?")));
-        assertEquals("/foo",
-                CookieShim.defaultPath(uri("http://hostname/foo/bar?query")));
-        assertEquals("/foo",
-                CookieShim.defaultPath(uri("http://hostname/foo/bar?query=push")));
+        assertEquals("/foo", CookieShim.defaultPath(uri("http://hostname/foo/bar")));
+        assertEquals("/foo", CookieShim.defaultPath(uri("http://hostname/foo/bar?")));
+        assertEquals("/foo", CookieShim.defaultPath(uri("http://hostname/foo/bar?query")));
+        assertEquals("/foo", CookieShim.defaultPath(uri("http://hostname/foo/bar?query=push")));
 
         assertEquals("/", CookieShim.defaultPath(uri("http://hostname")));
 
diff --git a/modules/javafx.web/src/test/java/test/com/sun/webkit/network/DateParserTest.java b/modules/javafx.web/src/test/java/test/com/sun/webkit/network/DateParserTest.java
index f84f5698727..4f0279f9e30 100644
--- a/modules/javafx.web/src/test/java/test/com/sun/webkit/network/DateParserTest.java
+++ b/modules/javafx.web/src/test/java/test/com/sun/webkit/network/DateParserTest.java
@@ -31,9 +31,9 @@
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.TimeZone;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * A test for the {@link DateParser} class.
@@ -299,8 +299,9 @@ public void testDelimiters() {
     private static void test(String dateString, String expectedResult) {
         try {
             long actualResult = DateParserShim.parse(dateString);
-            assertEquals("Unexpected result, date string: [" + dateString
-                    + "],", expectedResult, DF.format(new Date(actualResult)));
+            assertEquals(expectedResult, DF.format(new Date(actualResult)),
+                    "Unexpected result, date string: [" + dateString
+                            + "],");
         } catch (ParseException ex) {
             throw new AssertionError(ex);
         }
diff --git a/modules/javafx.web/src/test/java/test/com/sun/webkit/network/PublicSuffixesTest.java b/modules/javafx.web/src/test/java/test/com/sun/webkit/network/PublicSuffixesTest.java
index 7cbbe7fca7d..20a9dc75dfe 100644
--- a/modules/javafx.web/src/test/java/test/com/sun/webkit/network/PublicSuffixesTest.java
+++ b/modules/javafx.web/src/test/java/test/com/sun/webkit/network/PublicSuffixesTest.java
@@ -26,8 +26,8 @@
 package test.com.sun.webkit.network;
 
 import com.sun.webkit.network.PublicSuffixesShim;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * A test for the {@link PublicSuffixes} class.
@@ -99,7 +99,7 @@ public void testIdnRule() {
      * Tests a given domain.
      */
     private static void test(String domain, boolean expectedResult) {
-        assertEquals("Unexpected result, domain: [" + domain + "],",
-                expectedResult, PublicSuffixesShim.isPublicSuffix(domain));
+        assertEquals(expectedResult, PublicSuffixesShim.isPublicSuffix(domain),
+                "Unexpected result, domain: [" + domain + "],");
     }
 }
diff --git a/modules/javafx.web/src/test/java/test/com/sun/webkit/network/UtilTest.java b/modules/javafx.web/src/test/java/test/com/sun/webkit/network/UtilTest.java
index c5f7d9b711a..c1efc622178 100644
--- a/modules/javafx.web/src/test/java/test/com/sun/webkit/network/UtilTest.java
+++ b/modules/javafx.web/src/test/java/test/com/sun/webkit/network/UtilTest.java
@@ -25,11 +25,11 @@
 
 package test.com.sun.webkit.network;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import static com.sun.webkit.network.Util.adjustUrlForWebKit;
 import java.net.MalformedURLException;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class UtilTest {
 
diff --git a/modules/javafx.web/src/test/java/test/com/sun/webkit/network/data/DataURLConnectionTest.java b/modules/javafx.web/src/test/java/test/com/sun/webkit/network/data/DataURLConnectionTest.java
index f3240a0c3c5..daba6b392ce 100644
--- a/modules/javafx.web/src/test/java/test/com/sun/webkit/network/data/DataURLConnectionTest.java
+++ b/modules/javafx.web/src/test/java/test/com/sun/webkit/network/data/DataURLConnectionTest.java
@@ -26,9 +26,9 @@
 package test.com.sun.webkit.network.data;
 
 import static com.sun.webkit.network.URLs.newURL;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -37,7 +37,7 @@
 import java.net.URL;
 import java.net.URLConnection;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * A test for the {@link DataURLConnection} class.
@@ -404,14 +404,14 @@ public void testImportantUrls() throws Exception {
     private void execute(TestCase testCase) throws IOException {
         String s = ", url: " + testCase.url;
         URLConnection c = newURL(testCase.url).openConnection();
-        assertEquals("Unexpected content type" + s,
-                testCase.contentType, c.getContentType());
-        assertEquals("Unexpected content encoding" + s,
-                null, c.getContentEncoding());
-        assertEquals("Unexpected content length" + s,
-                testCase.content.length, c.getContentLength());
-        assertArrayEquals("Unexpected content" + s,
-                testCase.content, readContent(c));
+        assertEquals(testCase.contentType, c.getContentType(),
+                "Unexpected content type" + s);
+        assertEquals(null, c.getContentEncoding(),
+                "Unexpected content encoding" + s);
+        assertEquals(testCase.content.length, c.getContentLength(),
+                "Unexpected content length" + s);
+        assertArrayEquals(testCase.content, readContent(c),
+                "Unexpected content" + s);
     }
 
     /**
diff --git a/modules/javafx.web/src/test/java/test/com/sun/webkit/text/TextBreakIteratorTest.java b/modules/javafx.web/src/test/java/test/com/sun/webkit/text/TextBreakIteratorTest.java
index 7b02f206d5d..f846786705e 100644
--- a/modules/javafx.web/src/test/java/test/com/sun/webkit/text/TextBreakIteratorTest.java
+++ b/modules/javafx.web/src/test/java/test/com/sun/webkit/text/TextBreakIteratorTest.java
@@ -27,8 +27,8 @@
 
 import com.sun.webkit.text.TextBreakIteratorShim;
 import java.text.BreakIterator;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * A unit test for the {@link TextBreakIterator} class.
@@ -51,21 +51,20 @@ public void testBreakPrecedingFromGreaterThanStringLengthPosition() {
         int method = TextBreakIteratorShim.TEXT_BREAK_PRECEDING;
         for (int type : ITERATOR_TYPES) {
             String[] strings = new String[] {
-                "", "a", "aa", "a a", "a a. a a."
+                    "", "a", "aa", "a a", "a a. a a."
             };
             for (String string : strings) {
                 int length = string.length();
                 BreakIterator it =
                         TextBreakIteratorShim.getIterator(type, "en-US", string, false);
                 int[] positions = new int[] {
-                    length + 1, length + 2, length + 10
+                        length + 1, length + 2, length + 10
                 };
                 for (int position : positions) {
                     int result = TextBreakIteratorShim.invokeMethod(
                             it, method, position);
-                    assertEquals("Unexpected result, type: " + type
-                            + ", string: " + string + ", position: " + position,
-                            length, result);
+                    assertEquals(length, result, "Unexpected result, type: " + type
+                            + ", string: " + string + ", position: " + position);
                 }
             }
         }
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/BindingTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/BindingTest.java
index 6cfda921a30..412f2f849a1 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/BindingTest.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/BindingTest.java
@@ -32,9 +32,9 @@
 import javafx.scene.web.WebEngine;
 import javafx.scene.web.WebEngineShim;
 import javafx.scene.web.WebView;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
 
 public class BindingTest extends TestBase {
@@ -66,33 +66,22 @@ public class BindingTest extends TestBase {
             main.setPrefWidth(88.8);
             main.setMinWidth(77.7);
 
-            assertEquals("WebView.contextMenuEnabled",
-                    main.isContextMenuEnabled(), test.isContextMenuEnabled());
-            assertEquals("WebView.fontScale",
-                    main.getFontScale(), test.getFontScale(), 0.0);
-            assertEquals("WebView.fontSmoothingType",
-                    main.getFontSmoothingType(), test.getFontSmoothingType());
-            assertEquals("WebView.height",
-                    main.getHeight(), test.getHeight(), 0.0);
-            assertEquals("WebView.maxHeight",
-                    main.getMaxHeight(), test.getMaxHeight(), 0.0);
-            assertEquals("WebView.minHeight",
-                    main.getMinHeight(), test.getMinHeight(), 0.0);
-            assertEquals("WebView.prefHeight",
-                    main.getPrefHeight(), test.getPrefHeight(), 0.0);
-            assertEquals("WebView.width",
-                    main.getWidth(), test.getWidth(), 0.0);
-            assertEquals("WebView.maxWidth",
-                    main.getMaxWidth(), test.getMaxWidth(), 0.0);
-            assertEquals("WebView.minWidth",
-                    main.getMinWidth(), test.getMinWidth(), 0.0);
-            assertEquals("WebView.prefWidth",
-                    main.getPrefWidth(), test.getPrefWidth(), 0.0);
-            assertEquals("WebView.zoom", main.getZoom(), test.getZoom(), 0.0);
-            assertEquals("WebPage zoom factor",
+            assertEquals(main.isContextMenuEnabled(), test.isContextMenuEnabled(), "WebView.contextMenuEnabled");
+            assertEquals(main.getFontScale(), test.getFontScale(), 0.0, "WebView.fontScale");
+            assertEquals(main.getFontSmoothingType(), test.getFontSmoothingType(), "WebView.fontSmoothingType");
+            assertEquals(main.getHeight(), test.getHeight(), 0.0, "WebView.height");
+            assertEquals(main.getMaxHeight(), test.getMaxHeight(), 0.0, "WebView.maxHeight");
+            assertEquals(main.getMinHeight(), test.getMinHeight(), 0.0, "WebView.minHeight");
+            assertEquals(main.getPrefHeight(), test.getPrefHeight(), 0.0, "WebView.prefHeight");
+            assertEquals(main.getWidth(), test.getWidth(), 0.0, "WebView.width");
+            assertEquals(main.getMaxWidth(), test.getMaxWidth(), 0.0, "WebView.maxWidth");
+            assertEquals(main.getMinWidth(), test.getMinWidth(), 0.0, "WebView.minWidth");
+            assertEquals(main.getPrefWidth(), test.getPrefWidth(), 0.0, "WebView.prefWidth");
+            assertEquals(main.getZoom(), test.getZoom(), 0.0, "WebView.zoom");
+            assertEquals(
                     WebEngineShim.getPage(main.getEngine()).getZoomFactor(true),
                     WebEngineShim.getPage(test.getEngine()).getZoomFactor(true),
-                    0.0);
+                    0.0, "WebPage zoom factor");
         });
     }
 
@@ -109,12 +98,9 @@ public class BindingTest extends TestBase {
             web.setUserAgent("JavaFX/WebView");
             web.setUserStyleSheetLocation("");
 
-            assertEquals("WebEngine.javaScriptEnabled",
-                    web.isJavaScriptEnabled(), test.isJavaScriptEnabled());
-            assertEquals("WebEngine.userAgent",
-                    web.getUserAgent(), test.getUserAgent());
-            assertEquals("WebEngine.userStyleSheetLocation",
-                    web.getUserStyleSheetLocation(), test.getUserStyleSheetLocation());
+            assertEquals(web.isJavaScriptEnabled(), test.isJavaScriptEnabled(), "WebEngine.javaScriptEnabled");
+            assertEquals(web.getUserAgent(), test.getUserAgent(), "WebEngine.userAgent");
+            assertEquals(web.getUserStyleSheetLocation(), test.getUserStyleSheetLocation(), "WebEngine.userStyleSheetLocation");
 
         });
     }
@@ -130,8 +116,8 @@ public class BindingTest extends TestBase {
         loc.bind(web.locationProperty());
 
         load(new File("src/test/resources/test/html/ipsum.html"));
-        assertSame("WebEngine.document", web.getDocument(), doc.get());
-        assertSame("WebEngine.title",    web.getTitle(),    title.get());
-        assertSame("WebEngine.location", web.getLocation(), loc.get());
+        assertSame(web.getDocument(), doc.get(), "WebEngine.document");
+        assertSame(web.getTitle(), title.get(), "WebEngine.title");
+        assertSame(web.getLocation(), loc.get(), "WebEngine.location");
     }
 }
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/CSSTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/CSSTest.java
index dfab9d48be4..b1d6db25b79 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/CSSTest.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/CSSTest.java
@@ -38,12 +38,12 @@
 import javafx.scene.text.FontSmoothingType;
 import javafx.scene.web.WebEngineShim;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class CSSTest extends TestBase {
 
@@ -326,7 +326,7 @@ private void testMaxHeight(double expected) {
     @Test public void testLongSelectorList() {
         final String FILE = "src/test/resources/test/html/longselectorlist.html";
         load(new File(FILE));
-        assertEquals("Loading Long SelectorList completed successfully", SUCCEEDED, getLoadState());
+        assertEquals(SUCCEEDED, getLoadState(), "Loading Long SelectorList completed successfully");
     }
 
     @Test public void testBorderRadiusPropertyRendering() {
@@ -364,7 +364,7 @@ private void testMaxHeight(double expected) {
                 "    <button class=\"bad1\">B</button>\n" +
                 "    <button class=\"bad2\">C</button>\n" +
                 "    <button class=\"bad3\">D</button>\n" +
-                "  </body>\n" +
+                "   </body>\n" +
                 "</html>"
         );
         submit(() -> {
@@ -374,22 +374,22 @@ private void testMaxHeight(double expected) {
             assertNotNull(img);
 
             final Color pixelAt0x0 = new Color(img.getRGB(0, 0), true);
-            assertFalse("Color should not be red:" + pixelAt0x0, isColorsSimilar(Color.RED, pixelAt0x0, 1));
+            assertFalse(isColorsSimilar(Color.RED, pixelAt0x0, 1), "Color should not be red:" + pixelAt0x0);
             final Color pixelAt199x0 = new Color(img.getRGB(199, 0), true);
-            assertFalse("Color should not be red:" + pixelAt199x0, isColorsSimilar(Color.RED, pixelAt199x0, 1));
+            assertFalse(isColorsSimilar(Color.RED, pixelAt199x0, 1), "Color should not be red:" + pixelAt199x0);
             final Color pixelAt0x99 = new Color(img.getRGB(0, 99), true);
-            assertFalse("Color should not be red:" + pixelAt0x99, isColorsSimilar(Color.RED, pixelAt0x99, 1));
+            assertFalse(isColorsSimilar(Color.RED, pixelAt0x99, 1), "Color should not be red:" + pixelAt0x99);
             final Color pixelAt199x99 = new Color(img.getRGB(199, 99), true);
-            assertFalse("Color should not be red:" + pixelAt199x99, isColorsSimilar(Color.RED, pixelAt199x99, 1));
+            assertFalse(isColorsSimilar(Color.RED, pixelAt199x99, 1), "Color should not be red:" + pixelAt199x99);
 
             final Color pixelAt0x100 = new Color(img.getRGB(0, 100), true);
-            assertFalse("Color should not be blue:" + pixelAt0x100, isColorsSimilar(Color.BLUE, pixelAt0x100, 1));
+            assertFalse(isColorsSimilar(Color.BLUE, pixelAt0x100, 1), "Color should not be blue:" + pixelAt0x100);
             final Color pixelAt199x100 = new Color(img.getRGB(199, 100), true);
-            assertFalse("Color should not be blue:" + pixelAt199x100, isColorsSimilar(Color.BLUE, pixelAt199x100, 1));
+            assertFalse(isColorsSimilar(Color.BLUE, pixelAt199x100, 1), "Color should not be blue:" + pixelAt199x100);
             final Color pixel0x199 = new Color(img.getRGB(0, 199), true);
-            assertTrue("Color should be opaque blue:" + pixel0x199, isColorsSimilar(Color.BLUE, pixel0x199, 1));
+            assertTrue(isColorsSimilar(Color.BLUE, pixel0x199, 1), "Color should be opaque blue:" + pixel0x199);
             final Color pixelAt199x199 = new Color(img.getRGB(199, 199), true);
-            assertFalse("Color should not be blue:" + pixelAt199x199, isColorsSimilar(Color.BLUE, pixelAt199x199, 1));
+            assertFalse(isColorsSimilar(Color.BLUE, pixelAt199x199, 1), "Color should not be blue:" + pixelAt199x199);
         });
     }
 }
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/CallbackTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/CallbackTest.java
index b46c4be8115..5173ce8885b 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/CallbackTest.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/CallbackTest.java
@@ -27,7 +27,7 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -42,22 +42,20 @@
 import javafx.scene.web.WebEvent;
 import javafx.util.Callback;
 
-import org.junit.Test;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Disabled;
 
 
 public class CallbackTest extends TestBase {
     final static String JS_ALERT = "alert('MESSAGE');";
     final static String JS_CONFIRM = "confirm('MESSAGE');";
     final static String JS_PROMPT = "prompt('MESSAGE', 'DEFAULT');";
-    final static String JS_OPEN =
-            "window.open('', '', 'menubar=0, status=1, toolbar=0, resizable=1');";
+    final static String JS_OPEN = "window.open('', '', 'menubar=0, status=1, toolbar=0, resizable=1');";
     final static String JS_OPEN_DEFAULT = "window.open('');";
     final static String JS_CLOSE = "window.close();";
     final static String JS_STATUS = "window.status = 'STATUS'";
 
-    final static String HTML_ONLOAD =
-            "<html><body onload=\"ONLOAD\"></body></html>";
+    final static String HTML_ONLOAD = "<html><body onload=\"ONLOAD\"></body></html>";
 
     final static String ALERT = "onAlert";
     final static String RESIZED = "onResized";
@@ -159,7 +157,7 @@ private void checkErrorOutput(ByteArrayOutputStream bytes) {
         }
     }
 
-    @Ignore("JDK-8290238")
+    @Disabled("JDK-8290238")
     @Test public void testCloseWindow() {
         clear();
         executeScript(JS_CLOSE);
@@ -196,8 +194,7 @@ private void checkErrorOutput(ByteArrayOutputStream bytes) {
         mainUi.checkCalled(CONFIRM, message);
 
         clear();
-        script = JS_PROMPT.replaceAll("MESSAGE", message)
-                       .replaceAll("DEFAULT", defaultValue);
+        script = JS_PROMPT.replaceAll("MESSAGE", message).replaceAll("DEFAULT", defaultValue);
         executeScript(script);
         mainUi.checkCalled(PROMPT, message, defaultValue);
 
@@ -278,8 +275,7 @@ public void checkCalled(String methodName, Object... args) {
         public final EventHandler<WebEvent<Rectangle2D>> onResized =
                 ev -> {
                     Rectangle2D r = ev.getData();
-                    called(RESIZED, r.getMinX(), r.getMinY(),
-                                    r.getWidth(), r.getHeight());
+                    called(RESIZED, r.getMinX(), r.getMinY(), r.getWidth(), r.getHeight());
                 };
 
         public final EventHandler<WebEvent<Boolean>> onVisibilityChanged =
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/CanvasTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/CanvasTest.java
index 5d980789415..671b9ab5c69 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/CanvasTest.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/CanvasTest.java
@@ -34,9 +34,9 @@
 import javax.imageio.ImageIO;
 
 import netscape.javascript.JSObject;
-import org.junit.After;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * Test the Image to DataURL function
@@ -70,15 +70,15 @@ public class CanvasTest extends TestBase {
 
         // Without the fix for JDK-8162922, canvas image data will be like below, which is wrong.
         /**
-        final int[] wrongPixelArray = {255, 0, 0, 255,
-                                       255, 0, 0, 255,
-                                       255, 0, 0, 255,
-                                       255, 0, 0, 255,
-                                       255, 0, 0, 255,
-                                       255, 0, 0, 255,
-                                       255, 0, 0, 255,
-                                       255, 0, 0, 255,};
-        */
+         final int[] wrongPixelArray = {255, 0, 0, 255,
+                                        255, 0, 0, 255,
+                                        255, 0, 0, 255,
+                                        255, 0, 0, 255,
+                                        255, 0, 0, 255,
+                                        255, 0, 0, 255,
+                                        255, 0, 0, 255,
+                                        255, 0, 0, 255,};
+         */
 
         // Sample pixel array to test against the canvas image data (with fix for JDK-8162922)
         final int[] expectedPixelArray = {255, 0, 0, 255,
@@ -92,11 +92,11 @@ public class CanvasTest extends TestBase {
 
         submit(() -> {
             final JSObject obj = (JSObject) getEngine().executeScript("window.data");
-            assertEquals("Device Pixel Ratio should be 1", 1, (int) getEngine().executeScript("window.devicePixelRatio"));
+            assertEquals(1, (int) getEngine().executeScript("window.devicePixelRatio"), "Device Pixel Ratio should be 1");
             // Due to mismatch of first pixel(probably a bug), we are skipping first pixel and testing
             // from second pixel onwards (from 16th value) till next 3 pixels (till 47th value)
             for (int i = 16; i < 48; i++) {
-                assertEquals("StrokeRect pixel data is same", expectedPixelArray[i - 16], (int)obj.getSlot(i));
+                assertEquals(expectedPixelArray[i - 16], (int)obj.getSlot(i), "StrokeRect pixel data is same");
             }
         });
     }
@@ -114,10 +114,8 @@ public class CanvasTest extends TestBase {
         loadContent(htmlCanvasArc);
         submit(() -> {
             int redColor = 255;
-            assertEquals("Arc startAngle", redColor,
-                    (int) getEngine().executeScript("document.getElementById('canvas').getContext('2d').getImageData(260,213,1,1).data[0]"));
-            assertEquals("Arc endAngle", redColor,
-                    (int) getEngine().executeScript("document.getElementById('canvas').getContext('2d').getImageData(300,75,1,1).data[0]"));
+            assertEquals(redColor, (int) getEngine().executeScript("document.getElementById('canvas').getContext('2d').getImageData(260,213,1,1).data[0]"), "Arc startAngle");
+            assertEquals(redColor, (int) getEngine().executeScript("document.getElementById('canvas').getContext('2d').getImageData(300,75,1,1).data[0]"), "Arc endAngle");
         });
     }
 
@@ -144,12 +142,23 @@ public class CanvasTest extends TestBase {
         loadContent(htmlCanvasContent);
         submit(() -> {
             int redColor = 255;
-            assertEquals("Pattern top-left corner", 0, (int) getEngine().executeScript(
-                "document.getElementById('canvaspattern').getContext('2d').getImageData(1, 1, 1, 1).data[0]"));
-            assertEquals("First rect top-left", redColor, (int) getEngine().executeScript(
-                "document.getElementById('canvaspattern').getContext('2d').getImageData(11, 11, 1, 1).data[0]"));
-            assertEquals("First rect center", redColor, (int) getEngine().executeScript(
-                "document.getElementById('canvaspattern').getContext('2d').getImageData(21, 21, 1, 1).data[0]"));
+            assertEquals(
+                    0,
+                    (int) getEngine().executeScript(
+                            "document.getElementById('canvaspattern').getContext('2d').getImageData(1, 1, 1, 1).data[0]"),
+                    "Pattern top-left corner");
+
+            assertEquals(
+                    redColor,
+                    (int) getEngine().executeScript(
+                            "document.getElementById('canvaspattern').getContext('2d').getImageData(11, 11, 1, 1).data[0]"),
+                    "First rect top-left");
+
+            assertEquals(
+                    redColor,
+                    (int) getEngine().executeScript(
+                            "document.getElementById('canvaspattern').getContext('2d').getImageData(21, 21, 1, 1).data[0]"),
+                    "First rect center");
         });
     }
 
@@ -168,16 +177,16 @@ private BufferedImage htmlCanvasToBufferedImage(final String mime) throws Except
             + "data = canvas.toDataURL('%s');"
             + "</script>"
             + "</body>"
-         , mime);
+        , mime);
 
         loadContent(html);
         System.setErr(ERR);
 
         // Check whether any exception thrown
         final String exMessage = errStream.toString();
-        assertFalse(String.format("Test failed with exception:\n%s", exMessage),
-            exMessage.contains("Exception") || exMessage.contains("Error"));
-
+        assertFalse(
+                exMessage.contains("Exception") || exMessage.contains("Error"),
+                String.format("Test failed with exception:\n%s", exMessage));
         String img = (String) executeScript("window.data");
         assertNotNull("window.data must have base64 encoded image", img);
         // get rid of mime type
@@ -185,7 +194,7 @@ private BufferedImage htmlCanvasToBufferedImage(final String mime) throws Except
         assertNotNull(img);
 
         final byte[] imgBytes = Base64.getMimeDecoder().decode(img);
-        assertNotNull("Base64 decoded image data must be valid", imgBytes);
+        assertNotNull(imgBytes, "Base64 decoded image data must be valid");
         final ByteArrayInputStream inputStream = new ByteArrayInputStream(imgBytes);
         final BufferedImage decodedImg = ImageIO.read(inputStream);
         assertNotNull(decodedImg);
@@ -194,29 +203,29 @@ private BufferedImage htmlCanvasToBufferedImage(final String mime) throws Except
 
     @Test
     public void testColorSimilarityAlgorithm() {
-        assertTrue("Two Color.WHITE must be 100% equal", isColorsSimilar(Color.WHITE, Color.WHITE, 0));
-        assertTrue("Color.BLACK & Color.WHITE must be 100% different", isColorsSimilar(Color.WHITE, Color.BLACK, 100));
+        assertTrue(isColorsSimilar(Color.WHITE, Color.WHITE, 0), "Two Color.WHITE must be 100% equal");
+        assertTrue(isColorsSimilar(Color.WHITE, Color.BLACK, 100), "Color.BLACK & Color.WHITE must be 100% different");
 
-        assertFalse("Color.BLACK & Color.WHITE must be different by at least 80%", isColorsSimilar(Color.WHITE, Color.BLACK, 80));
-        assertFalse("(0, 0, 0, 0) & Color.WHITE must be at least 99.99% different", isColorsSimilar(Color.WHITE, new Color(0, true), 99.99f));
+        assertFalse(isColorsSimilar(Color.WHITE, Color.BLACK, 80), "Color.BLACK & Color.WHITE must be different by at least 80%");
+        assertFalse(isColorsSimilar(Color.WHITE, new Color(0, true), 99.99f), "(0, 0, 0, 0) & Color.WHITE must be at least 99.99% different");
 
-        assertTrue("Color.RED must be 100% equal to (255, 0, 0, 255)", isColorsSimilar(Color.RED, new Color(255, 0, 0, 255), 0));
-        assertTrue("Color.RED must be at least 99% similar to (255, 0, 0, 250)", isColorsSimilar(Color.RED, new Color(255, 0, 0, 250), 1));
-        assertTrue("Color.RED must be at least 95% similar to (250, 5, 5, 250)", isColorsSimilar(Color.RED, new Color(250, 5, 5, 250), 5));
+        assertTrue(isColorsSimilar(Color.RED, new Color(255, 0, 0, 255), 0), "Color.RED must be 100% equal to (255, 0, 0, 255)");
+        assertTrue(isColorsSimilar(Color.RED, new Color(255, 0, 0, 250), 1), "Color.RED must be at least 99% similar to (255, 0, 0, 250)");
+        assertTrue(isColorsSimilar(Color.RED, new Color(250, 5, 5, 250), 5), "Color.RED must be at least 95% similar to (250, 5, 5, 250)");
 
-        assertTrue("Color.GREEN must be 100% equal to (0, 255, 0, 255)", isColorsSimilar(Color.GREEN, new Color(0, 255, 0, 255), 0));
-        assertTrue("Color.GREEN must be at least 99% similar to (0, 255, 0, 250)", isColorsSimilar(Color.GREEN, new Color(0, 255, 0, 250), 1));
-        assertTrue("Color.GREEN must be at least 95% similar to (5, 250, 5, 250)", isColorsSimilar(Color.GREEN, new Color(5, 250, 5, 250), 5));
+        assertTrue(isColorsSimilar(Color.GREEN, new Color(0, 255, 0, 255), 0), "Color.GREEN must be 100% equal to (0, 255, 0, 255)");
+        assertTrue(isColorsSimilar(Color.GREEN, new Color(0, 255, 0, 250), 1), "Color.GREEN must be at least 99% similar to (0, 255, 0, 250)");
+        assertTrue(isColorsSimilar(Color.GREEN, new Color(5, 250, 5, 250), 5), "Color.GREEN must be at least 95% similar to (5, 250, 5, 250)");
 
-        assertTrue("Color.BLUE must be 100% equal to (0, 255, 0, 255)", isColorsSimilar(Color.BLUE, new Color(0, 0, 255, 255), 0));
-        assertTrue("Color.BLUE must be at least 99% similar to (0, 0, 255, 250)", isColorsSimilar(Color.BLUE, new Color(0, 0, 255, 250), 1));
-        assertTrue("Color.BLUE must be at least 95% similar to (5, 5, 250, 250)", isColorsSimilar(Color.BLUE, new Color(5, 5, 250, 250), 5));
+        assertTrue(isColorsSimilar(Color.BLUE, new Color(0, 0, 255, 255), 0), "Color.BLUE must be 100% equal to (0, 255, 0, 255)");
+        assertTrue(isColorsSimilar(Color.BLUE, new Color(0, 0, 255, 250), 1), "Color.BLUE must be at least 99% similar to (0, 0, 255, 250)");
+        assertTrue(isColorsSimilar(Color.BLUE, new Color(5, 5, 250, 250), 5), "Color.BLUE must be at least 95% similar to (5, 5, 250, 250)");
 
-        assertTrue("(0, 0, 0, 0) must be at least 95% similar to (5, 5, 5, 5)", isColorsSimilar(new Color(0, true), new Color(5, 5, 5, 5), 5));
-        assertFalse("(0, 0, 0, 0) and (5, 5, 5, 5) must be different by at least 1%", isColorsSimilar(new Color(0, true), new Color(5, 5, 5, 5), 1));
+        assertTrue(isColorsSimilar(new Color(0, true), new Color(5, 5, 5, 5), 5), "(0, 0, 0, 0) must be at least 95% similar to (5, 5, 5, 5)");
+        assertFalse(isColorsSimilar(new Color(0, true), new Color(5, 5, 5, 5), 1), "(0, 0, 0, 0) and (5, 5, 5, 5) must be different by at least 1%");
 
-        assertTrue("Color.RED must be at least 25% similar to Color.GREEN", isColorsSimilar(Color.RED, Color.GREEN, 75));
-        assertFalse("Color.RED and Color.GREEN must be different by at least 70%", isColorsSimilar(Color.RED, Color.GREEN, 70));
+        assertTrue(isColorsSimilar(Color.RED, Color.GREEN, 75), "Color.RED must be at least 25% similar to Color.GREEN");
+        assertFalse(isColorsSimilar(Color.RED, Color.GREEN, 70), "Color.RED and Color.GREEN must be different by at least 70%");
     }
 
     @Test
@@ -225,11 +234,11 @@ public void testToDataURLWithPNGMimeType() throws Exception {
 
         // Pixel at (25 x 25) must be red
         final Color pixelAt25x25 = new Color(decodedImg.getRGB(25, 25), true);
-        assertTrue("Color should be opaque red:" + pixelAt25x25, isColorsSimilar(Color.RED, pixelAt25x25, 1));
+        assertTrue(isColorsSimilar(Color.RED, pixelAt25x25, 1), "Color should be opaque red:" + pixelAt25x25);
 
         // PNG supports transparency, Pixel at (75 x 25) must be transparent black
         final Color pixelAt75x25 = new Color(decodedImg.getRGB(75, 25), true);
-        assertTrue("Color should be transparent black:" + pixelAt75x25, isColorsSimilar(new Color(0, true), pixelAt75x25, 1));
+        assertTrue(isColorsSimilar(new Color(0, true), pixelAt75x25, 1), "Color should be transparent black:" + pixelAt75x25);
     }
 
     @Test
@@ -238,14 +247,14 @@ public void testToDataURLWithJPEGMimeType() throws Exception {
 
         // Pixel at (25 x 25) must be red
         final Color pixelAt25x25 = new Color(decodedImg.getRGB(25, 25), true);
-        assertTrue("Color should be opaque red:" + pixelAt25x25, isColorsSimilar(Color.RED, pixelAt25x25, 1));
+        assertTrue(isColorsSimilar(Color.RED, pixelAt25x25, 1), "Color should be opaque red:" + pixelAt25x25);
 
         // JPEG doesn't supports transparency, Pixel at (75 x 25) must be opaque black
         final Color pixelAt75x25 = new Color(decodedImg.getRGB(75, 25), true);
-        assertTrue("Color should be transparent black:" + pixelAt75x25, isColorsSimilar(Color.BLACK, pixelAt75x25, 1));
+        assertTrue(isColorsSimilar(Color.BLACK, pixelAt75x25, 1), "Color should be transparent black:" + pixelAt75x25);
     }
 
-    @After
+    @AfterEach
     public void resetSystemErr() {
         System.setErr(ERR);
     }
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/CheckFxThreadTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/CheckFxThreadTest.java
index 856355293f6..1c4543dee05 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/CheckFxThreadTest.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/CheckFxThreadTest.java
@@ -26,8 +26,8 @@
 package test.javafx.scene.web;
 
 import javafx.scene.text.FontSmoothingType;
-import static org.junit.Assert.fail;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
 
 
 public class CheckFxThreadTest extends TestBase {
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/DOMTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/DOMTest.java
index 5bd8f793511..d88ae2a1727 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/DOMTest.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/DOMTest.java
@@ -25,16 +25,16 @@
 
 package test.javafx.scene.web;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import javafx.scene.web.WebEngine;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.w3c.dom.*;
 import org.w3c.dom.css.*;
 import org.w3c.dom.events.*;
@@ -58,16 +58,16 @@ public class DOMTest extends TestBase {
             NodeList ee = doc.getElementsByTagName("p");
 
             int numProcessed = 0;
-                for (int i = 0 ; i < ee.getLength() ; i++) {
-                    Node n = ee.item(i);
-                    String s = ((ElementImpl)n).getId();
-                    String newId = "new" + s;
-                    ((ElementImpl)n).setId(newId);
-                    assertEquals("New element id", newId, ((ElementImpl)n).getId());
-                    numProcessed++;
-                }
+            for (int i = 0 ; i < ee.getLength() ; i++) {
+                Node n = ee.item(i);
+                String s = ((ElementImpl)n).getId();
+                String newId = "new" + s;
+                ((ElementImpl)n).setId(newId);
+                assertEquals(newId, ((ElementImpl)n).getId(), "New element id");
+                numProcessed++;
+            }
 
-            assertTrue("Number of processed Elements is equal to 0", numProcessed > 0);
+            assertTrue(numProcessed > 0, "Number of processed Elements is equal to 0");
         });
     }
 
@@ -76,7 +76,7 @@ public class DOMTest extends TestBase {
         submit(() -> {
             Element emptyP = doc.getElementById("empty-paragraph");
             String textContent = emptyP.getTextContent();
-            assertEquals("Text content of an empty paragraph", "", textContent);
+            assertEquals("", textContent, "Text content of an empty paragraph");
         });
     }
 
@@ -96,17 +96,17 @@ public class DOMTest extends TestBase {
             int count2 = c2.getLength();
 
             // Some sanity/identity checks
-            assertSame("Sibling expected", right2, n.getNextSibling());
-            assertSame("Sibling expected", n, right2.getPreviousSibling());
+            assertSame(right2, n.getNextSibling(), "Sibling expected");
+            assertSame(n, right2.getPreviousSibling(), "Sibling expected");
 
             Node ret = p1.appendChild(n);
-            assertSame("Sibling expected", left2, right2.getPreviousSibling());
-            assertSame("Parent check", p2, right2.getParentNode());
+            assertSame(left2, right2.getPreviousSibling(), "Sibling expected");
+            assertSame(p2, right2.getParentNode(), "Parent check");
 
             verifyChildRemoved(p2, count2, left2, right2);
             verifyChildAdded(n, p1, count1);
             verifySiblings(n, left1, null);
-            assertSame("Returned node", n, ret);
+            assertSame(n, ret, "Returned node");
         });
     }
 
@@ -126,8 +126,8 @@ public class DOMTest extends TestBase {
             int count2 = c2.getLength();
 
             // Some sanity/identity checks
-            assertSame("Sibling expected", right2, n.getNextSibling());
-            assertSame("Sibling expected", n, right2.getPreviousSibling());
+            assertSame(right2, n.getNextSibling(), "Sibling expected");
+            assertSame(n, right2.getPreviousSibling(), "Sibling expected");
 
             try {
                 p1.insertBefore(null, null);
@@ -139,13 +139,13 @@ public class DOMTest extends TestBase {
             }
 
             Node ret = p1.insertBefore(n, null);
-            assertSame("Sibling expected", left2, right2.getPreviousSibling());
-            assertSame("Parent check", p2, right2.getParentNode());
+            assertSame(left2, right2.getPreviousSibling(), "Sibling expected");
+            assertSame(p2, right2.getParentNode(), "Parent check");
 
             verifyChildRemoved(p2, count2, left2, right2);
             verifyChildAdded(n, p1, count1);
             verifySiblings(n, left1, null);
-            assertSame("Returned node", n, ret);
+            assertSame(n, ret, "Returned node");
         });
     }
 
@@ -170,7 +170,7 @@ public class DOMTest extends TestBase {
             verifyChildRemoved(p2, count2, left2, right2);
             verifyChildAdded(n, p1, count1);
             verifySiblings(n, left1, right1);
-            assertEquals("Returned node", n, ret);
+            assertEquals(n, ret, "Returned node");
         });
     }
 
@@ -197,7 +197,7 @@ public class DOMTest extends TestBase {
             verifyChildAdded(n, p1, count1 - 1);    // child count stays the same
             verifySiblings(n, left1, right1);
             verifyNodeRemoved(old);
-            assertEquals("Returned node", old, ret);
+            assertEquals(old, ret, "Returned node");
         });
     }
 
@@ -215,7 +215,7 @@ public class DOMTest extends TestBase {
 
             verifyChildRemoved(p, count, left, right);
             verifyNodeRemoved(n);
-            assertEquals("Returned node", n, ret);
+            assertEquals(n, ret, "Returned node");
         });
     }
 
@@ -231,19 +231,19 @@ public class DOMTest extends TestBase {
             final EventTarget[] evtTarget = new EventTarget[1];
 
             EventListener listener = new EventListener() {
-                    @Override
-                    public void handleEvent(Event evt) {
-                        evtTarget[0] = evt.getTarget();
-                    }
-                };
+                @Override
+                public void handleEvent(Event evt) {
+                    evtTarget[0] = evt.getTarget();
+                }
+            };
             ((EventTarget) p).addEventListener("DOMNodeRemoved",
-                                               listener, false);
+                    listener, false);
 
             Node ret = p.removeChild(n);
-            assertEquals("event target2", evtTarget[0], n);
+            assertEquals(evtTarget[0], n, "event target2");
             verifyChildRemoved(p, count, left, right);
             verifyNodeRemoved(n);
-            assertEquals("Returned node", n, ret);
+            assertEquals(n, ret, "Returned node");
         });
     }
 
@@ -251,30 +251,30 @@ public void handleEvent(Event evt) {
         final Document doc = getDocumentFor("src/test/resources/test/html/dom.html");
         submit(() -> {
             Element p = doc.getElementById("showcase-paragraph");
-            assertEquals("P element's node type", Node.ELEMENT_NODE, p.getNodeType());
-            assertEquals("P element's tag name", "P", p.getTagName());
+            assertEquals(Node.ELEMENT_NODE, p.getNodeType(), "P element's node type");
+            assertEquals("P", p.getTagName(), "P element's tag name");
 
             NodeList children = p.getChildNodes();
-            assertEquals("Paragraph child count", 3, children.getLength());
+            assertEquals(3, children.getLength(), "Paragraph child count");
             Node text = children.item(0);
-            assertEquals("Text node type", Node.TEXT_NODE, text.getNodeType());
+            assertEquals(Node.TEXT_NODE, text.getNodeType(), "Text node type");
             Node comment = children.item(1);
-            assertEquals("Comment node type", Node.COMMENT_NODE, comment.getNodeType());
+            assertEquals(Node.COMMENT_NODE, comment.getNodeType(), "Comment node type");
             Node element = children.item(2);
-            assertEquals("SPAN element's node type", Node.ELEMENT_NODE, element.getNodeType());
+            assertEquals(Node.ELEMENT_NODE, element.getNodeType(), "SPAN element's node type");
 
             Element span = (Element) element;
-            assertEquals("SPAN element's tag name", "SPAN", span.getTagName());
-            assertTrue("SPAN has 'class' attribute", span.hasAttribute("class"));
-            assertTrue("SPAN has 'CLASS' attribute", span.hasAttribute("CLASS"));
-            assertEquals("SPAN attributes count", 1, span.getAttributes().getLength());
+            assertEquals("SPAN", span.getTagName(), "SPAN element's tag name");
+            assertTrue(span.hasAttribute("class"), "SPAN has 'class' attribute");
+            assertTrue(span.hasAttribute("CLASS"), "SPAN has 'CLASS' attribute");
+            assertEquals(1, span.getAttributes().getLength(), "SPAN attributes count");
 
             Attr attr = span.getAttributeNode("class");
-            assertEquals("Attr node type", Node.ATTRIBUTE_NODE, attr.getNodeType());
+            assertEquals(Node.ATTRIBUTE_NODE, attr.getNodeType(), "Attr node type");
             children = span.getChildNodes();
-            assertEquals("SPAN element child count", 1, children.getLength());
+            assertEquals(1, children.getLength(), "SPAN element child count");
             text = children.item(0);
-            assertEquals("SPAN text node type", Node.TEXT_NODE, text.getNodeType());
+            assertEquals(Node.TEXT_NODE, text.getNodeType(), "SPAN text node type");
         });
     }
 
@@ -283,11 +283,11 @@ public void handleEvent(Event evt) {
         submit(() -> {
             NodeList inputsp = doc.getElementsByTagName("p");
             HTMLParagraphElement elp = (HTMLParagraphElement) inputsp.item(0);
-            assertEquals("P element typification", "left", elp.getAlign());
+            assertEquals("left", elp.getAlign(), "P element typification");
 
             NodeList inputsi = doc.getElementsByTagName("img");
             HTMLImageElement eli = (HTMLImageElement) inputsi.item(0);
-            assertEquals("Image element typification", "file:///C:/test.png", eli.getSrc());
+            assertEquals("file:///C:/test.png", eli.getSrc(), "Image element typification");
         });
     }
 
@@ -319,23 +319,23 @@ public void handleEvent(Event evt) {
             // dispatch test
             MouseEvent evClick = (MouseEvent)((DocumentEvent)htmlDoc).createEvent("MouseEvent");
             evClick.initMouseEvent(
-                "click",
-                true,
-                true,
-                ((DocumentView)htmlDoc).getDefaultView(),
-                10,
-                0, 0, 0, 0,
-                true, true, true, true,
-                (short)1, (EventTarget)body);
+                    "click",
+                    true,
+                    true,
+                    ((DocumentView)htmlDoc).getDefaultView(),
+                    10,
+                    0, 0, 0, 0,
+                    true, true, true, true,
+                    (short)1, (EventTarget)body);
 
             //check start condition
-            assertEquals("Wrong body initial state", "bodyClass", body.getClassName());
+            assertEquals("bodyClass", body.getClassName(), "Wrong body initial state");
 
             //FIXME: ineffective - there is not ScriptExecutionContext
             listenerJS.handleEvent(evClick);
             //OK!
             ((EventTarget)body).dispatchEvent(evClick);
-            assertEquals("JS EventHandler does not work directly", "testClass", body.getClassName());
+            assertEquals("testClass", body.getClassName(), "JS EventHandler does not work directly");
 
             EventListener listener1 = evt -> {
                 EventTarget src = ((MouseEvent) evt).getTarget();
@@ -343,7 +343,7 @@ public void handleEvent(Event evt) {
             };
             ((EventTarget)body).addEventListener("click", listener1, false);
             ((EventTarget)body).dispatchEvent(evClick);
-            assertEquals("Java EventHandler does not work directly", "newTestClass", body.getClassName());
+            assertEquals("newTestClass", body.getClassName(), "Java EventHandler does not work directly");
 
             EventListener listener2 = evt -> {
                 //OK: stacked ScriptExecutionContext
@@ -351,7 +351,7 @@ public void handleEvent(Event evt) {
             };
             ((EventTarget)body).addEventListener("click", listener2, false);
             ((EventTarget)body).dispatchEvent(evClick);
-            assertEquals("JS EventHandler does not work from Java call", "testClass", body.getClassName());
+            assertEquals("testClass", body.getClassName(), "JS EventHandler does not work from Java call");
         });
     }
 
@@ -368,7 +368,7 @@ public void handleEvent(Event evt) {
 
             //Style access
             CSSStyleDeclaration style = ((HTMLBodyElementImpl)body).getStyle();
-            assertEquals("Style extraction", "blue", style.getPropertyValue("background-color"));
+            assertEquals("blue", style.getPropertyValue("background-color"), "Style extraction");
         });
     }
 
@@ -379,21 +379,21 @@ public void handleEvent(Event evt) {
             for (int i = 0; i < shl.getLength(); ++i ) {
                 StyleSheet sh = shl.item(i);
                 String type = sh.getType();
-                assertEquals("Style type", "text/css", type);
+                assertEquals("text/css", type, "Style type");
                 String media = sh.getMedia().getMediaText();
                 if (i == 0) {
-                    assertEquals("Style media", "screen", media);
+                    assertEquals("screen", media, "Style media");
                 }
                 CSSRuleList rl = ((CSSStyleSheet)sh).getCssRules();
                 for (int k = 0; k < rl.getLength(); ++k ) {
                     CSSRule r = rl.item(k);
                     switch (r.getType()) {
-                    case CSSRule.MEDIA_RULE:
-                        CSSRuleList mediaRl = ((CSSMediaRule)r).getCssRules();
-                        break;
-                    case CSSRule.IMPORT_RULE:
-                        String url = ((CSSImportRule)r).getHref();
-                        break;
+                        case CSSRule.MEDIA_RULE:
+                            CSSRuleList mediaRl = ((CSSMediaRule)r).getCssRules();
+                            break;
+                        case CSSRule.IMPORT_RULE:
+                            String url = ((CSSImportRule)r).getHref();
+                            break;
                     }
                     String cssText = r.getCssText();
                 }
@@ -432,47 +432,38 @@ public void handleEvent(Event evt) {
 
             String attributeName = "test";
             Attr attr = doc.createAttribute(attributeName);
-            assertEquals("Created attribute", attributeName, attr.getName());
+            assertEquals(attributeName, attr.getName(), "Created attribute");
         });
     }
 
     // helper methods
 
     private void verifyChildRemoved(Node parent,
-            int oldChildrenCount, Node leftSibling, Node rightSibling) {
-        assertSame("Children count",
-                oldChildrenCount - 1, parent.getChildNodes().getLength());
-        assertSame("Left sibling's next sibling",
-                rightSibling, leftSibling.getNextSibling());
-        assertSame("Right sibling's previous sibling",
-                leftSibling, rightSibling.getPreviousSibling());
+                                    int oldChildrenCount, Node leftSibling, Node rightSibling) {
+        assertSame(oldChildrenCount - 1, parent.getChildNodes().getLength(), "Children count");
+        assertSame(rightSibling, leftSibling.getNextSibling(), "Left sibling's next sibling");
+        assertSame(leftSibling, rightSibling.getPreviousSibling(), "Right sibling's previous sibling");
     }
 
     private void verifyChildAdded(Node n, Node parent, int oldChildrenCount) {
-        assertEquals("Children count",
-                oldChildrenCount + 1, parent.getChildNodes().getLength());
-        assertEquals("Added node's parent",
-                parent, n.getParentNode());
+        assertEquals(oldChildrenCount + 1, parent.getChildNodes().getLength(), "Children count");
+        assertEquals(parent, n.getParentNode(), "Added node's parent");
     }
 
     private void verifySiblings(Node n, Node leftSibling, Node rightSibling) {
-        assertSame("Added node's previous sibling",
-                leftSibling, n.getPreviousSibling());
-        assertSame("Added node's next sibling",
-                rightSibling, n.getNextSibling());
+        assertSame(leftSibling, n.getPreviousSibling(), "Added node's previous sibling");
+        assertSame(rightSibling, n.getNextSibling(), "Added node's next sibling");
 
         if (leftSibling != null)
-            assertSame("Previous sibling's next sibling",
-                    n, leftSibling.getNextSibling());
+            assertSame(n, leftSibling.getNextSibling(), "Previous sibling's next sibling");
 
         if (rightSibling != null)
-            assertSame("Next sibling's previous sibling",
-                    n, rightSibling.getPreviousSibling());
+            assertSame(n, rightSibling.getPreviousSibling(), "Next sibling's previous sibling");
     }
 
     private void verifyNodeRemoved(Node n) {
-        assertNull("Removed node's parent", n.getParentNode());
-        assertNull("Removed node's previous sibling", n.getPreviousSibling());
-        assertNull("Removed node's next sibling", n.getNextSibling());
+        assertNull(n.getParentNode(), "Removed node's parent");
+        assertNull(n.getPreviousSibling(), "Removed node's previous sibling");
+        assertNull(n.getNextSibling(), "Removed node's next sibling");
     }
 }
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/DebuggerTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/DebuggerTest.java
index 7a567029d85..7cb0ebf9df1 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/DebuggerTest.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/DebuggerTest.java
@@ -31,10 +31,10 @@
 import java.util.List;
 import javafx.scene.web.WebEngineShim;
 import javafx.util.Callback;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-import org.junit.Test;
-import org.junit.After;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.AfterEach;
 
 public class DebuggerTest extends TestBase {
 
@@ -158,7 +158,7 @@ private static String q(String s) {
         return s.replace('\'', '\"');
     }
 
-    @After
+    @AfterEach
     public void disableDebug() {
         submit(() -> {
             WebEngineShim.getDebugger(getEngine()).setEnabled(false);
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/DirectoryLockTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/DirectoryLockTest.java
index caaa85c5d28..7e0db5d0a2a 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/DirectoryLockTest.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/DirectoryLockTest.java
@@ -33,12 +33,12 @@
 import java.nio.channels.OverlappingFileLockException;
 import java.util.ArrayList;
 import javafx.scene.web.DirectoryLockShim;
-import org.junit.After;
-import org.junit.AfterClass;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class DirectoryLockTest {
 
@@ -55,7 +55,7 @@ public class DirectoryLockTest {
     private final ArrayList<DirectoryLockShim> createdLocks = new ArrayList<>();
 
 
-    @BeforeClass
+    @BeforeAll
     public static void beforeClass() throws IOException {
         for (File dir : DIRS) {
             dir.mkdirs();
@@ -69,7 +69,7 @@ public static void beforeClass() throws IOException {
         }
     }
 
-    @AfterClass
+    @AfterAll
     public static void afterClass() throws IOException {
         preLockedLock.release();
         preLockedRaf.close();
@@ -79,7 +79,7 @@ public static void afterClass() throws IOException {
     }
 
 
-    @After
+    @AfterEach
     public void after() {
         for (DirectoryLockShim lock : createdLocks) {
             lock.close();
@@ -220,7 +220,7 @@ public void testCloseClosedLock() throws Exception {
 
 
     private DirectoryLockShim createLock(File directory)
-        throws IOException, DirectoryLockShim.DirectoryAlreadyInUseException
+            throws IOException, DirectoryLockShim.DirectoryAlreadyInUseException
     {
         DirectoryLockShim lock = new DirectoryLockShim(directory);
         createdLocks.add(lock);
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/EventListenerLeakTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/EventListenerLeakTest.java
index 3797a2fa6ef..775f79ea19b 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/EventListenerLeakTest.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/EventListenerLeakTest.java
@@ -40,13 +40,13 @@
 import javafx.concurrent.Worker;
 import javafx.scene.web.WebEngine;
 import javafx.scene.web.WebView;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.w3c.dom.events.Event;
 import org.w3c.dom.events.EventListener;
 import org.w3c.dom.events.EventTarget;
-import static org.junit.Assert.*;
-import org.junit.Before;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeEach;
 import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 
@@ -93,7 +93,7 @@ public void handleEvent(Event evt) {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setupOnce() throws Exception {
         final CountDownLatch startupLatch = new CountDownLatch(1);
 
@@ -101,8 +101,7 @@ public static void setupOnce() throws Exception {
             startupLatch.countDown();
         });
 
-        assertTrue("Timeout waiting for FX runtime to start",
-                startupLatch.await(15, TimeUnit.SECONDS));
+        assertTrue(startupLatch.await(15, TimeUnit.SECONDS), "Timeout waiting for FX runtime to start");
     }
 
     /**
@@ -159,8 +158,7 @@ protected void loadContent(final WebView webView, final String content) {
         });
 
         try {
-            assertTrue("Timeout waiting for content to load",
-                    loadLatch.await(5, TimeUnit.SECONDS));
+            assertTrue(loadLatch.await(5, TimeUnit.SECONDS), "Timeout waiting for content to load");
         } catch (InterruptedException ex) {
             throw new RuntimeException("Unexpected exception", ex);
         }
@@ -174,10 +172,10 @@ protected void loadContent(final WebView webView, final String content) {
     private List<EventTarget> getDomNodes(WebView webView) {
         final List<EventTarget> nodes = new ArrayList<>();
         Document doc = webView.getEngine().getDocument();
-        assertNotNull("Document", doc);
+        assertNotNull(doc, "Document");
 
         NodeList nodeList = doc.getElementsByTagName("a");
-        assertNotNull("DOM nodes", nodeList);
+        assertNotNull(nodeList, "DOM nodes");
         for (int i = 0; i < nodeList.getLength(); i++) {
             EventTarget node = (EventTarget) nodeList.item(i);
             nodes.add(node);
@@ -210,10 +208,10 @@ void assertNumActive(String msg, List<WeakReference<?>> refs, int exCount)
             Thread.sleep(250);
         }
 
-        assertEquals("Active references (" + msg + ")", exCount, count);
+        assertEquals(exCount, count, "Active references (" + msg + ")");
     }
 
-    @Before
+    @BeforeEach
     public void initEach() {
         listenerRefs = new ArrayList<>();
         webViewRefs = new ArrayList<>();
@@ -226,19 +224,19 @@ public void initEach() {
         });
     }
 
-// ---------------------------------------------------------------
+    // ---------------------------------------------------------------
     private static final String HTML =
             "<body><html>" +
-            "Link: <a id=\"link0\" href=click>click me 0</a><br>" +
-            "Link: <a id=\"link1\" href=click>click me 1</a><br>" +
-            "Link: <a id=\"link2\" href=click>click me 2</a><br>" +
-            "Link: <a id=\"link3\" href=click>click me 3</a><br>" +
-            "</html></body>";
+                    "Link: <a id=\"link0\" href=click>click me 0</a><br>" +
+                    "Link: <a id=\"link1\" href=click>click me 1</a><br>" +
+                    "Link: <a id=\"link2\" href=click>click me 2</a><br>" +
+                    "Link: <a id=\"link3\" href=click>click me 3</a><br>" +
+                    "</html></body>";
 
     private static final String HTML2 =
             "<body><html>" +
-            "Link: <a id=\"link0\" href=click>click me 0</a><br>" +
-             "</html></body>";
+                    "Link: <a id=\"link0\" href=click>click me 0</a><br>" +
+                    "</html></body>";
 
     private static final int NUM_DOM_NODES = 4;
 
@@ -269,7 +267,7 @@ public void oneWebViewSingleListenerNoRelease() throws Exception {
         Thread.sleep(100);
 
         // Verify that the event is delivered to the listener
-        assertEquals("Click count", 1, listeners.get(0).getClickCount());
+        assertEquals(1, listeners.get(0).getClickCount(), "Click count");
 
         // Clear strong reference to listener and the DOM nodes
         listeners.clear();
@@ -310,7 +308,7 @@ public void oneWebViewSingleListenerExplicitRelease() throws Exception {
 
         // Verify that the event is delivered to the listener
         assertNotNull(listeners.get(0).get());
-        assertEquals("Click count", 1, listeners.get(0).get().getClickCount());
+        assertEquals(1, listeners.get(0).get().getClickCount(), "Click count");
 
         submit(() -> {
             // Remove event listener
@@ -372,9 +370,9 @@ public void oneWebViewMultipleListenersExplicitRelease() throws Exception {
 
         // Verify that the events are delivered to the listeners (0 and 2 are same)
         Thread.sleep(100);
-        assertEquals("Click count", 2, listeners.get(0).get().getClickCount());
-        assertEquals("Click count", 1, listeners.get(1).get().getClickCount());
-        assertEquals("Click count", 2, listeners.get(2).get().getClickCount());
+        assertEquals(2, listeners.get(0).get().getClickCount(), "Click count");
+        assertEquals(1, listeners.get(1).get().getClickCount(), "Click count");
+        assertEquals(2, listeners.get(2).get().getClickCount(), "Click count");
 
         submit(() -> {
             // Remove shared event listener from dom node 0
@@ -398,9 +396,9 @@ public void oneWebViewMultipleListenersExplicitRelease() throws Exception {
 
         // Verify that one more event is delivered to each listener (0 and 2 are same)
         Thread.sleep(100);
-        assertEquals("Click count", 3, listeners.get(0).get().getClickCount());
-        assertEquals("Click count", 2, listeners.get(1).get().getClickCount());
-        assertEquals("Click count", 3, listeners.get(2).get().getClickCount());
+        assertEquals(3, listeners.get(0).get().getClickCount(), "Click count");
+        assertEquals(2, listeners.get(1).get().getClickCount(), "Click count");
+        assertEquals(3, listeners.get(2).get().getClickCount(), "Click count");
 
         submit(() -> {
             // Remove event listener from dom node 1
@@ -424,8 +422,8 @@ public void oneWebViewMultipleListenersExplicitRelease() throws Exception {
 
         // Verify that one more event is delivered to active listener (0 and 2 are same)
         Thread.sleep(100);
-        assertEquals("Click count", 4, listeners.get(0).get().getClickCount());
-        assertEquals("Click count", 4, listeners.get(2).get().getClickCount());
+        assertEquals(4, listeners.get(0).get().getClickCount(), "Click count");
+        assertEquals(4, listeners.get(2).get().getClickCount(), "Click count");
 
 
         submit(() -> {
@@ -496,7 +494,7 @@ public void oneWebViewSingleListenerImplicitRelease() throws Exception {
         assertNotNull(listeners.get(0));
 
         // Verify that the event is delivered to the listener
-        assertEquals("Click count", 1, listeners.get(0).getClickCount());
+        assertEquals(1, listeners.get(0).getClickCount(), "Click count");
 
         // Clear strong reference to listener and WebView
         listeners.clear();
@@ -541,8 +539,8 @@ public void twoWebViewSingleListenerExplicitRelease() throws Exception {
 
         // Verify that the event is delivered to the right listener
         Thread.sleep(100);
-        assertEquals("Click count", 1, listeners1.get(0).getClickCount());
-        assertEquals("Click count", 0, listeners2.get(0).getClickCount());
+        assertEquals(1, listeners1.get(0).getClickCount(), "Click count");
+        assertEquals(0, listeners2.get(0).getClickCount(), "Click count");
 
         submit(() -> {
             // Now click the other WebView's node
@@ -551,8 +549,8 @@ public void twoWebViewSingleListenerExplicitRelease() throws Exception {
 
         // Verify that the event is delivered to the right listener
         Thread.sleep(100);
-        assertEquals("Click count", 1, listeners1.get(0).getClickCount());
-        assertEquals("Click count", 1, listeners2.get(0).getClickCount());
+        assertEquals(1, listeners1.get(0).getClickCount(), "Click count");
+        assertEquals(1, listeners2.get(0).getClickCount(), "Click count");
 
         submit(() -> {
             // Remove event listener from first WebView
@@ -566,8 +564,8 @@ public void twoWebViewSingleListenerExplicitRelease() throws Exception {
         });
 
         // Verify that the event is delivered to the right listener
-        assertEquals("Click count", 1, listeners1.get(0).getClickCount());
-        assertEquals("Click count", 2, listeners2.get(0).getClickCount());
+        assertEquals(1, listeners1.get(0).getClickCount(), "Click count");
+        assertEquals(2, listeners2.get(0).getClickCount(), "Click count");
 
         // Release strong reference to listener and the DOM nodes
         listeners1.clear();
@@ -588,7 +586,7 @@ public void twoWebViewSingleListenerExplicitRelease() throws Exception {
 
         // Verify that no more events are delivered
         Thread.sleep(100);
-        assertEquals("Click count", 2, listeners2.get(0).getClickCount());
+        assertEquals(2, listeners2.get(0).getClickCount(), "Click count");
 
         // Release strong reference to listener and the DOM nodes
         listeners2.clear();
@@ -622,7 +620,7 @@ public void testStrongRefNewContentLoad() throws Exception {
 
         // Verify that the event is delivered to the right listener
         Thread.sleep(100);
-        assertEquals("Click count", 1, listeners.get(0).getClickCount());
+        assertEquals(1, listeners.get(0).getClickCount(), "Click count");
 
         // load new content
         loadContent(webView1, HTML2);
@@ -634,7 +632,7 @@ public void testStrongRefNewContentLoad() throws Exception {
 
         // Verify that the click event is not delivered to the event handler.
         Thread.sleep(100);
-        assertEquals("Click count", 1, listeners.get(0).getClickCount());
+        assertEquals(1, listeners.get(0).getClickCount(), "Click count");
         // Verify that even a new content has been loaded , previously register listener is active
         assertNumActive("MyListener", listenerRefs, 1);
 
@@ -679,7 +677,7 @@ public void oneWebViewRefCountTest() throws Exception {
 
         // Verify that all three refer to same listener
         Thread.sleep(100);
-        assertEquals("Click count", 3, listeners.get(0).get().getClickCount());
+        assertEquals(3, listeners.get(0).get().getClickCount(), "Click count");
 
         //save for later
         MyListener tmpListener = listeners.get(0).get();
@@ -700,7 +698,7 @@ public void oneWebViewRefCountTest() throws Exception {
 
         // verify that the events are not delivered, which is why the count should be remains at 3.
         Thread.sleep(100);
-        assertEquals("Click count", 3, listeners.get(0).get().getClickCount());
+        assertEquals(3, listeners.get(0).get().getClickCount(), "Click count");
 
         // add events listeners again
         submit(() -> {
@@ -729,7 +727,7 @@ public void oneWebViewRefCountTest() throws Exception {
 
         // Verify that the events are delivered to the listeners (0, 1 and 2 are same)
         Thread.sleep(100);
-        assertEquals("Click count", 6, listeners.get(1).get().getClickCount() + listeners.get(0).get().getClickCount());
+        assertEquals(6, listeners.get(1).get().getClickCount() + listeners.get(0).get().getClickCount(), "Click count");
 
         // remove events listeners again
         submit(() -> {
@@ -752,7 +750,7 @@ public void oneWebViewRefCountTest() throws Exception {
 
         // Verify that the events count should not be increased
         Thread.sleep(100);
-        assertEquals("Click count", 6, listeners.get(1).get().getClickCount() + listeners.get(0).get().getClickCount());
+        assertEquals(6, listeners.get(1).get().getClickCount() + listeners.get(0).get().getClickCount(), "Click count");
 
         // Release strong reference to listener and the DOM nodes
         listeners.clear();
@@ -809,7 +807,7 @@ public void oneWebViewMultipleListenersImplicitRelease() throws Exception {
 
         // Verify that the events are delivered
         Thread.sleep(100);
-        assertEquals("Click count", 2, listeners.get(0).get().getClickCount());
+        assertEquals(2, listeners.get(0).get().getClickCount(), "Click count");
 
         // make web view , goes out of scope
         domNodes1.clear();
@@ -883,7 +881,7 @@ public void multipleWebViewMultipleListenersImplicitRelease() throws Exception {
 
         // Verify that the events are delivered to both webviews
         Thread.sleep(100);
-        assertEquals("Click count", 3, listeners.get(0).get().getClickCount());
+        assertEquals(3, listeners.get(0).get().getClickCount(), "Click count");
 
         domNodes1.clear();
         webView1 = null;
@@ -897,8 +895,8 @@ public void multipleWebViewMultipleListenersImplicitRelease() throws Exception {
 
         // Verify that the events are delivered to webview2
         Thread.sleep(100);
-        assertEquals("Click count", 4, listeners.get(0).get().getClickCount());
-        assertEquals("Click count", 4, listeners.get(2).get().getClickCount());
+        assertEquals(4, listeners.get(0).get().getClickCount(), "Click count");
+        assertEquals(4, listeners.get(2).get().getClickCount(), "Click count");
         // Verify that listener is still strongly held
         assertNumActive("listeners", listenerRefs, 3);
 
@@ -915,7 +913,7 @@ public void multipleWebViewMultipleListenersImplicitRelease() throws Exception {
 
         // Verify that the event is not delivered to webview2 for shared listener
         Thread.sleep(100);
-        assertEquals("Click count", 2, listeners.get(4).get().getClickCount());
+        assertEquals(2, listeners.get(4).get().getClickCount(), "Click count");
 
         // check active listeners
         listeners.clear();
@@ -955,8 +953,8 @@ public void oneWebViewMultipleListenerSameNode() throws Exception {
 
         Thread.sleep(100);
         // Verify that the event is delivered to the listener
-        assertEquals("Click count", 1, listeners.get(0).getClickCount());
-        assertEquals("Click count", 1, listeners.get(1).getClickCount());
+        assertEquals(1, listeners.get(0).getClickCount(), "Click count");
+        assertEquals(1, listeners.get(1).getClickCount(), "Click count");
 
         submit(() -> {
             // Remove event listener
@@ -967,8 +965,8 @@ public void oneWebViewMultipleListenerSameNode() throws Exception {
 
         Thread.sleep(100);
         // Verify that listener has been released
-        assertEquals("Click count", 1, listeners.get(0).getClickCount());
-        assertEquals("Click count", 2, listeners.get(1).getClickCount());
+        assertEquals(1, listeners.get(0).getClickCount(), "Click count");
+        assertEquals(2, listeners.get(1).getClickCount(), "Click count");
         // Verify that active listener
         assertNumActive("MyListener", listenerRefs, 2);
 
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/FileReaderTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/FileReaderTest.java
index efe94a75aff..21218f87164 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/FileReaderTest.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/FileReaderTest.java
@@ -39,13 +39,13 @@
 import javafx.scene.web.WebEngineShim;
 
 import static javafx.concurrent.Worker.State.SUCCEEDED;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import netscape.javascript.JSObject;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class FileReaderTest extends TestBase {
     private final WebPage page = WebEngineShim.getPage(getEngine());
@@ -87,7 +87,7 @@ private String getScriptString(String readAPI, String slice, boolean abort) {
         return scriptContent;
     }
 
-    @Before
+    @BeforeEach
     public void before() {
         latch = new CountDownLatch(1);
         UIClientImplShim.test_setChooseFiles(fileList);
@@ -99,8 +99,8 @@ private void loadFileReaderTestScript(String testScript) {
     }
 
     private void testLatch(CountDownLatch latch) {
-        assertTrue("Page load is not finished yet", getLoadState() == SUCCEEDED);
-        assertNotNull("Document should not be null", getEngine().getDocument());
+        assertTrue(getLoadState() == SUCCEEDED, "Page load is not finished yet");
+        assertNotNull(getEngine().getDocument(), "Document should not be null");
         submit(() -> {
             final JSObject window = (JSObject) getEngine().executeScript("window");
             assertNotNull(window);
@@ -119,84 +119,96 @@ private void testLatch(CountDownLatch latch) {
     @Test public void testReadAsTextWithoutSlice() {
         loadFileReaderTestScript(getScriptString("readAsText", "", false));
         submit(() -> {
-            assertEquals("Unexpected file content received", "Hello World", getEngine().executeScript("window.result"));
+            assertEquals("Hello World", getEngine().executeScript("window.result"),
+                    "Unexpected file content received");
         });
     }
 
     @Test public void testReadAsTextWithSlice() {
         loadFileReaderTestScript(getScriptString("readAsText", ".slice()", false));
         submit(() -> {
-            assertEquals("Unexpected file content received", "Hello World", getEngine().executeScript("window.result"));
+            assertEquals("Hello World", getEngine().executeScript("window.result"),
+                    "Unexpected file content received");
         });
     }
 
     @Test public void testReadAsTexWithSliceWithValidStartAndEnd() {
         loadFileReaderTestScript(getScriptString("readAsText", ".slice(3, 7)", false));
         submit(() -> {
-            assertEquals("Unexpected file content received", "lo W", getEngine().executeScript("window.result"));
+            assertEquals("lo W", getEngine().executeScript("window.result"),
+                    "Unexpected file content received");
         });
     }
 
     @Test public void testReadAsTexWithSliceWithEndAsFileLength() {
         loadFileReaderTestScript(getScriptString("readAsText", ".slice(3, file.length)", false));
         submit(() -> {
-            assertEquals("Unexpected file content received", "lo World", getEngine().executeScript("window.result"));
+            assertEquals("lo World", getEngine().executeScript("window.result"),
+                    "Unexpected file content received");
         });
     }
 
     @Test public void testReadAsTexWithSliceWithOnlyStartAsFileLength() {
         loadFileReaderTestScript(getScriptString("readAsText", ".slice(file.length)", false));
         submit(() -> {
-            assertEquals("Unexpected file content received", "Hello World", getEngine().executeScript("window.result"));
+            assertEquals("Hello World", getEngine().executeScript("window.result"),
+                    "Unexpected file content received");
         });
     }
 
     @Test public void testReadAsTexWithSliceWithStartAsNegetiveValue() {
         loadFileReaderTestScript(getScriptString("readAsText", ".slice(-7, file.length)", false));
         submit(() -> {
-            assertEquals("Unexpected file content received", "o World", getEngine().executeScript("window.result"));
+            assertEquals("o World", getEngine().executeScript("window.result"),
+                    "Unexpected file content received");
         });
     }
 
     @Test public void testReadAsTexWithSliceWithStartAsFileLength() {
         loadFileReaderTestScript(getScriptString("readAsText", ".slice(file.length, 3)", false));
         submit(() -> {
-            assertEquals("Unexpected file content received", "Hel", getEngine().executeScript("window.result"));
+            assertEquals("Hel", getEngine().executeScript("window.result"),
+                    "Unexpected file content received");
         });
     }
 
     @Test public void testReadAsTexWithSliceWithEndAsNegetiveValue() {
         loadFileReaderTestScript(getScriptString("readAsText", ".slice(file.length, -3)", false));
         submit(() -> {
-            assertEquals("Unexpected file content received", "Hello Wo", getEngine().executeScript("window.result"));
+            assertEquals("Hello Wo", getEngine().executeScript("window.result"),
+                    "Unexpected file content received");
         });
     }
 
     @Test public void testReadAsTexWithSliceWithEndAsBeyondFileLength() {
         loadFileReaderTestScript(getScriptString("readAsText", ".slice(file.length, -100)", false));
         submit(() -> {
-            assertEquals("Unexpected file content received", "", getEngine().executeScript("window.result"));
+            assertEquals("", getEngine().executeScript("window.result"),
+                    "Unexpected file content received");
         });
     }
 
     @Test public void testReadAsTexWithSliceWithBeginAsValidValue() {
         loadFileReaderTestScript(getScriptString("readAsText", ".slice(6)", false));
         submit(() -> {
-            assertEquals("Unexpected file content received", "World", getEngine().executeScript("window.result"));
+            assertEquals("World", getEngine().executeScript("window.result"),
+                    "Unexpected file content received");
         });
     }
 
     @Test public void testReadAsTexWithSliceWithOnlyStartAsNegetiveValue() {
         loadFileReaderTestScript(getScriptString("readAsText", ".slice(-3)", false));
         submit(() -> {
-            assertEquals("Unexpected file content received", "rld", getEngine().executeScript("window.result"));
+            assertEquals("rld", getEngine().executeScript("window.result"),
+                    "Unexpected file content received");
         });
     }
 
     @Test public void testReadAsTexWithSliceWithStartAndEndAsNegetiveValues() {
         loadFileReaderTestScript(getScriptString("readAsText", ".slice(-3, -7)", false));
         submit(() -> {
-            assertEquals("Unexpected file content received", "", getEngine().executeScript("window.result"));
+            assertEquals("", getEngine().executeScript("window.result"),
+                    "Unexpected file content received");
         });
     }
 
@@ -206,14 +218,14 @@ private void testLatch(CountDownLatch latch) {
         loadFileReaderTestScript(getScriptString("readAsBinaryString", "", false));
         FileInputStream in = new FileInputStream(binaryFile[0]);
         final byte[] expectedBinaryData = in.readAllBytes();
-        assertNotNull("BinaryFile content should not be null", expectedBinaryData);
+        assertNotNull(expectedBinaryData, "BinaryFile content should not be null");
         submit(() -> {
             try {
                 final String obj = (String) getEngine().executeScript("window.result");
                 // setting encoding scheme to ISO-8859-1 for binary data as webkit uses the same.
                 final byte[] binBytes = obj.getBytes("ISO-8859-1");
-                assertNotNull("BinaryFile content read should not be null", binBytes);
-                assertArrayEquals("Unexpected file content received", expectedBinaryData, binBytes);
+                assertNotNull(binBytes, "BinaryFile content read should not be null");
+                assertArrayEquals(expectedBinaryData, binBytes, "Unexpected file content received");
             } catch (UnsupportedEncodingException ex) {
                 throw new AssertionError(ex);
             }
@@ -226,10 +238,14 @@ private void testLatch(CountDownLatch latch) {
             final byte[] expectedArrayBuffer = in.readAllBytes();
             submit(() -> {
                 final JSObject obj = (JSObject) getEngine().executeScript("new Uint8Array(window.result)");
-                assertEquals(String.format("%s length must be equal in both Java & JavaScript", fileList[0]),
-                                       expectedArrayBuffer.length, obj.getMember("length"));
+                String filePath = fileList[0];
+                int expectedLength = expectedArrayBuffer.length;
+                int actualLength = (Integer) obj.getMember("length");
+                String message = String.format("File at %s: Expected length %d but got %d",
+                        filePath, expectedLength, actualLength);
+                assertEquals(expectedLength, actualLength, message);
                 for (int i = 0; i < expectedArrayBuffer.length; i++) {
-                    assertEquals("Unexpected file content received", expectedArrayBuffer[i], ((Number)(obj.getSlot(i))).byteValue());
+                    assertEquals(expectedArrayBuffer[i], ((Number)(obj.getSlot(i))).byteValue(), "Unexpected file content received");
                 }
             });
         } catch (IOException ex){
@@ -244,15 +260,14 @@ private void testLatch(CountDownLatch latch) {
             submit(() -> {
                 try {
                     String encodedData = (String) getEngine().executeScript("window.result");
-                    assertNotNull("window.result must have base64 encoded data", encodedData);
-                    assertEquals("Base64 EncodedData is not same as window.result",
-                                   "data:text/plain;base64,SGVsbG8gV29ybGQ=", encodedData);
+                    assertNotNull(encodedData, "window.result must have base64 encoded data");
+                    assertEquals("data:text/plain;base64,SGVsbG8gV29ybGQ=", encodedData, "Base64 EncodedData is not same as window.result");
                     encodedData = encodedData.split(",")[1];
                     assertNotNull(encodedData);
                     final byte[] decodedData = Base64.getDecoder().decode(encodedData);
-                    assertNotNull("Base64 decoded data must be valid", decodedData);
-                    assertEquals("Base64 DecodedData is not same as File Content",
-                        new String(expectedArrayBuffer, "utf-8"), new String(decodedData, "utf-8"));
+                    assertNotNull(decodedData, "Base64 decoded data must be valid");
+                    assertEquals(new String(expectedArrayBuffer, "utf-8"), new String(decodedData, "utf-8"),
+                            "Base64 DecodedData is not same as File Content");
                 } catch (UnsupportedEncodingException e) {
                     throw new AssertionError(e);
                 }
@@ -265,8 +280,8 @@ private void testLatch(CountDownLatch latch) {
     @Test public void testAbort() {
         loadFileReaderTestScript(getScriptString("readAsText", "", true));
         submit(() -> {
-            assertEquals("Unexpected file content received", "failed due to abort",
-                          getEngine().executeScript("window.result"));
+            assertEquals("failed due to abort", getEngine().executeScript("window.result"),
+                    "Unexpected file content received");
         });
     }
 }
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/FileTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/FileTest.java
index 515a20ef28e..afd19af7be9 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/FileTest.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/FileTest.java
@@ -33,27 +33,27 @@
 import javafx.concurrent.Worker.State;
 import javafx.scene.web.WebEngineShim;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class FileTest extends TestBase {
     private final WebPage page = WebEngineShim.getPage(getEngine());
     private final String[] fileList = { new File("src/test/resources/test/html/HelloWorld.txt").getAbsolutePath() };
     private final String script = String.format("<script type='text/javascript'>" +
-                                    "var result;" +
-                                    "window.addEventListener('click', (e) => {" +
-                                        "document.getElementById('file').click();" +
-                                    "});" +
-                                    "function readFile()" +
-                                    "{" +
-                                        "file = event.target.files[0];" +
-                                        "result = file.name;" +
-                                    "}" +
-                                    "</script>" +
-                                    "<body> <input type='file' id='file' onchange='readFile()'/> </body>");
-    @Before
+            "var result;" +
+            "window.addEventListener('click', (e) => {" +
+            "document.getElementById('file').click();" +
+            "});" +
+            "function readFile()" +
+            "{" +
+            "file = event.target.files[0];" +
+            "result = file.name;" +
+            "}" +
+            "</script>" +
+            "<body> <input type='file' id='file' onchange='readFile()'/> </body>");
+    @BeforeEach
     public void before() {
         UIClientImplShim.test_setChooseFiles(fileList);
     }
@@ -70,7 +70,7 @@ private void loadFileReaderTestScript(String testScript) {
     public void testFileName() {
         loadFileReaderTestScript(script);
         submit(() -> {
-            assertEquals("Unexpected file name received", "HelloWorld.txt", getEngine().executeScript("window.result"));
+            assertEquals("HelloWorld.txt", getEngine().executeScript("window.result"), "Unexpected file name received");
         });
     }
 }
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/FormControlsTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/FormControlsTest.java
index b284ce9138f..1e29e1e237c 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/FormControlsTest.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/FormControlsTest.java
@@ -36,46 +36,36 @@
 import javafx.scene.Node;
 import javafx.scene.web.WebEngineShim;
 
-import org.junit.After;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized.Parameters;
-import org.junit.runners.Parameterized;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-@RunWith(Parameterized.class)
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.Arguments;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.stream.Stream;
+
 public final class FormControlsTest extends TestBase {
 
     private static final PrintStream ERR = System.err;
 
-    // To arguments from junit data provider.
-    private final String element;
-    private final String selector;
-
-    // TODO: junit 4.11 provides an option to label arguments.
-    @Parameters
-    public static Collection<String[]> data() {
-        return Arrays.asList(new String[][] {
-            {"<input type='checkbox'/>", "check-box"},
-            {"<input type='radio'/>", "radio-button"},
-            {"<input type='button'/>", "button"},
-            {"<input type='text'/>", "text-field"},
-            {"<meter value='06'>60%</meter>", "progress-bar"},
-            {"<input type='range'/>", "slider"},
-            // TODO: Add other form controls once it is enabled
-            // from WebKit.
-        });
-    }
-
-    public FormControlsTest(final String element, final String selector) {
-        this.element = element;
-        this.selector = selector;
+    static Stream<Arguments> dataProvider() {
+        return Stream.of(
+                Arguments.of("<input type='checkbox'/>", "check-box"),
+                Arguments.of("<input type='radio'/>", "radio-button"),
+                Arguments.of("<input type='button'/>", "button"),
+                Arguments.of("<input type='text'/>", "text-field"),
+                Arguments.of("<meter value='06'>60%</meter>", "progress-bar"),
+                Arguments.of("<input type='range'/>", "slider")
+                // TODO: Add other form controls once it is enabled from WebKit.
+        );
     }
 
-    private void printWithFormControl(final Runnable testBody) {
+    private void printWithFormControl(final Runnable testBody, String element, String selector) {
         final ByteArrayOutputStream errStream = new ByteArrayOutputStream();
 
         System.setErr(new PrintStream(errStream));
@@ -84,56 +74,56 @@ private void printWithFormControl(final Runnable testBody) {
         System.setErr(ERR);
 
         final String exMessage = errStream.toString();
-        assertFalse(String.format("%s:Test failed with exception:\n%s", selector, exMessage),
-            exMessage.contains("Exception") || exMessage.contains("Error"));
+        assertFalse(exMessage.contains("Exception") || exMessage.contains("Error"),
+                String.format("%s: Test failed with exception:\n%s", selector, exMessage));
     }
 
-    @Test
-    public void testRendering() {
+    @ParameterizedTest
+    @MethodSource("dataProvider")
+    public void testRendering(String element, String selector) {
         final Runnable testBody = () -> {
             final WebPage page = WebEngineShim.getPage(getEngine());
             assertNotNull(page);
             WebPageShim.mockPrint(page, 0, 0, 800, 600);
             final Set<Node> elements = getView().lookupAll("." + selector);
-            // Check whether control is added as a children of WebView.
-            assertEquals(
-                String.format("%s control doesn't exists as child of WebView", selector),
-                1,
-                elements.size());
+            // Check whether control is added as a child of WebView.
+            assertEquals(1, elements.size(),
+                    String.format("%s control doesn't exist as child of WebView", selector));
             final Node node = (Node) elements.toArray()[0];
-            // Check whether Node's styleClass contains given selector.
-            assertTrue(
-                String.format("%s styleClass=%s is incorrect", node.getTypeSelector(), selector),
-                node.getStyleClass().contains(selector));
+            // Check whether Node's styleClass contains the given selector.
+            assertTrue(node.getStyleClass().contains(selector),
+                    String.format("%s styleClass=%s is incorrect", node.getTypeSelector(), selector));
         };
 
-        printWithFormControl(testBody);
+        printWithFormControl(testBody, element, selector);
     }
 
-    @Test
-    public void testPrint() {
+    @ParameterizedTest
+    @MethodSource("dataProvider")
+    public void testPrint(String element, String selector) {
         final Runnable testBody = () -> {
             final WebPage page = WebEngineShim.getPage(getEngine());
             assertNotNull(page);
             WebPageShim.mockPrint(page, 0, 0, 800, 600);
         };
 
-        printWithFormControl(testBody);
+        printWithFormControl(testBody, element, selector);
     }
 
-    @Test
-    public void testPrintByPageNumber() {
+    @ParameterizedTest
+    @MethodSource("dataProvider")
+    public void testPrintByPageNumber(String element, String selector) {
         final Runnable testBody = () -> {
             final WebPage page = WebEngineShim.getPage(getEngine());
             assertNotNull(page);
             WebPageShim.mockPrintByPage(page, 0, 0, 0, 800, 600);
         };
-        printWithFormControl(testBody);
+
+        printWithFormControl(testBody, element, selector);
     }
 
-    @After
+    @AfterEach
     public void teardown() {
         System.setErr(ERR);
     }
 }
-
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/HTMLEditingTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/HTMLEditingTest.java
index 0a21628208b..9bb83e0fd43 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/HTMLEditingTest.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/HTMLEditingTest.java
@@ -31,12 +31,12 @@
 import javafx.scene.input.ClipboardContent;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
-import org.junit.Test;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Disabled;
 
 import static javafx.concurrent.Worker.State.SUCCEEDED;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class HTMLEditingTest extends TestBase {
 
@@ -45,22 +45,21 @@ public class HTMLEditingTest extends TestBase {
      * @bug 8143894
      * summary intercept clipboard data in javascript for onpaste event
      */
-    @Ignore("JDK-8290237")
+    @Disabled("JDK-8290237")
     @Test public void clipboardGetDataOnPaste() {
         // Read the clipboard data from JavaScript onpaste event
         // Verify the paste data from pasteTarget element
         String defaultText = "Default";
         loadContent(
                 "<input id='srcInput' value=" + defaultText + " autofocus>" +
-                "<input id='pasteTarget'></input>" +
-                "<script>"+
-                "srcInput.onpaste = function(e) {" +
-                "pasteTarget.value = e.clipboardData.getData('text/plain');}" +
-                "</script>");
+                        "<input id='pasteTarget'></input>" +
+                        "<script>"+
+                        "srcInput.onpaste = function(e) {" +
+                        "pasteTarget.value = e.clipboardData.getData('text/plain');}" +
+                        "</script>");
 
         submit(() -> {
-            assertTrue("LoadContent completed successfully",
-                    getEngine().getLoadWorker().getState() == SUCCEEDED);
+            assertTrue(getEngine().getLoadWorker().getState() == SUCCEEDED, "LoadContent completed successfully");
             String clipboardData = "Clipboard text";
             ClipboardContent content = new ClipboardContent();
             content.putString(clipboardData);
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/HistoryStateTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/HistoryStateTest.java
index 93e7bc208d8..1f2a3956634 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/HistoryStateTest.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/HistoryStateTest.java
@@ -25,8 +25,8 @@
 
 package test.javafx.scene.web;
 
-import org.junit.Test;
-import org.junit.Before;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeEach;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -34,11 +34,11 @@
 import javafx.collections.ObservableList;
 import javafx.scene.web.WebHistory;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class HistoryStateTest extends TestBase {
     private static final CountDownLatch historyStateLatch = new CountDownLatch(3);
@@ -64,7 +64,7 @@ public class HistoryStateTest extends TestBase {
 
     private static final int TIMEOUT = 30;    // seconds
 
-    @Before
+    @BeforeEach
     public void before() {
         load(HistoryStateTest.class.getClassLoader().getResource(
                 resourcePath + initialLoadUrl).toExternalForm());
@@ -72,57 +72,50 @@ public void before() {
 
     @Test
     public void pushAndReplaceTest() throws Exception {
+        // Assuming executeScript is a method that returns an Object
+        Object historyState = executeScript(historyStateScript);
+        Object historyLength = executeScript(historyLengthScript);
+
         // Initial history.state should be null
-        assertNull(historyStateScript + " : Failed",
-                executeScript(historyStateScript));
+        assertNull(historyState, historyStateScript + " : Failed");
+
         // Initial history.length will be 1
-        assertEquals(historyLengthScript + " : Failed",
-                1, executeScript(historyLengthScript));
+        assertEquals(1, historyLength, historyLengthScript + " : Failed");
 
         // history.pushState({push1Key : 1}, '', '?firstLoadUrl"');
         executeScript(historyPushScript1);
         // Check if the history.state object for not null
-        assertNotNull(historyStateScript + " : Failed",
-                executeScript(historyStateScript));
+        assertNotNull(executeScript(historyStateScript), historyStateScript + " : Failed");
         // {push1Key : 1} : {key = push1Key :value = (Integer) 1}
-        assertEquals("history.state.push1key Failed",
-                1, executeScript("history.state.push1key"));
+        assertEquals(1, executeScript("history.state.push1key"), "history.state.push1key Failed");
 
         // history.length expected to be 2
         // Initial load + history.pushState(...)
-        assertEquals(historyLengthScript + " : Failed",
-                2, executeScript(historyLengthScript));
+        assertEquals(2, executeScript(historyLengthScript), historyLengthScript + " : Failed");
 
         // Check for WebEngine location is updated with new URL
-        assertTrue(historyPushScript1 + " : Failed",
-                getEngine().getLocation().endsWith(firstLoadUrl));
+        assertTrue(getEngine().getLocation().endsWith(firstLoadUrl), historyPushScript1 + " : Failed");
 
 
         executeScript(historyPushScript2);
         // {push2Key : 2} : {key = push1Key :value = (Integer) 2}
-        assertEquals("history.state.push1key Failed",
-                2, executeScript("history.state.push2key"));
+        assertEquals(2, executeScript("history.state.push2key"), "history.state.push1key Failed");
 
         // history.length expected to be 2
         // Initial load + history.pushState(...)
-        assertEquals(historyLengthScript + " : Failed",
-                3, executeScript(historyLengthScript));
+        assertEquals(3, executeScript(historyLengthScript), historyLengthScript + " : Failed");
 
         // Check for WebEngine location is updated with new URL
-        assertTrue(historyPushScript2 + " : Failed",
-                getEngine().getLocation().endsWith(secondLoadUrl));
+        assertTrue(getEngine().getLocation().endsWith(secondLoadUrl), historyPushScript2 + " : Failed");
 
         executeScript(historyReplaceScript);
         // history.length remains same
-        assertEquals(historyLengthScript + " : Failed",
-                3, executeScript(historyLengthScript));
+        assertEquals(3, executeScript(historyLengthScript), historyLengthScript + " : Failed");
 
-        assertEquals("history.state.replaceObject Failed",
-                3, executeScript("history.state.replaceObject"));
+        assertEquals(3, executeScript("history.state.replaceObject"), "history.state.replaceObject Failed");
 
         // Check for WebEngine location is updated with new URL
-        assertTrue(historyPushScript2 + " : Failed",
-                getEngine().getLocation().endsWith(replaceLoadUrl));
+        assertTrue(getEngine().getLocation().endsWith(replaceLoadUrl), historyPushScript2 + " : Failed");
 
         submit(() -> {
             getEngine().locationProperty().addListener((observable, previousUrl, newUrl) -> {
@@ -160,7 +153,7 @@ public void pushAndReplaceTest() throws Exception {
         } catch (InterruptedException ex) {
             throw new AssertionError(ex);
         } finally {
-            assertEquals("history navigation using javascript failed", 2, historyListenerIndex.get());
+            assertEquals(2, historyListenerIndex.get(), "history navigation using javascript failed");
         }
     }
 
@@ -175,9 +168,9 @@ public void testDocumentExistenceAfterPushState() {
         assertNotNull(getEngine().getDocument());
 
         executeScript("history.pushState('push', 'title', 'pushState.html')");
-        assertNotNull("Document shouldn't be null after history.pushState", getEngine().getDocument());
-        assertTrue("location must end with pushState.html", getEngine().getLocation().endsWith("pushState.html"));
-        assertEquals("history count should be incremented", initialHistorySize + 1, history.size());
+        assertNotNull(getEngine().getDocument(), "Document shouldn't be null after history.pushState");
+        assertTrue(getEngine().getLocation().endsWith("pushState.html"), "location must end with pushState.html");
+        assertEquals(initialHistorySize + 1, history.size(), "history count should be incremented");
     }
 
     // JDK-8204856
@@ -191,9 +184,9 @@ public void testDocumentExistenceAfterReplaceState() {
         assertNotNull(getEngine().getDocument());
 
         executeScript("history.replaceState('push', 'title', 'replaceState.html')");
-        assertNotNull("Document shouldn't be null after history.replaceState", getEngine().getDocument());
-        assertTrue("location must end with replaceState.html", getEngine().getLocation().endsWith("replaceState.html"));
-        assertEquals("history count shouldn't be incremented", initialHistorySize, history.size());
+        assertNotNull(getEngine().getDocument(), "Document shouldn't be null after history.replaceState");
+        assertTrue(getEngine().getLocation().endsWith("replaceState.html"), "location must end with replaceState.html");
+        assertEquals(initialHistorySize, history.size(), "history count shouldn't be incremented");
     }
 }
 
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/HistoryTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/HistoryTest.java
index e803b8f725b..90969f52be5 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/HistoryTest.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/HistoryTest.java
@@ -33,10 +33,10 @@
 import javafx.collections.ListChangeListener;
 import java.util.Date;
 
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class HistoryTest extends TestBase {
     WebHistory history = getEngine().getHistory();
@@ -62,7 +62,7 @@ public class HistoryTest extends TestBase {
             } catch (IndexOutOfBoundsException ex) {}
 
             history.setMaxSize(99);
-            assertEquals("max size is wrong", history.getMaxSize(), 99);
+            assertEquals(history.getMaxSize(), 99, "max size is wrong");
         });
 
         // [1*]
@@ -78,8 +78,8 @@ public class HistoryTest extends TestBase {
             @Override
             public void onChanged(ListChangeListener.Change<? extends WebHistory.Entry> c) {
                 c.next();
-                assertTrue("entries: change is wrong", c.wasAdded());
-                assertTrue("entries: size is wrong", c.getAddedSubList().size() == 1);
+                assertTrue(c.wasAdded(), "entries: change is wrong");
+                assertTrue(c.getAddedSubList().size() == 1, "entries: size is wrong");
                 history.getEntries().removeListener(this);
                 entriesChanged.set(true);
             }
@@ -99,8 +99,8 @@ public void onChanged(ListChangeListener.Change<? extends WebHistory.Entry> c) {
         //
         history.getEntries().get(history.getCurrentIndex()).titleProperty().addListener(new ChangeListener<String>() {
             public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) {
-                assertEquals("entries: old title is wrong", "3", oldValue);
-                assertEquals("entries: new title is wrong", "hello", newValue);
+                assertEquals(oldValue, "entries: old title is wrong", "3");
+                assertEquals(newValue, "entries: new title is wrong", "hello");
                 observable.removeListener(this);
                 titleChanged.set(true);
             }
@@ -120,8 +120,8 @@ public void changed(ObservableValue<? extends String> observable, String oldValu
         history.currentIndexProperty().addListener(new ChangeListener<Number>() {
             @Override
             public void changed(ObservableValue<? extends java.lang.Number> observable, Number oldValue, Number newValue) {
-                assertEquals("currentIndexProperty: old index is wrong", 2, oldValue);
-                assertEquals("currentIndexProperty: new index is wrong", 1, newValue);
+                assertEquals(2, oldValue, "currentIndexProperty: old index is wrong");
+                assertEquals(1, newValue, "currentIndexProperty: new index is wrong");
                 observable.removeListener(this);
                 indexChanged.set(true);
             }
@@ -197,9 +197,9 @@ public void changed(ObservableValue<? extends java.lang.Number> observable, Numb
         submit(() -> {
             // [2, 3*]
             history.setMaxSize(2);
-            assertEquals("entries: size is wrong", 2, history.getEntries().size());
+            assertEquals(2, history.getEntries().size(), "entries: size is wrong");
             //JDK-8335596
-            //assertEquals("entries: title is wrong", "2", history.getEntries().get(0).getTitle());
+            //assertEquals(history.getEntries().get(0).getTitle(), "entries: title is wrong", "2");
         });
 
         submit(() -> {
@@ -250,7 +250,7 @@ public void changed(ObservableValue<? extends java.lang.Number> observable, Numb
         submit(() -> {
             // []
             history.setMaxSize(0);
-            assertEquals("maxSizeProperty: wrong value", 0, history.getEntries().size());
+            assertEquals(0, history.getEntries().size(), "maxSizeProperty: wrong value");
 
             // []
             try {
@@ -266,13 +266,13 @@ void checkLoad(File file, int size, int index, String title) {
     }
 
     void check(File file, int size, int index, String title) {
-        assertEquals("entries: size is wrong", size, history.getEntries().size());
-        assertEquals("currentIndex: index is wrong", index, history.getCurrentIndex());
-        assertEquals("entries: url is wrong", file.toURI().toString(), history.getEntries().get(index).getUrl());
+        assertEquals(size, history.getEntries().size(), "entries: size is wrong");
+        assertEquals(index, history.getCurrentIndex(), "currentIndex: index is wrong");
+        assertEquals(file.toURI().toString(), history.getEntries().get(index).getUrl(), "entries: url is wrong");
         /*
         The following assert causes test failure after JDK-8268849.
         An issue is raised: JDK-8269912, to investigate the failure.
-        // assertEquals("entries: title is wrong", title, history.getEntries().get(index).getTitle());
+        // assertEquals(title, history.getEntries().get(index).getTitle(), "entries: title is wrong");
         */
     }
 
@@ -291,13 +291,13 @@ public void changed(ObservableValue<? extends Date> observable, Date oldValue, D
                 long curTime = System.currentTimeMillis();
 
                 if (newValue.before(oldValue) ||
-                    newValue.getTime() < startTime ||
-                    newValue.getTime() > curTime)
+                        newValue.getTime() < startTime ||
+                        newValue.getTime() > curTime)
                 {
                     System.out.println("oldValue=" + oldValue.getTime() +
-                                       ", newValue=" + newValue.getTime() +
-                                       ", startTime=" + startTime +
-                                       ", curTime=" + curTime);
+                            ", newValue=" + newValue.getTime() +
+                            ", startTime=" + startTime +
+                            ", curTime=" + curTime);
 
                     fail("entries: date is wrong");
                 }
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/IrresponsiveScriptTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/IrresponsiveScriptTest.java
index 3051a65e50c..0e5cde715a8 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/IrresponsiveScriptTest.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/IrresponsiveScriptTest.java
@@ -30,10 +30,10 @@
 import javafx.event.EventHandler;
 import javafx.scene.web.WebEvent;
 import netscape.javascript.JSException;
-import org.junit.Test;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Disabled;
 
-@Ignore("JDK-8280421")
+@Disabled("JDK-8280421")
 public class IrresponsiveScriptTest extends TestBase {
 
     @Test public void testInfiniteLoopInScript() {
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/JavaScriptBridgeTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/JavaScriptBridgeTest.java
index 2aa37f40d4e..198c4cd3e9e 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/JavaScriptBridgeTest.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/JavaScriptBridgeTest.java
@@ -28,8 +28,9 @@
 import javafx.scene.web.WebEngine;
 import netscape.javascript.JSException;
 import netscape.javascript.JSObject;
-import static org.junit.Assert.*;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import org.w3c.dom.Document;
 
 public class JavaScriptBridgeTest extends TestBase {
@@ -685,17 +686,19 @@ public void throwException2() {
     }
 
     // JDK-8187568
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testcheckJSPeerTostring() {
         final JSObject doc = (JSObject) executeScript("document");
         loadContent("<h1></h1>");
-        submit(() -> {
-            getEngine().executeScript(doc.toString());
+        assertThrows(NullPointerException.class, () -> {
+            submit(() -> {
+                getEngine().executeScript(doc.toString());
+            });
         });
     }
 
     // JDK-8187568
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testcheckJSPeerGetMember() {
         final JSObject doc = (JSObject) executeScript("document");
         submit(() -> {
@@ -703,42 +706,50 @@ public void testcheckJSPeerGetMember() {
         });
 
         loadContent("<h1></h1>");
-        submit(() -> {
-            doc.getMember("beforeload");
+        assertThrows(NullPointerException.class, () -> {
+            submit(() -> {
+                doc.getMember("beforeload");
+            });
         });
     }
 
     // JDK-8187568
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testcheckJSPeerSetMember() {
         final JSObject doc = (JSObject) executeScript("document");
         loadContent("<h1></h1>");
-        submit(() -> {
-            doc.setMember("newMember", "newvalue");
+        assertThrows(NullPointerException.class, () -> {
+            submit(() -> {
+                doc.setMember("newMember", "newvalue");
+            });
         });
     }
 
     // JDK-8187568
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testcheckJSPeerRemoveMember() {
         final JSObject doc = (JSObject) executeScript("document");
         submit(() -> {
             doc.setMember("oldMember", "oldmember");
         });
         loadContent("<h1></h1>");
-        submit(() -> {
-            doc.removeMember("oldMember");
+        assertThrows(NullPointerException.class, () -> {
+            submit(() -> {
+                doc.removeMember("oldMember");
+            });
         });
     }
 
     // JDK-8187568
-    @Test(expected=NullPointerException.class)
-    public void testcheckJSPeerEval() {
+    @Test
+    void testcheckJSPeerEval() {
         final JSObject doc = (JSObject) executeScript("document");
         executeScript("var x = 10;");
         loadContent("<h1></h1>");
-        submit(() -> {
-            doc.eval("x");
+        assertThrows(NullPointerException.class, () -> {
+            submit(() -> {
+                doc.eval("x");
+            });
         });
     }
 }
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/LeakTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/LeakTest.java
index c915c5c262c..5dbbe01bd94 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/LeakTest.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/LeakTest.java
@@ -43,11 +43,11 @@
 import javafx.scene.web.WebView;
 import javafx.util.Duration;
 import netscape.javascript.JSObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 import test.util.memory.JMemoryBuddy;
 
 public class LeakTest extends TestBase {
@@ -143,7 +143,7 @@ private static boolean isAllElementsNull(Reference<?>[] array) {
 
         // Give disposer a chance to run
         Thread.sleep(SLEEP_TIME);
-        assertTrue("All JSObjects are disposed", JSObjectShim.test_getPeerCount() == 0);
+        assertTrue(JSObjectShim.test_getPeerCount() == 0, "All JSObjects are disposed");
     }
 
     private State getLoadState() {
@@ -156,14 +156,14 @@ private State getLoadState() {
         WeakReference<?>[] willGC = new WeakReference[count];
         final String html =
                 "<html>\n" +
-                "<head></head>\n" +
-                "<body> <a href=#>hello</a><p> Paragraph </p>\n" +
-                "<div> Div Block </div> <iframe> iframe </iframe> <br> </body>\n" +
-                "</html>";
+                        "<head></head>\n" +
+                        "<body> <a href=#>hello</a><p> Paragraph </p>\n" +
+                        "<div> Div Block </div> <iframe> iframe </iframe> <br> </body>\n" +
+                        "</html>";
         loadContent(html);
         WebEngine web = getEngine();
 
-        assertTrue("Load task completed successfully", getLoadState() == SUCCEEDED);
+        assertTrue(getLoadState() == SUCCEEDED, "Load task completed successfully");
 
         System.gc();
         Thread.sleep(SLEEP_TIME);
@@ -174,42 +174,42 @@ private State getLoadState() {
 
         submit(() -> {
             Document doc = web.getDocument();
-            assertNotNull("Document should not be null", doc);
+            assertNotNull(doc, "Document should not be null");
 
             NodeList tagList = doc.getElementsByTagName("html");
             Element element = (Element) tagList.item(0);
             willGC[0] = new WeakReference<>(element);
-            assertEquals("Expected NodeImpl(tag:html) HashCount", initialHashCount+1, NodeImplShim.test_getHashCount());
+            assertEquals(initialHashCount+1, NodeImplShim.test_getHashCount(), "Expected NodeImpl(tag:html) HashCount");
 
             tagList = doc.getElementsByTagName("head");
             element = (Element) tagList.item(0);
             willGC[1] = new WeakReference<>(element);
-            assertEquals("Expected NodeImpl(tag:head) HashCount", initialHashCount+2, NodeImplShim.test_getHashCount());
+            assertEquals(initialHashCount+2, NodeImplShim.test_getHashCount(), "Expected NodeImpl(tag:head) HashCount");
 
             tagList = doc.getElementsByTagName("body");
             element = (Element) tagList.item(0);
             willGC[2] = new WeakReference<>(element);
-            assertEquals("Expected NodeImpl(tag:body) HashCount", initialHashCount+3, NodeImplShim.test_getHashCount());
+            assertEquals(initialHashCount+3, NodeImplShim.test_getHashCount(), "Expected NodeImpl(tag:body) HashCount");
 
             tagList = doc.getElementsByTagName("p");
             element = (Element) tagList.item(0);
             willGC[3] = new WeakReference<>(element);
-            assertEquals("Expected NodeImpl(tag:p) HashCount", initialHashCount+4, NodeImplShim.test_getHashCount());
+            assertEquals(initialHashCount+4, NodeImplShim.test_getHashCount(), "Expected NodeImpl(tag:p) HashCount");
 
             tagList = doc.getElementsByTagName("div");
             element = (Element) tagList.item(0);
             willGC[4] = new WeakReference<>(element);
-            assertEquals("Expected NodeImpl(tag:div) HashCount", initialHashCount+5, NodeImplShim.test_getHashCount());
+            assertEquals(initialHashCount+5, NodeImplShim.test_getHashCount(), "Expected NodeImpl(tag:div) HashCount");
 
             tagList = doc.getElementsByTagName("iframe");
             element = (Element) tagList.item(0);
             willGC[5] = new WeakReference<>(element);
-            assertEquals("Expected NodeImpl(tag:iframe) HashCount", initialHashCount+6, NodeImplShim.test_getHashCount());
+            assertEquals(initialHashCount+6, NodeImplShim.test_getHashCount(), "Expected NodeImpl(tag:iframe) HashCount");
 
             tagList = doc.getElementsByTagName("br");
             element = (Element) tagList.item(0);
             willGC[6] = new WeakReference<>(element);
-            assertEquals("Expected NodeImpl(tag:br) HashCount", initialHashCount+7, NodeImplShim.test_getHashCount());
+            assertEquals(initialHashCount+7, NodeImplShim.test_getHashCount(), "Expected NodeImpl(tag:br) HashCount");
         });
 
         JMemoryBuddy.assertCollectable(willGC);
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/LoadNotificationsTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/LoadNotificationsTest.java
index 4278ce02b59..553661cad54 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/LoadNotificationsTest.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/LoadNotificationsTest.java
@@ -33,12 +33,12 @@
 import javafx.concurrent.Worker.State;
 import javafx.scene.web.WebEngine;
 import static javafx.concurrent.Worker.State.*;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
 
 public class LoadNotificationsTest extends TestBase {
 
@@ -89,11 +89,9 @@ private void testUrl(String url) {
     private void checkRunning(boolean oldValue, boolean newValue) {
         State state = getEngine().getLoadWorker().getState();
         if (newValue) {
-            assertTrue("LoadWorker.running should be false",
-                    state == SCHEDULED || state == RUNNING);
+            assertTrue(state == SCHEDULED || state == RUNNING, "LoadWorker.running should be false");
         } else {
-            assertTrue("LoadWorker.running should be true",
-                    state == SUCCEEDED || state == FAILED);
+            assertTrue(state == SUCCEEDED || state == FAILED, "LoadWorker.running should be true");
         }
     }
 
@@ -112,62 +110,55 @@ private void checkState(State oldValue, State newValue) {
         try {
             switch (newValue) {
                 case READY:
-                    assertEquals("LoadWorker.totalWork", -1, worker.getTotalWork(), 0);
-                    assertEquals("LoadWorker.workDone", -1, worker.getWorkDone(), 0);
-                    assertEquals("LoadWorker.progress", -1, worker.getProgress(), 0);
-                    assertNull("LoadWorker.exception should be null", worker.getException());
-                    assertEquals("LoadWorker.message", "", worker.getMessage());
+                    assertEquals(-1, worker.getTotalWork(), 0, "LoadWorker.totalWork");
+                    assertEquals(-1, worker.getWorkDone(), 0, "LoadWorker.workDone");
+                    assertEquals(-1, worker.getProgress(), 0, "LoadWorker.progress");
+                    assertNull(worker.getException(), "LoadWorker.exception should be null");
+                    assertEquals("", worker.getMessage(), "LoadWorker.message");
                     break;
                 case SCHEDULED:
                 case RUNNING:
-                    assertEquals("LoadWorker.state",
-                            (newValue == RUNNING ? SCHEDULED : READY),
-                            oldValue);
-                    assertEquals("LoadWorker.totalWork", 100.0, worker.getTotalWork(), 0);
-                    assertEquals("LoadWorker.workDone", 0.0, worker.getWorkDone(), 0);
-                    assertEquals("LoadWorker.progress", 0.0, worker.getProgress(), 0);
-                    assertNull("LoadWorker.exception should be null", worker.getException());
-                    assertTrue("LoadWorker.message should read 'Loading [url]'",
-                            worker.getMessage().matches("Loading .*" + currentUrl));
-
-                    assertNull("WebEngine.document should be null", web.getDocument());
+                    assertEquals((newValue == RUNNING ? SCHEDULED : READY), oldValue, "LoadWorker.state");
+                    assertEquals(100.0, worker.getTotalWork(), 0, "LoadWorker.totalWork");
+                    assertEquals(0.0, worker.getWorkDone(), 0, "LoadWorker.workDone");
+                    assertEquals(0.0, worker.getProgress(), 0, "LoadWorker.progress");
+                    assertNull(worker.getException(), "LoadWorker.exception should be null");
+                    assertTrue(worker.getMessage().matches("Loading .*" + currentUrl), "LoadWorker.message should read 'Loading [url]'");
+
+                    assertNull(web.getDocument(), "WebEngine.document should be null");
                     /*
                     The following assert causes test failure after JDK-8268849.
                     An issue is raised: JDK-8269912, to investigate the failure.
-                    // assertNull("WebEngine.title should be null", web.getTitle());
+                    // assertNull(web.getTitle(), "WebEngine.title should be null");
                     */
-                    assertTrue("WebEngine.location should be set",
-                            web.getLocation().endsWith(currentUrl));
+                    assertTrue(web.getLocation().endsWith(currentUrl), "WebEngine.location should be set");
                     break;
                 case SUCCEEDED:
-                    assertEquals("LoadWorker.state", RUNNING, oldValue);
-                    assertEquals("LoadWorker.totalWork", 100.0, worker.getTotalWork(), 0);
-                    assertEquals("LoadWorker.workDone", 100.0, worker.getWorkDone(), 0);
-                    assertEquals("LoadWorker.progress", 1.0, worker.getProgress(), 0);
-                    assertNull("LoadWorker.exception should be null", worker.getException());
-                    assertTrue("LoadWorker.message should read 'Loading complete'",
-                            worker.getMessage().startsWith("Loading complete"));
-
-                    assertNotNull("WebEngine.document should be set", web.getDocument());
-                    assertTrue("WebEngine.location should be set",
-                            web.getLocation().endsWith(currentUrl));
+                    assertEquals(RUNNING, oldValue, "LoadWorker.state");
+                    assertEquals(100.0, worker.getTotalWork(), 0, "LoadWorker.totalWork");
+                    assertEquals(100.0, worker.getWorkDone(), 0, "LoadWorker.workDone");
+                    assertEquals(1.0, worker.getProgress(), 0, "LoadWorker.progress");
+                    assertNull(worker.getException(), "LoadWorker.exception should be null");
+                    assertTrue(worker.getMessage().startsWith("Loading complete"), "LoadWorker.message should read 'Loading complete'");
+
+                    assertNotNull(web.getDocument(), "WebEngine.document should be set");
+                    assertTrue(web.getLocation().endsWith(currentUrl), "WebEngine.location should be set");
                     /*
                     This commented code block causes test failure after JDK-8268849.
                     An issue is raised: JDK-8269912, to investigate the failure.
 
                     if (currentUrl == "about:blank") {
-                        assertNull("WebEngine.title should be null", web.getTitle());
+                        assertNull(web.getTitle(), "WebEngine.title should be null");
                     } else {
-                        assertNotNull("WebEngine.title should be set", web.getTitle());
+                        assertNotNull(web.getTitle(), "WebEngine.title should be set");
                     }
                     */
                     break;
                 case FAILED:
-                    assertEquals("LoadWorker.state", RUNNING, oldValue);
-                    assertEquals("LoadWorker.totalWork", 100.0, worker.getTotalWork(), 0);
-                    assertNotNull("LoadWorker.exception should be set", worker.getException());
-                    assertTrue("LoadWorker.message should read 'Loading failed'",
-                            worker.getMessage().startsWith("Loading failed"));
+                    assertEquals(RUNNING, oldValue, "LoadWorker.state");
+                    assertEquals(100.0, worker.getTotalWork(), 0, "LoadWorker.totalWork");
+                    assertNotNull(worker.getException(), "LoadWorker.exception should be set");
+                    assertTrue(worker.getMessage().startsWith("Loading failed"), "LoadWorker.message should read 'Loading failed'");
                     break;
                 default:
                     fail("Unexpected LoadWorker.state == " + newValue);
@@ -185,10 +176,9 @@ private void check() {
 
         // check that we have transitioned through all relevant states
         // (order of states is checked in the changed() method)
-        assertTrue("State.READY was never set", log.contains(READY));
-        assertTrue("State.SCHEDULED was never set", log.contains(SCHEDULED));
-        assertTrue("State.RUNNING was never set", log.contains(RUNNING));
-        assertTrue("Neither State.SUCCEEDED nor State.FAILED has been set",
-                log.contains(SUCCEEDED) || log.contains(FAILED));
+        assertTrue(log.contains(READY), "State.READY was never set");
+        assertTrue(log.contains(SCHEDULED), "State.SCHEDULED was never set");
+        assertTrue(log.contains(RUNNING), "State.RUNNING was never set");
+        assertTrue(log.contains(SUCCEEDED) || log.contains(FAILED), "Neither State.SUCCEEDED nor State.FAILED has been set");
     }
 }
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/LoadTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/LoadTest.java
index 706667d23f5..52da9c4ac68 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/LoadTest.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/LoadTest.java
@@ -29,17 +29,18 @@
 import static javafx.concurrent.Worker.State.RUNNING;
 import static javafx.concurrent.Worker.State.FAILED;
 import static javafx.concurrent.Worker.State.SUCCEEDED;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
+import org.junit.jupiter.api.Timeout;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import java.io.File;
 import java.util.concurrent.CountDownLatch;
 import javafx.concurrent.Worker.State;
 import javafx.scene.web.WebEngine;
 import netscape.javascript.JSObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -58,53 +59,57 @@ private State getLoadState() {
         load(new File(FILE));
         WebEngine web = getEngine();
 
-        assertTrue("Load task completed successfully", getLoadState() == SUCCEEDED);
-        assertTrue("Location.endsWith(FILE)", web.getLocation().endsWith(FILE));
-        assertNotNull("Document should not be null", web.getDocument());
+        assertTrue(getLoadState() == SUCCEEDED, "Load task completed successfully");
+        assertTrue(web.getLocation().endsWith(FILE), "Location.endsWith(FILE)");
+        assertNotNull(web.getDocument(),"Document should not be null");
     }
 
-    @Test public void testLoadBadUrl() {
+    @Test
+    public void testLoadBadUrl() {
         final String URL = "bad://url";
         load(URL);
         WebEngine web = getEngine();
 
-        assertTrue("Load task failed", getLoadState() == FAILED);
-        assertEquals("Location", URL, web.getLocation());
-        assertNull("Document should be null", web.getDocument());
+        assertTrue(getLoadState() == FAILED, "Load task failed");
+        assertEquals(URL, web.getLocation(), "Location");
+        assertNull(web.getDocument(), "Document should be null");
     }
 
-    @Test public void testLoadHtmlContent() {
+    @Test
+    public void testLoadHtmlContent() {
         final String TITLE = "In a Silent Way";
         loadContent("<html><head><title>" + TITLE + "</title></head></html>");
         WebEngine web = getEngine();
 
-        assertTrue("Load task completed successfully", getLoadState() == SUCCEEDED);
-        assertEquals("Location", "", web.getLocation());
-        assertNotNull("Document should not be null", web.getDocument());
+        assertTrue(getLoadState() == SUCCEEDED, "Load task completed successfully");
+        assertEquals("", web.getLocation(), "Location");
+        assertNotNull(web.getDocument(), "Document should not be null");
     }
 
-    @Test public void testLoadPlainContent() {
+    @Test
+    public void testLoadPlainContent() {
         final String TEXT =
                 "<html><head><title>Hidden Really Well</title></head></html>";
         loadContent(TEXT, "text/plain");
         final WebEngine web = getEngine();
 
-        assertTrue("Load task completed successfully", getLoadState() == SUCCEEDED);
-        assertEquals("Location", "", web.getLocation());
+        assertTrue(getLoadState() == SUCCEEDED, "Load task completed successfully");
+        assertEquals("", web.getLocation(), "Location");
 
         // DOM access should happen on FX thread
         submit(() -> {
             Document doc = web.getDocument();
-            assertNotNull("Document should not be null", doc);
+            assertNotNull(doc, "Document should not be null");
             Node el = // html -> body -> pre -> text
                     doc.getDocumentElement().getLastChild().getFirstChild().getFirstChild();
             String text = ((Text)el).getNodeValue();
-            assertEquals("Plain text should not be interpreted as HTML",
-                    TEXT, text);
+            assertEquals(TEXT, text,
+                    "Plain text should not be interpreted as HTML");
         });
     }
 
-    @Test public void testLoadEmpty() {
+    @Test
+    public void testLoadEmpty() {
         testLoadEmpty(null);
         testLoadEmpty("");
         testLoadEmpty("about:blank");
@@ -114,56 +119,59 @@ private void testLoadEmpty(String url) {
         load(url);
         final WebEngine web = getEngine();
 
-        assertTrue("Load task completed successfully", getLoadState() == SUCCEEDED);
-        assertEquals("Location", "about:blank", web.getLocation());
-        assertNull("Title should be null", web.getTitle());
+        assertTrue(getLoadState() == SUCCEEDED, "Load task completed successfully");
+        assertEquals("about:blank", web.getLocation(), "Location");
+        assertNull(web.getTitle(), "Title should be null");
 
         submit(() -> {
             Document doc = web.getDocument();
-            assertNotNull("Document should not be null", doc);
+            assertNotNull(doc, "Document should not be null");
 
             Element html = doc.getDocumentElement();
-            assertNotNull("There should be an HTML element", html);
-            assertEquals("HTML element should have tag HTML", "HTML", html.getTagName());
+            assertNotNull(html, "There should be an HTML element");
+            assertEquals("HTML", html.getTagName(), "HTML element should have tag HTML");
 
             NodeList htmlNodes = html.getChildNodes();
-            assertNotNull("HTML element should have two children", htmlNodes);
-            assertEquals("HTML element should have two children", 2, htmlNodes.getLength());
+            assertNotNull(htmlNodes, "HTML element should have two children");
+            assertEquals(2, htmlNodes.getLength(), "HTML element should have two children");
 
             Element head = (Element) htmlNodes.item(0);
             NodeList headNodes = head.getChildNodes();
-            assertNotNull("There should be a HEAD element", head);
-            assertEquals("HEAD element should have tag HEAD", "HEAD", head.getTagName());
-            assertTrue("HEAD element should have no children",
-                    headNodes == null || headNodes.getLength() == 0);
+            assertNotNull(head, "There should be a HEAD element");
+            assertEquals("HEAD", head.getTagName(), "HEAD element should have tag HEAD");
+            assertTrue(headNodes == null || headNodes.getLength() == 0,
+                    "HEAD element should have no children");
 
             Element body = (Element) htmlNodes.item(1);
             NodeList bodyNodes = body.getChildNodes();
-            assertNotNull("There should be a BODY element", body);
-            assertEquals("BODY element should have tag BODY", "BODY", body.getTagName());
-            assertTrue("BODY element should have no children",
-                    bodyNodes == null || bodyNodes.getLength() == 0);
+            assertNotNull(body, "There should be a BODY element");
+            assertEquals("BODY", body.getTagName(), "BODY element should have tag BODY");
+            assertTrue(bodyNodes == null || bodyNodes.getLength() == 0,
+                    "BODY element should have no children");
         });
     }
 
-    @Test public void testLoadUrlWithEncodedSpaces() {
+    @Test
+    public void testLoadUrlWithEncodedSpaces() {
         final String URL = "http://localhost/test.php?param=a%20b%20c";
         load(URL);
         WebEngine web = getEngine();
 
-        assertEquals("Unexpected location", URL, web.getLocation());
+        assertEquals(URL, web.getLocation(), "Unexpected location");
     }
 
-    @Test public void testLoadUrlWithUnencodedSpaces() {
+    @Test
+    public void testLoadUrlWithUnencodedSpaces() {
         final String URL = "http://localhost/test.php?param=a b c";
         load(URL);
         WebEngine web = getEngine();
 
-        assertEquals("Unexpected location",
-                URL.replace(" ", "%20"), web.getLocation());
+        assertEquals(URL.replace(" ", "%20"), web.getLocation(),
+                "Unexpected location");
     }
 
-    @Test public void testLoadContentWithLocalScript() {
+    @Test
+    public void testLoadContentWithLocalScript() {
         WebEngine webEngine = getEngine();
 
         final StringBuilder result = new StringBuilder();
@@ -180,31 +188,35 @@ private void testLoadEmpty(String url) {
                 "</html>";
         loadContent(html);
 
-        assertEquals("Unexpected result", "ALERT: foo", result.toString());
-        assertEquals("Unexpected load state", SUCCEEDED, getLoadState());
-        assertEquals("Unexpected location", "", webEngine.getLocation());
-        assertNotNull("Document is null", webEngine.getDocument());
+        assertEquals("ALERT: foo", result.toString(), "Unexpected result");
+        assertEquals(SUCCEEDED, getLoadState(), "Unexpected load state");
+        assertEquals("", webEngine.getLocation(), "Unexpected location");
+        assertNotNull(webEngine.getDocument(), "Document is null");
     }
 
-    @Test public void testLoadLocalCSS() {
+    @Test
+    public void testLoadLocalCSS() {
         load(new File("src/test/resources/test/html/dom.html"));
         submit(() -> {
-            assertEquals("Font weight should be bold", "700", getEngine().executeScript(
-                "window.getComputedStyle(document.getElementById('p3')).getPropertyValue('font-weight')"));
-            assertEquals("font style should be italic", "italic", getEngine().executeScript(
-                "window.getComputedStyle(document.getElementById('p3')).getPropertyValue('font-style')"));
+            assertEquals("700", getEngine().executeScript(
+                "window.getComputedStyle(document.getElementById('p3')).getPropertyValue('font-weight')"),
+                    "Font weight should be bold");
+            assertEquals("italic", getEngine().executeScript(
+                "window.getComputedStyle(document.getElementById('p3')).getPropertyValue('font-style')"),
+                    "font style should be italic");
         });
     }
 
-    @Test public void testLoadTitleChanged() {
+    @Test
+    public void testLoadTitleChanged() {
         final String FILE = "src/test/resources/test/html/ipsum.html";
         final CountDownLatch latch = new CountDownLatch(1);
 
         submit(() -> {
             WebEngine webEngine = new WebEngine();
             webEngine.titleProperty().addListener((observable, oldValue, newValue) -> {
-                assertTrue("loadContent in SUCCEEDED State", webEngine.getLoadWorker().getState() == SUCCEEDED);
-                assertEquals("Title", "Lorem Ipsum", webEngine.getTitle());
+                assertTrue(webEngine.getLoadWorker().getState() == SUCCEEDED, "loadContent in SUCCEEDED State");
+                assertEquals("Lorem Ipsum", webEngine.getTitle(), "Title");
                 latch.countDown();
             });
 
@@ -217,15 +229,16 @@ private void testLoadEmpty(String url) {
         }
     }
 
-    @Test public void testLoadContentTitleChanged() {
+    @Test
+    public void testLoadContentTitleChanged() {
         final String TITLE = "Title Test";
         final CountDownLatch latch = new CountDownLatch(1);
 
         submit(() -> {
             WebEngine webEngine = new WebEngine();
             webEngine.titleProperty().addListener((observable, oldValue, newValue) -> {
-                assertTrue("loadContent in SUCCEEDED State", webEngine.getLoadWorker().getState() == SUCCEEDED);
-                assertEquals("Title", TITLE, webEngine.getTitle());
+                assertTrue(webEngine.getLoadWorker().getState() == SUCCEEDED, "loadContent in SUCCEEDED State");
+                assertEquals(TITLE, webEngine.getTitle(), "Title");
                 latch.countDown();
             });
 
@@ -243,7 +256,8 @@ private void testLoadEmpty(String url) {
      * @bug 8140501
      * summary loadContent on location changed
      */
-    @Test public void loadContentOnLocationChange() throws Exception {
+    @Test
+    public void loadContentOnLocationChange() throws Exception {
         final CountDownLatch latch = new CountDownLatch(2);
 
         submit(() -> {
@@ -255,7 +269,7 @@ private void testLoadEmpty(String url) {
                 // ref : https://html.spec.whatwg.org
                 if (newValue.equalsIgnoreCase("about:blank")) {
                     webEngine.loadContent("");
-                    assertTrue("loadContent in READY State", webEngine.getLoadWorker().getState() == READY);
+                    assertTrue(webEngine.getLoadWorker().getState() == READY, "loadContent in READY State");
                 }
             });
 
@@ -266,7 +280,7 @@ private void testLoadEmpty(String url) {
             }));
 
             webEngine.load("");
-            assertTrue("load task completed successfully", webEngine.getLoadWorker().getState() == SUCCEEDED);
+            assertTrue(webEngine.getLoadWorker().getState() == SUCCEEDED, "load task completed successfully");
         });
         try {
             latch.await();
@@ -280,7 +294,8 @@ private void testLoadEmpty(String url) {
      * @bug 8140501
      * summary load url on location changed
      */
-    @Test public void loadUrlOnLocationChange() throws Exception {
+    @Test
+    public void loadUrlOnLocationChange() throws Exception {
         // Cancelling loadContent is synchronous,
         // there wont be 2 SUCCEEDED event
         final CountDownLatch latch = new CountDownLatch(1);
@@ -290,7 +305,7 @@ private void testLoadEmpty(String url) {
             webEngine.locationProperty().addListener((observable, oldValue, newValue) -> {
                 if (newValue.equalsIgnoreCase("")) {
                     webEngine.load("");
-                    assertTrue("Load in READY State", webEngine.getLoadWorker().getState() == READY);
+                    assertTrue(webEngine.getLoadWorker().getState() == READY, "Load in READY State");
                 }
             });
 
@@ -301,7 +316,7 @@ private void testLoadEmpty(String url) {
             }));
 
             webEngine.loadContent("");
-            assertTrue("loadContent task running", webEngine.getLoadWorker().getState() == RUNNING);
+            assertTrue(webEngine.getLoadWorker().getState() == RUNNING, "loadContent task running");
         });
         try {
             latch.await();
@@ -315,34 +330,35 @@ private void testLoadEmpty(String url) {
      * @bug 8152420
      * summary loading relative sub-resource from jar
      */
-    @Test public void loadJarFile() throws Exception {
+    @Test
+    public void loadJarFile() throws Exception {
 
         // archive-root0.html -- src archive-r0.js, c/archive-c0.js
         load("jar:" + new File(System.getProperties().get("WEB_ARCHIVE_JAR_TEST_DIR").toString()
                 + "/webArchiveJar.jar").toURI().toASCIIString() + "!/archive-root0.html");
-        assertEquals("archive-root0.html failed to load src='archive-r0.js'",
-                "loaded", executeScript("jsr0()").toString());
+        assertEquals("loaded", executeScript("jsr0()").toString(),
+                "archive-root0.html failed to load src='archive-r0.js'");
 
-        assertEquals("archive-root0.html failed to load src='c/archive-c0.js'",
-                "loaded", executeScript("jsc0()").toString());
+        assertEquals("loaded", executeScript("jsc0()").toString(),
+                "archive-root0.html failed to load src='c/archive-c0.js'");
 
         // archive-root1.html -- src ./archive-r0.js, ./c/archive-c0.js
         load("jar:" + new File(System.getProperties().get("WEB_ARCHIVE_JAR_TEST_DIR").toString()
                 + "/webArchiveJar.jar").toURI().toASCIIString() + "!/archive-root1.html");
-        assertEquals("archive-root1.html failed to load src='./archive-r0.js'",
-                "loaded", executeScript("jsr0()").toString());
+        assertEquals("loaded", executeScript("jsr0()").toString(),
+                "archive-root1.html failed to load src='./archive-r0.js'");
 
-        assertEquals("archive-root1.html failed to load src='./c/archive-c0.js'",
-                "loaded", executeScript("jsc0()").toString());
+        assertEquals("loaded", executeScript("jsc0()").toString(),
+                "archive-root1.html failed to load src='./c/archive-c0.js'");
 
         // archive-root2.html -- src ./c/../archive-r0.js, ./c/./././archive-c0.js
         load("jar:" + new File(System.getProperties().get("WEB_ARCHIVE_JAR_TEST_DIR").toString()
                 + "/webArchiveJar.jar").toURI().toASCIIString() + "!/archive-root2.html");
-        assertEquals("archive-root2.html failed to load src='./c/../archive-r0.js'",
-                "loaded", executeScript("jsr0()").toString());
+        assertEquals("loaded", executeScript("jsr0()").toString(),
+                "archive-root2.html failed to load src='./c/../archive-r0.js'");
 
-        assertEquals("archive-root2.html failed to load src='./c/./././archive-c0.js'",
-                "loaded", executeScript("jsc0()").toString());
+        assertEquals("loaded", executeScript("jsc0()").toString(),
+                "archive-root2.html failed to load src='./c/./././archive-c0.js'");
     }
 
     /**
@@ -366,7 +382,9 @@ public void onError() {
      * @bug 8153681
      * summary testing jrt url scheme support in WebView
      */
-    @Test(timeout = 30000) public void loadJrtResource() throws Exception {
+    @Test
+    @Timeout(30)
+    public void loadJrtResource() throws Exception {
         assumeTrue(isJigsawMode());
 
         final String[] jrtResources = {
@@ -380,11 +398,11 @@ public void onError() {
         // Load single resource and check for image is being rendered
         // Check the natural width of rendered image
         load(jrtResources[0]);
-        assertEquals("Failed to load " + jrtResources[0],
-                1, executeScript("document.getElementsByTagName('img').length"));
+        assertEquals(1, executeScript("document.getElementsByTagName('img').length"),
+                "Failed to load " + jrtResources[0]);
 
-        assertEquals("Failed to Render " + jrtResources[0],
-                16, executeScript("document.getElementsByTagName('img')[0].naturalWidth"));
+        Integer actualWidth = (Integer) executeScript("document.getElementsByTagName('img')[0].naturalWidth");
+        assertEquals(16, actualWidth, "Failed to Render " + jrtResources[0]);
 
         // LoadContent with multiple jrt resource which needs to
         // resolve path navigation i.e ./ or ../ in native url handler
@@ -399,7 +417,7 @@ public void onError() {
                     final String msg = String.format(
                             "Failed to load : %d / %d resources",
                             imageEvent.failed, jrtResources.length);
-                    assertTrue(msg, imageEvent.loaded == jrtResources.length);
+                    assertTrue(imageEvent.loaded == jrtResources.length, msg);
                     latch.countDown();
                 }
             }));
@@ -423,31 +441,32 @@ public void onError() {
     }
 
     // JDK-8282134 Certain regex can cause a JS trap in WebView
-    @Test public void jsRegexpTrapTest() {
+    @Test
+    public void jsRegexpTrapTest() {
         final String FILE = "src/test/resources/test/html/unicode.html";
         load(new File(FILE));
         WebEngine web = getEngine();
-        assertTrue("Load task completed successfully", getLoadState() == SUCCEEDED);
+        assertTrue(getLoadState() == SUCCEEDED, "Load task completed successfully");
     }
 
     // JDK-8311097 Synchronous XMLHttpRequest not receiving data
-    @Test public void testSynchronousDataRequest() {
+    @Test
+    public void testSynchronousDataRequest() {
         final String TEXT = "pass";
         final String FILE = "src/test/resources/test/html/sync-request.html";
         load(new File(FILE));
         final WebEngine web = getEngine();
 
-        assertTrue("Load task completed successfully", getLoadState() == SUCCEEDED);
+        assertTrue(getLoadState() == SUCCEEDED, "Load task completed successfully");
 
         // DOM access should happen on FX thread
         submit(() -> {
             Document doc = web.getDocument();
-            assertNotNull("Document should not be null", doc);
+            assertNotNull(doc, "Document should not be null");
 
             var body = doc.getDocumentElement().getLastChild();
             String text = getTargetText(body);
-            assertEquals("Found expected text",
-                    TEXT, text);
+            assertEquals(TEXT, text, "Found expected text");
         });
     }
 
@@ -463,7 +482,7 @@ private String getTargetText(Node body) {
         while (!"target".equals(getId(c))) {
             c = c.getNextSibling();
         }
-        assertNotNull("Found target element", c);
+        assertNotNull(c, "Found target element");
         return c.getTextContent();
     }
 }
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/LocalStorageTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/LocalStorageTest.java
index 5573ca28dee..20592b84b10 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/LocalStorageTest.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/LocalStorageTest.java
@@ -25,14 +25,14 @@
 
 package test.javafx.scene.web;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertNotNull;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import java.io.File;
 import java.io.IOException;
 import javafx.scene.web.WebView;
@@ -70,17 +70,17 @@ void checkLocalStorageAfterWindowClose(WebEngine webEngine) {
         });
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void beforeClass() throws IOException {
         deleteRecursively(LOCAL_STORAGE_DIR);
     }
 
-    @AfterClass
+    @AfterAll
     public static void afterClass() throws IOException {
         deleteRecursively(LOCAL_STORAGE_DIR);
     }
 
-    @After
+    @AfterEach
     public void after() {
         final WebEngine webEngine = getEngine();
         webEngine.setUserDataDirectory(null);
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/MathMLRenderTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/MathMLRenderTest.java
index 88e179c83cf..2e768ae4f09 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/MathMLRenderTest.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/MathMLRenderTest.java
@@ -25,14 +25,14 @@
 
 package test.javafx.scene.web;
 
-import static org.junit.Assert.assertTrue;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
 
 public class MathMLRenderTest extends TestBase {
 
     @Test public void testTokenHeight() throws Exception {
         loadContent("<!doctype html><html><body><math><mo>=</mo></math></body></html>");
         int height = (int) executeScript("document.getElementsByTagName('mo')[0].clientHeight");
-        assertTrue("MathML token height is lesser than expected " + height, height > 1);
+        assertTrue(height > 1, "MathML token height is lesser than expected " + height);
     }
 }
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/MiscellaneousTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/MiscellaneousTest.java
index 5d1900c52ec..959a2f9f962 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/MiscellaneousTest.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/MiscellaneousTest.java
@@ -41,26 +41,27 @@
 import javafx.scene.web.WebEngine;
 import javafx.scene.web.WebView;
 import netscape.javascript.JSObject;
-import org.junit.Ignore;
-import org.junit.Test;
 import org.w3c.dom.Document;
-
 import static java.lang.String.format;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.junit.jupiter.api.Timeout;
 
 public class MiscellaneousTest extends TestBase {
 
     @Test public void testNoEffectOnFollowRedirects() {
-        assertEquals("Unexpected HttpURLConnection.getFollowRedirects() result",
-                true, HttpURLConnection.getFollowRedirects());
+        assertEquals(true, HttpURLConnection.getFollowRedirects(),
+                "Unexpected HttpURLConnection.getFollowRedirects() result");
         load("test/html/ipsum.html");
-        assertEquals("Unexpected HttpURLConnection.getFollowRedirects() result",
-                true, HttpURLConnection.getFollowRedirects());
+        assertEquals(true, HttpURLConnection.getFollowRedirects(),
+                "Unexpected HttpURLConnection.getFollowRedirects() result");
     }
 
     @Test public void testRT22458() throws Exception {
@@ -137,7 +138,8 @@ public Record(Document document, String location) {
     }
 
     // JDK-8133775
-    @Test(expected = IllegalStateException.class) public void testDOMObjectThreadOwnership() {
+    @Test
+    public void testDOMObjectThreadOwnership() {
           class IllegalStateExceptionChecker {
               public Object resultObject;
               public void start() {
@@ -150,7 +152,9 @@ public void start() {
            submit(obj::start);
            // Try accessing the resultObject created in JavaFX Application Thread
            // from someother thread. It should throw an exception.
-           obj.resultObject.toString();
+           assertThrows(IllegalStateException.class, () -> {
+                obj.resultObject.toString();
+           });
      }
 
     // JDK-8162715
@@ -174,7 +178,9 @@ public void call(long createdTime, long interval, int index) {
         }
     }
 
-    @Test(timeout = 30000) public void testDOMTimer() {
+    @Test
+    @Timeout(30)
+    public void testDOMTimer() {
         final TimerCallback timer = new TimerCallback();
         final WebEngine webEngine = createWebEngine();
         submit(() -> {
@@ -207,13 +213,11 @@ public void call(long createdTime, long interval, int index) {
                     stat.firedTime - stat.createdTime);
             // Timer should not fire too early. Added 20 ms offset to compensate
             // the floating point approximation issues while dealing with timer.
-            assertTrue(msg,
-                    ((stat.firedTime + 20) - stat.createdTime) >= stat.interval);
+            assertTrue(((stat.firedTime + 20) - stat.createdTime) >= stat.interval, msg);
             // Timer should not be too late. Since it is not a real time system,
             // we can't expect the timer to be fire at exactly on the requested
             // time, give a 1000 ms extra time.
-            assertTrue(msg,
-                    (stat.firedTime - stat.createdTime) <= (stat.interval + 1000));
+            assertTrue((stat.firedTime - stat.createdTime) <= (stat.interval + 1000), msg);
         }
     }
 
@@ -274,7 +278,7 @@ public class FontFaceTestHelper {
                 ttfFileStream.read(ttfFileContent, offset, available);
                 offset += available;
             }
-            assertEquals("Offset must equal to file length", length, offset);
+            assertEquals(length, offset, "Offset must equal to file length");
         }
 
         // Will be called from JS to indicate test complete
@@ -369,9 +373,9 @@ void waitForCompletion() {
         );
 
         submit(()->{
-            assertFalse("ICU text wrap failed ",
-                (Boolean) getEngine().executeScript(
-                "document.getElementById('idwrap').clientHeight == document.getElementById('idword').clientHeight"));
+            assertFalse((Boolean) getEngine().executeScript(
+                            "document.getElementById('idwrap').clientHeight == document.getElementById('idword').clientHeight"),
+                    "ICU text wrap failed");
         });
     }
 
@@ -395,8 +399,7 @@ void waitForCompletion() {
         });
 
         try {
-            assertTrue("No callback received from window.requestAnimationFrame",
-                    latch.await(10, TimeUnit.SECONDS));
+            assertTrue(latch.await(10, TimeUnit.SECONDS), "No callback received from window.requestAnimationFrame");
         } catch (InterruptedException e) {
             throw new AssertionError(e);
         }
@@ -406,16 +409,16 @@ private void verifyUserAgentString(String userAgentString) {
         final String fxVersion = System.getProperty("javafx.runtime.version");
         final String numericStr = fxVersion.split("[^0-9]")[0];
         final String fxVersionString = "JavaFX/" + numericStr;
-        assertTrue("UserAgentString does not contain " + fxVersionString, userAgentString.contains(fxVersionString));
+        assertTrue(userAgentString.contains(fxVersionString), "UserAgentString does not contain " + fxVersionString);
 
         File webkitLicense = new File("src/main/legal/webkit.md");
-        assertTrue("File does not exist: " + webkitLicense, webkitLicense.exists());
+        assertTrue(webkitLicense.exists(), "File does not exist: " + webkitLicense);
 
         try (final BufferedReader licenseText = new BufferedReader(new FileReader(webkitLicense))) {
             final String firstLine = licenseText.readLine().trim();
             final String webkitVersion = firstLine.substring(firstLine.lastIndexOf(" ") + 2);
-            assertTrue("webkitVersion should not be empty", webkitVersion.length() > 0);
-            assertTrue("UserAgentString does not contain: " + webkitVersion, userAgentString.contains(webkitVersion));
+            assertTrue(webkitVersion.length() > 0, "webkitVersion should not be empty");
+            assertTrue(userAgentString.contains(webkitVersion), "UserAgentString does not contain: " + webkitVersion);
         } catch (IOException ex){
             throw new AssertionError(ex);
         }
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/OpacityTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/OpacityTest.java
index f913502f04b..d3a015ca08b 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/OpacityTest.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/OpacityTest.java
@@ -30,9 +30,9 @@
 import java.awt.Color;
 import java.awt.image.BufferedImage;
 import javafx.scene.web.WebEngineShim;
-import org.junit.Test;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class OpacityTest extends TestBase {
     /**
@@ -45,24 +45,24 @@ public class OpacityTest extends TestBase {
      */
     @Test public void testOpacity() {
         loadContent("<html>\n" +
-                    "<body style='margin: 0px;'>\n" +
-                    "<p style='opacity: 1.0; height: 100px; margin: 0px; background-color:#000; color: #fff;'>text</p>\n" +
-                    "<p style='opacity: 0.5; height: 100px; margin: 0px; background-color:#000; color: #fff;'>text</p>\n" +
-                    "<p style='opacity: 0.0; height: 100px; margin: 0px; background-color:#000; color: #fff;'>text</p>\n" +
-                    "</body>\n" +
-                    "</html>");
+                "<body style='margin: 0px;'>\n" +
+                "<p style='opacity: 1.0; height: 100px; margin: 0px; background-color:#000; color: #fff;'>text</p>\n" +
+                "<p style='opacity: 0.5; height: 100px; margin: 0px; background-color:#000; color: #fff;'>text</p>\n" +
+                "<p style='opacity: 0.0; height: 100px; margin: 0px; background-color:#000; color: #fff;'>text</p>\n" +
+                "</body>\n" +
+                "</html>");
         submit(() -> {
-                final WebPage webPage = WebEngineShim.getPage(getEngine());
-                assertNotNull(webPage);
-                final BufferedImage img = WebPageShim.paint(webPage, 0, 0, 800, 600);
-                assertNotNull(img);
+            final WebPage webPage = WebEngineShim.getPage(getEngine());
+            assertNotNull(webPage);
+            final BufferedImage img = WebPageShim.paint(webPage, 0, 0, 800, 600);
+            assertNotNull(img);
 
-                final Color pixelAt400x50 = new Color(img.getRGB(400, 50), true);
-                assertTrue("Color should be black:" + pixelAt400x50, isColorsSimilar(Color.BLACK, pixelAt400x50, 1));
-                final Color pixelAt400x150 = new Color(img.getRGB(400, 150), true);
-                assertTrue("Color should be gray:" + pixelAt400x150, isColorsSimilar(Color.GRAY, pixelAt400x150, 1));
-                final Color pixelAt400x250 = new Color(img.getRGB(400, 250), true);
-                assertTrue("Color should be white:" + pixelAt400x250, isColorsSimilar(Color.WHITE, pixelAt400x250, 1));
+            final Color pixelAt400x50 = new Color(img.getRGB(400, 50), true);
+            assertTrue(isColorsSimilar(Color.BLACK, pixelAt400x50, 1), "Color should be black:" + pixelAt400x50);
+            final Color pixelAt400x150 = new Color(img.getRGB(400, 150), true);
+            assertTrue(isColorsSimilar(Color.GRAY, pixelAt400x150, 1), "Color should be gray:" + pixelAt400x150);
+            final Color pixelAt400x250 = new Color(img.getRGB(400, 250), true);
+            assertTrue(isColorsSimilar(Color.WHITE, pixelAt400x250, 1), "Color should be white:" + pixelAt400x250);
         });
     }
 }
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/PathContructorTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/PathContructorTest.java
index b4865fc8d61..3f7da5d83a8 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/PathContructorTest.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/PathContructorTest.java
@@ -25,8 +25,8 @@
 
 package test.javafx.scene.web;
 
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
 
 public class PathContructorTest extends TestBase {
@@ -54,8 +54,9 @@ public class PathContructorTest extends TestBase {
 
         submit(() -> {
             int greenColor = 128;
-            assertEquals("First rect center", greenColor, (int) getEngine().executeScript(
-                    "document.getElementById('myCanvas').getContext('2d').getImageData(21, 21, 1, 1).data[1]"));
+            assertEquals(greenColor, (int) getEngine().executeScript(
+                            "document.getElementById('myCanvas').getContext('2d').getImageData(21, 21, 1, 1).data[1]"),
+                    "First rect center");
         });
     }
 }
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/SVGPointerEventsTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/SVGPointerEventsTest.java
index 847edb71215..a2ee8cb2ab9 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/SVGPointerEventsTest.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/SVGPointerEventsTest.java
@@ -28,10 +28,10 @@
 import com.sun.webkit.WebPage;
 import com.sun.webkit.WebPageShim;
 import javafx.scene.web.WebEngineShim;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class SVGPointerEventsTest extends TestBase {
 
@@ -64,7 +64,7 @@ public void testClickOnStrokePointerEventsStroke() throws Exception {
             WebPageShim.click(page, 70, 410);
 
             for (String s : asList("polyline", "path", "rect", "circle", "ellipse", "polygon", "dashed")) {
-                assertTrue("Expected element '" + s + "' to be activated", (boolean) getEngine().executeScript("isActivated('" + s + "')"));
+                assertTrue((boolean) getEngine().executeScript("isActivated('" + s + "')"), "Expected element '" + s + "' to be activated");
             }
         });
     }
@@ -99,7 +99,7 @@ public void testClickOnFillPointerEventsStroke() throws Exception {
             WebPageShim.click(page, 30, 410);
 
             for (String s : asList("polyline", "path", "rect", "circle", "ellipse", "polygon", "dashed")) {
-                assertFalse("Expected element '" + s + "' not to be activated", (boolean) getEngine().executeScript("isActivated('" + s + "')"));
+                assertFalse((boolean) getEngine().executeScript("isActivated('" + s + "')"), "Expected element '" + s + "' not to be activated");
             }
         });
     }
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/SVGTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/SVGTest.java
index 460eec641ec..5f0ae48d3d4 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/SVGTest.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/SVGTest.java
@@ -31,11 +31,12 @@
 import java.awt.image.BufferedImage;
 import java.util.HashMap;
 import javafx.scene.web.WebEngineShim;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Timeout;
 
 public class SVGTest extends TestBase {
     /**
@@ -44,7 +45,9 @@ public class SVGTest extends TestBase {
      * summary svg.path.getTotalLength
      * Load a simple SVG, Replace its path and get its path's totalLength using pat.getTotalLength
      */
-    @Test(timeout = 30000) public void testSvgGetTotalLength() throws Exception {
+    @Test
+    @Timeout(30)
+    public void testSvgGetTotalLength() throws Exception {
         final String svgStub = "<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'>" +
                 " <path id='pathId' d='M150 0 L75 200 L225 200 Z' /> <svg>";
 
@@ -73,25 +76,25 @@ public class SVGTest extends TestBase {
             final String msg = String.format(
                     "svg.path.getTotalLength() for %s",
                     pathData);
-            assertEquals(msg,
-                    expected[0], totalLength, expected[1]);
+            assertEquals((double) expected[0], totalLength, (double) expected[1], msg);
         });
     }
 
-    @Test public void testSVGRenderingWithGradient() {
+    @Test
+    public void testSVGRenderingWithGradient() {
         loadContent("<html>\n" +
-                    "<body style='margin: 0px 0px;'>\n" +
-                    "<svg width='400' height='150'>\n" +
-                    "<defs>\n" +
-                    "<linearGradient id='grad1' x1='0%' y1='0%' x2='100%' y2='100%'>\n" +
-                    "<stop offset='0%' style='stop-color:red' />\n" +
-                    "<stop offset='100%' style='stop-color:yellow' />\n" +
-                    "</linearGradient>\n" +
-                    "</defs>\n" +
-                    "<rect width='400' height='150' fill='url(#grad1)' />\n" +
-                    "</svg>\n" +
-                    "</body>\n" +
-                    "</html>");
+                "<body style='margin: 0px 0px;'>\n" +
+                "<svg width='400' height='150'>\n" +
+                "<defs>\n" +
+                "<linearGradient id='grad1' x1='0%' y1='0%' x2='100%' y2='100%'>\n" +
+                "<stop offset='0%' style='stop-color:red' />\n" +
+                "<stop offset='100%' style='stop-color:yellow' />\n" +
+                "</linearGradient>\n" +
+                "</defs>\n" +
+                "<rect width='400' height='150' fill='url(#grad1)' />\n" +
+                "</svg>\n" +
+                "</body>\n" +
+                "</html>");
         submit(() -> {
             final WebPage webPage = WebEngineShim.getPage(getEngine());
             assertNotNull(webPage);
@@ -99,22 +102,23 @@ public class SVGTest extends TestBase {
             assertNotNull(img);
 
             final Color pixelAt0x0 = new Color(img.getRGB(0, 0), true);
-            assertTrue("Color should be opaque red:" + pixelAt0x0, isColorsSimilar(Color.RED, pixelAt0x0, 1));
+            assertTrue(isColorsSimilar(Color.RED, pixelAt0x0, 1), "Color should be opaque red:" + pixelAt0x0);
 
             final Color pixelAt100x36 = new Color(img.getRGB(100, 36), true);
-            assertTrue("Color should be almost red:" + pixelAt100x36, isColorsSimilar(Color.RED, pixelAt100x36, 40));
-            assertFalse("Color shouldn't be yellow:" + pixelAt100x36, isColorsSimilar(Color.YELLOW, pixelAt100x36, 10));
+            assertTrue(isColorsSimilar(Color.RED, pixelAt100x36, 40), "Color should be almost red:" + pixelAt100x36);
+            assertFalse(isColorsSimilar(Color.YELLOW, pixelAt100x36, 10), "Color shouldn't be yellow:" + pixelAt100x36);
 
             final Color pixelAt200x75 = new Color(img.getRGB(200, 75), true);
-            assertFalse("Color shouldn't be red:" + pixelAt200x75, isColorsSimilar(Color.RED, pixelAt200x75, 10));
-            assertTrue("Color should look like yellow:" + pixelAt200x75, isColorsSimilar(Color.YELLOW, pixelAt200x75, 40));
+            assertFalse(isColorsSimilar(Color.RED, pixelAt200x75, 10), "Color shouldn't be red:" + pixelAt200x75);
+            assertTrue(isColorsSimilar(Color.YELLOW, pixelAt200x75, 40), "Color should look like yellow:" + pixelAt200x75);
 
             final Color pixelAt399x145 = new Color(img.getRGB(399, 149), true);
-            assertTrue("Color should be opaque yellow:" + pixelAt399x145, isColorsSimilar(Color.YELLOW, pixelAt399x145, 1));
+            assertTrue(isColorsSimilar(Color.YELLOW, pixelAt399x145, 1), "Color should be opaque yellow:" + pixelAt399x145);
         });
     }
 
-    @Test public void testCrashOnScrollableSVG() {
+    @Test
+    public void testCrashOnScrollableSVG() {
         load(SVGTest.class.getClassLoader().getResource("test/html/crash-on-scrollable-svg.html").toExternalForm());
         submit(() -> {
             final WebPage webPage = WebEngineShim.getPage(getEngine());
@@ -124,15 +128,15 @@ public class SVGTest extends TestBase {
 
             // RED rectangle should be rendered with in 0,0, 100x100.
             final Color pixelAt0x0 = new Color(img.getRGB(0, 0), true);
-            assertTrue("Color should be opaque red:" + pixelAt0x0, isColorsSimilar(Color.RED, pixelAt0x0, 1));
+            assertTrue(isColorsSimilar(Color.RED, pixelAt0x0, 1), "Color should be opaque red:" + pixelAt0x0);
             final Color pixelAt50x50 = new Color(img.getRGB(50, 50), true);
-            assertTrue("Color should be opaque red:" + pixelAt50x50, isColorsSimilar(Color.RED, pixelAt50x50, 1));
+            assertTrue(isColorsSimilar(Color.RED, pixelAt50x50, 1), "Color should be opaque red:" + pixelAt50x50);
             final Color pixelAt99x99 = new Color(img.getRGB(99, 99), true);
-            assertTrue("Color should be opaque red:" + pixelAt99x99, isColorsSimilar(Color.RED, pixelAt99x99, 1));
+            assertTrue(isColorsSimilar(Color.RED, pixelAt99x99, 1), "Color should be opaque red:" + pixelAt99x99);
 
             // After 100x100, pixel should be WHITE.
             final Color pixelAt100x100 = new Color(img.getRGB(100, 100), true);
-            assertTrue("Color should be white:" + pixelAt100x100, isColorsSimilar(Color.WHITE, pixelAt100x100, 1));
+            assertTrue(isColorsSimilar(Color.WHITE, pixelAt100x100, 1), "Color should be white:" + pixelAt100x100);
         });
     }
 }
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/ScreenAndWindowTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/ScreenAndWindowTest.java
index d27f34a0c35..32fd6991180 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/ScreenAndWindowTest.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/ScreenAndWindowTest.java
@@ -32,8 +32,8 @@
 import javafx.scene.Scene;
 import javafx.stage.Screen;
 import javafx.stage.Stage;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 import netscape.javascript.*;
 
 public class ScreenAndWindowTest extends TestBase {
@@ -47,15 +47,15 @@ private void checkScreenProperties(Rectangle2D screenSize, Rectangle2D availSize
         int availWidth = (Integer) screen.getMember("availWidth");
         int availHeight = (Integer) screen.getMember("availHeight");
 
-        assertEquals("screen.width", (int)screenSize.getWidth(), width);
-        assertEquals("screen.height", (int)screenSize.getHeight(), height);
-        assertEquals("screen.availWidth", (int)availSize.getWidth(), availWidth);
-        assertEquals("screen.availHeight", (int)availSize.getHeight(), availHeight);
+        assertEquals((int)screenSize.getWidth(), width, "screen.width");
+        assertEquals((int)screenSize.getHeight(), height, "screen.height");
+        assertEquals((int)availSize.getWidth(), availWidth, "screen.availWidth");
+        assertEquals((int)availSize.getHeight(), availHeight, "screen.availHeight");
 
         // do some basic checking, too
-        assertTrue("screen.depth >= 0", depth >= 0);
-        assertTrue("screen.width >= screen.availWidth", width >= availWidth);
-        assertTrue("screen.height >= screen.availHeight", height >= availHeight);
+        assertTrue(depth >= 0, "screen.depth >= 0");
+        assertTrue(width >= availWidth, "screen.width >= screen.availWidth");
+        assertTrue(height >= availHeight, "screen.height >= screen.availHeight");
     }
 
     // called on FX thread
@@ -67,20 +67,20 @@ private void checkWindowProperties(int windowWidth, int windowHeight) {
         int outerHeight = (Integer)window.getMember("outerHeight");
 
         if (windowWidth >= 0) {
-            assertEquals("window.outerWidth", windowWidth, outerWidth);
+            assertEquals(windowWidth, outerWidth, "window.outerWidth");
         }
         if (windowHeight >= 0) {
-            assertEquals("window.outerHeight", windowHeight, outerHeight);
+            assertEquals(windowHeight, outerHeight, "window.outerHeight");
         }
 
         // do some sanity checks
-        assertTrue("window.outerWidth >= window.innerWidth", outerWidth >= innerWidth);
-        assertTrue("window.outerHeight >= window.innerHeight", outerHeight >= innerHeight);
+        assertTrue(outerWidth >= innerWidth, "window.outerWidth >= window.innerWidth");
+        assertTrue(outerHeight >= innerHeight, "window.outerHeight >= window.innerHeight");
     }
 
     // called on FX thread
     private void checkProperties(Rectangle2D screenSize, Rectangle2D availSize,
-                                int windowWidth, int windowHeight) {
+                                 int windowWidth, int windowHeight) {
         checkScreenProperties(screenSize, availSize);
         checkWindowProperties(windowWidth, windowHeight);
     }
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/ShadowTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/ShadowTest.java
index ffdfcded351..3d808fc20b7 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/ShadowTest.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/ShadowTest.java
@@ -28,13 +28,13 @@
 import com.sun.webkit.WebPage;
 import com.sun.webkit.WebPageShim;
 import javafx.scene.web.WebEngineShim;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.awt.Color;
 import java.awt.image.BufferedImage;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class ShadowTest extends TestBase {
     /**
@@ -46,34 +46,34 @@ public class ShadowTest extends TestBase {
      */
     @Test public void testShadow() {
         loadContent("<html>\n" +
-                    "<body style='margin: 0px;'>\n" +
-                    "<p style='text-shadow:5px 5px 0 #FF0000;height: 100px;'>text</p>\n" +
-                    "<p style='height: 100px'>text</p>\n" +
-                    "</body>\n" +
-                    "</html>");
+                "<body style='margin: 0px;'>\n" +
+                "<p style='text-shadow:5px 5px 0 #FF0000;height: 100px;'>text</p>\n" +
+                "<p style='height: 100px'>text</p>\n" +
+                "</body>\n" +
+                "</html>");
         submit(() -> {
-                final WebPage webPage = WebEngineShim.getPage(getEngine());
-                assertNotNull(webPage);
-                final BufferedImage img = WebPageShim.paint(webPage, 0, 0, 800, 600);
-                assertNotNull(img);
+            final WebPage webPage = WebEngineShim.getPage(getEngine());
+            assertNotNull(webPage);
+            final BufferedImage img = WebPageShim.paint(webPage, 0, 0, 800, 600);
+            assertNotNull(img);
 
-                int redShadowCnt = 0;
-                int noShadowCnt = 0;
-                for (int x = 0; x < 100; x++) {
-                    for (int y = 0; y < 200; y++) {
-                        Color pixelColor = new Color(img.getRGB(x, y), true);
-                        if (isColorsSimilar(Color.RED, pixelColor, 1)) {
-                            if (y < 100) {
-                                redShadowCnt++;
-                            } else {
-                                noShadowCnt++;
-                            }
+            int redShadowCnt = 0;
+            int noShadowCnt = 0;
+            for (int x = 0; x < 100; x++) {
+                for (int y = 0; y < 200; y++) {
+                    Color pixelColor = new Color(img.getRGB(x, y), true);
+                    if (isColorsSimilar(Color.RED, pixelColor, 1)) {
+                        if (y < 100) {
+                            redShadowCnt++;
+                        } else {
+                            noShadowCnt++;
                         }
                     }
                 }
+            }
 
-                assertTrue("no shadow found", redShadowCnt > 0);
-                assertTrue("wrong shadow found", noShadowCnt == 0);
+            assertTrue(redShadowCnt > 0, () -> "no shadow found");
+            assertTrue(noShadowCnt == 0, () -> "wrong shadow found");
         });
     }
 }
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/SubresourceIntegrityTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/SubresourceIntegrityTest.java
index d44bf235803..f16c1e65534 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/SubresourceIntegrityTest.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/SubresourceIntegrityTest.java
@@ -29,60 +29,53 @@
 import java.io.FileOutputStream;
 import java.util.Arrays;
 import java.util.Collection;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized.Parameters;
-import org.junit.runners.Parameterized;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.Arguments;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import java.util.stream.Stream;
 
-@RunWith(Parameterized.class)
 public final class SubresourceIntegrityTest extends TestBase {
 
-    // To arguments from junit data provider.
-    private final String hashValue;
-    private final String expected;
     private File htmlFile;
     // Expectations
     private final static String LOADED = "hello";
     private final static String NOT_LOADED = "not loaded";
-    // TODO: junit 4.11 provides an option to label arguments.
-    @Parameters
-    public static Collection<String[]> data() {
-        return Arrays.asList(new String[][] {
-            // shasum -b -a 1 subresource-integrity-test.js | awk '{ print $1 }' | xxd -r -p | base64
-            {"sha1-/kpzvnGzRkcE9OFn5j8qRE61nZY=", LOADED},
-            // shasum -b -a 224 subresource-integrity-test.js | awk '{ print $1 }' | xxd -r -p | base64
-            {"sha224-zgiBbbuKJixMVEkaOXnvpSYZGsx7SbSZ0QOckg==", LOADED},
-            // shasum -b -a 256 subresource-integrity-test.js | awk '{ print $1 }' | xxd -r -p | base64
-            {"sha256-vcl3cFaIDAtcQBkUZFdY+tW/bjrg6vX1R+hQ8uB5tHc=", LOADED},
-            // shasum -b -a 384 subresource-integrity-test.js | awk '{ print $1 }' | xxd -r -p | base64
-            {"sha384-+GrI+cacF05VlQitRghQhs1by9CSIyc8XgZTbymUg2oA0EYdLiPMtilnFP3LDbkY", LOADED},
-            // shasum -b -a 512 subresource-integrity-test.js | awk '{ print $1 }' | xxd -r -p | base64
-            {"sha512-V8m3j61x5soaVcO83NuHavY7Yn4MQYoUgrqJe38f6QYG9QzzgWbVDB1SrZsZ2CVR1IsOnV2MLhnDaZhWOwHDsw==", LOADED},
-            // Only sha256, sha384, sha512 are validated, rest will be ignored and loaded
-            // Ref. https://developer.mozilla.org/en-US/docs/Web/Security/Subresource_Integrity#Using_Subresource_Integrity
-            {"sha1-0000000000000000000000000000", LOADED},
-            {"sha224-0000000000000000000000000000000000000000", LOADED},
-            // negative tests, change the hash value and ensure it fails
-            {"sha256-Vcl3cFaIDAtcQBkUZFdY+tW/bjrg6vX1R+hQ8uB5tHc=", NOT_LOADED},
-            {"sha384-+grI+cacF05VlQitRghQhs1by9CSIyc8XgZTbymUg2oA0EYdLiPMtilnFP3LDbkY", NOT_LOADED},
-            {"sha512-v8m3j61x5soaVcO83NuHavY7Yn4MQYoUgrqJe38f6QYG9QzzgWbVDB1SrZsZ2CVR1IsOnV2MLhnDaZhWOwHDsw==", NOT_LOADED},
-            // should load for invalid hash algorithm
-            {"unknown-0000", LOADED},
-            {"", LOADED},
-        });
-    }
 
-    public SubresourceIntegrityTest(final String hashValue, final String expected) {
-        this.hashValue = hashValue;
-        this.expected = expected;
+    static Stream<Arguments> dataProvider() {
+        return Stream.of(
+                // shasum -b -a 1 subresource-integrity-test.js | awk '{ print $1 }' | xxd -r -p | base64
+                Arguments.of("sha1-/kpzvnGzRkcE9OFn5j8qRE61nZY=", LOADED),
+                // shasum -b -a 224 subresource-integrity-test.js | awk '{ print $1 }' | xxd -r -p | base64
+                Arguments.of("sha224-zgiBbbuKJixMVEkaOXnvpSYZGsx7SbSZ0QOckg==", LOADED),
+                // shasum -b -a 256 subresource-integrity-test.js | awk '{ print $1 }' | xxd -r -p | base64
+                Arguments.of("sha256-vcl3cFaIDAtcQBkUZFdY+tW/bjrg6vX1R+hQ8uB5tHc=", LOADED),
+                // shasum -b -a 384 subresource-integrity-test.js | awk '{ print $1 }' | xxd -r -p | base64
+                Arguments.of("sha384-+GrI+cacF05VlQitRghQhs1by9CSIyc8XgZTbymUg2oA0EYdLiPMtilnFP3LDbkY", LOADED),
+                // shasum -b -a 512 subresource-integrity-test.js | awk '{ print $1 }' | xxd -r -p | base64
+                Arguments.of("sha512-V8m3j61x5soaVcO83NuHavY7Yn4MQYoUgrqJe38f6QYG9QzzgWbVDB1SrZsZ2CVR1IsOnV2MLhnDaZhWOwHDsw==", LOADED),
+                // Only sha256, sha384, sha512 are validated, rest will be ignored and loaded
+                // Ref. https://developer.mozilla.org/en-US/docs/Web/Security/Subresource_Integrity#Using_Subresource_Integrity
+                Arguments.of("sha1-0000000000000000000000000000", LOADED),
+                Arguments.of("sha224-0000000000000000000000000000000000000000", LOADED),
+                // negative tests, change the hash value and ensure it fails
+                Arguments.of("sha256-Vcl3cFaIDAtcQBkUZFdY+tW/bjrg6vX1R+hQ8uB5tHc=", NOT_LOADED),
+                Arguments.of("sha384-+grI+cacF05VlQitRghQhs1by9CSIyc8XgZTbymUg2oA0EYdLiPMtilnFP3LDbkY", NOT_LOADED),
+                Arguments.of("sha512-v8m3j61x5soaVcO83NuHavY7Yn4MQYoUgrqJe38f6QYG9QzzgWbVDB1SrZsZ2CVR1IsOnV2MLhnDaZhWOwHDsw==", NOT_LOADED),
+                // should load for invalid hash algorithm
+                Arguments.of("unknown-0000", LOADED),
+                Arguments.of("", LOADED)
+        );
     }
 
-    @Before
-    public void setup() throws Exception {
+    // @BeforeEach
+    public void setup(String hashValue, String expected) throws Exception {
         // loadContent won't work with CORS, use file:// for main resource.
         htmlFile = new File("subresource-integrity-test.html");
         final FileOutputStream out = new FileOutputStream(htmlFile);
@@ -90,26 +83,27 @@ public void setup() throws Exception {
                 new File("src/test/resources/test/html/subresource-integrity-test.js").toURI().toASCIIString();
         final String html =
                 String.format("<html>\n" +
-                "<head><script src='%s' integrity='%s' crossorigin='anonymous'></script></head>\n" +
-                "<body>%s</body>\n" +
-                "</html>", scriptUrl, hashValue, NOT_LOADED);
+                        "<head><script src='%s' integrity='%s' crossorigin='anonymous'></script></head>\n" +
+                        "<body>%s</body>\n" +
+                        "</html>", scriptUrl, hashValue, NOT_LOADED);
         out.write(html.getBytes());
         out.close();
     }
 
-    @Test
-    public void testScriptTagWithCorrectHashValue() {
+    @ParameterizedTest
+    @MethodSource("dataProvider")
+    public void testScriptTagWithCorrectHashValue(String hashValue, String expected) throws Exception {
+        setup(hashValue, expected);
         load(htmlFile);
         final String bodyText = (String) executeScript("document.body.innerText");
         assertNotNull("document.body.innerText must be non null for " + hashValue, bodyText);
-        assertEquals(hashValue, expected, bodyText);
+        assertEquals(expected, bodyText, hashValue);
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         if (!htmlFile.delete()) {
             htmlFile.deleteOnExit();
         }
     }
 }
-
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/SwingDependencyTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/SwingDependencyTest.java
index da1b01440ea..bfb1bd2dfc5 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/SwingDependencyTest.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/SwingDependencyTest.java
@@ -27,9 +27,9 @@
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test the Image to DataURL function
@@ -39,27 +39,27 @@ public class SwingDependencyTest extends TestBase {
     private final PrintStream err = System.err;
 
     private static final String htmlContent = "\n"
-        + "<!DOCTYPE html>\n"
-        + "<html>\n"
-        + "<body>\n"
-        + "<canvas id=\"theCanvas\" width=\"200\" height=\"100\">\n"
-        + "</canvas>\n"
-        + "<p id = \"encodedText\">\n"
-        + "</p>\n"
-        + "<script>\n"
-        + "var c = document.getElementById(\"theCanvas\");\n"
-        + "var ctx = c.getContext(\"2d\");\n"
-        + "var my_gradient=ctx.createLinearGradient(0,0,0,75);\n"
-        + "my_gradient.addColorStop(0,\"red\");\n"
-        + "my_gradient.addColorStop(0.5,\"green\");\n"
-        + "my_gradient.addColorStop(1,\"blue\");\n"
-        + "ctx.fillStyle=my_gradient;\n"
-        + "ctx.fillRect(0,0,150,75);\n"
-        + "var dataURL = c.toDataURL();\n"
-        + "document.getElementById(\"encodedText\").innerHTML=dataURL;\n"
-        + "</script>\n"
-        + "</body>\n"
-        + "</html>\n";
+            + "<!DOCTYPE html>\n"
+            + "<html>\n"
+            + "<body>\n"
+            + "<canvas id=\"theCanvas\" width=\"200\" height=\"100\">\n"
+            + "</canvas>\n"
+            + "<p id = \"encodedText\">\n"
+            + "</p>\n"
+            + "<script>\n"
+            + "var c = document.getElementById(\"theCanvas\");\n"
+            + "var ctx = c.getContext(\"2d\");\n"
+            + "var my_gradient=ctx.createLinearGradient(0,0,0,75);\n"
+            + "my_gradient.addColorStop(0,\"red\");\n"
+            + "my_gradient.addColorStop(0.5,\"green\");\n"
+            + "my_gradient.addColorStop(1,\"blue\");\n"
+            + "ctx.fillStyle=my_gradient;\n"
+            + "ctx.fillRect(0,0,150,75);\n"
+            + "var dataURL = c.toDataURL();\n"
+            + "document.getElementById(\"encodedText\").innerHTML=dataURL;\n"
+            + "</script>\n"
+            + "</body>\n"
+            + "</html>\n";
 
     @Test
     public void testSwingDependency() throws Exception {
@@ -71,11 +71,10 @@ public void testSwingDependency() throws Exception {
 
         System.setErr(err);
 
-        Assert.assertFalse("ClassNotFoundException found",
-                            bytes.toString().contains("ClassNotFoundException"));
+        assertFalse(bytes.toString().contains("ClassNotFoundException"), "ClassNotFoundException found");
     }
 
-    @After
+    @AfterEach
     public void resetSystemErr() {
         System.setErr(err);
     }
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/TestBase.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/TestBase.java
index 5b64ed831bf..755cd35f40a 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/TestBase.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/TestBase.java
@@ -43,7 +43,7 @@
 import java.util.concurrent.ExecutionException;
 import javafx.scene.web.WebEngine;
 import javafx.scene.web.WebView;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.BeforeAll;
 import org.w3c.dom.Document;
 
 public class TestBase implements ChangeListener, InvalidationListener {
@@ -53,7 +53,7 @@ public class TestBase implements ChangeListener, InvalidationListener {
 
     private static WebView view;
 
-    @BeforeClass
+    @BeforeAll
     public static void setupOnce() {
         final CountDownLatch startupLatch = new CountDownLatch(1);
 
@@ -220,7 +220,7 @@ protected Object executeScript(final String script) {
     private class LoadFinishedListener implements ChangeListener<Boolean> {
         @Override
         public void changed(ObservableValue<? extends Boolean> observable,
-                Boolean oldValue, Boolean newValue) {
+                            Boolean oldValue, Boolean newValue) {
             if (! newValue) {
                 TestBase.this.notify(LOCK);
             }
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/UserDataDirectoryTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/UserDataDirectoryTest.java
index dd7cb5f75bd..b9957063400 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/UserDataDirectoryTest.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/UserDataDirectoryTest.java
@@ -52,16 +52,16 @@
 import static javafx.scene.web.WebErrorEvent.USER_DATA_DIRECTORY_ALREADY_IN_USE;
 import static javafx.scene.web.WebErrorEvent.USER_DATA_DIRECTORY_IO_ERROR;
 import static javafx.scene.web.WebErrorEvent.USER_DATA_DIRECTORY_SECURITY_ERROR;
-import org.junit.After;
-import org.junit.AfterClass;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.fail;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class UserDataDirectoryTest extends TestBase {
 
@@ -80,7 +80,7 @@ public class UserDataDirectoryTest extends TestBase {
     private WebEngine webEngine;
 
 
-    @BeforeClass
+    @BeforeAll
     public static void beforeClass() throws IOException {
         for (File dir : DIRS) {
             dir.mkdirs();
@@ -94,7 +94,7 @@ public static void beforeClass() throws IOException {
         }
     }
 
-    @AfterClass
+    @AfterAll
     public static void afterClass() throws IOException {
         preLockedLock.release();
         preLockedRaf.close();
@@ -104,12 +104,12 @@ public static void afterClass() throws IOException {
     }
 
 
-    @Before
+    @BeforeEach
     public void before() {
         webEngine = createWebEngine();
     }
 
-    @After
+    @AfterEach
     public void after() {
         for (WebEngine webEngine : createdWebEngines) {
             dispose(webEngine);
@@ -711,7 +711,7 @@ private static void sleep(long millis) {
     }
 
     private static final class ErrorHandler
-        implements EventHandler<WebErrorEvent>
+            implements EventHandler<WebErrorEvent>
     {
         private final ArrayList<WebErrorEvent> errors = new ArrayList<>();
 
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/WebPageTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/WebPageTest.java
index 04eb96b39e9..494adacb671 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/WebPageTest.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/WebPageTest.java
@@ -29,9 +29,10 @@
 import com.sun.webkit.WebPageShim;
 import javafx.scene.web.WebEngineShim;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.junit.jupiter.api.Test;
 
 public class WebPageTest extends TestBase {
 
@@ -45,17 +46,17 @@ public class WebPageTest extends TestBase {
         WebPage page = WebEngineShim.getPage(getEngine());
 
         loadContent(HTML);
-        assertEquals("HTML document", HTML, getHtml(page));
+        assertEquals(HTML, getHtml(page), "HTML document");
 
         // With XML document, getHtml() should return null
         loadContent(XML, "application/xml");
-        assertNull("XML document", getHtml(page));
+        assertNull(getHtml(page), "XML document");
 
         loadContent("");
-        assertEquals("Empty document", PLAIN, getHtml(page));
+        assertEquals(PLAIN, getHtml(page), "Empty document");
 
         loadContent("", "text/plain");
-        assertEquals("Empty text/plain document", PLAIN, getHtml(page));
+        assertEquals(PLAIN, getHtml(page), "Empty text/plain document");
     }
 
     private String getHtml(final WebPage page) throws Exception {
@@ -73,13 +74,13 @@ private String getHtml(final WebPage page) throws Exception {
         // load content with single iframe, which leads to two frame
         loadContent(PTAG + IFRAME);
         submit(() -> {
-            assertEquals("Expected two frames : ", 2, WebPageShim.getFramesCount(page));
+            assertEquals(2, WebPageShim.getFramesCount(page), "Expected two frames : ");
         });
 
         // load content with only one element which leads to single frame
         loadContent(PTAG);
         submit(() -> {
-            assertEquals("Expected single frame : ", 1, WebPageShim.getFramesCount(page));
+            assertEquals(1, WebPageShim.getFramesCount(page), "Expected single frame : ");
         });
     }
 
@@ -89,15 +90,19 @@ private String getHtml(final WebPage page) throws Exception {
                 "test/html/icutagparse.html").toExternalForm());
     }
 
-    @Test(expected = IllegalStateException.class)
+    @Test
     public void testGetClientTextLocationFromNonEventThread() {
-        WebPage page = WebEngineShim.getPage(getEngine());
-        page.getClientTextLocation(0);
+        assertThrows(IllegalStateException.class, () -> {
+            WebPage page = WebEngineShim.getPage(getEngine());
+            page.getClientTextLocation(0);
+        });
     }
 
-    @Test(expected = IllegalStateException.class)
+    @Test
     public void testGetClientLocationOffsetFromNonEventThread() {
-        WebPage page = WebEngineShim.getPage(getEngine());
-        page.getClientLocationOffset(0, 0);
+        assertThrows(IllegalStateException.class, () -> {
+            WebPage page = WebEngineShim.getPage(getEngine());
+            page.getClientLocationOffset(0, 0);
+        });
     }
 }
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/WebViewResizabilityTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/WebViewResizabilityTest.java
index 21cacbe476e..e41ad8ccd7c 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/WebViewResizabilityTest.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/WebViewResizabilityTest.java
@@ -26,11 +26,11 @@
 package test.javafx.scene.web;
 
 import javafx.scene.web.WebView;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 
 public class WebViewResizabilityTest extends TestBase {
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/WebViewTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/WebViewTest.java
index 78b64265994..ce13d12ab2b 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/WebViewTest.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/WebViewTest.java
@@ -25,8 +25,8 @@
 
 package test.javafx.scene.web;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 import java.io.File;
 import javafx.event.Event;
@@ -35,7 +35,7 @@
 import javafx.scene.web.WebEngineShim;
 import javafx.scene.web.WebView;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class WebViewTest extends TestBase {
     final static float SCALE = 1.78f;
@@ -68,9 +68,8 @@ public class WebViewTest extends TestBase {
     }
 
     void checkFontScale(WebView view, float scale) {
-        assertEquals("WebView.fontScale", scale, view.getFontScale(), DELTA);
-        assertEquals("WebPage.zoomFactor",
-                scale, WebEngineShim.getPage(view.getEngine()).getZoomFactor(true), DELTA);
+        assertEquals(scale, view.getFontScale(), DELTA, "WebView.fontScale");
+        assertEquals(scale, WebEngineShim.getPage(view.getEngine()).getZoomFactor(true), DELTA, "WebPage.zoomFactor");
     }
 
     private void setFontScale(final WebView view, final float scale) throws Exception {
@@ -80,7 +79,7 @@ private void setFontScale(final WebView view, final float scale) throws Exceptio
     }
 
     void checkZoom(WebView view, float zoom) {
-        assertEquals("WebView.zoom", zoom, view.getZoom(), DELTA);
+        assertEquals(zoom, view.getZoom(), DELTA, "WebView.zoom");
     }
 
     private void setZoom(final WebView view, final float zoom) throws Exception {
@@ -96,20 +95,21 @@ private void setZoom(final WebView view, final float zoom) throws Exception {
      */
     @Test public void testFontWeights() {
         loadContent(
-            "<!DOCTYPE html><html><head></head>" +
-            "<body>" +
-            "   <div style=\"font: 19px system-ui\">" +
-            "       <div style=\"font-style: italic;\">" +
-            "           <span id=\"six\" style=\"font-weight: 600;\">Hello, World</span>" +
-            "           <span id=\"nine\" style=\"font-weight: 900;\">Hello, World</span>" +
-            "       </div>" +
-            "   </div>" +
-            "</body> </html>"
-            );
+                "<!DOCTYPE html><html><head></head>" +
+                "<body>" +
+                "   <div style=\"font: 19px system-ui\">" +
+                "       <div style=\"font-style: italic;\">" +
+                "           <span id=\"six\" style=\"font-weight: 600;\">Hello, World</span>" +
+                "           <span id=\"nine\" style=\"font-weight: 900;\">Hello, World</span>" +
+                "       </div>" +
+                "   </div>" +
+                "</body> </html>"
+        );
         submit(() -> {
-            assertFalse("Font weight test failed ",
-                (Boolean) getEngine().executeScript(
-                "document.getElementById('six').offsetWidth == document.getElementById('nine').offsetWidth"));
+            assertFalse(
+                    (Boolean) getEngine().executeScript(
+                            "document.getElementById('six').offsetWidth == document.getElementById('nine').offsetWidth"),
+                    "Font weight test failed ");
         });
     }
 }
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/WebWorkerTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/WebWorkerTest.java
index 397c5784c3b..168ea8ecace 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/WebWorkerTest.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/WebWorkerTest.java
@@ -25,13 +25,13 @@
 
 package test.javafx.scene.web;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.io.File;
 import javafx.concurrent.Worker.State;
 import javafx.scene.web.WebEngine;
 import javafx.scene.web.WebView;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class WebWorkerTest extends TestBase {
 
@@ -44,7 +44,7 @@ public void testWorker() throws InterruptedException {
         final WebEngine webEngine = getEngine();
         webEngine.setJavaScriptEnabled(true);
         load(new File("src/test/resources/test/html/worker.html"));
-        assertTrue("Load task completed successfully", getLoadState() == State.SUCCEEDED);
+        assertTrue(getLoadState() == State.SUCCEEDED, "Load task completed successfully");
 
         Thread.sleep(500);
 

From 9386ee9d18b9f2bf3128f45b2a6f5c0969fc605b Mon Sep 17 00:00:00 2001
From: Andy Goryachev <angorya@openjdk.org>
Date: Thu, 19 Sep 2024 22:37:47 +0000
Subject: [PATCH 43/75] 8328828: Monkey Tester Application Part 4

Reviewed-by: arapte, lkostyra
---
 .../.settings/org.eclipse.jdt.core.prefs      |   5 +-
 tests/manual/monkey/build.xml                 |   2 +-
 .../oracle/tools/fx/monkey/AppSettings.java   |  34 ++
 .../com/oracle/tools/fx/monkey/Loggers.java   | 124 ++++++
 .../oracle/tools/fx/monkey/MainWindow.java    |  55 ++-
 .../src/com/oracle/tools/fx/monkey/Pages.java |  18 +-
 .../fx/monkey/options/BooleanOption.java      |   5 +-
 .../tools/fx/monkey/options/DoubleOption.java | 133 ++++++-
 .../tools/fx/monkey/options/FontOption.java   |  73 +++-
 .../fx/monkey/options/GraphicOption.java      |  12 +-
 .../tools/fx/monkey/options/ObjectOption.java |   5 +-
 .../fx/monkey/options/StyleClassOption.java   |  97 +++++
 .../tools/fx/monkey/options/TextOption.java   |   9 +-
 .../tools/fx/monkey/pages/AccordionPage.java  |  11 +-
 .../tools/fx/monkey/pages/AreaChartPage.java  |  11 +-
 .../tools/fx/monkey/pages/BarChartPage.java   | 101 ++++-
 .../fx/monkey/pages/BubbleChartPage.java      |  11 +-
 .../tools/fx/monkey/pages/ButtonPage.java     |  75 ++++
 .../tools/fx/monkey/pages/CanvasPage.java     |  47 ++-
 .../tools/fx/monkey/pages/CheckBoxPage.java   |  74 ++++
 .../tools/fx/monkey/pages/ChoiceBoxPage.java  |  11 +-
 .../fx/monkey/pages/ColorPickerPage.java      |  11 +-
 .../tools/fx/monkey/pages/ComboBoxPage.java   |  36 +-
 .../tools/fx/monkey/pages/DatePickerPage.java |  11 +-
 .../oracle/tools/fx/monkey/pages/DnDPage.java | 196 ++++++++++
 .../tools/fx/monkey/pages/HBoxPage.java       |  11 +-
 .../fx/monkey/pages/HTMLEditor_Page.java      |  11 +-
 .../tools/fx/monkey/pages/HyperlinkPage.java  |  74 ++++
 .../tools/fx/monkey/pages/LabelPage.java      |  16 +-
 .../tools/fx/monkey/pages/LineChartPage.java  |  11 +-
 .../tools/fx/monkey/pages/ListViewPage.java   |  49 ++-
 .../tools/fx/monkey/pages/MenuBarPage.java    | 160 ++++++++
 .../tools/fx/monkey/pages/MenuButtonPage.java |  12 +-
 .../tools/fx/monkey/pages/PaginationPage.java |  11 +-
 .../fx/monkey/pages/PasswordFieldPage.java    |  11 +-
 .../tools/fx/monkey/pages/PieChartPage.java   |  11 +-
 .../fx/monkey/pages/RadioButtonPage.java      |  81 ++++
 .../tools/fx/monkey/pages/ScrollBarPage.java  |  11 +-
 .../tools/fx/monkey/pages/ScrollPanePage.java |  30 +-
 .../tools/fx/monkey/pages/ShapePage.java      | 358 ++++++++++++++++++
 .../tools/fx/monkey/pages/SpinnerPage.java    |  11 +-
 .../fx/monkey/pages/SplitMenuButtonPage.java  | 106 ++++++
 .../fx/monkey/pages/StackedAreaChartPage.java |  11 +-
 .../fx/monkey/pages/StackedBarChartPage.java  |  11 +-
 .../tools/fx/monkey/pages/TabPanePage.java    |  82 +++-
 .../tools/fx/monkey/pages/TableViewPage.java  | 287 +++-----------
 .../tools/fx/monkey/pages/TextAreaPage.java   |  23 +-
 .../tools/fx/monkey/pages/TextFieldPage.java  |  26 +-
 .../tools/fx/monkey/pages/TextFlowPage.java   |  33 +-
 .../tools/fx/monkey/pages/TextPage.java       |  27 +-
 .../tools/fx/monkey/pages/TitledPanePage.java |  36 +-
 .../fx/monkey/pages/ToggleButtonPage.java     |  81 ++++
 .../tools/fx/monkey/pages/ToolBarPage.java    |  59 ++-
 .../tools/fx/monkey/pages/TooltipPage.java    |  49 ++-
 .../fx/monkey/pages/TreeTableViewPage.java    | 202 +++-------
 .../tools/fx/monkey/pages/TreeViewPage.java   |  11 +-
 .../tools/fx/monkey/pages/VBoxPage.java       |  11 +-
 .../fx/monkey/pages/XYChartPageBase.java      |  34 +-
 .../monkey/sheets/ButtonsPropertySheet.java   |  86 +++++
 .../monkey/sheets/ControlPropertySheet.java   |  84 +++-
 .../fx/monkey/sheets/NodePropertySheet.java   |  25 +-
 .../tools/fx/monkey/sheets/Options.java       |  68 +++-
 .../fx/monkey/sheets/PropertiesMenu.java      |  78 ++++
 .../fx/monkey/sheets/PropertiesMonitor.java   | 270 +++++++++++++
 .../monkey/sheets/StyleablePropertySheet.java |  68 ++++
 .../sheets/TableColumnPropertySheet.java      |  92 +++--
 .../monkey/sheets/TextAreaPropertySheet.java  |  46 +++
 .../monkey/sheets/TextFieldPropertySheet.java |  48 +++
 .../sheets/TypeSpecificContextMenu.java       |  67 ++++
 .../monkey/sheets/XYChartPropertySheet.java   |   1 -
 .../tools/AccessibilityPropertyViewer.java    |  86 +++++
 .../fx/monkey/tools/ClipboardViewer.java      |   2 +-
 .../fx/monkey/tools/Native2AsciiPane.java     | 109 +++++-
 .../tools/fx/monkey/util/BooleanConsumer.java |  38 ++
 .../tools/fx/monkey/util/EnterTextDialog.java |  16 +-
 .../com/oracle/tools/fx/monkey/util/FX.java   | 150 +++++++-
 .../tools/fx/monkey/util/ImageTools.java      |  38 +-
 .../tools/fx/monkey/util/OptionPane.java      |  23 +-
 .../tools/fx/monkey/util/OptionWindow.java    |  63 +++
 .../tools/fx/monkey/util/TestPaneBase.java    |   6 +
 .../tools/fx/monkey/util/TextTemplates.java   |  16 +
 .../oracle/tools/fx/monkey/util/Utils.java    |  41 ++
 82 files changed, 3907 insertions(+), 738 deletions(-)
 create mode 100644 tests/manual/monkey/src/com/oracle/tools/fx/monkey/AppSettings.java
 create mode 100644 tests/manual/monkey/src/com/oracle/tools/fx/monkey/Loggers.java
 create mode 100644 tests/manual/monkey/src/com/oracle/tools/fx/monkey/options/StyleClassOption.java
 create mode 100644 tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/ButtonPage.java
 create mode 100644 tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/CheckBoxPage.java
 create mode 100644 tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/DnDPage.java
 create mode 100644 tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/HyperlinkPage.java
 create mode 100644 tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/MenuBarPage.java
 create mode 100644 tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/RadioButtonPage.java
 create mode 100644 tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/ShapePage.java
 create mode 100644 tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/SplitMenuButtonPage.java
 create mode 100644 tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/ToggleButtonPage.java
 create mode 100644 tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/ButtonsPropertySheet.java
 create mode 100644 tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/PropertiesMenu.java
 create mode 100644 tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/PropertiesMonitor.java
 create mode 100644 tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/StyleablePropertySheet.java
 create mode 100644 tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/TextAreaPropertySheet.java
 create mode 100644 tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/TextFieldPropertySheet.java
 create mode 100644 tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/TypeSpecificContextMenu.java
 create mode 100644 tests/manual/monkey/src/com/oracle/tools/fx/monkey/tools/AccessibilityPropertyViewer.java
 create mode 100644 tests/manual/monkey/src/com/oracle/tools/fx/monkey/util/BooleanConsumer.java
 create mode 100644 tests/manual/monkey/src/com/oracle/tools/fx/monkey/util/OptionWindow.java

diff --git a/tests/manual/monkey/.settings/org.eclipse.jdt.core.prefs b/tests/manual/monkey/.settings/org.eclipse.jdt.core.prefs
index 72f2c9699d6..1e0cb16bbc7 100644
--- a/tests/manual/monkey/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/manual/monkey/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,9 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -11,4 +12,4 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/tests/manual/monkey/build.xml b/tests/manual/monkey/build.xml
index d9452e7cee6..b3bb0038410 100644
--- a/tests/manual/monkey/build.xml
+++ b/tests/manual/monkey/build.xml
@@ -45,7 +45,7 @@ This build requires javafx.home property, pointing to JavaFX SDK (21+) directory
 			includeantruntime="false"
 		>
 			<compilerarg value="-Xlint:none"/>
-			<compilerarg line="--module-path ${javafx.home}/lib --add-modules javafx.base,javafx.graphics,javafx.controls"/>
+			<compilerarg line="--module-path ${javafx.home}/lib --add-modules javafx.base,javafx.graphics,javafx.controls,javafx.swing,javafx.web"/>
 			<classpath refid="libs" />
 		</javac>
 	</target>
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/AppSettings.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/AppSettings.java
new file mode 100644
index 00000000000..922ff771de5
--- /dev/null
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/AppSettings.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+package com.oracle.tools.fx.monkey;
+
+import javafx.beans.property.SimpleBooleanProperty;
+
+/**
+ * Application Settings.
+ */
+public class AppSettings {
+    public static final SimpleBooleanProperty snapSplitPanes = new SimpleBooleanProperty(true);
+}
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/Loggers.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/Loggers.java
new file mode 100644
index 00000000000..b10e0e19fbb
--- /dev/null
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/Loggers.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+package com.oracle.tools.fx.monkey;
+
+import javafx.beans.property.SimpleBooleanProperty;
+
+/**
+ * Various logs (write to stdout).
+ */
+public class Loggers {
+    public static final Logger accessibility = new Logger("accessibility");
+
+    private static String toJson(long time, String name, Object[] nameValuePairs) {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        kv(sb, "time", time);
+        sb.append(", ");
+        kv(sb, "log", name);
+        for(int i=0; i<nameValuePairs.length; ) {
+            Object k = nameValuePairs[i++];
+            String ks = escape(k.toString());
+            Object v = nameValuePairs[i++];
+            String vs = formatValue(v);
+            sb.append(", ");
+            kv(sb, ks, vs);
+        }
+        sb.append("}");
+        return sb.toString();
+    }
+
+    private static void kv(StringBuilder sb, String name, Object value) {
+        String v = formatValue(value);
+        sb.append(name);
+        sb.append(":");
+        sb.append(v);
+    }
+
+    private static String formatValue(Object v) {
+        if (v == null) {
+            return "null";
+        } else if(v instanceof Number) {
+            return v.toString();
+        } else {
+            return escape(v.toString());
+        }
+    }
+
+    private static String escape(String text) {
+        int len = text.length();
+        StringBuilder sb = new StringBuilder(len + 8);
+        sb.append('"');
+        for (int i = 0; i < len; i++) {
+            char c = text.charAt(i);
+            String s;
+            switch(c) {
+            case '\b':
+                s = "\\b";
+                break;
+            case '\t':
+                s = "\\t";
+                break;
+            case '\r':
+                s = "\\r";
+                break;
+            case '\n':
+                s = "\\n";
+                break;
+            case '\f':
+                s = "\\f";
+                break;
+            case '"':
+                s = "\\\"";
+                break;
+            default:
+                sb.append(c);
+                continue;
+            }
+
+            sb.append(s);
+        }
+        sb.append('"');
+        return sb.toString();
+    }
+
+    public static class Logger {
+        private final String name;
+        public final SimpleBooleanProperty enabled = new SimpleBooleanProperty();
+        private volatile boolean isEnabled;
+
+        public Logger(String name) {
+            this.name = name;
+            enabled.addListener((s, p, on) -> isEnabled = on);
+        }
+
+        public void log(Object... nameValuePairs) {
+            if (isEnabled) {
+                String json = toJson(System.currentTimeMillis(), name, nameValuePairs);
+                System.out.println(json);
+            }
+        }
+    }
+}
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/MainWindow.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/MainWindow.java
index f8e4dd4ccb1..5c6354a5b21 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/MainWindow.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/MainWindow.java
@@ -39,8 +39,6 @@
 import javafx.scene.control.ListView;
 import javafx.scene.control.MenuBar;
 import javafx.scene.control.SplitPane;
-import javafx.scene.control.ToggleGroup;
-import javafx.scene.input.KeyCombination;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Priority;
@@ -127,38 +125,37 @@ private MenuBar createMenu() {
             getScene().setNodeOrientation(v);
         });
 
-        MenuBar b = new MenuBar();
+        MenuBar m = new MenuBar();
         // File
-        FX.menu(b, "_File");
-        FX.item(b, "Quit", Platform::exit);
+        FX.menu(m, "_File");
+        FX.item(m, "Quit", Platform::exit);
         // Page
-        FX.menu(b, "_Page");
-        FX.item(b, "Reload Current Page", this::reloadCurrentPage);
+        FX.menu(m, "_Page");
+        FX.item(m, "Reload Current Page", this::reloadCurrentPage);
+        FX.separator(m);
+        FX.checkItem(m, "Snapped Split Panes", AppSettings.snapSplitPanes);
         // Skin
-        FX.menu(b, "_Skin");
-        FX.item(b, "Set New Skin", this::newSkin);
-        FX.item(b, "<null> Skin", this::nullSkin);
-        // Menu
-        FX.menu(b, "_Menu");
-        ToggleGroup g = new ToggleGroup();
-        FX.radio(b, "RadioMenuItem 1", KeyCombination.keyCombination("Shortcut+1"), g);
-        FX.radio(b, "RadioMenuItem 2", KeyCombination.keyCombination("Shortcut+2"), g);
-        FX.radio(b, "RadioMenuItem 3", KeyCombination.keyCombination("Shortcut+3"), g);
+        FX.menu(m, "_Skin");
+        FX.item(m, "Set New Skin", this::newSkin);
+        FX.item(m, "<null> Skin", this::nullSkin);
         // Tools
-        FX.menu(b, "_Tools");
-        FX.item(b, "Clipboard Viewer", this::openClipboardViewer);
-        FX.item(b, "CSS Playground", this::openCssPlayground);
-        FX.item(b, "FX TextArea Embedded in JFXPanel", this::openJFXPanel);
-        FX.item(b, "JTextArea/JTextField Embedded in SwingNode", this::openJTextArea);
-        FX.item(b, "Keyboard Event Viewer", this::openKeyboardViewer);
-        FX.item(b, "Native to ASCII", this::openNative2Ascii);
-        FX.item(b, "System Info", this::openSystemInfo);
+        FX.menu(m, "_Tools");
+        FX.item(m, "Clipboard Viewer", this::openClipboardViewer);
+        FX.item(m, "CSS Playground", this::openCssPlayground);
+        FX.item(m, "FX TextArea Embedded in JFXPanel", this::openJFXPanel);
+        FX.item(m, "JTextArea/JTextField Embedded in SwingNode", this::openJTextArea);
+        FX.item(m, "Keyboard Event Viewer", this::openKeyboardViewer);
+        FX.item(m, "Native to ASCII", this::openNative2Ascii);
+        FX.item(m, "System Info", this::openSystemInfo);
+        // Logs
+        FX.menu(m, "_Logging");
+        FX.checkItem(m, "Accessibility", Loggers.accessibility.enabled);
         // Window
-        FX.menu(b, "_Window");
-        FX.item(b, orientation);
-        FX.separator(b);
-        FX.item(b, "Open Modal Window", this::openModalWindow);
-        return b;
+        FX.menu(m, "_Window");
+        FX.item(m, orientation);
+        FX.separator(m);
+        FX.item(m, "Open Modal Window", this::openModalWindow);
+        return m;
     }
 
     private void updatePage(DemoPage p) {
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/Pages.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/Pages.java
index 535a82d34c7..b16f997eeb8 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/Pages.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/Pages.java
@@ -36,33 +36,37 @@ public static DemoPage[] create() {
             new DemoPage("AreaChart", AreaChartPage::new),
             new DemoPage("BarChart", BarChartPage::new),
             new DemoPage("BubbleChart", BubbleChartPage::new),
-            // TODO Button
+            new DemoPage("Button", ButtonPage::new),
             // TODO ButtonBar
-            // TODO new DemoPage("Canvas", CanvasPage::new),
-            // TODO CheckBox
+            new DemoPage("Canvas", CanvasPage::new),
+            new DemoPage("CheckBox", CheckBoxPage::new),
             new DemoPage("ChoiceBox", ChoiceBoxPage::new),
             new DemoPage("ComboBox", ComboBoxPage::new),
             new DemoPage("ColorPicker", ColorPickerPage::new),
             new DemoPage("DatePicker", DatePickerPage::new),
+            new DemoPage("Drag and Drop", DnDPage::new),
             new DemoPage("HBox", HBoxPage::new),
             new DemoPage("HTMLEditor", HTMLEditor_Page::new),
-            // TODO Hyperlink
+            new DemoPage("Hyperlink", HyperlinkPage::new),
             // TODO InputField: DoubleField, IntegerField, WebColorField
             new DemoPage("Label", LabelPage::new),
             new DemoPage("LineChart", LineChartPage::new),
             new DemoPage("ListView", ListViewPage::new),
-            // TODO MenuBar
+            new DemoPage("MenuBar", MenuBarPage::new),
             new DemoPage("MenuButton", MenuButtonPage::new),
             new DemoPage("Pagination", PaginationPage::new),
             new DemoPage("PasswordField", PasswordFieldPage::new),
             new DemoPage("PieChart", PieChartPage::new),
             // TODO ProgressIndicator
-            // TODO RadioButton
+            new DemoPage("RadioButton", RadioButtonPage::new),
+            new DemoPage("ScatterChart", ScatterChartPage::new),
             new DemoPage("ScrollBar", ScrollBarPage::new),
             new DemoPage("ScrollPane", ScrollPanePage::new),
             // TODO Separator
+            new DemoPage("Shape", ShapePage::new),
             // TODO Slider
             new DemoPage("Spinner", SpinnerPage::new),
+            new DemoPage("SplitMenuButton", SplitMenuButtonPage::new),
             // TODO SplitPane
             new DemoPage("StackedAreaChart", StackedAreaChartPage::new),
             new DemoPage("StackedBarChart", StackedBarChartPage::new),
@@ -73,7 +77,7 @@ public static DemoPage[] create() {
             new DemoPage("TextField", TextFieldPage::new),
             new DemoPage("TextFlow", TextFlowPage::new),
             new DemoPage("TitledPane", TitledPanePage::new),
-            // TODO ToggleButton
+            new DemoPage("ToggleButton", ToggleButtonPage::new),
             new DemoPage("ToolBar", ToolBarPage::new),
             new DemoPage("Tooltip", TooltipPage::new),
             // TODO in tables: Cell, DateCell, IndexedCell* ?
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/options/BooleanOption.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/options/BooleanOption.java
index 171f481e7f7..9ce967b0820 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/options/BooleanOption.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/options/BooleanOption.java
@@ -27,6 +27,7 @@
 import javafx.beans.property.Property;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.scene.control.CheckBox;
+import com.oracle.tools.fx.monkey.util.BooleanConsumer;
 import com.oracle.tools.fx.monkey.util.FX;
 
 /**
@@ -45,12 +46,12 @@ public BooleanOption(String name, String text, Property<Boolean> p) {
         selectedProperty().bindBidirectional(property);
     }
 
-    public BooleanOption(String name, String text, Runnable onChange) {
+    public BooleanOption(String name, String text, BooleanConsumer onChange) {
         this(name, text, (Property)null);
 
         property.addListener((src, prev, cur) -> {
             try {
-                onChange.run();
+                onChange.consume(cur);
             } catch (Throwable e) {
                 e.printStackTrace();
             }
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/options/DoubleOption.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/options/DoubleOption.java
index 645dd90a81d..1519993572e 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/options/DoubleOption.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/options/DoubleOption.java
@@ -24,20 +24,145 @@
  */
 package com.oracle.tools.fx.monkey.options;
 
+import java.util.List;
+import java.util.Objects;
 import javafx.beans.property.Property;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.scene.control.ComboBox;
+import javafx.util.StringConverter;
+import com.oracle.tools.fx.monkey.util.FX;
 import com.oracle.tools.fx.monkey.util.Formats;
+import com.oracle.tools.fx.monkey.util.NamedValue;
+import com.oracle.tools.fx.monkey.util.Utils;
 
 /**
  * Double Option Bound to a Property.
  */
-public class DoubleOption extends ObjectOption<Number> {
+public class DoubleOption extends ComboBox<Object> {
+    private final SimpleObjectProperty<Number> property = new SimpleObjectProperty<>();
+
     public DoubleOption(String name, Property<Number> p) {
-        super(name, p);
+        FX.name(this, name);
+
+        property.bindBidirectional(p);
+
+        setEditable(true);
+        setConverter(new StringConverter<Object>() {
+            @Override
+            public String toString(Object x) {
+                if (x instanceof NamedValue n) {
+                    return n.getDisplay();
+                }
+                return String.valueOf(getValue(x));
+            }
+
+            @Override
+            public Object fromString(String s) {
+                return parseValue(s);
+            }
+        });
+        setOnAction((ev) -> {
+            Object x = getValue();
+            Number n = getValue(x);
+            if (n != null) {
+                property.set(n);
+            }
+        });
+        property.addListener((s, old, cur) -> {
+            select(cur, false);
+        });
+    }
+
+    private Number parseValue(String s) {
+        if (Utils.isBlank(s)) {
+            return null;
+        }
+        NamedValue<Number> n = find(s);
+        if (n == null) {
+            try {
+                return Double.parseDouble(s);
+            } catch (NumberFormatException e) {
+                e.printStackTrace();
+            }
+            return null;
+        }
+        return n.getValue();
+    }
+
+    private NamedValue<Number> find(String s) {
+        for (Object x: getItems()) {
+            if (x instanceof NamedValue n) {
+                if (s.equals(n.getDisplay())) {
+                    return n;
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Selects the property value, adding it to the list of items under "<INITIAL>" name.
+     */
+    public void selectInitialValue() {
+        Number value = property.get();
+        select(value, true);
+    }
+
+    private void select(Number value, boolean initial) {
+        List<Object> items = getItems();
+        int sz = items.size();
+        for (int i = 0; i < sz; i++) {
+            Object x = items.get(i);
+            Number v = getValue(x);
+            if (Objects.equals(value, v)) {
+                select(i);
+                return;
+            }
+        }
+
+        Object v;
+        if (initial) {
+            String text = "<INITIAL " + value + ">";
+            v = new NamedValue<Number>(text, value);
+        } else {
+            v = value;
+        }
+        items.add(v);
+        select(sz);
+    }
+
+    private Number getValue(Object x) {
+        if (x == null) {
+            return null;
+        } else if (x instanceof Number n) {
+            return n;
+        } else if (x instanceof NamedValue n) {
+            return getValue(n.getValue());
+        }
+        throw new Error("?" + x);
+    }
+
+    /**
+     * Selects the given index.  Does nothing if the index is outside of the valid range.
+     * @param ix
+     */
+    public void select(int ix) {
+        if ((ix >= 0) && (ix < getItems().size())) {
+            getSelectionModel().select(ix);
+        }
+    }
+
+    public void addChoice(String name, Number item) {
+        getItems().add(new NamedValue<>(name, item));
+    }
+
+    public void addChoice(Number item) {
+        getItems().add(item);
     }
 
-    public static DoubleOption of(String name, Property<Number> p, double ... values) {
+    public static DoubleOption of(String name, Property<Number> p, double... values) {
         DoubleOption d = new DoubleOption(name, p);
-        for (double v : values) {
+        for (double v: values) {
             String text = Formats.formatDouble(v);
             d.addChoice(text, v);
         }
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/options/FontOption.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/options/FontOption.java
index 90ad209576b..61e82060a0d 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/options/FontOption.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/options/FontOption.java
@@ -25,24 +25,24 @@
 package com.oracle.tools.fx.monkey.options;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.geometry.Insets;
 import javafx.scene.control.ComboBox;
-import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
 import javafx.scene.text.Font;
 import com.oracle.tools.fx.monkey.util.FX;
 
 /**
  * Font Option Bound to a Property.
  */
-// TODO allow null? use logical fonts?
-// TODO names of families?
-// TODO filtered list
-public class FontOption extends BorderPane {
+public class FontOption extends HBox {
     private final SimpleObjectProperty<Font> property = new SimpleObjectProperty<>();
     private final ComboBox<String> fontField = new ComboBox<>();
+    private final ComboBox<String> styleField = new ComboBox<>();
     private final ComboBox<Double> sizeField = new ComboBox<>();
 
     public FontOption(String name, boolean allowNull, ObjectProperty<Font> p) {
@@ -54,6 +54,13 @@ public FontOption(String name, boolean allowNull, ObjectProperty<Font> p) {
         FX.name(fontField, name + "_FONT");
         fontField.getItems().setAll(collectFonts(allowNull));
         fontField.getSelectionModel().selectedItemProperty().addListener((x) -> {
+            String fam = fontField.getSelectionModel().getSelectedItem();
+            updateStyles(fam);
+            update();
+        });
+
+        FX.name(styleField, name + "_STYLE");
+        styleField.getSelectionModel().selectedItemProperty().addListener((x) -> {
             update();
         });
 
@@ -78,8 +85,8 @@ public FontOption(String name, boolean allowNull, ObjectProperty<Font> p) {
             update();
         });
 
-        setCenter(fontField);
-        setRight(sizeField);
+        getChildren().setAll(fontField, styleField, sizeField);
+        setHgrow(fontField, Priority.ALWAYS);
         setMargin(sizeField, new Insets(0, 0, 0, 2));
 
         setFont(property.get());
@@ -89,11 +96,6 @@ public SimpleObjectProperty<Font> getProperty() {
         return property;
     }
 
-    protected void update() {
-        Font f = getFont();
-        property.set(f);
-    }
-
     public void select(String name) {
         fontField.getSelectionModel().select(name);
     }
@@ -103,6 +105,10 @@ public Font getFont() {
         if (name == null) {
             return null;
         }
+        String style = styleField.getSelectionModel().getSelectedItem();
+        if (!isBlank(style)) {
+            name = name + " " + style;
+        }
         Double size = sizeField.getSelectionModel().getSelectedItem();
         if (size == null) {
             size = 12.0;
@@ -110,17 +116,53 @@ public Font getFont() {
         return new Font(name, size);
     }
 
+    private static boolean isBlank(String s) {
+        return s == null ? true : s.trim().length() == 0;
+    }
+
+    protected void updateStyles(String family) {
+        String st = styleField.getSelectionModel().getSelectedItem();
+        if (st == null) {
+            st = "";
+        }
+
+        List<String> ss = Font.getFontNames(family);
+        for (int i = 0; i < ss.size(); i++) {
+            String s = ss.get(i);
+            if (s.startsWith(family)) {
+                s = s.substring(family.length()).trim();
+                ss.set(i, s);
+            }
+        }
+        Collections.sort(ss);
+
+        styleField.getItems().setAll(ss);
+        int ix = ss.indexOf(st);
+        if (ix >= 0) {
+            styleField.getSelectionModel().select(ix);
+        }
+    }
+
+    protected void update() {
+        Font f = getFont();
+        property.set(f);
+    }
+
     private void setFont(Font f) {
         String name;
+        String style;
         double size;
         if (f == null) {
             name = null;
+            style = null;
             size = 12.0;
         } else {
-            name = f.getName();
+            name = f.getFamily();
+            style = f.getStyle();
             size = f.getSize();
         }
         fontField.getSelectionModel().select(name);
+        styleField.getSelectionModel().select(style);
         sizeField.getSelectionModel().select(size);
     }
 
@@ -129,12 +171,13 @@ protected List<String> collectFonts(boolean allowNull) {
         if (allowNull) {
             rv.add(null);
         }
-        rv.addAll(Font.getFontNames());
+        rv.addAll(Font.getFamilies());
         return rv;
     }
 
     public void selectSystemFont() {
-        FX.select(fontField, "System Regular"); // windows?
+        FX.select(fontField, "System");
+        FX.select(styleField, "");
         FX.select(sizeField, 12.0);
     }
 }
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/options/GraphicOption.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/options/GraphicOption.java
index 1d5988ee48c..49f0606b82d 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/options/GraphicOption.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/options/GraphicOption.java
@@ -26,7 +26,6 @@
 
 import javafx.beans.property.ObjectProperty;
 import javafx.scene.Node;
-import javafx.scene.paint.Color;
 import com.oracle.tools.fx.monkey.util.ImageTools;
 
 /**
@@ -37,11 +36,12 @@ public GraphicOption(String name, ObjectProperty<Node> p) {
         super(name, p);
 
         addChoice("<null>", null);
-        addChoice("1x1", ImageTools.createImageView(Color.RED, 1, 1));
-        addChoice("Small", ImageTools.createImageView(Color.ORANGE, 16, 16));
-        addChoice("Wide", ImageTools.createImageView(Color.GREEN, 128, 16));
-        addChoice("Tall", ImageTools.createImageView(Color.BLUE, 16, 128));
-        addChoice("Large", ImageTools.createImageView(Color.SALMON, 256, 256));
+        addChoice("1x1", ImageTools.createImageView(1, 1));
+        addChoice("Small", ImageTools.createImageView(16, 16));
+        addChoice("Wide", ImageTools.createImageView(128, 16));
+        addChoice("Tall", ImageTools.createImageView(16, 128));
+        addChoice("Large", ImageTools.createImageView(256, 256));
+        // TODO include active content (see tooltip)
 
         selectInitialValue();
     }
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/options/ObjectOption.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/options/ObjectOption.java
index b2ffc2c3993..7c45b80dc1f 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/options/ObjectOption.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/options/ObjectOption.java
@@ -32,6 +32,7 @@
 import javafx.scene.control.ComboBox;
 import com.oracle.tools.fx.monkey.util.FX;
 import com.oracle.tools.fx.monkey.util.NamedValue;
+import com.oracle.tools.fx.monkey.util.Utils;
 
 /**
  * Object Selector Bound to a Property.
@@ -47,7 +48,9 @@ public ObjectOption(String name, Property<T> p) {
 
         getSelectionModel().selectedItemProperty().addListener((s, pr, c) -> {
             T v = c.getValue();
-            property.set(v);
+            if (!Utils.eq(v, property.getValue())) {
+                property.set(v);
+            }
         });
     }
 
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/options/StyleClassOption.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/options/StyleClassOption.java
new file mode 100644
index 00000000000..74f699b3521
--- /dev/null
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/options/StyleClassOption.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+package com.oracle.tools.fx.monkey.options;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.StringJoiner;
+import javafx.collections.ObservableList;
+import javafx.geometry.Insets;
+import javafx.scene.control.Button;
+import javafx.scene.control.ComboBox;
+import javafx.scene.layout.BorderPane;
+import com.oracle.tools.fx.monkey.util.EnterTextDialog;
+import com.oracle.tools.fx.monkey.util.FX;
+
+/**
+ * Style Class (Observable List of Strings) Option.
+ * This can be later extracted into a generic option for list of strings.
+ */
+// TODO instead of combo box, use r/o text field + menu button (edit / revert)
+public class StyleClassOption extends BorderPane {
+    private final ComboBox<String> combo;
+    private final ObservableList<String> list;
+
+    public StyleClassOption(String name, ObservableList<String> list) {
+        this.list = list;
+
+        FX.name(this, name);
+
+        combo = new ComboBox<>();
+        combo.getItems().add(listToString(list));
+        combo.getSelectionModel().select(0);
+
+        Button editButton = FX.button("Edit", () -> {
+            String text = listToString(list);
+            EnterTextDialog d = new EnterTextDialog(this, text, (s) -> {
+                setList(s);
+            });
+            d.setInstructions("Whitespace-delimited list of style class names:");
+            d.show();
+        });
+
+        setCenter(combo);
+        setRight(editButton);
+        setMargin(editButton, new Insets(0, 0, 0, 2));
+        setMaxWidth(Double.MAX_VALUE);
+
+        combo.getSelectionModel().selectedItemProperty().addListener((s, pr, val) -> {
+            setList(val);
+        });
+    }
+
+    private static String listToString(Collection<String> items) {
+        if ((items == null) || items.isEmpty()) {
+            return null;
+        }
+        StringJoiner sj = new StringJoiner(" ");
+        for (String s: items) {
+            sj.add(s);
+        }
+        return sj.toString();
+    }
+
+    private static List<String> parseList(String text) {
+        if (text == null) {
+            return List.of();
+        }
+        return List.of(text.split("\\s+"));
+    }
+
+    private void setList(String text) {
+        List<String> items = parseList(text);
+        list.setAll(items);
+    }
+}
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/options/TextOption.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/options/TextOption.java
index 90db63d226b..00fff1f5d3b 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/options/TextOption.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/options/TextOption.java
@@ -59,10 +59,11 @@ private TextOption(String name) {
 
         textField = new TextField();
         textField.setMaxWidth(Double.MAX_VALUE);
-        textField.setOnAction((ev) -> {
-            String v = textField.getText();
-            property.set(v);
-        });
+        textField.textProperty().bindBidirectional(property);
+//        setOnAction((ev) -> {
+//            String v = textField.getText();
+//            property.set(v);
+//        });
 
         Button editButton = FX.button("Edit", EnterTextDialog.getRunnable(this, property));
 
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/AccordionPage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/AccordionPage.java
index 7708c440745..5bb30f6b4ef 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/AccordionPage.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/AccordionPage.java
@@ -24,10 +24,12 @@
  */
 package com.oracle.tools.fx.monkey.pages;
 
+import javafx.scene.AccessibleAttribute;
 import javafx.scene.control.Accordion;
 import javafx.scene.control.Button;
 import javafx.scene.control.TitledPane;
 import javafx.scene.control.skin.AccordionSkin;
+import com.oracle.tools.fx.monkey.Loggers;
 import com.oracle.tools.fx.monkey.sheets.ControlPropertySheet;
 import com.oracle.tools.fx.monkey.util.FX;
 import com.oracle.tools.fx.monkey.util.HasSkinnable;
@@ -45,7 +47,14 @@ public class AccordionPage extends TestPaneBase implements HasSkinnable {
     public AccordionPage() {
         super("AccordionPage");
 
-        control = new Accordion();
+        control = new Accordion() {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute a, Object... ps) {
+                Object v = super.queryAccessibleAttribute(a, ps);
+                Loggers.accessibility.log(a, v);
+                return v;
+            }
+        };
         addPane();
 
         // TODO MenuButtons with more options
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/AreaChartPage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/AreaChartPage.java
index 308ec69b842..600573409d6 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/AreaChartPage.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/AreaChartPage.java
@@ -24,8 +24,10 @@
  */
 package com.oracle.tools.fx.monkey.pages;
 
+import javafx.scene.AccessibleAttribute;
 import javafx.scene.chart.AreaChart;
 import javafx.scene.chart.XYChart;
+import com.oracle.tools.fx.monkey.Loggers;
 import com.oracle.tools.fx.monkey.options.BooleanOption;
 import com.oracle.tools.fx.monkey.sheets.XYChartPropertySheet;
 import com.oracle.tools.fx.monkey.util.OptionPane;
@@ -39,7 +41,14 @@ public class AreaChartPage extends XYChartPageBase {
     public AreaChartPage() {
         super("AreaChartPage");
 
-        chart = new AreaChart<>(createNumberAxis("X Axis"), createNumberAxis("Y Axis"));
+        chart = new AreaChart<>(createNumberAxis("X Axis"), createNumberAxis("Y Axis")) {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute a, Object... ps) {
+                Object v = super.queryAccessibleAttribute(a, ps);
+                Loggers.accessibility.log(a, v);
+                return v;
+            }
+        };
         chart.setTitle("Area Chart");
         addSeries();
 
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/BarChartPage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/BarChartPage.java
index 3b3cd387849..f9230e5efb0 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/BarChartPage.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/BarChartPage.java
@@ -24,10 +24,20 @@
  */
 package com.oracle.tools.fx.monkey.pages;
 
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.scene.AccessibleAttribute;
+import javafx.scene.Node;
 import javafx.scene.chart.BarChart;
 import javafx.scene.chart.XYChart;
+import javafx.scene.chart.XYChart.Series;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.input.PickResult;
+import com.oracle.tools.fx.monkey.Loggers;
 import com.oracle.tools.fx.monkey.sheets.Options;
+import com.oracle.tools.fx.monkey.sheets.PropertiesMonitor;
 import com.oracle.tools.fx.monkey.sheets.XYChartPropertySheet;
+import com.oracle.tools.fx.monkey.util.FX;
 import com.oracle.tools.fx.monkey.util.OptionPane;
 
 /**
@@ -39,8 +49,16 @@ public class BarChartPage extends XYChartPageBase {
     public BarChartPage() {
         super("BarChartPage");
 
-        chart = new BarChart<>(createCategoryAxis("X Axis"), createNumberAxis("Y Axis"));
+        chart = new BarChart<>(createCategoryAxis("X Axis"), createNumberAxis("Y Axis")) {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute a, Object... ps) {
+                Object v = super.queryAccessibleAttribute(a, ps);
+                Loggers.accessibility.log(a, v);
+                return v;
+            }
+        };
         chart.setTitle("Bar Chart");
+        FX.setPopupMenu(chart, this::createMenu);
         addSeries();
 
         OptionPane op = new OptionPane();
@@ -53,6 +71,87 @@ public BarChartPage() {
         setOptions(op);
     }
 
+    ContextMenu createMenu(PickResult p) {
+        Node nd = p.getIntersectedNode();
+
+        Series<String, Number> s = findSeries(nd);
+        XYChart.Data<String, Number> d = findData(s, nd);
+        // FIX this is incorrect - styles remain after modifying the list
+        // we may need to iterate over all the data (?) and query data.getNode() perhaps?
+        // or maybe add a listener to each node??
+        //System.out.println("s=" + s + " d=" + d + " p=" + p);// FIX
+
+        ContextMenu m = new ContextMenu();
+
+//        if ((s != null) && (d != null)) {
+//            FX.item(m, "Delete Point", () -> {
+//                s.getData().remove(d);
+//            });
+//            FX.separator(m);
+//        }
+
+        FX.item(m, "Add Duplicate Category", this::addDuplicateCategory);
+        FX.item(m, "Add Series with Duplicate Category", this::addDuplicateSeries);
+        FX.separator(m);
+        FX.item(m, "Properties...", () -> PropertiesMonitor.open(nd));
+        return m;
+    }
+
+    private Series<String,Number> findSeries(Node n) {
+        try {
+            if (n != null) {
+                for (String s: n.getStyleClass()) {
+                    if (s.startsWith("series")) {
+                        s = s.substring("series".length());
+                        int ix = Integer.parseInt(s);
+                        return chart.getData().get(ix);
+                    }
+                }
+            }
+        } catch (Exception ignore) {
+        }
+        return null;
+    }
+
+    private XYChart.Data<String,Number> findData(Series<String,Number> series, Node n) {
+        if (series != null) {
+            try {
+                if (n != null) {
+                    for (String s: n.getStyleClass()) {
+                        if (s.startsWith("data")) {
+                            s = s.substring("data".length());
+                            int ix = Integer.parseInt(s);
+                            return series.getData().get(ix);
+                        }
+                    }
+                }
+            } catch (Exception ignore) {
+            }
+        }
+        return null;
+    }
+
+    void addDuplicateCategory() {
+        var d = chart.getData();
+        if (d.size() > 0) {
+            var dd = d.get(0).getData();
+            if (dd.size() > 0) {
+                var v = dd.get(0);
+                dd.add(new XYChart.Data(v.getXValue(), randomValue()));
+            }
+        }
+    }
+
+    void addDuplicateSeries() {
+        ObservableList<XYChart.Data<String, Number>> list = FXCollections.observableArrayList();
+        list.add(new XYChart.Data<>("1", randomValue()));
+        list.add(new XYChart.Data<>("1", randomValue()));
+        list.add(new XYChart.Data<>("2", randomValue()));
+        if (chart.getData().size() > 0) {
+            chart.getData().getFirst().setData(list);
+        }
+    }
+
     @Override
     public XYChart<?, Number> chart() {
         return chart;
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/BubbleChartPage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/BubbleChartPage.java
index 8ddb3b563e1..52b5b8f824a 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/BubbleChartPage.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/BubbleChartPage.java
@@ -24,8 +24,10 @@
  */
 package com.oracle.tools.fx.monkey.pages;
 
+import javafx.scene.AccessibleAttribute;
 import javafx.scene.chart.BubbleChart;
 import javafx.scene.chart.XYChart;
+import com.oracle.tools.fx.monkey.Loggers;
 import com.oracle.tools.fx.monkey.sheets.XYChartPropertySheet;
 import com.oracle.tools.fx.monkey.util.OptionPane;
 
@@ -38,7 +40,14 @@ public class BubbleChartPage extends XYChartPageBase {
     public BubbleChartPage() {
         super("BubbleChartPage");
 
-        chart = new BubbleChart<>(createNumberAxis("X Axis"), createNumberAxis("Y Axis"));
+        chart = new BubbleChart<>(createNumberAxis("X Axis"), createNumberAxis("Y Axis")) {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute a, Object... ps) {
+                Object v = super.queryAccessibleAttribute(a, ps);
+                Loggers.accessibility.log(a, v);
+                return v;
+            }
+        };
         chart.setTitle("Bubble Chart");
         addSeries();
 
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/ButtonPage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/ButtonPage.java
new file mode 100644
index 00000000000..9d1f1133823
--- /dev/null
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/ButtonPage.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+package com.oracle.tools.fx.monkey.pages;
+
+import javafx.geometry.Insets;
+import javafx.scene.AccessibleAttribute;
+import javafx.scene.control.Button;
+import javafx.scene.control.skin.ButtonSkin;
+import javafx.scene.layout.HBox;
+import com.oracle.tools.fx.monkey.Loggers;
+import com.oracle.tools.fx.monkey.sheets.ButtonsPropertySheet;
+import com.oracle.tools.fx.monkey.util.HasSkinnable;
+import com.oracle.tools.fx.monkey.util.OptionPane;
+import com.oracle.tools.fx.monkey.util.TestPaneBase;
+
+/**
+ * Button Page.
+ */
+public class ButtonPage extends TestPaneBase implements HasSkinnable {
+    private final Button control;
+
+    public ButtonPage() {
+        super("ButtonPage");
+
+        control = new Button("Button") {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute a, Object... ps) {
+                Object v = super.queryAccessibleAttribute(a, ps);
+                Loggers.accessibility.log(a, v);
+                return v;
+            }
+        };
+
+        OptionPane op = new OptionPane();
+        ButtonsPropertySheet.appendTo(op, control);
+
+        HBox p = new HBox(4, control);
+        p.setPadding(new Insets(4));
+
+        setContent(p);
+        setOptions(op);
+    }
+
+    @Override
+    public void nullSkin() {
+        control.setSkin(null);
+    }
+
+    @Override
+    public void newSkin() {
+        control.setSkin(new ButtonSkin(control));
+    }
+}
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/CanvasPage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/CanvasPage.java
index 73bde33a800..b3093777853 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/CanvasPage.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/CanvasPage.java
@@ -24,11 +24,20 @@
  */
 package com.oracle.tools.fx.monkey.pages;
 
+import java.text.SimpleDateFormat;
+import javafx.beans.value.ChangeListener;
+import javafx.scene.Node;
 import javafx.scene.canvas.Canvas;
 import javafx.scene.canvas.GraphicsContext;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.input.PickResult;
 import javafx.scene.layout.Pane;
 import javafx.scene.paint.Color;
 import javafx.scene.text.Font;
+import javafx.stage.Window;
+import com.oracle.tools.fx.monkey.sheets.PropertiesMonitor;
+import com.oracle.tools.fx.monkey.tools.AccessibilityPropertyViewer;
+import com.oracle.tools.fx.monkey.util.FX;
 import com.oracle.tools.fx.monkey.util.TestPaneBase;
 
 /**
@@ -37,6 +46,7 @@
 public class CanvasPage extends TestPaneBase {
     private Pane pane;
 
+    // TODO context menu to draw stuff?
     public CanvasPage() {
         super("CanvasPage");
 
@@ -53,10 +63,31 @@ protected void updateCanvas() {
         double w = pane.getWidth();
         double h = pane.getHeight();
         String text = "width=" + w + " height=" + h;
-        Font f = Font.font("System", 12);
-        Canvas c = new Canvas(w, h);
+        Font f = Font.font("System", 14);
 
-        GraphicsContext g = c.getGraphicsContext2D();
+        ChangeListener<Number> li = (s,p,c) -> {
+            String t = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").format(System.currentTimeMillis());
+            System.out.println(String.format("%s scalex=%f", t, c));
+        };
+
+        Canvas canvas = new Canvas(w, h);
+        canvas.sceneProperty().addListener((s, p, v) -> {
+            if (p != null) {
+                Window win = p.getWindow();
+                if (win != null) {
+                    win.renderScaleXProperty().removeListener(li);
+                }
+            }
+            if (v != null) {
+                Window win = v.getWindow();
+                if (win != null) {
+                    win.renderScaleXProperty().addListener(li);
+                }
+            }
+        });
+        FX.setPopupMenu(canvas, this::createMenu);
+
+        GraphicsContext g = canvas.getGraphicsContext2D();
 
         g.setFont(f);
         g.setFill(Color.BLACK);
@@ -69,6 +100,14 @@ protected void updateCanvas() {
         g.lineTo(w, h / 2);
         g.stroke();
 
-        pane.getChildren().setAll(c);
+        pane.getChildren().setAll(canvas);
+    }
+
+    private ContextMenu createMenu(PickResult pick) {
+        Node source = pick.getIntersectedNode();
+        ContextMenu m = new ContextMenu();
+        FX.item(m, "Show Properties Monitor...", () -> PropertiesMonitor.open(source));
+        FX.item(m, "Accessibility Attributes...", () -> AccessibilityPropertyViewer.open(pick));
+        return m;
     }
 }
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/CheckBoxPage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/CheckBoxPage.java
new file mode 100644
index 00000000000..819da9390b8
--- /dev/null
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/CheckBoxPage.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+package com.oracle.tools.fx.monkey.pages;
+
+import javafx.geometry.Insets;
+import javafx.scene.AccessibleAttribute;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.skin.CheckBoxSkin;
+import javafx.scene.layout.HBox;
+import com.oracle.tools.fx.monkey.Loggers;
+import com.oracle.tools.fx.monkey.sheets.ButtonsPropertySheet;
+import com.oracle.tools.fx.monkey.util.HasSkinnable;
+import com.oracle.tools.fx.monkey.util.OptionPane;
+import com.oracle.tools.fx.monkey.util.TestPaneBase;
+
+/**
+ * CheckBox Page.
+ */
+public class CheckBoxPage extends TestPaneBase implements HasSkinnable {
+    private final CheckBox control;
+
+    public CheckBoxPage() {
+        super("CheckBoxPage");
+
+        control = new CheckBox("CheckBox") {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute a, Object... ps) {
+                Object v = super.queryAccessibleAttribute(a, ps);
+                Loggers.accessibility.log(a, v);
+                return v;
+            }
+        };
+
+        OptionPane op = new OptionPane();
+        ButtonsPropertySheet.appendTo(op, control);
+
+        HBox p = new HBox(4, control);
+        p.setPadding(new Insets(4));
+        setContent(p);
+        setOptions(op);
+    }
+
+    @Override
+    public void nullSkin() {
+        control.setSkin(null);
+    }
+
+    @Override
+    public void newSkin() {
+        control.setSkin(new CheckBoxSkin(control));
+    }
+}
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/ChoiceBoxPage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/ChoiceBoxPage.java
index 0c8d3d55cd0..f97ab7cf36e 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/ChoiceBoxPage.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/ChoiceBoxPage.java
@@ -30,9 +30,11 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 import javafx.collections.ObservableList;
+import javafx.scene.AccessibleAttribute;
 import javafx.scene.Node;
 import javafx.scene.control.ChoiceBox;
 import javafx.scene.control.skin.ChoiceBoxSkin;
+import com.oracle.tools.fx.monkey.Loggers;
 import com.oracle.tools.fx.monkey.sheets.ControlPropertySheet;
 import com.oracle.tools.fx.monkey.util.HasSkinnable;
 import com.oracle.tools.fx.monkey.util.ObjectSelector;
@@ -49,7 +51,14 @@ public class ChoiceBoxPage extends TestPaneBase implements HasSkinnable {
     public ChoiceBoxPage() {
         super("ChoiceBoxPage");
 
-        control = new ChoiceBox();
+        control = new ChoiceBox() {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute a, Object... ps) {
+                Object v = super.queryAccessibleAttribute(a, ps);
+                Loggers.accessibility.log(a, v);
+                return v;
+            }
+        };
 
         OptionPane op = new OptionPane();
         op.section("ChoiceBox");
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/ColorPickerPage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/ColorPickerPage.java
index af592950268..c5f9eee3c61 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/ColorPickerPage.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/ColorPickerPage.java
@@ -24,9 +24,11 @@
  */
 package com.oracle.tools.fx.monkey.pages;
 
+import javafx.scene.AccessibleAttribute;
 import javafx.scene.control.ColorPicker;
 import javafx.scene.control.skin.ColorPickerSkin;
 import javafx.scene.paint.Color;
+import com.oracle.tools.fx.monkey.Loggers;
 import com.oracle.tools.fx.monkey.sheets.ComboBoxBasePropertySheet;
 import com.oracle.tools.fx.monkey.util.HasSkinnable;
 import com.oracle.tools.fx.monkey.util.OptionPane;
@@ -41,7 +43,14 @@ public class ColorPickerPage extends TestPaneBase implements HasSkinnable {
     public ColorPickerPage() {
         super("ColorPickerPage");
 
-        control = new ColorPicker(Color.YELLOW);
+        control = new ColorPicker(Color.YELLOW) {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute a, Object... ps) {
+                Object v = super.queryAccessibleAttribute(a, ps);
+                Loggers.accessibility.log(a, v);
+                return v;
+            }
+        };
         control.setOnAction((ev) -> {
             Object v = control.getValue();
             System.out.println(v);
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/ComboBoxPage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/ComboBoxPage.java
index 9bda96995f1..abe833096d6 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/ComboBoxPage.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/ComboBoxPage.java
@@ -31,11 +31,13 @@
 import java.util.function.Supplier;
 import javafx.beans.property.ObjectProperty;
 import javafx.collections.ObservableList;
+import javafx.scene.AccessibleAttribute;
 import javafx.scene.Node;
 import javafx.scene.control.Button;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.skin.ComboBoxListViewSkin;
 import javafx.util.StringConverter;
+import com.oracle.tools.fx.monkey.Loggers;
 import com.oracle.tools.fx.monkey.options.ObjectOption;
 import com.oracle.tools.fx.monkey.sheets.ComboBoxBasePropertySheet;
 import com.oracle.tools.fx.monkey.sheets.Options;
@@ -56,7 +58,15 @@ public class ComboBoxPage extends TestPaneBase implements HasSkinnable {
     public ComboBoxPage() {
         super("ComboBoxPage");
 
-        control = new ComboBox<>();
+        control = new ComboBox<>() {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute a, Object... ps) {
+                Object v = super.queryAccessibleAttribute(a, ps);
+                Loggers.accessibility.log(a, v);
+                return v;
+            }
+        };
+        control.setOnAction((ev) -> addItem());
 
         Button addButton = FX.button("Add Item", () -> {
             control.getItems().add(newItem(""));
@@ -94,6 +104,17 @@ private Node createSelectionModelOptions(String name) {
         return s;
     }
 
+    private void addItem() {
+        Object v = control.getValue();
+        if (!control.getItems().contains(v)) {
+            System.out.println("added: " + v);
+            control.getItems().add(0, v);
+            if (control.getSelectionModel() != null) {
+                control.getSelectionModel().select(0);
+            }
+        }
+    }
+
     // TODO common code with ListViewPage - move to utils?
     private String newItem(Object n) {
         return n + "." + SequenceNumber.next();
@@ -154,6 +175,19 @@ public Object fromString(String s) {
                 }
             };
         });
+        op.addChoiceSupplier("Number", () -> {
+            return new StringConverter<Object>() {
+                @Override
+                public String toString(Object x) {
+                    return x == null ? null : String.valueOf(x);
+                }
+
+                @Override
+                public Object fromString(String s) {
+                    return s == null ? null : Double.parseDouble(s);
+                }
+            };
+        });
         op.addChoice("<default>", original);
         op.addChoice("<null>", null);
         op.selectInitialValue();
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/DatePickerPage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/DatePickerPage.java
index f94e11a1c95..0bb446c936c 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/DatePickerPage.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/DatePickerPage.java
@@ -25,8 +25,10 @@
 package com.oracle.tools.fx.monkey.pages;
 
 import java.time.LocalDate;
+import javafx.scene.AccessibleAttribute;
 import javafx.scene.control.DatePicker;
 import javafx.scene.control.skin.DatePickerSkin;
+import com.oracle.tools.fx.monkey.Loggers;
 import com.oracle.tools.fx.monkey.sheets.ComboBoxBasePropertySheet;
 import com.oracle.tools.fx.monkey.util.HasSkinnable;
 import com.oracle.tools.fx.monkey.util.OptionPane;
@@ -41,7 +43,14 @@ public class DatePickerPage extends TestPaneBase implements HasSkinnable {
     public DatePickerPage() {
         super("DatePickerPage");
 
-        control = new DatePicker(LocalDate.now());
+        control = new DatePicker(LocalDate.now()) {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute a, Object... ps) {
+                Object v = super.queryAccessibleAttribute(a, ps);
+                Loggers.accessibility.log(a, v);
+                return v;
+            }
+        };
 
         OptionPane op = new OptionPane();
         op.section("DatePicker");
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/DnDPage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/DnDPage.java
new file mode 100644
index 00000000000..19b8ea9cbb8
--- /dev/null
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/DnDPage.java
@@ -0,0 +1,196 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+package com.oracle.tools.fx.monkey.pages;
+
+import java.util.ArrayList;
+import javafx.beans.property.DoubleProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleDoubleProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.control.Label;
+import javafx.scene.image.Image;
+import javafx.scene.input.ClipboardContent;
+import javafx.scene.input.DragEvent;
+import javafx.scene.input.Dragboard;
+import javafx.scene.input.TransferMode;
+import javafx.scene.layout.Background;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.paint.Color;
+import com.oracle.tools.fx.monkey.options.BooleanOption;
+import com.oracle.tools.fx.monkey.options.DoubleOption;
+import com.oracle.tools.fx.monkey.options.ObjectOption;
+import com.oracle.tools.fx.monkey.sheets.Options;
+import com.oracle.tools.fx.monkey.util.ImageTools;
+import com.oracle.tools.fx.monkey.util.OptionPane;
+import com.oracle.tools.fx.monkey.util.TestPaneBase;
+
+/**
+ * Drag and Drop Test Page.
+ */
+public class DnDPage extends TestPaneBase {
+    //private static final DataFormat FORMAT = new DataFormat("DnDPage");
+    private final Label source;
+    private final Label target;
+    private final SimpleBooleanProperty acceptsCopy = new SimpleBooleanProperty(true);
+    private final SimpleBooleanProperty acceptsLink = new SimpleBooleanProperty();
+    private final SimpleBooleanProperty acceptsMove = new SimpleBooleanProperty();
+    private final SimpleObjectProperty<Image> dragImage = new SimpleObjectProperty<>();
+    private final SimpleDoubleProperty offsetX = new SimpleDoubleProperty();
+    private final SimpleDoubleProperty offsetY = new SimpleDoubleProperty();
+
+    public DnDPage() {
+        super("DnDPage");
+
+        source = new Label("DRAG ME");
+        source.setStyle("-fx-font-size: 24; -fx-border-width:1; -fx-border-color:red;");
+
+        target = new Label("DROP HERE");
+        target.setStyle("-fx-font-size: 24; -fx-border-width:1; -fx-border-color:red;");
+
+        HBox hb = new HBox(5, source, target);
+        hb.setAlignment(Pos.CENTER);
+        hb.setPadding(new Insets(10));
+
+        source.setOnDragDetected((ev) -> {
+            Dragboard db = source.startDragAndDrop(TransferMode.ANY);
+            ClipboardContent content = new ClipboardContent();
+            content.putString(source.getText());
+            db.setContent(content);
+
+            Image im = dragImage.get();
+            db.setDragView(im);
+            db.setDragViewOffsetX(offsetX.get());
+            db.setDragViewOffsetY(offsetY.get());
+        });
+
+        source.setOnDragDone((ev) -> {
+            print(ev);
+        });
+
+        target.setOnDragOver((ev) -> {
+            print(ev);
+            if (ev.getGestureSource() != target && ev.getDragboard().hasString()) {
+                ArrayList<TransferMode> a = new ArrayList<>();
+                if (acceptsCopy.get()) {
+                    a.add(TransferMode.COPY);
+                }
+                if (acceptsLink.get()) {
+                    a.add(TransferMode.LINK);
+                }
+                if (acceptsMove.get()) {
+                    a.add(TransferMode.MOVE);
+                }
+                TransferMode[] modes = a.toArray(TransferMode[]::new);
+                ev.acceptTransferModes(modes);
+            }
+        });
+
+        target.setOnDragEntered((ev) -> {
+            print(ev);
+            target.setBackground(Background.fill(Color.YELLOW));
+        });
+
+        target.setOnDragExited((ev) -> {
+            print(ev);
+            target.setBackground(null);
+        });
+
+        target.setOnDragDropped((ev) -> {
+            print(ev);
+        });
+
+        BorderPane bp = new BorderPane();
+        bp.setTop(hb);
+
+        OptionPane op = new OptionPane();
+        op.section("Source");
+        op.label("Drag View Image:");
+        op.option(createImageOption());
+        op.option("Offset X:", doubleOption("offsetX", offsetX));
+        op.option("Offset Y:", doubleOption("offsetY", offsetY));
+        op.section("Target");
+        op.option(new BooleanOption("copy", "accepts COPY", acceptsCopy));
+        op.option(new BooleanOption("link", "accepts LINK", acceptsLink));
+        op.option(new BooleanOption("move", "accepts MOVE", acceptsMove));
+
+        setContent(bp);
+        setOptions(op);
+    }
+
+    private ObjectOption<Image> createImageOption() {
+        ObjectOption<Image> op = new ObjectOption<>("image", dragImage);
+        op.addChoice("<null>", null);
+        op.addChoice("1x1", ImageTools.createImage(1, 1));
+        op.addChoice("16 x 16", ImageTools.createImage(16, 16));
+        op.addChoice("32 x 32", ImageTools.createImage(32, 32));
+        op.addChoice("64 x 64", ImageTools.createImage(64, 64));
+        op.addChoiceSupplier("128 x 16", () -> ImageTools.createImage(128, 16));
+        op.addChoiceSupplier("16 x 128", () -> ImageTools.createImage(16, 128));
+        op.addChoiceSupplier("256 x 256", () -> ImageTools.createImage(256, 256));
+        op.addChoiceSupplier("4096 x 4096", () -> ImageTools.createImage(4096, 4096));
+        op.addChoiceSupplier("<snapshot>", () -> {
+            try {
+                // FIX windows throws Errors if this check is not done
+                if(source.getScene() != null) {
+                    return source.snapshot(null, null);
+                }
+            } catch(Throwable e) {
+            }
+            return null;
+        });
+        op.selectFirst();
+        return op;
+    }
+
+    private Node doubleOption(String name, DoubleProperty p) {
+        DoubleOption d = new DoubleOption(name, p);
+        d.addChoice("0", Double.valueOf(0));
+        d.addChoice("10", 10.0);
+        d.addChoice("33.3", 33.3);
+        d.addChoice("100", 100.0);
+        d.addChoice("Double.MAX_VALUE", Double.MAX_VALUE);
+        d.addChoice("Double.MIN_VALUE", Double.MIN_VALUE);
+        d.addChoice("Double.POSITIVE_INFINITY", Double.POSITIVE_INFINITY);
+        d.addChoice("NaN", Double.NaN);
+        d.selectInitialValue();
+        return d;
+    }
+
+    private void print(DragEvent ev) {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{event=" + ev.getEventType());
+        sb.append(", screenX=" + ev.getScreenX());
+        sb.append(", screenY=" + ev.getScreenY());
+        sb.append(", sceneX=" + ev.getSceneX());
+        sb.append(", sceneY=" + ev.getSceneY());
+        sb.append("}");
+        String s = sb.toString();
+        System.out.println(s);
+    }
+}
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/HBoxPage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/HBoxPage.java
index 0de894c2118..2997fa8c344 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/HBoxPage.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/HBoxPage.java
@@ -27,6 +27,7 @@
 import java.util.List;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
+import javafx.scene.AccessibleAttribute;
 import javafx.scene.Node;
 import javafx.scene.control.Button;
 import javafx.scene.control.ContextMenu;
@@ -36,6 +37,7 @@
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.Region;
 import javafx.scene.paint.Color;
+import com.oracle.tools.fx.monkey.Loggers;
 import com.oracle.tools.fx.monkey.options.BooleanOption;
 import com.oracle.tools.fx.monkey.options.EnumOption;
 import com.oracle.tools.fx.monkey.options.PaneContentOptions;
@@ -56,7 +58,14 @@ public class HBoxPage extends TestPaneBase {
     public HBoxPage() {
         super("HBoxPage");
 
-        box = new HBox();
+        box = new HBox() {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute a, Object... ps) {
+                Object v = super.queryAccessibleAttribute(a, ps);
+                Loggers.accessibility.log(a, v);
+                return v;
+            }
+        };
 
         // TODO menu button
         Button addButton = FX.button("Add Item", () -> {
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/HTMLEditor_Page.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/HTMLEditor_Page.java
index 5f5b9a6563a..d4e52e48b5d 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/HTMLEditor_Page.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/HTMLEditor_Page.java
@@ -24,9 +24,11 @@
  */
 package com.oracle.tools.fx.monkey.pages;
 
+import javafx.scene.AccessibleAttribute;
 import javafx.scene.Node;
 import javafx.scene.web.HTMLEditor;
 import javafx.scene.web.HTMLEditorSkin;
+import com.oracle.tools.fx.monkey.Loggers;
 import com.oracle.tools.fx.monkey.options.TextChoiceOption;
 import com.oracle.tools.fx.monkey.sheets.ControlPropertySheet;
 import com.oracle.tools.fx.monkey.util.HasSkinnable;
@@ -42,7 +44,14 @@ public class HTMLEditor_Page extends TestPaneBase implements HasSkinnable {
     public HTMLEditor_Page() {
         super("HTMLEditorPage");
 
-        control = new HTMLEditor();
+        control = new HTMLEditor() {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute a, Object... ps) {
+                Object v = super.queryAccessibleAttribute(a, ps);
+                Loggers.accessibility.log(a, v);
+                return v;
+            }
+        };
 
         OptionPane op = new OptionPane();
         op.section("HTMLEditor");
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/HyperlinkPage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/HyperlinkPage.java
new file mode 100644
index 00000000000..1b134ac694b
--- /dev/null
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/HyperlinkPage.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+package com.oracle.tools.fx.monkey.pages;
+
+import javafx.geometry.Insets;
+import javafx.scene.AccessibleAttribute;
+import javafx.scene.control.Hyperlink;
+import javafx.scene.control.skin.HyperlinkSkin;
+import javafx.scene.layout.HBox;
+import com.oracle.tools.fx.monkey.Loggers;
+import com.oracle.tools.fx.monkey.sheets.ButtonsPropertySheet;
+import com.oracle.tools.fx.monkey.util.HasSkinnable;
+import com.oracle.tools.fx.monkey.util.OptionPane;
+import com.oracle.tools.fx.monkey.util.TestPaneBase;
+
+/**
+ * Hyperlink Page.
+ */
+public class HyperlinkPage extends TestPaneBase implements HasSkinnable {
+    private final Hyperlink control;
+
+    public HyperlinkPage() {
+        super("HyperlinkPage");
+
+        control = new Hyperlink("Hyperlink") {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute a, Object... ps) {
+                Object v = super.queryAccessibleAttribute(a, ps);
+                Loggers.accessibility.log(a, v);
+                return v;
+            }
+        };
+
+        OptionPane op = new OptionPane();
+        ButtonsPropertySheet.appendTo(op, control);
+
+        HBox p = new HBox(4, control);
+        p.setPadding(new Insets(4));
+        setContent(p);
+        setOptions(op);
+    }
+
+    @Override
+    public void nullSkin() {
+        control.setSkin(null);
+    }
+
+    @Override
+    public void newSkin() {
+        control.setSkin(new HyperlinkSkin(control));
+    }
+}
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/LabelPage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/LabelPage.java
index 88286147d54..b7bbf86d3e6 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/LabelPage.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/LabelPage.java
@@ -24,8 +24,10 @@
  */
 package com.oracle.tools.fx.monkey.pages;
 
+import javafx.scene.AccessibleAttribute;
 import javafx.scene.control.Label;
 import javafx.scene.control.skin.LabelSkin;
+import com.oracle.tools.fx.monkey.Loggers;
 import com.oracle.tools.fx.monkey.sheets.LabeledPropertySheet;
 import com.oracle.tools.fx.monkey.util.HasSkinnable;
 import com.oracle.tools.fx.monkey.util.OptionPane;
@@ -40,12 +42,14 @@ public class LabelPage extends TestPaneBase implements HasSkinnable {
     public LabelPage() {
         super("LabelPage");
 
-        control = new Label();
-
-        // JDK-8092102
-//        control.textTruncatedProperty().addListener((s,p,c) -> {
-//            System.err.println("truncated: " + c);
-//        });
+        control = new Label() {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute a, Object... ps) {
+                Object v = super.queryAccessibleAttribute(a, ps);
+                Loggers.accessibility.log(a, v);
+                return v;
+            }
+        };
 
         OptionPane op = new OptionPane();
         LabeledPropertySheet.appendTo(op, "Label", true, control);
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/LineChartPage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/LineChartPage.java
index 96cfbb4beb5..8651f9728bb 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/LineChartPage.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/LineChartPage.java
@@ -24,8 +24,10 @@
  */
 package com.oracle.tools.fx.monkey.pages;
 
+import javafx.scene.AccessibleAttribute;
 import javafx.scene.chart.LineChart;
 import javafx.scene.chart.XYChart;
+import com.oracle.tools.fx.monkey.Loggers;
 import com.oracle.tools.fx.monkey.options.BooleanOption;
 import com.oracle.tools.fx.monkey.sheets.XYChartPropertySheet;
 import com.oracle.tools.fx.monkey.util.OptionPane;
@@ -39,7 +41,14 @@ public class LineChartPage extends XYChartPageBase {
     public LineChartPage() {
         super("LineChartPage");
 
-        chart = new LineChart<>(createNumberAxis("X Axis"), createNumberAxis("Y Axis"));
+        chart = new LineChart<>(createNumberAxis("X Axis"), createNumberAxis("Y Axis")) {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute a, Object... ps) {
+                Object v = super.queryAccessibleAttribute(a, ps);
+                Loggers.accessibility.log(a, v);
+                return v;
+            }
+        };
         chart.setTitle("Line Chart");
         addSeries();
 
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/ListViewPage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/ListViewPage.java
index 081453c640f..8fe4455d86c 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/ListViewPage.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/ListViewPage.java
@@ -32,6 +32,7 @@
 import javafx.beans.property.ObjectProperty;
 import javafx.collections.ObservableList;
 import javafx.geometry.Orientation;
+import javafx.scene.AccessibleAttribute;
 import javafx.scene.Node;
 import javafx.scene.Parent;
 import javafx.scene.control.Button;
@@ -46,6 +47,7 @@
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.BorderPane;
 import javafx.util.Callback;
+import com.oracle.tools.fx.monkey.Loggers;
 import com.oracle.tools.fx.monkey.options.BooleanOption;
 import com.oracle.tools.fx.monkey.options.EnumOption;
 import com.oracle.tools.fx.monkey.options.ObjectOption;
@@ -69,7 +71,14 @@ public class ListViewPage extends TestPaneBase implements HasSkinnable {
     public ListViewPage() {
         super("ListViewPage");
 
-        control = new ListView<>();
+        control = new ListView<>() {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute a, Object... ps) {
+                Object v = super.queryAccessibleAttribute(a, ps);
+                Loggers.accessibility.log(a, v);
+                return v;
+            }
+        };
         control.setTooltip(new Tooltip("edit to 'update' to commit the change"));
         control.setOnEditCommit((ev) -> {
             int ix = ev.getIndex();
@@ -226,6 +235,14 @@ private String newItem(Object n) {
 
     private String newVariableItem(Object n) {
         int rows = 1 << new Random().nextInt(5);
+        return newItem(n, rows);
+    }
+
+    private String newLargeItem(Object n) {
+        return newItem(n, 200);
+    }
+
+    private String newItem(Object n, int rows) {
         StringBuilder sb = new StringBuilder();
         for (int i = 0; i < rows; i++) {
             if (i > 0) {
@@ -236,13 +253,26 @@ private String newVariableItem(Object n) {
         return n + "." + SequenceNumber.next() + "." + sb;
     }
 
-    private Supplier<List<Object>> createItems(int count, Function<Integer, Object> gen) {
+    private Supplier<List<Object>> createItems(int count) {
         return () -> {
             ArrayList<Object> rv = new ArrayList<>(count);
             for (int i = 0; i < count; i++) {
-                Object v = gen.apply(i);
+                Object v = newItem(i);
+                rv.add(v);
+            }
+            return rv;
+        };
+    }
+
+    private Supplier<List<Object>> createVariableItems(int count) {
+        return () -> {
+            ArrayList<Object> rv = new ArrayList<>(count);
+            int i = 0;
+            for ( ; i < count; i++) {
+                Object v = newVariableItem(i);
                 rv.add(v);
             }
+            rv.add(newLargeItem(i));
             return rv;
         };
     }
@@ -251,12 +281,13 @@ private Node createItemsOptions(String name, ObservableList<Object> items) {
         ObjectSelector<List<Object>> s = new ObjectSelector<>(name, (v) -> {
             items.setAll(v);
         });
-        s.addChoiceSupplier("1 Row", createItems(1, this::newItem));
-        s.addChoiceSupplier("10 Rows", createItems(10, this::newItem));
-        s.addChoiceSupplier("200 Rows", createItems(200, this::newItem));
-        s.addChoiceSupplier("10,000 Rows", createItems(10_000, this::newItem));
-        s.addChoiceSupplier("10 Variable Height Rows", createItems(10, this::newVariableItem));
-        s.addChoiceSupplier("200 Variable HeightRows", createItems(200, this::newVariableItem));
+        s.addChoiceSupplier("1 Row", createItems(1));
+        s.addChoiceSupplier("10 Rows", createItems(10));
+        s.addChoiceSupplier("200 Rows", createItems(200));
+        s.addChoiceSupplier("10,000 Rows", createItems(10_000));
+        s.addChoiceSupplier("10 Variable Height Rows", createVariableItems(10));
+        s.addChoiceSupplier("200 Variable HeightRows", createVariableItems(200));
+        s.addChoiceSupplier("2,000 Variable HeightRows", createVariableItems(2000));
         s.addChoice("<empty>", List.of());
         s.selectFirst();
         return s;
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/MenuBarPage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/MenuBarPage.java
new file mode 100644
index 00000000000..580e7a5143e
--- /dev/null
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/MenuBarPage.java
@@ -0,0 +1,160 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+package com.oracle.tools.fx.monkey.pages;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Supplier;
+import javafx.collections.ObservableList;
+import javafx.scene.AccessibleAttribute;
+import javafx.scene.Node;
+import javafx.scene.control.Button;
+import javafx.scene.control.CheckMenuItem;
+import javafx.scene.control.CustomMenuItem;
+import javafx.scene.control.Menu;
+import javafx.scene.control.MenuBar;
+import javafx.scene.control.MenuItem;
+import javafx.scene.control.RadioMenuItem;
+import javafx.scene.control.SeparatorMenuItem;
+import javafx.scene.control.ToggleGroup;
+import javafx.scene.control.skin.MenuBarSkin;
+import com.oracle.tools.fx.monkey.Loggers;
+import com.oracle.tools.fx.monkey.options.BooleanOption;
+import com.oracle.tools.fx.monkey.sheets.ControlPropertySheet;
+import com.oracle.tools.fx.monkey.util.FX;
+import com.oracle.tools.fx.monkey.util.HasSkinnable;
+import com.oracle.tools.fx.monkey.util.ImageTools;
+import com.oracle.tools.fx.monkey.util.ObjectSelector;
+import com.oracle.tools.fx.monkey.util.OptionPane;
+import com.oracle.tools.fx.monkey.util.TestPaneBase;
+
+/**
+ * MenuBar Page.
+ */
+public class MenuBarPage extends TestPaneBase implements HasSkinnable {
+    private final MenuBar control;
+
+    public MenuBarPage() {
+        super("MenuButtonPage");
+
+        control = new MenuBar() {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute a, Object... ps) {
+                Object v = super.queryAccessibleAttribute(a, ps);
+                Loggers.accessibility.log(a, v);
+                return v;
+            }
+        };
+
+        OptionPane op = new OptionPane();
+        op.section("MenuBar");
+        op.option("Items:", createItemsOptions("items", control.getMenus()));
+        op.option(new BooleanOption("useSystemMenuBar", "use system menu bar", control.useSystemMenuBarProperty()));
+        ControlPropertySheet.appendTo(op, control);
+
+        setContent(control);
+        setOptions(op);
+    }
+
+    private Supplier<List<Menu>> mk(int count) {
+        return () -> {
+            ArrayList<Menu> rv = new ArrayList(count);
+            for (int i = 0; i < count; i++) {
+                Menu m = mkMenu(String.valueOf(i + 1));
+                rv.add(m);
+            }
+            return rv;
+        };
+    }
+
+    private Menu mkMenu(String name) {
+        Menu m = new Menu("Menu" + name);
+        ToggleGroup g = new ToggleGroup();
+        m.getItems().addAll(
+            new MenuItem("MenuItem 1"),
+            new MenuItem("MenuItem 2"),
+            new MenuItem("MenuItem 3"),
+            new SeparatorMenuItem(),
+            radio("RadioMenuItem 1", g),
+            radio("RadioMenuItem 2", g),
+            radio("RadioMenuItem 3", g),
+            new SeparatorMenuItem(),
+            new CheckMenuItem("CheckMenuItem 1"),
+            new CheckMenuItem("CheckMenuItem 2"),
+            new CheckMenuItem("CheckMenuItem 3", ImageTools.createImageView(16, 16)),
+            new SeparatorMenuItem(),
+            new CustomMenuItem(new Button("CustomMenuItem 1")),
+            new CustomMenuItem(new Button("CustomMenuItem 2 (auto hide)"), true),
+            new CustomMenuItem(new Button("CustomMenuItem 3 (auto hide off)"), false)
+        );
+        Menu m2 = FX.menu(m, "_Submenu");
+        FX.item(m2, "Submenu Item 1");
+        FX.item(m2, "Submenu Item 2");
+        FX.item(m2, "Submenu Item 3");
+        FX.item(m2, "Submenu Item 4");
+        return m;
+    }
+
+    private MenuItem radio(String text, ToggleGroup g) {
+        RadioMenuItem mi = new RadioMenuItem(text);
+        mi.setToggleGroup(g);
+        return mi;
+    }
+
+    private Supplier<List<Menu>> createInvisibleDisabled() {
+        return () -> {
+            ArrayList<Menu> rv = new ArrayList();
+            Menu m;
+            rv.add(m = mkMenu("1"));
+            rv.add(m = mkMenu("2"));
+            m.setVisible(false);
+            rv.add(m = mkMenu("3"));
+            rv.add(m = mkMenu("4"));
+            m.setDisable(true);
+            rv.add(m = mkMenu("5"));
+            return rv;
+        };
+    }
+
+    private Node createItemsOptions(String name, ObservableList<Menu> items) {
+        ObjectSelector<List<Menu>> s = new ObjectSelector<>(name, items::setAll);
+        s.addChoiceSupplier("1 Menu", mk(1));
+        s.addChoiceSupplier("5 Items", mk(5));
+        s.addChoiceSupplier("Invisible/Disabled", createInvisibleDisabled());
+        s.addChoiceSupplier("<empty>", mk(0));
+        s.selectFirst();
+        return s;
+    }
+
+    @Override
+    public void nullSkin() {
+        control.setSkin(null);
+    }
+
+    @Override
+    public void newSkin() {
+        control.setSkin(new MenuBarSkin(control));
+    }
+}
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/MenuButtonPage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/MenuButtonPage.java
index 4e1a31f0978..00344fe3f49 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/MenuButtonPage.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/MenuButtonPage.java
@@ -29,10 +29,12 @@
 import java.util.function.Supplier;
 import javafx.collections.ObservableList;
 import javafx.geometry.Side;
+import javafx.scene.AccessibleAttribute;
 import javafx.scene.Node;
 import javafx.scene.control.MenuButton;
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.skin.MenuButtonSkin;
+import com.oracle.tools.fx.monkey.Loggers;
 import com.oracle.tools.fx.monkey.options.EnumOption;
 import com.oracle.tools.fx.monkey.sheets.LabeledPropertySheet;
 import com.oracle.tools.fx.monkey.util.HasSkinnable;
@@ -49,7 +51,14 @@ public class MenuButtonPage extends TestPaneBase implements HasSkinnable {
     public MenuButtonPage() {
         super("MenuButtonPage");
 
-        control = new MenuButton();
+        control = new MenuButton() {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute a, Object... ps) {
+                Object v = super.queryAccessibleAttribute(a, ps);
+                Loggers.accessibility.log(a, v);
+                return v;
+            }
+        };
 
         control.setText("Menu Button");
         control.getItems().add(new MenuItem("Edit"));
@@ -78,6 +87,7 @@ private Node createItemsOptions(String name, ObservableList<MenuItem> items) {
         ObjectSelector<List<MenuItem>> s = new ObjectSelector<>(name, items::setAll);
         s.addChoiceSupplier("1 Item", mk(1));
         s.addChoiceSupplier("10 Items", mk(10));
+        s.addChoiceSupplier("100 Items", mk(100));
         s.addChoiceSupplier("1,000 Items", mk(1000));
         s.addChoiceSupplier("<empty>", mk(0));
         s.selectFirst();
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/PaginationPage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/PaginationPage.java
index 7061189c75d..27586eb7df5 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/PaginationPage.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/PaginationPage.java
@@ -26,11 +26,13 @@
 package com.oracle.tools.fx.monkey.pages;
 
 import javafx.beans.property.ObjectProperty;
+import javafx.scene.AccessibleAttribute;
 import javafx.scene.Node;
 import javafx.scene.control.Pagination;
 import javafx.scene.control.skin.PaginationSkin;
 import javafx.scene.image.ImageView;
 import javafx.util.Callback;
+import com.oracle.tools.fx.monkey.Loggers;
 import com.oracle.tools.fx.monkey.options.IntOption;
 import com.oracle.tools.fx.monkey.options.ObjectOption;
 import com.oracle.tools.fx.monkey.sheets.ControlPropertySheet;
@@ -48,7 +50,14 @@ public class PaginationPage extends TestPaneBase implements HasSkinnable {
     public PaginationPage() {
         super("PaginationPage");
 
-        control = new Pagination();
+        control = new Pagination() {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute a, Object... ps) {
+                Object v = super.queryAccessibleAttribute(a, ps);
+                Loggers.accessibility.log(a, v);
+                return v;
+            }
+        };
 
         OptionPane op = new OptionPane();
         op.section("Pagination");
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/PasswordFieldPage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/PasswordFieldPage.java
index 2e8f7b25308..18d1078206a 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/PasswordFieldPage.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/PasswordFieldPage.java
@@ -25,13 +25,22 @@
 
 package com.oracle.tools.fx.monkey.pages;
 
+import javafx.scene.AccessibleAttribute;
 import javafx.scene.control.PasswordField;
+import com.oracle.tools.fx.monkey.Loggers;
 
 /**
  * PasswordField Page uses the fact that PasswordField is a TextField.
  */
 public class PasswordFieldPage extends TextFieldPage {
     public PasswordFieldPage() {
-        super(new PasswordField(), "PasswordFieldPage");
+        super(new PasswordField() {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute a, Object... ps) {
+                Object v = super.queryAccessibleAttribute(a, ps);
+                Loggers.accessibility.log(a, v);
+                return v;
+            }
+        }, "PasswordFieldPage");
     }
 }
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/PieChartPage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/PieChartPage.java
index c7224206864..955e94aa8dd 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/PieChartPage.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/PieChartPage.java
@@ -28,10 +28,12 @@
 import java.util.List;
 import java.util.Random;
 import javafx.collections.ObservableList;
+import javafx.scene.AccessibleAttribute;
 import javafx.scene.Node;
 import javafx.scene.chart.PieChart;
 import javafx.scene.chart.PieChart.Data;
 import javafx.scene.layout.BorderPane;
+import com.oracle.tools.fx.monkey.Loggers;
 import com.oracle.tools.fx.monkey.options.BooleanOption;
 import com.oracle.tools.fx.monkey.options.DoubleOption;
 import com.oracle.tools.fx.monkey.sheets.ChartPropertySheet;
@@ -48,7 +50,14 @@ public class PieChartPage extends TestPaneBase {
     public PieChartPage() {
         super("PieChartPage");
 
-        chart = new PieChart();
+        chart = new PieChart() {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute a, Object... ps) {
+                Object v = super.queryAccessibleAttribute(a, ps);
+                Loggers.accessibility.log(a, v);
+                return v;
+            }
+        };
 
         OptionPane op = new OptionPane();
         op.section("PieChart");
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/RadioButtonPage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/RadioButtonPage.java
new file mode 100644
index 00000000000..5907212762b
--- /dev/null
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/RadioButtonPage.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+package com.oracle.tools.fx.monkey.pages;
+
+import javafx.geometry.Insets;
+import javafx.scene.AccessibleAttribute;
+import javafx.scene.control.RadioButton;
+import javafx.scene.control.ToggleGroup;
+import javafx.scene.control.skin.RadioButtonSkin;
+import javafx.scene.layout.HBox;
+import com.oracle.tools.fx.monkey.Loggers;
+import com.oracle.tools.fx.monkey.sheets.ButtonsPropertySheet;
+import com.oracle.tools.fx.monkey.util.HasSkinnable;
+import com.oracle.tools.fx.monkey.util.OptionPane;
+import com.oracle.tools.fx.monkey.util.TestPaneBase;
+
+/**
+ * RadioButton Page.
+ */
+public class RadioButtonPage extends TestPaneBase implements HasSkinnable {
+    private final RadioButton control;
+
+    public RadioButtonPage() {
+        super("RadioButtonPage");
+
+        control = new RadioButton("Radio Button") {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute a, Object... ps) {
+                Object v = super.queryAccessibleAttribute(a, ps);
+                Loggers.accessibility.log(a, v);
+                return v;
+            }
+        };
+
+        RadioButton b2 = new RadioButton("B2");
+        RadioButton b3 = new RadioButton("B3");
+
+        ToggleGroup group = new ToggleGroup();
+        group.getToggles().addAll(b2, b3);
+
+        OptionPane op = new OptionPane();
+        ButtonsPropertySheet.appendTo(op, control, group);
+
+        HBox p = new HBox(4, control, b2, b3);
+        p.setPadding(new Insets(4));
+        setContent(p);
+        setOptions(op);
+    }
+
+    @Override
+    public void nullSkin() {
+        control.setSkin(null);
+    }
+
+    @Override
+    public void newSkin() {
+        control.setSkin(new RadioButtonSkin(control));
+    }
+}
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/ScrollBarPage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/ScrollBarPage.java
index da15f4c87d5..b24c557f47b 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/ScrollBarPage.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/ScrollBarPage.java
@@ -24,11 +24,13 @@
  */
 package com.oracle.tools.fx.monkey.pages;
 
+import javafx.scene.AccessibleAttribute;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.Label;
 import javafx.scene.control.ScrollBar;
 import javafx.scene.control.skin.ScrollBarSkin;
 import javafx.scene.layout.VBox;
+import com.oracle.tools.fx.monkey.Loggers;
 import com.oracle.tools.fx.monkey.util.FX;
 import com.oracle.tools.fx.monkey.util.HasSkinnable;
 import com.oracle.tools.fx.monkey.util.OptionPane;
@@ -47,7 +49,14 @@ public class ScrollBarPage extends TestPaneBase implements HasSkinnable {
     public ScrollBarPage() {
         super("ScrollBarPage");
 
-        control = new ScrollBar();
+        control = new ScrollBar() {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute a, Object... ps) {
+                Object v = super.queryAccessibleAttribute(a, ps);
+                Loggers.accessibility.log(a, v);
+                return v;
+            }
+        };
 
         ComboBox<Long> min = new ComboBox<>();
         FX.name(min, "min");
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/ScrollPanePage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/ScrollPanePage.java
index 2a8c2b4a89c..a78d7a5aa81 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/ScrollPanePage.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/ScrollPanePage.java
@@ -26,12 +26,14 @@
 
 import java.util.function.Supplier;
 import javafx.beans.property.ObjectProperty;
+import javafx.scene.AccessibleAttribute;
 import javafx.scene.Node;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.control.ScrollPane.ScrollBarPolicy;
 import javafx.scene.control.skin.ScrollPaneSkin;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
+import com.oracle.tools.fx.monkey.Loggers;
 import com.oracle.tools.fx.monkey.options.BooleanOption;
 import com.oracle.tools.fx.monkey.options.EnumOption;
 import com.oracle.tools.fx.monkey.options.ObjectOption;
@@ -50,7 +52,14 @@ public class ScrollPanePage extends TestPaneBase implements HasSkinnable {
     public ScrollPanePage() {
         super("ScrollPanePage");
 
-        control = new ScrollPane();
+        control = new ScrollPane() {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute a, Object... ps) {
+                Object v = super.queryAccessibleAttribute(a, ps);
+                Loggers.accessibility.log(a, v);
+                return v;
+            }
+        };
 
         OptionPane op = new OptionPane();
         op.section("ScrollPane");
@@ -77,20 +86,6 @@ public ScrollPanePage() {
         setOptions(op);
     }
 
-//        new Dimension2D(50, 50),
-//        new Dimension2D(100, 100),
-//        new Dimension2D(1000, 1000),
-//        new Dimension2D(5000, 5000),
-//        new Dimension2D(5000, 50)
-
-//    private void updatePrefSize(Dimension2D d) {
-//        double w = d.getWidth();
-//        double h = d.getHeight();
-//        content.setPrefSize(w, h);
-//        String s = "Preferred size: " + w + " x " + h;
-//        content.setText(s);
-//    }
-
     @Override
     public void nullSkin() {
         control.setSkin(null);
@@ -103,10 +98,7 @@ public void newSkin() {
 
     private Supplier<Node> mk(int w, int h) {
         return () -> {
-            // TODO maybe a Rectangle with a gradient paint and/or grid?
-            String s = w + "x" + h;
-            Image im = ImageTools.createImage(s, w, h);
-            return new ImageView(im);
+            return ImageTools.createImageView(w, h);
         };
     }
 
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/ShapePage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/ShapePage.java
new file mode 100644
index 00000000000..5cc3f3efdcc
--- /dev/null
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/ShapePage.java
@@ -0,0 +1,358 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+package com.oracle.tools.fx.monkey.pages;
+
+import java.util.function.Supplier;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.ObjectBinding;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.scene.Node;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.Background;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.StackPane;
+import javafx.scene.paint.Color;
+import javafx.scene.shape.Arc;
+import javafx.scene.shape.Circle;
+import javafx.scene.shape.ClosePath;
+import javafx.scene.shape.CubicCurve;
+import javafx.scene.shape.Ellipse;
+import javafx.scene.shape.Line;
+import javafx.scene.shape.LineTo;
+import javafx.scene.shape.MoveTo;
+import javafx.scene.shape.Path;
+import javafx.scene.shape.Polygon;
+import javafx.scene.shape.Polyline;
+import javafx.scene.shape.Rectangle;
+import javafx.scene.shape.Shape;
+import javafx.scene.shape.StrokeLineCap;
+import javafx.scene.text.Font;
+import javafx.scene.text.FontWeight;
+import javafx.scene.text.Text;
+import com.oracle.tools.fx.monkey.options.ObjectOption;
+import com.oracle.tools.fx.monkey.util.FX;
+import com.oracle.tools.fx.monkey.util.OptionPane;
+import com.oracle.tools.fx.monkey.util.TestPaneBase;
+
+/**
+ * Shape Page.
+ */
+public class ShapePage extends TestPaneBase {
+    private final SimpleObjectProperty<Supplier<Shape>> gen1;
+    private final SimpleObjectProperty<Supplier<Shape>> gen2;
+    private final CheckBox stroke1;
+    private final CheckBox stroke2;
+    private final CheckBox fill1;
+    private final CheckBox fill2;
+    private final SimpleObjectProperty<Operation> operation;
+    private final ObjectBinding<Node[]> nodes;
+    private final StackPane stack;
+    private Shape shape1;
+    private Shape shape2;
+    private Shape result;
+    private double originX;
+    private double originY;
+    private final Positioner pos1;
+    private final Positioner pos2;
+
+    public ShapePage() {
+        super("ShapePage");
+
+        pos1 = new Positioner();
+        pos2 = new Positioner();
+
+        stack = new StackPane();
+        stack.setBackground(Background.fill(Color.WHITE));
+        stack.addEventFilter(MouseEvent.MOUSE_PRESSED, this::handleMousePressed);
+        stack.addEventFilter(MouseEvent.MOUSE_DRAGGED, this::handleMouseDragged);
+        FX.setPopupMenu(stack, this::createPopupMenu);
+
+        gen1 = new SimpleObjectProperty<>();
+
+        gen2 = new SimpleObjectProperty<>();
+
+        stroke1 = new CheckBox("S");
+        FX.name(stroke1, "stroke1");
+        stroke1.setSelected(true);
+        FX.tooltip(stroke1, "Enables the stroke on the shape");
+
+        stroke2 = new CheckBox("S");
+        FX.name(stroke2, "stroke2");
+        stroke2.setSelected(true);
+        FX.tooltip(stroke2, "Enables the stroke on the shape");
+
+        fill1 = new CheckBox("F");
+        FX.name(stroke2, "fill1");
+        FX.tooltip(fill1, "Enables the fill on the shape");
+
+        fill2 = new CheckBox("F");
+        FX.name(stroke2, "fill2");
+        FX.tooltip(fill2, "Enables the fill on the shape");
+
+        operation = new SimpleObjectProperty<>();
+
+        nodes = Bindings.createObjectBinding(
+            this::process,
+            gen1,
+            gen2,
+            stroke1.selectedProperty(),
+            stroke2.selectedProperty(),
+            fill1.selectedProperty(),
+            fill2.selectedProperty(),
+            operation
+        );
+        nodes.addListener((s,p,v) -> {
+            stack.getChildren().setAll(v);
+        });
+
+        OptionPane op = new OptionPane();
+        op.section("Shape");
+        op.option("Shape 1", createShapeSelector("shape1", gen1, stroke1, fill1));
+        op.option("Shape 2", createShapeSelector("shape2", gen2, stroke2, fill2));
+        op.separator();
+        op.option("Operation:", createOpSelector("op", operation));
+
+        setContent(stack);
+        setOptions(op);
+    }
+
+    private Node createShapeSelector(String name, ObjectProperty<Supplier<Shape>> p, CheckBox stroke, CheckBox fill) {
+        ObjectOption<Supplier<Shape>> op = new ObjectOption<>(name, p);
+        op.addChoice("Arc", () -> {
+            return new Arc(0, 0, 100, 200, 0, 270);
+        });
+        op.addChoice("Circle", () -> {
+            return new Circle(20, 20, 40);
+        });
+        op.addChoice("Cubic Curve", () -> {
+            return new CubicCurve(0, 0, 100, 60, 200, 0, 300, 80);
+        });
+        op.addChoice("Ellipse", () -> {
+            return new Ellipse(0, 0, 200, 100);
+        });
+        op.addChoice("Line", () -> {
+            return new Line(0, 0, 200, 100);
+        });
+        op.addChoice("Path (H)", () -> {
+            Path t = new Path();
+            t.getElements().addAll(
+                new MoveTo(0.0, 0),
+                new LineTo(100, 10),
+                new LineTo(110, 45),
+                new LineTo(10, 50),
+                new ClosePath()
+            );
+            return t;
+        });
+        op.addChoice("Path (V)", () -> {
+            Path t = new Path();
+            t.getElements().addAll(
+                new MoveTo(50, 0),
+                new LineTo(75, 5),
+                new LineTo(80, 120),
+                new LineTo(45, 125),
+                new ClosePath()
+            );
+            return t;
+        });
+        op.addChoice("Polygon", () -> {
+            return new Polygon(0, 0, 200, 100, 250, 200, 200, 210, 100, -30, 20, 205);
+        });
+        op.addChoice("Polyline", () -> {
+            return new Polyline(0, 0, 200, 100, 250, 200, 200, 210, 100, -30, 20, 205);
+        });
+        // TODO quad curve, svgpath?
+        op.addChoice("Rectangle", () -> {
+            return new Rectangle(0, 0, 400, 200);
+        });
+        op.addChoice("Text", () -> {
+            Text t = new Text("Text");
+            t.setFont(Font.font("System", FontWeight.BOLD, 48));
+            return t;
+        });
+        op.selectFirst();
+
+        return new HBox(op, stroke, fill);
+    }
+
+    private ObjectOption<Operation> createOpSelector(String name, ObjectProperty<Operation> p) {
+        ObjectOption<Operation> op = new ObjectOption<>(name, p);
+        op.addChoice("Intersect", Shape::intersect);
+        op.addChoice("Subtract", Shape::subtract);
+        op.addChoice("Union", Shape::union);
+        op.selectFirst();
+        return op;
+    }
+
+    @FunctionalInterface
+    private interface Operation {
+        public Shape op(Shape a, Shape b);
+    }
+
+    private class Positioner {
+        double tx;
+        double ty;
+        double initx;
+        double inity;
+
+        public void set() {
+            initx = tx;
+            inity = ty;
+        }
+
+        public void reset() {
+            tx = 0;
+            ty = 0;
+            translate(shape1);
+            translate(shape2);
+        }
+
+        public void handleEvent(MouseEvent ev, Shape s) {
+            if (s == null) {
+                return;
+            }
+
+            tx = initx + ev.getX() - originX;
+            ty = inity + ev.getY() - originY;
+            translate(s);
+
+            Operation op = operation.get();
+            if (op != null) {
+                if (result != null) {
+                    stack.getChildren().remove(result);
+                }
+                result = op.op(shape1, shape2);
+                init(result);
+                result.setFill(FX.alpha(Color.BLACK, 0.5));
+                stack.getChildren().add(result);
+            }
+        }
+
+        public void translate(Shape s) {
+            if (s != null) {
+                s.setTranslateX(tx);
+                s.setTranslateY(ty);
+            }
+        }
+    }
+
+    private Node[] clear() {
+        shape1 = null;
+        shape2 = null;
+        result = null;
+        return null;
+    }
+
+    Node[] process() {
+        Supplier<Shape> sup1 = gen1.get();
+        if (sup1 == null) {
+            return clear();
+        }
+
+        Supplier<Shape> sup2 = gen2.get();
+        if (sup2 == null) {
+            return clear();
+        }
+
+        Operation op = operation.get();
+        if (op == null) {
+            return clear();
+        }
+
+        // shape 1
+
+        shape1 = sup1.get();
+        pos1.translate(shape1);
+        init(shape1);
+
+        if (stroke1.isSelected()) {
+            shape1.setStroke(Color.RED);
+            shape1.setStrokeLineCap(StrokeLineCap.ROUND);
+            shape1.setStrokeWidth(10);
+        } else {
+            shape1.setStroke(null);
+            shape1.setStrokeWidth(0);
+        }
+        shape1.setFill(fill1.isSelected() ? FX.alpha(Color.RED, 0.5) : null);
+
+        // shape 2
+
+        shape2 = sup2.get();
+        pos2.translate(shape2);
+        init(shape2);
+
+        if (stroke2.isSelected()) {
+            shape2.setStroke(Color.GREEN);
+            shape2.setStrokeLineCap(StrokeLineCap.ROUND);
+            shape2.setStrokeWidth(10);
+        } else {
+            shape2.setStroke(null);
+            shape2.setStrokeWidth(0);
+        }
+        shape2.setFill(fill2.isSelected() ? FX.alpha(Color.GREEN, 0.5) : null);
+
+        // result
+
+        result = op.op(shape1, shape2);
+        init(result);
+        result.setFill(FX.alpha(Color.BLACK, 0.5));
+        return new Node[] { shape1, shape2, result };
+    }
+
+    private static void init(Node n) {
+        //n.setManaged(false);
+        n.setLayoutX(0);
+        n.setLayoutY(0);
+    }
+
+    void handleMousePressed(MouseEvent ev) {
+        originX = ev.getX();
+        originY = ev.getY();
+        pos1.set();
+        pos2.set();
+    }
+
+    void handleMouseDragged(MouseEvent ev) {
+        if(ev.isShiftDown()) {
+            pos2.handleEvent(ev, shape2);
+        } else {
+            pos1.handleEvent(ev, shape1);
+        }
+    }
+
+    void reset() {
+        pos1.reset();
+        pos2.reset();
+    }
+
+    ContextMenu createPopupMenu() {
+        ContextMenu m = new ContextMenu();
+        FX.item(m, "Reset Transform", this::reset);
+        return m;
+    }
+}
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/SpinnerPage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/SpinnerPage.java
index 0f20f406fd6..77f11d2f7a8 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/SpinnerPage.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/SpinnerPage.java
@@ -32,9 +32,11 @@
 import javafx.beans.property.ReadOnlyProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.collections.FXCollections;
+import javafx.scene.AccessibleAttribute;
 import javafx.scene.control.Spinner;
 import javafx.scene.control.SpinnerValueFactory;
 import javafx.util.StringConverter;
+import com.oracle.tools.fx.monkey.Loggers;
 import com.oracle.tools.fx.monkey.options.BooleanOption;
 import com.oracle.tools.fx.monkey.options.DoubleSpinner;
 import com.oracle.tools.fx.monkey.options.DurationOption;
@@ -76,7 +78,14 @@ enum Converter {
     public SpinnerPage() {
         super("SpinnerPage");
 
-        control = new Spinner<Object>();
+        control = new Spinner<Object>() {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute a, Object... ps) {
+                Object v = super.queryAccessibleAttribute(a, ps);
+                Loggers.accessibility.log(a, v);
+                return v;
+            }
+        };
         control.valueProperty().addListener((s,p,c) -> {
             // TODO show in UI?
             System.out.println("Value=" + c);
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/SplitMenuButtonPage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/SplitMenuButtonPage.java
new file mode 100644
index 00000000000..a1e538afbc3
--- /dev/null
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/SplitMenuButtonPage.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+package com.oracle.tools.fx.monkey.pages;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Supplier;
+import javafx.collections.ObservableList;
+import javafx.geometry.Side;
+import javafx.scene.AccessibleAttribute;
+import javafx.scene.Node;
+import javafx.scene.control.MenuItem;
+import javafx.scene.control.SplitMenuButton;
+import javafx.scene.control.skin.SplitMenuButtonSkin;
+import com.oracle.tools.fx.monkey.Loggers;
+import com.oracle.tools.fx.monkey.options.EnumOption;
+import com.oracle.tools.fx.monkey.sheets.LabeledPropertySheet;
+import com.oracle.tools.fx.monkey.util.HasSkinnable;
+import com.oracle.tools.fx.monkey.util.ObjectSelector;
+import com.oracle.tools.fx.monkey.util.OptionPane;
+import com.oracle.tools.fx.monkey.util.TestPaneBase;
+
+/**
+ * SplitMenuButton Page.
+ */
+public class SplitMenuButtonPage extends TestPaneBase implements HasSkinnable {
+    private final SplitMenuButton control;
+
+    public SplitMenuButtonPage() {
+        super("SplitMenuButtonPage");
+
+        control = new SplitMenuButton() {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute a, Object... ps) {
+                Object v = super.queryAccessibleAttribute(a, ps);
+                Loggers.accessibility.log(a, v);
+                return v;
+            }
+        };
+
+        control.setText("Split Menu Button");
+        control.getItems().add(new MenuItem("Edit"));
+
+        OptionPane op = new OptionPane();
+        op.section("SplitMenuButton");
+        op.option("Items:", createItemsOptions("items", control.getItems()));
+        op.option("Popup Side:", new EnumOption<Side>("popupSide", true, Side.class, control.popupSideProperty()));
+        LabeledPropertySheet.appendTo(op, "ButtonBase", false, control);
+
+        setContent(control);
+        setOptions(op);
+    }
+
+    private Supplier<List<MenuItem>> mk(int count) {
+        return () -> {
+            ArrayList<MenuItem> rv = new ArrayList(count);
+            for (int i = 0; i < count; i++) {
+                rv.add(new MenuItem("Item_" + (i + 1)));
+            }
+            return rv;
+        };
+    }
+
+    private Node createItemsOptions(String name, ObservableList<MenuItem> items) {
+        ObjectSelector<List<MenuItem>> s = new ObjectSelector<>(name, items::setAll);
+        s.addChoiceSupplier("1 Item", mk(1));
+        s.addChoiceSupplier("10 Items", mk(10));
+        s.addChoiceSupplier("100 Items", mk(100));
+        s.addChoiceSupplier("1,000 Items", mk(1000));
+        s.addChoiceSupplier("<empty>", mk(0));
+        s.selectFirst();
+        return s;
+    }
+
+    @Override
+    public void nullSkin() {
+        control.setSkin(null);
+    }
+
+    @Override
+    public void newSkin() {
+        control.setSkin(new SplitMenuButtonSkin(control));
+    }
+}
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/StackedAreaChartPage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/StackedAreaChartPage.java
index 0b3b1bc5d81..c6bad2270d1 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/StackedAreaChartPage.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/StackedAreaChartPage.java
@@ -24,8 +24,10 @@
  */
 package com.oracle.tools.fx.monkey.pages;
 
+import javafx.scene.AccessibleAttribute;
 import javafx.scene.chart.StackedAreaChart;
 import javafx.scene.chart.XYChart;
+import com.oracle.tools.fx.monkey.Loggers;
 import com.oracle.tools.fx.monkey.options.BooleanOption;
 import com.oracle.tools.fx.monkey.sheets.XYChartPropertySheet;
 import com.oracle.tools.fx.monkey.util.OptionPane;
@@ -39,7 +41,14 @@ public class StackedAreaChartPage extends XYChartPageBase {
     public StackedAreaChartPage() {
         super("StackedAreaChartPage");
 
-        chart = new StackedAreaChart<>(createNumberAxis("X Axis"), createNumberAxis("Y Axis"));
+        chart = new StackedAreaChart<>(createNumberAxis("X Axis"), createNumberAxis("Y Axis")) {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute a, Object... ps) {
+                Object v = super.queryAccessibleAttribute(a, ps);
+                Loggers.accessibility.log(a, v);
+                return v;
+            }
+        };
         chart.setTitle("Stacked Area Chart");
         addSeries();
 
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/StackedBarChartPage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/StackedBarChartPage.java
index 2da18fea05a..58111c199fa 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/StackedBarChartPage.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/StackedBarChartPage.java
@@ -24,8 +24,10 @@
  */
 package com.oracle.tools.fx.monkey.pages;
 
+import javafx.scene.AccessibleAttribute;
 import javafx.scene.chart.StackedBarChart;
 import javafx.scene.chart.XYChart;
+import com.oracle.tools.fx.monkey.Loggers;
 import com.oracle.tools.fx.monkey.sheets.Options;
 import com.oracle.tools.fx.monkey.sheets.XYChartPropertySheet;
 import com.oracle.tools.fx.monkey.util.OptionPane;
@@ -39,7 +41,14 @@ public class StackedBarChartPage extends XYChartPageBase {
     public StackedBarChartPage() {
         super("StackedBarChartPage");
 
-        chart = new StackedBarChart<>(createCategoryAxis("X Axis"), createNumberAxis("Y Axis"));
+        chart = new StackedBarChart<>(createCategoryAxis("X Axis"), createNumberAxis("Y Axis")) {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute a, Object... ps) {
+                Object v = super.queryAccessibleAttribute(a, ps);
+                Loggers.accessibility.log(a, v);
+                return v;
+            }
+        };
         chart.setTitle("Stacked Bar Chart");
         addSeries();
 
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/TabPanePage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/TabPanePage.java
index dbdbb087bbb..68e42fa156c 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/TabPanePage.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/TabPanePage.java
@@ -24,9 +24,15 @@
  */
 package com.oracle.tools.fx.monkey.pages;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+import java.util.function.Supplier;
+import javafx.collections.ObservableList;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.geometry.Side;
+import javafx.scene.AccessibleAttribute;
 import javafx.scene.Node;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
@@ -36,12 +42,16 @@
 import javafx.scene.control.TabPane.TabDragPolicy;
 import javafx.scene.control.TextField;
 import javafx.scene.control.skin.TabPaneSkin;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
 import javafx.scene.layout.VBox;
+import com.oracle.tools.fx.monkey.Loggers;
 import com.oracle.tools.fx.monkey.options.BooleanOption;
 import com.oracle.tools.fx.monkey.options.EnumOption;
 import com.oracle.tools.fx.monkey.sheets.ControlPropertySheet;
 import com.oracle.tools.fx.monkey.sheets.Options;
 import com.oracle.tools.fx.monkey.util.HasSkinnable;
+import com.oracle.tools.fx.monkey.util.ImageTools;
 import com.oracle.tools.fx.monkey.util.ObjectSelector;
 import com.oracle.tools.fx.monkey.util.OptionPane;
 import com.oracle.tools.fx.monkey.util.TestPaneBase;
@@ -55,17 +65,20 @@ public class TabPanePage extends TestPaneBase implements HasSkinnable {
     public TabPanePage() {
         super("TabPanePage");
 
-        control = new TabPane();
-        // TODO graphic, other Tab propertis in the context menu
-        control.getTabs().addAll(
-            new Tab("One", mkContent("Tab One Content")),
-            new Tab("Two", mkContent("Tab Two Content")),
-            new Tab("Three", mkContent("Tab Three Content")),
-            new Tab("Four", mkContent("Tab Four Content"))
-        );
+        control = new TabPane() {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute a, Object... ps) {
+                Object v = super.queryAccessibleAttribute(a, ps);
+                Loggers.accessibility.log(a, v);
+                return v;
+            }
+        };
+
+        // TODO other Tab propertis in the context menu
 
         OptionPane op = new OptionPane();
         op.section("TabPane");
+        op.option("Tabs:", createTabsOption("tabs", control.getTabs()));
         op.option(new BooleanOption("rotateGraphic", "rotate graphic", control.rotateGraphicProperty()));
         op.option("Selection Model:", createSelectionModelOptions("selectionModel"));
         op.option("Side:", new EnumOption<Side>("side", true, Side.class, control.sideProperty()));
@@ -82,6 +95,59 @@ public TabPanePage() {
         setOptions(op);
     }
 
+    private Node createTabsOption(String name, ObservableList<Tab> items) {
+        ObjectSelector<List<Tab>> s = new ObjectSelector<>(name, (v) -> {
+            items.setAll(v);
+        });
+        s.addChoice("<empty>", List.of());
+        s.addChoiceSupplier("1 Tab", tabs(1, false));
+        s.addChoiceSupplier("2 Tabs", tabs(2, false));
+        s.addChoiceSupplier("10 Tabs", tabs(10, false));
+        s.addChoiceSupplier("200 Tabs", tabs(200, false));
+        s.addChoiceSupplier("1,000 Tabs", tabs(1_000, false));
+        s.addChoiceSupplier("1 Tab with Graphic", tabs(1, true));
+        s.addChoiceSupplier("2 Tabs with Graphic", tabs(2, true));
+        s.addChoiceSupplier("10 Tabs with Graphic", tabs(10, true));
+        s.addChoiceSupplier("200 Tabs with Graphic", tabs(200, true));
+        s.select(2);
+        return s;
+    }
+
+    private Supplier<List<Tab>> tabs(int count, boolean graphic) {
+        return () -> {
+            Random r = new Random();
+            ArrayList<Tab> ts = new ArrayList<>(count);
+            for (int i = 0; i < count; i++) {
+                Node n = mkContent("Content_" + i);
+                String name = "T_" + i;
+                Tab t = new Tab(name, n);
+                if (graphic) {
+                    Image im;
+                    switch (r.nextInt(5)) {
+                    case 0:
+                        im = ImageTools.createImage(name, 70, 20);
+                        break;
+                    case 1:
+                        im = ImageTools.createImage(name, 20, 70);
+                        break;
+                    case 3:
+                        im = ImageTools.createImage(20, 20);
+                        break;
+                    default:
+                        im = null;
+                        break;
+                    }
+
+                    if (im != null) {
+                        t.setGraphic(new ImageView(im));
+                    }
+                }
+                ts.add(t);
+            }
+            return ts;
+        };
+    }
+
     private Node mkContent(String text) {
         Label label = new Label(text);
 
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/TableViewPage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/TableViewPage.java
index d342d639f8c..d4cf84a3b66 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/TableViewPage.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/TableViewPage.java
@@ -30,11 +30,12 @@
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
+import javafx.scene.AccessibleAttribute;
 import javafx.scene.Node;
 import javafx.scene.control.Button;
 import javafx.scene.control.ConstrainedColumnResizeBase;
+import javafx.scene.control.ContextMenu;
 import javafx.scene.control.SelectionMode;
-import javafx.scene.control.SplitMenuButton;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableColumnBase;
 import javafx.scene.control.TableRow;
@@ -45,10 +46,12 @@
 import javafx.scene.layout.Background;
 import javafx.scene.paint.Color;
 import javafx.util.Callback;
+import com.oracle.tools.fx.monkey.Loggers;
 import com.oracle.tools.fx.monkey.options.BooleanOption;
 import com.oracle.tools.fx.monkey.options.ObjectOption;
 import com.oracle.tools.fx.monkey.sheets.ControlPropertySheet;
 import com.oracle.tools.fx.monkey.sheets.Options;
+import com.oracle.tools.fx.monkey.sheets.TableColumnPropertySheet;
 import com.oracle.tools.fx.monkey.util.ColumnBuilder;
 import com.oracle.tools.fx.monkey.util.DataRow;
 import com.oracle.tools.fx.monkey.util.FX;
@@ -67,7 +70,14 @@ public class TableViewPage extends TestPaneBase implements HasSkinnable {
     public TableViewPage() {
         super("TableViewPage");
 
-        control = new TableView<>();
+        control = new TableView<>() {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute a, Object... ps) {
+                Object v = super.queryAccessibleAttribute(a, ps);
+                Loggers.accessibility.log(a, v);
+                return v;
+            }
+        };
 
         Button addDataItemButton = FX.button("Add Data Item", () -> {
             control.getItems().add(new DataRow());
@@ -77,32 +87,13 @@ public TableViewPage() {
             control.getItems().clear();
         });
 
-        SplitMenuButton addColumnButton = new SplitMenuButton(
-            FX.menuItem("at the beginning", () -> addColumn(0)),
-            FX.menuItem("in the middle", () -> addColumn(1)),
-            FX.menuItem("at the end", () -> addColumn(2))
-        );
-        addColumnButton.setText("Add Column");
-
-        SplitMenuButton removeColumnButton = new SplitMenuButton(
-            FX.menuItem("at the beginning", () -> removeColumn(0)),
-            FX.menuItem("in the middle", () -> removeColumn(1)),
-            FX.menuItem("at the end", () -> removeColumn(2)),
-            FX.menuItem("all", () -> removeAllColumns())
-        );
-        removeColumnButton.setText("Remove Column");
-
         Button refresh = FX.button("Refresh", () -> {
             control.refresh();
         });
 
-        // layout
-
         OptionPane op = new OptionPane();
         op.section("TableView");
-
         op.option("Columns:", createColumnsSelector("columns", control.getColumns()));
-        op.option(Utils.buttons(addColumnButton, removeColumnButton));
         op.option("Column Resize Policy:", createColumnResizePolicy("columnResizePolicy", control.columnResizePolicyProperty()));
         op.option(new BooleanOption("editable", "editable", control.editableProperty()));
         op.option("Fixed Cell Size:", Options.fixedSizeOption("fixedCellSize", control.fixedCellSizeProperty()));
@@ -114,137 +105,54 @@ public TableViewPage() {
         op.option("Selection Model:", createSelectionModelOptions("selectionModel"));
         op.option("Sort Policy: TODO", null); // TODO
         op.option(new BooleanOption("tableMenuButtonVisible", "table menu button visible", control.tableMenuButtonVisibleProperty()));
-
-        // TODO
-//        op.label("Filter:");
-//        op.option(filterSelector);
-//        op.label("Cell Value:");
-//        op.option(cellValueSelector);
-//        op.label("Cell Factory:");
-//        op.option(cellFactorySelector);
-//        op.label("Selection Model:");
-//        op.option(selectionSelector);
-
         op.separator();
         op.option(refresh);
-
-        // currently selected column option sheet
-        //TableColumnOptions.appendTo(op, currentColumn);
-
-        // control option sheet
         ControlPropertySheet.appendTo(op, control);
 
         setContent(control);
         setOptions(op);
     }
 
-    private void addColumn(int where) {
-        TableColumn<DataRow, Object> c = newColumn();
-        c.setText("C" + System.currentTimeMillis());
-        //c.setCellValueFactory((f) -> new SimpleStringProperty(describe(c)));
+    private ContextMenu createPopupMenu(TableColumn<?,?> tc) {
+        ContextMenu m = new ContextMenu();
+        FX.item(m, "Add Column Before", () -> addColumn(tc, false));
+        FX.item(m, "Add Column After", () -> addColumn(tc, true));
+        FX.separator(m);
+        FX.item(m, "Remove Column", () -> control.getColumns().remove(tc));
+        FX.item(m, "Remove All Columns", () -> control.getColumns().clear());
+        FX.separator(m);
+        FX.item(m, "Properties...", () -> TableColumnPropertySheet.open(this, tc));
+        return m;
+    }
 
-        int ct = control.getColumns().size();
-        int ix;
-        switch (where) {
-        case 0:
-            ix = 0;
-            break;
-        case 1:
-            ix = ct / 2;
-            break;
-        case 2:
-        default:
-            ix = ct;
-            break;
-        }
-        if ((ct == 0) || (ix >= ct)) {
-            control.getColumns().add(c);
-        } else {
-            control.getColumns().add(ix, c);
-        }
+    private TableColumn<DataRow, Object> newColumn() {
+        TableColumn<DataRow, Object> tc = new TableColumn();
+        tc.setCellFactory(TextFieldTableCell.<DataRow, Object>forTableColumn(DataRow.converter()));
+        tc.setCellValueFactory((cdf) -> {
+            Object v = cdf.getValue();
+            if (v instanceof DataRow r) {
+                return r.getValue(tc);
+            }
+            return new SimpleObjectProperty(v);
+        });
+        tc.setContextMenu(createPopupMenu(tc));
+        return tc;
     }
 
-    private void removeColumn(int where) {
-        int ct = control.getColumns().size();
-        int ix;
-        switch (where) {
-        case 0:
-            ix = 0;
-            break;
-        case 1:
-            ix = ct / 2;
-            break;
-        case 2:
-        default:
-            ix = ct - 1;
-            break;
+    private void addColumn(TableColumn<?, ?> ref, boolean after) {
+        int ix = control.getColumns().indexOf(ref);
+        if (ix < 0) {
+            return;
         }
-
-        if ((ct >= 0) && (ix < ct)) {
-            control.getColumns().remove(ix);
+        if (after) {
+            ix++;
         }
-    }
 
-    private void removeAllColumns() {
-        control.getColumns().clear();
+        TableColumn<DataRow, Object> c = newColumn();
+        c.setText("C" + System.currentTimeMillis());
+        control.getColumns().add(ix, c);
     }
 
-//                case COL_WITH_GRAPHIC:
-//                    {
-//                        TableColumn<Object, String> c = new TableColumn<>();
-//                        tableView.getColumns().add(c);
-//                        c.setText("C" + tableView.getColumns().size());
-//                        c.setCellValueFactory((f) -> new SimpleStringProperty(describe(c)));
-//                        c.setCellFactory((r) -> {
-//                            return new TableCell<>() {
-//                                @Override
-//                                protected void updateItem(String item, boolean empty) {
-//                                    super.updateItem(item, empty);
-//                                    Text t = new Text(
-//                                        "11111111111111111111111111111111111111111111111111111111111111111111111111111111111111\n2\n3\n");
-//                                    t.wrappingWidthProperty().bind(widthProperty());
-//                                    setPrefHeight(USE_COMPUTED_SIZE);
-//                                    setGraphic(t);
-//                                }
-//                            };
-//                        });
-//                        lastColumn = c;
-//                    }
-
-    // FIX move to column menu
-//    void filter() {
-//        Filter f = filterSelector.getSelectionModel().getSelectedItem();
-//        if (f == Filter.NONE) {
-//            f = null;
-//        }
-//        if (f != null) {
-//            ObservableList<Object> items = FXCollections.observableArrayList();
-//            items.addAll(tableView.getItems());
-//            FilteredList<Object> filteredList = new FilteredList<>(items);
-//            switch(f) {
-//            case SKIP1S:
-//                filteredList.setPredicate((s) -> {
-//                    if (s == null) {
-//                        return true;
-//                    }
-//                    return !((String)s).contains("11");
-//                });
-//                break;
-//            case SKIP2S:
-//                filteredList.setPredicate((s) -> {
-//                    if (s == null) {
-//                        return true;
-//                    }
-//                    return !((String)s).contains("22");
-//                });
-//                break;
-//            default:
-//                throw new Error("?" + f);
-//            }
-//            //tableView.setItems(filteredList);
-//        }
-//    }
-
     @Override
     public void nullSkin() {
         control.setSkin(null);
@@ -255,92 +163,6 @@ public void newSkin() {
         control.setSkin(new TableViewSkin<>(control));
     }
 
-    // FIX move to column menu
-//    private Callback<CellDataFeatures<Object, String>, ObservableValue<String>> getValueFactory(CellValue t) {
-//        if (t != null) {
-//            switch (t) {
-//            case MIN_MAX:
-//                return (f) -> {
-//                    String s = describe(f.getTableColumn());
-//                    return new SimpleStringProperty(s);
-//                };
-//            case QUOTED:
-//                return (f) -> {
-//                    String s = "\"" + f.getValue() + '"';
-//                    return new SimpleStringProperty(s);
-//                };
-//            case VALUE:
-//                return (f) -> {
-//                    String s = String.valueOf(f.getValue());
-//                    return new SimpleStringProperty(s);
-//                };
-//            }
-//        }
-//        return null;
-//    }
-
-//    private Node getIcon(String text) {
-//        if (text.contains("0")) {
-//            return icon(Color.RED);
-//        } else if (text.contains("1")) {
-//            return icon(Color.GREEN);
-//        }
-//        return null;
-//    }
-//
-//    private Node icon(Color color) {
-//        Canvas c = new Canvas(16, 16);
-//        GraphicsContext g = c.getGraphicsContext2D();
-//        g.setFill(color);
-//        g.fillRect(0, 0, c.getWidth(), c.getHeight());
-//        return c;
-//    }
-
-    // FIX move to column menu
-//    private Callback getCellFactory(Cells t) {
-//        if (t != null) {
-//            switch (t) {
-//            case NULL:
-//                return null;
-//            case GRAPHICS:
-//                return (r) -> {
-//                    return new TableCell<String,String>() {
-//                        @Override
-//                        protected void updateItem(String item, boolean empty) {
-//                            super.updateItem(item, empty);
-//                            if (item == null) {
-//                                super.setText(null);
-//                                super.setGraphic(null);
-//                            } else {
-//                                String s = item.toString();
-//                                super.setText(s);
-//                                Node n = getIcon(s);
-//                                super.setGraphic(n);
-//                            }
-//                        }
-//                    };
-//                };
-//            case VARIABLE:
-//                return (r) -> {
-//                    return new TableCell<String,String>() {
-//                        @Override
-//                        protected void updateItem(String item, boolean empty) {
-//                            super.updateItem(item, empty);
-//                            String s =
-//                                "111111111111111111111111111111111111111111111" +
-//                                "11111111111111111111111111111111111111111\n2\n3\n";
-//                            Text t = new Text(s);
-//                            t.wrappingWidthProperty().bind(widthProperty());
-//                            setPrefHeight(USE_COMPUTED_SIZE);
-//                            setGraphic(t);
-//                        }
-//                    };
-//                };
-//            }
-//        }
-//        return TableColumn.DEFAULT_CELL_FACTORY;
-//    }
-
     /**
      * a user-defined policy demonstrates that we can indeed create a custom policy using the new API.
      * this policy simply sizes all columns equally.
@@ -364,6 +186,10 @@ public Boolean call(ResizeFeatures rf) {
         }
     }
 
+    private ColumnBuilder<TableColumn<DataRow, ?>> columnBuilder() {
+        return new ColumnBuilder<>(this::newColumn);
+    }
+
     private Node createColumnsSelector(String name, ObservableList<TableColumn<DataRow, ?>> columns) {
         ObjectSelector<List<TableColumn<DataRow, ?>>> s = new ObjectSelector<>(name, (v) -> {
             columns.setAll(v);
@@ -437,23 +263,6 @@ private Node createColumnsSelector(String name, ObservableList<TableColumn<DataR
         return s;
     }
 
-    private ColumnBuilder<TableColumn<DataRow, ?>> columnBuilder() {
-        return new ColumnBuilder<>(this::newColumn);
-    }
-
-    private TableColumn<DataRow, Object> newColumn() {
-        TableColumn<DataRow, Object> tc = new TableColumn();
-        tc.setCellFactory(TextFieldTableCell.<DataRow, Object>forTableColumn(DataRow.converter()));
-        tc.setCellValueFactory((cdf) -> {
-            Object v = cdf.getValue();
-            if (v instanceof DataRow r) {
-                return r.getValue(tc);
-            }
-            return new SimpleObjectProperty(v);
-        });
-        return tc;
-    }
-
     private Node createColumnResizePolicy(String name, ObjectProperty<Callback<ResizeFeatures, Boolean>> p) {
         ObjectOption<Callback<ResizeFeatures, Boolean>> s = new ObjectOption<>(name, p);
         s.addChoice("AUTO_RESIZE_FLEX_NEXT_COLUMN", TableView.CONSTRAINED_RESIZE_POLICY_FLEX_NEXT_COLUMN);
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/TextAreaPage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/TextAreaPage.java
index 312835e078c..a5da3c32727 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/TextAreaPage.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/TextAreaPage.java
@@ -24,11 +24,11 @@
  */
 package com.oracle.tools.fx.monkey.pages;
 
+import javafx.scene.AccessibleAttribute;
 import javafx.scene.control.TextArea;
 import javafx.scene.control.skin.TextAreaSkin;
-import com.oracle.tools.fx.monkey.options.BooleanOption;
-import com.oracle.tools.fx.monkey.options.IntOption;
-import com.oracle.tools.fx.monkey.sheets.TextInputControlPropertySheet;
+import com.oracle.tools.fx.monkey.Loggers;
+import com.oracle.tools.fx.monkey.sheets.TextAreaPropertySheet;
 import com.oracle.tools.fx.monkey.util.HasSkinnable;
 import com.oracle.tools.fx.monkey.util.OptionPane;
 import com.oracle.tools.fx.monkey.util.TestPaneBase;
@@ -42,16 +42,17 @@ public class TextAreaPage extends TestPaneBase implements HasSkinnable {
     public TextAreaPage() {
         super("TextAreaPage");
 
-        control = new TextArea();
+        control = new TextArea() {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute a, Object... ps) {
+                Object v = super.queryAccessibleAttribute(a, ps);
+                Loggers.accessibility.log(a, v);
+                return v;
+            }
+        };
 
         OptionPane op = new OptionPane();
-        op.section("TextArea");
-        op.option("Preferred Column Count:", new IntOption("prefColumnCount", -1, Integer.MAX_VALUE, control.prefColumnCountProperty()));
-        op.option("Preferred Row Count:", new IntOption("prefRowCount", -1, Integer.MAX_VALUE, control.prefRowCountProperty()));
-        op.option("Scroll Left: TODO", null); // TODO
-        op.option("Scroll Top: TODO", null); // TODO
-        op.option(new BooleanOption("wrapText", "wrap text", control.wrapTextProperty()));
-        TextInputControlPropertySheet.appendTo(op, true, control);
+        TextAreaPropertySheet.appendTo(op, control);
 
         setContent(control);
         setOptions(op);
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/TextFieldPage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/TextFieldPage.java
index 6ec53b72f43..ee1d9c197b9 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/TextFieldPage.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/TextFieldPage.java
@@ -24,14 +24,13 @@
  */
 package com.oracle.tools.fx.monkey.pages;
 
-import javafx.geometry.Pos;
+import javafx.scene.AccessibleAttribute;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.control.TextField;
 import javafx.scene.control.skin.TextFieldSkin;
-import com.oracle.tools.fx.monkey.options.EnumOption;
-import com.oracle.tools.fx.monkey.options.IntOption;
-import com.oracle.tools.fx.monkey.sheets.TextInputControlPropertySheet;
+import com.oracle.tools.fx.monkey.Loggers;
+import com.oracle.tools.fx.monkey.sheets.TextFieldPropertySheet;
 import com.oracle.tools.fx.monkey.util.FX;
 import com.oracle.tools.fx.monkey.util.HasSkinnable;
 import com.oracle.tools.fx.monkey.util.OptionPane;
@@ -45,7 +44,14 @@ public class TextFieldPage extends TestPaneBase implements HasSkinnable {
     private final CheckBox inScroll;
 
     public TextFieldPage() {
-        this(new TextField(), "TextFieldPage");
+        this(new TextField() {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute a, Object... ps) {
+                Object v = super.queryAccessibleAttribute(a, ps);
+                Loggers.accessibility.log(a, v);
+                return v;
+            }
+        }, "TextFieldPage");
     }
 
     protected TextFieldPage(TextField f, String name) {
@@ -57,12 +63,10 @@ protected TextFieldPage(TextField f, String name) {
         inScroll.setOnAction((ev) -> updateScroll());
 
         OptionPane op = new OptionPane();
-        op.option("Alignment:", new EnumOption<>("alignment", false, Pos.class, control.alignmentProperty()));
-        op.option("Preferred Column Count:", new IntOption("prefColumnCount", -1, Integer.MAX_VALUE, control.prefColumnCountProperty()));
-        op.separator();
-        op.option(inScroll);
-
-        TextInputControlPropertySheet.appendTo(op, false, control);
+        TextFieldPropertySheet.appendTo(op, control, () -> {
+            op.separator();
+            op.option(inScroll);
+        });
 
         setContent(control);
         setOptions(op);
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/TextFlowPage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/TextFlowPage.java
index 4d923e05e36..b6832123e2f 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/TextFlowPage.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/TextFlowPage.java
@@ -26,8 +26,10 @@
 
 import javafx.geometry.Point2D;
 import javafx.geometry.Point3D;
+import javafx.scene.AccessibleAttribute;
 import javafx.scene.Node;
 import javafx.scene.control.Button;
+import javafx.scene.control.ContextMenu;
 import javafx.scene.control.Label;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.input.PickResult;
@@ -36,13 +38,16 @@
 import javafx.scene.text.Text;
 import javafx.scene.text.TextAlignment;
 import javafx.scene.text.TextFlow;
+import com.oracle.tools.fx.monkey.Loggers;
 import com.oracle.tools.fx.monkey.options.ActionSelector;
 import com.oracle.tools.fx.monkey.options.BooleanOption;
 import com.oracle.tools.fx.monkey.options.EnumOption;
 import com.oracle.tools.fx.monkey.options.FontOption;
 import com.oracle.tools.fx.monkey.sheets.Options;
 import com.oracle.tools.fx.monkey.sheets.RegionPropertySheet;
+import com.oracle.tools.fx.monkey.tools.AccessibilityPropertyViewer;
 import com.oracle.tools.fx.monkey.util.EnterTextDialog;
+import com.oracle.tools.fx.monkey.util.FX;
 import com.oracle.tools.fx.monkey.util.OptionPane;
 import com.oracle.tools.fx.monkey.util.ShowCaretPaths;
 import com.oracle.tools.fx.monkey.util.ShowCharacterRuns;
@@ -66,8 +71,16 @@ public class TextFlowPage extends TestPaneBase {
     public TextFlowPage() {
         super("TextFlowPage");
 
-        textFlow = new TextFlow();
+        textFlow = new TextFlow() {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute a, Object... ps) {
+                Object v = super.queryAccessibleAttribute(a, ps);
+                Loggers.accessibility.log(a, v);
+                return v;
+            }
+        };
         textFlow.addEventHandler(MouseEvent.ANY, this::handleMouseEvent);
+        FX.setPopupMenu(textFlow, this::createPopupMenu);
 
         pickResult = new Label();
 
@@ -95,9 +108,9 @@ public TextFlowPage() {
             }
         });
 
-        showChars = new BooleanOption("showChars", "show characters", () -> updateShowCharacters());
+        showChars = new BooleanOption("showChars", "show characters", (v) -> updateShowCharacters(v));
 
-        showCaretPaths = new BooleanOption("showCaretPaths", "show caret paths", () -> updateShowCaretPaths());
+        showCaretPaths = new BooleanOption("showCaretPaths", "show caret paths", (v) -> updateShowCaretPaths(v));
 
         OptionPane op = new OptionPane();
         op.section("TextFlow");
@@ -226,19 +239,25 @@ private String getText() {
         return sb.toString();
     }
 
-    private void updateShowCaretPaths() {
-        if (showCaretPaths.getValue()) {
+    private void updateShowCaretPaths(boolean on) {
+        if (on) {
             ShowCaretPaths.createFor(textFlow);
         } else {
             ShowCaretPaths.remove(textFlow);
         }
     }
 
-    private void updateShowCharacters() {
-        if (showChars.getValue()) {
+    private void updateShowCharacters(boolean on) {
+        if (on) {
             ShowCharacterRuns.createFor(textFlow);
         } else {
             ShowCharacterRuns.remove(textFlow);
         }
     }
+
+    private ContextMenu createPopupMenu(PickResult pick) {
+        ContextMenu m = new ContextMenu();
+        FX.item(m, "Accessibility Attributes", () -> AccessibilityPropertyViewer.open(pick));
+        return m;
+    }
 }
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/TextPage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/TextPage.java
index 0e2ba8341ca..5d92c7ff8b1 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/TextPage.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/TextPage.java
@@ -27,10 +27,12 @@
 import javafx.geometry.Point2D;
 import javafx.geometry.VPos;
 import javafx.scene.Group;
+import javafx.scene.control.ContextMenu;
 import javafx.scene.control.Label;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.control.ScrollPane.ScrollBarPolicy;
 import javafx.scene.input.MouseEvent;
+import javafx.scene.input.PickResult;
 import javafx.scene.layout.Border;
 import javafx.scene.text.FontSmoothingType;
 import javafx.scene.text.HitInfo;
@@ -44,6 +46,8 @@
 import com.oracle.tools.fx.monkey.options.PaintOption;
 import com.oracle.tools.fx.monkey.sheets.Options;
 import com.oracle.tools.fx.monkey.sheets.ShapePropertySheet;
+import com.oracle.tools.fx.monkey.tools.AccessibilityPropertyViewer;
+import com.oracle.tools.fx.monkey.util.FX;
 import com.oracle.tools.fx.monkey.util.OptionPane;
 import com.oracle.tools.fx.monkey.util.ShowCharacterRuns;
 import com.oracle.tools.fx.monkey.util.TestPaneBase;
@@ -63,12 +67,13 @@ public TextPage() {
 
         text = new Text();
         text.addEventHandler(MouseEvent.ANY, this::handleMouseEvent);
+        FX.setPopupMenu(text, this::createPopupMenu);
 
         hitInfo = new Label();
 
-        showChars = new BooleanOption("showChars", "show characters", () -> updateShowCharacters());
+        showChars = new BooleanOption("showChars", "show characters", (v) -> updateShowCharacters(v));
 
-        wrap = new BooleanOption("wrap", "wrap width", () -> updateWrap());
+        wrap = new BooleanOption("wrap", "wrap width", (v) -> updateWrap(v));
 
         OptionPane op = new OptionPane();
         op.section("Text");
@@ -105,20 +110,20 @@ public TextPage() {
         setContent(scroll);
         setOptions(op);
 
-        updateWrap();
-        updateShowCharacters();
+        updateWrap(false);
+        updateShowCharacters(false);
     }
 
-    private void updateShowCharacters() {
-        if (showChars.getValue()) {
+    private void updateShowCharacters(boolean on) {
+        if (on) {
             ShowCharacterRuns.createFor(text);
         } else {
             ShowCharacterRuns.remove(text);
         }
     }
 
-    private void updateWrap() {
-        if (wrap.getValue()) {
+    private void updateWrap(boolean on) {
+        if (on) {
             text.wrappingWidthProperty().bind(scroll.viewportBoundsProperty().map((b) -> b.getWidth()));
         } else {
             text.wrappingWidthProperty().unbind();
@@ -131,4 +136,10 @@ private void handleMouseEvent(MouseEvent ev) {
         HitInfo h = text.hitTest(p);
         hitInfo.setText(String.valueOf(h));
     }
+
+    private ContextMenu createPopupMenu(PickResult pick) {
+        ContextMenu m = new ContextMenu();
+        FX.item(m, "Accessibility Attributes", () -> AccessibilityPropertyViewer.open(pick));
+        return m;
+    }
 }
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/TitledPanePage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/TitledPanePage.java
index 06b7e049175..9a34f7f1507 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/TitledPanePage.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/TitledPanePage.java
@@ -25,13 +25,19 @@
 package com.oracle.tools.fx.monkey.pages;
 
 import javafx.beans.property.ObjectProperty;
+import javafx.geometry.Pos;
+import javafx.scene.AccessibleAttribute;
 import javafx.scene.Node;
+import javafx.scene.control.ComboBox;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
 import javafx.scene.control.TitledPane;
 import javafx.scene.control.skin.TitledPaneSkin;
 import javafx.scene.layout.AnchorPane;
+import javafx.scene.layout.Background;
 import javafx.scene.layout.VBox;
+import javafx.scene.paint.Color;
+import com.oracle.tools.fx.monkey.Loggers;
 import com.oracle.tools.fx.monkey.options.BooleanOption;
 import com.oracle.tools.fx.monkey.options.ObjectOption;
 import com.oracle.tools.fx.monkey.sheets.LabeledPropertySheet;
@@ -48,7 +54,14 @@ public class TitledPanePage extends TestPaneBase implements HasSkinnable {
     public TitledPanePage() {
         super("TitledPane");
 
-        control = new TitledPane();
+        control = new TitledPane() {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute a, Object... ps) {
+                Object v = super.queryAccessibleAttribute(a, ps);
+                Loggers.accessibility.log(a, v);
+                return v;
+            }
+        };
 
         OptionPane op = new OptionPane();
         op.section("TitledPane");
@@ -72,10 +85,29 @@ private Node makeAnchorPane() {
         return p;
     }
 
+    private Node makeLabel() {
+        Label t = new Label("Label");
+        t.setAlignment(Pos.CENTER);
+        t.setMaxHeight(Double.MAX_VALUE);
+        t.setMaxWidth(Double.MAX_VALUE);
+        t.setBackground(Background.fill(Color.LIGHTGOLDENRODYELLOW));
+        return t;
+    }
+
+    private Node makeComboBox() {
+        ComboBox<Object> t = new ComboBox<>();
+        t.setEditable(true);
+        t.getItems().addAll(
+            "is a very long string to make the combo box extra wide"
+        );
+        return t;
+    }
+
     private Node createContentOptions(String name, ObjectProperty<Node> p) {
         ObjectOption<Node> s = new ObjectOption<>(name, p);
-        s.addChoiceSupplier("Label", () -> new Label("Label"));
         s.addChoiceSupplier("AnchorPane", () -> makeAnchorPane());
+        s.addChoiceSupplier("ComboBox", () -> makeComboBox());
+        s.addChoiceSupplier("Label", () -> makeLabel());
         s.addChoiceSupplier("<null>", () -> null);
         s.selectFirst();
         return s;
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/ToggleButtonPage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/ToggleButtonPage.java
new file mode 100644
index 00000000000..8878600f254
--- /dev/null
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/ToggleButtonPage.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+package com.oracle.tools.fx.monkey.pages;
+
+import javafx.geometry.Insets;
+import javafx.scene.AccessibleAttribute;
+import javafx.scene.control.ToggleButton;
+import javafx.scene.control.ToggleGroup;
+import javafx.scene.control.skin.ToggleButtonSkin;
+import javafx.scene.layout.HBox;
+import com.oracle.tools.fx.monkey.Loggers;
+import com.oracle.tools.fx.monkey.sheets.ButtonsPropertySheet;
+import com.oracle.tools.fx.monkey.util.HasSkinnable;
+import com.oracle.tools.fx.monkey.util.OptionPane;
+import com.oracle.tools.fx.monkey.util.TestPaneBase;
+
+/**
+ * ToggleButton Page.
+ */
+public class ToggleButtonPage extends TestPaneBase implements HasSkinnable {
+    private final ToggleButton control;
+
+    public ToggleButtonPage() {
+        super("ToggleButtonPage");
+
+        control = new ToggleButton("Toggle Button") {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute a, Object... ps) {
+                Object v = super.queryAccessibleAttribute(a, ps);
+                Loggers.accessibility.log(a, v);
+                return v;
+            }
+        };
+
+        ToggleButton b2 = new ToggleButton("B2");
+        ToggleButton b3 = new ToggleButton("B3");
+
+        ToggleGroup group = new ToggleGroup();
+        group.getToggles().addAll(b2, b3);
+
+        OptionPane op = new OptionPane();
+        ButtonsPropertySheet.appendTo(op, control, group);
+
+        HBox p = new HBox(4, control, b2, b3);
+        p.setPadding(new Insets(4));
+        setContent(p);
+        setOptions(op);
+    }
+
+    @Override
+    public void nullSkin() {
+        control.setSkin(null);
+    }
+
+    @Override
+    public void newSkin() {
+        control.setSkin(new ToggleButtonSkin(control));
+    }
+}
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/ToolBarPage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/ToolBarPage.java
index a4c627f812e..c6fb04b47de 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/ToolBarPage.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/ToolBarPage.java
@@ -28,18 +28,23 @@
 import javafx.beans.property.Property;
 import javafx.collections.ObservableList;
 import javafx.geometry.Orientation;
+import javafx.scene.AccessibleAttribute;
 import javafx.scene.Node;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonBase;
+import javafx.scene.control.CheckBox;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.Label;
+import javafx.scene.control.ListView;
 import javafx.scene.control.SplitMenuButton;
 import javafx.scene.control.TextField;
 import javafx.scene.control.TextInputControl;
 import javafx.scene.control.ToolBar;
 import javafx.scene.layout.Region;
+import com.oracle.tools.fx.monkey.Loggers;
 import com.oracle.tools.fx.monkey.options.EnumOption;
 import com.oracle.tools.fx.monkey.sheets.ControlPropertySheet;
+import com.oracle.tools.fx.monkey.sheets.PropertiesMenu;
 import com.oracle.tools.fx.monkey.util.EnterTextDialog;
 import com.oracle.tools.fx.monkey.util.FX;
 import com.oracle.tools.fx.monkey.util.ObjectSelector;
@@ -57,12 +62,21 @@ public class ToolBarPage extends TestPaneBase {
     public ToolBarPage() {
         super("ToolBarPage");
 
-        control = new ToolBar();
+        control = new ToolBar() {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute a, Object... ps) {
+                Object v = super.queryAccessibleAttribute(a, ps);
+                Loggers.accessibility.log(a, v);
+                return v;
+            }
+        };
 
         SplitMenuButton addButton = new SplitMenuButton(
             FX.menuItem("Button", () -> add(button())),
+            FX.menuItem("CheckBox", () -> add(checkBox("CheckBox"))),
             FX.menuItem("Label", () -> add(label("Label"))),
-            FX.menuItem("TextField", () -> add(textField(20)))
+            FX.menuItem("TextField", () -> add(textField(20))),
+            FX.menuItem("ListView", () -> add(listView()))
         );
         addButton.setText("Add");
 
@@ -101,10 +115,11 @@ private Node createItemsOptions(String name, ObservableList<Node> items) {
         s.addChoiceSupplier("Mixed", () -> {
             return List.of(
                 button(),
-                label("Find:"),
+                label("Label"),
                 textField(20),
                 button(),
                 button(),
+                checkBox("checkbox"),
                 button(),
                 button(),
                 button(),
@@ -129,6 +144,12 @@ private Node label(String text) {
         return n;
     }
 
+    private Node checkBox(String text) {
+        CheckBox n = new CheckBox(text);
+        setContextMenu(n);
+        return n;
+    }
+
     private Node textField(int cols) {
         TextField n = new TextField();
         setContextMenu(n);
@@ -136,6 +157,16 @@ private Node textField(int cols) {
         return n;
     }
 
+    private Node listView() {
+        ListView<String> listView = new ListView<>();
+        for (int i = 0; i < 10; i++) {
+            listView.getItems().add("Item " + i);
+        }
+        listView.setPrefHeight(100);
+        setContextMenu(listView);
+        return listView;
+    }
+
     private Property<String> getTextProperty(Node n) {
         if(n instanceof Label label) {
             return label.textProperty();
@@ -150,25 +181,15 @@ private Property<String> getTextProperty(Node n) {
     private void setContextMenu(Region n) {
         n.setOnContextMenuRequested((ev) -> {
             ContextMenu m = new ContextMenu();
-            FX.item(m, "Remove", () -> {
-                control.getItems().remove(n);
-            });
-
+            FX.item(m, "Remove", () -> control.getItems().remove(n));
             FX.separator(m);
-
             FX.item(m, "Edit Text", EnterTextDialog.getRunnable(n, getTextProperty(n)));
-
             FX.separator(m);
-
-            FX.item(m, "Pref(50)", () -> {
-                n.setPrefWidth(50);
-            });
-            FX.item(m, "Pref(200)", () -> {
-                n.setPrefWidth(200);
-            });
-            FX.item(m, "Pref(500)", () -> {
-                n.setPrefWidth(500);
-            });
+            FX.item(m, "Pref(50)", () -> n.setPrefWidth(50));
+            FX.item(m, "Pref(200)", () -> n.setPrefWidth(200));
+            FX.item(m, "Pref(500)", () -> n.setPrefWidth(500));
+            FX.separator(m);
+            FX.item(m, "Properties...", () -> PropertiesMenu.openPropertiesDialog(this, n));
             m.show(n, ev.getScreenX(), ev.getScreenY());
         });
     }
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/TooltipPage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/TooltipPage.java
index d148a2bb5b9..9098a5be861 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/TooltipPage.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/TooltipPage.java
@@ -24,6 +24,7 @@
  */
 package com.oracle.tools.fx.monkey.pages;
 
+import javafx.beans.property.ObjectProperty;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.control.ContentDisplay;
@@ -48,36 +49,34 @@
  * Tooltip Page.
  */
 public class TooltipPage extends TestPaneBase {
-    private final Tooltip control; // TODO not a control, but a PopupWindow
+    private final Tooltip tooltip;
 
     public TooltipPage() {
         super("TooltipPage");
 
-        control = new Tooltip("This is a tooltip with some default text, to be settable later.");
+        tooltip = new Tooltip("This is a tooltip with some default text, to be settable later.");
+        tooltip.showDelayProperty().addListener((s, p, c) -> {
+            System.out.println("showDelay=" + c);
+        });
 
-        ObjectOption<Node> graphic = new ObjectOption<>("graphic", control.graphicProperty());
-        graphic.addChoice("<null>", null);
-        graphic.addChoice("Image", ImageTools.createImageView(Color.RED, 256, 256));
-        graphic.addChoiceSupplier("Interactive Content", this::createInteractiveContent);
-
-        Label content = new Label("Hover to show the tooltip");
+        Label content = new Label("Hover over this area to show the tooltip");
         content.setMaxSize(Double.MAX_VALUE, Double.MAX_VALUE);
-        Tooltip.install(content, control);
+        Tooltip.install(content, tooltip);
         content.setAlignment(Pos.CENTER);
 
         OptionPane op = new OptionPane();
         op.section("Tooltip");
-        op.option("Content Display:", new EnumOption<>("contentDisplay", ContentDisplay.class, control.contentDisplayProperty()));
+        op.option("Content Display:", new EnumOption<>("contentDisplay", ContentDisplay.class, tooltip.contentDisplayProperty()));
         op.option("Font: TODO", null); // TODO font
-        op.option("Graphic:", graphic);
-        op.option("Graphic Text Gap:", new DoubleSpinner("graphicTextGap", 0, 100, 0.1, control.graphicTextGapProperty()));
-        op.option("Hide Delay:", new DurationOption("hideDelay", control.hideDelayProperty()));
-        op.option("Show Delay:", new DurationOption("showDelay", control.showDelayProperty()));
-        op.option("Show Duration:", new DurationOption("showDuration", control.showDurationProperty()));
-        op.option("Text:", Options.textOption("text", true, true, control.textProperty()));
-        op.option("Text Alignment:", new EnumOption<>("textAlignment", TextAlignment.class, control.textAlignmentProperty()));
-        op.option("Text Overrun:", new EnumOption<>("textOverrun", OverrunStyle.class, control.textOverrunProperty()));
-        op.option(new BooleanOption("wrapText", "wrap text", control.wrapTextProperty()));
+        op.option("Graphic:", createGraphicOptions("graphic", tooltip.graphicProperty()));
+        op.option("Graphic Text Gap:", new DoubleSpinner("graphicTextGap", 0, 100, 0.1, tooltip.graphicTextGapProperty()));
+        op.option("Hide Delay:", new DurationOption("hideDelay", tooltip.hideDelayProperty()));
+        op.option("Show Delay:", new DurationOption("showDelay", tooltip.showDelayProperty()));
+        op.option("Show Duration:", new DurationOption("showDuration", tooltip.showDurationProperty()));
+        op.option("Text:", Options.textOption("text", true, true, tooltip.textProperty()));
+        op.option("Text Alignment:", new EnumOption<>("textAlignment", TextAlignment.class, tooltip.textAlignmentProperty()));
+        op.option("Text Overrun:", new EnumOption<>("textOverrun", OverrunStyle.class, tooltip.textOverrunProperty()));
+        op.option(new BooleanOption("wrapText", "wrap text", tooltip.wrapTextProperty()));
 
         // TODO popup window
 
@@ -85,10 +84,18 @@ public TooltipPage() {
         setOptions(op);
     }
 
+    private Node createGraphicOptions(String string, ObjectProperty<Node> graphicProperty) {
+        ObjectOption<Node> op = new ObjectOption<>("graphic", tooltip.graphicProperty());
+        op.addChoice("<null>", null);
+        op.addChoice("Image", ImageTools.createImageView(256, 256));
+        op.addChoiceSupplier("Interactive Content", this::createInteractiveContent);
+        return op;
+    }
+
     // TODO tooltip cannot be interactive: the default behavior is to move it away from underneath the mouse pointer!
     private Node createInteractiveContent() {
-        boolean autoHide = control.isAutoHide();
-        control.setAutoHide(false);
+        boolean autoHide = tooltip.isAutoHide();
+        tooltip.setAutoHide(false);
 
         TextField f = new TextField();
         return f;
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/TreeTableViewPage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/TreeTableViewPage.java
index 324d08c1739..d02b6f7b93e 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/TreeTableViewPage.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/TreeTableViewPage.java
@@ -30,11 +30,12 @@
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
+import javafx.scene.AccessibleAttribute;
 import javafx.scene.Node;
 import javafx.scene.control.Button;
 import javafx.scene.control.ConstrainedColumnResizeBase;
+import javafx.scene.control.ContextMenu;
 import javafx.scene.control.SelectionMode;
-import javafx.scene.control.SplitMenuButton;
 import javafx.scene.control.TableColumnBase;
 import javafx.scene.control.TreeItem;
 import javafx.scene.control.TreeSortMode;
@@ -47,11 +48,13 @@
 import javafx.scene.layout.Background;
 import javafx.scene.paint.Color;
 import javafx.util.Callback;
+import com.oracle.tools.fx.monkey.Loggers;
 import com.oracle.tools.fx.monkey.options.BooleanOption;
 import com.oracle.tools.fx.monkey.options.EnumOption;
 import com.oracle.tools.fx.monkey.options.ObjectOption;
 import com.oracle.tools.fx.monkey.sheets.ControlPropertySheet;
 import com.oracle.tools.fx.monkey.sheets.Options;
+import com.oracle.tools.fx.monkey.sheets.TableColumnPropertySheet;
 import com.oracle.tools.fx.monkey.util.ColumnBuilder;
 import com.oracle.tools.fx.monkey.util.DataRow;
 import com.oracle.tools.fx.monkey.util.FX;
@@ -71,7 +74,14 @@ public class TreeTableViewPage extends TestPaneBase implements HasSkinnable {
     public TreeTableViewPage() {
         super("TreeTableViewPage");
 
-        control = new TreeTableView<>();
+        control = new TreeTableView<>() {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute a, Object... ps) {
+                Object v = super.queryAccessibleAttribute(a, ps);
+                Loggers.accessibility.log(a, v);
+                return v;
+            }
+        };
 
         Button addDataItemButton = FX.button("Add Data Item", this::addDataItem);
         addDataItemButton.setDisable(true); // FIX
@@ -81,21 +91,6 @@ public TreeTableViewPage() {
             control.setShowRoot(false);
         });
 
-        SplitMenuButton addColumnButton = new SplitMenuButton(
-            FX.menuItem("at the beginning", () -> addColumn(0)),
-            FX.menuItem("in the middle", () -> addColumn(1)),
-            FX.menuItem("at the end", () -> addColumn(2))
-        );
-        addColumnButton.setText("Add Column");
-
-        SplitMenuButton removeColumnButton = new SplitMenuButton(
-            FX.menuItem("at the beginning", () -> removeColumn(0)),
-            FX.menuItem("in the middle", () -> removeColumn(1)),
-            FX.menuItem("at the end", () -> removeColumn(2)),
-            FX.menuItem("all", () -> removeAllColumns())
-        );
-        removeColumnButton.setText("Remove Column");
-
         Button refresh = FX.button("Refresh", () -> {
             control.refresh();
         });
@@ -103,7 +98,6 @@ public TreeTableViewPage() {
         OptionPane op = new OptionPane();
         op.section("TreeTableView");
         op.option("Columns:", createColumnsSelector("columns", control.getColumns()));
-        op.option(Utils.buttons(addColumnButton, removeColumnButton));
         op.option("Column Resize Policy:", createColumnResizePolicy("columnResizePolicy", control.columnResizePolicyProperty()));
         op.option(new BooleanOption("editable", "editable", control.editableProperty()));
         op.option("Fixed Cell Size:", Options.fixedSizeOption("fixedCellSize", control.fixedCellSizeProperty()));
@@ -117,145 +111,58 @@ public TreeTableViewPage() {
         op.option("Sort Mode:", new EnumOption("sortMode", TreeSortMode.class, control.sortModeProperty()));
         op.option("Sort Policy: TODO", null); // TODO
         op.option(new BooleanOption("tableMenuButtonVisible", "table menu button visible", control.tableMenuButtonVisibleProperty()));
-        op.option("Tree Column: TODO", null); // TODO
-        ControlPropertySheet.appendTo(op, control);
-
-        // TODO op.option("Cell Factory:", cellFactorySelector);
-        //op.option(addGraphics);
-        //op.option(addSubNodes);
-
         op.separator();
         op.option(refresh);
+        ControlPropertySheet.appendTo(op, control);
 
         setContent(control);
         setOptions(op);
     }
 
-    private void addColumn(int where) {
-        TreeTableColumn<DataRow, Object> c = newColumn();
-        c.setText("C" + System.currentTimeMillis());
+    private ContextMenu createPopupMenu(TreeTableColumn<?,?> tc) {
+        ContextMenu m = new ContextMenu();
+        FX.item(m, "Add Column Before", () -> addColumn(tc, false));
+        FX.item(m, "Add Column After", () -> addColumn(tc, true));
+        FX.separator(m);
+        FX.item(m, "Remove Column", () -> control.getColumns().remove(tc));
+        FX.item(m, "Remove All Columns", () -> control.getColumns().clear());
+        FX.separator(m);
+        FX.item(m, "Properties...", () -> TableColumnPropertySheet.open(this, tc));
+        return m;
+    }
 
-        int ct = control.getColumns().size();
-        int ix;
-        switch (where) {
-        case 0:
-            ix = 0;
-            break;
-        case 1:
-            ix = ct / 2;
-            break;
-        case 2:
-        default:
-            ix = ct;
-            break;
-        }
-        if ((ct == 0) || (ix >= ct)) {
-            control.getColumns().add(c);
-        } else {
-            control.getColumns().add(ix, c);
-        }
+    private TreeTableColumn<DataRow, Object> newColumn() {
+        TreeTableColumn<DataRow, Object> tc = new TreeTableColumn();
+        tc.setCellFactory(TextFieldTreeTableCell.<DataRow, Object>forTreeTableColumn(DataRow.converter()));
+        tc.setCellValueFactory((cdf) -> {
+            Object v = cdf.getValue().getValue();
+            if (v instanceof DataRow r) {
+                return r.getValue(tc);
+            }
+            return new SimpleObjectProperty(v);
+        });
+        tc.setContextMenu(createPopupMenu(tc));
+        return tc;
     }
 
-    private void removeColumn(int where) {
-        int ct = control.getColumns().size();
-        int ix;
-        switch (where) {
-        case 0:
-            ix = 0;
-            break;
-        case 1:
-            ix = ct / 2;
-            break;
-        case 2:
-        default:
-            ix = ct - 1;
-            break;
+    private void addColumn(TreeTableColumn<?, ?> ref, boolean after) {
+        int ix = control.getColumns().indexOf(ref);
+        if (ix < 0) {
+            return;
         }
-
-        if ((ct >= 0) && (ix < ct)) {
-            control.getColumns().remove(ix);
+        if (after) {
+            ix++;
         }
+
+        TreeTableColumn<DataRow, Object> c = newColumn();
+        c.setText("C" + System.currentTimeMillis());
+        control.getColumns().add(ix, c);
     }
 
     private void removeAllColumns() {
         control.getColumns().clear();
     }
 
-//    protected Pane createPane(Data demo, ResizePolicy policy, Object[] spec) {
-//        TreeTableColumn<String, String> lastColumn = null;
-//        int id = 1;
-//
-//        for (int i = 0; i < spec.length;) {
-//            Object x = spec[i++];
-//            if (x instanceof Cmd cmd) {
-//                switch (cmd) {
-//                case COL_WITH_GRAPHIC:
-//                    lastColumn = makeColumn((c) -> {
-//                        c.setCellValueFactory((f) -> new SimpleStringProperty(describe(c)));
-//                        c.setCellFactory((r) -> {
-//                            return new TreeTableCell<>() {
-//                                @Override
-//                                protected void updateItem(String item, boolean empty) {
-//                                    super.updateItem(item, empty);
-//                                    if (empty) {
-//                                        setGraphic(null);
-//                                    } else {
-//                                        Text t = new Text("11111111111111111111111111111111111111111111111111111111111111111111111111111111111111\n2\n3\n");
-//                                        t.wrappingWidthProperty().bind(widthProperty());
-//                                        setGraphic(t);
-//                                    }
-//                                    setPrefHeight(USE_COMPUTED_SIZE);
-//                                }
-//                            };
-//                        });
-//                    });
-//                case ROWS:
-//                    {
-//                        int n = (int)(spec[i++]);
-//                        TreeItem subNodeTreeItem = null;
-//                        for (int j = 0; j < n; j++) {
-//                            TreeItem treeItem = new TreeItem(newItem());
-//                            if (addSubNodes.isSelected()) {
-//                                subNodeTreeItem = new TreeItem(newItem());
-//                                treeItem.getChildren().add(subNodeTreeItem);
-//                            }
-//                            if (addGraphics.isSelected()) {
-//                                treeItem.setGraphic(new Rectangle(10, 10, Color.RED));
-//                                if (subNodeTreeItem != null) {
-//                                    subNodeTreeItem.setGraphic(new Rectangle(10, 10));
-//                                }
-//                            }
-//                            control.getRoot().getChildren().add(treeItem);
-//                        }
-//                    }
-
-//    protected TreeTableColumn<String, String> makeColumn(Consumer<TreeTableColumn<String, String>> updater) {
-//        TreeTableColumn<String, String> c = new TreeTableColumn<>();
-//        control.getColumns().add(c);
-//        c.setText("C" + control.getColumns().size());
-//        updater.accept(c);
-//
-//        if (defaultCellFactory == null) {
-//            defaultCellFactory = c.getCellFactory();
-//        }
-//
-//        Cells t = cellFactorySelector.getSelectionModel().getSelectedItem();
-//        Callback<TreeTableColumn<String, String>, TreeTableCell<String, String>> f = getCellFactory(t);
-//        c.setCellFactory(f);
-//
-//        c.setOnEditCommit((ev) -> {
-//            if ("update".equals(ev.getNewValue())) {
-//                var item = ev.getRowValue();
-//                item.setValue("UPDATED!");
-//                System.out.println("committing the value `UPDATED!`");
-//            } else {
-//                System.out.println("discarding the new value: " + ev.getNewValue());
-//            }
-//        });
-//
-//        return c;
-//    }
-
     protected String newItem() {
         return SequenceNumber.next();
     }
@@ -293,19 +200,6 @@ public Boolean call(ResizeFeatures rf) {
         }
     }
 
-    private TreeTableColumn<DataRow, Object> newColumn() {
-        TreeTableColumn<DataRow, Object> tc = new TreeTableColumn();
-        tc.setCellFactory(TextFieldTreeTableCell.<DataRow, Object>forTreeTableColumn(DataRow.converter()));
-        tc.setCellValueFactory((cdf) -> {
-            Object v = cdf.getValue().getValue();
-            if (v instanceof DataRow r) {
-                return r.getValue(tc);
-            }
-            return new SimpleObjectProperty(v);
-        });
-        return tc;
-    }
-
     private ColumnBuilder<TreeTableColumn<DataRow, ?>> columnBuilder() {
         return new ColumnBuilder<>(this::newColumn);
     }
@@ -325,14 +219,14 @@ private Node createColumnsSelector(String name, ObservableList<TreeTableColumn<D
         );
         s.addChoiceSupplier("20 Equal", () -> {
             var cs = columnBuilder();
-            for(int i=1; i<20; i++) {
+            for (int i = 1; i < 20; i++) {
                 cs.col("C" + i);
             }
             return cs.asList();
         });
         s.addChoiceSupplier("20 Equal, Pref=30", () -> {
             var cs = columnBuilder();
-            for(int i=1; i<20; i++) {
+            for (int i = 1; i < 20; i++) {
                 cs.col("C" + i).pref(30);
             }
             return cs.asList();
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/TreeViewPage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/TreeViewPage.java
index 260f09b7419..8f4a04c9cf8 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/TreeViewPage.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/TreeViewPage.java
@@ -26,6 +26,7 @@
 
 import java.util.function.Supplier;
 import javafx.beans.property.ObjectProperty;
+import javafx.scene.AccessibleAttribute;
 import javafx.scene.Node;
 import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
@@ -38,6 +39,7 @@
 import javafx.scene.control.cell.TextFieldTreeCell;
 import javafx.scene.control.skin.TreeViewSkin;
 import javafx.util.Callback;
+import com.oracle.tools.fx.monkey.Loggers;
 import com.oracle.tools.fx.monkey.options.BooleanOption;
 import com.oracle.tools.fx.monkey.options.ObjectOption;
 import com.oracle.tools.fx.monkey.sheets.ControlPropertySheet;
@@ -59,7 +61,14 @@ public class TreeViewPage extends TestPaneBase implements HasSkinnable {
     public TreeViewPage() {
         super("TreeViewPage");
 
-        control = new TreeView<>(new CheckBoxTreeItem<>("root"));
+        control = new TreeView<>(new CheckBoxTreeItem<>("root")) {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute a, Object... ps) {
+                Object v = super.queryAccessibleAttribute(a, ps);
+                Loggers.accessibility.log(a, v);
+                return v;
+            }
+        };
         control.getRoot().setExpanded(true);
         addChild(true, true);
 
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/VBoxPage.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/VBoxPage.java
index 3cb16da094e..f7877e8badb 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/VBoxPage.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/VBoxPage.java
@@ -27,6 +27,7 @@
 import java.util.List;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
+import javafx.scene.AccessibleAttribute;
 import javafx.scene.Node;
 import javafx.scene.control.Button;
 import javafx.scene.control.ContextMenu;
@@ -36,6 +37,7 @@
 import javafx.scene.layout.Region;
 import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
+import com.oracle.tools.fx.monkey.Loggers;
 import com.oracle.tools.fx.monkey.options.BooleanOption;
 import com.oracle.tools.fx.monkey.options.EnumOption;
 import com.oracle.tools.fx.monkey.options.PaneContentOptions;
@@ -56,7 +58,14 @@ public class VBoxPage extends TestPaneBase {
     public VBoxPage() {
         super("VBoxPage");
 
-        box = new VBox();
+        box = new VBox() {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute a, Object... ps) {
+                Object v = super.queryAccessibleAttribute(a, ps);
+                Loggers.accessibility.log(a, v);
+                return v;
+            }
+        };
 
         // TODO menu button
         Button addButton = FX.button("Add Item", () -> {
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/XYChartPageBase.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/XYChartPageBase.java
index 239fecb6c94..cdb39be6675 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/XYChartPageBase.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/pages/XYChartPageBase.java
@@ -41,7 +41,7 @@ public abstract class XYChartPageBase extends TestPaneBase {
 
     public abstract XYChart<?, Number> chart();
 
-    protected static final Random rnd = new Random();
+    protected static final Random random = new Random();
     private int seq;
 
     public XYChartPageBase(String name) {
@@ -60,12 +60,16 @@ protected NumberAxis createNumberAxis(String text) {
         return a;
     }
 
+    protected double randomValue() {
+        return random.nextInt(50) - 25;
+    }
+
     protected Series<Number, Number> createNumberSeries() {
         String name = "S" + (seq++);
         XYChart.Series s = new XYChart.Series();
         s.setName(name);
         for (int i = 0; i < 12; i++) {
-            int v = rnd.nextInt(50);
+            double v = randomValue();
             s.getData().add(new XYChart.Data(i, v));
         }
         return s;
@@ -76,7 +80,7 @@ protected Series<String, Number> createBarSeries() {
         XYChart.Series s = new XYChart.Series();
         s.setName(name);
         for (int i = 0; i < 12; i++) {
-            int v = rnd.nextInt(50);
+            double v = randomValue();
             s.getData().add(new XYChart.Data("c" + i, v));
         }
         return s;
@@ -116,17 +120,17 @@ public final void addPoint() {
         }
         XYChart.Series s = list.get(0);
         int sz = s.getData().size();
-        boolean atIndexZero = rnd.nextBoolean();
+        boolean atIndexZero = random.nextBoolean();
 
         if (chart() instanceof BarChart b) {
-            int v = rnd.nextInt(50);
+            double v = randomValue();
             add(s.getData(), atIndexZero, new XYChart.Data("c" + sz, v));
         } else if (chart() instanceof StackedBarChart b) {
-            int v = rnd.nextInt(50);
+            double v = randomValue();
             add(s.getData(), atIndexZero, new XYChart.Data("c" + sz, v));
         } else {
-            int i = rnd.nextInt(100);
-            int v = rnd.nextInt(50);
+            int i = random.nextInt(100);
+            double v = randomValue();
             add(s.getData(), atIndexZero, new XYChart.Data(i, v));
         }
     }
@@ -137,7 +141,7 @@ public final void removePoint() {
             XYChart.Series s = data.get(0);
             int sz = s.getData().size();
             if (sz > 0) {
-                int ix = rnd.nextBoolean() ? 0 : sz - 1;
+                int ix = random.nextBoolean() ? 0 : sz - 1;
                 s.getData().remove(ix);
             }
         }
@@ -163,13 +167,13 @@ public final void changePointX() {
         }
 
         if (chart() instanceof BarChart b) {
-            int v = rnd.nextInt(50);
+            double v = randomValue();
             ((XYChart.Data)s.getData().get(1)).setXValue("c" + v);
         } else if (chart() instanceof StackedBarChart b) {
-            int v = rnd.nextInt(50);
+            double v = randomValue();
             ((XYChart.Data)s.getData().get(1)).setXValue("c" + v);
         } else {
-            int v = rnd.nextInt(50);
+            double v = randomValue();
             ((XYChart.Data)s.getData().get(1)).setXValue(v);
         }
     }
@@ -186,13 +190,13 @@ public final void changePointY() {
         }
 
         if (chart() instanceof BarChart b) {
-            int v = rnd.nextInt(50);
+            double v = randomValue();
             ((XYChart.Data)s.getData().get(1)).setYValue(v);
         } else if (chart() instanceof StackedBarChart b) {
-            int v = rnd.nextInt(50);
+            double v = randomValue();
             ((XYChart.Data)s.getData().get(1)).setYValue(v);
         } else {
-            int v = rnd.nextInt(50);
+            double v = randomValue();
             ((XYChart.Data)s.getData().get(1)).setYValue(v);
         }
     }
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/ButtonsPropertySheet.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/ButtonsPropertySheet.java
new file mode 100644
index 00000000000..4c7fdb8619d
--- /dev/null
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/ButtonsPropertySheet.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+package com.oracle.tools.fx.monkey.sheets;
+
+import javafx.scene.control.Button;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.Hyperlink;
+import javafx.scene.control.RadioButton;
+import javafx.scene.control.ToggleButton;
+import javafx.scene.control.ToggleGroup;
+import com.oracle.tools.fx.monkey.options.BooleanOption;
+import com.oracle.tools.fx.monkey.util.OptionPane;
+
+/**
+ * Button(s) property sheet.
+ */
+public class ButtonsPropertySheet {
+    public static void appendTo(OptionPane op, Button n) {
+        op.section("Button");
+        op.option(new BooleanOption("cancelButton", "cancel button", n.cancelButtonProperty()));
+        op.option(new BooleanOption("defaultButton", "default button", n.defaultButtonProperty()));
+
+        LabeledPropertySheet.appendTo(op, "Labeled", false, n);
+    }
+
+    public static void appendTo(OptionPane op, CheckBox n) {
+        op.section("CheckBox");
+        op.option(new BooleanOption("allowIndeterminate", "allow indeterminate", n.allowIndeterminateProperty()));
+        op.option(new BooleanOption("indeterminate", "indeterminate", n.indeterminateProperty()));
+        op.option(new BooleanOption("selected", "selected", n.selectedProperty()));
+
+        LabeledPropertySheet.appendTo(op, "Labeled", false, n);
+    }
+
+    public static void appendTo(OptionPane op, Hyperlink n) {
+        op.section("Hyperlink");
+        op.option(new BooleanOption("visited", "visited", n.visitedProperty()));
+
+        LabeledPropertySheet.appendTo(op, "Labeled", false, n);
+    }
+
+    public static void appendTo(OptionPane op, RadioButton n, ToggleGroup g) {
+        op.section("RadioButton");
+        op.option(new BooleanOption("selectedButton", "selected", n.selectedProperty()));
+        if (g != null)
+            op.option(new BooleanOption("toggleGroup", "part of a toggle group", (v) -> {
+                n.setToggleGroup(v ? g : null);
+            }));
+
+        LabeledPropertySheet.appendTo(op, "Labeled", false, n);
+    }
+
+    public static void appendTo(OptionPane op, ToggleButton n, ToggleGroup g) {
+        op.section("ToggleButton");
+        op.option(new BooleanOption("selectedButton", "selected", n.selectedProperty()));
+        if (g != null) {
+            op.option(new BooleanOption("toggleGroup", "part of a toggle group", (v) -> {
+                n.setToggleGroup(v ? g : null);
+            }));
+        }
+
+        LabeledPropertySheet.appendTo(op, "Labeled", false, n);
+    }
+}
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/ControlPropertySheet.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/ControlPropertySheet.java
index 750ca54572d..89c5d63f975 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/ControlPropertySheet.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/ControlPropertySheet.java
@@ -24,7 +24,18 @@
  */
 package com.oracle.tools.fx.monkey.sheets;
 
+import javafx.beans.property.ObjectProperty;
+import javafx.event.EventHandler;
+import javafx.scene.Node;
+import javafx.scene.control.ContextMenu;
 import javafx.scene.control.Control;
+import javafx.scene.control.Tooltip;
+import javafx.scene.input.ContextMenuEvent;
+import javafx.scene.input.PickResult;
+import com.oracle.tools.fx.monkey.options.ObjectOption;
+import com.oracle.tools.fx.monkey.tools.AccessibilityPropertyViewer;
+import com.oracle.tools.fx.monkey.util.FX;
+import com.oracle.tools.fx.monkey.util.ImageTools;
 import com.oracle.tools.fx.monkey.util.OptionPane;
 
 /**
@@ -33,12 +44,75 @@
 public class ControlPropertySheet {
     public static void appendTo(OptionPane op, Control control) {
         op.section("Control");
-        op.option("Context Menu: TODO", null);
-        // TODO context menu
-        op.option("Tooltip: TODO", null);
-        // TODO tooltip
-
+        op.option("Context Menu:", contextMenuOptions("contextMenu", control));
+        op.option("Tooltip:", tooltipOption("tooltip", control.tooltipProperty()));
         // region
         RegionPropertySheet.appendTo(op, control);
     }
+
+    public static Node tooltipOption(String name, ObjectProperty<Tooltip> p) {
+        ObjectOption<Tooltip> op = new ObjectOption<>(name, p);
+        op.addChoice("<null>", null);
+        op.addChoiceSupplier("simple text", () -> createSimpleTextTooltip());
+        op.addChoiceSupplier("with image", () -> createTooltipWithImage());
+        op.selectInitialValue();
+        return op;
+    }
+
+    private static Tooltip createSimpleTextTooltip() {
+        Tooltip t = new Tooltip("simple text tooltip");
+        return t;
+    }
+
+    private static Tooltip createTooltipWithImage() {
+        Tooltip t = new Tooltip("tooltip with image");
+        t.setGraphic(ImageTools.createImageView(128, 96));
+        return t;
+    }
+
+    public static ObjectOption<ContextMenu> contextMenuOptions(String name, Control c) {
+        Picker picker = new Picker();
+        ObjectProperty<ContextMenu> p = c.contextMenuProperty();
+        c.addEventFilter(ContextMenuEvent.CONTEXT_MENU_REQUESTED, picker);
+        ObjectOption<ContextMenu> op = new ObjectOption<>(name, p);
+        op.addChoiceSupplier("Standard Context Menu", () -> createStandardContextMenu(picker));
+        op.addChoice("<null>", null);
+        op.selectInitialValue();
+        return op;
+    }
+
+    private static ContextMenu createStandardContextMenu(Picker picker) {
+        return new ContextMenu() {
+            @Override
+            public void show(Node anchor, double screenX, double screenY) {
+                PickResult pick = picker.getPickResult();
+                getItems().clear();
+                populate(this, pick);
+                super.show(anchor, screenX, screenY);
+            }
+        };
+    }
+
+    private static void populate(ContextMenu m, PickResult pick) {
+        Node source = pick.getIntersectedNode();
+        TypeSpecificContextMenu.populate(m, source);
+        if (m.getItems().size() > 0) {
+            FX.separator(m);
+        }
+        FX.item(m, "Show Properties Monitor...", () -> PropertiesMonitor.open(source));
+        FX.item(m, "Accessibility Attributes...", () -> AccessibilityPropertyViewer.open(pick));
+    }
+
+    static class Picker implements EventHandler<ContextMenuEvent> {
+        private PickResult pick;
+
+        @Override
+        public void handle(ContextMenuEvent ev) {
+            pick = ev.getPickResult();
+        }
+
+        public PickResult getPickResult() {
+            return pick;
+        }
+    }
 }
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/NodePropertySheet.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/NodePropertySheet.java
index 6d384eb8d36..954bf8c665e 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/NodePropertySheet.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/NodePropertySheet.java
@@ -30,8 +30,10 @@
 import javafx.scene.Node;
 import javafx.scene.effect.BlendMode;
 import com.oracle.tools.fx.monkey.options.BooleanOption;
+import com.oracle.tools.fx.monkey.options.DoubleOption;
 import com.oracle.tools.fx.monkey.options.DoubleSpinner;
 import com.oracle.tools.fx.monkey.options.EnumOption;
+import com.oracle.tools.fx.monkey.options.StyleClassOption;
 import com.oracle.tools.fx.monkey.options.TextOption;
 import com.oracle.tools.fx.monkey.util.OptionPane;
 
@@ -56,25 +58,28 @@ public static void appendTo(OptionPane op, Node n) {
         op.option(new BooleanOption("focusTraversable", "focus traversable", n.focusTraversableProperty()));
         op.option("Id:", new TextOption("id", n.idProperty()));
         op.option("Input Method Requests: TODO", null); // TODO
-        op.option("Layout X: TODO", null); // TODO
-        op.option("Layout Y: TODO", null); // TODO
+        op.option("Layout X:", new DoubleOption("layoutX", n.layoutXProperty()));
+        op.option("Layout Y:", new DoubleOption("layoutY", n.layoutYProperty()));
         op.option(new BooleanOption("managed", "managed", n.managedProperty()));
         op.option(new BooleanOption("mouseTransparent", "mouse transparent", n.mouseTransparentProperty()));
         op.option("Node Orientation:", new EnumOption<>("nodeOrientation", NodeOrientation.class, n.nodeOrientationProperty()));
         //op.option("On Various Events: TODO", null); // TODO own section?
         op.option("Opacity:", new DoubleSpinner("opacity", -0.1, 1.1, 0.1, n.opacityProperty()));
         op.option(new BooleanOption("pickOnBounds", "pick on bounds", n.pickOnBoundsProperty()));
-        op.option("Rotate: TODO", null); // TODO
+        op.option("Rotate:", new DoubleOption("rotate", n.rotateProperty()));
         op.option("Rotation Axis: TODO", null); // TODO
-        op.option("Scale X: TODO", null); // TODO
-        op.option("Scale Y: TODO", null); // TODO
-        op.option("Scale Z: TODO", null); // TODO
+        op.option("Scale X:", new DoubleOption("scaleX", n.scaleXProperty()));
+        op.option("Scale Y:", new DoubleOption("scaleY", n.scaleYProperty()));
+        op.option("Scale Z:", new DoubleOption("scaleZ", n.scaleZProperty()));
         op.option("Style:", new TextOption("style", n.styleProperty()));
-        op.option("Translate X: TODO", null); // TODO
-        op.option("Translate Y: TODO", null); // TODO
-        op.option("Translate Z: TODO", null); // TODO
+        op.option("Style Class:", new StyleClassOption("styleClass", n.getStyleClass()));
+        op.option("Translate X:", new DoubleOption("translateX", n.translateXProperty()));
+        op.option("Translate Y:", new DoubleOption("translateY", n.translateYProperty()));
+        op.option("Translate Z:", new DoubleOption("translateZ", n.translateZProperty()));
         op.option("User Data: TODO", null); // TODO
-        op.option("View Order: TODO", null); // TODO
+        op.option("View Order:", new DoubleOption("viewOrder", n.viewOrderProperty()));
         op.option(new BooleanOption("visible", "visible", n.visibleProperty()));
+
+        StyleablePropertySheet.appendTo(op, n);
     }
 }
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/Options.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/Options.java
index 5e556d85105..d4af2bd2fac 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/Options.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/Options.java
@@ -35,10 +35,16 @@
 import javafx.scene.layout.Background;
 import javafx.scene.layout.Region;
 import javafx.scene.paint.Color;
+import javafx.scene.paint.CycleMethod;
+import javafx.scene.paint.ImagePattern;
+import javafx.scene.paint.LinearGradient;
+import javafx.scene.paint.RadialGradient;
+import javafx.scene.paint.Stop;
 import com.oracle.tools.fx.monkey.options.DoubleOption;
 import com.oracle.tools.fx.monkey.options.IntOption;
 import com.oracle.tools.fx.monkey.options.ObjectOption;
 import com.oracle.tools.fx.monkey.options.TextChoiceOption;
+import com.oracle.tools.fx.monkey.util.ImageTools;
 import com.oracle.tools.fx.monkey.util.ObjectSelector;
 import com.oracle.tools.fx.monkey.util.TextTemplates;
 import com.oracle.tools.fx.monkey.util.Utils;
@@ -77,13 +83,13 @@ public static Node gaps(String name, DoubleProperty p) {
 
     public static Node tabPaneConstraints(String name, DoubleProperty p) {
         DoubleOption d = new DoubleOption(name, p);
-        d.addChoice("0", Double.valueOf(0));
-        d.addChoice("10", 10.0);
-        d.addChoice("33.3", 33.3);
-        d.addChoice("100", 100.0);
+        d.addChoice(0);
+        d.addChoice(10.0);
+        d.addChoice(33.3);
+        d.addChoice(100.0);
         d.addChoice("Double.MAX_VALUE", Double.MAX_VALUE);
         d.addChoice("Double.POSITIVE_INFINITY", Double.POSITIVE_INFINITY);
-        d.addChoice("Double.NaN", Double.NaN);
+        d.addChoice("NaN", Double.NaN);
         d.selectInitialValue();
         return d;
     }
@@ -99,7 +105,7 @@ public static Node forRegion(String name, Property<Number> p) {
         d.addChoice("Double.MAX_VALUE", Double.MAX_VALUE);
         d.addChoice("Double.MIN_VALUE", Double.MIN_VALUE);
         d.addChoice("Double.POSITIVE_INFINITY", Double.POSITIVE_INFINITY);
-        d.addChoice("Double.NaN", Double.NaN);
+        d.addChoice("NaN", Double.NaN);
         d.selectInitialValue();
         return d;
     }
@@ -119,18 +125,29 @@ public static Node background(Node owner, String name, Property<Background> p) {
         op.addChoiceSupplier("White", () -> {
             return Background.fill(Color.WHITE);
         });
-        // TODO let background property track focused and focusWithin properties to change the bg
-        // also make sure to removeListener when the background is set to another value
-//        op.addChoiceSupplier("Focus(Green), NoFocus(Gray)", () -> {
-//            BooleanBinding b = Bindings.createBooleanBinding(
-//                () -> {
-//                },
-//                owner.focusTraversableProperty(),
-//                owner.focusedProperty(),
-//                owner.focusWithinProperty()
-//            );
-//            Background bg = new Background();
-//        });
+        op.addChoiceSupplier("Linear Gradient", () -> {
+            LinearGradient g = new LinearGradient(
+                0, 0, 30, 30, false,
+                CycleMethod.REFLECT,
+                new Stop(0, Color.RED), new Stop(30, Color.GREEN)
+            );
+            return Background.fill(g);
+        });
+        op.addChoiceSupplier("Radial Gradient", () -> {
+            RadialGradient g = new RadialGradient(
+                45, 0, 50, 10, 10, false,
+                CycleMethod.REFLECT,
+                new Stop(0, Color.RED), new Stop(10, Color.GREEN)
+            );
+            return Background.fill(g);
+        });
+        op.addChoiceSupplier("Image Pattern", () -> {
+            ImagePattern g = new ImagePattern(
+                ImageTools.createImage(50, 50),
+                0, 0, 50, 50, false
+            );
+            return Background.fill(g);
+        });
         op.addChoice("<null>", null);
         op.selectInitialValue();
         return op;
@@ -164,4 +181,19 @@ public static ObjectSelector<Runnable> selector(String name) {
             }
         });
     }
+
+    public static Node forColumnWidth(String name, double defaultValue, DoubleProperty p) {
+        DoubleOption d = new DoubleOption(name, p);
+        d.addChoice("0", Double.valueOf(0));
+        d.addChoice("10", 10.0);
+        d.addChoice("33.3", 33.3);
+        d.addChoice("100", 100.0);
+        d.addChoice("Double.MAX_VALUE", Double.MAX_VALUE);
+        d.addChoice("Double.MIN_VALUE", Double.MIN_VALUE);
+        d.addChoice("Double.POSITIVE_INFINITY", Double.POSITIVE_INFINITY);
+        d.addChoice("NaN", Double.NaN);
+        d.addChoice("<default: " + defaultValue + ">", defaultValue);
+        d.selectInitialValue();
+        return d;
+    }
 }
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/PropertiesMenu.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/PropertiesMenu.java
new file mode 100644
index 00000000000..46f3b93adf7
--- /dev/null
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/PropertiesMenu.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+package com.oracle.tools.fx.monkey.sheets;
+
+import javafx.scene.Node;
+import javafx.scene.control.Button;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.Hyperlink;
+import javafx.scene.control.Label;
+import javafx.scene.control.RadioButton;
+import javafx.scene.control.TextArea;
+import javafx.scene.control.TextField;
+import javafx.scene.control.ToggleButton;
+import com.oracle.tools.fx.monkey.util.OptionPane;
+import com.oracle.tools.fx.monkey.util.OptionWindow;
+
+/**
+ * Properties... menu.
+ */
+public class PropertiesMenu {
+    public static void openPropertiesDialog(Object parent, Node n) {
+        String name;
+        OptionPane op = new OptionPane();
+        if(n instanceof Button t) {
+            name = "Button";
+            ButtonsPropertySheet.appendTo(op, t);
+        } else if(n instanceof CheckBox t) {
+            name = "CheckBox";
+            ButtonsPropertySheet.appendTo(op, t);
+        } else if(n instanceof Hyperlink t) {
+            name = "Hyperlink";
+            ButtonsPropertySheet.appendTo(op, t);
+        } else if (n instanceof Label t) {
+            name = "Label";
+            LabeledPropertySheet.appendTo(op, "Label", false, t);
+        } else if(n instanceof RadioButton t) {
+            name = "RadioButton";
+            ButtonsPropertySheet.appendTo(op, t, null);
+        } else if(n instanceof TextArea t) {
+            name = "TextArea";
+            TextAreaPropertySheet.appendTo(op, t);
+        } else if(n instanceof TextField t) {
+            name = "TextField";
+            TextFieldPropertySheet.appendTo(op, t, null);
+        } else if(n instanceof ToggleButton t) {
+            name = "ToggleButton";
+            ButtonsPropertySheet.appendTo(op, t, null);
+        } else {
+            // TODO other types
+            System.err.println("property sheet not yet created for:" + n);
+            return;
+        }
+
+        OptionWindow.open(parent, "Properties: " + name, 500, 800, op);
+    }
+}
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/PropertiesMonitor.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/PropertiesMonitor.java
new file mode 100644
index 00000000000..b2368ddbc70
--- /dev/null
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/PropertiesMonitor.java
@@ -0,0 +1,270 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+package com.oracle.tools.fx.monkey.sheets;
+
+import java.beans.BeanInfo;
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import javafx.beans.Observable;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.value.ObservableValue;
+import javafx.collections.ObservableList;
+import javafx.collections.ObservableSet;
+import javafx.event.EventDispatcher;
+import javafx.event.EventHandler;
+import javafx.scene.Node;
+import javafx.scene.control.TreeItem;
+import javafx.scene.control.TreeTableCell;
+import javafx.scene.control.TreeTableColumn;
+import javafx.scene.control.TreeTableView;
+import javafx.scene.layout.Background;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.paint.Color;
+import com.oracle.tools.fx.monkey.util.OptionWindow;
+import com.oracle.tools.fx.monkey.util.Utils;
+
+/**
+ * Monitors Public Properties
+ */
+public class PropertiesMonitor extends BorderPane {
+    private final TreeTableView<Entry> table;
+
+    public PropertiesMonitor(Node owner) {
+        table = new TreeTableView<>();
+        table.setColumnResizePolicy(TreeTableView.CONSTRAINED_RESIZE_POLICY_FLEX_NEXT_COLUMN);
+        {
+            TreeTableColumn<Entry, String> c = new TreeTableColumn<>("Name");
+            c.setCellFactory((tc) -> createCell());
+            c.setCellValueFactory((f) -> new SimpleStringProperty(f.getValue().getValue().getName()));
+            c.setPrefWidth(120);
+            table.getColumns().add(c);
+        }
+        {
+            TreeTableColumn<Entry, String> c = new TreeTableColumn<>("Type");
+            c.setCellFactory((tc) -> createCell());
+            c.setCellValueFactory((f) -> new SimpleStringProperty(f.getValue().getValue().getType()));
+            c.setPrefWidth(100);
+            table.getColumns().add(c);
+        }
+        {
+            TreeTableColumn<Entry, Object> c = new TreeTableColumn<>("Value");
+            c.setCellFactory((tc) -> createCell());
+            c.setCellValueFactory((f) -> f.getValue().getValue().getValue());
+            c.setPrefWidth(300);
+            table.getColumns().add(c);
+        }
+        table.setShowRoot(false);
+        table.setRoot(collectProperties(owner));
+        setCenter(table);
+    }
+
+    public static void open(Node node) {
+        if (node != null) {
+            String name = node.getClass().getSimpleName();
+            PropertiesMonitor p = new PropertiesMonitor(node);
+            OptionWindow.open(node, "Properties: " + name, 800, 900, p);
+        }
+    }
+
+    private TreeTableCell createCell() {
+        return new TreeTableCell<Object, Object>() {
+            @Override
+            protected void updateItem(Object item, boolean empty) {
+                super.updateItem(item, empty);
+
+                if (item == null) {
+                    super.setText(null);
+                    super.setGraphic(null);
+                } else if (item instanceof Node) {
+                    super.setText(null);
+                    super.setGraphic((Node)item);
+                } else {
+                    super.setText(item.toString());
+                    super.setGraphic(null);
+                }
+                Object x = getTableRow().getItem();
+                if (x instanceof Entry en) {
+                    boolean hdr = en.isHeader();
+                    setBackground(hdr ? Background.fill(Color.rgb(0, 0, 0, 0.1)) : null);
+                    setStyle(hdr ? "-fx-font-weight:bold;" : "-fx-font-weight:normal;");
+                }
+            }
+        };
+    }
+
+    private static TreeItem<Entry> collectProperties(Node n) {
+        TreeItem<Entry> root = new TreeItem<>(null);
+        root.setExpanded(true);
+        boolean expand = true;
+        while (n != null) {
+            collectProperties(root, n, expand);
+            n = n.getParent();
+            expand = false;
+        }
+        return root;
+    }
+
+    private static void collectProperties(TreeItem<Entry> root, Node n, boolean expand) {
+        ArrayList<Entry> a = new ArrayList<>();
+        try {
+            BeanInfo inf = Introspector.getBeanInfo(n.getClass());
+            PropertyDescriptor[] ps = inf.getPropertyDescriptors();
+            for (PropertyDescriptor p: ps) {
+                Entry en = createEntry(n, p);
+                if (en != null) {
+                    a.add(en);
+                }
+            }
+
+            a.add(new Entry("styleClass", "ObservableList", n.getStyleClass()));
+            a.add(new Entry("pseudoClassStates", "ObservableSet", n.getPseudoClassStates()));
+
+            Collections.sort(a, new Comparator<Entry>() {
+                @Override
+                public int compare(Entry a, Entry b) {
+                    return a.getName().compareTo(b.getName());
+                }
+            });
+        } catch (IntrospectionException e) {
+            e.printStackTrace();
+        }
+
+        String type = n.getClass().getSimpleName();
+        if (Utils.isBlank(type)) {
+            type = n.getClass().getName();
+            int ix = type.lastIndexOf('.');
+            if (ix >= 0) {
+                type = type.substring(ix + 1);
+            }
+        }
+        TreeItem<Entry> ti = new TreeItem<>(new Entry(type, null, null));
+        ti.setExpanded(expand);
+        root.getChildren().add(ti);
+
+        for (Entry en: a) {
+            ti.getChildren().add(new TreeItem<>(en));
+        }
+    }
+
+    private static Entry createEntry(Node n, PropertyDescriptor pd) {
+        Class<?> t = pd.getPropertyType();
+        if (t == null) {
+            return null;
+        }
+        if (t.isAssignableFrom(EventHandler.class)) {
+            return null;
+        }
+        if (t.isAssignableFrom(EventDispatcher.class)) {
+            return null;
+        }
+        String name = pd.getName();
+        String pname = name + "Property";
+        try {
+            Method m = n.getClass().getMethod(pname);
+            if (m != null) {
+                Object v = m.invoke(n);
+                if (v instanceof ObservableValue val) {
+                    Class<?> tp = pd.getPropertyType();
+                    String type = tp == null ? "<null>" : tp.getSimpleName();
+                    return new Entry(pd.getName(), type, val);
+                }
+            }
+        } catch (Throwable e) {
+            // ignore
+        }
+        return null;
+    }
+
+    static class Entry {
+        private final String name;
+        private final String type;
+        private final Observable prop;
+        private SimpleObjectProperty<Object> value;
+
+        public Entry(String name, String type, Observable p) {
+            this.name = name;
+            this.type = type;
+            this.prop = p;
+        }
+
+        public boolean isHeader() {
+            return type == null;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public SimpleObjectProperty<Object> getValue() {
+            if (value == null) {
+                value = new SimpleObjectProperty<>();
+
+                if (prop != null) {
+                    if (prop instanceof ObservableValue p) {
+                        p.addListener((src, prev, c) -> {
+                            setValue(c);
+                        });
+                        Object y = p.getValue();
+                        setValue(p.getValue());
+                    } else if (prop instanceof ObservableList p) {
+                        p.addListener((Observable x) -> {
+                            setValue(p.toString());
+                        });
+                        setValue(p.toString());
+                    } else if (prop instanceof ObservableSet p) {
+                        p.addListener((Observable x) -> {
+                            setValue(p.toString());
+                        });
+                        setValue(p.toString());
+                    }
+                }
+            }
+            return value;
+        }
+
+        private void setValue(Object x) {
+            if (x instanceof Node) {
+                // do not set nodes!
+                x = x.getClass().getSimpleName();
+            }
+            value.set(x);
+        }
+
+        public String getType() {
+            return type;
+        }
+
+        @Override
+        public String toString() {
+            return getName();
+        }
+    }
+}
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/StyleablePropertySheet.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/StyleablePropertySheet.java
new file mode 100644
index 00000000000..88f07695678
--- /dev/null
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/StyleablePropertySheet.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+package com.oracle.tools.fx.monkey.sheets;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import javafx.css.CssMetaData;
+import javafx.css.Styleable;
+import javafx.scene.Node;
+import javafx.scene.control.Label;
+import com.oracle.tools.fx.monkey.util.OptionPane;
+
+/**
+ * Styleable Property Sheet.
+ */
+public class StyleablePropertySheet {
+    public static void appendTo(OptionPane op, Styleable n) {
+        op.section("Styleable");
+
+        ArrayList<CssMetaData<? extends Styleable, ?>> ss = new ArrayList<>(n.getCssMetaData());
+        Collections.sort(ss, new Comparator<CssMetaData>() {
+            @Override
+            public int compare(CssMetaData a, CssMetaData b) {
+                return a.getProperty().compareTo(b.getProperty());
+            }
+        });
+
+        for (CssMetaData md : ss) {
+            // TODO
+            // Node ed = createOption(n, md);
+            // op.option(md.getProperty(), ed);
+            String val = md.getProperty(); // + ": " + md.getStyleableProperty(n).getValue();
+            op.option(val, null);
+        }
+    }
+
+    private static Node createOption(Styleable s, CssMetaData md) {
+        // TODO move up
+//        if (!md.isSettable(s))
+//        {
+//            return null;
+//        }
+        return new Label(String.valueOf(md.getStyleableProperty(s).getValue()));
+    }
+}
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/TableColumnPropertySheet.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/TableColumnPropertySheet.java
index 5bc1af89851..be4c4946fa4 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/TableColumnPropertySheet.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/TableColumnPropertySheet.java
@@ -24,51 +24,77 @@
  */
 package com.oracle.tools.fx.monkey.sheets;
 
-import javafx.beans.property.ObjectProperty;
 import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableColumnBase;
+import javafx.scene.control.TreeTableColumn;
+import javafx.scene.layout.BorderPane;
+import com.oracle.tools.fx.monkey.options.BooleanOption;
+import com.oracle.tools.fx.monkey.options.EnumOption;
+import com.oracle.tools.fx.monkey.options.GraphicOption;
+import com.oracle.tools.fx.monkey.options.TextOption;
 import com.oracle.tools.fx.monkey.util.OptionPane;
+import com.oracle.tools.fx.monkey.util.OptionWindow;
 
 /**
  * TreeTableView/TableView (Selected) Column Property Sheet
  */
-// TODO this is not used
-public class TableColumnPropertySheet {
-//    public TableColumnOptions(String name, ObjectProperty<TableColumn> p) {
-//        super(name, (v) -> {
-//            var col = p.get();
-//            if(col != null) {
-//                col.set
-//            }
-//            updateValue(v);
-//        });
-//        disableProperty().bind(Bindings.createBooleanBinding(() -> {
-//            return p.get() == null;
-//        }, p));
-//
-//        this.currentColumn = p;
-//    }
+public class TableColumnPropertySheet extends BorderPane {
+    protected TableColumnPropertySheet(TableColumnBase<?,?> c) {
+        OptionPane op = new OptionPane();
+        if(c instanceof TableColumn tc) {
+            tableColumnOptions(op, tc);
+        } else if(c instanceof TreeTableColumn tc) {
+            treeTableColumnOptions(op, tc);
+        }
+        tableColumnBaseOptions(op, c);
 
-    public static void appendTo(OptionPane op, ObjectProperty<TableColumn> currentColumn) {
-        op.section("Current Column");
+        StyleablePropertySheet.appendTo(op, c);
+        setCenter(op);
+    }
+
+    public static void open(Object parent, TableColumnBase<?, ?> c) {
+        String name = c.getText();
+        if (name == null) {
+            name = "<null>";
+        } else {
+            name = " [" + name + "]";
+        }
+
+        TableColumnPropertySheet p = new TableColumnPropertySheet(c);
+        OptionWindow.open(parent, "Table Column Properties" + name, 500, 800, p);
+    }
+
+    private void tableColumnOptions(OptionPane op, TableColumn<?, ?> c) {
+        op.section("TableColumn");
         op.option("Cell Factory: TODO", null); // TODO
         op.option("Cell Value Factory: TODO", null); // TODO
+        op.option("Sort Type:", new EnumOption(null, TableColumn.SortType.class, c.sortTypeProperty()));
+    }
+
+    private void treeTableColumnOptions(OptionPane op, TreeTableColumn<?, ?> c) {
+        op.section("TreeTableColumn");
+        op.option("Cell Factory: TODO", null); // TODO
+        op.option("Cell Value Factory: TODO", null); // TODO
+        op.option("Sort Type:", new EnumOption(null, TreeTableColumn.SortType.class, c.sortTypeProperty()));
+    }
+
+    private void tableColumnBaseOptions(OptionPane op, TableColumnBase<?, ?> c) {
+        op.section("TableColumnBase");
         op.option("Comparator: TODO", null); // TODO
         op.option("Context Menu: TODO", null); // TODO
-        //op.option(new BooleanOption("editable", "editable", null)); // FIX how to set properties dynamically? Optional?
-        op.option("Graphic: TODO", null); // TODO
-        op.option("Id: TODO", null); // TODO
-        op.option("Max Width: TODO", null); // TODO
-        op.option("Min Width: TODO", null); // TODO
-        op.option("Pref Width: TODO", null); // TODO
-        op.option("reorderable: TODO", null); // TODO
-        op.option("resizeable: TODO", null); // TODO
-        op.option("Sort Type: TODO", null); // TODO
-        op.option("sortable: TODO", null); // TODO
+        op.option(new BooleanOption(null, "editable", c.editableProperty()));
+        op.option("Graphic:", new GraphicOption("graphic", c.graphicProperty()));
+        op.option("Id:", new TextOption("id", c.idProperty()));
+        op.option("Max Width:", Options.forColumnWidth("maxWidth", 5000.0, c.maxWidthProperty()));
+        op.option("Min Width:", Options.forColumnWidth("minWidth", 10.0, c.minWidthProperty()));
+        op.option("Pref Width:", Options.forColumnWidth("prefWidth", 80.0, c.prefWidthProperty()));
+        op.option(new BooleanOption(null, "reorderable", c.reorderableProperty()));
+        op.option(new BooleanOption(null, "resizeable", c.resizableProperty()));
+        op.option(new BooleanOption(null, "sortable", c.sortableProperty()));
         op.option("Sort Node: TODO", null); // TODO
-        op.option("Style: TODO", null); // TODO
-        op.option("Text: TODO", null); // TODO
+        op.option("Style:", new TextOption("style", c.styleProperty()));
+        op.option("Text:", new TextOption("text", c.textProperty()));
         op.option("User Data: TODO", null); // TODO
-        op.option("visible: TODO", null); // TODO
-        op.option(": TODO", null); // TODO
+        op.option(new BooleanOption(null, "visible", c.visibleProperty()));
     }
 }
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/TextAreaPropertySheet.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/TextAreaPropertySheet.java
new file mode 100644
index 00000000000..6bc1d907ecd
--- /dev/null
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/TextAreaPropertySheet.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+package com.oracle.tools.fx.monkey.sheets;
+
+import javafx.scene.control.TextArea;
+import com.oracle.tools.fx.monkey.options.BooleanOption;
+import com.oracle.tools.fx.monkey.options.IntOption;
+import com.oracle.tools.fx.monkey.util.OptionPane;
+
+/**
+ * TextArea property sheet.
+ */
+public class TextAreaPropertySheet {
+    public static void appendTo(OptionPane op, TextArea control) {
+        op.section("TextArea");
+        op.option("Preferred Column Count:", new IntOption("prefColumnCount", -1, Integer.MAX_VALUE, control.prefColumnCountProperty()));
+        op.option("Preferred Row Count:", new IntOption("prefRowCount", -1, Integer.MAX_VALUE, control.prefRowCountProperty()));
+        op.option("Scroll Left: TODO", null); // TODO
+        op.option("Scroll Top: TODO", null); // TODO
+        op.option(new BooleanOption("wrapText", "wrap text", control.wrapTextProperty()));
+
+        TextInputControlPropertySheet.appendTo(op, true, control);
+    }
+}
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/TextFieldPropertySheet.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/TextFieldPropertySheet.java
new file mode 100644
index 00000000000..9fa3011225b
--- /dev/null
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/TextFieldPropertySheet.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+package com.oracle.tools.fx.monkey.sheets;
+
+import java.util.function.Consumer;
+import javafx.geometry.Pos;
+import javafx.scene.control.TextField;
+import com.oracle.tools.fx.monkey.options.EnumOption;
+import com.oracle.tools.fx.monkey.options.IntOption;
+import com.oracle.tools.fx.monkey.util.OptionPane;
+
+/**
+ * TextField property sheet.
+ */
+public class TextFieldPropertySheet {
+    public static void appendTo(OptionPane op, TextField control, Runnable r) {
+        op.section("TextField");
+        op.option("Alignment:", new EnumOption<>("alignment", false, Pos.class, control.alignmentProperty()));
+        op.option("Preferred Column Count:", new IntOption("prefColumnCount", -1, Integer.MAX_VALUE, control.prefColumnCountProperty()));
+        if (r != null) {
+            r.run();
+        }
+
+        TextInputControlPropertySheet.appendTo(op, false, control);
+    }
+}
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/TypeSpecificContextMenu.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/TypeSpecificContextMenu.java
new file mode 100644
index 00000000000..255dafffd3d
--- /dev/null
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/TypeSpecificContextMenu.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+package com.oracle.tools.fx.monkey.sheets;
+
+import java.util.List;
+import javafx.scene.Node;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.Menu;
+import javafx.scene.control.MenuBar;
+import javafx.scene.control.MenuButton;
+import javafx.scene.control.MenuItem;
+import com.oracle.tools.fx.monkey.util.FX;
+import com.oracle.tools.fx.monkey.util.Utils;
+
+/**
+ * Populates ContextMenu based on the type of the item under cursor.
+ */
+public class TypeSpecificContextMenu {
+    public static void populate(ContextMenu m, Node source) {
+        Menu menu = findMenu(source);
+        if(menu != null) {
+            FX.item(m, "Set Menu Invisible", () -> menu.setVisible(false));
+        }
+        System.out.println(source);
+    }
+
+    // MenuBarButton is not accessible, so we can't get an instance of Menu directly.
+    // Let's find the menu and use its text and items to determine which one we are looking at.
+    private static Menu findMenu(Node n) {
+        MenuButton mb = FX.getAncestorOfClass(MenuButton.class, n);
+        if (mb != null) {
+            MenuBar bar = FX.getAncestorOfClass(MenuBar.class, mb);
+            if (bar != null) {
+                String text = mb.getText();
+                List<MenuItem> items = mb.getItems();
+                for (Menu m: bar.getMenus()) {
+                    if (Utils.eq(text, m.getText()) && Utils.eq(items, m.getItems())) {
+                        return m;
+                    }
+                }
+            }
+        }
+        return null;
+    }
+}
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/XYChartPropertySheet.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/XYChartPropertySheet.java
index d88500a6ff5..ce529e5c93f 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/XYChartPropertySheet.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/sheets/XYChartPropertySheet.java
@@ -25,7 +25,6 @@
 package com.oracle.tools.fx.monkey.sheets;
 
 import javafx.scene.chart.XYChart;
-import javafx.scene.control.Button;
 import com.oracle.tools.fx.monkey.options.BooleanOption;
 import com.oracle.tools.fx.monkey.pages.XYChartPageBase;
 import com.oracle.tools.fx.monkey.util.FX;
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/tools/AccessibilityPropertyViewer.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/tools/AccessibilityPropertyViewer.java
new file mode 100644
index 00000000000..5dcbd6165d6
--- /dev/null
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/tools/AccessibilityPropertyViewer.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+
+package com.oracle.tools.fx.monkey.tools;
+
+import javafx.geometry.Point2D;
+import javafx.geometry.Point3D;
+import javafx.scene.AccessibleAttribute;
+import javafx.scene.Node;
+import javafx.scene.input.PickResult;
+import com.oracle.tools.fx.monkey.util.Utils;
+
+public class AccessibilityPropertyViewer {
+    private final PickResult pick;
+    private Node node;
+    private StringBuilder sb;
+
+    public AccessibilityPropertyViewer(PickResult pick) {
+        this.pick = pick;
+    }
+
+    public static void open(PickResult pick) {
+        Node parent = pick.getIntersectedNode();
+        String text = new AccessibilityPropertyViewer(pick).generate();
+        Utils.showTextDialog(parent, "Accessibility", "Accessibility Properties", text);
+    }
+
+    public String generate() {
+        node = pick.getIntersectedNode();
+        Point3D p3 = pick.getIntersectedPoint();
+        Point2D point = node.localToScreen(p3);
+
+        Integer offset = parseInteger(node.queryAccessibleAttribute(AccessibleAttribute.OFFSET_AT_POINT, point));
+        Integer line = offset == null ? null : parseInteger(node.queryAccessibleAttribute(AccessibleAttribute.LINE_FOR_OFFSET, offset));
+
+        sb = new StringBuilder();
+
+        sb.append("*** Node: ").append(node.getClass().getSimpleName()).append("\n");
+
+        if (offset != null) {
+            query(AccessibleAttribute.LINE_FOR_OFFSET, offset);
+        }
+        if (line != null) {
+            query(AccessibleAttribute.LINE_START, line);
+            query(AccessibleAttribute.LINE_END, line);
+        }
+        query(AccessibleAttribute.OFFSET_AT_POINT, point);
+
+        return sb.toString();
+    }
+
+    private void query(AccessibleAttribute a, Object... params) {
+        Object v = node.queryAccessibleAttribute(a, params);
+        if (v == null) {
+            return;
+        }
+
+        sb.append(a).append(": ").append(v).append("\n");
+    }
+
+    private static Integer parseInteger(Object x) {
+        return (x instanceof Integer n) ? n : null;
+    }
+}
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/tools/ClipboardViewer.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/tools/ClipboardViewer.java
index dd72a23acb3..062b5fdf9a6 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/tools/ClipboardViewer.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/tools/ClipboardViewer.java
@@ -194,7 +194,7 @@ private Set<DataFormat> getExpandedItems() {
 
     private static String convert(Object x) {
         // String, ByteBuffer
-        return x.toString();
+        return x == null ? null : x.toString();
     }
 
     private static class Entry {
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/tools/Native2AsciiPane.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/tools/Native2AsciiPane.java
index 7169f44088e..30875e89b74 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/tools/Native2AsciiPane.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/tools/Native2AsciiPane.java
@@ -56,6 +56,7 @@ public Native2AsciiPane() {
         table.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY_SUBSEQUENT_COLUMNS);
         {
             TableColumn<Entry, Integer> c = new TableColumn<>();
+            // FIX there is no easy way to add a tooltip to table column!!!
             c.setText("Index");
             c.setCellValueFactory((d) -> new SimpleObjectProperty<Integer>(d.getValue().index));
             c.setPrefWidth(50);
@@ -71,7 +72,21 @@ public Native2AsciiPane() {
         {
             TableColumn<Entry, String> c = new TableColumn<>();
             c.setText("U+Code");
-            c.setCellValueFactory((d) -> new SimpleStringProperty(d.getValue().code));
+            c.setCellValueFactory((d) -> new SimpleStringProperty(d.getValue().ucode));
+            c.setPrefWidth(100);
+            table.getColumns().add(c);
+        }
+        {
+            TableColumn<Entry, String> c = new TableColumn<>();
+            c.setText("Type");
+            c.setCellValueFactory((d) -> new SimpleStringProperty(d.getValue().type));
+            c.setPrefWidth(300);
+            table.getColumns().add(c);
+        }
+        {
+            TableColumn<Entry, String> c = new TableColumn<>();
+            c.setText("CodePoint");
+            c.setCellValueFactory((d) -> new SimpleStringProperty(d.getValue().codePoint));
             c.setPrefWidth(100);
             table.getColumns().add(c);
         }
@@ -213,25 +228,107 @@ protected void updateSymbols(String text) {
         ArrayList<Entry> es = new ArrayList<>(sz);
         for (int i = 0; i < sz; i++) {
             char c = text.charAt(i);
-            String code = String.format("%04X", (int)c);
+            int codePoint = -1;
+            String cp = null;
+            if (Character.isHighSurrogate(c)) {
+                codePoint = text.codePointAt(i);
+                cp = Character.toString(codePoint);
+            }
+            String ucode = String.format("%04X", (int)c);
             String desc = Character.getName(c);
-            Entry en = new Entry(i, String.valueOf(c), code, desc);
+            if (cp != null) {
+                desc = String.format("%s (U+%06X %s)", desc, codePoint, Character.getName(codePoint));
+            }
+            String type = getType(c);
+            Entry en = new Entry(i, String.valueOf(c), ucode, desc, cp, type);
             es.add(en);
         }
         table.getItems().setAll(es);
     }
 
+    private String getType(char c) {
+        int t = Character.getType(c);
+        switch (t) {
+        case Character.COMBINING_SPACING_MARK:
+            return "COMBINING_SPACING_MARK";
+        case Character.CONNECTOR_PUNCTUATION:
+            return "CONNECTOR_PUNCTUATION";
+        case Character.CONTROL:
+            return "CONTROL";
+        case Character.CURRENCY_SYMBOL:
+            return "CURRENCY_SYMBOL";
+        case Character.DASH_PUNCTUATION:
+            return "DASH_PUNCTUATION";
+        case Character.DECIMAL_DIGIT_NUMBER:
+            return "DECIMAL_DIGIT_NUMBER";
+        case Character.ENCLOSING_MARK:
+            return "ENCLOSING_MARK";
+        case Character.END_PUNCTUATION:
+            return "END_PUNCTUATION";
+        case Character.FINAL_QUOTE_PUNCTUATION:
+            return "FINAL_QUOTE_PUNCTUATION";
+        case Character.FORMAT:
+            return "FORMAT";
+        case Character.INITIAL_QUOTE_PUNCTUATION:
+            return "INITIAL_QUOTE_PUNCTUATION";
+        case Character.LETTER_NUMBER:
+            return "LETTER_NUMBER";
+        case Character.LINE_SEPARATOR:
+            return "LINE_SEPARATOR";
+        case Character.LOWERCASE_LETTER:
+            return "LOWERCASE_LETTER";
+        case Character.MATH_SYMBOL:
+            return "MATH_SYMBOL";
+        case Character.MODIFIER_LETTER:
+            return "MODIFIER_LETTER";
+        case Character.MODIFIER_SYMBOL:
+            return "MODIFIER_SYMBOL";
+        case Character.NON_SPACING_MARK:
+            return "NON_SPACING_MARK";
+        case Character.OTHER_LETTER:
+            return "OTHER_LETTER";
+        case Character.OTHER_NUMBER:
+            return "OTHER_NUMBER";
+        case Character.OTHER_PUNCTUATION:
+            return "OTHER_PUNCTUATION";
+        case Character.OTHER_SYMBOL:
+            return "OTHER_SYMBOL";
+        case Character.PARAGRAPH_SEPARATOR:
+            return "PARAGRAPH_SEPARATOR";
+        case Character.PRIVATE_USE:
+            return "PRIVATE_USE";
+        case Character.SPACE_SEPARATOR:
+            return "SPACE_SEPARATOR";
+        case Character.START_PUNCTUATION:
+            return "START_PUNCTUATION";
+        case Character.SURROGATE:
+            return "SURROGATE";
+        case Character.TITLECASE_LETTER:
+            return "TITLECASE_LETTER";
+        case Character.UNASSIGNED:
+            return "UNASSIGNED";
+        case Character.UPPERCASE_LETTER:
+            return "UPPERCASE_LETTER";
+        default:
+            return String.valueOf(t);
+        }
+    }
+
     protected static class Entry {
         public final int index;
         public final String character;
-        public final String code;
+        public final String ucode;
         public final String description;
+        public final String codePoint;
+        public final String type;
 
-        public Entry(int index, String character, String code, String description) {
+        public Entry(int index, String character, String ucode, String description, String codePoint, String type) {
             this.index = index;
             this.character = character;
-            this.code = code;
+            this.ucode = ucode;
             this.description = description;
+            this.codePoint = codePoint;
+            this.type = type;
         }
     }
 }
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/util/BooleanConsumer.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/util/BooleanConsumer.java
new file mode 100644
index 00000000000..4e2e9443e91
--- /dev/null
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/util/BooleanConsumer.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+package com.oracle.tools.fx.monkey.util;
+
+/**
+ * Equivalent of Consumer<Boolean> but with primitive value.
+ */
+@FunctionalInterface
+public interface BooleanConsumer {
+    /**
+     * Performs this operation on the given argument.
+     *
+     * @param value the input argument
+     */
+    public void consume(boolean value);
+}
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/util/EnterTextDialog.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/util/EnterTextDialog.java
index 65f74c91abf..d9ffbed45bf 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/util/EnterTextDialog.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/util/EnterTextDialog.java
@@ -27,13 +27,12 @@
 
 import java.util.function.Consumer;
 import javafx.beans.property.Property;
-import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
 import javafx.geometry.Insets;
 import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonBar;
+import javafx.scene.control.Label;
 import javafx.scene.control.TextArea;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
@@ -43,6 +42,7 @@
 
 public class EnterTextDialog extends Stage {
     private final TextArea textField;
+    private final BorderPane content;
 
     public EnterTextDialog(Object owner, String initialText, Consumer<String> onEdit) {
         initOwner(FX.getParentWindow(owner));
@@ -60,9 +60,9 @@ public EnterTextDialog(Object owner, String initialText, Consumer<String> onEdit
         bp.setPadding(new Insets(5, 10, 5, 10));
         bp.getButtons().add(ok);
 
-        BorderPane p = new BorderPane(textField);
-        p.setBottom(bp);
-        setScene(new Scene(p));
+        content = new BorderPane(textField);
+        content.setBottom(bp);
+        setScene(new Scene(content));
 
         addEventHandler(KeyEvent.KEY_PRESSED, (ev) -> {
             if (ev.getCode() == KeyCode.ESCAPE) {
@@ -86,4 +86,10 @@ public static Runnable getRunnable(Node owner, Property<String> p) {
             }).show();
         };
     }
+
+    public void setInstructions(String text) {
+        Label t = new Label(text);
+        t.setPadding(new Insets(2, 10, 2, 10));
+        content.setTop(t);
+    }
 }
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/util/FX.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/util/FX.java
index 41116f02a0f..b1613095791 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/util/FX.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/util/FX.java
@@ -25,12 +25,15 @@
 package com.oracle.tools.fx.monkey.util;
 
 import java.util.List;
+import java.util.function.Function;
 import java.util.function.Supplier;
 import javafx.application.Platform;
+import javafx.beans.property.BooleanProperty;
 import javafx.event.EventHandler;
 import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
+import javafx.scene.control.CheckMenuItem;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.Control;
@@ -43,7 +46,9 @@
 import javafx.scene.control.Tooltip;
 import javafx.scene.input.KeyCombination;
 import javafx.scene.input.MouseEvent;
+import javafx.scene.input.PickResult;
 import javafx.scene.layout.GridPane;
+import javafx.scene.paint.Color;
 import javafx.scene.text.Text;
 import javafx.scene.text.TextFlow;
 import javafx.stage.Stage;
@@ -66,18 +71,31 @@ public static Menu menu(MenuBar b, String text) {
         return m;
     }
 
-    public static final MenuItem menuItem(String text, Runnable r) {
-        MenuItem m = new MenuItem(text);
-        if (r != null) {
-            m.setOnAction((ev) -> r.run());
+    public static final MenuItem menuItem(String text, Runnable action) {
+        MenuItem mi = new MenuItem(text);
+        if (action == null) {
+            mi.setDisable(true);
+        } else {
+            mi.setOnAction((ev) -> action.run());
         }
-        return m;
+        return mi;
     }
 
     public static MenuItem item(MenuBar b, String text, Runnable action) {
         MenuItem mi = new MenuItem(text);
         applyMnemonic(mi);
-        mi.setOnAction((ev) -> action.run());
+        if (action == null) {
+            mi.setDisable(true);
+        } else {
+            mi.setOnAction((ev) -> action.run());
+        }
+        lastMenu(b).getItems().add(mi);
+        return mi;
+    }
+
+    public static CheckMenuItem checkItem(MenuBar b, String name, BooleanProperty prop) {
+        CheckMenuItem mi = new CheckMenuItem(name);
+        mi.selectedProperty().bindBidirectional(prop);
         lastMenu(b).getItems().add(mi);
         return mi;
     }
@@ -132,7 +150,9 @@ public static RadioMenuItem radio(MenuBar b, String text, KeyCombination acceler
     public static MenuItem item(ContextMenu cm, String text, Runnable action) {
         MenuItem mi = new MenuItem(text);
         applyMnemonic(mi);
-        if (action != null) {
+        if (action == null) {
+            mi.setDisable(true);
+        } else {
             mi.setOnAction((ev) -> action.run());
         }
         cm.getItems().add(mi);
@@ -160,19 +180,22 @@ public static <T> T getSelectedItem(ComboBox<T> cb) {
         return cb.getSelectionModel().getSelectedItem();
     }
 
-    public static Window getParentWindow(Object nodeOrWindow) {
-        if (nodeOrWindow == null) {
+    public static Window getParentWindow(Object x) {
+        if (x == null) {
             return null;
-        } else if (nodeOrWindow instanceof Window w) {
+        } else if (x instanceof Window w) {
             return w;
-        } else if (nodeOrWindow instanceof Node n) {
+        } else if (x instanceof Node n) {
             Scene s = n.getScene();
             if (s != null) {
                 return s.getWindow();
             }
             return null;
+        } else if (x instanceof MenuItem m) {
+            ContextMenu cm = m.getParentPopup();
+            return cm == null ? null : cm.getOwnerWindow();
         } else {
-            throw new Error("Node or Window only");
+            throw new Error("Node, Window, or MenuItem only: " + x);
         }
     }
 
@@ -239,13 +262,30 @@ public static boolean isMac() {
      */
     // https://github.com/andy-goryachev/MP3Player/blob/8b0ff12460e19850b783b961f214eacf5e1cdaf8/src/goryachev/fx/FX.java#L1251
     public static void setPopupMenu(Node owner, Supplier<ContextMenu> generator) {
+        setPopupMenuLocal(owner, generator);
+    }
+
+    public static void setPopupMenu(Node owner, Function<PickResult,ContextMenu> generator) {
+        setPopupMenuLocal(owner, generator);
+    }
+
+    private static void setPopupMenuLocal(Node owner, Object generator) {
         if (owner == null) {
             throw new NullPointerException("cannot attach popup menu to null");
         }
 
         owner.setOnContextMenuRequested((ev) -> {
             if (generator != null) {
-                ContextMenu m = generator.get();
+                ContextMenu m;
+                if (generator instanceof Supplier sup) {
+                    m = (ContextMenu)sup.get();
+                } else if (generator instanceof Function func) {
+                    PickResult pick = ev.getPickResult();
+                    m = (ContextMenu)func.apply(pick);
+                } else {
+                    m = null;
+                }
+
                 if (m != null) {
                     if (m.getItems().size() > 0) {
                         Platform.runLater(() -> {
@@ -266,8 +306,8 @@ public void handle(MouseEvent event) {
                         ev.consume();
                     }
                 }
+                ev.consume();
             }
-            ev.consume();
         });
     }
 
@@ -292,4 +332,86 @@ public static Button button(String text, Runnable r) {
         }
         return b;
     }
+
+    public static void style(Node n, String style) {
+        n.getStyleClass().add(style);
+    }
+
+    public static void style(Node n, String style, boolean on) {
+        if (on) {
+            n.getStyleClass().add(style);
+        } else {
+            n.getStyleClass().remove(style);
+        }
+    }
+
+    // borrowed from
+    // https://github.com/andy-goryachev/AppFramework/blob/1e9f2197ce510a77ec5f719a2cb7112b0b6cf7be/src/goryachev/fx/FX.java#L1081
+    // with the author's permission
+    /** returns a parent of the specified type, or null.  if node is an instance of the specified class, returns node */
+    public static <T> T getAncestorOfClass(Class<T> c, Node node) {
+        if (Window.class.isAssignableFrom(c)) {
+            Scene sc = node.getScene();
+            if (sc != null) {
+                Window w = sc.getWindow();
+                while (w != null) {
+                    if (w.getClass().isAssignableFrom(c)) {
+                        return (T)w;
+                    }
+
+                    // the window can be a dialog, check the owner
+                    if (w instanceof Stage stage) {
+                        w = stage.getOwner();
+                    }
+                }
+            }
+            return null;
+        } else {
+            while (node != null) {
+                if (c.isInstance(node)) {
+                    return (T)node;
+                }
+
+                node = node.getParent();
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Creates a new color with the same RGB values and the specified alpha (opacity).
+     *
+     * @param c the color to borrow RGB values from
+     * @param alpha the opacity
+     * @return the new color instance
+     */
+    public static Color alpha(Color c, double alpha) {
+        return new Color(c.getRed(), c.getGreen(), c.getBlue(), alpha);
+    }
+
+    public static Menu menu(Menu menu, String text) {
+        Menu m = new Menu(text);
+        applyMnemonic(m);
+        menu.getItems().add(m);
+        return m;
+    }
+
+    public static MenuItem item(Menu m, String text) {
+        MenuItem mi = new MenuItem(text);
+        applyMnemonic(mi);
+        m.getItems().add(mi);
+        return mi;
+    }
+
+    public static MenuItem item(Menu m, String text, Runnable action) {
+        MenuItem mi = new MenuItem(text);
+        applyMnemonic(mi);
+        if (action == null) {
+            mi.setDisable(true);
+        } else {
+            mi.setOnAction((ev) -> action.run());
+        }
+        m.getItems().add(mi);
+        return mi;
+    }
 }
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/util/ImageTools.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/util/ImageTools.java
index 65acdb7e4a3..bcca11fac95 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/util/ImageTools.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/util/ImageTools.java
@@ -30,30 +30,44 @@
 import javafx.scene.canvas.GraphicsContext;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
-import javafx.scene.image.PixelWriter;
-import javafx.scene.image.WritableImage;
 import javafx.scene.paint.Color;
 
 /**
  * Image Tools.
  */
 public class ImageTools {
-    public static ImageView createImageView(Color c, int w, int h) {
-        Image im = createImage(c, w, h);
+    public static ImageView createImageView(int w, int h) {
+        Image im = createImage(w, h);
         return new ImageView(im);
     }
 
-    public static Image createImage(Color c, int w, int h) {
-        WritableImage im = new WritableImage(w, h);
-        PixelWriter wr = im.getPixelWriter();
+    public static Image createImage(int w, int h) {
+        Canvas c = new Canvas(w, h);
+        GraphicsContext g = c.getGraphicsContext2D();
+        g.setFill(Color.gray(0.97));
+        g.fillRect(0, 0, w, h);
 
-        for (int y = 0; y < h; y++) {
-            for (int x = 0; x < w; x++) {
-                wr.setColor(x, y, c);
-            }
+        g.setStroke(Color.gray(0.9));
+        g.setLineWidth(1.0);
+        for (double y = 0.5; y < h; y += 10) {
+            g.strokeLine(0, y, w, y);
+        }
+        for (double x = 0.5; x < w; x += 10) {
+            g.strokeLine(x, 0, x, h);
         }
 
-        return im;
+        g.setStroke(Color.gray(0.7));
+        for (double y = 0.5; y < h; y += 100) {
+            g.strokeLine(0, y, w, y);
+        }
+        for (double x = 0.5; x < w; x += 100) {
+            g.strokeLine(x, 0, x, h);
+        }
+
+        g.setStroke(Color.RED);
+        g.strokeRect(0, 0, w, h);
+
+        return c.snapshot(null, null);
     }
 
     public static Image createImage(String s, int w, int h) {
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/util/OptionPane.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/util/OptionPane.java
index 5e96cd4d053..0e225f968be 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/util/OptionPane.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/util/OptionPane.java
@@ -25,22 +25,24 @@
 package com.oracle.tools.fx.monkey.util;
 
 import java.util.List;
+import java.util.stream.Collectors;
 import javafx.geometry.Insets;
 import javafx.geometry.Orientation;
 import javafx.scene.Node;
-import javafx.scene.control.Accordion;
 import javafx.scene.control.Label;
 import javafx.scene.control.Separator;
 import javafx.scene.control.TitledPane;
 import javafx.scene.layout.GridPane;
+import javafx.scene.layout.VBox;
 
 /**
  * Option Pane - a vertical option sheet.
  */
-public class OptionPane extends Accordion {
+public class OptionPane extends VBox {
 
     public OptionPane() {
         FX.name(this, "OptionPane");
+        FX.style(this, "option-pane");
     }
 
     public void label(String text) {
@@ -70,14 +72,17 @@ public void section(String name) {
         section(name, new OptionGridPane());
     }
 
+    private List<TitledPane> getPanes() {
+        return getChildren().
+            stream().
+            filter((n) -> n instanceof TitledPane).
+            map((n) -> (TitledPane)n).
+            collect(Collectors.toList());
+    }
+
     public void section(String name, OptionGridPane content) {
         TitledPane t = new TitledPane(name, content);
-        getPanes().add(t);
-
-        List<TitledPane> panes = getPanes();
-        if (panes.size() == 1) {
-            setExpandedPane(panes.get(0));
-        }
+        getChildren().add(t);
     }
 
     private OptionGridPane lastSection() {
@@ -85,6 +90,7 @@ private OptionGridPane lastSection() {
         if (panes.size() == 0) {
             section("Properties");
         }
+        panes = getPanes();
         TitledPane t = panes.get(panes.size() - 1);
         return (OptionGridPane)t.getContent();
     }
@@ -97,6 +103,7 @@ private static class OptionGridPane extends GridPane {
 
         public OptionGridPane() {
             setPadding(PADDING);
+            setMaxWidth(Double.MAX_VALUE);
         }
 
         public void label(String text) {
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/util/OptionWindow.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/util/OptionWindow.java
new file mode 100644
index 00000000000..6e658d9a623
--- /dev/null
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/util/OptionWindow.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+package com.oracle.tools.fx.monkey.util;
+
+import javafx.scene.Node;
+import javafx.scene.Scene;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
+import javafx.stage.Stage;
+
+/**
+ * Property Sheet Window.
+ */
+public class OptionWindow extends Stage {
+    public OptionWindow(Object parent, String title, double width, double height, Node content) {
+        ScrollPane sp = new ScrollPane(content);
+        sp.setFitToHeight(true);
+        sp.setFitToWidth(true);
+
+        initOwner(FX.getParentWindow(parent));
+        setScene(new Scene(sp));
+        setTitle(title);
+        addEventHandler(KeyEvent.KEY_RELEASED, this::handleKey);
+        setWidth(width);
+        setHeight(height);
+    }
+
+    public static OptionWindow open(Object parent, String title, double width, double height, Node content) {
+        OptionWindow w = new OptionWindow(parent, title, width, height, content);
+        w.show();
+        return w;
+    }
+
+    private void handleKey(KeyEvent ev) {
+        if (ev.getCode() == KeyCode.ESCAPE) {
+            hide();
+            ev.consume();
+        }
+    }
+}
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/util/TestPaneBase.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/util/TestPaneBase.java
index 05852fd1419..d43043ca284 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/util/TestPaneBase.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/util/TestPaneBase.java
@@ -39,6 +39,7 @@
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Pane;
 import javafx.stage.Window;
+import com.oracle.tools.fx.monkey.AppSettings;
 
 /**
  * Base class for individual control test Pane.
@@ -48,9 +49,11 @@ public class TestPaneBase extends BorderPane {
 
     public TestPaneBase(String name) {
         FX.name(this, name);
+        FX.style(this, name);
 
         contentPane = new BorderPane();
         contentPane.setOpacity(1.0);
+        FX.style(contentPane, "test-content");
 
         updateContent();
     }
@@ -61,12 +64,14 @@ public void updateContent() {
         hsplit.setBorder(Border.EMPTY);
         hsplit.setDividerPositions(1.0);
         hsplit.setOrientation(Orientation.HORIZONTAL);
+        hsplit.snapToPixelProperty().bind(AppSettings.snapSplitPanes);
 
         SplitPane vsplit = new SplitPane(hsplit, pane());
         FX.name(vsplit, "vsplit");
         vsplit.setBorder(Border.EMPTY);
         vsplit.setDividerPositions(1.0);
         vsplit.setOrientation(Orientation.VERTICAL);
+        vsplit.snapToPixelProperty().bind(AppSettings.snapSplitPanes);
 
         setCenter(vsplit);
     }
@@ -112,6 +117,7 @@ public void setOptions(Node n) {
             setRight(null);
         } else {
             ScrollPane sp = new ScrollPane(n);
+            sp.setMinViewportWidth(10);
             sp.setVbarPolicy(ScrollBarPolicy.AS_NEEDED);
             sp.setHbarPolicy(ScrollBarPolicy.NEVER);
             setRight(sp);
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/util/TextTemplates.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/util/TextTemplates.java
index 59cb6e2ed4a..7eceef2e44c 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/util/TextTemplates.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/util/TextTemplates.java
@@ -41,6 +41,7 @@ public static Object[] multiLineTextPairs() {
             "Long", "<beg-0123456789012345678901234567890123456789-|-0123456789012345678901234567890123456789-end>",
             "Right-to-Left", RIGHT_TO_LEFT,
             "Writing Systems", WritingSystemsDemo.getText(false),
+            "Lorem Ipsum", loremIpsum(),
             "Combining Chars", "Tibetan ཨོཾ་མ་ཎི་པདྨེ་ཧཱུྃ\nDouble diacritics: a\u0360b a\u0361b a\u0362b a\u035cb",
             "Failed Nav Bug", "Arabic: \u0627\u0644\u0639\u0631\u0628\u064a\u0629",
             "Wrap Index Bug", "A regular Arabic verb, كَتَبَ‎ kataba (to write).",
@@ -86,4 +87,19 @@ private static String createLongCJK() {
         }
         return sb.toString();
     }
+
+    private static String loremIpsum() {
+        return
+            """
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Pellentesque habitant morbi tristique senectus et netus et malesuada. Nunc eget lorem dolor sed viverra ipsum. Vulputate enim nulla aliquet porttitor lacus. Platea dictumst quisque sagittis purus sit amet volutpat consequat. Vestibulum rhoncus est pellentesque elit ullamcorper dignissim cras tincidunt. Turpis egestas pretium aenean pharetra magna. Ultricies mi quis hendrerit dolor magna eget est lorem ipsum. Vitae et leo duis ut diam quam. Tincidunt nunc pulvinar sapien et. Laoreet sit amet cursus sit amet dictum sit amet.
+
+            Ornare suspendisse sed nisi lacus sed viverra tellus. Hac habitasse platea dictumst quisque. Egestas quis ipsum suspendisse ultrices gravida dictum fusce ut placerat. Diam vulputate ut pharetra sit amet aliquam id diam maecenas. At volutpat diam ut venenatis tellus in metus. Imperdiet nulla malesuada pellentesque elit eget gravida cum sociis natoque. Nisl vel pretium lectus quam id leo in vitae. Turpis cursus in hac habitasse platea. Varius vel pharetra vel turpis nunc. Eu volutpat odio facilisis mauris. Dictum fusce ut placerat orci nulla pellentesque. Pulvinar neque laoreet suspendisse interdum. Congue nisi vitae suscipit tellus mauris a diam maecenas. Sapien nec sagittis aliquam malesuada bibendum arcu vitae. Amet nisl purus in mollis nunc sed id semper.
+
+            Pretium quam vulputate dignissim suspendisse in est ante in. Non odio euismod lacinia at quis risus. Pellentesque elit eget gravida cum. Malesuada proin libero nunc consequat interdum varius sit amet mattis. Nulla posuere sollicitudin aliquam ultrices sagittis orci a scelerisque. Ullamcorper morbi tincidunt ornare massa. Eu facilisis sed odio morbi quis commodo. Lorem ipsum dolor sit amet consectetur. Et molestie ac feugiat sed. Facilisis mauris sit amet massa vitae tortor. Consectetur adipiscing elit duis tristique sollicitudin. Tempus imperdiet nulla malesuada pellentesque elit eget gravida.
+
+            Diam ut venenatis tellus in metus vulputate eu scelerisque felis. Eget nunc scelerisque viverra mauris in. Ac orci phasellus egestas tellus rutrum tellus. Nulla pellentesque dignissim enim sit amet. Congue quisque egestas diam in arcu cursus euismod quis viverra. Augue interdum velit euismod in pellentesque massa placerat. Vitae tempus quam pellentesque nec nam aliquam sem. Nisl vel pretium lectus quam id leo. Facilisi etiam dignissim diam quis. Pharetra convallis posuere morbi leo urna. Nisl nunc mi ipsum faucibus vitae aliquet nec ullamcorper sit. Eleifend mi in nulla posuere sollicitudin aliquam ultrices. Donec ultrices tincidunt arcu non sodales neque sodales ut. Nisi porta lorem mollis aliquam. Vitae aliquet nec ullamcorper sit.
+
+            Vitae justo eget magna fermentum iaculis eu non. Sed blandit libero volutpat sed cras. Et ultrices neque ornare aenean euismod elementum nisi quis eleifend. Porta non pulvinar neque laoreet suspendisse interdum consectetur. Orci porta non pulvinar neque laoreet suspendisse interdum. Elementum pulvinar etiam non quam lacus suspendisse faucibus. Eu lobortis elementum nibh tellus molestie nunc non blandit massa. Mi proin sed libero enim sed faucibus turpis in eu. Feugiat vivamus at augue eget arcu. In pellentesque massa placerat duis ultricies lacus sed turpis tincidunt.
+            """;
+    }
 }
diff --git a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/util/Utils.java b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/util/Utils.java
index 53790d2f748..8367382f95d 100644
--- a/tests/manual/monkey/src/com/oracle/tools/fx/monkey/util/Utils.java
+++ b/tests/manual/monkey/src/com/oracle/tools/fx/monkey/util/Utils.java
@@ -25,9 +25,18 @@
 package com.oracle.tools.fx.monkey.util;
 
 import java.util.function.BiConsumer;
+import java.util.function.Supplier;
+import javafx.application.Platform;
 import javafx.scene.Node;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
+import javafx.scene.control.TextArea;
+import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Pane;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
+import javafx.stage.Window;
 
 /**
  * Monkey Tester Utilities
@@ -53,4 +62,36 @@ public static Pane buttons(Node ... nodes) {
         b.setSpacing(2);
         return b;
     }
+
+    public static boolean eq(Object a, Object b) {
+        if (a == null) {
+            return b == null;
+        }
+        return a.equals(b);
+    }
+
+    public static void showDialog(Node owner, String windowName, String title, Parent content) {
+        Window w = FX.getParentWindow(owner);
+        Stage s = new Stage();
+        s.initModality(Modality.WINDOW_MODAL);
+        s.initOwner(w);
+
+        FX.name(s, windowName);
+        s.setTitle(title);
+        s.setScene(new Scene(content));
+        s.setWidth(900);
+        s.setHeight(500);
+        s.show();
+    }
+
+    public static void showTextDialog(Node owner, String windowName, String title, String text) {
+        TextArea textField = new TextArea(text);
+        textField.setEditable(false);
+        textField.setWrapText(false);
+
+        BorderPane p = new BorderPane();
+        p.setCenter(textField);
+
+        showDialog(owner, windowName, title, p);
+    }
 }

From 9360575cbb3209c1a0e8e758af79498cda2c679a Mon Sep 17 00:00:00 2001
From: Lukasz Kostyra <lkostyra@openjdk.org>
Date: Fri, 20 Sep 2024 06:53:07 +0000
Subject: [PATCH 44/75] 8339508: RenderPerf Test Application 8331570:
 RenderPerf test: Add infinite test mode for stress-testing scenarios

Co-authored-by: Karthik P K <kpk@openjdk.org>
Reviewed-by: arapte, jdv
---
 .../src/renderperf/RenderPerfTest.java        | 2326 +++++++++++++++++
 .../RenderPerfTest/src/renderperf/duke.png    |  Bin 0 -> 2124 bytes
 2 files changed, 2326 insertions(+)
 create mode 100644 tests/performance/animation/RenderPerfTest/src/renderperf/RenderPerfTest.java
 create mode 100644 tests/performance/animation/RenderPerfTest/src/renderperf/duke.png

diff --git a/tests/performance/animation/RenderPerfTest/src/renderperf/RenderPerfTest.java b/tests/performance/animation/RenderPerfTest/src/renderperf/RenderPerfTest.java
new file mode 100644
index 00000000000..c023313de0b
--- /dev/null
+++ b/tests/performance/animation/RenderPerfTest/src/renderperf/RenderPerfTest.java
@@ -0,0 +1,2326 @@
+/*
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+
+package renderperf;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Random;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import javafx.animation.AnimationTimer;
+import javafx.application.Platform;
+import javafx.geometry.Point3D;
+import javafx.scene.control.Button;
+import javafx.scene.effect.BlendMode;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.paint.Color;
+import javafx.scene.paint.CycleMethod;
+import javafx.scene.paint.LinearGradient;
+import javafx.scene.paint.PhongMaterial;
+import javafx.scene.paint.RadialGradient;
+import javafx.scene.paint.Stop;
+import javafx.scene.shape.Arc;
+import javafx.scene.shape.ArcTo;
+import javafx.scene.shape.ArcType;
+import javafx.scene.shape.Box;
+import javafx.scene.shape.Cylinder;
+import javafx.scene.shape.Circle;
+import javafx.scene.shape.CubicCurve;
+import javafx.scene.shape.CubicCurveTo;
+import javafx.scene.shape.CullFace;
+import javafx.scene.shape.DrawMode;
+import javafx.scene.shape.Ellipse;
+import javafx.scene.shape.Line;
+import javafx.scene.shape.MeshView;
+import javafx.scene.shape.MoveTo;
+import javafx.scene.shape.Path;
+import javafx.scene.shape.Polygon;
+import javafx.scene.shape.Rectangle;
+import javafx.scene.shape.Sphere;
+import javafx.scene.shape.TriangleMesh;
+import javafx.scene.shape.QuadCurve;
+import javafx.scene.shape.QuadCurveTo;
+import javafx.scene.text.Font;
+import javafx.scene.text.Text;
+import javafx.scene.transform.Rotate;
+import javafx.scene.Group;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
+/**
+ * {@link RenderPerfTest} is an application to measure graphic rendering performance
+ * of JavaFX graphic rendering by calculatiing the Frames per second (FPS) value.
+ * The application calculates the FPS by creating a JavaFX environment and rendering
+ * objects such as Circle, Image, Text etc based on the test executed. Rendered objects
+ * are animated by changing their coordinates every frame which creates animation.
+ * Each test case is run for a duration of {@link #TEST_TIME} and number of frames rendered
+ * are tracked to calculate FPS.
+ *
+ * <p>
+ * Steps to run the application:
+ * <ol>
+ *  <li>cd RenderPerfTest/src</li>
+ *  <li>Command to compile the program: javac {@literal @}{@literal <}path_to{@literal >}/compile.args renderperf/{@link RenderPerfTest}.java</li>
+ *  <li>Command to execute the program: java {@literal @}{@literal <}path_to{@literal >}/run.args renderperf/{@link RenderPerfTest} -t {@literal <}test_name{@literal <} -n {@literal <}number_of_objects{@literal <} -h</li>
+ *  Where:
+ *  <ul>
+ *      <li>test_name: Name of the test to be executed. If not specified, all tests are executed.</li>
+ *      <li>number_of_objects: Number of objects to be rendered in the test. If not specified, default value is 1000.</li>
+ *      <li>-h: help: prints application usage.</li>
+ *  </ul>
+ * NOTE: Set JVM command line parameter -Djavafx.animation.fullspeed=true to run animation at full speed
+ * </ol>
+ * <p>
+ * Example - Command to execute the Circle test with 10000 circle objects: <br>
+ * java -Djavafx.animation.fullspeed=true {@literal @}{@literal <}path_to{@literal >}/run.args renderperf/{@link RenderPerfTest} -t Circle -n 10000.
+ *
+ */
+
+public class RenderPerfTest {
+    private static final double WIDTH = 800;
+    private static final double HEIGHT = 800;
+    private static final double R = 25;
+    private static final long SECOND_IN_NANOS = 1_000_000_000L;
+    private static final long WARMUP_TIME_SECONDS = 5;
+    private static final long WARMUP_TIME = WARMUP_TIME_SECONDS * SECOND_IN_NANOS;
+    private static final long DEFAULT_TEST_TIME_SECONDS = 10;
+    private static final Color[] marker = {Color.RED, Color.BLUE, Color.GREEN, Color.YELLOW, Color.ORANGE, Color.MAGENTA};
+
+    private static Stage stage;
+    private static Scene scene;
+    private static Group group;
+    private static Random random = new Random(100);
+    private static int objectCount = 0;
+    private static long testDuration = DEFAULT_TEST_TIME_SECONDS;
+    private static ArrayList<String> testList = null;
+
+    interface Renderable {
+        void addComponents(Group node);
+        void updateCoordinates();
+        void updateComponentCoordinates();
+        void releaseResource();
+    }
+
+    private static int roundUpTo4(int n) {
+        if (n % 4 != 0) {
+            n = (n + 3) & ~(0x3);
+            System.out.println("Test requires object count that is a multiple of 4 - rounding up to " + n);
+        }
+        return n;
+    }
+
+    /**
+     * This method is used to create object of {@link ParticleRenderable}
+     * which will be used to call the {@link PerfMeter#exec} method of
+     * {@link PerfMeter} to render the components or update coordinates.
+     * This method shall be called for each teast case.
+     *
+     * @param renderer object of a particle renderer which inherits from {@link ParticleRenderer}
+     *
+     * @return object of {@link ParticleRenderable}
+     */
+    ParticleRenderable createPR(ParticleRenderer renderer) {
+        return new ParticleRenderable(renderer, WIDTH, HEIGHT);
+    }
+
+    /**
+     * Primary function of {@link ParticleRenderable} class is to invoke
+     * the methods of {@link Particles} class which in turn invokes
+     * {@link ParticleRenderable} methods to render components on JavaFX application.
+     * Object of {@link ParticleRenderable} is created for every {@link ParticleRenderable}
+     * child class i.e for each test case which makes it easy to reuse the
+     * coordinates generated for rendering the components.
+     * This class helps in separating the individual test case component rendering code
+     * independant of the test execution.
+     */
+    static class ParticleRenderable implements Renderable {
+        private ParticleRenderer renderer;
+
+        private double[] bx;
+        private double[] by;
+        private double[] vx;
+        private double[] vy;
+        private double r;
+        private int n;
+
+        private double width;
+        private double height;
+
+        ParticleRenderable(ParticleRenderer renderer, double width, double height) {
+            this.renderer = renderer;
+            this.n = renderer.getObjectCount();
+            this.r = renderer.getParticleRadius();
+
+            bx = new double[n];
+            by = new double[n];
+            vx = new double[n];
+            vy = new double[n];
+            this.width = width;
+            this.height = height;
+
+            for (int i = 0; i < n; i++) {
+                bx[i] = random.nextDouble(r, (width - r));
+                by[i] = random.nextDouble(r, (height - r));
+                vx[i] = random.nextDouble(-2, 2);
+                vy[i] = random.nextDouble(-2, 2);
+            }
+        }
+
+        @Override
+        public void addComponents(Group node) {
+            renderer.addComponents(node, n, bx, by, vx, vy);
+        }
+
+        @Override
+        public void updateCoordinates() {
+            for (int i = 0; i < n; i++) {
+                bx[i] += vx[i];
+                if (bx[i] + r > width || bx[i] - r < 0) vx[i] = -vx[i];
+                by[i] += vy[i];
+                if (by[i] + r > height || by[i] - r < 0) vy[i] = -vy[i];
+            }
+        }
+
+        @Override
+        public void updateComponentCoordinates() {
+            renderer.updateComponentCoordinates(n, bx, by, vx, vy);
+        }
+
+        @Override
+        public void releaseResource() {
+            renderer.releaseResource();
+        }
+    }
+
+    /**
+     * Interface which shall be implemented by all the particle renderer sub-classes
+     * used in different test cases.
+     * Methods for adding components, changing location of components and
+     * releasing resources used for rendering the components are defined.
+     */
+    interface ParticleRenderer {
+        void addComponents(Group node, int n, double[] x, double[] y, double[] vx, double[] vy);
+        void updateComponentCoordinates(int n, double[] x, double[] y, double[] vx, double[] vy);
+        void releaseResource();
+        int getObjectCount();
+        double getParticleRadius();
+    }
+
+    static abstract class FlatParticleRenderer implements ParticleRenderer {
+        Color[] colors;
+        int n;
+        double r;
+
+        FlatParticleRenderer(int n, double r) {
+            colors = new Color[n];
+            this.n = n;
+            this.r = r;
+
+            for (int i = 0; i < n; i++) {
+                colors[i] = Color.rgb(random.nextInt(256), random.nextInt(256), random.nextInt(256));
+            }
+        }
+
+        public void releaseResource() {
+            colors = null;
+        }
+
+        public int getObjectCount() {
+            return n;
+        }
+
+        public double getParticleRadius() {
+            return r;
+        }
+    }
+
+    static class ArcRenderer extends FlatParticleRenderer {
+        Arc[] arc;
+
+        ArcRenderer(int n, double r) {
+            super(n, r);
+            arc = new Arc[n];
+        }
+
+        @Override
+        public void addComponents(Group node, int n, double[] x, double[] y, double[] vx, double[] vy) {
+            for (int id = 0; id < n; id++) {
+                arc[id] = new Arc();
+
+                arc[id].setCenterX(x[id]);
+                arc[id].setCenterY(y[id]);
+                arc[id].setRadiusX(r);
+                arc[id].setRadiusY(r);
+                arc[id].setStartAngle(random.nextDouble(100));
+                arc[id].setLength(random.nextDouble(360));
+                arc[id].setType(ArcType.ROUND);
+                arc[id].setFill(colors[id % colors.length]);
+                node.getChildren().add(arc[id]);
+            }
+        }
+
+        public void updateComponentCoordinates(int n, double[] x, double[] y, double[] vx, double[] vy) {
+            for (int id = 0; id < n; id++) {
+                arc[id].setCenterX(x[id]);
+                arc[id].setCenterY(y[id]);
+            }
+        }
+
+        public void releaseResource() {
+            super.releaseResource();
+            arc = null;
+        }
+    }
+
+    static class OpenArcRenderer extends ArcRenderer {
+        OpenArcRenderer(int n, double r) {
+            super(n, r);
+        }
+
+        @Override
+        public void addComponents(Group node, int n, double[] x, double[] y, double[] vx, double[] vy) {
+            super.addComponents(node, n, x, y, vx, vy);
+            for (int id = 0; id < n; id++) {
+                arc[id].setType(ArcType.OPEN);
+                arc[id].setFill(null);
+                arc[id].setStroke(colors[id % colors.length]);
+            }
+        }
+    }
+
+    static class CubicCurveRenderer extends FlatParticleRenderer {
+        CubicCurve[] cubicCurve;
+
+        CubicCurveRenderer(int n, double r) {
+            super(n, r);
+            cubicCurve = new CubicCurve[n];
+        }
+
+        @Override
+        public void addComponents(Group node, int n, double[] x, double[] y, double[] vx, double[] vy) {
+            for (int id = 0; id < n; id++) {
+                cubicCurve[id] = new CubicCurve();
+
+                cubicCurve[id].setStartX(0);
+                cubicCurve[id].setStartY(50);
+                cubicCurve[id].setControlX1(25);
+                cubicCurve[id].setControlY1(0);
+                cubicCurve[id].setControlX2(75);
+                cubicCurve[id].setControlY2(100);
+                cubicCurve[id].setEndX(100);
+                cubicCurve[id].setEndY(50);
+                cubicCurve[id].setFill(colors[id % colors.length]);
+                node.getChildren().add(cubicCurve[id]);
+            }
+
+        }
+
+        public void updateComponentCoordinates(int n, double[] x, double[] y, double[] vx, double[] vy) {
+            for (int id = 0; id < n; id++) {
+                cubicCurve[id].setTranslateX(x[id] - r);
+                cubicCurve[id].setTranslateY(y[id] - (2 * r));
+            }
+        }
+
+        public void releaseResource() {
+            super.releaseResource();
+            cubicCurve = null;
+        }
+    }
+
+    static class QuadCurveRenderer extends FlatParticleRenderer {
+        QuadCurve[] quadCurve;
+
+        QuadCurveRenderer(int n, double r) {
+            super(n, r);
+            quadCurve = new QuadCurve[n];
+        }
+
+        @Override
+        public void addComponents(Group node, int n, double[] x, double[] y, double[] vx, double[] vy) {
+            for (int id = 0; id < n; id++) {
+                quadCurve[id] = new QuadCurve();
+
+                quadCurve[id].setStartX(0);
+                quadCurve[id].setStartY(50);
+                quadCurve[id].setControlX(25);
+                quadCurve[id].setControlY(0);
+                quadCurve[id].setEndX(100);
+                quadCurve[id].setEndY(50);
+                quadCurve[id].setFill(colors[id % colors.length]);
+                node.getChildren().add(quadCurve[id]);
+            }
+
+        }
+
+        public void updateComponentCoordinates(int n, double[] x, double[] y, double[] vx, double[] vy) {
+            for (int id = 0; id < n; id++) {
+                quadCurve[id].setTranslateX(x[id] - r);
+                quadCurve[id].setTranslateY(y[id] - (2 * r));
+            }
+        }
+
+        public void releaseResource() {
+            super.releaseResource();
+            quadCurve = null;
+        }
+    }
+
+    static class CircleRenderer extends FlatParticleRenderer {
+        Circle[] circle;
+
+        CircleRenderer(int n, double r) {
+            super(n, r);
+            circle = new Circle[n];
+        }
+
+        @Override
+        public void addComponents(Group node, int n, double[] x, double[] y, double[] vx, double[] vy) {
+            for (int id = 0; id < n; id++) {
+                circle[id] = new Circle();
+
+                circle[id].setCenterX(x[id]);
+                circle[id].setCenterY(y[id]);
+                circle[id].setRadius(r);
+                circle[id].setFill(colors[id % colors.length]);
+                node.getChildren().add(circle[id]);
+            }
+        }
+
+        public void updateComponentCoordinates(int n, double[] x, double[] y, double[] vx, double[] vy) {
+            for (int id = 0; id < n; id++) {
+                circle[id].setCenterX(x[id]);
+                circle[id].setCenterY(y[id]);
+            }
+        }
+
+        public void releaseResource() {
+            super.releaseResource();
+            circle = null;
+        }
+    }
+
+    static class CircleRendererRH extends CircleRenderer {
+
+        CircleRendererRH(int n, double r) {
+            super(n, r);
+        }
+
+        @Override
+        public void addComponents(Group node, int n, double[] x, double[] y, double[] vx, double[] vy) {
+            super.addComponents(node, n, x, y, vx, vy);
+            for (int id = 0; id < n; id++) {
+                circle[id].setSmooth(false);
+            }
+        }
+    }
+
+    static class CircleRendererBlendMultiply extends CircleRenderer {
+
+        CircleRendererBlendMultiply(int n, double r) {
+            super(n, r);
+        }
+
+        @Override
+        public void addComponents(Group node, int n, double[] x, double[] y, double[] vx, double[] vy) {
+            super.addComponents(node, n, x, y, vx, vy);
+            for (int id = 0; id < n; id += 10) {
+                circle[id].setBlendMode(BlendMode.MULTIPLY);
+            }
+        }
+    }
+
+    static class CircleRendererBlendAdd extends CircleRenderer {
+
+        CircleRendererBlendAdd(int n, double r) {
+            super(n, r);
+        }
+
+        @Override
+        public void addComponents(Group node, int n, double[] x, double[] y, double[] vx, double[] vy) {
+            super.addComponents(node, n, x, y, vx, vy);
+            for (int id = 0; id < n; id += 10) {
+                circle[id].setBlendMode(BlendMode.ADD);
+            }
+        }
+    }
+
+    static class CircleRendererBlendDarken extends CircleRenderer {
+
+        CircleRendererBlendDarken(int n, double r) {
+            super(n, r);
+        }
+
+        @Override
+        public void addComponents(Group node, int n, double[] x, double[] y, double[] vx, double[] vy) {
+            super.addComponents(node, n, x, y, vx, vy);
+            for (int id = 0; id < n; id += 10) {
+                circle[id].setBlendMode(BlendMode.DARKEN);
+            }
+        }
+    }
+
+    static class StrokedCircleRenderer extends CircleRenderer {
+
+        StrokedCircleRenderer(int n, double r) {
+            super(n, r);
+        }
+
+        @Override
+        public void addComponents(Group node, int n, double[] x, double[] y, double[] vx, double[] vy) {
+            super.addComponents(node, n, x, y, vx, vy);
+            for (int id = 0; id < n; id++) {
+                circle[id].setFill(null);
+                circle[id].setStroke(colors[id % colors.length]);
+            }
+        }
+    }
+
+    static class LinGradCircleRenderer extends CircleRenderer {
+        Stop[] stops;
+        LinearGradient linGradient;
+
+        LinGradCircleRenderer(int n, double r) {
+            super(n, r);
+            stops = new Stop[] { new Stop(0, Color.BLACK), new Stop(1, Color.RED)};
+            linGradient = new LinearGradient(0, 0, 1, 0, true, CycleMethod.NO_CYCLE, stops);
+        }
+
+        @Override
+        public void addComponents(Group node, int n, double[] x, double[] y, double[] vx, double[] vy) {
+            super.addComponents(node, n, x, y, vx, vy);
+            for (int id = 0; id < n; id++) {
+                circle[id].setFill(linGradient);
+            }
+        }
+    }
+
+    static class RadGradCircleRenderer extends CircleRenderer {
+        Stop[] stops;
+        RadialGradient radGradient;
+
+        RadGradCircleRenderer(int n, double r) {
+            super(n, r);
+            stops = new Stop[] { new Stop(0.0, Color.WHITE), new Stop(0.1, Color.RED), new Stop(1.0, Color.DARKRED)};
+        }
+
+        @Override
+        public void addComponents(Group node, int n, double[] x, double[] y, double[] vx, double[] vy) {
+            super.addComponents(node, n, x, y, vx, vy);
+            for (int id = 0; id < n; id++) {
+                radGradient = new RadialGradient(0, 0, x[id], y[id], 60, false, CycleMethod.NO_CYCLE, stops);
+                circle[id].setFill(radGradient);
+            }
+        }
+    }
+
+    static class EllipseRenderer extends FlatParticleRenderer {
+        Ellipse[] ellipse;
+
+        EllipseRenderer(int n, double r) {
+            super(n, r);
+            ellipse = new Ellipse[n];
+        }
+
+        @Override
+        public void addComponents(Group node, int n, double[] x, double[] y, double[] vx, double[] vy) {
+            for (int id = 0; id < n; id++) {
+                ellipse[id] = new Ellipse();
+
+                ellipse[id].setCenterX(x[id]);
+                ellipse[id].setCenterY(y[id]);
+                ellipse[id].setRadiusX(2 * r);
+                ellipse[id].setRadiusY(r);
+                ellipse[id].setFill(colors[id % colors.length]);
+                node.getChildren().add(ellipse[id]);
+            }
+        }
+
+        public void updateComponentCoordinates(int n, double[] x, double[] y, double[] vx, double[] vy) {
+            for (int id = 0; id < n; id++) {
+                ellipse[id].setCenterX(x[id]);
+                ellipse[id].setCenterY(y[id]);
+            }
+        }
+
+        public void releaseResource() {
+            super.releaseResource();
+            ellipse = null;
+        }
+    }
+
+    static class LineRenderer extends FlatParticleRenderer {
+        Line[] line;
+
+        LineRenderer(int n, double r) {
+            super(n, r);
+            line = new Line[n];
+        }
+
+        @Override
+        public void addComponents(Group node, int n, double[] x, double[] y, double[] vx, double[] vy) {
+            for (int id = 0; id < n; id++) {
+                line[id] = new Line();
+
+                line[id].setStartX(0);
+                line[id].setStartY(0);
+                line[id].setEndX(50);
+                line[id].setEndY(50);
+                line[id].setStroke(colors[id % colors.length]);
+                node.getChildren().add(line[id]);
+            }
+        }
+
+        public void updateComponentCoordinates(int n, double[] x, double[] y, double[] vx, double[] vy) {
+            for (int id = 0; id < n; id++) {
+                line[id].setTranslateX(x[id] - r);
+                line[id].setTranslateY(y[id] - r);
+            }
+        }
+
+        public void releaseResource() {
+            super.releaseResource();
+            line = null;
+        }
+    }
+
+    static class PathRenderer extends FlatParticleRenderer {
+        Path[] path;
+
+        PathRenderer(int n, double r) {
+            super(n, r);
+            path = new Path[n];
+        }
+
+        @Override
+        public void addComponents(Group node, int n, double[] x, double[] y, double[] vx, double[] vy) {
+            for (int id = 0; id < n; id++) {
+                MoveTo moveTo = new MoveTo();
+                moveTo.setX(0);
+                moveTo.setY(0);
+
+                CubicCurveTo cubicCurveTo = new CubicCurveTo();
+                cubicCurveTo.setX(40);
+                cubicCurveTo.setY(45);
+                cubicCurveTo.setControlX1(0);
+                cubicCurveTo.setControlY1(0);
+                cubicCurveTo.setControlX2(30);
+                cubicCurveTo.setControlY2(80);
+
+                QuadCurveTo quadCurveTo = new QuadCurveTo();
+                quadCurveTo.setX(60);
+                quadCurveTo.setY(45);
+                quadCurveTo.setControlX(50);
+                quadCurveTo.setControlY(0);
+
+                ArcTo arcTo = new ArcTo();
+                arcTo.setX(80);
+                arcTo.setY(45);
+                arcTo.setRadiusX(20);
+                arcTo.setRadiusY(40);
+                arcTo.setLargeArcFlag(true);
+                arcTo.setSweepFlag(true);
+
+                path[id] = new Path();
+                path[id].setStroke(colors[id % colors.length]);
+                path[id].getElements().addAll(moveTo, cubicCurveTo, quadCurveTo, arcTo);
+
+                node.getChildren().add(path[id]);
+            }
+        }
+
+        public void updateComponentCoordinates(int n, double[] x, double[] y, double[] vx, double[] vy) {
+            for (int id = 0; id < n; id++) {
+                path[id].setTranslateX(x[id] - r);
+                path[id].setTranslateY(y[id] - r);
+            }
+        }
+
+        public void releaseResource() {
+            super.releaseResource();
+            path = null;
+        }
+    }
+
+    static class RectangleRenderer extends FlatParticleRenderer {
+        Rectangle[] rectangle;
+
+        RectangleRenderer(int n, double r) {
+            super(n, r);
+            rectangle = new Rectangle[n];
+        }
+
+        @Override
+        public void addComponents(Group node, int n, double[] x, double[] y, double[] vx, double[] vy) {
+            for (int id = 0; id < n; id++) {
+                rectangle[id] = new Rectangle();
+
+                rectangle[id].setX(x[id] - r);
+                rectangle[id].setY(y[id] - r);
+                rectangle[id].setWidth(2 * r);
+                rectangle[id].setHeight(2 * r);
+                rectangle[id].setFill(colors[id % colors.length]);
+                node.getChildren().add(rectangle[id]);
+            }
+        }
+
+        public void updateComponentCoordinates(int n, double[] x, double[] y, double[] vx, double[] vy) {
+            for (int id = 0; id < n; id++) {
+                rectangle[id].setX(x[id] - r);
+                rectangle[id].setY(y[id] - r);
+            }
+        }
+
+        public void releaseResource() {
+            super.releaseResource();
+            rectangle = null;
+        }
+    }
+
+    static class RectangleRendererRH extends RectangleRenderer {
+
+        RectangleRendererRH(int n, double r) {
+            super(n, r);
+        }
+
+        @Override
+        public void addComponents(Group node, int n, double[] x, double[] y, double[] vx, double[] vy) {
+            super.addComponents(node, n, x, y, vx, vy);
+            for (int id = 0; id < n; id++) {
+                rectangle[id].setSmooth(false);
+                rectangle[id].setRotate(45);
+            }
+        }
+    }
+
+    static class StrokedRectangleRenderer extends RectangleRenderer {
+
+        StrokedRectangleRenderer(int n, double r) {
+            super(n, r);
+        }
+
+        @Override
+        public void addComponents(Group node, int n, double[] x, double[] y, double[] vx, double[] vy) {
+            super.addComponents(node, n, x, y, vx, vy);
+            for (int id = 0; id < n; id++) {
+                rectangle[id].setFill(null);
+                rectangle[id].setStroke(colors[id % colors.length]);
+            }
+        }
+    }
+
+    static class PolygonRenderer extends FlatParticleRenderer {
+        Polygon[] polygon;
+
+        PolygonRenderer(int n, double r) {
+            super(n, r);
+            polygon = new Polygon[n];
+        }
+
+        @Override
+        public void addComponents(Group node, int n, double[] x, double[] y, double[] vx, double[] vy) {
+            for (int id = 0; id < n; id++) {
+                polygon[id] = new Polygon();
+
+                polygon[id].getPoints().addAll(new Double[]{
+                    0.0, 20.0,
+                    20.0, 0.0,
+                    40.0, 20.0,
+                    40.0, 40.0,
+                    20.0, 60.0,
+                    0.0, 40.0
+                });
+                polygon[id].setFill(colors[id % colors.length]);
+                node.getChildren().add(polygon[id]);
+            }
+        }
+
+        public void updateComponentCoordinates(int n, double[] x, double[] y, double[] vx, double[] vy) {
+            for (int id = 0; id < n; id++) {
+                polygon[id].setTranslateX(x[id] - r);
+                polygon[id].setTranslateY(y[id] - r);
+            }
+        }
+
+        public void releaseResource() {
+            super.releaseResource();
+            polygon = null;
+        }
+    }
+
+    static class StrokedPolygonRenderer extends PolygonRenderer {
+
+        StrokedPolygonRenderer(int n, double r) {
+            super(n, r);
+        }
+
+        @Override
+        public void addComponents(Group node, int n, double[] x, double[] y, double[] vx, double[] vy) {
+            super.addComponents(node, n, x, y, vx, vy);
+            for (int id = 0; id < n; id++) {
+                polygon[id].setFill(null);
+                polygon[id].setStroke(colors[id % colors.length]);
+            }
+        }
+    }
+
+    static class Box3DRenderer extends FlatParticleRenderer {
+        Box[] box;
+
+        Box3DRenderer(int n, double r) {
+            super(n, r);
+            box = new Box[n];
+        }
+
+        @Override
+        public void addComponents(Group node, int n, double[] x, double[] y, double[] vx, double[] vy) {
+            for (int id = 0; id < n; id++) {
+                box[id] = new Box(2 * r, 2 * r, 2 * r);
+
+                box[id].setTranslateX(x[id]);
+                box[id].setTranslateY(y[id]);
+
+                PhongMaterial material = new PhongMaterial();
+                material.setDiffuseColor(colors[id % colors.length]);
+                box[id].setMaterial(material);
+
+                box[id].setRotationAxis(new Point3D(1, 1, 1));
+                box[id].setRotate(45);
+                node.getChildren().add(box[id]);
+            }
+        }
+
+        public void updateComponentCoordinates(int n, double[] x, double[] y, double[] vx, double[] vy) {
+            for (int id = 0; id < n; id++) {
+                box[id].setTranslateX(x[id]);
+                box[id].setTranslateY(y[id]);
+            }
+        }
+
+        public void releaseResource() {
+            super.releaseResource();
+            box = null;
+        }
+    }
+
+    static class CylinderRenderer extends FlatParticleRenderer {
+        Cylinder[] cylinder;
+
+        CylinderRenderer(int n, double r) {
+            super(n, r);
+            cylinder = new Cylinder[n];
+        }
+
+        @Override
+        public void addComponents(Group node, int n, double[] x, double[] y, double[] vx, double[] vy) {
+            for (int id = 0; id < n; id++) {
+                cylinder[id] = new Cylinder(r, 2 * r);
+
+                PhongMaterial material = new PhongMaterial();
+                material.setDiffuseColor(colors[id % colors.length]);
+                cylinder[id].setMaterial(material);
+
+                cylinder[id].setRotationAxis(new Point3D(1, 1, 1));
+                cylinder[id].setRotate(45);
+                node.getChildren().add(cylinder[id]);
+            }
+        }
+
+        public void updateComponentCoordinates(int n, double[] x, double[] y, double[] vx, double[] vy) {
+            for (int id = 0; id < n; id++) {
+                cylinder[id].setTranslateX(x[id]);
+                cylinder[id].setTranslateY(y[id]);
+            }
+        }
+
+        public void releaseResource() {
+            super.releaseResource();
+            cylinder = null;
+        }
+    }
+
+    static class SphereRenderer extends FlatParticleRenderer {
+        Sphere[] sphere;
+
+        SphereRenderer(int n, double r) {
+            super(n, r);
+            sphere = new Sphere[n];
+        }
+
+        @Override
+        public void addComponents(Group node, int n, double[] x, double[] y, double[] vx, double[] vy) {
+            for (int id = 0; id < n; id++) {
+                sphere[id] = new Sphere(r);
+
+                PhongMaterial material = new PhongMaterial();
+                material.setDiffuseColor(colors[id % colors.length]);
+                sphere[id].setMaterial(material);
+
+                node.getChildren().add(sphere[id]);
+            }
+        }
+
+        public void updateComponentCoordinates(int n, double[] x, double[] y, double[] vx, double[] vy) {
+            for (int id = 0; id < n; id++) {
+                sphere[id].setTranslateX(x[id]);
+                sphere[id].setTranslateY(y[id]);
+            }
+        }
+
+        public void releaseResource() {
+            super.releaseResource();
+            sphere = null;
+        }
+    }
+
+    static class MeshRenderer extends FlatParticleRenderer {
+        MeshView[] meshView;
+
+        final static float minX = -10;
+        final static float minY = -10;
+        final static float maxX = 10;
+        final static float maxY = 10;
+        final int pointSize = 3;
+        final int texCoordSize = 2;
+        final int faceSize = 6;
+        final int scale = 3;
+
+        MeshRenderer(int n, double r) {
+            super(n, r);
+            meshView = new MeshView[n];
+        }
+
+        @Override
+        public void addComponents(Group node, int n, double[] x, double[] y, double[] vx, double[] vy) {
+            int subDivX = 2;
+            int subDivY = 2;
+            int numDivX = subDivX + 1;
+            int numVerts = (subDivY + 1) * numDivX;
+            float points[] = new float[numVerts * pointSize];
+            float texCoords[] = new float[numVerts * texCoordSize];
+            int faceCount = subDivX * subDivY * 2;
+            int faces[] = new int[ faceCount * faceSize];
+
+            // Create points and texture coordinates
+            for (int i = 0; i <= subDivY; i++) {
+                float dy = (float) i / subDivY;
+                double fy = (1 - dy) * minY + dy * maxY;
+                for (int j = 0; j <= subDivX; j++) {
+                    float dx = (float) j / subDivX;
+                    double fx = (1 - dx) * minX + dx * maxX;
+                    int index = i * numDivX * pointSize + (j * pointSize);
+                    points[index] = (float) fx * scale;
+                    points[index + 1] = (float) fy * scale;
+                    points[index + 2] = (float) getSinDivX(fx, fy) * scale;
+                    index = i * numDivX * texCoordSize + (j * texCoordSize);
+                    texCoords[index] = dx;
+                    texCoords[index + 1] = dy;
+                }
+            }
+
+            // Create faces
+            for (int i = 0; i < subDivY; i++) {
+                for (int j = 0; j < subDivX; j++) {
+                    int p00 = i * numDivX + j;
+                    int p01 = p00 + 1;
+                    int p10 = p00 + numDivX;
+                    int p11 = p10 + 1;
+                    int tc00 = i * numDivX + j;
+                    int tc01 = tc00 + 1;
+                    int tc10 = tc00 + numDivX;
+                    int tc11 = tc10 + 1;
+
+                    int index = (i * subDivX * faceSize + (j * faceSize)) * 2;
+                    faces[index + 0] = p00;
+                    faces[index + 1] = tc00;
+                    faces[index + 2] = p10;
+                    faces[index + 3] = tc10;
+                    faces[index + 4] = p11;
+                    faces[index + 5] = tc11;
+                    index += faceSize;
+                    faces[index + 0] = p11;
+                    faces[index + 1] = tc11;
+                    faces[index + 2] = p01;
+                    faces[index + 3] = tc01;
+                    faces[index + 4] = p00;
+                    faces[index + 5] = tc00;
+                }
+            }
+
+            TriangleMesh triangleMesh = new TriangleMesh();
+            triangleMesh.getPoints().setAll(points);
+            triangleMesh.getTexCoords().setAll(texCoords);
+            triangleMesh.getFaces().setAll(faces);
+
+            for (int id = 0; id < n; id++) {
+                PhongMaterial material = new PhongMaterial();
+                material.setDiffuseColor(colors[id % colors.length]);
+                material.setSpecularColor(colors[id % colors.length]);
+                String url = RenderPerfTest.class.getResource("duke.png").toString();
+                material.setDiffuseMap(new Image(url));
+
+                meshView[id] = new MeshView(triangleMesh);
+                meshView[id].setMaterial(material);
+                meshView[id].setDrawMode(DrawMode.FILL);
+                meshView[id].setCullFace(CullFace.BACK);
+
+                node.getChildren().add(meshView[id]);
+            }
+        }
+
+        private double getSinDivX(double x, double y) {
+            float funcValue = -30.0f;
+            double r = Math.sqrt(x*x + y*y);
+            return funcValue * (r == 0 ? 1 : Math.sin(r) / r);
+        }
+
+        public void updateComponentCoordinates(int n, double[] x, double[] y, double[] vx, double[] vy) {
+            for (int id = 0; id < n; id++) {
+                meshView[id].setTranslateX(x[id]);
+                meshView[id].setTranslateY(y[id]);
+            }
+        }
+
+        public void releaseResource() {
+            super.releaseResource();
+            meshView = null;
+        }
+    }
+
+    static class WhiteTextRenderer implements ParticleRenderer {
+        int n;
+        double r;
+        Text[] text;
+
+        WhiteTextRenderer(int n, double r) {
+            this.n = n;
+            this.r = r;
+            text = new Text[n];
+        }
+
+        void setPaint(Text t, int id) {
+            t.setFill(Color.WHITE);
+        }
+
+        @Override
+        public void addComponents(Group node, int n, double[] x, double[] y, double[] vx, double[] vy) {
+            for (int id = 0; id < n; id++) {
+                text[id] = new Text(x[id], y[id], "The quick brown fox jumps over the lazy dog");
+                setPaint(text[id], id);
+                node.getChildren().add(text[id]);
+            }
+        }
+
+        public void updateComponentCoordinates(int n, double[] x, double[] y, double[] vx, double[] vy) {
+            for (int id = 0; id < n; id++) {
+                text[id].setX(x[id]);
+                text[id].setY(y[id]);
+            }
+        }
+
+        public void releaseResource() {
+            text = null;
+        }
+
+        public int getObjectCount() {
+            return n;
+        }
+
+        public double getParticleRadius() {
+            return r;
+        }
+    }
+
+    static class ColorTextRenderer extends WhiteTextRenderer {
+        Color[] colors;
+
+        ColorTextRenderer(int n, double r) {
+            super(n, r);
+            colors = new Color[n];
+
+            for (int i = 0; i < n; i++) {
+                colors[i] = Color.rgb(random.nextInt(256), random.nextInt(256), random.nextInt(256));
+            }
+        }
+
+        @Override
+        public void addComponents(Group node, int n, double[] x, double[] y, double[] vx, double[] vy) {
+            super.addComponents(node, n, x, y, vx, vy);
+            for (int id = 0; id < n; id++) {
+                text[id].setFill(colors[id % colors.length]);
+            }
+        }
+    }
+
+    static class LargeTextRenderer extends WhiteTextRenderer {
+        Font font;
+
+        LargeTextRenderer(int n, double r) {
+            super(n, r);
+            font = new Font(48);
+        }
+
+        @Override
+        public void addComponents(Group node, int n, double[] x, double[] y, double[] vx, double[] vy) {
+            super.addComponents(node, n, x, y, vx, vy);
+            for (int id = 0; id < n; id++) {
+                text[id].setFont(font);
+            }
+        }
+    }
+
+    static class LargeColorTextRenderer extends ColorTextRenderer {
+        Font font;
+
+        LargeColorTextRenderer(int n, double r) {
+            super(n, r);
+            font = new Font(48);
+        }
+
+        @Override
+        public void addComponents(Group node, int n, double[] x, double[] y, double[] vx, double[] vy) {
+            super.addComponents(node, n, x, y, vx, vy);
+            for (int id = 0; id < n; id++) {
+                text[id].setFont(font);
+            }
+        }
+    }
+
+    static class ImageRenderer implements ParticleRenderer {
+        ImageView[] dukeImg;
+        Image image;
+        int n;
+        double r;
+
+        ImageRenderer(int n, double r) {
+            this.n = n;
+            this.r = r;
+            try {
+                String url = RenderPerfTest.class.getResource("duke.png").toString();
+                image = new Image(url);
+                dukeImg = new ImageView[n];
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        @Override
+        public void addComponents(Group node, int n, double[] x, double[] y, double[] vx, double[] vy) {
+            for (int id = 0; id < n; id++) {
+                dukeImg[id] = new ImageView();
+                dukeImg[id].setImage(image);
+                dukeImg[id].setX(x[id] - r);
+                dukeImg[id].setY(y[id] - 2 * r);
+
+                node.getChildren().add(dukeImg[id]);
+            }
+        }
+
+        public void updateComponentCoordinates(int n, double[] x, double[] y, double[] vx, double[] vy) {
+            for (int id = 0; id < n; id++) {
+                dukeImg[id].setX(x[id] - r);
+                dukeImg[id].setY(y[id] - 2 * r);
+            }
+        }
+
+        public void releaseResource() {
+            image = null;
+            dukeImg = null;
+        }
+
+        public int getObjectCount() {
+            return n;
+        }
+
+        public double getParticleRadius() {
+            return r;
+        }
+    }
+
+    static class ImageRendererRH extends ImageRenderer {
+
+        ImageRendererRH(int n, double r) {
+            super(n, r);
+        }
+
+        @Override
+        public void addComponents(Group node, int n, double[] x, double[] y, double[] vx, double[] vy) {
+            super.addComponents(node, n, x, y, vx, vy);
+            for (int id = 0; id < n; id++) {
+                dukeImg[id].setSmooth(false);
+            }
+        }
+    }
+
+    static class MultiShapeRendererInterleaved extends FlatParticleRenderer {
+        Circle[] circle;
+        Rectangle[] rectangle;
+        Arc[] arc;
+        Ellipse[] ellipse;
+
+        MultiShapeRendererInterleaved(int n, double r) {
+            super((n = roundUpTo4(n)), r);
+            circle = new Circle[n / 4];
+            rectangle = new Rectangle[n / 4];
+            arc = new Arc[n / 4];
+            ellipse = new Ellipse[n / 4];
+        }
+
+        @Override
+        public void addComponents(Group node, int n, double[] x, double[] y, double[] vx, double[] vy) {
+            int index =0;
+             for (int id = 0; id < n / 4; id++) {
+                circle[id] = new Circle();
+
+                circle[id].setCenterX(x[index]);
+                circle[id].setCenterY(y[index]);
+                circle[id].setRadius(r);
+                circle[id].setFill(colors[index % colors.length]);
+                node.getChildren().add(circle[id]);
+                index++;
+
+                rectangle[id] = new Rectangle();
+
+                rectangle[id].setX(x[index] - r);
+                rectangle[id].setY(y[index] - r);
+                rectangle[id].setWidth(2 * r);
+                rectangle[id].setHeight(2 * r);
+                rectangle[id].setFill(colors[index % colors.length]);
+                node.getChildren().add(rectangle[id]);
+                index++;
+
+                arc[id] = new Arc();
+
+                arc[id].setCenterX(x[index]);
+                arc[id].setCenterY(y[index]);
+                arc[id].setRadiusX(r);
+                arc[id].setRadiusY(r);
+                arc[id].setStartAngle(random.nextDouble(100));
+                arc[id].setLength(random.nextDouble(360));
+                arc[id].setType(ArcType.ROUND);
+                arc[id].setFill(colors[index % colors.length]);
+                node.getChildren().add(arc[id]);
+                index++;
+
+                ellipse[id] = new Ellipse();
+
+                ellipse[id].setCenterX(x[index]);
+                ellipse[id].setCenterY(y[index]);
+                ellipse[id].setRadiusX(2 * r);
+                ellipse[id].setRadiusY(r);
+                ellipse[id].setFill(colors[index % colors.length]);
+                node.getChildren().add(ellipse[id]);
+                index++;
+            }
+        }
+
+        public void updateComponentCoordinates(int n, double[] x, double[] y, double[] vx, double[] vy) {
+            int index = 0;
+            for (int id = 0; id < n / 4; id++) {
+                circle[id].setCenterX(x[index]);
+                circle[id].setCenterY(y[index]);
+                index++;
+
+                rectangle[id].setX(x[index] - r);
+                rectangle[id].setY(y[index] - r);
+                index++;
+
+                arc[id].setCenterX(x[index]);
+                arc[id].setCenterY(y[index]);
+                index++;
+
+                ellipse[id].setCenterX(x[index]);
+                ellipse[id].setCenterY(y[index]);
+                index++;
+            }
+        }
+
+        public void releaseResource() {
+            circle = null;
+            rectangle = null;
+            arc = null;
+            ellipse = null;
+        }
+    }
+
+    static class MultiShapeRenderer extends MultiShapeRendererInterleaved {
+
+        MultiShapeRenderer(int n, double r) {
+            super(n, r);
+        }
+
+        @Override
+        public void addComponents(Group node, int n, double[] x, double[] y, double[] vx, double[] vy) {
+            int index =0;
+             for (int id = 0; id < n / 4; id++) {
+                circle[id] = new Circle();
+
+                circle[id].setCenterX(x[index]);
+                circle[id].setCenterY(y[index]);
+                circle[id].setRadius(r);
+                circle[id].setFill(colors[index % colors.length]);
+                node.getChildren().add(circle[id]);
+                index++;
+            }
+
+            for (int id = 0; id < n / 4; id++) {
+
+                rectangle[id] = new Rectangle();
+
+                rectangle[id].setX(x[index] - r);
+                rectangle[id].setY(y[index] - r);
+                rectangle[id].setWidth(2 * r);
+                rectangle[id].setHeight(2 * r);
+                rectangle[id].setFill(colors[index % colors.length]);
+                node.getChildren().add(rectangle[id]);
+                index++;
+            }
+
+            for (int id = 0; id < n / 4; id++) {
+
+                arc[id] = new Arc();
+
+                arc[id].setCenterX(x[index]);
+                arc[id].setCenterY(y[index]);
+                arc[id].setRadiusX(r);
+                arc[id].setRadiusY(r);
+                arc[id].setStartAngle(random.nextDouble(100));
+                arc[id].setLength(random.nextDouble(360));
+                arc[id].setType(ArcType.ROUND);
+                arc[id].setFill(colors[index % colors.length]);
+                node.getChildren().add(arc[id]);
+                index++;
+            }
+            for (int id = 0; id < n / 4; id++) {
+
+                ellipse[id] = new Ellipse();
+
+                ellipse[id].setCenterX(x[index]);
+                ellipse[id].setCenterY(y[index]);
+                ellipse[id].setRadiusX(2 * r);
+                ellipse[id].setRadiusY(r);
+                ellipse[id].setFill(colors[index % colors.length]);
+                node.getChildren().add(ellipse[id]);
+                index++;
+            }
+        }
+
+        public void updateComponentCoordinates(int n, double[] x, double[] y, double[] vx, double[] vy) {
+            int index = 0;
+            for (int id = 0; id < n / 4; id++) {
+                circle[id].setCenterX(x[index]);
+                circle[id].setCenterY(y[index]);
+                index++;
+            }
+            for (int id = 0; id < n / 4; id++) {
+                rectangle[id].setX(x[index] - r);
+                rectangle[id].setY(y[index] - r);
+                index++;
+            }
+
+            for (int id = 0; id < n / 4; id++) {
+                arc[id].setCenterX(x[index]);
+                arc[id].setCenterY(y[index]);
+                index++;
+            }
+
+            for (int id = 0; id < n / 4; id++) {
+                ellipse[id].setCenterX(x[index]);
+                ellipse[id].setCenterY(y[index]);
+                index++;
+            }
+        }
+    }
+
+    static class MultiShape2D3DRendererInterleaved extends FlatParticleRenderer {
+        Circle[] circle;
+        Sphere[] sphere;
+        Rectangle[] rectangle;
+        Box[] box;
+
+        MultiShape2D3DRendererInterleaved(int n, double r) {
+            super((n = roundUpTo4(n)), r);
+            circle = new Circle[n / 4];
+            sphere = new Sphere[n / 4];
+            rectangle = new Rectangle[n / 4];
+            box = new Box[n / 4];
+        }
+
+        @Override
+        public void addComponents(Group node, int n, double[] x, double[] y, double[] vx, double[] vy) {
+            int index =0;
+             for (int id = 0; id < n / 4; id++) {
+                circle[id] = new Circle();
+
+                circle[id].setCenterX(x[index]);
+                circle[id].setCenterY(y[index]);
+                circle[id].setRadius(r);
+                circle[id].setFill(colors[index % colors.length]);
+                node.getChildren().add(circle[id]);
+                index++;
+
+                sphere[id] = new Sphere(r);
+
+                PhongMaterial materialSphere = new PhongMaterial();
+                materialSphere.setDiffuseColor(colors[index % colors.length]);
+                sphere[id].setMaterial(materialSphere);
+                node.getChildren().add(sphere[id]);
+                index++;
+
+                rectangle[id] = new Rectangle();
+
+                rectangle[id].setX(x[index] - r);
+                rectangle[id].setY(y[index] - r);
+                rectangle[id].setWidth(2 * r);
+                rectangle[id].setHeight(2 * r);
+                rectangle[id].setFill(colors[index % colors.length]);
+                node.getChildren().add(rectangle[id]);
+                index++;
+
+                box[id] = new Box(2 * r, 2 * r, 2 * r);
+
+                box[id].setTranslateX(x[index]);
+                box[id].setTranslateY(y[index]);
+
+                PhongMaterial materialBox = new PhongMaterial();
+                materialBox.setDiffuseColor(colors[index % colors.length]);
+                box[id].setMaterial(materialBox);
+
+                box[id].setRotationAxis(new Point3D(1, 1, 1));
+                box[id].setRotate(45);
+                node.getChildren().add(box[id]);
+                index++;
+            }
+        }
+
+        public void updateComponentCoordinates(int n, double[] x, double[] y, double[] vx, double[] vy) {
+            int index = 0;
+            for (int id = 0; id < n / 4; id++) {
+                circle[id].setCenterX(x[index]);
+                circle[id].setCenterY(y[index]);
+                index++;
+
+                sphere[id].setTranslateX(x[index]);
+                sphere[id].setTranslateY(y[index]);
+                index++;
+
+                rectangle[id].setX(x[index] - r);
+                rectangle[id].setY(y[index] - r);
+                index++;
+
+                box[id].setTranslateX(x[index]);
+                box[id].setTranslateY(y[index]);
+                index++;
+            }
+        }
+
+        public void releaseResource() {
+            circle = null;
+            sphere = null;
+            rectangle = null;
+            box = null;
+        }
+    }
+
+    static class MultiShape2D3DRenderer extends MultiShape2D3DRendererInterleaved {
+        MultiShape2D3DRenderer(int n, double r) {
+            super(n, r);
+        }
+
+        @Override
+        public void addComponents(Group node, int n, double[] x, double[] y, double[] vx, double[] vy) {
+            int index =0;
+            for (int id = 0; id < n / 4; id++) {
+                circle[id] = new Circle();
+
+                circle[id].setCenterX(x[index]);
+                circle[id].setCenterY(y[index]);
+                circle[id].setRadius(r);
+                circle[id].setFill(colors[index % colors.length]);
+                node.getChildren().add(circle[id]);
+                index++;
+            }
+
+            for (int id = 0; id < n / 4; id++) {
+                sphere[id] = new Sphere(r);
+
+                PhongMaterial materialSphere = new PhongMaterial();
+                materialSphere.setDiffuseColor(colors[index % colors.length]);
+                sphere[id].setMaterial(materialSphere);
+                node.getChildren().add(sphere[id]);
+                index++;
+            }
+
+            for (int id = 0; id < n / 4; id++) {
+
+                rectangle[id] = new Rectangle();
+
+                rectangle[id].setX(x[index] - r);
+                rectangle[id].setY(y[index] - r);
+                rectangle[id].setWidth(2 * r);
+                rectangle[id].setHeight(2 * r);
+                rectangle[id].setFill(colors[index % colors.length]);
+                node.getChildren().add(rectangle[id]);
+                index++;
+            }
+
+            for (int id = 0; id < n / 4; id++) {
+
+                box[id] = new Box(2 * r, 2 * r, 2 * r);
+
+                box[id].setTranslateX(x[index]);
+                box[id].setTranslateY(y[index]);
+
+                PhongMaterial materialBox = new PhongMaterial();
+                materialBox.setDiffuseColor(colors[index % colors.length]);
+                box[id].setMaterial(materialBox);
+
+                box[id].setRotationAxis(new Point3D(1, 1, 1));
+                box[id].setRotate(45);
+                node.getChildren().add(box[id]);
+                index++;
+            }
+        }
+
+        public void updateComponentCoordinates(int n, double[] x, double[] y, double[] vx, double[] vy) {
+            int index = 0;
+            for (int id = 0; id < n / 4; id++) {
+                circle[id].setCenterX(x[index]);
+                circle[id].setCenterY(y[index]);
+                index++;
+            }
+
+            for (int id = 0; id < n / 4; id++) {
+                sphere[id].setTranslateX(x[index]);
+                sphere[id].setTranslateY(y[index]);
+                index++;
+            }
+
+            for (int id = 0; id < n / 4; id++) {
+                rectangle[id].setX(x[index] - r);
+                rectangle[id].setY(y[index] - r);
+                index++;
+            }
+
+            for (int id = 0; id < n / 4; id++) {
+                box[id].setTranslateX(x[index]);
+                box[id].setTranslateY(y[index]);
+                index++;
+            }
+        }
+    }
+
+    static class MultiShape3DRendererInterleaved extends FlatParticleRenderer {
+        Sphere[] sphere;
+        Box[] box;
+        Cylinder[] cylinder;
+        MeshView[] meshView;
+
+        final static float minX = -10;
+        final static float minY = -10;
+        final static float maxX = 10;
+        final static float maxY = 10;
+        final int pointSize = 3;
+        final int texCoordSize = 2;
+        final int faceSize = 6;
+        final int scale = 3;
+
+
+        MultiShape3DRendererInterleaved(int n, double r) {
+            super((n = roundUpTo4(n)), r);
+            sphere = new Sphere[n / 4];
+            box = new Box[n / 4];
+            cylinder = new Cylinder[n / 4];
+            meshView = new MeshView[n / 4];
+        }
+
+        @Override
+        public void addComponents(Group node, int n, double[] x, double[] y, double[] vx, double[] vy) {
+            int index =0;
+
+            int subDivX = 2;
+            int subDivY = 2;
+            int numDivX = subDivX + 1;
+            int numVerts = (subDivY + 1) * numDivX;
+            float points[] = new float[numVerts * pointSize];
+            float texCoords[] = new float[numVerts * texCoordSize];
+            int faceCount = subDivX * subDivY * 2;
+            int faces[] = new int[ faceCount * faceSize];
+
+            // Create points and texture coordinates
+            for (int i = 0; i <= subDivY; i++) {
+                float dy = (float) i / subDivY;
+                double fy = (1 - dy) * minY + dy * maxY;
+                for (int j = 0; j <= subDivX; j++) {
+                    float dx = (float) j / subDivX;
+                    double fx = (1 - dx) * minX + dx * maxX;
+                    int idx = i * numDivX * pointSize + (j * pointSize);
+                    points[idx] = (float) fx * scale;
+                    points[idx + 1] = (float) fy * scale;
+                    points[idx + 2] = (float) getSinDivX(fx, fy) * scale;
+                    idx = i * numDivX * texCoordSize + (j * texCoordSize);
+                    texCoords[idx] = dx;
+                    texCoords[idx + 1] = dy;
+                }
+            }
+
+            // Create faces
+            for (int i = 0; i < subDivY; i++) {
+                for (int j = 0; j < subDivX; j++) {
+                    int p00 = i * numDivX + j;
+                    int p01 = p00 + 1;
+                    int p10 = p00 + numDivX;
+                    int p11 = p10 + 1;
+                    int tc00 = i * numDivX + j;
+                    int tc01 = tc00 + 1;
+                    int tc10 = tc00 + numDivX;
+                    int tc11 = tc10 + 1;
+
+                    int idx = (i * subDivX * faceSize + (j * faceSize)) * 2;
+                    faces[idx + 0] = p00;
+                    faces[idx + 1] = tc00;
+                    faces[idx + 2] = p10;
+                    faces[idx + 3] = tc10;
+                    faces[idx + 4] = p11;
+                    faces[idx + 5] = tc11;
+                    idx += faceSize;
+                    faces[idx + 0] = p11;
+                    faces[idx + 1] = tc11;
+                    faces[idx + 2] = p01;
+                    faces[idx + 3] = tc01;
+                    faces[idx + 4] = p00;
+                    faces[idx + 5] = tc00;
+                }
+            }
+
+            TriangleMesh triangleMesh = new TriangleMesh();
+            triangleMesh.getPoints().setAll(points);
+            triangleMesh.getTexCoords().setAll(texCoords);
+            triangleMesh.getFaces().setAll(faces);
+
+            for (int id = 0; id < n / 4; id++) {
+                sphere[id] = new Sphere(r);
+
+                PhongMaterial materialSphere = new PhongMaterial();
+                materialSphere.setDiffuseColor(colors[index % colors.length]);
+                sphere[id].setMaterial(materialSphere);
+                node.getChildren().add(sphere[id]);
+                index++;
+
+                box[id] = new Box(2 * r, 2 * r, 2 * r);
+
+                box[id].setTranslateX(x[index]);
+                box[id].setTranslateY(y[index]);
+
+                PhongMaterial materialBox = new PhongMaterial();
+                materialBox.setDiffuseColor(colors[index % colors.length]);
+                box[id].setMaterial(materialBox);
+
+                box[id].setRotationAxis(new Point3D(1, 1, 1));
+                box[id].setRotate(45);
+                node.getChildren().add(box[id]);
+                index++;
+
+
+                cylinder[id] = new Cylinder(r, 2 * r);
+
+                PhongMaterial materialCylinder = new PhongMaterial();
+                materialCylinder.setDiffuseColor(colors[id % colors.length]);
+                cylinder[id].setMaterial(materialCylinder);
+
+                cylinder[id].setRotationAxis(new Point3D(1, 1, 1));
+                cylinder[id].setRotate(45);
+                node.getChildren().add(cylinder[id]);
+                index++;
+
+                PhongMaterial materialMesh = new PhongMaterial();
+                materialMesh.setDiffuseColor(colors[id % colors.length]);
+                materialMesh.setSpecularColor(colors[id % colors.length]);
+                String url = RenderPerfTest.class.getResource("duke.png").toString();
+                materialMesh.setDiffuseMap(new Image(url));
+
+                meshView[id] = new MeshView(triangleMesh);
+                meshView[id].setMaterial(materialMesh);
+                meshView[id].setDrawMode(DrawMode.FILL);
+                meshView[id].setCullFace(CullFace.BACK);
+                node.getChildren().add(meshView[id]);
+                index++;
+            }
+        }
+
+        private double getSinDivX(double x, double y) {
+            float funcValue = -30.0f;
+            double r = Math.sqrt(x*x + y*y);
+            return funcValue * (r == 0 ? 1 : Math.sin(r) / r);
+        }
+
+        public void updateComponentCoordinates(int n, double[] x, double[] y, double[] vx, double[] vy) {
+            int index = 0;
+            for (int id = 0; id < n / 4; id++) {
+                sphere[id].setTranslateX(x[index]);
+                sphere[id].setTranslateY(y[index]);
+                index++;
+
+                box[id].setTranslateX(x[index]);
+                box[id].setTranslateY(y[index]);
+                index++;
+
+                cylinder[id].setTranslateX(x[index]);
+                cylinder[id].setTranslateY(y[index]);
+                index++;
+
+                meshView[id].setTranslateX(x[index]);
+                meshView[id].setTranslateY(y[index]);
+                index++;
+            }
+        }
+
+        public void releaseResource() {
+            sphere = null;
+            box = null;
+            cylinder = null;
+            meshView = null;
+        }
+    }
+
+    static class MultiShape3DRenderer extends MultiShape3DRendererInterleaved {
+        MultiShape3DRenderer(int n, double r) {
+            super(n, r);
+        }
+
+        @Override
+        public void addComponents(Group node, int n, double[] x, double[] y, double[] vx, double[] vy) {
+            int index =0;
+            for (int id = 0; id < n / 4; id++) {
+                sphere[id] = new Sphere(r);
+
+                PhongMaterial materialSphere = new PhongMaterial();
+                materialSphere.setDiffuseColor(colors[index % colors.length]);
+                sphere[id].setMaterial(materialSphere);
+                node.getChildren().add(sphere[id]);
+                index++;
+            }
+
+            for (int id = 0; id < n / 4; id++) {
+                box[id] = new Box(2 * r, 2 * r, 2 * r);
+                box[id].setTranslateX(x[index]);
+                box[id].setTranslateY(y[index]);
+
+                PhongMaterial materialBox = new PhongMaterial();
+                materialBox.setDiffuseColor(colors[index % colors.length]);
+                box[id].setMaterial(materialBox);
+
+                box[id].setRotationAxis(new Point3D(1, 1, 1));
+                box[id].setRotate(45);
+                node.getChildren().add(box[id]);
+                index++;
+            }
+
+            for (int id = 0; id < n / 4; id++) {
+                cylinder[id] = new Cylinder(r, 2 * r);
+
+                PhongMaterial materialCylinder = new PhongMaterial();
+                materialCylinder.setDiffuseColor(colors[id % colors.length]);
+                cylinder[id].setMaterial(materialCylinder);
+
+                cylinder[id].setRotationAxis(new Point3D(1, 1, 1));
+                cylinder[id].setRotate(45);
+                node.getChildren().add(cylinder[id]);
+                index++;
+            }
+
+            int subDivX = 2;
+            int subDivY = 2;
+            int numDivX = subDivX + 1;
+            int numVerts = (subDivY + 1) * numDivX;
+            float points[] = new float[numVerts * pointSize];
+            float texCoords[] = new float[numVerts * texCoordSize];
+            int faceCount = subDivX * subDivY * 2;
+            int faces[] = new int[ faceCount * faceSize];
+
+            // Create points and texture coordinates
+            for (int i = 0; i <= subDivY; i++) {
+                float dy = (float) i / subDivY;
+                double fy = (1 - dy) * minY + dy * maxY;
+                for (int j = 0; j <= subDivX; j++) {
+                    float dx = (float) j / subDivX;
+                    double fx = (1 - dx) * minX + dx * maxX;
+                    int idx = i * numDivX * pointSize + (j * pointSize);
+                    points[idx] = (float) fx * scale;
+                    points[idx + 1] = (float) fy * scale;
+                    points[idx + 2] = (float) getSinDivX(fx, fy) * scale;
+                    idx = i * numDivX * texCoordSize + (j * texCoordSize);
+                    texCoords[idx] = dx;
+                    texCoords[idx + 1] = dy;
+                }
+            }
+
+            // Create faces
+            for (int i = 0; i < subDivY; i++) {
+                for (int j = 0; j < subDivX; j++) {
+                    int p00 = i * numDivX + j;
+                    int p01 = p00 + 1;
+                    int p10 = p00 + numDivX;
+                    int p11 = p10 + 1;
+                    int tc00 = i * numDivX + j;
+                    int tc01 = tc00 + 1;
+                    int tc10 = tc00 + numDivX;
+                    int tc11 = tc10 + 1;
+
+                    int idx = (i * subDivX * faceSize + (j * faceSize)) * 2;
+                    faces[idx + 0] = p00;
+                    faces[idx + 1] = tc00;
+                    faces[idx + 2] = p10;
+                    faces[idx + 3] = tc10;
+                    faces[idx + 4] = p11;
+                    faces[idx + 5] = tc11;
+                    idx += faceSize;
+                    faces[idx + 0] = p11;
+                    faces[idx + 1] = tc11;
+                    faces[idx + 2] = p01;
+                    faces[idx + 3] = tc01;
+                    faces[idx + 4] = p00;
+                    faces[idx + 5] = tc00;
+                }
+            }
+
+            TriangleMesh triangleMesh = new TriangleMesh();
+            triangleMesh.getPoints().setAll(points);
+            triangleMesh.getTexCoords().setAll(texCoords);
+            triangleMesh.getFaces().setAll(faces);
+
+            for (int id = 0; id < n / 4; id++) {
+                PhongMaterial materialMesh = new PhongMaterial();
+                materialMesh.setDiffuseColor(colors[id % colors.length]);
+                materialMesh.setSpecularColor(colors[id % colors.length]);
+                String url = RenderPerfTest.class.getResource("duke.png").toString();
+                materialMesh.setDiffuseMap(new Image(url));
+
+                meshView[id] = new MeshView(triangleMesh);
+                meshView[id].setMaterial(materialMesh);
+                meshView[id].setDrawMode(DrawMode.FILL);
+                meshView[id].setCullFace(CullFace.BACK);
+                node.getChildren().add(meshView[id]);
+                index++;
+            }
+        }
+
+        private double getSinDivX(double x, double y) {
+            float funcValue = -30.0f;
+            double r = Math.sqrt(x*x + y*y);
+            return funcValue * (r == 0 ? 1 : Math.sin(r) / r);
+        }
+
+        public void updateComponentCoordinates(int n, double[] x, double[] y, double[] vx, double[] vy) {
+            int index = 0;
+            for (int id = 0; id < n / 4; id++) {
+                sphere[id].setTranslateX(x[index]);
+                sphere[id].setTranslateY(y[index]);
+                index++;
+            }
+
+            for (int id = 0; id < n / 4; id++) {
+                box[id].setTranslateX(x[index]);
+                box[id].setTranslateY(y[index]);
+                index++;
+            }
+
+            for (int id = 0; id < n / 4; id++) {
+                cylinder[id].setTranslateX(x[index]);
+                cylinder[id].setTranslateY(y[index]);
+                index++;
+            }
+
+            for (int id = 0; id < n / 4; id++) {
+                meshView[id].setTranslateX(x[index]);
+                meshView[id].setTranslateY(y[index]);
+                index++;
+            }
+        }
+    }
+
+    static class ButtonRenderer implements ParticleRenderer {
+        int n;
+        double r;
+        Button[] button;
+
+        ButtonRenderer(int n, double r) {
+            this.n = n;
+            this.r = r;
+            button = new Button[n];
+        }
+
+        @Override
+        public void addComponents(Group node, int n, double[] x, double[] y, double[] vx, double[] vy) {
+            for (int id = 0; id < n; id++) {
+                button[id] = new Button();
+                button[id].setText(String.valueOf(id));
+                button[id].setLayoutX(x[id]);
+                button[id].setLayoutY(y[id]);
+                node.getChildren().add(button[id]);
+            }
+        }
+
+        public void updateComponentCoordinates(int n, double[] x, double[] y, double[] vx, double[] vy) {
+            for (int id = 0; id < n; id++) {
+                button[id].setLayoutX(x[id]);
+                button[id].setLayoutY(y[id]);
+            }
+        }
+
+        public void releaseResource() {
+            button = null;
+        }
+
+        public int getObjectCount() {
+            return n;
+        }
+
+        public double getParticleRadius() {
+            return r;
+        }
+    }
+
+    /**
+     * {@link PerfMeter} is the class which runs each test.
+     * This uses the JavaFX applcation environment created and invokes {@link ParticleRenderable}
+     * methods to render component and animate. The values details required to calculate
+     * FPS is also tracked in this class.
+     */
+    static class PerfMeter {
+        private String name;
+
+        private int frames = 0;
+        private long testTimeSeconds = DEFAULT_TEST_TIME_SECONDS;
+        private long testTimeNanos = testTimeSeconds * SECOND_IN_NANOS;
+        AnimationTimer frameRateMeter;
+
+        long startTime = 0;
+        long lastTickTime = 0;
+        boolean warmUp = true;
+        boolean completed = false;
+        boolean stopped = false;
+
+        PerfMeter(String name) {
+            this(name, DEFAULT_TEST_TIME_SECONDS);
+        }
+
+        PerfMeter(String name, long testTimeSeconds) {
+            this.name = name;
+            this.testTimeSeconds = testTimeSeconds;
+            this.testTimeNanos = this.testTimeSeconds * SECOND_IN_NANOS;
+        }
+
+        /**
+         * The method which invokes {@link ParticleRenderable} methods for rendering and
+         * moving the components on the JavaFX application. Same JavaFX application
+         * environment is used for all the test cases.
+         * This method warms up the test environment and then runs animation to calculate FPS.
+         * The overridden {@link AnimationTimer#handle} method, gets invoked for each frame
+         * which keeps track of the number of frames rendered, duration of the test case
+         * to calculate FPS value.
+         *
+         * @params  renderable
+         *          object of {@link Renderable}
+         */
+        void exec(final Renderable renderable) throws Exception {
+            final CountDownLatch startupLatch = new CountDownLatch(1);
+            final CountDownLatch stopLatch = new CountDownLatch(1);
+            final CountDownLatch stageHiddenLatch = new CountDownLatch(1);
+
+            Platform.runLater(() -> {
+                group = new Group();
+                renderable.addComponents(group);
+                scene = new Scene(group, WIDTH, HEIGHT);
+                scene.setFill(Color.BLACK);
+
+                stage.setScene(scene);
+                stage.setAlwaysOnTop(true);
+                stage.setOnShown(event -> Platform.runLater(startupLatch::countDown));
+                stage.setOnHidden(event -> Platform.runLater(stageHiddenLatch::countDown));
+                stage.setOnCloseRequest(event -> {
+                    Platform.runLater(stopLatch::countDown);
+                    stopped = true;
+                });
+
+                stage.show();
+
+                frameRateMeter = new AnimationTimer() {
+                    @Override
+                    public void handle(long now) {
+                        if (startTime == 0) {
+                            startTime = now;
+                        }
+
+                        lastTickTime = now;
+
+                        if (warmUp && (now >= startTime + WARMUP_TIME)) {
+                            startTime = now;
+                            frames = 0;
+                            warmUp = false;
+                        }
+
+                        if (!stopped) {
+                            moveComponents(renderable);
+                        }
+
+                        if (!warmUp) {
+                            frames++;
+                            if (testTimeSeconds > 0 && now >= startTime + testTimeNanos) {
+                                completed = true;
+                                stopLatch.countDown();
+                            }
+                        }
+                    }
+                };
+            });
+
+            if (!startupLatch.await(20, TimeUnit.SECONDS)) {
+                throw new RuntimeException("Timeout waiting for stage to load.");
+            }
+            Platform.runLater(() -> frameRateMeter.start());
+
+            if (testTimeSeconds > 0) {
+                // timed run, which means we can also timeout if something goes wrong
+                if (!stopLatch.await(testTimeSeconds + 10, TimeUnit.SECONDS)) {
+                    throw new RuntimeException("Timeout waiting for test execution completion.\n" + name + ": Test workload could be too high. Try running the test with lesser number of objects.");
+                }
+            } else {
+                // infinite run, await until the stage is closed
+                stopLatch.await();
+            }
+            Platform.runLater(() -> frameRateMeter.stop());
+
+            reportFPS();
+            Platform.runLater(() -> {
+                renderable.releaseResource();
+                stage.hide();
+            });
+
+            if (!stageHiddenLatch.await(20, TimeUnit.SECONDS)) {
+                throw new RuntimeException("Timeout waiting for stage to get hidden.");
+            }
+            startTime = 0;
+            warmUp = true;
+        }
+
+        void moveComponents(final Renderable renderable){
+            Platform.runLater(() -> {
+                renderable.updateCoordinates();
+                renderable.updateComponentCoordinates();
+            });
+        }
+
+        void reportFPS() {
+            if (warmUp) {
+                System.out.println(String.format("Test %s stopped before warm-up was completed. Results not valid.", name));
+            } else {
+                long totalTestTime = testTimeNanos;
+                if (totalTestTime == 0 || !completed) {
+                    // infinite run, we have to get the time from stop-start delta
+                    totalTestTime = (lastTickTime - startTime);
+                }
+                double totalTestTimeSeconds = (double)totalTestTime / SECOND_IN_NANOS;
+                double frameRate = frames / totalTestTimeSeconds;
+                System.out.println(String.format("%s (Objects Frames Time FPS): %d, %d, %.2f, %.2f", name, objectCount, frames, totalTestTimeSeconds, frameRate));
+            }
+        }
+    }
+
+
+
+    public void testArc() throws Exception {
+        (new PerfMeter("Arc", testDuration)).exec(createPR(new ArcRenderer(objectCount, R)));
+    }
+
+    public void testOpenArc() throws Exception {
+        (new PerfMeter("OpenArc", testDuration)).exec(createPR(new OpenArcRenderer(objectCount, R)));
+    }
+
+    public void testCubicCurve() throws Exception {
+        (new PerfMeter("CubicCurve", testDuration)).exec(createPR(new CubicCurveRenderer(objectCount, R)));
+    }
+
+    public void testQuadCurve() throws Exception {
+        (new PerfMeter("QuadCurve", testDuration)).exec(createPR(new QuadCurveRenderer(objectCount, R)));
+    }
+
+    public void testCircle() throws Exception {
+        (new PerfMeter("Circle", testDuration)).exec(createPR(new CircleRenderer(objectCount, R)));
+    }
+
+    public void testCircleRH() throws Exception {
+        (new PerfMeter("CircleRH", testDuration)).exec(createPR(new CircleRendererRH(objectCount, R)));
+    }
+
+    public void testCircleBlendMultiply() throws Exception {
+        (new PerfMeter("CircleBlendMultiply", testDuration)).exec(createPR(new CircleRendererBlendMultiply(objectCount, R)));
+    }
+
+    public void testCircleBlendAdd() throws Exception {
+        (new PerfMeter("CircleBlendAdd", testDuration)).exec(createPR(new CircleRendererBlendAdd(objectCount, R)));
+    }
+
+    public void testCircleBlendDarken() throws Exception {
+        (new PerfMeter("CircleBlendDarken", testDuration)).exec(createPR(new CircleRendererBlendDarken(objectCount, R)));
+    }
+
+    public void testStrokedCircle() throws Exception {
+        (new PerfMeter("StrokedCircle", testDuration)).exec(createPR(new StrokedCircleRenderer(objectCount, R)));
+    }
+
+    public void testLinGradCircle() throws Exception {
+        (new PerfMeter("LinGradCircle", testDuration)).exec(createPR(new LinGradCircleRenderer(objectCount, R)));
+    }
+
+    public void testRadGradCircle() throws Exception {
+        (new PerfMeter("RadGradCircle", testDuration)).exec(createPR(new RadGradCircleRenderer(objectCount, R)));
+    }
+
+    public void testEllipse() throws Exception {
+        (new PerfMeter("Ellipse", testDuration)).exec(createPR(new EllipseRenderer(objectCount, R)));
+    }
+
+    public void testLine() throws Exception {
+        (new PerfMeter("Line", testDuration)).exec(createPR(new LineRenderer(objectCount, R)));
+    }
+
+    public void testPath() throws Exception {
+        (new PerfMeter("Path", testDuration)).exec(createPR(new PathRenderer(objectCount, R)));
+    }
+
+    public void testRectangle() throws Exception {
+        (new PerfMeter("Rectangle", testDuration)).exec(createPR(new RectangleRenderer(objectCount, R)));
+    }
+
+    public void testRotatedRectangleRH() throws Exception {
+        (new PerfMeter("RotatedRectangleRH", testDuration)).exec(createPR(new RectangleRendererRH(objectCount, R)));
+    }
+
+    public void testStrokedRectangle() throws Exception {
+        (new PerfMeter("StrokedRectangle", testDuration)).exec(createPR(new StrokedRectangleRenderer(objectCount, R)));
+    }
+
+    public void testPolygon() throws Exception {
+        (new PerfMeter("Polygon", testDuration)).exec(createPR(new PolygonRenderer(objectCount, R)));
+    }
+
+    public void testStrokedPolygon() throws Exception {
+        (new PerfMeter("StrokedPolygon", testDuration)).exec(createPR(new StrokedPolygonRenderer(objectCount, R)));
+    }
+
+    public void testWhiteText() throws Exception {
+        (new PerfMeter("WhiteText", testDuration)).exec(createPR(new WhiteTextRenderer(objectCount, R)));
+    }
+
+    public void testColorText() throws Exception {
+        (new PerfMeter("ColorText", testDuration)).exec(createPR(new ColorTextRenderer(objectCount, R)));
+    }
+
+    public void testLargeText() throws Exception {
+        (new PerfMeter("LargeText", testDuration)).exec(createPR(new LargeTextRenderer(objectCount, R)));
+    }
+
+    public void testLargeColorText() throws Exception {
+        (new PerfMeter("LargeColorText", testDuration)).exec(createPR(new LargeColorTextRenderer(objectCount, R)));
+    }
+
+    public void testImage() throws Exception {
+        (new PerfMeter("Image", testDuration)).exec(createPR(new ImageRenderer(objectCount, R)));
+    }
+
+    public void testImageRH() throws Exception {
+        (new PerfMeter("ImageRH", testDuration)).exec(createPR(new ImageRendererRH(objectCount, R)));
+    }
+
+    public void test3DBox() throws Exception {
+        (new PerfMeter("3DBox", testDuration)).exec(createPR(new Box3DRenderer(objectCount, R)));
+    }
+
+    public void test3DCylinder() throws Exception {
+        (new PerfMeter("3DCylinder", testDuration)).exec(createPR(new CylinderRenderer(objectCount, R)));
+    }
+
+    public void test3DSphere() throws Exception {
+        (new PerfMeter("3DSphere", testDuration)).exec(createPR(new SphereRenderer(objectCount, R)));
+    }
+
+    public void test3DMesh() throws Exception {
+        (new PerfMeter("3DMesh", testDuration)).exec(createPR(new MeshRenderer(objectCount, R)));
+    }
+
+    public void testMultiShape2DInterleaved() throws Exception {
+        (new PerfMeter("MultiShape2DInterleaved", testDuration)).exec(createPR(new MultiShapeRendererInterleaved(objectCount, R)));
+    }
+
+    public void testMultiShape2D() throws Exception {
+        (new PerfMeter("MultiShape2D", testDuration)).exec(createPR(new MultiShapeRenderer(objectCount, R)));
+    }
+
+    public void testMultiShape3DInterleaved() throws Exception {
+        (new PerfMeter("MultiShape3DInterleaved", testDuration)).exec(createPR(new MultiShape3DRendererInterleaved(objectCount, R)));
+    }
+
+    public void testMultiShape3D() throws Exception {
+        (new PerfMeter("MultiShape3D", testDuration)).exec(createPR(new MultiShape3DRenderer(objectCount, R)));
+    }
+
+    public void testMultiShape2D3DInterleaved() throws Exception {
+        (new PerfMeter("MultiShape2D3DInterleaved", testDuration)).exec(createPR(new MultiShape2D3DRendererInterleaved(objectCount, R)));
+    }
+
+    public void testMultiShape2D3D() throws Exception {
+        (new PerfMeter("MultiShape2D3D", testDuration)).exec(createPR(new MultiShape2D3DRenderer(objectCount, R)));
+    }
+
+    public void testButton() throws Exception {
+        (new PerfMeter("Button", testDuration)).exec(createPR(new ButtonRenderer(objectCount, R)));
+    }
+
+    /**
+     * Initialize the JavaFX application environment.
+     * Once the stage is initialized, all tests use
+     * same environment for execution.
+     */
+    public void intializeFxEnvironment() {
+        Platform.startup(() -> {
+            stage = new Stage();
+            Platform.setImplicitExit(false);
+        });
+    }
+
+    public void exitFxEnvironment() {
+        Platform.exit();
+    }
+
+    public boolean parseCmdOptions(String[] args) {
+        for (int i = 0; i < args.length; i++) {
+            String arg = args[i];
+            switch(arg) {
+            case "-t":
+                while ((i+1) < args.length && args[i + 1].charAt(0) != '-') {
+                    testList.add(args[++i]);
+                }
+                if (testList.size() == 0) return false;
+                break;
+            case "-n":
+                try {
+                    objectCount = Integer.parseInt(args[++i]);
+                }
+                catch (ArrayIndexOutOfBoundsException e) {
+                    System.out.println("\nnumber_of_objects not provided.");
+                    return false;
+                }
+                break;
+            case "-d":
+                try {
+                    testDuration = Integer.parseInt(args[++i]);
+                }
+                catch (ArrayIndexOutOfBoundsException e) {
+                    System.out.println("\ntest_duration_in_seconds not provided.");
+                    return false;
+                }
+                break;
+            case "-h":
+            case "--help":
+            default:
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public static void printTests() {
+        Method[] methods = RenderPerfTest.class.getDeclaredMethods();
+        System.out.println("\nSupported tests:");
+        for (Method m : methods) {
+            if (m.getName().startsWith("test")) {
+                System.out.println(m.getName().replaceFirst("test", ""));
+            }
+        }
+    }
+
+    public static void printUsage() {
+        System.out.println("Usage: java @<path_to>/run.args RenderPerfTest [-t <test_name>...] [-n <number_of_objects>] [-d <test_duration_in_seconds>] [-h]");
+        System.out.println("       Where test_name: Name of the test (or tests) to be executed.");
+        System.out.println("             number_of_objects: Number of objects to be rendered in the test(s)");
+        System.out.println("             test_duration_in_seconds: How many seconds should each test take (default 10, set 0 for infinite run)");
+        System.out.println("                                       NOTE: Tests have extra 5 seconds warmup time where performance is NOT measured.");
+        System.out.println("             -h: help: print application usage");
+        System.out.println("NOTE: Set JVM command line parameter -Djavafx.animation.fullspeed=true to run animation at full speed");
+
+        printTests();
+    }
+
+    public static void main(String[] args) throws Exception {
+        RenderPerfTest test = new RenderPerfTest();
+
+        test.intializeFxEnvironment();
+        testList = new ArrayList<String>();
+
+        if (!test.parseCmdOptions(args)) {
+            printUsage();
+            test.exitFxEnvironment();
+            return;
+        }
+
+        if (test.objectCount == 0) {
+            test.objectCount = 1000;
+        }
+
+        if (test.testDuration == 0) {
+            System.out.println("NOTE: Test length set to 0. Test will run indefinitely until Stage is closed.");
+        }
+
+        try {
+            if (testList.size() != 0) {
+                for(String testName: testList) {
+                    Method m = RenderPerfTest.class.getDeclaredMethod("test" + testName);
+                    m.invoke(test);
+                }
+            } else {
+                Method[] methods = RenderPerfTest.class.getDeclaredMethods();
+                for (Method m : methods) {
+                    if (m.getName().startsWith("test")) {
+                        m.invoke(test);
+                    }
+                }
+            }
+        } catch (NoSuchMethodException e) {
+            System.out.println("\nIncorrect Test Name!");
+            printTests();
+        } catch (InvocationTargetException e) {
+            System.out.println(e.getCause().getMessage());
+        } catch (Exception e) {
+            System.out.println("\nUnexpected error occurred");
+            e.printStackTrace();
+        }
+        test.exitFxEnvironment();
+    }
+}
diff --git a/tests/performance/animation/RenderPerfTest/src/renderperf/duke.png b/tests/performance/animation/RenderPerfTest/src/renderperf/duke.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a52fa05b41478f2b370d2818c5d4f81e79bbb61
GIT binary patch
literal 2124
zcmV-S2($NzP)<h;3K|Lk000e1NJLTq001`t003hM1^@s6Kg5`)0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU(?ny*JRCwClT+MIONEClf7mz@(t`J`W
zQCGbp#c)7ys>^|Evl5)^9ysg?_b*7egHn#1QvQOpH*P7nl|UrrfW!gP6$l}|oE1WR
zGdnM_)5&CJJa)#7%afjxIOBMJ^FHT2I{^75i*kc92|1wb!EZty1B?Y|>;6C?$KY&<
zG)s!bh$P)sjLQX81d>Cp3&vI@QqG0?)kC&4!10rICF97rfz`OlG&R5xZV?)iG3{{z
zb0m}UG{CuxUCPGP#_3RG244<eTZ(htnBPFUJx*{fg_m?=z!k&SIm!1MG3Sp>ElFrc
z5IPUp7+djus$g$3Dq(`!ipl$-2bF!_i~*jCNElbF3}ad3@@tCkNfsfX!K|EPAPXTG
zu#wngBAKn{37klkDkJ=!n*lh-Wa3;7C7OmdLN@J*Q;{Fz!K@reua=b>r3F|u2(Fo>
zjido+#l)^1aVl<t)w5FAN?^*VWSLt!VN6T{5c9!hgEg4UjbBHCZs-I8gKD`W;8XxD
z#b$F94zjj6S*EYriRV5PB)KTbi0yHJi*^)Qf*UE<bq!9SX4uX~u2q^!m7LI_R6~2L
za2w%L0%sE#*nUaN+-X-@$2LkDA;QnP5=;z+2vNw0%H@Hnn3grTG;W*EL8VD@9vUHD
zLJ!xWe1rR(TX4~KCy7H?Q-R7GI4e}oq)E1MaB~^%BFf_imnHcLioXBF4frFgS(a=Y
z=8hc$=g=X5@86;G`7_*q^9I&lzlJUPKBjbdR>!7x6r8nhANc3a!S!MhtjWnPDERgb
z;Oo~emyR5P>g+76wA--!?3t=iTQ;$2O#@D-Hty-uP`i2+?CEKM7cY9i2n|C&e*z#-
z<U*m#{;5;o9ykDJA3s*9=Xy-Z@6R2vIq%FFXxzF5_RX6B*RBEV*)sqJCMJg1*}oqu
zCr)hF=o<|Pf&d)HVb#-$Nz1a0bMDELP`i8?;L4TWfqVCQ0OE*_Sv-7rP^~QsYPA}x
zp1vYWit^I?roasa+S;W{0Ka|#+_?ilr3Vim0{r;VJBDhhV4F(V-n+NA{GFZvP;#E<
zv6XB`0IbXfbR*yf)TBi1%cknp1@rVN0QH1j=YdWHk0GPYAy5fe1c<b`xw)OLRI6Pn
zhSUrb=6aYkv%oM7+sZ^O9h?9H;Jjk@Jsx8LMjQbRxr4_j6^q3I_4Iw8cVZ=OaZ%JO
zCLPM4r^JaN5EdBAEJz&70!3i-yVjR4eLyUg%Vn@_<#z9OTr3<Z&b2;#=mCh_edI`@
z5D)=EfXMIO0X%<>2G%o{g9o=)%^i*~2ykg>Np|^F)1hFR{jl-&Ep$G85=$<UXe7NS
zPXHc0>H|ai_v6Q2DDlKQ9y~6QUPonX5lyDps2-0#e4(m!oH~RHm|~#~vC@hdfnl(I
z`EqD>e}}L2dVNSOS^HaGU*`}1L;0>r$yuUMaD#fu7OETC4$CM#e0}w*#~dw(OJAu}
zl(r?2o>tyjNb5`@cio}VnSbyATJPVBRkPC>n$=&S!QjNvuHr~AW(y2czs5*ck{~sk
zO+o?o>mlCJqoi3Z5_0h(Ar~$Xa{fFav$Lc*IZ0@sB2=e|6^->gl7#S@F{SyDcFO&#
zQ>j$yUlajy7w$669SO}ohK}Q6&=iX#C91wgI;XL<N~)4W7sm<H)Ja<9!td}rnjDif
zgy*qZqBH3UO>k|tfQlKsC@yu4VQZ_)1DOoX7iHcs31Q4zUG0arC7oE8xWYUxYPZ`)
z?atyWyr^E|B&spmt*U~ChaAu+nL6$iEiNvyAFrpb@rWEl8c%1M7{?N%k(@27;WK4`
z@zvkAb5YfE22zsV?2-q<*b3_B43x<+e+zr}JsNXfh)WzS9ksN%ZTvEuedj?X`wpR0
z5>>*K;MhSM{5GB~1&o_GueqRe4%>rv`D3W-c_KzNgCyQ^i>dZHc~nbIH7!vkyb#kK
zvLj<1ckmX`!oq@5HD%yBd6!zW;7mduE4da2%E_ZMk)(qT9};+Qo6JB|$zq-*hcq`g
zr!4pLy8!kct!ADw6OC-8q8ko^JZ2^$lBHrIhjO29dc>5q^JaHSa2x!AygCzsKd@P$
z6cV1COPZdZ7CM#R0vtC#TLsSIYxO27S9t-qu$!b734qm78MvWs`)&Zod334d$|AMg
zW#ELN043(fq&K^PTppYwt9I=c$;mdW77YLC!>+SA8MrD)%F=mHyL7;LNsKfpVaI1>
zWd-Kv=V5AU3MM8d`i#f$JH9JqlB7Mgq}@-J8jS|uv><WUO53{=G)Vd+tuA9XGfk5a
zJFlRASVH)G0QLZIQA~kDwVa2+o5NE78^zk%8qCbhbYD4Ig<hY3D&+a_bq2O?Z0O$H
zhN{Xm7>&n>es?EHN5}Vl*%Mc~v7`bcbdz*j%5F4BM@1xR*no7;unj!7Q?J+4?8eQ2
zLtug?e`Q4NaabGFt#X6rBb{2{us_WK3&7lerFg)!spGt8l3sZ!4jg}T4WxgnUq$^V
z{?VS}!VYNm>-ykC_nV*{aKLIA02>NZDlNi!>Y9Zs3gW050*~lJw$!&j?C8kU6XyxT
z-6{1CMk;|PbJ8+tU)mu;mNCV(vUpPc@lhi~HH=kHKK^kkS=Chs9$*v3_s@eiUjauJ
zcxx-E&bu(eL*)jk1UvAw@wfp7F#Pvf!o~kzfB^vg0jz*@j~7D#0000<MNUMnLSTaR
Cu;)_%

literal 0
HcmV?d00001


From bc5adfa9b6f9180eb32930f61e59fdc46a83cb73 Mon Sep 17 00:00:00 2001
From: Hima Bindu Meda <hmeda@openjdk.org>
Date: Mon, 23 Sep 2024 08:37:26 +0000
Subject: [PATCH 45/75] 8340208: Additional WebKit 619.1 fixes from WebKitGTK
 2.44.4

Reviewed-by: kcr, sykora
---
 .../JavaScriptCore/bytecode/CodeBlock.cpp     |  9 ++--
 .../JavaScriptCore/bytecode/MetadataTable.cpp | 11 +++--
 .../JavaScriptCore/bytecode/MetadataTable.h   |  8 +++-
 .../disassembler/ARM64/A64DOpcode.h           |  1 +
 .../Source/JavaScriptCore/llint/LLIntOpcode.h | 12 +++--
 .../llint/LowLevelInterpreter.cpp             |  3 +-
 .../JavaScriptCore/wasm/WasmB3IRGenerator.cpp |  2 +
 .../Source/JavaScriptCore/wasm/WasmBBQJIT.cpp | 19 --------
 .../Source/JavaScriptCore/wasm/WasmCallee.h   | 32 +++++++++++--
 .../JavaScriptCore/wasm/WasmOperations.cpp    | 29 ++++++++++--
 .../JavaScriptCore/wasm/WasmSlowPaths.cpp     |  2 +-
 .../main/native/Source/WebCore/Headers.cmake  |  1 +
 .../WebCore/Modules/fetch/FetchBodySource.cpp |  2 +
 .../WebCore/Modules/fetch/FetchBodySource.h   |  1 +
 .../WebCore/Modules/fetch/FetchResponse.cpp   |  2 +
 .../WebCore/Modules/fetch/FetchResponse.h     |  2 +
 .../controls/text-tracks.css                  | 19 ++------
 .../plugins/YouTubePluginReplacement.cpp      |  2 +
 .../plugins/YouTubePluginReplacement.h        |  3 ++
 .../Modules/reporting/ReportingObserver.cpp   |  5 ++
 .../Modules/reporting/ReportingObserver.h     |  2 +
 .../Modules/reporting/ReportingObserver.idl   |  3 +-
 .../reporting/ReportingObserverCallback.h     |  2 +
 .../reporting/ReportingObserverCallback.idl   |  2 +-
 .../Modules/speech/SpeechRecognitionEvent.cpp |  2 +
 .../Modules/speech/SpeechRecognitionEvent.h   |  2 +
 .../Modules/storage/StorageConnection.h       |  2 +-
 .../webaudio/AudioBasicProcessorNode.cpp      |  2 +
 .../webaudio/AudioBasicProcessorNode.h        |  1 +
 .../main/native/Source/WebCore/Sources.txt    |  1 +
 .../accessibility/AccessibilityObject.cpp     | 36 +++++++-------
 .../WebCore/animation/CSSTransition.cpp       |  2 +
 .../Source/WebCore/animation/CSSTransition.h  |  3 +-
 .../WebCore/animation/DocumentTimeline.cpp    |  2 +
 .../WebCore/animation/DocumentTimeline.h      |  2 +
 .../Source/WebCore/bindings/js/JSExecState.h  |  8 ++--
 .../bindings/js/JSReportingObserverCustom.cpp | 43 +++++++++++++++++
 .../WebCore/bindings/js/ScriptController.cpp  | 12 +++--
 .../WebCore/crypto/keys/CryptoKeyEC.cpp       |  2 +
 .../Source/WebCore/crypto/keys/CryptoKeyEC.h  |  2 +-
 .../Source/WebCore/css/mediaControls.css      | 15 ++----
 .../WebCore/css/typedom/CSSUnparsedValue.cpp  |  2 +
 .../WebCore/css/typedom/CSSUnparsedValue.h    |  1 +
 .../css/typedom/transform/CSSPerspective.cpp  |  2 +
 .../css/typedom/transform/CSSPerspective.h    |  2 +
 .../typedom/transform/CSSTransformValue.cpp   |  2 +
 .../css/typedom/transform/CSSTransformValue.h |  2 +
 .../native/Source/WebCore/dom/Document.cpp    |  4 ++
 .../native/Source/WebCore/dom/DragEvent.cpp   |  2 +
 .../native/Source/WebCore/dom/DragEvent.h     |  1 +
 .../native/Source/WebCore/dom/InputEvent.cpp  |  2 +
 .../native/Source/WebCore/dom/InputEvent.h    |  2 +
 .../editing/ReplaceSelectionCommand.cpp       |  2 +
 .../WebCore/editing/ReplaceSelectionCommand.h |  2 +
 .../WebCore/html/CollectionTraversalInlines.h |  1 +
 .../html/GenericCachedHTMLCollection.cpp      |  5 ++
 .../html/GenericCachedHTMLCollection.h        |  2 +
 .../Source/WebCore/html/HTMLMediaElement.cpp  |  5 ++
 .../Source/WebCore/html/ImageBitmap.cpp       |  4 +-
 .../Source/WebCore/html/ImageDocument.cpp     | 10 ++--
 .../Source/WebCore/html/PluginDocument.cpp    |  2 +
 .../Source/WebCore/html/PluginDocument.h      |  2 +
 .../canvas/CanvasRenderingContext2DBase.cpp   | 35 +++-----------
 .../Source/WebCore/loader/DocumentLoader.cpp  | 11 ++++-
 .../WebCore/loader/cache/CachedSVGFont.cpp    |  2 +
 .../WebCore/loader/cache/CachedSVGFont.h      |  1 +
 .../main/native/Source/WebCore/page/Page.cpp  |  7 +++
 .../main/native/Source/WebCore/page/Page.h    |  3 ++
 .../Source/WebCore/page/WorkerNavigator.cpp   |  2 +
 .../Source/WebCore/page/WorkerNavigator.h     |  2 +
 .../scrolling/ScrollingStateFixedNode.cpp     |  4 ++
 .../audio/AudioDSPKernelProcessor.cpp         |  2 +
 .../platform/audio/AudioDSPKernelProcessor.h  |  1 +
 .../WebCore/platform/graphics/NativeImage.cpp |  2 +
 .../WebCore/platform/graphics/NativeImage.h   |  2 +
 .../WebCore/platform/graphics/RoundedRect.cpp |  4 +-
 .../transforms/TransformationMatrix.cpp       | 15 +++---
 .../platform/mock/MockRealtimeVideoSource.h   |  2 +-
 .../WebCore/rendering/BackgroundPainter.cpp   | 37 ++++-----------
 .../WebCore/rendering/BackgroundPainter.h     |  2 +-
 .../rendering/GridTrackSizingAlgorithm.cpp    |  2 +-
 .../rendering/ImageQualityController.cpp      |  4 +-
 .../rendering/ImageQualityController.h        |  2 +-
 .../Source/WebCore/rendering/RenderBox.cpp    |  3 +-
 .../Source/WebCore/rendering/RenderGrid.cpp   | 10 ++++
 .../Source/WebCore/rendering/RenderLayer.cpp  | 35 +++++++-------
 .../rendering/RenderLayerCompositor.cpp       |  5 +-
 .../rendering/RenderLayerModelObject.cpp      |  8 +---
 .../rendering/RenderMultiColumnFlow.cpp       |  3 ++
 .../WebCore/rendering/RenderReplaced.cpp      |  2 +-
 .../Source/WebCore/rendering/RenderWidget.cpp |  2 +-
 .../rendering/TextDecorationPainter.cpp       |  6 ++-
 .../WebCore/rendering/style/BasicShapes.cpp   |  2 +
 .../WebCore/rendering/style/BasicShapes.h     |  2 +
 .../WebCore/rendering/style/RenderStyle.h     |  2 +
 .../rendering/style/RenderStyleInlines.h      |  2 +
 .../WebCore/style/StyleTreeResolver.cpp       |  4 +-
 .../WorkerOrWorkletScriptController.cpp       | 10 ++--
 .../context/ServiceWorkerThreadProxy.cpp      |  2 +-
 .../Source/WebCore/xml/XPathNodeSet.cpp       |  2 +-
 .../WebCoreSupport/HistoryItemClientJava.cpp  | 47 +++++++++++++++++++
 .../WebCoreSupport/HistoryItemClientJava.h    | 40 ++++++++++++++++
 .../Source/cmake/WebKitCompilerFlags.cmake    |  5 ++
 103 files changed, 481 insertions(+), 221 deletions(-)
 create mode 100644 modules/javafx.web/src/main/native/Source/WebCore/bindings/js/JSReportingObserverCustom.cpp
 create mode 100644 modules/javafx.web/src/main/native/Source/WebKitLegacy/java/WebCoreSupport/HistoryItemClientJava.cpp
 create mode 100644 modules/javafx.web/src/main/native/Source/WebKitLegacy/java/WebCoreSupport/HistoryItemClientJava.h

diff --git a/modules/javafx.web/src/main/native/Source/JavaScriptCore/bytecode/CodeBlock.cpp b/modules/javafx.web/src/main/native/Source/JavaScriptCore/bytecode/CodeBlock.cpp
index f4728c09b1c..c30f70a4416 100644
--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/bytecode/CodeBlock.cpp
+++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/bytecode/CodeBlock.cpp
@@ -852,12 +852,11 @@ CodeBlock::~CodeBlock()
         vm.m_perBytecodeProfiler->notifyDestruction(this);
 
     if (LIKELY(!vm.heap.isShuttingDown())) {
-        if (m_metadata) {
-            auto unlinkedMetadata = m_metadata->unlinkedMetadata();
-
             // FIXME: This check should really not be necessary, see https://webkit.org/b/272787
-            ASSERT(unlinkedMetadata);
-            if (unlinkedMetadata && unlinkedMetadata->didOptimize() == TriState::Indeterminate)
+        ASSERT(!m_metadata || m_metadata->unlinkedMetadata());
+        if (m_metadata && !m_metadata->isDestroyed()) {
+            auto unlinkedMetadata = m_metadata->unlinkedMetadata();
+            if (unlinkedMetadata->didOptimize() == TriState::Indeterminate)
                 unlinkedMetadata->setDidOptimize(TriState::False);
         }
     }
diff --git a/modules/javafx.web/src/main/native/Source/JavaScriptCore/bytecode/MetadataTable.cpp b/modules/javafx.web/src/main/native/Source/JavaScriptCore/bytecode/MetadataTable.cpp
index 637afdde44c..30f8994d60e 100644
--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/bytecode/MetadataTable.cpp
+++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/bytecode/MetadataTable.cpp
@@ -61,16 +61,17 @@ MetadataTable::~MetadataTable()
 
 void MetadataTable::destroy(MetadataTable* table)
 {
-    RefPtr<UnlinkedMetadataTable> unlinkedMetadata = WTFMove(table->linkingData().unlinkedMetadata);
-
-    table->~MetadataTable();
-
     // FIXME: This check should really not be necessary, see https://webkit.org/b/272787
-    if (UNLIKELY(!unlinkedMetadata)) {
+    if (table->isDestroyed()) {
         ASSERT_NOT_REACHED();
         return;
     }
 
+    RefPtr<UnlinkedMetadataTable> unlinkedMetadata = WTFMove(table->linkingData().unlinkedMetadata);
+    ASSERT(table->isDestroyed());
+
+    table->~MetadataTable();
+
     // Since UnlinkedMetadata::unlink frees the underlying memory of MetadataTable.
     // We need to destroy LinkingData before calling it.
     unlinkedMetadata->unlink(*table);
diff --git a/modules/javafx.web/src/main/native/Source/JavaScriptCore/bytecode/MetadataTable.h b/modules/javafx.web/src/main/native/Source/JavaScriptCore/bytecode/MetadataTable.h
index 19810e515fa..ab9f5c91c0e 100644
--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/bytecode/MetadataTable.h
+++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/bytecode/MetadataTable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 Apple Inc. All rights reserved.
+ * Copyright (C) 2018-2024 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -129,6 +129,12 @@ class MetadataTable {
 
     RefPtr<UnlinkedMetadataTable> unlinkedMetadata() const { return static_reference_cast<UnlinkedMetadataTable>(linkingData().unlinkedMetadata); }
 
+    bool isDestroyed() const
+    {
+        uintptr_t unlinkedMetadataPtr = *bitwise_cast<uintptr_t*>(&linkingData().unlinkedMetadata);
+        return !unlinkedMetadataPtr;
+    }
+
 private:
     MetadataTable(UnlinkedMetadataTable&);
 
diff --git a/modules/javafx.web/src/main/native/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h b/modules/javafx.web/src/main/native/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h
index 5d2997b83e3..8053846b220 100644
--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h
+++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h
@@ -25,6 +25,7 @@
 
 #pragma once
 
+#include <mutex>
 #include <stdint.h>
 #include <wtf/Assertions.h>
 #include <wtf/DataLog.h>
diff --git a/modules/javafx.web/src/main/native/Source/JavaScriptCore/llint/LLIntOpcode.h b/modules/javafx.web/src/main/native/Source/JavaScriptCore/llint/LLIntOpcode.h
index 70711b0c5f5..4c949b39f1f 100644
--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/llint/LLIntOpcode.h
+++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/llint/LLIntOpcode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2023 Apple Inc. All rights reserved.
+ * Copyright (C) 2012, 2013, 2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -46,8 +46,10 @@
 
 #define FOR_EACH_LLINT_NATIVE_HELPER(macro) \
     FOR_EACH_LLINT_NOJIT_NATIVE_HELPER(macro) \
-    FOR_EACH_LLINT_NOJIT_RETURN_HELPER(macro)
-
-#define FOR_EACH_LLINT_OPCODE_EXTENSION(macro) \
+    \
     FOR_EACH_BYTECODE_HELPER_ID(macro) \
-    FOR_EACH_LLINT_NATIVE_HELPER(macro)
+    \
+    FOR_EACH_LLINT_NOJIT_RETURN_HELPER(macro) \
+
+
+#define FOR_EACH_LLINT_OPCODE_EXTENSION(macro) FOR_EACH_LLINT_NATIVE_HELPER(macro)
diff --git a/modules/javafx.web/src/main/native/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/modules/javafx.web/src/main/native/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
index d458740dab6..f61ce085c0c 100644
--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
+++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2023 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-2022 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -279,7 +279,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm,
             opcodeMap[__opcode] = __opcode;
 #endif
         FOR_EACH_BYTECODE_ID(OPCODE_ENTRY)
-        FOR_EACH_BYTECODE_HELPER_ID(OPCODE_ENTRY)
         FOR_EACH_CLOOP_BYTECODE_HELPER_ID(LLINT_OPCODE_ENTRY)
         FOR_EACH_LLINT_NATIVE_HELPER(LLINT_OPCODE_ENTRY)
         FOR_EACH_CLOOP_RETURN_HELPER_ID(LLINT_OPCODE_ENTRY)
diff --git a/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp b/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp
index af2872c1900..892c2835b6d 100644
--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp
+++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp
@@ -5267,6 +5267,8 @@ Expected<std::unique_ptr<InternalFunction>, String> parseAndCompileB3(Compilatio
         bool needsOverflowCheck = false;
         irGenerator.computeStackCheckSize(needsOverflowCheck, checkSize);
         ASSERT(checkSize || !needsOverflowCheck);
+        if (!needsOverflowCheck)
+            checkSize = stackCheckNotNeeded;
         static_cast<OSREntryCallee*>(&callee)->setStackCheckSize(checkSize);
     }
 
diff --git a/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmBBQJIT.cpp b/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmBBQJIT.cpp
index 9184bbe875a..b4309e7b108 100644
--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmBBQJIT.cpp
+++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmBBQJIT.cpp
@@ -3958,25 +3958,6 @@ void BBQJIT::returnValuesFromCall(Vector<Value, N>& results, const FunctionSigna
                         ASSERT(m_validFPRs.contains(returnLocation.asFPR(), Width::Width128));
                         m_fprSet.add(returnLocation.asFPR(), Width::Width128);
                 }
-            } else {
-                ASSERT(returnLocation.isStackArgument());
-                // FIXME: Ideally, we would leave these values where they are but a subsequent call could clobber them before they are used.
-                // That said, stack results are very rare so this isn't too painful.
-                // Even if we did leave them where they are, we'd need to flush them to their canonical location at the next branch otherwise
-                // we could have something like (assume no result regs for simplicity):
-                // call (result i32 i32) $foo
-                // if (result i32) // Stack: i32(StackArgument:8) i32(StackArgument:0)
-                //   // Stack: i32(StackArgument:8)
-                // else
-                //   call (result i32 i32) $bar // Stack: i32(StackArgument:8) we have to flush the stack argument to make room for the result of bar
-                //   drop // Stack: i32(Stack:X) i32(StackArgument:8) i32(StackArgument:0)
-                //   drop // Stack: i32(Stack:X) i32(StackArgument:8)
-                // end
-                // return // Stack i32(*Conflicting locations*)
-
-                Location canonicalLocation = canonicalSlot(result);
-                emitMoveMemory(result.type(), returnLocation, canonicalLocation);
-                returnLocation = canonicalLocation;
             }
             }
             bind(result, returnLocation);
diff --git a/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmCallee.h b/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmCallee.h
index e9b67703fc6..e7ae2e0cfa5 100644
--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmCallee.h
+++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmCallee.h
@@ -243,6 +243,9 @@ class OptimizingJITCallee : public JITCallee {
     Vector<Ref<NameSection>, 0> nameSections;
 };
 
+constexpr int32_t stackCheckUnset = 0;
+constexpr int32_t stackCheckNotNeeded = -1;
+
 class OSREntryCallee final : public OptimizingJITCallee {
     WTF_MAKE_TZONE_ALLOCATED(OSREntryCallee);
 public:
@@ -261,8 +264,18 @@ class OSREntryCallee final : public OptimizingJITCallee {
         OptimizingJITCallee::setEntrypoint(WTFMove(entrypoint), WTFMove(unlinkedCalls), WTFMove(stackmaps), WTFMove(exceptionHandlers), WTFMove(exceptionHandlerLocations));
     }
 
-    void setStackCheckSize(unsigned stackCheckSize) { m_stackCheckSize = stackCheckSize; }
-    unsigned stackCheckSize() const { return m_stackCheckSize; }
+    void setStackCheckSize(int32_t stackCheckSize)
+    {
+        ASSERT(m_stackCheckSize == stackCheckUnset);
+        ASSERT(stackCheckSize > 0 || stackCheckSize == stackCheckNotNeeded);
+        m_stackCheckSize = stackCheckSize;
+    }
+
+    int32_t stackCheckSize() const
+    {
+        ASSERT(m_stackCheckSize > 0 || m_stackCheckSize == stackCheckNotNeeded);
+        return m_stackCheckSize;
+    }
 
 private:
     OSREntryCallee(CompilationMode compilationMode, size_t index, std::pair<const Name*, RefPtr<NameSection>>&& name, uint32_t loopIndex)
@@ -273,7 +286,7 @@ class OSREntryCallee final : public OptimizingJITCallee {
 
     unsigned m_osrEntryScratchBufferSize { 0 };
     uint32_t m_loopIndex;
-    unsigned m_stackCheckSize { 0 };
+    int32_t m_stackCheckSize { stackCheckUnset };
 };
 
 #endif // ENABLE(WEBASSEMBLY_BBQJIT) || ENABLE(WEBASSEMBLY_OMGJIT)
@@ -354,8 +367,17 @@ class BBQCallee final : public OptimizingJITCallee {
         return m_switchJumpTables.last().ptr();
     }
 
-    void setStackCheckSize(unsigned stackCheckSize) { m_stackCheckSize = stackCheckSize; }
-    unsigned stackCheckSize() const { return m_stackCheckSize; }
+    void setStackCheckSize(unsigned stackCheckSize)
+    {
+        ASSERT(m_stackCheckSize == stackCheckUnset);
+        ASSERT(stackCheckSize > 0 || int32_t(stackCheckSize) == stackCheckNotNeeded);
+        m_stackCheckSize = stackCheckSize;
+    }
+    int32_t stackCheckSize() const
+    {
+        ASSERT(m_stackCheckSize > 0 || int32_t(m_stackCheckSize) == stackCheckNotNeeded);
+        return m_stackCheckSize;
+    }
 
 private:
     BBQCallee(size_t index, std::pair<const Name*, RefPtr<NameSection>>&& name, std::unique_ptr<TierUpCount>&& tierUpCount, SavedFPWidth savedFPWidth)
diff --git a/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmOperations.cpp b/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmOperations.cpp
index 25f673122d5..d39eaac5066 100644
--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmOperations.cpp
+++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmOperations.cpp
@@ -325,6 +325,20 @@ JSC_DEFINE_JIT_OPERATION(operationWasmTriggerOSREntryNow, void, (Probe::Context&
         context.gpr(GPRInfo::nonPreservedNonArgumentGPR0) = 0;
     };
 
+    auto doStackCheck = [instance](OSREntryCallee* callee) -> bool {
+        uintptr_t stackPointer = reinterpret_cast<uintptr_t>(currentStackPointer());
+        ASSERT(callee->stackCheckSize());
+        if (callee->stackCheckSize() == stackCheckNotNeeded)
+            return true;
+        uintptr_t stackExtent = stackPointer - callee->stackCheckSize();
+        uintptr_t stackLimit = reinterpret_cast<uintptr_t>(instance->softStackLimit());
+        if (UNLIKELY(stackExtent >= stackPointer || stackExtent <= stackLimit)) {
+            dataLogLnIf(Options::verboseOSR(), "Skipping OMG loop tier up due to stack check; ", RawHex(stackPointer), " -> ", RawHex(stackExtent), " is past soft limit ", RawHex(stackLimit));
+            return false;
+        }
+        return true;
+    };
+
     Wasm::CalleeGroup& calleeGroup = *instance->calleeGroup();
     ASSERT(instance->memory()->mode() == calleeGroup.mode());
 
@@ -399,9 +413,12 @@ JSC_DEFINE_JIT_OPERATION(operationWasmTriggerOSREntryNow, void, (Probe::Context&
     }
 
     if (OSREntryCallee* osrEntryCallee = callee.osrEntryCallee()) {
-        if (osrEntryCallee->loopIndex() == loopIndex)
+        if (osrEntryCallee->loopIndex() == loopIndex) {
+            if (!doStackCheck(osrEntryCallee))
+                return returnWithoutOSREntry();
             return doOSREntry(instance, context, callee, *osrEntryCallee, osrEntryData);
     }
+    }
 
     if (!shouldTriggerOMGCompile(tierUp, callee.replacement(), functionIndex) && !triggeredSlowPathToStartCompilation)
         return returnWithoutOSREntry();
@@ -414,8 +431,11 @@ JSC_DEFINE_JIT_OPERATION(operationWasmTriggerOSREntryNow, void, (Probe::Context&
     }
 
     if (OSREntryCallee* osrEntryCallee = callee.osrEntryCallee()) {
-        if (osrEntryCallee->loopIndex() == loopIndex)
+        if (osrEntryCallee->loopIndex() == loopIndex) {
+            if (!doStackCheck(osrEntryCallee))
+                return returnWithoutOSREntry();
             return doOSREntry(instance, context, callee, *osrEntryCallee, osrEntryData);
+        }
         tierUp.dontOptimizeAnytimeSoon(functionIndex);
         return returnWithoutOSREntry();
     }
@@ -495,8 +515,11 @@ JSC_DEFINE_JIT_OPERATION(operationWasmTriggerOSREntryNow, void, (Probe::Context&
         return returnWithoutOSREntry();
     }
 
-    if (osrEntryCallee->loopIndex() == loopIndex)
+    if (osrEntryCallee->loopIndex() == loopIndex) {
+        if (!doStackCheck(osrEntryCallee))
+            return returnWithoutOSREntry();
         return doOSREntry(instance, context, callee, *osrEntryCallee, osrEntryData);
+    }
 
     tierUp.dontOptimizeAnytimeSoon(functionIndex);
     return returnWithoutOSREntry();
diff --git a/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmSlowPaths.cpp b/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmSlowPaths.cpp
index 392d6756461..54795ebc9a1 100644
--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmSlowPaths.cpp
+++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/wasm/WasmSlowPaths.cpp
@@ -306,7 +306,7 @@ WASM_SLOW_PATH_DECL(loop_osr)
             size_t osrEntryScratchBufferSize = osrEntryCallee->osrEntryScratchBufferSize();
             RELEASE_ASSERT(osrEntryScratchBufferSize == osrEntryData.values.size());
 
-            if (osrEntryCallee->stackCheckSize()) {
+            if (osrEntryCallee->stackCheckSize() != Wasm::stackCheckNotNeeded) {
                 uintptr_t stackPointer = reinterpret_cast<uintptr_t>(currentStackPointer());
                 uintptr_t stackExtent = stackPointer - osrEntryCallee->stackCheckSize();
                 uintptr_t stackLimit = reinterpret_cast<uintptr_t>(instance->softStackLimit());
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Headers.cmake b/modules/javafx.web/src/main/native/Source/WebCore/Headers.cmake
index f0e63e7546c..8ec26edaa9f 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Headers.cmake
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Headers.cmake
@@ -2392,6 +2392,7 @@ set(WebCore_PRIVATE_FRAMEWORK_HEADERS
     rendering/style/GridArea.h
     rendering/style/GridLength.h
     rendering/style/GridPosition.h
+    rendering/style/GridPositionsResolver.h
     rendering/style/GridTrackSize.h
     rendering/style/LineClampValue.h
     rendering/style/ListStyleType.h
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/fetch/FetchBodySource.cpp b/modules/javafx.web/src/main/native/Source/WebCore/Modules/fetch/FetchBodySource.cpp
index 0755187294a..cda2a71ef58 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/fetch/FetchBodySource.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/fetch/FetchBodySource.cpp
@@ -36,6 +36,8 @@ FetchBodySource::FetchBodySource(FetchBodyOwner& bodyOwner)
 {
 }
 
+FetchBodySource::~FetchBodySource() = default;
+
 void FetchBodySource::setActive()
 {
     ASSERT(m_bodyOwner);
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/fetch/FetchBodySource.h b/modules/javafx.web/src/main/native/Source/WebCore/Modules/fetch/FetchBodySource.h
index dd4ff701f95..113c51c5ed3 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/fetch/FetchBodySource.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/fetch/FetchBodySource.h
@@ -40,6 +40,7 @@ class FetchBodyOwner;
 class FetchBodySource final : public RefCountedReadableStreamSource {
 public:
     FetchBodySource(FetchBodyOwner&);
+    virtual ~FetchBodySource();
 
     bool enqueue(RefPtr<JSC::ArrayBuffer>&& chunk) { return controller().enqueue(WTFMove(chunk)); }
     void close();
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/fetch/FetchResponse.cpp b/modules/javafx.web/src/main/native/Source/WebCore/Modules/fetch/FetchResponse.cpp
index 90be0ea7d7f..1213e3643a7 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/fetch/FetchResponse.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/fetch/FetchResponse.cpp
@@ -50,6 +50,8 @@ static inline bool isNullBodyStatus(int status)
     return status == 101 || status == 204 || status == 205 || status == 304;
 }
 
+FetchResponse::~FetchResponse() = default;
+
 Ref<FetchResponse> FetchResponse::create(ScriptExecutionContext* context, std::optional<FetchBody>&& body, FetchHeaders::Guard guard, ResourceResponse&& response)
 {
     bool isSynthetic = response.type() == ResourceResponse::Type::Default || response.type() == ResourceResponse::Type::Error;
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/fetch/FetchResponse.h b/modules/javafx.web/src/main/native/Source/WebCore/Modules/fetch/FetchResponse.h
index 2ea1f8be723..7ae59e3da69 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/fetch/FetchResponse.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/fetch/FetchResponse.h
@@ -59,6 +59,8 @@ class FetchResponse final : public FetchBodyOwner {
         std::optional<FetchHeaders::Init> headers;
     };
 
+    virtual ~FetchResponse();
+
     WEBCORE_EXPORT static Ref<FetchResponse> create(ScriptExecutionContext*, std::optional<FetchBody>&&, FetchHeaders::Guard, ResourceResponse&&);
 
     static ExceptionOr<Ref<FetchResponse>> create(ScriptExecutionContext&, std::optional<FetchBody::Init>&&, Init&&);
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/modern-media-controls/controls/text-tracks.css b/modules/javafx.web/src/main/native/Source/WebCore/Modules/modern-media-controls/controls/text-tracks.css
index c5d744be1ca..6370cf88f3a 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/modern-media-controls/controls/text-tracks.css
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/modern-media-controls/controls/text-tracks.css
@@ -94,18 +94,7 @@ video[controls]::-webkit-media-text-track-container.visible-controls-bar {
     color: gray;
 }
 
-[pseudo="-webkit-media-text-track-display"] b {
-    font-weight: bold;
-}
-
-[pseudo="-webkit-media-text-track-display"] u {
-    text-decoration: underline;
-}
-
-[pseudo="-webkit-media-text-track-display"] i {
-    font-style: italic;
-}
-
-[pseudo="-webkit-media-text-track-display"] .hidden {
-    display: none;
-}
+[useragentpart="-webkit-media-text-track-display"] b { font-weight: bold; }
+[useragentpart="-webkit-media-text-track-display"] u { text-decoration: underline; }
+[useragentpart="-webkit-media-text-track-display"] i { font-style: italic; }
+[useragentpart="-webkit-media-text-track-display"] .hidden { display: none; }
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/plugins/YouTubePluginReplacement.cpp b/modules/javafx.web/src/main/native/Source/WebCore/Modules/plugins/YouTubePluginReplacement.cpp
index c59da30a310..d848db5f83e 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/plugins/YouTubePluginReplacement.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/plugins/YouTubePluginReplacement.cpp
@@ -66,6 +66,8 @@ YouTubePluginReplacement::YouTubePluginReplacement(HTMLPlugInElement& plugin, co
         m_attributes.add(paramNames[i], paramValues[i]);
 }
 
+YouTubePluginReplacement::~YouTubePluginReplacement() = default;
+
 RenderPtr<RenderElement> YouTubePluginReplacement::createElementRenderer(HTMLPlugInElement& plugin, RenderStyle&& style, const RenderTreePosition& insertionPosition)
 {
     ASSERT_UNUSED(plugin, m_parentElement == &plugin);
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/plugins/YouTubePluginReplacement.h b/modules/javafx.web/src/main/native/Source/WebCore/Modules/plugins/YouTubePluginReplacement.h
index a87fe7f5479..aba7c89bed4 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/plugins/YouTubePluginReplacement.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/plugins/YouTubePluginReplacement.h
@@ -43,7 +43,10 @@ class YouTubePluginReplacement final : public PluginReplacement {
 
 private:
     YouTubePluginReplacement(HTMLPlugInElement&, const Vector<AtomString>& paramNames, const Vector<AtomString>& paramValues);
+    virtual ~YouTubePluginReplacement();
+
     static Ref<PluginReplacement> create(HTMLPlugInElement&, const Vector<AtomString>& paramNames, const Vector<AtomString>& paramValues);
+
     static bool supportsMIMEType(const String&);
     static bool supportsFileExtension(StringView);
     static bool supportsURL(const URL&);
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/reporting/ReportingObserver.cpp b/modules/javafx.web/src/main/native/Source/WebCore/Modules/reporting/ReportingObserver.cpp
index 97b705b3a97..5b7c6cd7ade 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/reporting/ReportingObserver.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/reporting/ReportingObserver.cpp
@@ -146,4 +146,9 @@ void ReportingObserver::appendQueuedReportIfCorrectType(const Ref<Report>& repor
     });
 }
 
+ReportingObserverCallback& ReportingObserver::callbackConcurrently()
+{
+    return m_callback.get();
+}
+
 } // namespace WebCore
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/reporting/ReportingObserver.h b/modules/javafx.web/src/main/native/Source/WebCore/Modules/reporting/ReportingObserver.h
index 9523f588b5c..c4ef10e21a5 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/reporting/ReportingObserver.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/reporting/ReportingObserver.h
@@ -55,6 +55,8 @@ class ReportingObserver final : public RefCounted<ReportingObserver>, public Con
 
     void appendQueuedReportIfCorrectType(const Ref<Report>&);
 
+    ReportingObserverCallback& callbackConcurrently();
+
 private:
     explicit ReportingObserver(ScriptExecutionContext&, Ref<ReportingObserverCallback>&&, ReportingObserver::Options&&);
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/reporting/ReportingObserver.idl b/modules/javafx.web/src/main/native/Source/WebCore/Modules/reporting/ReportingObserver.idl
index 545b2f0b10a..5cb4a56a778 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/reporting/ReportingObserver.idl
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/reporting/ReportingObserver.idl
@@ -30,7 +30,8 @@ typedef sequence<Report> ReportList;
 [
     EnabledBySetting=ReportingEnabled,
     Exposed=(Window,Worker),
-    GenerateIsReachable=ImplScriptExecutionContext
+    GenerateIsReachable=ImplScriptExecutionContext,
+    JSCustomMarkFunction
 ] interface ReportingObserver {
     [CallWith=CurrentScriptExecutionContext] constructor(ReportingObserverCallback callback, optional ReportingObserverOptions options);
     undefined observe();
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/reporting/ReportingObserverCallback.h b/modules/javafx.web/src/main/native/Source/WebCore/Modules/reporting/ReportingObserverCallback.h
index ae9143d851a..6d1cded9a17 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/reporting/ReportingObserverCallback.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/reporting/ReportingObserverCallback.h
@@ -40,6 +40,8 @@ class ReportingObserverCallback : public RefCounted<ReportingObserverCallback>,
     using ActiveDOMCallback::ActiveDOMCallback;
 
     virtual CallbackResult<void> handleEvent(const Vector<Ref<Report>>&, ReportingObserver&) = 0;
+
+    virtual bool hasCallback() const = 0;
 };
 
 } // namespace WebCore
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/reporting/ReportingObserverCallback.idl b/modules/javafx.web/src/main/native/Source/WebCore/Modules/reporting/ReportingObserverCallback.idl
index 96be24ada27..6b6165899a3 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/reporting/ReportingObserverCallback.idl
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/reporting/ReportingObserverCallback.idl
@@ -27,4 +27,4 @@
 
 typedef sequence<Report> ReportList;
 
-callback ReportingObserverCallback = undefined (ReportList reports, ReportingObserver observer);
+[ IsWeakCallback ] callback ReportingObserverCallback = undefined (ReportList reports, ReportingObserver observer);
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/speech/SpeechRecognitionEvent.cpp b/modules/javafx.web/src/main/native/Source/WebCore/Modules/speech/SpeechRecognitionEvent.cpp
index 2846daa62e5..1eb46715977 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/speech/SpeechRecognitionEvent.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/speech/SpeechRecognitionEvent.cpp
@@ -62,4 +62,6 @@ EventInterface SpeechRecognitionEvent::eventInterface() const
     return SpeechRecognitionEventInterfaceType;
 }
 
+SpeechRecognitionEvent::~SpeechRecognitionEvent() = default;
+
 } // namespace WebCore
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/speech/SpeechRecognitionEvent.h b/modules/javafx.web/src/main/native/Source/WebCore/Modules/speech/SpeechRecognitionEvent.h
index 272e884c790..16a0fe65f75 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/speech/SpeechRecognitionEvent.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/speech/SpeechRecognitionEvent.h
@@ -42,6 +42,8 @@ class SpeechRecognitionEvent final : public Event {
     static Ref<SpeechRecognitionEvent> create(const AtomString&, Init&&, IsTrusted = IsTrusted::No);
     static Ref<SpeechRecognitionEvent> create(const AtomString&, uint64_t resultIndex, RefPtr<SpeechRecognitionResultList>&&);
 
+    virtual ~SpeechRecognitionEvent();
+
     uint64_t resultIndex() const { return m_resultIndex; }
     SpeechRecognitionResultList* results() const { return m_results.get(); }
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/storage/StorageConnection.h b/modules/javafx.web/src/main/native/Source/WebCore/Modules/storage/StorageConnection.h
index aaa81494315..e8430fab47d 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/storage/StorageConnection.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/storage/StorageConnection.h
@@ -26,6 +26,7 @@
 #pragma once
 
 #include "FileSystemHandleIdentifier.h"
+#include "StorageEstimate.h"
 #include <wtf/CompletionHandler.h>
 #include <wtf/ThreadSafeRefCounted.h>
 
@@ -34,7 +35,6 @@ namespace WebCore {
 class FileSystemStorageConnection;
 template<typename> class ExceptionOr;
 struct ClientOrigin;
-struct StorageEstimate;
 
 class StorageConnection : public ThreadSafeRefCounted<StorageConnection> {
 public:
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioBasicProcessorNode.cpp b/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioBasicProcessorNode.cpp
index cc1c4c53cea..c49d055dc47 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioBasicProcessorNode.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioBasicProcessorNode.cpp
@@ -48,6 +48,8 @@ AudioBasicProcessorNode::AudioBasicProcessorNode(BaseAudioContext& context, Node
     // The subclass must create m_processor.
 }
 
+AudioBasicProcessorNode::~AudioBasicProcessorNode() = default;
+
 void AudioBasicProcessorNode::initialize()
 {
     if (isInitialized())
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioBasicProcessorNode.h b/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioBasicProcessorNode.h
index 94714a55eeb..aa94ce099bd 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioBasicProcessorNode.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Modules/webaudio/AudioBasicProcessorNode.h
@@ -38,6 +38,7 @@ class AudioBasicProcessorNode : public AudioNode {
     WTF_MAKE_ISO_ALLOCATED(AudioBasicProcessorNode);
 public:
     AudioBasicProcessorNode(BaseAudioContext&, NodeType);
+    virtual ~AudioBasicProcessorNode();
 
     // AudioNode
     void process(size_t framesToProcess) override;
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/Sources.txt b/modules/javafx.web/src/main/native/Source/WebCore/Sources.txt
index 99c2c4a11ca..b6caec5b6b0 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/Sources.txt
+++ b/modules/javafx.web/src/main/native/Source/WebCore/Sources.txt
@@ -704,6 +704,7 @@ bindings/js/JSReadableStreamSourceCustom.cpp
 bindings/js/JSRemoteDOMWindowBase.cpp
 bindings/js/JSRemoteDOMWindowCustom.cpp
 bindings/js/JSReportBodyCustom.cpp
+bindings/js/JSReportingObserverCustom.cpp
 bindings/js/JSResizeObserverCustom.cpp
 bindings/js/JSResizeObserverEntryCustom.cpp
 bindings/js/JSSVGPathSegCustom.cpp
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/accessibility/AccessibilityObject.cpp b/modules/javafx.web/src/main/native/Source/WebCore/accessibility/AccessibilityObject.cpp
index b51fbbd7128..037dcd3ea3f 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/accessibility/AccessibilityObject.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/accessibility/AccessibilityObject.cpp
@@ -1813,26 +1813,28 @@ String AccessibilityObject::stringForVisiblePositionRange(const VisiblePositionR
     return builder.toString();
 }
 
-VisiblePosition AccessibilityObject::nextLineEndPosition(const VisiblePosition& visiblePos) const
+VisiblePosition AccessibilityObject::nextLineEndPosition(const VisiblePosition& startPosition) const
 {
-    if (visiblePos.isNull())
-        return VisiblePosition();
-
-    // to make sure we move off of a line end
-    VisiblePosition nextVisiblePos = visiblePos.next();
-    if (nextVisiblePos.isNull())
-        return VisiblePosition();
-
-    VisiblePosition endPosition = endOfLine(nextVisiblePos);
+    if (startPosition.isNull())
+        return { };
 
-    // as long as the position hasn't reached the end of the doc,  keep searching for a valid line end position
-    // There are cases like when the position is next to a floating object that'll return null for end of line. This code will avoid returning null.
-    while (endPosition.isNull() && nextVisiblePos.isNotNull()) {
-        nextVisiblePos = nextVisiblePos.next();
-        endPosition = endOfLine(nextVisiblePos);
-    }
+    // Move to the next position to ensure we move off a line end.
+    auto nextPosition = startPosition.next();
+    if (nextPosition.isNull())
+        return { };
 
-    return endPosition;
+    auto lineEndPosition = endOfLine(nextPosition);
+    // As long as the position hasn't reached the end of the document, keep searching for a valid line
+    // end position. Skip past null positions, as there are cases like when the position is next to a
+    // floating object that'll return null for end of line. Also, in certain scenarios, like when one
+    // position is editable and the other isn't (e.g. in mixed-contenteditable-visible-character-range-hang.html),
+    // we may end up back at the same position we started at. This is never valid, so keep moving forward
+    // trying to find the next line end.
+    while ((lineEndPosition.isNull() || lineEndPosition == startPosition) && nextPosition.isNotNull()) {
+        nextPosition = nextPosition.next();
+        lineEndPosition = endOfLine(nextPosition);
+    }
+    return lineEndPosition;
 }
 
 std::optional<VisiblePosition> AccessibilityObject::previousLineStartPositionInternal(const VisiblePosition& visiblePosition) const
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/animation/CSSTransition.cpp b/modules/javafx.web/src/main/native/Source/WebCore/animation/CSSTransition.cpp
index 9e0c92660dd..38ddb83228d 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/animation/CSSTransition.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/animation/CSSTransition.cpp
@@ -61,6 +61,8 @@ CSSTransition::CSSTransition(const Styleable& styleable, const AnimatableCSSProp
 {
 }
 
+CSSTransition::~CSSTransition() = default;
+
 void CSSTransition::resolve(RenderStyle& targetStyle, const Style::ResolutionContext& resolutionContext, std::optional<Seconds> startTime)
 {
     StyleOriginatedAnimation::resolve(targetStyle, resolutionContext, startTime);
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/animation/CSSTransition.h b/modules/javafx.web/src/main/native/Source/WebCore/animation/CSSTransition.h
index 8cbb97de011..21ff323eeb8 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/animation/CSSTransition.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/animation/CSSTransition.h
@@ -43,7 +43,8 @@ class CSSTransition final : public StyleOriginatedAnimation {
     WTF_MAKE_ISO_ALLOCATED(CSSTransition);
 public:
     static Ref<CSSTransition> create(const Styleable&, const AnimatableCSSProperty&, MonotonicTime generationTime, const Animation&, const RenderStyle& oldStyle, const RenderStyle& newStyle, Seconds delay, Seconds duration, const RenderStyle& reversingAdjustedStartStyle, double);
-    ~CSSTransition() = default;
+
+    virtual ~CSSTransition();
 
     const AtomString transitionProperty() const;
     AnimatableCSSProperty property() const { return m_property; }
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/animation/DocumentTimeline.cpp b/modules/javafx.web/src/main/native/Source/WebCore/animation/DocumentTimeline.cpp
index fecbd7a9293..ff9c1fd55e2 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/animation/DocumentTimeline.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/animation/DocumentTimeline.cpp
@@ -72,6 +72,8 @@ DocumentTimeline::DocumentTimeline(Document& document, Seconds originTime)
     document.ensureTimelinesController().addTimeline(*this);
 }
 
+DocumentTimeline::~DocumentTimeline() = default;
+
 DocumentTimelinesController* DocumentTimeline::controller() const
 {
     if (m_document)
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/animation/DocumentTimeline.h b/modules/javafx.web/src/main/native/Source/WebCore/animation/DocumentTimeline.h
index cee18f5a033..9fa2fcf96c0 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/animation/DocumentTimeline.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/animation/DocumentTimeline.h
@@ -53,6 +53,8 @@ class DocumentTimeline final : public AnimationTimeline
     static Ref<DocumentTimeline> create(Document&);
     static Ref<DocumentTimeline> create(Document&, DocumentTimelineOptions&&);
 
+    virtual ~DocumentTimeline();
+
     Document* document() const { return m_document.get(); }
 
     std::optional<Seconds> currentTime() override;
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/bindings/js/JSExecState.h b/modules/javafx.web/src/main/native/Source/WebCore/bindings/js/JSExecState.h
index c1011d366d2..585b86fb28c 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/bindings/js/JSExecState.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/bindings/js/JSExecState.h
@@ -119,16 +119,16 @@ class JSExecState {
         task.run(lexicalGlobalObject);
     }
 
-    static JSC::JSInternalPromise& loadModule(JSC::JSGlobalObject& lexicalGlobalObject, const URL& topLevelModuleURL, JSC::JSValue parameters, JSC::JSValue scriptFetcher)
+    static JSC::JSInternalPromise* loadModule(JSC::JSGlobalObject& lexicalGlobalObject, const URL& topLevelModuleURL, JSC::JSValue parameters, JSC::JSValue scriptFetcher)
     {
         JSExecState currentState(&lexicalGlobalObject);
-        return *JSC::loadModule(&lexicalGlobalObject, JSC::Identifier::fromString(lexicalGlobalObject.vm(), topLevelModuleURL.string()), parameters, scriptFetcher);
+        return JSC::loadModule(&lexicalGlobalObject, JSC::Identifier::fromString(lexicalGlobalObject.vm(), topLevelModuleURL.string()), parameters, scriptFetcher);
     }
 
-    static JSC::JSInternalPromise& loadModule(JSC::JSGlobalObject& lexicalGlobalObject, const JSC::SourceCode& sourceCode, JSC::JSValue scriptFetcher)
+    static JSC::JSInternalPromise* loadModule(JSC::JSGlobalObject& lexicalGlobalObject, const JSC::SourceCode& sourceCode, JSC::JSValue scriptFetcher)
     {
         JSExecState currentState(&lexicalGlobalObject);
-        return *JSC::loadModule(&lexicalGlobalObject, sourceCode, scriptFetcher);
+        return JSC::loadModule(&lexicalGlobalObject, sourceCode, scriptFetcher);
     }
 
     static JSC::JSValue linkAndEvaluateModule(JSC::JSGlobalObject& lexicalGlobalObject, const JSC::Identifier& moduleKey, JSC::JSValue scriptFetcher, NakedPtr<JSC::Exception>& returnedException)
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/bindings/js/JSReportingObserverCustom.cpp b/modules/javafx.web/src/main/native/Source/WebCore/bindings/js/JSReportingObserverCustom.cpp
new file mode 100644
index 00000000000..b60ce0146a7
--- /dev/null
+++ b/modules/javafx.web/src/main/native/Source/WebCore/bindings/js/JSReportingObserverCustom.cpp
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2024 Apple, Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "JSReportingObserver.h"
+
+#include "ReportingObserverCallback.h"
+
+#include <JavaScriptCore/JSCInlines.h>
+
+namespace WebCore {
+
+template <typename Visitor>
+void JSReportingObserver::visitAdditionalChildren(Visitor& visitor)
+{
+    wrapped().callbackConcurrently().visitJSFunction(visitor);
+}
+
+DEFINE_VISIT_ADDITIONAL_CHILDREN(JSReportingObserver);
+
+}
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/bindings/js/ScriptController.cpp b/modules/javafx.web/src/main/native/Source/WebCore/bindings/js/ScriptController.cpp
index e5ee62d05d5..1108d406422 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/bindings/js/ScriptController.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/bindings/js/ScriptController.cpp
@@ -184,8 +184,10 @@ void ScriptController::loadModuleScriptInWorld(LoadableModuleScript& moduleScrip
     auto& proxy = jsWindowProxy(world);
     auto& lexicalGlobalObject = *proxy.window();
 
-    auto& promise = JSExecState::loadModule(lexicalGlobalObject, topLevelModuleURL, JSC::JSScriptFetchParameters::create(lexicalGlobalObject.vm(), WTFMove(topLevelFetchParameters)), JSC::JSScriptFetcher::create(lexicalGlobalObject.vm(), { &moduleScript }));
-    setupModuleScriptHandlers(moduleScript, promise, world);
+    auto* promise = JSExecState::loadModule(lexicalGlobalObject, topLevelModuleURL, JSC::JSScriptFetchParameters::create(lexicalGlobalObject.vm(), WTFMove(topLevelFetchParameters)), JSC::JSScriptFetcher::create(lexicalGlobalObject.vm(), { &moduleScript }));
+    if (UNLIKELY(!promise))
+        return;
+    setupModuleScriptHandlers(moduleScript, *promise, world);
 }
 
 void ScriptController::loadModuleScript(LoadableModuleScript& moduleScript, const URL& topLevelModuleURL, Ref<JSC::ScriptFetchParameters>&& topLevelFetchParameters)
@@ -200,8 +202,10 @@ void ScriptController::loadModuleScriptInWorld(LoadableModuleScript& moduleScrip
     auto& proxy = jsWindowProxy(world);
     auto& lexicalGlobalObject = *proxy.window();
 
-    auto& promise = JSExecState::loadModule(lexicalGlobalObject, sourceCode.jsSourceCode(), JSC::JSScriptFetcher::create(lexicalGlobalObject.vm(), { &moduleScript }));
-    setupModuleScriptHandlers(moduleScript, promise, world);
+    auto* promise = JSExecState::loadModule(lexicalGlobalObject, sourceCode.jsSourceCode(), JSC::JSScriptFetcher::create(lexicalGlobalObject.vm(), { &moduleScript }));
+    if (UNLIKELY(!promise))
+        return;
+    setupModuleScriptHandlers(moduleScript, *promise, world);
 }
 
 void ScriptController::loadModuleScript(LoadableModuleScript& moduleScript, const ScriptSourceCode& sourceCode)
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/crypto/keys/CryptoKeyEC.cpp b/modules/javafx.web/src/main/native/Source/WebCore/crypto/keys/CryptoKeyEC.cpp
index e5da3f2b326..04c84dab6dd 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/crypto/keys/CryptoKeyEC.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/crypto/keys/CryptoKeyEC.cpp
@@ -59,6 +59,8 @@ CryptoKeyEC::CryptoKeyEC(CryptoAlgorithmIdentifier identifier, NamedCurve curve,
     ASSERT(platformSupportedCurve(curve));
 }
 
+CryptoKeyEC::~CryptoKeyEC() = default;
+
 ExceptionOr<CryptoKeyPair> CryptoKeyEC::generatePair(CryptoAlgorithmIdentifier identifier, const String& curve, bool extractable, CryptoKeyUsageBitmap usages)
 {
     auto namedCurve = toNamedCurve(curve);
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/crypto/keys/CryptoKeyEC.h b/modules/javafx.web/src/main/native/Source/WebCore/crypto/keys/CryptoKeyEC.h
index 954f61d052b..bc4617600f9 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/crypto/keys/CryptoKeyEC.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/crypto/keys/CryptoKeyEC.h
@@ -72,7 +72,7 @@ class CryptoKeyEC final : public CryptoKey {
     {
         return adoptRef(*new CryptoKeyEC(identifier, curve, type, WTFMove(platformKey), extractable, usages));
     }
-    virtual ~CryptoKeyEC() = default;
+    virtual ~CryptoKeyEC();
 
     WEBCORE_EXPORT static ExceptionOr<CryptoKeyPair> generatePair(CryptoAlgorithmIdentifier, const String& curve, bool extractable, CryptoKeyUsageBitmap);
     WEBCORE_EXPORT static RefPtr<CryptoKeyEC> importRaw(CryptoAlgorithmIdentifier, const String& curve, Vector<uint8_t>&& keyData, bool extractable, CryptoKeyUsageBitmap);
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/css/mediaControls.css b/modules/javafx.web/src/main/native/Source/WebCore/css/mediaControls.css
index 1b9f4e50ef9..3a4a6d062c7 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/css/mediaControls.css
+++ b/modules/javafx.web/src/main/native/Source/WebCore/css/mediaControls.css
@@ -273,16 +273,9 @@ video::cue(:future) {
     color: gray;
 }
 
-[pseudo="-webkit-media-text-track-display"] b {
-    font-weight: bold;
-}
-
-[pseudo="-webkit-media-text-track-display"] u {
-    text-decoration: underline;
-}
-
-[pseudo="-webkit-media-text-track-display"] i {
-    font-style: italic;
-}
+[useragentpart="-webkit-media-text-track-display"] b { font-weight: bold; }
+[useragentpart="-webkit-media-text-track-display"] u { text-decoration: underline; }
+[useragentpart="-webkit-media-text-track-display"] i { font-style: italic; }
+[useragentpart="-webkit-media-text-track-display"] .hidden { display: none; }
 
 #endif
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/css/typedom/CSSUnparsedValue.cpp b/modules/javafx.web/src/main/native/Source/WebCore/css/typedom/CSSUnparsedValue.cpp
index 1f424428cb7..2eb2d027ccd 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/css/typedom/CSSUnparsedValue.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/css/typedom/CSSUnparsedValue.cpp
@@ -119,6 +119,8 @@ CSSUnparsedValue::CSSUnparsedValue(Vector<CSSUnparsedSegment>&& segments)
 {
 }
 
+CSSUnparsedValue::~CSSUnparsedValue() = default;
+
 void CSSUnparsedValue::serialize(StringBuilder& builder, OptionSet<SerializationArguments> arguments) const
 {
     for (auto& segment : m_segments) {
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/css/typedom/CSSUnparsedValue.h b/modules/javafx.web/src/main/native/Source/WebCore/css/typedom/CSSUnparsedValue.h
index 7f661387d21..cc384e1c140 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/css/typedom/CSSUnparsedValue.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/css/typedom/CSSUnparsedValue.h
@@ -42,6 +42,7 @@ class CSSUnparsedValue final : public CSSStyleValue {
     static Ref<CSSUnparsedValue> create(Vector<CSSUnparsedSegment>&&);
     static Ref<CSSUnparsedValue> create(CSSParserTokenRange);
 
+    virtual ~CSSUnparsedValue();
     void serialize(StringBuilder&, OptionSet<SerializationArguments>) const final;
     size_t length() const { return m_segments.size(); }
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/css/typedom/transform/CSSPerspective.cpp b/modules/javafx.web/src/main/native/Source/WebCore/css/typedom/transform/CSSPerspective.cpp
index dc5f9a4c3dd..a9b87203fce 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/css/typedom/transform/CSSPerspective.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/css/typedom/transform/CSSPerspective.cpp
@@ -102,6 +102,8 @@ CSSPerspective::CSSPerspective(CSSPerspectiveValue length)
 {
 }
 
+CSSPerspective::~CSSPerspective() = default;
+
 ExceptionOr<void> CSSPerspective::setLength(CSSPerspectiveValue length)
 {
     auto checkedLength = checkLength(WTFMove(length));
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/css/typedom/transform/CSSPerspective.h b/modules/javafx.web/src/main/native/Source/WebCore/css/typedom/transform/CSSPerspective.h
index d6c2029b825..a09335dfb3b 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/css/typedom/transform/CSSPerspective.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/css/typedom/transform/CSSPerspective.h
@@ -41,6 +41,8 @@ class CSSPerspective : public CSSTransformComponent {
     static ExceptionOr<Ref<CSSPerspective>> create(CSSPerspectiveValue);
     static ExceptionOr<Ref<CSSPerspective>> create(CSSFunctionValue&);
 
+    virtual ~CSSPerspective();
+
     const CSSPerspectiveValue& length() const { return m_length; }
     ExceptionOr<void> setLength(CSSPerspectiveValue);
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/css/typedom/transform/CSSTransformValue.cpp b/modules/javafx.web/src/main/native/Source/WebCore/css/typedom/transform/CSSTransformValue.cpp
index 34c7e36c1ff..89c22f43558 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/css/typedom/transform/CSSTransformValue.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/css/typedom/transform/CSSTransformValue.cpp
@@ -167,6 +167,8 @@ CSSTransformValue::CSSTransformValue(Vector<RefPtr<CSSTransformComponent>>&& tra
 {
 }
 
+CSSTransformValue::~CSSTransformValue() = default;
+
 void CSSTransformValue::serialize(StringBuilder& builder, OptionSet<SerializationArguments>) const
 {
     // https://drafts.css-houdini.org/css-typed-om/#serialize-a-csstransformvalue
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/css/typedom/transform/CSSTransformValue.h b/modules/javafx.web/src/main/native/Source/WebCore/css/typedom/transform/CSSTransformValue.h
index 4b044b2f966..852608fa26e 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/css/typedom/transform/CSSTransformValue.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/css/typedom/transform/CSSTransformValue.h
@@ -42,6 +42,8 @@ class CSSTransformValue final : public CSSStyleValue {
     static ExceptionOr<Ref<CSSTransformValue>> create(const CSSTransformListValue&);
     static ExceptionOr<Ref<CSSTransformValue>> create(Vector<RefPtr<CSSTransformComponent>>&&);
 
+    virtual ~CSSTransformValue();
+
     size_t length() const { return m_components.size(); }
     bool isSupportedPropertyIndex(unsigned index) const { return index < m_components.size(); }
     RefPtr<CSSTransformComponent> item(size_t);
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/dom/Document.cpp b/modules/javafx.web/src/main/native/Source/WebCore/dom/Document.cpp
index 2951e672911..5a12d51ac6d 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/dom/Document.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/dom/Document.cpp
@@ -4028,6 +4028,10 @@ void Document::setURL(const URL& url)
     if (newURL == m_url)
         return;
 
+    if (RefPtr page = protectedPage())
+        m_fragmentDirective = page->mainFrameURLFragment();
+
+    if (m_fragmentDirective.isEmpty())
     m_fragmentDirective = newURL.consumefragmentDirective();
 
     if (SecurityOrigin::shouldIgnoreHost(newURL))
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/dom/DragEvent.cpp b/modules/javafx.web/src/main/native/Source/WebCore/dom/DragEvent.cpp
index 53d30ebef8f..c7d8c5e81d4 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/dom/DragEvent.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/dom/DragEvent.cpp
@@ -74,4 +74,6 @@ EventInterface DragEvent::eventInterface() const
     return DragEventInterfaceType;
 }
 
+DragEvent::~DragEvent() = default;
+
 } // namespace WebCore
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/dom/DragEvent.h b/modules/javafx.web/src/main/native/Source/WebCore/dom/DragEvent.h
index 7f09154cd9e..8cadffdb015 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/dom/DragEvent.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/dom/DragEvent.h
@@ -49,6 +49,7 @@ class DragEvent : public MouseEvent {
         const IntPoint& screenLocation, const IntPoint& windowLocation, double movementX, double movementY, OptionSet<Modifier>, MouseButton, unsigned short buttons,
         EventTarget* relatedTarget, double force, SyntheticClickType, DataTransfer* = nullptr, IsSimulated = IsSimulated::No, IsTrusted = IsTrusted::Yes);
 
+    virtual ~DragEvent();
 
     DataTransfer* dataTransfer() const { return m_dataTransfer.get(); }
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/dom/InputEvent.cpp b/modules/javafx.web/src/main/native/Source/WebCore/dom/InputEvent.cpp
index 3c38cbe9a10..13988505117 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/dom/InputEvent.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/dom/InputEvent.cpp
@@ -61,6 +61,8 @@ InputEvent::InputEvent(const AtomString& eventType, const Init& initializer)
 {
 }
 
+InputEvent::~InputEvent() = default;
+
 RefPtr<DataTransfer> InputEvent::dataTransfer() const
 {
     return m_dataTransfer;
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/dom/InputEvent.h b/modules/javafx.web/src/main/native/Source/WebCore/dom/InputEvent.h
index 0f5ac281d3c..87b78299ba4 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/dom/InputEvent.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/dom/InputEvent.h
@@ -44,6 +44,8 @@ class InputEvent final : public UIEvent {
         String inputType;
     };
 
+    virtual ~InputEvent();
+
     static Ref<InputEvent> create(const AtomString& eventType, const String& inputType, IsCancelable, RefPtr<WindowProxy>&& view,
         const String& data, RefPtr<DataTransfer>&&, const Vector<RefPtr<StaticRange>>& targetRanges, int detail, IsInputMethodComposing);
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/editing/ReplaceSelectionCommand.cpp b/modules/javafx.web/src/main/native/Source/WebCore/editing/ReplaceSelectionCommand.cpp
index f10b9c4293d..f7000fb6daa 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/editing/ReplaceSelectionCommand.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/editing/ReplaceSelectionCommand.cpp
@@ -235,6 +235,8 @@ ReplacementFragment::ReplacementFragment(RefPtr<DocumentFragment>&& inputFragmen
     }
 }
 
+ReplaceSelectionCommand::~ReplaceSelectionCommand() = default;
+
 void ReplacementFragment::removeContentsWithSideEffects()
 {
     Vector<Ref<Element>> elementsToRemove;
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/editing/ReplaceSelectionCommand.h b/modules/javafx.web/src/main/native/Source/WebCore/editing/ReplaceSelectionCommand.h
index f475011a555..716fc341893 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/editing/ReplaceSelectionCommand.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/editing/ReplaceSelectionCommand.h
@@ -52,6 +52,8 @@ class ReplaceSelectionCommand : public CompositeEditCommand {
         return adoptRef(*new ReplaceSelectionCommand(WTFMove(document), WTFMove(fragment), options, editingAction));
     }
 
+    virtual ~ReplaceSelectionCommand();
+
     VisibleSelection visibleSelectionForInsertedText() const { return m_visibleSelectionForInsertedText; }
     String documentFragmentPlainText() const { return m_documentFragmentPlainText; }
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/html/CollectionTraversalInlines.h b/modules/javafx.web/src/main/native/Source/WebCore/html/CollectionTraversalInlines.h
index c1fbc3b2b59..824aa2bc41a 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/html/CollectionTraversalInlines.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/html/CollectionTraversalInlines.h
@@ -27,6 +27,7 @@
 
 #include "CollectionTraversal.h"
 #include "ElementChildIteratorInlines.h"
+#include "HTMLOptionsCollectionInlines.h"
 #include "TypedElementDescendantIteratorInlines.h"
 
 namespace WebCore {
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/html/GenericCachedHTMLCollection.cpp b/modules/javafx.web/src/main/native/Source/WebCore/html/GenericCachedHTMLCollection.cpp
index ecbc9fb6725..88dfd2e9ffb 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/html/GenericCachedHTMLCollection.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/html/GenericCachedHTMLCollection.cpp
@@ -50,6 +50,11 @@ GenericCachedHTMLCollection<traversalType>::GenericCachedHTMLCollection(Containe
 template GenericCachedHTMLCollection<CollectionTraversalType::Descendants>::GenericCachedHTMLCollection(ContainerNode&, CollectionType);
 template GenericCachedHTMLCollection<CollectionTraversalType::ChildrenOnly>::GenericCachedHTMLCollection(ContainerNode&, CollectionType);
 
+template <CollectionTraversalType traversalType>
+GenericCachedHTMLCollection<traversalType>::~GenericCachedHTMLCollection() = default;
+template GenericCachedHTMLCollection<CollectionTraversalType::Descendants>::~GenericCachedHTMLCollection();
+template GenericCachedHTMLCollection<CollectionTraversalType::ChildrenOnly>::~GenericCachedHTMLCollection();
+
 template <CollectionTraversalType traversalType>
 bool GenericCachedHTMLCollection<traversalType>::elementMatches(Element& element) const
 {
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/html/GenericCachedHTMLCollection.h b/modules/javafx.web/src/main/native/Source/WebCore/html/GenericCachedHTMLCollection.h
index 714b6a11173..3eb9094d226 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/html/GenericCachedHTMLCollection.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/html/GenericCachedHTMLCollection.h
@@ -39,6 +39,8 @@ class GenericCachedHTMLCollection final : public CachedHTMLCollection<GenericCac
         return adoptRef(*new GenericCachedHTMLCollection(base, collectionType));
     }
 
+    virtual ~GenericCachedHTMLCollection();
+
     bool elementMatches(Element&) const;
 
 private:
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/html/HTMLMediaElement.cpp b/modules/javafx.web/src/main/native/Source/WebCore/html/HTMLMediaElement.cpp
index e88e489d466..6980905dee2 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/html/HTMLMediaElement.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/html/HTMLMediaElement.cpp
@@ -1635,6 +1635,11 @@ void HTMLMediaElement::loadResource(const URL& initialURL, ContentType& contentT
         return;
     }
 
+    if (!m_player) {
+        ASSERT_NOT_REACHED("It should not be possible to enter loadResource without a valid m_player object");
+        mediaLoadingFailed(MediaPlayer::NetworkState::FormatError);
+        return;
+    }
     URL url = initialURL;
 #if PLATFORM(COCOA)
     if (url.protocolIsFile() && !frame->loader().willLoadMediaElementURL(url, *this)) {
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/html/ImageBitmap.cpp b/modules/javafx.web/src/main/native/Source/WebCore/html/ImageBitmap.cpp
index c47f3bf94ba..26733bf871c 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/html/ImageBitmap.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/html/ImageBitmap.cpp
@@ -725,8 +725,10 @@ class PendingImageBitmap final : public RefCounted<PendingImageBitmap>, public A
 public:
     static void fetch(ScriptExecutionContext& scriptExecutionContext, RefPtr<Blob>&& blob, ImageBitmapOptions&& options, std::optional<IntRect> rect, ImageBitmap::ImageBitmapCompletionHandler&& completionHandler)
     {
-        if (scriptExecutionContext.activeDOMObjectsAreStopped())
+        if (scriptExecutionContext.activeDOMObjectsAreStopped()) {
+            completionHandler(Exception { ExceptionCode::InvalidStateError, "Cannot create ImageBitmap in a document without browsing context"_s });
             return;
+        }
         Ref pendingImageBitmap = adoptRef(*new PendingImageBitmap(scriptExecutionContext, WTFMove(blob), WTFMove(options), WTFMove(rect), WTFMove(completionHandler)));
         pendingImageBitmap->suspendIfNeeded();
         pendingImageBitmap->start(scriptExecutionContext);
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/html/ImageDocument.cpp b/modules/javafx.web/src/main/native/Source/WebCore/html/ImageDocument.cpp
index 9e47f0140bc..27ae5583549 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/html/ImageDocument.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/html/ImageDocument.cpp
@@ -147,6 +147,9 @@ void ImageDocument::updateDuringParsing()
     if (!m_imageElement)
         createDocumentStructure();
 
+    if (!frame())
+        return;
+
     if (RefPtr<FragmentedSharedBuffer> buffer = loader()->mainResourceData()) {
         if (auto* cachedImage = m_imageElement->cachedImage())
             cachedImage->updateBuffer(*buffer);
@@ -237,9 +240,10 @@ void ImageDocument::createDocumentStructure()
     auto head = HTMLHeadElement::create(*this);
     rootElement->appendChild(head);
 
+    RefPtr documentLoader = loader();
     auto body = HTMLBodyElement::create(*this);
     body->setAttribute(styleAttr, "margin: 0px; height: 100%"_s);
-    if (MIMETypeRegistry::isPDFMIMEType(document().loader()->responseMIMEType()))
+    if (documentLoader && MIMETypeRegistry::isPDFMIMEType(documentLoader->responseMIMEType()))
         body->setInlineStyleProperty(CSSPropertyBackgroundColor, "white"_s);
     rootElement->appendChild(body);
 
@@ -250,8 +254,8 @@ void ImageDocument::createDocumentStructure()
         imageElement->setAttribute(styleAttr, "-webkit-user-select:none; display:block; padding:env(safe-area-inset-top) env(safe-area-inset-right) env(safe-area-inset-bottom) env(safe-area-inset-left);"_s);
     imageElement->setLoadManually(true);
     imageElement->setSrc(AtomString { url().string() });
-    if (auto* cachedImage = imageElement->cachedImage())
-        cachedImage->setResponse(loader()->response());
+    if (auto* cachedImage = imageElement->cachedImage(); documentLoader && cachedImage)
+        cachedImage->setResponse(documentLoader->response());
     body->appendChild(imageElement);
     imageElement->setLoadManually(false);
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/html/PluginDocument.cpp b/modules/javafx.web/src/main/native/Source/WebCore/html/PluginDocument.cpp
index cbbe7c688ff..7d98b8cf682 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/html/PluginDocument.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/html/PluginDocument.cpp
@@ -166,6 +166,8 @@ PluginDocument::PluginDocument(LocalFrame& frame, const URL& url)
     lockCompatibilityMode();
 }
 
+PluginDocument::~PluginDocument() = default;
+
 Ref<DocumentParser> PluginDocument::createParser()
 {
     return PluginDocumentParser::create(*this);
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/html/PluginDocument.h b/modules/javafx.web/src/main/native/Source/WebCore/html/PluginDocument.h
index 42054191b85..10dd38d3ddb 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/html/PluginDocument.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/html/PluginDocument.h
@@ -41,6 +41,8 @@ class PluginDocument final : public HTMLDocument {
         return document;
     }
 
+    virtual ~PluginDocument();
+
     WEBCORE_EXPORT PluginViewBase* pluginWidget();
     HTMLPlugInElement* pluginElement() { return m_pluginElement.get(); }
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp b/modules/javafx.web/src/main/native/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp
index 75ea7573e94..544cbe47bf0 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp
@@ -1571,25 +1571,6 @@ ExceptionOr<void> CanvasRenderingContext2DBase::drawImage(CSSStyleImageValue& im
     return result;
 }
 
-static std::pair<FloatRect, FloatRect> normalizeSourceAndDestination(const FloatRect& imageRect, const FloatRect& srcRect, const FloatRect& dstRect)
-{
-    std::pair<FloatRect, FloatRect> srcDstRect { normalizeRect(srcRect), normalizeRect(dstRect) };
-
-    // When the source rectangle is outside the source image, the source rectangle must be clipped
-    // to the source image and the destination rectangle must be clipped in the same proportion.
-    FloatRect originalNormalizedSrcRect = srcDstRect.first;
-    srcDstRect.first.intersect(imageRect);
-    if (srcDstRect.first.isEmpty())
-        return srcDstRect;
-
-    if (srcDstRect.first != originalNormalizedSrcRect) {
-        srcDstRect.second.setWidth(srcDstRect.second.width() * srcDstRect.first.width() / originalNormalizedSrcRect.width());
-        srcDstRect.second.setHeight(srcDstRect.second.height() * srcDstRect.first.height() / originalNormalizedSrcRect.height());
-    }
-
-    return srcDstRect;
-}
-
 #if ENABLE(WEB_CODECS)
 ExceptionOr<void> CanvasRenderingContext2DBase::drawImage(WebCodecsVideoFrame& frame, const FloatRect&, const FloatRect& dstRect)
 {
@@ -1628,9 +1609,8 @@ ExceptionOr<void> CanvasRenderingContext2DBase::drawImage(Document& document, Ca
     if (!dstRect.width() || !dstRect.height())
         return { };
 
-    auto normalizedSrcDstRect = normalizeSourceAndDestination(imageRect, srcRect, dstRect);
-    FloatRect normalizedSrcRect = normalizedSrcDstRect.first;
-    FloatRect normalizedDstRect = normalizedSrcDstRect.second;
+    auto normalizedSrcRect = normalizeRect(srcRect);
+    auto normalizedDstRect = normalizeRect(dstRect);
 
     if (normalizedSrcRect.isEmpty())
         return { };
@@ -1711,9 +1691,8 @@ ExceptionOr<void> CanvasRenderingContext2DBase::drawImage(CanvasBase& sourceCanv
     if (!srcRect.width() || !srcRect.height())
         return { };
 
-    auto normalizedSrcDstRect = normalizeSourceAndDestination(srcCanvasRect, srcRect, dstRect);
-    FloatRect normalizedSrcRect = normalizedSrcDstRect.first;
-    FloatRect normalizedDstRect = normalizedSrcDstRect.second;
+    auto normalizedSrcRect = normalizeRect(srcRect);
+    auto normalizedDstRect = normalizeRect(dstRect);
 
     if (normalizedSrcRect.isEmpty())
         return { };
@@ -1772,13 +1751,11 @@ ExceptionOr<void> CanvasRenderingContext2DBase::drawImage(HTMLVideoElement& vide
     if (video.readyState() == HTMLMediaElement::HAVE_NOTHING || video.readyState() == HTMLMediaElement::HAVE_METADATA)
         return { };
 
-    FloatRect videoRect = FloatRect(FloatPoint(), size(video));
     if (!srcRect.width() || !srcRect.height())
         return { };
 
-    auto normalizedSrcDstRect = normalizeSourceAndDestination(videoRect, srcRect, dstRect);
-    FloatRect normalizedSrcRect = normalizedSrcDstRect.first;
-    FloatRect normalizedDstRect = normalizedSrcDstRect.second;
+    auto normalizedSrcRect = normalizeRect(srcRect);
+    auto normalizedDstRect = normalizeRect(dstRect);
 
     if (normalizedSrcRect.isEmpty())
         return { };
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/loader/DocumentLoader.cpp b/modules/javafx.web/src/main/native/Source/WebCore/loader/DocumentLoader.cpp
index 98c755fc73d..5dfaf585272 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/loader/DocumentLoader.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/loader/DocumentLoader.cpp
@@ -1435,7 +1435,7 @@ void DocumentLoader::checkLoadComplete()
     if (!m_frame || isLoading())
         return;
 
-    // ASSERT(this == frameLoader()->activeDocumentLoader());
+    ASSERT(this == frameLoader()->activeDocumentLoader());
     m_frame->document()->domWindow()->finishedLoading();
 }
 
@@ -2148,6 +2148,15 @@ void DocumentLoader::startLoadingMainResource()
     m_contentFilter = !m_substituteData.isValid() ? ContentFilter::create(*this) : nullptr;
 #endif
 
+    auto url = m_request.url();
+    auto fragmentDirective = url.consumefragmentDirective();
+
+    m_request.setURL(url, m_request.didFilterLinkDecoration());
+    if (m_frame) {
+        RefPtr page = m_frame->protectedPage();
+        if (page)
+            page->setMainFrameURLFragment(WTFMove(fragmentDirective));
+    }
 
     // Make sure we re-apply the user agent to the Document's ResourceRequest upon reload in case the embedding
     // application has changed it, by clearing the previous user agent value here and applying the new value in CachedResourceLoader.
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/loader/cache/CachedSVGFont.cpp b/modules/javafx.web/src/main/native/Source/WebCore/loader/cache/CachedSVGFont.cpp
index ece55c3ac23..11a72d0162f 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/loader/cache/CachedSVGFont.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/loader/cache/CachedSVGFont.cpp
@@ -57,6 +57,8 @@ CachedSVGFont::CachedSVGFont(CachedResourceRequest&& request, CachedSVGFont& res
 {
 }
 
+CachedSVGFont::~CachedSVGFont() = default;
+
 RefPtr<Font> CachedSVGFont::createFont(const FontDescription& fontDescription, bool syntheticBold, bool syntheticItalic, const FontCreationContext& fontCreationContext)
 {
     ASSERT(firstFontFace());
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/loader/cache/CachedSVGFont.h b/modules/javafx.web/src/main/native/Source/WebCore/loader/cache/CachedSVGFont.h
index 9361c8a3567..51e3b3300a5 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/loader/cache/CachedSVGFont.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/loader/cache/CachedSVGFont.h
@@ -38,6 +38,7 @@ class CachedSVGFont final : public CachedFont {
 public:
     CachedSVGFont(CachedResourceRequest&&, PAL::SessionID, const CookieJar*, const Settings&);
     CachedSVGFont(CachedResourceRequest&&, CachedSVGFont&);
+    virtual ~CachedSVGFont();
 
     bool ensureCustomFontData() final;
     RefPtr<Font> createFont(const FontDescription&, bool syntheticBold, bool syntheticItalic, const FontCreationContext&) final;
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/page/Page.cpp b/modules/javafx.web/src/main/native/Source/WebCore/page/Page.cpp
index a48f5f9a8d0..844ee490649 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/page/Page.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/page/Page.cpp
@@ -723,6 +723,11 @@ void Page::setMainFrameURL(const URL& url)
     m_mainFrameURL = url;
 }
 
+void Page::setMainFrameURLFragment(String&& fragment)
+{
+    if (!fragment.isEmpty())
+        m_mainFrameURLFragment = WTFMove(fragment);
+}
 bool Page::openedByDOM() const
 {
     return m_openedByDOM;
@@ -1531,6 +1536,8 @@ void Page::didCommitLoad()
     m_isEditableRegionEnabled = false;
 #endif
 
+    m_mainFrameURLFragment = { };
+
     resetSeenPlugins();
     resetSeenMediaEngines();
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/page/Page.h b/modules/javafx.web/src/main/native/Source/WebCore/page/Page.h
index 2639e13f925..d1294635396 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/page/Page.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/page/Page.h
@@ -330,6 +330,8 @@ class Page : public RefCounted<Page>, public Supplementable<Page>, public CanMak
     WEBCORE_EXPORT void setMainFrame(Ref<Frame>&&);
     const URL& mainFrameURL() const { return m_mainFrameURL; }
     WEBCORE_EXPORT void setMainFrameURL(const URL&);
+    WEBCORE_EXPORT void setMainFrameURLFragment(String&&);
+    String mainFrameURLFragment() const { return m_mainFrameURLFragment; }
 
     bool openedByDOM() const;
     WEBCORE_EXPORT void setOpenedByDOM();
@@ -1177,6 +1179,7 @@ class Page : public RefCounted<Page>, public Supplementable<Page>, public CanMak
     UniqueRef<EditorClient> m_editorClient;
     Ref<Frame> m_mainFrame;
     URL m_mainFrameURL;
+    String m_mainFrameURLFragment;
 
     RefPtr<PluginData> m_pluginData;
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/page/WorkerNavigator.cpp b/modules/javafx.web/src/main/native/Source/WebCore/page/WorkerNavigator.cpp
index c95935a302c..4c34c0b5035 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/page/WorkerNavigator.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/page/WorkerNavigator.cpp
@@ -46,6 +46,8 @@ WorkerNavigator::WorkerNavigator(ScriptExecutionContext& context, const String&
 {
 }
 
+WorkerNavigator::~WorkerNavigator() = default;
+
 const String& WorkerNavigator::userAgent() const
 {
     return m_userAgent;
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/page/WorkerNavigator.h b/modules/javafx.web/src/main/native/Source/WebCore/page/WorkerNavigator.h
index 550636079e6..8af54f088c8 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/page/WorkerNavigator.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/page/WorkerNavigator.h
@@ -38,6 +38,8 @@ class WorkerNavigator final : public NavigatorBase, public Supplementable<Worker
 public:
     static Ref<WorkerNavigator> create(ScriptExecutionContext& context, const String& userAgent, bool isOnline) { return adoptRef(*new WorkerNavigator(context, userAgent, isOnline)); }
 
+    virtual ~WorkerNavigator();
+
     const String& userAgent() const final;
     bool onLine() const final;
     void setIsOnline(bool isOnline) { m_isOnline = isOnline; }
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/page/scrolling/ScrollingStateFixedNode.cpp b/modules/javafx.web/src/main/native/Source/WebCore/page/scrolling/ScrollingStateFixedNode.cpp
index 4d3d2735be7..33433adeea0 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/page/scrolling/ScrollingStateFixedNode.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/page/scrolling/ScrollingStateFixedNode.cpp
@@ -84,6 +84,10 @@ void ScrollingStateFixedNode::reconcileLayerPositionForViewportRect(const Layout
     FloatPoint position = m_constraints.layerPositionForViewportRect(viewportRect);
     if (layer().representsGraphicsLayer()) {
         auto* graphicsLayer = static_cast<GraphicsLayer*>(layer());
+        ASSERT(graphicsLayer);
+        // Crash data suggest that graphicsLayer can be null: rdar://105887621.
+        if (!graphicsLayer)
+            return;
 
         LOG_WITH_STREAM(Scrolling, stream << "ScrollingStateFixedNode " << scrollingNodeID() <<" reconcileLayerPositionForViewportRect " << action << " position of layer " << graphicsLayer->primaryLayerID() << " to " << position);
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/platform/audio/AudioDSPKernelProcessor.cpp b/modules/javafx.web/src/main/native/Source/WebCore/platform/audio/AudioDSPKernelProcessor.cpp
index 5ab13edb8bf..28f6347d11d 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/platform/audio/AudioDSPKernelProcessor.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/platform/audio/AudioDSPKernelProcessor.cpp
@@ -44,6 +44,8 @@ AudioDSPKernelProcessor::AudioDSPKernelProcessor(float sampleRate, unsigned numb
 {
 }
 
+AudioDSPKernelProcessor::~AudioDSPKernelProcessor() = default;
+
 void AudioDSPKernelProcessor::initialize()
 {
     if (isInitialized())
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/platform/audio/AudioDSPKernelProcessor.h b/modules/javafx.web/src/main/native/Source/WebCore/platform/audio/AudioDSPKernelProcessor.h
index 49859178dae..51c46f8ca65 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/platform/audio/AudioDSPKernelProcessor.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/platform/audio/AudioDSPKernelProcessor.h
@@ -49,6 +49,7 @@ class AudioDSPKernelProcessor : public AudioProcessor {
 public:
     // numberOfChannels may be later changed if object is not yet in an "initialized" state
     AudioDSPKernelProcessor(float sampleRate, unsigned numberOfChannels);
+    virtual ~AudioDSPKernelProcessor();
 
     // Subclasses create the appropriate type of processing kernel here.
     // We'll call this to create a kernel for each channel.
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/NativeImage.cpp b/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/NativeImage.cpp
index ae336a06222..851dd6c62bb 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/NativeImage.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/NativeImage.cpp
@@ -77,6 +77,8 @@ void NativeImage::draw(GraphicsContext& context, const FloatRect& destRect, cons
     context.drawNativeImageInternal(*this, destRect, srcRect, options);
 }
 #endif
+NativeImage::~NativeImage() = default;
+
 const PlatformImagePtr& NativeImage::platformImage() const
 {
     return m_backend->platformImage();
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/NativeImage.h b/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/NativeImage.h
index 711688cf03b..9d199bf43bf 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/NativeImage.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/NativeImage.h
@@ -47,6 +47,8 @@ class NativeImage final : public RenderingResource {
     // Creates a NativeImage that is intended to be drawn once or only few times. Signals the platform to avoid generating any caches for the image.
     static WEBCORE_EXPORT RefPtr<NativeImage> createTransient(PlatformImagePtr&&, RenderingResourceIdentifier = RenderingResourceIdentifier::generate());
 
+    virtual ~NativeImage();
+
     WEBCORE_EXPORT const PlatformImagePtr& platformImage() const;
 
     WEBCORE_EXPORT IntSize size() const;
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/RoundedRect.cpp b/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/RoundedRect.cpp
index 0f825f20364..33ad1f3c9c4 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/RoundedRect.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/RoundedRect.cpp
@@ -178,8 +178,8 @@ bool RoundedRect::isRenderable() const
 
 void RoundedRect::adjustRadii()
 {
-    int maxRadiusWidth = std::max(m_radii.topLeft().width() + m_radii.topRight().width(), m_radii.bottomLeft().width() + m_radii.bottomRight().width());
-    int maxRadiusHeight = std::max(m_radii.topLeft().height() + m_radii.bottomLeft().height(), m_radii.topRight().height() + m_radii.bottomRight().height());
+    auto maxRadiusWidth = std::max(m_radii.topLeft().width() + m_radii.topRight().width(), m_radii.bottomLeft().width() + m_radii.bottomRight().width());
+    auto maxRadiusHeight = std::max(m_radii.topLeft().height() + m_radii.bottomLeft().height(), m_radii.topRight().height() + m_radii.bottomRight().height());
 
     if (maxRadiusWidth <= 0 || maxRadiusHeight <= 0) {
         m_radii.scale(0.0f);
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp b/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp
index f453ffba6f0..632c4e84530 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp
@@ -73,8 +73,6 @@ namespace WebCore {
 typedef double Vector4[4];
 typedef double Vector3[3];
 
-const double SMALL_NUMBER = 1.e-8;
-
 const TransformationMatrix TransformationMatrix::identity { };
 
 // inverse(original_matrix, inverse_matrix)
@@ -216,16 +214,15 @@ static bool inverse(const TransformationMatrix::Matrix4& matrix, TransformationM
     // Calculate the 4x4 determinant
     // If the determinant is zero,
     // then the inverse matrix is not unique.
-    double det = determinant4x4(matrix);
-
-    if (std::abs(det) < SMALL_NUMBER)
+    double determinant = determinant4x4(matrix);
+    if (!std::isnormal(determinant))
         return false;
 
     // Scale the adjoint matrix to get the inverse
 
     for (int i = 0; i < 4; i++)
         for (int j = 0; j < 4; j++)
-            result[i][j] = result[i][j] / det;
+            result[i][j] = result[i][j] / determinant;
 
     return true;
 }
@@ -1588,7 +1585,7 @@ bool TransformationMatrix::isInvertible() const
     if (type == Type::IdentityOrTranslation)
         return true;
 
-    return std::abs(type == Type::Affine ? (m11() * m22() - m12() * m21()) : WebCore::determinant4x4(m_matrix)) >= SMALL_NUMBER;
+    return std::isnormal(type == Type::Affine ? (m11() * m22() - m12() * m21()) : WebCore::determinant4x4(m_matrix));
 }
 
 std::optional<TransformationMatrix> TransformationMatrix::inverse() const
@@ -1614,7 +1611,7 @@ std::optional<TransformationMatrix> TransformationMatrix::inverse() const
         double e = m41();
         double f = m42();
         double determinant = a * d - b * c;
-        if (std::abs(determinant) < SMALL_NUMBER)
+        if (!std::isnormal(determinant))
             return std::nullopt;
 
         double inverseDeterminant = 1 / determinant;
@@ -1917,7 +1914,7 @@ bool TransformationMatrix::isBackFaceVisible() const
     double determinant = WebCore::determinant4x4(m_matrix);
 
     // If the matrix is not invertible, then we assume its backface is not visible.
-    if (std::abs(determinant) < SMALL_NUMBER)
+    if (!std::isnormal(determinant))
         return false;
 
     double cofactor33 = determinant3x3(m11(), m12(), m14(), m21(), m22(), m24(), m41(), m42(), m44());
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/platform/mock/MockRealtimeVideoSource.h b/modules/javafx.web/src/main/native/Source/WebCore/platform/mock/MockRealtimeVideoSource.h
index 9e903c0fb54..ae159884763 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/platform/mock/MockRealtimeVideoSource.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/platform/mock/MockRealtimeVideoSource.h
@@ -51,7 +51,7 @@ enum class VideoFrameRotation : uint16_t;
 class MockRealtimeVideoSource : public RealtimeVideoCaptureSource, private OrientationNotifier::Observer {
 public:
     static CaptureSourceOrError create(String&& deviceID, AtomString&& name, MediaDeviceHashSalts&&, const MediaConstraints*, PageIdentifier);
-    ~MockRealtimeVideoSource();
+    virtual ~MockRealtimeVideoSource();
 
     static void setIsInterrupted(bool);
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/rendering/BackgroundPainter.cpp b/modules/javafx.web/src/main/native/Source/WebCore/rendering/BackgroundPainter.cpp
index 0fdbb0907d4..5e635dd3f09 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/rendering/BackgroundPainter.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/rendering/BackgroundPainter.cpp
@@ -253,7 +253,7 @@ void BackgroundPainter::paintFillLayer(const Color& color, const FillLayer& bgLa
                     context.setCompositeOperation(previousOperator);
             } else {
                 context.save();
-                clipRoundedInnerRect(context, pixelSnappedRect, pixelSnappedBorder);
+                clipRoundedInnerRect(context, pixelSnappedBorder);
                 context.fillRect(pixelSnappedBorder.rect(), bgColor, op);
                 context.restore();
             }
@@ -278,7 +278,7 @@ void BackgroundPainter::paintFillLayer(const Color& color, const FillLayer& bgLa
         } else if (bgLayer.clip() == FillBox::Padding)
             border = style.getRoundedInnerBorderFor(border.rect(), includeLeftEdge, includeRightEdge);
 
-        clipRoundedInnerRect(context, pixelSnappedRect, border.pixelSnappedRoundedRectForPainting(deviceScaleFactor));
+        clipRoundedInnerRect(context, border.pixelSnappedRoundedRectForPainting(deviceScaleFactor));
     }
 
     LayoutUnit bLeft = includeLeftEdge ? m_renderer.borderLeft() : 0_lu;
@@ -431,37 +431,16 @@ void BackgroundPainter::paintFillLayer(const Color& color, const FillLayer& bgLa
     }
 }
 
-void BackgroundPainter::clipRoundedInnerRect(GraphicsContext& context, const FloatRect& rect, const FloatRoundedRect& clipRect)
+void BackgroundPainter::clipRoundedInnerRect(GraphicsContext& context, const FloatRoundedRect& clipRect)
 {
-    if (clipRect.isRenderable()) {
-        context.clipRoundedRect(clipRect);
+    if (UNLIKELY(!clipRect.isRenderable())) {
+        auto adjustedClipRect = clipRect;
+        adjustedClipRect.adjustRadii();
+        context.clipRoundedRect(adjustedClipRect);
         return;
     }
 
-    // We create a rounded rect for each of the corners and clip it, while making sure we clip opposing corners together.
-    if (!clipRect.radii().topLeft().isEmpty() || !clipRect.radii().bottomRight().isEmpty()) {
-        FloatRect topCorner(clipRect.rect().x(), clipRect.rect().y(), rect.maxX() - clipRect.rect().x(), rect.maxY() - clipRect.rect().y());
-        FloatRoundedRect::Radii topCornerRadii;
-        topCornerRadii.setTopLeft(clipRect.radii().topLeft());
-        context.clipRoundedRect(FloatRoundedRect(topCorner, topCornerRadii));
-
-        FloatRect bottomCorner(rect.x(), rect.y(), clipRect.rect().maxX() - rect.x(), clipRect.rect().maxY() - rect.y());
-        FloatRoundedRect::Radii bottomCornerRadii;
-        bottomCornerRadii.setBottomRight(clipRect.radii().bottomRight());
-        context.clipRoundedRect(FloatRoundedRect(bottomCorner, bottomCornerRadii));
-    }
-
-    if (!clipRect.radii().topRight().isEmpty() || !clipRect.radii().bottomLeft().isEmpty()) {
-        FloatRect topCorner(rect.x(), clipRect.rect().y(), clipRect.rect().maxX() - rect.x(), rect.maxY() - clipRect.rect().y());
-        FloatRoundedRect::Radii topCornerRadii;
-        topCornerRadii.setTopRight(clipRect.radii().topRight());
-        context.clipRoundedRect(FloatRoundedRect(topCorner, topCornerRadii));
-
-        FloatRect bottomCorner(clipRect.rect().x(), rect.y(), rect.maxX() - clipRect.rect().x(), clipRect.rect().maxY() - rect.y());
-        FloatRoundedRect::Radii bottomCornerRadii;
-        bottomCornerRadii.setBottomLeft(clipRect.radii().bottomLeft());
-        context.clipRoundedRect(FloatRoundedRect(bottomCorner, bottomCornerRadii));
-    }
+    context.clipRoundedRect(clipRect);
 }
 
 RoundedRect BackgroundPainter::backgroundRoundedRectAdjustedForBleedAvoidance(const LayoutRect& borderRect, BackgroundBleedAvoidance bleedAvoidance, const InlineIterator::InlineBoxIterator& box, bool includeLogicalLeftEdge, bool includeLogicalRightEdge) const
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/rendering/BackgroundPainter.h b/modules/javafx.web/src/main/native/Source/WebCore/rendering/BackgroundPainter.h
index 0079012f09d..8c918728848 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/rendering/BackgroundPainter.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/rendering/BackgroundPainter.h
@@ -68,7 +68,7 @@ class BackgroundPainter {
 
     static bool paintsOwnBackground(const RenderBoxModelObject&);
     static BackgroundImageGeometry calculateBackgroundImageGeometry(const RenderBoxModelObject&, const RenderLayerModelObject* paintContainer, const FillLayer&, const LayoutPoint& paintOffset, const LayoutRect& borderBoxRect);
-    static void clipRoundedInnerRect(GraphicsContext&, const FloatRect&, const FloatRoundedRect& clipRect);
+    static void clipRoundedInnerRect(GraphicsContext&, const FloatRoundedRect& clipRect);
     static bool boxShadowShouldBeAppliedToBackground(const RenderBoxModelObject&, const LayoutPoint& paintOffset, BackgroundBleedAvoidance, const InlineIterator::InlineBoxIterator&);
 
 private:
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/rendering/GridTrackSizingAlgorithm.cpp b/modules/javafx.web/src/main/native/Source/WebCore/rendering/GridTrackSizingAlgorithm.cpp
index ca8e0026532..4fbabaca0de 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/rendering/GridTrackSizingAlgorithm.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/rendering/GridTrackSizingAlgorithm.cpp
@@ -829,7 +829,7 @@ LayoutUnit GridTrackSizingAlgorithmStrategy::logicalHeightForChild(RenderBox& ch
     GridTrackSizingDirection childBlockDirection = GridLayoutFunctions::flowAwareDirectionForChild(*renderGrid(), child, GridTrackSizingDirection::ForRows);
     // If |child| has a relative logical height, we shouldn't let it override its intrinsic height, which is
     // what we are interested in here. Thus we need to set the block-axis override size to nullopt (no possible resolution).
-    if (shouldClearOverridingContainingBlockContentSizeForChild(child, GridTrackSizingDirection::ForRows)) {
+    if (GridLayoutFunctions::overridingContainingBlockContentSizeForChild(child, GridTrackSizingDirection::ForRows) && shouldClearOverridingContainingBlockContentSizeForChild(child, GridTrackSizingDirection::ForRows)) {
         setOverridingContainingBlockContentSizeForChild(*renderGrid(), child, childBlockDirection, std::nullopt);
         child.setNeedsLayout(MarkOnlyThis);
     }
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/rendering/ImageQualityController.cpp b/modules/javafx.web/src/main/native/Source/WebCore/rendering/ImageQualityController.cpp
index 8f695e51542..30ac42666d0 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/rendering/ImageQualityController.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/rendering/ImageQualityController.cpp
@@ -40,7 +40,7 @@ static const Seconds lowQualityTimeThreshold { 500_ms };
 
 ImageQualityController::ImageQualityController(const RenderView& renderView)
     : m_renderView(renderView)
-    , m_timer(*this, &ImageQualityController::highQualityRepaintTimerFired)
+    , m_timer(*this, &ImageQualityController::highQualityRepaintTimerFired, lowQualityTimeThreshold)
 {
 }
 
@@ -95,7 +95,7 @@ void ImageQualityController::highQualityRepaintTimerFired()
 
 void ImageQualityController::restartTimer()
 {
-    m_timer.startOneShot(lowQualityTimeThreshold);
+    m_timer.restart();
 }
 
 std::optional<InterpolationQuality> ImageQualityController::interpolationQualityFromStyle(const RenderStyle& style)
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/rendering/ImageQualityController.h b/modules/javafx.web/src/main/native/Source/WebCore/rendering/ImageQualityController.h
index a818a979f0c..10f4e9f1f85 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/rendering/ImageQualityController.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/rendering/ImageQualityController.h
@@ -60,7 +60,7 @@ class ImageQualityController {
 
     const RenderView& m_renderView;
     ObjectLayerSizeMap m_objectLayerSizeMap;
-    Timer m_timer;
+    DeferrableOneShotTimer m_timer;
     bool m_animatedResizeIsActive { false };
     bool m_liveResizeOptimizationIsActive { false };
 };
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderBox.cpp b/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderBox.cpp
index 08e5ce04480..96d2c78140e 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderBox.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderBox.cpp
@@ -847,8 +847,7 @@ FloatQuad RenderBox::absoluteContentQuad() const
 LayoutRect RenderBox::localOutlineBoundsRepaintRect() const
 {
     auto box = borderBoundingBox();
-    applyVisualEffectOverflow(box);
-    return box;
+    return applyVisualEffectOverflow(box);
 }
 
 LayoutRect RenderBox::outlineBoundsForRepaint(const RenderLayerModelObject* repaintContainer, const RenderGeometryMap* geometryMap) const
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderGrid.cpp b/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderGrid.cpp
index 3f6aa834f82..435bd501e85 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderGrid.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderGrid.cpp
@@ -87,6 +87,16 @@ void RenderGrid::styleDidChange(StyleDifference diff, const RenderStyle* oldStyl
         return;
 
     const RenderStyle& newStyle = this->style();
+
+    auto hasDifferentTrackSizes = [&newStyle, &oldStyle](GridTrackSizingDirection direction) {
+        return newStyle.gridTrackSizes(direction) != oldStyle->gridTrackSizes(direction);
+    };
+
+    if (hasDifferentTrackSizes(GridTrackSizingDirection::ForColumns) || hasDifferentTrackSizes(GridTrackSizingDirection::ForRows)) {
+        for (auto& child : childrenOfType<RenderBox>(*this))
+            child.setChildNeedsLayout();
+    }
+
     if (oldStyle->resolvedAlignItems(selfAlignmentNormalBehavior(this)).position() == ItemPosition::Stretch) {
         // Style changes on the grid container implying stretching (to-stretch) or
         // shrinking (from-stretch) require the affected items to be laid out again.
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderLayer.cpp b/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderLayer.cpp
index 213d3d3ca7e..0f82835ba60 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderLayer.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderLayer.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2006-2024 Apple Inc. All rights reserved.
- * Copyright (C) 2014 Google Inc. All rights reserved.
+ * Copyright (C) 2013-2014 Google Inc. All rights reserved.
  * Copyright (C) 2019 Adobe. All rights reserved.
  * Copyright (c) 2020, 2021, 2022 Igalia S.L.
  *
@@ -533,10 +533,6 @@ void RenderLayer::removeOnlyThisLayer(LayerChangeTiming timing)
     if (timing == LayerChangeTiming::StyleChange)
         renderer().view().layerChildrenChangedDuringStyleChange(*parent());
 
-    // Mark that we are about to lose our layer. This makes render tree
-    // walks ignore this layer while we're removing it.
-    renderer().setHasLayer(false);
-
     compositor().layerWillBeRemoved(*m_parent, *this);
 
     // Dirty the clip rects.
@@ -2188,10 +2184,10 @@ enum TransparencyClipBoxMode {
     RootOfTransparencyClipBox
 };
 
-static LayoutRect transparencyClipBox(const RenderLayer&, const RenderLayer* rootLayer, TransparencyClipBoxBehavior, TransparencyClipBoxMode, OptionSet<PaintBehavior> = { });
+static LayoutRect transparencyClipBox(const RenderLayer&, const RenderLayer* rootLayer, TransparencyClipBoxBehavior, TransparencyClipBoxMode, OptionSet<PaintBehavior> = { }, const LayoutRect* paintDirtyRect = nullptr);
 
 static void expandClipRectForDescendantsAndReflection(LayoutRect& clipRect, const RenderLayer& layer, const RenderLayer* rootLayer,
-    TransparencyClipBoxBehavior transparencyBehavior, OptionSet<PaintBehavior> paintBehavior)
+    TransparencyClipBoxBehavior transparencyBehavior, OptionSet<PaintBehavior> paintBehavior, const LayoutRect* paintDirtyRect)
 {
     // If we have a mask, then the clip is limited to the border box area (and there is
     // no need to examine child layers).
@@ -2200,7 +2196,7 @@ static void expandClipRectForDescendantsAndReflection(LayoutRect& clipRect, cons
         // a stacking container. This means we can just walk the layer tree directly.
         for (RenderLayer* curr = layer.firstChild(); curr; curr = curr->nextSibling()) {
             if (!layer.isReflectionLayer(*curr))
-                clipRect.unite(transparencyClipBox(*curr, rootLayer, transparencyBehavior, DescendantsOfTransparencyClipBox, paintBehavior));
+                clipRect.unite(transparencyClipBox(*curr, rootLayer, transparencyBehavior, DescendantsOfTransparencyClipBox, paintBehavior, paintDirtyRect));
         }
     }
 
@@ -2217,7 +2213,7 @@ static void expandClipRectForDescendantsAndReflection(LayoutRect& clipRect, cons
 }
 
 static LayoutRect transparencyClipBox(const RenderLayer& layer, const RenderLayer* rootLayer, TransparencyClipBoxBehavior transparencyBehavior,
-    TransparencyClipBoxMode transparencyMode, OptionSet<PaintBehavior> paintBehavior)
+    TransparencyClipBoxMode transparencyMode, OptionSet<PaintBehavior> paintBehavior, const LayoutRect* paintDirtyRect)
 {
     // FIXME: Although this function completely ignores CSS-imposed clipping, we did already intersect with the
     // paintDirtyRect, and that should cut down on the amount we have to paint.  Still it
@@ -2239,11 +2235,14 @@ static LayoutRect transparencyClipBox(const RenderLayer& layer, const RenderLaye
         // We don't use fragment boxes when collecting a transformed layer's bounding box, since it always
         // paints unfragmented.
         LayoutRect clipRect = layer.boundingBox(&layer);
-        expandClipRectForDescendantsAndReflection(clipRect, layer, &layer, transparencyBehavior, paintBehavior);
+        expandClipRectForDescendantsAndReflection(clipRect, layer, &layer, transparencyBehavior, paintBehavior, paintDirtyRect);
         clipRect.expand(toLayoutBoxExtent(layer.filterOutsets()));
         LayoutRect result = transform.mapRect(clipRect);
-        if (!paginationLayer)
+        if (!paginationLayer) {
+            if (paintDirtyRect)
+                result = intersection(result, *paintDirtyRect);
             return result;
+        }
 
         // We have to break up the transformed extent across our columns.
         // Split our box up into the actual fragment boxes that render in the columns/pages and unite those together to
@@ -2251,21 +2250,21 @@ static LayoutRect transparencyClipBox(const RenderLayer& layer, const RenderLaye
         auto& enclosingFragmentedFlow = downcast<RenderFragmentedFlow>(paginationLayer->renderer());
         result = enclosingFragmentedFlow.fragmentsBoundingBox(result);
         result.move(paginationLayer->offsetFromAncestor(rootLayer));
+        if (paintDirtyRect)
+            result = intersection(result, *paintDirtyRect);
         return result;
     }
 
     OptionSet<RenderLayer::CalculateLayerBoundsFlag> flags = transparencyBehavior == HitTestingTransparencyClipBox ? RenderLayer::UseFragmentBoxesIncludingCompositing : RenderLayer::UseFragmentBoxesExcludingCompositing;
     flags.add(RenderLayer::IncludeRootBackgroundPaintingArea);
     auto clipRect = layer.boundingBox(rootLayer, layer.offsetFromAncestor(rootLayer), flags);
-    expandClipRectForDescendantsAndReflection(clipRect, layer, rootLayer, transparencyBehavior, paintBehavior);
+    expandClipRectForDescendantsAndReflection(clipRect, layer, rootLayer, transparencyBehavior, paintBehavior, paintDirtyRect);
     clipRect.expand(toLayoutBoxExtent(layer.filterOutsets()));
 
-    return clipRect;
-}
+    if (paintDirtyRect)
+        clipRect = intersection(clipRect, *paintDirtyRect);
 
-static LayoutRect paintingExtent(const RenderLayer& currentLayer, const RenderLayer* rootLayer, const LayoutRect& paintDirtyRect, OptionSet<PaintBehavior> paintBehavior)
-{
-    return intersection(transparencyClipBox(currentLayer, rootLayer, PaintingTransparencyClipBox, RootOfTransparencyClipBox, paintBehavior), paintDirtyRect);
+    return clipRect;
 }
 
 void RenderLayer::beginTransparencyLayers(GraphicsContext& context, const LayerPaintingInfo& paintingInfo, const LayoutRect& dirtyRect)
@@ -2286,7 +2285,7 @@ void RenderLayer::beginTransparencyLayers(GraphicsContext& context, const LayerP
             return;
         }
         context.save();
-        LayoutRect adjustedClipRect = paintingExtent(*this, paintingInfo.rootLayer, dirtyRect, paintingInfo.paintBehavior);
+        LayoutRect adjustedClipRect = transparencyClipBox(*this, paintingInfo.rootLayer, PaintingTransparencyClipBox, RootOfTransparencyClipBox, paintingInfo.paintBehavior, &dirtyRect);
         adjustedClipRect.move(paintingInfo.subpixelOffset);
         auto snappedClipRect = snapRectToDevicePixelsIfNeeded(adjustedClipRect, renderer());
         context.clip(snappedClipRect);
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderLayerCompositor.cpp b/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderLayerCompositor.cpp
index ae08a7f907f..902ac19b69b 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderLayerCompositor.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderLayerCompositor.cpp
@@ -1582,7 +1582,7 @@ void RenderLayerCompositor::updateBackingSharingBeforeDescendantTraversal(Backin
 void RenderLayerCompositor::updateBackingSharingAfterDescendantTraversal(BackingSharingState& sharingState, unsigned depth, const LayerOverlapMap& overlapMap, RenderLayer& layer, OverlapExtent& layerExtent, const RenderLayer* preDescendantProviderStartLayer, RenderLayer*  stackingContextAncestor)
 {
     UNUSED_PARAM(depth);
-    LOG_WITH_STREAM(Compositing, stream << TextStream::Repeat(depth * 2, ' ') << &layer << " updateBackingSharingAfterDescendantTraversal for layer - is composited " << layer.isComposited());
+    LOG_WITH_STREAM(Compositing, stream << TextStream::Repeat(depth * 2, ' ') << &layer << " updateBackingSharingAfterDescendantTraversal for layer - is composited " << layer.isComposited() << " has composited descendant " << layer.hasCompositingDescendant());
 
     if (layer.isComposited()) {
         // If this layer is being composited, clean up sharing-related state.
@@ -1609,6 +1609,8 @@ void RenderLayerCompositor::updateBackingSharingAfterDescendantTraversal(Backing
     if (!stackingContextAncestor)
         return;
 
+    bool canBeBackingProvider = !layer.hasCompositingDescendant();
+    if (canBeBackingProvider) {
     if (!sharingState.backingSharingStackingContext()) {
         computeExtent(overlapMap, layer, layerExtent);
         sharingState.startBackingSharingSequence(layer, layerExtent.bounds, *stackingContextAncestor);
@@ -1622,6 +1624,7 @@ void RenderLayerCompositor::updateBackingSharingAfterDescendantTraversal(Backing
         LOG_WITH_STREAM(Compositing, stream << TextStream::Repeat(depth * 2, ' ') << " - added additional provider candidate " << &layer);
         return;
     }
+    }
 
     layer.backing()->clearBackingSharingLayers();
     LOG_WITH_STREAM(Compositing, stream << TextStream::Repeat(depth * 2, ' ') << " - is composited; maybe ending existing backing sequence with candidates " << sharingState.backingProviderCandidates() << " stacking context " << sharingState.backingSharingStackingContext());
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderLayerModelObject.cpp b/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderLayerModelObject.cpp
index d35d4cad20c..289cdfdb32f 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderLayerModelObject.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderLayerModelObject.cpp
@@ -3,7 +3,7 @@
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
  *           (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
- * Copyright (C) 2005-2023 Apple Inc. All rights reserved.
+ * Copyright (C) 2005-2024 Apple Inc. All rights reserved.
  * Copyright (C) 2010-2015 Google Inc. All rights reserved.
  * Copyright (C) 2023, 2024 Igalia S.L.
  *
@@ -93,10 +93,7 @@ void RenderLayerModelObject::willBeDestroyed()
             view().frameView().removeViewportConstrainedObject(*this);
     }
 
-    if (hasLayer()) {
-        setHasLayer(false);
         destroyLayer();
-    }
 
     RenderElement::willBeDestroyed();
 }
@@ -112,8 +109,7 @@ void RenderLayerModelObject::willBeRemovedFromTree(IsInternalMove isInternalMove
 
 void RenderLayerModelObject::destroyLayer()
 {
-    ASSERT(!hasLayer());
-    ASSERT(m_layer);
+    setHasLayer(false);
     m_layer = nullptr;
 }
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderMultiColumnFlow.cpp b/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderMultiColumnFlow.cpp
index 55085adcf25..a26c14c02d8 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderMultiColumnFlow.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderMultiColumnFlow.cpp
@@ -203,6 +203,9 @@ void RenderMultiColumnFlow::setPageBreak(const RenderBlock* block, LayoutUnit of
 
 void RenderMultiColumnFlow::updateMinimumPageHeight(const RenderBlock* block, LayoutUnit offset, LayoutUnit minHeight)
 {
+    if (!hasValidFragmentInfo())
+        return;
+
     if (auto* multicolSet = downcast<RenderMultiColumnSet>(fragmentAtBlockOffset(block, offset)))
         multicolSet->updateMinimumColumnHeight(minHeight);
 }
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderReplaced.cpp b/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderReplaced.cpp
index 8786e2713e1..5746c420b19 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderReplaced.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderReplaced.cpp
@@ -286,7 +286,7 @@ void RenderReplaced::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
             paintInfo.context().save();
             auto pixelSnappedRoundedRect = style().getRoundedInnerBorderFor(paintRect,
                 paddingTop() + borderTop(), paddingBottom() + borderBottom(), paddingLeft() + borderLeft(), paddingRight() + borderRight(), true, true).pixelSnappedRoundedRectForPainting(document().deviceScaleFactor());
-            BackgroundPainter::clipRoundedInnerRect(paintInfo.context(), paintRect, pixelSnappedRoundedRect);
+            BackgroundPainter::clipRoundedInnerRect(paintInfo.context(), pixelSnappedRoundedRect);
         }
     }
 
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderWidget.cpp b/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderWidget.cpp
index 5799fb59360..d3a1b9499b6 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderWidget.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderWidget.cpp
@@ -328,7 +328,7 @@ void RenderWidget::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
         paintInfo.context().save();
         FloatRoundedRect roundedInnerRect = FloatRoundedRect(style().getRoundedInnerBorderFor(borderRect,
             paddingTop() + borderTop(), paddingBottom() + borderBottom(), paddingLeft() + borderLeft(), paddingRight() + borderRight(), true, true));
-        BackgroundPainter::clipRoundedInnerRect(paintInfo.context(), borderRect, roundedInnerRect);
+        BackgroundPainter::clipRoundedInnerRect(paintInfo.context(), roundedInnerRect);
     }
 
     if (m_widget && !isSkippedContentRoot())
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/rendering/TextDecorationPainter.cpp b/modules/javafx.web/src/main/native/Source/WebCore/rendering/TextDecorationPainter.cpp
index 0eba423d5ff..2c23cb92454 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/rendering/TextDecorationPainter.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/rendering/TextDecorationPainter.cpp
@@ -140,8 +140,10 @@ static DashArray translateIntersectionPointsToSkipInkBoundaries(const DashArray&
             else
                 intermediateTuples.append(*i);
         }
-    } else
-        intermediateTuples = tuples;
+    } else {
+        // XXX(274780): A plain assignment or move here makes Clang generate bad code in LTO builds.
+        intermediateTuples.swap(tuples);
+    }
 
     // Step 3: Output the space between the ranges, but only if the space warrants an underline.
     float previous = 0;
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/rendering/style/BasicShapes.cpp b/modules/javafx.web/src/main/native/Source/WebCore/rendering/style/BasicShapes.cpp
index 3a5442d3992..58c01b32955 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/rendering/style/BasicShapes.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/rendering/style/BasicShapes.cpp
@@ -636,6 +636,8 @@ BasicShapePath::BasicShapePath(std::unique_ptr<SVGPathByteStream>&& byteStream,
 {
 }
 
+BasicShapePath::~BasicShapePath() = default;
+
 Ref<BasicShape> BasicShapePath::clone() const
 {
     std::unique_ptr<SVGPathByteStream> byteStream;
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/rendering/style/BasicShapes.h b/modules/javafx.web/src/main/native/Source/WebCore/rendering/style/BasicShapes.h
index d808796af19..555754c003b 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/rendering/style/BasicShapes.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/rendering/style/BasicShapes.h
@@ -303,6 +303,8 @@ class BasicShapePath final : public BasicShape {
 
     WEBCORE_EXPORT static Ref<BasicShapePath> create(std::unique_ptr<SVGPathByteStream>&&, float zoom, WindRule);
 
+    virtual ~BasicShapePath();
+
     Ref<BasicShape> clone() const final;
 
     void setWindRule(WindRule windRule) { m_windRule = windRule; }
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/rendering/style/RenderStyle.h b/modules/javafx.web/src/main/native/Source/WebCore/rendering/style/RenderStyle.h
index 376217c412f..88119338d17 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/rendering/style/RenderStyle.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/rendering/style/RenderStyle.h
@@ -146,6 +146,7 @@ enum class FlexDirection : uint8_t;
 enum class FlexWrap : uint8_t;
 enum class Float : uint8_t;
 enum class FontOrientation : bool;
+enum class GridTrackSizingDirection : uint8_t;
 enum class HangingPunctuation : uint8_t;
 enum class Hyphens : uint8_t;
 enum class ImageRendering : uint8_t;
@@ -766,6 +767,7 @@ class RenderStyle {
 
     inline const Vector<GridTrackSize>& gridColumnTrackSizes() const;
     inline const Vector<GridTrackSize>& gridRowTrackSizes() const;
+    inline const Vector<GridTrackSize>& gridTrackSizes(GridTrackSizingDirection) const;
     inline const GridTrackList& gridColumnList() const;
     inline const GridTrackList& gridRowList() const;
     inline const Vector<GridTrackSize>& gridAutoRepeatColumns() const;
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/rendering/style/RenderStyleInlines.h b/modules/javafx.web/src/main/native/Source/WebCore/rendering/style/RenderStyleInlines.h
index a140ffa2c92..5ead2e031ab 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/rendering/style/RenderStyleInlines.h
+++ b/modules/javafx.web/src/main/native/Source/WebCore/rendering/style/RenderStyleInlines.h
@@ -29,6 +29,7 @@
 #include "Element.h"
 #include "FontCascadeDescription.h"
 #include "GraphicsTypes.h"
+#include "GridPositionsResolver.h"
 #include "ImageOrientation.h"
 #include "RenderStyle.h"
 #include "ScrollTypes.h"
@@ -242,6 +243,7 @@ inline bool RenderStyle::gridMasonryColumns() const { return m_nonInheritedData-
 inline bool RenderStyle::gridMasonryRows() const { return m_nonInheritedData->rareData->grid->masonryRows(); }
 inline const GridTrackList& RenderStyle::gridRowList() const { return m_nonInheritedData->rareData->grid->rows(); }
 inline const Vector<GridTrackSize>& RenderStyle::gridRowTrackSizes() const { return m_nonInheritedData->rareData->grid->gridRowTrackSizes(); }
+inline const Vector<GridTrackSize>& RenderStyle::gridTrackSizes(GridTrackSizingDirection direction) const { return direction == GridTrackSizingDirection::ForRows ? m_nonInheritedData->rareData->grid->gridRowTrackSizes() : m_nonInheritedData->rareData->grid->gridColumnTrackSizes(); }
 inline bool RenderStyle::gridSubgridColumns() const { return m_nonInheritedData->rareData->grid->subgridColumns(); }
 inline bool RenderStyle::gridSubgridRows() const { return m_nonInheritedData->rareData->grid->subgridRows(); }
 inline OptionSet<HangingPunctuation> RenderStyle::hangingPunctuation() const { return OptionSet<HangingPunctuation>::fromRaw(m_rareInheritedData->hangingPunctuation); }
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/style/StyleTreeResolver.cpp b/modules/javafx.web/src/main/native/Source/WebCore/style/StyleTreeResolver.cpp
index 844b86eb0ce..f3043b21963 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/style/StyleTreeResolver.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/style/StyleTreeResolver.cpp
@@ -246,8 +246,10 @@ auto TreeResolver::resolveElement(Element& element, const RenderStyle* existingS
     Styleable styleable { element, PseudoId::None };
     auto resolvedStyle = styleForStyleable(styleable, resolutionType, resolutionContext);
 
-    if (!affectsRenderedSubtree(element, *resolvedStyle.style))
+    if (!affectsRenderedSubtree(element, *resolvedStyle.style)) {
+        styleable.setLastStyleChangeEventStyle(nullptr);
         return { };
+    }
 
     auto update = createAnimatedElementUpdate(WTFMove(resolvedStyle), styleable, parent().change, resolutionContext);
     auto descendantsToResolve = computeDescendantsToResolve(update.change, element.styleValidity(), parent().descendantsToResolve);
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerOrWorkletScriptController.cpp b/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerOrWorkletScriptController.cpp
index dedbaecde6c..31eacaff2d5 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerOrWorkletScriptController.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/workers/WorkerOrWorkletScriptController.cpp
@@ -285,7 +285,7 @@ bool WorkerOrWorkletScriptController::loadModuleSynchronously(WorkerScriptFetche
 
     Ref protector { scriptFetcher };
     {
-        auto& promise = JSExecState::loadModule(globalObject, sourceCode.jsSourceCode(), JSC::JSScriptFetcher::create(vm, { &scriptFetcher }));
+        auto* promise = JSExecState::loadModule(globalObject, sourceCode.jsSourceCode(), JSC::JSScriptFetcher::create(vm, { &scriptFetcher }));
         scope.assertNoExceptionExceptTermination();
         RETURN_IF_EXCEPTION(scope, false);
 
@@ -365,7 +365,7 @@ bool WorkerOrWorkletScriptController::loadModuleSynchronously(WorkerScriptFetche
             return JSValue::encode(jsUndefined());
         });
 
-        promise.then(&globalObject, &fulfillHandler, &rejectHandler);
+        promise->then(&globalObject, &fulfillHandler, &rejectHandler);
     }
     m_globalScope->eventLoop().performMicrotaskCheckpoint();
 
@@ -442,9 +442,9 @@ void WorkerOrWorkletScriptController::loadAndEvaluateModule(const URL& moduleURL
 
     auto parameters = ModuleFetchParameters::create(JSC::ScriptFetchParameters::Type::JavaScript, emptyString(), /* isTopLevelModule */ true);
     auto scriptFetcher = WorkerScriptFetcher::create(WTFMove(parameters), credentials, globalScope()->destination(), globalScope()->referrerPolicy());
-    {
-        auto& promise = JSExecState::loadModule(globalObject, moduleURL, JSC::JSScriptFetchParameters::create(vm, scriptFetcher->parameters()), JSC::JSScriptFetcher::create(vm, { scriptFetcher.ptr() }));
 
+    auto* promise = JSExecState::loadModule(globalObject, moduleURL, JSC::JSScriptFetchParameters::create(vm, scriptFetcher->parameters()), JSC::JSScriptFetcher::create(vm, { scriptFetcher.ptr() }));
+    if (LIKELY(promise)) {
         auto task = createSharedTask<void(std::optional<Exception>&&)>([completionHandler = WTFMove(completionHandler)](std::optional<Exception>&& exception) mutable {
             completionHandler(WTFMove(exception));
         });
@@ -537,7 +537,7 @@ void WorkerOrWorkletScriptController::loadAndEvaluateModule(const URL& moduleURL
             return JSValue::encode(jsUndefined());
         });
 
-        promise.then(&globalObject, &fulfillHandler, &rejectHandler);
+        promise->then(&globalObject, &fulfillHandler, &rejectHandler);
     }
     m_globalScope->eventLoop().performMicrotaskCheckpoint();
 }
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/workers/service/context/ServiceWorkerThreadProxy.cpp b/modules/javafx.web/src/main/native/Source/WebCore/workers/service/context/ServiceWorkerThreadProxy.cpp
index c98b2323fa5..9e69c1a1208 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/workers/service/context/ServiceWorkerThreadProxy.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/workers/service/context/ServiceWorkerThreadProxy.cpp
@@ -329,7 +329,7 @@ void ServiceWorkerThreadProxy::fireMessageEvent(MessageWithMessagePorts&& messag
         protectedThis->thread().willPostTaskToFireMessageEvent();
     });
 
-    thread().runLoop().postTask([this, protectedThis = Ref { *this }, message = WTFMove(message), sourceData = WTFMove(sourceData)](auto&) mutable {
+    thread().runLoop().postTask([this, protectedThis = Ref { *this }, message = WTFMove(message), sourceData = crossThreadCopy(WTFMove(sourceData))](auto&) mutable {
         thread().queueTaskToPostMessage(WTFMove(message), WTFMove(sourceData));
     });
 }
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/xml/XPathNodeSet.cpp b/modules/javafx.web/src/main/native/Source/WebCore/xml/XPathNodeSet.cpp
index e94008c3ec9..f450366cb50 100644
--- a/modules/javafx.web/src/main/native/Source/WebCore/xml/XPathNodeSet.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/xml/XPathNodeSet.cpp
@@ -127,7 +127,7 @@ static void sortBlock(unsigned from, unsigned to, Vector<Vector<Node*>>& parentM
 
             ASSERT(previousGroupEnd != groupEnd);
             previousGroupEnd = groupEnd;
-#ifndef NDEBUG
+#if ASSERT_ENABLED
             parentNodes.remove(n);
 #endif
         }
diff --git a/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/WebCoreSupport/HistoryItemClientJava.cpp b/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/WebCoreSupport/HistoryItemClientJava.cpp
new file mode 100644
index 00000000000..98bf1dab9e0
--- /dev/null
+++ b/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/WebCoreSupport/HistoryItemClientJava.cpp
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+
+#include "HistoryItemClientJava.h"
+
+namespace WebCore {
+
+HistoryItemClientJava& HistoryItemClientJava::singleton()
+{
+    static NeverDestroyed<Ref<HistoryItemClientJava>> client { adoptRef(*new HistoryItemClientJava) };
+    return client.get().get();
+}
+void historyItemChangedImpl(const HistoryItem& item) {
+    JNIEnv* env = WTF::GetJavaEnv();
+    static jmethodID notifyItemChangedMID = initMethod(env, getJEntryClass(), "notifyItemChanged", "()V");
+    if (item.hostObject()) {
+        env->CallVoidMethod(item.hostObject(), notifyItemChangedMID);
+        WTF::CheckAndClearException(env);
+    }
+}
+void HistoryItemClientJava::historyItemChanged(const WebCore::HistoryItem& item)
+{
+   historyItemChangedImpl(item);
+}
+}//Webcore
diff --git a/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/WebCoreSupport/HistoryItemClientJava.h b/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/WebCoreSupport/HistoryItemClientJava.h
new file mode 100644
index 00000000000..11659b07cb3
--- /dev/null
+++ b/modules/javafx.web/src/main/native/Source/WebKitLegacy/java/WebCoreSupport/HistoryItemClientJava.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+
+#pragma once
+
+#include <WebCore/HistoryItem.h>
+#include <WebCore/PlatformJavaClasses.h>
+
+namespace WebCore {
+class HistoryItemClientJava final : public HistoryItemClient {
+public:
+    static HistoryItemClientJava& singleton();
+private:
+    HistoryItemClientJava() = default;
+    void historyItemChanged(const WebCore::HistoryItem&) final;
+};
+} // namespace WebCore
+
diff --git a/modules/javafx.web/src/main/native/Source/cmake/WebKitCompilerFlags.cmake b/modules/javafx.web/src/main/native/Source/cmake/WebKitCompilerFlags.cmake
index efe4ef0476d..5712fdc29d5 100644
--- a/modules/javafx.web/src/main/native/Source/cmake/WebKitCompilerFlags.cmake
+++ b/modules/javafx.web/src/main/native/Source/cmake/WebKitCompilerFlags.cmake
@@ -104,6 +104,11 @@ endif ()
 if (COMPILER_IS_GCC_OR_CLANG)
     WEBKIT_APPEND_GLOBAL_COMPILER_FLAGS(-fno-strict-aliasing)
 
+    # Split debug information in ".debug_types" / ".debug_info" sections - this leads
+    # to a smaller overall size of the debug information, and avoids linker relocation
+    # errors on e.g. aarch64 (relocation R_AARCH64_ABS32 out of range: 4312197985 is not in [-2147483648, 4294967295])
+    WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-fdebug-types-section)
+
     # clang-cl.exe impersonates cl.exe so some clang arguments like -fno-rtti are
     # represented using cl.exe's options and should not be passed as flags, so
     # we do not add -fno-rtti or -fno-exceptions for clang-cl

From addf0854dcd95fb8b78ad0dce4413c1170fd70eb Mon Sep 17 00:00:00 2001
From: Kevin Rushforth <kcr@openjdk.org>
Date: Mon, 23 Sep 2024 12:46:48 +0000
Subject: [PATCH 46/75] 8340405: JavaFX shutdown hook can hang preventing app
 from exiting

Reviewed-by: arapte, jvos, angorya
---
 .../sun/javafx/tk/quantum/QuantumToolkit.java | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumToolkit.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumToolkit.java
index 9e2711ce8eb..96f00d09a75 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumToolkit.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumToolkit.java
@@ -259,7 +259,25 @@ boolean get() {
          */
         shutdownHook = new Thread("Glass/Prism Shutdown Hook") {
             @Override public void run() {
-                dispose();
+                // Run dispose in a background thread and wait for up to
+                // 5 seconds for it to finish. If it doesn't, then throw an
+                // error, so that if dispose hangs or deadlocks, it won't
+                // prevent the JVM from exiting.
+                var disposeLatch = new CountDownLatch(1);
+                var thr = new Thread(() -> {
+                    dispose();
+                    disposeLatch.countDown();
+                });
+                thr.setDaemon(true);
+                thr.start();
+
+                try {
+                    if (!disposeLatch.await(5, TimeUnit.SECONDS)) {
+                        throw new InternalError("dispose timed out");
+                    }
+                } catch (InterruptedException ex) {
+                    throw new InternalError(ex);
+                }
             }
         };
         @SuppressWarnings("removal")

From 51717533b1d54fdb8a2817035b201763b3d4febe Mon Sep 17 00:00:00 2001
From: Andy Goryachev <angorya@openjdk.org>
Date: Mon, 23 Sep 2024 18:29:51 +0000
Subject: [PATCH 47/75] 8338468: [TestBug] Convert controls tests to JUnit 5

Reviewed-by: mhanl, lkostyra, arapte
---
 .../scene/control/LabeledImplOtherTest.java   |   23 +-
 .../javafx/scene/control/LabeledImplTest.java |   51 +-
 .../javafx/scene/control/LabeledTextTest.java |   40 +-
 .../LambdaMultipleListHandlerTest.java        |   38 +-
 .../LambdaMultipleObservableHandlerTest.java  |  211 ++--
 ...lectedItemsReadOnlyObservableListTest.java |   25 +-
 .../behavior/AccordionBehaviorTest.java       |    8 +-
 .../control/behavior/BehaviorCleanupTest.java |  126 +-
 .../behavior/BehaviorMemoryLeakTest.java      |   57 +-
 .../control/behavior/MnemonicInfoTest.java    |   12 +-
 .../infrastructure/ControlSkinFactory.java    |   15 +-
 .../ControlSkinFactoryTest.java               |   16 +-
 .../infrastructure/ControlTestUtils.java      |   36 +-
 .../infrastructure/KeyEventFirerTest.java     |   49 +-
 .../infrastructure/MouseEventFirerTest.java   |  159 +--
 .../infrastructure/VirtualFlowTestUtils.java  |   32 +-
 .../VirtualizedControlTestUtilsTest.java      |   60 +-
 .../scene/control/inputmap/InputMapTest.java  |    2 +-
 .../control/inputmap/KeyBindingTest.java      |   11 +-
 .../javafx/scene/chart/AreaChartTest.java     |  106 +-
 .../test/javafx/scene/chart/AxisHelper.java   |   15 +-
 .../test/javafx/scene/chart/AxisTest.java     |  328 +++--
 .../test/javafx/scene/chart/BarChartTest.java |   56 +-
 .../javafx/scene/chart/CategoryAxisTest.java  |   37 +-
 .../javafx/scene/chart/ChartTestBase.java     |   38 +-
 .../javafx/scene/chart/LineChartTest.java     |  158 ++-
 .../javafx/scene/chart/NumberAxisTest.java    |   70 +-
 .../test/javafx/scene/chart/PieChartTest.java |   32 +-
 .../scene/chart/StackedAreaChartTest.java     |   73 +-
 .../scene/chart/StackedBarChartTest.java      |   30 +-
 .../javafx/scene/chart/ValueAxisTest.java     |   72 +-
 .../javafx/scene/chart/XYChartDataTest.java   |    7 +-
 .../test/javafx/scene/chart/XYChartTest.java  |   47 +-
 .../javafx/scene/chart/XYChartTestBase.java   |    6 +-
 .../scene/chart/XYNumberChartsTest.java       |   75 +-
 .../scene/chart/XYNumberChartsTestBase.java   |    6 +-
 .../scene/chart/XYNumberLineChartsTest.java   |   90 +-
 .../control/AcceleratorParameterizedTest.java |  148 ++-
 .../javafx/scene/control/AccordionTest.java   |   31 +-
 .../test/javafx/scene/control/AlertTest.java  |   16 +-
 .../javafx/scene/control/ButtonBaseTest.java  |   21 +-
 .../test/javafx/scene/control/ButtonTest.java |   66 +-
 .../CellEditEventOfTableColumnTest.java       |   34 +-
 .../CellEditEventOfTreeTableColumnTest.java   |   36 +-
 .../test/javafx/scene/control/CellTest.java   |  272 +++--
 .../javafx/scene/control/CheckBoxTest.java    |   21 +-
 .../scene/control/CheckBoxTreeItemTest.java   |   25 +-
 .../scene/control/CheckMenuItemTest.java      |   26 +-
 .../scene/control/ChoiceBoxLabelTextTest.java |  299 +++--
 .../scene/control/ChoiceBoxSelectionTest.java |   34 +-
 .../javafx/scene/control/ChoiceBoxTest.java   |   71 +-
 .../javafx/scene/control/ColorPickerTest.java |   21 +-
 .../javafx/scene/control/ComboBoxTest.java    |  126 +-
 .../scene/control/ComboSpecialKeyTest.java    |  101 +-
 .../javafx/scene/control/ContextMenuTest.java |  101 +-
 .../ControlAcceleratorSupportTest.java        |   37 +-
 .../scene/control/ControlChildrenTest.java    |   18 +-
 .../javafx/scene/control/ControlSkinTest.java |   64 +-
 .../javafx/scene/control/ControlTest.java     |   52 +-
 .../scene/control/ControlTooltipTest.java     |   34 +-
 .../javafx/scene/control/ControlUtils.java    |    9 +-
 .../scene/control/CustomMenuItemTest.java     |   35 +-
 .../javafx/scene/control/DateCellTest.java    |   22 +-
 .../javafx/scene/control/DatePickerTest.java  |   93 +-
 .../control/DefaultCancelButtonTestBase.java  |  132 +-
 .../javafx/scene/control/DialogPaneTest.java  |   15 +-
 .../javafx/scene/control/EventAnyTest.java    |   73 +-
 .../scene/control/FireButtonBaseTest.java     |   63 +-
 .../javafx/scene/control/HyperlinkTest.java   |   25 +-
 .../javafx/scene/control/IndexRangeTest.java  |   21 +-
 .../scene/control/IndexRangeValueOfTest.java  |   30 +-
 .../javafx/scene/control/IndexedCellTest.java |   17 +-
 .../javafx/scene/control/InputMapTest.java    |    4 +-
 .../test/javafx/scene/control/LabelTest.java  |   30 +-
 .../javafx/scene/control/LabeledTest.java     |   31 +-
 .../javafx/scene/control/ListCellTest.java    |  129 +-
 .../scene/control/ListViewKeyInputTest.java   |   88 +-
 .../scene/control/ListViewMouseInputTest.java |   37 +-
 .../javafx/scene/control/ListViewTest.java    |  124 +-
 .../javafx/scene/control/MenuBarTest.java     |   43 +-
 .../javafx/scene/control/MenuButtonTest.java  |  253 ++--
 .../javafx/scene/control/MenuItemTest.java    |   35 +-
 .../test/javafx/scene/control/MenuTest.java   |   26 +-
 .../scene/control/MiscellaneousTests.java     |   20 +-
 .../MultipleSelectionModelImplTest.java       |  577 ++++++---
 .../javafx/scene/control/PaginationTest.java  |   60 +-
 .../PasswordFieldDefaultCancelButtonTest.java |    9 +-
 .../scene/control/PasswordFieldTest.java      |   19 +-
 .../scene/control/PopupControlTest.java       |   27 +-
 .../scene/control/ProgressIndicatorTest.java  |   19 +-
 .../scene/control/RadioMenuItemTest.java      |   47 +-
 .../scene/control/ResizeHelperTestBase.java   |   14 +-
 .../javafx/scene/control/ScrollBarTest.java   |   59 +-
 .../javafx/scene/control/ScrollPaneTest.java  |   87 +-
 .../SelectionFocusModelMemoryTest.java        |  139 ++-
 .../scene/control/SelectionModelImplTest.java |  174 ++-
 .../scene/control/SeparatorMenuItemTest.java  |   25 +-
 .../javafx/scene/control/SeparatorTest.java   |   29 +-
 .../javafx/scene/control/SkinBaseTest.java    |   26 +-
 .../test/javafx/scene/control/SliderTest.java |   27 +-
 .../javafx/scene/control/SpinnerTest.java     |  191 +--
 .../scene/control/SplitMenuButtonTest.java    |   13 +-
 .../javafx/scene/control/SplitPaneTest.java   |   61 +-
 .../javafx/scene/control/TabPaneTest.java     |  114 +-
 .../test/javafx/scene/control/TabTest.java    |   70 +-
 .../scene/control/TableCellEditingTest.java   |  127 +-
 .../javafx/scene/control/TableCellTest.java   |  103 +-
 .../javafx/scene/control/TableColumnTest.java |   37 +-
 .../scene/control/TablePositionBaseTest.java  |    6 +-
 .../TableViewHorizontalArrowsTest.java        |  182 +--
 .../scene/control/TableViewKeyInputTest.java  |   82 +-
 .../control/TableViewMouseInputTest.java      |   40 +-
 .../scene/control/TableViewResizeTest.java    |   11 +-
 .../scene/control/TableViewRowTest.java       |   12 +-
 .../TableViewSelectionModelImplTest.java      |  229 ++--
 .../javafx/scene/control/TableViewTest.java   |  176 +--
 .../scene/control/TestListenerHelper.java     |    4 +-
 .../TextAreaDefaultCancelButtonTest.java      |   43 +-
 .../javafx/scene/control/TextAreaTest.java    |   32 +-
 .../TextFieldDefaultCancelButtonTest.java     |    8 +-
 .../javafx/scene/control/TextFieldTest.java   |   53 +-
 ...dWithFormatterDefaultCancelButtonTest.java |   15 +-
 .../scene/control/TextInputControlTest.java   | 1086 +++++++++++++----
 .../javafx/scene/control/TitledPaneTest.java  |   47 +-
 .../scene/control/ToggleButtonTest.java       |   27 +-
 .../javafx/scene/control/ToggleGroupTest.java |   23 +-
 .../control/ToolBarHorizontalArrowsTest.java  |   92 +-
 .../javafx/scene/control/ToolbarTest.java     |   54 +-
 .../javafx/scene/control/TooltipTest.java     |   75 +-
 .../scene/control/TreeAndTableViewTest.java   |    6 +-
 .../scene/control/TreeCellEditingTest.java    |  134 +-
 .../javafx/scene/control/TreeCellTest.java    |  120 +-
 .../javafx/scene/control/TreeItemTest.java    |   20 +-
 .../control/TreeTableCellEditingTest.java     |  128 +-
 .../scene/control/TreeTableCellTest.java      |  143 ++-
 .../scene/control/TreeTableColumnTest.java    |   52 +-
 .../scene/control/TreeTableRowTest.java       |   47 +-
 .../control/TreeTableViewKeyInputTest.java    |  121 +-
 .../control/TreeTableViewMouseInputTest.java  |   87 +-
 .../control/TreeTableViewResizeTest.java      |   13 +-
 .../TreeTableViewSelectionModelImplTest.java  |  225 ++--
 .../scene/control/TreeTableViewTest.java      |  156 +--
 .../scene/control/TreeViewKeyInputTest.java   |   86 +-
 .../scene/control/TreeViewMouseInputTest.java |   45 +-
 .../javafx/scene/control/TreeViewTest.java    |  130 +-
 .../control/cell/CheckBoxListCellTest.java    |   25 +-
 .../control/cell/CheckBoxTableCellTest.java   |   29 +-
 .../control/cell/CheckBoxTreeCellTest.java    |   31 +-
 .../cell/CheckBoxTreeTableCellTest.java       |   29 +-
 .../control/cell/ChoiceBoxListCellTest.java   |   16 +-
 .../control/cell/ChoiceBoxTableCellTest.java  |   16 +-
 .../control/cell/ChoiceBoxTreeCellTest.java   |   16 +-
 .../cell/ChoiceBoxTreeTableCellTest.java      |   22 +-
 .../control/cell/ComboBoxListCellTest.java    |   16 +-
 .../control/cell/ComboBoxTableCellTest.java   |   16 +-
 .../control/cell/ComboBoxTreeCellTest.java    |   16 +-
 .../cell/ComboBoxTreeTableCellTest.java       |   22 +-
 .../control/cell/ListCellStartEditTest.java   |   64 +-
 .../cell/ParameterisedPrebuiltCellTest.java   |   69 +-
 .../cell/ProgressBarTableCellTest.java        |   16 +-
 .../cell/ProgressBarTreeTableCellTest.java    |   16 +-
 .../control/cell/TableCellStartEditTest.java  |   66 +-
 .../control/cell/TextFieldListCellTest.java   |   16 +-
 .../control/cell/TextFieldTableCellTest.java  |   18 +-
 .../control/cell/TextFieldTreeCellTest.java   |   16 +-
 .../cell/TextFieldTreeTableCellTest.java      |   16 +-
 .../control/cell/TreeCellStartEditTest.java   |   62 +-
 .../cell/TreeTableCellStartEditTest.java      |   66 +-
 .../scene/control/css/PropertySizeTest.java   |   50 +-
 .../control/skin/ArrayLinkedListTest.java     |   39 +-
 .../scene/control/skin/ButtonSkinTest.java    |   63 +-
 .../scene/control/skin/CheckBoxSkinTest.java  |   24 +-
 .../scene/control/skin/ChoiceBoxSkinTest.java |   13 +-
 .../control/skin/ColorPickerSkinTest.java     |   26 +-
 .../skin/ComboBoxListViewSkinTest.java        |   14 +-
 .../skin/ConcreteVirtualContainerTest.java    |   21 +-
 .../control/skin/CustomListViewSkinTest.java  |   17 +-
 .../scene/control/skin/EditAndScrollTest.java |   60 +-
 .../scene/control/skin/HyperlinkSkinTest.java |   13 +-
 .../control/skin/LabelSkinCreationTest.java   |  121 +-
 .../control/skin/LabelSkinLayoutTest.java     |  361 ++++--
 .../scene/control/skin/LabelSkinTest.java     |   27 +-
 .../scene/control/skin/MenuBarSkinTest.java   |   29 +-
 .../control/skin/MenuButtonSkinBaseTest.java  |   18 +-
 .../control/skin/MenuButtonSkinTest.java      |   13 +-
 .../control/skin/ProgressBarSkinTest.java     |   31 +-
 .../skin/ProgressIndicatorSkinTest.java       |   17 +-
 .../skin/QueryAccessibleAttributeTest.java    |   38 +-
 .../control/skin/RadioButtonSkinTest.java     |   13 +-
 .../scene/control/skin/ScrollBarSkinTest.java |   13 +-
 .../control/skin/ScrollPaneSkinTest.java      |   29 +-
 .../control/skin/SeparatorSkinLayoutTest.java |   12 +-
 .../scene/control/skin/SeparatorSkinTest.java |   23 +-
 .../scene/control/skin/SkinCleanupTest.java   |  237 ++--
 .../control/skin/SkinDisposeContractTest.java |   47 +-
 .../control/skin/SkinLabeledCleanupTest.java  |   84 +-
 .../control/skin/SkinMemoryLeakTest.java      |  119 +-
 .../control/skin/SkinPopupContractTest.java   |    6 +-
 .../scene/control/skin/SliderSkinTest.java    |   12 +-
 .../scene/control/skin/SpinnerSkinTest.java   |    8 +-
 .../control/skin/TabPaneHeaderScrollTest.java |   69 +-
 .../skin/TabPaneSkinHeaderOrderTest.java      |   36 +-
 .../control/skin/TableColumnHeaderTest.java   |   76 +-
 .../scene/control/skin/TableRowSkinTest.java  |   23 +-
 .../skin/TextInputControlSkinTest.java        |   12 +-
 .../control/skin/ToggleButtonSkinTest.java    |   13 +-
 .../scene/control/skin/ToolBarSkinTest.java   |   13 +-
 .../skin/TreeTableColumnHeaderTest.java       |   22 +-
 .../skin/TreeTableViewDisclosureNodeTest.java |   56 +-
 .../skin/TreeTableViewIndentationTest.java    |   20 +-
 .../control/skin/VirtualFlowSubClassTest.java |   13 +-
 .../scene/control/skin/VirtualFlowTest.java   |  258 ++--
 212 files changed, 7782 insertions(+), 6196 deletions(-)

diff --git a/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/LabeledImplOtherTest.java b/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/LabeledImplOtherTest.java
index 07d470c0525..f1170d07441 100644
--- a/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/LabeledImplOtherTest.java
+++ b/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/LabeledImplOtherTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,9 @@
 
 package test.com.sun.javafx.scene.control;
 
-import com.sun.javafx.scene.control.LabeledImpl;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import java.net.URL;
 import javafx.scene.Scene;
 import javafx.scene.control.Label;
 import javafx.scene.control.Labeled;
@@ -34,17 +36,13 @@
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.stage.Stage;
-import org.junit.Test;
-
-import java.net.URL;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.scene.control.LabeledImpl;
 
 public class LabeledImplOtherTest {
 
-
-    @Test public void test_RT_21357() {
+    @Test
+    public void test_RT_21357() {
 
         final Labeled labeled = new Label("label");
         final LabeledImpl labeledImpl = new LabeledImpl(labeled);
@@ -60,8 +58,8 @@ public class LabeledImplOtherTest {
         assertNotNull(labeled.getGraphic());
     }
 
-    @Test public void test_RT_21617() {
-
+    @Test
+    public void test_RT_21617() {
         MenuButton mb = new MenuButton();
         mb.setText("SomeText");
         MenuButtonSkin mbs = new MenuButtonSkin(mb);
@@ -87,5 +85,4 @@ public class LabeledImplOtherTest {
         assertEquals(1, mb.getOpacity(), 0.00001);
         assertEquals(.5, labeledImpl.getOpacity(), 0.00001);
     }
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/LabeledImplTest.java b/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/LabeledImplTest.java
index ec618b63a1a..c3aa72eb5ee 100644
--- a/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/LabeledImplTest.java
+++ b/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/LabeledImplTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,18 +25,13 @@
 
 package test.com.sun.javafx.scene.control;
 
-import test.com.sun.javafx.pgstub.StubImageLoaderFactory;
-import test.com.sun.javafx.pgstub.StubPlatformImageInfo;
-import test.com.sun.javafx.pgstub.StubToolkit;
-import com.sun.javafx.scene.control.LabeledImpl;
-import com.sun.javafx.scene.control.LabeledImplShim;
-import com.sun.javafx.tk.Toolkit;
-import javafx.css.CssMetaData;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 import java.util.ArrayList;
-
 import java.util.Collection;
 import java.util.List;
 import javafx.beans.value.WritableValue;
+import javafx.css.CssMetaData;
 import javafx.css.Styleable;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
@@ -50,19 +45,20 @@
 import javafx.scene.paint.Color;
 import javafx.scene.text.Font;
 import javafx.scene.text.TextAlignment;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import com.sun.javafx.scene.control.LabeledImpl;
+import com.sun.javafx.scene.control.LabeledImplShim;
+import com.sun.javafx.tk.Toolkit;
+import test.com.sun.javafx.pgstub.StubImageLoaderFactory;
+import test.com.sun.javafx.pgstub.StubPlatformImageInfo;
+import test.com.sun.javafx.pgstub.StubToolkit;
 
-import org.junit.BeforeClass;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-@RunWith(Parameterized.class)
 public class LabeledImplTest {
 
-    @BeforeClass
+    @BeforeAll
     public static void configureImageLoaderFactory() {
         final StubImageLoaderFactory imageLoaderFactory =
                 ((StubToolkit) Toolkit.getToolkit()).getImageLoaderFactory();
@@ -155,9 +151,6 @@ private static Configuration config(CssMetaData styleable) {
         return null;
     }
 
-    private final Configuration configuration;
-
-    @Parameters
     public static Collection<Configuration[]> data() {
 
         Collection<Configuration[]> data = new ArrayList<>();
@@ -180,20 +173,14 @@ public static Collection<Configuration[]> data() {
         return data;
     }
 
-    @Test
-    public void testMirrorReflectsSource() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testMirrorReflectsSource(Configuration configuration) {
         final WritableValue source = configuration.source;
         final WritableValue mirror = configuration.mirror;
         final Object expected = configuration.value;
 
         source.setValue(expected);
-        assertEquals(mirror.toString(), expected, mirror.getValue());
-    }
-
-    public LabeledImplTest(Configuration configuration) {
-        this.configuration = configuration;
-    }
-
-    static {
+        assertEquals(expected, mirror.getValue(), mirror.toString());
     }
 }
diff --git a/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/LabeledTextTest.java b/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/LabeledTextTest.java
index 4a8a1fc83c9..2dd46f61fdc 100644
--- a/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/LabeledTextTest.java
+++ b/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/LabeledTextTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,12 @@
 
 package test.com.sun.javafx.scene.control;
 
-import com.sun.javafx.scene.control.LabeledText;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 import javafx.css.CssMetaData;
 import javafx.css.Stylesheet;
 import javafx.scene.Cursor;
@@ -39,8 +44,9 @@
 import javafx.scene.text.Font;
 import javafx.scene.text.TextAlignment;
 import javafx.stage.Stage;
-import org.junit.*;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.scene.control.LabeledText;
 
 /**
  *
@@ -57,7 +63,8 @@ public class LabeledTextTest {
     public LabeledTextTest() {
     }
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         label =
             new Label("\"A computer once beat me at chess, "
                 + "but it was no match for me at kick boxing.\" Emo Philips");
@@ -111,13 +118,11 @@ public void testLabeledTextFontIsBound() {
 
     @Test
     public void testLabeledTextFillStyleAffectsLabeledText() {
-
         label.setStyle("-fx-text-fill: rgb(255,0,0);");
         label.applyCss();
         Color expected = Color.rgb(255, 0, 0);
         assertEquals(expected, label.getTextFill());
         assertEquals(expected, labeledText.getFill());
-
     }
 
     @Test
@@ -132,12 +137,10 @@ public void testLabeledTextFillIsBound() {
 
     @Test
     public void testLabeledUnderlineStyleAffectsLabeledText() {
-
         label.setStyle("-fx-underline: true;");
         label.applyCss();
         assert(label.isUnderline() == true);
         assert(labeledText.isUnderline() == true);
-
     }
 
     @Test
@@ -253,7 +256,6 @@ private static CssMetaData getCssMetaData(String prop) {
 
     @Test
     public void testLabeledTextFillIsSettableByCss() {
-
         CssMetaData sp = getCssMetaData("-fx-fill");
         assertTrue(sp.isSettable(labeledText));
     }
@@ -263,10 +265,8 @@ public void testCanStyleFillOnLabeledText() {
         assertEquals(Color.GREEN, labeledText.getFill());
     }
 
-
     @Test
     public void testLabeledTextTextAlignmentIsSettableByCss() {
-
         CssMetaData sp = getCssMetaData("-fx-text-alignment");
         assertTrue(sp.isSettable(labeledText));
     }
@@ -276,10 +276,8 @@ public void testCanStyleTextAlignmentOnLabeledText() {
         assertEquals(TextAlignment.RIGHT, labeledText.getTextAlignment());
     }
 
-
     @Test
     public void testLabeledTextFontIsSettableByCss() {
-
         CssMetaData sp = getCssMetaData("-fx-font");
         assertTrue(sp.isSettable(labeledText));
     }
@@ -289,10 +287,8 @@ public void testCanStyleFontOnLabeledText() {
         assertEquals(Font.font("Amble", 10), labeledText.getFont());
     }
 
-
     @Test
     public void testLabeledTextUnderlineIsSettableByCss() {
-
         CssMetaData sp = getCssMetaData("-fx-underline");
         assertTrue(sp.isSettable(labeledText));
     }
@@ -371,9 +367,8 @@ public void testLabeledSetUnderlineNotOverridenByUAStyleOnLabeledText() {
         assertTrue(labeledText.isUnderline());
     }
 
-
-    @Test public void test_RT_37787() {
-
+    @Test
+    public void test_RT_37787() {
         label = new Label("test_RT_37787");
         label.getStyleClass().clear();
         label.setId("test-rt-37787");
@@ -392,11 +387,10 @@ public void testLabeledSetUnderlineNotOverridenByUAStyleOnLabeledText() {
         double expected = Font.getDefault().getSize() * 1.5;
         double actual = label.getFont().getSize();
         assertEquals(expected, actual, .1);
-
     }
 
-    @Test public void test_RT_37787_with_inline_style() {
-
+    @Test
+    public void test_RT_37787_with_inline_style() {
         label = new Label("test_RT_37787_with_inline_style");
         label.setStyle("-fx-font-size: 1.231em;");
         label.getStyleClass().clear();
@@ -412,7 +406,5 @@ public void testLabeledSetUnderlineNotOverridenByUAStyleOnLabeledText() {
         double expected = Font.getDefault().getSize() * 1.5 * 1.231;
         double actual = label.getFont().getSize();
         assertEquals(expected, actual, .1);
-
     }
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/LambdaMultipleListHandlerTest.java b/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/LambdaMultipleListHandlerTest.java
index e49899abd4c..f4f5d9faedd 100644
--- a/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/LambdaMultipleListHandlerTest.java
+++ b/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/LambdaMultipleListHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,25 +25,24 @@
 
 package test.com.sun.javafx.scene.control;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlSkinFactory.attemptGC;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import com.sun.javafx.scene.control.LambdaMultiplePropertyChangeListenerHandler;
-
-import static org.junit.Assert.*;
-import static test.com.sun.javafx.scene.control.infrastructure.ControlSkinFactory.*;
-
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ListChangeListener.Change;
 import javafx.collections.ObservableList;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.scene.control.LambdaMultiplePropertyChangeListenerHandler;
 
 /**
  * Test support of listChange listeners.
@@ -89,9 +88,8 @@ public void testUnregistersMultipleConsumers() {
         // remove listener chain
         Consumer<Change<?>> removedChain = handler.unregisterListChangeListeners(items);
         items.add("added after removed");
-        assertEquals("none of the removed listeners must be notified",
-                0, changes.size() + secondChanges.size());
-       // manually add the chained listener
+        assertEquals(0, changes.size() + secondChanges.size(), "none of the removed listeners must be notified");
+        // manually add the chained listener
         items.addListener((ListChangeListener)(c -> removedChain.accept(c)));
         items.add("added");
         assertEquals(1, changes.size());
@@ -190,10 +188,10 @@ public void testDispose() {
         handler.registerListChangeListener(items, consumer);
         handler.dispose();
         items.add("added");
-        assertEquals("listener must not be invoked after dispose", 0, changes.size());
+        assertEquals(0, changes.size(), "listener must not be invoked after dispose");
         handler.registerListChangeListener(items, consumer);
         items.add("added");
-        assertEquals("listener must be invoked when re-registered after dispose", 1, changes.size());
+        assertEquals(1, changes.size(), "listener must be invoked when re-registered after dispose");
     }
 
 
@@ -213,15 +211,15 @@ public void testRegisterMemoryLeak() {
         assertEquals(1, changes.size());
         handler = null;
         attemptGC(ref);
-        assertNull("handler must be gc'ed", ref.get());
+        assertNull(ref.get(), "handler must be gc'ed");
         items.add("another");
-        assertEquals("listener must not be invoked after gc", 1, changes.size());
+        assertEquals(1, changes.size(), "listener must not be invoked after gc");
     }
 
 
 //----------- setup and intial
 
-    @Before
+    @BeforeEach
     public void setup() {
         handler = new LambdaMultiplePropertyChangeListenerHandler();
         items = FXCollections.observableArrayList("one", "two", "four");
@@ -242,8 +240,8 @@ public void testInvalidationOfListValuedObservable() {
         itemsProperty.addListener((obs, ov, nv) -> changes[0]++);
         itemsProperty.set(FXCollections.observableArrayList(data));
         // notifications when newList.equals(oldList)
-        assertEquals("changeListener not notified", 0, changes[0]);
-        assertEquals("invalidationListener notified", 1, invalidations[0]);
+        assertEquals(0, changes[0], "changeListener not notified");
+        assertEquals(1, invalidations[0], "invalidationListener notified");
         itemsProperty.get().add("added");
         // sanity: no notification on modifications to the list
         assertEquals(0, changes[0]);
diff --git a/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/LambdaMultipleObservableHandlerTest.java b/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/LambdaMultipleObservableHandlerTest.java
index 19c075ac977..57ffdbbbc7c 100644
--- a/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/LambdaMultipleObservableHandlerTest.java
+++ b/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/LambdaMultipleObservableHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,27 +25,26 @@
 
 package test.com.sun.javafx.scene.control;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlSkinFactory.attemptGC;
 import java.lang.ref.WeakReference;
-import java.util.Arrays;
 import java.util.Collection;
+import java.util.List;
 import java.util.function.Consumer;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import com.sun.javafx.scene.control.LambdaMultiplePropertyChangeListenerHandler;
-
-import static org.junit.Assert.*;
-import static test.com.sun.javafx.scene.control.infrastructure.ControlSkinFactory.*;
-
 import javafx.beans.Observable;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.NumberBinding;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.value.ObservableValue;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import com.sun.javafx.scene.control.LambdaMultiplePropertyChangeListenerHandler;
 
 /**
  * Test LambdaMultiplePropertyChangeListenerHandler.
@@ -53,11 +52,9 @@
  *
  * This test is parameterized in testing change- or invalidationListener api.
  */
-@RunWith(Parameterized.class)
 public class LambdaMultipleObservableHandlerTest {
 
     private LambdaMultiplePropertyChangeListenerHandler handler;
-    private boolean useChangeListener;
 
 // -------------- unregister
 
@@ -65,15 +62,16 @@ public class LambdaMultipleObservableHandlerTest {
      * Single consumer for multiple observables: test that
      * removing from one observable doesn't effect listening to other observable
      */
-    @Test
-    public void testUnregistersSingleConsumerMultipleObservables() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testUnregistersSingleConsumerMultipleObservables(boolean useChangeListener) {
         IntegerProperty p = new SimpleIntegerProperty();
         IntegerProperty other = new SimpleIntegerProperty();
         int[] count = new int[] {0};
         Consumer<ObservableValue<?>> consumer = c -> count[0]++;
-        registerListener(p, consumer);
-        registerListener(other, consumer);
-        unregisterListeners(other);
+        registerListener(useChangeListener, p, consumer);
+        registerListener(useChangeListener, other, consumer);
+        unregisterListeners(useChangeListener, other);
         p.set(100);
         other.set(100);
         assertEquals(1, count[0]);
@@ -84,65 +82,70 @@ public void testUnregistersSingleConsumerMultipleObservables() {
      * and manually adding the removed consumer chain as listener
      * has the same effect as when invoked via handler.
      */
-    @Test
-    public void testUnregistersMultipleConsumers() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testUnregistersMultipleConsumers(boolean useChangeListener) {
         IntegerProperty p = new SimpleIntegerProperty();
         int[] action = new int[] {0};
         int actionValue = 10;
         int[] secondAction = new int[] {0};
         // register multiple consumers
-        registerListener(p, c -> action[0] = actionValue);
-        registerListener(p, c -> secondAction[0] = action[0]);
+        registerListener(useChangeListener, p, c -> action[0] = actionValue);
+        registerListener(useChangeListener, p, c -> secondAction[0] = action[0]);
         // remove all
-        Consumer removedChain = unregisterListeners(p);
+        Consumer removedChain = unregisterListeners(useChangeListener, p);
         p.set(100);
-        assertEquals("none of the removed listeners must be notified", 0, action[0] + secondAction[0]);
+        assertEquals(0, action[0] + secondAction[0], "none of the removed listeners must be notified");
 
         // manually add the chained consumers
-        addListener(p, removedChain);
+        addListener(useChangeListener, p, removedChain);
         p.set(200);
         // assert effect of manually added chain is same
-        assertEquals("effect of removed consumer chain", actionValue, action[0]);
-        assertEquals("effect of removed consumer chain", action[0], secondAction[0]);
+        assertEquals(actionValue, action[0], "effect of removed consumer chain");
+        assertEquals(action[0], secondAction[0], "effect of removed consumer chain");
     }
 
-    @Test
-    public void testUnregistersSingleConsumer() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testUnregistersSingleConsumer(boolean useChangeListener) {
         IntegerProperty p = new SimpleIntegerProperty();
         int[] count = new int[] {0};
         Consumer<Observable> consumer = c -> count[0]++;
-        registerListener(p, consumer);
-        Consumer<Observable> removed = unregisterListeners(p);
+        registerListener(useChangeListener, p, consumer);
+        Consumer<Observable> removed = unregisterListeners(useChangeListener, p);
         p.set(100);
         assertEquals(0, count[0]);
-        assertSame("single registered listener must be returned", consumer, removed);
+        assertSame(consumer, removed, "single registered listener must be returned");
     }
 
     /**
      * Test unregisters not registered observable.
      */
-    @Test
-    public void testUnregistersNotRegistered() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testUnregistersNotRegistered(boolean useChangeListener) {
         IntegerProperty p = new SimpleIntegerProperty();
-        assertNull(unregisterListeners(p));
+        assertNull(unregisterListeners(useChangeListener, p));
     }
 
-    @Test
-    public void testUnregistersNull() {
-        assertNull(unregisterListeners(null));
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testUnregistersNull(boolean useChangeListener) {
+        assertNull(unregisterListeners(useChangeListener, null));
     }
 
 
 //------------ register
 
-    @Test
-    public void testRegisterConsumerToMultipleObservables() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testRegisterConsumerToMultipleObservables(boolean useChangeListener) {
         IntegerProperty p = new SimpleIntegerProperty();
         IntegerProperty other = new SimpleIntegerProperty();
         int[] count = new int[] {0};
         Consumer<Observable> consumer = c -> count[0]++;
-        registerListener(p, consumer);
-        registerListener(other, consumer);
+        registerListener(useChangeListener, p, consumer);
+        registerListener(useChangeListener, other, consumer);
         p.set(100);
         other.set(100);
         assertEquals(2, count[0]);
@@ -152,53 +155,58 @@ public void testRegisterConsumerToMultipleObservables() {
      * Test that multiple consumers to same observable are invoked in order
      * of registration.
      */
-    @Test
-    public void testRegisterMultipleConsumerToSingleObservable() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testRegisterMultipleConsumerToSingleObservable(boolean useChangeListener) {
         IntegerProperty p = new SimpleIntegerProperty();
         int[] action = new int[] {0};
         int actionValue = 10;
         int[] secondAction = new int[] {0};
-        registerListener(p, c -> action[0] = actionValue);
-        registerListener(p, c -> secondAction[0] = action[0]);
+        registerListener(useChangeListener, p, c -> action[0] = actionValue);
+        registerListener(useChangeListener, p, c -> secondAction[0] = action[0]);
         p.set(100);
         assertEquals(actionValue, action[0]);
         assertEquals(action[0], secondAction[0]);
     }
 
-    @Test
-    public void testRegister() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testRegister(boolean useChangeListener) {
         IntegerProperty p = new SimpleIntegerProperty();
         int[] count = new int[] {0};
-        registerListener(p, c -> count[0]++);
+        registerListener(useChangeListener, p, c -> count[0]++);
         p.set(100);
         assertEquals(1, count[0]);
     }
 
-    @Test
-    public void testRegisterNullConsumer() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testRegisterNullConsumer(boolean useChangeListener) {
         IntegerProperty p = new SimpleIntegerProperty();
-        registerListener(p, null);
+        registerListener(useChangeListener, p, null);
     }
 
-    @Test
-    public void testRegisterNullObservable() {
-        registerListener(null, c -> {});
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testRegisterNullObservable(boolean useChangeListener) {
+        registerListener(useChangeListener, null, c -> {});
     }
 
 //--------- dispose
 
-    @Test
-    public void testDispose() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testDispose(boolean useChangeListener) {
         IntegerProperty p = new SimpleIntegerProperty();
         int[] count = new int[] {0};
-        registerListener(p, c -> count[0]++);
+        registerListener(useChangeListener, p, c -> count[0]++);
         handler.dispose();
         p.set(100);
-        assertEquals("listener must not be invoked after dispose", 0, count[0]);
+        assertEquals(0, count[0], "listener must not be invoked after dispose");
         // re-register
-        registerListener(p, c -> count[0]++);
+        registerListener(useChangeListener, p, c -> count[0]++);
         p.set(200);
-        assertEquals("listener must be invoked when re-registered after dispose", 1, count[0]);
+        assertEquals(1, count[0], "listener must be invoked when re-registered after dispose");
     }
 
 
@@ -207,24 +215,25 @@ public void testDispose() {
     /**
      * Test that handler is gc'ed and listener no longer notified.
      */
-    @Test
-    public void testRegisterMemoryLeak() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testRegisterMemoryLeak(boolean useChangeListener) {
         IntegerProperty p = new SimpleIntegerProperty();
         int[] count = new int[] {0};
         Consumer<ObservableValue<?>> consumer = c -> count[0]++;
         LambdaMultiplePropertyChangeListenerHandler handler = new LambdaMultiplePropertyChangeListenerHandler();
         WeakReference<LambdaMultiplePropertyChangeListenerHandler> ref =
                 new WeakReference<>(handler);
-        registerListener(handler, p, consumer);
+        registerListener(useChangeListener, handler, p, consumer);
         p.setValue(100);
         int notified = count[0];
-        assertEquals("sanity: listener invoked", notified, count[0]);
+        assertEquals(notified, count[0], "sanity: listener invoked");
         assertNotNull(ref.get());
         handler = null;
         attemptGC(ref);
-        assertNull("handler must be gc'ed", ref.get());
+        assertNull(ref.get(), "handler must be gc'ed");
         p.setValue(200);
-        assertEquals("listener must not be invoked after gc", notified, count[0]);
+        assertEquals(notified, count[0], "listener must not be invoked after gc");
     }
 
 
@@ -234,20 +243,22 @@ public void testRegisterMemoryLeak() {
     /**
      * Register both invalidation/change listener on same property.
      */
-    @Test
+    @ParameterizedTest
+    @MethodSource("data")
     public void testRegisterBoth() {
         IntegerProperty p = new SimpleIntegerProperty();
         int[] count = new int[] {0};
         handler.registerChangeListener(p, c -> count[0]++);
         handler.registerInvalidationListener(p, c -> count[0]++);
         p.set(100);
-        assertEquals("both listener types must be invoked", 2, count[0]);
+        assertEquals(2, count[0], "both listener types must be invoked");
     }
 
     /**
      * Register both invalidation/change listener, remove change listener
      */
-    @Test
+    @ParameterizedTest
+    @MethodSource("data")
     public void testRegisterBothRemoveChangeListener() {
         IntegerProperty p = new SimpleIntegerProperty();
         int[] count = new int[] {0};
@@ -255,13 +266,14 @@ public void testRegisterBothRemoveChangeListener() {
         handler.registerInvalidationListener(p, c -> count[0]++);
         handler.unregisterChangeListeners(p);
         p.set(200);
-        assertEquals("", 1, count[0]);
+        assertEquals(1, count[0]);
     }
 
     /**
      * Register both invalidation/change listener, remove invalidationListener.
      */
-    @Test
+    @ParameterizedTest
+    @MethodSource("data")
     public void testRegisterBothRemoveInvalidationListener() {
         IntegerProperty p = new SimpleIntegerProperty();
         int[] count = new int[] {0};
@@ -269,13 +281,14 @@ public void testRegisterBothRemoveInvalidationListener() {
         handler.registerInvalidationListener(p, c -> count[0]++);
         handler.unregisterInvalidationListeners(p);
         p.set(200);
-        assertEquals("", 1, count[0]);
+        assertEquals(1, count[0]);
     }
 
     /**
      * Test that binding is invalid.
      */
-    @Test
+    @ParameterizedTest
+    @MethodSource("data")
     public void testBindingInvalid() {
         IntegerProperty num1 = new SimpleIntegerProperty(1);
         IntegerProperty num2 = new SimpleIntegerProperty(2);
@@ -285,8 +298,8 @@ public void testBindingInvalid() {
         handler.registerInvalidationListener(p, c -> count[0]++);
         handler.unregisterChangeListeners(p);
         num1.set(200);
-        assertEquals("sanity: received invalidation", 1, count[0]);
-        assertFalse("binding must not be valid", p.isValid());
+        assertEquals(1, count[0], "sanity: received invalidation");
+        assertFalse(p.isValid(), "binding must not be valid");
     }
 
 
@@ -297,15 +310,20 @@ public void testBindingInvalid() {
      * using the default handler.
      *
      */
-    protected void registerListener(Observable p, Consumer consumer) {
-        registerListener(handler, p, consumer);
+    protected void registerListener(boolean useChangeListener, Observable p, Consumer consumer) {
+        registerListener(useChangeListener, handler, p, consumer);
     }
 
     /**
      * Registers the consumer for notification from the observable,
      * using the given handler.
      */
-    protected void registerListener(LambdaMultiplePropertyChangeListenerHandler handler, Observable p, Consumer consumer) {
+    protected void registerListener(
+        boolean useChangeListener,
+        LambdaMultiplePropertyChangeListenerHandler handler,
+        Observable p,
+        Consumer consumer
+    ) {
         if (useChangeListener) {
             handler.registerChangeListener((ObservableValue<?>) p, consumer);
         } else {
@@ -316,21 +334,21 @@ protected void registerListener(LambdaMultiplePropertyChangeListenerHandler hand
     /**
      * Unregisters listeners from observable, using default handler
      */
-    protected Consumer unregisterListeners(Observable p) {
-        return unregisterListeners(handler, p);
+    protected Consumer unregisterListeners(boolean useChangeListener, Observable p) {
+        return unregisterListeners(useChangeListener, handler, p);
     }
 
     /**
      * Unregisters listeners from observable, using default handler
      */
-    protected Consumer unregisterListeners(LambdaMultiplePropertyChangeListenerHandler handler, Observable p) {
+    protected Consumer unregisterListeners(boolean useChangeListener, LambdaMultiplePropertyChangeListenerHandler handler, Observable p) {
         if (useChangeListener) {
             return handler.unregisterChangeListeners((ObservableValue<?>) p);
         }
         return handler.unregisterInvalidationListeners(p);
     }
 
-    protected void addListener(ObservableValue<?> p, Consumer<Observable> consumer) {
+    protected void addListener(boolean useChangeListener, ObservableValue<?> p, Consumer<Observable> consumer) {
         if (useChangeListener) {
            p.addListener((obs, ov, nv) -> consumer.accept(obs));
         } else {
@@ -339,28 +357,19 @@ protected void addListener(ObservableValue<?> p, Consumer<Observable> consumer)
     }
 
 
-//-------------- parameters
-
-    // Note: name property not supported before junit 4.11
-    @Parameterized.Parameters //(name = "{index}: changeListener {0} ")
-    public static Collection<Object[]> data() {
-        Object[][] data = new Object[][] {
-                {true}, // test changeListener api
-                {false} // test invalidationListener api
-        };
-        return Arrays.asList(data);
-    }
-
-    public LambdaMultipleObservableHandlerTest(boolean useChangeListener) {
-        this.useChangeListener = useChangeListener;
+    /** parameters */
+    private static Collection<Boolean> data() {
+        return List.of(
+            true, // test changeListener api
+            false // test invalidationListener api
+        );
     }
 
 
 //------------ setup and initial
 
-    @Before
+    @BeforeEach
     public void setup() {
         this.handler = new LambdaMultiplePropertyChangeListenerHandler();
     }
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/SelectedItemsReadOnlyObservableListTest.java b/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/SelectedItemsReadOnlyObservableListTest.java
index 74ba9e3d804..68519ed13db 100644
--- a/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/SelectedItemsReadOnlyObservableListTest.java
+++ b/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/SelectedItemsReadOnlyObservableListTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,18 +24,17 @@
  */
 package test.com.sun.javafx.scene.control;
 
-import com.sun.javafx.collections.ObservableListWrapper;
-import com.sun.javafx.scene.control.SelectedItemsReadOnlyObservableList;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.ArrayList;
+import java.util.List;
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.collections.ObservableListWrapper;
+import com.sun.javafx.scene.control.SelectedItemsReadOnlyObservableList;
 
 public class SelectedItemsReadOnlyObservableListTest {
 
@@ -44,7 +43,7 @@ public class SelectedItemsReadOnlyObservableListTest {
     TestObservableList<Integer> selectedIndices;
     List<String> changes;
 
-    @Before
+    @BeforeEach
     public void setup() {
         changes = new ArrayList<>();
         items = FXCollections.observableArrayList("foo", "bar", "baz", "qux", "quz");
@@ -102,7 +101,7 @@ public void testRemoveDisjointRanges() {
      * { [bar] replaced by [foo] at 1 }
      */
     @Test
-    @Ignore("JDK-8267951")
+    @Disabled("JDK-8267951")
     public void testReplaceTwoItems() {
         selectedIndices.addAll(0, 1);
         changes.clear();
@@ -120,7 +119,7 @@ public void testReplaceTwoItems() {
      * { [quz] replaced by [qux] at 4 }
      */
     @Test
-    @Ignore("JDK-8267951")
+    @Disabled("JDK-8267951")
     public void testReplaceDisjointRanges() {
         selectedIndices.addAll(0, 1, 2, 3, 4);
         changes.clear();
diff --git a/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/behavior/AccordionBehaviorTest.java b/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/behavior/AccordionBehaviorTest.java
index 1736e2f0ca2..67d0b912ea4 100644
--- a/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/behavior/AccordionBehaviorTest.java
+++ b/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/behavior/AccordionBehaviorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.scene.control.behavior;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  */
@@ -35,7 +35,7 @@ public class AccordionBehaviorTest {
     // Panes added / removed, focus should move along with it
     // Pane gets focused, the focus model should reflect it
 
-    @Test public void focusGainedIsCaughtByBehavior() {
-
+    @Test
+    public void focusGainedIsCaughtByBehavior() {
     }
 }
diff --git a/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/behavior/BehaviorCleanupTest.java b/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/behavior/BehaviorCleanupTest.java
index cbd0a722799..3123dd392fd 100644
--- a/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/behavior/BehaviorCleanupTest.java
+++ b/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/behavior/BehaviorCleanupTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,25 +25,18 @@
 
 package test.com.sun.javafx.scene.control.behavior;
 
+import static com.sun.javafx.scene.control.behavior.TextBehaviorShim.getRawBidi;
+import static com.sun.javafx.scene.control.behavior.TextBehaviorShim.isRTLText;
+import static javafx.collections.FXCollections.observableArrayList;
+import static javafx.scene.control.skin.TextInputSkinShim.isCaretBlinking;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlSkinFactory.createBehavior;
 import java.lang.ref.WeakReference;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.sun.javafx.scene.control.behavior.BehaviorBase;
-import com.sun.javafx.scene.control.behavior.ListCellBehavior;
-import com.sun.javafx.scene.control.behavior.TextFieldBehavior;
-import com.sun.javafx.scene.control.inputmap.InputMap;
-import com.sun.javafx.scene.control.inputmap.KeyBinding;
-import com.sun.javafx.scene.control.inputmap.InputMap.KeyMapping;
-
-import static com.sun.javafx.scene.control.behavior.TextBehaviorShim.*;
-import static javafx.collections.FXCollections.*;
-import static javafx.scene.control.skin.TextInputSkinShim.*;
-import static org.junit.Assert.*;
-import static test.com.sun.javafx.scene.control.infrastructure.ControlSkinFactory.*;
-
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.control.Control;
@@ -56,6 +49,15 @@
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.scene.control.behavior.BehaviorBase;
+import com.sun.javafx.scene.control.behavior.ListCellBehavior;
+import com.sun.javafx.scene.control.behavior.TextFieldBehavior;
+import com.sun.javafx.scene.control.inputmap.InputMap;
+import com.sun.javafx.scene.control.inputmap.InputMap.KeyMapping;
+import com.sun.javafx.scene.control.inputmap.KeyBinding;
 
 /**
  * Test for misbehavior of individual implementations that turned
@@ -74,10 +76,10 @@ public class BehaviorCleanupTest {
     public void testTextAreaFocusListener() {
         TextArea control = new TextArea("some text");
         showControl(control, true);
-        assertTrue("caret must be blinking if focused", isCaretBlinking(control));
+        assertTrue(isCaretBlinking(control), "caret must be blinking if focused");
         Button button = new Button("dummy");
         showControl(button, true);
-        assertFalse("caret must not be blinking if not focused", isCaretBlinking(control));
+        assertFalse(isCaretBlinking(control), "caret must not be blinking if not focused");
     }
 
 //---------- TextField
@@ -86,20 +88,20 @@ public void testTextAreaFocusListener() {
     public void testFocusListener() {
         TextField control = new TextField("some text");
         showControl(control, true);
-        assertTrue("caret must be blinking if focused", isCaretBlinking(control));
+        assertTrue(isCaretBlinking(control), "caret must be blinking if focused");
         Button button = new Button("dummy");
         showControl(button, true);
-        assertFalse("caret must not be blinking if not focused", isCaretBlinking(control));
+        assertFalse(isCaretBlinking(control), "caret must not be blinking if not focused");
     }
 
     @Test
     public void testFocusOwnerListenerRegisteredInitially() {
         TextField control = new TextField("some text");
         showControl(control, true);
-        assertEquals("all text selected", control.getText(), control.getSelectedText());
+        assertEquals(control.getText(), control.getSelectedText(), "all text selected");
         Button button = new Button("dummy");
         showControl(button, true);
-        assertEquals("selection cleared", 0, control.getSelectedText().length());
+        assertEquals(0, control.getSelectedText().length(), "selection cleared");
     }
 
     /**
@@ -119,20 +121,18 @@ public void testFocusOwnerListenerOnSceneChanged() {
         Button button = new Button("dummy");
         showControl(button, false);
         control.selectNextWord();
-        assertEquals("sanity: ", secondWord, control.getSelectedText());
+        assertEquals(secondWord, control.getSelectedText(), "sanity: ");
         // detach textfield from scene
         root.getChildren().remove(control);
-        assertEquals("selection unchanged after remove", secondWord, control.getSelectedText());
+        assertEquals(secondWord, control.getSelectedText(), "selection unchanged after remove");
         // change scene's focusOwner to another node
         Button secondButton = new Button("another dummy");
         showControl(secondButton, true);
-        assertEquals("selection unchanged after focusOwner change in old scene",
-                secondWord, control.getSelectedText());
+        assertEquals(secondWord, control.getSelectedText(), "selection unchanged after focusOwner change in old scene");
         // re-add textField
         root.getChildren().add(control);
         control.requestFocus();
-        assertEquals("selection changed on becoming scene's focusOwner",
-                text, control.getSelectedText());
+        assertEquals(text, control.getSelectedText(), "selection changed on becoming scene's focusOwner");
     }
 
     /**
@@ -149,7 +149,7 @@ public void testFocusOwnerListenerSecondStage() {
         Button button = new Button("dummy");
         showControl(button, false);
         control.selectNextWord();
-        assertEquals("sanity: ", secondWord, control.getSelectedText());
+        assertEquals(secondWord, control.getSelectedText(), "sanity: ");
 
         // build and activate second stage
         VBox secondRoot = new VBox(10, new Button("secondButton"));
@@ -160,13 +160,13 @@ public void testFocusOwnerListenerSecondStage() {
         secondStage.requestFocus();
 
         try {
-            assertTrue("sanity: ", secondStage.isFocused());
-            assertEquals("selection unchanged", secondWord, control.getSelectedText());
+            assertTrue(secondStage.isFocused(), "sanity: ");
+            assertEquals(secondWord, control.getSelectedText(), "selection unchanged");
             // back to first
             stage.requestFocus();
-            assertTrue("sanity: ", stage.isFocused());
-            assertTrue("sanity: ", control.isFocused());
-            assertEquals("selection unchanged", secondWord, control.getSelectedText());
+            assertTrue(stage.isFocused(), "sanity: ");
+            assertTrue(control.isFocused(), "sanity: ");
+            assertEquals(secondWord, control.getSelectedText(), "selection unchanged");
         } finally {
             // cleanup
             secondStage.hide();
@@ -180,9 +180,9 @@ public void testChildMapsCleared() {
         TextField control = new TextField("some text");
         TextFieldBehavior behavior = (TextFieldBehavior) createBehavior(control);
         InputMap<?> inputMap = behavior.getInputMap();
-        assertFalse("sanity: inputMap has child maps", inputMap.getChildInputMaps().isEmpty());
+        assertFalse(inputMap.getChildInputMaps().isEmpty(), "sanity: inputMap has child maps");
         behavior.dispose();
-        assertEquals("default child maps must be cleared", 0, inputMap.getChildInputMaps().size());
+        assertEquals(0, inputMap.getChildInputMaps().size(), "default child maps must be cleared");
     }
 
     @Test
@@ -190,9 +190,9 @@ public void testDefaultMappingsCleared() {
         TextField control = new TextField("some text");
         TextFieldBehavior behavior = (TextFieldBehavior) createBehavior(control);
         InputMap<?> inputMap = behavior.getInputMap();
-        assertFalse("sanity: inputMap has mappings", inputMap.getMappings().isEmpty());
+        assertFalse(inputMap.getMappings().isEmpty(), "sanity: inputMap has mappings");
         behavior.dispose();
-        assertEquals("default mappings must be cleared", 0, inputMap.getMappings().size());
+        assertEquals(0, inputMap.getMappings().size(), "default mappings must be cleared");
     }
 
     /**
@@ -241,12 +241,12 @@ public void testKeyPadMappingChildInputMap() {
     public void testTextPropertyListener() {
         TextField control = new TextField("some text");
         TextFieldBehavior behavior = (TextFieldBehavior) createBehavior(control);
-        assertNull("sanity: initial bidi", getRawBidi(behavior));
+        assertNull(getRawBidi(behavior), "sanity: initial bidi");
         // validate bidi field
         isRTLText(behavior);
         assertNotNull(getRawBidi(behavior));
         control.setText("dummy");
-        assertNull("listener working (bidi is reset)", getRawBidi(behavior));
+        assertNull(getRawBidi(behavior), "listener working (bidi is reset)");
     }
 
 //----------- TreeView
@@ -261,8 +261,7 @@ public void testTreeViewBehaviorDisposeSelect() {
         treeView.getSelectionModel().select(1);
         weakRef.get().dispose();
         treeView.getSelectionModel().select(0);
-        assertNull("anchor must remain cleared on selecting when disposed",
-                treeView.getProperties().get("anchor"));
+        assertNull(treeView.getProperties().get("anchor"), "anchor must remain cleared on selecting when disposed");
     }
 
     @Test
@@ -271,7 +270,7 @@ public void testTreeViewBehaviorSelect() {
         createBehavior(treeView);
         int last = 1;
         treeView.getSelectionModel().select(last);
-        assertEquals("anchor must be set", last, treeView.getProperties().get("anchor"));
+        assertEquals(last, treeView.getProperties().get("anchor"), "anchor must be set");
     }
 
     @Test
@@ -280,7 +279,7 @@ public void testTreeViewBehaviorDispose() {
         WeakReference<BehaviorBase<?>> weakRef = new WeakReference<>(createBehavior(treeView));
         treeView.getSelectionModel().select(1);
         weakRef.get().dispose();
-        assertNull("anchor must be cleared after dispose", treeView.getProperties().get("anchor"));
+        assertNull(treeView.getProperties().get("anchor"), "anchor must be cleared after dispose");
     }
 
     /**
@@ -307,10 +306,9 @@ public void testListViewBehaviorDisposeSetItems() {
         int last = 1;
         ListCellBehavior.setAnchor(listView, last, false);
         listView.setItems(observableArrayList("other", "again"));
-        assertEquals("sanity: anchor unchanged", last, listView.getProperties().get("anchor"));
+        assertEquals(last, listView.getProperties().get("anchor"), "sanity: anchor unchanged");
         listView.getItems().remove(0);
-        assertEquals("anchor must not be updated on items modification when disposed",
-                last, listView.getProperties().get("anchor"));
+        assertEquals(last, listView.getProperties().get("anchor"), "anchor must not be updated on items modification when disposed");
     }
 
     @Test
@@ -320,10 +318,9 @@ public void testListViewBehaviorSetItems() {
         int last = 1;
         ListCellBehavior.setAnchor(listView, last, false);
         listView.setItems(observableArrayList("other", "again"));
-        assertEquals("sanity: anchor unchanged", last, listView.getProperties().get("anchor"));
+        assertEquals(last, listView.getProperties().get("anchor"), "sanity: anchor unchanged");
         listView.getItems().remove(0);
-        assertEquals("anchor must be updated on items modification",
-                last -1, listView.getProperties().get("anchor"));
+        assertEquals(last -1, listView.getProperties().get("anchor"), "anchor must be updated on items modification");
    }
 
     /**
@@ -337,9 +334,10 @@ public void testListViewBehaviorDisposeRemoveItem() {
         int last = 1;
         ListCellBehavior.setAnchor(listView, last, false);
         listView.getItems().remove(0);
-        assertEquals("anchor must not be updated on items modification when disposed",
-                last,
-                listView.getProperties().get("anchor"));
+        assertEquals(
+            last,
+            listView.getProperties().get("anchor"),
+            "anchor must not be updated on items modification when disposed");
     }
 
     @Test
@@ -348,10 +346,9 @@ public void testListViewBehaviorRemoveItem() {
         createBehavior(listView);
         int last = 1;
         ListCellBehavior.setAnchor(listView, last, false);
-        assertEquals("behavior must set anchor on select", last, listView.getProperties().get("anchor"));
+        assertEquals(last, listView.getProperties().get("anchor"), "behavior must set anchor on select");
         listView.getItems().remove(0);
-        assertEquals("anchor must be updated on items modification",
-                last -1, listView.getProperties().get("anchor"));
+        assertEquals(last -1, listView.getProperties().get("anchor"), "anchor must be updated on items modification");
     }
 
     /**
@@ -364,8 +361,7 @@ public void testListViewBehaviorDisposeSelect() {
         listView.getSelectionModel().select(1);
         weakRef.get().dispose();
         listView.getSelectionModel().select(0);
-        assertNull("anchor must remain cleared on selecting when disposed",
-                listView.getProperties().get("anchor"));
+        assertNull(listView.getProperties().get("anchor"), "anchor must remain cleared on selecting when disposed");
     }
 
     @Test
@@ -374,7 +370,7 @@ public void testListViewBehaviorSelect() {
         createBehavior(listView);
         int last = 1;
         listView.getSelectionModel().select(last);
-        assertEquals("anchor must be set", last, listView.getProperties().get("anchor"));
+        assertEquals(last, listView.getProperties().get("anchor"), "anchor must be set");
     }
 
     @Test
@@ -383,7 +379,7 @@ public void testListViewBehaviorDispose() {
         WeakReference<BehaviorBase<?>> weakRef = new WeakReference<>(createBehavior(listView));
         listView.getSelectionModel().select(1);
         weakRef.get().dispose();
-        assertNull("anchor must be cleared after dispose", listView.getProperties().get("anchor"));
+        assertNull(listView.getProperties().get("anchor"), "anchor must be cleared after dispose");
     }
 
   //------------------ setup/cleanup
@@ -423,7 +419,7 @@ protected void showControl(Control control, boolean focused) {
         }
     }
 
-    @After
+    @AfterEach
     public void cleanup() {
         if (stage != null) {
             stage.hide();
@@ -431,7 +427,7 @@ public void cleanup() {
         Thread.currentThread().setUncaughtExceptionHandler(null);
     }
 
-    @Before
+    @BeforeEach
     public void setup() {
         Thread.currentThread().setUncaughtExceptionHandler((thread, throwable) -> {
             if (throwable instanceof RuntimeException) {
diff --git a/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/behavior/BehaviorMemoryLeakTest.java b/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/behavior/BehaviorMemoryLeakTest.java
index 075354f3772..b1ba8fe354f 100644
--- a/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/behavior/BehaviorMemoryLeakTest.java
+++ b/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/behavior/BehaviorMemoryLeakTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,54 +25,50 @@
 
 package test.com.sun.javafx.scene.control.behavior;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlSkinFactory.attemptGC;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlSkinFactory.createBehavior;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlSkinFactory.createControl;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlSkinFactory.getControlClassesWithBehavior;
 import java.lang.ref.WeakReference;
-import java.util.Collection;
 import java.util.List;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import com.sun.javafx.scene.control.behavior.BehaviorBase;
-
-import static org.junit.Assert.*;
-import static test.com.sun.javafx.scene.control.infrastructure.ControlSkinFactory.*;
-
 import javafx.scene.control.Control;
 import javafx.scene.control.PasswordField;
 import javafx.scene.control.TableView;
 import javafx.scene.control.TreeTableView;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import com.sun.javafx.scene.control.behavior.BehaviorBase;
 
 /**
  * Test for memory leaks in Behavior implementations.
  * <p>
  * This test is parameterized on control type.
  */
-@RunWith(Parameterized.class)
 public class BehaviorMemoryLeakTest {
 
-    private Class<Control> controlClass;
-    private Control control;
-
     /**
-     * Create behavior -> dispose behavior -> gc
+     * Create control -> create behavior -> dispose behavior -> gc
      */
-    @Test
-    public void testMemoryLeakDisposeBehavior() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testMemoryLeakDisposeBehavior(Class<Control> controlClass) {
+        Control control = createControl(controlClass);
+        assertNotNull(control);
         WeakReference<BehaviorBase<?>> weakRef = new WeakReference<>(createBehavior(control));
         assertNotNull(weakRef.get());
         weakRef.get().dispose();
         attemptGC(weakRef);
-        assertNull("behavior must be gc'ed", weakRef.get());
+        assertNull(weakRef.get(), "behavior must be gc'ed");
     }
 
     //---------------- parameterized
 
     // Note: name property not supported before junit 4.11
-    @Parameterized.Parameters // (name = "{index}: {0} ")
-    public static Collection<Object[]> data() {
+    public static List<Class<Control>> data() {
         List<Class<Control>> controlClasses = getControlClassesWithBehavior();
         // FIXME as part of JDK-8241364
         // The behaviors of these controls are leaking
@@ -85,21 +81,17 @@ public static Collection<Object[]> data() {
          );
         // remove the known issues to make the test pass
         controlClasses.removeAll(leakingClasses);
-        return asArrays(controlClasses);
-    }
-
-    public BehaviorMemoryLeakTest(Class<Control> controlClass) {
-        this.controlClass = controlClass;
+        return controlClasses;
     }
 
 //------------------- setup
 
-    @After
+    @AfterEach
     public void cleanup() {
         Thread.currentThread().setUncaughtExceptionHandler(null);
     }
 
-    @Before
+    @BeforeEach
     public void setup() {
         Thread.currentThread().setUncaughtExceptionHandler((thread, throwable) -> {
             if (throwable instanceof RuntimeException) {
@@ -108,8 +100,5 @@ public void setup() {
                 Thread.currentThread().getThreadGroup().uncaughtException(thread, throwable);
             }
         });
-        control = createControl(controlClass);
-        assertNotNull(control);
     }
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/behavior/MnemonicInfoTest.java b/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/behavior/MnemonicInfoTest.java
index 12904627ad8..ec9bdaeb43a 100644
--- a/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/behavior/MnemonicInfoTest.java
+++ b/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/behavior/MnemonicInfoTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,12 @@
 
 package test.com.sun.javafx.scene.control.behavior;
 
-import com.sun.javafx.scene.control.behavior.MnemonicInfo;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
 import javafx.scene.input.KeyCombination;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.scene.control.behavior.MnemonicInfo;
 
 public class MnemonicInfoTest {
 
@@ -141,5 +142,4 @@ public void testMnemonicParsingStopsAfterFirstExtendedMnemonic() {
         assertKeyCombination("x", mnemonicInfo.getMnemonicKeyCombination());
         assertEquals(0, mnemonicInfo.getMnemonicIndex());
     }
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/infrastructure/ControlSkinFactory.java b/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/infrastructure/ControlSkinFactory.java
index 6f80cd8188f..962887a7d9a 100644
--- a/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/infrastructure/ControlSkinFactory.java
+++ b/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/infrastructure/ControlSkinFactory.java
@@ -25,21 +25,14 @@
 
 package test.com.sun.javafx.scene.control.infrastructure;
 
+import static java.util.stream.Collectors.toList;
+import static org.junit.jupiter.api.Assertions.fail;
 import java.lang.ref.WeakReference;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
-
-import com.sun.javafx.scene.control.behavior.BehaviorBase;
-import com.sun.javafx.scene.control.behavior.ButtonBehavior;
-import com.sun.javafx.scene.control.behavior.ComboBoxListViewBehavior;
-import com.sun.javafx.scene.control.behavior.ToggleButtonBehavior;
-
-import static java.util.stream.Collectors.*;
-import static org.junit.Assert.*;
-
 import javafx.scene.control.Accordion;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonBar;
@@ -125,6 +118,10 @@
 import javafx.scene.control.skin.TreeTableRowSkin;
 import javafx.scene.control.skin.TreeTableViewSkin;
 import javafx.scene.control.skin.TreeViewSkin;
+import com.sun.javafx.scene.control.behavior.BehaviorBase;
+import com.sun.javafx.scene.control.behavior.ButtonBehavior;
+import com.sun.javafx.scene.control.behavior.ComboBoxListViewBehavior;
+import com.sun.javafx.scene.control.behavior.ToggleButtonBehavior;
 
 /**
  * Utility class to create Controls, alternative Skins and access/create behaviors.
diff --git a/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/infrastructure/ControlSkinFactoryTest.java b/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/infrastructure/ControlSkinFactoryTest.java
index 17c4ed772d3..d0deaddfebe 100644
--- a/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/infrastructure/ControlSkinFactoryTest.java
+++ b/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/infrastructure/ControlSkinFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,16 +25,17 @@
 
 package test.com.sun.javafx.scene.control.infrastructure;
 
-import java.util.List;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static test.com.sun.javafx.scene.control.infrastructure.ControlSkinFactory.*;
-
+import java.util.List;
 import javafx.scene.control.Control;
 import javafx.scene.control.ControlShim;
 import javafx.scene.control.Skin;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests on ControlSkinFactory.
@@ -111,6 +112,5 @@ public void testControlsAndSkin() {
             Class<Control> controlClass = (Class<Control>) controlClasses[i][0];
             assertTrue(alternativeSkinClassMap.containsKey(controlClass));
         }
-
     }
 }
diff --git a/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/infrastructure/ControlTestUtils.java b/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/infrastructure/ControlTestUtils.java
index 58829e64201..902a0f842ae 100644
--- a/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/infrastructure/ControlTestUtils.java
+++ b/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/infrastructure/ControlTestUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,12 @@
 
 package test.com.sun.javafx.scene.control.infrastructure;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
 import javafx.beans.InvalidationListener;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.ListChangeListener;
@@ -36,13 +42,7 @@
 import javafx.scene.control.Pagination;
 import javafx.scene.control.PopupControl;
 import javafx.scene.control.Tab;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
 import test.com.sun.javafx.binding.ExpressionHelperUtility;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 
 public final class ControlTestUtils {
     private ControlTestUtils() { }
@@ -56,7 +56,7 @@ public static void assertStyleClassContains(Tab tab, String styleClass) {
     }
 
     public static void assertStyleClassContains(String message, Tab tab, String styleClass) {
-        assertTrue(message, tab.getStyleClass().contains(styleClass));
+        assertTrue(tab.getStyleClass().contains(styleClass), message);
     }
 
     /*********************************************************************
@@ -69,7 +69,7 @@ public static void assertStyleClassContains(MenuItem mi, String styleClass) {
     }
 
     public static void assertStyleClassContains(String message, MenuItem mi, String styleClass) {
-        assertTrue(message, mi.getStyleClass().contains(styleClass));
+        assertTrue(mi.getStyleClass().contains(styleClass), message);
     }
 
     /*********************************************************************
@@ -82,7 +82,7 @@ public static void assertStyleClassContains(PopupControl control, String styleCl
     }
 
     public static void assertStyleClassContains(String message, PopupControl control, String styleClass) {
-        assertTrue(message, control.getStyleClass().contains(styleClass));
+        assertTrue(control.getStyleClass().contains(styleClass), message);
     }
 
     /****************************************************************************
@@ -95,7 +95,7 @@ public static void assertStyleClassContains(Control control, String styleClass)
     }
 
     public static void assertStyleClassContains(String message, Control control, String styleClass) {
-        assertTrue(message, control.getStyleClass().contains(styleClass));
+        assertTrue(control.getStyleClass().contains(styleClass), message);
     }
 
     /****************************************************************************
@@ -110,7 +110,7 @@ public static void assertPseudoClassExists(Control control, String pseudoClass)
     public static void assertPseudoClassExists(String message, Control control, String pseudoClass) {
         Set<PseudoClass> allStates = control.getPseudoClassStates();
         PseudoClass state = PseudoClass.getPseudoClass(pseudoClass);
-        assertTrue(message, allStates.contains(state));
+        assertTrue(allStates.contains(state), message);
     }
 
     public static void assertPseudoClassDoesNotExist(Control control, String pseudoClass) {
@@ -122,7 +122,7 @@ public static void assertPseudoClassDoesNotExist(Control control, String pseudoC
     public static void assertPseudoClassDoesNotExist(String message, Control control, String pseudoClass) {
         Set<PseudoClass> allStates = control.getPseudoClassStates();
         PseudoClass state = PseudoClass.getPseudoClass(pseudoClass);
-        assertFalse(message, allStates.contains(state));
+        assertFalse(allStates.contains(state), message);
     }
 
     /****************************************************************************
@@ -137,7 +137,7 @@ public static void assertPseudoClassExists(Axis axis, String pseudoClass) {
     public static void assertPseudoClassExists(String message, Axis axis, String pseudoClass) {
         Set<PseudoClass> allStates = axis.getPseudoClassStates();
         PseudoClass state = PseudoClass.getPseudoClass(pseudoClass);
-        assertTrue(message, allStates.contains(state));
+        assertTrue(allStates.contains(state), message);
     }
 
     public static void assertPseudoClassDoesNotExist(Axis axis, String pseudoClass) {
@@ -149,7 +149,7 @@ public static void assertPseudoClassDoesNotExist(Axis axis, String pseudoClass)
     public static void assertPseudoClassDoesNotExist(String message, Axis axis, String pseudoClass) {
         Set<PseudoClass> allStates = axis.getPseudoClassStates();
         PseudoClass state = PseudoClass.getPseudoClass(pseudoClass);
-        assertFalse(message, allStates.contains(state));
+        assertFalse(allStates.contains(state), message);
     }
 
     /*********************************************************************
@@ -162,7 +162,7 @@ public static void assertStyleClassContains(Pagination control, String styleClas
     }
 
     public static void assertStyleClassContains(String message, Pagination control, String styleClass) {
-        assertTrue(message, control.getStyleClass().contains(styleClass));
+        assertTrue(control.getStyleClass().contains(styleClass), message);
     }
 
     public static void assertListenerListContains(ObservableList list, ListChangeListener listener) {
@@ -193,7 +193,7 @@ public static void assertValueListenersContains(ObservableValue value, Invalidat
 
     public static void assertValueListenersContains(String message, ObservableValue value, InvalidationListener listener) {
         List listeners = getObservableValueListeners(value);
-        assertTrue(message, listeners != null && listeners.contains(listener));
+        assertTrue(listeners != null && listeners.contains(listener), message);
     }
 
     public static void assertValueListenersDoesNotContain(ObservableValue value, InvalidationListener listener) {
@@ -202,7 +202,7 @@ public static void assertValueListenersDoesNotContain(ObservableValue value, Inv
 
     public static void assertValueListenersDoesNotContain(String message, ObservableValue value, InvalidationListener listener) {
         List listeners = getObservableValueListeners(value);
-        assertTrue(message, listeners == null || !listeners.contains(listener));
+        assertTrue(listeners == null || !listeners.contains(listener), message);
     }
 
     public static int getListenerCount(ObservableValue value) {
diff --git a/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/infrastructure/KeyEventFirerTest.java b/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/infrastructure/KeyEventFirerTest.java
index b517549d024..4b81f8cca3c 100644
--- a/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/infrastructure/KeyEventFirerTest.java
+++ b/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/infrastructure/KeyEventFirerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,17 +25,14 @@
 
 package test.com.sun.javafx.scene.control.infrastructure;
 
+import static javafx.scene.input.KeyCode.A;
+import static javafx.scene.input.KeyEvent.KEY_PRESSED;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.ArrayList;
 import java.util.List;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import static javafx.scene.input.KeyCode.*;
-import static javafx.scene.input.KeyEvent.*;
-import static org.junit.Assert.*;
-
 import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
@@ -44,6 +41,9 @@
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test of enhanced KeyEventFirer.
@@ -68,8 +68,8 @@ public void testFireViaScene() {
         textField.addEventHandler(KEY_PRESSED, textFieldEvents::add);
         KeyEventFirer firer = new KeyEventFirer(textField, scene);
         firer.doKeyPress(A);
-        assertEquals("button must have received the key", 1, buttonEvents.size());
-        assertEquals("textField must not have received the key", 0, textFieldEvents.size());
+        assertEquals(1, buttonEvents.size(), "button must have received the key");
+        assertEquals(0, textFieldEvents.size(), "textField must not have received the key");
     }
 
     /**
@@ -85,8 +85,8 @@ public void testFireViaSceneNullTarget() {
         textField.addEventHandler(KEY_PRESSED, textFieldEvents::add);
         KeyEventFirer firer = new KeyEventFirer(null, scene);
         firer.doKeyPress(A);
-        assertEquals("button must have received the key", 1, buttonEvents.size());
-        assertEquals("textField must not have received the key", 0, textFieldEvents.size());
+        assertEquals(1, buttonEvents.size(), "button must have received the key");
+        assertEquals(0, textFieldEvents.size(), "textField must not have received the key");
     }
 
     /**
@@ -105,8 +105,8 @@ public void testFireTargetFalseGreen() {
         incorrectFirer.doKeyPress(A);
         int falseTextFieldNotification = textFieldEvents.size();
         int falseButtonNotification = buttonEvents.size();
-        assertEquals("false green - textField must have received the key", 1, textFieldEvents.size());
-        assertEquals("false green - button must not have received the key", 0, buttonEvents.size());
+        assertEquals(1, textFieldEvents.size(), "false green - textField must have received the key");
+        assertEquals(0, buttonEvents.size(), "false green - button must not have received the key");
         textFieldEvents.clear();
         buttonEvents.clear();
         // firing on the scene makes a difference
@@ -116,14 +116,18 @@ public void testFireTargetFalseGreen() {
         assertEquals(falseButtonNotification + 1, buttonEvents.size());
     }
 
-    @Test (expected= NullPointerException.class)
+    @Test
     public void testTwoParamConstructorNPE() {
-        new KeyEventFirer(null, null);
+        assertThrows(NullPointerException.class, () -> {
+            new KeyEventFirer(null, null);
+        });
     }
 
-    @Test (expected= NullPointerException.class)
+    @Test
     public void testSingleParamConstructorNPE() {
-        new KeyEventFirer(null);
+        assertThrows(NullPointerException.class, () -> {
+            new KeyEventFirer(null);
+        });
     }
 
     /**
@@ -150,7 +154,7 @@ private void showAndFocus(Node focused) {
         }
     }
 
-    @Before
+    @BeforeEach
     public void setup() {
         root = new VBox();
         scene = new Scene(root);
@@ -161,11 +165,10 @@ public void setup() {
         root.getChildren().addAll(button, textField);
     }
 
-    @After
+    @AfterEach
     public void cleanup() {
         if (stage != null) {
             stage.hide();
         }
     }
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/infrastructure/MouseEventFirerTest.java b/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/infrastructure/MouseEventFirerTest.java
index 3f600da39ce..1c03810eb38 100644
--- a/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/infrastructure/MouseEventFirerTest.java
+++ b/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/infrastructure/MouseEventFirerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,20 +25,15 @@
 
 package test.com.sun.javafx.scene.control.infrastructure;
 
-import java.util.Arrays;
+import static javafx.scene.layout.AnchorPane.setBottomAnchor;
+import static javafx.scene.layout.AnchorPane.setLeftAnchor;
+import static javafx.scene.layout.AnchorPane.setRightAnchor;
+import static javafx.scene.layout.AnchorPane.setTopAnchor;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.Collection;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import com.sun.javafx.tk.Toolkit;
-
-import static javafx.scene.layout.AnchorPane.*;
-import static org.junit.Assert.*;
-
+import java.util.List;
 import javafx.geometry.Bounds;
 import javafx.geometry.Point2D;
 import javafx.scene.Node;
@@ -48,6 +43,12 @@
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.AnchorPane;
 import javafx.stage.Stage;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import com.sun.javafx.tk.Toolkit;
 
 /**
  * Test for MouseEventFirer.
@@ -55,7 +56,6 @@
  * The test is parameterized on not/using (old/new) the alternative mouseEvent creation
  * path.
  */
-@RunWith(Parameterized.class)
 public class MouseEventFirerTest {
 
     //------------ fields
@@ -73,57 +73,66 @@ public class MouseEventFirerTest {
 
 //------- standalone node
 
-    @Test
-    public void testLocalStandaloneDeltaNegative() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testLocalStandaloneDeltaNegative(boolean useAlternative) {
         Button button = new Button("standalone button, a bit longish");
-        assertLocal(button, - 10, - 5);
+        assertLocal(useAlternative, button, - 10, - 5);
     }
 
-    @Test
-    public void testLocalStandaloneDelta() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testLocalStandaloneDelta(boolean useAlternative) {
         Button button = new Button("standalone button, a bit longish");
-        assertLocal(button, 10, 5);
+        assertLocal(useAlternative, button, 10, 5);
     }
 
-    @Test
-    public void testLocalStandalone() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testLocalStandalone(boolean useAlternative) {
         Button button = new Button("standalone button, a bit longish");
-        assertLocal(button, 0, 0);
+        assertLocal(useAlternative, button, 0, 0);
     }
 
-    @Test
-    public void testMouseCoordinatesStandaloneDeltaNegative() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testMouseCoordinatesStandaloneDeltaNegative(boolean useAlternative) {
         Button button = new Button("standalone button, a bit longish");
-        assertMouseCoordinatesDelta(button, - 10, - 5);
+        assertMouseCoordinatesDelta(useAlternative, button, - 10, - 5);
     }
 
-    @Test
-    public void testMouseCoordinatesStandaloneDelta() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testMouseCoordinatesStandaloneDelta(boolean useAlternative) {
         Button button = new Button("standalone button, a bit longish");
-        assertMouseCoordinatesDelta(button, 10, 5);
+        assertMouseCoordinatesDelta(useAlternative, button, 10, 5);
     }
 
-    @Test
-    public void testMouseCoordinatesStandalone() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testMouseCoordinatesStandalone(boolean useAlternative) {
         Button button = new Button("standalone button, a bit longish");
-        assertMouseCoordinatesDelta(button, 0, 0);
+        assertMouseCoordinatesDelta(useAlternative, button, 0, 0);
     }
 
 // --------- test local coordinates
 
-    @Test
-    public void testLocalDeltaNegative() {
-        content.getChildren().forEach(child -> assertLocal(child, - 10, - 5));
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testLocalDeltaNegative(boolean useAlternative) {
+        content.getChildren().forEach(child -> assertLocal(useAlternative, child, - 10, - 5));
     }
 
-    @Test
-    public void testLocalDelta() {
-        content.getChildren().forEach(child -> assertLocal(child, 10, 5));
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testLocalDelta(boolean useAlternative) {
+        content.getChildren().forEach(child -> assertLocal(useAlternative, child, 10, 5));
     }
 
-    @Test
-    public void testLocal() {
-        content.getChildren().forEach(child -> assertLocal(child, 0, 0));
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testLocal(boolean useAlternative) {
+        content.getChildren().forEach(child -> assertLocal(useAlternative, child, 0, 0));
     }
 
     /**
@@ -131,40 +140,43 @@ public void testLocal() {
      * and asserts the local mouse coordinates.
      *
      */
-    protected void assertLocal(Node target, double deltaX, double deltaY) {
+    protected void assertLocal(boolean useAlternative, Node target, double deltaX, double deltaY) {
         MouseEventFirer firer = new MouseEventFirer(target, useAlternative);
         String text = target instanceof Labeled ? ((Labeled) target).getText() : target.getId();
         target.setOnMousePressed(e -> {
             double width = target.getLayoutBounds().getWidth();
             double height = target.getLayoutBounds().getHeight();
-            assertEquals("local x of " + text, width /2 + deltaX, e.getX(), EPS);
-            assertEquals("local y of " + text, height / 2 + deltaY, e.getY(), EPS);
+            assertEquals(width /2 + deltaX, e.getX(), EPS, "local x of " + text);
+            assertEquals(height / 2 + deltaY, e.getY(), EPS, "local y of " + text);
         });
         firer.fireMousePressed(deltaX, deltaY);
     }
 
 //------------ test scene/screen coordinates
 
-    @Test
-    public void testMouseCoordinatesDeltaNegative() {
-        content.getChildren().forEach(child -> assertMouseCoordinatesDelta(child, - 10, - 5));
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testMouseCoordinatesDeltaNegative(boolean useAlternative) {
+        content.getChildren().forEach(child -> assertMouseCoordinatesDelta(useAlternative, child, - 10, - 5));
     }
 
-    @Test
-    public void testMouseCoordinatesDelta() {
-        content.getChildren().forEach(child -> assertMouseCoordinatesDelta(child, 10, 5));
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testMouseCoordinatesDelta(boolean useAlternative) {
+        content.getChildren().forEach(child -> assertMouseCoordinatesDelta(useAlternative, child, 10, 5));
     }
 
-    @Test
-    public void testMouseCoordinates() {
-        content.getChildren().forEach(child -> assertMouseCoordinatesDelta(child, 0, 0));
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testMouseCoordinates(boolean useAlternative) {
+        content.getChildren().forEach(child -> assertMouseCoordinatesDelta(useAlternative, child, 0, 0));
     }
 
     /**
      * Fires a mousePressed with the given x/y location on the given target
      *  and asserts basic mouseEvent constraints.
      */
-    protected void assertMouseCoordinatesDelta(Node target, double deltaX, double deltaY) {
+    protected void assertMouseCoordinatesDelta(boolean useAlternative, Node target, double deltaX, double deltaY) {
         MouseEventFirer firer = new MouseEventFirer(target, useAlternative);
         target.setOnMousePressed(this::assertMouseEventCoordinates);
         firer.fireMousePressed(deltaX, deltaY);
@@ -179,30 +191,22 @@ protected void assertMouseEventCoordinates(MouseEvent mouse) {
         String text = receiver instanceof Labeled ? ((Labeled) receiver).getText() : receiver.getId();
 
         Point2D sceneP = receiver.localToScene(mouse.getX(), mouse.getY());
-        assertEquals("sceneX of " + text, sceneP.getX(), mouse.getSceneX(), EPS);
-        assertEquals("sceneY of " + text, sceneP.getY(), mouse.getSceneY(), EPS);
+        assertEquals(sceneP.getX(), mouse.getSceneX(), EPS, "sceneX of " + text);
+        assertEquals(sceneP.getY(), mouse.getSceneY(), EPS, "sceneY of " + text);
         Point2D screenP = receiver.localToScreen(mouse.getX(), mouse.getY());
-        assertEquals("screenX of " + text, screenP.getX(), mouse.getScreenX(), EPS);
-        assertEquals("screenY of " + text, screenP.getY(), mouse.getScreenY(), EPS);
+        assertEquals(screenP.getX(), mouse.getScreenX(), EPS, "screenX of " + text);
+        assertEquals(screenP.getY(), mouse.getScreenY(), EPS, "screenY of " + text);
     }
 
  // ------------- parameterized in not/alternative mouseEvent creation
 
-    private boolean useAlternative;
-
-    @Parameterized.Parameters
-    public static Collection<Object[]> data() {
+    private static Collection<Boolean> data() {
         // current / alternative mouseEvent creation
-        Object[][] data = new Object[][] {
+        return List.of(
             // @Ignore("8253769")
-            // {false},
-            {true},
-        };
-        return Arrays.asList(data);
-    }
-
-    public MouseEventFirerTest(boolean useAlternative) {
-        this.useAlternative = useAlternative;
+            // false,
+            true
+        );
     }
 
  // ------------ setup/cleanup/intial
@@ -210,8 +214,8 @@ public MouseEventFirerTest(boolean useAlternative) {
     @Test
     public void testFirer() {
         new MouseEventFirer(topLeft, true);
-        assertSame("sanity: firer must not change hierarchy", scene, topLeft.getScene());
-        assertSame("sanity: firer must not change hierarchy", stage, topLeft.getScene().getWindow());
+        assertSame(scene, topLeft.getScene(), "sanity: firer must not change hierarchy");
+        assertSame(stage, topLeft.getScene().getWindow(), "sanity: firer must not change hierarchy");
     }
 
     @Test
@@ -228,7 +232,7 @@ public void testLayoutBounds() {
         setLeftAnchor(topLeft, null);
         setRightAnchor(topLeft, 0.);
         Toolkit.getToolkit().firePulse();
-        assertEquals("sanity: layout bounds unchanged", initial, topLeft.getLayoutBounds());
+        assertEquals(initial, topLeft.getLayoutBounds(), "sanity: layout bounds unchanged");
     }
 
     @Test
@@ -248,7 +252,7 @@ public void testContentLayout() {
         assertEquals(content.getHeight() - bottomRight.prefHeight(-1), bottomRight.getBoundsInParent().getMinY(), EPS);
     }
 
-    @Before
+    @BeforeEach
     public void setup() {
         Thread.currentThread().setUncaughtExceptionHandler((thread, throwable) -> {
             if (throwable instanceof RuntimeException) {
@@ -281,10 +285,9 @@ public void setup() {
         stage.show();
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         if (stage != null) stage.hide();
         Thread.currentThread().setUncaughtExceptionHandler(null);
     }
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/infrastructure/VirtualFlowTestUtils.java b/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/infrastructure/VirtualFlowTestUtils.java
index 3d86f757ec8..a00bedd4cb9 100644
--- a/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/infrastructure/VirtualFlowTestUtils.java
+++ b/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/infrastructure/VirtualFlowTestUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,21 +24,30 @@
  */
 package test.com.sun.javafx.scene.control.infrastructure;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.List;
 import javafx.geometry.Orientation;
 import javafx.scene.Node;
-import javafx.scene.control.*;
+import javafx.scene.control.Cell;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.Control;
+import javafx.scene.control.IndexedCell;
+import javafx.scene.control.ListView;
+import javafx.scene.control.TableColumnBase;
+import javafx.scene.control.TableRow;
+import javafx.scene.control.TreeTableRow;
 import javafx.scene.control.skin.ComboBoxListViewSkin;
-import com.sun.javafx.scene.control.LabeledText;
 import javafx.scene.control.skin.NestedTableColumnHeader;
 import javafx.scene.control.skin.TableColumnHeader;
 import javafx.scene.control.skin.TableHeaderRow;
 import javafx.scene.control.skin.TableViewSkinBase;
 import javafx.scene.control.skin.VirtualFlow;
-import com.sun.javafx.scene.control.VirtualScrollBar;
 import javafx.util.Callback;
-import java.util.List;
-
-import static org.junit.Assert.*;
+import com.sun.javafx.scene.control.LabeledText;
+import com.sun.javafx.scene.control.VirtualScrollBar;
 
 public class VirtualFlowTestUtils {
 
@@ -113,10 +122,10 @@ public static void assertCellEmpty(IndexedCell cell) {
             }
         } else {
             final String text = cell.getText();
-            assertTrue("Expected null, found '" + text + "'", text == null || text.isEmpty());
+            assertTrue(text == null || text.isEmpty(), "Expected null, found '" + text + "'");
 
             final Node graphic = cell.getGraphic();
-            assertTrue("Expected null graphic, found " + graphic, graphic == null);
+            assertTrue(graphic == null, "Expected null graphic, found " + graphic);
         }
     }
 
@@ -132,8 +141,7 @@ public static void assertCellNotEmpty(IndexedCell cell) {
         } else {
             final String text = cell.getText();
             final Node graphic = cell.getGraphic();
-            assertTrue("Expected a non-null text or graphic property",
-                       (text != null && ! text.isEmpty()) || graphic != null);
+            assertTrue((text != null && ! text.isEmpty()) || graphic != null, "Expected a non-null text or graphic property");
         }
     }
 
@@ -229,7 +237,7 @@ public static void assertLayoutX(final Control control, final int startRow, fina
 
             String error = "Element in row " + indexedCell.getIndex() + " has incorrect indentation. "
                     + "Expected " + expectedLayoutX + ", but found " + labeledText.getLayoutX();
-            assertEquals(error, expectedLayoutX, labeledText.getLayoutX(), 0.0);
+            assertEquals(expectedLayoutX, labeledText.getLayoutX(), 0.0, error);
             return null;
         };
 
diff --git a/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/infrastructure/VirtualizedControlTestUtilsTest.java b/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/infrastructure/VirtualizedControlTestUtilsTest.java
index 71d7b6339fc..3d2337e0f57 100644
--- a/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/infrastructure/VirtualizedControlTestUtilsTest.java
+++ b/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/infrastructure/VirtualizedControlTestUtilsTest.java
@@ -25,11 +25,6 @@
 
 package test.com.sun.javafx.scene.control.infrastructure;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
 import static test.com.sun.javafx.scene.control.infrastructure.VirtualizedControlTestUtils.*;
 
 import javafx.collections.FXCollections;
@@ -41,6 +36,21 @@
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Rudimentary test of VirtualizedControlTestUtils.
@@ -60,9 +70,9 @@ public class VirtualizedControlTestUtilsTest {
     public void testFireMouseOnVerticalTrack() {
         ListView<?> list = createAndShowListView();
         ScrollBar scrollBar = getVerticalScrollBar(list);
-        assertEquals("sanity: initial value of scrollBar", 0, scrollBar.getValue(), 0.1);
+        assertEquals(0, scrollBar.getValue(), 0.1, "sanity: initial value of scrollBar");
         fireMouseOnVerticalTrack(list);
-        assertTrue("mouse on track must have scrolled", scrollBar.getValue() > 0);
+        assertTrue(scrollBar.getValue() > 0, "mouse on track must have scrolled");
     }
 
     /**
@@ -72,21 +82,25 @@ public void testFireMouseOnVerticalTrack() {
     public void testFireMouseOnHorizontalTrack() {
         ListView<?> list = createAndShowListView();
         ScrollBar scrollBar = getHorizontalScrollBar(list);
-        assertEquals("sanity: initial value of scrollBar", 0, scrollBar.getValue(), 0.1);
+        assertEquals(0, scrollBar.getValue(), 0.1, "sanity: initial value of scrollBar");
         fireMouseOnHorizontalTrack(list);
-        assertTrue("mouse on track must have scrolled", scrollBar.getValue() > 0);
+        assertTrue(scrollBar.getValue() > 0, "mouse on track must have scrolled");
     }
 
-    @Test (expected=IllegalStateException.class)
+    @Test
     public void testGetVerticalScrollBarThrowsWithoutSkin() {
-        ListView<?> list = new ListView<>();
-        getVerticalScrollBar(list);
+        assertThrows(IllegalStateException.class, () -> {
+            ListView<?> list = new ListView<>();
+            getVerticalScrollBar(list);
+        });
     }
 
-    @Test (expected=IllegalStateException.class)
+    @Test
     public void testGetHorizontalScrollBarThrowsWithoutSkin() {
-        ListView<?> list = new ListView<>();
-        getHorizontalScrollBar(list);
+        assertThrows(IllegalStateException.class, () -> {
+            ListView<?> list = new ListView<>();
+            getHorizontalScrollBar(list);
+        });
     }
 
     /**
@@ -98,10 +112,8 @@ public void testListViewEditing() {
         assertEquals(rows, control.getItems().size());
         assertEquals(100, scene.getWidth(), 1);
         assertEquals(330, scene.getHeight(), 1);
-        assertTrue("sanity: vertical scrollbar visible for list " ,
-                getHorizontalScrollBar(control).isVisible());
-        assertTrue("sanity: vertical scrollbar visible for list " ,
-                getVerticalScrollBar(control).isVisible());
+        assertTrue(getHorizontalScrollBar(control).isVisible(), "sanity: vertical scrollbar visible for list ");
+        assertTrue(getVerticalScrollBar(control).isVisible(), "sanity: vertical scrollbar visible for list ");
     }
 
   //----------------- setup
@@ -172,7 +184,8 @@ protected void showControl(Control control, boolean focused, double width, doubl
         }
     }
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         Thread.currentThread().setUncaughtExceptionHandler((thread, throwable) -> {
             if (throwable instanceof RuntimeException) {
                 throw (RuntimeException)throwable;
@@ -183,9 +196,10 @@ protected void showControl(Control control, boolean focused, double width, doubl
         rows = 60;
     }
 
-    @After public void cleanup() {
-        if (stage != null) stage.hide();
+    @AfterEach
+    public void cleanup() {
+        if (stage != null)
+            stage.hide();
         Thread.currentThread().setUncaughtExceptionHandler(null);
     }
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/inputmap/InputMapTest.java b/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/inputmap/InputMapTest.java
index ed88d4f656e..02cb7553a8a 100644
--- a/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/inputmap/InputMapTest.java
+++ b/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/inputmap/InputMapTest.java
@@ -24,7 +24,7 @@
  */
 package test.com.sun.javafx.scene.control.inputmap;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Thoughts / Considerations (search for [1], etc in comments below):
diff --git a/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/inputmap/KeyBindingTest.java b/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/inputmap/KeyBindingTest.java
index a86c8d27156..db75079141a 100644
--- a/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/inputmap/KeyBindingTest.java
+++ b/modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/inputmap/KeyBindingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,15 +25,16 @@
 
 package test.com.sun.javafx.scene.control.inputmap;
 
-import com.sun.javafx.scene.control.inputmap.KeyBinding;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.scene.control.inputmap.KeyBinding;
 
 public class KeyBindingTest {
 
-    @Test public void getSpecificity() {
+    @Test
+    public void getSpecificity() {
         final KeyCode code = KeyCode.ENTER;
 
         // Expected answer:
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/chart/AreaChartTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/chart/AreaChartTest.java
index 0a110e1d834..6ffc331cc14 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/chart/AreaChartTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/chart/AreaChartTest.java
@@ -25,6 +25,11 @@
 
 package test.javafx.scene.chart;
 
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.List;
+import java.util.stream.Collectors;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.geometry.Point2D;
@@ -39,25 +44,18 @@
 import javafx.scene.chart.XYChartShim;
 import javafx.scene.shape.LineTo;
 import javafx.scene.shape.Path;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 import javafx.scene.shape.PathElement;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import java.util.List;
-import java.util.stream.Collectors;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class AreaChartTest extends XYChartTestBase {
     AreaChart<Number,Number> ac;
     final XYChart.Series<Number, Number> series1 = new XYChart.Series<>();
     boolean useCategoryAxis = false;
     final String[] countries = {"USA", "Italy", "France", "China", "India"};
+
     @Override
-    protected Chart createChart() {
+    protected void createChart() {
         final NumberAxis yAxis = new NumberAxis(0, 30, 2);
         ObservableList<XYChart.Data> data = FXCollections.observableArrayList();
         Axis xAxis;
@@ -84,7 +82,11 @@ protected Chart createChart() {
         xAxis.setLabel("X Axis");
         yAxis.setLabel("Y Axis");
         ac.setTitle("HelloAreaChart");
+        ac.setAnimated(false);
+    }
 
+    @Override
+    protected Chart getChart() {
         return ac;
     }
 
@@ -102,8 +104,10 @@ private String getSeriesLineFromPlot() {
         return "";
     }
 
-    @Test @Ignore
+    @Test
+    @Disabled
     public void testDataItemRemove() {
+        createChart();
         startApp();
         ac.getData().addAll(series1);
         pulse();
@@ -116,6 +120,7 @@ public void testDataItemRemove() {
 
     @Test
     public void testAreaChartWithCategoryAxis() {
+        createChart();
         useCategoryAxis = true;
         startApp();
         useCategoryAxis = false;
@@ -140,13 +145,16 @@ void checkDataStyleClasses(XYChart.Data<?, ?> data,
 
     @Test
     public void testSeriesRemoveAnimatedStyleClasses() {
+        createChart();
         startApp();
         //ac.setCreateSymbols(false);
         int nodesPerSeries = 4; // 3 symbols + 1 path
         checkSeriesRemoveAnimatedStyleClasses(ac, nodesPerSeries, 400);
     }
 
-    @Test public void testCreateSymbols() {
+    @Test
+    public void testCreateSymbols() {
+         createChart();
          startApp();
          ac.getData().clear();
          ac.setCreateSymbols(false);
@@ -163,7 +171,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
          assertEquals(5, countSymbols(ac, "chart-area-symbol"));
      }
 
-    @Test public void testPathInsideXAndInsideYBounds() {
+    @Test
+    public void testPathInsideXAndInsideYBounds() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data<>(85d, 15d)); // upper bound is 90,30
         ac.getData().addAll(series1);
@@ -172,7 +182,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
         assertArrayEquals(convertSeriesDataToPoint2D(series1).toArray(), findDataPointsFromPathLine(ac).toArray());
     }
 
-    @Test public void testPathOutsideXLowerBoundsWithDuplicateXAndHigherY() {
+    @Test
+    public void testPathOutsideXLowerBoundsWithDuplicateXAndHigherY() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data<>(-10d, 20d)); // lower bound is 0
         series1.getData().add(new XYChart.Data<>(-10d, 50d));
@@ -192,7 +204,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
         assertArrayEquals(convertSeriesDataToPoint2D(expectedSeries).toArray(), findDataPointsFromPathLine(ac).toArray());
     }
 
-    @Test public void testPathOutsideXUpperBoundsWithDuplicateXAndHigherY() {
+    @Test
+    public void testPathOutsideXUpperBoundsWithDuplicateXAndHigherY() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data<>(100d, 20d)); // upper bound is 90
         series1.getData().add(new XYChart.Data<>(100d, 50d));
@@ -212,7 +226,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
         assertArrayEquals(convertSeriesDataToPoint2D(expectedSeries).toArray(), findDataPointsFromPathLine(ac).toArray());
     }
 
-    @Test public void testPathOutsideXLowerBoundsWithDuplicateXAndLowerY() {
+    @Test
+    public void testPathOutsideXLowerBoundsWithDuplicateXAndLowerY() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data<>(-10d, 20d)); // lower bound is 0
         series1.getData().add(new XYChart.Data<>(-10d, 15d));
@@ -232,7 +248,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
         assertArrayEquals(convertSeriesDataToPoint2D(expectedSeries).toArray(), findDataPointsFromPathLine(ac).toArray());
     }
 
-    @Test public void testPathOutsideXUpperBoundsWithDuplicateXAndLowerY() {
+    @Test
+    public void testPathOutsideXUpperBoundsWithDuplicateXAndLowerY() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data<>(100d, 20d)); // upper bound is 90
         series1.getData().add(new XYChart.Data<>(100d, 15d));
@@ -252,7 +270,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
         assertArrayEquals(convertSeriesDataToPoint2D(expectedSeries).toArray(), findDataPointsFromPathLine(ac).toArray());
     }
 
-    @Test public void testPathOutsideYLowerBoundsWithDuplicateYAndLowerX() {
+    @Test
+    public void testPathOutsideYLowerBoundsWithDuplicateYAndLowerX() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data<>(85d, -10d)); // y-axis lower bound is 0
         series1.getData().add(new XYChart.Data<>(70d, -10d));
@@ -274,7 +294,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
         assertArrayEquals(convertSeriesDataToPoint2D(expectedSeries).toArray(), findDataPointsFromPathLine(ac).toArray());
     }
 
-    @Test public void testPathOutsideYUpperBoundsWithDuplicateYAndLowerX() {
+    @Test
+    public void testPathOutsideYUpperBoundsWithDuplicateYAndLowerX() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data<>(85d, 40d));  // y-axis upper bound is 30
         series1.getData().add(new XYChart.Data<>(70d, 40d));
@@ -296,7 +318,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
         assertArrayEquals(convertSeriesDataToPoint2D(expectedSeries).toArray(), findDataPointsFromPathLine(ac).toArray());
     }
 
-    @Test public void testPathOutsideYLowerBoundsWithDuplicateYAndHigherX() {
+    @Test
+    public void testPathOutsideYLowerBoundsWithDuplicateYAndHigherX() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data<>(70d, -10d)); // lower bound is 30
         series1.getData().add(new XYChart.Data<>(85d, -10d));
@@ -317,7 +341,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
         assertArrayEquals(convertSeriesDataToPoint2D(expectedSeries).toArray(), findDataPointsFromPathLine(ac).toArray());
     }
 
-    @Test public void testPathOutsideYUpperBoundsWithDuplicateYAndHigherX() {
+    @Test
+    public void testPathOutsideYUpperBoundsWithDuplicateYAndHigherX() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data<>(70d, 32d)); // upper bound is 30
         series1.getData().add(new XYChart.Data<>(85d, 32d));
@@ -338,7 +364,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
         assertArrayEquals(convertSeriesDataToPoint2D(expectedSeries).toArray(), findDataPointsFromPathLine(ac).toArray());
     }
 
-    @Test public void testPathOutsideXAndYLowerBoundsWithDuplicateXAndHigherY() {
+    @Test
+    public void testPathOutsideXAndYLowerBoundsWithDuplicateXAndHigherY() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data<>(-10d, -40d)); // lower bound is 0,0
         series1.getData().add(new XYChart.Data<>(-10d, -30d));
@@ -358,7 +386,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
         assertArrayEquals(convertSeriesDataToPoint2D(expectedSeries).toArray(), findDataPointsFromPathLine(ac).toArray());
     }
 
-    @Test public void testPathOutsideXAndYUpperBoundsWithDuplicateXAndHigherY() {
+    @Test
+    public void testPathOutsideXAndYUpperBoundsWithDuplicateXAndHigherY() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data<>(95d, 35d)); // upper bound is 90,30
         series1.getData().add(new XYChart.Data<>(95d, 40d));
@@ -378,7 +408,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
         assertArrayEquals(convertSeriesDataToPoint2D(expectedSeries).toArray(), findDataPointsFromPathLine(ac).toArray());
     }
 
-    @Test public void testPathOutsideXAndYLowerBoundsWithDuplicateXAndLowerY() {
+    @Test
+    public void testPathOutsideXAndYLowerBoundsWithDuplicateXAndLowerY() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data<>(-10d, -30d)); // lower bound is 0,0
         series1.getData().add(new XYChart.Data<>(-10d, -40d));
@@ -398,7 +430,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
         assertArrayEquals(convertSeriesDataToPoint2D(expectedSeries).toArray(), findDataPointsFromPathLine(ac).toArray());
     }
 
-    @Test public void testPathOutsideXAndYUpperBoundsWithDuplicateXAndLowerY() {
+    @Test
+    public void testPathOutsideXAndYUpperBoundsWithDuplicateXAndLowerY() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data<>(95d, 40d)); // upper bound is 90,30
         series1.getData().add(new XYChart.Data<>(95d, 35d));
@@ -418,7 +452,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
         assertArrayEquals(convertSeriesDataToPoint2D(expectedSeries).toArray(), findDataPointsFromPathLine(ac).toArray());
     }
 
-    @Test public void testPathOutsideXAndYLowerBoundsWithDuplicateYAndHigherX() {
+    @Test
+    public void testPathOutsideXAndYLowerBoundsWithDuplicateYAndHigherX() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data<>(-20d, -30d)); // lower bound is 0,0
         series1.getData().add(new XYChart.Data<>(-10d, -30d));
@@ -438,7 +474,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
         assertArrayEquals(convertSeriesDataToPoint2D(expectedSeries).toArray(), findDataPointsFromPathLine(ac).toArray());
     }
 
-    @Test public void testPathOutsideXAndYUpperBoundsWithDuplicateYAndHigherX() {
+    @Test
+    public void testPathOutsideXAndYUpperBoundsWithDuplicateYAndHigherX() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data<>(95d, 32d)); // upper bound is 90,30
         series1.getData().add(new XYChart.Data<>(100d, 32d));
@@ -458,7 +496,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
         assertArrayEquals(convertSeriesDataToPoint2D(expectedSeries).toArray(), findDataPointsFromPathLine(ac).toArray());
     }
 
-    @Test public void testPathOutsideXAndYLowerBoundsWithDuplicateYAndLowerX() {
+    @Test
+    public void testPathOutsideXAndYLowerBoundsWithDuplicateYAndLowerX() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data<>(-10d, -30d)); // lower bound is 0,0
         series1.getData().add(new XYChart.Data<>(-20d, -30d));
@@ -478,7 +518,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
         assertArrayEquals(convertSeriesDataToPoint2D(expectedSeries).toArray(), findDataPointsFromPathLine(ac).toArray());
     }
 
-    @Test public void testPathOutsideXAndYUpperBoundsWithDuplicateYAndLowerX() {
+    @Test
+    public void testPathOutsideXAndYUpperBoundsWithDuplicateYAndLowerX() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data<>(100d, 40d)); // upper bound is 90,30
         series1.getData().add(new XYChart.Data<>(95d, 40d));
@@ -499,7 +541,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
     }
 
     //JDK-8283675
-    @Test public void testChartFillRemovedOnClearingSeries() {
+    @Test
+    public void testChartFillRemovedOnClearingSeries() {
+        createChart();
         startApp();
         ac.getData().addAll(series1);
         pulse();
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/chart/AxisHelper.java b/modules/javafx.controls/src/test/java/test/javafx/scene/chart/AxisHelper.java
index f74964b47e4..e9925e975d9 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/chart/AxisHelper.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/chart/AxisHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,15 +27,13 @@
 
 import java.util.List;
 import javafx.scene.chart.Axis;
-
-
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
 
 /**
  * Helper class for Axis. All functionality common to ValueAxis,NumberAxis,CategoryAxis goes here.
  */
 public class AxisHelper {
-    private Axis axis;//Empty string
+    private Axis axis;
 
     public AxisHelper() {
     }
@@ -68,10 +66,11 @@ protected void setRange(Object o, boolean bln) {}
                 public double toNumericValue(Object t) {return 0.0;}
                 @Override
                 public Object toRealValue(double d) {return 0.0;}
-
             };
     }
-    @Before public void setup() {
+
+    @BeforeEach
+    public void setup() {
         if (axis == null) {
             axis = getDummyAxis();
         }
@@ -91,6 +90,4 @@ void defaultValueForDisplay() {}
     void defaultValueOnAxis() {}
     void defaultNumericValue() {}
     void defaultRealValue() {}
-
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/chart/AxisTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/chart/AxisTest.java
index 5d0cd928a76..52f6b60ad6d 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/chart/AxisTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/chart/AxisTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,25 +25,27 @@
 
 package test.javafx.scene.chart;
 
-import javafx.css.CssMetaData;
-
-import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertPseudoClassDoesNotExist;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertPseudoClassExists;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleDoubleProperty;
 import javafx.beans.property.SimpleObjectProperty;
+import javafx.css.CssMetaData;
 import javafx.css.StyleableProperty;
 import javafx.geometry.Side;
 import javafx.scene.chart.Axis;
 import javafx.scene.paint.Color;
 import javafx.scene.text.Font;
-import static org.junit.Assert.*;
-
-
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * All public members of Axis are tested here .
@@ -56,7 +58,8 @@ public AxisTest() {
         helper = new AxisHelper();
     }
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         if (axis == null) {
             axis = helper.getDummyAxis();
         }
@@ -69,45 +72,54 @@ public AxisTest() {
      * Tests for default values                                         *
      ********************************************************************/
 
-    @Test public void defaultSideNull() {
+    @Test
+    public void defaultSideNull() {
         assertNull(axis.getSide());
     }
 
-    @Test public void defaultTickMarkVisibleIsTrue() {
+    @Test
+    public void defaultTickMarkVisibleIsTrue() {
         assertTrue(axis.isTickMarkVisible());
     }
 
-    @Test public void defaultTickLabelsVisibleIsTrue() {
+    @Test
+    public void defaultTickLabelsVisibleIsTrue() {
         assertTrue(axis.isTickLabelsVisible());
     }
 
-
-    @Test public void defaultTickLength() {
-        assertEquals(axis.getTickLength(), 8.0 , 0.0);
+    @Test
+    public void defaultTickLength() {
+        assertEquals(axis.getTickLength(), 8.0, 0.0);
     }
 
-    @Test public void defaultAutoRangingIsTrue() {
+    @Test
+    public void defaultAutoRangingIsTrue() {
         assertTrue(axis.isAutoRanging());
     }
 
-    @Test public void defaultTickLabelFont() {
+    @Test
+    public void defaultTickLabelFont() {
         assertEquals(axis.getTickLabelFont(), Font.font("System", 8));
     }
 
-    @Test public void defaultTickLabelFill() {
-        assertSame(axis.getTickLabelFill(), Color.BLACK );
+    @Test
+    public void defaultTickLabelFill() {
+        assertSame(axis.getTickLabelFill(), Color.BLACK);
     }
 
-    @Test public void defaultTickLabelGap() {
-        assertEquals(axis.getTickLabelGap(), 3.0 , 0.0);
+    @Test
+    public void defaultTickLabelGap() {
+        assertEquals(axis.getTickLabelGap(), 3.0, 0.0);
     }
 
-    @Test public void defaultAnimatedIsTrue() {
+    @Test
+    public void defaultAnimatedIsTrue() {
         assertTrue(axis.getAnimated());
     }
 
-    @Test public void defaultTickLabelRotation() {
-        assertEquals(axis.getTickLabelRotation(), 0.0 , 0.0);
+    @Test
+    public void defaultTickLabelRotation() {
+        assertEquals(axis.getTickLabelRotation(), 0.0, 0.0);
     }
 
 
@@ -115,165 +127,193 @@ public AxisTest() {
      * Tests for property binding                                        *
      ********************************************************************/
 
-    @Test public void checkSidePropertyBind() {
+    @Test
+    public void checkSidePropertyBind() {
         ObjectProperty objPr = new SimpleObjectProperty<>(Side.TOP);
         axis.sideProperty().bind(objPr);
-        assertSame("side cannot be bound", axis.sideProperty().getValue(), Side.TOP);
+        assertSame(axis.sideProperty().getValue(), Side.TOP, "side cannot be bound");
         objPr.setValue(Side.BOTTOM);
-        assertSame("side cannot be bound", axis.sideProperty().getValue(), Side.BOTTOM);
+        assertSame(axis.sideProperty().getValue(), Side.BOTTOM, "side cannot be bound");
     }
 
-    @Test public void checkTickMarkVisiblePropertyBind() {
+    @Test
+    public void checkTickMarkVisiblePropertyBind() {
         BooleanProperty objPr = new SimpleBooleanProperty(true);
         axis.tickMarkVisibleProperty().bind(objPr);
-        assertTrue("tickMarkVisibleProperty cannot be bound", axis.tickMarkVisibleProperty().getValue());
+        assertTrue(axis.tickMarkVisibleProperty().getValue(), "tickMarkVisibleProperty cannot be bound");
         objPr.setValue(false);
-        assertFalse("tickMarkVisibleProperty cannot be bound", axis.tickMarkVisibleProperty().getValue());
+        assertFalse(axis.tickMarkVisibleProperty().getValue(), "tickMarkVisibleProperty cannot be bound");
     }
 
-    @Test public void checkTickLabelsVisiblePropertyBind() {
+    @Test
+    public void checkTickLabelsVisiblePropertyBind() {
         BooleanProperty objPr = new SimpleBooleanProperty(true);
         axis.tickLabelsVisibleProperty().bind(objPr);
-        assertTrue("tickLabelsVisibleProperty cannot be bound", axis.tickLabelsVisibleProperty().getValue());
+        assertTrue(axis.tickLabelsVisibleProperty().getValue(), "tickLabelsVisibleProperty cannot be bound");
         objPr.setValue(false);
-        assertFalse("tickLabelsVisibleProperty cannot be bound", axis.tickLabelsVisibleProperty().getValue());
+        assertFalse(axis.tickLabelsVisibleProperty().getValue(), "tickLabelsVisibleProperty cannot be bound");
     }
 
-    @Test public void checkTickLengthPropertyBind() {
+    @Test
+    public void checkTickLengthPropertyBind() {
         DoubleProperty objPr = new SimpleDoubleProperty(56.0);
         axis.tickLengthProperty().bind(objPr);
-        assertEquals("tickLengthProperty cannot be bound", axis.tickLengthProperty().getValue(),56.0,0.0);
+        assertEquals(axis.tickLengthProperty().getValue(),56.0,0.0, "tickLengthProperty cannot be bound");
         objPr.setValue(23.0);
-        assertEquals("tickLengthProperty cannot be bound", axis.tickLengthProperty().getValue(),23.0,0.0);
+        assertEquals(axis.tickLengthProperty().getValue(),23.0,0.0, "tickLengthProperty cannot be bound");
     }
 
-    @Test public void checkAutoRangingPropertyBind() {
+    @Test
+    public void checkAutoRangingPropertyBind() {
         BooleanProperty objPr = new SimpleBooleanProperty(true);
         axis.autoRangingProperty().bind(objPr);
-        assertTrue("autoRangingProperty cannot be bound", axis.autoRangingProperty().getValue());
+        assertTrue(axis.autoRangingProperty().getValue(), "autoRangingProperty cannot be bound");
         objPr.setValue(false);
-        assertFalse("autoRangingProperty cannot be bound", axis.autoRangingProperty().getValue());
+        assertFalse(axis.autoRangingProperty().getValue(), "autoRangingProperty cannot be bound");
     }
 
-    @Test public void checkTickLabelFontPropertyBind() {
+    @Test
+    public void checkTickLabelFontPropertyBind() {
         ObjectProperty objPr = new SimpleObjectProperty<Font>(null);
         axis.tickLabelFontProperty().bind(objPr);
-        assertNull("tickLabelFontProperty cannot be bound", axis.tickLabelFontProperty().getValue());
+        assertNull(axis.tickLabelFontProperty().getValue(), "tickLabelFontProperty cannot be bound");
         objPr.setValue(Font.getDefault());
-        assertSame("tickLabelFontProperty cannot be bound", axis.tickLabelFontProperty().getValue(), Font.getDefault());
+        assertSame(axis.tickLabelFontProperty().getValue(), Font.getDefault(), "tickLabelFontProperty cannot be bound");
     }
 
-    @Test public void checkTickLabelFillPropertyBind() {
+    @Test
+    public void checkTickLabelFillPropertyBind() {
         ObjectProperty objPr = new SimpleObjectProperty<>(Color.WHEAT);
         axis.tickLabelFillProperty().bind(objPr);
-        assertSame("tickLabelFillProperty cannot be bound", axis.tickLabelFillProperty().getValue(), Color.WHEAT);
+        assertSame(axis.tickLabelFillProperty().getValue(), Color.WHEAT, "tickLabelFillProperty cannot be bound");
         objPr.setValue(Color.BLUE);
-        assertSame("tickLabelFillProperty cannot be bound", axis.tickLabelFillProperty().getValue(), Color.BLUE);
+        assertSame(axis.tickLabelFillProperty().getValue(), Color.BLUE, "tickLabelFillProperty cannot be bound");
     }
 
-    @Test public void checkTickLabelGapPropertyBind() {
+    @Test
+    public void checkTickLabelGapPropertyBind() {
         DoubleProperty objPr = new SimpleDoubleProperty(56.0);
         axis.tickLabelGapProperty().bind(objPr);
-        assertEquals("tickLabelGapProperty cannot be bound", axis.tickLabelGapProperty().getValue(),56.0,0.0);
+        assertEquals(axis.tickLabelGapProperty().getValue(),56.0,0.0, "tickLabelGapProperty cannot be bound");
         objPr.setValue(23.0);
-        assertEquals("tickLabelGapProperty cannot be bound", axis.tickLabelGapProperty().getValue(),23.0,0.0);
+        assertEquals(axis.tickLabelGapProperty().getValue(),23.0,0.0, "tickLabelGapProperty cannot be bound");
     }
 
-    @Test public void checkAnimatedPropertyBind() {
+    @Test
+    public void checkAnimatedPropertyBind() {
         BooleanProperty objPr = new SimpleBooleanProperty(true);
         axis.animatedProperty().bind(objPr);
-        assertTrue("animatedProperty cannot be bound", axis.animatedProperty().getValue());
+        assertTrue(axis.animatedProperty().getValue(), "animatedProperty cannot be bound");
         objPr.setValue(false);
-        assertFalse("animatedProperty cannot be bound", axis.animatedProperty().getValue());
+        assertFalse(axis.animatedProperty().getValue(), "animatedProperty cannot be bound");
     }
 
-    @Test public void checkTickLabelRotationPropertyBind() {
+    @Test
+    public void checkTickLabelRotationPropertyBind() {
         DoubleProperty objPr = new SimpleDoubleProperty(56.0);
         axis.tickLabelRotationProperty().bind(objPr);
-        assertEquals("tickLabelRotationProperty cannot be bound", axis.tickLabelRotationProperty().getValue(),56.0,0.0);
+        assertEquals(axis.tickLabelRotationProperty().getValue(),56.0,0.0, "tickLabelRotationProperty cannot be bound");
         objPr.setValue(23.0);
-        assertEquals("tickLabelRotationProperty cannot be bound", axis.tickLabelRotationProperty().getValue(),23.0,0.0);
+        assertEquals(axis.tickLabelRotationProperty().getValue(),23.0,0.0, "tickLabelRotationProperty cannot be bound");
     }
 
-
-
-    @Test public void sidePropertyHasBeanReference() {
+    @Test
+    public void sidePropertyHasBeanReference() {
         assertSame(axis, axis.sideProperty().getBean());
     }
 
-    @Test public void sidePropertyHasName() {
+    @Test
+    public void sidePropertyHasName() {
         assertEquals("side", axis.sideProperty().getName());
     }
 
-    @Test public void tickMarkVisiblePropertyHasBeanReference() {
+    @Test
+    public void tickMarkVisiblePropertyHasBeanReference() {
         assertSame(axis, axis.tickMarkVisibleProperty().getBean());
     }
 
-    @Test public void tickMarkVisiblePropertyHasName() {
+    @Test
+    public void tickMarkVisiblePropertyHasName() {
         assertEquals("tickMarkVisible", axis.tickMarkVisibleProperty().getName());
     }
 
-    @Test public void tickLabelsVisiblePropertyHasBeanReference() {
+    @Test
+    public void tickLabelsVisiblePropertyHasBeanReference() {
         assertSame(axis, axis.tickLabelsVisibleProperty().getBean());
     }
 
-    @Test public void tickLabelsVisiblePropertyHasName() {
+    @Test
+    public void tickLabelsVisiblePropertyHasName() {
         assertEquals("tickLabelsVisible", axis.tickLabelsVisibleProperty().getName());
     }
 
-    @Test public void tickLengthPropertyHasBeanReference() {
+    @Test
+    public void tickLengthPropertyHasBeanReference() {
         assertSame(axis, axis.tickLengthProperty().getBean());
     }
 
-    @Test public void tickLengthPropertyHasName() {
+    @Test
+    public void tickLengthPropertyHasName() {
         assertEquals("tickLength", axis.tickLengthProperty().getName());
     }
 
-    @Test public void autoRangingPropertyHasBeanReference() {
+    @Test
+    public void autoRangingPropertyHasBeanReference() {
         assertSame(axis, axis.autoRangingProperty().getBean());
     }
 
-    @Test public void autoRangingPropertyHasName() {
+    @Test
+    public void autoRangingPropertyHasName() {
         assertEquals("autoRanging", axis.autoRangingProperty().getName());
     }
 
-    @Test public void tickLabelFontPropertyHasBeanReference() {
+    @Test
+    public void tickLabelFontPropertyHasBeanReference() {
         assertSame(axis, axis.tickLabelFontProperty().getBean());
     }
 
-    @Test public void tickLabelFontPropertyHasName() {
+    @Test
+    public void tickLabelFontPropertyHasName() {
         assertEquals("tickLabelFont", axis.tickLabelFontProperty().getName());
     }
 
-    @Test public void tickLabelFillPropertyHasBeanReference() {
+    @Test
+    public void tickLabelFillPropertyHasBeanReference() {
         assertSame(axis, axis.tickLabelFillProperty().getBean());
     }
 
-    @Test public void tickLabelFillPropertyHasName() {
+    @Test
+    public void tickLabelFillPropertyHasName() {
         assertEquals("tickLabelFill", axis.tickLabelFillProperty().getName());
     }
 
-    @Test public void tickLabelGapPropertyHasBeanReference() {
+    @Test
+    public void tickLabelGapPropertyHasBeanReference() {
         assertSame(axis, axis.tickLabelGapProperty().getBean());
     }
 
-    @Test public void tickLabelGapPropertyHasName() {
+    @Test
+    public void tickLabelGapPropertyHasName() {
         assertEquals("tickLabelGap", axis.tickLabelGapProperty().getName());
     }
 
-    @Test public void animatedPropertyHasBeanReference() {
+    @Test
+    public void animatedPropertyHasBeanReference() {
         assertSame(axis, axis.animatedProperty().getBean());
     }
 
-    @Test public void animatedPropertyHasName() {
+    @Test
+    public void animatedPropertyHasName() {
         assertEquals("animated", axis.animatedProperty().getName());
     }
 
-    @Test public void tickLabelRotationPropertyHasBeanReference() {
+    @Test
+    public void tickLabelRotationPropertyHasBeanReference() {
         assertSame(axis, axis.tickLabelRotationProperty().getBean());
     }
 
-    @Test public void tickLabelRotationPropertyHasName() {
+    @Test
+    public void tickLabelRotationPropertyHasName() {
         assertEquals("tickLabelRotation", axis.tickLabelRotationProperty().getName());
     }
 
@@ -282,7 +322,8 @@ public AxisTest() {
     /*********************************************************************
      * Check for Pseudo classes                                          *
      ********************************************************************/
-    @Test public void settingSideTopSetsTopAndClearsOther3SidesPseudoClass() {
+    @Test
+    public void settingSideTopSetsTopAndClearsOther3SidesPseudoClass() {
         axis.setSide(Side.TOP);
         assertPseudoClassExists(axis, "top");
         assertPseudoClassDoesNotExist(axis, "left");
@@ -290,7 +331,8 @@ public AxisTest() {
         assertPseudoClassDoesNotExist(axis, "bottom");
     }
 
-    @Test public void settingSideLeftSetsLeftAndClearsOther3SidesPseudoClass() {
+    @Test
+    public void settingSideLeftSetsLeftAndClearsOther3SidesPseudoClass() {
         axis.setSide(Side.LEFT);
         assertPseudoClassExists(axis, "left");
         assertPseudoClassDoesNotExist(axis, "top");
@@ -298,7 +340,8 @@ public AxisTest() {
         assertPseudoClassDoesNotExist(axis, "bottom");
     }
 
-    @Test public void settingSideRightSetsRightAndClearsOther3SidesPseudoClass() {
+    @Test
+    public void settingSideRightSetsRightAndClearsOther3SidesPseudoClass() {
         axis.setSide(Side.RIGHT);
         assertPseudoClassExists(axis, "right");
         assertPseudoClassDoesNotExist(axis, "left");
@@ -306,7 +349,8 @@ public AxisTest() {
         assertPseudoClassDoesNotExist(axis, "bottom");
     }
 
-    @Test public void settingSideBottomSetsBottomAndClearsOther3SidesPseudoClass() {
+    @Test
+    public void settingSideBottomSetsBottomAndClearsOther3SidesPseudoClass() {
         axis.setSide(Side.BOTTOM);
         assertPseudoClassExists(axis, "bottom");
         assertPseudoClassDoesNotExist(axis, "left");
@@ -319,7 +363,8 @@ public AxisTest() {
     /*********************************************************************
      * CSS related Tests                                                 *
      ********************************************************************/
-    @Test public void whenSideIsBound_CssMetaData_isSettable_ReturnsFalse() {
+    @Test
+    public void whenSideIsBound_CssMetaData_isSettable_ReturnsFalse() {
         CssMetaData styleable = ((StyleableProperty)axis.sideProperty()).getCssMetaData();
         assertTrue(styleable.isSettable(axis));
         ObjectProperty<Side> other = new SimpleObjectProperty<>(Side.LEFT);
@@ -327,17 +372,20 @@ public AxisTest() {
         assertFalse(styleable.isSettable(axis));
     }
 
-    @Test public void whenSideIsSpecifiedViaCSSAndIsNotBound_CssMetaData_isSettable_ReturnsTrue() {
+    @Test
+    public void whenSideIsSpecifiedViaCSSAndIsNotBound_CssMetaData_isSettable_ReturnsTrue() {
         CssMetaData styleable = ((StyleableProperty)axis.sideProperty()).getCssMetaData();
         assertTrue(styleable.isSettable(axis));
     }
 
-    @Test public void canSpecifySideViaCSS() {
+    @Test
+    public void canSpecifySideViaCSS() {
         ((StyleableProperty)axis.sideProperty()).applyStyle(null, Side.BOTTOM);
         assertSame(Side.BOTTOM, axis.getSide());
     }
 
-    @Test public void whenTickMarkVisibleIsBound_CssMetaData_isSettable_ReturnsFalse() {
+    @Test
+    public void whenTickMarkVisibleIsBound_CssMetaData_isSettable_ReturnsFalse() {
         CssMetaData styleable = ((StyleableProperty)axis.tickMarkVisibleProperty()).getCssMetaData();
         assertTrue(styleable.isSettable(axis));
         BooleanProperty other = new SimpleBooleanProperty();
@@ -345,17 +393,20 @@ public AxisTest() {
         assertFalse(styleable.isSettable(axis));
     }
 
-    @Test public void whenTickMarkVisibleIsSpecifiedViaCSSAndIsNotBound_CssMetaData_isSettable_ReturnsTrue() {
+    @Test
+    public void whenTickMarkVisibleIsSpecifiedViaCSSAndIsNotBound_CssMetaData_isSettable_ReturnsTrue() {
         CssMetaData styleable = ((StyleableProperty)axis.tickMarkVisibleProperty()).getCssMetaData();
         assertTrue(styleable.isSettable(axis));
     }
 
-    @Test public void canSpecifyTickMarkVisibleViaCSS() {
+    @Test
+    public void canSpecifyTickMarkVisibleViaCSS() {
         ((StyleableProperty)axis.tickMarkVisibleProperty()).applyStyle(null, Boolean.TRUE);
         assertSame(true, axis.isTickMarkVisible());
     }
 
-    @Test public void whenTickLabelsVisibleIsBound_CssMetaData_isSettable_ReturnsFalse() {
+    @Test
+    public void whenTickLabelsVisibleIsBound_CssMetaData_isSettable_ReturnsFalse() {
         CssMetaData styleable = ((StyleableProperty)axis.tickLabelsVisibleProperty()).getCssMetaData();
         assertTrue(styleable.isSettable(axis));
         BooleanProperty other = new SimpleBooleanProperty();
@@ -363,17 +414,20 @@ public AxisTest() {
         assertFalse(styleable.isSettable(axis));
     }
 
-    @Test public void whenTickLabelsVisibleIsSpecifiedViaCSSAndIsNotBound_CssMetaData_isSettable_ReturnsTrue() {
+    @Test
+    public void whenTickLabelsVisibleIsSpecifiedViaCSSAndIsNotBound_CssMetaData_isSettable_ReturnsTrue() {
         CssMetaData styleable = ((StyleableProperty)axis.tickLabelsVisibleProperty()).getCssMetaData();
         assertTrue(styleable.isSettable(axis));
     }
 
-    @Test public void canSpecifyTickLabelsVisibleViaCSS() {
+    @Test
+    public void canSpecifyTickLabelsVisibleViaCSS() {
         ((StyleableProperty)axis.tickLabelsVisibleProperty()).applyStyle(null, Boolean.TRUE);
         assertSame(true, axis.isTickMarkVisible());
     }
 
-    @Test public void whenTickLengthIsBound_CssMetaData_isSettable_ReturnsFalse() {
+    @Test
+    public void whenTickLengthIsBound_CssMetaData_isSettable_ReturnsFalse() {
         CssMetaData styleable = ((StyleableProperty)axis.tickLengthProperty()).getCssMetaData();
         assertTrue(styleable.isSettable(axis));
         DoubleProperty other = new SimpleDoubleProperty();
@@ -381,17 +435,20 @@ public AxisTest() {
         assertFalse(styleable.isSettable(axis));
     }
 
-    @Test public void whenTickLengthIsSpecifiedViaCSSAndIsNotBound_CssMetaData_isSettable_ReturnsTrue() {
+    @Test
+    public void whenTickLengthIsSpecifiedViaCSSAndIsNotBound_CssMetaData_isSettable_ReturnsTrue() {
         CssMetaData styleable = ((StyleableProperty)axis.tickLengthProperty()).getCssMetaData();
         assertTrue(styleable.isSettable(axis));
     }
 
-    @Test public void canSpecifyTickLengthViaCSS() {
+    @Test
+    public void canSpecifyTickLengthViaCSS() {
         ((StyleableProperty)axis.tickLengthProperty()).applyStyle(null, 10.34);
         assertEquals(10.34, axis.tickLengthProperty().get(), 0.000001);
     }
 
-    @Test public void whenTickLabelFontIsBound_CssMetaData_isSettable_ReturnsFalse() {
+    @Test
+    public void whenTickLabelFontIsBound_CssMetaData_isSettable_ReturnsFalse() {
         CssMetaData styleable = ((StyleableProperty)axis.tickLabelFontProperty()).getCssMetaData();
         assertTrue(styleable.isSettable(axis));
         ObjectProperty<Font> other = new SimpleObjectProperty<>(Font.getDefault());
@@ -399,17 +456,20 @@ public AxisTest() {
         assertFalse(styleable.isSettable(axis));
     }
 
-    @Test public void whenTickLabelFontIsSpecifiedViaCSSAndIsNotBound_CssMetaData_isSettable_ReturnsTrue() {
+    @Test
+    public void whenTickLabelFontIsSpecifiedViaCSSAndIsNotBound_CssMetaData_isSettable_ReturnsTrue() {
         CssMetaData styleable = ((StyleableProperty)axis.tickLabelFontProperty()).getCssMetaData();
         assertTrue(styleable.isSettable(axis));
     }
 
-    @Test public void canSpecifyTickLabelFontViaCSS() {
+    @Test
+    public void canSpecifyTickLabelFontViaCSS() {
         ((StyleableProperty)axis.tickLabelFontProperty()).applyStyle(null, Font.getDefault());
         assertSame(Font.getDefault(), axis.getTickLabelFont());
     }
 
-    @Test public void whenTickLabelFillIsBound_CssMetaData_isSettable_ReturnsFalse() {
+    @Test
+    public void whenTickLabelFillIsBound_CssMetaData_isSettable_ReturnsFalse() {
         CssMetaData styleable = ((StyleableProperty)axis.tickLabelFillProperty()).getCssMetaData();
         assertTrue(styleable.isSettable(axis));
         ObjectProperty<Color> other = new SimpleObjectProperty<>(Color.BROWN);
@@ -417,17 +477,20 @@ public AxisTest() {
         assertFalse(styleable.isSettable(axis));
     }
 
-    @Test public void whenTickLabelFillIsSpecifiedViaCSSAndIsNotBound_CssMetaData_isSettable_ReturnsTrue() {
+    @Test
+    public void whenTickLabelFillIsSpecifiedViaCSSAndIsNotBound_CssMetaData_isSettable_ReturnsTrue() {
         CssMetaData styleable = ((StyleableProperty)axis.tickLabelFillProperty()).getCssMetaData();
         assertTrue(styleable.isSettable(axis));
     }
 
-    @Test public void canSpecifyTickLabelFillViaCSS() {
+    @Test
+    public void canSpecifyTickLabelFillViaCSS() {
         ((StyleableProperty)axis.tickLabelFillProperty()).applyStyle(null, Color.BROWN);
         assertSame(Color.BROWN, axis.getTickLabelFill());
     }
 
-    @Test public void whenTickLabelGapIsBound_CssMetaData_isSettable_ReturnsFalse() {
+    @Test
+    public void whenTickLabelGapIsBound_CssMetaData_isSettable_ReturnsFalse() {
         CssMetaData styleable = ((StyleableProperty)axis.tickLabelGapProperty()).getCssMetaData();
         assertTrue(styleable.isSettable(axis));
         DoubleProperty other = new SimpleDoubleProperty();
@@ -435,12 +498,14 @@ public AxisTest() {
         assertFalse(styleable.isSettable(axis));
     }
 
-    @Test public void whenTickLabelGapIsSpecifiedViaCSSAndIsNotBound_CssMetaData_isSettable_ReturnsTrue() {
+    @Test
+    public void whenTickLabelGapIsSpecifiedViaCSSAndIsNotBound_CssMetaData_isSettable_ReturnsTrue() {
         CssMetaData styleable = ((StyleableProperty)axis.tickLabelGapProperty()).getCssMetaData();
         assertTrue(styleable.isSettable(axis));
     }
 
-    @Test public void canSpecifyTickLabelGapViaCSS() {
+    @Test
+    public void canSpecifyTickLabelGapViaCSS() {
         ((StyleableProperty)axis.tickLabelGapProperty()).applyStyle(null, 10.34);
         assertEquals(10.34, axis.getTickLabelGap(), 0.0);
     }
@@ -450,17 +515,20 @@ public AxisTest() {
     /*********************************************************************
      * Miscellaneous Tests                                         *
      ********************************************************************/
-    @Test public void setSideAndSeeValueIsReflectedInModel() {
+    @Test
+    public void setSideAndSeeValueIsReflectedInModel() {
         axis.setSide(Side.BOTTOM);
         assertSame(axis.sideProperty().getValue(), Side.BOTTOM);
     }
 
-    @Test public void setHbarPolicyAndSeeValue() {
+    @Test
+    public void setHbarPolicyAndSeeValue() {
         axis.setSide(Side.TOP);
         assertSame(axis.getSide(), Side.TOP);
     }
 
-    @Test public void setTickMarkVisibleAndSeeValueIsReflectedInModel() {
+    @Test
+    public void setTickMarkVisibleAndSeeValueIsReflectedInModel() {
         axis.setTickMarkVisible(false);
         assertFalse(axis.tickMarkVisibleProperty().getValue());
     }
@@ -470,85 +538,99 @@ public AxisTest() {
         assertTrue(axis.isTickMarkVisible());
     }
 
-    @Test public void setTickLabelsVisibleAndSeeValueIsReflectedInModel() {
+    @Test
+    public void setTickLabelsVisibleAndSeeValueIsReflectedInModel() {
         axis.setTickLabelsVisible(false);
         assertFalse(axis.tickLabelsVisibleProperty().getValue());
     }
 
-    @Test public void setTickLabelsVisibleAndSeeValue() {
+    @Test
+    public void setTickLabelsVisibleAndSeeValue() {
         axis.setTickLabelsVisible(true);
         assertTrue(axis.isTickLabelsVisible());
     }
 
-    @Test public void setTickLengthAndSeeValueIsReflectedInModel() {
+    @Test
+    public void setTickLengthAndSeeValueIsReflectedInModel() {
         axis.setTickLength(30.0);
         assertEquals(axis.tickLengthProperty().getValue(), 30.0, 0.0);
     }
 
-    @Test public void setTickLengthAndSeeValue() {
+    @Test
+    public void setTickLengthAndSeeValue() {
         axis.setTickLength(30.0);
         assertEquals(axis.getTickLength(), 30.0, 0.0);
     }
 
-    @Test public void setAutoRangingAndSeeValueIsReflectedInModel() {
+    @Test
+    public void setAutoRangingAndSeeValueIsReflectedInModel() {
         axis.setAutoRanging(false);
         assertFalse(axis.autoRangingProperty().getValue());
     }
 
-    @Test public void setAutoRangingAndSeeValue() {
+    @Test
+    public void setAutoRangingAndSeeValue() {
         axis.setAutoRanging(true);
         assertTrue(axis.isAutoRanging());
     }
 
-    @Test public void setTickLabelFontAndSeeValueIsReflectedInModel() {
+    @Test
+    public void setTickLabelFontAndSeeValueIsReflectedInModel() {
         axis.setTickLabelFont(Font.getDefault());
         assertSame(axis.tickLabelFontProperty().getValue(), Font.getDefault());
     }
 
-    @Test public void setTickLabelFontAndSeeValue() {
+    @Test
+    public void setTickLabelFontAndSeeValue() {
         axis.setTickLabelFont(Font.getDefault());
         assertSame(axis.getTickLabelFont(), Font.getDefault());
     }
 
-    @Test public void setTickLabelFillAndSeeValueIsReflectedInModel() {
+    @Test
+    public void setTickLabelFillAndSeeValueIsReflectedInModel() {
         axis.setTickLabelFill(Color.AQUA);
         assertSame(axis.tickLabelFillProperty().getValue(), Color.AQUA);
     }
 
-    @Test public void setTickLabelFillAndSeeValue() {
+    @Test
+    public void setTickLabelFillAndSeeValue() {
         axis.setTickLabelFill(Color.AQUA);
         assertSame(axis.getTickLabelFill(), Color.AQUA);
     }
 
-    @Test public void setTickLabelGapAndSeeValueIsReflectedInModel() {
+    @Test
+    public void setTickLabelGapAndSeeValueIsReflectedInModel() {
         axis.setTickLabelGap(30.0);
         assertEquals(axis.tickLabelGapProperty().getValue(), 30.0, 0.0);
     }
 
-    @Test public void setTickLabelGapAndSeeValue() {
+    @Test
+    public void setTickLabelGapAndSeeValue() {
         axis.setTickLabelGap(30.0);
         assertEquals(axis.getTickLabelGap(), 30.0, 0.0);
     }
 
-    @Test public void setAnimatedAndSeeValueIsReflectedInModel() {
+    @Test
+    public void setAnimatedAndSeeValueIsReflectedInModel() {
         axis.setAnimated(false);
         assertFalse(axis.animatedProperty().getValue());
     }
 
-    @Test public void setAnimatedAndSeeValue() {
+    @Test
+    public void setAnimatedAndSeeValue() {
         axis.setAnimated(true);
         assertTrue(axis.getAnimated());
     }
 
-    @Test public void setTickLabelRotationAndSeeValueIsReflectedInModel() {
+    @Test
+    public void setTickLabelRotationAndSeeValueIsReflectedInModel() {
         axis.setTickLabelRotation(30.0);
         assertEquals(axis.tickLabelRotationProperty().getValue(), 30.0, 0.0);
     }
 
-    @Test public void setTickLabelRotationAndSeeValue() {
+    @Test
+    public void setTickLabelRotationAndSeeValue() {
         axis.setTickLabelRotation(30.0);
         assertEquals(axis.getTickLabelRotation(), 30.0, 0.0);
     }
-
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/chart/BarChartTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/chart/BarChartTest.java
index 2c45cacd906..9bc4b3f880b 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/chart/BarChartTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/chart/BarChartTest.java
@@ -25,17 +25,13 @@
 
 package test.javafx.scene.chart;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.fail;
 import java.util.Arrays;
 import java.util.List;
-
 import javafx.collections.FXCollections;
-import javafx.scene.shape.MoveTo;
-import javafx.scene.shape.Path;
-import org.junit.Assert;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import javafx.collections.*;
-
+import javafx.collections.ObservableList;
 import javafx.scene.Node;
 import javafx.scene.chart.BarChart;
 import javafx.scene.chart.CategoryAxis;
@@ -45,7 +41,10 @@
 import javafx.scene.chart.XYChart.Series;
 import javafx.scene.chart.XYChartShim;
 import javafx.scene.layout.StackPane;
-import org.junit.Ignore;
+import javafx.scene.shape.MoveTo;
+import javafx.scene.shape.Path;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class BarChartTest extends XYChartTestBase {
 
@@ -55,10 +54,11 @@ public class BarChartTest extends XYChartTestBase {
     static double[] pillsSold = { 1154, 1927, 2774 };
     final CategoryAxis xAxis = new CategoryAxis();
     final NumberAxis yAxis = new NumberAxis();
-    final BarChart<String,Number> bc = new BarChart<>(xAxis,yAxis);
+    BarChart<String,Number> bc;
 
     @Override
-    protected Chart createChart() {
+    protected void createChart() {
+        bc = new BarChart<>(xAxis,yAxis);
         xAxis.setLabel("X Axis");
         xAxis.setCategories(FXCollections.<String>observableArrayList(Arrays.asList(years)));
         yAxis.setLabel("Y Axis");
@@ -76,12 +76,18 @@ protected Chart createChart() {
         series2.getData().add(new XYChart.Data<String,Number>(years[2], 2450));
         bc.getData().add(series1);
         bc.getData().add(series2);
+        bc.setAnimated(false);
+    }
+
+    @Override
+    protected Chart getChart() {
         return bc;
     }
 
-    @Ignore("JDK-8162547")
+    @Disabled("JDK-8162547")
     @Test
     public void testAddingCustomStyleClassToBarChartBarNodes() {
+        createChart();
         startApp();
         XYChart.Series<String, Number> series = new XYChart.Series();
         XYChart.Data<String, Number> item = new XYChart.Data("A", 20);
@@ -99,6 +105,7 @@ public void testAddingCustomStyleClassToBarChartBarNodes() {
 
     @Test
     public void testCategoryAxisCategoriesOnAddDataAtIndex() {
+        createChart();
         startApp();
         bc.getData().clear();
         xAxis.getCategories().clear();
@@ -120,6 +127,7 @@ public void testCategoryAxisCategoriesOnAddDataAtIndex() {
 
     @Test
     public void testRemoveAndAddSameSeriesBeforeAnimationCompletes() {
+        createChart();
         startApp();
         assertEquals(2, bc.getData().size());
         // remove and add the same series.
@@ -130,6 +138,7 @@ public void testRemoveAndAddSameSeriesBeforeAnimationCompletes() {
 
     @Test
     public void testRemoveAndAddSameDataBeforeAnimationCompletes() {
+        createChart();
         startApp();
         Series s = bc.getData().get(0);
         assertEquals(3, XYChartShim.Series_getDataSize(s));
@@ -139,6 +148,7 @@ public void testRemoveAndAddSameDataBeforeAnimationCompletes() {
 
     @Test
     public void testRemoveNotAnimated() {
+        createChart();
         startApp();
         bc.setAnimated(false);
         Series s = bc.getData().get(0);
@@ -175,6 +185,7 @@ void checkDataStyleClasses(XYChart.Data<?, ?> data,
 
     @Test
     public void testSeriesRemoveAnimatedStyleClasses() {
+        createChart();
         startApp();
         bc.getData().clear();
         xAxis.getCategories().clear();
@@ -186,6 +197,7 @@ public void testSeriesRemoveAnimatedStyleClasses() {
 
     @Test
     public void testAddingNonEmptySeries() {
+        createChart();
         startApp();
         ObservableList<XYChart.Data<String, Number>> list = FXCollections.observableArrayList();
         list.add(new XYChart.Data<>("1", 1));
@@ -199,6 +211,7 @@ public void testAddingNonEmptySeries() {
 
     @Test
     public void testAddingDuplicateCategory() {
+        createChart();
         startApp();
         ObservableList<XYChart.Data<String, Number>> list = FXCollections.observableArrayList();
         list.add(new XYChart.Data<>("1", 1));
@@ -212,6 +225,7 @@ public void testAddingDuplicateCategory() {
 
     @Test
     public void testAddingDataAtIndex() {
+        createChart();
         startApp();
         ObservableList<XYChart.Data<String, Number>> list = FXCollections.observableArrayList();
         list.add(new XYChart.Data<>("1", 1));
@@ -235,6 +249,7 @@ public void testAddingDataAtIndex() {
 
     @Test
     public void testAddingMultipleSeriesWithDuplicateCategories() {
+        createChart();
         startApp();
         var series1 = new Series<String, Number>();
         var series2 = new Series<String, Number>();
@@ -277,6 +292,7 @@ public void testAddingMultipleSeriesWithDuplicateCategories() {
 
     @Test
     public void testNegativeStyleIsAddedToNewData() {
+        createChart();
         startApp();
         Series<String, Number> series = bc.getData().getFirst();
         series.getData().addFirst(new XYChart.Data<>("1", -1));
@@ -287,6 +303,7 @@ public void testNegativeStyleIsAddedToNewData() {
 
     @Test
     public void testNegativeStyleIsAddedToDataOfNewSeries() {
+        createChart();
         startApp();
         Series<String, Number> series = new Series<>();
         series.getData().addFirst(new XYChart.Data<>("1", -1));
@@ -298,6 +315,7 @@ public void testNegativeStyleIsAddedToDataOfNewSeries() {
 
     @Test
     public void testNegativeStyleIsRemovedWhenChangingData() {
+        createChart();
         startApp();
         Series<String, Number> series = bc.getData().getFirst();
 
@@ -306,12 +324,13 @@ public void testNegativeStyleIsRemovedWhenChangingData() {
         checkStyleClass(bar, "negative");
 
         series.getData().getFirst().setYValue(1);
-        Assert.assertFalse(bar.getStyleClass().contains("negative"));
+        assertFalse(bar.getStyleClass().contains("negative"));
     }
 
     @Test
     public void testAddingDataToEmptySeries() {
-        Thread.currentThread().setUncaughtExceptionHandler((t, e) -> Assert.fail("Exception: " + e));
+        createChart();
+        Thread.currentThread().setUncaughtExceptionHandler((t, e) -> fail("Exception: " + e));
         startApp();
         BarChart<String, Number> chart = new BarChart<>(new CategoryAxis(), new NumberAxis());
         XYChart.Series<String, Number> series = new XYChart.Series<>();
@@ -327,7 +346,8 @@ public void testAddingDataToEmptySeries() {
 
     @Test
     public void testAddingDataToNonEmptySeries() {
-        Thread.currentThread().setUncaughtExceptionHandler((t, e) -> Assert.fail("Exception: " + e));
+        createChart();
+        Thread.currentThread().setUncaughtExceptionHandler((t, e) -> fail("Exception: " + e));
         startApp();
         BarChart<String, Number> chart = new BarChart<>(new CategoryAxis(), new NumberAxis());
         XYChart.Series<String, Number> series = new XYChart.Series<>();
@@ -342,7 +362,8 @@ public void testAddingDataToNonEmptySeries() {
 
     @Test
     public void testAddingDataToSeriesContainingDuplicateCategories() {
-        Thread.currentThread().setUncaughtExceptionHandler((t, e) -> Assert.fail("Exception: " + e));
+        createChart();
+        Thread.currentThread().setUncaughtExceptionHandler((t, e) -> fail("Exception: " + e));
         startApp();
         BarChart<String, Number> chart = new BarChart<>(new CategoryAxis(), new NumberAxis());
         XYChart.Series<String, Number> series = new XYChart.Series<>();
@@ -360,6 +381,7 @@ public void testAddingDataToSeriesContainingDuplicateCategories() {
 
     @Test
     public void testTickMarksMatchBarPositionsAfterAnimation() {
+        createChart();
         startApp();
         CategoryAxis xAxis = new CategoryAxis();
         NumberAxis yAxis = new NumberAxis();
@@ -400,6 +422,7 @@ public void testTickMarksMatchBarPositionsAfterAnimation() {
 
     @Test
     public void testBarPositionsWithMultipleIncompleteSeries() {
+        createChart();
         startApp();
         CategoryAxis xAxis = new CategoryAxis();
         NumberAxis yAxis = new NumberAxis();
@@ -446,5 +469,4 @@ public void testBarPositionsWithMultipleIncompleteSeries() {
         assertEquals(3, normalized2.get(0), delta);
         assertEquals(5, normalized2.get(1), delta);
     }
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/chart/CategoryAxisTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/chart/CategoryAxisTest.java
index b75a85f8b47..5b7056a587a 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/chart/CategoryAxisTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/chart/CategoryAxisTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,11 @@
 
 package test.javafx.scene.chart;
 
-import javafx.css.CssMetaData;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.ReadOnlyDoubleProperty;
@@ -33,28 +37,26 @@
 import javafx.beans.property.SimpleDoubleProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
+import javafx.css.CssMetaData;
 import javafx.css.StyleableProperty;
-import static org.junit.Assert.*;
-
-
-import org.junit.Before;
-import org.junit.Test;
-
 import javafx.scene.chart.CategoryAxis;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * All public members of CatgoryAxis are tested here .
  * @author srikalyc
  */
 public class CategoryAxisTest {
-    private CategoryAxis axis;//Empty string
+    private CategoryAxis axis;
     private AxisHelper helper;
 
     public CategoryAxisTest() {
         helper = new AxisHelper();
     }
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         if (axis == null) {
             axis = new CategoryAxis();
         }
@@ -95,29 +97,27 @@ public CategoryAxisTest() {
     @Test public void checkStartMarginPropertyBind() {
         DoubleProperty objPr = new SimpleDoubleProperty(56.0);
         axis.startMarginProperty().bind(objPr);
-        assertEquals("startMarginProperty cannot be bound", axis.startMarginProperty().getValue(),56.0,0.0);
+        assertEquals(axis.startMarginProperty().getValue(),56.0,0.0, "startMarginProperty cannot be bound");
         objPr.setValue(23.0);
-        assertEquals("startMarginProperty cannot be bound", axis.startMarginProperty().getValue(),23.0,0.0);
+        assertEquals(axis.startMarginProperty().getValue(),23.0,0.0, "startMarginProperty cannot be bound");
     }
 
     @Test public void checkEndMarginPropertyBind() {
         DoubleProperty objPr = new SimpleDoubleProperty(56.0);
         axis.endMarginProperty().bind(objPr);
-        assertEquals("endMarginProperty cannot be bound", axis.endMarginProperty().getValue(),56.0,0.0);
+        assertEquals(axis.endMarginProperty().getValue(),56.0,0.0, "endMarginProperty cannot be bound");
         objPr.setValue(23.0);
-        assertEquals("endMarginProperty cannot be bound", axis.endMarginProperty().getValue(),23.0,0.0);
+        assertEquals(axis.endMarginProperty().getValue(),23.0,0.0, "endMarginProperty cannot be bound");
     }
 
-
     @Test public void checkGapStartAndEndPropertyBind() {
         BooleanProperty objPr = new SimpleBooleanProperty(true);
         axis.gapStartAndEndProperty().bind(objPr);
-        assertTrue("gapStartAndEndProperty cannot be bound", axis.gapStartAndEndProperty().getValue());
+        assertTrue(axis.gapStartAndEndProperty().getValue(), "gapStartAndEndProperty cannot be bound");
         objPr.setValue(false);
-        assertFalse("gapStartAndEndProperty cannot be bound", axis.gapStartAndEndProperty().getValue());
+        assertFalse(axis.gapStartAndEndProperty().getValue(), "gapStartAndEndProperty cannot be bound");
     }
 
-
     @SuppressWarnings("cast")
     @Test public void checkCategorySpacingReadOnlyCannotBind() {
         assertTrue(axis.categorySpacingProperty() instanceof ReadOnlyDoubleProperty);
@@ -268,5 +268,4 @@ public void testDisplayPositionOfInvalidValue() {
         axis.setCategories(FXCollections.observableArrayList("A", "B", "C", "D"));
         assertTrue(Double.isNaN(axis.getDisplayPosition("E")));
     }
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/chart/ChartTestBase.java b/modules/javafx.controls/src/test/java/test/javafx/scene/chart/ChartTestBase.java
index 46ddbc19c65..60cd01c4944 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/chart/ChartTestBase.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/chart/ChartTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,33 +25,33 @@
 
 package test.javafx.scene.chart;
 
-import org.junit.Before;
-
-import test.com.sun.javafx.pgstub.StubToolkit;
-import com.sun.javafx.tk.Toolkit;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.Arrays;
 import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.chart.Chart;
-import javafx.stage.Stage;
 import javafx.scene.layout.Region;
-import javafx.scene.shape.*;
-import static org.junit.Assert.assertTrue;
+import javafx.scene.shape.LineTo;
+import javafx.scene.shape.Path;
+import javafx.scene.shape.PathElement;
+import javafx.stage.Stage;
+import com.sun.javafx.tk.Toolkit;
+import test.com.sun.javafx.pgstub.StubToolkit;
 
 public abstract class ChartTestBase {
+
+    /** creates the chart instance, not animated, (as a part of each test setup) */
+    protected abstract void createChart();
+
+    /** returns the chart instance created by initChart() */
+    protected abstract Chart getChart();
+
     private Scene scene;
     private Stage stage;
     StubToolkit toolkit = (StubToolkit) Toolkit.getToolkit();
-    private Chart chart;
-
-    @Before
-    public void setUp() {
-        chart = createChart();
-        chart.setAnimated(false);
-    }
 
     protected void startApp() {
-        scene = new Scene(chart,800,600);
+        scene = new Scene(getChart(), 800, 600);
         stage = new Stage();
         stage.setScene(scene);
         stage.show();
@@ -79,8 +79,6 @@ protected void setTestStage(Stage stage) {
         this.stage = stage;
     }
 
-    protected abstract Chart createChart();
-
     String computeSVGPath(Path line) {
         StringBuilder str = new StringBuilder();
         for (PathElement pe : line.getElements()) {
@@ -110,8 +108,6 @@ String computeBoundsString(Region r1, Region r2, Region r3) {
     }
 
     void checkStyleClass(Node item, String... styleClass) {
-        assertTrue("\"" + item.getStyleClass() + "\" doesn't contain all of the " +
-                Arrays.toString(styleClass),
-                item.getStyleClass().containsAll(Arrays.asList(styleClass)));
+        assertTrue(item.getStyleClass().containsAll(Arrays.asList(styleClass)), "\"" + item.getStyleClass() + "\" doesn't contain all of the " + Arrays.toString(styleClass));
     }
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/chart/LineChartTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/chart/LineChartTest.java
index 840325df093..1bf064bb812 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/chart/LineChartTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/chart/LineChartTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,11 @@
 
 package test.javafx.scene.chart;
 
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.List;
+import java.util.stream.Collectors;
 import javafx.collections.ObservableList;
 import javafx.geometry.Point2D;
 import javafx.scene.Node;
@@ -36,25 +41,20 @@
 import javafx.scene.shape.LineTo;
 import javafx.scene.shape.Path;
 import javafx.scene.shape.PathElement;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class LineChartTest extends XYChartTestBase {
 
     LineChart<Number,Number> lineChart;
     final XYChart.Series<Number, Number> series1 = new XYChart.Series<>();
 
-    @Override protected Chart createChart() {
+    @Override
+    protected void createChart() {
         final NumberAxis xAxis = new NumberAxis(0, 90, 10);
         final NumberAxis yAxis = new NumberAxis(0, 30, 2);
         lineChart = new LineChart<>(xAxis,yAxis);
+        lineChart.setAnimated(false);
         xAxis.setLabel("X Axis");
         yAxis.setLabel("Y Axis");
         lineChart.setTitle("HelloLineChart");
@@ -64,6 +64,10 @@ public class LineChartTest extends XYChartTestBase {
         series1.getData().add(new XYChart.Data(30d, 15d));
         series1.getData().add(new XYChart.Data(50d, 15d));
         series1.getData().add(new XYChart.Data(80d, 10d));
+    }
+
+    @Override
+    protected Chart getChart() {
         return lineChart;
     }
 
@@ -79,6 +83,7 @@ private String getSeriesLineFromPlot() {
 
     @Test
     public void testCreateSymbols() {
+        createChart();
         startApp();
         lineChart.setCreateSymbols(false);
         pulse();
@@ -96,6 +101,7 @@ public void testCreateSymbols() {
 
     @Test
     public void testDataItemAdd() {
+        createChart();
         startApp();
         lineChart.getData().addAll(series1);
         pulse();
@@ -105,24 +111,27 @@ public void testDataItemAdd() {
         assertEquals(7, XYChartShim.getPlotChildren(lineChart).size());
     }
 
-     @Test @Ignore
+     @Test
+     @Disabled
      // Ignored because the animation's Timeline doesn't run. It used to be that the item was added before the
      // animation was run. Now the item is added as the onFinished handler of the first KeyFrame. Since the
      // Timeline doesn't run in the context of the unit test, this test fails. In fact, this test never really
      // achieved its purpose.
-    public void testDataItemAddWithAnimation() {
-        startApp();
-        lineChart.setAnimated(true);
-        lineChart.getData().addAll(series1);
-        pulse();
-        series1.getData().add(new XYChart.Data(60d, 30d));
-        pulse();
-        // 5 stackpane nodes and 1 path node + new stackpane for data added
-        assertEquals(7, XYChartShim.getPlotChildren(lineChart).size());
-    }
+     public void testDataItemAddWithAnimation() {
+         createChart();
+         startApp();
+         lineChart.setAnimated(true);
+         lineChart.getData().addAll(series1);
+         pulse();
+         series1.getData().add(new XYChart.Data(60d, 30d));
+         pulse();
+         // 5 stackpane nodes and 1 path node + new stackpane for data added
+         assertEquals(7, XYChartShim.getPlotChildren(lineChart).size());
+     }
 
     @Test
     public void testDataItemRemove() {
+        createChart();
         startApp();
         lineChart.getData().addAll(series1);
         pulse();
@@ -134,8 +143,9 @@ public void testDataItemRemove() {
         }
     }
 
-     @Test
+    @Test
     public void testSeriesAddWithAnimation() {
+        createChart();
         startApp();
         lineChart.setAnimated(true);
         final XYChart.Series<Number, Number> series2 = new XYChart.Series<>();
@@ -163,13 +173,16 @@ void checkDataStyleClasses(XYChart.Data<?, ?> data,
 
     @Test
     public void testSeriesRemoveAnimatedStyleClasses() {
+        createChart();
         startApp();
         //lineChart.setCreateSymbols(false);
         int nodesPerSeries = 4; // 3 symbols + 1 path
         checkSeriesRemoveAnimatedStyleClasses(lineChart, nodesPerSeries, 900);
     }
 
-    @Test public void testPathInsideXAndInsideYBounds() {
+    @Test
+    public void testPathInsideXAndInsideYBounds() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data<>(85d, 15d)); // upper bound is 90, 30
         lineChart.getData().addAll(series1);
@@ -178,7 +191,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
         assertArrayEquals(convertSeriesDataToPoint2D(series1).toArray(), findDataPointsFromPathLine(lineChart).toArray());
     }
 
-    @Test public void testPathOutsideXBoundsWithDuplicateXAndHigherY() {
+    @Test
+    public void testPathOutsideXBoundsWithDuplicateXAndHigherY() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data(100d, 20d)); // upper bound is 90
         series1.getData().add(new XYChart.Data(100d, 50d));
@@ -198,7 +213,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
         assertArrayEquals(convertSeriesDataToPoint2D(expectedSeries).toArray(), findDataPointsFromPathLine(lineChart).toArray());
     }
 
-    @Test public void testPathOutsideXBoundsWithDuplicateXAndLowerY() {
+    @Test
+    public void testPathOutsideXBoundsWithDuplicateXAndLowerY() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data(100d, 20d)); // upper bound is 90
         series1.getData().add(new XYChart.Data(100d, 15d));
@@ -218,7 +235,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
         assertArrayEquals(convertSeriesDataToPoint2D(expectedSeries).toArray(), findDataPointsFromPathLine(lineChart).toArray());
     }
 
-    @Test public void testPathOutsideYBoundsWithDuplicateYAndHigherX() {
+    @Test
+    public void testPathOutsideYBoundsWithDuplicateYAndHigherX() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data(80d, 32d)); // upper bound is 30
         series1.getData().add(new XYChart.Data(90d, 32d));
@@ -239,7 +258,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
         assertArrayEquals(convertSeriesDataToPoint2D(expectedSeries).toArray(), findDataPointsFromPathLine(lineChart).toArray());
     }
 
-    @Test public void testPathOutsideYBoundsWithDuplicateYAndLowerX() {
+    @Test
+    public void testPathOutsideYBoundsWithDuplicateYAndLowerX() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data(85d, 40d)); // upper bound is 30
         series1.getData().add(new XYChart.Data(90d, 40d));
@@ -260,7 +281,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
         assertArrayEquals(convertSeriesDataToPoint2D(expectedSeries).toArray(), findDataPointsFromPathLine(lineChart).toArray());
     }
 
-    @Test public void testPathOutsideXAndYBoundsWithDuplicateXAndHigherY() {
+    @Test
+    public void testPathOutsideXAndYBoundsWithDuplicateXAndHigherY() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data<>(95d, 35d)); // upper bound is 90,30
         series1.getData().add(new XYChart.Data<>(95d, 40d));
@@ -280,7 +303,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
         assertArrayEquals(convertSeriesDataToPoint2D(expectedSeries).toArray(), findDataPointsFromPathLine(lineChart).toArray());
     }
 
-    @Test public void testPathOutsideXAndYBoundsWithDuplicateXAndLowerY() {
+    @Test
+    public void testPathOutsideXAndYBoundsWithDuplicateXAndLowerY() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data<>(95d, 40d)); // upper bound is 90,30
         series1.getData().add(new XYChart.Data<>(95d, 35d));
@@ -300,7 +325,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
         assertArrayEquals(convertSeriesDataToPoint2D(expectedSeries).toArray(), findDataPointsFromPathLine(lineChart).toArray());
     }
 
-    @Test public void testPathOutsideXAndYBoundsWithDuplicateYAndHigherX() {
+    @Test
+    public void testPathOutsideXAndYBoundsWithDuplicateYAndHigherX() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data<>(95d, 32d)); // upper bound is 90,30
         series1.getData().add(new XYChart.Data<>(100d, 32d));
@@ -320,7 +347,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
         assertArrayEquals(convertSeriesDataToPoint2D(expectedSeries).toArray(), findDataPointsFromPathLine(lineChart).toArray());
     }
 
-    @Test public void testPathOutsideXAndYBoundsWithDuplicateYAndLowerX() {
+    @Test
+    public void testPathOutsideXAndYBoundsWithDuplicateYAndLowerX() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data<>(100d, 40d)); // upper bound is 90,30
         series1.getData().add(new XYChart.Data<>(95d, 40d));
@@ -340,7 +369,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
         assertArrayEquals(convertSeriesDataToPoint2D(expectedSeries).toArray(), findDataPointsFromPathLine(lineChart).toArray());
     }
 
-    @Test public void testPathOutsideXLowerBoundsWithDuplicateXAndHigherYWithSortYAxis() {
+    @Test
+    public void testPathOutsideXLowerBoundsWithDuplicateXAndHigherYWithSortYAxis() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data(-10d, 20d)); // lower bound is 0
         series1.getData().add(new XYChart.Data(-10d, 50d));
@@ -362,7 +393,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
         assertArrayEquals(convertSeriesDataToPoint2D(expectedSeries).toArray(), findDataPointsFromPathLine(lineChart).toArray());
     }
 
-    @Test public void testPathOutsideXUpperBoundsWithDuplicateXAndHigherYWithSortYAxis() {
+    @Test
+    public void testPathOutsideXUpperBoundsWithDuplicateXAndHigherYWithSortYAxis() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data(100d, 20d)); // upper bound is 90
         series1.getData().add(new XYChart.Data(100d, 50d));
@@ -384,7 +417,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
         assertArrayEquals(convertSeriesDataToPoint2D(expectedSeries).toArray(), findDataPointsFromPathLine(lineChart).toArray());
     }
 
-    @Test public void testPathOutsideXLowerBoundsWithDuplicateXAndLowerYWithSortYAxis() {
+    @Test
+    public void testPathOutsideXLowerBoundsWithDuplicateXAndLowerYWithSortYAxis() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data(-10d, 20d)); // lower bound is 0
         series1.getData().add(new XYChart.Data(-10d, 15d));
@@ -406,7 +441,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
         assertArrayEquals(convertSeriesDataToPoint2D(expectedSeries).toArray(), findDataPointsFromPathLine(lineChart).toArray());
     }
 
-    @Test public void testPathOutsideXUpperBoundsWithDuplicateXAndLowerYWithSortYAxis() {
+    @Test
+    public void testPathOutsideXUpperBoundsWithDuplicateXAndLowerYWithSortYAxis() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data(100d, 20d)); // upper bound is 90
         series1.getData().add(new XYChart.Data(100d, 15d));
@@ -428,7 +465,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
         assertArrayEquals(convertSeriesDataToPoint2D(expectedSeries).toArray(), findDataPointsFromPathLine(lineChart).toArray());
     }
 
-    @Test public void testPathOutsideYLowerBoundsWithDuplicateYAndHigherXWithSortYAxis() {
+    @Test
+    public void testPathOutsideYLowerBoundsWithDuplicateYAndHigherXWithSortYAxis() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data(80d, -10d)); // lower bound is 0
         series1.getData().add(new XYChart.Data(90d, -10d));
@@ -449,7 +488,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
         assertArrayEquals(convertSeriesDataToPoint2D(expectedSeries).toArray(), findDataPointsFromPathLine(lineChart).toArray());
     }
 
-    @Test public void testPathOutsideYUpperBoundsWithDuplicateYAndHigherXWithSortYAxis() {
+    @Test
+    public void testPathOutsideYUpperBoundsWithDuplicateYAndHigherXWithSortYAxis() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data(80d, 32d)); // upper bound is 30
         series1.getData().add(new XYChart.Data(90d, 32d));
@@ -470,7 +511,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
         assertArrayEquals(convertSeriesDataToPoint2D(expectedSeries).toArray(), findDataPointsFromPathLine(lineChart).toArray());
     }
 
-    @Test public void testPathOutsideYLowerBoundsWithDuplicateYAndLowerXWithSortYAxis() {
+    @Test
+    public void testPathOutsideYLowerBoundsWithDuplicateYAndLowerXWithSortYAxis() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data(80d, -10d)); // lower bound is 0
         series1.getData().add(new XYChart.Data(70d, -10d));
@@ -490,7 +533,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
         assertArrayEquals(convertSeriesDataToPoint2D(expectedSeries).toArray(), findDataPointsFromPathLine(lineChart).toArray());
     }
 
-    @Test public void testPathOutsideYUpperBoundsWithDuplicateYAndLowerXWithSortYAxis() {
+    @Test
+    public void testPathOutsideYUpperBoundsWithDuplicateYAndLowerXWithSortYAxis() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data(80d, 40d)); // upper bound is 30
         series1.getData().add(new XYChart.Data(70d, 40d));
@@ -511,7 +556,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
         assertArrayEquals(convertSeriesDataToPoint2D(expectedSeries).toArray(), findDataPointsFromPathLine(lineChart).toArray());
     }
 
-    @Test public void testPathOutsideXAndYLowerBoundsWithDuplicateXAndHigherYWithSortYAxis() {
+    @Test
+    public void testPathOutsideXAndYLowerBoundsWithDuplicateXAndHigherYWithSortYAxis() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data<>(95d, -10d)); // lower bound is 0,0
         series1.getData().add(new XYChart.Data<>(95d, -5d));
@@ -533,7 +580,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
         assertArrayEquals(convertSeriesDataToPoint2D(expectedSeries).toArray(), findDataPointsFromPathLine(lineChart).toArray());
     }
 
-    @Test public void testPathOutsideXAndYUpperBoundsWithDuplicateXAndHigherYWithSortYAxis() {
+    @Test
+    public void testPathOutsideXAndYUpperBoundsWithDuplicateXAndHigherYWithSortYAxis() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data<>(95d, 35d)); // upper bound is 90,30
         series1.getData().add(new XYChart.Data<>(95d, 40d));
@@ -554,7 +603,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
         assertArrayEquals(convertSeriesDataToPoint2D(expectedSeries).toArray(), findDataPointsFromPathLine(lineChart).toArray());
     }
 
-    @Test public void testPathOutsideXAndYLowerBoundsWithDuplicateXAndLowerYWithSortYAxis() {
+    @Test
+    public void testPathOutsideXAndYLowerBoundsWithDuplicateXAndLowerYWithSortYAxis() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data<>(-10d, -10d)); // lower bound is 0,0
         series1.getData().add(new XYChart.Data<>(-10d, -20d));
@@ -575,7 +626,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
         assertArrayEquals(convertSeriesDataToPoint2D(expectedSeries).toArray(), findDataPointsFromPathLine(lineChart).toArray());
     }
 
-    @Test public void testPathOutsideXAndYUpperBoundsWithDuplicateXAndLowerYWithSortYAxis() {
+    @Test
+    public void testPathOutsideXAndYUpperBoundsWithDuplicateXAndLowerYWithSortYAxis() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data<>(95d, 40d)); // upper bound is 90,30
         series1.getData().add(new XYChart.Data<>(95d, 35d));
@@ -596,7 +649,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
         assertArrayEquals(convertSeriesDataToPoint2D(expectedSeries).toArray(), findDataPointsFromPathLine(lineChart).toArray());
     }
 
-    @Test public void testPathOutsideXAndYLowerBoundsWithDuplicateYAndHigherXWithSortYAxis() {
+    @Test
+    public void testPathOutsideXAndYLowerBoundsWithDuplicateYAndHigherXWithSortYAxis() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data<>(-15d, -10d)); // lower bound is 0,0
         series1.getData().add(new XYChart.Data<>(-10d, -10d));
@@ -617,7 +672,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
         assertArrayEquals(convertSeriesDataToPoint2D(expectedSeries).toArray(), findDataPointsFromPathLine(lineChart).toArray());
     }
 
-    @Test public void testPathOutsideXAndYUpperBoundsWithDuplicateYAndHigherXWithSortYAxis() {
+    @Test
+    public void testPathOutsideXAndYUpperBoundsWithDuplicateYAndHigherXWithSortYAxis() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data<>(95d, 32d)); // upper bound is 90,30
         series1.getData().add(new XYChart.Data<>(100d, 32d));
@@ -638,7 +695,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
         assertArrayEquals(convertSeriesDataToPoint2D(expectedSeries).toArray(), findDataPointsFromPathLine(lineChart).toArray());
     }
 
-    @Test public void testPathOutsideXAndYLowerBoundsWithDuplicateYAndLowerXWithSortYAxis() {
+    @Test
+    public void testPathOutsideXAndYLowerBoundsWithDuplicateYAndLowerXWithSortYAxis() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data<>(-10d, -10d)); // lower bound is 0,0
         series1.getData().add(new XYChart.Data<>(-15d, -10d));
@@ -659,7 +718,9 @@ public void testSeriesRemoveAnimatedStyleClasses() {
         assertArrayEquals(convertSeriesDataToPoint2D(expectedSeries).toArray(), findDataPointsFromPathLine(lineChart).toArray());
     }
 
-    @Test public void testPathOutsideXAndYUpperBoundsWithDuplicateYAndLowerXWithSortYAxis() {
+    @Test
+    public void testPathOutsideXAndYUpperBoundsWithDuplicateYAndLowerXWithSortYAxis() {
+        createChart();
         startApp();
         series1.getData().add(new XYChart.Data<>(100d, 40d)); // upper bound is 90,30
         series1.getData().add(new XYChart.Data<>(95d, 40d));
@@ -683,6 +744,7 @@ public void testSeriesRemoveAnimatedStyleClasses() {
     //JDK-8283675
     @Test
     public void testChartLineRemovedOnClearingSeries() {
+        createChart();
         startApp();
         lineChart.getData().addAll(series1);
         pulse();
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/chart/NumberAxisTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/chart/NumberAxisTest.java
index 8cbb9e42c49..9ac84272aaf 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/chart/NumberAxisTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/chart/NumberAxisTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,39 +25,43 @@
 
 package test.javafx.scene.chart;
 
-import javafx.css.CssMetaData;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleDoubleProperty;
+import javafx.css.CssMetaData;
 import javafx.css.StyleableProperty;
-import javafx.util.StringConverter;
-import static org.junit.Assert.*;
-
-
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.Arrays;
-import java.util.List;
 import javafx.geometry.Side;
 import javafx.scene.chart.NumberAxis;
 import javafx.scene.chart.NumberAxisShim;
+import javafx.util.StringConverter;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 /**
  * All public members of NumberAxis are tested here .
  * @author srikalyc
  */
 public class NumberAxisTest {
-    private NumberAxis axis;//Empty string
-    private NumberAxis threeValueAxis;//Empty string
-    private NumberAxis fourValueAxis;//Empty string
+    private NumberAxis axis;
+    private NumberAxis threeValueAxis;
+    private NumberAxis fourValueAxis;
     private StringConverter<Number> formatter;
 
     public NumberAxisTest() {
     }
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         if (axis == null) {
             axis = new NumberAxis();
         }
@@ -108,25 +112,24 @@ public NumberAxisTest() {
      * Tests for property binding                                        *
      ********************************************************************/
 
-
-    @Test public void checkForceZeroInRangePropertyBind() {
+    @Test
+    public void checkForceZeroInRangePropertyBind() {
         BooleanProperty objPr = new SimpleBooleanProperty(true);
         axis.forceZeroInRangeProperty().bind(objPr);
-        assertTrue("forceZeroInRange cannot be bound", axis.forceZeroInRangeProperty().getValue());
+        assertTrue(axis.forceZeroInRangeProperty().getValue(), "forceZeroInRange cannot be bound");
         objPr.setValue(false);
-        assertFalse("forceZeroInRange cannot be bound", axis.forceZeroInRangeProperty().getValue());
+        assertFalse(axis.forceZeroInRangeProperty().getValue(), "forceZeroInRange cannot be bound");
     }
 
-
-    @Test public void checkTickUnitPropertyBind() {
+    @Test
+    public void checkTickUnitPropertyBind() {
         DoubleProperty objPr = new SimpleDoubleProperty(56.0);
         axis.tickUnitProperty().bind(objPr);
-        assertEquals("tickUnitProperty cannot be bound", axis.tickUnitProperty().getValue(),56.0,0.0);
+        assertEquals(axis.tickUnitProperty().getValue(), 56.0, 0.0, "tickUnitProperty cannot be bound");
         objPr.setValue(23.0);
-        assertEquals("tickUnitProperty cannot be bound", axis.tickUnitProperty().getValue(),23.0,0.0);
+        assertEquals(axis.tickUnitProperty().getValue(), 23.0, 0.0, "tickUnitProperty cannot be bound");
     }
 
-
     @Test public void forceZeroInRangePropertyHasBeanReference() {
         assertSame(axis, axis.forceZeroInRangeProperty().getBean());
     }
@@ -253,7 +256,8 @@ public NumberAxisTest() {
         assertArrayEquals(new double[] {8.45, 8.55, 8.65}, asDoubleArray, 1e-10);
     }
 
-    @Test(timeout = 1000)
+    @Test
+    @Timeout(value=1000, unit=TimeUnit.MILLISECONDS)
     public void testCloseValues() {
         axis.setForceZeroInRange(false);
         axis.setSide(Side.LEFT);
@@ -262,18 +266,20 @@ public void testCloseValues() {
         NumberAxisShim.autoRange(axis, minValue, maxValue, 500, 50);
     }
 
-    @Test(timeout = 1000)
+    @Test
+    @Timeout(value=1000, unit=TimeUnit.MILLISECONDS)
     public void testCloseValuesMinorTicks() {
         axis.setForceZeroInRange(false);
         axis.setSide(Side.LEFT);
         double minValue = 1.0;
-        double maxValue = minValue + 11*Math.ulp(minValue);
+        double maxValue = minValue + 11 * Math.ulp(minValue);
         Object range = NumberAxisShim.autoRange(axis, minValue, maxValue, 500, 50);
         NumberAxisShim.setRange(axis, range, false);
         NumberAxisShim.calculateMinorTickMarks(axis);
     }
 
-    @Test(timeout = 1000)
+    @Test
+    @Timeout(value=1000, unit=TimeUnit.MILLISECONDS)
     public void testEqualLargeValues() {
         axis.setForceZeroInRange(false);
         axis.setSide(Side.LEFT);
@@ -282,7 +288,8 @@ public void testEqualLargeValues() {
         NumberAxisShim.autoRange(axis, minValue, maxValue, 500, 50);
     }
 
-    @Test(timeout = 1000)
+    @Test
+    @Timeout(value=1000, unit=TimeUnit.MILLISECONDS)
     public void testCloseValuesNoAutorange() {
         axis.setForceZeroInRange(false);
         axis.setSide(Side.LEFT);
@@ -292,13 +299,14 @@ public void testCloseValuesNoAutorange() {
         axis.setLowerBound(minValue);
         axis.setUpperBound(maxValue);
         // minValue + tickUnit == minValue
-        axis.setTickUnit(0.5*Math.ulp(minValue));
+        axis.setTickUnit(0.5 * Math.ulp(minValue));
         Object range = NumberAxisShim.getRange(axis);
         NumberAxisShim.calculateTickValues(axis, 500, range);
         NumberAxisShim.calculateMinorTickMarks(axis);
     }
 
-    @Test(timeout = 1000)
+    @Test
+    @Timeout(value=1000, unit=TimeUnit.MILLISECONDS)
     public void testCloseValuesMinorTicksNoAutoRange() {
         axis.setForceZeroInRange(false);
         axis.setSide(Side.LEFT);
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/chart/PieChartTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/chart/PieChartTest.java
index bc6920469fe..6c4249e80f6 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/chart/PieChartTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/chart/PieChartTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,11 @@
 
 package test.javafx.scene.chart;
 
-import com.sun.javafx.charts.Legend;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
-
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.scene.Node;
@@ -38,8 +37,8 @@
 import javafx.scene.chart.ChartShim;
 import javafx.scene.chart.PieChart;
 import javafx.scene.text.Text;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.charts.Legend;
 
 /**
  *
@@ -51,9 +50,14 @@ public class PieChartTest extends ChartTestBase {
     PieChart pc;
 
     @Override
-    protected Chart createChart() {
+    protected void createChart() {
         data = FXCollections.observableArrayList();
         pc = new PieChart(data);
+        pc.setAnimated(false);
+    }
+
+    @Override
+    protected Chart getChart() {
         return pc;
     }
 
@@ -67,6 +71,7 @@ private void addTestData() {
 
     @Test
     public void testLabelsVisibleFalse_RT24106() {
+        createChart();
         addTestData();
         pc.setLabelsVisible(false);
         assertEquals(false, pc.getLabelsVisible());
@@ -74,6 +79,7 @@ public void testLabelsVisibleFalse_RT24106() {
 
     @Test
     public void testLegendUpdateAfterPieNameChange_RT26854() {
+        createChart();
         data.add(new PieChart.Data("Sun", 20));
         Legend.LegendItem legendItem = ((Legend)ChartShim.getLegend(pc)).getItems().get(0);
         assertEquals("Sun", legendItem.getText());
@@ -85,6 +91,7 @@ public void testLegendUpdateAfterPieNameChange_RT26854() {
 
     @Test
     public void testDataItemRemovedWithAnimation() {
+        createChart();
         pc.setAnimated(true);
         addTestData();
         pc.getData().remove(0);
@@ -93,6 +100,7 @@ public void testDataItemRemovedWithAnimation() {
 
     @Test
     public void testDataNodeChangeReported() {
+        createChart();
         AtomicBoolean called = new AtomicBoolean();
 
         PieChart.Data data = new PieChart.Data("ABC", 40);
@@ -104,15 +112,14 @@ public void testDataNodeChangeReported() {
 
     private void checkStyleClass(int i, String styleClass) {
         Node item = pc.getData().get(i).getNode();
-        assertTrue(item.getStyleClass().toString(),
-                item.getStyleClass().contains(styleClass));
+        assertTrue(item.getStyleClass().contains(styleClass), item.getStyleClass().toString());
         Node legendItem = ((Legend)ChartShim.getLegend(pc)).getItems().get(i).getSymbol();
-        assertTrue(legendItem.getStyleClass().toString(),
-                legendItem.getStyleClass().contains(styleClass));
+        assertTrue(legendItem.getStyleClass().contains(styleClass), legendItem.getStyleClass().toString());
     }
 
     @Test
     public void testCSSStyleClass_DataClear() {
+        createChart();
         for (int i = 0; i < 10; i++) {
             data.add(new PieChart.Data(String.valueOf(i), i));
         }
@@ -132,6 +139,7 @@ public void testCSSStyleClass_DataClear() {
 
     @Test
     public void testCSSStyleClass_DataModify() {
+        createChart();
         for (int i = 0; i < 10; i++) {
             data.add(new PieChart.Data(String.valueOf(i), i));
         }
@@ -158,6 +166,7 @@ public void testCSSStyleClass_DataModify() {
 
     @Test
     public void testLegendUpdateWhileNotVisible_8163454() {
+        createChart();
         addTestData();
         assertEquals(5, ((Legend)ChartShim.getLegend(pc)).getItems().size());
         pc.setLegendVisible(false);
@@ -168,6 +177,7 @@ public void testLegendUpdateWhileNotVisible_8163454() {
 
     @Test
     public void testLabelsCollision_8166055() {
+        createChart();
         data.addAll(
                 new PieChart.Data("AAAAA", 2),
                 new PieChart.Data("BBBBB", 1),
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/chart/StackedAreaChartTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/chart/StackedAreaChartTest.java
index 690a3017be6..2e9e8a19cff 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/chart/StackedAreaChartTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/chart/StackedAreaChartTest.java
@@ -25,6 +25,8 @@
 
 package test.javafx.scene.chart;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.scene.Group;
@@ -39,18 +41,17 @@
 import javafx.scene.chart.XYChartShim;
 import javafx.scene.shape.Path;
 import javafx.scene.shape.PathElement;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class StackedAreaChartTest extends XYChartTestBase {
     StackedAreaChart<Number,Number> ac;
     final XYChart.Series<Number, Number> series1 = new XYChart.Series<>();
     boolean useCategoryAxis = false;
     final String[] countries = {"USA", "Italy", "France", "China", "India"};
+
     @Override
-    protected Chart createChart() {
+    protected void createChart() {
         final NumberAxis yAxis = new NumberAxis();
         ObservableList<XYChart.Data> data = FXCollections.observableArrayList();
         Axis xAxis;
@@ -58,26 +59,31 @@ protected Chart createChart() {
             xAxis = new CategoryAxis();
             ((CategoryAxis)xAxis).setCategories(FXCollections.observableArrayList(countries));
             // add starting data
-        series1.getData().add(new XYChart.Data(countries[0], 10d));
-        series1.getData().add(new XYChart.Data(countries[1], 20d));
-        series1.getData().add(new XYChart.Data(countries[2], 15d));
-        series1.getData().add(new XYChart.Data(countries[3], 15d));
-        series1.getData().add(new XYChart.Data(countries[4], 10d));
+            series1.getData().add(new XYChart.Data(countries[0], 10d));
+            series1.getData().add(new XYChart.Data(countries[1], 20d));
+            series1.getData().add(new XYChart.Data(countries[2], 15d));
+            series1.getData().add(new XYChart.Data(countries[3], 15d));
+            series1.getData().add(new XYChart.Data(countries[4], 10d));
         } else {
             xAxis = new NumberAxis();
-            ac = new StackedAreaChart<Number,Number>(xAxis,yAxis);
             // add starting data
-        series1.getData().add(new XYChart.Data(10d, 10d));
-        series1.getData().add(new XYChart.Data(25d, 20d));
-        series1.getData().add(new XYChart.Data(30d, 15d));
-        series1.getData().add(new XYChart.Data(50d, 15d));
-        series1.getData().add(new XYChart.Data(80d, 10d));
+            series1.getData().add(new XYChart.Data(10d, 10d));
+            series1.getData().add(new XYChart.Data(25d, 20d));
+            series1.getData().add(new XYChart.Data(30d, 15d));
+            series1.getData().add(new XYChart.Data(50d, 15d));
+            series1.getData().add(new XYChart.Data(80d, 10d));
         }
 
         xAxis.setLabel("X Axis");
         yAxis.setLabel("Y Axis");
+
+        ac = new StackedAreaChart<Number, Number>(xAxis, yAxis);
         ac.setTitle("HelloStackedAreaChart");
+        ac.setAnimated(false);
+    }
 
+    @Override
+    protected Chart getChart() {
         return ac;
     }
 
@@ -95,8 +101,10 @@ private String getSeriesLineFromPlot() {
         return "";
     }
 
-    @Test @Ignore("pending RT-28373")
+    @Test
+    @Disabled("pending RT-28373")
     public void testSeriesAdd() {
+        createChart();
         startApp();
         ac.getData().addAll(series1);
         pulse();
@@ -105,8 +113,10 @@ public void testSeriesAdd() {
 
     }
 
-    @Test @Ignore
+    @Test
+    @Disabled
     public void testDataItemRemove() {
+        createChart();
         startApp();
         ac.getData().addAll(series1);
         pulse();
@@ -117,8 +127,10 @@ public void testDataItemRemove() {
         }
     }
 
-    @Test @Ignore
+    @Test
+    @Disabled
     public void testDataItemAdd() {
+        createChart();
         startApp();
         ac.getData().addAll(series1);
         pulse();
@@ -129,8 +141,10 @@ public void testDataItemAdd() {
         }
     }
 
-    @Test @Ignore
+    @Test
+    @Disabled
     public void testDataItemInsert() {
+        createChart();
         startApp();
         ac.getData().addAll(series1);
         pulse();
@@ -141,8 +155,10 @@ public void testDataItemInsert() {
         }
     }
 
-    @Test @Ignore
+    @Test
+    @Disabled
     public void testDataItemChange() {
+        createChart();
         startApp();
         ac.getData().addAll(series1);
         pulse();
@@ -158,11 +174,14 @@ public void testDataItemChange() {
     @Test
     public void testStackedAreaChartWithCategoryAxis() {
         useCategoryAxis = true;
+        createChart();
         startApp();
         useCategoryAxis = false;
     }
 
-    @Test public void testCreateSymbols() {
+    @Test
+    public void testCreateSymbols() {
+        createChart();
          startApp();
          ac.setCreateSymbols(false);
          pulse();
@@ -180,6 +199,7 @@ public void testStackedAreaChartWithCategoryAxis() {
 
     @Test
     public void  testAutoRange_AdditionalPointInSeries1() {
+        createChart();
         ac.getData().clear();
         final NumberAxis yAxis = (NumberAxis) ac.getYAxis();
         yAxis.setAutoRanging(true);
@@ -210,6 +230,7 @@ public void  testAutoRange_AdditionalPointInSeries1() {
 
     @Test
     public void testAutoRange_AdditionalPointInSeries1AtTheEnd() {
+        createChart();
         ac.getData().clear();
         final NumberAxis yAxis = (NumberAxis) ac.getYAxis();
         yAxis.setAutoRanging(true);
@@ -240,6 +261,7 @@ public void testAutoRange_AdditionalPointInSeries1AtTheEnd() {
 
     @Test
     public void testAutoRange_AdditionalPointInSeries1AtTheBeginning() {
+        createChart();
         ac.getData().clear();
         final NumberAxis yAxis = (NumberAxis) ac.getYAxis();
         yAxis.setAutoRanging(true);
@@ -270,6 +292,7 @@ public void testAutoRange_AdditionalPointInSeries1AtTheBeginning() {
 
     @Test
     public void testAutoRange_AdditionalPointInSeries2() {
+        createChart();
         ac.getData().clear();
         final NumberAxis yAxis = (NumberAxis) ac.getYAxis();
         yAxis.setAutoRanging(true);
@@ -300,6 +323,7 @@ public void testAutoRange_AdditionalPointInSeries2() {
 
     @Test
     public void testAutoRange_AdditionalPointInSeries2AtTheEnd() {
+        createChart();
         ac.getData().clear();
         final NumberAxis yAxis = (NumberAxis) ac.getYAxis();
         yAxis.setAutoRanging(true);
@@ -330,6 +354,7 @@ public void testAutoRange_AdditionalPointInSeries2AtTheEnd() {
 
     @Test
     public void testAutoRange_AdditionalPointInSeries2AtTheBeginning() {
+        createChart();
         ac.getData().clear();
         final NumberAxis yAxis = (NumberAxis) ac.getYAxis();
         yAxis.setAutoRanging(true);
@@ -360,6 +385,7 @@ public void testAutoRange_AdditionalPointInSeries2AtTheBeginning() {
 
     @Test
     public void testAutoRange_EmptySeries1() {
+        createChart();
         ac.getData().clear();
         final NumberAxis yAxis = (NumberAxis) ac.getYAxis();
         yAxis.setAutoRanging(true);
@@ -383,6 +409,7 @@ public void testAutoRange_EmptySeries1() {
 
     @Test
     public void testAutoRange_EmptySeries2() {
+        createChart();
         ac.getData().clear();
         final NumberAxis yAxis = (NumberAxis) ac.getYAxis();
         yAxis.setAutoRanging(true);
@@ -418,6 +445,7 @@ public void testAutoRange_EmptySeries2() {
      */
     @Test
     public void testChartLineAndAreaRemovedOnClearingSeries() {
+        createChart();
         startApp();
         ac.getData().addAll(series1);
         pulse();
@@ -453,6 +481,7 @@ void checkDataStyleClasses(XYChart.Data<?, ?> data,
 
     @Test
     public void testSeriesRemoveAnimatedStyleClasses() {
+        createChart();
         startApp();
         //ac.setCreateSymbols(false);
         int nodesPerSeries = 4; // 3 symbols + 1 path
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/chart/StackedBarChartTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/chart/StackedBarChartTest.java
index 5a045a66eba..7d80c885a52 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/chart/StackedBarChartTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/chart/StackedBarChartTest.java
@@ -25,13 +25,10 @@
 
 package test.javafx.scene.chart;
 
-
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import javafx.collections.*;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import java.util.Arrays;
-
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 import javafx.scene.Node;
 import javafx.scene.chart.CategoryAxis;
 import javafx.scene.chart.Chart;
@@ -40,7 +37,8 @@
 import javafx.scene.chart.XYChart;
 import javafx.scene.chart.XYChartShim;
 import javafx.scene.layout.Region;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class StackedBarChartTest extends XYChartTestBase {
 
@@ -52,13 +50,14 @@ public class StackedBarChartTest extends XYChartTestBase {
     final String[] years = {"2007", "2008", "2009"};
 
     @Override
-    protected Chart createChart() {
+    protected void createChart() {
         final NumberAxis yAxis = new NumberAxis();
         sbc = new StackedBarChart<>(xAxis,yAxis);
         xAxis.setLabel("Year");
         xAxis.setCategories(FXCollections.<String>observableArrayList(Arrays.asList(years)));
         yAxis.setLabel("Price");
         sbc.setTitle("HelloStackedBarChart");
+        sbc.setAnimated(false);
         // Populate Chart data
         ObservableList<XYChart.Data> data = FXCollections.observableArrayList();
         series1.getData().add(new XYChart.Data<String,Number>(years[0], 567));
@@ -70,11 +69,16 @@ protected Chart createChart() {
         series3.getData().add(new XYChart.Data<String,Number>(years[0], 800));
         series3.getData().add(new XYChart.Data<String,Number>(years[1], 1000));
         series3.getData().add(new XYChart.Data<String,Number>(years[2], 2800));
+    }
+
+    @Override
+    protected Chart getChart() {
         return sbc;
     }
 
     @Test
     public void testAddingAutoRangingCategoryAxis() {
+        createChart();
         startApp();
         ObservableList<XYChart.Series<String, Number>> barChartData = FXCollections.observableArrayList(
             new StackedBarChart.Series("Region 1", FXCollections.observableArrayList(
@@ -97,6 +101,7 @@ public void testAddingAutoRangingCategoryAxis() {
 
     @Test
     public void testSeriesAdd() {
+        createChart();
         startApp();
         sbc.getData().addAll(series1, series2, series3);
         pulse();
@@ -123,6 +128,7 @@ public void testSeriesAdd() {
 
     @Test
     public void testSeriesRemove() {
+        createChart();
         startApp();
         sbc.getData().addAll(series1);
         pulse();
@@ -136,6 +142,7 @@ public void testSeriesRemove() {
 
     @Test
     public void testDataItemAdd() {
+        createChart();
         startApp();
         sbc.getData().addAll(series1);
         pulse();
@@ -146,6 +153,7 @@ public void testDataItemAdd() {
 
     @Test
     public void testDataItemInsert() {
+        createChart();
         startApp();
         sbc.getData().addAll(series1);
         pulse();
@@ -156,6 +164,7 @@ public void testDataItemInsert() {
 
     @Test
     public void testDataItemRemove() {
+        createChart();
         startApp();
         sbc.getData().addAll(series1);
         pulse();
@@ -166,8 +175,10 @@ public void testDataItemRemove() {
         }
     }
 
-    @Test @Ignore
+    @Test
+    @Disabled
     public void testDataItemChange() {
+        createChart();
         startApp();
         sbc.getData().addAll(series1);
         pulse();
@@ -217,6 +228,7 @@ void checkDataStyleClasses(XYChart.Data<?, ?> data,
 
     @Test
     public void testSeriesRemoveAnimatedStyleClasses() {
+        createChart();
         startApp();
         int nodesPerSeries = 3; // 3 bars
         checkSeriesRemoveAnimatedStyleClasses(sbc, nodesPerSeries, 700);
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/chart/ValueAxisTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/chart/ValueAxisTest.java
index f982cede02b..d9d68e6a94f 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/chart/ValueAxisTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/chart/ValueAxisTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,12 @@
 
 package test.javafx.scene.chart;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.List;
-import javafx.css.CssMetaData;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.ObjectProperty;
@@ -34,29 +38,28 @@
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleDoubleProperty;
 import javafx.beans.property.SimpleObjectProperty;
+import javafx.css.CssMetaData;
 import javafx.css.StyleableProperty;
 import javafx.scene.chart.ValueAxis;
 import javafx.scene.chart.ValueAxisShim;
 import javafx.util.StringConverter;
-import static org.junit.Assert.*;
-
-
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * All public members of ValueAxis are tested here .
  * @author srikalyc
  */
 public class ValueAxisTest {
-    private ValueAxis axis;//Empty string
-    private ValueAxis twoValueAxis;//Empty string
+    private ValueAxis axis;
+    private ValueAxis twoValueAxis;
     private StringConverter<Number> formatter;
 
     public ValueAxisTest() {
     }
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         if (axis == null) {
               axis = new ValueAxis() {
                 @Override
@@ -142,62 +145,66 @@ protected void setRange(Object o, boolean bln) {}
      * Tests for property binding                                        *
      ********************************************************************/
 
-
-    @Test public void checkMinorTickVisiblePropertyBind() {
+    @Test
+    public void checkMinorTickVisiblePropertyBind() {
         BooleanProperty objPr = new SimpleBooleanProperty(true);
         axis.minorTickVisibleProperty().bind(objPr);
-        assertTrue("minorTickVisibleProperty cannot be bound", axis.minorTickVisibleProperty().getValue());
+        assertTrue(axis.minorTickVisibleProperty().getValue(), "minorTickVisibleProperty cannot be bound");
         objPr.setValue(false);
-        assertFalse("minorTickVisibleProperty cannot be bound", axis.minorTickVisibleProperty().getValue());
+        assertFalse(axis.minorTickVisibleProperty().getValue(), "minorTickVisibleProperty cannot be bound");
     }
 
-
-    @Test public void checkMinorTickLengthPropertyBind() {
+    @Test
+    public void checkMinorTickLengthPropertyBind() {
         DoubleProperty objPr = new SimpleDoubleProperty(56.0);
         axis.minorTickLengthProperty().bind(objPr);
-        assertEquals("minorTickLengthProperty cannot be bound", axis.minorTickLengthProperty().getValue(),56.0,0.0);
+        assertEquals(axis.minorTickLengthProperty().getValue(), 56.0, 0.0, "minorTickLengthProperty cannot be bound");
         objPr.setValue(23.0);
-        assertEquals("minorTickLengthProperty cannot be bound", axis.minorTickLengthProperty().getValue(),23.0,0.0);
+        assertEquals(axis.minorTickLengthProperty().getValue(), 23.0, 0.0, "minorTickLengthProperty cannot be bound");
     }
 
-    @Test public void checkMinorTickCountPropertyBind() {
+    @Test
+    public void checkMinorTickCountPropertyBind() {
         DoubleProperty objPr = new SimpleDoubleProperty(56.0);
         axis.minorTickCountProperty().bind(objPr);
-        assertEquals("minorTickCountProperty cannot be bound", axis.minorTickCountProperty().getValue(),56.0,0.0);
+        assertEquals(axis.minorTickCountProperty().getValue(), 56.0, 0.0, "minorTickCountProperty cannot be bound");
         objPr.setValue(23.0);
-        assertEquals("minorTickCountProperty cannot be bound", axis.minorTickCountProperty().getValue(),23.0,0.0);
+        assertEquals(axis.minorTickCountProperty().getValue(), 23.0, 0.0, "minorTickCountProperty cannot be bound");
     }
 
     @SuppressWarnings("cast")
-    @Test public void checkScaleIsReadOnlyPropertyAndHenceCannotBeBound() {
+    @Test
+    public void checkScaleIsReadOnlyPropertyAndHenceCannotBeBound() {
         assertTrue(axis.scaleProperty() instanceof ReadOnlyDoubleProperty);
     }
 
-    @Test public void checkUpperBoundPropertyBind() {
+    @Test
+    public void checkUpperBoundPropertyBind() {
         DoubleProperty objPr = new SimpleDoubleProperty(56.0);
         axis.upperBoundProperty().bind(objPr);
-        assertEquals("upperBoundProperty cannot be bound", axis.upperBoundProperty().getValue(),56.0,0.0);
+        assertEquals(axis.upperBoundProperty().getValue(), 56.0, 0.0, "upperBoundProperty cannot be bound");
         objPr.setValue(23.0);
-        assertEquals("upperBoundProperty cannot be bound", axis.upperBoundProperty().getValue(),23.0,0.0);
+        assertEquals(axis.upperBoundProperty().getValue(), 23.0, 0.0, "upperBoundProperty cannot be bound");
     }
 
-    @Test public void checkLowerBoundPropertyBind() {
+    @Test
+    public void checkLowerBoundPropertyBind() {
         DoubleProperty objPr = new SimpleDoubleProperty(56.0);
         axis.lowerBoundProperty().bind(objPr);
-        assertEquals("lowerBoundProperty cannot be bound", axis.lowerBoundProperty().getValue(),56.0,0.0);
+        assertEquals(axis.lowerBoundProperty().getValue(), 56.0, 0.0, "lowerBoundProperty cannot be bound");
         objPr.setValue(23.0);
-        assertEquals("lowerBoundProperty cannot be bound", axis.lowerBoundProperty().getValue(),23.0,0.0);
+        assertEquals(axis.lowerBoundProperty().getValue(), 23.0, 0.0, "lowerBoundProperty cannot be bound");
     }
 
-    @Test public void checkTickLabelFormatterPropertyBind() {
+    @Test
+    public void checkTickLabelFormatterPropertyBind() {
         ObjectProperty objPr = new SimpleObjectProperty<StringConverter<Number>>(null);
         axis.tickLabelFormatterProperty().bind(objPr);
-        assertNull("tickLabelFormatterProperty cannot be bound", axis.tickLabelFormatterProperty().getValue());
+        assertNull(axis.tickLabelFormatterProperty().getValue(), "tickLabelFormatterProperty cannot be bound");
         objPr.setValue(formatter);
-        assertSame("tickLabelFormatterProperty cannot be bound", axis.tickLabelFormatterProperty().getValue(), formatter);
+        assertSame(axis.tickLabelFormatterProperty().getValue(), formatter, "tickLabelFormatterProperty cannot be bound");
     }
 
-
     @Test public void minorTickVisiblePropertyHasBeanReference() {
         assertSame(axis, axis.minorTickVisibleProperty().getBean());
     }
@@ -406,5 +413,4 @@ public void testDisplayPositionOfValueOutOfRange() {
         assertEquals(-1, axis.getDisplayPosition(-1), 1e-10);
         assertEquals(11, axis.getDisplayPosition(11), 1e-10);
     }
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/chart/XYChartDataTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/chart/XYChartDataTest.java
index e9f57b74d05..f4fed1f4463 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/chart/XYChartDataTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/chart/XYChartDataTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 
 package test.javafx.scene.chart;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.scene.chart.CategoryAxis;
@@ -32,9 +33,7 @@
 import javafx.scene.chart.NumberAxis;
 import javafx.scene.chart.XYChart;
 import javafx.scene.chart.XYChartShim;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
 
 /**
  */
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/chart/XYChartTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/chart/XYChartTest.java
index 841956311c2..39f25c33b0d 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/chart/XYChartTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/chart/XYChartTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,20 +25,21 @@
 
 package test.javafx.scene.chart;
 
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleListProperty;
-import org.junit.Test;
-import javafx.collections.*;
-import javafx.scene.chart.Axis.TickMark;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.css.CssParserShim;
 import javafx.css.ParsedValue;
 import javafx.css.StyleableProperty;
-import javafx.css.CssParserShim;
 import javafx.scene.Node;
 import javafx.scene.ParentShim;
 import javafx.scene.Scene;
 import javafx.scene.chart.AreaChart;
 import javafx.scene.chart.Axis;
+import javafx.scene.chart.Axis.TickMark;
 import javafx.scene.chart.AxisShim;
 import javafx.scene.chart.CategoryAxis;
 import javafx.scene.chart.Chart;
@@ -47,12 +48,10 @@
 import javafx.scene.chart.XYChart;
 import javafx.scene.layout.StackPane;
 import javafx.scene.paint.Color;
-
 import javafx.scene.text.Font;
 import javafx.scene.text.Text;
 import javafx.stage.Stage;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
+import org.junit.jupiter.api.Test;
 import test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils;
 
 public class XYChartTest extends ChartTestBase {
@@ -61,22 +60,29 @@ public class XYChartTest extends ChartTestBase {
     AreaChart<String, Number> areachart;
 
     @Override
-    protected Chart createChart() {
+    protected void createChart() {
         yaxis = new NumberAxis();
         areachart = new AreaChart<>(new CategoryAxis(), yaxis);
+        areachart.setAnimated(false);
+    }
+
+    @Override
+    protected Chart getChart() {
         return areachart;
     }
 
     @Test
     public void testTickMarksToString() {
+        createChart();
         startApp();
         pulse();
         yaxis.getTickMarks().toString();
-        //System.out.println(" --- "+yaxis.getTickMarks().toString());
     }
 
     // RT-22166
-    @Test public void testTickLabelFont() {
+    @Test
+    public void testTickLabelFont() {
+        createChart();
         startApp();
         Font f = yaxis.getTickLabelFont();
         // default caspian value for font size = 10
@@ -101,7 +107,9 @@ public void testTickMarksToString() {
         assertEquals(12, Double.valueOf(AxisShim.TickMark_get_textNode(tm).getFont().getSize()).intValue());
     }
 
-    @Test public void testSetTickLabelFill() {
+    @Test
+    public void testSetTickLabelFill() {
+        createChart();
         startApp();
         pulse();
         yaxis.setTickLabelFill(Color.web("#444444"));
@@ -114,7 +122,9 @@ public void testTickMarksToString() {
         }
     }
 
-    @Test public void testAddAxisWithoutSpecifyingSide() {
+    @Test
+    public void testAddAxisWithoutSpecifyingSide() {
+        createChart();
         final NumberAxis axis = new NumberAxis(0, 12, 1);
         axis.setMaxWidth(Double.MAX_VALUE);
         axis.setPrefWidth(400);
@@ -129,14 +139,17 @@ public void testTickMarksToString() {
         pulse();
     }
 
-    @Test public void testLegendSizeWhenThereIsNoChartData() {
+    @Test
+    public void testLegendSizeWhenThereIsNoChartData() {
+        createChart();
         startApp();
         assertEquals(0, ChartShim.getLegend(areachart).prefHeight(-1), 0);
         assertEquals(0, ChartShim.getLegend(areachart).prefWidth(-1), 0);
     }
 
-
-    @Test public void canModifySeriesWithoutChart() {
+    @Test
+    public void canModifySeriesWithoutChart() {
+        createChart();
         XYChart.Series series = new XYChart.Series();
 
         ObservableList<XYChart.Data> dataList1 = FXCollections.observableArrayList();
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/chart/XYChartTestBase.java b/modules/javafx.controls/src/test/java/test/javafx/scene/chart/XYChartTestBase.java
index e3120bad178..253b7e4a517 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/chart/XYChartTestBase.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/chart/XYChartTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,15 +25,13 @@
 
 package test.javafx.scene.chart;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import java.util.HashMap;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-
 import javafx.scene.Node;
 import javafx.scene.chart.XYChart;
 import javafx.scene.chart.XYChartShim;
-import static org.junit.Assert.assertEquals;
-
 
 public abstract class XYChartTestBase extends ChartTestBase {
 
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/chart/XYNumberChartsTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/chart/XYNumberChartsTest.java
index 7595de6ec0a..940495a2fc8 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/chart/XYNumberChartsTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/chart/XYNumberChartsTest.java
@@ -28,6 +28,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.scene.chart.AreaChart;
 import javafx.scene.chart.Axis;
 import javafx.scene.chart.BubbleChart;
@@ -37,51 +38,73 @@
 import javafx.scene.chart.ScatterChart;
 import javafx.scene.chart.StackedAreaChart;
 import javafx.scene.chart.XYChart;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.Arguments;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertTimeout;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.params.provider.Arguments;
 
-@RunWith(Parameterized.class)
 public class XYNumberChartsTest extends XYNumberChartsTestBase {
-    private Class chartClass;
-    int nodesPerSeries;
 
-    @Parameterized.Parameters
-    public static Collection implementations() {
-        return Arrays.asList(new Object[][] {
-            { AreaChart.class, 1, },
-            { BubbleChart.class, 0, },
-            { LineChart.class, 1, },
-            { ScatterChart.class, 0, },
-            { StackedAreaChart.class, 1, },
-        });
+    private static Stream<Arguments> parameters() {
+        return Stream.of(
+            Arguments.of(AreaChart.class, 1),
+            Arguments.of(BubbleChart.class, 0),
+            Arguments.of(LineChart.class, 1),
+            Arguments.of(ScatterChart.class, 0),
+            Arguments.of(StackedAreaChart.class, 1)
+        );
     }
 
-    public XYNumberChartsTest(Class chartClass, int nodesPerSeries) {
-        this.chartClass = chartClass;
-        this.nodesPerSeries = nodesPerSeries;
+    @Override
+    protected void createChart() {
+        // will be using createChart() below
     }
 
-    @Override
-    protected Chart createChart() {
+    protected void createChart(Class<?> chartClass, int nodesPerSeries) {
         try {
-            chart = (XYChart<Number, Number>) chartClass.getConstructor(Axis.class, Axis.class).
-                newInstance(new NumberAxis(), new NumberAxis());
+            chart = (XYChart<Number, Number>)chartClass.getConstructor(Axis.class, Axis.class).newInstance(new NumberAxis(), new NumberAxis());
+            chart.setAnimated(false);
         } catch (InvocationTargetException e) {
             throw new AssertionError(e.getCause());
         } catch (Exception e) {
             throw new AssertionError(e);
         }
+    }
+
+    @Override
+    protected Chart getChart() {
         return chart;
     }
 
-    @Test
-    public void testSeriesClearAnimated_rt_40632() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSeriesClearAnimated_rt_40632(Class<?> chartClass, int nodesPerSeries) {
+        createChart(chartClass, nodesPerSeries);
         checkSeriesClearAnimated_rt_40632();
     }
 
-    @Test
-    public void testSeriesRemove() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSeriesRemove(Class<?> chartClass, int nodesPerSeries) {
+        createChart(chartClass, nodesPerSeries);
         checkSeriesRemove(seriesData.size() + nodesPerSeries);
     }
 
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/chart/XYNumberChartsTestBase.java b/modules/javafx.controls/src/test/java/test/javafx/scene/chart/XYNumberChartsTestBase.java
index 593d76f576d..496a2d4380f 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/chart/XYNumberChartsTestBase.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/chart/XYNumberChartsTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,12 @@
 
 package test.javafx.scene.chart;
 
-import test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.scene.chart.XYChart;
 import javafx.scene.chart.XYChartShim;
-import static org.junit.Assert.assertEquals;
+import test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils;
 
 abstract public class XYNumberChartsTestBase extends XYChartTestBase {
     XYChart<Number, Number> chart;
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/chart/XYNumberLineChartsTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/chart/XYNumberLineChartsTest.java
index c79e600ea48..63b831badf7 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/chart/XYNumberLineChartsTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/chart/XYNumberLineChartsTest.java
@@ -25,14 +25,11 @@
 
 package test.javafx.scene.chart;
 
-import javafx.scene.shape.MoveTo;
-import javafx.scene.shape.Path;
-import test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
+import java.util.stream.Stream;
 import javafx.scene.chart.AreaChart;
 import javafx.scene.chart.Axis;
 import javafx.scene.chart.Chart;
@@ -41,60 +38,65 @@
 import javafx.scene.chart.StackedAreaChart;
 import javafx.scene.chart.XYChart;
 import javafx.scene.chart.XYChartShim;
-import static org.junit.Assert.assertEquals;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import javafx.scene.shape.MoveTo;
+import javafx.scene.shape.Path;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils;
 
-@RunWith(Parameterized.class)
 public class XYNumberLineChartsTest extends XYNumberChartsTestBase {
-    private final Class chartClass;
-    private final int seriesFadeOutTime;
-    private final int dataFadeOutTime;
-
-    @Parameterized.Parameters
-    public static Collection implementations() {
-        return Arrays.asList(new Object[][] {
-            { AreaChart.class, 400, 800 },
-            { LineChart.class, 900, 500 },
-            { StackedAreaChart.class, 400, 800 }
-        });
-    }
 
-    public XYNumberLineChartsTest(Class chartClass, int seriesFadeOutTime, int dataFadeOutTime) {
-        this.chartClass = chartClass;
-        this.seriesFadeOutTime = seriesFadeOutTime;
-        this.dataFadeOutTime = dataFadeOutTime;
+    private static Stream<Arguments> parameters() {
+        return Stream.of(
+            Arguments.of(AreaChart.class, 400, 800),
+            Arguments.of(LineChart.class, 900, 500),
+            Arguments.of(StackedAreaChart.class, 400, 800)
+        );
     }
 
     @Override
-    protected Chart createChart() {
+    protected void createChart() {
+        // will be using createChart() below
+    }
+
+    protected void createChart(Class<?> chartClass, int seriesFadeOutTime, int dataFadeOutTime) {
         try {
-            chart = (XYChart<Number, Number>) chartClass.getConstructor(Axis.class, Axis.class).
-                newInstance(new NumberAxis(), new NumberAxis());
+            chart = (XYChart<Number, Number>) chartClass.getConstructor(Axis.class, Axis.class).newInstance(new NumberAxis(), new NumberAxis());
             Method setCreateSymbolsMethod = chartClass.getMethod("setCreateSymbols", Boolean.TYPE);
             setCreateSymbolsMethod.invoke(chart, false);
+            chart.setAnimated(false);
         } catch (InvocationTargetException e) {
             throw new AssertionError(e.getCause());
         } catch (Exception e) {
             throw new AssertionError(e);
         }
+    }
+
+    @Override
+    protected Chart getChart() {
         return chart;
     }
 
-    @Test
-    public void testSeriesClearAnimatedWithoutSymbols_rt_40632() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSeriesClearAnimatedWithoutSymbols_rt_40632(Class<?> chartClass, int seriesFadeOutTime, int dataFadeOutTime) {
+        createChart(chartClass, seriesFadeOutTime, dataFadeOutTime);
         checkSeriesClearAnimated_rt_40632();
     }
 
-    @Test
-    public void testSeriesRemoveWithoutSymbols() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSeriesRemoveWithoutSymbols(Class<?> chartClass, int seriesFadeOutTime, int dataFadeOutTime) {
+        createChart(chartClass, seriesFadeOutTime, dataFadeOutTime);
         // 1 area group
         checkSeriesRemove(1);
     }
 
-    @Test
-    public void testSeriesRemoveWithoutSymbolsAnimated_rt_22124() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSeriesRemoveWithoutSymbolsAnimated_rt_22124(Class<?> chartClass, int seriesFadeOutTime, int dataFadeOutTime) {
+        createChart(chartClass, seriesFadeOutTime, dataFadeOutTime);
         startAppWithSeries();
         // 1 area group
         assertEquals(1, XYChartShim.getPlotChildren(chart).size());
@@ -112,8 +114,10 @@ public void testSeriesRemoveWithoutSymbolsAnimated_rt_22124() {
         assertEquals(0, XYChartShim.getPlotChildren(chart).size());
     }
 
-    @Test
-    public void testDataWithoutSymbolsAddWithAnimation_rt_39353() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testDataWithoutSymbolsAddWithAnimation_rt_39353(Class<?> chartClass, int seriesFadeOutTime, int dataFadeOutTime) {
+        createChart(chartClass, seriesFadeOutTime, dataFadeOutTime);
         startAppWithSeries();
         chart.setAnimated(true);
         series.getData().add(new XYChart.Data<>(30, 30));
@@ -122,8 +126,10 @@ public void testDataWithoutSymbolsAddWithAnimation_rt_39353() {
         });
     }
 
-    @Test
-    public void testSeriesClearWithoutSymbolsAnimated_8150264() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSeriesClearWithoutSymbolsAnimated_8150264(Class<?> chartClass, int seriesFadeOutTime, int dataFadeOutTime) {
+        createChart(chartClass, seriesFadeOutTime, dataFadeOutTime);
         startAppWithSeries();
         assertEquals(3, XYChartShim.Series_getDataSize(series));
 
@@ -140,8 +146,10 @@ public void testSeriesClearWithoutSymbolsAnimated_8150264() {
         assertEquals(0, XYChartShim.Series_getDataSize(series));
     }
 
-    @Test
-    public void testMinorTicksMatchMajorTicksAfterAnimation() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testMinorTicksMatchMajorTicksAfterAnimation(Class<?> chartClass, int seriesFadeOutTime, int dataFadeOutTime) {
+        createChart(chartClass, seriesFadeOutTime, dataFadeOutTime);
         startAppWithSeries();
         chart.setAnimated(true);
         // increase ranges, starting axis animation
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/AcceleratorParameterizedTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/AcceleratorParameterizedTest.java
index 6d057dcdace..0bb3b459a8d 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/AcceleratorParameterizedTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/AcceleratorParameterizedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,24 +25,15 @@
 
 package test.javafx.scene.control;
 
-import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.*;
-import test.com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
-import test.com.sun.javafx.scene.control.infrastructure.KeyModifier;
-import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.fail;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.getListenerCount;
+import java.util.List;
+import java.util.stream.Stream;
 import javafx.beans.property.ObjectProperty;
-import javafx.scene.Scene;
-import javafx.scene.input.KeyCode;
-import javafx.scene.input.KeyCombination;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.Arrays;
-import java.util.Collection;
 import javafx.scene.Group;
+import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.Menu;
@@ -53,47 +44,46 @@
 import javafx.scene.control.TableView;
 import javafx.scene.control.TreeTableColumn;
 import javafx.scene.control.TreeTableView;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyCombination;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import test.com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
+import test.com.sun.javafx.scene.control.infrastructure.KeyModifier;
+import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.fail;
-
-@RunWith(Parameterized.class)
 public class AcceleratorParameterizedTest {
 
     private int eventCounter = 0;
-
     private MenuItem item1;
     private ContextMenu menu;
-
     private ObjectProperty<ContextMenu> contextMenuProperty;
-
     private Button btn;
     private Tab tab;
     private TableColumn<?,?> tableColumn;
     private TreeTableColumn<?,?> treeTableColumn;
-
     private StageLoader sl;
     private Scene scene;
     private KeyEventFirer keyboard;
 
-    private Class<?> testClass;
-
-    @Parameterized.Parameters
-    public static Collection implementations() {
-        return Arrays.asList(new Object[][]{
-            {Button.class},
-            {Tab.class},
-            {TableColumn.class},
-            {TreeTableColumn.class}
-        });
+    private static List<Class> parameters() {
+        return List.of(
+            Button.class,
+            Tab.class,
+            TableColumn.class,
+            TreeTableColumn.class
+        );
     }
 
-    public AcceleratorParameterizedTest(Class<?> testClass) {
-        this.testClass = testClass;
-    }
-
-    @Before public void setup() {
+    // @BeforeEach
+    // junit5 does not support parameterized class-level tests yet
+    private void setup(Class<?> testClass) {
         eventCounter = 0;
 
         item1 = new MenuItem("Item 1");
@@ -141,7 +131,8 @@ public AcceleratorParameterizedTest(Class<?> testClass) {
         keyboard = new KeyEventFirer(scene);
     }
 
-    @After public void cleanup() {
+    @AfterEach
+    public void cleanup() {
         sl.dispose();
     }
 
@@ -152,8 +143,10 @@ private void assertSceneDoesNotContainKeyCombination(KeyCombination keyCombinati
         assertFalse(scene.getAccelerators().containsKey(keyCombination));
     }
 
-
-    @Test public void rt_28136_assertContextMenuAcceleratorWorks() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void rt_28136_assertContextMenuAcceleratorWorks(Class c) {
+        setup(c);
         keyboard.doKeyPress(KeyCode.DIGIT1, KeyModifier.ALT);
         assertEquals(1, eventCounter);
 
@@ -162,7 +155,10 @@ private void assertSceneDoesNotContainKeyCombination(KeyCombination keyCombinati
         assertEquals(3, eventCounter);
     }
 
-    @Test public void rt_28136_assertContextMenuAcceleratorWorksWithNewMenuItemAdded() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void rt_28136_assertContextMenuAcceleratorWorksWithNewMenuItemAdded(Class c) {
+        setup(c);
         MenuItem item2 = new MenuItem("Item 2");
         item2.setOnAction(e -> eventCounter++);
         item2.setAccelerator(KeyCombination.valueOf("alt+2"));
@@ -177,7 +173,10 @@ private void assertSceneDoesNotContainKeyCombination(KeyCombination keyCombinati
         assertEquals(2, eventCounter);
     }
 
-    @Test public void rt_28136_assertContextMenuStopsFiringWhenMenuItemRemoved() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void rt_28136_assertContextMenuStopsFiringWhenMenuItemRemoved(Class c) {
+        setup(c);
         menu.getItems().remove(item1);
         assertSceneDoesNotContainKeyCombination(KeyCombination.keyCombination("alt+1"));
 
@@ -189,7 +188,10 @@ private void assertSceneDoesNotContainKeyCombination(KeyCombination keyCombinati
         assertEquals(0, eventCounter);
     }
 
-    @Test public void rt_28136_assertAcceleratorChangeToNullWorks_oldAcceleratorStopsFiring() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void rt_28136_assertAcceleratorChangeToNullWorks_oldAcceleratorStopsFiring(Class c) {
+        setup(c);
         item1.setAccelerator(null);
         assertSceneDoesNotContainKeyCombination(KeyCombination.keyCombination("alt+1"));
 
@@ -197,7 +199,10 @@ private void assertSceneDoesNotContainKeyCombination(KeyCombination keyCombinati
         assertEquals(0, eventCounter);
     }
 
-    @Test public void rt_28136_assertAcceleratorChangeToNonNullWorks_oldAcceleratorStopsFiring() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void rt_28136_assertAcceleratorChangeToNonNullWorks_oldAcceleratorStopsFiring(Class c) {
+        setup(c);
         item1.setAccelerator(KeyCombination.valueOf("alt+A"));
         assertSceneDoesNotContainKeyCombination(KeyCombination.keyCombination("alt+1"));
 
@@ -205,7 +210,10 @@ private void assertSceneDoesNotContainKeyCombination(KeyCombination keyCombinati
         assertEquals(0, eventCounter);
     }
 
-    @Test public void rt_28136_assertAcceleratorChangeToNonNullWorks_newAcceleratorStartsFiring() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void rt_28136_assertAcceleratorChangeToNonNullWorks_newAcceleratorStartsFiring(Class c) {
+        setup(c);
         item1.setAccelerator(KeyCombination.valueOf("alt+A"));
         assertSceneDoesNotContainKeyCombination(KeyCombination.keyCombination("alt+1"));
 
@@ -213,7 +221,10 @@ private void assertSceneDoesNotContainKeyCombination(KeyCombination keyCombinati
         assertEquals(1, eventCounter);
     }
 
-    @Test public void rt_28136_assertNewMenuWithMenuItemAcceleratorsFire() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void rt_28136_assertNewMenuWithMenuItemAcceleratorsFire(Class c) {
+        setup(c);
         MenuItem item2 = new MenuItem("Item 2");
         item2.setOnAction(e -> eventCounter++);
         item2.setAccelerator(KeyCombination.valueOf("alt+2"));
@@ -232,7 +243,10 @@ private void assertSceneDoesNotContainKeyCombination(KeyCombination keyCombinati
         assertEquals(2, eventCounter);
     }
 
-    @Test public void rt_28136_assertRemovedMenuItemAcceleratorInSubmenuDoesNotFire() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void rt_28136_assertRemovedMenuItemAcceleratorInSubmenuDoesNotFire(Class c) {
+        setup(c);
         MenuItem item2 = new MenuItem("Item 2");
         item2.setOnAction(e -> eventCounter++);
         item2.setAccelerator(KeyCombination.valueOf("alt+2"));
@@ -263,7 +277,10 @@ private void assertSceneDoesNotContainKeyCombination(KeyCombination keyCombinati
         assertEquals(3, eventCounter);
     }
 
-    @Test public void rt_28136_assertRemovedMenuWithMenuItemAcceleratorsDoesNotFire() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void rt_28136_assertRemovedMenuWithMenuItemAcceleratorsDoesNotFire(Class c) {
+        setup(c);
         MenuItem item2 = new MenuItem("Item 2");
         item2.setOnAction(e -> eventCounter++);
         item2.setAccelerator(KeyCombination.valueOf("alt+2"));
@@ -294,14 +311,20 @@ private void assertSceneDoesNotContainKeyCombination(KeyCombination keyCombinati
         assertEquals(3, eventCounter);
     }
 
-    @Test public void rt_28136_assertAcceleratorIsNotFiredWhenContextMenuIsRemoved() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void rt_28136_assertAcceleratorIsNotFiredWhenContextMenuIsRemoved(Class c) {
+        setup(c);
         contextMenuProperty.set(null);
 
         keyboard.doKeyPress(KeyCode.DIGIT1, KeyModifier.ALT);
         assertEquals(0, eventCounter);
     }
 
-    @Test public void testAcceleratorShouldNotGetFiredWhenMenuItemRemovedFromScene() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testAcceleratorShouldNotGetFiredWhenMenuItemRemovedFromScene(Class c) {
+        setup(c);
         KeyEventFirer kb = new KeyEventFirer(item1, scene);
 
         kb.doKeyPress(KeyCode.DIGIT1, KeyModifier.ALT);
@@ -317,7 +340,10 @@ private void assertSceneDoesNotContainKeyCombination(KeyCombination keyCombinati
         assertEquals(1, eventCounter);
     }
 
-    @Test public void testAcceleratorShouldGetFiredWhenMenuItemRemovedAndAddedBackToScene() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testAcceleratorShouldGetFiredWhenMenuItemRemovedAndAddedBackToScene(Class c) {
+        setup(c);
         KeyEventFirer kb = new KeyEventFirer(item1, scene);
 
         kb.doKeyPress(KeyCode.DIGIT1, KeyModifier.ALT);
@@ -332,7 +358,10 @@ private void assertSceneDoesNotContainKeyCombination(KeyCombination keyCombinati
         assertEquals(2, eventCounter);
     }
 
-    @Test public void testAcceleratorShouldGetFiredWhenMenuItemRemovedAndAddedToDifferentScene() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testAcceleratorShouldGetFiredWhenMenuItemRemovedAndAddedToDifferentScene(Class c) {
+        setup(c);
         KeyEventFirer kb = new KeyEventFirer(item1, scene);
 
         kb.doKeyPress(KeyCode.DIGIT1, KeyModifier.ALT);
@@ -349,8 +378,11 @@ private void assertSceneDoesNotContainKeyCombination(KeyCombination keyCombinati
         assertEquals(2, eventCounter);
     }
 
-    @Ignore("JDK-8268374")
-    @Test public void testAcceleratorShouldNotGetFiredWhenControlsIsRemovedFromSceneThenContextMenuIsSetToNullAndControlIsAddedBackToScene() {
+    @Disabled("JDK-8268374")
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testAcceleratorShouldNotGetFiredWhenControlsIsRemovedFromSceneThenContextMenuIsSetToNullAndControlIsAddedBackToScene(Class testClass) {
+        setup(testClass);
         KeyEventFirer kb = new KeyEventFirer(item1, scene);
         kb.doKeyPress(KeyCode.DIGIT1, KeyModifier.ALT);
         assertEquals(1, eventCounter);
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/AccordionTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/AccordionTest.java
index d5dda409a65..7f1d19f8295 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/AccordionTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/AccordionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,25 +25,27 @@
 
 package test.javafx.scene.control;
 
-import com.sun.javafx.application.PlatformImpl;
-import test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils;
-import test.com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
-import com.sun.javafx.tk.Toolkit;
-import javafx.scene.Scene;
-import javafx.scene.layout.StackPane;
-import javafx.stage.Stage;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.value.ObservableValue;
+import javafx.scene.Scene;
 import javafx.scene.control.Accordion;
 import javafx.scene.control.Button;
 import javafx.scene.control.TitledPane;
 import javafx.scene.input.KeyCode;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
+import javafx.scene.layout.StackPane;
+import javafx.stage.Stage;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.application.PlatformImpl;
+import com.sun.javafx.tk.Toolkit;
 import test.com.sun.javafx.pgstub.StubToolkit;
+import test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils;
+import test.com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
 
 /**
  */
@@ -54,7 +56,8 @@ public class AccordionTest {
     private Stage stage;
     private StackPane root;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         tk = Toolkit.getToolkit();
 
         assertTrue(tk instanceof StubToolkit);  // Ensure it's StubToolkit
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/AlertTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/AlertTest.java
index cfee0d6f039..4a29cf7c4b5 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/AlertTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/AlertTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,10 @@
  */
 package test.javafx.scene.control;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.Locale;
 import javafx.application.Platform;
 import javafx.scene.control.Alert;
 import javafx.scene.control.ButtonType;
@@ -32,11 +36,8 @@
 import javafx.scene.control.HeavyweightDialogShim;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
-import java.util.Locale;
-import org.junit.After;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Note that this class tests non-blocking alerts only. For blocking alerts,
@@ -57,7 +58,8 @@ public class AlertTest {
     private boolean closeVetoed = false;
     private Object result = DUMMY_RESULT;
 
-    @After public void cleanup() {
+    @AfterEach
+    public void cleanup() {
         if (dialog != null) {
             getStage(dialog).close();
             dialog = null;
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ButtonBaseTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ButtonBaseTest.java
index d4b66bcefe6..fd6758014be 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ButtonBaseTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ButtonBaseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,14 +25,13 @@
 
 package test.javafx.scene.control;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertPseudoClassDoesNotExist;
 import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertPseudoClassExists;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.event.ActionEvent;
@@ -40,16 +39,16 @@
 import javafx.scene.Node;
 import javafx.scene.control.ButtonBase;
 import javafx.scene.shape.Rectangle;
-
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  */
 public class ButtonBaseTest {
     private ButtonBase btn;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         btn = new ButtonBaseMock();
     }
 
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ButtonTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ButtonTest.java
index 27df0fec4ee..75fc7dd28db 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ButtonTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ButtonTest.java
@@ -25,10 +25,24 @@
 
 package test.javafx.scene.control;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertPseudoClassDoesNotExist;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertPseudoClassExists;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
+import java.util.List;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.event.ActionEvent;
 import javafx.scene.Scene;
+import javafx.scene.control.Button;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.MenuItem;
+import javafx.scene.control.Skin;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.MouseButton;
 import javafx.scene.layout.BackgroundFill;
@@ -39,28 +53,14 @@
 import javafx.scene.paint.Stop;
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
-import java.util.List;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.tk.Toolkit;
 import test.com.sun.javafx.pgstub.StubToolkit;
 import test.com.sun.javafx.scene.control.infrastructure.ContextMenuEventFirer;
 import test.com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
 import test.com.sun.javafx.scene.control.infrastructure.MouseEventFirer;
-import com.sun.javafx.tk.Toolkit;
-import javafx.scene.control.Button;
-import javafx.scene.control.ContextMenu;
-import javafx.scene.control.MenuItem;
-import javafx.scene.control.Skin;
-import org.junit.Before;
-import org.junit.After;
-import org.junit.Test;
-import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertPseudoClassDoesNotExist;
-import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertPseudoClassExists;
-import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 /**
  * action (which can be bound, and can be null),
@@ -75,7 +75,8 @@ public class ButtonTest {
     private MouseEventFirer mouse; //Note : It is created and used by individual tests that need it
 
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         btn = new Button();
         tk = Toolkit.getToolkit();
 
@@ -87,7 +88,8 @@ public class ButtonTest {
         stage.setScene(scene);
     }
 
-    @After public void after() {
+    @AfterEach
+    public void after() {
         stage.hide();
 
         if (mouse != null) {
@@ -264,21 +266,19 @@ private void show() {
     }
 
     // Test for JDK-8209938
-    @Test public void defaultButtonSceneAccelerators() {
-        assertEquals("Scene.getAccelerators() should contain no accelerators.",
-            0, scene.getAccelerators().size());
+    @Test
+    public void defaultButtonSceneAccelerators() {
+        assertEquals(0, scene.getAccelerators().size(), "Scene.getAccelerators() should contain no accelerators.");
 
         HBox btnParent = new HBox();
         btnParent.getChildren().add(btn);
         root.getChildren().add(btnParent);
         btn.setDefaultButton(true);
         show();
-        assertEquals("Scene.getAccelerators() should contain one accelerator" +
-            " for Default button.", 1, scene.getAccelerators().size());
+        assertEquals(1, scene.getAccelerators().size(), "Scene.getAccelerators() should contain one accelerator for Default button.");
 
         root.getChildren().remove(btnParent);
-        assertEquals("Default button accelerator should be removed from" +
-            " Scene.getAccelerators().", 0, scene.getAccelerators().size());
+        assertEquals(0, scene.getAccelerators().size(), "Default button accelerator should be removed from Scene.getAccelerators().");
 
         tk.firePulse();
     }
@@ -339,21 +339,19 @@ private void show() {
     }
 
     // Test for JDK-8209938
-    @Test public void cancelButtonSceneAccelerators() {
-        assertEquals("Scene.getAccelerators() should contain no accelerators.",
-            0, scene.getAccelerators().size());
+    @Test
+    public void cancelButtonSceneAccelerators() {
+        assertEquals(0, scene.getAccelerators().size(), "Scene.getAccelerators() should contain no accelerators.");
 
         HBox btnParent = new HBox();
         btnParent.getChildren().add(btn);
         root.getChildren().add(btnParent);
         btn.setCancelButton(true);
         show();
-        assertEquals("Scene.getAccelerators() should contain one accelerator" +
-            " for Cancel button.", 1, scene.getAccelerators().size());
+        assertEquals(1, scene.getAccelerators().size(), "Scene.getAccelerators() should contain one accelerator for Cancel button.");
 
         root.getChildren().remove(btnParent);
-        assertEquals("Cancel button accelerator should be removed from" +
-            " Scene.getAccelerators().", 0, scene.getAccelerators().size());
+        assertEquals(0, scene.getAccelerators().size(), "Cancel button accelerator should be removed from Scene.getAccelerators().");
 
         tk.firePulse();
     }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/CellEditEventOfTableColumnTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/CellEditEventOfTableColumnTest.java
index 0ed34edbe39..f54d634defd 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/CellEditEventOfTableColumnTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/CellEditEventOfTableColumnTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,13 +25,10 @@
 
 package test.javafx.scene.control;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import static javafx.scene.control.TableColumn.*;
-import static org.junit.Assert.*;
-
+import static javafx.scene.control.TableColumn.editAnyEvent;
+import static javafx.scene.control.TableColumn.editCommitEvent;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -40,6 +37,9 @@
 import javafx.scene.control.TableColumn.CellEditEvent;
 import javafx.scene.control.TablePosition;
 import javafx.scene.control.TableView;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test cell edit event for TableColumn: must not throw NPE in accessors (JDK-8269871).
@@ -71,32 +71,32 @@ public void testDefaultOnCommitHandlerNullTablePosition() {
     @Test
     public void testNullTablePositionGetTableView() {
         CellEditEvent<String, String> ev = new CellEditEvent<>(table, null, editAnyEvent(), null);
-        assertNull("table must be null for null pos", ev.getTableView());
+        assertNull(ev.getTableView(), "table must be null for null pos");
     }
 
     @Test
     public void testNullTablePositionGetTableColumn() {
         CellEditEvent<String, String> ev = new CellEditEvent<>(table, null, editAnyEvent(), null);
-        assertNull("column must be null for null pos", ev.getTableColumn());
+        assertNull(ev.getTableColumn(), "column must be null for null pos");
     }
 
     @Test
     public void testNullTablePositionGetOldValue() {
         CellEditEvent<String, String> ev = new CellEditEvent<>(table, null, editAnyEvent(), null);
-        assertNull("oldValue must be null for null pos", ev.getOldValue());
+        assertNull(ev.getOldValue(), "oldValue must be null for null pos");
     }
 
     @Test
     public void testNullTablePositionGetRowValue() {
         CellEditEvent<String, String> ev = new CellEditEvent<>(table, null, editAnyEvent(), null);
-        assertNull("rowValue must be null for null pos", ev.getRowValue());
+        assertNull(ev.getRowValue(), "rowValue must be null for null pos");
     }
 
     @Test
     public void testNullTablePositionGetNewValue() {
         String editedValue = "edited";
         CellEditEvent<String, String> ev = new CellEditEvent<>(table, null, editAnyEvent(), editedValue);
-        assertEquals("editedValue must be available for null pos", editedValue, ev.getNewValue());
+        assertEquals(editedValue, ev.getNewValue(), "editedValue must be available for null pos");
     }
 
     @Test
@@ -104,7 +104,7 @@ public void testTablePositionWithNullTable() {
         String editedValue = "edited";
         TablePosition<String, String> pos = new TablePosition<>(null, 1, editingColumn);
         CellEditEvent<String, String> ev = new CellEditEvent<>(table, pos, editAnyEvent(), editedValue);
-        assertNull("rowValue must be null for null pos", ev.getRowValue());
+        assertNull(ev.getRowValue(), "rowValue must be null for null pos");
     }
 
 //---------- event source
@@ -163,7 +163,8 @@ private <S, T> void assertCellEditEventState(CellEditEvent<S, T> event,
 
 //------------ init
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         Thread.currentThread().setUncaughtExceptionHandler((thread, throwable) -> {
             if (throwable instanceof RuntimeException) {
                 throw (RuntimeException)throwable;
@@ -179,9 +180,8 @@ private <S, T> void assertCellEditEventState(CellEditEvent<S, T> event,
         table.getColumns().addAll(editingColumn);
     }
 
-    @After
+    @AfterEach
     public void cleanup() {
         Thread.currentThread().setUncaughtExceptionHandler(null);
     }
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/CellEditEventOfTreeTableColumnTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/CellEditEventOfTreeTableColumnTest.java
index f23ede4b11b..62e004ff3a8 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/CellEditEventOfTreeTableColumnTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/CellEditEventOfTreeTableColumnTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,16 +25,11 @@
 
 package test.javafx.scene.control;
 
-import java.util.stream.Collectors;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
+import static javafx.scene.control.TreeTableColumn.editAnyEvent;
 import static javafx.scene.control.TreeTableColumn.editCommitEvent;
-import static javafx.scene.control.TreeTableColumn.*;
-import static org.junit.Assert.*;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import java.util.stream.Collectors;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.event.Event;
@@ -43,6 +38,9 @@
 import javafx.scene.control.TreeTableColumn.CellEditEvent;
 import javafx.scene.control.TreeTablePosition;
 import javafx.scene.control.TreeTableView;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test cell edit event for TableColumn: must not throw NPE in accessors (JDK-8269871).
@@ -74,32 +72,32 @@ public void testDefaultOnCommitHandlerNullTablePosition() {
     @Test
     public void testNullTablePositionGetTableView() {
         CellEditEvent<String, String> ev = new CellEditEvent<>(table, null, editAnyEvent(), null);
-        assertNull("treeTable must be null if pos is null", ev.getTreeTableView());
+        assertNull(ev.getTreeTableView(), "treeTable must be null if pos is null");
     }
 
     @Test
     public void testNullTablePositionGetTableColumn() {
         CellEditEvent<String, String> ev = new CellEditEvent<>(table, null, editAnyEvent(), null);
-        assertNull("column must be null for null pos", ev.getTableColumn());
+        assertNull(ev.getTableColumn(), "column must be null for null pos");
     }
 
     @Test
     public void testNullTablePositionGetOldValue() {
         CellEditEvent<String, String> ev = new CellEditEvent<>(table, null, editAnyEvent(), null);
-        assertNull("oldValue must be null for null pos", ev.getOldValue());
+        assertNull(ev.getOldValue(), "oldValue must be null for null pos");
     }
 
     @Test
     public void testNullTablePositionGetRowValue() {
         CellEditEvent<String, String> ev = new CellEditEvent<>(table, null, editAnyEvent(), null);
-        assertNull("rowValue must be null for null pos", ev.getRowValue());
+        assertNull(ev.getRowValue(), "rowValue must be null for null pos");
     }
 
     @Test
     public void testNullTablePositionGetNewValue() {
         String editedValue = "edited";
         CellEditEvent<String, String> ev = new CellEditEvent<>(table, null, editAnyEvent(), editedValue);
-        assertEquals("editedValue must be available for null pos", editedValue, ev.getNewValue());
+        assertEquals(editedValue, ev.getNewValue(), "editedValue must be available for null pos");
     }
 
     @Test
@@ -107,7 +105,7 @@ public void testTablePositionWithNullTable() {
         String editedValue = "edited";
         TreeTablePosition<String, String> pos = new TreeTablePosition<>(null, 1, editingColumn);
         CellEditEvent<String, String> ev = new CellEditEvent<>(table, pos, editAnyEvent(), editedValue);
-        assertNull("rowValue must be null for null pos", ev.getRowValue());
+        assertNull(ev.getRowValue(), "rowValue must be null for null pos");
     }
 
 // ------------- event source
@@ -168,7 +166,8 @@ private <S, T> void assertCellEditEventState(CellEditEvent<S, T> event,
 
 //------------ init
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         Thread.currentThread().setUncaughtExceptionHandler((thread, throwable) -> {
             if (throwable instanceof RuntimeException) {
                 throw (RuntimeException)throwable;
@@ -187,9 +186,8 @@ private <S, T> void assertCellEditEventState(CellEditEvent<S, T> event,
         editingColumn.setCellValueFactory(e -> e.getValue().valueProperty());
     }
 
-    @After
+    @AfterEach
     public void cleanup() {
         Thread.currentThread().setUncaughtExceptionHandler(null);
     }
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/CellTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/CellTest.java
index 0f170432275..c46f31a0577 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/CellTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/CellTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,16 +25,16 @@
 
 package test.javafx.scene.control;
 
-import com.sun.javafx.tk.Toolkit;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.stream.Stream;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.scene.Group;
 import javafx.scene.Scene;
-import javafx.stage.Stage;
-
-import java.util.Arrays;
-import java.util.Collection;
 import javafx.scene.control.Button;
 import javafx.scene.control.Cell;
 import javafx.scene.control.CellShim;
@@ -46,44 +46,39 @@
 import javafx.scene.control.TreeTableCell;
 import javafx.scene.control.TreeTableCellShim;
 import javafx.scene.control.TreeTableRow;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
+import javafx.stage.Stage;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import com.sun.javafx.tk.Toolkit;
 import test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils;
 
-import static org.junit.Assert.*;
-
 /**
  */
-@RunWith(Parameterized.class)
 public class CellTest {
-    @SuppressWarnings("rawtypes")
-    @Parameterized.Parameters public static Collection implementations() {
-        return Arrays.asList(new Object[][]{
-                {Cell.class},
-                {ListCell.class},
-                {TableRow.class},
+    private static Stream<Class> parameters() {
+        return Stream.of(
+                Cell.class,
+                ListCell.class,
+                TableRow.class,
                 // Note: We use the shim here, so we can lock the item. The behaviour is the same otherwise.
-                {TableCellShim.class},
-                {TreeCell.class},
-                {TreeTableRow.class},
+                TableCellShim.class,
+                TreeCell.class,
+                TreeTableRow.class,
                 // Note: We use the shim here, so we can lock the item.  The behaviour is the same otherwise.
-                {TreeTableCellShim.class}
-        });
+                TreeTableCellShim.class
+        );
     }
 
     private Cell<String> cell;
-    private Class type;
-
-    public CellTest(Class type) {
-        this.type = type;
-    }
 
-    @Before public void setup() throws Exception {
-        cell = (Cell<String>) type.getDeclaredConstructor().newInstance();
+    // @BeforeEach
+    // junit5 does not support parameterized class-level tests yet
+    private void setup(Class<?> type) {
+        try {
+            cell = (Cell<String>)type.getDeclaredConstructor().newInstance();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
 
         // Empty TableCells can be selected, as long as the row they exist in
         // is not empty, so here we set a TableRow to ensure testing works
@@ -105,7 +100,10 @@ public CellTest(Class type) {
      * Tests for the constructors                                        *
      ********************************************************************/
 
-    @Test public void cellsShouldBeNonFocusableByDefault() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void cellsShouldBeNonFocusableByDefault(Class<?> c) {
+        setup(c);
         // Cells are non-focusable because we manually position the focus from
         // the ListView / TableView / TreeView skin, rather than making them
         // focus traversable and having directional focus work etc. We must
@@ -115,11 +113,17 @@ public CellTest(Class type) {
         assertFalse(cell.isFocused());
     }
 
-    @Test public void styleClassShouldDefaultTo_cell() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void styleClassShouldDefaultTo_cell(Class<?> c) {
+        setup(c);
         ControlTestUtils.assertStyleClassContains(cell, "cell");
     }
 
-    @Test public void pseudoClassStateShouldBe_empty_ByDefault() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void pseudoClassStateShouldBe_empty_ByDefault(Class<?> c) {
+        setup(c);
         ControlTestUtils.assertPseudoClassExists(cell, "empty");
         ControlTestUtils.assertPseudoClassDoesNotExist(cell, "filled");
         ControlTestUtils.assertPseudoClassDoesNotExist(cell, "selected");
@@ -130,97 +134,142 @@ public CellTest(Class type) {
      * Tests for updating the item, selection, editable                  *
      ********************************************************************/
 
-    @Test public void updatingItemAffectsBothItemAndEmpty() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void updatingItemAffectsBothItemAndEmpty(Class<?> c) {
+        setup(c);
         CellShim.updateItem(cell, "Apples", false);
         assertEquals("Apples", cell.getItem());
         assertFalse(cell.isEmpty());
     }
 
-    @Test public void updatingItemWithEmptyTrueAndItemNotNullIsWeirdButOK() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void updatingItemWithEmptyTrueAndItemNotNullIsWeirdButOK(Class<?> c) {
+        setup(c);
         CellShim.updateItem(cell, "Weird!", true);
         assertEquals("Weird!", cell.getItem());
         assertTrue(cell.isEmpty());
     }
 
-    @Test public void updatingItemWithEmptyFalseAndNullItemIsOK() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void updatingItemWithEmptyFalseAndNullItemIsOK(Class<?> c) {
+        setup(c);
         CellShim.updateItem(cell, null, false);
         assertNull(cell.getItem());
         assertFalse(cell.isEmpty());
     }
 
-    @Test public void selectingANonEmptyCellIsOK() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectingANonEmptyCellIsOK(Class<?> c) {
+        setup(c);
         CellShim.updateItem(cell, "Oranges", false);
         cell.updateSelected(true);
         assertTrue(cell.isSelected());
     }
 
-    @Test public void unSelectingANonEmptyCellIsOK() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void unSelectingANonEmptyCellIsOK(Class<?> c) {
+        setup(c);
         CellShim.updateItem(cell, "Oranges", false);
         cell.updateSelected(true);
         cell.updateSelected(false);
         assertFalse(cell.isSelected());
     }
 
-    public void selectingAnEmptyCellResultsInNoChange() {
+    public void selectingAnEmptyCellResultsInNoChange(Class<?> c) {
         CellShim.updateItem(cell, null, true);
         cell.updateSelected(true);
         assertFalse(cell.isSelected());
     }
 
-    @Test public void updatingASelectedCellToBeEmptyClearsSelection() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void updatingASelectedCellToBeEmptyClearsSelection(Class<?> c) {
+        setup(c);
         CellShim.updateItem(cell, "Oranges", false);
         cell.updateSelected(true);
         CellShim.updateItem(cell, null, true);
         assertFalse(cell.isSelected());
     }
 
-    @Test public void updatingItemWithEmptyTrueResultsIn_empty_pseudoClassAndNot_filled() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void updatingItemWithEmptyTrueResultsIn_empty_pseudoClassAndNot_filled(Class<?> c) {
+        setup(c);
         CellShim.updateItem(cell, null, true);
         ControlTestUtils.assertPseudoClassExists(cell, "empty");
         ControlTestUtils.assertPseudoClassDoesNotExist(cell, "filled");
     }
 
-    @Test public void updatingItemWithEmptyFalseResultsIn_filled_pseudoClassAndNot_empty() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void updatingItemWithEmptyFalseResultsIn_filled_pseudoClassAndNot_empty(Class<?> c) {
+        setup(c);
         CellShim.updateItem(cell, null, false);
         ControlTestUtils.assertPseudoClassExists(cell, "filled");
         ControlTestUtils.assertPseudoClassDoesNotExist(cell, "empty");
     }
 
-    @Test public void updatingSelectedToTrueResultsIn_selected_pseudoClass() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void updatingSelectedToTrueResultsIn_selected_pseudoClass(Class<?> c) {
+        setup(c);
         CellShim.updateItem(cell, "Pears", false);
         cell.updateSelected(true);
         ControlTestUtils.assertPseudoClassExists(cell, "selected");
     }
 
-    @Test public void updatingSelectedToFalseResultsInNo_selected_pseudoClass() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void updatingSelectedToFalseResultsInNo_selected_pseudoClass(Class<?> c) {
+        setup(c);
         CellShim.updateItem(cell, "Pears", false);
         cell.updateSelected(true);
         cell.updateSelected(false);
         ControlTestUtils.assertPseudoClassDoesNotExist(cell, "selected");
     }
 
-    @Test public void editableIsTrueByDefault() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void editableIsTrueByDefault(Class<?> c) {
+        setup(c);
         assertTrue(cell.isEditable());
         assertTrue(cell.editableProperty().get());
     }
 
-    @Test public void editableCanBeSet() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void editableCanBeSet(Class<?> c) {
+        setup(c);
         cell.setEditable(false);
         assertFalse(cell.isEditable());
     }
 
-    @Test public void editableSetToNonDefaultValueIsReflectedInModel() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void editableSetToNonDefaultValueIsReflectedInModel(Class<?> c) {
+        setup(c);
         cell.setEditable(false);
         assertFalse(cell.editableProperty().get());
     }
 
-    @Test public void editableCanBeCleared() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void editableCanBeCleared(Class<?> c) {
+        setup(c);
         cell.setEditable(false);
         cell.setEditable(true);
         assertTrue(cell.isEditable());
     }
 
-    @Test public void editableCanBeBound() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void editableCanBeBound(Class<?> c) {
+        setup(c);
         BooleanProperty other = new SimpleBooleanProperty(false);
         cell.editableProperty().bind(other);
         assertFalse(cell.isEditable());
@@ -228,7 +277,10 @@ public void selectingAnEmptyCellResultsInNoChange() {
         assertTrue(cell.isEditable());
     }
 
-    @Test public void cannotSpecifyEditableViaCSS() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void cannotSpecifyEditableViaCSS(Class<?> c) {
+        setup(c);
         cell.setStyle("-fx-editable: false;");
         cell.applyCss();
         assertTrue(cell.isEditable());
@@ -245,19 +297,28 @@ public void selectingAnEmptyCellResultsInNoChange() {
      * Tests for editing                                                 *
      ********************************************************************/
 
-    @Test public void editingAnEmptyCellResultsInNoChange() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void editingAnEmptyCellResultsInNoChange(Class<?> c) {
+        setup(c);
         cell.startEdit();
         assertFalse(cell.isEditing());
     }
 
-    @Test public void editingAnEmptyCellResultsInNoChange2() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void editingAnEmptyCellResultsInNoChange2(Class<?> c) {
+        setup(c);
         CellShim.updateItem(cell, null, false);
         CellShim.updateItem(cell, null, true);
         cell.startEdit();
         assertFalse(cell.isEditing());
     }
 
-    @Test public void updatingACellBeingEditedDoesNotResultInACancelOfEdit() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void updatingACellBeingEditedDoesNotResultInACancelOfEdit(Class<?> c) {
+        setup(c);
         CellShim.updateItem(cell, "Apples", false);
         cell.startEdit();
         assertFalse(cell.isEmpty());
@@ -266,7 +327,10 @@ public void selectingAnEmptyCellResultsInNoChange() {
         assertTrue(cell.isEditing());
     }
 
-    @Test public void updatingACellBeingEditedDoesNotResultInACancelOfEdit2() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void updatingACellBeingEditedDoesNotResultInACancelOfEdit2(Class<?> c) {
+        setup(c);
         CellShim.updateItem(cell, "Apples", false);
         cell.startEdit();
         assertFalse(cell.isEmpty());
@@ -275,49 +339,70 @@ public void selectingAnEmptyCellResultsInNoChange() {
         assertTrue(cell.isEditing());
     }
 
-    @Test public void startEditWhenEditableIsTrue() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void startEditWhenEditableIsTrue(Class<?> c) {
+        setup(c);
         CellShim.updateItem(cell, "Apples", false);
         cell.startEdit();
         assertTrue(cell.isEditing());
     }
 
-    @Test public void startEditWhenEditableIsFalse() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void startEditWhenEditableIsFalse(Class<?> c) {
+        setup(c);
         CellShim.updateItem(cell, "Apples", false);
         cell.setEditable(false);
         cell.startEdit();
         assertFalse(cell.isEditing());
     }
 
-    @Test public void startEditWhileAlreadyEditingIsIgnored() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void startEditWhileAlreadyEditingIsIgnored(Class<?> c) {
+        setup(c);
         CellShim.updateItem(cell, "Apples", false);
         cell.startEdit();
         cell.startEdit();
         assertTrue(cell.isEditing());
     }
 
-    @Test public void cancelEditWhenEditableIsTrue() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void cancelEditWhenEditableIsTrue(Class<?> c) {
+        setup(c);
         CellShim.updateItem(cell, "Apples", false);
         cell.startEdit();
         cell.cancelEdit();
         assertFalse(cell.isEditing());
     }
 
-    @Test public void cancelEditWhenEditableIsFalse() {
-        CellShim.updateItem(cell, "Apples", false);
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void cancelEditWhenEditableIsFalse(Class<?> c) {
+        setup(c);
+       CellShim.updateItem(cell, "Apples", false);
         cell.setEditable(false);
         cell.startEdit();
         cell.cancelEdit();
         assertFalse(cell.isEditing());
     }
 
-    @Test public void commitEditWhenEditableIsTrue() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void commitEditWhenEditableIsTrue(Class<?> c) {
+        setup(c);
         CellShim.updateItem(cell, "Apples", false);
         cell.startEdit();
         cell.commitEdit("Oranges");
         assertFalse(cell.isEditing());
     }
 
-    @Test public void commitEditWhenEditableIsFalse() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void commitEditWhenEditableIsFalse(Class<?> c) {
+        setup(c);
         CellShim.updateItem(cell, "Apples", false);
         cell.setEditable(false);
         cell.startEdit();
@@ -325,47 +410,80 @@ public void selectingAnEmptyCellResultsInNoChange() {
         assertFalse(cell.isEditing());
     }
 
-    @Test public void getBeanIsCorrectForItemProperty() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void getBeanIsCorrectForItemProperty(Class<?> c) {
+        setup(c);
         assertSame(cell, cell.itemProperty().getBean());
     }
 
-    @Test public void getNameIsCorrectForItemProperty() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void getNameIsCorrectForItemProperty(Class<?> c) {
+        setup(c);
         assertEquals("item", cell.itemProperty().getName());
     }
 
-    @Test public void getBeanIsCorrectForEmptyProperty() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void getBeanIsCorrectForEmptyProperty(Class<?> c) {
+        setup(c);
         assertSame(cell, cell.emptyProperty().getBean());
     }
 
-    @Test public void getNameIsCorrectForEmptyProperty() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void getNameIsCorrectForEmptyProperty(Class<?> c) {
+        setup(c);
         assertEquals("empty", cell.emptyProperty().getName());
     }
 
-    @Test public void getBeanIsCorrectForSelectedProperty() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void getBeanIsCorrectForSelectedProperty(Class<?> c) {
+        setup(c);
         assertSame(cell, cell.selectedProperty().getBean());
     }
 
-    @Test public void getNameIsCorrectForSelectedProperty() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void getNameIsCorrectForSelectedProperty(Class<?> c) {
+        setup(c);
         assertEquals("selected", cell.selectedProperty().getName());
     }
 
-    @Test public void getBeanIsCorrectForEditingProperty() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void getBeanIsCorrectForEditingProperty(Class<?> c) {
+        setup(c);
         assertSame(cell, cell.editingProperty().getBean());
     }
 
-    @Test public void getNameIsCorrectForEditingProperty() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void getNameIsCorrectForEditingProperty(Class<?> c) {
+        setup(c);
         assertEquals("editing", cell.editingProperty().getName());
     }
 
-    @Test public void getBeanIsCorrectForEditableProperty() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void getBeanIsCorrectForEditableProperty(Class<?> c) {
+        setup(c);
         assertSame(cell, cell.editableProperty().getBean());
     }
 
-    @Test public void getNameIsCorrectForEditableProperty() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void getNameIsCorrectForEditableProperty(Class<?> c) {
+        setup(c);
         assertEquals("editable", cell.editableProperty().getName());
     }
 
-    @Test public void loseFocusWhileEditing() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void loseFocusWhileEditing(Class<?> c) {
+        setup(c);
         Button other = new Button();
         Group root = new Group(other, cell);
         Scene scene = new Scene(root);
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/CheckBoxTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/CheckBoxTest.java
index 02639a1630c..d5e70c7492a 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/CheckBoxTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/CheckBoxTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,23 +25,28 @@
 
 package test.javafx.scene.control;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertPseudoClassDoesNotExist;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertPseudoClassExists;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.geometry.Pos;
 import javafx.scene.control.CheckBox;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.*;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  */
 public class CheckBoxTest {
     private CheckBox btn;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         btn = new CheckBox();
     }
 
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/CheckBoxTreeItemTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/CheckBoxTreeItemTest.java
index 220c0e22669..9160c1c0dd4 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/CheckBoxTreeItemTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/CheckBoxTreeItemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,19 +24,18 @@
  */
 package test.javafx.scene.control;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.scene.control.CheckBoxTreeItem;
 import javafx.scene.control.TreeItem;
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Rectangle;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class CheckBoxTreeItemTest {
 
@@ -49,7 +48,8 @@ public class CheckBoxTreeItemTest {
             private CheckBoxTreeItem<String> subchild2;
         private CheckBoxTreeItem<String> child3;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         treeItem = new CheckBoxTreeItem<>();
 
         root = new CheckBoxTreeItem<>("root");
@@ -63,7 +63,8 @@ public class CheckBoxTreeItemTest {
         root.getChildren().addAll(child1, child2, child3);
     }
 
-    @After public void cleanup() {
+    @AfterEach
+    public void cleanup() {
         treeItem = null;
         root = null;
         child1 = null;
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/CheckMenuItemTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/CheckMenuItemTest.java
index 38b52e3d009..b4b8ccd15db 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/CheckMenuItemTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/CheckMenuItemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,19 +25,21 @@
 
 package test.javafx.scene.control;
 
-import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.*;
-
-import test.com.sun.javafx.pgstub.StubToolkit;
-import com.sun.javafx.tk.Toolkit;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.scene.Node;
 import javafx.scene.control.CheckMenuItem;
 import javafx.scene.shape.Rectangle;
-import static org.junit.Assert.*;
-
-
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.tk.Toolkit;
+import test.com.sun.javafx.pgstub.StubToolkit;
 
 /**
  *
@@ -49,7 +51,8 @@ public class CheckMenuItemTest {
     private CheckMenuItem checkMenuItemTwoArg;
     private Node node;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         assertTrue(Toolkit.getToolkit() instanceof StubToolkit);  // Ensure StubToolkit is loaded
 
         node = new Rectangle();
@@ -218,5 +221,4 @@ public class CheckMenuItemTest {
         cmi.selectedProperty().bind(other);
         assertEquals(other.get(), cmi.isSelected());
     }
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ChoiceBoxLabelTextTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ChoiceBoxLabelTextTest.java
index 95177d5bf54..4a8182f23f6 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ChoiceBoxLabelTextTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ChoiceBoxLabelTextTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,18 +25,12 @@
 
 package test.javafx.scene.control;
 
-import java.util.Arrays;
-import java.util.Collection;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.List;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import static org.junit.Assert.*;
-
+import java.util.stream.Stream;
 import javafx.collections.FXCollections;
 import javafx.scene.Node;
 import javafx.scene.Scene;
@@ -49,6 +43,9 @@
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
 import javafx.util.StringConverter;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Contains tests around the text shown in the box's label, mainly covering
@@ -58,268 +55,322 @@
  * It is parameterized in the converter
  * used by ChoiceBox.
  */
-@RunWith(Parameterized.class)
 public class ChoiceBoxLabelTextTest {
 
     private Scene scene;
     private Stage stage;
     private Pane root;
-
     private ChoiceBox<String> box;
-
-    private StringConverter<String> converter;
     private String uncontained;
 
 // -------------- test change uncontained -> different selected
 
-    @Test
-    public void testChangeUncontainedSelectIndex() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testChangeUncontainedSelectIndex(StringConverter<String> converter) {
+        setup(converter);
         showChoiceBox();
         box.setValue(uncontained);
         box.getSelectionModel().select(1);
-        assertEquals("label updated after select index ", getValueText(), getLabelText());
+        assertEquals(getValueText(), getLabelText(), "label updated after select index ");
     }
 
-    @Test
-    public void testChangeUncontainedSelectItem() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testChangeUncontainedSelectItem(StringConverter<String> converter) {
+        setup(converter);
         showChoiceBox();
         box.setValue(uncontained);
         box.getSelectionModel().select(box.getItems().get(1));
-        assertEquals("label updated after select item ", getValueText(), getLabelText());
+        assertEquals(getValueText(), getLabelText(), "label updated after select item ");
     }
 
-    @Test
-    public void testChangeUncontainedSelectItemOtherUncontained() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testChangeUncontainedSelectItemOtherUncontained(StringConverter<String> converter) {
+        setup(converter);
         showChoiceBox();
         box.setValue(uncontained);
         box.getSelectionModel().select(uncontained + "xx");
-        assertEquals("label updated after select item ", getValueText(), getLabelText());
+        assertEquals(getValueText(), getLabelText(), "label updated after select item ");
     }
 
-    @Test
-    public void testChangeUncontainedSetValue() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testChangeUncontainedSetValue(StringConverter<String> converter) {
+        setup(converter);
         showChoiceBox();
         box.setValue(uncontained);
         box.setValue(box.getItems().get(1));
-        assertEquals("label updated after select item ", getValueText(), getLabelText());
+        assertEquals(getValueText(), getLabelText(), "label updated after select item ");
     }
 
-    @Test
-    public void testChangeContainedSetValueOtherUncontained() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testChangeContainedSetValueOtherUncontained(StringConverter<String> converter) {
+        setup(converter);
         showChoiceBox();
         box.setValue(uncontained);
         box.setValue(uncontained + "xx");
-        assertEquals("label updated after select item ", getValueText(), getLabelText());
+        assertEquals(getValueText(), getLabelText(), "label updated after select item ");
     }
 
-    @Test
-    public void testChangeUncontainedClear() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testChangeUncontainedClear(StringConverter<String> converter) {
+        setup(converter);
         showChoiceBox();
         box.setValue(uncontained);
         box.getSelectionModel().clearSelection();
-        assertEquals("label updated after select item ", getValueText(), getLabelText());
+        assertEquals(getValueText(), getLabelText(), "label updated after select item ");
     }
 
 
 // ------------- test change selected contained -> different selected
 
-    @Test
-    public void testChangeContainedSelectIndex() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testChangeContainedSelectIndex(StringConverter<String> converter) {
+        setup(converter);
         showChoiceBox();
         int index = 1;
         box.setValue(box.getItems().get(index));
         box.getSelectionModel().select(index -1);
-        assertEquals("label updated after select index ", getValueText(), getLabelText());
+        assertEquals(getValueText(), getLabelText(), "label updated after select index ");
     }
 
-    @Test
-    public void testChangeContainedSelectItem() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testChangeContainedSelectItem(StringConverter<String> converter) {
+        setup(converter);
         showChoiceBox();
         int index = 1;
         box.setValue(box.getItems().get(index));
         box.getSelectionModel().select(box.getItems().get(index -1));
-        assertEquals("label updated after select item ", getValueText(), getLabelText());
+        assertEquals(getValueText(), getLabelText(), "label updated after select item ");
     }
 
-    @Test
-    public void testChangeContainedSelectItemUncontained() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testChangeContainedSelectItemUncontained(StringConverter<String> converter) {
+        setup(converter);
         showChoiceBox();
         int index = 1;
         box.setValue(box.getItems().get(index));
         box.getSelectionModel().select(uncontained);
-        assertEquals("label updated after select item ", getValueText(), getLabelText());
+        assertEquals(getValueText(), getLabelText(), "label updated after select item ");
     }
 
-    @Test
-    public void testChangeContainedSetValue() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testChangeContainedSetValue(StringConverter<String> converter) {
+        setup(converter);
         showChoiceBox();
         int index = 1;
         box.setValue(box.getItems().get(index));
         box.setValue(box.getItems().get(index -1));
-        assertEquals("label updated after set value ", getValueText(), getLabelText());
+        assertEquals(getValueText(), getLabelText(), "label updated after set value ");
     }
 
-    @Test
-    public void testChangeContainedSetValueUncontained() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testChangeContainedSetValueUncontained(StringConverter<String> converter) {
+        setup(converter);
         showChoiceBox();
         int index = 1;
         box.setValue(box.getItems().get(index));
         box.setValue(uncontained);
-        assertEquals("label updated after set value ", getValueText(), getLabelText());
+        assertEquals(getValueText(), getLabelText(), "label updated after set value ");
     }
 
-    @Test
-    public void testChangeContainedClear() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testChangeContainedClear(StringConverter<String> converter) {
+        setup(converter);
         showChoiceBox();
         int index = 1;
         box.setValue(box.getItems().get(index));
         box.getSelectionModel().clearSelection();
-        assertEquals("label updated after clear selection ", getValueText(), getLabelText());
+        assertEquals(getValueText(), getLabelText(), "label updated after clear selection ");
     }
 
 // ------------- test empty -> selected
 
-    @Test
-    public void testChangeEmptySelectIndex() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testChangeEmptySelectIndex(StringConverter<String> converter) {
+        setup(converter);
         showChoiceBox();
         box.getSelectionModel().select(1);
-        assertEquals("label updated after select index ", getValueText(), getLabelText());
+        assertEquals(getValueText(), getLabelText(), "label updated after select index ");
     }
 
-    @Test
-    public void testChangeEmptySelectItem() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testChangeEmptySelectItem(StringConverter<String> converter) {
+        setup(converter);
         showChoiceBox();
         box.getSelectionModel().select(box.getItems().get(1));
-        assertEquals("label updated after select item ", getValueText(), getLabelText());
+        assertEquals(getValueText(), getLabelText(), "label updated after select item ");
     }
 
-    @Test
-    public void testChangeEmptySelectItemUncontained() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testChangeEmptySelectItemUncontained(StringConverter<String> converter) {
+        setup(converter);
         showChoiceBox();
         box.getSelectionModel().select(uncontained);
-        assertEquals("label updated after select item ", getValueText(), getLabelText());
+        assertEquals(getValueText(), getLabelText(), "label updated after select item ");
     }
 
-    @Test
-    public void testChangeEmptySetValue() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testChangeEmptySetValue(StringConverter<String> converter) {
+        setup(converter);
         showChoiceBox();
         box.setValue(box.getItems().get(1));
-        assertEquals("label updated after set value ", getValueText(), getLabelText());
+        assertEquals(getValueText(), getLabelText(), "label updated after set value ");
     }
 
-    @Test
-    public void testChangeEmptySetValueUncontained() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testChangeEmptySetValueUncontained(StringConverter<String> converter) {
+        setup(converter);
         showChoiceBox();
         box.setValue(uncontained);
-        assertEquals("label updated after set value ", getValueText(), getLabelText());
+        assertEquals(getValueText(), getLabelText(), "label updated after set value ");
     }
 
 
 //------------- test initial label text
 
-    @Test
-    public void testInitialEmpty() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testInitialEmpty(StringConverter<String> converter) {
+        setup(converter);
         showChoiceBox();
-        assertEquals("label has empty value ", getValueText(), getLabelText());
+        assertEquals(getValueText(), getLabelText(), "label has empty value ");
     }
 
-    @Test
-    public void testInitialUncontained() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testInitialUncontained(StringConverter<String> converter) {
+        setup(converter);
         box.setValue(uncontained);
         showChoiceBox();
-        assertEquals("label has uncontainedValue ", getValueText(), getLabelText());
+        assertEquals(getValueText(), getLabelText(), "label has uncontainedValue ");
     }
 
-    @Test
-    public void testInitialUncontained1999() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testInitialUncontained1999(StringConverter<String> converter) {
+        setup(converter);
         box.getSelectionModel().select(1);
         box.setValue(uncontained);
         showChoiceBox();
-        assertEquals("label has uncontainedValue ", getValueText(), getLabelText());
+        assertEquals(getValueText(), getLabelText(), "label has uncontainedValue ");
     }
 
-    @Test
-    public void testInitialContained() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testInitialContained(StringConverter<String> converter) {
+        setup(converter);
         int index = 1;
         box.setValue(box.getItems().get(index));
         showChoiceBox();
-        assertEquals("label has contained value", getValueText(), getLabelText());
+        assertEquals(getValueText(), getLabelText(), "label has contained value");
     }
 
 //------------- test label text sync after modifications of items
 
-    @Test
-    public void testModifyItemsSetEqualList() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testModifyItemsSetEqualList(StringConverter<String> converter) {
+        setup(converter);
         showChoiceBox();
         box.setValue(uncontained);
         box.setItems(FXCollections.observableArrayList(box.getItems()));
-        assertEquals("label has uncontainedValue ", getValueText(), getLabelText());
+        assertEquals(getValueText(), getLabelText(), "label has uncontainedValue ");
     }
 
-    @Test
-    public void testModifyItemsSetItems() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testModifyItemsSetItems(StringConverter<String> converter) {
+        setup(converter);
         showChoiceBox();
         box.setValue(uncontained);
         box.setItems(FXCollections.observableArrayList("one", "two", "three"));
-        assertEquals("label has uncontainedValue ", getValueText(), getLabelText());
+        assertEquals(getValueText(), getLabelText(), "label has uncontainedValue ");
     }
 
-    @Test
-    public void testModifyItemsSetAll() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testModifyItemsSetAll(StringConverter<String> converter) {
+        setup(converter);
         showChoiceBox();
         box.setValue(uncontained);
         box.getItems().setAll(FXCollections.observableArrayList("one", "two", "three"));
-        assertEquals("label has uncontainedValue ", getValueText(), getLabelText());
+        assertEquals(getValueText(), getLabelText(), "label has uncontainedValue ");
     }
 
-    @Test
-    public void testModifyItemsRemoveItem() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testModifyItemsRemoveItem(StringConverter<String> converter) {
+        setup(converter);
         showChoiceBox();
         box.setValue(uncontained);
         box.getItems().remove(0);
-        assertEquals("sanity: is still set to uncontained", uncontained, box.getValue());
-        assertEquals("label has uncontainedValue ", getValueText(), getLabelText());
+        assertEquals(uncontained, box.getValue(), "sanity: is still set to uncontained");
+        assertEquals(getValueText(), getLabelText(), "label has uncontainedValue ");
     }
 
-    @Test
-    public void testModifyItemsReplaceItem() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testModifyItemsReplaceItem(StringConverter<String> converter) {
+        setup(converter);
         showChoiceBox();
         box.setValue(uncontained);
         box.getItems().set(0, "replaced");
-        assertEquals("label has uncontainedValue ", getValueText(), getLabelText());
+        assertEquals(getValueText(), getLabelText(), "label has uncontainedValue ");
     }
 
-    @Test
-    public void testModifyItemsAddItem() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testModifyItemsAddItem(StringConverter<String> converter) {
+        setup(converter);
         showChoiceBox();
         box.setValue(uncontained);
         box.getItems().add(0, "added");
-        assertEquals("label has uncontainedValue ", getValueText(), getLabelText());
+        assertEquals(getValueText(), getLabelText(), "label has uncontainedValue ");
     }
 
-    @Test
-    public void testToggleText() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testToggleText(StringConverter<String> converter) {
+        setup(converter);
         showChoiceBox();
         ContextMenu popup = ChoiceBoxSkinNodesShim.getChoiceBoxPopup((ChoiceBoxSkin) box.getSkin());
         for (int i = 0; i < popup.getItems().size(); i++) {
             MenuItem item = popup.getItems().get(i);
-            assertEquals("menuItem text at " + i, getItemText(box.getItems().get(i)), item.getText());
+            assertEquals(getItemText(box.getItems().get(i)), item.getText(), "menuItem text at " + i);
         }
     }
 
-    @Test
-    public void testToggleConverter() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testToggleConverter(StringConverter<String> converter) {
+        setup(converter);
         showChoiceBox();
         box.setValue(uncontained);
         // before fix failing here: initial state incorrect
-        assertEquals("sanity: label has uncontainedValue ", getValueText(), getLabelText());
+        assertEquals(getValueText(), getLabelText(), "sanity: label has uncontainedValue ");
         if (box.getConverter() == null) {
             box.setConverter(createStringConverter());
         } else {
             box.setConverter(null);
         }
-        assertEquals("after change converter - sanity: value is set to uncontained", uncontained, box.getValue());
-        assertEquals("after change converter - label has uncontainedValue ", getValueText(), getLabelText());
+        assertEquals(uncontained, box.getValue(), "after change converter - sanity: value is set to uncontained");
+        assertEquals(getValueText(), getLabelText(), "after change converter - label has uncontainedValue ");
     }
 
 // -------- helper methods
@@ -362,17 +413,11 @@ protected String getItemText(String value) {
         return value != null ? value : "";
     }
 
-
-//------------------ parameterized
-    // Note: name property not supported before junit 4.11
-    @Parameterized.Parameters
-    public static Collection<Object[]> data() {
-        // converter
-        Object[][] data = new Object[][] {
-            {null},
-            {createStringConverter()},
-        };
-        return Arrays.asList(data);
+    private static Stream<StringConverter<String>> parameters() {
+        return Stream.of(
+            null,
+            createStringConverter()
+        );
     }
 
     protected static StringConverter<String> createStringConverter() {
@@ -388,18 +433,15 @@ public String fromString(String string) {
                 throw new UnsupportedOperationException(
                         "conversion to value not supported");
             }
-
         };
     }
 
-    public ChoiceBoxLabelTextTest(StringConverter<String> converter) {
-        this.converter = converter;
-    }
-
 //------------------ setup/cleanup and initial state
 
-    @Test
-    public void testSetupState() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSetupState(StringConverter<String> converter) {
+        setup(converter);
         assertNotNull(box);
         showChoiceBox();
         List<Node> expected = List.of(box);
@@ -415,13 +457,14 @@ protected void showChoiceBox() {
         assertSame(box, scene.getFocusOwner());
     }
 
-    @After
+    @AfterEach
     public void cleanup() {
         stage.hide();
     }
 
-    @Before
-    public void setup() {
+    // @Before
+    // junit5 does not support parameterized class-level tests yet
+    public void setup(StringConverter<String> converter) {
         uncontained = "uncontained";
         root = new VBox();
         scene = new Scene(root);
@@ -431,6 +474,4 @@ public void setup() {
         box.setConverter(converter);
         root.getChildren().addAll(box);
     }
-
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ChoiceBoxSelectionTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ChoiceBoxSelectionTest.java
index a5b34c021de..732eeb9d4d1 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ChoiceBoxSelectionTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ChoiceBoxSelectionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,14 +25,12 @@
 
 package test.javafx.scene.control;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.List;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
@@ -51,6 +49,9 @@
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Collection of tests around state related to selection.
@@ -262,9 +263,11 @@ protected void assertToggleSelected(ChoiceBox<?> box, int selectedIndex) {
             MenuItem item = popup.getItems().get(i);
             if (item instanceof RadioMenuItem) {
                 RadioMenuItem selectedToggle = (RadioMenuItem) popup.getItems().get(i);
-                assertEquals("toggle " + selectedToggle.getText() + " at index: " + i + " must be selected: " + shouldBeSelected,
-                        shouldBeSelected,
-                        selectedToggle.isSelected());
+                assertEquals(
+                    shouldBeSelected,
+                    selectedToggle.isSelected(),
+                    "toggle " + selectedToggle.getText() + " at index: " + i + " must be selected: " + shouldBeSelected
+                );
             }
         }
     }
@@ -291,7 +294,7 @@ public void testSyncedToggleUncontainedValue() {
     public void testSyncedSelectedIndexUncontained() {
         box.setValue(box.getItems().get(1));
         box.setValue(uncontained);
-        assertEquals("selectedIndex for uncontained value ", -1, box.getSelectionModel().getSelectedIndex());
+        assertEquals(-1, box.getSelectionModel().getSelectedIndex(), "selectedIndex for uncontained value ");
     }
 
     /**
@@ -303,7 +306,7 @@ public void testSyncedSelectedOnPreselectedThenUncontained() {
         box.setValue(box.getItems().get(1));
         box.setValue(uncontained);
         box.getSelectionModel().clearSelection();
-        assertEquals("uncontained value must be unchanged after clearSelection", uncontained, box.getValue());
+        assertEquals(uncontained, box.getValue(), "uncontained value must be unchanged after clearSelection");
     }
 
     /**
@@ -378,12 +381,12 @@ protected void showControl(Control box) {
         assertSame(box, scene.getFocusOwner());
     }
 
-    @After
+    @AfterEach
     public void cleanup() {
         stage.hide();
     }
 
-    @Before
+    @BeforeEach
     public void setup() {
         uncontained = "uncontained";
         root = new VBox();
@@ -393,5 +396,4 @@ public void setup() {
         box = new ChoiceBox<>(FXCollections.observableArrayList("Apple", "Banana", "Orange"));
         root.getChildren().addAll(box);
     }
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ChoiceBoxTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ChoiceBoxTest.java
index 67a4d05b835..69d49ca5db1 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ChoiceBoxTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ChoiceBoxTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,23 +25,16 @@
 
 package test.javafx.scene.control;
 
-import javafx.scene.control.Separator;
-import org.junit.After;
-import test.com.sun.javafx.pgstub.StubToolkit;
-import com.sun.javafx.tk.Toolkit;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertPseudoClassDoesNotExist;
 import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertPseudoClassExists;
 import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
-import javafx.scene.control.skin.ChoiceBoxSkin;
-import javafx.scene.control.skin.ChoiceBoxSkinNodesShim;
 import javafx.application.Platform;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -54,13 +47,18 @@
 import javafx.scene.control.ChoiceBoxShim;
 import javafx.scene.control.SelectionModel;
 import javafx.scene.control.SelectionModelShim;
+import javafx.scene.control.Separator;
 import javafx.scene.control.SingleSelectionModel;
+import javafx.scene.control.skin.ChoiceBoxSkin;
+import javafx.scene.control.skin.ChoiceBoxSkinNodesShim;
 import javafx.scene.layout.StackPane;
 import javafx.stage.Stage;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.tk.Toolkit;
+import test.com.sun.javafx.pgstub.StubToolkit;
 
 public class ChoiceBoxTest {
     private final ChoiceBox<String> box = new ChoiceBox<>();
@@ -68,7 +66,8 @@ public class ChoiceBoxTest {
     private Scene scene;
     private Stage stage;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         Thread.currentThread().setUncaughtExceptionHandler((thread, throwable) -> {
             if (throwable instanceof RuntimeException) {
                 throw (RuntimeException) throwable;
@@ -82,7 +81,8 @@ public class ChoiceBoxTest {
         assertTrue(tk instanceof StubToolkit);  // Ensure it's StubToolkit
     }
 
-    @After public void cleanUp() {
+    @AfterEach
+    public void cleanUp() {
         Thread.currentThread().setUncaughtExceptionHandler(null);
     }
 
@@ -244,7 +244,7 @@ protected void startApp(Parent root) {
         assertEquals(null, box.getSelectionModel().getSelectedItem());
     }
 
-    @Ignore
+    @Disabled
     @Test public void ensureSelectionClearsWhenSettingSelectionBeforePopulatingItemsAndSelectedItemIsRemoved() {
         box.getSelectionModel().select("Banana");
         box.getItems().addAll("Apple", "Orange", "Banana");
@@ -538,10 +538,9 @@ public void testSetSelectionModelUpdatesValueStandalone() {
 
         int index = 2;
         model.select(index);
-        assertEquals("sanity: model is selecting index and item", items.get(index),
-                model.getSelectedItem());
+        assertEquals(items.get(index), model.getSelectedItem(), "sanity: model is selecting index and item");
         box.setSelectionModel(model);
-        assertEquals("box value must be same as selected item", items.get(index), box.getValue());
+        assertEquals(items.get(index), box.getValue(), "box value must be same as selected item");
     }
 
     @Test public void test_jdk_8988261_selectNext() {
@@ -553,7 +552,7 @@ public void testSetSelectionModelUpdatesValueStandalone() {
         assertEquals("oranges", sm.getSelectedItem());
 
         sm.selectNext();
-        assertEquals("selecting next must move over separator", 3, sm.getSelectedIndex());
+        assertEquals(3, sm.getSelectedIndex(), "selecting next must move over separator");
         assertEquals("trucks", sm.getSelectedItem());
     }
 
@@ -566,7 +565,7 @@ public void testSetSelectionModelUpdatesValueStandalone() {
         assertEquals("trucks", sm.getSelectedItem());
 
         sm.selectPrevious();
-        assertEquals("selecting previous must move over separator", 1, sm.getSelectedIndex());
+        assertEquals(1, sm.getSelectedIndex(), "selecting previous must move over separator");
         assertEquals("oranges", sm.getSelectedItem());
     }
 
@@ -579,32 +578,28 @@ public void testSetSelectionModelUpdatesValueStandalone() {
         box.getItems().setAll("1");
 
         box.setOnShowing(event -> {
-            assertEquals("event is not of type ChoiceBox.ON_SHOWING",
-                event.getEventType(), ChoiceBox.ON_SHOWING);
+            assertEquals(event.getEventType(), ChoiceBox.ON_SHOWING, "event is not of type ChoiceBox.ON_SHOWING");
             onShowingPass = true;
         });
         box.setOnShown(event -> {
-            assertEquals("event is not of type ChoiceBox.ON_SHOWN",
-                event.getEventType(), ChoiceBox.ON_SHOWN);
+            assertEquals(event.getEventType(), ChoiceBox.ON_SHOWN, "event is not of type ChoiceBox.ON_SHOWN");
             onShownPass = true;
         });
         box.setOnHiding(event -> {
-            assertEquals("event is not of type ChoiceBox.ON_HIDING",
-                event.getEventType(), ChoiceBox.ON_HIDING);
+            assertEquals(event.getEventType(), ChoiceBox.ON_HIDING, "event is not of type ChoiceBox.ON_HIDING");
             onHidingPass = true;
         });
         box.setOnHidden(event -> {
-            assertEquals("event is not of type ChoiceBox.ON_HIDDEN",
-                event.getEventType(), ChoiceBox.ON_HIDDEN);
+            assertEquals(event.getEventType(), ChoiceBox.ON_HIDDEN, "event is not of type ChoiceBox.ON_HIDDEN");
             onHiddenPass = true;
         });
 
         box.show();
         box.hide();
 
-        assertTrue("OnShowing event not received", onShowingPass);
-        assertTrue("onShown event not received", onShownPass);
-        assertTrue("onHiding event not received", onHidingPass);
-        assertTrue("onHidden event not received", onHiddenPass);
+        assertTrue(onShowingPass, "OnShowing event not received");
+        assertTrue(onShownPass, "onShown event not received");
+        assertTrue(onHidingPass, "onHiding event not received");
+        assertTrue(onHiddenPass, "onHidden event not received");
     }
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ColorPickerTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ColorPickerTest.java
index 601e50fa073..f2b12d9f1f2 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ColorPickerTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ColorPickerTest.java
@@ -25,11 +25,11 @@
 
 package test.javafx.scene.control;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
@@ -41,9 +41,9 @@
 import javafx.scene.paint.Color;
 import javafx.stage.Stage;
 import javafx.stage.Window;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import com.sun.javafx.tk.Toolkit;
 import test.com.sun.javafx.pgstub.StubToolkit;
 
@@ -54,7 +54,8 @@ public class ColorPickerTest {
     private Stage stage;
     private VBox root;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         tk = Toolkit.getToolkit();
 
         assertTrue(tk instanceof StubToolkit);  // Ensure it's StubToolkit
@@ -69,7 +70,7 @@ public class ColorPickerTest {
         tk.firePulse();
     }
 
-    @After
+    @AfterEach
     public void after() {
         stage.hide();
     }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ComboBoxTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ComboBoxTest.java
index 2ad5fd682b8..90897deda90 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ComboBoxTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ComboBoxTest.java
@@ -25,36 +25,27 @@
 
 package test.javafx.scene.control;
 
-import com.sun.javafx.scene.control.behavior.FocusTraversalInputMap;
-import com.sun.javafx.scene.control.behavior.ListViewBehavior;
-import com.sun.javafx.scene.control.inputmap.InputMap;
-import com.sun.javafx.scene.control.inputmap.InputMap.KeyMapping;
-import com.sun.javafx.scene.control.inputmap.KeyBinding;
-import com.sun.javafx.tk.Toolkit;
-import com.sun.javafx.util.Utils;
-
-import test.com.sun.javafx.scene.control.infrastructure.ControlSkinFactory;
-import test.com.sun.javafx.scene.control.infrastructure.KeyModifier;
-import test.com.sun.javafx.scene.control.infrastructure.MouseEventFirer;
-import javafx.css.PseudoClass;
-
-import test.com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
-import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
-import javafx.scene.control.skin.ComboBoxListViewSkin;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
-import static org.junit.Assert.*;
-import static org.junit.Assert.assertEquals;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
-
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
+import javafx.css.PseudoClass;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.scene.Node;
@@ -74,6 +65,7 @@
 import javafx.scene.control.TabPane;
 import javafx.scene.control.TextField;
 import javafx.scene.control.Tooltip;
+import javafx.scene.control.skin.ComboBoxListViewSkin;
 import javafx.scene.control.skin.VirtualFlow;
 import javafx.scene.input.KeyCode;
 import javafx.scene.layout.BorderPane;
@@ -84,11 +76,22 @@
 import javafx.stage.Stage;
 import javafx.util.Callback;
 import javafx.util.StringConverter;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.scene.control.behavior.FocusTraversalInputMap;
+import com.sun.javafx.scene.control.behavior.ListViewBehavior;
+import com.sun.javafx.scene.control.inputmap.InputMap;
+import com.sun.javafx.scene.control.inputmap.InputMap.KeyMapping;
+import com.sun.javafx.scene.control.inputmap.KeyBinding;
+import com.sun.javafx.tk.Toolkit;
+import com.sun.javafx.util.Utils;
+import test.com.sun.javafx.scene.control.infrastructure.ControlSkinFactory;
+import test.com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
+import test.com.sun.javafx.scene.control.infrastructure.KeyModifier;
+import test.com.sun.javafx.scene.control.infrastructure.MouseEventFirer;
+import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
 
 public class ComboBoxTest {
     private ComboBox<String> comboBox;
@@ -117,7 +120,8 @@ public Node getDisplayNode() {
      *                                                                   *
      ********************************************************************/
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         Thread.currentThread().setUncaughtExceptionHandler((thread, throwable) -> {
             if (throwable instanceof RuntimeException) {
                 throw (RuntimeException)throwable;
@@ -131,7 +135,8 @@ public Node getDisplayNode() {
         sm = comboBox.getSelectionModel();
     }
 
-    @After public void cleanup() {
+    @AfterEach
+    public void cleanup() {
         if (sl != null) {
             sl.dispose();
         }
@@ -486,9 +491,11 @@ protected void updateItem(String item, boolean empty) {
         assertEquals(null, sm.getSelectedItem());
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void selectionModelComboBoxReferenceCanNotBeNull() {
-        ComboBoxShim.<String>get_ComboBoxSelectionModel(null);
+        assertThrows(NullPointerException.class, () -> {
+            ComboBoxShim.<String>get_ComboBoxSelectionModel(null);
+        });
     }
 
     @Test public void ensureGetModelItemOutOfBoundsWorks_1() {
@@ -576,7 +583,7 @@ public void selectionModelComboBoxReferenceCanNotBeNull() {
         assertEquals("Apple", comboBox.getValue());
 
         sm.select(-1);
-        assertNull("Expected null, actual value: " + comboBox.getValue(), comboBox.getValue());
+        assertNull(comboBox.getValue(), "Expected null, actual value: " + comboBox.getValue());
     }
 
     @Test public void ensureValueIsCorrectWhenItemsIsAddedToWithExistingSelection() {
@@ -720,11 +727,13 @@ public void selectionModelComboBoxReferenceCanNotBeNull() {
         assertEquals("42", sc.toString(Integer.valueOf(42)));
     }
 
-    @Test(expected=ClassCastException.class)
+    @Test
     public void defaultConverterCanHandleIncorrectType_2() {
-        ComboBox<Integer> cb = new ComboBox<>();
-        StringConverter<Integer> sc = cb.getConverter();
-        Integer value = sc.fromString("42");
+        assertThrows(ClassCastException.class, () -> {
+            ComboBox<Integer> cb = new ComboBox<>();
+            StringConverter<Integer> sc = cb.getConverter();
+            Integer value = sc.fromString("42");
+        });
     }
 
     @Test public void defaultConverterCanHandleNullValues() {
@@ -881,17 +890,17 @@ public void defaultConverterCanHandleIncorrectType_2() {
     @Test public void checkPromptTextPropertyBind() {
         StringProperty strPr = new SimpleStringProperty("value");
         comboBox.promptTextProperty().bind(strPr);
-        assertTrue("PromptText cannot be bound", comboBox.getPromptText().equals("value"));
+        assertTrue(comboBox.getPromptText().equals("value"), "PromptText cannot be bound");
         strPr.setValue("newvalue");
-        assertTrue("PromptText cannot be bound", comboBox.getPromptText().equals("newvalue"));
+        assertTrue(comboBox.getPromptText().equals("newvalue"), "PromptText cannot be bound");
     }
 
     @Test public void checkValuePropertyBind() {
         StringProperty strPr = new SimpleStringProperty("value");
         comboBox.valueProperty().bind(strPr);
-        assertTrue("value cannot be bound", comboBox.getValue().equals("value"));
+        assertTrue(comboBox.getValue().equals("value"), "value cannot be bound");
         strPr.setValue("newvalue");
-        assertTrue("value cannot be bound", comboBox.getValue().equals("newvalue"));
+        assertTrue(comboBox.getValue().equals("newvalue"), "value cannot be bound");
     }
 
 
@@ -926,7 +935,7 @@ public void defaultConverterCanHandleIncorrectType_2() {
         comboBox.setValue("Orange");
         assertEquals("Orange", comboBox.getValue());
         assertEquals("Orange", comboBox.getSelectionModel().getSelectedItem());
-        assertTrue("Selected Index: " + sm.getSelectedIndex(), sm.isSelected(1));
+        assertTrue(sm.isSelected(1), "Selected Index: " + sm.getSelectedIndex());
     }
 
     @Test public void test_rt19227() {
@@ -937,7 +946,7 @@ public void defaultConverterCanHandleIncorrectType_2() {
         assertTrue(sm.isSelected(2));
     }
 
-    @Ignore("JDK-8091127 Test not working as the heights being returned are not accurate")
+    @Disabled("JDK-8091127 Test not working as the heights being returned are not accurate")
     @Test public void test_rt20106() {
         comboBox.getItems().addAll("0","1","2","3","4","5","6","7","8","9");
 
@@ -949,12 +958,11 @@ public void defaultConverterCanHandleIncorrectType_2() {
 
         comboBox.setVisibleRowCount(5);
         double initialHeight = getListView().getHeight();
-        assertFalse("initialHeight: " + initialHeight, Double.compare(0.0, initialHeight) == 0);
+        assertFalse(Double.compare(0.0, initialHeight) == 0, "initialHeight: " + initialHeight);
 
         comboBox.setVisibleRowCount(0);
         double smallHeight =    getListView().getHeight();
-        assertTrue("smallHeight: " + smallHeight + ", initialHeight: " + initialHeight,
-                smallHeight != initialHeight && smallHeight < initialHeight);
+        assertTrue(smallHeight != initialHeight && smallHeight < initialHeight, "smallHeight: " + smallHeight + ", initialHeight: " + initialHeight);
 
         comboBox.setVisibleRowCount(7);
         double biggerHeight = getListView().getHeight();
@@ -972,20 +980,20 @@ public void defaultConverterCanHandleIncorrectType_2() {
         assertTrue(count == 0);
 
         comboBox.valueProperty().bind(tf.textProperty());   // count++ here
-        assertTrue("count: " + count, count == 1);
+        assertTrue(count == 1, "count: " + count);
 
         tf.setText("Text1");                                // count++ here
-        assertTrue("count: " + count, count == 2);
+        assertTrue(count == 2, "count: " + count);
 
         comboBox.valueProperty().unbind();                  // no count++ here
-        assertTrue("count: " + count, count == 2);
+        assertTrue(count == 2, "count: " + count);
 
         comboBox.valueProperty().bindBidirectional(tf.textProperty());  // count++ here
         tf.setText("Text2");
-        assertTrue("count: " + count, count == 3);
+        assertTrue(count == 3, "count: " + count);
     }
 
-    @Ignore("Test not working as the skin is not being properly instantiated")
+    @Disabled("Test not working as the skin is not being properly instantiated")
     @Test public void test_rt20100() {
         comboBox.getItems().addAll("0","1","2","3","4","5","6","7","8","9");
 
@@ -1958,14 +1966,12 @@ private void testInterceptor(ObservableList<?> mappings, KeyBinding binding, boo
         // cb2.isFocused() returns true as expected, the scene focus owner is
         // not the ComboBox, but the FakeFocusTextField inside it
         cb1Keyboard.doKeyPress(KeyCode.TAB, KeyModifier.SHIFT);
-        assertTrue("Expect cb2 to be focused, but actual focus owner is: " + scene.getFocusOwner(),
-                cb2.isFocused());
+        assertTrue(cb2.isFocused(), "Expect cb2 to be focused, but actual focus owner is: " + scene.getFocusOwner());
         // Updated with fix for RT-34602: The TextField now never gets
         // focus (it's just faking it).
         // assertEquals("Expect cb2 TextField to be focused, but actual focus owner is: " + scene.getFocusOwner(),
         //         cb2.getEditor(), scene.getFocusOwner());
-        assertEquals("Expect cb2 to be focused, but actual focus owner is: " + scene.getFocusOwner(),
-                     cb2, scene.getFocusOwner());
+        assertEquals(cb2, scene.getFocusOwner(), "Expect cb2 to be focused, but actual focus owner is: " + scene.getFocusOwner());
 
         // This is where the second half of the bug appears, as we are stuck in
         // the FakeFocusTextField of cb2, we never make it to cb1
@@ -2158,7 +2164,7 @@ private void test_rt_38901(boolean selectNull) {
         // but in index (last - 2).
         int expected = last - 2;
         assertEquals("5", sm.getSelectedItem());
-        assertEquals("selected index after disjoint removes above", expected, sm.getSelectedIndex());
+        assertEquals(expected, sm.getSelectedIndex(), "selected index after disjoint removes above");
     }
 
     /**
@@ -2205,8 +2211,8 @@ private void test_rt_38901(boolean selectNull) {
 
         // disjoint remove of 2 elements above the last selected
         items.removeAll(items.get(1), items.get(3));
-        assertEquals("sanity: selectedIndex must be shifted by -2", last - 2, sm.getSelectedIndex());
-        assertEquals("must fire single event on removes above", 1, rt_40012_count);
+        assertEquals(last - 2, sm.getSelectedIndex(), "sanity: selectedIndex must be shifted by -2");
+        assertEquals(1, rt_40012_count, "must fire single event on removes above");
     }
 
     /**
@@ -2228,8 +2234,8 @@ public void test_rt_40012_selectedItemNotificationOnDisjointRemovesAbove() {
 
         // disjoint remove of 2 elements above the last selected
         items.removeAll(items.get(1), items.get(3));
-        assertEquals("sanity: selectedItem unchanged", lastItem, sm.getSelectedItem());
-        assertEquals("must not fire on unchanged selected item", 0, rt_40012_count);
+        assertEquals(lastItem, sm.getSelectedItem(), "sanity: selectedItem unchanged");
+        assertEquals(0, rt_40012_count, "must not fire on unchanged selected item");
     }
 
     @Test public void test_jdk_8150946_testCommit_valid() {
@@ -2316,7 +2322,7 @@ public void test_rt_40012_selectedItemNotificationOnDisjointRemovesAbove() {
 
         tk.firePulse();
 
-        assertEquals("ComboBox skinProperty changed more than once, which is not expected.", 1, skinChangedCount);
+        assertEquals(1, skinChangedCount, "ComboBox skinProperty changed more than once, which is not expected.");
     }
 
     //JDK-8279140
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ComboSpecialKeyTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ComboSpecialKeyTest.java
index 2874940489b..a1f78ae327f 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ComboSpecialKeyTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ComboSpecialKeyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,69 +25,64 @@
 
 package test.javafx.scene.control;
 
+import static javafx.scene.input.KeyCode.F4;
+import static javafx.scene.input.KeyEvent.KEY_RELEASED;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
 import java.util.function.Supplier;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import com.sun.javafx.tk.Toolkit;
-
-import static javafx.scene.input.KeyCode.*;
-import static javafx.scene.input.KeyEvent.*;
-import static org.junit.Assert.*;
-
+import java.util.stream.Stream;
 import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.control.ColorPicker;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.ComboBoxBase;
 import javafx.scene.control.DatePicker;
-import javafx.scene.control.skin.ComboBoxPopupControl;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import com.sun.javafx.tk.Toolkit;
 import test.com.sun.javafx.pgstub.StubToolkit;
 import test.com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
 
 /**
  * Test for https://bugs.openjdk.org/browse/JDK-8233040 - F4
  * must not be consumed by EventFilter in ComboBoxPopupControl.
- * <p>
- * Parameterized in concrete sub of ComboBoxBase and editable.
  */
-@RunWith(Parameterized.class)
 public class ComboSpecialKeyTest {
 
     private Scene scene;
     private Stage stage;
     private Pane root;
-
     private ComboBoxBase comboBox;
-    private Supplier<ComboBoxBase> comboFactory;
-    private boolean editable;
 
-    @Test
-    public void testF4TogglePopup() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testF4TogglePopup(Supplier<ComboBoxBase> factory, boolean editable) {
+        setup(factory);
         showAndFocus();
         comboBox.setEditable(editable);
         assertFalse(comboBox.isShowing());
         KeyEventFirer firer = new KeyEventFirer(comboBox);
         firer.doKeyPress(F4);
-        assertTrue(failPrefix(), comboBox.isShowing());
+        assertTrue(comboBox.isShowing(), failPrefix(editable));
         firer.doKeyPress(F4);
-        assertFalse(failPrefix(), comboBox.isShowing());
+        assertFalse(comboBox.isShowing(), failPrefix(editable));
     }
 
-    @Test
-    public void testF4ConsumeFilterNotTogglePopup() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testF4ConsumeFilterNotTogglePopup(Supplier<ComboBoxBase> factory, boolean editable) {
+        setup(factory);
         showAndFocus();
         comboBox.setEditable(editable);
         List<KeyEvent> events = new ArrayList<>();
@@ -99,39 +94,33 @@ public void testF4ConsumeFilterNotTogglePopup() {
         });
         KeyEventFirer firer = new KeyEventFirer(comboBox);
         firer.doKeyPress(F4);
-        assertFalse(failPrefix() + ": popup must not be showing", comboBox.isShowing());
+        assertFalse(comboBox.isShowing(), failPrefix(editable) + ": popup must not be showing");
     }
 
-    protected String failPrefix() {
+    protected String failPrefix(boolean editable) {
         String failPrefix = comboBox.getClass().getSimpleName() + " editable " + editable;
         return failPrefix;
     }
 
 //---------------- parameterized
 
-    // Note: name property not supported before junit 4.11
-    @Parameterized.Parameters//(name = "{index}: editable {1} ")
-    public static Collection<Object[]> data() {
+    private static Stream<Arguments> parameters() {
         // Supplier for type of ComboBoxBase to test, editable
-        Object[][] data = new Object[][] {
-            {(Supplier)ComboBox::new, false},
-            {(Supplier)ComboBox::new, true },
-            {(Supplier)DatePicker::new, false },
-            {(Supplier)DatePicker::new, true},
-            {(Supplier)ColorPicker::new, false },
-        };
-        return Arrays.asList(data);
-    }
-
-    public ComboSpecialKeyTest(Supplier<ComboBoxBase> factory, boolean editable) {
-        this.comboFactory = factory;
-        this.editable = editable;
+        return Stream.of(
+            Arguments.of((Supplier)ComboBox::new, false),
+            Arguments.of((Supplier)ComboBox::new, true),
+            Arguments.of((Supplier)DatePicker::new, false),
+            Arguments.of((Supplier)DatePicker::new, true),
+            Arguments.of((Supplier)ColorPicker::new, false)
+        );
     }
 
 // --- initial and setup
 
-    @Test
-    public void testInitialState() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testInitialState(Supplier<ComboBoxBase> factory, boolean editable) {
+        setup(factory);
         assertNotNull(comboBox);
         showAndFocus();
         List<Node> expected = List.of(comboBox);
@@ -150,24 +139,20 @@ protected void showAndFocus(Node control) {
         assertSame(control, scene.getFocusOwner());
     }
 
-    @After
+    @AfterEach
     public void cleanup() {
         stage.hide();
     }
 
-    @Before
-    public void setup() {
-        ComboBoxPopupControl c;
-
+    // @Before
+    // junit5 does not support parameterized class-level tests yet
+    public void setup(Supplier<ComboBoxBase> factory) {
         assertTrue(Toolkit.getToolkit() instanceof StubToolkit);  // Ensure StubToolkit is loaded
-
         root = new VBox();
         scene = new Scene(root);
         stage = new Stage();
         stage.setScene(scene);
-        comboBox = comboFactory.get();
+        comboBox = factory.get();
         root.getChildren().addAll(comboBox);
     }
-
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ContextMenuTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ContextMenuTest.java
index efb81fcfb7c..865850a11f9 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ContextMenuTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ContextMenuTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,18 +25,25 @@
 
 package test.javafx.scene.control;
 
-import com.sun.javafx.scene.control.ContextMenuContent;
-import com.sun.javafx.scene.control.ContextMenuContentShim;
-import javafx.geometry.Insets;
-import javafx.scene.layout.StackPane;
-import javafx.scene.text.Font;
-import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
+import static com.sun.javafx.scene.control.ContextMenuContentShim.getCurrentFocusedIndex;
+import static com.sun.javafx.scene.control.ContextMenuContentShim.getCurrentFocusedItem;
+import static com.sun.javafx.scene.control.ContextMenuContentShim.getOpenSubMenu;
+import static com.sun.javafx.scene.control.ContextMenuContentShim.getShowingMenuContent;
+import static com.sun.javafx.scene.control.ContextMenuContentShim.getShowingSubMenu;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.Optional;
 import javafx.css.PseudoClass;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.geometry.Bounds;
+import javafx.geometry.Insets;
 import javafx.geometry.NodeOrientation;
 import javafx.geometry.Side;
+import javafx.scene.Node;
 import javafx.scene.control.Button;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.CustomMenuItem;
@@ -46,18 +53,17 @@
 import javafx.scene.control.MenuItem;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-import static com.sun.javafx.scene.control.ContextMenuContentShim.*;
-
-import java.util.Optional;
-import javafx.scene.Node;
 import javafx.scene.input.KeyCode;
+import javafx.scene.layout.StackPane;
+import javafx.scene.text.Font;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.scene.control.ContextMenuContent;
+import com.sun.javafx.scene.control.ContextMenuContentShim;
 import test.com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
 import test.com.sun.javafx.scene.control.infrastructure.MouseEventFirer;
+import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
 
 public class ContextMenuTest {
 
@@ -125,7 +131,8 @@ public static void pressMouseButton(ContextMenu menu) {
     private StageLoader sl;
     private Button anchorBtn;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         // earlier test items
         menuItem0 = new MenuItem("0");
         menuItem1 = new MenuItem("1");
@@ -152,7 +159,8 @@ public static void pressMouseButton(ContextMenu menu) {
         sl = new StageLoader(anchorBtn);
     }
 
-    @After public void after() {
+    @AfterEach
+    public void after() {
         sl.dispose();
     }
 
@@ -326,8 +334,7 @@ private ContextMenu createContextMenuAndShowSubMenu() {
         // make sure the first item of the subMenu is focused
         MenuItem focusedItem = getCurrentFocusedItem(cm);
         assertEquals(0, getCurrentFocusedIndex(cm));
-        assertEquals("Expected " + subMenuItem1.getText() + ", found " + focusedItem.getText(),
-                subMenuItem1, focusedItem);
+        assertEquals(subMenuItem1, focusedItem, "Expected " + subMenuItem1.getText() + ", found " + focusedItem.getText());
 
         return cm;
     }
@@ -353,15 +360,13 @@ private ContextMenu createContextMenuAndShowSubMenu() {
         pressDownKey(cm);
         MenuItem focusedItem = getCurrentFocusedItem(cm);
         assertEquals(0, getCurrentFocusedIndex(cm));
-        assertEquals("Expected " + menuItem.getText() + ", found " + focusedItem.getText(),
-                menuItem, focusedItem);
+        assertEquals(menuItem, focusedItem, "Expected " + menuItem.getText() + ", found " + focusedItem.getText());
 
         // press down once to go to subMenu
         pressDownKey(cm);
         focusedItem = getCurrentFocusedItem(cm);
         assertEquals(1, getCurrentFocusedIndex(cm));
-        assertEquals("Expected " + subMenu.getText() + ", found " + focusedItem.getText(),
-                subMenu, focusedItem);
+        assertEquals(subMenu, focusedItem, "Expected " + subMenu.getText() + ", found " + focusedItem.getText());
 
         // ensure the submenu isn't showing (it should only show on right-arrow)
         assertFalse(subMenu.isShowing());
@@ -370,8 +375,7 @@ private ContextMenu createContextMenuAndShowSubMenu() {
         pressDownKey(cm);
         focusedItem = getCurrentFocusedItem(cm);
         assertEquals(0, getCurrentFocusedIndex(cm));
-        assertEquals("Expected " + menuItem.getText() + ", found " + focusedItem.getText(),
-                menuItem, focusedItem);
+        assertEquals(menuItem, focusedItem, "Expected " + menuItem.getText() + ", found " + focusedItem.getText());
     }
 
     @Test public void test_navigateMenu_upwards() {
@@ -384,15 +388,13 @@ private ContextMenu createContextMenuAndShowSubMenu() {
         pressUpKey(cm);
         MenuItem focusedItem = getCurrentFocusedItem(cm);
         assertEquals(1, getCurrentFocusedIndex(cm));
-        assertEquals("Expected " + subMenu.getText() + ", found " + focusedItem.getText(),
-                subMenu, focusedItem);
+        assertEquals(subMenu, focusedItem, "Expected " + subMenu.getText() + ", found " + focusedItem.getText());
 
         // press up once to go to menuItem
         pressDownKey(cm);
         focusedItem = getCurrentFocusedItem(cm);
         assertEquals(0, getCurrentFocusedIndex(cm));
-        assertEquals("Expected " + menuItem.getText() + ", found " + focusedItem.getText(),
-                menuItem, focusedItem);
+        assertEquals(menuItem, focusedItem, "Expected " + menuItem.getText() + ", found " + focusedItem.getText());
     }
 
     @Test public void test_navigateMenu_showSubMenu() {
@@ -406,22 +408,19 @@ private ContextMenu createContextMenuAndShowSubMenu() {
         assertNotNull(getShowingMenuContent(cm));
         MenuItem focusedItem = getCurrentFocusedItem(cm);
         assertEquals(0, getCurrentFocusedIndex(cm));
-        assertEquals("Expected " + subMenuItem1.getText() + ", found " + focusedItem.getText(),
-                subMenuItem1, focusedItem);
+        assertEquals(subMenuItem1, focusedItem, "Expected " + subMenuItem1.getText() + ", found " + focusedItem.getText());
 
         // press down once to go to customMenuItem
         pressDownKey(cm);
         focusedItem = getCurrentFocusedItem(cm);
         assertEquals(1, getCurrentFocusedIndex(cm));
-        assertEquals("Expected " + customMenuItem.getText() + ", found " + focusedItem.getText(),
-                customMenuItem, focusedItem);
+        assertEquals(customMenuItem, focusedItem, "Expected " + customMenuItem.getText() + ", found " + focusedItem.getText());
 
         // press down once to go to wrap back around to subMenuItem1
         pressDownKey(cm);
         focusedItem = getCurrentFocusedItem(cm);
         assertEquals(0, getCurrentFocusedIndex(cm));
-        assertEquals("Expected " + subMenuItem1.getText() + ", found " + focusedItem.getText(),
-                subMenuItem1, focusedItem);
+        assertEquals(subMenuItem1, focusedItem, "Expected " + subMenuItem1.getText() + ", found " + focusedItem.getText());
     }
 
     @Test public void test_navigateSubMenu_upwards() {
@@ -431,22 +430,19 @@ private ContextMenu createContextMenuAndShowSubMenu() {
         assertNotNull(getShowingMenuContent(cm));
         MenuItem focusedItem = getCurrentFocusedItem(cm);
         assertEquals(0, getCurrentFocusedIndex(cm));
-        assertEquals("Expected " + subMenuItem1.getText() + ", found " + focusedItem.getText(),
-                subMenuItem1, focusedItem);
+        assertEquals(subMenuItem1, focusedItem, "Expected " + subMenuItem1.getText() + ", found " + focusedItem.getText());
 
         // press up once to go to customMenuItem
         pressUpKey(cm);
         focusedItem = getCurrentFocusedItem(cm);
         assertEquals(1, getCurrentFocusedIndex(cm));
-        assertEquals("Expected " + customMenuItem.getText() + ", found " + focusedItem.getText(),
-                customMenuItem, focusedItem);
+        assertEquals(customMenuItem, focusedItem, "Expected " + customMenuItem.getText() + ", found " + focusedItem.getText());
 
         // press up once to go to subMenuItem1
         pressUpKey(cm);
         focusedItem = getCurrentFocusedItem(cm);
         assertEquals(0, getCurrentFocusedIndex(cm));
-        assertEquals("Expected " + subMenuItem1.getText() + ", found " + focusedItem.getText(),
-                subMenuItem1, focusedItem);
+        assertEquals(subMenuItem1, focusedItem, "Expected " + subMenuItem1.getText() + ", found " + focusedItem.getText());
     }
 
     @Test public void test_navigateSubMenu_rightKeyDoesNothing() {
@@ -457,8 +453,7 @@ private ContextMenu createContextMenuAndShowSubMenu() {
         assertNotNull(getShowingMenuContent(cm));
         MenuItem focusedItem = getCurrentFocusedItem(cm);
         assertEquals(0, getCurrentFocusedIndex(cm));
-        assertEquals("Expected " + subMenuItem1.getText() + ", found " + focusedItem.getText(),
-                subMenuItem1, focusedItem);
+        assertEquals(subMenuItem1, focusedItem, "Expected " + subMenuItem1.getText() + ", found " + focusedItem.getText());
     }
 
     @Test public void test_emptySubMenu_rightKeyDoesNothing() {
@@ -487,8 +482,7 @@ private ContextMenu createContextMenuAndShowSubMenu() {
         assertNotNull(getShowingMenuContent(cm));
         MenuItem focusedItem = getCurrentFocusedItem(cm);
         assertEquals(1, getCurrentFocusedIndex(cm));
-        assertEquals("Expected " + subMenu.getText() + ", found " + focusedItem.getText(),
-                subMenu, focusedItem);
+        assertEquals(subMenu, focusedItem, "Expected " + subMenu.getText() + ", found " + focusedItem.getText());
     }
 
     private int rt_37127_count = 0;
@@ -588,17 +582,17 @@ private ContextMenu createContextMenuAndShowSubMenu() {
         // press down once to go to menuItem
         pressDownKey(cm);
         MenuItem focusedItem = getCurrentFocusedItem(cm);
-        assertEquals("Expected " + menuItem1.getText() + ", found " + focusedItem.getText(), menuItem1, focusedItem);
+        assertEquals(menuItem1, focusedItem, "Expected " + menuItem1.getText() + ", found " + focusedItem.getText());
 
         // press down again should skip invisible menuItem2 and proceed to menuItem3
         pressDownKey(cm);
         focusedItem = getCurrentFocusedItem(cm);
-        assertEquals("Expected " + menuItem3.getText() + ", found " + focusedItem.getText(), menuItem3, focusedItem);
+        assertEquals(menuItem3, focusedItem, "Expected " + menuItem3.getText() + ", found " + focusedItem.getText());
 
         // press up should skip invisible menuItem2 and proceed to menuItem1
         pressUpKey(cm);
         focusedItem = getCurrentFocusedItem(cm);
-        assertEquals("Expected " + menuItem1.getText() + ", found " + focusedItem.getText(), menuItem1, focusedItem);
+        assertEquals(menuItem1, focusedItem, "Expected " + menuItem1.getText() + ", found " + focusedItem.getText());
     }
 
     @Test public void test_jdk_8167132_issue_1() {
@@ -617,15 +611,13 @@ private ContextMenu createContextMenuAndShowSubMenu() {
         pressDownKey(cm);
         MenuItem focusedItem = getCurrentFocusedItem(cm);
         assertEquals(0, getCurrentFocusedIndex(cm));
-        assertEquals("Expected " + item1.getText() + ", found " + focusedItem.getText(),
-                item1, focusedItem);
+        assertEquals(item1, focusedItem, "Expected " + item1.getText() + ", found " + focusedItem.getText());
 
         // press down once to go to item2
         pressDownKey(cm);
         focusedItem = getCurrentFocusedItem(cm);
         assertEquals(1, getCurrentFocusedIndex(cm));
-        assertEquals("Expected " + item2.getText() + ", found " + focusedItem.getText(),
-                item2, focusedItem);
+        assertEquals(item2, focusedItem, "Expected " + item2.getText() + ", found " + focusedItem.getText());
 
         // hide context menu
         cm.hide();
@@ -642,8 +634,7 @@ private ContextMenu createContextMenuAndShowSubMenu() {
         pressDownKey(cm);
         focusedItem = getCurrentFocusedItem(cm);
         assertEquals(0, getCurrentFocusedIndex(cm));
-        assertEquals("Expected " + item1.getText() + ", found " + focusedItem.getText(),
-                item1, focusedItem);
+        assertEquals(item1, focusedItem, "Expected " + item1.getText() + ", found " + focusedItem.getText());
     }
 
     @Test public void test_position_showOnScreen() {
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ControlAcceleratorSupportTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ControlAcceleratorSupportTest.java
index c6b48404316..6c83f17f4ee 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ControlAcceleratorSupportTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ControlAcceleratorSupportTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,27 +25,30 @@
 
 package test.javafx.scene.control;
 
-import com.sun.javafx.tk.Toolkit;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.getListenerCount;
+import java.lang.ref.WeakReference;
 import javafx.beans.value.ChangeListener;
 import javafx.collections.ListChangeListener;
 import javafx.scene.Scene;
-import javafx.scene.control.*;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.Menu;
+import javafx.scene.control.MenuBar;
+import javafx.scene.control.MenuButton;
+import javafx.scene.control.MenuItem;
+import javafx.scene.control.Tab;
+import javafx.scene.control.TabPane;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.StackPane;
-
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.tk.Toolkit;
 import test.com.sun.javafx.binding.ExpressionHelperUtility;
 import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
 import test.util.memory.JMemoryBuddy;
-import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.*;
-
-import org.junit.Test;
-
-import java.lang.ref.WeakReference;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertFalse;
 public class ControlAcceleratorSupportTest {
 
     @Test
@@ -232,7 +235,7 @@ private void setActionMenuItem(Tab tab, MenuItem menuItem) {
         menuItem.setOnAction(e -> tab.setText("Tab Renamed"));
     }
 
-    @Ignore("JDK-8283449")
+    @Disabled("JDK-8283449")
     @Test
     public void testTabWithContextMenuReferencingTabDoesntCauseMemoryLeak() {
         // JDK-8283449 Tab with context menu that references tab gets leaked
@@ -301,7 +304,7 @@ public void testSingleTabContextMenuGetsNewListChangeListenersWhenSceneChange()
         sl2.dispose();
     }
 
-    @Ignore // Only the first tab's context menu gets a scene change listener right now
+    @Disabled // Only the first tab's context menu gets a scene change listener right now
     @Test
     public void testMultipleTabContextMenuGetsNewListChangeListenersWhenSceneChange() {
         Tab t = new Tab();
@@ -392,7 +395,7 @@ public void testTabContextMenuSceneChangeDoesntLeakScene() {
         JMemoryBuddy.assertCollectable(scene1);
     }
 
-    @Ignore("JDK-8268374")
+    @Disabled("JDK-8268374")
     @Test
     public void testContextMenuOnTabSetToNullWhenNotInSceneRemovesListeners() {
         // JDK-8268374
@@ -417,7 +420,7 @@ public void testContextMenuOnTabSetToNullWhenNotInSceneRemovesListeners() {
         sl1.dispose();
     }
 
-    @Ignore("JDK-8268374")
+    @Disabled("JDK-8268374")
     @Test
     public void testContextMenuOnTabSetToNullAfterTabIsRemoved() {
         // JDK-8268374
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ControlChildrenTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ControlChildrenTest.java
index d73cbbb4c34..c93b275cd7a 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ControlChildrenTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ControlChildrenTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,20 +25,19 @@
 
 package test.javafx.scene.control;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
 import javafx.collections.ListChangeListener;
 import javafx.scene.Node;
 import javafx.scene.control.Tooltip;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
  *
  */
-@Ignore
+@Disabled
 public class ControlChildrenTest {
     private ControlStub c;
     private SkinStub<ControlStub> s;
@@ -46,7 +45,8 @@ public class ControlChildrenTest {
     private int changeNotificationCount;
     private ListChangeListener<Node> changeNotifier;
 
-    @Before public void setUp() {
+    @BeforeEach
+    public void setUp() {
         c = new ControlStub();
         s = new SkinStub<>(c);
         t = new Tooltip();
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ControlSkinTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ControlSkinTest.java
index a48e0419606..53ebc6e05ef 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ControlSkinTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ControlSkinTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,22 +25,23 @@
 
 package test.javafx.scene.control;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
 import javafx.beans.property.StringProperty;
 import javafx.css.StyleableProperty;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
 import javafx.scene.Scene;
 import javafx.scene.control.ControlShim;
 import javafx.scene.control.Skin;
 import javafx.scene.control.Tooltip;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
  * Skin related tests for Control. This test case will construct
@@ -48,7 +49,7 @@
  * all together. This is done so that in the various tests, we can
  * set things up the way we want for the test.
  */
-@Ignore
+@Disabled
 public class ControlSkinTest {
     private ControlStub c;
     private SkinStub<ControlStub> s;
@@ -61,11 +62,11 @@ public class ControlSkinTest {
      *
      * By necessity, however, the skin does have a reference back to the control.
      */
-    @Before public void setUp() {
+    @BeforeEach
+    public void setUp() {
         c = new ControlStub();
         s = new SkinStub<>(c);
         t = new Tooltip();
-//        t.setSkin(new SkinStub<Tooltip>(t));
     }
 
     @Test public void controlWithNoSkinShouldReportNullEvenIfSkinKnowsAboutControl() {
@@ -102,7 +103,7 @@ public class ControlSkinTest {
         assertTrue(result[0]);
     }
 
-    @Ignore ("I need some means of being able to check whether CSS has been told this property is set manually")
+    @Disabled("I need some means of being able to check whether CSS has been told this property is set manually")
     @Test public void whenSkinIsChangedCSSIsNotified() {
     }
 
@@ -128,7 +129,9 @@ public class ControlSkinTest {
             boolean calledOnce = false;
             @Override
             public void invalidated(Observable o) {
-                if (calledOnce) org.junit.Assert.fail();
+                if (calledOnce) {
+                    fail();
+                }
                 calledOnce = true;
             }
         });
@@ -146,28 +149,28 @@ public void invalidated(Observable o) {
     }
 
 
-    @Ignore ("This spits out annoying debug statements, re-enable when we can disable all logging")
+    @Disabled("This spits out annoying debug statements, re-enable when we can disable all logging")
     @Test public void loadSkinClassShouldIgnoreNullNames() {
         c.setSkin(s);
         ((StyleableProperty)ControlShim.skinClassNameProperty(c)).applyStyle(null, null);
         assertSame(s, c.getSkin()); // shouldn't have changed
     }
 
-    @Ignore ("This spits out annoying debug statements, re-enable when we can disable all logging")
+    @Disabled("This spits out annoying debug statements, re-enable when we can disable all logging")
     @Test public void loadSkinClassShouldIgnoreEmptyStrings() {
         c.setSkin(s);
         ((StyleableProperty)ControlShim.skinClassNameProperty(c)).applyStyle(null, "");
         assertSame(s, c.getSkin()); // shouldn't have changed
     }
 
-    @Ignore ("This spits out annoying debug statements, re-enable when we can disable all logging")
+    @Disabled("This spits out annoying debug statements, re-enable when we can disable all logging")
     @Test public void loadSkinClassShouldIgnoreSkinsWithoutAProperConstructor() {
         c.setSkin(s);
         ((StyleableProperty)ControlShim.skinClassNameProperty(c)).applyStyle(null, "test.javafx.scene.control.ControlSkinTest$UnloadableSkinStub");
         assertSame(s, c.getSkin()); // shouldn't have changed
     }
 
-    @Ignore ("This spits out annoying debug statements, re-enable when we can disable all logging")
+    @Disabled("This spits out annoying debug statements, re-enable when we can disable all logging")
     @Test public void loadSkinClassShouldIgnoreBogusOrUnfindableSkins() {
         c.setSkin(s);
         ((StyleableProperty)ControlShim.skinClassNameProperty(c)).applyStyle(null, "test.javafx.scene.control.ControlSkinTest$FooSkinWhichDoesntExist");
@@ -195,9 +198,10 @@ public UnloadableSkinStub() {
         }
     }
 
-    @Test public void getUserAgentStylesheet() {
+    @Test
+    public void getUserAgentStylesheet() {
 
-        org.junit.Assume.assumeNotNull(ControlSkinTest.class.getResource("ControlSkinTest.css"));
+        Assumptions.assumeTrue(ControlSkinTest.class.getResource("ControlSkinTest.css") != null);
 
         ControlStub control = new ControlStub() {
             @Override public String getUserAgentStylesheet() {
@@ -214,12 +218,12 @@ public UnloadableSkinStub() {
         //  opacity set in ControlSkinTest.css
         assertEquals(.7, control.getOpacity(), 1E-6);
         assertNull(control.getSkin());
-
     }
 
-    @Test public void getUserAgentStylesheetDoesNotOverrideUserSetValue() {
+    @Test
+    public void getUserAgentStylesheetDoesNotOverrideUserSetValue() {
 
-        org.junit.Assume.assumeNotNull(ControlSkinTest.class.getResource("ControlSkinTest.css"));
+        Assumptions.assumeTrue(ControlSkinTest.class.getResource("ControlSkinTest.css") != null);
 
         ControlStub control = new ControlStub() {
             @Override public String getUserAgentStylesheet() {
@@ -236,12 +240,12 @@ public UnloadableSkinStub() {
         //  opacity set by setOpacity
         assertEquals(.3, control.getOpacity(), 1E-6);
         assertNull(control.getSkin());
-
     }
 
-    @Test public void getUserAgentStylesheetInlineStylePrevails() {
+    @Test
+    public void getUserAgentStylesheetInlineStylePrevails() {
 
-        org.junit.Assume.assumeNotNull(ControlSkinTest.class.getResource("ControlSkinTest.css"));
+        Assumptions.assumeTrue(ControlSkinTest.class.getResource("ControlSkinTest.css") != null);
 
         ControlStub control = new ControlStub() {
             @Override public String getUserAgentStylesheet() {
@@ -259,12 +263,12 @@ public UnloadableSkinStub() {
         //  opacity set by setStyle
         assertEquals(.42, control.getOpacity(), 1E-6);
         assertNull(control.getSkin());
-
     }
 
-    @Test public void getUserAgentStylesheetWithSkin() {
+    @Test
+    public void getUserAgentStylesheetWithSkin() {
 
-        org.junit.Assume.assumeNotNull(ControlSkinTest.class.getResource("ControlSkinTest.css"));
+        Assumptions.assumeTrue(ControlSkinTest.class.getResource("ControlSkinTest.css") != null);
 
         ControlStub control = new ControlStub() {
             @Override public String getUserAgentStylesheet() {
@@ -286,7 +290,5 @@ public UnloadableSkinStub() {
         //  opacity set in ControlSkinTest.css
         assertEquals(.85, control.getOpacity(), 1E-6);
         assertEquals(SkinStub.class, control.getSkin().getClass());
-
     }
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ControlTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ControlTest.java
index c70d811e8e0..916261f04a2 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ControlTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ControlTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,14 @@
 
 package test.javafx.scene.control;
 
-import javafx.css.CssMetaData;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -40,24 +47,23 @@
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.beans.value.WritableValue;
-import javafx.scene.Group;
-import javafx.scene.Node;
-import javafx.scene.shape.Rectangle;
-import com.sun.javafx.scene.control.Logging;
+import javafx.css.CssMetaData;
 import javafx.css.Styleable;
 import javafx.css.StyleableProperty;
+import javafx.scene.Group;
+import javafx.scene.Node;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.Control;
 import javafx.scene.control.ControlShim;
 import javafx.scene.control.Skin;
 import javafx.scene.control.Tooltip;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import javafx.scene.shape.Rectangle;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import com.sun.javafx.logging.PlatformLogger;
 import com.sun.javafx.logging.PlatformLogger.Level;
-
-import static org.junit.Assert.*;
+import com.sun.javafx.scene.control.Logging;
 
 /**
  * Things every Control needs to test:
@@ -86,10 +92,10 @@ public class ControlTest {
     private ControlStub c;
     private SkinStub<ControlStub> s;
     private ResizableRectangle skinNode;
-
     private Level originalLogLevel = null;
 
-    @Before public void setUp() {
+    @BeforeEach
+    public void setUp() {
         c = new ControlStub();
         s = new SkinStub<>(c);
         skinNode = new ResizableRectangle();
@@ -624,7 +630,7 @@ private void enableLogging() {
         assertEquals(0, c.prefWidth(-1), 0.0);
     }
 
-    @Ignore ("What should happen when the pref width is set to USE_PREF_SIZE? Seems it should be an exception")
+    @Disabled("What should happen when the pref width is set to USE_PREF_SIZE? Seems it should be an exception")
     @Test public void resettingPrefWidthTo_USE_PREF_SIZE_ThrowsExceptionWhenThereIsASkin() {
         c.setSkin(s);
         c.setPrefWidth(80);
@@ -709,7 +715,7 @@ private void enableLogging() {
         assertEquals(0, c.prefHeight(-1), 0.0);
     }
 
-    @Ignore ("What should happen when the pref width is set to USE_PREF_SIZE? Seems it should be an exception")
+    @Disabled("What should happen when the pref width is set to USE_PREF_SIZE? Seems it should be an exception")
     @Test public void resettingPrefHeightTo_USE_PREF_SIZE_ThrowsExceptionWhenThereIsASkin() {
         c.setSkin(s);
         c.setPrefHeight(92);
@@ -805,7 +811,7 @@ public void install() {
 
         SkinWithInstall skin = new SkinWithInstall(c);
         c.setSkin(skin);
-        assertTrue("Control.setSkin() must call Skin.install()", skin.installed);
+        assertTrue(skin.installed, "Control.setSkin() must call Skin.install()");
     }
 
     /** Verifies that an IllegalArgumentException is thrown when setting skin for an unrelated control JDK-8290844 */
@@ -1032,8 +1038,7 @@ public void testRT18097() {
                 URL base = cl.getResource("test/javafx/../javafx");
                 f = new File(base.toURI());
             }
-            //System.err.println(f.getPath());
-            assertTrue("" + f.getCanonicalPath() + " is not a directory", f.isDirectory());
+            assertTrue(f.isDirectory(), f.getCanonicalPath() + " is not a directory");
             recursiveCheck(f, f.getPath().length() - 7);
         } catch (Exception ex) {
             ex.printStackTrace(System.err);
@@ -1058,7 +1063,7 @@ private static void checkClass(Class someClass) {
 
                     what = someClass.getName() + " " + styleable.getProperty();
                     WritableValue writable = styleable.getStyleableProperty(node);
-                    assertNotNull(what, writable);
+                    assertNotNull(writable, what);
 
                     Object defaultValue = writable.getValue();
                     Object initialValue = styleable.getInitialValue((Node) someClass.getDeclaredConstructor().newInstance());
@@ -1069,16 +1074,13 @@ private static void checkClass(Class someClass) {
                         assert(initialValue instanceof Number);
                         double d1 = ((Number)defaultValue).doubleValue();
                         double d2 = ((Number)initialValue).doubleValue();
-                        assertEquals(what, d1, d2, .001);
-
+                        assertEquals(d1, d2, .001, what);
                     } else if (defaultValue != null && defaultValue.getClass().isArray()) {
-                        assertTrue(what, Arrays.equals((Object[])defaultValue, (Object[])initialValue));
+                        assertTrue(Arrays.equals((Object[])defaultValue, (Object[])initialValue), what);
                     } else {
-                        assertEquals(what, defaultValue, initialValue);
+                        assertEquals(defaultValue, initialValue, what);
                     }
-
                 }
-
             } catch (NoSuchMethodException ex) {
                 fail("NoSuchMethodException: RT-18097 cannot be tested on " + what);
             } catch (IllegalAccessException ex) {
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ControlTooltipTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ControlTooltipTest.java
index 4507ac4e331..3fb76aa5918 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ControlTooltipTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ControlTooltipTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,28 +26,42 @@
 package test.javafx.scene.control;
 
 import javafx.scene.control.Tooltip;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.Arguments;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertTimeout;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import org.junit.jupiter.api.Assumptions;
 
 /**
  *
  */
-@Ignore
+@Disabled
 public class ControlTooltipTest {
     private ControlStub c;
     private SkinStub<ControlStub> s;
     private Tooltip t;
 
-    @Before public void setUp() {
+    @BeforeEach
+    public void setUp() {
         c = new ControlStub();
         s = new SkinStub<>(c);
         c.setSkin(s);
         t = new Tooltip();
-//        t.setSkin(new SkinStub<Tooltip>(t));
     }
 
     @Test public void controlsWithNoTooltipHaveNoTooltipAsAChild() {
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ControlUtils.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ControlUtils.java
index b5263fbde74..7ce2c9b1775 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ControlUtils.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ControlUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,14 +24,10 @@
  */
 package test.javafx.scene.control;
 
-import static org.junit.Assert.assertEquals;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import java.util.Set;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-
-import com.sun.javafx.tk.Toolkit;
-
 import javafx.beans.property.SimpleStringProperty;
 import javafx.event.EventTarget;
 import javafx.scene.Node;
@@ -44,6 +40,7 @@
 import javafx.scene.control.TreeTableColumn;
 import javafx.scene.control.TreeTableRow;
 import javafx.scene.control.TreeTableView;
+import com.sun.javafx.tk.Toolkit;
 import test.com.sun.javafx.scene.control.infrastructure.KeyModifier;
 import test.com.sun.javafx.scene.control.infrastructure.MouseEventFirer;
 
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/CustomMenuItemTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/CustomMenuItemTest.java
index 47760796f32..ac42fab89a6 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/CustomMenuItemTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/CustomMenuItemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,33 +25,37 @@
 
 package test.javafx.scene.control;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.scene.Node;
+import javafx.scene.control.CustomMenuItem;
 import javafx.scene.shape.Rectangle;
-
-import test.com.sun.javafx.pgstub.StubToolkit;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import com.sun.javafx.tk.Toolkit;
-import javafx.scene.control.CustomMenuItem;
-import org.junit.Before;
-import org.junit.Test;
-
-import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.*;
-import static org.junit.Assert.*;
+import test.com.sun.javafx.pgstub.StubToolkit;
 
 /**
  *
  * @author srikalyc
  */
 public class CustomMenuItemTest {
-    private CustomMenuItem customMenuItem, cmi;//Empty string
+    private CustomMenuItem customMenuItem, cmi;
     private CustomMenuItem customMenuItemOneArg;
     private CustomMenuItem customMenuItemTwoArg;
     private Node node;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         assertTrue(Toolkit.getToolkit() instanceof StubToolkit);  // Ensure StubToolkit is loaded
 
         node = new Rectangle();
@@ -94,17 +98,17 @@ public class CustomMenuItemTest {
     @Test public void checkHideOnClickPropertyBind() {
         BooleanProperty objPr = new SimpleBooleanProperty(true);
         customMenuItem.hideOnClickProperty().bind(objPr);
-        assertTrue("hideOnClickProperty cannot be bound", customMenuItem.hideOnClickProperty().getValue());
+        assertTrue(customMenuItem.hideOnClickProperty().getValue(), "hideOnClickProperty cannot be bound");
         objPr.setValue(false);
-        assertFalse("hideOnClickProperty cannot be bound", customMenuItem.hideOnClickProperty().getValue());
+        assertFalse(customMenuItem.hideOnClickProperty().getValue(), "hideOnClickProperty cannot be bound");
     }
 
     @Test public void checkContentPropertyBind() {
         ObjectProperty objPr = new SimpleObjectProperty<Node>(null);
         customMenuItem.contentProperty().bind(objPr);
-        assertNull("contentProperty cannot be bound", customMenuItem.contentProperty().getValue());
+        assertNull(customMenuItem.contentProperty().getValue(), "contentProperty cannot be bound");
         objPr.setValue(node);
-        assertSame("contentProperty cannot be bound", customMenuItem.contentProperty().getValue(), node);
+        assertSame(customMenuItem.contentProperty().getValue(), node, "contentProperty cannot be bound");
     }
 
     @Test public void contentPropertyHasBeanReference() {
@@ -306,5 +310,4 @@ public class CustomMenuItemTest {
         cmi.hideOnClickProperty().bind(other);
         assertEquals(other.get(), cmi.isHideOnClick());
     }
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/DateCellTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/DateCellTest.java
index 45cc3c97fb4..fe56b7e4a2c 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/DateCellTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/DateCellTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,12 @@
 
 package test.javafx.scene.control;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.time.LocalDate;
-
-import com.sun.javafx.tk.Toolkit;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.scene.Group;
@@ -37,21 +39,19 @@
 import javafx.scene.control.CellShim;
 import javafx.scene.control.DateCell;
 import javafx.stage.Stage;
-
-import org.junit.Before;
-import org.junit.Test;
-
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.tk.Toolkit;
 import test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils;
 
-import static org.junit.Assert.*;
-
 public class DateCellTest {
     private DateCell cell;
     private Class type;
     private final LocalDate today = LocalDate.now();
     private final LocalDate tomorrow = today.plusDays(1);
 
-    @Before public void setup() throws Exception {
+    @BeforeEach
+    public void setup() throws Exception {
         cell = new DateCell();
     }
 
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/DatePickerTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/DatePickerTest.java
index cae8e33fec6..cff22d4ed14 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/DatePickerTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/DatePickerTest.java
@@ -25,20 +25,31 @@
 
 package test.javafx.scene.control;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
 import java.time.DateTimeException;
 import java.time.LocalDate;
-import java.time.chrono.*;
+import java.time.chrono.AbstractChronology;
+import java.time.chrono.ChronoLocalDate;
+import java.time.chrono.Chronology;
+import java.time.chrono.Era;
+import java.time.chrono.IsoChronology;
+import java.time.chrono.JapaneseChronology;
+import java.time.chrono.MinguoChronology;
+import java.time.chrono.MinguoDate;
+import java.time.chrono.MinguoEra;
 import java.time.temporal.ChronoField;
 import java.time.temporal.TemporalAccessor;
 import java.time.temporal.ValueRange;
-import java.util.*;
-
-import javafx.scene.control.Button;
-import javafx.scene.layout.HBox;
-import test.com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
-import test.com.sun.javafx.scene.control.infrastructure.KeyModifier;
-import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
-import com.sun.javafx.tk.Toolkit;
+import java.util.List;
+import java.util.Locale;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -47,25 +58,24 @@
 import javafx.event.EventHandler;
 import javafx.scene.Node;
 import javafx.scene.Scene;
+import javafx.scene.control.Button;
 import javafx.scene.control.DateCell;
 import javafx.scene.control.DatePicker;
 import javafx.scene.control.Tooltip;
+import javafx.scene.control.skin.DatePickerSkin;
 import javafx.scene.input.KeyCode;
+import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
 import javafx.util.Callback;
 import javafx.util.StringConverter;
-
-import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
-
-import javafx.scene.control.skin.DatePickerSkin;
-
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.tk.Toolkit;
+import test.com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
+import test.com.sun.javafx.scene.control.infrastructure.KeyModifier;
+import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
 
 public class DatePickerTest {
     private DatePicker datePicker;
@@ -91,16 +101,19 @@ public Node getDisplayNode() {
      *                                                                   *
      ********************************************************************/
 
-    @BeforeClass public static void setupOnce() {
+    @BeforeAll
+    public static void setupOnce() {
         defaultLocale = Locale.getDefault();
         Locale.setDefault(Locale.forLanguageTag("en-US"));
     }
 
-    @AfterClass public static void tearDownOnce() {
+    @AfterAll
+    public static void tearDownOnce() {
         Locale.setDefault(defaultLocale);
     }
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         datePicker = new DatePicker();
     }
 
@@ -373,26 +386,26 @@ public Node getDisplayNode() {
     @Test public void checkPromptTextPropertyBind() {
         StringProperty strPr = new SimpleStringProperty("value");
         datePicker.promptTextProperty().bind(strPr);
-        assertTrue("PromptText cannot be bound", datePicker.getPromptText().equals("value"));
+        assertTrue(datePicker.getPromptText().equals("value"), "PromptText cannot be bound");
         strPr.setValue("newvalue");
-        assertTrue("PromptText cannot be bound", datePicker.getPromptText().equals("newvalue"));
+        assertTrue(datePicker.getPromptText().equals("newvalue"), "PromptText cannot be bound");
     }
 
     @Test public void checkValuePropertyBind() {
         ObjectProperty<LocalDate> objPr = new SimpleObjectProperty<>(today);
         datePicker.valueProperty().bind(objPr);
-        assertTrue("value cannot be bound", datePicker.getValue().equals(today));
+        assertTrue(datePicker.getValue().equals(today), "value cannot be bound");
         LocalDate tomorrow = today.plusDays(1);
         objPr.setValue(tomorrow);
-        assertTrue("value cannot be bound", datePicker.getValue().equals(tomorrow));
+        assertTrue(datePicker.getValue().equals(tomorrow), "value cannot be bound");
     }
 
     @Test public void checkChronologyPropertyBind() {
         ObjectProperty<Chronology> objPr = new SimpleObjectProperty<>(IsoChronology.INSTANCE);
         datePicker.chronologyProperty().bind(objPr);
-        assertTrue("Chronology cannot be bound", datePicker.getChronology().equals(IsoChronology.INSTANCE));
+        assertTrue(datePicker.getChronology().equals(IsoChronology.INSTANCE), "Chronology cannot be bound");
         objPr.setValue(JapaneseChronology.INSTANCE);
-        assertTrue("Chronology cannot be bound", datePicker.getChronology().equals(JapaneseChronology.INSTANCE));
+        assertTrue(datePicker.getChronology().equals(JapaneseChronology.INSTANCE), "Chronology cannot be bound");
     }
 
 
@@ -606,14 +619,12 @@ public Node getDisplayNode() {
         // dp2.isFocused() returns true as expected, the scene focus owner is
         // not the ComboBox, but the FakeFocusTextField inside it
         dp1Keyboard.doKeyPress(KeyCode.TAB, KeyModifier.SHIFT);
-        assertTrue("Expect dp2 to be focused, but actual focus owner is: " + scene.getFocusOwner(),
-                dp2.isFocused());
+        assertTrue(dp2.isFocused(), "Expect dp2 to be focused, but actual focus owner is: " + scene.getFocusOwner());
         // Updated with fix for RT-34602: The TextField now never gets
         // focus (it's just faking it).
         // assertEquals("Expect dp2 TextField to be focused, but actual focus owner is: " + scene.getFocusOwner(),
         //         dp2.getEditor(), scene.getFocusOwner());
-        assertEquals("Expect dp2 to be focused, but actual focus owner is: " + scene.getFocusOwner(),
-                     dp2, scene.getFocusOwner());
+        assertEquals(dp2, scene.getFocusOwner(), "Expect dp2 to be focused, but actual focus owner is: " + scene.getFocusOwner());
 
         // This is where the second half of the bug appears, as we are stuck in
         // the FakeFocusTextField of dp2, we never make it to dp1
@@ -668,14 +679,16 @@ public void testNotEditableCommitValue() {
         assertEquals("11/24/2021", datePicker.getEditor().getText());
     }
 
-    @Test(expected = RuntimeException.class)
+    @Test
     public void testCommitValueWrongType() {
-        datePicker.setEditable(true);
-        datePicker.getEditor().setText("Some Date");
-        datePicker.commitValue();
+        assertThrows(RuntimeException.class, () -> {
+            datePicker.setEditable(true);
+            datePicker.getEditor().setText("Some Date");
+            datePicker.commitValue();
 
-        assertNull(datePicker.getValue());
-        assertEquals("Some Date", datePicker.getEditor().getText());
+            assertNull(datePicker.getValue());
+            assertEquals("Some Date", datePicker.getEditor().getText());
+        });
     }
 
     @Test
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/DefaultCancelButtonTestBase.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/DefaultCancelButtonTestBase.java
index 1653dd77c8b..e4539b5bb31 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/DefaultCancelButtonTestBase.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/DefaultCancelButtonTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,23 +25,16 @@
 
 package test.javafx.scene.control;
 
+import static javafx.scene.input.KeyCode.ENTER;
+import static javafx.scene.input.KeyCode.ESCAPE;
+import static javafx.scene.input.KeyEvent.KEY_PRESSED;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
 import java.util.function.Consumer;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import com.sun.javafx.tk.Toolkit;
-
-import static javafx.scene.input.KeyCode.*;
-import static javafx.scene.input.KeyEvent.*;
-import static org.junit.Assert.*;
-
+import java.util.stream.Stream;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.scene.Scene;
@@ -51,6 +44,11 @@
 import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import com.sun.javafx.tk.Toolkit;
 import test.com.sun.javafx.pgstub.StubToolkit;
 import test.com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
 
@@ -72,7 +70,6 @@
  * The test parameterized on all combination of the first 3 bullets, handling
  * the last by 4 test methods.
  */
-@RunWith(Parameterized.class)
 public abstract class DefaultCancelButtonTestBase<C extends Control> {
     /**
      * State of default/cancel button.
@@ -159,8 +156,6 @@ public EventHandler<KeyEvent> getKeyHandler(boolean consuming) {
         public String toString() {
             return "" + type;
         }
-
-
     }
 
     private Stage stage;
@@ -169,62 +164,56 @@ public String toString() {
     private Button fallback;
     private Scene scene;
 
-    private ButtonType buttonType;
-    private boolean consume;
-    private boolean registerAfterShowing;
-
-    // TODO name doesn't compile with gradle :controls:test
-    // because the junit version is 4.8.2 - name was introduced in 4.11
-    // commenting for now until upgrade to newer junit
-    @Parameterized.Parameters //( name = "{index}: Button {0}, consuming {1}, registerAfterShowing {2} " )
-    public static Collection<Object[]> data() {
-        Object[][] data = new Object[][] {
-            // buttonType, consuming, registerAfterShowing
-            {new ButtonType(ButtonState.DEFAULT), true, true},
-            {new ButtonType(ButtonState.DEFAULT), true, false},
-            {new ButtonType(ButtonState.DEFAULT), false, true},
-            {new ButtonType(ButtonState.DEFAULT), false, false},
-            {new ButtonType(ButtonState.CANCEL), true, true},
-            {new ButtonType(ButtonState.CANCEL), true, false},
-            {new ButtonType(ButtonState.CANCEL), false, true},
-            {new ButtonType(ButtonState.CANCEL), false, false},
-        };
-        return Arrays.asList(data);
-    }
-
-    public DefaultCancelButtonTestBase(ButtonType buttonType, boolean consume,
-            boolean registerAfterShowing) {
-        this.buttonType = buttonType;
-        this.consume = consume;
-        this.registerAfterShowing = registerAfterShowing;
+    //( name = "{index}: Button {0}, consuming {1}, registerAfterShowing {2} " )
+    static Stream<Arguments> parameters() {
+        return Stream.of(
+                Arguments.of(new ButtonType(ButtonState.DEFAULT), true, true),
+                Arguments.of(new ButtonType(ButtonState.DEFAULT), true, false),
+                Arguments.of(new ButtonType(ButtonState.DEFAULT), false, true),
+                Arguments.of(new ButtonType(ButtonState.DEFAULT), false, false),
+                Arguments.of(new ButtonType(ButtonState.CANCEL), true, true),
+                Arguments.of(new ButtonType(ButtonState.CANCEL), true, false),
+                Arguments.of(new ButtonType(ButtonState.CANCEL), false, true),
+                Arguments.of(new ButtonType(ButtonState.CANCEL), false, false)
+        );
     }
 
-
-    @Test
-    public void testFallbackFilter() {
-        registerHandlerAndAssertFallbackNotification(this::addEventFilter);
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testFallbackFilter(ButtonType buttonType, boolean consume, boolean registerAfterShowing) {
+        setup(buttonType);
+        registerHandlerAndAssertFallbackNotification(buttonType, consume, registerAfterShowing, this::addEventFilter);
     }
 
-    @Test
-    public void testFallbackHandler() {
-        registerHandlerAndAssertFallbackNotification(this::addEventHandler);
-
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testFallbackHandler(ButtonType buttonType, boolean consume, boolean registerAfterShowing) {
+        setup(buttonType);
+        registerHandlerAndAssertFallbackNotification(buttonType, consume, registerAfterShowing, this::addEventHandler);
     }
 
-    @Test
-    public void testFallbackSingletonHandler() {
-        registerHandlerAndAssertFallbackNotification(this::setOnKeyPressed);
-
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testFallbackSingletonHandler(ButtonType buttonType, boolean consume, boolean registerAfterShowing) {
+        setup(buttonType);
+        registerHandlerAndAssertFallbackNotification(buttonType, consume, registerAfterShowing, this::setOnKeyPressed);
     }
 
-    @Test
-    public void testFallbackNoHandler() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testFallbackNoHandler(ButtonType buttonType, boolean consume, boolean registerAfterShowing) {
         if (consume) return;
+        setup(buttonType);
         show();
         assertTargetNotification(buttonType.getCode(), buttonType.getButton(), 1);
     }
 
-    protected void registerHandlerAndAssertFallbackNotification(Consumer<EventHandler<KeyEvent>> consumer) {
+    protected void registerHandlerAndAssertFallbackNotification(
+        ButtonType buttonType,
+        boolean consume,
+        boolean registerAfterShowing,
+        Consumer<EventHandler<KeyEvent>> consumer
+    ) {
         if (registerAfterShowing) {
             show();
         }
@@ -278,23 +267,24 @@ protected void assertTargetNotification(KeyCode key, Button target, int expected
         KeyEventFirer keyFirer = new KeyEventFirer(control);
         keyFirer.doKeyPress(key);
         String exp = expected > 0 ? " must " : " must not ";
-        assertEquals(key + exp + " trigger ", expected, actions.size());
+        assertEquals(expected, actions.size(), key + exp + " trigger ");
     }
 
 
     /**
      * sanity test of initial state and test assumptions
      */
-    @Test
-    public void testInitial() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testInitial(ButtonType buttonType, boolean consume, boolean registerAfterShowing) {
+        setup(buttonType);
         show();
         assertTrue(control.isFocused());
         assertSame(root, control.getParent());
         assertSame(root, fallback.getParent());
     }
 
-
-    protected boolean isEnter() {
+    protected boolean isEnter(ButtonType buttonType) {
         return buttonType.getCode() == ENTER;
     }
 
@@ -320,21 +310,19 @@ private void initStage() {
         stage.setScene(scene);
     }
 
-    @Before
-    public void setup() {
+    // @BeforeEach
+    // junit5 does not support parameterized class-level tests yet
+    protected void setup(ButtonType buttonType) {
         initStage();
         control = createControl();
-
         fallback = buttonType.getButton();
         root.getChildren().addAll(control, fallback);
-
     }
 
-    @After
+    @AfterEach
     public void cleanup() {
         if (stage != null) {
             stage.hide();
         }
     }
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/DialogPaneTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/DialogPaneTest.java
index 8e4caf48f80..fe87f11f7fd 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/DialogPaneTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/DialogPaneTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 
 package test.javafx.scene.control;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import javafx.collections.ObservableList;
 import javafx.css.PseudoClass;
 import javafx.geometry.Bounds;
@@ -39,25 +40,23 @@
 import javafx.scene.layout.StackPane;
 import javafx.scene.shape.Rectangle;
 import javafx.scene.text.Font;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
 
-import static org.junit.Assert.assertEquals;
-
 public class DialogPaneTest {
 
     private StageLoader sl;
     private DialogPane dialogPane;
 
-    @Before
+    @BeforeEach
     public void setup() {
         dialogPane = new DialogPane();
         sl = new StageLoader(dialogPane);
     }
 
-    @After
+    @AfterEach
     public void after() {
         sl.dispose();
     }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/EventAnyTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/EventAnyTest.java
index bb97d352074..f38ab637635 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/EventAnyTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/EventAnyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,8 @@
 
 package test.javafx.scene.control;
 
-import java.util.Arrays;
-import java.util.Collection;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.stream.Stream;
 import javafx.event.Event;
 import javafx.event.EventType;
 import javafx.scene.Node;
@@ -44,53 +44,38 @@
 import javafx.scene.control.TreeTableView;
 import javafx.scene.control.TreeView;
 import javafx.scene.shape.Rectangle;
-import static org.junit.Assert.assertTrue;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-import org.junit.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@RunWith(Parameterized.class)
 public class EventAnyTest {
-    @Parameters
-    public static Collection getParams() {
-        return Arrays.asList(new Object[][] {
-            { CheckBoxTreeItem.TreeModificationEvent.ANY, checkBoxTreeEvent(), Rectangle.class, true},
-            { CheckBoxTreeItem.TreeModificationEvent.ANY, listViewEditEvent(), Rectangle.class, false},
-            { ListView.EditEvent.ANY, listViewEditEvent(), ListView.class, true},
-            { ListView.EditEvent.ANY, checkBoxTreeEvent(), ListView.class, false},
-            { ScrollToEvent.ANY, scrollToEvent(), Rectangle.class, true},
-            { ScrollToEvent.ANY, listViewEditEvent(), Rectangle.class, false},
-            { SortEvent.ANY, sortEvent(), Rectangle.class, true},
-            { SortEvent.ANY, scrollToEvent(), Rectangle.class, false},
-            { TableColumn.CellEditEvent.ANY, tableColumnCellEditEvent(), Rectangle.class, true },
-            { TableColumn.CellEditEvent.ANY, listViewEditEvent(), Rectangle.class, false },
-            { TreeItem.TreeModificationEvent.ANY, treeItemModificationEvent(), Rectangle.class, true},
-            { TreeItem.TreeModificationEvent.ANY, checkBoxTreeEvent(), Rectangle.class, false},
-            { TreeTableColumn.CellEditEvent.ANY, treeTableColumnCellEditEvent(), Rectangle.class, true },
-            { TreeTableColumn.CellEditEvent.ANY, tableColumnCellEditEvent(), Rectangle.class, false },
-            { TreeTableView.EditEvent.ANY, treeTableViewEditEvent(), TreeTableView.class, true },
-            { TreeTableView.EditEvent.ANY, treeTableColumnCellEditEvent(), TreeTableView.class, false },
-            { TreeView.EditEvent.ANY, treeViewEditEvent(), TreeView.class, true },
-            { TreeView.EditEvent.ANY, treeTableViewEditEvent(), TreeView.class, false },
-        });
+    private static Stream<Arguments> parameters() {
+        return Stream.of(
+            Arguments.of(CheckBoxTreeItem.TreeModificationEvent.ANY, checkBoxTreeEvent(), Rectangle.class, true),
+            Arguments.of(CheckBoxTreeItem.TreeModificationEvent.ANY, listViewEditEvent(), Rectangle.class, false),
+            Arguments.of(ListView.EditEvent.ANY, listViewEditEvent(), ListView.class, true),
+            Arguments.of(ListView.EditEvent.ANY, checkBoxTreeEvent(), ListView.class, false),
+            Arguments.of(ScrollToEvent.ANY, scrollToEvent(), Rectangle.class, true),
+            Arguments.of(ScrollToEvent.ANY, listViewEditEvent(), Rectangle.class, false),
+            Arguments.of(SortEvent.ANY, sortEvent(), Rectangle.class, true),
+            Arguments.of(SortEvent.ANY, scrollToEvent(), Rectangle.class, false),
+            Arguments.of(TableColumn.CellEditEvent.ANY, tableColumnCellEditEvent(), Rectangle.class, true),
+            Arguments.of(TableColumn.CellEditEvent.ANY, listViewEditEvent(), Rectangle.class, false),
+            Arguments.of(TreeItem.TreeModificationEvent.ANY, treeItemModificationEvent(), Rectangle.class, true),
+            Arguments.of(TreeItem.TreeModificationEvent.ANY, checkBoxTreeEvent(), Rectangle.class, false),
+            Arguments.of(TreeTableColumn.CellEditEvent.ANY, treeTableColumnCellEditEvent(), Rectangle.class, true),
+            Arguments.of(TreeTableColumn.CellEditEvent.ANY, tableColumnCellEditEvent(), Rectangle.class, false),
+            Arguments.of(TreeTableView.EditEvent.ANY, treeTableViewEditEvent(), TreeTableView.class, true),
+            Arguments.of(TreeTableView.EditEvent.ANY, treeTableColumnCellEditEvent(), TreeTableView.class, false),
+            Arguments.of(TreeView.EditEvent.ANY, treeViewEditEvent(), TreeView.class, true),
+            Arguments.of(TreeView.EditEvent.ANY, treeTableViewEditEvent(), TreeView.class, false));
     }
 
     private boolean delivered;
-    private EventType type;
-    private Event event;
-    private Class target;
-    private boolean matches;
-
-    public EventAnyTest(EventType type, Event event, Class target, boolean matches) {
-        this.type = type;
-        this.event = event;
-        this.matches = matches;
-        this.target = target;
-    }
 
-    @Test
-    public void testEventDelivery() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testEventDelivery(EventType type, Event event, Class<?> target, boolean matches) throws Exception {
         Node n = (Node) target.getDeclaredConstructor().newInstance();
         delivered = false;
 
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/FireButtonBaseTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/FireButtonBaseTest.java
index 6fe17c0fc1c..ba228ce9c4b 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/FireButtonBaseTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/FireButtonBaseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,11 @@
 
 package test.javafx.scene.control;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.Collection;
+import java.util.List;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
-import java.util.Arrays;
-import java.util.Collection;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonBase;
 import javafx.scene.control.CheckBox;
@@ -37,50 +38,50 @@
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.SplitMenuButton;
 import javafx.scene.control.ToggleButton;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import static org.junit.Assert.assertTrue;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  */
-@RunWith(Parameterized.class)
 public class FireButtonBaseTest {
-    @SuppressWarnings("rawtypes")
-    @Parameterized.Parameters public static Collection implementations() {
-        return Arrays.asList(new Object[][]{
-                {Button.class},
-                {CheckBox.class},
-                {Hyperlink.class},
-                {RadioButton.class},
-                {MenuButton.class},
-                {SplitMenuButton.class},
-                {ToggleButton.class}
-        });
+    private static Collection<Class<?>> parameters() {
+        return List.of(
+            Button.class,
+            CheckBox.class,
+            Hyperlink.class,
+            RadioButton.class,
+            MenuButton.class,
+            SplitMenuButton.class,
+            ToggleButton.class
+        );
     }
 
     private ButtonBase btn;
-    private Class type;
 
-    public FireButtonBaseTest(Class type) {
-        this.type = type;
-    }
-
-    @Before public void setup() throws Exception {
-        btn = (ButtonBase) type.getDeclaredConstructor().newInstance();
+    //@BeforeEach
+    // junit5 does not support parameterized class-level tests yet
+    public void setup(Class<?> type) {
+        try {
+            btn = (ButtonBase) type.getDeclaredConstructor().newInstance();
+        } catch(Exception e) {
+            throw new RuntimeException(e);
+        }
     }
 
-    @Test public void onActionCalledWhenButtonIsFired() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void onActionCalledWhenButtonIsFired(Class<?> type) {
+        setup(type);
         final EventHandlerStub handler = new EventHandlerStub();
         btn.setOnAction(handler);
         btn.fire();
         assertTrue(handler.called);
     }
 
-    @Test public void onActionCalledWhenNullWhenButtonIsFiredIsNoOp() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void onActionCalledWhenNullWhenButtonIsFiredIsNoOp(Class<?> type) {
+        setup(type);
         btn.fire(); // should throw no exceptions, if it does, the test fails
     }
 
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/HyperlinkTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/HyperlinkTest.java
index b7ec48ea8c0..e285a56aa47 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/HyperlinkTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/HyperlinkTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,19 +25,20 @@
 
 package test.javafx.scene.control;
 
-import javafx.css.CssMetaData;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertPseudoClassDoesNotExist;
 import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertPseudoClassExists;
 import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
+import javafx.css.CssMetaData;
 import javafx.css.StyleableProperty;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
@@ -45,14 +46,14 @@
 import javafx.scene.Cursor;
 import javafx.scene.control.Hyperlink;
 import javafx.scene.shape.Rectangle;
-
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class HyperlinkTest {
     private Hyperlink link;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         link = new Hyperlink();
     }
 
@@ -171,7 +172,7 @@ public class HyperlinkTest {
         } catch (ClassCastException ignored) {
             // pass!
         } catch (Exception e) {
-            org.junit.Assert.fail(e.toString());
+            fail(e);
         }
     }
 
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/IndexRangeTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/IndexRangeTest.java
index 52956f3ada6..872e2a705e6 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/IndexRangeTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/IndexRangeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,11 @@
 
 package test.javafx.scene.control;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import javafx.scene.control.IndexRange;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
 
 /**
  */
@@ -50,9 +51,11 @@ public class IndexRangeTest {
         assertEquals(20, range.getEnd());
     }
 
-    @Test (expected = IllegalArgumentException.class)
+    @Test
     public void createRangeWithEndLessThanStartResultsIn_IAE() {
-        new IndexRange(20, 10);
+        assertThrows(IllegalArgumentException.class, () -> {
+            new IndexRange(20, 10);
+        });
     }
 
     @Test public void createRangeUsingCopyConstructor() {
@@ -62,9 +65,11 @@ public void createRangeWithEndLessThanStartResultsIn_IAE() {
         assertEquals(20, range.getEnd());
     }
 
-    @Test (expected = NullPointerException.class)
+    @Test
     public void createRangeUsingCopyConstructorPassingNullResultsIn_NPE() {
-        new IndexRange(null);
+        assertThrows(NullPointerException.class, () -> {
+            new IndexRange(null);
+        });
     }
 
     /*********************************************************************
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/IndexRangeValueOfTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/IndexRangeValueOfTest.java
index e5986e001fd..481a09bbf29 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/IndexRangeValueOfTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/IndexRangeValueOfTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,23 +25,19 @@
 
 package test.javafx.scene.control;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
 import javafx.scene.control.IndexRange;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import static org.junit.Assert.*;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  */
-@RunWith(Parameterized.class)
 public class IndexRangeValueOfTest {
-    @SuppressWarnings("rawtypes")
-    @Parameterized.Parameters public static Collection implementations() {
+    public static Collection<TestParameters> parameters() {
         // Valid strings are ones where the string contains only 2 numbers separated by a comma and
         // have only whitespace surrounding the numbers / comma. Any other characters will lead to
         // an exception.
@@ -59,7 +55,7 @@ public class IndexRangeValueOfTest {
         int[] numbers = new int[] { 10, 20, 1, -10, -20, -1, 0};
         int[] rules = new int[] {0, 1, 2, 3};
 
-        List params = new LinkedList();
+        List<TestParameters> params = new LinkedList<>();
         for (int i=0; i<numbers.length; i++) {
             for (int j=0; j<numbers.length; j++) {
                 for (int k=0; k<rules.length; k++) {
@@ -84,7 +80,7 @@ public class IndexRangeValueOfTest {
                             param.string = start + ",," + end;
                             break;
                     }
-                    params.add(new Object[] {param});
+                    params.add(param);
                 }
             }
         }
@@ -92,13 +88,9 @@ public class IndexRangeValueOfTest {
         return params;
     }
 
-    private TestParameters params;
-
-    public IndexRangeValueOfTest(TestParameters params) {
-        this.params = params;
-    }
-
-    @Test public void testValueOf() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testValueOf(TestParameters params) {
         if (params.expected == null) {
             try {
                 IndexRange.valueOf(params.string);
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/IndexedCellTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/IndexedCellTest.java
index 0667c505299..466a71a8b55 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/IndexedCellTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/IndexedCellTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,19 +25,22 @@
 
 package test.javafx.scene.control;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertPseudoClassDoesNotExist;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertPseudoClassExists;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
 import javafx.scene.control.IndexedCell;
-import org.junit.Before;
-import org.junit.Test;
-
-import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.*;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  */
 public class IndexedCellTest {
     private IndexedCell<String> cell;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         cell = new IndexedCell<>();
     }
 
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/InputMapTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/InputMapTest.java
index b2ae1a80be5..f9fb09ea01c 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/InputMapTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/InputMapTest.java
@@ -1,7 +1,7 @@
 package test.javafx.scene.control;
 
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * questions.
  */
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class InputMapTest {
 
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/LabelTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/LabelTest.java
index 4670fee1186..eb7706f77b5 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/LabelTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/LabelTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,28 +25,30 @@
 
 package test.javafx.scene.control;
 
-import com.sun.javafx.scene.NodeHelper;
-import javafx.css.CssMetaData;
-import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.*;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.getListenerCount;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
+import javafx.css.CssMetaData;
 import javafx.css.StyleableProperty;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
 import javafx.scene.shape.Rectangle;
-
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.scene.NodeHelper;
 
 public class LabelTest {
     private Label label;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         label = new Label();
     }
 
@@ -151,7 +153,7 @@ public class LabelTest {
         } catch (ClassCastException ignored) {
             // pass!
         } catch (Exception e) {
-            org.junit.Assert.fail(e.toString());
+            fail(e);
         }
     }
 
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/LabeledTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/LabeledTest.java
index 00c99fb3b3a..b47a96a695d 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/LabeledTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/LabeledTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,13 +25,13 @@
 
 package test.javafx.scene.control;
 
-import javafx.css.CssMetaData;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.ObjectProperty;
@@ -40,6 +40,7 @@
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
+import javafx.css.CssMetaData;
 import javafx.css.StyleableProperty;
 import javafx.geometry.Insets;
 import javafx.geometry.Orientation;
@@ -53,10 +54,9 @@
 import javafx.scene.shape.Rectangle;
 import javafx.scene.text.Font;
 import javafx.scene.text.TextAlignment;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
  *
@@ -68,7 +68,8 @@
 public class LabeledTest {
     private Labeled labeled;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         labeled = new LabeledMock();
     }
 
@@ -160,7 +161,7 @@ public class LabeledTest {
         } catch (ClassCastException ignored) {
             // pass!
         } catch (Exception e) {
-            org.junit.Assert.fail(e.toString());
+            fail(e);
         }
     }
 
@@ -581,7 +582,7 @@ public class LabeledTest {
         assertTrue(styleable.isSettable(labeled));
     }
 
-    @Ignore ("CSS Graphic must be a URL, and then it will try to load the image. Not sure how to test.")
+    @Disabled("CSS Graphic must be a URL, and then it will try to load the image. Not sure how to test.")
     @Test public void canSpecifyGraphicViaCSS() {
         ((StyleableProperty)labeled.graphicProperty()).applyStyle(null, "/some/url");
         assertNotNull(labeled.getGraphic());
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ListCellTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ListCellTest.java
index 721f976631d..895b8de48c7 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ListCellTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ListCellTest.java
@@ -25,15 +25,29 @@
 
 package test.javafx.scene.control;
 
-import javafx.scene.control.IndexedCell;
-import javafx.scene.control.skin.ListCellSkin;
-import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
+import static javafx.scene.control.ControlShim.installDefaultSkin;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertListenerListContains;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertListenerListDoesNotContain;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertValueListenersContains;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertValueListenersDoesNotContain;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.getInvalidationListener;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.getListChangeListener;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
 import javafx.beans.InvalidationListener;
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
-
 import javafx.scene.control.FocusModel;
+import javafx.scene.control.IndexedCell;
 import javafx.scene.control.ListCell;
 import javafx.scene.control.ListCellShim;
 import javafx.scene.control.ListView;
@@ -41,23 +55,14 @@
 import javafx.scene.control.MultipleSelectionModel;
 import javafx.scene.control.MultipleSelectionModelBaseShim;
 import javafx.scene.control.SelectionMode;
-
-import java.util.List;
-import java.util.ArrayList;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
+import javafx.scene.control.skin.ListCellSkin;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import com.sun.javafx.tk.Toolkit;
+import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
 import test.com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils;
 
-import static javafx.scene.control.ControlShim.*;
-import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.*;
-import static org.junit.Assert.*;
-
 /**
  */
 public class ListCellTest {
@@ -66,7 +71,8 @@ public class ListCellTest {
     private ObservableList<String> model;
     private StageLoader stageLoader;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         Thread.currentThread().setUncaughtExceptionHandler((thread, throwable) -> {
             if (throwable instanceof RuntimeException) {
                 throw (RuntimeException)throwable;
@@ -80,7 +86,8 @@ public class ListCellTest {
         list = new ListView<>(model);
     }
 
-    @After public void cleanup() {
+    @AfterEach
+    public void cleanup() {
         if (stageLoader != null) stageLoader.dispose();
         Thread.currentThread().setUncaughtExceptionHandler(null);
     }
@@ -375,9 +382,9 @@ public void testNullItem() {
      * @param index
      */
     protected void assertOffRangeState(int index) {
-        assertEquals("off range index", index, cell.getIndex());
-        assertNull("off range cell item must be null", cell.getItem());
-        assertTrue("off range cell must be empty", cell.isEmpty());
+        assertEquals(index, cell.getIndex(), "off range index");
+        assertNull(cell.getItem(), "off range cell item must be null");
+        assertTrue(cell.isEmpty(), "off range cell must be empty");
     }
 
     /**
@@ -385,9 +392,9 @@ protected void assertOffRangeState(int index) {
      * @param index
      */
     protected void assertInRangeState(int index) {
-        assertEquals("in range index", index, cell.getIndex());
-        assertEquals("in range cell item must be same as model item", model.get(index), cell.getItem());
-        assertFalse("in range cell must not be empty", cell.isEmpty());
+        assertEquals(index, cell.getIndex(), "in range index");
+        assertEquals(model.get(index), cell.getItem(), "in range cell item must be same as model item");
+        assertFalse(cell.isEmpty(), "in range cell must not be empty");
     }
 
 
@@ -685,7 +692,7 @@ protected void assertInRangeState(int index) {
         List<EditEvent<?>> events = new ArrayList<>();
         list.setOnEditStart(events::add);
         cell.startEdit();
-        assertEquals("startEdit must not fire event while editing", 0, events.size());
+        assertEquals(0, events.size(), "startEdit must not fire event while editing");
     }
 
     // commitEdit()
@@ -783,7 +790,7 @@ public void testEditCancelEventAfterCancelOnCell() {
         list.setOnEditCancel(events::add);
         cell.cancelEdit();
         assertEquals(1, events.size());
-        assertEquals("editing location of cancel event", editingIndex, events.get(0).getIndex());
+        assertEquals(editingIndex, events.get(0).getIndex(), "editing location of cancel event");
     }
 
     @Test
@@ -797,7 +804,7 @@ public void testEditCancelEventAfterCancelOnList() {
         list.setOnEditCancel(events::add);
         list.edit(-1);
         assertEquals(1, events.size());
-        assertEquals("editing location of cancel event", editingIndex, events.get(0).getIndex());
+        assertEquals(editingIndex, events.get(0).getIndex(), "editing location of cancel event");
     }
 
     @Test
@@ -811,7 +818,7 @@ public void testEditCancelEventAfterChangeEditingIndexOnList() {
         list.setOnEditCancel(events::add);
         list.edit(0);
         assertEquals(1, events.size());
-        assertEquals("editing location of cancel event", editingIndex, events.get(0).getIndex());
+        assertEquals(editingIndex, events.get(0).getIndex(), "editing location of cancel event");
     }
 
     @Test
@@ -825,7 +832,7 @@ public void testEditCancelEventAfterCellReuse() {
         list.setOnEditCancel(events::add);
         cell.updateIndex(0);
         assertEquals(1, events.size());
-        assertEquals("editing location of cancel event", editingIndex, events.get(0).getIndex());
+        assertEquals(editingIndex, events.get(0).getIndex(), "editing location of cancel event");
     }
 
     @Test
@@ -839,7 +846,7 @@ public void testEditCancelEventAfterModifyItems() {
         list.getItems().add(0, "added");
         Toolkit.getToolkit().firePulse();
         assertEquals(1, events.size());
-        assertEquals("editing location of cancel event", editingIndex, events.get(0).getIndex());
+        assertEquals(editingIndex, events.get(0).getIndex(), "editing location of cancel event");
     }
 
     @Test
@@ -852,9 +859,9 @@ public void testEditCancelEventAfterRemoveEditingItem() {
         list.setOnEditCancel(events::add);
         list.getItems().remove(editingIndex);
         Toolkit.getToolkit().firePulse();
-        assertEquals("removing item must cancel edit on list", -1, list.getEditingIndex());
+        assertEquals(-1, list.getEditingIndex(), "removing item must cancel edit on list");
         assertEquals(1, events.size());
-        assertEquals("editing location of cancel event", editingIndex, events.get(0).getIndex());
+        assertEquals(editingIndex, events.get(0).getIndex(), "editing location of cancel event");
     }
 
     @Test
@@ -865,8 +872,8 @@ public void testStartEditOffRangeMustNotFireStartEdit() {
         List<EditEvent<?>> events = new ArrayList<>();
         list.addEventHandler(ListView.editStartEvent(), events::add);
         cell.startEdit();
-        assertFalse("sanity: off-range cell must not be editing", cell.isEditing());
-        assertEquals("must not fire editStart", 0, events.size());
+        assertFalse(cell.isEditing(), "sanity: off-range cell must not be editing");
+        assertEquals(0, events.size(), "must not fire editStart");
     }
 
     @Test
@@ -875,8 +882,8 @@ public void testStartEditOffRangeMustNotUpdateEditingLocation() {
         cell.updateListView(list);
         cell.updateIndex(list.getItems().size());
         cell.startEdit();
-        assertFalse("sanity: off-range cell must not be editing", cell.isEditing());
-        assertEquals("list editing location must not be updated", -1, list.getEditingIndex());
+        assertFalse(cell.isEditing(), "sanity: off-range cell must not be editing");
+        assertEquals(-1, list.getEditingIndex(), "list editing location must not be updated");
     }
 
     @Test
@@ -896,8 +903,8 @@ public void testCommitEditMustNotFireCancel() {
         list.setOnEditCancel(events::add);
         String value = "edited";
         cell.commitEdit(value);
-        assertEquals("sanity: value committed", value, list.getItems().get(editingIndex));
-        assertEquals("commit must not have fired editCancel", 0, events.size());
+        assertEquals(value, list.getItems().get(editingIndex), "sanity: value committed");
+        assertEquals(0, events.size(), "commit must not have fired editCancel");
     }
 
     // When the list view item's change and affects a cell that is editing, then what?
@@ -988,15 +995,9 @@ public void testListCellHeights() {
         cell.updateListView(listView);
         installDefaultSkin(cell);
         listView.setFixedCellSize(100);
-        assertEquals("pref height must be fixedCellSize",
-                listView.getFixedCellSize(),
-                cell.prefHeight(-1), 1);
-        assertEquals("min height must be fixedCellSize",
-                listView.getFixedCellSize(),
-                cell.minHeight(-1), 1);
-        assertEquals("max height must be fixedCellSize",
-                listView.getFixedCellSize(),
-                cell.maxHeight(-1), 1);
+        assertEquals(listView.getFixedCellSize(), cell.prefHeight(-1), 1, "pref height must be fixedCellSize");
+        assertEquals(listView.getFixedCellSize(), cell.minHeight(-1), 1, "min height must be fixedCellSize");
+        assertEquals(listView.getFixedCellSize(), cell.maxHeight(-1), 1, "max height must be fixedCellSize");
     }
 
     @Test
@@ -1031,11 +1032,11 @@ private void assertChangeIndexToEditing(int initialCellIndex, int listEditingInd
         cell.updateListView(list);
         cell.updateIndex(initialCellIndex);
         list.edit(listEditingIndex);
-        assertEquals("sanity: list editingIndex ", listEditingIndex, list.getEditingIndex());
-        assertFalse("sanity: cell must not be editing", cell.isEditing());
+        assertEquals(listEditingIndex, list.getEditingIndex(), "sanity: list editingIndex ");
+        assertFalse(cell.isEditing(), "sanity: cell must not be editing");
         cell.updateIndex(listEditingIndex);
-        assertEquals("sanity: index updated ", listEditingIndex, cell.getIndex());
-        assertEquals("list editingIndex unchanged by cell", listEditingIndex, list.getEditingIndex());
+        assertEquals(listEditingIndex, cell.getIndex(), "sanity: index updated ");
+        assertEquals(listEditingIndex, list.getEditingIndex(), "list editingIndex unchanged by cell");
         assertTrue(cell.isEditing());
         assertEquals(1, events.size());
     }
@@ -1067,12 +1068,12 @@ public void assertUpdateCellIndexOffEditing(int editingIndex, int cancelIndex) {
         cell.updateListView(list);
         cell.updateIndex(editingIndex);
         list.edit(editingIndex);
-        assertEquals("sanity: list editingIndex ", editingIndex, list.getEditingIndex());
-        assertTrue("sanity: cell must be editing", cell.isEditing());
+        assertEquals(editingIndex, list.getEditingIndex(), "sanity: list editingIndex ");
+        assertTrue(cell.isEditing(), "sanity: cell must be editing");
         cell.updateIndex(cancelIndex); // change cell index to negative
-        assertEquals("sanity: index updated ", cancelIndex, cell.getIndex());
-        assertEquals("list editingIndex unchanged by cell", editingIndex, list.getEditingIndex());
-        assertFalse("cell must not be editing if cell index is " + cell.getIndex(), cell.isEditing());
+        assertEquals(cancelIndex, cell.getIndex(), "sanity: index updated ");
+        assertEquals(editingIndex, list.getEditingIndex(), "list editingIndex unchanged by cell");
+        assertFalse(cell.isEditing(), "cell must not be editing if cell index is " + cell.getIndex());
         assertEquals(1, events.size());
     }
 
@@ -1088,26 +1089,26 @@ public void testMisbehavingCancelEditTerminatesEdit() {
         int notEditingIndex = -1;
         cell.updateIndex(editingIndex);
         list.edit(editingIndex);
-        assertTrue("sanity: ", cell.isEditing());
+        assertTrue(cell.isEditing(), "sanity: ");
         try {
             list.edit(intermediate);
         } catch (Exception ex) {
             // just catching to test in finally
         } finally {
-            assertFalse("cell must not be editing", cell.isEditing());
-            assertEquals("list must be editing at intermediate index", intermediate, list.getEditingIndex());
+            assertFalse(cell.isEditing(), "cell must not be editing");
+            assertEquals(intermediate, list.getEditingIndex(), "list must be editing at intermediate index");
         }
         // test editing: second round
         // switch cell off editing by cell api
         list.edit(editingIndex);
-        assertTrue("sanity: ", cell.isEditing());
+        assertTrue(cell.isEditing(), "sanity: ");
         try {
             cell.cancelEdit();
         } catch (Exception ex) {
             // just catching to test in finally
         } finally {
-            assertFalse("cell must not be editing", cell.isEditing());
-            assertEquals("list editing must be cancelled by cell", notEditingIndex, list.getEditingIndex());
+            assertFalse(cell.isEditing(), "cell must not be editing");
+            assertEquals(notEditingIndex, list.getEditingIndex(), "list editing must be cancelled by cell");
         }
     }
 
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ListViewKeyInputTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ListViewKeyInputTest.java
index 537c2052e1b..904521088b5 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ListViewKeyInputTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ListViewKeyInputTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,15 +25,33 @@
 
 package test.javafx.scene.control;
 
-import com.sun.javafx.scene.control.behavior.ListCellBehavior;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.List;
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 import javafx.scene.Group;
 import javafx.scene.control.Button;
+import javafx.scene.control.FocusModel;
+import javafx.scene.control.FocusModelShim;
+import javafx.scene.control.IndexedCell;
+import javafx.scene.control.ListView;
+import javafx.scene.control.MultipleSelectionModel;
+import javafx.scene.control.SelectionMode;
 import javafx.scene.input.KeyCode;
-import java.util.List;
+import javafx.scene.layout.HBox;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import com.sun.javafx.PlatformUtil;
+import com.sun.javafx.scene.control.behavior.ListCellBehavior;
+import com.sun.javafx.tk.Toolkit;
 import com.sun.javafx.util.Utils;
 import test.com.sun.javafx.scene.control.behavior.ListViewAnchorRetriever;
 import test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils;
@@ -41,24 +59,6 @@
 import test.com.sun.javafx.scene.control.infrastructure.KeyModifier;
 import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
 import test.com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils;
-import com.sun.javafx.tk.Toolkit;
-import javafx.scene.control.FocusModel;
-import javafx.scene.control.FocusModelShim;
-import javafx.scene.control.IndexedCell;
-import javafx.scene.control.ListView;
-import javafx.scene.control.MultipleSelectionModel;
-import javafx.scene.control.SelectionMode;
-import javafx.scene.layout.HBox;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
 public class ListViewKeyInputTest {
     private ListView<String> listView;
@@ -69,7 +69,8 @@ public class ListViewKeyInputTest {
 
     private StageLoader stageLoader;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         listView = new ListView<>();
         sm = listView.getSelectionModel();
         fm = listView.getFocusModel();
@@ -82,7 +83,8 @@ public class ListViewKeyInputTest {
         listView.getItems().setAll("1", "2", "3", "4", "5", "6", "7", "8", "9", "10");
     }
 
-    @After public void tearDown() {
+    @AfterEach
+    public void tearDown() {
         listView.getSkin().dispose();
         stageLoader.dispose();
     }
@@ -223,7 +225,7 @@ private boolean isAnchor(int index) {
         sm.clearAndSelect(0);
         assertTrue(fm.isFocused(0));
         keyboard.doRightArrowPress(KeyModifier.getShortcutKey());
-        assertTrue(debug(), fm.isFocused(0));
+        assertTrue(fm.isFocused(0), debug());
         assertTrue(sm.isSelected(0));
     }
 
@@ -280,7 +282,7 @@ private boolean isAnchor(int index) {
     @Test public void testHomeKey() {
         sm.clearAndSelect(3);
         keyboard.doKeyPress(KeyCode.HOME);
-        assertTrue(debug(), isSelected(0));
+        assertTrue(isSelected(0), debug());
         assertTrue(isNotSelected(1,2,3));
     }
 
@@ -319,7 +321,7 @@ private boolean isAnchor(int index) {
                 (Utils.isMac() ? KeyModifier.CTRL : null));
 
         assertTrue(isNotSelected(5));
-        assertTrue(debug(), fm.isFocused(5));
+        assertTrue(fm.isFocused(5), debug());
         assertTrue(isAnchor(5));
     }
 
@@ -376,7 +378,7 @@ private boolean isAnchor(int index) {
         keyboard.doDownArrowPress(KeyModifier.SHIFT);
         keyboard.doDownArrowPress(KeyModifier.SHIFT);
         keyboard.doUpArrowPress(KeyModifier.SHIFT);
-        assertTrue(debug(), sm.isSelected(0));
+        assertTrue(sm.isSelected(0), debug());
         assertTrue(sm.isSelected(1));
         assertFalse(sm.isSelected(2));
     }
@@ -529,7 +531,7 @@ private boolean isAnchor(int index) {
         keyboard.doKeyPress(KeyCode.SPACE, KeyModifier.SHIFT);  // select 0,1,2
         assertTrue(isSelected(0, 1, 2));
         assertTrue(isNotSelected(3));
-        assertTrue(debug(), isAnchor(2));
+        assertTrue(isAnchor(2), debug());
     }
 
     // test 33
@@ -569,7 +571,7 @@ private boolean isAnchor(int index) {
         keyboard.doKeyPress(KeyCode.SPACE, KeyModifier.SHIFT);  // select 0,1,2
         assertTrue(isSelected(0, 1, 2));
         assertTrue(isNotSelected(3, 4));
-        assertTrue(debug(), isAnchor(2));
+        assertTrue(isAnchor(2), debug());
     }
 
     // test 35
@@ -588,7 +590,7 @@ private boolean isAnchor(int index) {
         keyboard.doUpArrowPress(KeyModifier.getShortcutKey());    // move focus to 1
         keyboard.doUpArrowPress(KeyModifier.getShortcutKey());    // move focus to 0
         keyboard.doDownArrowPress(KeyModifier.SHIFT);  // select 1,2,3
-        assertTrue(debug(), isSelected(1, 2, 3));
+        assertTrue(isSelected(1, 2, 3), debug());
         assertTrue(isNotSelected(0));
     }
 
@@ -692,7 +694,7 @@ private boolean isAnchor(int index) {
         keyboard.doKeyPress(KeyCode.HOME, KeyModifier.SHIFT);
         assertTrue(isSelected(0,1,2));
         assertTrue(isNotSelected(3,4));
-        assertTrue(debug(),isAnchor(2));
+        assertTrue(isAnchor(2), debug());
     }
 
     // test 51
@@ -712,7 +714,7 @@ private boolean isAnchor(int index) {
         keyboard.doKeyPress(KeyCode.END, KeyModifier.SHIFT);
         assertTrue(isSelected(3,4,5,6,7,8,9));
         assertTrue(isNotSelected(0,1,2));
-        assertTrue(debug(),isAnchor(3));
+        assertTrue(isAnchor(3), debug());
     }
 
     // test 42
@@ -759,7 +761,7 @@ private boolean isAnchor(int index) {
         keyboard.doKeyPress(KeyCode.HOME, KeyModifier.SHIFT);
         assertTrue(isSelected(0,1,2,3));
         assertTrue(isNotSelected(4,5));
-        assertTrue(debug(), isAnchor(3));
+        assertTrue(isAnchor(3), debug());
     }
 
     // test 49
@@ -827,7 +829,7 @@ private boolean isAnchor(int index) {
 
         keyboard.doDownArrowPress(KeyModifier.getShortcutKey(), KeyModifier.SHIFT);
         keyboard.doDownArrowPress(KeyModifier.getShortcutKey(), KeyModifier.SHIFT);
-        assertTrue(debug(),isSelected(0,2,3,4));
+        assertTrue(isSelected(0,2,3,4), debug());
         assertTrue(isAnchor(2));
     }
 
@@ -1038,7 +1040,7 @@ private boolean isAnchor(int index) {
 
         keyboard.doKeyPress(KeyCode.HOME, KeyModifier.SHIFT);
         assertTrue(isSelected(0,1,2,3,4,5));
-        assertTrue(debug(), isNotSelected(6,7,8,9));
+        assertTrue(isNotSelected(6,7,8,9), debug());
     }
 
     @Test public void test_rt14451_2() {
@@ -1050,7 +1052,7 @@ private boolean isAnchor(int index) {
 
         keyboard.doKeyPress(KeyCode.HOME, KeyModifier.SHIFT);
         assertTrue(isSelected(0,1,2,3,4,5));
-        assertTrue(debug(), isNotSelected(6,7,8,9));
+        assertTrue(isNotSelected(6,7,8,9), debug());
 
         keyboard.doKeyPress(KeyCode.END, KeyModifier.SHIFT);
         assertTrue(isNotSelected(0,1,2,3,4));
@@ -1066,13 +1068,13 @@ private boolean isAnchor(int index) {
     @Test public void test_rt26835_2() {
         sm.clearAndSelect(5);
         keyboard.doKeyPress(KeyCode.END, KeyModifier.getShortcutKey());
-        assertTrue(debug(), fm.isFocused(listView.getItems().size() - 1));
+        assertTrue(fm.isFocused(listView.getItems().size() - 1), debug());
     }
 
     @Test public void test_rt27175() {
         sm.clearAndSelect(5);
         keyboard.doKeyPress(KeyCode.HOME, KeyModifier.SHIFT, KeyModifier.getShortcutKey());
-        assertTrue(debug(), fm.isFocused(0));
+        assertTrue(fm.isFocused(0), debug());
         assertTrue(isSelected(0,1,2,3,4,5));
     }
 
@@ -1310,7 +1312,7 @@ private boolean isAnchor(int index) {
         assertNotSame(newSelectionOwner, nextSelectionOwner);
     }
 
-    @Ignore("Fix not yet implemented")
+    @Disabled("Fix not yet implemented")
     @Test public void test_rt20641_pageUp() {
         final int items = 20;
         listView.getItems().clear();
@@ -1344,7 +1346,7 @@ private boolean isAnchor(int index) {
         assertTrue(selectedIndex0 < selectedIndex2);
     }
 
-    @Ignore("Fix not yet implemented")
+    @Disabled("Fix not yet implemented")
     @Test public void test_rt20641_pageDown() {
         final int items = 100;
         listView.getItems().clear();
@@ -1571,7 +1573,7 @@ private boolean isAnchor(int index) {
         assertTrue(isNotSelected(0,1));
         assertTrue(isSelected(2,3,4));
         assertEquals(3, sm.getSelectedItems().size());
-        assertTrue("Focus index incorrectly at: " + fm.getFocusedIndex(), fm.isFocused(4));
+        assertTrue(fm.isFocused(4), "Focus index incorrectly at: " + fm.getFocusedIndex());
     }
 
     @Test public void test_rt33301_multipleSelection_up() {
@@ -1832,7 +1834,7 @@ private boolean isAnchor(int index) {
         sl.dispose();
     }
 
-    @Ignore("JDK-8289909") // there is no guarantee that there will be 8 selected items (can be 7 as well)
+    @Disabled("JDK-8289909") // there is no guarantee that there will be 8 selected items (can be 7 as well)
     @Test public void test_rt34407_up_up_down() {
         final int items = 100;
         listView.getItems().clear();
@@ -2216,7 +2218,7 @@ private void test_rt_27709(SelectionMode mode, boolean resetSelection) {
 
         keyboard.doKeyPress(KeyCode.HOME, KeyModifier.SHIFT);
         assertEquals(expectedSize, indices.size());
-        assertTrue(debug(),sm.isSelected(0));
+        assertTrue(sm.isSelected(0), debug());
 
         if (resetSelection) {
             sm.clearAndSelect(0);
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ListViewMouseInputTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ListViewMouseInputTest.java
index a76be06cbf3..fd51660e7cc 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ListViewMouseInputTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ListViewMouseInputTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,14 @@
 
 package test.javafx.scene.control;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
-
-import test.com.sun.javafx.scene.control.infrastructure.MouseEventFirer;
-import com.sun.javafx.tk.Toolkit;
 import javafx.collections.ListChangeListener;
 import javafx.scene.control.Button;
 import javafx.scene.control.FocusModel;
@@ -39,19 +41,16 @@
 import javafx.scene.control.ScrollBar;
 import javafx.scene.control.SelectionMode;
 import javafx.scene.layout.VBox;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.tk.Toolkit;
 import test.com.sun.javafx.scene.control.behavior.ListViewAnchorRetriever;
 import test.com.sun.javafx.scene.control.infrastructure.KeyModifier;
+import test.com.sun.javafx.scene.control.infrastructure.MouseEventFirer;
 import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
 import test.com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils;
 
-import static org.junit.Assert.*;
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-
-//@Ignore("Disabling tests as they fail with OOM in continuous builds")
 public class ListViewMouseInputTest {
     private ListView<String> listView;
     private MultipleSelectionModel<String> sm;
@@ -59,7 +58,8 @@ public class ListViewMouseInputTest {
 
     private StageLoader stageLoader;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         listView = new ListView<>();
         sm = listView.getSelectionModel();
         fm = listView.getFocusModel();
@@ -70,7 +70,8 @@ public class ListViewMouseInputTest {
         sm.clearAndSelect(0);
     }
 
-    @After public void tearDown() {
+    @AfterEach
+    public void tearDown() {
         listView.getSkin().dispose();
 
         if (stageLoader != null) {
@@ -133,11 +134,11 @@ private boolean isAnchor(int index) {
 
         // select all from 9 - 7
         VirtualFlowTestUtils.clickOnRow(listView, 7, KeyModifier.SHIFT);
-        assertTrue(debug(), isSelected(7,8,9));
+        assertTrue(isSelected(7,8,9), debug());
 
         // select all from 9 - 7 - 5
         VirtualFlowTestUtils.clickOnRow(listView, 5, KeyModifier.SHIFT);
-        assertTrue(debug(),isSelected(5,6,7,8,9));
+        assertTrue(isSelected(5,6,7,8,9), debug());
     }
 
     @Test public void test_rt29833_mouse_select_downwards() {
@@ -147,11 +148,11 @@ private boolean isAnchor(int index) {
 
         // select all from 5 - 7
         VirtualFlowTestUtils.clickOnRow(listView, 7, KeyModifier.SHIFT);
-        assertTrue(debug(), isSelected(5,6,7));
+        assertTrue(isSelected(5,6,7), debug());
 
         // select all from 5 - 7 - 9
         VirtualFlowTestUtils.clickOnRow(listView, 9, KeyModifier.SHIFT);
-        assertTrue(debug(),isSelected(5,6,7,8,9));
+        assertTrue(isSelected(5,6,7,8,9), debug());
     }
 
     private int rt30394_count = 0;
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ListViewTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ListViewTest.java
index 6d46411eca0..0f8d276c018 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ListViewTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ListViewTest.java
@@ -25,14 +25,17 @@
 
 package test.javafx.scene.control;
 
-import com.sun.javafx.scene.control.VirtualScrollBar;
-import com.sun.javafx.scene.control.behavior.FocusTraversalInputMap;
-import com.sun.javafx.scene.control.behavior.ListCellBehavior;
-import com.sun.javafx.scene.control.behavior.ListViewBehavior;
-import com.sun.javafx.scene.control.inputmap.InputMap;
-import com.sun.javafx.scene.control.inputmap.InputMap.KeyMapping;
-import com.sun.javafx.scene.control.inputmap.KeyBinding;
-import com.sun.javafx.tk.Toolkit;
+import static javafx.collections.FXCollections.observableArrayList;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -74,23 +77,17 @@
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Rectangle;
 import javafx.util.Callback;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
-import static javafx.collections.FXCollections.*;
-
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.scene.control.VirtualScrollBar;
+import com.sun.javafx.scene.control.behavior.FocusTraversalInputMap;
+import com.sun.javafx.scene.control.behavior.ListCellBehavior;
+import com.sun.javafx.scene.control.behavior.ListViewBehavior;
+import com.sun.javafx.scene.control.inputmap.InputMap;
+import com.sun.javafx.scene.control.inputmap.InputMap.KeyMapping;
+import com.sun.javafx.scene.control.inputmap.KeyBinding;
+import com.sun.javafx.tk.Toolkit;
 import test.com.sun.javafx.scene.control.infrastructure.ControlSkinFactory;
 import test.com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
 import test.com.sun.javafx.scene.control.infrastructure.KeyModifier;
@@ -106,7 +103,8 @@ public class ListViewTest {
 
     private StageLoader stageLoader;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         listView = new ListView<>();
         sm = listView.getSelectionModel();
         fm = listView.getFocusModel();
@@ -120,7 +118,7 @@ public class ListViewTest {
         });
     }
 
-    @After
+    @AfterEach
     public void cleanup() {
         Thread.currentThread().setUncaughtExceptionHandler(null);
 
@@ -969,7 +967,7 @@ public void test_rt35857_selectFirst_retainAllSelected() {
      */
     protected <T> void assert_rt35857(ObservableList<T> items, MultipleSelectionModel<T> sm, boolean retain) {
         T selectedItem = sm.getSelectedItem();
-        assertNotNull("sanity: ", selectedItem);
+        assertNotNull(selectedItem, "sanity: ");
         ObservableList<T> expected;
         if (retain) {
             expected = FXCollections.observableArrayList(selectedItem);
@@ -980,7 +978,7 @@ protected <T> void assert_rt35857(ObservableList<T> items, MultipleSelectionMode
             items.removeAll(sm.getSelectedItems());
         }
         String modified = (retain ? " retainAll " : " removeAll ") + " selectedItems ";
-        assertEquals("expected list after" + modified, expected, items);
+        assertEquals(expected, items, "expected list after" + modified);
     }
 
     @Test public void test_rt35857() {
@@ -1430,7 +1428,7 @@ private void test_rt_38787(String expectedItem, int expectedIndex, String... ite
 
         // we also expect there to be an event in the selection model for
         // selected indices and selected items
-        assertEquals(sm.getSelectedIndices() +"", 2, rt_38341_indices_count);
+        assertEquals(2, rt_38341_indices_count, sm.getSelectedIndices() + "");
         assertEquals(2, rt_38341_items_count);
     }
 
@@ -1911,7 +1909,7 @@ public int hashCode() {
         // but in index (last - 2).
         int expected = last - 2;
         assertEquals("5", sm.getSelectedItem());
-        assertEquals("selected index after disjoint removes above", expected, sm.getSelectedIndex());
+        assertEquals(expected, sm.getSelectedIndex(), "selected index after disjoint removes above");
     }
 
     /**
@@ -1958,8 +1956,8 @@ public int hashCode() {
 
         // disjoint remove of 2 elements above the last selected
         items.removeAll(items.get(1), items.get(3));
-        assertEquals("sanity: selectedIndex must be shifted by -2", last - 2, sm.getSelectedIndex());
-        assertEquals("must fire single event on removes above", 1, rt_40012_count);
+        assertEquals(last - 2, sm.getSelectedIndex(), "sanity: selectedIndex must be shifted by -2");
+        assertEquals(1, rt_40012_count, "must fire single event on removes above");
     }
 
     /**
@@ -1981,8 +1979,8 @@ public void test_rt_40012_selectedItemNotificationOnDisjointRemovesAbove() {
 
         // disjoint remove of 2 elements above the last selected
         items.removeAll(items.get(1), items.get(3));
-        assertEquals("sanity: selectedItem unchanged", lastItem, sm.getSelectedItem());
-        assertEquals("must not fire on unchanged selected item", 0, rt_40012_count);
+        assertEquals(lastItem, sm.getSelectedItem(), "sanity: selectedItem unchanged");
+        assertEquals(0, rt_40012_count, "must not fire on unchanged selected item");
     }
 
     @Test public void test_rt_40185() {
@@ -2021,12 +2019,12 @@ public void test_rt_40012_selectedItemNotificationOnDisjointRemovesAbove() {
         int selected = sm.getSelectedIndex();
 
         sm.getSelectedIndices().addListener((ListChangeListener<Integer>) change -> {
-            assertEquals("sanity: selectedIndex unchanged", selected, sm.getSelectedIndex());
+            assertEquals(selected, sm.getSelectedIndex(), "sanity: selectedIndex unchanged");
             while(change.next()) {
-                assertEquals("single event on clearAndSelect already selected", 1, ++rt_40212_count);
+                assertEquals(1, ++rt_40212_count, "single event on clearAndSelect already selected");
 
                 boolean type = change.wasAdded() || change.wasRemoved() || change.wasPermutated() || change.wasUpdated();
-                assertTrue("at least one of the change types must be true", type);
+                assertTrue(type, "at least one of the change types must be true");
             }
         });
 
@@ -2215,10 +2213,8 @@ public void test_rt_40012_selectedItemNotificationOnDisjointRemovesAbove() {
 
         // test editEvent
         assertNotNull(editEvent.get());
-        assertEquals("type is startEdit",
-                     ListView.editStartEvent(), editEvent.get().getEventType());
-        assertEquals("index on start event",
-                     editIndex, editEvent.get().getIndex());
+        assertEquals(ListView.editStartEvent(), editEvent.get().getEventType(), "type is startEdit");
+        assertEquals(editIndex, editEvent.get().getIndex(), "index on start event");
 
         sl.dispose();
     }
@@ -2235,20 +2231,20 @@ public void testEventIndicesOnSelectRange() {
         sm.select(selected);
         sm.getSelectedIndices().addListener((ListChangeListener<Integer>) ch -> {
             if (ch.next()) {
-                assertEquals("Two items should be selected.", 2, ch.getList().size());
-                assertEquals("Selection range should be from index 1 ", 1, ch.getFrom());
-                assertEquals("Selection range should be till index 2 ", 2, ch.getTo());
+                assertEquals(2, ch.getList().size(), "Two items should be selected.");
+                assertEquals(1, ch.getFrom(), "Selection range should be from index 1 ");
+                assertEquals(2, ch.getTo(), "Selection range should be till index 2 ");
             } else {
                 fail("Change event is expected when selection is changed.");
             }
         });
         int focus = lv.getFocusModel().getFocusedIndex();
-        assertEquals("Selected item should be focused.", selected, focus);
+        assertEquals(selected, focus, "Selected item should be focused.");
         // Select the next element
         sm.selectRange(selected, focus + 2);
-        assertEquals("Two items should be selected.", 2, sm.getSelectedIndices().size());
-        assertEquals("List item at index 1 should be selected", 1, (int) sm.getSelectedIndices().get(0));
-        assertEquals("List item at index 2 should be selected", 2, (int) sm.getSelectedIndices().get(1));
+        assertEquals(2, sm.getSelectedIndices().size(), "Two items should be selected.");
+        assertEquals(1, (int) sm.getSelectedIndices().get(0), "List item at index 1 should be selected");
+        assertEquals(2, (int) sm.getSelectedIndices().get(1), "List item at index 2 should be selected");
     }
 
     @Test public void testInterceptedKeyMappingsForComboBoxEditor() {
@@ -2299,7 +2295,7 @@ public void testListViewLeak() {
         ObservableList<String> items = FXCollections.observableArrayList();
         WeakReference<ListView<String>> listViewRef = new WeakReference<>(new ListView<>(items));
         attemptGC(listViewRef, 10);
-        assertNull("ListView is not GCed.", listViewRef.get());
+        assertNull(listViewRef.get(), "ListView is not GCed.");
     }
 
     @Test
@@ -2309,7 +2305,7 @@ public void testItemLeak() {
         ListView<String> listView = new ListView<>(items);
         items.clear();
         attemptGC(itemRef, 10);
-        assertNull("ListView item is not GCed.", itemRef.get());
+        assertNull(itemRef.get(), "ListView item is not GCed.");
     }
 
     @Test
@@ -2413,11 +2409,11 @@ public void updateItem(Integer item, boolean empty) {
         for (int i = 0; i < cc; i++) {
             IndexedCell<Integer> cell = VirtualFlowTestUtils.getCell(listView, i);
             if ((cell != null) && (cell.getItem() == 20)) {
-                assertEquals("Last cell doesn't end at listview end", viewportLength - 20, cell.getLayoutY(), 1.);
+                assertEquals(viewportLength - 20, cell.getLayoutY(), 1., "Last cell doesn't end at listview end");
                 got20 = true;
             }
             if ((cell != null) && (cell.getItem() == 70)) {
-                assertEquals("Secondlast cell doesn't end properly", viewportLength - 20 - 70, cell.getLayoutY(), 1.);
+                assertEquals(viewportLength - 20 - 70, cell.getLayoutY(), 1., "Secondlast cell doesn't end properly");
                 got70 = true;
             }
         }
@@ -2434,11 +2430,11 @@ public void updateItem(Integer item, boolean empty) {
         for (int i = 0; i < cc; i++) {
             IndexedCell<Integer> cell = VirtualFlowTestUtils.getCell(listView, i);
             if ((cell != null) && (cell.getItem() == 21)) {
-                assertEquals("Last cell doesn't end at listview end", viewportLength - 21, cell.getLayoutY(), 1.);
+                assertEquals(viewportLength - 21, cell.getLayoutY(), 1., "Last cell doesn't end at listview end");
                 got21 = true;
             }
             if ((cell != null) && (cell.getItem() == 20)) {
-                assertEquals("Secondlast cell doesn't end properly", viewportLength - 21 - 20, cell.getLayoutY(), 1.);
+                assertEquals(viewportLength - 21 - 20, cell.getLayoutY(), 1., "Secondlast cell doesn't end properly");
                 got20 = true;
             }
         }
@@ -2599,19 +2595,19 @@ public static void verifyListViewScrollTo(ListView listView, int listViewHeight,
             scrolledToBottom = true;
         }
 
-        assertTrue("Our cell must be visible!", scrollToCell.isVisible());
+        assertTrue(scrollToCell.isVisible(), "Our cell must be visible!");
 
         if (lastCell.isVisible() && sumOfHeights >= viewportLength) {
             // There shouldn't be any space between the last cell and the bottom
-            assertTrue("Last cell shouldn't leave space between itself and the bottom", lastCell.getLayoutY() + 1 > (viewportLength - lastCellSize));
+            assertTrue(lastCell.getLayoutY() + 1 > (viewportLength - lastCellSize), "Last cell shouldn't leave space between itself and the bottom");
         }
         if (sumOfHeights < viewportLength) {
             // If we have less cells then space, then all cells are shown, and the position of the last cell, is the sum of the height of the previous cells.
-            assertEquals("Last cell should be at the bottom, if we scroll to it", sumOfHeights - lastCellSize, lastCell.getLayoutY(), 1.);
+            assertEquals(sumOfHeights - lastCellSize, lastCell.getLayoutY(), 1., "Last cell should be at the bottom, if we scroll to it");
         }
         if (!shouldScrollToBottom && sumOfHeights > viewportLength) {
             // If we don't scroll to the bottom, and the cells are bigger than the available space, then our cell should be at the top.
-            assertEquals("Our cell mut be at the top", 0, scrollToCell.getLayoutY(), 1.);
+            assertEquals(0, scrollToCell.getLayoutY(), 1., "Our cell mut be at the top");
         }
         // Additional Tests:
         double previousLayoutY = scrollToCell.getLayoutY();
@@ -2621,10 +2617,10 @@ public static void verifyListViewScrollTo(ListView listView, int listViewHeight,
             listView.getItems().setAll(alternateHeights);
             listView.requestLayout();
             Toolkit.getToolkit().firePulse();
-            assertEquals("Upper cell shouldn't move after changing heights", previousLayoutY, scrollToCell.getLayoutY(), 1.);
+            assertEquals(previousLayoutY, scrollToCell.getLayoutY(), 1., "Upper cell shouldn't move after changing heights");
             VirtualFlow vf = VirtualFlowTestUtils.getVirtualFlow(listView);
             vf.scrollPixels(-1);
-            assertEquals("Upper cell should move 1 pixels, after scrolling 1 pixel", previousLayoutY + 1, scrollToCell.getLayoutY(), 1.);
+            assertEquals(previousLayoutY + 1, scrollToCell.getLayoutY(), 1., "Upper cell should move 1 pixels, after scrolling 1 pixel");
         }
 
     }
@@ -2660,15 +2656,13 @@ public void fixListViewCrash_JDK_8303680() {
         assertNotNull(cell);
 
         // should be visible
-        assertTrue("Cell should be visible", cell.isVisible());
+        assertTrue(cell.isVisible(), "Cell should be visible");
 
         // should have parent
-        assertNotNull("Cell should have parent", cell.getParent());
+        assertNotNull(cell.getParent(), "Cell should have parent");
 
         // Note:
         // We don't check for the position of the cell, because it's currently don't work properly.
         // But we wan't to ensure, that the VirtualFlow "Doesn't crash" - which was the case before.
-
     }
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/MenuBarTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/MenuBarTest.java
index 492935ed496..45afa013337 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/MenuBarTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/MenuBarTest.java
@@ -25,52 +25,48 @@
 
 package test.javafx.scene.control;
 
-import com.sun.javafx.scene.SceneHelper;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.scene.Node;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.Menu;
+import javafx.scene.control.MenuBar;
+import javafx.scene.control.MenuButton;
+import javafx.scene.control.MenuItem;
+import javafx.scene.control.skin.MenuBarSkin;
 import javafx.scene.control.skin.MenuBarSkinShim;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.scene.SceneHelper;
+import com.sun.javafx.scene.control.ContextMenuContent;
+import com.sun.javafx.scene.control.MenuBarMenuButtonShim;
+import com.sun.javafx.tk.Toolkit;
 import test.com.sun.javafx.pgstub.StubToolkit;
 import test.com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
 import test.com.sun.javafx.scene.control.infrastructure.KeyModifier;
 import test.com.sun.javafx.scene.control.infrastructure.MouseEventGenerator;
-import com.sun.javafx.scene.control.ContextMenuContent;
-import com.sun.javafx.scene.control.MenuBarMenuButtonShim;
-import javafx.scene.control.skin.MenuBarSkin;
-import com.sun.javafx.tk.Toolkit;
-import javafx.scene.control.CheckBox;
-import javafx.scene.control.Menu;
-import javafx.scene.control.MenuBar;
-import javafx.scene.control.MenuButton;
-import javafx.scene.control.MenuItem;
-
 
 /**
  *
  * @author lubermud
  */
-
 public class MenuBarTest {
     private MenuBar menuBar;
     private Toolkit tk;
     private Scene scene;
     private Stage stage;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         setUncaughtExceptionHandler();
 
         tk = Toolkit.getToolkit();
@@ -81,7 +77,8 @@ public class MenuBarTest {
         menuBar.setUseSystemMenuBar(false);
     }
 
-    @After public void cleanup() {
+    @AfterEach
+    public void cleanup() {
         if (stage != null) {
             stage.hide();
         }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/MenuButtonTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/MenuButtonTest.java
index af44238a759..25801daab61 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/MenuButtonTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/MenuButtonTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,13 +25,12 @@
 
 package test.javafx.scene.control;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.event.Event;
 import javafx.event.EventHandler;
@@ -48,13 +47,10 @@
 import javafx.scene.layout.VBox;
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
-
-import org.junit.Before;
-import org.junit.Test;
-
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import com.sun.javafx.scene.SceneHelper;
 import com.sun.javafx.tk.Toolkit;
-
 import test.com.sun.javafx.scene.control.infrastructure.MouseEventGenerator;
 
 /**
@@ -64,7 +60,8 @@
 public class MenuButtonTest {
     private MenuButton menuButton;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         menuButton = new MenuButton();
     }
 
@@ -339,24 +336,16 @@ public void test_RT_21894() {
         mbtn.hide();
 
         for (int i = 0; i < 5; ++i) {
-            assertEquals("event " + i + " is not of type MenuButton.ON_SHOWN",
-                    MenuButton.ON_SHOWING, onShowingEventTypes[i]);
-            assertEquals("event " + i + " is not of type MenuButton.ON_SHOWN",
-                    MenuButton.ON_SHOWN, onShownEventTypes[i]);
-            assertEquals("event " + i + " is not of type MenuButton.ON_HIDING",
-                    MenuButton.ON_HIDING, onHidingEventTypes[i]);
-            assertEquals("event " + i + " is not of type  MenuButton.ON_HIDDEN",
-                    MenuButton.ON_HIDDEN, onHiddenEventTypes[i]);
+            assertEquals(MenuButton.ON_SHOWING, onShowingEventTypes[i], "event " + i + " is not of type MenuButton.ON_SHOWN");
+            assertEquals(MenuButton.ON_SHOWN, onShownEventTypes[i], "event " + i + " is not of type MenuButton.ON_SHOWN");
+            assertEquals(MenuButton.ON_HIDING, onHidingEventTypes[i], "event " + i + " is not of type MenuButton.ON_HIDING");
+            assertEquals(MenuButton.ON_HIDDEN, onHiddenEventTypes[i], "event " + i + " is not of type  MenuButton.ON_HIDDEN");
         }
 
-        assertEquals("MenuButton.ON_SHOWING event listener should "
-            + "get called 5 times. ", 5, onShowing);
-        assertEquals("MenuButton.ON_SHOWN event listener should "
-            + "get called 5 times. ", 5, onShown);
-        assertEquals("MenuButton.ON_HIDING event listener should "
-            + "get called 5 times. ", 5, onHiding);
-        assertEquals("MenuButton.ON_HIDDEN event listener should "
-            + "get called 5 times. ", 5, onHidden);
+        assertEquals(5, onShowing, "MenuButton.ON_SHOWING event listener should get called 5 times. ");
+        assertEquals(5, onShown, "MenuButton.ON_SHOWN event listener should get called 5 times. ");
+        assertEquals(5, onHiding, "MenuButton.ON_HIDING event listener should get called 5 times. ");
+        assertEquals(5, onHidden, "MenuButton.ON_HIDDEN event listener should get called 5 times. ");
     }
 
     EventType onShowingEventType;
@@ -393,23 +382,15 @@ public void test_RT_21894() {
         mbtn.show();
         mbtn.hide();
 
-        assertEquals("event is not of type MenuButton.ON_SHOWING",
-            MenuButton.ON_SHOWING, onShowingEventType);
-        assertEquals("event is not of type MenuButton.ON_SHOWN",
-            MenuButton.ON_SHOWN, onShownEventType);
-        assertEquals("event is not of type MenuButton.ON_HIDING",
-            MenuButton.ON_HIDING, onHidingEventType);
-        assertEquals("event is not of type MenuButton.ON_HIDDEN",
-            MenuButton.ON_HIDDEN, onHiddenEventType);
-
-        assertEquals("MenuButton.ON_SHOWING event listener should "
-            + "get called once.", 1, onShowing);
-        assertEquals("MenuButton.ON_SHOWN event listener should "
-            + "get called once.", 1, onShown);
-        assertEquals("MenuButton.ON_HIDING event listener should "
-            + "get called once.", 1, onHiding);
-        assertEquals("MenuButton.ON_HIDDEN event listener should "
-            + "get called once.", 1, onHidden);
+        assertEquals(MenuButton.ON_SHOWING, onShowingEventType, "event is not of type MenuButton.ON_SHOWING");
+        assertEquals(MenuButton.ON_SHOWN, onShownEventType, "event is not of type MenuButton.ON_SHOWN");
+        assertEquals(MenuButton.ON_HIDING, onHidingEventType, "event is not of type MenuButton.ON_HIDING");
+        assertEquals(MenuButton.ON_HIDDEN, onHiddenEventType, "event is not of type MenuButton.ON_HIDDEN");
+
+        assertEquals(1, onShowing, "MenuButton.ON_SHOWING event listener should get called once.");
+        assertEquals(1, onShown, "MenuButton.ON_SHOWN event listener should get called once.");
+        assertEquals(1, onHiding, "MenuButton.ON_HIDING event listener should get called once.");
+        assertEquals(1, onHidden, "MenuButton.ON_HIDDEN event listener should get called once.");
     }
 
     // Test for JDK-8177633
@@ -431,46 +412,30 @@ public void handle(Event event) {
         mbtn.setOnHiding(handlers[2]);
         mbtn.setOnHidden(handlers[3]);
 
-        assertEquals("getOnShowing() should return same handler as set using "
-            + "setOnShowing()", handlers[0], mbtn.getOnShowing());
-        assertEquals("getOnShown() should return same handler as set using "
-            + "setOnShown()", handlers[1], mbtn.getOnShown());
-        assertEquals("getOnHiding() should return same handler as set using "
-            + "setOnHiding()", handlers[2], mbtn.getOnHiding());
-        assertEquals("getOnHidden() should return same handler as set using "
-            + "setOnHidden()", handlers[3], mbtn.getOnHidden());
-
-        assertEquals("onShowingProperty().get() should return same handler as "
-            + "set using setOnShowing()", handlers[0], mbtn.onShowingProperty().get());
-        assertEquals("onShownProperty().get() should return same handler as "
-            + "set using setOnShown()", handlers[1], mbtn.onShownProperty().get());
-        assertEquals("onHidingProperty().get() should return same handler as "
-            + "set using setOnHiding()", handlers[2], mbtn.onHidingProperty().get());
-        assertEquals("onHiddenProperty().get() should return same handler as "
-            + "set using setOnHidden()", handlers[3], mbtn.onHiddenProperty().get());
+        assertEquals(handlers[0], mbtn.getOnShowing(), "getOnShowing() should return same handler as set using setOnShowing()");
+        assertEquals(handlers[1], mbtn.getOnShown(), "getOnShown() should return same handler as set using setOnShown()");
+        assertEquals(handlers[2], mbtn.getOnHiding(), "getOnHiding() should return same handler as set using setOnHiding()");
+        assertEquals(handlers[3], mbtn.getOnHidden(), "getOnHidden() should return same handler as set using setOnHidden()");
+
+        assertEquals(handlers[0], mbtn.onShowingProperty().get(), "onShowingProperty().get() should return same handler as set using setOnShowing()");
+        assertEquals(handlers[1], mbtn.onShownProperty().get(), "onShownProperty().get() should return same handler as set using setOnShown()");
+        assertEquals(handlers[2], mbtn.onHidingProperty().get(), "onHidingProperty().get() should return same handler as set using setOnHiding()");
+        assertEquals(handlers[3], mbtn.onHiddenProperty().get(), "onHiddenProperty().get() should return same handler as set using setOnHidden()");
 
         mbtn.setOnShowing(null);
         mbtn.setOnShown(null);
         mbtn.setOnHiding(null);
         mbtn.setOnHidden(null);
 
-        assertEquals("getOnShowing() should return same handler as set using "
-            + "setOnShowing()", null, mbtn.getOnShowing());
-        assertEquals("getOnShown() should return same handler as set using "
-            + "setOnShown()", null, mbtn.getOnShown());
-        assertEquals("getOnHiding() should return same handler as set using "
-            + "setOnHiding()", null, mbtn.getOnHiding());
-        assertEquals("getOnHidden() should return same handler as set using "
-            + "setOnHidden()", null, mbtn.getOnHidden());
-
-        assertEquals("onShowingProperty().get() should return same handler as "
-            + "set using setOnShowing()", null, mbtn.onShowingProperty().get());
-        assertEquals("onShownProperty().get() should return same handler as "
-            + "set using setOnShown()", null, mbtn.onShownProperty().get());
-        assertEquals("onHidingProperty().get() should return same handler as "
-            + "set using setOnHiding()", null, mbtn.onHidingProperty().get());
-        assertEquals("onHiddenProperty().get() should return same handler as "
-            + "set using setOnHidden()", null, mbtn.onHiddenProperty().get());
+        assertEquals(null, mbtn.getOnShowing(), "getOnShowing() should return same handler as set using setOnShowing()");
+        assertEquals(null, mbtn.getOnShown(), "getOnShown() should return same handler as set using setOnShown()");
+        assertEquals(null, mbtn.getOnHiding(), "getOnHiding() should return same handler as set using setOnHiding()");
+        assertEquals(null, mbtn.getOnHidden(), "getOnHidden() should return same handler as set using setOnHidden()");
+
+        assertEquals(null, mbtn.onShowingProperty().get(), "onShowingProperty().get() should return same handler as set using setOnShowing()");
+        assertEquals(null, mbtn.onShownProperty().get(), "onShownProperty().get() should return same handler as set using setOnShown()");
+        assertEquals(null, mbtn.onHidingProperty().get(), "onHidingProperty().get() should return same handler as set using setOnHiding()");
+        assertEquals(null, mbtn.onHiddenProperty().get(), "onHiddenProperty().get() should return same handler as set using setOnHidden()");
     }
 
     // Test for JDK-8177633
@@ -492,46 +457,30 @@ public void handle(Event event) {
         mbtn.onHidingProperty().set(handlers[2]);
         mbtn.onHiddenProperty().set(handlers[3]);
 
-        assertEquals("getOnShowing() should return same handler as set using "
-            + "onShowingProperty().set()", handlers[0], mbtn.getOnShowing());
-        assertEquals("getOnShown() should return same handler as set using "
-            + "onShownProperty().set()", handlers[1], mbtn.getOnShown());
-        assertEquals("getOnHiding() should return same handler as set using "
-            + "onHidingProperty().set()", handlers[2], mbtn.getOnHiding());
-        assertEquals("getOnHidden() should return same handler as set using "
-            + "onHiddenProperty().set()", handlers[3], mbtn.getOnHidden());
-
-        assertEquals("onShowingProperty().get() should return same handler as "
-            + "set using onShowingProperty().set()", handlers[0], mbtn.onShowingProperty().get());
-        assertEquals("onShownProperty().get() should return same handler as "
-            + "set using onShownProperty().set()", handlers[1], mbtn.onShownProperty().get());
-        assertEquals("onHidingProperty().get() should return same handler as "
-            + "set using onHidingProperty().set()", handlers[2], mbtn.onHidingProperty().get());
-        assertEquals("onHiddenProperty().get() should return same handler as "
-            + "set using onHiddenProperty().set()", handlers[3], mbtn.onHiddenProperty().get());
+        assertEquals(handlers[0], mbtn.getOnShowing(), "getOnShowing() should return same handler as set using onShowingProperty().set()");
+        assertEquals(handlers[1], mbtn.getOnShown(), "getOnShown() should return same handler as set using onShownProperty().set()");
+        assertEquals(handlers[2], mbtn.getOnHiding(), "getOnHiding() should return same handler as set using onHidingProperty().set()");
+        assertEquals(handlers[3], mbtn.getOnHidden(), "getOnHidden() should return same handler as set using onHiddenProperty().set()");
+
+        assertEquals(handlers[0], mbtn.onShowingProperty().get(), "onShowingProperty().get() should return same handler as set using onShowingProperty().set()");
+        assertEquals(handlers[1], mbtn.onShownProperty().get(), "onShownProperty().get() should return same handler as set using onShownProperty().set()");
+        assertEquals(handlers[2], mbtn.onHidingProperty().get(), "onHidingProperty().get() should return same handler as set using onHidingProperty().set()");
+        assertEquals(handlers[3], mbtn.onHiddenProperty().get(), "onHiddenProperty().get() should return same handler as set using onHiddenProperty().set()");
 
         mbtn.onShowingProperty().set(null);
         mbtn.onShownProperty().set(null);
         mbtn.onHidingProperty().set(null);
         mbtn.onHiddenProperty().set(null);
 
-        assertEquals("getOnShowing() should return same handler as set using "
-            + "onShowingProperty().set()", null, mbtn.getOnShowing());
-        assertEquals("getOnShown() should return same handler as set using "
-            + "onShownProperty().set()", null, mbtn.getOnShown());
-        assertEquals("getOnHiding() should return same handler as set using "
-            + "onHidingProperty().set()", null, mbtn.getOnHiding());
-        assertEquals("getOnHidden() should return same handler as set using "
-            + "onHiddenProperty().set()", null, mbtn.getOnHidden());
-
-        assertEquals("onShowingProperty().get() should return same handler as "
-            + "set using onShowingProperty().set()", null, mbtn.onShowingProperty().get());
-        assertEquals("onShownProperty().get() should return same handler as "
-            + "set using onShownProperty().set()", null, mbtn.onShownProperty().get());
-        assertEquals("onHidingProperty().get() should return same handler as "
-            + "set using onHidingProperty().set()", null, mbtn.onHidingProperty().get());
-        assertEquals("onHiddenProperty().get() should return same handler as "
-            + "set using onHiddenProperty().set()", null, mbtn.onHiddenProperty().get());
+        assertEquals(null, mbtn.getOnShowing(), "getOnShowing() should return same handler as set using onShowingProperty().set()");
+        assertEquals(null, mbtn.getOnShown(), "getOnShown() should return same handler as set using onShownProperty().set()");
+        assertEquals(null, mbtn.getOnHiding(), "getOnHiding() should return same handler as set using onHidingProperty().set()");
+        assertEquals(null, mbtn.getOnHidden(), "getOnHidden() should return same handler as set using onHiddenProperty().set()");
+
+        assertEquals(null, mbtn.onShowingProperty().get(), "onShowingProperty().get() should return same handler as set using onShowingProperty().set()");
+        assertEquals(null, mbtn.onShownProperty().get(), "onShownProperty().get() should return same handler as set using onShownProperty().set()");
+        assertEquals(null, mbtn.onHidingProperty().get(), "onHidingProperty().get() should return same handler as set using onHidingProperty().set()");
+        assertEquals(null, mbtn.onHiddenProperty().get(), "onHiddenProperty().get() should return same handler as set using onHiddenProperty().set()");
     }
 
     // Test for JDK-8177633
@@ -555,14 +504,10 @@ public void handle(Event event) {
         mbtn.show();
         mbtn.hide();
 
-        assertEquals("MenuButton.ON_SHOWING event listener should  "
-            + "get called once.", 1, onShowing);
-        assertEquals("MenuButton.ON_SHOWN event listener should  "
-            + "get called once.", 1, onShown);
-        assertTrue("MenuButton.ON_SHOWING event should be received "
-            + "before MenuButton.ON_SHOWN.", onShowingOrderTest);
-        assertTrue("MenuButton.ON_SHOWN event should be received "
-            + "after MenuButton.ON_SHOWING.", onShownOrderTest);
+        assertEquals(1, onShowing, "MenuButton.ON_SHOWING event listener should get called once.");
+        assertEquals(1, onShown, "MenuButton.ON_SHOWN event listener should get called once.");
+        assertTrue(onShowingOrderTest, "MenuButton.ON_SHOWING event should be received before MenuButton.ON_SHOWN.");
+        assertTrue(onShownOrderTest, "MenuButton.ON_SHOWN event should be received after MenuButton.ON_SHOWING.");
     }
 
     // Test for JDK-8177633
@@ -586,14 +531,10 @@ public void handle(Event event) {
         mbtn.show();
         mbtn.hide();
 
-        assertEquals("MenuButton.ON_HIDING event listener should "
-            + "get called once.", 1, onHiding);
-        assertEquals("MenuButton.ON_HIDDEN event listener should "
-            + "get called once.", 1, onHidden);
-        assertTrue("MenuButton.ON_HIDING event should be received "
-            + "before MenuButton.ON_HIDDEN.", onHidingOrderTest);
-        assertTrue("MenuButton.ON_HIDDEN event should be received "
-            + "after MenuButton.ON_HIDING.", onHiddenOrderTest);
+        assertEquals(1, onHiding, "MenuButton.ON_HIDING event listener should get called once.");
+        assertEquals(1, onHidden, "MenuButton.ON_HIDDEN event listener should get called once.");
+        assertTrue(onHidingOrderTest, "MenuButton.ON_HIDING event should be received before MenuButton.ON_HIDDEN.");
+        assertTrue(onHiddenOrderTest, "MenuButton.ON_HIDDEN event should be received after MenuButton.ON_HIDING.");
     }
 
     // Test for JDK-8177633
@@ -619,49 +560,33 @@ public void handle(Event event) {
         });
 
         mbtn.show();
-        assertEquals("MenuButton.ON_SHOWING event listener should "
-            + "get called once.", 1, onShowing);
-        assertEquals("MenuButton.ON_SHOWN event listener should "
-            + "get called once.", 1, onShown);
-        assertEquals("MenuButton.ON_HIDING event should not be "
-            + "received while showing.", 0, onHiding);
-        assertEquals("MenuButton.ON_HIDDEN event should not be "
-            + "received while showing.", 0, onHidden);
+        assertEquals(1, onShowing, "MenuButton.ON_SHOWING event listener should get called once.");
+        assertEquals(1, onShown, "MenuButton.ON_SHOWN event listener should get called once.");
+        assertEquals(0, onHiding, "MenuButton.ON_HIDING event should not be received while showing.");
+        assertEquals(0, onHidden, "MenuButton.ON_HIDDEN event should not be received while showing.");
 
         onShown = 0;
         onShowing = 0;
         mbtn.hide();
-        assertEquals("MenuButton.ON_HIDING event listener should "
-            + "get called once.", 1, onHiding);
-        assertEquals("MenuButton.ON_HIDDEN event listener should "
-            + "get called once.", 1, onHidden);
-        assertEquals("MenuButton.ON_SHOWING event should not be "
-            + "received while hiding.", 0, onShowing);
-        assertEquals("MenuButton.ON_SHOWN event should not be "
-            + "received while showing.", 0, onShown);
+        assertEquals(1, onHiding, "MenuButton.ON_HIDING event listener should get called once.");
+        assertEquals(1, onHidden, "MenuButton.ON_HIDDEN event listener should get called once.");
+        assertEquals(0, onShowing, "MenuButton.ON_SHOWING event should not be received while hiding.");
+        assertEquals(0, onShown, "MenuButton.ON_SHOWN event should not be received while showing.");
     }
 
     // Test for JDK-8177633
     @Test public void test_onShowHidePropertyAttribs() {
         MenuButton mbtn = new MenuButton();
 
-        assertEquals("MenuButton.onShowing name should be \"onShowing\".",
-            "onShowing", mbtn.onShowingProperty().getName());
-        assertEquals("MenuButton.onShown name should be \"onShown\".",
-            "onShown", mbtn.onShownProperty().getName());
-        assertEquals("MenuButton.onHiding name should be \"onHiding\".",
-            "onHiding", mbtn.onHidingProperty().getName());
-        assertEquals("MenuButton.onHidden name should be \"onHidden\".",
-            "onHidden", mbtn.onHiddenProperty().getName());
-
-        assertEquals("MenuButton.onShowing bean should be MenuButton object.",
-            mbtn, mbtn.onShowingProperty().getBean());
-        assertEquals("MenuButton.onShown bean should be MenuButton object.",
-            mbtn, mbtn.onShownProperty().getBean());
-        assertEquals("MenuButton.onHiding bean should be MenuButton object.",
-            mbtn, mbtn.onHidingProperty().getBean());
-        assertEquals("MenuButton.onHidden bean should be MenuButton object.",
-            mbtn, mbtn.onHiddenProperty().getBean());
+        assertEquals("onShowing", mbtn.onShowingProperty().getName(), "MenuButton.onShowing name should be \"onShowing\".");
+        assertEquals("onShown", mbtn.onShownProperty().getName(), "MenuButton.onShown name should be \"onShown\".");
+        assertEquals("onHiding", mbtn.onHidingProperty().getName(), "MenuButton.onHiding name should be \"onHiding\".");
+        assertEquals("onHidden", mbtn.onHiddenProperty().getName(), "MenuButton.onHidden name should be \"onHidden\".");
+
+        assertEquals(mbtn, mbtn.onShowingProperty().getBean(), "MenuButton.onShowing bean should be MenuButton object.");
+        assertEquals(mbtn, mbtn.onShownProperty().getBean(), "MenuButton.onShown bean should be MenuButton object.");
+        assertEquals(mbtn, mbtn.onHidingProperty().getBean(), "MenuButton.onHiding bean should be MenuButton object.");
+        assertEquals(mbtn, mbtn.onHiddenProperty().getBean(), "MenuButton.onHidden bean should be MenuButton object.");
     }
 
     /**
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/MenuItemTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/MenuItemTest.java
index b1a42ab913f..0abe65ae96c 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/MenuItemTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/MenuItemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,12 @@
 
 package test.javafx.scene.control;
 
-import test.com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
-import test.com.sun.javafx.scene.control.infrastructure.KeyModifier;
-import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
@@ -47,19 +50,13 @@
 import javafx.scene.input.KeyCodeCombination;
 import javafx.scene.input.KeyCombination;
 import javafx.scene.input.KeyCombination.Modifier;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
 import javafx.scene.shape.Rectangle;
-
-
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import test.com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
+import test.com.sun.javafx.scene.control.infrastructure.KeyModifier;
+import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
 
 /**
  *
@@ -69,11 +66,13 @@ public class MenuItemTest {
     public static EventType<Event> eventType;
     private MenuItem menuItem;
 
-    @BeforeClass public static void classSetup() {
+    @BeforeAll
+    public static void classSetup() {
         eventType = new EventType<>(Event.ANY, "TEST_EVENT");
     }
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         menuItem = new MenuItem();
     }
 
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/MenuTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/MenuTest.java
index dc077314819..1a646812871 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/MenuTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/MenuTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,22 +25,20 @@
 
 package test.javafx.scene.control;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.event.Event;
 import javafx.event.EventHandler;
 import javafx.event.EventType;
 import javafx.scene.control.Menu;
 import javafx.scene.control.MenuItem;
 import javafx.scene.shape.Rectangle;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  *
@@ -50,11 +48,13 @@ public class MenuTest {
     private static EventType<Event> eventType;
     private Menu menu;
 
-    @BeforeClass public static void classSetup() {
+    @BeforeAll
+    public static void classSetup() {
         eventType = new EventType<>(Event.ANY, "ON_EVENT");
     }
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         menu = new Menu("Hello");
     }
 
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/MiscellaneousTests.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/MiscellaneousTests.java
index bfda01acee7..6abf2b33361 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/MiscellaneousTests.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/MiscellaneousTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,10 @@
 
 package test.javafx.scene.control;
 
-import test.com.sun.javafx.pgstub.StubToolkit;
-import com.sun.javafx.tk.Toolkit;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
 import javafx.geometry.Bounds;
 import javafx.scene.Group;
 import javafx.scene.Scene;
@@ -38,12 +40,9 @@
 import javafx.scene.shape.Rectangle;
 import javafx.scene.text.Font;
 import javafx.stage.Stage;
-import junit.framework.Assert;
-import org.junit.Test;
-
-import static junit.framework.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.tk.Toolkit;
+import test.com.sun.javafx.pgstub.StubToolkit;
 
 public class MiscellaneousTests {
 
@@ -155,7 +154,6 @@ public void test_RT_31168() {
         Bounds b1 = rb1.getLayoutBounds();
         Bounds b2 = rb2.getLayoutBounds();
 
-        Assert.assertEquals(rb1.getWidth(), rb2.getWidth(), 0.00001);
+        assertEquals(rb1.getWidth(), rb2.getWidth(), 0.00001);
     }
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/MultipleSelectionModelImplTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/MultipleSelectionModelImplTest.java
index d4efbd7e858..8580bb4d389 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/MultipleSelectionModelImplTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/MultipleSelectionModelImplTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,23 +25,26 @@
 
 package test.javafx.scene.control;
 
-import javafx.beans.property.IntegerProperty;
-import javafx.beans.property.SimpleIntegerProperty;
-import test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.util.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.BiPredicate;
 import java.util.stream.Collectors;
-
-import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
+import javafx.beans.property.IntegerProperty;
+import javafx.beans.property.SimpleIntegerProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
@@ -64,17 +67,13 @@
 import javafx.scene.control.TreeTableViewShim;
 import javafx.scene.control.TreeView;
 import javafx.scene.control.TreeViewShim;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils;
+import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
 import test.com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils;
 import test.javafx.collections.MockListObserver;
 
@@ -84,13 +83,11 @@
  * as such contains some conditional logic to handle the various controls as
  * simply as possible.
  */
-@RunWith(Parameterized.class)
 public class MultipleSelectionModelImplTest {
 
     private MultipleSelectionModel model;
     private FocusModel focusModel;
 
-    private Class<? extends MultipleSelectionModel> modelClass;
     private Control currentControl;
 
     // ListView
@@ -117,22 +114,21 @@ public class MultipleSelectionModelImplTest {
     // TableView
     private TableView tableView;
 
-    @Parameters public static Collection implementations() {
-        return Arrays.asList(new Object[][] {
-            { ListViewShim.get_ListViewBitSetSelectionModel_class() },
-            { TreeViewShim.get_TreeViewBitSetSelectionModel_class() },
-            { TableViewShim.get_TableViewArrayListSelectionModel_class() },
-            { TreeTableViewShim.get_TreeTableViewArrayListSelectionModel_class() },
-        });
-    }
-
-    public MultipleSelectionModelImplTest(Class<? extends MultipleSelectionModel> modelClass) {
-        this.modelClass = modelClass;
+    private static Collection<Class<? extends MultipleSelectionModel>> parameters() {
+        return List.of(
+            ListViewShim.get_ListViewBitSetSelectionModel_class(),
+            TreeViewShim.get_TreeViewBitSetSelectionModel_class(),
+            TableViewShim.get_TableViewArrayListSelectionModel_class(),
+            TreeTableViewShim.get_TreeTableViewArrayListSelectionModel_class()
+        );
     }
 
-    @AfterClass public static void tearDownClass() throws Exception {    }
+    @AfterAll
+    public static void tearDownClass() throws Exception {    }
 
-    @Before public void setUp() throws Exception {
+    // @BeforeEach
+    // junit5 does not support parameterized class-level tests yet
+    public void setUp(Class<? extends MultipleSelectionModel> modelClass) {
         // ListView init
         defaultData.setAll(ROW_1_VALUE, ROW_2_VALUE, ROW_3_VALUE, "Row 4", ROW_5_VALUE, "Row 6",
                 "Row 7", "Row 8", "Row 9", "Row 10", "Row 11", "Row 12", "Row 13",
@@ -211,11 +207,12 @@ public MultipleSelectionModelImplTest(Class<? extends MultipleSelectionModel> mo
             // ensure the selection mode is set to multiple
             model.setSelectionMode(SelectionMode.MULTIPLE);
         } catch (Exception ex) {
-            throw ex;
+            throw new RuntimeException(ex);
         }
     }
 
-    @After public void tearDown() {
+    @AfterEach
+    public void tearDown() {
         model = null;
     }
 
@@ -258,7 +255,14 @@ private void ensureInEmptyState() {
         assertEquals(0, msModel().getSelectedItems().size());
     }
 
-    @Test public void ensureInDefaultState() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void ensureInDefaultState(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
+        ensureInDefaultStateImpl();
+    }
+
+    private void ensureInDefaultStateImpl() {
         assertEquals(-1, model.getSelectedIndex());
         assertNull(model.getSelectedItem());
 
@@ -273,7 +277,10 @@ private void ensureInEmptyState() {
         assertEquals(0, msModel().getSelectedItems().size());
     }
 
-    @Test public void selectValidIndex() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectValidIndex(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         int index = 4;
         model.clearSelection();
         model.select(index);
@@ -296,13 +303,19 @@ private void ensureInEmptyState() {
         assertEquals(ROW_5_VALUE, getValue(msModel().getSelectedItems().get(0)));
     }
 
-    @Test public void testSelectAllWithSingleSelection() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSelectAllWithSingleSelection(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         msModel().setSelectionMode(SelectionMode.SINGLE);
         msModel().selectAll();
-        ensureInDefaultState();
+        ensureInDefaultStateImpl();
     }
 
-    @Test public void testSelectAllWithMultipleSelection() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSelectAllWithMultipleSelection(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         msModel().clearSelection();
         msModel().selectAll();
 
@@ -318,13 +331,19 @@ private void ensureInEmptyState() {
         assertEquals(20, msModel().getSelectedItems().size());
     }
 
-    @Test public void clearAllSelection() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void clearAllSelection(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         msModel().selectAll();
         model.clearSelection();
         ensureInEmptyState();
     }
 
-    @Test public void clearPartialSelectionWithSingleSelection() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void clearPartialSelectionWithSingleSelection(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         model.clearSelection();
         assertFalse(model.isSelected(5));
         model.select(5);
@@ -336,7 +355,10 @@ private void ensureInEmptyState() {
         assertEquals(0, msModel().getSelectedItems().size());
     }
 
-    @Test public void clearPartialSelectionWithMultipleSelection() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void clearPartialSelectionWithMultipleSelection(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         msModel().setSelectionMode(SelectionMode.MULTIPLE);
         msModel().selectAll();
         model.clearSelection(5);
@@ -346,7 +368,10 @@ private void ensureInEmptyState() {
         assertTrue(model.isSelected(6));
     }
 
-    @Test public void selectedIndicesListenerReportsCorrectIndexOnClearSelection() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectedIndicesListenerReportsCorrectIndexOnClearSelection(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         model.setSelectionMode(SelectionMode.MULTIPLE);
         model.select(1);
         model.select(5);
@@ -358,7 +383,10 @@ private void ensureInEmptyState() {
         observer.checkAddRemove(0, model.getSelectedIndices(), List.of(5), 1, 1);
     }
 
-    @Test public void clearAndSelectFiresDisjointRemovedChanges() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void clearAndSelectFiresDisjointRemovedChanges(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         model.setSelectionMode(SelectionMode.MULTIPLE);
         model.selectAll();
 
@@ -384,7 +412,10 @@ private void ensureInEmptyState() {
         observer.checkAddRemove(1, model.getSelectedItems(), removed2, equalityComparer, 1, 1);
     }
 
-    @Test public void clearAndSelectFirstSelectedItem() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void clearAndSelectFirstSelectedItem(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         model.setSelectionMode(SelectionMode.MULTIPLE);
         model.select(1);
         model.select(2);
@@ -409,7 +440,10 @@ private void ensureInEmptyState() {
         observer.checkAddRemove(0, model.getSelectedItems(), removed, equalityComparer, 1, 1);
     }
 
-    @Test public void clearAndSelectLastSelectedItem() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void clearAndSelectLastSelectedItem(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         model.setSelectionMode(SelectionMode.MULTIPLE);
         model.select(1);
         model.select(2);
@@ -434,19 +468,31 @@ private void ensureInEmptyState() {
         observer.checkAddRemove(0, model.getSelectedItems(), removed, equalityComparer, 0, 0);
     }
 
-    @Test public void testSelectedIndicesObservableListIsEmpty() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSelectedIndicesObservableListIsEmpty(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         assertTrue(msModel().getSelectedIndices().isEmpty());
     }
 
-    @Test public void testSelectedIndicesIteratorIsNotNull() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSelectedIndicesIteratorIsNotNull(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         assertNotNull(msModel().getSelectedIndices().iterator());
     }
 
-    @Test public void testSelectedIndicesIteratorHasNoNext() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSelectedIndicesIteratorHasNoNext(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         assertFalse(msModel().getSelectedIndices().iterator().hasNext());
     }
 
-    @Test public void testSelectedIndicesIteratorWorksWithSingleSelection() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSelectedIndicesIteratorWorksWithSingleSelection(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         msModel().clearSelection();
         model.select(5);
 
@@ -455,28 +501,40 @@ private void ensureInEmptyState() {
         assertFalse(it.hasNext());
     }
 
-    @Test public void testSelectedIndicesIteratorWorksWithMultipleSelection() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSelectedIndicesIteratorWorksWithMultipleSelection(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         msModel().clearSelection();
         msModel().setSelectionMode(SelectionMode.MULTIPLE);
         msModel().selectIndices(1, 2, 5);
 
         Iterator<Integer> it = msModel().getSelectedIndices().iterator();
-        assertEquals(indices(msModel()), 1, (int) it.next());
-        assertEquals(indices(msModel()), 2, (int) it.next());
-        assertEquals(indices(msModel()), 5, (int) it.next());
+        assertEquals(1, (int) it.next(), indices(msModel()));
+        assertEquals(2, (int) it.next(), indices(msModel()));
+        assertEquals(5, (int) it.next(), indices(msModel()));
         assertFalse(it.hasNext());
     }
 
-    @Test public void testSelectedIndicesContains() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSelectedIndicesContains(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         model.select(5);
         assertTrue(msModel().getSelectedIndices().contains(5));
     }
 
-    @Test public void testSelectedItemsObservableListIsEmpty() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSelectedItemsObservableListIsEmpty(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         assertTrue(msModel().getSelectedItems().isEmpty());
     }
 
-    @Test public void testSelectedItemsIndexOf() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSelectedItemsIndexOf(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         msModel().clearSelection();
         if (isTree()) {
             model.select(ROW_2_TREE_VALUE);
@@ -489,11 +547,17 @@ private void ensureInEmptyState() {
         }
     }
 
-    @Test public void testSelectedItemsIteratorIsNotNull() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSelectedItemsIteratorIsNotNull(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         assertNotNull(msModel().getSelectedIndices().iterator());
     }
 
-    @Test public void testSelectedItemsLastIndexOf() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSelectedItemsLastIndexOf(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         msModel().clearSelection();
         if (isTree()) {
             model.select(ROW_2_TREE_VALUE);
@@ -506,12 +570,18 @@ private void ensureInEmptyState() {
         }
     }
 
-    @Test public void testSelectedItemsContains() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSelectedItemsContains(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         model.select(5);
         assertTrue(msModel().getSelectedIndices().contains(5));
     }
 
-    @Test public void testSingleSelectionMode() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSingleSelectionMode(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         msModel().clearSelection();
         msModel().setSelectionMode(SelectionMode.SINGLE);
         assertTrue(model.isEmpty());
@@ -527,7 +597,10 @@ private void ensureInEmptyState() {
         assertEquals(1, msModel().getSelectedItems().size());
     }
 
-    @Test public void testMultipleSelectionMode() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testMultipleSelectionMode(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         msModel().clearSelection();
         msModel().setSelectionMode(SelectionMode.MULTIPLE);
         assertTrue(model.isEmpty());
@@ -542,11 +615,14 @@ private void ensureInEmptyState() {
         assertEquals(2, msModel().getSelectedItems().size());
     }
 
-    @Test public void testChangeSelectionMode() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testChangeSelectionMode(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         msModel().clearSelection();
         msModel().setSelectionMode(SelectionMode.MULTIPLE);
         msModel().selectIndices(5, 10, 15);
-        assertEquals(indices(msModel()), 3, msModel().getSelectedIndices().size());
+        assertEquals(3, msModel().getSelectedIndices().size(), indices(msModel()));
         assertEquals(3, msModel().getSelectedItems().size());
         assertTrue(model.isSelected(5));
         assertTrue(model.isSelected(10));
@@ -555,22 +631,21 @@ private void ensureInEmptyState() {
         msModel().setSelectionMode(SelectionMode.SINGLE);
         assertEquals(1, msModel().getSelectedIndices().size());
         assertEquals(1, msModel().getSelectedItems().size());
-        assertFalse(indices(msModel()), model.isSelected(5));
-        assertFalse(indices(msModel()), model.isSelected(10));
-        assertTrue(indices(msModel()), model.isSelected(15));
+        assertFalse(model.isSelected(5), indices(msModel()));
+        assertFalse(model.isSelected(10), indices(msModel()));
+        assertTrue(model.isSelected(15), indices(msModel()));
     }
 
-//    @Test public void testSelectNullObject() {
-//        model.select(null);
-//    }
-
-    @Test public void testSelectRange() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSelectRange(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         // should select all indices starting at 5, and finishing just before
         // the 10th item
         msModel().clearSelection();
         msModel().setSelectionMode(SelectionMode.MULTIPLE);
         msModel().selectRange(5, 10);
-        assertEquals(indices(msModel()), 5, msModel().getSelectedIndices().size());
+        assertEquals(5, msModel().getSelectedIndices().size(), indices(msModel()));
         assertEquals(5, msModel().getSelectedItems().size());
         assertFalse(model.isSelected(4));
         assertTrue(model.isSelected(5));
@@ -581,16 +656,22 @@ private void ensureInEmptyState() {
         assertFalse(model.isSelected(10));
     }
 
-    @Test public void testDeselectionFromASelectionRange() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testDeselectionFromASelectionRange(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         msModel().setSelectionMode(SelectionMode.MULTIPLE);
         msModel().selectRange(2, 10);
         model.clearSelection(5);
-        assertTrue(indices(msModel()), model.isSelected(4));
-        assertFalse(indices(msModel()), model.isSelected(5));
-        assertTrue(indices(msModel()), model.isSelected(6));
+        assertTrue(model.isSelected(4), indices(msModel()));
+        assertFalse(model.isSelected(5), indices(msModel()));
+        assertTrue(model.isSelected(6), indices(msModel()));
     }
 
-    @Test public void testAccurateItemSelection() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testAccurateItemSelection(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         msModel().clearSelection();
         msModel().setSelectionMode(SelectionMode.MULTIPLE);
         msModel().selectRange(2, 5);
@@ -612,7 +693,10 @@ private void ensureInEmptyState() {
         }
     }
 
-    @Test public void ensureSelectedIndexAndItemIsAlwaysTheLastSelectionWithSelect() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void ensureSelectedIndexAndItemIsAlwaysTheLastSelectionWithSelect(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         msModel().setSelectionMode(SelectionMode.MULTIPLE);
         model.select(3);
         assertEquals(3, model.getSelectedIndex());
@@ -647,7 +731,10 @@ private void ensureInEmptyState() {
         }
     }
 
-    @Test public void ensureSelectedIndexAndItemIsAlwaysTheLastSelectionWithMultipleSelect() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void ensureSelectedIndexAndItemIsAlwaysTheLastSelectionWithMultipleSelect(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         msModel().setSelectionMode(SelectionMode.MULTIPLE);
         msModel().selectIndices(3,4,5);
         assertEquals(5, model.getSelectedIndex());
@@ -676,7 +763,10 @@ private void ensureInEmptyState() {
         }
     }
 
-    @Test public void ensureSelectedIndexAndItemIsAlwaysTheLastSelectionWithSelectRange() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void ensureSelectedIndexAndItemIsAlwaysTheLastSelectionWithSelectRange(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         msModel().setSelectionMode(SelectionMode.MULTIPLE);
         msModel().selectRange(3,10);
         assertEquals(9, model.getSelectedIndex());
@@ -703,7 +793,10 @@ private void ensureInEmptyState() {
         }
     }
 
-    @Test public void testMultipleSelectionWithEmptyArray() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testMultipleSelectionWithEmptyArray(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         msModel().clearSelection();
         msModel().setSelectionMode(SelectionMode.MULTIPLE);
         msModel().selectIndices(3,new int[] { });
@@ -718,7 +811,10 @@ private void ensureInEmptyState() {
         }
     }
 
-    @Test public void selectOnlyValidIndicesInSingleSelection() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectOnlyValidIndicesInSingleSelection(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         msModel().setSelectionMode(SelectionMode.SINGLE);
         msModel().selectIndices(750397, 3, 709709375, 4, 8597998, 47929);
         assertEquals(4, model.getSelectedIndex());
@@ -734,7 +830,10 @@ private void ensureInEmptyState() {
         }
     }
 
-    @Test public void selectOnlyValidIndicesInMultipleSelection() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectOnlyValidIndicesInMultipleSelection(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         msModel().setSelectionMode(SelectionMode.MULTIPLE);
         model.clearSelection();
         msModel().selectIndices(750397, 3, 709709375, 4, 8597998, 47929);
@@ -751,42 +850,54 @@ private void ensureInEmptyState() {
         }
     }
 
-    @Test public void testNullArrayInMultipleSelection() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testNullArrayInMultipleSelection(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         msModel().clearSelection();
         msModel().setSelectionMode(SelectionMode.MULTIPLE);
         msModel().selectIndices(-20, null);
         assertEquals(-1, model.getSelectedIndex());
         assertNull(model.getSelectedItem());
-        assertEquals(indices(msModel()), 0, msModel().getSelectedIndices().size());
-        assertEquals(items(msModel()), 0, msModel().getSelectedItems().size());
+        assertEquals(0, msModel().getSelectedIndices().size(), indices(msModel()));
+        assertEquals(0, msModel().getSelectedItems().size(), items(msModel()));
     }
 
-    @Test public void testMultipleSelectionWithInvalidIndices() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testMultipleSelectionWithInvalidIndices(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         msModel().clearSelection();
         msModel().setSelectionMode(SelectionMode.MULTIPLE);
         msModel().selectIndices(-20, 23505, 78125);
         assertEquals(-1, model.getSelectedIndex());
         assertNull(model.getSelectedItem());
-        assertEquals(indices(msModel()), 0, msModel().getSelectedIndices().size());
-        assertEquals(items(msModel()), 0, msModel().getSelectedItems().size());
+        assertEquals(0, msModel().getSelectedIndices().size(), indices(msModel()));
+        assertEquals(0, msModel().getSelectedItems().size(), items(msModel()));
     }
 
-    @Test public void testInvalidSelection() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testInvalidSelection(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         msModel().clearSelection();
         msModel().setSelectionMode(SelectionMode.SINGLE);
         msModel().selectIndices(-20, null);
         assertEquals(-1, model.getSelectedIndex());
         assertNull(model.getSelectedItem());
-        assertEquals(indices(msModel()), 0, msModel().getSelectedIndices().size());
-        assertEquals(items(msModel()), 0, msModel().getSelectedItems().size());
+        assertEquals(0, msModel().getSelectedIndices().size(), indices(msModel()));
+        assertEquals(0, msModel().getSelectedItems().size(), items(msModel()));
     }
 
-    @Test public void ensureSwappedSelectRangeWorks() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void ensureSwappedSelectRangeWorks(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         // first test a valid range - there should be 6 selected items
         model.clearSelection();
         model.setSelectionMode(SelectionMode.MULTIPLE);
         model.selectRange(3, 10);
-        assertEquals(indices(model), 7, model.getSelectedIndices().size());
+        assertEquals(7, model.getSelectedIndices().size(), indices(model));
         assertEquals(9, model.getSelectedIndex());
         if (isTree()) {
             assertEquals(root.getChildren().get(8), model.getSelectedItem());
@@ -799,7 +910,7 @@ private void ensureInEmptyState() {
         // we should select the range from 10 - 4 inclusive
         model.selectRange(10, 3);
         assertEquals(7, model.getSelectedIndices().size());
-        assertEquals(indices(model), 4, model.getSelectedIndex());
+        assertEquals(4, model.getSelectedIndex(), indices(model));
         if (isTree()) {
             assertEquals(root.getChildren().get(3), model.getSelectedItem());
         } else {
@@ -807,47 +918,67 @@ private void ensureInEmptyState() {
         }
     }
 
-    @Test public void testInvalidSelectRange() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testInvalidSelectRange(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         msModel().clearSelection();
         msModel().setSelectionMode(SelectionMode.MULTIPLE);
         msModel().selectRange(200, 220);
         assertEquals(-1, model.getSelectedIndex());
         assertEquals(null, model.getSelectedItem());
-        assertEquals(indices(msModel()), 0, msModel().getSelectedIndices().size());
-        assertEquals(items(msModel()), 0, msModel().getSelectedItems().size());
+        assertEquals(0, msModel().getSelectedIndices().size(), indices(msModel()));
+        assertEquals(0, msModel().getSelectedItems().size(), items(msModel()));
     }
 
-    @Test public void testEmptySelectRange() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testEmptySelectRange(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         msModel().clearSelection();
         msModel().setSelectionMode(SelectionMode.MULTIPLE);
         msModel().selectRange(10, 10);
         assertEquals(-1, model.getSelectedIndex());
         assertEquals(null, model.getSelectedItem());
-        assertEquals(indices(msModel()), 0, msModel().getSelectedIndices().size());
-        assertEquals(items(msModel()), 0, msModel().getSelectedItems().size());
+        assertEquals(0, msModel().getSelectedIndices().size(), indices(msModel()));
+        assertEquals(0, msModel().getSelectedItems().size(), items(msModel()));
     }
 
-    @Test public void testNegativeSelectRange() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testNegativeSelectRange(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         msModel().clearSelection();
         msModel().setSelectionMode(SelectionMode.MULTIPLE);
         msModel().selectRange(-10, -1);
         assertEquals(-1, model.getSelectedIndex());
         assertEquals(null, model.getSelectedItem());
-        assertEquals(indices(msModel()), 0, msModel().getSelectedIndices().size());
-        assertEquals(items(msModel()), 0, msModel().getSelectedItems().size());
+        assertEquals(0, msModel().getSelectedIndices().size(), indices(msModel()));
+        assertEquals(0, msModel().getSelectedItems().size(), items(msModel()));
     }
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testNullListViewInSelectionModel() {
-        ListViewShim.getListViewBitSetSelectionModel(null);
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testNullListViewInSelectionModel(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
+        assertThrows(IllegalArgumentException.class, () -> {
+            ListViewShim.getListViewBitSetSelectionModel(null);
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testNullTreeViewInSelectionModel() {
-        TreeViewShim.<String>get_TreeViewBitSetSelectionModel(null);
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testNullTreeViewInSelectionModel(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
+        assertThrows(IllegalArgumentException.class, () -> {
+            TreeViewShim.<String>get_TreeViewBitSetSelectionModel(null);
+        });
     }
 
-    @Test public void selectAllInEmptySingleSelectionMode() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectAllInEmptySingleSelectionMode(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         model.clearSelection();
         msModel().setSelectionMode(SelectionMode.SINGLE);
         assertTrue(model.isEmpty());
@@ -855,7 +986,10 @@ public void testNullTreeViewInSelectionModel() {
         assertTrue(model.isEmpty());
     }
 
-    @Test public void selectAllInSingleSelectionModeWithSelectedRow() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectAllInSingleSelectionModeWithSelectedRow(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         msModel().setSelectionMode(SelectionMode.SINGLE);
         model.clearSelection();
         assertTrue(model.isEmpty());
@@ -865,16 +999,25 @@ public void testNullTreeViewInSelectionModel() {
         assertEquals(1, msModel().getSelectedIndices().size());
     }
 
-    @Test public void selectionModePropertyHasReferenceToBean() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectionModePropertyHasReferenceToBean(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         assertSame(model, model.selectionModeProperty().getBean());
     }
 
-    @Test public void selectionModePropertyHasName() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectionModePropertyHasName(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         assertSame("selectionMode", model.selectionModeProperty().getName());
     }
 
-    @Ignore("Not yet implemented in TreeView and TableView")
-    @Test public void testSelectionChangesWhenItemIsInsertedAtStartOfModel() {
+    @Disabled("Not yet implemented in TreeView and TableView")
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSelectionChangesWhenItemIsInsertedAtStartOfModel(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         /* Select the fourth item, and insert a new item at the start of the
          * data model. The end result should be that the fourth item should NOT
          * be selected, and the fifth item SHOULD be selected.
@@ -888,7 +1031,10 @@ public void testNullTreeViewInSelectionModel() {
 
     private int rt_28615_row_1_hit_count = 0;
     private int rt_28615_row_2_hit_count = 0;
-    @Test public void test_rt_28615() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void test_rt_28615(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         model.clearSelection();
         msModel().setSelectionMode(SelectionMode.MULTIPLE);
 
@@ -927,7 +1073,10 @@ public void testNullTreeViewInSelectionModel() {
     }
 
     private int rt_29860_size_count = 0;
-    @Test public void test_rt_29860_add() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void test_rt_29860_add(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         model.clearSelection();
         msModel().setSelectionMode(SelectionMode.MULTIPLE);
 
@@ -945,18 +1094,21 @@ public void testNullTreeViewInSelectionModel() {
         // list is wrong (it isn't - it's correct). The bug is that the addedSize
         // reported in the callback above is incorrect.
         msModel().selectIndices(0, 1, 2, 3);
-        assertEquals(msModel().getSelectedIndices().toString(), 4, rt_29860_size_count);
+        assertEquals(4, rt_29860_size_count, msModel().getSelectedIndices().toString());
         rt_29860_size_count = 0;
 
         msModel().selectIndices(0,1,2,3,4);
-        assertEquals(msModel().getSelectedIndices().toString(), 1, rt_29860_size_count);   // only 4 was selected
+        assertEquals(1, rt_29860_size_count, msModel().getSelectedIndices().toString());   // only 4 was selected
         rt_29860_size_count = 0;
 
         msModel().selectIndices(6,7,8);
         assertEquals(3, rt_29860_size_count);   // 6,7,8 was selected
     }
 
-    @Test public void test_rt_29821() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void test_rt_29821(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         msModel().setSelectionMode(SelectionMode.MULTIPLE);
 
         IndexedCell cell_3 = VirtualFlowTestUtils.getCell(currentControl, 3);
@@ -978,7 +1130,10 @@ public void testNullTreeViewInSelectionModel() {
 
     private int rt_32411_add_count = 0;
     private int rt_32411_remove_count = 0;
-    @Test public void test_rt_32411_selectedItems() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void test_rt_32411_selectedItems(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         model.clearSelection();
 
         model.getSelectedItems().addListener((ListChangeListener.Change change) -> {
@@ -1004,7 +1159,10 @@ public void testNullTreeViewInSelectionModel() {
         assertEquals(1, rt_32411_remove_count);
     }
 
-    @Test public void test_rt_32411_selectedIndices() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void test_rt_32411_selectedIndices(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         model.clearSelection();
 
         model.getSelectedIndices().addListener((ListChangeListener.Change change) -> {
@@ -1031,7 +1189,10 @@ public void testNullTreeViewInSelectionModel() {
     }
 
     private int rt32618_count = 0;
-    @Test public void test_rt32618_multipleSelection() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void test_rt32618_multipleSelection(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         model.selectedItemProperty().addListener((ov, t, t1) -> rt32618_count++);
 
         assertEquals(0, rt32618_count);
@@ -1045,7 +1206,10 @@ public void testNullTreeViewInSelectionModel() {
         assertEquals(ROW_3_VALUE, getValue(model.getSelectedItem()));
     }
 
-    @Test public void test_rt33324_selectedIndices() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void test_rt33324_selectedIndices(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         // pre-select item 0
         model.select(0);
 
@@ -1066,7 +1230,10 @@ public void testNullTreeViewInSelectionModel() {
         model.clearAndSelect(1);
     }
 
-    @Test public void test_rt33324_selectedItems() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void test_rt33324_selectedItems(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         // pre-select item 0
         model.select(0);
 
@@ -1087,7 +1254,10 @@ public void testNullTreeViewInSelectionModel() {
         model.clearAndSelect(1);
     }
 
-    @Test public void test_rt33324_selectedCells() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void test_rt33324_selectedCells(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         if (! (msModel() instanceof TableViewSelectionModel)) {
             return;
         }
@@ -1114,7 +1284,10 @@ public void testNullTreeViewInSelectionModel() {
         tableSM.clearAndSelect(1);
     }
 
-    @Test public void test_rt35624_selectedIndices_downwards() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void test_rt35624_selectedIndices_downwards(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         model.clearSelection();
         model.select(2);
 
@@ -1122,19 +1295,22 @@ public void testNullTreeViewInSelectionModel() {
             while (change.next()) {
                 // we expect two items in the added list: 3 and 4, as index
                 // 2 has previously been selected
-                Assert.assertEquals(2, change.getAddedSize());
-                Assert.assertEquals(FXCollections.observableArrayList(3, 4), change.getAddedSubList());
+                assertEquals(2, change.getAddedSize());
+                assertEquals(FXCollections.observableArrayList(3, 4), change.getAddedSubList());
             }
 
             // In the actual list, we expect three items: 2, 3 and 4
-            Assert.assertEquals(3, change.getList().size());
-            Assert.assertEquals(FXCollections.observableArrayList(2, 3, 4), change.getList());
+            assertEquals(3, change.getList().size());
+            assertEquals(FXCollections.observableArrayList(2, 3, 4), change.getList());
         });
 
         model.selectIndices(2, 3, 4);
     }
 
-    @Test public void test_rt35624_selectedIndices_upwards() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void test_rt35624_selectedIndices_upwards(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         model.clearSelection();
         model.select(4);
 
@@ -1154,7 +1330,10 @@ public void testNullTreeViewInSelectionModel() {
         model.selectIndices(4, 3, 2);
     }
 
-    @Test public void test_rt35624_selectedItems_downwards() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void test_rt35624_selectedItems_downwards(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         model.clearSelection();
         model.select(2);
 
@@ -1199,7 +1378,10 @@ public void testNullTreeViewInSelectionModel() {
         model.selectIndices(2, 3, 4);
     }
 
-    @Test public void test_rt35624_selectedItems_upwards() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void test_rt35624_selectedItems_upwards(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         model.clearSelection();
         model.select(4);
 
@@ -1244,21 +1426,30 @@ public void testNullTreeViewInSelectionModel() {
         model.selectIndices(4, 3, 2);
     }
 
-    @Test public void test_rt39548_positiveValue_outOfRange() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void test_rt39548_positiveValue_outOfRange(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         // for this test we want there to be no data in the controls
         clearModelData();
 
         model.clearAndSelect(10);
     }
 
-    @Test public void test_rt39548_negativeValue() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void test_rt39548_negativeValue(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         // for this test we want there to be no data in the controls
         clearModelData();
 
         model.clearAndSelect(-1);
     }
 
-    @Test public void test_rt38884_invalidChange() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void test_rt38884_invalidChange(Class<? extends MultipleSelectionModel> cls) {
+        setUp(cls);
         model.select(3);
         int removedSize = model.getSelectedItems().size();
         ListChangeListener l = (ListChangeListener.Change c) -> {
@@ -1276,7 +1467,10 @@ private void clearModelData() {
         treeTableView.setRoot(null);
     }
 
-    @Test public void test_rt40804() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void test_rt40804(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         StageLoader sl = new StageLoader(currentControl);
         model.setSelectionMode(SelectionMode.MULTIPLE);
         model.select(0);
@@ -1289,7 +1483,10 @@ private void clearModelData() {
         sl.dispose();
     }
 
-    @Test public void test_jdk_8088752() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void test_jdk_8088752(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         // FIXME for now this test does not cover TreeView / TreeTableView
         if (isTree()) {
             return;
@@ -1300,14 +1497,14 @@ private void clearModelData() {
         model.selectRange(3, 5);
         model.select(uncontained);
 
-        assertEquals("sanity: having uncontained selectedItem", uncontained, model.getSelectedItem());
-        assertEquals("sanity: selected index removed ", -1, model.getSelectedIndex());
+        assertEquals(uncontained, model.getSelectedItem(), "sanity: having uncontained selectedItem");
+        assertEquals(-1, model.getSelectedIndex(), "sanity: selected index removed ");
 
         // insert uncontained to items
         int insertIndex = 3;
         addItem(insertIndex, uncontained);
-        assertEquals("selectedItem unchanged", uncontained, model.getSelectedItem());
-        assertEquals("selectedIndex updated", insertIndex, model.getSelectedIndex());
+        assertEquals(uncontained, model.getSelectedItem(), "selectedItem unchanged");
+        assertEquals(insertIndex, model.getSelectedIndex(), "selectedIndex updated");
     }
 
     private void addItem(int index, Object item) {
@@ -1322,8 +1519,10 @@ private void addItem(int index, Object item) {
         }
     }
 
-    @Test
-    public void test_jdk_8088467_selectedIndicesReselect() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void test_jdk_8088467_selectedIndicesReselect(Class<? extends MultipleSelectionModel> cls) {
+        setUp(cls);
         model.setSelectionMode(SelectionMode.MULTIPLE);
         IntegerProperty counter = new SimpleIntegerProperty();
 
@@ -1337,15 +1536,17 @@ public void test_jdk_8088467_selectedIndicesReselect() {
 
         // add selectedIndex - changes nothing as it is already selected
         model.select(selectedIndex);
-        assertSame("sanity: state unchanged", selected, model.getSelectedItems().get(0));
-        assertEquals("sanity: state unchanged", 0, selectedIndex);
-        assertEquals("sanity: state unchanged", selectedItems, model.getSelectedItems());
-        assertEquals("sanity: state unchanged", selectedIndices, model.getSelectedIndices());
-        assertEquals("must not fire if nothing changed", 0, counter.get());
+        assertSame(selected, model.getSelectedItems().get(0), "sanity: state unchanged");
+        assertEquals(0, selectedIndex, "sanity: state unchanged");
+        assertEquals(selectedItems, model.getSelectedItems(), "sanity: state unchanged");
+        assertEquals(selectedIndices, model.getSelectedIndices(), "sanity: state unchanged");
+        assertEquals(0, counter.get(), "must not fire if nothing changed");
     }
 
-    @Test
-    public void test_jdk_8088467_selectedItemsReselect() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void test_jdk_8088467_selectedItemsReselect(Class<? extends MultipleSelectionModel> cls) {
+        setUp(cls);
         model.setSelectionMode(SelectionMode.MULTIPLE);
         IntegerProperty counter = new SimpleIntegerProperty();
 
@@ -1359,15 +1560,17 @@ public void test_jdk_8088467_selectedItemsReselect() {
 
         // add selectedIndex - changes nothing as it is already selected
         model.select(selectedIndex);
-        assertSame("sanity: state unchanged", selected, model.getSelectedItems().get(0));
-        assertEquals("sanity: state unchanged", 0, selectedIndex);
-        assertEquals("sanity: state unchanged", selectedItems, model.getSelectedItems());
-        assertEquals("sanity: state unchanged", selectedIndices, model.getSelectedIndices());
-        assertEquals("must not fire if nothing changed", 0, counter.get());
+        assertSame(selected, model.getSelectedItems().get(0), "sanity: state unchanged");
+        assertEquals(0, selectedIndex, "sanity: state unchanged");
+        assertEquals(selectedItems, model.getSelectedItems(), "sanity: state unchanged");
+        assertEquals(selectedIndices, model.getSelectedIndices(), "sanity: state unchanged");
+        assertEquals(0, counter.get(), "must not fire if nothing changed");
     }
 
-    @Test
-    public void test_jdk_8088896() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void test_jdk_8088896(Class<? extends MultipleSelectionModel> cls) {
+        setUp(cls);
         model.setSelectionMode(SelectionMode.MULTIPLE);
 
         model.selectRange(2, 4);
@@ -1399,7 +1602,10 @@ public void test_jdk_8088896() {
     }
 
     // Test for MultipleSelectionModelBase.SelectedIndicesList#set(int index)
-    @Test public void testSelectedIndicesList_SetMethod() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSelectedIndicesList_SetMethod(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         model.clearSelection();
         model.setSelectionMode(SelectionMode.MULTIPLE);
         model.select(1);
@@ -1408,7 +1614,10 @@ public void test_jdk_8088896() {
     }
 
     // Test for MultipleSelectionModelBase.SelectedIndicesList#set(int index, int end, boolean isSet)
-    @Test public void testSelectedIndicesList_SetRangeMethod() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSelectedIndicesList_SetRangeMethod(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         model.clearSelection();
         model.setSelectionMode(SelectionMode.MULTIPLE);
         model.selectAll();
@@ -1417,7 +1626,10 @@ public void test_jdk_8088896() {
     }
 
     // Test for MultipleSelectionModelBase.SelectedIndicesList#set(int index, int... indices)
-    @Test public void testSelectedIndicesList_SetIndicesMethod() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSelectedIndicesList_SetIndicesMethod(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         model.clearSelection();
         model.setSelectionMode(SelectionMode.MULTIPLE);
         model.selectIndices(1, 2, 5);
@@ -1429,7 +1641,10 @@ public void test_jdk_8088896() {
     }
 
     // Test for MultipleSelectionModelBase.SelectedIndicesList#clear()
-    @Test public void testSelectedIndicesList_ClearMethod() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSelectedIndicesList_ClearMethod(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         model.setSelectionMode(SelectionMode.MULTIPLE);
         model.selectIndices(1, 2, 5);
         model.clearSelection();
@@ -1438,7 +1653,10 @@ public void test_jdk_8088896() {
     }
 
     // Test for MultipleSelectionModelBase.SelectedIndicesList#clear()
-    @Test public void testSelectedIndicesList_ClearIndexMethod() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSelectedIndicesList_ClearIndexMethod(Class<? extends MultipleSelectionModel> c) {
+        setUp(c);
         model.clearSelection();
         model.setSelectionMode(SelectionMode.MULTIPLE);
         model.selectIndices(1, 2, 5);
@@ -1447,9 +1665,10 @@ public void test_jdk_8088896() {
         assertEquals(2, model.getSelectedIndices().size());
     }
 
-
-    @Test
-    public void testSelectedIndicesChangeEvents() throws InterruptedException {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSelectedIndicesChangeEvents(Class<? extends MultipleSelectionModel> c) throws InterruptedException {
+        setUp(c);
 
         testSelectedIndicesChangeEventsFactory(0, new int[]{2,3}, 1, new int[]{5,7},
                 new int[][]{new int[]{1}, new int[]{5,7}});
@@ -1507,6 +1726,6 @@ public void testSelectedIndicesChangeHelper(ListView listView, int selected, int
 
         selectionModel.selectIndices(selected, selectedI);
 
-        assertTrue("A ListEvent was missing: " + Arrays.deepToString(expectedEntries.toArray()), expectedEntries.isEmpty());
+        assertTrue(expectedEntries.isEmpty(), "A ListEvent was missing: " + Arrays.deepToString(expectedEntries.toArray()));
     }
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/PaginationTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/PaginationTest.java
index 0596d58c933..1b21fead27d 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/PaginationTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/PaginationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,14 +25,14 @@
 
 package test.javafx.scene.control;
 
-import com.sun.javafx.scene.SceneHelper;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleIntegerProperty;
@@ -41,22 +41,21 @@
 import javafx.css.StyleableProperty;
 import javafx.scene.Node;
 import javafx.scene.Scene;
+import javafx.scene.control.Label;
+import javafx.scene.control.Pagination;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
 import javafx.util.Callback;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.scene.SceneHelper;
+import com.sun.javafx.tk.Toolkit;
 import test.com.sun.javafx.pgstub.StubToolkit;
 import test.com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
 import test.com.sun.javafx.scene.control.infrastructure.MouseEventGenerator;
-import com.sun.javafx.tk.Toolkit;
-import javafx.scene.control.Label;
-import javafx.scene.control.Pagination;
 
 public class PaginationTest {
     private Pagination pagination;
@@ -65,7 +64,8 @@ public class PaginationTest {
     private Stage stage;
     private StackPane root;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         pagination = new Pagination();
         tk = Toolkit.getToolkit();//This step is not needed (Just to make sure StubToolkit is loaded into VM)
 
@@ -77,7 +77,8 @@ public class PaginationTest {
         stage.setScene(scene);
     }
 
-    @After public void tearDown() {
+    @AfterEach
+    public void tearDown() {
         stage.hide();
     }
 
@@ -117,24 +118,29 @@ private void show() {
      * Tests for property binding                                        *
      ********************************************************************/
 
-    @Test public void checkMaxPageIndicatorCountPropertyBind() {
+    @Test
+    public void checkMaxPageIndicatorCountPropertyBind() {
         IntegerProperty intPr = new SimpleIntegerProperty(200);
         pagination.maxPageIndicatorCountProperty().bind(intPr);
-        assertEquals("number of visible pages cannot be bound", pagination.maxPageIndicatorCountProperty().getValue(), 200.0, 0.0);
+        assertEquals(pagination.maxPageIndicatorCountProperty().getValue(), 200.0, 0.0, "number of visible pages cannot be bound");
         intPr.setValue(105);
-        assertEquals("number of visible pages cannot be bound", pagination.maxPageIndicatorCountProperty().getValue(), 105.0, 0.0);
+        assertEquals(pagination.maxPageIndicatorCountProperty().getValue(), 105.0, 0.0, "number of visible pages cannot be bound");
     }
 
-    @Test(expected = java.lang.UnsupportedOperationException.class) public void checkPageIndexPropertyBind() {
-        IntegerProperty intPr = new SimpleIntegerProperty(10);
-        pagination.currentPageIndexProperty().bind(intPr);
+    @Test
+    public void checkPageIndexPropertyBind() {
+        assertThrows(UnsupportedOperationException.class, () -> {
+            IntegerProperty intPr = new SimpleIntegerProperty(10);
+            pagination.currentPageIndexProperty().bind(intPr);
+        });
     }
 
-    @Test public void checkPageFactoryPropertyBind() {
+    @Test
+    public void checkPageFactoryPropertyBind() {
         Callback callback = arg0 -> null;
         ObjectProperty objPr = new SimpleObjectProperty(callback);
         pagination.pageFactoryProperty().bind(objPr);
-        assertSame("page factory cannot be bound", pagination.pageFactoryProperty().getValue(), callback);
+        assertSame(pagination.pageFactoryProperty().getValue(), callback, "page factory cannot be bound");
     }
 
     /*********************************************************************
@@ -341,6 +347,6 @@ public void testInitialPreferredSize() {
         show();
 
         tk.firePulse();
-        assertTrue("pagination prefWidth() is incorrect", (pagination.prefWidth(-1) > 200));
+        assertTrue((pagination.prefWidth(-1) > 200), "pagination prefWidth() is incorrect");
     }
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/PasswordFieldDefaultCancelButtonTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/PasswordFieldDefaultCancelButtonTest.java
index 339cb57aebc..647fd13741a 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/PasswordFieldDefaultCancelButtonTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/PasswordFieldDefaultCancelButtonTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,15 +32,8 @@
  * default/cancel button actions.
  */
 public class PasswordFieldDefaultCancelButtonTest extends DefaultCancelButtonTestBase<PasswordField> {
-
-     public PasswordFieldDefaultCancelButtonTest(ButtonType buttonType,
-            boolean consume, boolean registerAfterShowing) {
-        super(buttonType, consume, registerAfterShowing);
-    }
-
     @Override
     protected PasswordField createControl() {
         return new PasswordField();
     }
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/PasswordFieldTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/PasswordFieldTest.java
index ffa4206384d..64836ea117d 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/PasswordFieldTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/PasswordFieldTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,23 +25,24 @@
 
 package test.javafx.scene.control;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
 import javafx.scene.control.PasswordField;
 import javafx.scene.control.TextInputControlShim;
-import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.*;
-import static org.junit.Assert.*;
-
-
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  *
  * @author srikalyc
  */
 public class PasswordFieldTest {
-    private PasswordField pwdField;//Empty string
+    private PasswordField pwdField;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         pwdField = new PasswordField();
     }
 
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/PopupControlTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/PopupControlTest.java
index db87455f3e4..9e6e75f5fa9 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/PopupControlTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/PopupControlTest.java
@@ -25,22 +25,23 @@
 
 package test.javafx.scene.control;
 
-import javafx.scene.control.skin.TooltipSkin;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlSkinFactory.attemptGC;
+import java.lang.ref.WeakReference;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.DoublePropertyBase;
 import javafx.beans.property.SimpleStringProperty;
-
 import javafx.scene.Node;
 import javafx.scene.control.PopupControl;
 import javafx.scene.control.Skin;
 import javafx.scene.control.Tooltip;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.lang.ref.WeakReference;
-
-import static org.junit.Assert.*;
-import static test.com.sun.javafx.scene.control.infrastructure.ControlSkinFactory.attemptGC;
+import javafx.scene.control.skin.TooltipSkin;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  *
@@ -55,7 +56,8 @@ private static final class PopupControlSkin<C extends PopupControl> implements S
         @Override public C getSkinnable()   { return null; }
     }
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         popup = new PopupControl();
     }
 
@@ -665,7 +667,7 @@ public void testMemoryLeakSameSkinClass() {
         WeakReference<?> weakRef = new WeakReference<>(skin);
         skin = null;
         attemptGC(weakRef);
-        assertNull("Unused Skin must be gc'ed", weakRef.get());
+        assertNull(weakRef.get(), "Unused Skin must be gc'ed");
     }
 
     @Test
@@ -675,7 +677,6 @@ public void testSetSkinOfSameClass() {
         popup.setSkin(new PopupControlSkin<>());
         Skin<?> newSkin = popup.getSkin();
 
-        assertNotEquals("New skin was not set", oldSkin, newSkin);
+        assertNotEquals(oldSkin, newSkin, "New skin was not set");
     }
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ProgressIndicatorTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ProgressIndicatorTest.java
index f9f5ec25f7d..8fab27a28e6 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ProgressIndicatorTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ProgressIndicatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,30 +25,29 @@
 
 package test.javafx.scene.control;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import javafx.geometry.Pos;
+import javafx.scene.Scene;
 import javafx.scene.control.Alert;
 import javafx.scene.control.ProgressIndicator;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
+import javafx.stage.Stage;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import com.sun.javafx.tk.Toolkit;
 
-import org.junit.Before;
-import org.junit.Test;
-
 /**
  */
 public class ProgressIndicatorTest {
     Toolkit tk;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         tk = Toolkit.getToolkit();
     }
 
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/RadioMenuItemTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/RadioMenuItemTest.java
index 99d56848e41..9d652a14b30 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/RadioMenuItemTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/RadioMenuItemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,13 +25,13 @@
 
 package test.javafx.scene.control;
 
-import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.*;
-
-import test.com.sun.javafx.pgstub.StubToolkit;
-import test.com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
-import test.com.sun.javafx.scene.control.infrastructure.KeyModifier;
-import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
-import com.sun.javafx.tk.Toolkit;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
@@ -40,18 +40,20 @@
 import javafx.beans.value.ObservableValue;
 import javafx.scene.Node;
 import javafx.scene.Scene;
-import javafx.scene.control.RadioMenuItem;
-import javafx.scene.control.ToggleGroup;
 import javafx.scene.control.Menu;
 import javafx.scene.control.MenuBar;
-import javafx.scene.input.KeyCombination;
+import javafx.scene.control.RadioMenuItem;
+import javafx.scene.control.ToggleGroup;
 import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyCombination;
 import javafx.scene.shape.Rectangle;
-import static org.junit.Assert.*;
-
-
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.tk.Toolkit;
+import test.com.sun.javafx.pgstub.StubToolkit;
+import test.com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
+import test.com.sun.javafx.scene.control.infrastructure.KeyModifier;
+import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
 
 /**
  *
@@ -59,11 +61,12 @@
  */
 public class RadioMenuItemTest {
     private ToggleGroup toggleGroup;
-    private RadioMenuItem radioMenuItem, rmi;//Empty string
+    private RadioMenuItem radioMenuItem, rmi;
     private RadioMenuItem radioMenuItemTwoArg;
     private Node node;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         assertTrue(Toolkit.getToolkit() instanceof StubToolkit);  // Ensure StubToolkit is loaded
 
         node = new Rectangle();
@@ -107,17 +110,17 @@ public class RadioMenuItemTest {
     @Test public void checkSelectedPropertyBind() {
         BooleanProperty objPr = new SimpleBooleanProperty(true);
         radioMenuItem.selectedProperty().bind(objPr);
-        assertTrue("selectedProperty cannot be bound", radioMenuItem.selectedProperty().getValue());
+        assertTrue(radioMenuItem.selectedProperty().getValue(), "selectedProperty cannot be bound");
         objPr.setValue(false);
-        assertFalse("selectedProperty cannot be bound", radioMenuItem.selectedProperty().getValue());
+        assertFalse(radioMenuItem.selectedProperty().getValue(), "selectedProperty cannot be bound");
     }
 
     @Test public void checkToggleGroupPropertyBind() {
         ObjectProperty objPr = new SimpleObjectProperty<ToggleGroup>(null);
         radioMenuItem.toggleGroupProperty().bind(objPr);
-        assertNull("toggleGroupProperty cannot be bound", radioMenuItem.toggleGroupProperty().getValue());
+        assertNull(radioMenuItem.toggleGroupProperty().getValue(), "toggleGroupProperty cannot be bound");
         objPr.setValue(toggleGroup);
-        assertSame("toggleGroupProperty cannot be bound", radioMenuItem.toggleGroupProperty().getValue(), toggleGroup);
+        assertSame(radioMenuItem.toggleGroupProperty().getValue(), toggleGroup, "toggleGroupProperty cannot be bound");
     }
 
     @Test public void selectedPropertyHasBeanReference() {
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ResizeHelperTestBase.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ResizeHelperTestBase.java
index 420dd3ed439..ae608cf8103 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ResizeHelperTestBase.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ResizeHelperTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,11 +24,11 @@
  */
 package test.javafx.scene.control;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.ArrayList;
 import java.util.List;
 import javafx.scene.control.TableColumnBase;
-import org.junit.After;
+import org.junit.jupiter.api.AfterEach;
 import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
 
 /**
@@ -49,7 +49,7 @@ public enum Cmd {
     protected static final double EPSILON = 0.000001;
     protected StageLoader stageLoader;
 
-    @After
+    @AfterEach
     public void after() {
         if (stageLoader != null) {
             stageLoader.dispose();
@@ -58,10 +58,8 @@ public void after() {
 
     protected void checkInvariants(List<? extends TableColumnBase<?,?>> cols) {
         for (TableColumnBase<?,?> c: cols) {
-            assertTrue("violated min constraint: w=" + c.getWidth() + " min=" + c.getMinWidth(),
-                       c.getWidth() >= c.getMinWidth());
-            assertTrue("violated max constraint: w=" + c.getWidth() + " max=" + c.getMaxWidth(),
-                       c.getWidth() <= c.getMaxWidth());
+            assertTrue(c.getWidth() >= c.getMinWidth(), "violated min constraint: w=" + c.getWidth() + " min=" + c.getMinWidth());
+            assertTrue(c.getWidth() <= c.getMaxWidth(), "violated max constraint: w=" + c.getWidth() + " max=" + c.getMaxWidth());
         }
     }
 
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ScrollBarTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ScrollBarTest.java
index e5d942b589e..48f51b8a92b 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ScrollBarTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ScrollBarTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,33 +25,36 @@
 
 package test.javafx.scene.control;
 
-import com.sun.javafx.scene.control.Properties;
-import javafx.css.CssMetaData;
-import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.*;
-
-import test.com.sun.javafx.pgstub.StubToolkit;
-import com.sun.javafx.tk.Toolkit;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertPseudoClassDoesNotExist;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertPseudoClassExists;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleDoubleProperty;
 import javafx.beans.property.SimpleObjectProperty;
+import javafx.css.CssMetaData;
 import javafx.css.StyleableProperty;
 import javafx.geometry.Orientation;
 import javafx.scene.control.ScrollBar;
-import static org.junit.Assert.*;
-
-
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.scene.control.Properties;
+import com.sun.javafx.tk.Toolkit;
+import test.com.sun.javafx.pgstub.StubToolkit;
 
 /**
  *
  * @author srikalyc
  */
 public class ScrollBarTest {
-    private ScrollBar scrollBar;//Empty string
+    private ScrollBar scrollBar;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         assertTrue(Toolkit.getToolkit() instanceof StubToolkit);  // Ensure StubToolkit is loaded
 
         scrollBar = new ScrollBar();
@@ -116,57 +119,57 @@ public class ScrollBarTest {
     @Test public void checkMinPropertyBind() {
         DoubleProperty objPr = new SimpleDoubleProperty(2.0);
         scrollBar.minProperty().bind(objPr);
-        assertEquals("minProperty cannot be bound", scrollBar.minProperty().getValue(), 2.0, 0.0);
+        assertEquals(scrollBar.minProperty().getValue(), 2.0, 0.0, "minProperty cannot be bound");
         objPr.setValue(5.0);
-        assertEquals("minProperty cannot be bound", scrollBar.minProperty().getValue(), 5.0, 0.0);
+        assertEquals(scrollBar.minProperty().getValue(), 5.0, 0.0, "minProperty cannot be bound");
     }
 
     @Test public void checkMaxPropertyBind() {
         DoubleProperty objPr = new SimpleDoubleProperty(2.0);
         scrollBar.maxProperty().bind(objPr);
-        assertEquals("maxProperty cannot be bound", scrollBar.maxProperty().getValue(), 2.0, 0.0);
+        assertEquals(scrollBar.maxProperty().getValue(), 2.0, 0.0, "maxProperty cannot be bound");
         objPr.setValue(5.0);
-        assertEquals("maxProperty cannot be bound", scrollBar.maxProperty().getValue(), 5.0, 0.0);
+        assertEquals(scrollBar.maxProperty().getValue(), 5.0, 0.0, "maxProperty cannot be bound");
     }
 
     @Test public void checkValuePropertyBind() {
         DoubleProperty objPr = new SimpleDoubleProperty(2.0);
         scrollBar.valueProperty().bind(objPr);
-        assertEquals("valueProperty cannot be bound", scrollBar.valueProperty().getValue(), 2.0, 0.0);
+        assertEquals(scrollBar.valueProperty().getValue(), 2.0, 0.0, "valueProperty cannot be bound");
         objPr.setValue(5.0);
-        assertEquals("valueProperty cannot be bound", scrollBar.valueProperty().getValue(), 5.0, 0.0);
+        assertEquals(scrollBar.valueProperty().getValue(), 5.0, 0.0, "valueProperty cannot be bound");
     }
 
     @Test public void checkOrientationPropertyBind() {
         ObjectProperty objPr = new SimpleObjectProperty<>(Orientation.HORIZONTAL);
         scrollBar.orientationProperty().bind(objPr);
-        assertSame("orientationProperty cannot be bound", scrollBar.orientationProperty().getValue(), Orientation.HORIZONTAL);
+        assertSame(scrollBar.orientationProperty().getValue(), Orientation.HORIZONTAL, "orientationProperty cannot be bound");
         objPr.setValue(Orientation.VERTICAL);
-        assertSame("orientationProperty cannot be bound", scrollBar.orientationProperty().getValue(), Orientation.VERTICAL);
+        assertSame(scrollBar.orientationProperty().getValue(), Orientation.VERTICAL, "orientationProperty cannot be bound");
     }
 
     @Test public void checkUnitIncrementPropertyBind() {
         DoubleProperty objPr = new SimpleDoubleProperty(2.0);
         scrollBar.unitIncrementProperty().bind(objPr);
-        assertEquals("unitIncrementProperty cannot be bound", scrollBar.unitIncrementProperty().getValue(), 2.0, 0.0);
+        assertEquals(scrollBar.unitIncrementProperty().getValue(), 2.0, 0.0, "unitIncrementProperty cannot be bound");
         objPr.setValue(5.0);
-        assertEquals("unitIncrementProperty cannot be bound", scrollBar.unitIncrementProperty().getValue(), 5.0, 0.0);
+        assertEquals(scrollBar.unitIncrementProperty().getValue(), 5.0, 0.0, "unitIncrementProperty cannot be bound");
     }
 
     @Test public void checkBlockIncrementPropertyBind() {
         DoubleProperty objPr = new SimpleDoubleProperty(2.0);
         scrollBar.blockIncrementProperty().bind(objPr);
-        assertEquals("blockIncrementProperty cannot be bound", scrollBar.blockIncrementProperty().getValue(), 2.0, 0.0);
+        assertEquals(scrollBar.blockIncrementProperty().getValue(), 2.0, 0.0, "blockIncrementProperty cannot be bound");
         objPr.setValue(5.0);
-        assertEquals("blockIncrementProperty cannot be bound", scrollBar.blockIncrementProperty().getValue(), 5.0, 0.0);
+        assertEquals(scrollBar.blockIncrementProperty().getValue(), 5.0, 0.0, "blockIncrementProperty cannot be bound");
     }
 
     @Test public void checkVisibleAmtPropertyBind() {
         DoubleProperty objPr = new SimpleDoubleProperty(2.0);
         scrollBar.visibleAmountProperty().bind(objPr);
-        assertEquals("visibleAmountProperty cannot be bound", scrollBar.visibleAmountProperty().getValue(), 2.0, 0.0);
+        assertEquals(scrollBar.visibleAmountProperty().getValue(), 2.0, 0.0, "visibleAmountProperty cannot be bound");
         objPr.setValue(5.0);
-        assertEquals("visibleAmountProperty cannot be bound", scrollBar.visibleAmountProperty().getValue(), 5.0, 0.0);
+        assertEquals(scrollBar.visibleAmountProperty().getValue(), 5.0, 0.0, "visibleAmountProperty cannot be bound");
     }
 
 
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ScrollPaneTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ScrollPaneTest.java
index d49f3ec1f0d..87779477d61 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ScrollPaneTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ScrollPaneTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,35 +25,39 @@
 
 package test.javafx.scene.control;
 
-import javafx.css.CssMetaData;
-import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.*;
-
-import test.com.sun.javafx.pgstub.StubToolkit;
-import com.sun.javafx.tk.Toolkit;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertPseudoClassDoesNotExist;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertPseudoClassExists;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleDoubleProperty;
 import javafx.beans.property.SimpleObjectProperty;
+import javafx.css.CssMetaData;
 import javafx.css.StyleableProperty;
 import javafx.geometry.BoundingBox;
 import javafx.geometry.Bounds;
 import javafx.scene.control.ScrollPane;
-import static org.junit.Assert.*;
-
-
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.tk.Toolkit;
+import test.com.sun.javafx.pgstub.StubToolkit;
 
 /**
  *
  * @author srikalyc
  */
 public class ScrollPaneTest {
-    private ScrollPane scrollPane;//Empty string
+    private ScrollPane scrollPane;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         assertTrue(Toolkit.getToolkit() instanceof StubToolkit);  // Ensure StubToolkit is loaded
 
         scrollPane = new ScrollPane();
@@ -136,118 +140,117 @@ public class ScrollPaneTest {
     @Test public void checkHBarPolicyPropertyBind() {
         ObjectProperty objPr = new SimpleObjectProperty<>(ScrollPane.ScrollBarPolicy.ALWAYS);
         scrollPane.hbarPolicyProperty().bind(objPr);
-        assertSame("HBarPolicyProperty cannot be bound", scrollPane.hbarPolicyProperty().getValue(), ScrollPane.ScrollBarPolicy.ALWAYS);
+        assertSame(scrollPane.hbarPolicyProperty().getValue(), ScrollPane.ScrollBarPolicy.ALWAYS, "HBarPolicyProperty cannot be bound");
         objPr.setValue(ScrollPane.ScrollBarPolicy.NEVER);
-        assertSame("HBarPolicyProperty cannot be bound", scrollPane.hbarPolicyProperty().getValue(), ScrollPane.ScrollBarPolicy.NEVER);
+        assertSame(scrollPane.hbarPolicyProperty().getValue(), ScrollPane.ScrollBarPolicy.NEVER, "HBarPolicyProperty cannot be bound");
     }
 
     @Test public void checkVBarPolicyPropertyBind() {
         ObjectProperty objPr = new SimpleObjectProperty<>(ScrollPane.ScrollBarPolicy.ALWAYS);
         scrollPane.vbarPolicyProperty().bind(objPr);
-        assertSame("VBarPolicyProperty cannot be bound", scrollPane.vbarPolicyProperty().getValue(), ScrollPane.ScrollBarPolicy.ALWAYS);
+        assertSame(scrollPane.vbarPolicyProperty().getValue(), ScrollPane.ScrollBarPolicy.ALWAYS, "VBarPolicyProperty cannot be bound");
         objPr.setValue(ScrollPane.ScrollBarPolicy.NEVER);
-        assertSame("VBarPolicyProperty cannot be bound", scrollPane.vbarPolicyProperty().getValue(), ScrollPane.ScrollBarPolicy.NEVER);
+        assertSame(scrollPane.vbarPolicyProperty().getValue(), ScrollPane.ScrollBarPolicy.NEVER, "VBarPolicyProperty cannot be bound");
     }
 
     @Test public void checkHValuePropertyBind() {
         DoubleProperty objPr = new SimpleDoubleProperty(2.0);
         scrollPane.hvalueProperty().bind(objPr);
-        assertEquals("hvalueProperty cannot be bound", scrollPane.hvalueProperty().getValue(), 2.0, 0.0);
+        assertEquals(scrollPane.hvalueProperty().getValue(), 2.0, 0.0, "hvalueProperty cannot be bound");
         objPr.setValue(5.0);
-        assertEquals("hvalueProperty cannot be bound", scrollPane.hvalueProperty().getValue(), 5.0, 0.0);
+        assertEquals(scrollPane.hvalueProperty().getValue(), 5.0, 0.0, "hvalueProperty cannot be bound");
     }
 
     @Test public void checkHminPropertyBind() {
         DoubleProperty objPr = new SimpleDoubleProperty(2.0);
         scrollPane.hminProperty().bind(objPr);
-        assertEquals("hminProperty cannot be bound", scrollPane.hminProperty().getValue(), 2.0, 0.0);
+        assertEquals(scrollPane.hminProperty().getValue(), 2.0, 0.0, "hminProperty cannot be bound");
         objPr.setValue(5.0);
-        assertEquals("hminProperty cannot be bound", scrollPane.hminProperty().getValue(), 5.0, 0.0);
+        assertEquals(scrollPane.hminProperty().getValue(), 5.0, 0.0, "hminProperty cannot be bound");
     }
 
     @Test public void checkHmaxPropertyBind() {
         DoubleProperty objPr = new SimpleDoubleProperty(2.0);
         scrollPane.hmaxProperty().bind(objPr);
-        assertEquals("hmaxProperty cannot be bound", scrollPane.hmaxProperty().getValue(), 2.0, 0.0);
+        assertEquals(scrollPane.hmaxProperty().getValue(), 2.0, 0.0, "hmaxProperty cannot be bound");
         objPr.setValue(5.0);
-        assertEquals("hmaxProperty cannot be bound", scrollPane.hmaxProperty().getValue(), 5.0, 0.0);
+        assertEquals(scrollPane.hmaxProperty().getValue(), 5.0, 0.0, "hmaxProperty cannot be bound");
     }
 
     @Test public void checkVValuePropertyBind() {
         DoubleProperty objPr = new SimpleDoubleProperty(2.0);
         scrollPane.vvalueProperty().bind(objPr);
-        assertEquals("vvalueProperty cannot be bound", scrollPane.vvalueProperty().getValue(), 2.0, 0.0);
+        assertEquals(scrollPane.vvalueProperty().getValue(), 2.0, 0.0, "vvalueProperty cannot be bound");
         objPr.setValue(5.0);
-        assertEquals("vvalueProperty cannot be bound", scrollPane.vvalueProperty().getValue(), 5.0, 0.0);
+        assertEquals(scrollPane.vvalueProperty().getValue(), 5.0, 0.0, "vvalueProperty cannot be bound");
     }
 
     @Test public void checkVminPropertyBind() {
         DoubleProperty objPr = new SimpleDoubleProperty(2.0);
         scrollPane.vminProperty().bind(objPr);
-        assertEquals("vminProperty cannot be bound", scrollPane.vminProperty().getValue(), 2.0, 0.0);
+        assertEquals(scrollPane.vminProperty().getValue(), 2.0, 0.0, "vminProperty cannot be bound");
         objPr.setValue(5.0);
-        assertEquals("vminProperty cannot be bound", scrollPane.vminProperty().getValue(), 5.0, 0.0);
+        assertEquals(scrollPane.vminProperty().getValue(), 5.0, 0.0, "vminProperty cannot be bound");
     }
 
     @Test public void checkVmaxPropertyBind() {
         DoubleProperty objPr = new SimpleDoubleProperty(2.0);
         scrollPane.vmaxProperty().bind(objPr);
-        assertEquals("vmaxProperty cannot be bound", scrollPane.vmaxProperty().getValue(), 2.0, 0.0);
+        assertEquals(scrollPane.vmaxProperty().getValue(), 2.0, 0.0, "vmaxProperty cannot be bound");
         objPr.setValue(5.0);
-        assertEquals("vmaxProperty cannot be bound", scrollPane.vmaxProperty().getValue(), 5.0, 0.0);
+        assertEquals(scrollPane.vmaxProperty().getValue(), 5.0, 0.0, "vmaxProperty cannot be bound");
     }
 
     @Test public void checkFitToWidthPropertyBind() {
         BooleanProperty objPr = new SimpleBooleanProperty(true);
         scrollPane.fitToWidthProperty().bind(objPr);
-        assertEquals("FitToWidth cannot be bound", scrollPane.fitToWidthProperty().getValue(), true);
+        assertEquals(scrollPane.fitToWidthProperty().getValue(), true, "FitToWidth cannot be bound");
         objPr.setValue(false);
-        assertEquals("FitToWidth cannot be bound", scrollPane.fitToWidthProperty().getValue(), false);
+        assertEquals(scrollPane.fitToWidthProperty().getValue(), false, "FitToWidth cannot be bound");
     }
 
     @Test public void checkFitToHeigtPropertyBind() {
         BooleanProperty objPr = new SimpleBooleanProperty(true);
         scrollPane.fitToHeightProperty().bind(objPr);
-        assertEquals("FitToHeigt cannot be bound", scrollPane.fitToHeightProperty().getValue(), true);
+        assertEquals(scrollPane.fitToHeightProperty().getValue(), true, "FitToHeigt cannot be bound");
         objPr.setValue(false);
-        assertEquals("FitToHeigt cannot be bound", scrollPane.fitToHeightProperty().getValue(), false);
+        assertEquals(scrollPane.fitToHeightProperty().getValue(), false, "FitToHeigt cannot be bound");
     }
 
     @Test public void checkPannablePropertyBind() {
         BooleanProperty objPr = new SimpleBooleanProperty(true);
         scrollPane.pannableProperty().bind(objPr);
-        assertEquals("Pannable cannot be bound", scrollPane.pannableProperty().getValue(), true);
+        assertEquals(scrollPane.pannableProperty().getValue(), true, "Pannable cannot be bound");
         objPr.setValue(false);
-        assertEquals("Pannable cannot be bound", scrollPane.pannableProperty().getValue(), false);
+        assertEquals(scrollPane.pannableProperty().getValue(), false, "Pannable cannot be bound");
     }
 
     @Test public void checkPreferredViewportWidthBind() {
         DoubleProperty objPr = new SimpleDoubleProperty(2.0);
         scrollPane.prefViewportWidthProperty().bind(objPr);
-        assertEquals("prefViewportWidthProperty cannot be bound", scrollPane.prefViewportWidthProperty().getValue(), 2.0, 0.0);
+        assertEquals(scrollPane.prefViewportWidthProperty().getValue(), 2.0, 0.0, "prefViewportWidthProperty cannot be bound");
         objPr.setValue(5.0);
-        assertEquals("prefViewportWidthProperty cannot be bound", scrollPane.prefViewportWidthProperty().getValue(), 5.0, 0.0);
+        assertEquals(scrollPane.prefViewportWidthProperty().getValue(), 5.0, 0.0, "prefViewportWidthProperty cannot be bound");
     }
 
     @Test public void checkPreferredViewportHeightBind() {
         DoubleProperty objPr = new SimpleDoubleProperty(2.0);
         scrollPane.prefViewportHeightProperty().bind(objPr);
-        assertEquals("prefViewportHeightProperty cannot be bound", scrollPane.prefViewportHeightProperty().getValue(), 2.0, 0.0);
+        assertEquals(scrollPane.prefViewportHeightProperty().getValue(), 2.0, 0.0, "prefViewportHeightProperty cannot be bound");
         objPr.setValue(5.0);
-        assertEquals("prefViewportHeightProperty cannot be bound", scrollPane.prefViewportHeightProperty().getValue(), 5.0, 0.0);
+        assertEquals(scrollPane.prefViewportHeightProperty().getValue(), 5.0, 0.0, "prefViewportHeightProperty cannot be bound");
     }
 
     @Test public void checkViewportBoundsBind() {
         Bounds b = null;
         ObjectProperty objPr = new SimpleObjectProperty<>(b);
         scrollPane.viewportBoundsProperty().bind(objPr);
-        assertNull("viewportBoundsProperty cannot be bound", scrollPane.viewportBoundsProperty().getValue());
+        assertNull(scrollPane.viewportBoundsProperty().getValue(), "viewportBoundsProperty cannot be bound");
         b = new BoundingBox(0.0, 0.0, 0.0, 0.0);
         objPr.setValue(b);
-        assertSame("viewportBoundsProperty cannot be bound", scrollPane.viewportBoundsProperty().getValue(), b);
+        assertSame(scrollPane.viewportBoundsProperty().getValue(), b, "viewportBoundsProperty cannot be bound");
     }
 
-
     @Test public void hbarPolicyPropertyHasBeanReference() {
         assertSame(scrollPane, scrollPane.hbarPolicyProperty().getBean());
     }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/SelectionFocusModelMemoryTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/SelectionFocusModelMemoryTest.java
index 5ebb23977c2..7d6cd66f93d 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/SelectionFocusModelMemoryTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/SelectionFocusModelMemoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,17 +25,10 @@
 
 package test.javafx.scene.control;
 
+import static org.junit.jupiter.api.Assertions.assertNull;
 import java.lang.ref.WeakReference;
-import java.util.Arrays;
 import java.util.Collection;
-
-import org.junit.After;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import static org.junit.Assert.*;
-
+import java.util.List;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.scene.Scene;
@@ -67,6 +60,9 @@
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Testing for potential memory leaks in xxSelectionModel and xxFocusModel (
@@ -80,151 +76,159 @@
  * the skin - added here for convenience (and because it is simple).
  *
  */
-@RunWith(Parameterized.class)
 public class SelectionFocusModelMemoryTest {
     private Scene scene;
     private Stage stage;
     private Pane root;
 
-    private boolean showBeforeReplaceSM;
-
 //---------- focusModel
 
-    @Test
-    public void testTreeViewFocusModel() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testTreeViewFocusModel(boolean showBeforeReplaceSM) {
         TreeItem<String> root = new TreeItem<>("root");
         ObservableList<String> data = FXCollections.observableArrayList("Apple", "Orange", "Banana");
         data.forEach(text -> root.getChildren().add(new TreeItem<>(text)));
         TreeView<String> control = new TreeView<>(root);
         WeakReference<FocusModel<?>> weakRef = new WeakReference<>(control.getFocusModel());
         FocusModel<TreeItem<String>> replacingSm = TreeViewShim.get_TreeViewFocusModel(control);
-        maybeShowControl(control);
+        maybeShowControl(control, showBeforeReplaceSM);
         control.setFocusModel(replacingSm);
         attemptGC(weakRef, 10);
-        assertNull("focusModel must be gc'ed", weakRef.get());
+        assertNull(weakRef.get(), "focusModel must be gc'ed");
     }
 
-    @Test
-    public void testTreeTableViewFocusModel() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testTreeTableViewFocusModel(boolean showBeforeReplaceSM) {
         TreeItem<String> root = new TreeItem<>("root");
         ObservableList<String> data = FXCollections.observableArrayList("Apple", "Orange", "Banana");
         data.forEach(text -> root.getChildren().add(new TreeItem<>(text)));
         TreeTableView<String> control = new TreeTableView<>(root);
         WeakReference<FocusModel<?>> weakRef = new WeakReference<>(control.getFocusModel());
         TreeTableViewFocusModel<String> replacingSm = new TreeTableViewFocusModel<>(control);
-        maybeShowControl(control);
+        maybeShowControl(control, showBeforeReplaceSM);
         control.setFocusModel(replacingSm);
         attemptGC(weakRef, 10);
-        assertNull("focusModel must be gc'ed", weakRef.get());
+        assertNull(weakRef.get(), "focusModel must be gc'ed");
     }
 
-    @Test
-    public void testTableViewFocusModel() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testTableViewFocusModel(boolean showBeforeReplaceSM) {
         TableView<String> control = new TableView<>(FXCollections.observableArrayList("Apple", "Orange", "Banana"));
         WeakReference<FocusModel<?>> weakRef = new WeakReference<>(control.getFocusModel());
         TableViewFocusModel<String> replacingSm = new TableViewFocusModel<>(control);
-        maybeShowControl(control);
+        maybeShowControl(control, showBeforeReplaceSM);
         control.setFocusModel(replacingSm);
         attemptGC(weakRef, 10);
-        assertNull("focusModel must be gc'ed", weakRef.get());
+        assertNull(weakRef.get(), "focusModel must be gc'ed");
     }
 
-    @Test
-    public void testListViewFocusModel() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testListViewFocusModel(boolean showBeforeReplaceSM) {
         ListView<String> control = new ListView<>(FXCollections.observableArrayList("Apple", "Orange", "Banana"));
         WeakReference<FocusModel<?>> weakRef = new WeakReference<>(control.getFocusModel());
         FocusModel<String> replacingSm = ListViewShim.getListViewFocusModel(control);
-        maybeShowControl(control);
+        maybeShowControl(control, showBeforeReplaceSM);
         control.setFocusModel(replacingSm);
         attemptGC(weakRef, 10);
-        assertNull("focusModel must be gc'ed", weakRef.get());
+        assertNull(weakRef.get(), "focusModel must be gc'ed");
     }
 
 //------------------------ selectionModel
 
-    @Test
-    public void testTreeViewSelectionModel() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testTreeViewSelectionModel(boolean showBeforeReplaceSM) {
         TreeItem<String> root = new TreeItem<>("root");
         ObservableList<String> data = FXCollections.observableArrayList("Apple", "Orange", "Banana");
         data.forEach(text -> root.getChildren().add(new TreeItem<>(text)));
         TreeView<String> control = new TreeView<>(root);
         WeakReference<SelectionModel<?>> weakRef = new WeakReference<>(control.getSelectionModel());
         MultipleSelectionModel<TreeItem<String>> replacingSm = TreeViewShim.get_TreeViewBitSetSelectionModel(control);
-        maybeShowControl(control);
+        maybeShowControl(control, showBeforeReplaceSM);
         control.setSelectionModel(replacingSm);
         attemptGC(weakRef, 10);
-        assertNull("selectionModel must be gc'ed", weakRef.get());
+        assertNull(weakRef.get(), "selectionModel must be gc'ed");
     }
 
-    @Test
-    public void testTreeTableViewSelectionModel() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testTreeTableViewSelectionModel(boolean showBeforeReplaceSM) {
         TreeItem<String> root = new TreeItem<>("root");
         ObservableList<String> data = FXCollections.observableArrayList("Apple", "Orange", "Banana");
         data.forEach(text -> root.getChildren().add(new TreeItem<>(text)));
         TreeTableView<String> control = new TreeTableView<>(root);
         WeakReference<SelectionModel<?>> weakRef = new WeakReference<>(control.getSelectionModel());
         TreeTableViewSelectionModel<String> replacingSm = (TreeTableViewSelectionModel<String>) TreeTableViewShim.get_TreeTableViewArrayListSelectionModel(control);
-        maybeShowControl(control);
+        maybeShowControl(control, showBeforeReplaceSM);
         control.setSelectionModel(replacingSm);
         attemptGC(weakRef, 10);
-        assertNull("selectionModel must be gc'ed", weakRef.get());
+        assertNull(weakRef.get(), "selectionModel must be gc'ed");
     }
 
-    @Test
-    public void testTableViewSelectionModel() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testTableViewSelectionModel(boolean showBeforeReplaceSM) {
         TableView<String> control = new TableView<>(FXCollections.observableArrayList("Apple", "Orange", "Banana"));
         WeakReference<SelectionModel<?>> weakRef = new WeakReference<>(control.getSelectionModel());
         TableViewSelectionModel<String> replacingSm = TableViewShim.get_TableViewArrayListSelectionModel(control);
-        maybeShowControl(control);
+        maybeShowControl(control, showBeforeReplaceSM);
         control.setSelectionModel(replacingSm);
         attemptGC(weakRef, 10);
-        assertNull("selectionModel must be gc'ed", weakRef.get());
+        assertNull(weakRef.get(), "selectionModel must be gc'ed");
     }
 
-    @Test
-    public void testListViewSelectionModel() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testListViewSelectionModel(boolean showBeforeReplaceSM) {
         ListView<String> control = new ListView<>(FXCollections.observableArrayList("Apple", "Orange", "Banana"));
         WeakReference<SelectionModel<?>> weakRef = new WeakReference<>(control.getSelectionModel());
         MultipleSelectionModel<String> replacingSm = ListViewShim.getListViewBitSetSelectionModel(control);
-        maybeShowControl(control);
+        maybeShowControl(control, showBeforeReplaceSM);
         control.setSelectionModel(replacingSm);
         attemptGC(weakRef, 10);
-        assertNull("selectionModel must be gc'ed", weakRef.get());
+        assertNull(weakRef.get(), "selectionModel must be gc'ed");
     }
 
-    @Test
-    public void testTabPaneSelectionModel() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testTabPaneSelectionModel(boolean showBeforeReplaceSM) {
         TabPane control = new TabPane();
         ObservableList<String> data = FXCollections.observableArrayList("Apple", "Orange", "Banana");
         data.forEach(text -> control.getTabs().add(new Tab(text)));
         WeakReference<SelectionModel<?>> weakRef = new WeakReference<>(control.getSelectionModel());
         SingleSelectionModel<Tab> replacingSm = TabPaneShim.getTabPaneSelectionModel(control);
-        maybeShowControl(control);
+        maybeShowControl(control, showBeforeReplaceSM);
         control.setSelectionModel(replacingSm);
         attemptGC(weakRef, 10);
-        assertNull("selectionModel must be gc'ed", weakRef.get());
+        assertNull(weakRef.get(), "selectionModel must be gc'ed");
     }
 
-    @Test
-    public void testComboBoxSelectionModel() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testComboBoxSelectionModel(boolean showBeforeReplaceSM) {
         ComboBox<String> control = new ComboBox<>(FXCollections.observableArrayList("Apple", "Orange", "Banana"));
         WeakReference<SelectionModel<?>> weakRef = new WeakReference<>(control.getSelectionModel());
         SingleSelectionModel<String> replacingSm = ComboBoxShim.get_ComboBoxSelectionModel(control);
-        maybeShowControl(control);
+        maybeShowControl(control, showBeforeReplaceSM);
         control.setSelectionModel(replacingSm);
         attemptGC(weakRef, 10);
-        assertNull("selectionModel must be gc'ed", weakRef.get());
+        assertNull(weakRef.get(), "selectionModel must be gc'ed");
     }
 
-    @Test
-    public void testChoiceBoxSelectionModel() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testChoiceBoxSelectionModel(boolean showBeforeReplaceSM) {
         ChoiceBox<String> control = new ChoiceBox<>(FXCollections.observableArrayList("Apple", "Orange", "Banana"));
         WeakReference<SelectionModel<?>> weakRef = new WeakReference<>(control.getSelectionModel());
         SingleSelectionModel<String> replacingSm = ChoiceBoxShim.get_ChoiceBoxSelectionModel(control);
-        maybeShowControl(control);
+        maybeShowControl(control, showBeforeReplaceSM);
         control.setSelectionModel(replacingSm);
         attemptGC(weakRef, 10);
-        assertNull("selectionModel must be gc'ed", weakRef.get());
+        assertNull(weakRef.get(), "selectionModel must be gc'ed");
     }
 
     private void attemptGC(WeakReference<?> weakRef, int n) {
@@ -243,25 +247,19 @@ private void attemptGC(WeakReference<?> weakRef, int n) {
         }
     }
 
-    protected void maybeShowControl(Control control) {
+    protected void maybeShowControl(Control control, boolean showBeforeReplaceSM) {
         if (!showBeforeReplaceSM) return;
         show(control);
     }
 
 // ------------- parameterized
 
-    @Parameterized.Parameters
-    public static Collection<Object[]> data() {
+    private static Collection<Boolean> parameters() {
         // show the control before replacing the selectionModel
-        Object[][] data = new Object[][] {
-            {false},
-            {true },
-        };
-        return Arrays.asList(data);
-    }
-
-    public SelectionFocusModelMemoryTest(boolean showBeforeReplaceSM) {
-        this.showBeforeReplaceSM = showBeforeReplaceSM;
+        return List.of(
+            false,
+            true
+        );
     }
 
 //------------------ setup
@@ -279,11 +277,10 @@ private void show(Control node) {
         }
     }
 
-    @After
+    @AfterEach
     public void cleanup() {
         if (stage != null) {
             stage.hide();
         }
     }
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/SelectionModelImplTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/SelectionModelImplTest.java
index d8196149b7a..8372c75524d 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/SelectionModelImplTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/SelectionModelImplTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,17 +25,21 @@
 
 package test.javafx.scene.control;
 
-import java.util.Arrays;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 import java.util.Collection;
-
+import java.util.List;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.scene.control.ChoiceBox;
 import javafx.scene.control.ChoiceBoxShim;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.ComboBoxShim;
-import javafx.scene.control.TableView.TableViewFocusModel;
-import javafx.scene.control.TableView.TableViewSelectionModel;
 import javafx.scene.control.Control;
 import javafx.scene.control.ControlShim;
 import javafx.scene.control.FocusModel;
@@ -48,27 +52,21 @@
 import javafx.scene.control.SelectionModelShim;
 import javafx.scene.control.SingleSelectionModel;
 import javafx.scene.control.TableView;
+import javafx.scene.control.TableView.TableViewFocusModel;
+import javafx.scene.control.TableView.TableViewSelectionModel;
 import javafx.scene.control.TableViewShim;
 import javafx.scene.control.TreeItem;
 import javafx.scene.control.TreeTableView;
 import javafx.scene.control.TreeTableViewShim;
 import javafx.scene.control.TreeView;
 import javafx.scene.control.TreeViewShim;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import test.com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils;
 
-import static org.junit.Assert.*;
-import static org.junit.Assert.assertEquals;
-
 /**
  * Unit tests for the SelectionModel abstract class used by ListView
  * and TreeView. This unit test attempts to test all known implementations, and
@@ -77,20 +75,16 @@
  *
  * @author Jonathan Giles
  */
-@RunWith(Parameterized.class)
 public class SelectionModelImplTest {
 
     private SelectionModel model;
     private FocusModel focusModel;
-
-    private Class<? extends SelectionModel> modelClass;
     private Control currentControl;
 
     // ListView
     private ListView<String> listView;
 
     // ListView model data
-//    private static ObservableList<String> defaultData = FXCollections.<String>observableArrayList();
     private static ObservableList<String> data = FXCollections.<String>observableArrayList();
     private static final String ROW_1_VALUE = "Row 1";
     private static final String ROW_2_VALUE = "Row 2";
@@ -119,24 +113,23 @@ public class SelectionModelImplTest {
 
     // --- ListView model data
 
-    @Parameters public static Collection implementations() {
-        return Arrays.asList(new Object[][] {
-            { ListViewShim.get_ListViewBitSetSelectionModel_class() },
-            { TreeViewShim.get_TreeViewBitSetSelectionModel_class() },
-            { TableViewShim.get_TableViewArrayListSelectionModel_class() },
-            { TreeTableViewShim.get_TreeTableViewArrayListSelectionModel_class() }
-//            { ChoiceBox.ChoiceBoxSelectionModel.class } TODO re-enable
-//            { ComboBox.ComboBoxSelectionModel.class }  TODO re-enable
-        });
-    }
-
-    public SelectionModelImplTest(Class<? extends SelectionModel> modelClass) {
-        this.modelClass = modelClass;
+    private static Collection<Class<? extends SelectionModel>> parameters() {
+        return List.of(
+            ListViewShim.get_ListViewBitSetSelectionModel_class(),
+            TreeViewShim.get_TreeViewBitSetSelectionModel_class(),
+            TableViewShim.get_TableViewArrayListSelectionModel_class(),
+            TreeTableViewShim.get_TreeTableViewArrayListSelectionModel_class()
+//          ChoiceBox.ChoiceBoxSelectionModel.class, TODO re-enable
+//          ComboBox.ComboBoxSelectionModel.class  TODO re-enable
+        );
     }
 
-    @AfterClass public static void tearDownClass() throws Exception {    }
+    @AfterAll
+    public static void tearDownClass() throws Exception {    }
 
-    @Before public void setUp() throws Exception {
+    // @BeforeEach
+    // junit5 does not support parameterized class-level tests yet
+    public void setUp(Class<? extends SelectionModel> modelClass) {
         // reset the data model
         data.setAll(ROW_1_VALUE, ROW_2_VALUE, ROW_3_VALUE, "Row 4", ROW_5_VALUE, "Row 6",
                 "Row 7", "Row 8", "Row 9", "Row 10", "Row 11", "Row 12", "Row 13",
@@ -179,8 +172,6 @@ public SelectionModelImplTest(Class<? extends SelectionModel> modelClass) {
         comboBox.setItems(data);
         // --- ComboBox init
 
-
-
         try {
             // we create a new SelectionModel per test to ensure it is always back
             // at the default settings
@@ -244,12 +235,12 @@ public SelectionModelImplTest(Class<? extends SelectionModel> modelClass) {
                 ((MultipleSelectionModel)model).setSelectionMode(SelectionMode.SINGLE);
             }
         } catch (Exception ex) {
-            ex.printStackTrace();
-            throw ex;
+            fail(ex);
         }
     }
 
-    @After public void tearDown() {
+    @AfterEach
+    public void tearDown() {
         model = null;
     }
 
@@ -265,7 +256,14 @@ private Object getValue(Object item) {
         return item;
     }
 
-    @Test public void testDefaultState() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testDefaultState(Class<? extends SelectionModel> modelClass) {
+        setUp(modelClass);
+        testDefaultState2();
+    }
+
+    private void testDefaultState2() {
         assertEquals(-1, model.getSelectedIndex());
         assertNull(getValue(model.getSelectedItem()));
 
@@ -275,15 +273,21 @@ private Object getValue(Object item) {
         }
     }
 
-    @Test public void selectInvalidIndex() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectInvalidIndex(Class<? extends SelectionModel> modelClass) {
+        setUp(modelClass);
         // there isn't 100 rows, so selecting this shouldn't be possible
         model.select(100);
 
         // we should be in a default state
-        testDefaultState();
+        testDefaultState2();
     }
 
-    @Test public void selectRowAfterInvalidIndex() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectRowAfterInvalidIndex(Class<? extends SelectionModel> modelClass) {
+        setUp(modelClass);
         // there isn't 100 rows, so selecting this shouldn't be possible.
         // The end result should be that we remain at the 0 index
         model.select(100);
@@ -299,7 +303,10 @@ private Object getValue(Object item) {
         if (focusModel != null) assertEquals(2, focusModel.getFocusedIndex());
     }
 
-    @Test public void selectInvalidItem() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectInvalidItem(Class<? extends SelectionModel> modelClass) {
+        setUp(modelClass);
         assertEquals(-1, model.getSelectedIndex());
 
         Object obj = new TreeItem("DUMMY");
@@ -309,7 +316,10 @@ private Object getValue(Object item) {
         assertEquals(-1, model.getSelectedIndex());
     }
 
-    @Test public void selectValidIndex() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectValidIndex(Class<? extends SelectionModel> modelClass) {
+        setUp(modelClass);
         int index = 4;
         model.select(index);
 
@@ -324,7 +334,10 @@ private Object getValue(Object item) {
         }
     }
 
-    @Test public void clearPartialSelectionWithSingleSelection() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void clearPartialSelectionWithSingleSelection(Class<? extends SelectionModel> modelClass) {
+        setUp(modelClass);
         assertFalse(model.isSelected(5));
         model.select(5);
         assertTrue(model.isSelected(5));
@@ -332,7 +345,10 @@ private Object getValue(Object item) {
         assertFalse(model.isSelected(5));
     }
 
-    @Test public void ensureIsEmptyIsAccurate() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void ensureIsEmptyIsAccurate(Class<? extends SelectionModel> modelClass) {
+        setUp(modelClass);
         assertTrue(model.isEmpty());
         model.select(5);
         assertFalse(model.isEmpty());
@@ -340,23 +356,32 @@ private Object getValue(Object item) {
         assertTrue(model.isEmpty());
     }
 
-    @Test public void testSingleSelectionMode() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSingleSelectionMode(Class<? extends SelectionModel> modelClass) {
+        setUp(modelClass);
         model.clearSelection();
         assertTrue(model.isEmpty());
 
         model.select(5);
-        assertTrue("Selected: " + model.getSelectedIndex() + ", expected: 5",  model.isSelected(5));
+        assertTrue(model.isSelected(5), "Selected: " + model.getSelectedIndex() + ", expected: 5");
 
         model.select(10);
         assertTrue(model.isSelected(10));
         assertFalse(model.isSelected(5));
     }
 
-    @Test public void testSelectNullObject() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSelectNullObject(Class<? extends SelectionModel> modelClass) {
+        setUp(modelClass);
         model.select(null);
     }
 
-    @Test public void testFocusOnNegativeIndex() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testFocusOnNegativeIndex(Class<? extends SelectionModel> modelClass) {
+        setUp(modelClass);
         if (focusModel == null) return;
         assertEquals(0, focusModel.getFocusedIndex());
         focusModel.focus(-1);
@@ -364,7 +389,10 @@ private Object getValue(Object item) {
         assertFalse(focusModel.isFocused(-1));
     }
 
-    @Test public void testFocusOnOutOfBoundsIndex() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testFocusOnOutOfBoundsIndex(Class<? extends SelectionModel> modelClass) {
+        setUp(modelClass);
         if (focusModel == null) return;
         assertEquals(0, focusModel.getFocusedIndex());
         focusModel.focus(Integer.MAX_VALUE);
@@ -373,7 +401,10 @@ private Object getValue(Object item) {
         assertFalse(focusModel.isFocused(Integer.MAX_VALUE));
     }
 
-    @Test public void testFocusOnValidIndex() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testFocusOnValidIndex(Class<? extends SelectionModel> modelClass) {
+        setUp(modelClass);
         if (focusModel == null) return;
         assertEquals(0, focusModel.getFocusedIndex());
         focusModel.focus(1);
@@ -387,8 +418,11 @@ private Object getValue(Object item) {
         }
     }
 
-    @Ignore("Not yet implemented in TreeView")
-    @Test public void testSelectionChangesWhenItemIsInsertedAtStartOfModel() {
+    @Disabled("Not yet implemented in TreeView")
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSelectionChangesWhenItemIsInsertedAtStartOfModel(Class<? extends SelectionModel> modelClass) {
+        setUp(modelClass);
         /* Select the fourth item, and insert a new item at the start of the
          * data model. The end result should be that the fourth item should NOT
          * be selected, and the fifth item SHOULD be selected.
@@ -400,7 +434,10 @@ private Object getValue(Object item) {
         assertTrue(model.isSelected(4));
     }
 
-    @Test public void test_rt_29821() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void test_rt_29821(Class<? extends SelectionModel> modelClass) {
+        setUp(modelClass);
         // in single selection passing in select(null) should clear selection.
         // In multiple selection (tested elsewhere), this would result in a no-op
 
@@ -433,8 +470,10 @@ private Object getValue(Object item) {
         }
     }
 
-    @Test public void test_rt_30356_selectRowAtIndex0() throws Exception {
-        setUp();
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void test_rt_30356_selectRowAtIndex0(Class<? extends SelectionModel> modelClass) {
+        setUp(modelClass);
 
         // this test selects the 0th row, then removes it, and sees what happens
         // to the selection.
@@ -459,7 +498,7 @@ private Object getValue(Object item) {
         } else {
             // for list / table
             model.select(0);
-            assertEquals("model is " + model, ROW_1_VALUE, model.getSelectedItem());
+            assertEquals(ROW_1_VALUE, model.getSelectedItem(), "model is " + model);
 
             data.remove(0);
             assertEquals(ROW_2_VALUE, model.getSelectedItem());
@@ -474,8 +513,10 @@ private Object getValue(Object item) {
         }
     }
 
-    @Test public void test_rt_30356_selectRowAtIndex1() throws Exception {
-        setUp();
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void test_rt_30356_selectRowAtIndex1(Class<? extends SelectionModel> modelClass) {
+        setUp(modelClass);
 
         // this test selects the 1st row, then removes it, and sees what happens
         // to the selection.
@@ -525,7 +566,10 @@ private Object getValue(Object item) {
     }
 
     private int rt32618_count = 0;
-    @Test public void test_rt32618_singleSelection() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void test_rt32618_singleSelection(Class<? extends SelectionModel> modelClass) {
+        setUp(modelClass);
         model.selectedItemProperty().addListener((ov, t, t1) -> {
             rt32618_count++;
         });
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/SeparatorMenuItemTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/SeparatorMenuItemTest.java
index ca18ba0f7e4..8b995576893 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/SeparatorMenuItemTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/SeparatorMenuItemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,20 +25,22 @@
 
 package test.javafx.scene.control;
 
-import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.*;
-
-import test.com.sun.javafx.pgstub.StubToolkit;
-import com.sun.javafx.tk.Toolkit;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
 import javafx.geometry.Orientation;
 import javafx.scene.Node;
 import javafx.scene.control.Separator;
 import javafx.scene.control.SeparatorMenuItem;
 import javafx.scene.shape.Rectangle;
-import static org.junit.Assert.*;
-
-
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.tk.Toolkit;
+import test.com.sun.javafx.pgstub.StubToolkit;
 
 /**
  *
@@ -48,7 +50,8 @@ public class SeparatorMenuItemTest {
     private SeparatorMenuItem separatorMenuItem, smi;
     private Node node;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         assertTrue(Toolkit.getToolkit() instanceof StubToolkit);  // Ensure StubToolkit is loaded
 
         node = new Rectangle();
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/SeparatorTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/SeparatorTest.java
index bab1936522f..96ea14d8622 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/SeparatorTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/SeparatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,32 +25,33 @@
 
 package test.javafx.scene.control;
 
-import javafx.css.CssMetaData;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertPseudoClassExists;
 import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
+import javafx.css.CssMetaData;
 import javafx.css.StyleableProperty;
 import javafx.geometry.HPos;
 import javafx.geometry.Orientation;
 import javafx.geometry.VPos;
 import javafx.scene.control.Separator;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
  */
 public class SeparatorTest {
 
     private Separator separator;
-    @Before public void setup() {
+
+    @BeforeEach
+    public void setup() {
         separator = new Separator();
     }
 
@@ -155,9 +156,7 @@ public class SeparatorTest {
         assertSame(Orientation.VERTICAL, separator.getOrientation());
     }
 
-    @Ignore("This is an unreliable test because it uses the string version " +
-            "of the function instead of the other, and no check is made " +
-            "for bits set")
+    @Disabled("This is an unreliable test because it uses the string version of the function instead of the other, and no check is made for bits set")
     @Test public void whenSettingOrientationToItsExistingValue_CssMetaData_isSettable_ReturnsFalse() {
         CssMetaData styleable = ((StyleableProperty)separator.orientationProperty()).getCssMetaData();
         assertTrue(styleable.isSettable(separator));
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/SkinBaseTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/SkinBaseTest.java
index 2151a4e80d9..44c54fe96b5 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/SkinBaseTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/SkinBaseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,15 +25,12 @@
 
 package test.javafx.scene.control;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
 import javafx.beans.Observable;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
@@ -43,12 +40,15 @@
 import javafx.collections.ObservableList;
 import javafx.scene.control.Control;
 import javafx.scene.control.SkinBaseShim;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class SkinBaseTest {
     private ControlStub c;
     private SkinBaseStub<ControlStub> s;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         c = new ControlStub();
         s = new SkinBaseStub<>(c);
     }
@@ -79,10 +79,10 @@ public void testChangeSupport() {
         Consumer<ObservableValue<?>> consumer = c -> count[0]++;
         s.addChangeListener(p, consumer);
         p.set(200);
-        assertEquals("change listener must be notified", 1, count[0]);
+        assertEquals(1, count[0], "change listener must be notified");
         Consumer<ObservableValue<?>> removed = s.removeChangeListeners(p);
         p.set(100);
-        assertEquals("changeListener must not be notified", 1, count[0]);
+        assertEquals(1, count[0], "changeListener must not be notified");
         assertSame(consumer, removed);
     }
 
@@ -93,10 +93,10 @@ public void testInvalidationSupport() {
         Consumer<Observable> consumer = c -> count[0]++;
         s.addInvalidationListener(p, consumer);
         p.set(200);
-        assertEquals("invalidation listener must be notified", 1, count[0]);
+        assertEquals(1, count[0], "invalidation listener must be notified");
         Consumer<Observable> removed = s.removeInvalidationListeners(p);
         p.set(100);
-        assertEquals("invalidation listener must not be notified", 1, count[0]);
+        assertEquals(1, count[0], "invalidation listener must not be notified");
         assertSame(consumer, removed);
     }
 
@@ -158,7 +158,5 @@ void addListChangeListener(ObservableList<?> list, Consumer<Change<?>> consumer)
         Consumer<Change<?>> removeListChangeListeners(ObservableList<?> list) {
             return unregisterListChangeListeners(list);
         }
-
     }
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/SliderTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/SliderTest.java
index ba25eec2cb9..a2984f5dad1 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/SliderTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/SliderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,36 +25,35 @@
 
 package test.javafx.scene.control;
 
-
-import javafx.css.ParsedValue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 import javafx.css.CssParserShim;
-import test.com.sun.javafx.pgstub.StubToolkit;
-import com.sun.javafx.tk.Toolkit;
+import javafx.css.ParsedValue;
 import javafx.css.StyleableProperty;
 import javafx.scene.Scene;
 import javafx.scene.control.Slider;
 import javafx.scene.layout.StackPane;
 import javafx.stage.Stage;
 import javafx.util.StringConverter;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.tk.Toolkit;
+import test.com.sun.javafx.pgstub.StubToolkit;
 
 /**
  * @author smarks
  */
 public class SliderTest {
 
-
     private Slider slider;
     private Toolkit tk;
     private Scene scene;
     private Stage stage;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         tk = Toolkit.getToolkit();
 
         assertTrue(tk instanceof StubToolkit);  // Ensure it's StubToolkit
@@ -78,7 +77,7 @@ protected void startApp() {
             ((StyleableProperty)slider.minorTickCountProperty()).applyStyle(null, val);
             assertEquals(2, slider.getMinorTickCount(), 0.);
         } catch (Exception e) {
-            Assert.fail(e.toString());
+            fail(e);
         }
     }
     @Test public void testSettingTickLabelFormatter() {
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/SpinnerTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/SpinnerTest.java
index 302c9aff11d..842b4c15965 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/SpinnerTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/SpinnerTest.java
@@ -24,18 +24,32 @@
  */
 package test.javafx.scene.control;
 
-import static junit.framework.Assert.*;
-
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.scene.layout.HBox;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.Arguments;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertTimeout;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.params.provider.Arguments;
 import java.text.DecimalFormat;
 import java.time.LocalDate;
 import java.time.LocalTime;
@@ -94,16 +108,19 @@ public class SpinnerTest {
 
     private static Locale defaultLocale;
 
-    @BeforeClass public static void setupOnce() {
+    @BeforeAll
+    public static void setupOnce() {
         defaultLocale = Locale.getDefault();
         Locale.setDefault(Locale.US);
     }
 
-    @AfterClass public static void tearDownOnce() {
+    @AfterAll
+    public static void tearDownOnce() {
         Locale.setDefault(defaultLocale);
     }
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         eventCount = 0;
         spinner = new Spinner();
 
@@ -137,7 +154,7 @@ public class SpinnerTest {
         });
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         Thread.currentThread().setUncaughtExceptionHandler(null);
     }
@@ -242,24 +259,32 @@ public void tearDown() {
      *                                                                         *
      **************************************************************************/
 
-    @Test(expected = IllegalStateException.class)
+    @Test
     public void expectExceptionWhenNoArgsIncrementCalled_noValueFactory() {
-        spinner.increment();
+        assertThrows(IllegalStateException.class, () -> {
+            spinner.increment();
+        });
     }
 
-    @Test(expected = IllegalStateException.class)
+    @Test
     public void expectExceptionWhenOneArgsIncrementCalled_noValueFactory() {
-        spinner.increment(2);
+        assertThrows(IllegalStateException.class, () -> {
+            spinner.increment(2);
+        });
     }
 
-    @Test(expected = IllegalStateException.class)
+    @Test
     public void expectExceptionWhenNoArgsDecrementCalled_noValueFactory() {
-        spinner.decrement();
+        assertThrows(IllegalStateException.class, () -> {
+            spinner.decrement();
+        });
     }
 
-    @Test(expected = IllegalStateException.class)
+    @Test
     public void expectExceptionWhenOneArgsDecrementCalled_noValueFactory() {
-        spinner.decrement(2);
+        assertThrows(IllegalStateException.class, () -> {
+            spinner.decrement(2);
+        });
     }
 
 
@@ -338,8 +363,9 @@ public void expectExceptionWhenOneArgsDecrementCalled_noValueFactory() {
      *                                                                         *
      **************************************************************************/
 
-    @Ignore("JDK-8328701")
-    @Test public void editing_commitValidInput() {
+    @Disabled("JDK-8328701")
+    @Test
+    public void editing_commitValidInput() {
         intSpinner.valueProperty().addListener(o -> eventCount++);
         intSpinner.getEditor().setText("3");
         // TODO press enter
@@ -349,8 +375,9 @@ public void expectExceptionWhenOneArgsDecrementCalled_noValueFactory() {
         assertEquals("3", intSpinner.getEditor().getText());
     }
 
-    @Ignore("JDK-8328701")
-    @Test public void editing_commitInvalidInput() {
+    @Disabled("JDK-8328701")
+    @Test
+    public void editing_commitInvalidInput() {
         intSpinner.valueProperty().addListener(o -> eventCount++);
         intSpinner.getEditor().setText("300");
         // TODO press enter
@@ -1292,60 +1319,69 @@ private void assertTimeEquals(LocalTime expected, LocalTime actual) {
         assertEquals(expected.truncatedTo(ChronoUnit.MINUTES), actual.truncatedTo(ChronoUnit.MINUTES));
     }
 
-    @Ignore
-    @Test public void localTimeSpinner_testIncrement_oneStep() {
+    @Disabled
+    @Test
+    public void localTimeSpinner_testIncrement_oneStep() {
         localTimeValueFactory.increment(1);
         assertTimeEquals(nowPlusHours(1), localTimeValueFactory.getValue());
     }
 
-    @Ignore
-    @Test public void localTimeSpinner_testIncrement_twoSteps() {
+    @Disabled
+    @Test
+    public void localTimeSpinner_testIncrement_twoSteps() {
         localTimeValueFactory.increment(2);
         assertTimeEquals(nowPlusHours(2), localTimeValueFactory.getValue());
     }
 
-    @Ignore
-    @Test public void localTimeSpinner_testIncrement_manyCalls() {
+    @Disabled
+    @Test
+    public void localTimeSpinner_testIncrement_manyCalls() {
         for (int i = 0; i < 100; i++) {
             localTimeValueFactory.increment(1);
         }
         assertTimeEquals(LocalTime.MAX, localTimeValueFactory.getValue());
     }
 
-    @Ignore
-    @Test public void localTimeSpinner_testIncrement_bigStepPastMaximum() {
+    @Disabled
+    @Test
+    public void localTimeSpinner_testIncrement_bigStepPastMaximum() {
         localTimeValueFactory.increment(100000);
         assertTimeEquals(LocalTime.MAX, localTimeValueFactory.getValue());
     }
 
-    @Ignore
-    @Test public void localTimeSpinner_testDecrement_oneStep() {
+    @Disabled
+    @Test
+    public void localTimeSpinner_testDecrement_oneStep() {
         localTimeValueFactory.decrement(1);
         assertTimeEquals(nowPlusHours(-1), localTimeValueFactory.getValue());
     }
 
-    @Ignore
-    @Test public void localTimeSpinner_testDecrement_twoSteps() {
+    @Disabled
+    @Test
+    public void localTimeSpinner_testDecrement_twoSteps() {
         localTimeValueFactory.decrement(2);
         assertTimeEquals(nowPlusHours(-2), localTimeValueFactory.getValue());
     }
 
-    @Ignore
-    @Test public void localTimeSpinner_testDecrement_manyCalls() {
+    @Disabled
+    @Test
+    public void localTimeSpinner_testDecrement_manyCalls() {
         for (int i = 0; i < 100; i++) {
             localTimeValueFactory.decrement(1);
         }
         assertTimeEquals(LocalTime.MIN, localTimeValueFactory.getValue());
     }
 
-    @Ignore
-    @Test public void localTimeSpinner_testDecrement_bigStepPastMinimum() {
+    @Disabled
+    @Test
+    public void localTimeSpinner_testDecrement_bigStepPastMinimum() {
         localTimeValueFactory.decrement(100000);
         assertTimeEquals(LocalTime.MIN, localTimeValueFactory.getValue());
     }
 
-    @Ignore
-    @Test public void localTimeSpinner_testWrapAround_increment_oneStep() {
+    @Disabled
+    @Test
+    public void localTimeSpinner_testWrapAround_increment_oneStep() {
         localTimeValueFactory.setWrapAround(true);
 
         LocalTime six_pm = LocalTime.of(18,32);
@@ -1360,8 +1396,9 @@ private void assertTimeEquals(LocalTime expected, LocalTime actual) {
         assertTimeEquals(LocalTime.of(01,32), localTimeValueFactory.getValue());
     }
 
-    @Ignore
-    @Test public void localTimeSpinner_testWrapAround_increment_twoSteps() {
+    @Disabled
+    @Test
+    public void localTimeSpinner_testWrapAround_increment_twoSteps() {
         localTimeValueFactory.setWrapAround(true);
 
         LocalTime six_pm = LocalTime.of(18,32);
@@ -1388,8 +1425,9 @@ private void assertTimeEquals(LocalTime expected, LocalTime actual) {
         assertTimeEquals(LocalTime.of(23,32), localTimeValueFactory.getValue());
     }
 
-    @Ignore
-    @Test public void localTimeSpinner_testWrapAround_decrement_twoSteps() {
+    @Disabled
+    @Test
+    public void localTimeSpinner_testWrapAround_decrement_twoSteps() {
         localTimeValueFactory.setWrapAround(true);
 
         LocalTime six_am = LocalTime.of(06,32);
@@ -1401,13 +1439,15 @@ private void assertTimeEquals(LocalTime expected, LocalTime actual) {
         assertTimeEquals(LocalTime.of(22,32), localTimeValueFactory.getValue());
     }
 
-    @Ignore
-    @Test public void localTimeSpinner_assertDefaultConverterIsNonNull() {
+    @Disabled
+    @Test
+    public void localTimeSpinner_assertDefaultConverterIsNonNull() {
         assertNotNull(localTimeValueFactory.getConverter());
     }
 
-    @Ignore("Not safe when run early in the morning - needs refining when time permits")
-    @Test public void localTimeSpinner_testSetMin_doesNotChangeSpinnerValueWhenMinIsLessThanCurrentValue() {
+    @Disabled("Not safe when run early in the morning - needs refining when time permits")
+    @Test
+    public void localTimeSpinner_testSetMin_doesNotChangeSpinnerValueWhenMinIsLessThanCurrentValue() {
         LocalTime newValue = LocalTime.now();
         localTimeValueFactory.setValue(newValue);
         assertTimeEquals(newValue, localTimeSpinner.getValue());
@@ -1415,8 +1455,9 @@ private void assertTimeEquals(LocalTime expected, LocalTime actual) {
         assertTimeEquals(newValue, localTimeSpinner.getValue());
     }
 
-    @Ignore("Not safe when late at night - needs refining when time permits")
-    @Test public void localTimeSpinner_testSetMin_changesSpinnerValueWhenMinIsGreaterThanCurrentValue() {
+    @Disabled("Not safe when late at night - needs refining when time permits")
+    @Test
+    public void localTimeSpinner_testSetMin_changesSpinnerValueWhenMinIsGreaterThanCurrentValue() {
         LocalTime newValue = LocalTime.now();
         localTimeValueFactory.setValue(newValue);
         assertTimeEquals(newValue, localTimeSpinner.getValue());
@@ -1433,8 +1474,9 @@ private void assertTimeEquals(LocalTime expected, LocalTime actual) {
         assertTimeEquals(LocalTime.MAX, SpinnerValueFactoryShim.LocalTime_getMax(localTimeValueFactory));
     }
 
-    @Ignore
-    @Test public void localTimeSpinner_testSetMax_doesNotChangeSpinnerValueWhenMaxIsGreaterThanCurrentValue() {
+    @Disabled
+    @Test
+    public void localTimeSpinner_testSetMax_doesNotChangeSpinnerValueWhenMaxIsGreaterThanCurrentValue() {
         LocalTime newValue = LocalTime.now();
         localTimeValueFactory.setValue(newValue);
         assertTimeEquals(newValue, localTimeSpinner.getValue());
@@ -1442,8 +1484,9 @@ private void assertTimeEquals(LocalTime expected, LocalTime actual) {
         assertTimeEquals(newValue, localTimeSpinner.getValue());
     }
 
-    @Ignore
-    @Test public void localTimeSpinner_testSetMax_changesSpinnerValueWhenMaxIsLessThanCurrentValue() {
+    @Disabled
+    @Test
+    public void localTimeSpinner_testSetMax_changesSpinnerValueWhenMaxIsLessThanCurrentValue() {
         LocalTime newValue = nowPlusHours(4);
         localTimeValueFactory.setValue(newValue);
         assertTimeEquals(newValue, localTimeSpinner.getValue());
@@ -1453,8 +1496,9 @@ private void assertTimeEquals(LocalTime expected, LocalTime actual) {
         assertTimeEquals(twoDays, localTimeSpinner.getValue());
     }
 
-    @Ignore
-    @Test public void localTimeSpinner_testSetMax_ensureThatMaxCanNotGoLessThanMin() {
+    @Disabled
+    @Test
+    public void localTimeSpinner_testSetMax_ensureThatMaxCanNotGoLessThanMin() {
         SpinnerValueFactoryShim.LocalTime_setMin(localTimeValueFactory, nowPlusHours(5));
         assertTimeEquals(nowPlusHours(5), SpinnerValueFactoryShim.LocalTime_getMax(localTimeValueFactory));
         assertTimeEquals(LocalTime.MAX, SpinnerValueFactoryShim.LocalTime_getMax(localTimeValueFactory));
@@ -1462,8 +1506,9 @@ private void assertTimeEquals(LocalTime expected, LocalTime actual) {
         assertTimeEquals(nowPlusHours(5), SpinnerValueFactoryShim.LocalTime_getMax(localTimeValueFactory));
     }
 
-    @Ignore
-    @Test public void localTimeSpinner_testSetMax_ensureThatMaxCanEqualMin() {
+    @Disabled
+    @Test
+    public void localTimeSpinner_testSetMax_ensureThatMaxCanEqualMin() {
         LocalTime twoDays = nowPlusHours(2);
         SpinnerValueFactoryShim.LocalTime_setMin(localTimeValueFactory, twoDays);
         assertTimeEquals(twoDays, SpinnerValueFactoryShim.LocalTime_getMax(localTimeValueFactory));
@@ -1519,14 +1564,16 @@ private void assertTimeEquals(LocalTime expected, LocalTime actual) {
         assertEquals(100.0, spinner.getValue());
     }
 
-    @Test(expected = RuntimeException.class)
+    @Test
     public void test_jdk_8150946_testCommit_invalid_wrongType() {
-        Spinner<Double> spinner = new Spinner<>(-100, 100, 0, 0.5);
-        spinner.setEditable(true);
-        assertEquals(0.0, spinner.getValue());
-        spinner.getEditor().setText("Hello, World!");
-        spinner.commitValue();
-        assertEquals(0.0, spinner.getValue());
+        assertThrows(RuntimeException.class, () -> {
+            Spinner<Double> spinner = new Spinner<>(-100, 100, 0, 0.5);
+            spinner.setEditable(true);
+            assertEquals(0.0, spinner.getValue());
+            spinner.getEditor().setText("Hello, World!");
+            spinner.commitValue();
+            assertEquals(0.0, spinner.getValue());
+        });
     }
 
     @Test public void test_jdk_8150946_testCancel() {
@@ -1585,8 +1632,8 @@ public void test_jdk_8150946_testCommit_invalid_wrongType() {
         String canMsg = "OnAction EventHandler of the cancel 'Cancel' " +
             "button should get invoked on ESCAPE key press.";
 
-        assertTrue(defMsg, enterDefaultPass);
-        assertTrue(canMsg, escapeCancelPass);
+        assertTrue(enterDefaultPass, defMsg);
+        assertTrue(escapeCancelPass, canMsg);
 
         // Same test with non editable spinner.
         intSpinner.setEditable(false);
@@ -1597,8 +1644,8 @@ public void test_jdk_8150946_testCommit_invalid_wrongType() {
         tk.firePulse();
         stage.hide();
 
-        assertTrue(defMsg, enterDefaultPass);
-        assertTrue(canMsg, escapeCancelPass);
+        assertTrue(enterDefaultPass, defMsg);
+        assertTrue(escapeCancelPass, canMsg);
     }
 
     @Test public void spinnerDelayTest() {
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/SplitMenuButtonTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/SplitMenuButtonTest.java
index b0ab7b6f417..60504f17f27 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/SplitMenuButtonTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/SplitMenuButtonTest.java
@@ -25,13 +25,15 @@
 
 package test.javafx.scene.control;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.SplitMenuButton;
 import javafx.scene.shape.Rectangle;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Basic SplitMenuButton Tests.
@@ -41,7 +43,8 @@
 public class SplitMenuButtonTest {
     private SplitMenuButton splitMenuButton;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         splitMenuButton = new SplitMenuButton();
     }
 
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/SplitPaneTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/SplitPaneTest.java
index 719dab3cc4a..a27e8ebd994 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/SplitPaneTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/SplitPaneTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,47 +25,49 @@
 
 package test.javafx.scene.control;
 
-import javafx.collections.FXCollections;
-import javafx.scene.control.ComboBox;
-import javafx.scene.control.Tab;
-import javafx.scene.control.TabPane;
-import org.junit.After;
-import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
-import javafx.css.CssMetaData;
-import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.*;
-
-import test.com.sun.javafx.pgstub.StubToolkit;
-import javafx.scene.control.skin.SplitPaneSkin;
-import com.sun.javafx.tk.Toolkit;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertPseudoClassDoesNotExist;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertPseudoClassExists;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
+import java.util.concurrent.atomic.AtomicInteger;
 import javafx.application.Platform;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleDoubleProperty;
 import javafx.beans.property.SimpleObjectProperty;
+import javafx.collections.FXCollections;
+import javafx.css.CssMetaData;
 import javafx.css.StyleableProperty;
 import javafx.geometry.Orientation;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
+import javafx.scene.control.ComboBox;
 import javafx.scene.control.Label;
 import javafx.scene.control.SplitPane;
+import javafx.scene.control.Tab;
+import javafx.scene.control.TabPane;
+import javafx.scene.control.skin.SplitPaneSkin;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
-import static org.junit.Assert.*;
-
-
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.concurrent.atomic.AtomicInteger;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.tk.Toolkit;
+import test.com.sun.javafx.pgstub.StubToolkit;
+import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
 
 /**
  *
  * @author srikalyc
  */
 public class SplitPaneTest {
-    private SplitPane splitPane;//Empty string
+    private SplitPane splitPane;
     private SplitPane.Divider divider1;
     private SplitPane.Divider divider2;
     private Scene scene;
@@ -73,7 +75,8 @@ public class SplitPaneTest {
     private StackPane root;
     private StageLoader stageLoader;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         assertTrue(Toolkit.getToolkit() instanceof StubToolkit);  // Ensure StubToolkit is loaded
 
         splitPane = new SplitPane();
@@ -87,7 +90,7 @@ public class SplitPaneTest {
         stage.setScene(scene);
     }
 
-    @After
+    @AfterEach
     public void cleanup() {
         if (stageLoader != null) stageLoader.dispose();
     }
@@ -152,25 +155,25 @@ private double convertDividerPostionToAbsolutePostion(double pos, double edge) {
     @Test public void checkHBarPolicyPropertyBind() {
         ObjectProperty objPr = new SimpleObjectProperty<>(Orientation.VERTICAL);
         splitPane.orientationProperty().bind(objPr);
-        assertSame("orientationProperty cannot be bound", splitPane.orientationProperty().getValue(), Orientation.VERTICAL);
+        assertSame(splitPane.orientationProperty().getValue(), Orientation.VERTICAL, "orientationProperty cannot be bound");
         objPr.setValue(Orientation.HORIZONTAL);
-        assertSame("orientationProperty cannot be bound", splitPane.orientationProperty().getValue(), Orientation.HORIZONTAL);
+        assertSame(splitPane.orientationProperty().getValue(), Orientation.HORIZONTAL, "orientationProperty cannot be bound");
     }
 
     @Test public void checkDividerPositionPropertyBind() {
         DoubleProperty objPr = new SimpleDoubleProperty(0.6);
         divider1.positionProperty().bind(objPr);
-        assertEquals("positionProperty cannot be bound", divider1.positionProperty().getValue(), 0.6, 0.0);
+        assertEquals(divider1.positionProperty().getValue(), 0.6, 0.0, "positionProperty cannot be bound");
         objPr.setValue(0.9);
-        assertEquals("positionProperty cannot be bound", divider1.positionProperty().getValue(), 0.9, 0.0);
+        assertEquals(divider1.positionProperty().getValue(), 0.9, 0.0, "positionProperty cannot be bound");
     }
 
     @Test public void checkOrientationPropertyBind() {
         ObjectProperty objPr = new SimpleObjectProperty<>(Orientation.HORIZONTAL);
         splitPane.orientationProperty().bind(objPr);
-        assertSame("orientationProperty cannot be bound", splitPane.orientationProperty().getValue(), Orientation.HORIZONTAL);
+        assertSame(splitPane.orientationProperty().getValue(), Orientation.HORIZONTAL, "orientationProperty cannot be bound");
         objPr.setValue(Orientation.VERTICAL);
-        assertSame("orientationProperty cannot be bound", splitPane.orientationProperty().getValue(), Orientation.VERTICAL);
+        assertSame(splitPane.orientationProperty().getValue(), Orientation.VERTICAL, "orientationProperty cannot be bound");
     }
 
     @Test public void orientationPropertyHasBeanReference() {
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TabPaneTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TabPaneTest.java
index 76b8c0266ae..2333ed7698f 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TabPaneTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TabPaneTest.java
@@ -25,21 +25,22 @@
 
 package test.javafx.scene.control;
 
-import com.sun.javafx.scene.SceneHelper;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertPseudoClassDoesNotExist;
 import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertPseudoClassExists;
 import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import javafx.scene.control.SelectionModel;
-import javafx.scene.input.ScrollEvent;
-import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
+import java.lang.ref.WeakReference;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 import javafx.application.Platform;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.DoubleProperty;
@@ -55,42 +56,36 @@
 import javafx.geometry.Side;
 import javafx.scene.Group;
 import javafx.scene.Scene;
-import javafx.scene.input.KeyEvent;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.StackPane;
-import javafx.scene.layout.VBox;
-import javafx.stage.Stage;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import test.com.sun.javafx.pgstub.StubToolkit;
-import test.com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
-import test.com.sun.javafx.scene.control.infrastructure.MouseEventGenerator;
-import com.sun.javafx.scene.input.KeyCodeMap;
-import com.sun.javafx.tk.Toolkit;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
 import javafx.scene.control.Button;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.ScrollPane;
+import javafx.scene.control.SelectionModel;
 import javafx.scene.control.SingleSelectionModel;
 import javafx.scene.control.SingleSelectionModelShim;
-import javafx.scene.control.skin.TabPaneSkin;
-import javafx.scene.control.skin.TabPaneSkinShim;
 import javafx.scene.control.SplitPane;
 import javafx.scene.control.Tab;
 import javafx.scene.control.TabPane;
 import javafx.scene.control.TabPaneShim;
-
-import java.lang.ref.WeakReference;
+import javafx.scene.control.skin.TabPaneSkin;
+import javafx.scene.control.skin.TabPaneSkinShim;
+import javafx.scene.input.KeyEvent;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.input.ScrollEvent;
+import javafx.scene.layout.StackPane;
+import javafx.scene.layout.VBox;
+import javafx.stage.Stage;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.scene.SceneHelper;
+import com.sun.javafx.scene.input.KeyCodeMap;
+import com.sun.javafx.tk.Toolkit;
+import test.com.sun.javafx.pgstub.StubToolkit;
+import test.com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
+import test.com.sun.javafx.scene.control.infrastructure.MouseEventGenerator;
+import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
 
 public class TabPaneTest {
-    private TabPane tabPane;//Empty string
+    private TabPane tabPane;
     private Toolkit tk;
     private SingleSelectionModel<Tab> sm;
     private Tab tab1;
@@ -100,7 +95,8 @@ public class TabPaneTest {
     private Stage stage;
     private StackPane root;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         tk = Toolkit.getToolkit();
 
         assertTrue(tk instanceof StubToolkit);  // Ensure it's StubToolkit
@@ -191,66 +187,66 @@ private void show() {
     @Test public void checkSelectionModelPropertyBind() {
         ObjectProperty objPr = new SimpleObjectProperty<SingleSelectionModel<Tab>>(null);
         tabPane.selectionModelProperty().bind(objPr);
-        assertNull("selectionModel cannot be bound", tabPane.selectionModelProperty().getValue());
+        assertNull(tabPane.selectionModelProperty().getValue(), "selectionModel cannot be bound");
         objPr.setValue(sm);
-        assertSame("selectionModel cannot be bound", tabPane.selectionModelProperty().getValue(), sm);
+        assertSame(tabPane.selectionModelProperty().getValue(), sm, "selectionModel cannot be bound");
     }
 
     @Test public void checkSidePropertyBind() {
         ObjectProperty objPr = new SimpleObjectProperty<>(Side.BOTTOM);
         tabPane.sideProperty().bind(objPr);
-        assertSame("side cannot be bound", tabPane.sideProperty().getValue(), Side.BOTTOM);
+        assertSame(tabPane.sideProperty().getValue(), Side.BOTTOM, "side cannot be bound");
         objPr.setValue(Side.RIGHT);
-        assertSame("side cannot be bound", tabPane.sideProperty().getValue(), Side.RIGHT);
+        assertSame(tabPane.sideProperty().getValue(), Side.RIGHT, "side cannot be bound");
     }
 
     @Test public void checkTabClosingPropertyBind() {
         ObjectProperty objPr = new SimpleObjectProperty<>(TabPane.TabClosingPolicy.UNAVAILABLE);
         tabPane.tabClosingPolicyProperty().bind(objPr);
-        assertSame("side cannot be bound", tabPane.tabClosingPolicyProperty().getValue(), TabPane.TabClosingPolicy.UNAVAILABLE);
+        assertSame(tabPane.tabClosingPolicyProperty().getValue(), TabPane.TabClosingPolicy.UNAVAILABLE, "side cannot be bound");
         objPr.setValue(TabPane.TabClosingPolicy.ALL_TABS);
-        assertSame("side cannot be bound", tabPane.tabClosingPolicyProperty().getValue(), TabPane.TabClosingPolicy.ALL_TABS);
+        assertSame(tabPane.tabClosingPolicyProperty().getValue(), TabPane.TabClosingPolicy.ALL_TABS, "side cannot be bound");
     }
 
     @Test public void checkRotateGraphicsPropertyBind() {
         BooleanProperty objPr = new SimpleBooleanProperty(false);
         tabPane.rotateGraphicProperty().bind(objPr);
-        assertFalse("rotateGraphic cannot be bound", tabPane.rotateGraphicProperty().getValue());
+        assertFalse(tabPane.rotateGraphicProperty().getValue(), "rotateGraphic cannot be bound");
         objPr.setValue(true);
-        assertTrue("rotateGraphic cannot be bound", tabPane.rotateGraphicProperty().getValue());
+        assertTrue(tabPane.rotateGraphicProperty().getValue(), "rotateGraphic cannot be bound");
     }
 
     @Test public void checkTabMinWidthPropertyBind() {
         DoubleProperty objPr = new SimpleDoubleProperty(2.0);
         tabPane.tabMinWidthProperty().bind(objPr);
-        assertEquals("tabMinWidthProperty cannot be bound", tabPane.tabMinWidthProperty().getValue(), 2.0, 0.0);
+        assertEquals(tabPane.tabMinWidthProperty().getValue(), 2.0, 0.0, "tabMinWidthProperty cannot be bound");
         objPr.setValue(5.0);
-        assertEquals("tabMinWidthProperty cannot be bound", tabPane.tabMinWidthProperty().getValue(), 5.0, 0.0);
+        assertEquals(tabPane.tabMinWidthProperty().getValue(), 5.0, 0.0, "tabMinWidthProperty cannot be bound");
     }
 
     @Test public void checkTabMaxWidthPropertyBind() {
         DoubleProperty objPr = new SimpleDoubleProperty(2.0);
         tabPane.tabMaxWidthProperty().bind(objPr);
-        assertEquals("tabMaxWidthProperty cannot be bound", tabPane.tabMaxWidthProperty().getValue(), 2.0, 0.0);
+        assertEquals(tabPane.tabMaxWidthProperty().getValue(), 2.0, 0.0, "tabMaxWidthProperty cannot be bound");
         objPr.setValue(5.0);
-        assertEquals("tabMaxWidthProperty cannot be bound", tabPane.tabMaxWidthProperty().getValue(), 5.0, 0.0);
+        assertEquals(tabPane.tabMaxWidthProperty().getValue(), 5.0, 0.0, "tabMaxWidthProperty cannot be bound");
     }
 
 
     @Test public void checkTabMinHeightPropertyBind() {
         DoubleProperty objPr = new SimpleDoubleProperty(2.0);
         tabPane.tabMinHeightProperty().bind(objPr);
-        assertEquals("tabMinHeightProperty cannot be bound", tabPane.tabMinHeightProperty().getValue(), 2.0, 0.0);
+        assertEquals(tabPane.tabMinHeightProperty().getValue(), 2.0, 0.0, "tabMinHeightProperty cannot be bound");
         objPr.setValue(5.0);
-        assertEquals("tabMinHeightProperty cannot be bound", tabPane.tabMinHeightProperty().getValue(), 5.0, 0.0);
+        assertEquals(tabPane.tabMinHeightProperty().getValue(), 5.0, 0.0, "tabMinHeightProperty cannot be bound");
     }
 
     @Test public void checkTabMaxHeightPropertyBind() {
         DoubleProperty objPr = new SimpleDoubleProperty(2.0);
         tabPane.tabMaxHeightProperty().bind(objPr);
-        assertEquals("tabMaxHeightProperty cannot be bound", tabPane.tabMaxHeightProperty().getValue(), 2.0, 0.0);
+        assertEquals(tabPane.tabMaxHeightProperty().getValue(), 2.0, 0.0, "tabMaxHeightProperty cannot be bound");
         objPr.setValue(5.0);
-        assertEquals("tabMaxHeightProperty cannot be bound", tabPane.tabMaxHeightProperty().getValue(), 5.0, 0.0);
+        assertEquals(tabPane.tabMaxHeightProperty().getValue(), 5.0, 0.0, "tabMaxHeightProperty cannot be bound");
     }
 
     @Test public void selectionModelPropertyHasBeanReference() {
@@ -1000,7 +996,7 @@ private void show() {
 
         // selection should move to the next non-disabled tab - in this case tab2
         selectedTab = tabPane.getSelectionModel().getSelectedItem();
-        assertEquals(tab2.getText() + " != " +  tab2.getText(), tab2, selectedTab);
+        assertEquals(tab2, selectedTab, tab2.getText() + " != " +  tab2.getText());
 
         sl.dispose();
     }
@@ -1152,8 +1148,8 @@ public void test_rt_38382(boolean addToTabPane) {
             MouseEventGenerator.generateMouseEvent(MouseEvent.MOUSE_PRESSED, xval + 19, yval + 17));
         tk.firePulse();
 
-        assertEquals("Tabpane should have 3 tabs.", 3, tabPane.getTabs().size());
-        assertEquals("tab2 should be at index 0.", tab2, tabPane.getSelectionModel().getSelectedItem());
+        assertEquals(3, tabPane.getTabs().size(), "Tabpane should have 3 tabs.");
+        assertEquals(tab2, tabPane.getSelectionModel().getSelectedItem(), "tab2 should be at index 0.");
     }
 
     // Test for JDK-8154039
@@ -1197,11 +1193,11 @@ private void attemptGC(int n, WeakReference<?> weakRef) {
         assertNotNull(tbSkin);
         ContextMenu tabsMenu = TabPaneSkinShim.getTabsMenu(tbSkin);
         assertNotNull(tabsMenu);
-        assertEquals("ContextMenu should contain 3 items.", 3, tabsMenu.getItems().size());
+        assertEquals(3, tabsMenu.getItems().size(), "ContextMenu should contain 3 items.");
 
         tabPane.getTabs().sort((o1, o2) -> sortCompare(o1, o2));
         tk.firePulse();
-        assertEquals("ContextMenu should contain 3 items.", 3, tabsMenu.getItems().size());
+        assertEquals(3, tabsMenu.getItems().size(), "ContextMenu should contain 3 items.");
     }
 
     private int sortCompare(Tab t1, Tab t2) {
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TabTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TabTest.java
index 1c6fada5e5b..e5740eebcc0 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TabTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TabTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,12 @@
 
 package test.javafx.scene.control;
 
-import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.*;
-
-import test.com.sun.javafx.pgstub.StubToolkit;
-import com.sun.javafx.tk.Toolkit;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
@@ -43,25 +45,25 @@
 import javafx.scene.control.TabPane;
 import javafx.scene.control.TabShim;
 import javafx.scene.control.Tooltip;
-import javafx.scene.shape.Rectangle;
 import javafx.scene.layout.VBox;
-import static org.junit.Assert.*;
-
-
-import org.junit.Before;
-import org.junit.Test;
+import javafx.scene.shape.Rectangle;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.tk.Toolkit;
+import test.com.sun.javafx.pgstub.StubToolkit;
 
 /**
  *
  * @author srikalyc
  */
 public class TabTest {
-    private TabShim tab;//Empty string
-    private TabShim tabWithStr;//
+    private TabShim tab;
+    private TabShim tabWithStr;
     private TabPane dummyTabPane;
     EventHandler eh;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         assertTrue(Toolkit.getToolkit() instanceof StubToolkit);  // Ensure StubToolkit is loaded
 
         tab = new TabShim();
@@ -152,85 +154,85 @@ public class TabTest {
     @Test public void checkIdPropertyBind() {
         StringProperty objPr = new SimpleStringProperty("one");
         tab.idProperty().bind(objPr);
-        assertEquals("idProperty cannot be bound", tab.idProperty().getValue(), "one");
+        assertEquals(tab.idProperty().getValue(), "one", "idProperty cannot be bound");
         objPr.setValue("another");
-        assertEquals("idProperty cannot be bound", tab.idProperty().getValue(), "another");
+        assertEquals(tab.idProperty().getValue(), "another", "idProperty cannot be bound");
     }
 
     @Test public void checkStylePropertyBind() {
         StringProperty objPr = new SimpleStringProperty("one");
         tab.styleProperty().bind(objPr);
-        assertEquals("styleProperty cannot be bound", tab.styleProperty().getValue(), "one");
+        assertEquals(tab.styleProperty().getValue(), "one", "styleProperty cannot be bound");
         objPr.setValue("another");
-        assertEquals("styleProperty cannot be bound", tab.styleProperty().getValue(), "another");
+        assertEquals(tab.styleProperty().getValue(), "another", "styleProperty cannot be bound");
     }
 
     @Test public void checkTextPropertyBind() {
         StringProperty strPr = new SimpleStringProperty("value");
         tab.textProperty().bind(strPr);
-        assertEquals("Text cannot be bound", tab.textProperty().getValue(), "value");
+        assertEquals(tab.textProperty().getValue(), "value", "Text cannot be bound");
         strPr.setValue("newvalue");
-        assertEquals("Text cannot be bound", tab.textProperty().getValue(), "newvalue");
+        assertEquals(tab.textProperty().getValue(), "newvalue", "Text cannot be bound");
     }
 
     @Test public void checkGraphicPropertyBind() {
         ObjectProperty objPr = new SimpleObjectProperty<Node>(null);
         Rectangle rect = new Rectangle(10, 20);
         tab.graphicProperty().bind(objPr);
-        assertNull("Graphic cannot be bound", tab.graphicProperty().getValue());
+        assertNull(tab.graphicProperty().getValue(), "Graphic cannot be bound");
         objPr.setValue(rect);
-        assertSame("Graphic cannot be bound", tab.graphicProperty().getValue(), rect);
+        assertSame(tab.graphicProperty().getValue(), rect, "Graphic cannot be bound");
     }
 
     @Test public void checkContentPropertyBind() {
         ObjectProperty objPr = new SimpleObjectProperty<Node>(null);
         Rectangle rect = new Rectangle(10, 20);
         tab.contentProperty().bind(objPr);
-        assertNull("content cannot be bound", tab.contentProperty().getValue());
+        assertNull(tab.contentProperty().getValue(), "content cannot be bound");
         objPr.setValue(rect);
-        assertSame("content cannot be bound", tab.contentProperty().getValue(), rect);
+        assertSame(tab.contentProperty().getValue(), rect, "content cannot be bound");
     }
 
     @Test public void checkContextMenuPropertyBind() {
         ObjectProperty objPr = new SimpleObjectProperty<ContextMenu>(null);
         ContextMenu mnu = new ContextMenu();
         tab.contextMenuProperty().bind(objPr);
-        assertNull("contextMenu cannot be bound", tab.contextMenuProperty().getValue());
+        assertNull(tab.contextMenuProperty().getValue(), "contextMenu cannot be bound");
         objPr.setValue(mnu);
-        assertSame("contextMenu cannot be bound", tab.contextMenuProperty().getValue(), mnu);
+        assertSame(tab.contextMenuProperty().getValue(), mnu, "contextMenu cannot be bound");
     }
 
     @Test public void checkClosablePropertyBind() {
         BooleanProperty pr = new SimpleBooleanProperty(true);
         tab.closableProperty().bind(pr);
-        assertTrue("closable cannot be bound", tab.closableProperty().getValue());
+        assertTrue(tab.closableProperty().getValue(), "closable cannot be bound");
         pr.setValue(false);
-        assertFalse("closable cannot be bound", tab.closableProperty().getValue());
+        assertFalse(tab.closableProperty().getValue(), "closable cannot be bound");
     }
 
     @Test public void checkOnSelectionChangedPropertyBind() {
         ObjectProperty objPr = new SimpleObjectProperty<EventHandler<Event>>(null);
         tab.onSelectionChangedProperty().bind(objPr);
-        assertNull("onSelectionChanged cannot be bound", tab.onSelectionChangedProperty().getValue());
+        assertNull(tab.onSelectionChangedProperty().getValue(), "onSelectionChanged cannot be bound");
         objPr.setValue(eh);
-        assertSame("onSelectionChanged cannot be bound", tab.onSelectionChangedProperty().getValue(), eh);
+        assertSame(tab.onSelectionChangedProperty().getValue(), eh, "onSelectionChanged cannot be bound");
     }
 
     @Test public void checkOnClosedPropertyBind() {
         ObjectProperty objPr = new SimpleObjectProperty<EventHandler<Event>>(null);
         tab.onClosedProperty().bind(objPr);
-        assertNull("onSelectionChanged cannot be bound", tab.onClosedProperty().getValue());
+        assertNull(tab.onClosedProperty().getValue(), "onSelectionChanged cannot be bound");
         objPr.setValue(eh);
-        assertSame("onSelectionChanged cannot be bound", tab.onClosedProperty().getValue(), eh);
+        assertSame(tab.onClosedProperty().getValue(), eh, "onSelectionChanged cannot be bound");
     }
 
     @Test public void checkTooltipPropertyBind() {
         ObjectProperty objPr = new SimpleObjectProperty<Tooltip>(null);
         tab.tooltipProperty().bind(objPr);
-        assertNull("tooltip cannot be bound", tab.tooltipProperty().getValue());
+        assertNull(tab.tooltipProperty().getValue(), "tooltip cannot be bound");
         Tooltip tt = new Tooltip();
         objPr.setValue(tt);
-        assertSame("tooltip cannot be bound", tab.tooltipProperty().getValue(), tt);
+        assertSame(tab.tooltipProperty().getValue(), tt, "tooltip cannot be bound");
     }
 
     @Test public void textPropertyHasBeanReference() {
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableCellEditingTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableCellEditingTest.java
index ddd054f27a8..54a7d7c51b6 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableCellEditingTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableCellEditingTest.java
@@ -25,56 +25,52 @@
 
 package test.javafx.scene.control;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import static org.junit.Assert.*;
-
+import java.util.stream.Stream;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.scene.control.TableCell;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableColumn.CellEditEvent;
 import javafx.scene.control.TableView;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test TableCell editing state updated on re-use (aka after updateIndex(old, new)).
  *
  * This test is parameterized in cellIndex and editingIndex.
  */
-@RunWith(Parameterized.class)
 public class TableCellEditingTest {
     private TableCell<String,String> cell;
     private TableView<String> table;
     private TableColumn<String, String> editingColumn;
     private ObservableList<String> model;
 
-    private int cellIndex;
-    private int editingIndex;
-
 //--------------- change off editing index
 
-    @Test
-    public void testOffEditingIndex() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testOffEditingIndex(int cellIndex, int editingIndex) {
+        setup(cellIndex, editingIndex);
         cell.updateIndex(editingIndex);
         table.edit(editingIndex, editingColumn);
         cell.updateIndex(cellIndex);
-        assertEquals("sanity: cell index changed", cellIndex, cell.getIndex());
-        assertEquals("sanity: table editingIndex must be unchanged", editingIndex, table.getEditingCell().getRow());
-        assertEquals("sanity: table editingColumn must be unchanged", editingColumn, table.getEditingCell().getTableColumn());
-        assertFalse("cell must not be editing on update from editingIndex" + editingIndex
-                + " to cellIndex " + cellIndex, cell.isEditing());
+        assertEquals(cellIndex, cell.getIndex(), "sanity: cell index changed");
+        assertEquals(editingIndex, table.getEditingCell().getRow(), "sanity: table editingIndex must be unchanged");
+        assertEquals(editingColumn, table.getEditingCell().getTableColumn(), "sanity: table editingColumn must be unchanged");
+        assertFalse(cell.isEditing(), "cell must not be editing on update from editingIndex" + editingIndex + " to cellIndex " + cellIndex);
     }
 
-    @Test
-    public void testCancelOffEditingIndex() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testCancelOffEditingIndex(int cellIndex, int editingIndex) {
+        setup(cellIndex, editingIndex);
         cell.updateIndex(editingIndex);
         table.edit(editingIndex, editingColumn);
         List<CellEditEvent<String, String>> events = new ArrayList<>();
@@ -82,29 +78,30 @@ public void testCancelOffEditingIndex() {
             events.add(e);
         });
         cell.updateIndex(cellIndex);
-        assertEquals("cell must have fired edit cancel", 1, events.size());
-        assertEquals("cancel event index must be same as editingIndex", editingIndex,
-                events.get(0).getTablePosition().getRow());
-        assertEquals("cancel event index must be same as editingIndex",
-                editingIndex, table.getEditingCell().getRow());
+        assertEquals(1, events.size(), "cell must have fired edit cancel");
+        assertEquals(editingIndex, events.get(0).getTablePosition().getRow(), "cancel event index must be same as editingIndex");
+        assertEquals(editingIndex, table.getEditingCell().getRow(), "cancel event index must be same as editingIndex");
     }
 
 //--------------- change to editing index
 
-    @Test
-    public void testToEditingIndex() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testToEditingIndex(int cellIndex, int editingIndex) {
+        setup(cellIndex, editingIndex);
         cell.updateIndex(cellIndex);
         table.edit(editingIndex, editingColumn);
         cell.updateIndex(editingIndex);
-        assertEquals("sanity: cell at editing index", editingIndex, cell.getIndex());
-        assertEquals("sanity: table editingIndex must be unchanged", editingIndex, table.getEditingCell().getRow());
-        assertEquals("sanity: table editingColumn must be unchanged", editingColumn, table.getEditingCell().getTableColumn());
-        assertTrue("cell must be editing on update from " + cellIndex
-                + " to editingIndex " + editingIndex, cell.isEditing());
+        assertEquals(editingIndex, cell.getIndex(), "sanity: cell at editing index");
+        assertEquals(editingIndex, table.getEditingCell().getRow(), "sanity: table editingIndex must be unchanged");
+        assertEquals(editingColumn, table.getEditingCell().getTableColumn(), "sanity: table editingColumn must be unchanged");
+        assertTrue(cell.isEditing(), "cell must be editing on update from " + cellIndex + " to editingIndex " + editingIndex);
     }
 
-    @Test
-    public void testStartEvent() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testStartEvent(int cellIndex, int editingIndex) {
+        setup(cellIndex, editingIndex);
         cell.updateIndex(cellIndex);
         table.edit(editingIndex, editingColumn);
         List<CellEditEvent<String, String>> events = new ArrayList<>();
@@ -112,30 +109,20 @@ public void testStartEvent() {
             events.add(e);
         });
         cell.updateIndex(editingIndex);
-        assertEquals("cell must have fired edit start on update from " + cellIndex + " to " + editingIndex,
-                1, events.size());
-        assertEquals("start event index must be same as editingIndex", editingIndex,
-                events.get(0).getTablePosition().getRow());
+        assertEquals(1, events.size(), "cell must have fired edit start on update from " + cellIndex + " to " + editingIndex);
+        assertEquals(editingIndex, events.get(0).getTablePosition().getRow(), "start event index must be same as editingIndex");
     }
 
 //------------- parameterized
 
-    // Note: name property not supported before junit 4.11
-    @Parameterized.Parameters // (name = "{index}: cellIndex {0}, editingIndex {1}")
-    public static Collection<Object[]> data() {
-     // [0] is cellIndex, [1] is editingIndex
-        Object[][] data = new Object[][] {
-            {1, 2}, // normal
-            {0, 1}, // zero cell index
-            {1, 0}, // zero editing index
-            {-1, 1}, // negative cell - JDK-8265206
-        };
-        return Arrays.asList(data);
-    }
-
-    public TableCellEditingTest(int cellIndex, int editingIndex) {
-        this.cellIndex = cellIndex;
-        this.editingIndex = editingIndex;
+    private static Stream<Arguments> parameters() {
+        // [0] is cellIndex, [1] is editingIndex
+        return Stream.of(
+                Arguments.of(1, 2), // normal
+                Arguments.of(0, 1), // zero cell index
+                Arguments.of(1, 0), // zero editing index
+                Arguments.of(-1, 1) // negative cell - JDK-8265206
+        );
     }
 
 //-------------- setup and sanity
@@ -143,25 +130,30 @@ public TableCellEditingTest(int cellIndex, int editingIndex) {
     /**
      * Sanity: cell editing state updated when on editing index.
      */
-    @Test
-    public void testEditOnCellIndex() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testEditOnCellIndex(int cellIndex, int editingIndex) {
+        setup(cellIndex, editingIndex);
         cell.updateIndex(editingIndex);
         table.edit(editingIndex, editingColumn);
-        assertTrue("sanity: cell must be editing", cell.isEditing());
+        assertTrue(cell.isEditing(), "sanity: cell must be editing");
     }
 
     /**
      * Sanity: cell editing state unchanged when off editing index.
      */
-    @Test
-    public void testEditOffCellIndex() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testEditOffCellIndex(int cellIndex, int editingIndex) {
+        setup(cellIndex, editingIndex);
         cell.updateIndex(cellIndex);
         table.edit(editingIndex, editingColumn);
-        assertFalse("sanity: cell editing must be unchanged", cell.isEditing());
+        assertFalse(cell.isEditing(), "sanity: cell editing must be unchanged");
     }
 
-    @Before
-    public void setup() {
+    // @BeforeEach
+    // junit5 does not support parameterized class-level tests yet
+    public void setup(int cellIndex, int editingIndex) {
         cell = new TableCell<>();
         model = FXCollections.observableArrayList("Four", "Five", "Fear"); // "Flop", "Food", "Fizz"
         table = new TableView<>(model);
@@ -177,8 +169,7 @@ public void setup() {
         // if !cellSelectionEnabled nor if not in Tree/TableRow
         // done here for consistency across analogous tests for List/Tree/Cell
         table.getFocusModel().focus(-1);
-        assertFalse("sanity: cellIndex not same as editingIndex", cellIndex == editingIndex);
-        assertTrue("sanity: valid editingIndex", editingIndex < model.size());
+        assertFalse(cellIndex == editingIndex, "sanity: cellIndex not same as editingIndex");
+        assertTrue(editingIndex < model.size(), "sanity: valid editingIndex");
     }
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableCellTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableCellTest.java
index cd737b85787..65d8545b4a1 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableCellTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableCellTest.java
@@ -25,28 +25,25 @@
 
 package test.javafx.scene.control;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlSkinFactory.attemptGC;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
-
-import javafx.beans.property.SimpleStringProperty;
-import javafx.scene.control.IndexedCell;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.sun.javafx.tk.Toolkit;
-
-import static org.junit.Assert.*;
-import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.*;
-import static test.com.sun.javafx.scene.control.infrastructure.ControlSkinFactory.*;
-
 import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.scene.control.CellShim;
+import javafx.scene.control.IndexedCell;
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.TableCell;
 import javafx.scene.control.TableCellShim;
@@ -56,6 +53,10 @@
 import javafx.scene.control.TableRow;
 import javafx.scene.control.TableView;
 import javafx.scene.control.skin.TableCellSkin;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.tk.Toolkit;
 import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
 import test.com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils;
 
@@ -69,7 +70,8 @@ public class TableCellTest {
     private ObservableList<String> model;
     private StageLoader stageLoader;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         Thread.currentThread().setUncaughtExceptionHandler((thread, throwable) -> {
             if (throwable instanceof RuntimeException) {
                 throw (RuntimeException)throwable;
@@ -86,7 +88,7 @@ public class TableCellTest {
         row = new TableRow<>();
     }
 
-    @After
+    @AfterEach
     public void cleanup() {
         if (stageLoader != null) stageLoader.dispose();
         Thread.currentThread().setUncaughtExceptionHandler(null);
@@ -492,8 +494,8 @@ public void testEditCancelEventAfterCancelOnCell() {
         List<CellEditEvent<?, ?>> events = new ArrayList<>();
         editingColumn.setOnEditCancel(events::add);
         cell.cancelEdit();
-        assertEquals("column must have received editCancel", 1, events.size());
-        assertEquals("editing location of cancel event", editingPosition, events.get(0).getTablePosition());
+        assertEquals(1, events.size(), "column must have received editCancel");
+        assertEquals(editingPosition, events.get(0).getTablePosition(), "editing location of cancel event");
     }
 
     @Test
@@ -506,8 +508,8 @@ public void testEditCancelEventAfterCancelOnTable() {
         List<CellEditEvent<?, ?>> events = new ArrayList<>();
         editingColumn.setOnEditCancel(events::add);
         table.edit(-1, null);
-        assertEquals("column must have received editCancel", 1, events.size());
-        assertEquals("editing location of cancel event", editingPosition, events.get(0).getTablePosition());
+        assertEquals(1, events.size(), "column must have received editCancel");
+        assertEquals(editingPosition, events.get(0).getTablePosition(), "editing location of cancel event");
     }
 
     @Test
@@ -520,8 +522,8 @@ public void testEditCancelEventAfterCellReuse() {
         List<CellEditEvent<?, ?>> events = new ArrayList<>();
         editingColumn.setOnEditCancel(events::add);
         cell.updateIndex(0);
-        assertEquals("column must have received editCancel", 1, events.size());
-        assertEquals("editing location of cancel event", editingPosition, events.get(0).getTablePosition());
+        assertEquals(1, events.size(), "column must have received editCancel");
+        assertEquals(editingPosition, events.get(0).getTablePosition(), "editing location of cancel event");
     }
 
     @Test
@@ -535,8 +537,8 @@ public void testEditCancelEventAfterModifyItems() {
         editingColumn.setOnEditCancel(events::add);
         table.getItems().add(0, "added");
         Toolkit.getToolkit().firePulse();
-        assertEquals("column must have received editCancel", 1, events.size());
-        assertEquals("editing location of cancel event", editingPosition, events.get(0).getTablePosition());
+        assertEquals(1, events.size(), "column must have received editCancel");
+        assertEquals(editingPosition, events.get(0).getTablePosition(), "editing location of cancel event");
     }
 
     /**
@@ -554,9 +556,9 @@ public void testEditCancelEventAfterRemoveEditingItem() {
         editingColumn.setOnEditCancel(events::add);
         table.getItems().remove(editingIndex);
         Toolkit.getToolkit().firePulse();
-        assertNull("sanity: editing terminated on items modification", table.getEditingCell());
-        assertEquals("column must have received editCancel", 1, events.size());
-        assertEquals("editing location of cancel event", editingPosition, events.get(0).getTablePosition());
+        assertNull(table.getEditingCell(), "sanity: editing terminated on items modification");
+        assertEquals(1, events.size(), "column must have received editCancel");
+        assertEquals(editingPosition, events.get(0).getTablePosition(), "editing location of cancel event");
     }
 
     /**
@@ -579,7 +581,7 @@ public void testEditCancelMemoryLeakAfterRemoveEditingItem() {
         editingItem = null;
         Toolkit.getToolkit().firePulse();
         attemptGC(itemRef);
-        assertEquals("item must be gc'ed", null, itemRef.get());
+        assertEquals(null, itemRef.get(), "item must be gc'ed");
     }
 
     @Test
@@ -589,7 +591,7 @@ public void testEditStartFiresEvent() {
         List<CellEditEvent<?, ?>> events = new ArrayList<>();
         editingColumn.setOnEditStart(events::add);
         cell.startEdit();
-        assertEquals("startEdit must fire", 1, events.size());
+        assertEquals(1, events.size(), "startEdit must fire");
     }
 
     @Test
@@ -599,7 +601,7 @@ public void testEditStartOnCellUpdatesControl() {
         cell.updateIndex(editingRow);
         TablePosition<?, ?> editingCell = new TablePosition<>(table, editingRow, editingColumn);
         cell.startEdit();
-        assertEquals("table must be editing at", editingCell, table.getEditingCell());
+        assertEquals(editingCell, table.getEditingCell(), "table must be editing at");
     }
 
     @Test
@@ -611,7 +613,7 @@ public void testEditStartOnCellNoColumnUpdatesControl() {
         TablePosition<?, ?> editingCell = new TablePosition<>(table, editingRow, null);
         cell.startEdit();
         assertTrue(cell.isEditing());
-        assertEquals("table must be editing at", editingCell, table.getEditingCell());
+        assertEquals(editingCell, table.getEditingCell(), "table must be editing at");
     }
 
     @Test
@@ -622,7 +624,7 @@ public void testEditStartDoesNotFireEventWhileEditing() {
         List<CellEditEvent<?, ?>> events = new ArrayList<>();
         editingColumn.setOnEditStart(events::add);
         cell.startEdit();
-        assertEquals("startEdit must not fire while editing", 0, events.size());
+        assertEquals(0, events.size(), "startEdit must not fire while editing");
     }
 
     @Test
@@ -668,8 +670,8 @@ public void testCommitEditMustNotFireCancel() {
         editingColumn.setOnEditCancel(events::add);
         String value = "edited";
         cell.commitEdit(value);
-        assertEquals("sanity: value committed", value, table.getItems().get(editingRow));
-        assertEquals("commit must not have fired editCancel", 0, events.size());
+        assertEquals(value, table.getItems().get(editingRow), "sanity: value committed");
+        assertEquals(0, events.size(), "commit must not have fired editCancel");
     }
 
 
@@ -685,9 +687,8 @@ public void testEditCommitEvent() {
          List<CellEditEvent<?, ?>> events = new ArrayList<>();
          editingColumn.setOnEditCommit(events::add);
          cell.commitEdit("edited");
-         assertEquals("column must have received editCommit", 1, events.size());
-         assertEquals("editing location of commit event must be same as table's editingCell",
-                 editingPosition, events.get(0).getTablePosition());
+         assertEquals(1, events.size(), "column must have received editCommit");
+         assertEquals(editingPosition, events.get(0).getTablePosition(), "editing location of commit event must be same as table's editingCell");
      }
 
      @Test
@@ -700,9 +701,8 @@ public void testEditCommitEditingCellAtStartEdit() {
          List<CellEditEvent<?, ?>> events = new ArrayList<>();
          editingColumn.setOnEditCommit(events::add);
          cell.commitEdit("edited");
-         assertEquals("column must have received editCommit", 1, events.size());
-         assertEquals("editing location of commit event  must be same as editingCellAtStartEdit",
-                 editingCellAtStartEdit, events.get(0).getTablePosition());
+         assertEquals(1, events.size(), "column must have received editCommit");
+         assertEquals(editingCellAtStartEdit, events.get(0).getTablePosition(), "editing location of commit event  must be same as editingCellAtStartEdit");
      }
 
      @Test
@@ -713,9 +713,8 @@ public void testEditCommitEventNullTable() {
          List<CellEditEvent<?, ?>> events = new ArrayList<>();
          editingColumn.addEventHandler(TableColumn.editAnyEvent(), events::add);
          cell.commitEdit("edited");
-         assertEquals("column must have received editCommit", 1, events.size());
-         assertEquals("editing location of commit event must be same as editingCellAtStartEdit",
-                 editingCellAtStartEdit, events.get(0).getTablePosition());
+         assertEquals(1, events.size(), "column must have received editCommit");
+         assertEquals(editingCellAtStartEdit, events.get(0).getTablePosition(), "editing location of commit event must be same as editingCellAtStartEdit");
      }
 
 // --- JDK-8271474: implement consistent event firing pattern
@@ -802,8 +801,8 @@ public void testStartEditOffRangeMustNotFireStartEdit() {
          List<CellEditEvent<?, ?>> events = new ArrayList<>();
          editingColumn.addEventHandler(TableColumn.editStartEvent(), events::add);
          cell.startEdit();
-         assertFalse("sanity: off-range cell must not be editing", cell.isEditing());
-         assertEquals("must not fire editStart", 0, events.size());
+         assertFalse(cell.isEditing(), "sanity: off-range cell must not be editing");
+         assertEquals(0, events.size(), "must not fire editStart");
      }
 
      @Test
@@ -812,8 +811,8 @@ public void testStartEditOffRangeMustNotUpdateEditingLocation() {
          int editingRow = table.getItems().size();
          cell.updateIndex(editingRow);
          cell.startEdit();
-         assertFalse("sanity: off-range cell must not be editing", cell.isEditing());
-         assertNull("table editing location must not be updated", table.getEditingCell());
+         assertFalse(cell.isEditing(), "sanity: off-range cell must not be editing");
+         assertNull(table.getEditingCell(), "table editing location must not be updated");
      }
 
  //--------- test the test setup
@@ -882,26 +881,26 @@ public void testMisbehavingCancelEditTerminatesEdit() {
         int intermediate = 0;
         cell.updateIndex(editingIndex);
         table.edit(editingIndex, editingColumn);
-        assertTrue("sanity: ", cell.isEditing());
+        assertTrue(cell.isEditing(), "sanity: ");
         try {
             table.edit(intermediate, editingColumn);
         } catch (Exception ex) {
             // just catching to test in finally
         } finally {
-            assertFalse("cell must not be editing", cell.isEditing());
-            assertEquals("table must be editing at intermediate index", intermediate, table.getEditingCell().getRow());
+            assertFalse(cell.isEditing(), "cell must not be editing");
+            assertEquals(intermediate, table.getEditingCell().getRow(), "table must be editing at intermediate index");
         }
         // test editing: second round
         // switch cell off editing by cell api
         table.edit(editingIndex, editingColumn);
-        assertTrue("sanity: ", cell.isEditing());
+        assertTrue(cell.isEditing(), "sanity: ");
         try {
             cell.cancelEdit();
         } catch (Exception ex) {
             // just catching to test in finally
         } finally {
-            assertFalse("cell must not be editing", cell.isEditing());
-            assertNull("table editing must be cancelled by cell", table.getEditingCell());
+            assertFalse(cell.isEditing(), "cell must not be editing");
+            assertNull(table.getEditingCell(), "table editing must be cancelled by cell");
         }
     }
 
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableColumnTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableColumnTest.java
index 576081bbc95..6336ddd7d94 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableColumnTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableColumnTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,16 @@
 
 package test.javafx.scene.control;
 
-import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
-import test.com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils;
-import javafx.scene.control.skin.TableColumnHeader;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.ObjectProperty;
@@ -42,13 +49,6 @@
 import javafx.event.EventHandler;
 import javafx.event.EventType;
 import javafx.scene.Node;
-import javafx.scene.shape.Rectangle;
-import javafx.util.Callback;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
 import javafx.scene.control.CellShim;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.TableCell;
@@ -56,12 +56,14 @@
 import javafx.scene.control.TableColumnShim;
 import javafx.scene.control.TablePosition;
 import javafx.scene.control.TableView;
-
+import javafx.scene.control.skin.TableColumnHeader;
+import javafx.scene.shape.Rectangle;
+import javafx.util.Callback;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
+import test.com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils;
 import test.com.sun.javafx.scene.control.test.Person;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
 
 /**
  */
@@ -74,7 +76,8 @@ public class TableColumnTest {
     private TableView<Person> table;
     private ObservableList<Person> model;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         column = new TableColumn<>("");
         model = FXCollections.observableArrayList(
                 new Person("Humphrey McPhee", 76),
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TablePositionBaseTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TablePositionBaseTest.java
index 4d779f735e8..74db6e92214 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TablePositionBaseTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TablePositionBaseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,11 @@
 
 package test.javafx.scene.control;
 
-import org.junit.Test;
-
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TablePosition;
 import javafx.scene.control.TreeTableColumn;
 import javafx.scene.control.TreeTablePosition;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test Tree/TablePosition.
@@ -56,5 +55,4 @@ public void testNullTable() {
     public void testNullTreeTable() {
         new TreeTablePosition<>(null, 2, new TreeTableColumn<>());
     }
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableViewHorizontalArrowsTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableViewHorizontalArrowsTest.java
index d9c257bdd63..15ac725653f 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableViewHorizontalArrowsTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableViewHorizontalArrowsTest.java
@@ -25,43 +25,37 @@
 
 package test.javafx.scene.control;
 
-import java.util.Arrays;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static test.com.sun.javafx.scene.control.infrastructure.KeyModifier.getShortcutKey;
 import java.util.Collection;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import static org.junit.Assert.*;
-import static test.com.sun.javafx.scene.control.infrastructure.KeyModifier.*;
-
-import com.sun.javafx.util.Utils;
+import java.util.List;
 import javafx.geometry.NodeOrientation;
-import javafx.scene.input.KeyCode;
 import javafx.scene.control.SelectionMode;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TablePosition;
 import javafx.scene.control.TableView;
+import javafx.scene.input.KeyCode;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import com.sun.javafx.util.Utils;
 import test.com.sun.javafx.scene.control.behavior.TableViewAnchorRetriever;
 import test.com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
 import test.com.sun.javafx.scene.control.infrastructure.KeyModifier;
 import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
 
-
 /**
  * Test basic horizontal navigation mappings for TableView.
  * It is parameterized on NodeOrientation
  */
-@RunWith(Parameterized.class)
 public class TableViewHorizontalArrowsTest {
-    @Parameterized.Parameters
-    public static Collection<?> implementations() {
-        return Arrays.asList(new Object[][] {
-            {NodeOrientation.LEFT_TO_RIGHT},
-            {NodeOrientation.RIGHT_TO_LEFT}
-        });
+    private static Collection<NodeOrientation> parameters() {
+        return List.of(
+            NodeOrientation.LEFT_TO_RIGHT,
+            NodeOrientation.RIGHT_TO_LEFT
+        );
     }
 
     private TableView<String> tableView;
@@ -78,12 +72,10 @@ public static Collection<?> implementations() {
     private StageLoader stageLoader;
     private NodeOrientation orientation;
 
-    public TableViewHorizontalArrowsTest(NodeOrientation val) {
-        orientation = val;
-    }
-
-    @Before
-    public void setup() {
+    // @BeforeEach
+    // junit5 does not support parameterized class-level tests yet
+    public void setup(NodeOrientation orientation) {
+        this.orientation = orientation;
         tableView = new TableView<>();
         tableView.setNodeOrientation(orientation);
         sm = tableView.getSelectionModel();
@@ -107,7 +99,7 @@ public void setup() {
         stageLoader.getStage().show();
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         tableView.getSkin().dispose();
         stageLoader.dispose();
@@ -119,8 +111,7 @@ public void tearDown() {
      * sets the tableView's orientation to the new toggled value
      */
     private void toggleNodeOrientation() {
-        orientation = (orientation == NodeOrientation.LEFT_TO_RIGHT?
-            NodeOrientation.RIGHT_TO_LEFT : NodeOrientation.LEFT_TO_RIGHT);
+        orientation = (orientation == NodeOrientation.LEFT_TO_RIGHT ? NodeOrientation.RIGHT_TO_LEFT : NodeOrientation.LEFT_TO_RIGHT);
         tableView.setNodeOrientation(orientation);
     }
 
@@ -165,44 +156,54 @@ private boolean isAnchor(int row, int col) {
 
     // ----------------------- Tests ----------------------------
 
-    @Test
-    public void testForwardSelect() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testForwardSelect(NodeOrientation orientation) {
+        setup(orientation);
         sm.select(0, col0);
         forward();
-        assertTrue("next cell must be selected", sm.isSelected(0, col1));
-        assertFalse("old cell not be selected", sm.isSelected(0, col0));
+        assertTrue(sm.isSelected(0, col1), "next cell must be selected");
+        assertFalse(sm.isSelected(0, col0), "old cell not be selected");
     }
 
-    @Test
-    public void testBackwardSelect() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testBackwardSelect(NodeOrientation orientation) {
+        setup(orientation);
         sm.select(0, col4);
         backward();
-        assertTrue("next cell must be selected", sm.isSelected(0, col3));
-        assertFalse("old cell not be selected", sm.isSelected(0, col4));
+        assertTrue(sm.isSelected(0, col3), "next cell must be selected");
+        assertFalse(sm.isSelected(0, col4), "old cell not be selected");
     }
 
-    @Test
-    public void testForwardFocus() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testForwardFocus(NodeOrientation orientation) {
+        setup(orientation);
         sm.select(0, col0);
         forward(getShortcutKey());
-        assertTrue("selected cell must still be selected", sm.isSelected(0, col0));
-        assertFalse("next cell must not be selected", sm.isSelected(0, col1));
+        assertTrue(sm.isSelected(0, col0), "selected cell must still be selected");
+        assertFalse(sm.isSelected(0, col1), "next cell must not be selected");
         TablePosition<?, ?> focusedCell = fm.getFocusedCell();
-        assertEquals("focused cell must moved to next", col1, focusedCell.getTableColumn());
+        assertEquals(col1, focusedCell.getTableColumn(), "focused cell must moved to next");
     }
 
-    @Test
-    public void testBackwardFocus() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testBackwardFocus(NodeOrientation orientation) {
+        setup(orientation);
         sm.select(0, col4);
         backward(getShortcutKey());
-        assertTrue("selected cell must still be selected", sm.isSelected(0, col4));
-        assertFalse("previous cell must not be selected", sm.isSelected(0, col3));
+        assertTrue(sm.isSelected(0, col4), "selected cell must still be selected");
+        assertFalse(sm.isSelected(0, col3), "previous cell must not be selected");
         TablePosition<?, ?> focusedCell = fm.getFocusedCell();
-        assertEquals("focused cell must moved to prev", col3, focusedCell.getTableColumn());
+        assertEquals(col3, focusedCell.getTableColumn(), "focused cell must moved to prev");
     }
 
-    @Test
-    public void testChangeOrientationSimpleForwardSelect() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testChangeOrientationSimpleForwardSelect(NodeOrientation orientation) {
+        setup(orientation);
         sm.select(0, col0);
         forward();
         assertTrue(sm.isSelected(0, col1));
@@ -217,8 +218,10 @@ public void testChangeOrientationSimpleForwardSelect() {
         assertTrue(sm.isSelected(0, col2));
     }
 
-    @Test
-    public void testChangeOrientationSimpleBackwardSelect() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testChangeOrientationSimpleBackwardSelect(NodeOrientation orientation) {
+        setup(orientation);
         sm.select(0, col4);
         backward();
         assertTrue(sm.isSelected(0, col3));
@@ -232,64 +235,85 @@ public void testChangeOrientationSimpleBackwardSelect() {
         assertTrue(sm.isSelected(0, col2));
     }
 
-    @Test public void testShiftBackwardWhenAtFirstCol() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testShiftBackwardWhenAtFirstCol(NodeOrientation orientation) {
+        setup(orientation);
         sm.select(0, col0);
         backward(KeyModifier.SHIFT);
 
-        assertTrue("Selected cell remains selected", sm.isSelected(0, col0));
+        assertTrue(sm.isSelected(0, col0), "Selected cell remains selected");
 
         // We are at the first colum, there is no backward cell
-        assertFalse("sanity - forward cell must not be selected", sm.isSelected(0, col1));
+        assertFalse(sm.isSelected(0, col1), "sanity - forward cell must not be selected");
     }
 
-    @Test public void testShiftForwardWhenAtFirstCol() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testShiftForwardWhenAtFirstCol(NodeOrientation orientation) {
+        setup(orientation);
         sm.select(0, col0);
         forward(KeyModifier.SHIFT);
 
-        assertTrue("Selected cell remains selected", sm.isSelected(0, col0));
-        assertTrue("forward cell must also be selected", sm.isSelected(0, col1));
+        assertTrue(sm.isSelected(0, col0), "Selected cell remains selected");
+        assertTrue(sm.isSelected(0, col1), "forward cell must also be selected");
     }
 
-    @Test public void testShiftBackwardWhenAtLastCol() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testShiftBackwardWhenAtLastCol(NodeOrientation orientation) {
+        setup(orientation);
         sm.select(0, col4);
         backward(KeyModifier.SHIFT);
-        assertTrue("Selected cell remains selected", sm.isSelected(0, col4));
-        assertTrue("backward cell must also be selected", sm.isSelected(0, col3));
+        assertTrue(sm.isSelected(0, col4), "Selected cell remains selected");
+        assertTrue(sm.isSelected(0, col3), "backward cell must also be selected");
     }
 
-    @Test public void testShiftForwardWhenAtLastCol() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testShiftForwardWhenAtLastCol(NodeOrientation orientation) {
+        setup(orientation);
         sm.select(0, col4);
         forward(KeyModifier.SHIFT);
-        assertTrue("Selected cell remains selected", sm.isSelected(0, col4));
+        assertTrue(sm.isSelected(0, col4), "Selected cell remains selected");
 
         // We are at the last colum, there is no forward cell
-        assertFalse("sanity - backward cell must not be selected", sm.isSelected(0, col3));
+        assertFalse(sm.isSelected(0, col3), "sanity - backward cell must not be selected");
     }
 
-    @Test public void testCtrlBackwardDoesNotMoveRowFocus() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testCtrlBackwardDoesNotMoveRowFocus(NodeOrientation orientation) {
+        setup(orientation);
         // Select first row
         sm.clearAndSelect(0);
         assertTrue(fm.isFocused(0));
 
         backward(KeyModifier.getShortcutKey());
 
-        assertTrue("Focus should not change", fm.isFocused(0));
-        assertTrue("Selection should not change", sm.isSelected(0));
+        assertTrue(fm.isFocused(0), "Focus should not change");
+        assertTrue(sm.isSelected(0), "Selection should not change");
     }
 
-    @Test public void testCtrlForwardDoesNotMoveRowFocus() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testCtrlForwardDoesNotMoveRowFocus(NodeOrientation orientation) {
+        setup(orientation);
         // Select first row
         sm.clearAndSelect(0);
         assertTrue(fm.isFocused(0));
 
         forward(KeyModifier.getShortcutKey());
 
-        assertTrue("Focus should not change", fm.isFocused(0));
-        assertTrue("Selection should not change", sm.isSelected(0));
+        assertTrue(fm.isFocused(0), "Focus should not change");
+        assertTrue(sm.isSelected(0), "Selection should not change");
     }
 
     // Tests for discontinuous multiple cell selection (RT-18951)
-    @Test public void test_rt18591_select_forward_then_backward() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void test_rt18591_select_forward_then_backward(NodeOrientation orientation) {
+        setup(orientation);
         sm.select(0, col0);
 
         forward(KeyModifier.getShortcutKey());
@@ -312,7 +336,6 @@ public void testChangeOrientationSimpleBackwardSelect() {
         assertTrue(sm.isSelected(0, col4));
         assertTrue(isAnchor(0,2));
 
-
         backward(KeyModifier.SHIFT, KeyModifier.getShortcutKey());
         backward(KeyModifier.SHIFT, KeyModifier.getShortcutKey());
         backward(KeyModifier.SHIFT, KeyModifier.getShortcutKey());
@@ -324,7 +347,10 @@ public void testChangeOrientationSimpleBackwardSelect() {
         assertTrue(sm.isSelected(0, col4));
     }
 
-    @Test public void test_rt18591_select_backward_then_forward() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void test_rt18591_select_backward_then_forward(NodeOrientation orientation) {
+        setup(orientation);
         sm.select(0, col4);
 
         backward(KeyModifier.getShortcutKey());
@@ -359,7 +385,10 @@ public void testChangeOrientationSimpleBackwardSelect() {
         assertTrue(sm.isSelected(0, col0));
     }
 
-    @Test public void test_rt18536_forward_focus_and_selectAll() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void test_rt18536_forward_focus_and_selectAll(NodeOrientation orientation) {
+        setup(orientation);
         // Test shift selection when focus is elsewhere (so as to select a range)
         sm.clearAndSelect(1, col0);
 
@@ -379,7 +408,10 @@ public void testChangeOrientationSimpleBackwardSelect() {
         assertTrue(sm.isSelected(1, col4));
     }
 
-    @Test public void test_rt18536_backward_focus_and_selectAll() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void test_rt18536_backward_focus_and_selectAll(NodeOrientation orientation) {
+        setup(orientation);
         // Test shift selection when focus is elsewhere (so as to select a range)
         sm.clearAndSelect(1, col4);
 
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableViewKeyInputTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableViewKeyInputTest.java
index 64b5911b5d2..08d6c8701da 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableViewKeyInputTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableViewKeyInputTest.java
@@ -25,12 +25,12 @@
 
 package test.javafx.scene.control;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.List;
 import java.util.function.Function;
 import javafx.beans.property.ReadOnlyStringWrapper;
@@ -50,9 +50,9 @@
 import javafx.scene.control.TableView;
 import javafx.scene.input.KeyCode;
 import javafx.scene.layout.HBox;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import com.sun.javafx.PlatformUtil;
 import com.sun.javafx.scene.control.behavior.TableCellBehavior;
 import com.sun.javafx.tk.Toolkit;
@@ -80,7 +80,8 @@ public class TableViewKeyInputTest {
     private TableColumn<String, String> col3;
     private TableColumn<String, String> col4;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         tableView = new TableView<>();
         sm = tableView.getSelectionModel();
         fm = tableView.getFocusModel();
@@ -103,7 +104,8 @@ public class TableViewKeyInputTest {
         stageLoader.getStage().show();
     }
 
-    @After public void tearDown() {
+    @AfterEach
+    public void tearDown() {
         tableView.getSkin().dispose();
         stageLoader.dispose();
     }
@@ -415,7 +417,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         keyboard.doDownArrowPress(KeyModifier.SHIFT);
         keyboard.doDownArrowPress(KeyModifier.SHIFT);
         keyboard.doUpArrowPress(KeyModifier.SHIFT);
-        assertTrue(debug(), sm.isSelected(0));
+        assertTrue(sm.isSelected(0), debug());
         assertTrue(sm.isSelected(1));
         assertFalse(sm.isSelected(2));
     }
@@ -455,7 +457,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         keyboard.doUpArrowPress(KeyModifier.SHIFT);     // also select 1
         keyboard.doUpArrowPress(KeyModifier.SHIFT);     // also select 0
         keyboard.doDownArrowPress(KeyModifier.SHIFT);   // deselect 0
-        assertFalse(debug(), sm.isSelected(0));
+        assertFalse(sm.isSelected(0), debug());
         assertTrue(sm.isSelected(1));
         assertTrue(sm.isSelected(2));
         assertFalse(sm.isSelected(3));
@@ -568,7 +570,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         keyboard.doKeyPress(KeyCode.SPACE, KeyModifier.SHIFT);  // select 0,1,2
         assertTrue(isSelected(0, 1, 2));
         assertTrue(isNotSelected(3));
-        assertTrue(debug(), isAnchor(2));
+        assertTrue(isAnchor(2), debug());
     }
 
     // test 33
@@ -608,7 +610,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         keyboard.doKeyPress(KeyCode.SPACE, KeyModifier.SHIFT);  // select 0,1,2
         assertTrue(isSelected(0, 1, 2));
         assertTrue(isNotSelected(3, 4));
-        assertTrue(debug(), isAnchor(2));
+        assertTrue(isAnchor(2), debug());
     }
 
     // test 35
@@ -731,7 +733,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         keyboard.doKeyPress(KeyCode.HOME, KeyModifier.SHIFT);
         assertTrue(isSelected(0,1,2));
         assertTrue(isNotSelected(3,4));
-        assertTrue(debug(),isAnchor(2));
+        assertTrue(isAnchor(2), debug());
     }
 
     // test 51
@@ -751,7 +753,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         keyboard.doKeyPress(KeyCode.END, KeyModifier.SHIFT);
         assertTrue(isSelected(3,4,5,6,7,8,9));
         assertTrue(isNotSelected(0,1,2));
-        assertTrue(debug(),isAnchor(3));
+        assertTrue(isAnchor(3), debug());
     }
 
     // test 42
@@ -798,7 +800,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         keyboard.doKeyPress(KeyCode.HOME, KeyModifier.SHIFT);
         assertTrue(isSelected(0,1,2,3));
         assertTrue(isNotSelected(4,5));
-        assertTrue(debug(), isAnchor(3));
+        assertTrue(isAnchor(3), debug());
     }
 
     // test 49
@@ -807,7 +809,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         keyboard.doKeyPress(KeyCode.END, KeyModifier.SHIFT);
         assertTrue(isSelected(3,4,5,6,7,8,9));
         assertTrue(isNotSelected(0,1,2));
-        assertTrue(debug(), isAnchor(3));
+        assertTrue(isAnchor(3), debug());
     }
 
     // test 52
@@ -836,7 +838,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         keyboard.doDownArrowPress(KeyModifier.getShortcutKey());
         keyboard.doDownArrowPress(KeyModifier.getShortcutKey());
         keyboard.doKeyPress(KeyCode.PAGE_UP, KeyModifier.SHIFT);
-        assertTrue(debug(), isSelected(0,1,2));
+        assertTrue(isSelected(0,1,2), debug());
         assertTrue(isAnchor(2));
     }
 
@@ -1110,11 +1112,11 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         keyboard.doKeyPress(KeyCode.SPACE,
                 KeyModifier.getShortcutKey(),
                 (Utils.isMac() ? KeyModifier.CTRL : null));
-        assertTrue(debug(), isSelected(8,10));
+        assertTrue(isSelected(8,10), debug());
         assertTrue(isAnchor(8));
 
         keyboard.doKeyPress(KeyCode.PAGE_UP, KeyModifier.SHIFT, KeyModifier.getShortcutKey());
-        assertTrue(debug(), isSelected(0,1,2,3,4,5,6,7,8,10));
+        assertTrue(isSelected(0,1,2,3,4,5,6,7,8,10), debug());
         assertTrue(isAnchor(8));
     }
 
@@ -1465,7 +1467,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         keyboard.doKeyPress(KeyCode.END, KeyModifier.SHIFT, KeyModifier.getShortcutKey());
         assertTrue(sm.isSelected(0,col1));
         for (int i = 2; i < tableView.getItems().size(); i++) {
-            assertTrue(debug(),sm.isSelected(i,col1));
+            assertTrue(sm.isSelected(i,col1), debug());
         }
         assertTrue(isAnchor(2,1));
     }
@@ -1498,13 +1500,13 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         sm.setSelectionMode(SelectionMode.MULTIPLE);
         sm.setCellSelectionEnabled(true);
         sm.select(5, col1);
-        assertTrue(debug(), isAnchor(5,1));
+        assertTrue(isAnchor(5,1), debug());
 
         keyboard.doKeyPress(KeyCode.HOME, KeyModifier.SHIFT, KeyModifier.getShortcutKey());
         for (int i = 0; i <= 5; i++) {
             assertTrue(sm.isSelected(i,col1));
         }
-        assertTrue(debug(), isAnchor(5,1));
+        assertTrue(isAnchor(5,1), debug());
 
         keyboard.doKeyPress(KeyCode.END, KeyModifier.SHIFT, KeyModifier.getShortcutKey());
         for (int i = 0; i < tableView.getItems().size() - 1; i++) {
@@ -1611,7 +1613,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         assertTrue(sm.isSelected(1, col4));
         assertTrue(sm.isSelected(1, col3));
         assertTrue(sm.isSelected(1, col2));
-        assertTrue(debug(), sm.isSelected(1, col1));
+        assertTrue(sm.isSelected(1, col1), debug());
         assertFalse(sm.isSelected(1, col0));
     }
 
@@ -1678,7 +1680,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         // press shift + space to select all cells between (1, col1) and (1, col5)
         keyboard.doKeyPress(KeyCode.SPACE, KeyModifier.SHIFT);
         assertTrue(sm.isSelected(1, col4));
-        assertTrue(debug(), sm.isSelected(1, col3));
+        assertTrue(sm.isSelected(1, col3), debug());
         assertTrue(sm.isSelected(1, col2));
         assertTrue(sm.isSelected(1, col1));
         assertTrue(sm.isSelected(1, col0));
@@ -1698,7 +1700,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
 
         // press shift + space to select all cells between (1, col1) and (1, col5)
         keyboard.doKeyPress(KeyCode.SPACE, KeyModifier.SHIFT);
-        assertTrue(debug(), sm.isSelected(1, col4));
+        assertTrue(sm.isSelected(1, col4), debug());
         assertTrue(sm.isSelected(1, col3));
         assertTrue(sm.isSelected(1, col2));
         assertTrue(sm.isSelected(1, col1));
@@ -1786,7 +1788,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
 
         keyboard.doKeyPress(KeyCode.HOME, KeyModifier.SHIFT);
         assertTrue(isSelected(0,1,2,3,4,5));
-        assertTrue(debug(), isNotSelected(6,7,8,9));
+        assertTrue(isNotSelected(6,7,8,9), debug());
     }
 
     @Test public void test_rt14451_2() {
@@ -1798,7 +1800,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
 
         keyboard.doKeyPress(KeyCode.HOME, KeyModifier.SHIFT);
         assertTrue(isSelected(0,1,2,3,4,5));
-        assertTrue(debug(), isNotSelected(6,7,8,9));
+        assertTrue(isNotSelected(6,7,8,9), debug());
 
         keyboard.doKeyPress(KeyCode.END, KeyModifier.SHIFT);
         assertTrue(isNotSelected(0,1,2,3,4));
@@ -1814,13 +1816,13 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
     @Test public void test_rt26835_2() {
         sm.clearAndSelect(5);
         keyboard.doKeyPress(KeyCode.END, KeyModifier.getShortcutKey());
-        assertTrue(debug(), fm.isFocused(tableView.getItems().size() - 1));
+        assertTrue(fm.isFocused(tableView.getItems().size() - 1), debug());
     }
 
     @Test public void test_rt27175() {
         sm.clearAndSelect(5);
         keyboard.doKeyPress(KeyCode.HOME, KeyModifier.SHIFT, KeyModifier.getShortcutKey());
-        assertTrue(debug(), fm.isFocused(0));
+        assertTrue(fm.isFocused(0), debug());
         assertTrue(isSelected(0,1,2,3,4,5));
     }
 
@@ -1854,7 +1856,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         keyboard.doUpArrowPress(KeyModifier.SHIFT);
         assertTrue(fm.isFocused(0, col0));
         keyboard.doUpArrowPress(KeyModifier.SHIFT);
-        assertTrue(debug(), fm.isFocused(0, col0));
+        assertTrue(fm.isFocused(0, col0), debug());
 
     }
 
@@ -1871,7 +1873,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         keyboard.doDownArrowPress(KeyModifier.SHIFT);
         assertTrue(fm.isFocused(11, col0));
         keyboard.doDownArrowPress(KeyModifier.SHIFT);
-        assertTrue(debug(), fm.isFocused(11, col0));
+        assertTrue(fm.isFocused(11, col0), debug());
     }
 
     @Test public void test_rt27583_rowSelection_1() {
@@ -1887,7 +1889,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         keyboard.doUpArrowPress(KeyModifier.SHIFT);
         assertTrue(fm.isFocused(0));
         keyboard.doUpArrowPress(KeyModifier.SHIFT);
-        assertTrue(debug(), fm.isFocused(0));
+        assertTrue(fm.isFocused(0), debug());
 
     }
 
@@ -1904,7 +1906,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         keyboard.doDownArrowPress(KeyModifier.SHIFT);
         assertTrue(fm.isFocused(11));
         keyboard.doDownArrowPress(KeyModifier.SHIFT);
-        assertTrue(debug(), fm.isFocused(11));
+        assertTrue(fm.isFocused(11), debug());
     }
 
     @Test public void test_rt29833_keyboard_select_upwards() {
@@ -2188,7 +2190,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         keyboard.doKeyPress(KeyCode.PAGE_DOWN, KeyModifier.SHIFT);
         Toolkit.getToolkit().firePulse();
         final Object newSelectionOwner = sm.getSelectedItem();
-        assertNotSame(initialSelectionOwner + " == " + newSelectionOwner, initialSelectionOwner, newSelectionOwner);
+        assertNotSame(initialSelectionOwner, newSelectionOwner, initialSelectionOwner + " == " + newSelectionOwner);
 
         // selection should go all the way to the top, but this bug
         // shows that instead it seems to stop midway - where the anchor is
@@ -2464,7 +2466,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         assertTrue(isNotSelected(0,1));
         assertTrue(isSelected(2,3,4));
         assertEquals(3, sm.getSelectedItems().size());
-        assertTrue("Focus index incorrectly at: " + fm.getFocusedIndex(), fm.isFocused(4));
+        assertTrue(fm.isFocused(4), "Focus index incorrectly at: " + fm.getFocusedIndex());
     }
 
     @Test public void test_rt33301_multipleSelection_up() {
@@ -2702,7 +2704,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
 
         keyboard.doKeyPress(KeyCode.SPACE);
         Toolkit.getToolkit().firePulse();
-        assertEquals(debug(), 2, getAnchor().getRow());
+        assertEquals(2, getAnchor().getRow(), debug());
         assertEquals(2, fm.getFocusedIndex());
         assertEquals(2, sm.getSelectedIndex());
         assertTrue(isSelected(1, 2));
@@ -4219,7 +4221,7 @@ private void test_rt_18440(KeyCode direction, int startColumn, boolean goToEnd,
         expectedColumn = direction == KeyCode.RIGHT ? 3 : 0;
         keyboard.doKeyPress(direction, KeyModifier.SHIFT);
         assertEquals(0, sm.getSelectedIndex());
-        assertEquals(debug(), 4, sm.getSelectedCells().size());
+        assertEquals(4, sm.getSelectedCells().size(), debug());
         assertEquals(0, fm.getFocusedIndex());
         assertEquals(tableView.getColumns().get(expectedColumn), fm.getFocusedCell().getTableColumn());
 
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableViewMouseInputTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableViewMouseInputTest.java
index af2d66f8774..9eeb5ab31db 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableViewMouseInputTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableViewMouseInputTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,14 @@
 
 package test.javafx.scene.control;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
-
-import test.com.sun.javafx.scene.control.test.Person;
-import com.sun.javafx.tk.Toolkit;
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
@@ -51,19 +53,17 @@
 import javafx.scene.control.TableView;
 import javafx.scene.control.cell.PropertyValueFactory;
 import javafx.scene.layout.VBox;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.tk.Toolkit;
 import test.com.sun.javafx.scene.control.behavior.TableViewAnchorRetriever;
 import test.com.sun.javafx.scene.control.infrastructure.KeyModifier;
 import test.com.sun.javafx.scene.control.infrastructure.MouseEventFirer;
 import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
 import test.com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils;
+import test.com.sun.javafx.scene.control.test.Person;
 
-import static org.junit.Assert.*;
-
-//@Ignore("Disabling tests as they fail with OOM in continuous builds")
 public class TableViewMouseInputTest {
     private TableView<String> tableView;
     private TableView.TableViewSelectionModel<String> sm;
@@ -75,7 +75,8 @@ public class TableViewMouseInputTest {
     private final TableColumn<String, String> col3 = new TableColumn<>("col3");
     private final TableColumn<String, String> col4 = new TableColumn<>("col4");
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         tableView = new TableView<>();
         sm = tableView.getSelectionModel();
         fm = tableView.getFocusModel();
@@ -89,7 +90,8 @@ public class TableViewMouseInputTest {
         sm.clearAndSelect(0);
     }
 
-    @After public void tearDown() {
+    @AfterEach
+    public void tearDown() {
         if (tableView.getSkin() != null) {
             tableView.getSkin().dispose();
         }
@@ -159,11 +161,11 @@ private boolean isAnchor(int row, int col) {
 
         // select all from 9 - 7
         VirtualFlowTestUtils.clickOnRow(tableView, 7, KeyModifier.SHIFT);
-        assertTrue(debug(), isSelected(7,8,9));
+        assertTrue(isSelected(7,8,9), debug());
 
         // select all from 9 - 7 - 5
         VirtualFlowTestUtils.clickOnRow(tableView, 5, KeyModifier.SHIFT);
-        assertTrue(debug(),isSelected(5,6,7,8,9));
+        assertTrue(isSelected(5,6,7,8,9), debug());
     }
 
     @Test public void test_rt29833_mouse_select_downwards() {
@@ -174,11 +176,11 @@ private boolean isAnchor(int row, int col) {
 
         // select all from 5 - 7
         VirtualFlowTestUtils.clickOnRow(tableView, 7, KeyModifier.SHIFT);
-        assertTrue(debug(), isSelected(5,6,7));
+        assertTrue(isSelected(5,6,7), debug());
 
         // select all from 5 - 7 - 9
         VirtualFlowTestUtils.clickOnRow(tableView, 9, KeyModifier.SHIFT);
-        assertTrue(debug(),isSelected(5,6,7,8,9));
+        assertTrue(isSelected(5,6,7,8,9), debug());
     }
 
     private int rt30394_count = 0;
@@ -663,7 +665,7 @@ private void test_rt_38306(boolean selectTwoRows) {
                     continue;
                 }
                 TableCell cell = (TableCell) VirtualFlowTestUtils.getCell(table, row, column);
-                assertFalse("cell[row: " + row + ", column: " + column + "] is selected, but shouldn't be", cell.isSelected());
+                assertFalse(cell.isSelected(), "cell[row: " + row + ", column: " + column + "] is selected, but shouldn't be");
             }
             TableRow cell = (TableRow) VirtualFlowTestUtils.getCell(table, row);
             assertTrue(cell.isSelected());
@@ -831,7 +833,7 @@ private void test_rt_38464_selectedColumnChangesWhenCellsInRowClicked(boolean ce
             assertEquals(1, sm.getSelectedCells().size());
             TablePosition<?,?> cell = sm.getSelectedCells().get(0);
             assertEquals(0, cell.getRow());
-            assertEquals("Expected Last Name column, but got " + cell.getTableColumn().getText(), lastNameCol, cell.getTableColumn());
+            assertEquals(lastNameCol, cell.getTableColumn(), "Expected Last Name column, but got " + cell.getTableColumn().getText());
         }
     }
 
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableViewResizeTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableViewResizeTest.java
index ddcb370343e..c782617f8d4 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableViewResizeTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableViewResizeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
  */
 package test.javafx.scene.control;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import java.util.List;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.scene.control.ConstrainedColumnResizeBase;
@@ -34,8 +34,7 @@
 import javafx.scene.control.TableView;
 import javafx.scene.layout.BorderPane;
 import javafx.util.Callback;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import com.sun.javafx.tk.Toolkit;
 import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
 
@@ -249,7 +248,7 @@ public void testConstrainedResizeOfEmptyTable() {
                 t.setPrefWidth(300);
                 Toolkit.getToolkit().firePulse();
                 checkInvariants(t);
-                Assert.assertEquals(t.getWidth(), sumColumnWidths(t.getColumns()), tolerance);
+                assertEquals(t.getWidth(), sumColumnWidths(t.getColumns()), tolerance);
 
                 // clear items
                 t.getItems().clear();
@@ -258,7 +257,7 @@ public void testConstrainedResizeOfEmptyTable() {
                 t.setPrefWidth(1000);
                 Toolkit.getToolkit().firePulse();
                 checkInvariants(t);
-                Assert.assertEquals(t.getWidth(), sumColumnWidths(t.getColumns()), tolerance);
+                assertEquals(t.getWidth(), sumColumnWidths(t.getColumns()), tolerance);
             }
         } finally {
             stageLoader.dispose();
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableViewRowTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableViewRowTest.java
index 78c651d4554..b5d28786a39 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableViewRowTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableViewRowTest.java
@@ -24,9 +24,9 @@
  */
 package test.javafx.scene.control;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import javafx.scene.control.SelectionMode;
@@ -34,8 +34,8 @@
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableRow;
 import javafx.scene.control.TableView;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
 
 /**
@@ -45,7 +45,7 @@ public class TableViewRowTest {
 
     StageLoader stageLoader;
 
-    @After
+    @AfterEach
     public void after() {
         if (stageLoader != null) {
             stageLoader.dispose();
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableViewSelectionModelImplTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableViewSelectionModelImplTest.java
index 11e43803363..54b84f243f8 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableViewSelectionModelImplTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableViewSelectionModelImplTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,10 @@
 
 package test.javafx.scene.control;
 
-import java.util.Arrays;
-import java.util.Collection;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
@@ -41,18 +42,12 @@
 import javafx.scene.control.TableViewShim;
 import javafx.scene.control.TreeViewShim;
 import javafx.scene.control.cell.PropertyValueFactory;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import test.com.sun.javafx.scene.control.test.Person;
 
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import static org.junit.Assert.*;
-
 /**
  * Unit tests that are specific for the TableViewSelectionModel API. Other tests
  * for the MultipleSelectionModel API (from which TableViewSelectionModel
@@ -60,13 +55,13 @@
  *
  * @author Jonathan Giles
  */
-@RunWith(Parameterized.class)
 public class TableViewSelectionModelImplTest {
 
     private TableViewSelectionModel<String> model;
     private TableViewFocusModel focusModel;
 
-    private Class<? extends TableViewSelectionModel >modelClass;
+    // converted from parameterized test with just one choice
+    private static final Class<? extends TableViewSelectionModel>modelClass = TableViewShim.get_TableViewArrayListSelectionModel_class();
 
     // ListView model data
     private static ObservableList<String> defaultData = FXCollections.<String>observableArrayList();
@@ -97,24 +92,13 @@ public class TableViewSelectionModelImplTest {
             col1 = new TableColumn<>(),
             col2 = new TableColumn<>()
         );
-
-
-        // --- TableView init
-    }
-
-    @Parameters public static Collection implementations() {
-        return Arrays.asList(new Object[][] {
-            { TableViewShim.get_TableViewArrayListSelectionModel_class() }
-        });
-    }
-
-    public TableViewSelectionModelImplTest(Class<? extends TableViewSelectionModel> modelClass) {
-        this.modelClass = modelClass;
     }
 
-    @AfterClass public static void tearDownClass() throws Exception {    }
+    @AfterAll
+    public static void tearDownClass() throws Exception {    }
 
-    @Before public void setUp() throws Exception {
+    @BeforeEach
+    public void setUp() throws Exception {
         // reset the data model
         data.setAll(defaultData);
 
@@ -129,7 +113,8 @@ public TableViewSelectionModelImplTest(Class<? extends TableViewSelectionModel>
         }
     }
 
-    @After public void tearDown() {
+    @AfterEach
+    public void tearDown() {
         model = null;
     }
 
@@ -173,7 +158,7 @@ private TablePosition pos(int row, TableColumn<String,?> col) {
         model.select(3);
         assertFalse(model.isSelected(1, col0));
         assertFalse(model.isSelected(3, col0));
-        assertFalse(cells(model), model.isSelected(3, null));
+        assertFalse(model.isSelected(3, null), cells(model));
         assertTrue(model.isSelected(3));
         assertEquals(1, model.getSelectedCells().size());
     }
@@ -186,7 +171,7 @@ private TablePosition pos(int row, TableColumn<String,?> col) {
 
         assertFalse(model.isSelected(1, col0));
         assertFalse(model.isSelected(3, col0));
-        assertFalse(cells(model), model.isSelected(3, null));
+        assertFalse(model.isSelected(3, null), cells(model));
         assertTrue(model.isSelected(3));
         assertEquals(1, model.getSelectedCells().size());
     }
@@ -319,8 +304,8 @@ private TablePosition pos(int row, TableColumn<String,?> col) {
         model.select(2, col1);
         assertTrue(model.isSelected(2, col1));
         model.selectNext();
-        assertFalse(cells(model), model.isSelected(2, col1));
-        assertTrue(cells(model), model.isSelected(2, col2));
+        assertFalse(model.isSelected(2, col1), cells(model));
+        assertTrue(model.isSelected(2, col2), cells(model));
     }
 
     @Test public void selectPreviousRowInCellSelectionMode() {
@@ -361,8 +346,8 @@ private TablePosition pos(int row, TableColumn<String,?> col) {
         model.clearSelection();
         model.select(2, col1);
         model.selectLeftCell();
-        assertTrue(cells(model), model.isSelected(2, col1));
-        assertTrue(cells(model), model.isSelected(2, col0));
+        assertTrue(model.isSelected(2, col1), cells(model));
+        assertTrue(model.isSelected(2, col0), cells(model));
         assertEquals(2, model.getSelectedCells().size());
     }
 
@@ -372,8 +357,8 @@ private TablePosition pos(int row, TableColumn<String,?> col) {
         model.clearSelection();
         model.select(2, col1);
         model.selectRightCell();
-        assertTrue(cells(model), model.isSelected(2, col1));
-        assertTrue(cells(model), model.isSelected(2, col2));
+        assertTrue(model.isSelected(2, col1), cells(model));
+        assertTrue(model.isSelected(2, col2), cells(model));
         assertEquals(2, model.getSelectedCells().size());
     }
 
@@ -382,7 +367,7 @@ private TablePosition pos(int row, TableColumn<String,?> col) {
         assertFalse(model.isSelected(0, null));
 
         model.select(10);
-        assertFalse(cells(model), model.isSelected(10, null));
+        assertFalse(model.isSelected(10, null), cells(model));
         assertEquals(1, model.getSelectedCells().size());
     }
 
@@ -391,8 +376,8 @@ private TablePosition pos(int row, TableColumn<String,?> col) {
         model.select(2, col2);
         assertEquals(2, model.getSelectedCells().get(0).getRow());
         assertEquals(col2, model.getSelectedCells().get(0).getTableColumn());
-        assertTrue(cells(model), model.isSelected(2, col2));
-        assertTrue(cells(model), model.isSelected(2));
+        assertTrue(model.isSelected(2, col2), cells(model));
+        assertTrue(model.isSelected(2), cells(model));
     }
 
     @Test public void clearSelectionOfSelectedCell() {
@@ -415,15 +400,15 @@ private TablePosition pos(int row, TableColumn<String,?> col) {
         assertTrue(model.isSelected(2));
         assertTrue(model.isSelected(3));
         model.clearSelection(2);
-        assertFalse(indices(model), model.isSelected(2));
-        assertTrue(indices(model), model.isSelected(3));
+        assertFalse(model.isSelected(2), indices(model));
+        assertTrue(model.isSelected(3), indices(model));
     }
 
     @Test public void selectNextCellWhenAtFirstCell() {
         model.setCellSelectionEnabled(true);
         model.select(0, col0);
         model.selectBelowCell();
-        assertTrue(cells(model), model.isSelected(1, col0));
+        assertTrue(model.isSelected(1, col0), cells(model));
     }
 
 
@@ -433,8 +418,8 @@ private TablePosition pos(int row, TableColumn<String,?> col) {
         model.setCellSelectionEnabled(false);
         model.select(4);
         model.selectFirst();
-        assertTrue(cells(model), model.isSelected(0, null));
-        assertTrue(cells(model), model.isSelected(0));
+        assertTrue(model.isSelected(0, null), cells(model));
+        assertTrue(model.isSelected(0), cells(model));
         assertEquals(1, model.getSelectedCells().size());
     }
 
@@ -445,9 +430,9 @@ private TablePosition pos(int row, TableColumn<String,?> col) {
         model.selectFirst();
 
         // we should go to the top of the currently focused cells column (i.e column 1)
-        assertTrue(cells(model), model.isSelected(0, col1));
-        assertFalse(cells(model), model.isSelected(0, null));
-        assertFalse(cells(model), model.isSelected(0, col0));
+        assertTrue(model.isSelected(0, col1), cells(model));
+        assertFalse(model.isSelected(0, null), cells(model));
+        assertFalse(model.isSelected(0, col0), cells(model));
         assertEquals(1, model.getSelectedCells().size());
     }
 
@@ -456,9 +441,9 @@ private TablePosition pos(int row, TableColumn<String,?> col) {
         model.setCellSelectionEnabled(false);
         model.select(4);
         model.selectFirst();
-        assertTrue(cells(model), model.isSelected(0));
-        assertTrue(cells(model), model.isSelected(0, null));
-        assertTrue(cells(model), model.isSelected(4));
+        assertTrue(model.isSelected(0), cells(model));
+        assertTrue(model.isSelected(0, null), cells(model));
+        assertTrue(model.isSelected(4), cells(model));
         assertEquals(2, model.getSelectedCells().size());
     }
 
@@ -468,8 +453,8 @@ private TablePosition pos(int row, TableColumn<String,?> col) {
         model.clearSelection();
         model.select(4, col1);
         model.selectFirst();
-        assertTrue(cells(model), model.isSelected(0, col1));
-        assertTrue(cells(model), model.isSelected(4, col1));
+        assertTrue(model.isSelected(0, col1), cells(model));
+        assertTrue(model.isSelected(4, col1), cells(model));
         assertEquals(2, model.getSelectedCells().size());
     }
 
@@ -480,7 +465,7 @@ private TablePosition pos(int row, TableColumn<String,?> col) {
         model.setCellSelectionEnabled(false);
         model.select(4);
         model.selectLast();
-        assertTrue(cells(model), model.isSelected(tableView.getItems().size() - 1));
+        assertTrue(model.isSelected(tableView.getItems().size() - 1), cells(model));
         assertEquals(1, model.getSelectedCells().size());
     }
 
@@ -489,7 +474,7 @@ private TablePosition pos(int row, TableColumn<String,?> col) {
         model.setCellSelectionEnabled(true);
         model.select(4, col1);
         model.selectLast();
-        assertTrue(cells(model), model.isSelected(tableView.getItems().size() - 1, col1));
+        assertTrue(model.isSelected(tableView.getItems().size() - 1, col1), cells(model));
         assertEquals(1, model.getSelectedCells().size());
     }
 
@@ -499,8 +484,8 @@ private TablePosition pos(int row, TableColumn<String,?> col) {
         model.clearSelection();
         model.select(4);
         model.selectLast();
-        assertTrue(cells(model), model.isSelected(tableView.getItems().size() - 1));
-        assertTrue(cells(model), model.isSelected(4));
+        assertTrue(model.isSelected(tableView.getItems().size() - 1), cells(model));
+        assertTrue(model.isSelected(4), cells(model));
         assertEquals(2, model.getSelectedCells().size());
     }
 
@@ -510,15 +495,15 @@ private TablePosition pos(int row, TableColumn<String,?> col) {
         model.clearSelection();
         model.select(4, col1);
         model.selectLast();
-        assertTrue(cells(model), model.isSelected(tableView.getItems().size() - 1, col1));
-        assertTrue(cells(model), model.isSelected(4, col1));
+        assertTrue(model.isSelected(tableView.getItems().size() - 1, col1), cells(model));
+        assertTrue(model.isSelected(4, col1), cells(model));
         assertEquals(2, model.getSelectedCells().size());
     }
 
     @Test public void selectCellInRowSelectionMode_expectCellInformationToRemain() {
         model.setCellSelectionEnabled(false);
         model.select(4, col0);
-        assertEquals(cells(model), col0, model.getSelectedCells().get(0).getTableColumn());
+        assertEquals(col0, model.getSelectedCells().get(0).getTableColumn(), cells(model));
         assertEquals(col0, focusModel.getFocusedCell().getTableColumn());
         assertTrue(model.isSelected(4, col0));
         assertTrue(model.isSelected(4));
@@ -531,41 +516,41 @@ public void selectIndividualCells() {
         model.clearSelection();
 
         model.select(0, col0);
-        assertTrue(cells(model), model.isSelected(0));
-        assertFalse(cells(model), model.isSelected(1));
-        assertFalse(cells(model), model.isSelected(2));
+        assertTrue(model.isSelected(0), cells(model));
+        assertFalse(model.isSelected(1), cells(model));
+        assertFalse(model.isSelected(2), cells(model));
 
         model.select(1, col0);
         model.select(1, col1);
-        assertTrue(cells(model), model.isSelected(0));
-        assertTrue(cells(model), model.isSelected(1));
-        assertFalse(cells(model), model.isSelected(2));
+        assertTrue(model.isSelected(0), cells(model));
+        assertTrue(model.isSelected(1), cells(model));
+        assertFalse(model.isSelected(2), cells(model));
 
         model.select(2, col0);
         model.select(2, col1);
         model.select(2, col2);
-        assertTrue(cells(model), model.isSelected(0));
-        assertTrue(cells(model), model.isSelected(1));
-        assertTrue(cells(model), model.isSelected(2));
+        assertTrue(model.isSelected(0), cells(model));
+        assertTrue(model.isSelected(1), cells(model));
+        assertTrue(model.isSelected(2), cells(model));
 
-        assertFalse(cells(model), model.isSelected(3));
+        assertFalse(model.isSelected(3), cells(model));
 
         assertEquals(6, model.getSelectedCells().size());
 
         model.clearSelection(0, col0);
-        assertFalse(cells(model), model.isSelected(0));
+        assertFalse(model.isSelected(0), cells(model));
 
         model.clearSelection(1, col0);
-        assertTrue(cells(model), model.isSelected(1));
+        assertTrue(model.isSelected(1), cells(model));
         model.clearSelection(1, col1);
-        assertFalse(cells(model), model.isSelected(1));
+        assertFalse(model.isSelected(1), cells(model));
 
         model.clearSelection(2, col0);
-        assertTrue(cells(model), model.isSelected(2));
+        assertTrue(model.isSelected(2), cells(model));
         model.clearSelection(2, col1);
-        assertTrue(cells(model), model.isSelected(2));
+        assertTrue(model.isSelected(2), cells(model));
         model.clearSelection(2, col2);
-        assertFalse(cells(model), model.isSelected(2));
+        assertFalse(model.isSelected(2), cells(model));
 
         assertEquals(0, model.getSelectedCells().size());
     }
@@ -578,8 +563,8 @@ public void selectIndividualCells() {
 
     @Test public void focusOnRow() {
         focusModel.focus(3);
-        assertTrue(focusedCell(), focusModel.isFocused(3));
-        assertTrue(focusedCell(), focusModel.isFocused(3, null));
+        assertTrue(focusModel.isFocused(3), focusedCell());
+        assertTrue(focusModel.isFocused(3, null), focusedCell());
         assertEquals(new TablePosition(tableView, 3, null), focusModel.getFocusedCell());
         assertEquals(tableView.getItems().get(3), focusModel.getFocusedItem());
     }
@@ -587,39 +572,39 @@ public void selectIndividualCells() {
     @Test public void focusOnNegativeRowIndex() {
         focusModel.focus(-20);
         assertEquals(new TablePosition(tableView, -1, null), focusModel.getFocusedCell());
-        assertFalse(focusedCell(), focusModel.isFocused(-20, null));
+        assertFalse(focusModel.isFocused(-20, null), focusedCell());
     }
 
     @Test public void focusOutOfColumnsBounds() {
         focusModel.focus(3, null);
         assertEquals(new TablePosition(tableView, 3, null), focusModel.getFocusedCell());
-        assertTrue(focusedCell(), focusModel.isFocused(3, null));
+        assertTrue(focusModel.isFocused(3, null), focusedCell());
     }
 
     @Test public void focusPreviousRow() {
         focusModel.focus(3);
         assertEquals(new TablePosition(tableView, 3, null), focusModel.getFocusedCell());
-        assertTrue(focusedCell(), focusModel.isFocused(3));
-        assertTrue(focusedCell(), focusModel.isFocused(3, null));
+        assertTrue(focusModel.isFocused(3), focusedCell());
+        assertTrue(focusModel.isFocused(3, null), focusedCell());
 
         focusModel.focusPrevious();
         assertEquals(new TablePosition(tableView, 2, null), focusModel.getFocusedCell());
-        assertTrue(focusedCell(), focusModel.isFocused(2));
-        assertTrue(focusedCell(), focusModel.isFocused(2, null));
+        assertTrue(focusModel.isFocused(2), focusedCell());
+        assertTrue(focusModel.isFocused(2, null), focusedCell());
     }
 
     @Test public void focusPreviousRowImmediately() {
         focusModel.focusPrevious();
         assertEquals(new TablePosition(tableView, 0, col0), focusModel.getFocusedCell());
-        assertTrue(focusedCell(), focusModel.isFocused(0, null));
+        assertTrue(focusModel.isFocused(0, null), focusedCell());
     }
 
     @Test public void focusPreviousRowFromFirstRow() {
         focusModel.focus(0);
         focusModel.focusPrevious();
         assertEquals(new TablePosition(tableView, 0, null), focusModel.getFocusedCell());
-        assertTrue(focusedCell(), focusModel.isFocused(0));
-        assertTrue(focusedCell(), focusModel.isFocused(0, null));
+        assertTrue(focusModel.isFocused(0), focusedCell());
+        assertTrue(focusModel.isFocused(0, null), focusedCell());
     }
 
     @Test public void focusNextRow() {
@@ -627,8 +612,8 @@ public void selectIndividualCells() {
         focusModel.focusNext();
 
         assertEquals(new TablePosition(tableView, 4, null), focusModel.getFocusedCell());
-        assertTrue(focusedCell(), focusModel.isFocused(4));
-        assertTrue(focusedCell(), focusModel.isFocused(4, null));
+        assertTrue(focusModel.isFocused(4), focusedCell());
+        assertTrue(focusModel.isFocused(4, null), focusedCell());
     }
 
     @Test public void focusNextRowImmediately() {
@@ -637,8 +622,8 @@ public void selectIndividualCells() {
         focusModel.focusNext();
 
         assertEquals(new TablePosition(tableView, 1, col0), focusModel.getFocusedCell());
-        assertTrue(focusedCell(), focusModel.isFocused(1));
-        assertTrue(focusedCell(), focusModel.isFocused(1, null));
+        assertTrue(focusModel.isFocused(1), focusedCell());
+        assertTrue(focusModel.isFocused(1, null), focusedCell());
     }
 
     @Test public void focusNextRowFromLastRow() {
@@ -647,28 +632,28 @@ public void selectIndividualCells() {
         focusModel.focusNext();
 
         assertEquals(new TablePosition(tableView, rowCount, null), focusModel.getFocusedCell());
-        assertTrue(focusedCell(), focusModel.isFocused(rowCount));
-        assertTrue(focusedCell(), focusModel.isFocused(rowCount, null));
+        assertTrue(focusModel.isFocused(rowCount), focusedCell());
+        assertTrue(focusModel.isFocused(rowCount, null), focusedCell());
     }
 
     @Test public void focusAboveCell() {
         focusModel.focus(3, col1);
         assertEquals(new TablePosition(tableView, 3, col1), focusModel.getFocusedCell());
-        assertTrue(focusedCell(), focusModel.isFocused(3, col1));
+        assertTrue(focusModel.isFocused(3, col1), focusedCell());
 
         focusModel.focusAboveCell();
         assertEquals(new TablePosition(tableView, 2, col1), focusModel.getFocusedCell());
         // not sure about this - a row probably shouldn't be focused when we've given it specifically to a cell
-        assertTrue(focusedCell(), focusModel.isFocused(2));
-        assertTrue(focusedCell(), focusModel.isFocused(2, col1));
+        assertTrue(focusModel.isFocused(2), focusedCell());
+        assertTrue(focusModel.isFocused(2, col1), focusedCell());
     }
 
     @Test public void focusAboveCellFromFirstRow() {
         focusModel.focus(0, col1);
         focusModel.focusAboveCell();
         assertEquals(new TablePosition(tableView, 0, col1), focusModel.getFocusedCell());
-        assertTrue(focusedCell(), focusModel.isFocused(0));
-        assertTrue(focusedCell(), focusModel.isFocused(0, col1));
+        assertTrue(focusModel.isFocused(0), focusedCell());
+        assertTrue(focusModel.isFocused(0, col1), focusedCell());
     }
 
     @Test public void focusBelowCell() {
@@ -676,8 +661,8 @@ public void selectIndividualCells() {
         focusModel.focusBelowCell();
 
         assertEquals(new TablePosition(tableView, 4, col1), focusModel.getFocusedCell());
-        assertTrue(focusedCell(), focusModel.isFocused(4));
-        assertTrue(focusedCell(), focusModel.isFocused(4, col1));
+        assertTrue(focusModel.isFocused(4), focusedCell());
+        assertTrue(focusModel.isFocused(4, col1), focusedCell());
     }
 
     @Test public void focusBelowCellFromLastRow() {
@@ -686,8 +671,8 @@ public void selectIndividualCells() {
         focusModel.focusBelowCell();
 
         assertEquals(new TablePosition(tableView, rowCount, col1), focusModel.getFocusedCell());
-        assertTrue(focusedCell(), focusModel.isFocused(rowCount));
-        assertTrue(focusedCell(), focusModel.isFocused(rowCount, col1));
+        assertTrue(focusModel.isFocused(rowCount), focusedCell());
+        assertTrue(focusModel.isFocused(rowCount, col1), focusedCell());
     }
 
     @Test public void focusLeftCell() {
@@ -695,8 +680,8 @@ public void selectIndividualCells() {
         focusModel.focusLeftCell();
 
         assertEquals(new TablePosition(tableView, 3, col0), focusModel.getFocusedCell());
-        assertTrue(focusedCell(), focusModel.isFocused(3));
-        assertTrue(focusedCell(), focusModel.isFocused(3, col0));
+        assertTrue(focusModel.isFocused(3), focusedCell());
+        assertTrue(focusModel.isFocused(3, col0), focusedCell());
     }
 
     @Test public void focusLeftCellFromFirstColumn() {
@@ -704,8 +689,8 @@ public void selectIndividualCells() {
         focusModel.focusLeftCell();
 
         assertEquals(new TablePosition(tableView, 3, col0), focusModel.getFocusedCell());
-        assertTrue(focusedCell(), focusModel.isFocused(3));
-        assertTrue(focusedCell(), focusModel.isFocused(3, col0));
+        assertTrue(focusModel.isFocused(3), focusedCell());
+        assertTrue(focusModel.isFocused(3, col0), focusedCell());
     }
 
     @Test public void focusLeftCellFromNullColumn() {
@@ -713,8 +698,8 @@ public void selectIndividualCells() {
         focusModel.focusLeftCell();
 
         assertEquals(new TablePosition(tableView, 3, null), focusModel.getFocusedCell());
-        assertTrue(focusedCell(), focusModel.isFocused(3));
-        assertTrue(focusedCell(), focusModel.isFocused(3, null));
+        assertTrue(focusModel.isFocused(3), focusedCell());
+        assertTrue(focusModel.isFocused(3, null), focusedCell());
     }
 
     @Test public void focusRightCell() {
@@ -722,8 +707,8 @@ public void selectIndividualCells() {
         focusModel.focusRightCell();
 
         assertEquals(new TablePosition(tableView, 3, col1), focusModel.getFocusedCell());
-        assertTrue(focusedCell(), focusModel.isFocused(3));
-        assertTrue(focusedCell(), focusModel.isFocused(3, col1));
+        assertTrue(focusModel.isFocused(3), focusedCell());
+        assertTrue(focusModel.isFocused(3, col1), focusedCell());
     }
 
     @Test public void focusRightCellFromEndColumn() {
@@ -734,8 +719,8 @@ public void selectIndividualCells() {
         focusModel.focusRightCell();
 
         assertEquals(new TablePosition(tableView, 3, rightEdge), focusModel.getFocusedCell());
-        assertTrue(focusedCell(), focusModel.isFocused(3));
-        assertTrue(focusedCell(), focusModel.isFocused(3, rightEdge));
+        assertTrue(focusModel.isFocused(3), focusedCell());
+        assertTrue(focusModel.isFocused(3, rightEdge), focusedCell());
     }
 
     @Test public void test_rt33442() {
@@ -915,10 +900,10 @@ public void testSelectRowWhenInSingleCellSelectionModeIsSelected() {
         model.setCellSelectionEnabled(true);
         model.select(3);
         // test against contract
-        assertEquals("selected index", 3, model.getSelectedIndex());
-        assertTrue("contained in selected indices", model.getSelectedIndices().contains(3));
+        assertEquals(3, model.getSelectedIndex(), "selected index");
+        assertTrue(model.getSelectedIndices().contains(3), "contained in selected indices");
         // test against spec
-        assertEquals("is selected index", model.getSelectedIndices().contains(3), model.isSelected(3));
+        assertEquals(model.getSelectedIndices().contains(3), model.isSelected(3), "is selected index");
     }
 
     @Test
@@ -957,11 +942,11 @@ private void assertRowSelectionAfterSelectAndHideColumn(TableView<Person> table,
         TableColumn<Person, ?> column = table.getColumns().get(col);
 
         sm.select(row, column);
-        assertTrue("sanity: row " + row + "contained in selectedIndices", sm.getSelectedIndices().contains(row));
-        assertTrue("sanity: row must be selected" , sm.isSelected(row));
+        assertTrue(sm.getSelectedIndices().contains(row), "sanity: row " + row + "contained in selectedIndices");
+        assertTrue(sm.isSelected(row), "sanity: row must be selected");
         column.setVisible(false);
-        assertTrue("after hiding column: row " + row + "contained in selectedIndices", sm.getSelectedIndices().contains(row));
-        assertTrue("after hiding column: row must be selected" , sm.isSelected(row));
+        assertTrue(sm.getSelectedIndices().contains(row), "after hiding column: row " + row + "contained in selectedIndices");
+        assertTrue(sm.isSelected(row), "after hiding column: row must be selected");
     }
 
     /**
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableViewTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableViewTest.java
index 55a95cad15c..bf64198333a 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableViewTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TableViewTest.java
@@ -25,68 +25,51 @@
 
 package test.javafx.scene.control;
 
-import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
+import static javafx.collections.FXCollections.observableArrayList;
 import static javafx.scene.control.TableColumn.SortType.ASCENDING;
 import static javafx.scene.control.TableColumn.SortType.DESCENDING;
-import static javafx.collections.FXCollections.*;
-import static org.junit.Assert.*;
-
-import java.util.*;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Random;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Supplier;
-
-import com.sun.javafx.scene.control.ReadOnlyUnbackedObservableList;
-import com.sun.javafx.scene.control.SelectedCellsMap;
-import com.sun.javafx.scene.control.TableColumnBaseHelper;
-import com.sun.javafx.scene.control.behavior.TableCellBehavior;
-import javafx.collections.ObservableSet;
-import javafx.collections.SetChangeListener;
-import javafx.css.PseudoClass;
-import javafx.scene.control.Slider;
-import javafx.scene.control.TitledPane;
-import javafx.scene.layout.Region;
-import org.junit.After;
-import test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils;
-import test.com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
-import test.com.sun.javafx.scene.control.infrastructure.KeyModifier;
-import test.com.sun.javafx.scene.control.infrastructure.MouseEventFirer;
-import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.ObjectBinding;
-import javafx.beans.property.*;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ReadOnlyBooleanWrapper;
+import javafx.beans.property.ReadOnlyIntegerWrapper;
+import javafx.beans.property.ReadOnlyObjectWrapper;
+import javafx.beans.property.ReadOnlyStringWrapper;
+import javafx.beans.property.SimpleListProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
+import javafx.collections.ObservableSet;
+import javafx.collections.SetChangeListener;
 import javafx.collections.transformation.SortedList;
+import javafx.css.PseudoClass;
 import javafx.event.EventHandler;
 import javafx.geometry.Orientation;
 import javafx.scene.AccessibleAttribute;
 import javafx.scene.Group;
 import javafx.scene.Scene;
-import javafx.scene.control.cell.*;
-import javafx.scene.control.skin.TableCellSkin;
-import javafx.scene.control.skin.TableColumnHeader;
-import javafx.scene.control.skin.TableColumnHeaderShim;
-import javafx.scene.control.skin.TableHeaderRow;
-import javafx.scene.control.skin.VirtualFlow;
-import com.sun.javafx.scene.control.VirtualScrollBar;
-import javafx.scene.image.ImageView;
-import javafx.scene.input.KeyCode;
-import javafx.scene.layout.StackPane;
-import javafx.scene.layout.VBox;
-import javafx.scene.paint.Color;
-import javafx.scene.shape.Rectangle;
-import javafx.util.Callback;
-
-import com.sun.javafx.tk.Toolkit;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.sun.javafx.scene.control.TableColumnComparatorBase.TableColumnComparator;
 import javafx.scene.control.Button;
 import javafx.scene.control.Cell;
 import javafx.scene.control.CheckBox;
@@ -97,6 +80,7 @@
 import javafx.scene.control.MultipleSelectionModelBaseShim;
 import javafx.scene.control.ScrollBar;
 import javafx.scene.control.SelectionMode;
+import javafx.scene.control.Slider;
 import javafx.scene.control.SplitPane;
 import javafx.scene.control.TableCell;
 import javafx.scene.control.TableCellShim;
@@ -108,15 +92,48 @@
 import javafx.scene.control.TableView;
 import javafx.scene.control.TableViewShim;
 import javafx.scene.control.TextField;
+import javafx.scene.control.TitledPane;
 import javafx.scene.control.TreeTableColumn;
 import javafx.scene.control.TreeTableView;
+import javafx.scene.control.cell.CheckBoxTableCell;
+import javafx.scene.control.cell.ChoiceBoxTableCell;
+import javafx.scene.control.cell.PropertyValueFactory;
+import javafx.scene.control.cell.TextFieldTableCell;
+import javafx.scene.control.skin.TableCellSkin;
+import javafx.scene.control.skin.TableColumnHeader;
+import javafx.scene.control.skin.TableColumnHeaderShim;
+import javafx.scene.control.skin.TableHeaderRow;
+import javafx.scene.control.skin.TableHeaderRowShim;
+import javafx.scene.control.skin.VirtualFlow;
+import javafx.scene.image.ImageView;
+import javafx.scene.input.KeyCode;
+import javafx.scene.layout.Region;
+import javafx.scene.layout.StackPane;
+import javafx.scene.layout.VBox;
+import javafx.scene.paint.Color;
+import javafx.scene.shape.Rectangle;
+import javafx.util.Callback;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.scene.control.ReadOnlyUnbackedObservableList;
+import com.sun.javafx.scene.control.SelectedCellsMap;
+import com.sun.javafx.scene.control.TableColumnBaseHelper;
+import com.sun.javafx.scene.control.TableColumnComparatorBase.TableColumnComparator;
+import com.sun.javafx.scene.control.VirtualScrollBar;
+import com.sun.javafx.scene.control.behavior.TableCellBehavior;
+import com.sun.javafx.tk.Toolkit;
+import test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils;
+import test.com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
+import test.com.sun.javafx.scene.control.infrastructure.KeyModifier;
+import test.com.sun.javafx.scene.control.infrastructure.MouseEventFirer;
+import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
+import test.com.sun.javafx.scene.control.infrastructure.TableColumnHeaderUtil;
 import test.com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils;
 import test.com.sun.javafx.scene.control.test.Person;
 import test.com.sun.javafx.scene.control.test.RT_22463_Person;
 
-import javafx.scene.control.skin.TableHeaderRowShim;
-import test.com.sun.javafx.scene.control.infrastructure.TableColumnHeaderUtil;
-
 public class TableViewTest {
     private TableView<String> table;
     private TableView.TableViewSelectionModel sm;
@@ -126,7 +143,8 @@ public class TableViewTest {
 
     private ObservableList<Person> personTestData;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         table = new TableView<>();
         sm = table.getSelectionModel();
         fm = table.getFocusModel();
@@ -139,7 +157,7 @@ public class TableViewTest {
                 new Person("Michael", "Brown", "michael.brown@example.com"));
     }
 
-    @After
+    @AfterEach
     public void cleanup() {
         if (stageLoader != null) {
             stageLoader.dispose();
@@ -294,7 +312,7 @@ public void cleanup() {
         table.getItems().addAll("Apple", "Orange", "Banana");
         sm.select(2);
         table.getItems().clear();
-        assertNull("Selected Item: " + sm.getSelectedItem(), sm.getSelectedItem());
+        assertNull(sm.getSelectedItem(), "Selected Item: " + sm.getSelectedItem());
         assertEquals(-1, sm.getSelectedIndex());
 
         table.getItems().addAll("Kiwifruit", "Mandarin", "Pineapple");
@@ -481,7 +499,7 @@ private TableColumn<String, String> initSortTestStructure() {
         return col;
     }
 
-    @Ignore("This test is only valid if sort event consumption should revert changes")
+    @Disabled("This test is only valid if sort event consumption should revert changes")
     @Test public void testSortEventCanBeConsumedToStopSortOccurring_changeSortOrderList() {
         TableColumn<String, String> col = initSortTestStructure();
         table.setOnSort(event -> {
@@ -509,7 +527,7 @@ private TableColumn<String, String> initSortTestStructure() {
         VirtualFlowTestUtils.assertListContainsItemsInOrder(table.getSortOrder(), col);
     }
 
-    @Ignore("This test is only valid if sort event consumption should revert changes")
+    @Disabled("This test is only valid if sort event consumption should revert changes")
     @Test public void testSortEventCanBeConsumedToStopSortOccurring_changeColumnSortType_AscendingToDescending() {
         TableColumn<String, String> col = initSortTestStructure();
         assertEquals(ASCENDING, col.getSortType());
@@ -547,7 +565,7 @@ private TableColumn<String, String> initSortTestStructure() {
         VirtualFlowTestUtils.assertListContainsItemsInOrder(table.getSortOrder(), col);
     }
 
-    @Ignore("This test is only valid if sort event consumption should revert changes")
+    @Disabled("This test is only valid if sort event consumption should revert changes")
     @Test public void testSortEventCanBeConsumedToStopSortOccurring_changeColumnSortType_DescendingToNull() {
         TableColumn<String, String> col = initSortTestStructure();
         col.setSortType(DESCENDING);
@@ -584,7 +602,7 @@ private TableColumn<String, String> initSortTestStructure() {
         VirtualFlowTestUtils.assertListContainsItemsInOrder(table.getSortOrder(), col);
     }
 
-    @Ignore("This test is only valid if sort event consumption should revert changes")
+    @Disabled("This test is only valid if sort event consumption should revert changes")
     @Test public void testSortEventCanBeConsumedToStopSortOccurring_changeColumnSortType_NullToAscending() {
         TableColumn<String, String> col = initSortTestStructure();
         col.setSortType(null);
@@ -877,7 +895,7 @@ public void test_rt17522_focusShouldMoveWhenItemAddedAtFocusIndex() {
         assertTrue(fm.isFocused(0));
 
         lv.getItems().add(0, "row0");
-        assertTrue("Focus is on " + fm.getFocusedIndex(), fm.isFocused(1));
+        assertTrue(fm.isFocused(1), "Focus is on " + fm.getFocusedIndex());
         assertFalse(fm.isFocused(0));
 
         sl.dispose();
@@ -2956,19 +2974,25 @@ public void testTableViewRemainsFocusedAfterEditCommit() {
         assertEquals(firstNameCol, table.getSortOrder().get(0));
     }
 
-    @Test(expected = IndexOutOfBoundsException.class)
+    @Test
     public void test_rt35768_negativeFrom() {
-        readOnlyUnbackedObservableListSubListTest(-1, 0);
+        assertThrows(IndexOutOfBoundsException.class, () -> {
+            readOnlyUnbackedObservableListSubListTest(-1, 0);
+        });
     }
 
-    @Test(expected = IndexOutOfBoundsException.class)
+    @Test
     public void test_rt35768_bigTo() {
-        readOnlyUnbackedObservableListSubListTest(0, 10);
+        assertThrows(IndexOutOfBoundsException.class, () -> {
+            readOnlyUnbackedObservableListSubListTest(0, 10);
+        });
     }
 
-    @Test(expected = IndexOutOfBoundsException.class)
+    @Test
     public void test_rt35768_fromEqualsTo() {
-        readOnlyUnbackedObservableListSubListTest(1, 1);
+        assertThrows(IndexOutOfBoundsException.class, () -> {
+            readOnlyUnbackedObservableListSubListTest(1, 1);
+        });
     }
 
     private void readOnlyUnbackedObservableListSubListTest(int from, int to) {
@@ -3033,7 +3057,7 @@ protected <T> void assert_rt35857(ObservableList<T> items, MultipleSelectionMode
             items.removeAll(sm.getSelectedItems());
         }
         String modified = (retain ? " retainAll " : " removeAll ") + " selectedItems ";
-        assertEquals("expected list after" + modified, expected, items);
+        assertEquals(expected, items, "expected list after" + modified);
     }
 
 
@@ -4008,22 +4032,22 @@ private void test_rt_37538(boolean callCNextOnce, boolean callCNextInLoop) {
         sl.dispose();
     }
 
-    @Ignore("Fix not yet developed for TableView")
+    @Disabled("Fix not yet developed for TableView")
     @Test public void test_rt_35395_testCell_fixedCellSize() {
         test_rt_35395(true, true);
     }
 
-    @Ignore("Fix not yet developed for TableView")
+    @Disabled("Fix not yet developed for TableView")
     @Test public void test_rt_35395_testCell_notFixedCellSize() {
         test_rt_35395(true, false);
     }
 
-    @Ignore("Fix not yet developed for TableView")
+    @Disabled("Fix not yet developed for TableView")
     @Test public void test_rt_35395_testRow_fixedCellSize() {
         test_rt_35395(false, true);
     }
 
-    @Ignore("Fix not yet developed for TableView")
+    @Disabled("Fix not yet developed for TableView")
     @Test public void test_rt_35395_testRow_notFixedCellSize() {
         test_rt_35395(false, false);
     }
@@ -5309,7 +5333,7 @@ public int hashCode() {
         // but in index (last - 2).
         int expected = last - 2;
         assertEquals("5", sm.getSelectedItem());
-        assertEquals("selected index after disjoint removes above", expected, sm.getSelectedIndex());
+        assertEquals(expected, sm.getSelectedIndex(), "selected index after disjoint removes above");
     }
 
     /**
@@ -5364,8 +5388,8 @@ public int hashCode() {
 
         // disjoint remove of 2 elements above the last selected
         items.removeAll(items.get(1), items.get(3));
-        assertEquals("sanity: selectedIndex must be shifted by -2", last - 2, sm.getSelectedIndex());
-        assertEquals("must fire single event on removes above", 1, rt_40012_count);
+        assertEquals(last - 2, sm.getSelectedIndex(), "sanity: selectedIndex must be shifted by -2");
+        assertEquals(1, rt_40012_count, "must fire single event on removes above");
     }
 
     /**
@@ -5391,8 +5415,8 @@ public void test_rt_40012_selectedItemNotificationOnDisjointRemovesAbove() {
 
         // disjoint remove of 2 elements above the last selected
         items.removeAll(items.get(1), items.get(3));
-        assertEquals("sanity: selectedItem unchanged", lastItem, sm.getSelectedItem());
-        assertEquals("must not fire on unchanged selected item", 0, rt_40012_count);
+        assertEquals(lastItem, sm.getSelectedItem(), "sanity: selectedItem unchanged");
+        assertEquals(0, rt_40012_count, "must not fire on unchanged selected item");
     }
 
     /**
@@ -5416,12 +5440,12 @@ public void test_rt_40012_selectedItemNotificationOnDisjointRemovesAbove() {
         int selected = sm.getSelectedIndex();
 
         sm.getSelectedIndices().addListener((ListChangeListener<Integer>) change -> {
-            assertEquals("sanity: selectedIndex unchanged", selected, sm.getSelectedIndex());
+            assertEquals(selected, sm.getSelectedIndex(), "sanity: selectedIndex unchanged");
             while(change.next()) {
-                assertEquals("single event on clearAndSelect already selected", 1, ++rt_40212_count);
+                assertEquals(1, ++rt_40212_count, "single event on clearAndSelect already selected");
 
                 boolean type = change.wasAdded() || change.wasRemoved() || change.wasPermutated() || change.wasUpdated();
-                assertTrue("at least one of the change types must be true", type);
+                assertTrue(type, "at least one of the change types must be true");
             }
         });
 
@@ -5674,10 +5698,10 @@ public String toString() {
         table.getColumns().setAll(parent);
         Toolkit.getToolkit().firePulse();
         double nestedHeaderHeight = row.getHeight();
-        assertTrue("Nested column header should be larger.", nestedHeaderHeight > initialHeight);
+        assertTrue(nestedHeaderHeight > initialHeight, "Nested column header should be larger.");
         table.getColumns().setAll(child);
         Toolkit.getToolkit().firePulse();
-        assertEquals("Header should shrink to initial size.", initialHeight, row.getHeight(), 0.01);
+        assertEquals(initialHeight, row.getHeight(), 0.01, "Header should shrink to initial size.");
         sl.dispose();
     }
 
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TestListenerHelper.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TestListenerHelper.java
index 66ef8a3b0cb..cc3564b0f04 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TestListenerHelper.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TestListenerHelper.java
@@ -24,7 +24,7 @@
  */
 package test.javafx.scene.control;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import java.lang.ref.WeakReference;
 import java.util.concurrent.atomic.AtomicInteger;
 import javafx.beans.property.SimpleStringProperty;
@@ -46,7 +46,7 @@
 import javafx.scene.layout.Region;
 import javafx.scene.transform.Scale;
 import javafx.stage.Stage;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import com.sun.javafx.event.EventUtil;
 import com.sun.javafx.scene.control.ListenerHelper;
 import test.com.sun.javafx.scene.control.infrastructure.MouseEventGenerator;
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TextAreaDefaultCancelButtonTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TextAreaDefaultCancelButtonTest.java
index 1b2f49d2712..b12a465bc91 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TextAreaDefaultCancelButtonTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TextAreaDefaultCancelButtonTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,57 +26,60 @@
 package test.javafx.scene.control;
 
 import javafx.scene.control.TextArea;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test for interplay of ENTER/ESCAPE handlers on TextArea with
  * default/cancel button actions.
  */
 public class TextAreaDefaultCancelButtonTest extends DefaultCancelButtonTestBase<TextArea> {
-
-    public TextAreaDefaultCancelButtonTest(ButtonType buttonType,
-            boolean consume, boolean registerAfterShowing) {
-        super(buttonType, consume, registerAfterShowing);
-    }
-
     /**
      * Overridden to back out for ENTER (which is handled internally always)
      */
+    @ParameterizedTest
+    @MethodSource("parameters")
     @Override
-    public void testFallbackFilter() {
-        if (isEnter()) return;
-        super.testFallbackFilter();
+    public void testFallbackFilter(ButtonType buttonType, boolean consume, boolean registerAfterShowing) {
+        if (isEnter(buttonType)) return;
+        super.testFallbackFilter(buttonType, consume, registerAfterShowing);
     }
 
     /**
      * Overridden to back out for ENTER (which is handled internally always)
      */
+    @ParameterizedTest
+    @MethodSource("parameters")
     @Override
-    public void testFallbackHandler() {
-        if (isEnter()) return;
-        super.testFallbackHandler();
+    public void testFallbackHandler(ButtonType buttonType, boolean consume, boolean registerAfterShowing) {
+        if (isEnter(buttonType)) return;
+        super.testFallbackHandler(buttonType, consume, registerAfterShowing);
     }
 
     /**
      * Overridden to back out for ENTER (which is handled internally always)
      */
+    @ParameterizedTest
+    @MethodSource("parameters")
     @Override
-    public void testFallbackSingletonHandler() {
-        if (isEnter()) return;
-        super.testFallbackSingletonHandler();
+    public void testFallbackSingletonHandler(ButtonType buttonType, boolean consume, boolean registerAfterShowing) {
+        if (isEnter(buttonType)) return;
+        super.testFallbackSingletonHandler(buttonType, consume, registerAfterShowing);
     }
 
     /**
      * Overridden to back out for ENTER (which is handled internally always)
      */
+    @ParameterizedTest
+    @MethodSource("parameters")
     @Override
-    public void testFallbackNoHandler() {
-        if (isEnter()) return;
-        super.testFallbackNoHandler();
+    public void testFallbackNoHandler(ButtonType buttonType, boolean consume, boolean registerAfterShowing) {
+        if (isEnter(buttonType)) return;
+        super.testFallbackNoHandler(buttonType, consume, registerAfterShowing);
     }
 
     @Override
     protected TextArea createControl() {
         return new TextArea();
     }
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TextAreaTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TextAreaTest.java
index d020fa65616..8201664f66a 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TextAreaTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TextAreaTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,13 @@
 
 package test.javafx.scene.control;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.SimpleBooleanProperty;
@@ -34,12 +41,9 @@
 import javafx.scene.Scene;
 import javafx.scene.control.TextArea;
 import javafx.scene.control.TextInputControlShim;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.*;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  *
@@ -49,13 +53,15 @@ public class TextAreaTest {
     private TextArea txtArea;//Empty string
     private TextArea dummyTxtArea;//With string value
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         txtArea = new TextArea();
         dummyTxtArea = new TextArea("dummy");
         setUncaughtExceptionHandler();
     }
 
-    @After public void cleanup() {
+    @AfterEach
+    public void cleanup() {
         removeUncaughtExceptionHandler();
     }
 
@@ -187,17 +193,17 @@ private void removeUncaughtExceptionHandler() {
     @Test public void checkPromptTextPropertyBind() {
         StringProperty strPr = new SimpleStringProperty("value");
         txtArea.promptTextProperty().bind(strPr);
-        assertTrue("PromptText cannot be bound", txtArea.getPromptText().equals("value"));
+        assertTrue(txtArea.getPromptText().equals("value"), "PromptText cannot be bound");
         strPr.setValue("newvalue");
-        assertTrue("PromptText cannot be bound", txtArea.getPromptText().equals("newvalue"));
+        assertTrue(txtArea.getPromptText().equals("newvalue"), "PromptText cannot be bound");
     }
 
     @Test public void checkTextPropertyBind() {
         StringProperty strPr = new SimpleStringProperty("value");
         txtArea.textProperty().bind(strPr);
-        assertEquals("Text cannot be bound", txtArea.getText(), "value");
+        assertEquals(txtArea.getText(), "value", "Text cannot be bound");
         strPr.setValue("newvalue");
-        assertEquals("Text cannot be bound", txtArea.getText(),  "newvalue");
+        assertEquals(txtArea.getText(),  "newvalue", "Text cannot be bound");
     }
 
     @Test public void checkScrollLeftPropertyBind() {
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TextFieldDefaultCancelButtonTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TextFieldDefaultCancelButtonTest.java
index d38162d5415..73ed0161a79 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TextFieldDefaultCancelButtonTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TextFieldDefaultCancelButtonTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,14 +33,8 @@
  */
 public class TextFieldDefaultCancelButtonTest extends DefaultCancelButtonTestBase<TextField> {
 
-    public TextFieldDefaultCancelButtonTest(ButtonType buttonType, boolean consume,
-            boolean registerAfterShowing) {
-        super(buttonType, consume, registerAfterShowing);
-    }
-
     @Override
     protected TextField createControl() {
         return new TextField();
     }
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TextFieldTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TextFieldTest.java
index 4c4a0009878..97285bef20a 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TextFieldTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TextFieldTest.java
@@ -28,17 +28,33 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
 import com.sun.javafx.tk.Toolkit;
-
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.Arguments;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertTimeout;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.params.provider.Arguments;
 import static javafx.scene.input.KeyCode.*;
 import static javafx.scene.input.KeyEvent.*;
 import static java.util.stream.Collectors.*;
-import static org.junit.Assert.*;
 import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.*;
 
 import javafx.beans.property.ObjectProperty;
@@ -72,7 +88,8 @@ public class TextFieldTest {
     private TextField txtField;//Empty string
     private TextField dummyTxtField;//With string value
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         txtField = new TextField();
         dummyTxtField = new TextField("dummy");
         setUncaughtExceptionHandler();
@@ -219,17 +236,17 @@ private void removeUncaughtExceptionHandler() {
     @Test public void checkPromptTextPropertyBind() {
         StringProperty strPr = new SimpleStringProperty("value");
         txtField.promptTextProperty().bind(strPr);
-        assertTrue("PromptText cannot be bound", txtField.getPromptText().equals("value"));
+        assertTrue(txtField.getPromptText().equals("value"), "PromptText cannot be bound");
         strPr.setValue("newvalue");
-        assertTrue("PromptText cannot be bound", txtField.getPromptText().equals("newvalue"));
+        assertTrue(txtField.getPromptText().equals("newvalue"), "PromptText cannot be bound");
     }
 
     @Test public void checkTextPropertyBind() {
         StringProperty strPr = new SimpleStringProperty("value");
         txtField.textProperty().bind(strPr);
-        assertEquals("Text cannot be bound", txtField.getText(), "value");
+        assertEquals(txtField.getText(), "value", "Text cannot be bound");
         strPr.setValue("newvalue");
-        assertEquals("Text cannot be bound", txtField.getText(),  "newvalue");
+        assertEquals(txtField.getText(),  "newvalue", "Text cannot be bound");
     }
 
     @Test public void checkOnActionPropertyBind() {
@@ -349,7 +366,7 @@ public void testEditorInComboBoxEnterReleasedFilter() {
      * Unfixed part of JDK-8145515, reported as regression JDK-8229914: eventFilter
      * on editor not notified for ENTER pressed.
      */
-    @Ignore("JDK-8229914")
+    @Disabled("JDK-8229914")
     @Test
     public void testEditorInComboBoxEnterPressedFilter() {
         initStage();
@@ -382,7 +399,7 @@ public void testEventSequenceEnterHandler() {
         KeyCode key = ENTER;
         KeyEventFirer keyFirer = new KeyEventFirer(txtField);
         keyFirer.doKeyPress(key);
-        assertEquals("event count", 3, events.size());
+        assertEquals(3, events.size(), "event count");
         List<Object> sources = events.stream()
                 .map(e -> e.getSource())
                 .collect(toList());
@@ -403,7 +420,7 @@ public void testEventSequenceEscapeHandler() {
         KeyCode key = ESCAPE;
         KeyEventFirer keyFirer = new KeyEventFirer(txtField);
         keyFirer.doKeyPress(key);
-        assertEquals("event count", 3, events.size());
+        assertEquals(3, events.size(), "event count");
         List<Object> sources = events.stream()
                 .map(e -> e.getSource())
                 .collect(toList());
@@ -463,8 +480,8 @@ public void testEnterWithConsumingActionHandler() {
         stage.show();
         KeyEventFirer keyboard = new KeyEventFirer(txtField);
         keyboard.doKeyPress(ENTER);
-        assertEquals("actionHandler must be notified", 1, actions.size());
-        assertTrue("action must be consumed ", actions.get(0).isConsumed());
+        assertEquals(1, actions.size(), "actionHandler must be notified");
+        assertTrue(actions.get(0).isConsumed(), "action must be consumed ");
     }
 
     @Test public void replaceSelectionWithFilteredCharacters() {
@@ -661,7 +678,7 @@ private void initStage() {
         stage.setScene(scene);
     }
 
-    @After
+    @AfterEach
     public void cleanup() {
         if (stage != null) {
             stage.hide();
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TextFieldWithFormatterDefaultCancelButtonTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TextFieldWithFormatterDefaultCancelButtonTest.java
index 59cb5e7ff65..3437d41be7b 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TextFieldWithFormatterDefaultCancelButtonTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TextFieldWithFormatterDefaultCancelButtonTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,7 @@
 
 package test.javafx.scene.control;
 
-import org.junit.Ignore;
-
+import org.junit.jupiter.api.Disabled;
 import javafx.scene.control.TextField;
 import javafx.scene.control.TextFormatter;
 
@@ -38,14 +37,9 @@
  *
  * Ignoring for now
  */
-@Ignore
+@Disabled
 public class TextFieldWithFormatterDefaultCancelButtonTest
-        extends TextFieldDefaultCancelButtonTest {
-
-    public TextFieldWithFormatterDefaultCancelButtonTest(ButtonType buttonType,
-            boolean consume, boolean registerAfterShowing) {
-        super(buttonType, consume, registerAfterShowing);
-    }
+    extends TextFieldDefaultCancelButtonTest {
 
     @Override
     protected TextField createControl() {
@@ -53,5 +47,4 @@ protected TextField createControl() {
         input.setTextFormatter(new TextFormatter<>(TextFormatter.IDENTITY_STRING_CONVERTER));
         return input;
     }
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TextInputControlTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TextInputControlTest.java
index 803b1f47fa4..1841525e976 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TextInputControlTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TextInputControlTest.java
@@ -25,23 +25,13 @@
 
 package test.javafx.scene.control;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.util.Arrays;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 import java.util.Collection;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import com.sun.javafx.tk.Toolkit;
-
+import java.util.List;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -60,34 +50,39 @@
 import javafx.scene.layout.StackPane;
 import javafx.scene.text.Font;
 import javafx.stage.Stage;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import com.sun.javafx.tk.Toolkit;
 import test.com.sun.javafx.pgstub.StubToolkit;
 import test.com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
+
 /**
  */
-@RunWith(Parameterized.class)
 public class TextInputControlTest {
-    @SuppressWarnings("rawtypes")
-    @Parameterized.Parameters public static Collection implementations() {
-        return Arrays.asList(new Object[][]{
-                {TextField.class},
-                {PasswordField.class},
-                {TextArea.class}
-        });
+    private static Collection<Class> parameters() {
+        return List.of(
+            TextField.class,
+            PasswordField.class,
+            TextArea.class
+        );
     }
 
     private TextInputControl textInput;
-    private Class type;
-
-    public TextInputControlTest(Class type) {
-        this.type = type;
-    }
 
-    @Before public void setup() throws Exception {
-        textInput = (TextInputControl) type.getDeclaredConstructor().newInstance();
+    //@BeforeEach
+    // junit5 does not support parameterized class-level tests yet
+    public void setup(Class<?> type) {
         setUncaughtExceptionHandler();
+        try {
+            textInput = (TextInputControl)type.getDeclaredConstructor().newInstance();
+        } catch (Exception e) {
+            fail(e);
+        }
     }
 
-    @After public void cleanup() {
+    @AfterEach
+    public void cleanup() {
         removeUncaughtExceptionHandler();
     }
 
@@ -109,39 +104,66 @@ private void removeUncaughtExceptionHandler() {
      * Test the default states                            *
      *****************************************************/
 
-    @Test public void textDefaultsToEmptyString() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void textDefaultsToEmptyString(Class<?> type) {
+        setup(type);
         assertEquals("", textInput.getText());
     }
 
-    @Test public void editableDefaultsToTrue() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void editableDefaultsToTrue(Class<?> type) {
+        setup(type);
         assertTrue(textInput.isEditable());
     }
 
-    @Test public void anchorDefaultsToZero() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void anchorDefaultsToZero(Class<?> type) {
+        setup(type);
         assertEquals(0, textInput.getAnchor());
     }
 
-    @Test public void caretPositionDefaultsToZero() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void caretPositionDefaultsToZero(Class<?> type) {
+        setup(type);
         assertEquals(0, textInput.getCaretPosition());
     }
 
-    @Test public void lengthDefaultsToZero() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void lengthDefaultsToZero(Class<?> type) {
+        setup(type);
         assertEquals(0, textInput.getLength());
     }
 
-    @Test public void selectedTextDefaultsToEmptyString() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectedTextDefaultsToEmptyString(Class<?> type) {
+        setup(type);
         assertEquals("", textInput.getSelectedText());
     }
 
-    @Test public void selectionDefaultsToEmpty() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectionDefaultsToEmpty(Class<?> type) {
+        setup(type);
         assertEquals(0, textInput.getSelection().getLength());
     }
 
-    @Test public void selectionStartDefaultsToZero() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectionStartDefaultsToZero(Class<?> type) {
+        setup(type);
         assertEquals(0, textInput.getSelection().getStart());
     }
 
-    @Test public void selectionEndDefaultsToZero() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectionEndDefaultsToZero(Class<?> type) {
+        setup(type);
         assertEquals(0, textInput.getSelection().getEnd());
     }
 
@@ -149,7 +171,10 @@ private void removeUncaughtExceptionHandler() {
      * Tests for CSS                                                     *
      ********************************************************************/
 
-    @Test public void fontSetFromCSS() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void fontSetFromCSS(Class<?> type) {
+        setup(type);
         assertEquals(Font.font("System", 12), textInput.getFont());
 
         textInput.setStyle("-fx-font: 24 Amble");
@@ -162,30 +187,45 @@ private void removeUncaughtExceptionHandler() {
      * Test for text                                      *
      *****************************************************/
 
-    @Test public void settingTextUpdatesTheText() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void settingTextUpdatesTheText(Class<?> type) {
+        setup(type);
         textInput.setText("This is a test");
         assertEquals("This is a test", textInput.getText());
         assertEquals("This is a test", textInput.textProperty().get());
     }
 
-    @Test public void textCanBeNull() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void textCanBeNull(Class<?> type) {
+        setup(type);
         textInput.setText(null);
         assertNull(textInput.getText());
     }
 
-    @Test public void textCanBeSwitchedBetweenNullAndAValue() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void textCanBeSwitchedBetweenNullAndAValue(Class<?> type) {
+        setup(type);
         textInput.setText(null);
         textInput.setText("Test");
         assertEquals("Test", textInput.getText());
     }
 
-    @Test public void textCanBeSwitchedFromAValueToNull() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void textCanBeSwitchedFromAValueToNull(Class<?> type) {
+        setup(type);
         textInput.setText("Test");
         textInput.setText(null);
         assertNull(textInput.getText());
     }
 
-    @Test public void textIsNullThenBoundThenUnboundAndShouldReturnTheValueWhenBound() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void textIsNullThenBoundThenUnboundAndShouldReturnTheValueWhenBound(Class<?> type) {
+        setup(type);
         textInput.setText(null);
         StringProperty other = new SimpleStringProperty("Peppers");
         textInput.textProperty().bind(other);
@@ -193,14 +233,20 @@ private void removeUncaughtExceptionHandler() {
         assertEquals("Peppers", textInput.getText());
     }
 
-    @Test public void textHasValueThenIsBoundToNullShouldReturnNullFromGet() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void textHasValueThenIsBoundToNullShouldReturnNullFromGet(Class<?> type) {
+        setup(type);
         textInput.setText("Value");
         StringProperty other = new SimpleStringProperty(null);
         textInput.textProperty().bind(other);
         assertNull(textInput.getText());
     }
 
-    @Test public void textHasValueThenIsBoundToNullAndUnboundShouldReturnNullFromGet() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void textHasValueThenIsBoundToNullAndUnboundShouldReturnNullFromGet(Class<?> type) {
+        setup(type);
         textInput.setText("Value");
         StringProperty other = new SimpleStringProperty(null);
         textInput.textProperty().bind(other);
@@ -208,7 +254,10 @@ private void removeUncaughtExceptionHandler() {
         assertNull(textInput.getText());
     }
 
-    @Test public void textHasValueThenIsBoundToNullAndUnboundThenSetShouldReturnNewValueFromGet() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void textHasValueThenIsBoundToNullAndUnboundThenSetShouldReturnNewValueFromGet(Class<?> type) {
+        setup(type);
         textInput.setText("Value");
         StringProperty other = new SimpleStringProperty(null);
         textInput.textProperty().bind(other);
@@ -217,7 +266,10 @@ private void removeUncaughtExceptionHandler() {
         assertEquals("New Value", textInput.getText());
     }
 
-    @Test public void textCanBeBound() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void textCanBeBound(Class<?> type) {
+        setup(type);
         StringProperty other = new SimpleStringProperty("Apples");
         textInput.textProperty().bind(other);
         assertEquals("Apples", textInput.getText());
@@ -225,18 +277,24 @@ private void removeUncaughtExceptionHandler() {
         assertEquals("Oranges", textInput.getText());
     }
 
-    @Test public void cannotSpecifyTextViaCSS() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void cannotSpecifyTextViaCSS(Class<?> type) {
+        setup(type);
         try {
             CssMetaData styleable = ((StyleableProperty)textInput.textProperty()).getCssMetaData();
             assertNull(styleable);
         } catch (ClassCastException ignored) {
             // pass!
         } catch (Exception e) {
-            org.junit.Assert.fail(e.toString());
+            fail(e);
         }
     }
 
-    @Test public void settingTextNotifiesOfChange() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void settingTextNotifiesOfChange(Class<?> type) {
+        setup(type);
         final boolean[] passed = new boolean[] { false };
         textInput.textProperty().addListener((observable, oldValue, newValue) -> {
             passed[0] = true;
@@ -246,7 +304,10 @@ private void removeUncaughtExceptionHandler() {
     }
 
     // Test for JDK-8212102
-    @Test public void testControlCharacters() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testControlCharacters(Class<?> type) {
+        setup(type);
         try {
             String cc = "\r\n\n";
             String str = "123456";
@@ -272,19 +333,28 @@ private void removeUncaughtExceptionHandler() {
         }
     }
 
-    @Test public void controlCharactersAreOmitted_setText_getText() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void controlCharactersAreOmitted_setText_getText(Class<?> type) {
+        setup(type);
         String s = "This is " + '\0' + "a test";
         textInput.setText(s);
         assertEquals("This is a test", textInput.getText());
     }
 
-    @Test public void controlCharactersAreOmitted_setText_textProperty_get() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void controlCharactersAreOmitted_setText_textProperty_get(Class<?> type) {
+        setup(type);
         String s = "This is " + '\0' + "a test";
         textInput.setText(s);
         assertEquals("This is a test", textInput.textProperty().get());
     }
 
-    @Test public void controlCharactersAreOmitted_bound_getText() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void controlCharactersAreOmitted_bound_getText(Class<?> type) {
+        setup(type);
         StringProperty other = new SimpleStringProperty("This is " + '\0' + "a test");
         textInput.textProperty().bind(other);
         assertEquals("This is a test", textInput.getText());
@@ -292,7 +362,10 @@ private void removeUncaughtExceptionHandler() {
         assertEquals("Broken", textInput.getText());
     }
 
-    @Test public void controlCharactersAreOmitted_bound_textProperty_get() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void controlCharactersAreOmitted_bound_textProperty_get(Class<?> type) {
+        setup(type);
         StringProperty other = new SimpleStringProperty("This is " + '\0' + "a test");
         textInput.textProperty().bind(other);
         assertEquals("This is a test", textInput.textProperty().get());
@@ -309,17 +382,26 @@ private void removeUncaughtExceptionHandler() {
      * Test for editable                                  *
      *****************************************************/
 
-    @Test public void settingEditableValueShouldWork() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void settingEditableValueShouldWork(Class<?> type) {
+        setup(type);
         textInput.setEditable(false);
         assertFalse(textInput.isEditable());
     }
 
-    @Test public void settingEditableAndThenCreatingAModelAndReadingTheValueStillWorks() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void settingEditableAndThenCreatingAModelAndReadingTheValueStillWorks(Class<?> type) {
+        setup(type);
         textInput.setEditable(false);
         assertFalse(textInput.editableProperty().get());
     }
 
-    @Test public void editableCanBeBound() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void editableCanBeBound(Class<?> type) {
+        setup(type);
         BooleanProperty other = new SimpleBooleanProperty(false);
         textInput.editableProperty().bind(other);
         assertFalse(textInput.isEditable());
@@ -327,18 +409,24 @@ private void removeUncaughtExceptionHandler() {
         assertTrue(textInput.isEditable());
     }
 
-    @Test public void cannotSpecifyEditableViaCSS() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void cannotSpecifyEditableViaCSS(Class<?> type) {
+        setup(type);
         try {
             CssMetaData styleable = ((StyleableProperty)textInput.editableProperty()).getCssMetaData();
             assertNull(styleable);
         } catch (ClassCastException ignored) {
             // pass!
         } catch (Exception e) {
-            org.junit.Assert.fail(e.toString());
+            fail(e);
         }
     }
 
-    @Test public void settingEditableNotifiesOfChange() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void settingEditableNotifiesOfChange(Class<?> type) {
+        setup(type);
         final boolean[] passed = new boolean[] { false };
         textInput.editableProperty().addListener((observable, oldValue, newValue) -> {
             passed[0] = true;
@@ -351,20 +439,29 @@ private void removeUncaughtExceptionHandler() {
      * Test for anchor                                    *
      *****************************************************/
 
-    @Test public void anchorIsSetWhenSelectionChanges() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void anchorIsSetWhenSelectionChanges(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(4, 9);
         assertEquals(4, textInput.getAnchor());
     }
 
-    @Test public void anchorIsSetWhenSelectionChanges2() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void anchorIsSetWhenSelectionChanges2(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(9, 4);
         assertEquals(9, textInput.getAnchor());
     }
 
     // updated when text changes
-    @Test public void anchorIsSetToCaretPositionWhenTextChanges() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void anchorIsSetToCaretPositionWhenTextChanges(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(4, 9);
         textInput.setText("Gone");
@@ -375,27 +472,38 @@ private void removeUncaughtExceptionHandler() {
      * Test for caretPosition                             *
      *****************************************************/
 
-    @Test public void caretPositionIsSetWhenSelectionChanges() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void caretPositionIsSetWhenSelectionChanges(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(4, 9);
         assertEquals(9, textInput.getCaretPosition());
     }
 
-    @Test public void caretPositionIsSetWhenSelectionChanges2() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void caretPositionIsSetWhenSelectionChanges2(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(9, 4);
         assertEquals(4, textInput.getCaretPosition());
     }
 
-    @Test
-    public void caretAndAnchorPositionAfterSettingText() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void caretAndAnchorPositionAfterSettingText(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         assertEquals(0, textInput.getCaretPosition());
         assertEquals(0, textInput.getAnchor());
     }
 
     // Test for JDK-8178417
-    @Test public void caretPositionUndo() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void caretPositionUndo(Class<?> type) {
+        setup(type);
         Toolkit tk = Toolkit.getToolkit();
 
         assertTrue(tk instanceof StubToolkit);  // Ensure it's StubToolkit
@@ -434,19 +542,28 @@ public void caretAndAnchorPositionAfterSettingText() {
 
     // TODO null text results in 0 length
 
-    @Test public void emptyTextResultsInZeroLength() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void emptyTextResultsInZeroLength(Class<?> type) {
+        setup(type);
         textInput.setText("Hello");
         textInput.setText("");
         assertEquals(0, textInput.getLength());
     }
 
-    @Test public void lengthMatchesStringLength() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void lengthMatchesStringLength(Class<?> type) {
+        setup(type);
         final String string = "Hello";
         textInput.setText(string);
         assertEquals(string.length(), textInput.getLength());
     }
 
-    @Test public void lengthChangeNotificationWhenTextIsUpdatedToNonEmptyResult() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void lengthChangeNotificationWhenTextIsUpdatedToNonEmptyResult(Class<?> type) {
+        setup(type);
         final boolean[] passed = new boolean[] { false };
         textInput.lengthProperty().addListener((observable, oldValue, newValue) -> {
             passed[0] = true;
@@ -455,7 +572,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertTrue(passed[0]);
     }
 
-    @Test public void lengthChangeNotificationWhenTextIsSetToEmptyResult() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void lengthChangeNotificationWhenTextIsSetToEmptyResult(Class<?> type) {
+        setup(type);
         textInput.setText("Goodbye");
         final boolean[] passed = new boolean[] { false };
         textInput.lengthProperty().addListener((observable, oldValue, newValue) -> {
@@ -477,44 +597,65 @@ public void caretAndAnchorPositionAfterSettingText() {
 
     // TODO test null text and some random range
 
-    @Test public void selectedTextMatchesTextAndSelection() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectedTextMatchesTextAndSelection(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(0, 3);
         assertEquals("The", textInput.getSelectedText());
     }
 
-    @Test public void selectedTextMatchesTextAndSelection2() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectedTextMatchesTextAndSelection2(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(4, 9);
         assertEquals("quick", textInput.getSelectedText());
     }
 
-    @Test public void selectedTextMatchesTextAndSelection3() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectedTextMatchesTextAndSelection3(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(10, 19);
         assertEquals("brown fox", textInput.getSelectedText());
     }
 
-    @Test public void selectedTextIsClearedWhenTextChanges() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectedTextIsClearedWhenTextChanges(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(4, 9);
         textInput.setText("");
         assertEquals("", textInput.getSelectedText());
     }
 
-    @Test public void selectedTextWorksWhenSelectionExceedsPossibleRange() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectedTextWorksWhenSelectionExceedsPossibleRange(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(10, 180);
         assertEquals("brown fox", textInput.getSelectedText());
     }
 
-    @Test public void selectedTextWorksWhenSelectionExceedsPossibleRange2() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectedTextWorksWhenSelectionExceedsPossibleRange2(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(100, 180);
         assertEquals("", textInput.getSelectedText());
     }
 
-//    @Test public void selectedTextWorksWhenSelectionIsBound() {
+//    @ParameterizedTest
+//    @MethodSource("parameters")
+//    public void selectedTextWorksWhenSelectionIsBound(Class<?> type) {
+//        setup(type);
 //        ObjectProperty<IndexRange> other = new SimpleObjectProperty<IndexRange>(new IndexRange(4, 9));
 //        textInput.setText("The quick brown fox");
 //        textInput.selectionProperty().bind(other);
@@ -523,7 +664,10 @@ public void caretAndAnchorPositionAfterSettingText() {
 //        assertEquals("brown fox", textInput.getSelectedText());
 //    }
 
-    @Test public void selectedTextWorksWhenTextIsBound() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectedTextWorksWhenTextIsBound(Class<?> type) {
+        setup(type);
         StringProperty other = new SimpleStringProperty("There and back again");
         textInput.textProperty().bind(other);
         textInput.selectRange(0, 5);
@@ -532,7 +676,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals("", textInput.getSelectedText());
     }
 
-    @Test public void selectedTextChangeEvents() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectedTextChangeEvents(Class<?> type) {
+        setup(type);
         final boolean[] passed = new boolean[] { false };
         textInput.setText("The quick brown fox");
         textInput.selectedTextProperty().addListener(observable -> {
@@ -542,7 +689,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertTrue(passed[0]);
     }
 
-    @Test public void selectedTextChangeEvents2() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectedTextChangeEvents2(Class<?> type) {
+        setup(type);
         final boolean[] passed = new boolean[] { false };
         textInput.setText("The quick brown fox");
         textInput.selectRange(0, 3);
@@ -553,7 +703,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertTrue(passed[0]);
     }
 
-    @Test public void selectedTextChangeEvents3() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectedTextChangeEvents3(Class<?> type) {
+        setup(type);
         final boolean[] passed = new boolean[] { false };
         StringProperty other = new SimpleStringProperty("There and back again");
         textInput.textProperty().bind(other);
@@ -569,26 +722,38 @@ public void caretAndAnchorPositionAfterSettingText() {
      * Test for selection                                 *
      *****************************************************/
 
-    @Test public void selectionIsClearedWhenTextChanges() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectionIsClearedWhenTextChanges(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(4, 9);
         textInput.setText("");
         assertEquals(new IndexRange(0, 0), textInput.getSelection());
     }
 
-    @Test public void selectionCannotBeSetToBeOutOfRange() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectionCannotBeSetToBeOutOfRange(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(4, 99);
         assertEquals(new IndexRange(4, 19), textInput.getSelection());
     }
 
-    @Test public void selectionCannotBeSetToBeOutOfRange2() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectionCannotBeSetToBeOutOfRange2(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(44, 99);
         assertEquals(new IndexRange(19, 19), textInput.getSelection());
     }
 
-//    @Test public void selectionCanBeBound() {
+//    @ParameterizedTest
+//    @MethodSource("parameters")
+//    public void selectionCanBeBound(Class<?> type) {
+//        setup(type);
 //        ObjectProperty<IndexRange> other = new SimpleObjectProperty<IndexRange>(new IndexRange(4, 9));
 //        textInput.selectionProperty().bind(other);
 //        assertEquals(new IndexRange(4, 9), textInput.getSelection());
@@ -596,7 +761,10 @@ public void caretAndAnchorPositionAfterSettingText() {
 //        assertEquals(new IndexRange(10, 19), textInput.getSelection());
 //    }
 
-    @Test public void selectionChangeEventsHappen() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectionChangeEventsHappen(Class<?> type) {
+        setup(type);
         final boolean[] passed = new boolean[] { false };
         textInput.selectionProperty().addListener(observable -> {
             passed[0] = true;
@@ -605,11 +773,15 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertTrue(passed[0]);
     }
 
-//    @Test public void selectionChangeEventsHappenWhenBound() {
+//    @ParameterizedTest
+//    @MethodSource("parameters")
+//    public void selectionChangeEventsHappenWhenBound(Class<?> type) {
+//        setup(type);
 //        final boolean[] passed = new boolean[] { false };
 //        ObjectProperty<IndexRange> other = new SimpleObjectProperty<IndexRange>(new IndexRange(0, 5));
 //        textInput.selectionProperty().addListener(new InvalidationListener() {
-//            @Override public void invalidated(Observable observable) {
+//            @Override
+//            public void invalidated(Observable observable) {
 //                passed[0] = true;
 //            }
 //        });
@@ -617,12 +789,16 @@ public void caretAndAnchorPositionAfterSettingText() {
 //        assertTrue(passed[0]);
 //    }
 
-//    @Test public void selectionChangeEventsHappenWhenBound2() {
+//    @ParameterizedTest
+//    @MethodSource("parameters")
+//    public void selectionChangeEventsHappenWhenBound2(Class<?> type) {
+//        setup(type);
 //        final boolean[] passed = new boolean[] { false };
 //        ObjectProperty<IndexRange> other = new SimpleObjectProperty<IndexRange>(new IndexRange(0, 5));
 //        textInput.selectionProperty().bind(other);
 //        textInput.selectionProperty().addListener(new InvalidationListener() {
-//            @Override public void invalidated(Observable observable) {
+//            @Override
+//            public void invalidated(Observable observable) {
 //                passed[0] = true;
 //            }
 //        });
@@ -631,7 +807,10 @@ public void caretAndAnchorPositionAfterSettingText() {
 //        assertTrue(passed[0]);
 //    }
 
-    @Test public void selectionChangeEventsHappenWhenTextIsChanged() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectionChangeEventsHappenWhenTextIsChanged(Class<?> type) {
+        setup(type);
         final boolean[] passed = new boolean[] { false };
         StringProperty other = new SimpleStringProperty("There and back again");
         textInput.textProperty().bind(other);
@@ -647,7 +826,10 @@ public void caretAndAnchorPositionAfterSettingText() {
      * Test for cut/copy/paste                            *
      *****************************************************/
 
-    @Test public void cutRemovesSelection() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void cutRemovesSelection(Class<?> type) {
+        setup(type);
         // Skip for PasswordField
         if (textInput instanceof PasswordField) return;
         textInput.setText("The quick brown fox");
@@ -656,7 +838,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals("The  brown fox", textInput.getText());
     }
 
-    @Test public void pasteReplacesSelection() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void pasteReplacesSelection(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(4, 9);
         copy("slow");
@@ -664,7 +849,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals("The slow brown fox", textInput.getText());
     }
 
-    @Test public void pasteIllegalCharacters() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void pasteIllegalCharacters(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(19, 19);
         copy("" + '\0');
@@ -672,7 +860,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals("The quick brown fox", textInput.getText());
     }
 
-    @Test public void pasteIllegalCharactersCaretNotAtZero() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void pasteIllegalCharactersCaretNotAtZero(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(4, 4);
         copy("slow" + '\0');
@@ -681,7 +872,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(8, textInput.getAnchor());
     }
 
-    @Test public void pasteIllegalCharactersSelection() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void pasteIllegalCharactersSelection(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(4, 9);
         copy("slow" + '\0');
@@ -689,7 +883,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals("The slow brown fox", textInput.getText());
     }
 
-    @Test public void pasteIllegalCharactersIntoSelectionPositionsCaretCorrectly() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void pasteIllegalCharactersIntoSelectionPositionsCaretCorrectly(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(4, 9);
         copy("slow" + '\0');
@@ -703,7 +900,10 @@ public void caretAndAnchorPositionAfterSettingText() {
      *****************************************************/
 
     // cut ends up removing the selection, and setting anchor / caretPosition to match index
-    @Test public void cutRemovesSelectionAndResetsAnchorAndCaretPositionToIndex() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void cutRemovesSelectionAndResetsAnchorAndCaretPositionToIndex(Class<?> type) {
+        setup(type);
         // Skip for PasswordField
         if (textInput instanceof PasswordField) return;
         textInput.setText("The quick brown fox");
@@ -715,7 +915,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals("", textInput.getSelectedText());
     }
 
-    @Test public void pasteWithEmptySelection() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void pasteWithEmptySelection(Class<?> type) {
+        setup(type);
         textInput.setText("quick brown fox");
         textInput.selectRange(0,0);
         copy("The ");
@@ -726,7 +929,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals("", textInput.getSelectedText());
     }
 
-    @Test public void pasteWithSelection() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void pasteWithSelection(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(4, 9);
         copy("slow");
@@ -737,7 +943,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals("", textInput.getSelectedText());
     }
 
-    @Test public void pasteAll() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void pasteAll(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectAll();
         copy("Gone");
@@ -748,7 +957,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals("", textInput.getSelectedText());
     }
 
-    @Test public void selectBackwardHasNoEffectWhenCaretPositionIsAlreadyZero() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectBackwardHasNoEffectWhenCaretPositionIsAlreadyZero(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(3, 0);
         textInput.selectBackward();
@@ -756,7 +968,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(0, 3), textInput.getSelection());
     }
 
-    @Test public void selectBackwardMovesCaretPositionOnePlaceLeft_CaretPositionRightOfAnchor() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectBackwardMovesCaretPositionOnePlaceLeft_CaretPositionRightOfAnchor(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(0, 3);
         textInput.selectBackward();
@@ -764,7 +979,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(0, 2), textInput.getSelection());
     }
 
-    @Test public void selectBackwardMovesCaretPositionOnePlaceLeft_CaretPositionEqualsAnchor() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectBackwardMovesCaretPositionOnePlaceLeft_CaretPositionEqualsAnchor(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(3, 3);
         textInput.selectBackward();
@@ -772,7 +990,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(2, 3), textInput.getSelection());
     }
 
-    @Test public void selectBackwardMovesCaretPositionOnePlaceLeft_CaretPositionLeftOfAnchor() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectBackwardMovesCaretPositionOnePlaceLeft_CaretPositionLeftOfAnchor(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(6, 3);
         textInput.selectBackward();
@@ -780,7 +1001,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(2, 6), textInput.getSelection());
     }
 
-    @Test public void selectForwardHasNoEffectWhenCaretPositionIsAtLength() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectForwardHasNoEffectWhenCaretPositionIsAtLength(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(3, 19);
         textInput.selectForward();
@@ -788,7 +1012,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(3, 19), textInput.getSelection());
     }
 
-    @Test public void selectForwardMovesCaretPositionOnePlaceRight_CaretPositionRightOfAnchor() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectForwardMovesCaretPositionOnePlaceRight_CaretPositionRightOfAnchor(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(0, 3);
         textInput.selectForward();
@@ -796,7 +1023,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(0, 4), textInput.getSelection());
     }
 
-    @Test public void selectForwardMovesCaretPositionOnePlaceRight_CaretPositionEqualsAnchor() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectForwardMovesCaretPositionOnePlaceRight_CaretPositionEqualsAnchor(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(3, 3);
         textInput.selectForward();
@@ -804,7 +1034,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(3, 4), textInput.getSelection());
     }
 
-    @Test public void selectForwardMovesCaretPositionOnePlaceRight_CaretPositionLeftOfAnchor() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectForwardMovesCaretPositionOnePlaceRight_CaretPositionLeftOfAnchor(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(6, 3);
         textInput.selectForward();
@@ -812,14 +1045,20 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(4, 6), textInput.getSelection());
     }
 
-    @Test public void previousWordWithNoText() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void previousWordWithNoText(Class<?> type) {
+        setup(type);
         textInput.previousWord();
         assertEquals(0, textInput.getCaretPosition());
         assertEquals(0, textInput.getAnchor());
         assertEquals(new IndexRange(0, 0), textInput.getSelection());
     }
 
-    @Test public void previousWordWithSelection_caretPositionBeforeAnchor() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void previousWordWithSelection_caretPositionBeforeAnchor(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(15, 10);
         textInput.previousWord();
@@ -828,7 +1067,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(4, 4), textInput.getSelection());
     }
 
-    @Test public void previousWordWithSelection_caretPositionBeforeAnchor2() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void previousWordWithSelection_caretPositionBeforeAnchor2(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(12, 6);
         textInput.previousWord();
@@ -837,7 +1079,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(4, 4), textInput.getSelection());
     }
 
-    @Test public void previousWordWithSelection_caretPositionAfterAnchor() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void previousWordWithSelection_caretPositionAfterAnchor(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(10, 15);
         textInput.previousWord();
@@ -846,7 +1091,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(10, 10), textInput.getSelection());
     }
 
-    @Test public void previousWordWithSelection_caretPositionAfterAnchor2() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void previousWordWithSelection_caretPositionAfterAnchor2(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(6, 12);
         textInput.previousWord();
@@ -855,7 +1103,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(10, 10), textInput.getSelection());
     }
 
-    @Test public void previousWord_caretWithinAWord() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void previousWord_caretWithinAWord(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.positionCaret(12);
         textInput.previousWord();
@@ -864,7 +1115,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(10, 10), textInput.getSelection());
     }
 
-    @Test public void previousWord_caretAfterWord() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void previousWord_caretAfterWord(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.positionCaret(15);
         textInput.previousWord();
@@ -873,7 +1127,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(10, 10), textInput.getSelection());
     }
 
-    @Test public void previousWord_caretBeforeWord() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void previousWord_caretBeforeWord(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.positionCaret(10);
         textInput.previousWord();
@@ -882,7 +1139,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(4, 4), textInput.getSelection());
     }
 
-    @Test public void previousWord_caretWithinWhitespace() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void previousWord_caretWithinWhitespace(Class<?> type) {
+        setup(type);
         textInput.setText("The quick  brown fox");
         textInput.positionCaret(10);
         textInput.previousWord();
@@ -891,7 +1151,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(4, 4), textInput.getSelection());
     }
 
-    @Test public void previousWord_multipleWhitespaceInARow() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void previousWord_multipleWhitespaceInARow(Class<?> type) {
+        setup(type);
         textInput.setText("The quick  brown fox");
         textInput.positionCaret(11);
         textInput.previousWord();
@@ -900,7 +1163,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(4, 4), textInput.getSelection());
     }
 
-    @Test public void previousWord_withANumber() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void previousWord_withANumber(Class<?> type) {
+        setup(type);
         textInput.setText("There are 5 cards in the hand");
         textInput.positionCaret(12);
         textInput.previousWord();
@@ -909,7 +1175,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(10, 10), textInput.getSelection());
     }
 
-    @Test public void previousWord_withALongNumber() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void previousWord_withALongNumber(Class<?> type) {
+        setup(type);
         textInput.setText("There are 52 cards in the deck");
         textInput.positionCaret(13);
         textInput.previousWord();
@@ -918,14 +1187,20 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(10, 10), textInput.getSelection());
     }
 
-    @Test public void nextWordWithNoText() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void nextWordWithNoText(Class<?> type) {
+        setup(type);
         textInput.nextWord();
         assertEquals(0, textInput.getCaretPosition());
         assertEquals(0, textInput.getAnchor());
         assertEquals(new IndexRange(0, 0), textInput.getSelection());
     }
 
-    @Test public void nextWordWithSelection_caretPositionBeforeAnchor() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void nextWordWithSelection_caretPositionBeforeAnchor(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(9, 4);
         textInput.nextWord();
@@ -934,7 +1209,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(10, 10), textInput.getSelection());
     }
 
-    @Test public void nextWordWithSelection_caretPositionBeforeAnchor2() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void nextWordWithSelection_caretPositionBeforeAnchor2(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(9, 2);
         textInput.nextWord();
@@ -943,7 +1221,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(4, 4), textInput.getSelection());
     }
 
-    @Test public void nextWordWithSelection_caretPositionAfterAnchor() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void nextWordWithSelection_caretPositionAfterAnchor(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(4, 9);
         textInput.nextWord();
@@ -952,7 +1233,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(10, 10), textInput.getSelection());
     }
 
-    @Test public void nextWordWithSelection_caretPositionAfterAnchor2() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void nextWordWithSelection_caretPositionAfterAnchor2(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(5, 11);
         textInput.nextWord();
@@ -961,7 +1245,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(16, 16), textInput.getSelection());
     }
 
-    @Test public void nextWord_caretWithinAWord() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void nextWord_caretWithinAWord(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.positionCaret(6);
         textInput.nextWord();
@@ -970,7 +1257,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(10, 10), textInput.getSelection());
     }
 
-    @Test public void nextWord_caretAfterWord() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void nextWord_caretAfterWord(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.positionCaret(9);
         textInput.nextWord();
@@ -979,7 +1269,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(10, 10), textInput.getSelection());
     }
 
-    @Test public void nextWord_caretBeforeWord() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void nextWord_caretBeforeWord(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.positionCaret(4);
         textInput.nextWord();
@@ -988,7 +1281,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(10, 10), textInput.getSelection());
     }
 
-    @Test public void nextWord_caretWithinWhitespace() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void nextWord_caretWithinWhitespace(Class<?> type) {
+        setup(type);
         textInput.setText("The quick  brown fox");
         textInput.positionCaret(10);
         textInput.nextWord();
@@ -997,7 +1293,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(11, 11), textInput.getSelection());
     }
 
-    @Test public void nextWord_multipleWhitespaceInARow() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void nextWord_multipleWhitespaceInARow(Class<?> type) {
+        setup(type);
         textInput.setText("The quick  brown fox");
         textInput.positionCaret(9);
         textInput.nextWord();
@@ -1006,7 +1305,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(11, 11), textInput.getSelection());
     }
 
-    @Test public void nextWord_toTheEnd() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void nextWord_toTheEnd(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.positionCaret(16);
         textInput.nextWord();
@@ -1015,7 +1317,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(19, 19), textInput.getSelection());
     }
 
-    @Test public void nextWord_withANumber() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void nextWord_withANumber(Class<?> type) {
+        setup(type);
         textInput.setText("There are 5 cards in the hand");
         textInput.positionCaret(6);
         textInput.nextWord();
@@ -1024,7 +1329,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(10, 10), textInput.getSelection());
     }
 
-    @Test public void nextWord_withALongNumber() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void nextWord_withALongNumber(Class<?> type) {
+        setup(type);
         textInput.setText("There are 52 cards in the deck");
         textInput.positionCaret(10);
         textInput.nextWord();
@@ -1033,14 +1341,20 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(13, 13), textInput.getSelection());
     }
 
-    @Test public void endOfNextWordWithNoText() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void endOfNextWordWithNoText(Class<?> type) {
+        setup(type);
         textInput.endOfNextWord();
         assertEquals(0, textInput.getCaretPosition());
         assertEquals(0, textInput.getAnchor());
         assertEquals(new IndexRange(0, 0), textInput.getSelection());
     }
 
-    @Test public void endOfNextWordWithSelection_caretPositionBeforeAnchor() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void endOfNextWordWithSelection_caretPositionBeforeAnchor(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(9, 4);
         textInput.endOfNextWord();
@@ -1049,7 +1363,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(9, 9), textInput.getSelection());
     }
 
-    @Test public void endOfNextWordWithSelection_caretPositionBeforeAnchor2() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void endOfNextWordWithSelection_caretPositionBeforeAnchor2(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(9, 2);
         textInput.endOfNextWord();
@@ -1058,7 +1375,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(3, 3), textInput.getSelection());
     }
 
-    @Test public void endOfNextWordWithSelection_caretPositionAfterAnchor() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void endOfNextWordWithSelection_caretPositionAfterAnchor(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(4, 9);
         textInput.endOfNextWord();
@@ -1067,7 +1387,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(15, 15), textInput.getSelection());
     }
 
-    @Test public void endOfNextWordWithSelection_caretPositionAfterAnchor2() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void endOfNextWordWithSelection_caretPositionAfterAnchor2(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(5, 11);
         textInput.endOfNextWord();
@@ -1076,7 +1399,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(15, 15), textInput.getSelection());
     }
 
-    @Test public void endOfNextWord_caretWithinAWord() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void endOfNextWord_caretWithinAWord(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.positionCaret(6);
         textInput.endOfNextWord();
@@ -1085,7 +1411,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(9, 9), textInput.getSelection());
     }
 
-    @Test public void endOfNextWord_caretAfterWord() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void endOfNextWord_caretAfterWord(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.positionCaret(9);
         textInput.endOfNextWord();
@@ -1094,7 +1423,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(15, 15), textInput.getSelection());
     }
 
-    @Test public void endOfNextWord_caretBeforeWord() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void endOfNextWord_caretBeforeWord(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.positionCaret(4);
         textInput.endOfNextWord();
@@ -1103,7 +1435,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(9, 9), textInput.getSelection());
     }
 
-    @Test public void endOfNextWord_caretWithinWhitespace() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void endOfNextWord_caretWithinWhitespace(Class<?> type) {
+        setup(type);
         textInput.setText("The quick  brown fox");
         textInput.positionCaret(10);
         textInput.endOfNextWord();
@@ -1112,7 +1447,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(16, 16), textInput.getSelection());
     }
 
-    @Test public void endOfNextWord_multipleWhitespaceInARow() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void endOfNextWord_multipleWhitespaceInARow(Class<?> type) {
+        setup(type);
         textInput.setText("The quick  brown fox");
         textInput.positionCaret(9);
         textInput.endOfNextWord();
@@ -1121,7 +1459,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(16, 16), textInput.getSelection());
     }
 
-    @Test public void endOfNextWord_withANumber() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void endOfNextWord_withANumber(Class<?> type) {
+        setup(type);
         textInput.setText("There are 5 cards in the hand");
         textInput.positionCaret(6);
         textInput.endOfNextWord();
@@ -1130,7 +1471,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(9, 9), textInput.getSelection());
     }
 
-    @Test public void endOfNextWord_withANumber_CaretOnANumber() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void endOfNextWord_withANumber_CaretOnANumber(Class<?> type) {
+        setup(type);
         textInput.setText("There are 5 cards in the hand");
         textInput.positionCaret(10);
         textInput.endOfNextWord();
@@ -1139,7 +1483,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(11, 11), textInput.getSelection());
     }
 
-    @Test public void endOfNextWord_withALongNumber_CaretOnANumber() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void endOfNextWord_withALongNumber_CaretOnANumber(Class<?> type) {
+        setup(type);
         textInput.setText("There are 52 cards in the deck");
         textInput.positionCaret(10);
         textInput.endOfNextWord();
@@ -1148,14 +1495,20 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(12, 12), textInput.getSelection());
     }
 
-    @Test public void selectPreviousWordWithNoText() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectPreviousWordWithNoText(Class<?> type) {
+        setup(type);
         textInput.selectPreviousWord();
         assertEquals(0, textInput.getCaretPosition());
         assertEquals(0, textInput.getAnchor());
         assertEquals(new IndexRange(0, 0), textInput.getSelection());
     }
 
-    @Test public void selectPreviousWordWithSelection_caretPositionBeforeAnchor() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectPreviousWordWithSelection_caretPositionBeforeAnchor(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(15, 10);
         textInput.selectPreviousWord();
@@ -1164,7 +1517,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(4, 15), textInput.getSelection());
     }
 
-    @Test public void selectPreviousWordWithSelection_caretPositionAfterAnchor() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectPreviousWordWithSelection_caretPositionAfterAnchor(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(10, 15);
         textInput.selectPreviousWord();
@@ -1173,7 +1529,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(10, 10), textInput.getSelection());
     }
 
-    @Test public void selectPreviousWordWithSelection_caretPositionAfterAnchor2() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectPreviousWordWithSelection_caretPositionAfterAnchor2(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(11, 15);
         textInput.selectPreviousWord();
@@ -1182,7 +1541,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(10, 11), textInput.getSelection());
     }
 
-    @Test public void selectPreviousWord_caretWithinAWord() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectPreviousWord_caretWithinAWord(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.positionCaret(12);
         textInput.selectPreviousWord();
@@ -1191,7 +1553,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(10, 12), textInput.getSelection());
     }
 
-    @Test public void selectPreviousWord_caretAfterWord() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectPreviousWord_caretAfterWord(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.positionCaret(15);
         textInput.selectPreviousWord();
@@ -1200,7 +1565,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(10, 15), textInput.getSelection());
     }
 
-    @Test public void selectPreviousWord_caretBeforeWord() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectPreviousWord_caretBeforeWord(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.positionCaret(10);
         textInput.selectPreviousWord();
@@ -1209,7 +1577,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(4, 10), textInput.getSelection());
     }
 
-    @Test public void selectPreviousWord_caretWithinWhitespace() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectPreviousWord_caretWithinWhitespace(Class<?> type) {
+        setup(type);
         textInput.setText("The quick  brown fox");
         textInput.positionCaret(10);
         textInput.selectPreviousWord();
@@ -1218,7 +1589,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(4, 10), textInput.getSelection());
     }
 
-    @Test public void selectPreviousWord_multipleWhitespaceInARow() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectPreviousWord_multipleWhitespaceInARow(Class<?> type) {
+        setup(type);
         textInput.setText("The quick  brown fox");
         textInput.positionCaret(11);
         textInput.selectPreviousWord();
@@ -1227,14 +1601,20 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(4, 11), textInput.getSelection());
     }
 
-    @Test public void selectNextWordWithNoText() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectNextWordWithNoText(Class<?> type) {
+        setup(type);
         textInput.selectNextWord();
         assertEquals(0, textInput.getCaretPosition());
         assertEquals(0, textInput.getAnchor());
         assertEquals(new IndexRange(0, 0), textInput.getSelection());
     }
 
-    @Test public void selectNextWordWithSelection_caretPositionBeforeAnchor() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectNextWordWithSelection_caretPositionBeforeAnchor(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(9, 4);
         textInput.selectNextWord();
@@ -1243,7 +1623,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(9, 10), textInput.getSelection());
     }
 
-    @Test public void selectNextWordWithSelection_caretPositionBeforeAnchor2() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectNextWordWithSelection_caretPositionBeforeAnchor2(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(9, 2);
         textInput.selectNextWord();
@@ -1252,7 +1635,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(4, 9), textInput.getSelection());
     }
 
-    @Test public void selectNextWordWithSelection_caretPositionAfterAnchor() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectNextWordWithSelection_caretPositionAfterAnchor(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(4, 9);
         textInput.selectNextWord();
@@ -1261,7 +1647,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(4, 10), textInput.getSelection());
     }
 
-    @Test public void selectNextWordWithSelection_caretPositionAfterAnchor2() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectNextWordWithSelection_caretPositionAfterAnchor2(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(5, 11);
         textInput.selectNextWord();
@@ -1270,7 +1659,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(5, 16), textInput.getSelection());
     }
 
-    @Test public void selectNextWord_caretWithinAWord() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectNextWord_caretWithinAWord(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.positionCaret(6);
         textInput.selectNextWord();
@@ -1279,7 +1671,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(6, 10), textInput.getSelection());
     }
 
-    @Test public void selectNextWord_caretAfterWord() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectNextWord_caretAfterWord(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.positionCaret(9);
         textInput.selectNextWord();
@@ -1288,7 +1683,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(9, 10), textInput.getSelection());
     }
 
-    @Test public void selectNextWord_caretBeforeWord() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectNextWord_caretBeforeWord(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.positionCaret(4);
         textInput.selectNextWord();
@@ -1297,7 +1695,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(4, 10), textInput.getSelection());
     }
 
-    @Test public void selectNextWord_caretWithinWhitespace() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectNextWord_caretWithinWhitespace(Class<?> type) {
+        setup(type);
         textInput.setText("The quick  brown fox");
         textInput.positionCaret(10);
         textInput.selectNextWord();
@@ -1306,7 +1707,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(10, 11), textInput.getSelection());
     }
 
-    @Test public void selectNextWord_multipleWhitespaceInARow() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectNextWord_multipleWhitespaceInARow(Class<?> type) {
+        setup(type);
         textInput.setText("The quick  brown fox");
         textInput.positionCaret(9);
         textInput.selectNextWord();
@@ -1315,7 +1719,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(9, 11), textInput.getSelection());
     }
 
-    @Test public void selectNextWord_toTheEnd() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectNextWord_toTheEnd(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.positionCaret(16);
         textInput.selectNextWord();
@@ -1324,14 +1731,20 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(16, 19), textInput.getSelection());
     }
 
-    @Test public void selectEndOfNextWordWithNoText() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectEndOfNextWordWithNoText(Class<?> type) {
+        setup(type);
         textInput.selectEndOfNextWord();
         assertEquals(0, textInput.getCaretPosition());
         assertEquals(0, textInput.getAnchor());
         assertEquals(new IndexRange(0, 0), textInput.getSelection());
     }
 
-    @Test public void selectEndOfNextWordWithSelection_caretPositionBeforeAnchor() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectEndOfNextWordWithSelection_caretPositionBeforeAnchor(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(9, 4);
         textInput.selectEndOfNextWord();
@@ -1340,7 +1753,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(9, 9), textInput.getSelection());
     }
 
-    @Test public void selectEndOfNextWordWithSelection_caretPositionBeforeAnchor2() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectEndOfNextWordWithSelection_caretPositionBeforeAnchor2(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(9, 2);
         textInput.selectEndOfNextWord();
@@ -1349,7 +1765,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(3, 9), textInput.getSelection());
     }
 
-    @Test public void selectEndOfNextWordWithSelection_caretPositionAfterAnchor() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectEndOfNextWordWithSelection_caretPositionAfterAnchor(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(4, 9);
         textInput.selectEndOfNextWord();
@@ -1358,7 +1777,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(4, 15), textInput.getSelection());
     }
 
-    @Test public void selectEndOfNextWordWithSelection_caretPositionAfterAnchor2() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectEndOfNextWordWithSelection_caretPositionAfterAnchor2(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(5, 11);
         textInput.selectEndOfNextWord();
@@ -1367,7 +1789,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(5, 15), textInput.getSelection());
     }
 
-    @Test public void selectEndOfNextWord_caretWithinAWord() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectEndOfNextWord_caretWithinAWord(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.positionCaret(6);
         textInput.selectEndOfNextWord();
@@ -1376,7 +1801,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(6, 9), textInput.getSelection());
     }
 
-    @Test public void selectEndOfNextWord_caretAfterWord() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectEndOfNextWord_caretAfterWord(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.positionCaret(9);
         textInput.selectEndOfNextWord();
@@ -1385,7 +1813,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(9, 15), textInput.getSelection());
     }
 
-    @Test public void selectEndOfNextWord_caretBeforeWord() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectEndOfNextWord_caretBeforeWord(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.positionCaret(4);
         textInput.selectEndOfNextWord();
@@ -1394,7 +1825,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(4, 9), textInput.getSelection());
     }
 
-    @Test public void selectEndOfNextWord_caretWithinWhitespace() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectEndOfNextWord_caretWithinWhitespace(Class<?> type) {
+        setup(type);
         textInput.setText("The quick  brown fox");
         textInput.positionCaret(10);
         textInput.selectEndOfNextWord();
@@ -1403,7 +1837,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(10, 16), textInput.getSelection());
     }
 
-    @Test public void selectEndOfNextWord_multipleWhitespaceInARow() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectEndOfNextWord_multipleWhitespaceInARow(Class<?> type) {
+        setup(type);
         textInput.setText("The quick  brown fox");
         textInput.positionCaret(9);
         textInput.selectEndOfNextWord();
@@ -1412,7 +1849,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(9, 16), textInput.getSelection());
     }
 
-    @Test public void selectAllWithNoText() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectAllWithNoText(Class<?> type) {
+        setup(type);
         textInput.setText("");
         textInput.selectAll();
         assertEquals(0, textInput.getCaretPosition());
@@ -1420,7 +1860,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(0, 0), textInput.getSelection());
     }
 
-    @Test public void selectAllWithText_caretPositionIsAlwaysAtTheEnd() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectAllWithText_caretPositionIsAlwaysAtTheEnd(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectAll();
         assertEquals(19, textInput.getCaretPosition());
@@ -1428,7 +1871,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(0, 19), textInput.getSelection());
     }
 
-    @Test public void homeClearsSelection() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void homeClearsSelection(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(4, 9);
         textInput.home();
@@ -1437,7 +1883,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(0, 0), textInput.getSelection());
     }
 
-    @Test public void endClearsSelection() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void endClearsSelection(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(4, 9);
         textInput.end();
@@ -1446,7 +1895,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(19, 19), textInput.getSelection());
     }
 
-    @Test public void selectHomeHasNoEffectWhenCaretPositionIsAtZero() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectHomeHasNoEffectWhenCaretPositionIsAtZero(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(3, 0);
         textInput.selectHome();
@@ -1455,7 +1907,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(0, 3), textInput.getSelection());
     }
 
-    @Test public void selectHomeMovesCaretPositionToZero_CaretPositionRightOfAnchor() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectHomeMovesCaretPositionToZero_CaretPositionRightOfAnchor(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(4, 9);
         textInput.selectHome();
@@ -1464,7 +1919,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(0, 4), textInput.getSelection());
     }
 
-    @Test public void selectHomeMovesCaretPositionToZero_CaretPositionEqualsAnchor() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectHomeMovesCaretPositionToZero_CaretPositionEqualsAnchor(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(3, 3);
         textInput.selectHome();
@@ -1473,7 +1931,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(0, 3), textInput.getSelection());
     }
 
-    @Test public void selectHomeMovesCaretPositionToZero_CaretPositionLeftOfAnchor() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectHomeMovesCaretPositionToZero_CaretPositionLeftOfAnchor(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(6, 3);
         textInput.selectHome();
@@ -1482,7 +1943,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(0, 6), textInput.getSelection());
     }
 
-    @Test public void selectEndHasNoEffectWhenCaretPositionIsAtLength() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectEndHasNoEffectWhenCaretPositionIsAtLength(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(3, 19);
         textInput.selectEnd();
@@ -1491,7 +1955,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(3, 19), textInput.getSelection());
     }
 
-    @Test public void selectEndMovesCaretPositionToLength_CaretPositionRightOfAnchor() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectEndMovesCaretPositionToLength_CaretPositionRightOfAnchor(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(0, 3);
         textInput.selectEnd();
@@ -1500,7 +1967,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(0, 19), textInput.getSelection());
     }
 
-    @Test public void selectEndMovesCaretPositionToLength_CaretPositionEqualsAnchor() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectEndMovesCaretPositionToLength_CaretPositionEqualsAnchor(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(3, 3);
         textInput.selectEnd();
@@ -1509,7 +1979,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(3, 19), textInput.getSelection());
     }
 
-    @Test public void selectEndMovesCaretPositionToLength_CaretPositionLeftOfAnchor() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectEndMovesCaretPositionToLength_CaretPositionLeftOfAnchor(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(6, 3);
         textInput.selectEnd();
@@ -1518,7 +1991,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(6, 19), textInput.getSelection());
     }
 
-    @Test public void deletePreviousCharDeletesOnlySelectedText_anchorLessThanCaretPosition() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void deletePreviousCharDeletesOnlySelectedText_anchorLessThanCaretPosition(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(4, 10);
         textInput.deletePreviousChar();
@@ -1528,7 +2004,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(4, 4), textInput.getSelection());
     }
 
-    @Test public void deletePreviousCharDeletesOnlySelectedText_caretPositionLessThanAnchor() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void deletePreviousCharDeletesOnlySelectedText_caretPositionLessThanAnchor(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(10, 4);
         textInput.deletePreviousChar();
@@ -1538,7 +2017,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(4, 4), textInput.getSelection());
     }
 
-    @Test public void deletePreviousCharDeletesPreviousCharWhenCaretPositionEqualsAnchor() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void deletePreviousCharDeletesPreviousCharWhenCaretPositionEqualsAnchor(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(10, 10);
         textInput.deletePreviousChar();
@@ -1548,7 +2030,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(9, 9), textInput.getSelection());
     }
 
-    @Test public void deletePreviousCharDoesNothingWhenSelectionIs0_0() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void deletePreviousCharDoesNothingWhenSelectionIs0_0(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(0, 0);
         textInput.deletePreviousChar();
@@ -1558,7 +2043,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(0, 0), textInput.getSelection());
     }
 
-    @Test public void deleteNextCharDeletesOnlySelectedText_anchorLessThanCaretPosition() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void deleteNextCharDeletesOnlySelectedText_anchorLessThanCaretPosition(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(4, 10);
         textInput.deleteNextChar();
@@ -1568,7 +2056,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(4, 4), textInput.getSelection());
     }
 
-    @Test public void deleteNextCharDeletesOnlySelectedText_caretPositionLessThanAnchor() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void deleteNextCharDeletesOnlySelectedText_caretPositionLessThanAnchor(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(10, 4);
         textInput.deleteNextChar();
@@ -1578,7 +2069,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(4, 4), textInput.getSelection());
     }
 
-    @Test public void deleteNextCharDeletesNextCharWhenCaretPositionEqualsAnchor() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void deleteNextCharDeletesNextCharWhenCaretPositionEqualsAnchor(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(10, 10);
         textInput.deleteNextChar();
@@ -1588,7 +2082,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(10, 10), textInput.getSelection());
     }
 
-    @Test public void deleteNextCharDoesNothingWhenSelectionIsEmptyAtEnd() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void deleteNextCharDoesNothingWhenSelectionIsEmptyAtEnd(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(19, 19);
         textInput.deleteNextChar();
@@ -1598,7 +2095,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(19, 19), textInput.getSelection());
     }
 
-    @Test public void forwardSkipsSelection() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void forwardSkipsSelection(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(4, 9);
         textInput.forward();
@@ -1607,7 +2107,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(9, 9), textInput.getSelection());
     }
 
-    @Test public void forwardSkipsSelection2() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void forwardSkipsSelection2(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(9, 4);
         textInput.forward();
@@ -1616,7 +2119,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(9, 9), textInput.getSelection());
     }
 
-    @Test public void forwardMovesForwardWhenNotAtEnd() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void forwardMovesForwardWhenNotAtEnd(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(0, 0);
         textInput.forward();
@@ -1625,7 +2131,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(1, 1), textInput.getSelection());
     }
 
-    @Test public void forwardDoesNothingWhenAtEnd() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void forwardDoesNothingWhenAtEnd(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(19, 19);
         textInput.forward();
@@ -1634,7 +2143,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(19, 19), textInput.getSelection());
     }
 
-    @Test public void backwardSkipsSelection() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void backwardSkipsSelection(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(4, 9);
         textInput.backward();
@@ -1643,7 +2155,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(4, 4), textInput.getSelection());
     }
 
-    @Test public void backwardSkipsSelection2() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void backwardSkipsSelection2(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(9, 4);
         textInput.backward();
@@ -1652,7 +2167,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(4, 4), textInput.getSelection());
     }
 
-    @Test public void backwardMovesBackwardWhenNotAtStart() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void backwardMovesBackwardWhenNotAtStart(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.positionCaret(14);
         textInput.backward();
@@ -1661,7 +2179,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(13, 13), textInput.getSelection());
     }
 
-    @Test public void backwardDoesNothingWhenAtStart() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void backwardDoesNothingWhenAtStart(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(0, 0);
         textInput.backward();
@@ -1670,7 +2191,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(0, 0), textInput.getSelection());
     }
 
-    @Test public void positionCaretAtStart() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void positionCaretAtStart(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.positionCaret(0);
         assertEquals(0, textInput.getCaretPosition());
@@ -1678,7 +2202,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(0, 0), textInput.getSelection());
     }
 
-    @Test public void positionCaretInMiddle() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void positionCaretInMiddle(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.positionCaret(10);
         assertEquals(10, textInput.getCaretPosition());
@@ -1686,7 +2213,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(10, 10), textInput.getSelection());
     }
 
-    @Test public void positionCaretAtEnd() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void positionCaretAtEnd(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.positionCaret(19);
         assertEquals(19, textInput.getCaretPosition());
@@ -1694,7 +2224,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(19, 19), textInput.getSelection());
     }
 
-    @Test public void positionCaretBeyondStartClamps() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void positionCaretBeyondStartClamps(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.positionCaret(-10);
         assertEquals(0, textInput.getCaretPosition());
@@ -1702,7 +2235,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(0, 0), textInput.getSelection());
     }
 
-    @Test public void positionCaretBeyondEndClamps() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void positionCaretBeyondEndClamps(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.positionCaret(1000);
         assertEquals(19, textInput.getCaretPosition());
@@ -1710,7 +2246,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(19, 19), textInput.getSelection());
     }
 
-    @Test public void selectPositionCaretWhenAnchorAndCaretAreBothZero() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectPositionCaretWhenAnchorAndCaretAreBothZero(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(0, 0);
         textInput.selectPositionCaret(10);
@@ -1719,7 +2258,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(0, 10), textInput.getSelection());
     }
 
-    @Test public void selectPositionCaret_anchorLessThanCaretPosition() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectPositionCaret_anchorLessThanCaretPosition(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(4, 10);
         textInput.selectPositionCaret(1);
@@ -1728,7 +2270,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(1, 4), textInput.getSelection());
     }
 
-    @Test public void selectPositionCaret_anchorLessThanCaretPosition2() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectPositionCaret_anchorLessThanCaretPosition2(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(4, 10);
         textInput.selectPositionCaret(15);
@@ -1737,7 +2282,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(4, 15), textInput.getSelection());
     }
 
-    @Test public void selectPositionCaret_anchorLessThanCaretPosition3() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectPositionCaret_anchorLessThanCaretPosition3(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(4, 10);
         textInput.selectPositionCaret(4);
@@ -1746,7 +2294,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(4, 4), textInput.getSelection());
     }
 
-    @Test public void selectPositionCaret_caretPositionLessThanAnchor() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectPositionCaret_caretPositionLessThanAnchor(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(10, 4);
         textInput.selectPositionCaret(1);
@@ -1755,7 +2306,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(1, 10), textInput.getSelection());
     }
 
-    @Test public void selectPositionCaret_caretPositionLessThanAnchor2() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectPositionCaret_caretPositionLessThanAnchor2(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(10, 4);
         textInput.selectPositionCaret(14);
@@ -1764,7 +2318,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(10, 14), textInput.getSelection());
     }
 
-    @Test public void selectPositionCaret_caretPositionLessThanAnchor3() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectPositionCaret_caretPositionLessThanAnchor3(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(10, 4);
         textInput.selectPositionCaret(10);
@@ -1773,7 +2330,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(10, 10), textInput.getSelection());
     }
 
-    @Test public void selectPositionCaretWhenCaretPositionEqualsAnchor() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectPositionCaretWhenCaretPositionEqualsAnchor(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(10, 10);
         textInput.selectPositionCaret(4);
@@ -1782,7 +2342,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(4, 10), textInput.getSelection());
     }
 
-    @Test public void selectPositionCaretWhenCaretPositionEqualsAnchor2() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void selectPositionCaretWhenCaretPositionEqualsAnchor2(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(10, 10);
         textInput.selectPositionCaret(14);
@@ -1791,14 +2354,20 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(10, 14), textInput.getSelection());
     }
 
-    @Test public void extendSelectionWithNoText() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void extendSelectionWithNoText(Class<?> type) {
+        setup(type);
         textInput.extendSelection(0);
         assertEquals(0, textInput.getCaretPosition());
         assertEquals(0, textInput.getAnchor());
         assertEquals(new IndexRange(0, 0), textInput.getSelection());
     }
 
-    @Test public void extendSelectionWithOutOfRangePos() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void extendSelectionWithOutOfRangePos(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.selectRange(0, 0);
         textInput.extendSelection(1000);
@@ -1807,7 +2376,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(0, 19), textInput.getSelection());
     }
 
-    @Test public void extendSelectionWithOutOfRangePos2() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void extendSelectionWithOutOfRangePos2(Class<?> type) {
+        setup(type);
         textInput.setText("The quick brown fox");
         textInput.positionCaret(4);
         textInput.extendSelection(-19);
@@ -1816,7 +2388,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals(new IndexRange(0, 4), textInput.getSelection());
     }
 
-    @Test public void test_rt26250_caret_issue_for_thai_characters() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void test_rt26250_caret_issue_for_thai_characters(Class<?> type) {
+        setup(type);
         // Thai string containing two characters, consisting of three
         // codepoints each.
         String thaiStr = "\u0E17\u0E35\u0E48\u0E17\u0E35\u0E48";
@@ -1845,12 +2420,18 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals("", textInput.getText());
     }
 
-    @Test public void test_rt40376_delete_next_when_text_is_null() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void test_rt40376_delete_next_when_text_is_null(Class<?> type) {
+        setup(type);
         textInput.setText(null);
         textInput.deleteNextChar();
     }
 
-    @Test public void test_jdk_8171229_replaceText() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void test_jdk_8171229_replaceText(Class<?> type) {
+        setup(type);
         textInput.setText("");
         assertEquals("", textInput.getText());
 
@@ -1888,7 +2469,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals("", textInput.getText());
     }
 
-    @Test public void test_redo_replaceText_selectionShortening() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void test_redo_replaceText_selectionShortening(Class<?> type) {
+        setup(type);
         textInput.setText("0123456789");
         assertEquals("0123456789", textInput.getText());
 
@@ -1902,7 +2486,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals("01234567x", textInput.getText());
     }
 
-    @Test public void replaceSelectionAtEndWithListener() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void replaceSelectionAtEndWithListener(Class<?> type) {
+        setup(type);
         StringBuilder selectedTextLog = new StringBuilder();
         StringBuilder selectionLog = new StringBuilder();
         textInput.setText("x xxx");
@@ -1915,7 +2502,10 @@ public void caretAndAnchorPositionAfterSettingText() {
         assertEquals("x a", textInput.getText());
     }
 
-    @Test public void testSelectionProperties() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSelectionProperties(Class<?> type) {
+        setup(type);
         textInput.setText("abcdefghij");
 
         StringBuilder selectedTextLog = new StringBuilder();
@@ -1947,7 +2537,10 @@ public void caretAndAnchorPositionAfterSettingText() {
     }
 
     // Test for JDK-8178418
-    @Test public void UndoRedoSpaceSequence() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void UndoRedoSpaceSequence(Class<?> type) {
+        setup(type);
         Toolkit tk = Toolkit.getToolkit();
 
         assertTrue(tk instanceof StubToolkit);  // Ensure it's StubToolkit
@@ -1989,7 +2582,10 @@ public void caretAndAnchorPositionAfterSettingText() {
     }
 
     // Test for JDK-8178418
-    @Test public void UndoRedoReverseSpaceSequence() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void UndoRedoReverseSpaceSequence(Class<?> type) {
+        setup(type);
         Toolkit tk = Toolkit.getToolkit();
 
         assertTrue(tk instanceof StubToolkit);  // Ensure it's StubToolkit
@@ -2039,7 +2635,10 @@ public void caretAndAnchorPositionAfterSettingText() {
     }
 
     // Test for JDK-8178418
-    @Test public void UndoRedoWords() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void UndoRedoWords(Class<?> type) {
+        setup(type);
         Toolkit tk = Toolkit.getToolkit();
 
         assertTrue(tk instanceof StubToolkit);  // Ensure it's StubToolkit
@@ -2091,7 +2690,10 @@ public void caretAndAnchorPositionAfterSettingText() {
     }
 
     // Test for JDK-8178418
-    @Test public void UndoRedoTimestampBased() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void UndoRedoTimestampBased(Class<?> type) {
+        setup(type);
         Toolkit tk = Toolkit.getToolkit();
 
         assertTrue(tk instanceof StubToolkit);  // Ensure it's StubToolkit
@@ -2146,8 +2748,10 @@ private void copy(String string) {
         Clipboard.getSystemClipboard().setContent(content);
     }
 
-    @Test
-    public void previousWord_Bhojpuri() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void previousWord_Bhojpuri(Class<?> type) {
+        setup(type);
         // "Bhojpuri \ud804\udca6\ud804\udcb7\ud804\udc94\ud804\udca3\ud804\udcb3\ud804\udca9\ud804\udcb2 test"
         textInput.setText("Bhojpuri 𑂦𑂷𑂔𑂣𑂳𑂩𑂲 test");
         textInput.end();
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TitledPaneTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TitledPaneTest.java
index e73564bf88c..73eab606719 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TitledPaneTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TitledPaneTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,15 +25,14 @@
 
 package test.javafx.scene.control;
 
-import com.sun.javafx.scene.SceneHelper;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertPseudoClassDoesNotExist;
 import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertPseudoClassExists;
 import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
@@ -43,22 +42,21 @@
 import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.Scene;
+import javafx.scene.control.Button;
+import javafx.scene.control.TitledPane;
+import javafx.scene.control.skin.TitledPaneSkin;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.StackPane;
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
-
-import org.junit.Before;
-import org.junit.Test;
-
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.scene.SceneHelper;
+import com.sun.javafx.tk.Toolkit;
 import test.com.sun.javafx.pgstub.StubToolkit;
 import test.com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
 import test.com.sun.javafx.scene.control.infrastructure.MouseEventGenerator;
-import javafx.scene.control.skin.TitledPaneSkin;
-import com.sun.javafx.tk.Toolkit;
-import javafx.scene.control.Button;
-import javafx.scene.control.TitledPane;
 
 /**
  *
@@ -73,7 +71,8 @@ public class TitledPaneTest {
     private Stage stage;
     private StackPane root;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         node = new Rectangle();
         tk = Toolkit.getToolkit();
 
@@ -138,34 +137,34 @@ private void show() {
     @Test public void checkContentPropertyBind() {
         ObjectProperty objPr = new SimpleObjectProperty<Node>(null);
         titledPane.contentProperty().bind(objPr);
-        assertEquals("ContentProperty cannot be bound", titledPane.contentProperty().getValue(), null);
+        assertEquals(titledPane.contentProperty().getValue(), null, "ContentProperty cannot be bound");
         Node nde = new Rectangle();
         objPr.setValue(nde);
-        assertEquals("ContentProperty cannot be bound", titledPane.contentProperty().getValue(), nde);
+        assertEquals(titledPane.contentProperty().getValue(), nde, "ContentProperty cannot be bound");
     }
 
     @Test public void checkExpandedPropertyBind() {
         BooleanProperty objPr = new SimpleBooleanProperty(true);
         titledPane.expandedProperty().bind(objPr);
-        assertEquals("Expanded cannot be bound", titledPane.expandedProperty().getValue(), true);
+        assertEquals(titledPane.expandedProperty().getValue(), true, "Expanded cannot be bound");
         objPr.setValue(false);
-        assertEquals("Expanded cannot be bound", titledPane.expandedProperty().getValue(), false);
+        assertEquals(titledPane.expandedProperty().getValue(), false, "Expanded cannot be bound");
     }
 
     @Test public void checkAnimatedPropertyBind() {
         BooleanProperty objPr = new SimpleBooleanProperty(true);
         titledPane.animatedProperty().bind(objPr);
-        assertEquals("Animated cannot be bound", titledPane.animatedProperty().getValue(), true);
+        assertEquals(titledPane.animatedProperty().getValue(), true, "Animated cannot be bound");
         objPr.setValue(false);
-        assertEquals("Animated cannot be bound", titledPane.animatedProperty().getValue(), false);
+        assertEquals(titledPane.animatedProperty().getValue(), false, "Animated cannot be bound");
     }
 
     @Test public void checkCollapsiblePropertyBind() {
         BooleanProperty objPr = new SimpleBooleanProperty(true);
         titledPane.collapsibleProperty().bind(objPr);
-        assertEquals("Collapsible cannot be bound", titledPane.collapsibleProperty().getValue(), true);
+        assertEquals(titledPane.collapsibleProperty().getValue(), true, "Collapsible cannot be bound");
         objPr.setValue(false);
-        assertEquals("Collapsible cannot be bound", titledPane.collapsibleProperty().getValue(), false);
+        assertEquals(titledPane.collapsibleProperty().getValue(), false, "Collapsible cannot be bound");
     }
 
 
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ToggleButtonTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ToggleButtonTest.java
index 014d011a364..41d6f725e92 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ToggleButtonTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ToggleButtonTest.java
@@ -25,11 +25,14 @@
 
 package test.javafx.scene.control;
 
-import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.*;
-
-import test.com.sun.javafx.pgstub.StubToolkit;
-import com.sun.javafx.logging.PlatformLogger;
-import com.sun.javafx.tk.Toolkit;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertPseudoClassDoesNotExist;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertPseudoClassExists;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
 import javafx.event.ActionEvent;
 import javafx.event.EventType;
 import javafx.geometry.Pos;
@@ -37,10 +40,11 @@
 import javafx.scene.control.ToggleButton;
 import javafx.scene.control.ToggleGroup;
 import javafx.scene.shape.Rectangle;
-import static org.junit.Assert.*;
-
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.logging.PlatformLogger;
+import com.sun.javafx.tk.Toolkit;
+import test.com.sun.javafx.pgstub.StubToolkit;
 import test.util.memory.JMemoryBuddy;
 
 /**
@@ -54,7 +58,8 @@ public class ToggleButtonTest {
     private ToggleButton toggleWithGraphic;//With Graphic
     private Node node;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         assertTrue(Toolkit.getToolkit() instanceof StubToolkit);  // Ensure StubToolkit is loaded
 
         node = new Rectangle();
@@ -242,6 +247,6 @@ public class ToggleButtonTest {
         } catch (InterruptedException ex) {
             PlatformLogger.getLogger(ToggleButtonTest.class.getName()).severe(null, ex);
         }
-        assertTrue("fire() doesnt emit ActionEvent!", flag[0]);
+        assertTrue(flag[0], "fire() doesnt emit ActionEvent!");
     }
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ToggleGroupTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ToggleGroupTest.java
index 267d90a48d6..9c12c039951 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ToggleGroupTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ToggleGroupTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,13 @@
 
 package test.javafx.scene.control;
 
-import com.sun.javafx.event.EventUtil;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.scene.Group;
@@ -35,13 +41,9 @@
 import javafx.scene.control.ToggleGroup;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.event.EventUtil;
 
 public class ToggleGroupTest {
     private ToggleButton b1, b2, b3, b4;
@@ -64,7 +66,8 @@ private boolean isNotMember(ToggleButton b, ToggleGroup g) {
         return !isMember(b, g);
     }
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         b1 = make("one");
         b2 = make("two");
         b3 = make("three");
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ToolBarHorizontalArrowsTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ToolBarHorizontalArrowsTest.java
index 0f1e03ec03a..1e4ef238683 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ToolBarHorizontalArrowsTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ToolBarHorizontalArrowsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,25 +25,18 @@
 
 package test.javafx.scene.control;
 
-import java.util.Arrays;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.Collection;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import static org.junit.Assert.*;
-
-import com.sun.javafx.tk.Toolkit;
-
+import java.util.List;
 import javafx.geometry.NodeOrientation;
 import javafx.scene.control.Button;
 import javafx.scene.control.ToolBar;
 import javafx.scene.control.skin.ToolBarSkin;
 import javafx.scene.input.KeyCode;
-
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import com.sun.javafx.tk.Toolkit;
 import test.com.sun.javafx.pgstub.StubToolkit;
 import test.com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
 import test.com.sun.javafx.scene.control.infrastructure.KeyModifier;
@@ -54,14 +47,12 @@
  * Test basic horizontal navigation mappings for ToolBar.
  * It is parameterized on NodeOrientation
  */
-@RunWith(Parameterized.class)
 public class ToolBarHorizontalArrowsTest {
-    @Parameterized.Parameters
-    public static Collection<?> implementations() {
-        return Arrays.asList(new Object[][] {
-            {NodeOrientation.LEFT_TO_RIGHT},
-            {NodeOrientation.RIGHT_TO_LEFT}
-        });
+    private static Collection<NodeOrientation> parameters() {
+        return List.of(
+            NodeOrientation.LEFT_TO_RIGHT,
+            NodeOrientation.RIGHT_TO_LEFT
+        );
     }
 
     private ToolBar toolBar;
@@ -75,11 +66,10 @@ public static Collection<?> implementations() {
     private StageLoader stageLoader;
     private NodeOrientation orientation;
 
-    public ToolBarHorizontalArrowsTest(NodeOrientation val) {
-        orientation = val;
-    }
-
-    @Before public void setup() {
+    // @BeforeEach
+    // junit5 does not support parameterized class-level tests yet
+    public void setup(NodeOrientation orientation) {
+        this.orientation = orientation;
         toolBar = new ToolBar();
         toolBar.setNodeOrientation(orientation);
 
@@ -104,7 +94,7 @@ public ToolBarHorizontalArrowsTest(NodeOrientation val) {
         keyboard = new KeyEventFirer(toolBar, toolBar.getScene());
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         toolBar.getSkin().dispose();
         stageLoader.dispose();
@@ -151,8 +141,10 @@ private void backward(KeyModifier... modifiers) {
     /**
      * Test forward focus movements with TAB key
      */
-    @Test
-    public void testForwardFocus() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testForwardFocus(NodeOrientation orientation) {
+        setup(orientation);
         assertTrue(toolBar.isFocusTraversable());
 
         toolBar.getScene().getWindow().requestFocus();
@@ -174,8 +166,10 @@ public void testForwardFocus() {
     /**
      * Test backward focus movements with SHIFT+TAB keys
      */
-    @Test
-    public void testBackwardFocus() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testBackwardFocus(NodeOrientation orientation) {
+        setup(orientation);
         assertTrue(toolBar.isFocusTraversable());
 
         toolBar.getScene().getWindow().requestFocus();
@@ -195,8 +189,10 @@ public void testBackwardFocus() {
         assertTrue(btn1.isFocused());
     }
 
-    @Test
-    public void testForwardFocusArrows() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testForwardFocusArrows(NodeOrientation orientation) {
+        setup(orientation);
         assertTrue(toolBar.isFocusTraversable());
 
         toolBar.getScene().getWindow().requestFocus();
@@ -215,8 +211,10 @@ public void testForwardFocusArrows() {
         assertTrue(btn5.isFocused());
     }
 
-    @Test
-    public void testBackwardFocusArrows() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testBackwardFocusArrows(NodeOrientation orientation) {
+        setup(orientation);
         assertTrue(toolBar.isFocusTraversable());
 
         toolBar.getScene().getWindow().requestFocus();
@@ -240,8 +238,10 @@ public void testBackwardFocusArrows() {
      * Test forward focus movement when ToolBar's NodeOrientation
      * is changed dynamically.
      */
-    @Test
-    public void testForwardFocusArrows_toggleOrientation() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testForwardFocusArrows_toggleOrientation(NodeOrientation orientation) {
+        setup(orientation);
         assertTrue(toolBar.isFocusTraversable());
 
         toolBar.getScene().getWindow().requestFocus();
@@ -268,8 +268,10 @@ public void testForwardFocusArrows_toggleOrientation() {
      * Test backward focus movement when ToolBar's NodeOrientation
      * is changed dynamically.
      */
-    @Test
-    public void testBackwardFocusArrows_toggleOrientation() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testBackwardFocusArrows_toggleOrientation(NodeOrientation orientation) {
+        setup(orientation);
         assertTrue(toolBar.isFocusTraversable());
 
         toolBar.getScene().getWindow().requestFocus();
@@ -297,8 +299,10 @@ public void testBackwardFocusArrows_toggleOrientation() {
      * Test forward/backward focus movements when ToolBar's NodeOrientation
      * is changed dynamically.
      */
-    @Test
-    public void testMixedFocusArrows_toggleOrientation() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testMixedFocusArrows_toggleOrientation(NodeOrientation orientation) {
+        setup(orientation);
         assertTrue(toolBar.isFocusTraversable());
 
         toolBar.getScene().getWindow().requestFocus();
@@ -324,8 +328,10 @@ public void testMixedFocusArrows_toggleOrientation() {
     /**
      * Test focus movements when focus is at extreme child Nodes of the ToolBar
      */
-    @Test
-    public void testFocusExtremeNodesOfToolBar() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testFocusExtremeNodesOfToolBar(NodeOrientation orientation) {
+        setup(orientation);
         assertTrue(toolBar.isFocusTraversable());
 
         // Test backward movement when focus is at the first Button in the toolBar
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ToolbarTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ToolbarTest.java
index 192ac45a9c8..bc42f559ac5 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ToolbarTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ToolbarTest.java
@@ -27,7 +27,29 @@
 
 import javafx.css.CssMetaData;
 import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.*;
-
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.Arguments;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertTimeout;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.params.provider.Arguments;
 import javafx.scene.AccessibleAttribute;
 import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
@@ -49,11 +71,6 @@
 import javafx.scene.layout.Pane;
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
-import static org.junit.Assert.*;
-
-
-import org.junit.Before;
-import org.junit.Test;
 
 /**
  *
@@ -73,7 +90,8 @@ public class ToolbarTest {
     private static final double EXPANDED_CHILDREN_SIZE = 250.0;
     private static final double ORIGINAL_CHILDREN_SIZE = 100.0;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         tk = Toolkit.getToolkit();
 
         assertTrue(tk instanceof StubToolkit);  // Ensure it's StubToolkit
@@ -302,17 +320,21 @@ private void checkNodeBoundsWithinToolbar(Node node) {
 
         Pane overflowButton = getOverflowButton();
         if (overflowButton.getScene() != null && overflowButton.isVisible()) {
-            assertTrue("'" + node.getId() + "' is overlapping the overflowButton." +
-                            " The node " + "<" + nodeX + ".." + (nodeX + nodeWidth) + ">."
-                            + " The overflow button " + "<" + overflowButton.getLayoutX() + ".." + (overflowButton.getLayoutX() + overflowButton.getWidth()) + ">",
-                    nodeX + nodeWidth < overflowButton.getLayoutX());
+            assertTrue(
+                nodeX + nodeWidth < overflowButton.getLayoutX(),
+                "'" + node.getId() + "' is overlapping the overflowButton." +
+                " The node " + "<" + nodeX + ".." + (nodeX + nodeWidth) + ">."
+                + " The overflow button " + "<" + overflowButton.getLayoutX() + ".."
+                + (overflowButton.getLayoutX() + overflowButton.getWidth()) + ">"
+            );
         }
 
-        assertTrue("'" + node.getId() + "' bounds are outside the toolbar." +
-                        " The node " + "<" + nodeX + ".." + (nodeX + nodeWidth) + ">."
-                        + " The toolbar width " + toolBar.getWidth(),
-                nodeX + nodeWidth < toolBar.getWidth());
-
+        assertTrue(
+            nodeX + nodeWidth < toolBar.getWidth(),
+            "'" + node.getId() + "' bounds are outside the toolbar." +
+            " The node " + "<" + nodeX + ".." + (nodeX + nodeWidth) + ">."
+            + " The toolbar width " + toolBar.getWidth()
+        );
     }
 
     private void initializeToolBar() {
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TooltipTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TooltipTest.java
index abc0cd55953..d97de7dc47b 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TooltipTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TooltipTest.java
@@ -25,14 +25,16 @@
 
 package test.javafx.scene.control;
 
-import javafx.css.CssMetaData;
-
-import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.*;
-
-import javafx.scene.input.MouseEvent;
-import javafx.util.Duration;
-import test.com.sun.javafx.pgstub.StubToolkit;
-import com.sun.javafx.tk.Toolkit;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.ObjectProperty;
@@ -41,28 +43,27 @@
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
+import javafx.css.CssMetaData;
 import javafx.css.StyleableProperty;
 import javafx.scene.Node;
 import javafx.scene.control.ContentDisplay;
 import javafx.scene.control.OverrunStyle;
 import javafx.scene.control.Tooltip;
 import javafx.scene.control.TooltipShim;
+import javafx.scene.input.MouseEvent;
 import javafx.scene.shape.Rectangle;
 import javafx.scene.text.Font;
 import javafx.scene.text.TextAlignment;
-
-import static org.junit.Assert.*;
-
-import org.junit.Before;
-import org.junit.After;
-import org.junit.Ignore;
-import org.junit.Test;
+import javafx.util.Duration;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.tk.Toolkit;
+import test.com.sun.javafx.pgstub.StubToolkit;
 import test.com.sun.javafx.scene.control.infrastructure.MouseEventGenerator;
 import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
 
-import java.nio.charset.StandardCharsets;
-import java.util.Base64;
-
 public class TooltipTest {
     private TooltipShim toolTip;//Empty string
     private TooltipShim dummyToolTip;//Empty string
@@ -70,7 +71,7 @@ public class TooltipTest {
     private StageLoader stageLoader;
     private StubToolkit toolkit;
 
-    @Before
+    @BeforeEach
     public void setup() {
         toolTip = new TooltipShim();
         dummyToolTip = new TooltipShim("dummy");
@@ -79,7 +80,7 @@ public void setup() {
         toolkit.setAnimationTime(0);
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         if (stageLoader != null) {
             stageLoader.dispose();
@@ -159,67 +160,67 @@ public void tearDown() {
     @Test public void checkTextPropertyBind() {
         StringProperty strPr = new SimpleStringProperty("value");
         toolTip.textProperty().bind(strPr);
-        assertTrue("Text cannot be bound", toolTip.textProperty().getValue().equals("value"));
+        assertTrue(toolTip.textProperty().getValue().equals("value"), "Text cannot be bound");
         strPr.setValue("newvalue");
-        assertTrue("Text cannot be bound", toolTip.textProperty().getValue().equals("newvalue"));
+        assertTrue(toolTip.textProperty().getValue().equals("newvalue"), "Text cannot be bound");
     }
 
     @Test public void checkTextAlignmentPropertyBind() {
         ObjectProperty objPr = new SimpleObjectProperty<>(TextAlignment.CENTER);
         toolTip.textAlignmentProperty().bind(objPr);
-        assertSame("TextAlignment cannot be bound", toolTip.textAlignmentProperty().getValue(), TextAlignment.CENTER);
+        assertSame(toolTip.textAlignmentProperty().getValue(), TextAlignment.CENTER, "TextAlignment cannot be bound");
         objPr.setValue(TextAlignment.JUSTIFY);
-        assertSame("TextAlignment cannot be bound", toolTip.textAlignmentProperty().getValue(), TextAlignment.JUSTIFY);
+        assertSame(toolTip.textAlignmentProperty().getValue(), TextAlignment.JUSTIFY, "TextAlignment cannot be bound");
     }
 
     @Test public void checkTextOverrunPropertyBind() {
         ObjectProperty objPr = new SimpleObjectProperty<>(OverrunStyle.CENTER_WORD_ELLIPSIS);
         toolTip.textOverrunProperty().bind(objPr);
-        assertSame("TextOverrun cannot be bound", toolTip.textOverrunProperty().getValue(), OverrunStyle.CENTER_WORD_ELLIPSIS);
+        assertSame(toolTip.textOverrunProperty().getValue(), OverrunStyle.CENTER_WORD_ELLIPSIS, "TextOverrun cannot be bound");
         objPr.setValue(OverrunStyle.LEADING_ELLIPSIS);
-        assertSame("TextOverrun cannot be bound", toolTip.textOverrunProperty().getValue(), OverrunStyle.LEADING_ELLIPSIS);
+        assertSame(toolTip.textOverrunProperty().getValue(), OverrunStyle.LEADING_ELLIPSIS, "TextOverrun cannot be bound");
     }
 
     @Test public void checkTextWrapPropertyBind() {
         ObjectProperty objPr = new SimpleObjectProperty<>(true);
         toolTip.wrapTextProperty().bind(objPr);
-        assertEquals("TextWrap cannot be bound", toolTip.wrapTextProperty().getValue(), true);
+        assertEquals(toolTip.wrapTextProperty().getValue(), true, "TextWrap cannot be bound");
         objPr.setValue(false);
-        assertEquals("TextWrap cannot be bound", toolTip.wrapTextProperty().getValue(), false);
+        assertEquals(toolTip.wrapTextProperty().getValue(), false, "TextWrap cannot be bound");
     }
 
     @Test public void checkFontPropertyBind() {
         ObjectProperty objPr = new SimpleObjectProperty<Font>(null);
         toolTip.fontProperty().bind(objPr);
-        assertNull("Font cannot be bound", toolTip.fontProperty().getValue());
+        assertNull(toolTip.fontProperty().getValue(), "Font cannot be bound");
         objPr.setValue(Font.getDefault());
-        assertSame("Font cannot be bound", toolTip.fontProperty().getValue(), Font.getDefault());
+        assertSame(toolTip.fontProperty().getValue(), Font.getDefault(), "Font cannot be bound");
     }
 
     @Test public void checkGraphicPropertyBind() {
         ObjectProperty objPr = new SimpleObjectProperty<Node>(null);
         Rectangle rect = new Rectangle(10, 20);
         toolTip.graphicProperty().bind(objPr);
-        assertNull("Graphic cannot be bound", toolTip.graphicProperty().getValue());
+        assertNull(toolTip.graphicProperty().getValue(), "Graphic cannot be bound");
         objPr.setValue(rect);
-        assertSame("Graphic cannot be bound", toolTip.graphicProperty().getValue(), rect);
+        assertSame(toolTip.graphicProperty().getValue(), rect, "Graphic cannot be bound");
     }
 
     @Test public void checkContentDisplayPropertyBind() {
         ObjectProperty objPr = new SimpleObjectProperty<ContentDisplay>(null);
         ContentDisplay cont = ContentDisplay.GRAPHIC_ONLY;
         toolTip.contentDisplayProperty().bind(objPr);
-        assertNull("ContentDisplay cannot be bound", toolTip.contentDisplayProperty().getValue());
+        assertNull(toolTip.contentDisplayProperty().getValue(), "ContentDisplay cannot be bound");
         objPr.setValue(cont);
-        assertSame("ContentDisplay cannot be bound", toolTip.contentDisplayProperty().getValue(), cont);
+        assertSame(toolTip.contentDisplayProperty().getValue(), cont, "ContentDisplay cannot be bound");
     }
 
     @Test public void checkGraphicTextGapPropertyBind() {
         DoubleProperty objPr = new SimpleDoubleProperty(2.0);
         toolTip.graphicTextGapProperty().bind(objPr);
-        assertEquals("GraphicTextGap cannot be bound", toolTip.graphicTextGapProperty().getValue(), 2.0, 0.0);
+        assertEquals(toolTip.graphicTextGapProperty().getValue(), 2.0, 0.0, "GraphicTextGap cannot be bound");
         objPr.setValue(5.0);
-        assertEquals("GraphicTextGap cannot be bound", toolTip.graphicTextGapProperty().getValue(), 5.0, 0.0);
+        assertEquals(toolTip.graphicTextGapProperty().getValue(), 5.0, 0.0, "GraphicTextGap cannot be bound");
     }
 
     @Test public void textPropertyHasBeanReference() {
@@ -376,7 +377,7 @@ public void tearDown() {
         assertTrue(styleable.isSettable(toolTip.get_bridge()));
     }
 
-    @Ignore("CSS sets graphicProperty indirectly")
+    @Disabled("CSS sets graphicProperty indirectly")
     @Test public void canSpecifyGraphicViaCSS() {
         ((StyleableProperty)toolTip.graphicProperty())
                 .applyStyle(null , "../../../../build/classes/com/sun/javafx/scene/control/skin/caspian/menu-shadow.png");
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeAndTableViewTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeAndTableViewTest.java
index 16f1b8ba306..b507fc573a8 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeAndTableViewTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeAndTableViewTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,8 +28,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import java.util.List;
 import java.util.stream.Collectors;
-import org.junit.Test;
-import com.sun.javafx.tk.Toolkit;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.css.PseudoClass;
 import javafx.event.EventTarget;
@@ -44,6 +42,8 @@
 import javafx.scene.control.TreeTableView.TreeTableViewSelectionModel;
 import javafx.scene.control.skin.TableColumnHeader;
 import javafx.scene.input.MouseEvent;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.tk.Toolkit;
 import test.com.sun.javafx.scene.control.infrastructure.KeyModifier;
 import test.com.sun.javafx.scene.control.infrastructure.MouseEventFirer;
 import test.com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils;
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeCellEditingTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeCellEditingTest.java
index 98af6567e2f..70a30a97e8b 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeCellEditingTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeCellEditingTest.java
@@ -25,24 +25,21 @@
 
 package test.javafx.scene.control;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import static org.junit.Assert.*;
-
+import java.util.stream.Stream;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.scene.control.TreeCell;
 import javafx.scene.control.TreeItem;
 import javafx.scene.control.TreeView;
 import javafx.scene.control.TreeView.EditEvent;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test TreeCell editing state updated on re-use (aka: updateIndex(old, new)).
@@ -50,89 +47,81 @@
  * This test is parameterized in cellIndex and editingIndex.
  *
  */
-@RunWith(Parameterized.class)
 public class TreeCellEditingTest {
     private TreeCell<String> cell;
     private TreeView<String> tree;
     private ObservableList<TreeItem<String>> model;
 
-    private int cellIndex;
-    private int editingIndex;
-
 //--------------- change off editing index
 
-    @Test
-    public void testOffEditingIndex() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testOffEditingIndex(int cellIndex, int editingIndex) {
+        setup(cellIndex, editingIndex);
         cell.updateIndex(editingIndex);
         TreeItem<String> editingItem = tree.getTreeItem(editingIndex);
         tree.edit(editingItem);
-        assertTrue("sanity: cell is editing", cell.isEditing());
+        assertTrue(cell.isEditing(), "sanity: cell is editing");
         cell.updateIndex(cellIndex);
-        assertEquals("sanity: cell index changed", cellIndex, cell.getIndex());
-        assertFalse("cell must not be editing on update from editingIndex " + editingIndex
-                + " to cellIndex " + cellIndex, cell.isEditing());
+        assertEquals(cellIndex, cell.getIndex(), "sanity: cell index changed");
+        assertFalse(cell.isEditing(), "cell must not be editing on update from editingIndex " + editingIndex + " to cellIndex " + cellIndex);
     }
 
-    @Test
-    public void testCancelOffEditingIndex() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testCancelOffEditingIndex(int cellIndex, int editingIndex) {
+        setup(cellIndex, editingIndex);
         cell.updateIndex(editingIndex);
         TreeItem<String> editingItem = tree.getTreeItem(editingIndex);
         tree.edit(editingItem);
         List<EditEvent<String>> events = new ArrayList<>();
         tree.setOnEditCancel(events::add);
         cell.updateIndex(cellIndex);
-        assertEquals("sanity: tree editing unchanged", editingItem, tree.getEditingItem());
-        assertEquals("sanity: editingIndex unchanged", editingIndex, tree.getRow(editingItem));
-        assertEquals("cell must have fired edit cancel", 1, events.size());
-        assertEquals("cancel on updateIndex from " + editingIndex + " to " + cellIndex + "\n  ",
-                editingItem, events.get(0).getTreeItem());
+        assertEquals(editingItem, tree.getEditingItem(), "sanity: tree editing unchanged");
+        assertEquals(editingIndex, tree.getRow(editingItem), "sanity: editingIndex unchanged");
+        assertEquals(1, events.size(), "cell must have fired edit cancel");
+        assertEquals(editingItem, events.get(0).getTreeItem(), "cancel on updateIndex from " + editingIndex + " to " + cellIndex + "\n  ");
     }
 
 //--------------- change to editing index
 
-    @Test
-    public void testToEditingIndex() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testToEditingIndex(int cellIndex, int editingIndex) {
+        setup(cellIndex, editingIndex);
         cell.updateIndex(cellIndex);
         TreeItem<String> editingItem = tree.getTreeItem(editingIndex);
         tree.edit(editingItem);
-        assertFalse("sanity: cell must not be editing", cell.isEditing());
+        assertFalse(cell.isEditing(), "sanity: cell must not be editing");
         cell.updateIndex(editingIndex);
-        assertEquals("sanity: cell at editing index", editingIndex, cell.getIndex());
-        assertTrue("cell must be editing on update from " + cellIndex
-                + " to editingIndex " + editingIndex, cell.isEditing());
+        assertEquals(editingIndex, cell.getIndex(), "sanity: cell at editing index");
+        assertTrue(cell.isEditing(), "cell must be editing on update from " + cellIndex + " to editingIndex " + editingIndex);
     }
 
-    @Test
-    public void testStartEvent() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testStartEvent(int cellIndex, int editingIndex) {
+        setup(cellIndex, editingIndex);
         cell.updateIndex(cellIndex);
         TreeItem<String> editingItem = tree.getTreeItem(editingIndex);
         tree.edit(editingItem);
         List<EditEvent<String>> events = new ArrayList<>();
         tree.setOnEditStart(events::add);
         cell.updateIndex(editingIndex);
-        assertEquals("cell must have fired edit start on update from " + cellIndex + " to " + editingIndex,
-                1, events.size());
-        assertEquals("treeItem of start event ", editingItem, events.get(0).getTreeItem());
+        assertEquals(1, events.size(), "cell must have fired edit start on update from " + cellIndex + " to " + editingIndex);
+        assertEquals(editingItem, events.get(0).getTreeItem(), "treeItem of start event ");
     }
 
 //------------- parameterized
 
-    // Note: name property not supported before junit 4.11
-    @Parameterized.Parameters //(name = "{index}: cellIndex {0}, editingIndex {1}")
-    public static Collection<Object[]> data() {
-     // [0] is cellIndex, [1] is editingIndex
-        Object[][] data = new Object[][] {
-            {1, 2}, // normal
-            {0, 1}, // zero cell index
-            {1, 0}, // zero editing index
-            {-1, 1}, // negative cell
-        };
-        return Arrays.asList(data);
-    }
-
-    public TreeCellEditingTest(int cellIndex, int editingIndex) {
-        this.cellIndex = cellIndex;
-        this.editingIndex = editingIndex;
+    private static Stream<Arguments> parameters() {
+        // (name = "{index}: cellIndex {0}, editingIndex {1}")
+        return Stream.of(
+            Arguments.of(1, 2), // normal
+            Arguments.of(0, 1), // zero cell index
+            Arguments.of(1, 0), // zero editing index
+            Arguments.of(-1, 1) // negative cell
+        );
     }
 
 //-------------- setup and sanity
@@ -140,30 +129,36 @@ public TreeCellEditingTest(int cellIndex, int editingIndex) {
     /**
      * Sanity: cell editing state updated when on editing index.
      */
-    @Test
-    public void testEditOnCellIndex() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testEditOnCellIndex(int cellIndex, int editingIndex) {
+        setup(cellIndex, editingIndex);
         cell.updateIndex(editingIndex);
         TreeItem<String> editingItem = tree.getTreeItem(editingIndex);
         tree.edit(editingItem);
-        assertTrue("sanity: cell must be editing", cell.isEditing());
+        assertTrue(cell.isEditing(), "sanity: cell must be editing");
     }
 
     /**
      * Sanity: cell editing state unchanged when off editing index.
      */
-    @Test
-    public void testEditOffCellIndex() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testEditOffCellIndex(int cellIndex, int editingIndex) {
+        setup(cellIndex, editingIndex);
         cell.updateIndex(cellIndex);
         TreeItem<String> editingItem = tree.getTreeItem(editingIndex);
         tree.edit(editingItem);
-        assertFalse("sanity: cell editing must be unchanged", cell.isEditing());
+        assertFalse(cell.isEditing(), "sanity: cell editing must be unchanged");
     }
 
     /**
      * Test do-nothing block in indexChanged (was RT-31165, is JDK-8123482)
      */
-    @Test
-    public void testUpdateSameIndexWhileEdititing() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testUpdateSameIndexWhileEdititing(int cellIndex, int editingIndex) {
+        setup(cellIndex, editingIndex);
         cell.updateIndex(editingIndex);
         TreeItem<String> editingItem = tree.getTreeItem(editingIndex);
         tree.edit(editingItem);
@@ -180,8 +175,10 @@ public void testUpdateSameIndexWhileEdititing() {
     /**
      * Test do-nothing block in indexChanged (was RT-31165, is JDK-8123482)
      */
-    @Test
-    public void testUpdateSameIndexWhileNotEdititing() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testUpdateSameIndexWhileNotEdititing(int cellIndex, int editingIndex) {
+        setup(cellIndex, editingIndex);
         cell.updateIndex(cellIndex);
         TreeItem<String> editingItem = tree.getTreeItem(editingIndex);
         tree.edit(editingItem);
@@ -195,7 +192,9 @@ public void testUpdateSameIndexWhileNotEdititing() {
         assertEquals(0, events.size());
     }
 
-    @Before public void setup() {
+    // @BeforeEach
+    // junit5 does not support parameterized class-level tests yet
+    private void setup(int cellIndex, int editingIndex) {
         cell = new TreeCell<>();
         model = FXCollections.observableArrayList(new TreeItem<>("zero"),
                 new TreeItem<>("one"), new TreeItem<>("two"));
@@ -209,8 +208,7 @@ public void testUpdateSameIndexWhileNotEdititing() {
         // (editing cell losing focus will be canceled from focusListener in Cell)
         tree.getFocusModel().focus(-1);
         cell.updateTreeView(tree);
-        assertFalse("sanity: cellIndex not same as editingIndex", cellIndex == editingIndex);
-        assertTrue("sanity: valid editingIndex", editingIndex < model.size());
+        assertFalse(cellIndex == editingIndex, "sanity: cellIndex not same as editingIndex");
+        assertTrue(editingIndex < model.size(), "sanity: valid editingIndex");
     }
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeCellTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeCellTest.java
index 7a39287d2f2..b257ee789a7 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeCellTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeCellTest.java
@@ -25,28 +25,30 @@
 
 package test.javafx.scene.control;
 
+import static javafx.scene.control.ControlShim.installDefaultSkin;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlSkinFactory.attemptGC;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertListenerListContains;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertListenerListDoesNotContain;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertValueListenersContains;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertValueListenersDoesNotContain;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.getInvalidationListener;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.getListChangeListener;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
-
-import javafx.scene.control.IndexedCell;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.sun.javafx.tk.Toolkit;
-
-import static javafx.scene.control.ControlShim.*;
-import static org.junit.Assert.*;
-import static test.com.sun.javafx.scene.control.infrastructure.ControlSkinFactory.*;
-import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.*;
-
 import javafx.beans.InvalidationListener;
 import javafx.collections.ListChangeListener;
 import javafx.scene.control.FocusModel;
+import javafx.scene.control.IndexedCell;
 import javafx.scene.control.MultipleSelectionModel;
 import javafx.scene.control.MultipleSelectionModelBaseShim;
 import javafx.scene.control.SelectionMode;
@@ -56,6 +58,11 @@
 import javafx.scene.control.TreeView.EditEvent;
 import javafx.scene.control.cell.TextFieldTreeCell;
 import javafx.scene.control.skin.TreeCellSkin;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.tk.Toolkit;
 import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
 import test.com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils;
 
@@ -74,7 +81,8 @@ public class TreeCellTest {
     private TreeItem<String> pears;
     private StageLoader stageLoader;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         cell = new TreeCell<>();
 
         root = new TreeItem<>(ROOT);
@@ -87,7 +95,7 @@ public class TreeCellTest {
         root.setExpanded(true);
     }
 
-    @After
+    @AfterEach
     public void cleanup() {
         if (stageLoader != null) stageLoader.dispose();
     }
@@ -238,7 +246,7 @@ public void cleanup() {
     // Above were the simple tests. Now we check various circumstances
     // to make sure the item is updated correctly.
 
-    @Ignore // TODO file bug!
+    @Disabled // TODO file bug!
     @Test public void itemIsUpdatedWhenItWasOutOfRangeButUpdatesToTreeViewItemsMakesItInRange() {
         cell.updateIndex(4);
         cell.updateTreeView(tree);
@@ -246,7 +254,7 @@ public void cleanup() {
         assertSame("Pumpkin", cell.getItem());
     }
 
-    @Ignore // TODO file bug!
+    @Disabled // TODO file bug!
     @Test public void itemIsUpdatedWhenItWasInRangeButUpdatesToTreeViewItemsMakesItOutOfRange() {
         cell.updateIndex(2);
         cell.updateTreeView(tree);
@@ -256,7 +264,7 @@ public void cleanup() {
         assertNull(cell.getItem());
     }
 
-    @Ignore // TODO file bug!
+    @Disabled // TODO file bug!
     @Test public void itemIsUpdatedWhenTreeViewItemsIsUpdated() {
         // set cell index to point to 'Apples'
         cell.updateIndex(1);
@@ -270,7 +278,7 @@ public void cleanup() {
         assertEquals("Lime", cell.getItem());
     }
 
-    @Ignore // TODO file bug!
+    @Disabled // TODO file bug!
     @Test public void itemIsUpdatedWhenTreeViewItemsHasNewItemInsertedBeforeIndex() {
         cell.updateIndex(2);
         cell.updateTreeView(tree);
@@ -290,7 +298,7 @@ public void cleanup() {
 //        assertEquals(other, cell.getItem());
 //    }
 
-    @Ignore // TODO file bug!
+    @Disabled // TODO file bug!
     @Test public void itemIsUpdatedWhenTreeViewItemsIsReplaced() {
         cell.updateIndex(1);
         cell.updateTreeView(tree);
@@ -462,7 +470,9 @@ public void cleanup() {
         assertFalse(other.isSelected());
     }
 
-    @Ignore @Test public void replacingTheSelectionModelRemovesTheListenerFromTheOldModel() {
+    @Disabled
+    @Test
+    public void replacingTheSelectionModelRemovesTheListenerFromTheOldModel() {
         cell.updateIndex(0);
         cell.updateTreeView(tree);
         MultipleSelectionModel<TreeItem<String>> sm = tree.getSelectionModel();
@@ -719,7 +729,7 @@ public void testEditCancelEventAfterCancelOnCell() {
         tree.setOnEditCancel(events::add);
         cell.cancelEdit();
         assertEquals(1, events.size());
-        assertEquals("editing location of cancel event", editingItem, events.get(0).getTreeItem());
+        assertEquals(editingItem, events.get(0).getTreeItem(), "editing location of cancel event");
     }
 
     @Test
@@ -734,7 +744,7 @@ public void testEditCancelEventAfterCancelOnTree() {
         tree.setOnEditCancel(events::add);
         tree.edit(null);
         assertEquals(1, events.size());
-        assertEquals("editing location of cancel event", editingItem, events.get(0).getTreeItem());
+        assertEquals(editingItem, events.get(0).getTreeItem(), "editing location of cancel event");
     }
 
     @Test
@@ -749,7 +759,7 @@ public void testEditCancelEventAfterCellReuse() {
         tree.setOnEditCancel(events::add);
         cell.updateIndex(0);
         assertEquals(1, events.size());
-        assertEquals("editing location of cancel event", editingItem, events.get(0).getTreeItem());
+        assertEquals(editingItem, events.get(0).getTreeItem(), "editing location of cancel event");
     }
 
     @Test
@@ -764,7 +774,7 @@ public void testEditCancelEventAfterCollapse() {
         root.setExpanded(false);
         Toolkit.getToolkit().firePulse();
         assertEquals(1, events.size());
-        assertEquals("editing location of cancel event", editingItem, events.get(0).getTreeItem());
+        assertEquals(editingItem, events.get(0).getTreeItem(), "editing location of cancel event");
     }
 
     @Test
@@ -779,7 +789,7 @@ public void testEditCancelEventAfterModifyItems() {
         root.getChildren().add(0, new TreeItem<>("added"));
         Toolkit.getToolkit().firePulse();
         assertEquals(1, events.size());
-        assertEquals("editing location of cancel event", editingItem, events.get(0).getTreeItem());
+        assertEquals(editingItem, events.get(0).getTreeItem(), "editing location of cancel event");
     }
 
     /**
@@ -797,9 +807,9 @@ public void testEditCancelEventAfterRemoveEditingItem() {
         tree.setOnEditCancel(events::add);
         root.getChildren().remove(editingItem);
         Toolkit.getToolkit().firePulse();
-        assertNull("removing item must cancel edit on tree", tree.getEditingItem());
+        assertNull(tree.getEditingItem(), "removing item must cancel edit on tree");
         assertEquals(1, events.size());
-        assertEquals("editing location of cancel event", editingItem, events.get(0).getTreeItem());
+        assertEquals(editingItem, events.get(0).getTreeItem(), "editing location of cancel event");
     }
 
     /**
@@ -817,10 +827,10 @@ public void testEditCancelMemoryLeakAfterRemoveEditingItem() {
         tree.edit(editingItem);
         root.getChildren().remove(editingItem);
         Toolkit.getToolkit().firePulse();
-        assertNull("removing item must cancel edit on tree", tree.getEditingItem());
+        assertNull(tree.getEditingItem(), "removing item must cancel edit on tree");
         editingItem = null;
         attemptGC(itemRef);
-        assertEquals("treeItem must be gc'ed", null, itemRef.get());
+        assertEquals(null, itemRef.get(), "treeItem must be gc'ed");
     }
 
     /**
@@ -841,10 +851,10 @@ public void testEditCommitMemoryLeakAfterRemoveEditingItem() {
         editingCell.commitEdit("added changed");
         root.getChildren().remove(editingItem);
         Toolkit.getToolkit().firePulse();
-        assertNull("removing item must cancel edit on tree", tree.getEditingItem());
+        assertNull(tree.getEditingItem(), "removing item must cancel edit on tree");
         editingItem = null;
         attemptGC(itemRef);
-        assertEquals("treeItem must be gc'ed", null, itemRef.get());
+        assertEquals(null, itemRef.get(), "treeItem must be gc'ed");
     }
 
     @Test
@@ -856,8 +866,8 @@ public void testStartEditOffRangeMustNotFireStartEdit() {
         List<EditEvent<?>> events = new ArrayList<>();
         tree.addEventHandler(TreeView.editStartEvent(), events::add);
         cell.startEdit();
-        assertFalse("sanity: off-range cell must not be editing", cell.isEditing());
-        assertEquals("cell must not fire editStart if not editing", 0, events.size());
+        assertFalse(cell.isEditing(), "sanity: off-range cell must not be editing");
+        assertEquals(0, events.size(), "cell must not fire editStart if not editing");
     }
 
     @Test
@@ -867,8 +877,8 @@ public void testStartEditOffRangeMustNotUpdateEditingLocation() {
         // update cell's treeItem so there is something to update
         cell.updateTreeItem(new TreeItem<>("not-contained"));
         cell.startEdit();
-        assertFalse("sanity: off-range cell must not be editing", cell.isEditing());
-        assertNull("tree editing location must not be updated", tree.getEditingItem());
+        assertFalse(cell.isEditing(), "sanity: off-range cell must not be editing");
+        assertNull(tree.getEditingItem(), "tree editing location must not be updated");
     }
 
     @Test
@@ -888,15 +898,15 @@ public void testCommitEditMustNotFireCancel() {
         tree.edit(editingItem);
         String value = "edited";
         cell.commitEdit(value);
-        assertEquals("sanity: value committed", value, tree.getTreeItem(editingIndex).getValue());
-        assertEquals("commit must not have fired editCancel", 0, events.size());
+        assertEquals(value, tree.getTreeItem(editingIndex).getValue(), "sanity: value committed");
+        assertEquals(0, events.size(), "commit must not have fired editCancel");
     }
 
 //------------- JDK-8187309: fix editing mechanics to comply to specification
 
     @Test
     public void testTreeHasDefaultCommitHandler() {
-        assertNotNull("treeView must have default commit handler", tree.getOnEditCommit());
+        assertNotNull(tree.getOnEditCommit(), "treeView must have default commit handler");
     }
 
     @Test
@@ -905,7 +915,7 @@ public void testDefaultCommitUpdatesData() {
         tree.edit(editingItem);
         String value = "edited";
         cell.commitEdit(value);
-        assertEquals("value committed", value, editingItem.getValue());
+        assertEquals(value, editingItem.getValue(), "value committed");
     }
 
     @Test
@@ -915,7 +925,7 @@ public void testDefaultCommitUpdatesCell() {
         tree.edit(editingItem);
         String value = "edited";
         cell.commitEdit(value);
-        assertEquals("cell text updated to committed value", value, cell.getText());
+        assertEquals(value, cell.getText(), "cell text updated to committed value");
     }
 
     @Test
@@ -927,7 +937,7 @@ public void testDoNothingCommitHandlerDoesNotUpdateData() {
         tree.edit(editingItem);
         String value = "edited";
         cell.commitEdit(value);
-        assertEquals("edited value must not be committed", oldValue, editingItem.getValue());
+        assertEquals(oldValue, editingItem.getValue(), "edited value must not be committed");
     }
 
     @Test
@@ -940,7 +950,7 @@ public void testDoNothingCommitHandlerDoesNotUpdateCell() {
         tree.edit(editingItem);
         String value = "edited";
         cell.commitEdit(value);
-        assertEquals("cell text must not have changed", oldValue, cell.getText());
+        assertEquals(oldValue, cell.getText(), "cell text must not have changed");
     }
 
 
@@ -962,12 +972,11 @@ private TreeItem<String> setupForEditing(TreeCell<String> editingCell) {
     public void testSetupForEditing() {
         TreeCell<String> cell = new TreeCell<>();
         TreeItem<String> cellTreeItem = setupForEditing(cell);
-        assertTrue("sanity: tree must be editable", tree.isEditable());
-        assertEquals("sanity: returned treeItem", cellTreeItem, cell.getTreeItem());
+        assertTrue(tree.isEditable(), "sanity: tree must be editable");
+        assertEquals(cellTreeItem, cell.getTreeItem(), "sanity: returned treeItem");
         assertEquals(1, cell.getIndex());
-        assertEquals("sanity: cell configured with tree's treeItem at index",
-                tree.getTreeItem(cell.getIndex()), cell.getTreeItem());
-        assertNull("sanity: config doesn't change tree state", tree.getEditingItem());
+        assertEquals(tree.getTreeItem(cell.getIndex()), cell.getTreeItem(), "sanity: cell configured with tree's treeItem at index");
+        assertNull(tree.getEditingItem(), "sanity: config doesn't change tree state");
     }
 
 
@@ -1028,15 +1037,9 @@ public void testTreeCellHeights() {
         cell.updateTreeView(treeView);
         installDefaultSkin(cell);
         treeView.setFixedCellSize(100);
-        assertEquals("pref height must be fixedCellSize",
-                treeView.getFixedCellSize(),
-                cell.prefHeight(-1), 1);
-        assertEquals("min height must be fixedCellSize",
-                treeView.getFixedCellSize(),
-                cell.minHeight(-1), 1);
-        assertEquals("max height must be fixedCellSize",
-                treeView.getFixedCellSize(),
-                cell.maxHeight(-1), 1);
+        assertEquals(treeView.getFixedCellSize(), cell.prefHeight(-1), 1, "pref height must be fixedCellSize");
+        assertEquals(treeView.getFixedCellSize(), cell.minHeight(-1), 1, "min height must be fixedCellSize");
+        assertEquals(treeView.getFixedCellSize(), cell.maxHeight(-1), 1, "max height must be fixedCellSize");
     }
 
     /**
@@ -1111,5 +1114,4 @@ protected boolean isItemChanged(String oldItem, String newItem) {
 
         assertTrue(isItemChangedCalled.get());
     }
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeItemTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeItemTest.java
index 3b7061eafda..29cd4f601bc 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeItemTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeItemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,16 +25,15 @@
 
 package test.javafx.scene.control;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.scene.control.TreeItem;
 import javafx.scene.control.TreeView;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 /**
  *
@@ -48,7 +47,8 @@ public class TreeItemTest {
     private static TreeItem rootChild3;
     private static TreeItem rootChild4;
 
-    @BeforeClass public static void setUp() {
+    @BeforeAll
+    public static void setUp() {
         root = new TreeItem("Root");
 
         rootChild1 = new TreeItem("Root Child 1");
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableCellEditingTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableCellEditingTest.java
index 73029dea70b..0b79705d096 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableCellEditingTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableCellEditingTest.java
@@ -25,18 +25,12 @@
 
 package test.javafx.scene.control;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import static org.junit.Assert.*;
-
+import java.util.stream.Stream;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.scene.control.TreeItem;
@@ -44,6 +38,9 @@
 import javafx.scene.control.TreeTableColumn;
 import javafx.scene.control.TreeTableColumn.CellEditEvent;
 import javafx.scene.control.TreeTableView;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test TreeTableCell editing state updated on re-use (aka after updateIndex(old, new)).
@@ -51,32 +48,31 @@
  * This test is parameterized in cellIndex and editingIndex.
  *
  */
-@RunWith(Parameterized.class)
 public class TreeTableCellEditingTest {
     private TreeTableCell<String,String> cell;
     private TreeTableView<String> table;
     private TreeTableColumn<String, String> editingColumn;
     private ObservableList<TreeItem<String>> model;
 
-    private int cellIndex;
-    private int editingIndex;
-
 //--------------- change off editing index
 
-    @Test
-    public void testOffEditingIndex() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testOffEditingIndex(int cellIndex, int editingIndex) {
+        setup(cellIndex, editingIndex);
         cell.updateIndex(editingIndex);
         table.edit(editingIndex, editingColumn);
         cell.updateIndex(cellIndex);
-        assertEquals("sanity: cell index changed", cellIndex, cell.getIndex());
-        assertEquals("sanity: treeTable editingIndex must be unchanged", editingIndex, table.getEditingCell().getRow());
-        assertEquals("sanity: treeTable editingColumn must be unchanged", editingColumn, table.getEditingCell().getTableColumn());
-        assertFalse("cell must not be editing on update from editingIndex" + editingIndex
-                + " to cellIndex " + cellIndex, cell.isEditing());
+        assertEquals(cellIndex, cell.getIndex(), "sanity: cell index changed");
+        assertEquals(editingIndex, table.getEditingCell().getRow(), "sanity: treeTable editingIndex must be unchanged");
+        assertEquals(editingColumn, table.getEditingCell().getTableColumn(), "sanity: treeTable editingColumn must be unchanged");
+        assertFalse(cell.isEditing(), "cell must not be editing on update from editingIndex" + editingIndex + " to cellIndex " + cellIndex);
     }
 
-    @Test
-    public void testCancelOffEditingIndex() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testCancelOffEditingIndex(int cellIndex, int editingIndex) {
+        setup(cellIndex, editingIndex);
         cell.updateIndex(editingIndex);
         table.edit(editingIndex, editingColumn);
         List<CellEditEvent<String, String>> events = new ArrayList<>();
@@ -84,29 +80,30 @@ public void testCancelOffEditingIndex() {
             events.add(e);
         });
         cell.updateIndex(cellIndex);
-        assertEquals("cell must have fired edit cancel", 1, events.size());
-        assertEquals("cancel event index must be same as editingIndex", editingIndex,
-                events.get(0).getTreeTablePosition().getRow());
-        assertEquals("cancel event index must be same as editingIndex",
-                editingIndex, table.getEditingCell().getRow());
+        assertEquals(1, events.size(), "cell must have fired edit cancel");
+        assertEquals(editingIndex, events.get(0).getTreeTablePosition().getRow(), "cancel event index must be same as editingIndex");
+        assertEquals(editingIndex, table.getEditingCell().getRow(), "cancel event index must be same as editingIndex");
     }
 
 //--------------- change to editing index
 
-    @Test
-    public void testToEditingIndex() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testToEditingIndex(int cellIndex, int editingIndex) {
+        setup(cellIndex, editingIndex);
         cell.updateIndex(cellIndex);
         table.edit(editingIndex, editingColumn);
         cell.updateIndex(editingIndex);
-        assertEquals("sanity: cell at editing index", editingIndex, cell.getIndex());
-        assertEquals("sanity: treeTable editingIndex must be unchanged", editingIndex, table.getEditingCell().getRow());
-        assertEquals("sanity: treeTable editingColumn must be unchanged", editingColumn, table.getEditingCell().getTableColumn());
-        assertTrue("cell must be editing on update from " + cellIndex
-                + " to editingIndex " + editingIndex, cell.isEditing());
+        assertEquals(editingIndex, cell.getIndex(), "sanity: cell at editing index");
+        assertEquals(editingIndex, table.getEditingCell().getRow(), "sanity: treeTable editingIndex must be unchanged");
+        assertEquals(editingColumn, table.getEditingCell().getTableColumn(), "sanity: treeTable editingColumn must be unchanged");
+        assertTrue(cell.isEditing(), "cell must be editing on update from " + cellIndex + " to editingIndex " + editingIndex);
     }
 
-    @Test
-    public void testStartEvent() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testStartEvent(int cellIndex, int editingIndex) {
+        setup(cellIndex, editingIndex);
         cell.updateIndex(cellIndex);
         table.edit(editingIndex, editingColumn);
         List<CellEditEvent<String, String>> events = new ArrayList<>();
@@ -114,30 +111,21 @@ public void testStartEvent() {
             events.add(e);
         });
         cell.updateIndex(editingIndex);
-        assertEquals("cell must have fired edit start on update from " + cellIndex + " to " + editingIndex,
-                1, events.size());
-        assertEquals("start event index must be same as editingIndex", editingIndex,
-                events.get(0).getTreeTablePosition().getRow());
+        assertEquals(1, events.size(), "cell must have fired edit start on update from " + cellIndex + " to " + editingIndex);
+        assertEquals(editingIndex, events.get(0).getTreeTablePosition().getRow(), "start event index must be same as editingIndex");
     }
 
 //------------- parameterized
 
-    // Note: name property not supported before junit 4.11
-    @Parameterized.Parameters //(name = "{index}: cellIndex {0}, editingIndex {1}")
-    public static Collection<Object[]> data() {
-     // [0] is cellIndex, [1] is editingIndex
-        Object[][] data = new Object[][] {
-            {1, 2}, // normal
-            {0, 1}, // zero cell index
-            {1, 0}, // zero editing index
-            {-1, 1}, // negative cell - JDK-8265206
-        };
-        return Arrays.asList(data);
-    }
-
-    public TreeTableCellEditingTest(int cellIndex, int editingIndex) {
-        this.cellIndex = cellIndex;
-        this.editingIndex = editingIndex;
+    // (name = "{index}: cellIndex {0}, editingIndex {1}")
+    private static Stream<Arguments> parameters() {
+        return Stream.of(
+            // [0] is cellIndex, [1] is editingIndex
+            Arguments.of(1, 2), // normal
+            Arguments.of(0, 1), // zero cell index
+            Arguments.of(1, 0), // zero editing index
+            Arguments.of(-1, 1) // negative cell - JDK-8265206
+        );
     }
 
 //-------------- setup and sanity
@@ -145,25 +133,30 @@ public TreeTableCellEditingTest(int cellIndex, int editingIndex) {
     /**
      * Sanity: cell editing state updated when on editing index.
      */
-    @Test
-    public void testEditOnCellIndex() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testEditOnCellIndex(int cellIndex, int editingIndex) {
+        setup(cellIndex, editingIndex);
         cell.updateIndex(editingIndex);
         table.edit(editingIndex, editingColumn);
-        assertTrue("sanity: cell must be editing", cell.isEditing());
+        assertTrue(cell.isEditing(), "sanity: cell must be editing");
     }
 
     /**
      * Sanity: cell editing state unchanged when off editing index.
      */
-    @Test
-    public void testEditOffCellIndex() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testEditOffCellIndex(int cellIndex, int editingIndex) {
+        setup(cellIndex, editingIndex);
         cell.updateIndex(cellIndex);
         table.edit(editingIndex, editingColumn);
-        assertFalse("sanity: cell editing must be unchanged", cell.isEditing());
+        assertFalse(cell.isEditing(), "sanity: cell editing must be unchanged");
     }
 
-    @Before
-    public void setup() {
+    // @BeforeEach
+    // junit5 does not support parameterized class-level tests yet
+    private void setup(int cellIndex, int editingIndex) {
         cell = new TreeTableCell<>();
         model = FXCollections.observableArrayList(new TreeItem<>("Four"),
                 new TreeItem<>("Five"), new TreeItem<>("Fear")); // "Flop", "Food", "Fizz"
@@ -183,8 +176,7 @@ public void setup() {
         // if !cellSelectionEnabled nor if not in Tree/TableRow
         // done here for consistency across analogous tests for List/Tree/Cell
         table.getFocusModel().focus(-1);
-        assertFalse("sanity: cellIndex not same as editingIndex", cellIndex == editingIndex);
-        assertTrue("sanity: valid editingIndex", editingIndex < model.size());
+        assertFalse(cellIndex == editingIndex, "sanity: cellIndex not same as editingIndex");
+        assertTrue(editingIndex < model.size(), "sanity: valid editingIndex");
     }
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableCellTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableCellTest.java
index bb5d834342a..3433bf118f3 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableCellTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableCellTest.java
@@ -25,14 +25,24 @@
 
 package test.javafx.scene.control;
 
-import javafx.beans.property.SimpleStringProperty;
-import javafx.scene.control.IndexedCell;
-import javafx.scene.control.skin.TreeTableCellSkin;
-import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
-import test.com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils;
-import javafx.beans.property.SimpleObjectProperty;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlSkinFactory.attemptGC;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
 import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
 import javafx.scene.control.CellShim;
+import javafx.scene.control.IndexedCell;
 import javafx.scene.control.TreeItem;
 import javafx.scene.control.TreeTableCell;
 import javafx.scene.control.TreeTableCellShim;
@@ -41,23 +51,14 @@
 import javafx.scene.control.TreeTablePosition;
 import javafx.scene.control.TreeTableRow;
 import javafx.scene.control.TreeTableView;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
+import javafx.scene.control.skin.TreeTableCellSkin;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import com.sun.javafx.tk.Toolkit;
-
-import static test.com.sun.javafx.scene.control.infrastructure.ControlSkinFactory.*;
-import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.*;
-import static org.junit.Assert.*;
+import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
+import test.com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils;
 
 public class TreeTableCellTest {
     private TreeTableCellShim<String, String> cell;
@@ -77,7 +78,8 @@ public class TreeTableCellTest {
 
     private TreeTableColumn<String, String> editingColumn;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         Thread.currentThread().setUncaughtExceptionHandler((thread, throwable) -> {
             if (throwable instanceof RuntimeException) {
                 throw (RuntimeException)throwable;
@@ -101,7 +103,7 @@ public class TreeTableCellTest {
         row = new TreeTableRow<>();
     }
 
-    @After
+    @AfterEach
     public void cleanup() {
         if (stageLoader != null) stageLoader.dispose();
         Thread.currentThread().setUncaughtExceptionHandler(null);
@@ -126,7 +128,7 @@ public void cleanup() {
      * index, or treeView changes, including the treeView's items.       *
      ********************************************************************/
 
-    @Ignore // TODO file bug!
+    @Disabled // TODO file bug!
     @Test public void itemMatchesIndexWithinTreeItems() {
         cell.updateIndex(0);
         cell.updateTreeTableView(tree);
@@ -137,7 +139,7 @@ public void cleanup() {
         assertSame(apples, cell.getTableRow().getTreeItem());
     }
 
-    @Ignore // TODO file bug!
+    @Disabled // TODO file bug!
     @Test public void itemMatchesIndexWithinTreeItems2() {
         cell.updateTreeTableView(tree);
         cell.updateIndex(0);
@@ -170,7 +172,7 @@ public void cleanup() {
     // Above were the simple tests. Now we check various circumstances
     // to make sure the item is updated correctly.
 
-    @Ignore // TODO file bug!
+    @Disabled // TODO file bug!
     @Test public void itemIsUpdatedWhenItWasOutOfRangeButUpdatesToTreeTableViewItemsMakesItInRange() {
         cell.updateIndex(4);
         cell.updateTreeTableView(tree);
@@ -178,7 +180,7 @@ public void cleanup() {
         assertSame("Pumpkin", cell.getItem());
     }
 
-    @Ignore // TODO file bug!
+    @Disabled // TODO file bug!
     @Test public void itemIsUpdatedWhenItWasInRangeButUpdatesToTreeTableViewItemsMakesItOutOfRange() {
         cell.updateIndex(2);
         cell.updateTreeTableView(tree);
@@ -188,7 +190,7 @@ public void cleanup() {
         assertNull(cell.getItem());
     }
 
-    @Ignore // TODO file bug!
+    @Disabled // TODO file bug!
     @Test public void itemIsUpdatedWhenTreeTableViewItemsIsUpdated() {
         // set cell index to point to 'Apples'
         cell.updateIndex(1);
@@ -202,7 +204,7 @@ public void cleanup() {
         assertEquals("Lime", cell.getItem());
     }
 
-    @Ignore // TODO file bug!
+    @Disabled // TODO file bug!
     @Test public void itemIsUpdatedWhenTreeTableViewItemsHasNewItemInsertedBeforeIndex() {
         cell.updateIndex(2);
         cell.updateTreeTableView(tree);
@@ -222,7 +224,7 @@ public void cleanup() {
 //        assertEquals(other, cell.getItem());
 //    }
 
-    @Ignore // TODO file bug!
+    @Disabled // TODO file bug!
     @Test public void itemIsUpdatedWhenTreeTableViewItemsIsReplaced() {
         cell.updateIndex(1);
         cell.updateTreeTableView(tree);
@@ -230,7 +232,7 @@ public void cleanup() {
         assertEquals("Water", cell.getItem());
     }
 
-    @Ignore // TODO file bug!
+    @Disabled // TODO file bug!
     @Test public void itemIsUpdatedWhenTreeTableViewIsReplaced() {
         cell.updateIndex(2);
         cell.updateTreeTableView(tree);
@@ -258,7 +260,7 @@ public void cleanup() {
 //        assertListenerListDoesNotContain(model, treeener);
 //    }
 //
-@Ignore // TODO file bug!
+    @Disabled // TODO file bug!
     @Test public void replaceANullItemsWithNotNull() {
         cell.updateIndex(1);
         cell.updateTreeTableView(tree);
@@ -277,7 +279,7 @@ public void cleanup() {
      ********************************************************************/
 
     // startEdit()
-    @Ignore // TODO file bug!
+    @Disabled // TODO file bug!
     @Test public void editOnTreeTableViewResultsInEditingInCell() {
         tree.setEditable(true);
         cell.updateTreeTableView(tree);
@@ -348,7 +350,7 @@ public void cleanup() {
         cell.commitEdit("Watermelon");
     }
 
-    @Ignore // TODO file bug!
+    @Disabled // TODO file bug!
     @Test public void commitWhenTreeIsNotNullWillUpdateTheItemsTree() {
         tree.setEditable(true);
         cell.updateTreeTableView(tree);
@@ -833,8 +835,8 @@ public void testEditCancelEventAfterCancelOnCell() {
         List<CellEditEvent<?, ?>> events = new ArrayList<>();
         editingColumn.setOnEditCancel(events::add);
         cell.cancelEdit();
-        assertEquals("column must have received editCancel", 1, events.size());
-        assertEquals("editing location of cancel event", editingPosition, events.get(0).getTreeTablePosition());
+        assertEquals(1, events.size(), "column must have received editCancel");
+        assertEquals(editingPosition, events.get(0).getTreeTablePosition(), "editing location of cancel event");
     }
 
     @Test
@@ -847,8 +849,8 @@ public void testEditCancelEventAfterCancelOnTreeTable() {
         List<CellEditEvent<?, ?>> events = new ArrayList<>();
         editingColumn.setOnEditCancel(events::add);
         tree.edit(-1, null);
-        assertEquals("column must have received editCancel", 1, events.size());
-        assertEquals("editing location of cancel event", editingPosition, events.get(0).getTreeTablePosition());
+        assertEquals(1, events.size(), "column must have received editCancel");
+        assertEquals(editingPosition, events.get(0).getTreeTablePosition(), "editing location of cancel event");
     }
 
     @Test
@@ -861,8 +863,8 @@ public void testEditCancelEventAfterCellReuse() {
         List<CellEditEvent<?, ?>> events = new ArrayList<>();
         editingColumn.setOnEditCancel(events::add);
         cell.updateIndex(0);
-        assertEquals("column must have received editCancel", 1, events.size());
-        assertEquals("editing location of cancel event", editingPosition, events.get(0).getTreeTablePosition());
+        assertEquals(1, events.size(), "column must have received editCancel");
+        assertEquals(editingPosition, events.get(0).getTreeTablePosition(), "editing location of cancel event");
     }
 
     @Test
@@ -876,8 +878,8 @@ public void testEditCancelEventAfterCollapse() {
         editingColumn.setOnEditCancel(events::add);
         root.setExpanded(false);
         Toolkit.getToolkit().firePulse();
-        assertEquals("column must have received editCancel", 1, events.size());
-        assertEquals("editing location of cancel event", editingPosition, events.get(0).getTreeTablePosition());
+        assertEquals(1, events.size(), "column must have received editCancel");
+        assertEquals(editingPosition, events.get(0).getTreeTablePosition(), "editing location of cancel event");
     }
 
     @Test
@@ -891,9 +893,9 @@ public void testEditCancelEventAfterModifyItems() {
         editingColumn.setOnEditCancel(events::add);
         root.getChildren().add(0, new TreeItem<>("added"));
         Toolkit.getToolkit().firePulse();
-        assertNull("sanity: editing terminated on items modification", tree.getEditingCell());
-        assertEquals("column must have received editCancel", 1, events.size());
-        assertEquals("editing location of cancel event", editingPosition, events.get(0).getTreeTablePosition());
+        assertNull(tree.getEditingCell(), "sanity: editing terminated on items modification");
+        assertEquals(1, events.size(), "column must have received editCancel");
+        assertEquals(editingPosition, events.get(0).getTreeTablePosition(), "editing location of cancel event");
     }
 
     /**
@@ -911,9 +913,9 @@ public void testEditCancelEventAfterRemoveEditingItem() {
         editingColumn.setOnEditCancel(events::add);
         root.getChildren().remove(editingIndex - 1);
         Toolkit.getToolkit().firePulse();
-        assertNull("sanity: editing terminated on items modification", tree.getEditingCell());
-        assertEquals("column must have received editCancel", 1, events.size());
-        assertEquals("editing location of cancel event", editingPosition, events.get(0).getTreeTablePosition());
+        assertNull(tree.getEditingCell(), "sanity: editing terminated on items modification");
+        assertEquals(1, events.size(), "column must have received editCancel");
+        assertEquals(editingPosition, events.get(0).getTreeTablePosition(), "editing location of cancel event");
     }
 
     /**
@@ -934,7 +936,7 @@ public void testEditCancelMemoryLeakAfterRemoveEditingItem() {
         Toolkit.getToolkit().firePulse();
         editingItem = null;
         attemptGC(itemRef);
-        assertEquals("treeItem must be gc'ed", null, itemRef.get());
+        assertEquals(null, itemRef.get(), "treeItem must be gc'ed");
     }
 
     @Test
@@ -981,8 +983,8 @@ public void testCommitEditMustNotFireCancel() {
         editingColumn.setOnEditCancel(events::add);
         String value = "edited";
         cell.commitEdit(value);
-        assertEquals("sanity: value committed", value, tree.getTreeItem(editingRow).getValue());
-        assertEquals("commit must not have fired editCancel", 0, events.size());
+        assertEquals(value, tree.getTreeItem(editingRow).getValue(), "sanity: value committed");
+        assertEquals(0, events.size(), "commit must not have fired editCancel");
     }
 
 // fix of JDK-8271474 changed the implementation of how the editing location is evaluated
@@ -997,9 +999,8 @@ public void testEditCommitEvent() {
          List<CellEditEvent<?, ?>> events = new ArrayList<>();
          editingColumn.setOnEditCommit(events::add);
          cell.commitEdit("edited");
-         assertEquals("column must have received editCommit", 1, events.size());
-         assertEquals("editing location of commit event must be same as table's editingCell",
-                 editingPosition, events.get(0).getTreeTablePosition());
+         assertEquals(1, events.size(), "column must have received editCommit");
+         assertEquals(editingPosition, events.get(0).getTreeTablePosition(), "editing location of commit event must be same as table's editingCell");
      }
 
      @Test
@@ -1012,9 +1013,8 @@ public void testEditCommitEditingCellAtStartEdit() {
          List<CellEditEvent<?, ?>> events = new ArrayList<>();
          editingColumn.setOnEditCommit(events::add);
          cell.commitEdit("edited");
-         assertEquals("column must have received editCommit", 1, events.size());
-         assertEquals("editing location of commit event must be same as editingCellAtStartEdit",
-                 editingCellAtStartEdit, events.get(0).getTreeTablePosition());
+         assertEquals(1, events.size(), "column must have received editCommit");
+         assertEquals(editingCellAtStartEdit, events.get(0).getTreeTablePosition(), "editing location of commit event must be same as editingCellAtStartEdit");
      }
 
      @Test
@@ -1025,9 +1025,8 @@ public void testEditCommitEventNullTable() {
          List<CellEditEvent<?, ?>> events = new ArrayList<>();
          editingColumn.addEventHandler(TreeTableColumn.editAnyEvent(), events::add);
          cell.commitEdit("edited");
-         assertEquals("column must have received editCommit", 1, events.size());
-         assertEquals("editing location of commit event must be same as editingCellAtStartEdit",
-                 editingCellAtStartEdit, events.get(0).getTreeTablePosition());
+         assertEquals(1, events.size(), "column must have received editCommit");
+         assertEquals(editingCellAtStartEdit, events.get(0).getTreeTablePosition(), "editing location of commit event must be same as editingCellAtStartEdit");
      }
 
 // --- JDK-8271474: implement consistent event firing pattern
@@ -1113,8 +1112,8 @@ public void testStartEditOffRangeMustNotFireStartEdit() {
          List<CellEditEvent<?, ?>> events = new ArrayList<>();
          editingColumn.addEventHandler(TreeTableColumn.editStartEvent(), events::add);
          cell.startEdit();
-         assertFalse("sanity: off-range cell must not be editing", cell.isEditing());
-         assertEquals("cell must not fire editStart if not editing", 0, events.size());
+         assertFalse(cell.isEditing(), "sanity: off-range cell must not be editing");
+         assertEquals(0, events.size(), "cell must not fire editStart if not editing");
      }
 
      @Test
@@ -1122,8 +1121,8 @@ public void testStartEditOffRangeMustNotUpdateEditingLocation() {
          setupForEditing();
          cell.updateIndex(tree.getExpandedItemCount());
          cell.startEdit();
-         assertFalse("sanity: off-range cell must not be editing", cell.isEditing());
-         assertNull("treetable editing location must not be updated", tree.getEditingCell());
+         assertFalse(cell.isEditing(), "sanity: off-range cell must not be editing");
+         assertNull(tree.getEditingCell(), "treetable editing location must not be updated");
      }
 
 
@@ -1194,26 +1193,26 @@ public void testMisbehavingCancelEditTerminatesEdit() {
         int intermediate = 0;
         cell.updateIndex(editingIndex);
         tree.edit(editingIndex, editingColumn);
-        assertTrue("sanity: ", cell.isEditing());
+        assertTrue(cell.isEditing(), "sanity: ");
         try {
             tree.edit(intermediate, editingColumn);
         } catch (Exception ex) {
             // catching to test in finally
         } finally {
-            assertFalse("cell must not be editing", cell.isEditing());
-            assertEquals("table must be editing at intermediate index", intermediate, tree.getEditingCell().getRow());
+            assertFalse(cell.isEditing(), "cell must not be editing");
+            assertEquals(intermediate, tree.getEditingCell().getRow(), "table must be editing at intermediate index");
         }
         // test editing: second round
         // switch cell off editing by cell api
         tree.edit(editingIndex, editingColumn);
-        assertTrue("sanity: ", cell.isEditing());
+        assertTrue(cell.isEditing(), "sanity: ");
         try {
             cell.cancelEdit();
         } catch (Exception ex) {
             // catching to test in finally
         } finally {
-            assertFalse("cell must not be editing", cell.isEditing());
-            assertNull("table editing must be cancelled by cell", tree.getEditingCell());
+            assertFalse(cell.isEditing(), "cell must not be editing");
+            assertNull(tree.getEditingCell(), "table editing must be cancelled by cell");
         }
     }
 
@@ -1298,7 +1297,5 @@ public void cancelEdit() {
             super.cancelEdit();
             throw new RuntimeException("violating contract");
         }
-
     }
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableColumnTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableColumnTest.java
index be8997a236f..1dd934f55b9 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableColumnTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableColumnTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,17 @@
 
 package test.javafx.scene.control;
 
-import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
-import test.com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils;
-import javafx.scene.control.skin.TableColumnHeader;
-import test.com.sun.javafx.scene.control.test.Person;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
@@ -40,14 +47,6 @@
 import javafx.event.EventHandler;
 import javafx.event.EventType;
 import javafx.scene.Node;
-import javafx.scene.shape.Rectangle;
-import javafx.util.Callback;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import javafx.beans.property.BooleanProperty;
 import javafx.scene.control.CellShim;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.Control;
@@ -57,13 +56,15 @@
 import javafx.scene.control.TreeTableColumnShim;
 import javafx.scene.control.TreeTablePosition;
 import javafx.scene.control.TreeTableView;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-import static org.junit.Assert.assertEquals;
+import javafx.scene.control.skin.TableColumnHeader;
+import javafx.scene.shape.Rectangle;
+import javafx.util.Callback;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
+import test.com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils;
+import test.com.sun.javafx.scene.control.test.Person;
 
 /**
  */
@@ -76,7 +77,8 @@ public class TreeTableColumnTest {
     private TreeTableView<Person> table;
     private TreeItem<Person> root;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         root = new TreeItem<>(null);
         root.setExpanded(true);
 
@@ -466,7 +468,7 @@ public class TreeTableColumnTest {
      * minWidth Tests                                                           *
      ***************************************************************************/
 
-    @Ignore ("Fails with hardcoded value of 10")
+    @Disabled("Fails with hardcoded value of 10")
     @Test public void minWidthIs_USE_COMPUTED_SIZE_ByDefault() {
         assertEquals(Control.USE_COMPUTED_SIZE, column.getMinWidth(), 0);
         assertEquals(Control.USE_COMPUTED_SIZE, column.minWidthProperty().get(), 0);
@@ -498,7 +500,7 @@ public class TreeTableColumnTest {
      * maxWidth Tests                                                           *
      ***************************************************************************/
 
-    @Ignore ("Fails with hardcoded value of 5000")
+    @Disabled("Fails with hardcoded value of 5000")
     @Test public void maxWidthIs_USE_COMPUTED_SIZE_ByDefault() {
         assertEquals(Control.USE_COMPUTED_SIZE, column.getMaxWidth(), 0);
         assertEquals(Control.USE_COMPUTED_SIZE, column.maxWidthProperty().get(), 0);
@@ -530,7 +532,7 @@ public class TreeTableColumnTest {
      * prefWidth Tests                                                          *
      ***************************************************************************/
 
-    @Ignore ("Fails with hardcoded value of 80")
+    @Disabled("Fails with hardcoded value of 80")
     @Test public void prefWidthIs_USE_COMPUTED_SIZE_ByDefault() {
         assertEquals(Control.USE_COMPUTED_SIZE, column.getPrefWidth(), 0);
         assertEquals(Control.USE_COMPUTED_SIZE, column.prefWidthProperty().get(), 0);
@@ -1153,7 +1155,7 @@ public void defaultOnEditCommitHandlerDealsWithNullTablePosition() {
         assertSame(wilma, items.get(2));
     }
 
-    @Ignore("This started failing when I upgraded to Java 7")
+    @Disabled("This started failing when I upgraded to Java 7")
     @Test public void sortingMixOfComparableAndNonComparable() {
         Person fred = new Person("Fred", 36);
         Person wilma = new Person("Wilma", 34);
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableRowTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableRowTest.java
index 67f78066407..c6130eed0de 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableRowTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableRowTest.java
@@ -25,11 +25,11 @@
 
 package test.javafx.scene.control;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -40,10 +40,10 @@
 import javafx.scene.control.TreeTableRow;
 import javafx.scene.control.TreeTableView;
 import javafx.scene.control.skin.TreeTableRowSkin;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
 
 public class TreeTableRowTest {
@@ -62,14 +62,15 @@ public class TreeTableRowTest {
 
     StageLoader stageLoader;
 
-    @After
+    @AfterEach
     public void after() {
         if (stageLoader != null) {
             stageLoader.dispose();
         }
     }
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         cell = new TreeTableRow<>();
 
         root = new TreeItem<>(ROOT);
@@ -228,7 +229,7 @@ public void after() {
     // Above were the simple tests. Now we check various circumstances
     // to make sure the item is updated correctly.
 
-    @Ignore // TODO file bug!
+    @Disabled // TODO file bug!
     @Test public void itemIsUpdatedWhenItWasOutOfRangeButUpdatesToTreeTableViewItemsMakesItInRange() {
         cell.updateIndex(4);
         cell.updateTreeTableView(tree);
@@ -236,7 +237,7 @@ public void after() {
         assertSame("Pumpkin", cell.getItem());
     }
 
-    @Ignore // TODO file bug!
+    @Disabled // TODO file bug!
     @Test public void itemIsUpdatedWhenItWasInRangeButUpdatesToTreeTableViewItemsMakesItOutOfRange() {
         cell.updateIndex(2);
         cell.updateTreeTableView(tree);
@@ -246,7 +247,7 @@ public void after() {
         assertNull(cell.getItem());
     }
 
-    @Ignore // TODO file bug!
+    @Disabled // TODO file bug!
     @Test public void itemIsUpdatedWhenTreeTableViewItemsIsUpdated() {
         // set cell index to point to 'Apples'
         cell.updateIndex(1);
@@ -260,7 +261,7 @@ public void after() {
         assertEquals("Lime", cell.getItem());
     }
 
-    @Ignore // TODO file bug!
+    @Disabled // TODO file bug!
     @Test public void itemIsUpdatedWhenTreeTableViewItemsHasNewItemInsertedBeforeIndex() {
         cell.updateIndex(2);
         cell.updateTreeTableView(tree);
@@ -280,7 +281,7 @@ public void after() {
 //        assertEquals(other, cell.getItem());
 //    }
 
-    @Ignore // TODO file bug!
+    @Disabled // TODO file bug!
     @Test public void itemIsUpdatedWhenTreeTableViewItemsIsReplaced() {
         cell.updateIndex(1);
         cell.updateTreeTableView(tree);
@@ -299,7 +300,7 @@ public void after() {
         assertEquals("Juice", cell.getItem());
     }
 
-    @Ignore // TODO file bug!
+    @Disabled // TODO file bug!
     @Test public void replaceItemsWithANull() {
         cell.updateIndex(0);
         cell.updateTreeTableView(tree);
@@ -316,7 +317,7 @@ public void after() {
 //        assertListenerListDoesNotContain(model, treeener);
 //    }
 //
-    @Ignore // TODO file bug!
+    @Disabled // TODO file bug!
     @Test public void replaceANullItemsWithNotNull() {
         cell.updateIndex(1);
         cell.updateTreeTableView(tree);
@@ -346,7 +347,7 @@ public void after() {
         assertFalse(other.isSelected());
     }
 
-    @Ignore // TODO file bug!
+    @Disabled // TODO file bug!
     @Test public void changesToSelectionOnSelectionModelAreReflectedInCells() {
         cell.updateTreeTableView(tree);
         cell.updateIndex(0);
@@ -383,7 +384,7 @@ public void after() {
 //        assertTrue(other.isSelected());
 //    }
 
-    @Ignore // TODO file bug!
+    @Disabled // TODO file bug!
     @Test public void changesToSelectionOnSelectionModelAreReflectedInCells_MultipleSelection() {
         tree.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
         cell.updateTreeTableView(tree);
@@ -483,7 +484,7 @@ public void after() {
         assertFalse(other.isFocused());
     }
 
-    @Ignore // TODO file bug!
+    @Disabled // TODO file bug!
     @Test public void changesToFocusOnFocusModelAreReflectedInCells() {
         cell.updateTreeTableView(tree);
         cell.updateIndex(0);
@@ -598,7 +599,7 @@ public void after() {
         assertNull(tree.getEditingCell());
     }
 
-    @Ignore // TODO file bug!
+    @Disabled // TODO file bug!
     @Test public void editCellWithTreeResultsInUpdatedEditingIndexProperty() {
         tree.setEditable(true);
         cell.updateTreeTableView(tree);
@@ -694,7 +695,7 @@ public void after() {
         assertFalse(cell.isEditing());
     }
 
-    @Ignore // TODO file bug!
+    @Disabled // TODO file bug!
     @Test public void movingTreeCellEditingIndexCausesCurrentlyInEditCellToCancel() {
         tree.setEditable(true);
         cell.updateTreeTableView(tree);
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableViewKeyInputTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableViewKeyInputTest.java
index 6194f53b8d6..802ca8234a2 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableViewKeyInputTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableViewKeyInputTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,26 +25,20 @@
 
 package test.javafx.scene.control;
 
-import com.sun.javafx.scene.control.behavior.TreeTableCellBehavior;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.List;
+import java.util.function.Function;
 import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 import javafx.scene.Group;
 import javafx.scene.control.Button;
-import javafx.scene.input.KeyCode;
-import java.util.List;
-import java.util.function.Function;
-
-import com.sun.javafx.PlatformUtil;
-import com.sun.javafx.util.Utils;
-import test.com.sun.javafx.scene.control.behavior.TreeTableViewAnchorRetriever;
-import test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils;
-import test.com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
-import test.com.sun.javafx.scene.control.infrastructure.KeyModifier;
-import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
-import test.com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils;
-import com.sun.javafx.tk.Toolkit;
 import javafx.scene.control.FocusModel;
 import javafx.scene.control.IndexedCell;
 import javafx.scene.control.MultipleSelectionModel;
@@ -55,16 +49,21 @@
 import javafx.scene.control.TreeTableColumn;
 import javafx.scene.control.TreeTablePosition;
 import javafx.scene.control.TreeTableView;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import javafx.scene.input.KeyCode;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.PlatformUtil;
+import com.sun.javafx.scene.control.behavior.TreeTableCellBehavior;
+import com.sun.javafx.tk.Toolkit;
+import com.sun.javafx.util.Utils;
+import test.com.sun.javafx.scene.control.behavior.TreeTableViewAnchorRetriever;
+import test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils;
+import test.com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
+import test.com.sun.javafx.scene.control.infrastructure.KeyModifier;
+import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
+import test.com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils;
 
 public class TreeTableViewKeyInputTest {
     private TreeTableView<String> tableView;
@@ -96,7 +95,8 @@ public class TreeTableViewKeyInputTest {
         private final TreeItem<String> child9 = new TreeItem<>("Child 9");            // 12
         private final TreeItem<String> child10 = new TreeItem<>("Child 10");          // 13
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         // reset tree structure
         root.getChildren().clear();
         root.setExpanded(true);
@@ -145,7 +145,8 @@ public class TreeTableViewKeyInputTest {
         stageLoader.getStage().show();
     }
 
-    @After public void tearDown() {
+    @AfterEach
+    public void tearDown() {
         tableView.getSkin().dispose();
         stageLoader.dispose();
     }
@@ -471,8 +472,8 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         keyboard.doDownArrowPress(KeyModifier.SHIFT);
         keyboard.doDownArrowPress(KeyModifier.SHIFT);
         keyboard.doUpArrowPress(KeyModifier.SHIFT);
-        assertTrue(debug(), isSelected(0, 1));
-        assertTrue(debug(), isNotSelected(2));
+        assertTrue(isSelected(0, 1), debug());
+        assertTrue(isNotSelected(2), debug());
     }
 
     @Test public void testShiftUpTwiceThenShiftDownFrom0Index() {
@@ -510,7 +511,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         keyboard.doUpArrowPress(KeyModifier.SHIFT);     // also select 1
         keyboard.doUpArrowPress(KeyModifier.SHIFT);     // also select 0
         keyboard.doDownArrowPress(KeyModifier.SHIFT);   // deselect 0
-        assertFalse(debug(), sm.isSelected(0));
+        assertFalse(sm.isSelected(0), debug());
         assertTrue(sm.isSelected(1));
         assertTrue(sm.isSelected(2));
         assertFalse(sm.isSelected(3));
@@ -623,7 +624,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         keyboard.doKeyPress(KeyCode.SPACE, KeyModifier.SHIFT);  // select 0,1,2
         assertTrue(isSelected(0, 1, 2));
         assertTrue(isNotSelected(3));
-        assertTrue(debug(), isAnchor(2));
+        assertTrue(isAnchor(2), debug());
     }
 
     // test 33
@@ -663,7 +664,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         keyboard.doKeyPress(KeyCode.SPACE, KeyModifier.SHIFT);  // select 0,1,2
         assertTrue(isSelected(0, 1, 2));
         assertTrue(isNotSelected(3, 4));
-        assertTrue(debug(), isAnchor(2));
+        assertTrue(isAnchor(2), debug());
     }
 
     // test 35
@@ -786,7 +787,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         keyboard.doKeyPress(KeyCode.HOME, KeyModifier.SHIFT);
         assertTrue(isSelected(0,1,2));
         assertTrue(isNotSelected(3,4));
-        assertTrue(debug(),isAnchor(2));
+        assertTrue(isAnchor(2), debug());
     }
 
     // test 51
@@ -806,7 +807,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         keyboard.doKeyPress(KeyCode.END, KeyModifier.SHIFT);
         assertTrue(isSelected(3,4,5,6,7,8,9));
         assertTrue(isNotSelected(0,1,2));
-        assertTrue(debug(),isAnchor(3));
+        assertTrue(isAnchor(3), debug());
     }
 
     // test 42
@@ -853,7 +854,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         keyboard.doKeyPress(KeyCode.HOME, KeyModifier.SHIFT);
         assertTrue(isSelected(0,1,2,3));
         assertTrue(isNotSelected(4,5));
-        assertTrue(debug(), isAnchor(3));
+        assertTrue(isAnchor(3), debug());
     }
 
     // test 49
@@ -862,7 +863,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         keyboard.doKeyPress(KeyCode.END, KeyModifier.SHIFT);
         assertTrue(isSelected(3,4,5,6,7,8,9));
         assertTrue(isNotSelected(0,1,2));
-        assertTrue(debug(), isAnchor(3));
+        assertTrue(isAnchor(3), debug());
     }
 
     // test 52
@@ -1165,7 +1166,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         keyboard.doKeyPress(KeyCode.SPACE,
                 KeyModifier.getShortcutKey(),
                 (Utils.isMac()  ? KeyModifier.CTRL : null));
-        assertTrue(debug(), isSelected(8,10));
+        assertTrue(isSelected(8,10), debug());
         assertTrue(isAnchor(8));
 
         keyboard.doKeyPress(KeyCode.PAGE_UP, KeyModifier.SHIFT, KeyModifier.getShortcutKey());
@@ -1520,7 +1521,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         keyboard.doKeyPress(KeyCode.END, KeyModifier.SHIFT, KeyModifier.getShortcutKey());
         assertTrue(sm.isSelected(0,col1));
         for (int i = 2; i < tableView.getExpandedItemCount(); i++) {
-            assertTrue(debug(),sm.isSelected(i,col1));
+            assertTrue(sm.isSelected(i,col1), debug());
         }
         assertTrue(isAnchor(2,1));
     }
@@ -1558,7 +1559,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         for (int i = 0; i <= 5; i++) {
             assertTrue(sm.isSelected(i,col1));
         }
-        assertTrue(debug(), isAnchor(5,1));
+        assertTrue(isAnchor(5,1), debug());
 
         keyboard.doKeyPress(KeyCode.END, KeyModifier.SHIFT, KeyModifier.getShortcutKey());
         for (int i = 0; i < tableView.getExpandedItemCount() - 1; i++) {
@@ -1665,7 +1666,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         assertTrue(sm.isSelected(1, col4));
         assertTrue(sm.isSelected(1, col3));
         assertTrue(sm.isSelected(1, col2));
-        assertTrue(debug(), sm.isSelected(1, col1));
+        assertTrue(sm.isSelected(1, col1), debug());
         assertFalse(sm.isSelected(1, col0));
     }
 
@@ -1732,7 +1733,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         // press shift + space to select all cells between (1, col1) and (1, col5)
         keyboard.doKeyPress(KeyCode.SPACE, KeyModifier.SHIFT);
         assertTrue(sm.isSelected(1, col4));
-        assertTrue(debug(), sm.isSelected(1, col3));
+        assertTrue(sm.isSelected(1, col3), debug());
         assertTrue(sm.isSelected(1, col2));
         assertTrue(sm.isSelected(1, col1));
         assertTrue(sm.isSelected(1, col0));
@@ -1752,7 +1753,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
 
         // press shift + space to select all cells between (1, col1) and (1, col5)
         keyboard.doKeyPress(KeyCode.SPACE, KeyModifier.SHIFT);
-        assertTrue(debug(), sm.isSelected(1, col4));
+        assertTrue(sm.isSelected(1, col4), debug());
         assertTrue(sm.isSelected(1, col3));
         assertTrue(sm.isSelected(1, col2));
         assertTrue(sm.isSelected(1, col1));
@@ -1914,7 +1915,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
                 KeyModifier.getShortcutKey(),
                 (Utils.isMac()  ? KeyModifier.CTRL : null));
         assertTrue(isNotSelected(5));
-        assertTrue(debug(), fm.isFocused(5));
+        assertTrue(fm.isFocused(5), debug());
         assertTrue(isAnchor(5));
     }
 
@@ -1935,7 +1936,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
 
         keyboard.doDownArrowPress(KeyModifier.getShortcutKey(), KeyModifier.SHIFT);
         keyboard.doDownArrowPress(KeyModifier.getShortcutKey(), KeyModifier.SHIFT);
-        assertTrue(debug(),isSelected(0,2,3,4));
+        assertTrue(isSelected(0,2,3,4), debug());
         assertTrue(isAnchor(2));
     }
 
@@ -2246,12 +2247,12 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         sm.selectAll();
         fm.focus(1);
         keyboard.doKeyPress(KeyCode.BACK_SLASH, KeyModifier.getShortcutKey());
-        assertTrue(debug(), isSelected(0,1,2,3,4,5,6,7,8,9));
+        assertTrue(isSelected(0,1,2,3,4,5,6,7,8,9), debug());
         assertTrue(fm.isFocused(1));
     }
 
     // Test 24 (TreeView test cases)
-    @Ignore("Not yet working")
+    @Disabled("Not yet working")
     @Test public void testExpandCollapseImpactOnSelection() {
         sm.clearAndSelect(5);
         assertTrue(child3.isExpanded());
@@ -2331,7 +2332,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         sm.clearAndSelect(5);
 
         keyboard.doKeyPress(KeyCode.HOME, KeyModifier.SHIFT);
-        assertTrue(debug(), isSelected(0,1,2,3,4,5));
+        assertTrue(isSelected(0,1,2,3,4,5), debug());
         assertTrue(isNotSelected(6,7,8,9));
 
         keyboard.doKeyPress(KeyCode.END, KeyModifier.SHIFT);
@@ -2340,7 +2341,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
 
         keyboard.doKeyPress(KeyCode.HOME, KeyModifier.SHIFT);
         assertTrue(isSelected(0,1,2,3,4,5));
-        assertTrue(debug(), isNotSelected(6,7,8,9));
+        assertTrue(isNotSelected(6,7,8,9), debug());
     }
 
     @Test public void test_rt14451_2() {
@@ -2352,7 +2353,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
 
         keyboard.doKeyPress(KeyCode.HOME, KeyModifier.SHIFT);
         assertTrue(isSelected(0,1,2,3,4,5));
-        assertTrue(debug(), isNotSelected(6,7,8,9));
+        assertTrue(isNotSelected(6,7,8,9), debug());
 
         keyboard.doKeyPress(KeyCode.END, KeyModifier.SHIFT);
         assertTrue(isNotSelected(0,1,2,3,4));
@@ -2368,13 +2369,13 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
     @Test public void test_rt26835_2() {
         sm.clearAndSelect(5);
         keyboard.doKeyPress(KeyCode.END, KeyModifier.getShortcutKey());
-        assertTrue(debug(), fm.isFocused(getItemCount()));
+        assertTrue(fm.isFocused(getItemCount()), debug());
     }
 
     @Test public void test_rt27175() {
         sm.clearAndSelect(5);
         keyboard.doKeyPress(KeyCode.HOME, KeyModifier.SHIFT, KeyModifier.getShortcutKey());
-        assertTrue(debug(), fm.isFocused(0));
+        assertTrue(fm.isFocused(0), debug());
         assertTrue(isSelected(0,1,2,3,4,5));
     }
 
@@ -2407,7 +2408,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         keyboard.doUpArrowPress(KeyModifier.SHIFT);
         assertTrue(fm.isFocused(0, col0));
         keyboard.doUpArrowPress(KeyModifier.SHIFT);
-        assertTrue(debug(), fm.isFocused(0, col0));
+        assertTrue(fm.isFocused(0, col0), debug());
 
     }
 
@@ -2426,7 +2427,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         keyboard.doDownArrowPress(KeyModifier.SHIFT);
         assertTrue(fm.isFocused(13, col0));
         keyboard.doDownArrowPress(KeyModifier.SHIFT);
-        assertTrue(debug(), fm.isFocused(13, col0));
+        assertTrue(fm.isFocused(13, col0), debug());
     }
 
     @Test public void test_rt27583_rowSelection_1() {
@@ -2442,7 +2443,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         keyboard.doUpArrowPress(KeyModifier.SHIFT);
         assertTrue(fm.isFocused(0));
         keyboard.doUpArrowPress(KeyModifier.SHIFT);
-        assertTrue(debug(), fm.isFocused(0));
+        assertTrue(fm.isFocused(0), debug());
 
     }
 
@@ -2461,7 +2462,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         keyboard.doDownArrowPress(KeyModifier.SHIFT);
         assertTrue(fm.isFocused(13));
         keyboard.doDownArrowPress(KeyModifier.SHIFT);
-        assertTrue(debug(), fm.isFocused(13));
+        assertTrue(fm.isFocused(13), debug());
     }
 
     @Test public void test_rt29930() {
@@ -2483,7 +2484,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
 
         keyboard.doDownArrowPress(KeyModifier.SHIFT); // select rows [2,3]
         assertTrue(isSelected(2,3));
-        assertTrue(debug(), isNotSelected(0,1));
+        assertTrue(isNotSelected(0,1), debug());
         assertEquals(3, fm.getFocusedIndex());
         assertEquals(2, getAnchor().getRow());
     }
@@ -2700,7 +2701,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         keyboard.doKeyPress(KeyCode.PAGE_DOWN, KeyModifier.SHIFT);
         Toolkit.getToolkit().firePulse();
         final Object newSelectionOwner = sm.getSelectedItem();
-        assertNotSame(initialSelectionOwner + " == " + newSelectionOwner, initialSelectionOwner, newSelectionOwner);
+        assertNotSame(initialSelectionOwner, newSelectionOwner, initialSelectionOwner + " == " + newSelectionOwner);
 
         // selection should go all the way to the top, but this bug
         // shows that instead it seems to stop midway - where the anchor is
@@ -2941,7 +2942,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         assertTrue(isNotSelected(0,1));
         assertTrue(isSelected(2,3,4));
         assertEquals(3, sm.getSelectedItems().size());
-        assertTrue("Focus index incorrectly at: " + fm.getFocusedIndex(), fm.isFocused(4));
+        assertTrue(fm.isFocused(4), "Focus index incorrectly at: " + fm.getFocusedIndex());
     }
 
     @Test public void test_rt33301_multipleSelection_up() {
@@ -3442,7 +3443,7 @@ public void testEnterOnFocusedRowDoesNotThrowNPE() {
         keyboard.doKeyPress(KeyCode.RIGHT, KeyModifier.SHIFT); // col 3
         keyboard.doKeyPress(KeyCode.RIGHT, KeyModifier.SHIFT); // col 4
         assertEquals(0, getAnchor().getRow());
-        assertEquals(debug(), 0, getAnchor().getColumn());              // anchor does not move
+        assertEquals(0, getAnchor().getColumn(), debug());              // anchor does not move
         assertTrue(fm.isFocused(0, col4));
         assertTrue(sm.isSelected(0, col0));
         assertTrue(sm.isSelected(0, col1));
@@ -4665,7 +4666,7 @@ private void test_rt_18440(KeyCode direction, int startColumn, boolean goToEnd,
         expectedColumn = direction == KeyCode.RIGHT ? 3 : 0;
         keyboard.doKeyPress(direction, KeyModifier.SHIFT);
         assertEquals(0, sm.getSelectedIndex());
-        assertEquals(debug(), 4, sm.getSelectedCells().size());
+        assertEquals(4, sm.getSelectedCells().size(), debug());
         assertEquals(0, fm.getFocusedIndex());
         assertEquals(tableView.getColumns().get(expectedColumn), fm.getFocusedCell().getTableColumn());
 
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableViewMouseInputTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableViewMouseInputTest.java
index bf672755233..645752a50fb 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableViewMouseInputTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableViewMouseInputTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,36 +25,47 @@
 
 package test.javafx.scene.control;
 
-import javafx.scene.control.*;
-import test.com.sun.javafx.scene.control.infrastructure.KeyModifier;
-import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
-import test.com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils;
-import test.com.sun.javafx.scene.control.infrastructure.MouseEventFirer;
-import test.com.sun.javafx.scene.control.behavior.TreeTableViewAnchorRetriever;
-import test.com.sun.javafx.scene.control.test.Person;
-
-import static org.junit.Assert.*;
-
-import com.sun.javafx.tk.Toolkit;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 import javafx.scene.Node;
 import javafx.scene.Scene;
+import javafx.scene.control.Button;
+import javafx.scene.control.Cell;
+import javafx.scene.control.FocusModel;
+import javafx.scene.control.MultipleSelectionModel;
+import javafx.scene.control.ScrollBar;
+import javafx.scene.control.SelectionMode;
+import javafx.scene.control.TableColumnBaseShim;
+import javafx.scene.control.TableFocusModel;
+import javafx.scene.control.TreeItem;
+import javafx.scene.control.TreeTableCell;
+import javafx.scene.control.TreeTableColumn;
+import javafx.scene.control.TreeTablePosition;
+import javafx.scene.control.TreeTableRow;
+import javafx.scene.control.TreeTableView;
 import javafx.scene.control.cell.TreeItemPropertyValueFactory;
-
 import javafx.scene.layout.VBox;
-import org.junit.After;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.tk.Toolkit;
+import test.com.sun.javafx.scene.control.behavior.TreeTableViewAnchorRetriever;
+import test.com.sun.javafx.scene.control.infrastructure.KeyModifier;
+import test.com.sun.javafx.scene.control.infrastructure.MouseEventFirer;
+import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
+import test.com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils;
+import test.com.sun.javafx.scene.control.test.Person;
 
-//@Ignore("Disabling tests as they fail with OOM in continuous builds")
 public class TreeTableViewMouseInputTest {
     private TreeTableView<String> tableView;
     private TreeTableView.TreeTableViewSelectionModel<?> sm;
@@ -81,7 +92,8 @@ public class TreeTableViewMouseInputTest {
     private TreeItem<String> child9;            // 12
     private TreeItem<String> child10;           // 13
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         root = new TreeItem<>("Root");             // 0
         child1 = new TreeItem<>("Child 1");        // 1
         child2 = new TreeItem<>("Child 2");        // 2
@@ -134,7 +146,8 @@ public class TreeTableViewMouseInputTest {
         tableView.getColumns().setAll(col0, col1, col2, col3, col4);
     }
 
-    @After public void tearDown() {
+    @AfterEach
+    public void tearDown() {
         if (tableView.getSkin() != null) {
             tableView.getSkin().dispose();
         }
@@ -213,11 +226,11 @@ private int getItemCount() {
 
         // select all from 9 - 7
         VirtualFlowTestUtils.clickOnRow(tableView, 7, KeyModifier.SHIFT);
-        assertTrue(debug(), isSelected(7,8,9));
+        assertTrue(isSelected(7,8,9), debug());
 
         // select all from 9 - 7 - 5
         VirtualFlowTestUtils.clickOnRow(tableView, 5, KeyModifier.SHIFT);
-        assertTrue(debug(),isSelected(5,6,7,8,9));
+        assertTrue(isSelected(5,6,7,8,9), debug());
     }
 
     @Test public void test_rt29833_mouse_select_downwards() {
@@ -228,11 +241,11 @@ private int getItemCount() {
 
         // select all from 5 - 7
         VirtualFlowTestUtils.clickOnRow(tableView, 7, KeyModifier.SHIFT);
-        assertTrue(debug(), isSelected(5,6,7));
+        assertTrue(isSelected(5,6,7), debug());
 
         // select all from 5 - 7 - 9
         VirtualFlowTestUtils.clickOnRow(tableView, 9, KeyModifier.SHIFT);
-        assertTrue(debug(),isSelected(5,6,7,8,9));
+        assertTrue(isSelected(5,6,7,8,9), debug());
     }
 
     private int rt30394_count = 0;
@@ -442,12 +455,12 @@ private int getItemCount() {
         VirtualFlowTestUtils.clickOnRow(tableView, 5, true, KeyModifier.SHIFT);
         assertEquals(5, sm.getSelectedIndex());
         assertEquals(5, fm.getFocusedIndex());
-        assertEquals(sm.getSelectedItems().toString(), 6, sm.getSelectedItems().size());
+        assertEquals(6, sm.getSelectedItems().size(), sm.getSelectedItems().toString());
 
         VirtualFlowTestUtils.clickOnRow(tableView, 0, true, KeyModifier.SHIFT);
         assertEquals(0, sm.getSelectedIndex());
         assertEquals(0, fm.getFocusedIndex());
-        assertEquals(debug(), 1, sm.getSelectedItems().size());
+        assertEquals(1, sm.getSelectedItems().size(), debug());
 
 //        sl.dispose();
     }
@@ -474,14 +487,14 @@ private int getItemCount() {
         assertEquals(1, sm.getSelectedItems().size());
 
         VirtualFlowTestUtils.clickOnRow(tableView, 5, KeyModifier.SHIFT);
-        assertEquals("Actual selected index: " + sm.getSelectedIndex(), 5, sm.getSelectedIndex());
-        assertEquals("Actual focused index: " + fm.getFocusedIndex(), 5, fm.getFocusedIndex());
-        assertTrue("Selected indices: " + sm.getSelectedIndices(), sm.getSelectedIndices().contains(0));
-        assertTrue("Selected items: " + sm.getSelectedItems(), sm.getSelectedItems().contains(root));
+        assertEquals(5, sm.getSelectedIndex(), "Actual selected index: " + sm.getSelectedIndex());
+        assertEquals(5, fm.getFocusedIndex(), "Actual focused index: " + fm.getFocusedIndex());
+        assertTrue(sm.getSelectedIndices().contains(0), "Selected indices: " + sm.getSelectedIndices());
+        assertTrue(sm.getSelectedItems().contains(root), "Selected items: " + sm.getSelectedItems());
         assertEquals(6, sm.getSelectedItems().size());
     }
 
-    @Ignore("Test doesn't work - mouse event not firing as expected")
+    @Disabled("Test doesn't work - mouse event not firing as expected")
     @Test public void test_rt_33101() {
         final int items = 8;
         root.setValue("New Root");
@@ -833,7 +846,7 @@ private void test_rt_38306(boolean selectTwoRows) {
                     continue;
                 }
                 TreeTableCell cell = (TreeTableCell) VirtualFlowTestUtils.getCell(table, row, column);
-                assertFalse("cell[row: " + row + ", column: " + column + "] is selected, but shouldn't be", cell.isSelected());
+                assertFalse(cell.isSelected(), "cell[row: " + row + ", column: " + column + "] is selected, but shouldn't be");
             }
             TreeTableRow cell = (TreeTableRow) VirtualFlowTestUtils.getCell(table, row);
             assertTrue(cell.isSelected());
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableViewResizeTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableViewResizeTest.java
index 361ac91e881..73d12b55bd6 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableViewResizeTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableViewResizeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,11 +24,8 @@
  */
 package test.javafx.scene.control;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import java.util.List;
-import org.junit.Assert;
-import org.junit.Test;
-import com.sun.javafx.tk.Toolkit;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.scene.control.ConstrainedColumnResizeBase;
 import javafx.scene.control.SelectionMode;
@@ -38,6 +35,8 @@
 import javafx.scene.control.TreeTableView;
 import javafx.scene.layout.BorderPane;
 import javafx.util.Callback;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.tk.Toolkit;
 import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
 
 /**
@@ -251,7 +250,7 @@ public void testConstrainedResizeOfEmptyTable() {
                 t.setPrefWidth(300);
                 Toolkit.getToolkit().firePulse();
                 checkInvariants(t);
-                Assert.assertEquals(t.getWidth(), sumColumnWidths(t.getColumns()), tolerance);
+                assertEquals(t.getWidth(), sumColumnWidths(t.getColumns()), tolerance);
 
                 // clear items
                 t.getRoot().getChildren().clear();
@@ -260,7 +259,7 @@ public void testConstrainedResizeOfEmptyTable() {
                 t.setPrefWidth(1000);
                 Toolkit.getToolkit().firePulse();
                 checkInvariants(t);
-                Assert.assertEquals(t.getWidth(), sumColumnWidths(t.getColumns()), tolerance);
+                assertEquals(t.getWidth(), sumColumnWidths(t.getColumns()), tolerance);
             }
         } finally {
             stageLoader.dispose();
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableViewSelectionModelImplTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableViewSelectionModelImplTest.java
index b379381642e..6196fe49918 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableViewSelectionModelImplTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableViewSelectionModelImplTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,22 +25,10 @@
 
 package test.javafx.scene.control;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.tk.Toolkit;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.ListChangeListener;
@@ -52,9 +40,13 @@
 import javafx.scene.control.TreeTablePosition;
 import javafx.scene.control.TreeTableView;
 import javafx.scene.control.TreeTableView.TreeTableViewSelectionModel;
-import javafx.scene.control.TreeTableViewShim;
 import javafx.scene.control.cell.TreeItemPropertyValueFactory;
 import javafx.util.Callback;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.tk.Toolkit;
 import test.com.sun.javafx.scene.control.test.Person;
 
 /**
@@ -72,15 +64,11 @@ public class TreeTableViewSelectionModelImplTest {
     private TreeTableColumn<String,String> col1;
     private TreeTableColumn<String,String> col2;
 
-    @Parameters public static Collection implementations() {
-        return Arrays.asList(new Object[][] {
-            { TreeTableViewShim.get_TreeTableViewArrayListSelectionModel_class() }
-        });
-    }
-
-    @AfterClass public static void tearDownClass() throws Exception {    }
+    @AfterAll
+    public static void tearDownClass() throws Exception {    }
 
-    @Before public void setUp() throws Exception {
+    @BeforeEach
+    public void setUp() throws Exception {
         TreeItem<String> root = new TreeItem<>("Root");
         root.setExpanded(true);
         for (int i = 0; i < 20; i++) {
@@ -97,7 +85,8 @@ public class TreeTableViewSelectionModelImplTest {
         focusModel = tableView.getFocusModel();
     }
 
-    @After public void tearDown() {
+    @AfterEach
+    public void tearDown() {
         model = null;
     }
 
@@ -138,7 +127,7 @@ private TreeTablePosition pos(int row, TreeTableColumn<String,?> col) {
         model.select(3);
         assertFalse(model.isSelected(1, col0));
         assertFalse(model.isSelected(3, col0));
-        assertFalse(cells(model), model.isSelected(3, null));
+        assertFalse(model.isSelected(3, null), cells(model));
         assertTrue(model.isSelected(3));
         assertEquals(1, model.getSelectedCells().size());
     }
@@ -152,7 +141,7 @@ private TreeTablePosition pos(int row, TreeTableColumn<String,?> col) {
 
         assertFalse(model.isSelected(1, col0));
         assertFalse(model.isSelected(3, col0));
-        assertFalse(cells(model), model.isSelected(3, null));
+        assertFalse(model.isSelected(3, null), cells(model));
         assertTrue(model.isSelected(3));
         assertEquals(1, model.getSelectedCells().size());
     }
@@ -285,8 +274,8 @@ private TreeTablePosition pos(int row, TreeTableColumn<String,?> col) {
         model.select(2, col1);
         assertTrue(model.isSelected(2, col1));
         model.selectNext();
-        assertFalse(cells(model), model.isSelected(2, col1));
-        assertTrue(cells(model), model.isSelected(2, col2));
+        assertFalse(model.isSelected(2, col1), cells(model));
+        assertTrue(model.isSelected(2, col2));
     }
 
     @Test public void selectPreviousRowInCellSelectionMode() {
@@ -327,8 +316,8 @@ private TreeTablePosition pos(int row, TreeTableColumn<String,?> col) {
         model.clearSelection();
         model.select(2, col1);
         model.selectLeftCell();
-        assertTrue(cells(model), model.isSelected(2, col1));
-        assertTrue(cells(model), model.isSelected(2, col0));
+        assertTrue(model.isSelected(2, col1), cells(model));
+        assertTrue(model.isSelected(2, col0), cells(model));
         assertEquals(2, model.getSelectedCells().size());
     }
 
@@ -338,8 +327,8 @@ private TreeTablePosition pos(int row, TreeTableColumn<String,?> col) {
         model.clearSelection();
         model.select(2, col1);
         model.selectRightCell();
-        assertTrue(cells(model), model.isSelected(2, col1));
-        assertTrue(cells(model), model.isSelected(2, col2));
+        assertTrue(model.isSelected(2, col1), cells(model));
+        assertTrue(model.isSelected(2, col2), cells(model));
         assertEquals(2, model.getSelectedCells().size());
     }
 
@@ -348,7 +337,7 @@ private TreeTablePosition pos(int row, TreeTableColumn<String,?> col) {
         assertFalse(model.isSelected(0, null));
 
         model.select(10);
-        assertFalse(cells(model), model.isSelected(10, null));
+        assertFalse(model.isSelected(10, null), cells(model));
         assertEquals(1, model.getSelectedCells().size());
     }
 
@@ -357,8 +346,8 @@ private TreeTablePosition pos(int row, TreeTableColumn<String,?> col) {
         model.select(2, col2);
         assertEquals(2, model.getSelectedCells().get(0).getRow());
         assertEquals(col2, model.getSelectedCells().get(0).getTableColumn());
-        assertTrue(cells(model), model.isSelected(2, col2));
-        assertTrue(cells(model), model.isSelected(2));
+        assertTrue(model.isSelected(2, col2), cells(model));
+        assertTrue(model.isSelected(2), cells(model));
     }
 
     @Test public void clearSelectionOfSelectedCell() {
@@ -381,15 +370,15 @@ private TreeTablePosition pos(int row, TreeTableColumn<String,?> col) {
         assertTrue(model.isSelected(2));
         assertTrue(model.isSelected(3));
         model.clearSelection(2);
-        assertFalse(indices(model), model.isSelected(2));
-        assertTrue(indices(model), model.isSelected(3));
+        assertFalse(model.isSelected(2), indices(model));
+        assertTrue(model.isSelected(3), indices(model));
     }
 
     @Test public void selectNextCellWhenAtFirstCell() {
         model.setCellSelectionEnabled(true);
         model.select(0, col0);
         model.selectBelowCell();
-        assertTrue(cells(model), model.isSelected(1, col0));
+        assertTrue(model.isSelected(1, col0), cells(model));
     }
 
 
@@ -399,8 +388,8 @@ private TreeTablePosition pos(int row, TreeTableColumn<String,?> col) {
         model.setCellSelectionEnabled(false);
         model.select(4);
         model.selectFirst();
-        assertTrue(cells(model), model.isSelected(0, null));
-        assertTrue(cells(model), model.isSelected(0));
+        assertTrue(model.isSelected(0, null), cells(model));
+        assertTrue(model.isSelected(0), cells(model));
         assertEquals(1, model.getSelectedCells().size());
     }
 
@@ -411,9 +400,9 @@ private TreeTablePosition pos(int row, TreeTableColumn<String,?> col) {
         model.selectFirst();
 
         // we should go to the top of the currently focused cells column (i.e column 1)
-        assertTrue(cells(model), model.isSelected(0, col1));
-        assertFalse(cells(model), model.isSelected(0, null));
-        assertFalse(cells(model), model.isSelected(0, col0));
+        assertTrue(model.isSelected(0, col1), cells(model));
+        assertFalse(model.isSelected(0, null), cells(model));
+        assertFalse(model.isSelected(0, col0), cells(model));
         assertEquals(1, model.getSelectedCells().size());
     }
 
@@ -422,9 +411,9 @@ private TreeTablePosition pos(int row, TreeTableColumn<String,?> col) {
         model.setCellSelectionEnabled(false);
         model.select(4);
         model.selectFirst();
-        assertTrue(cells(model), model.isSelected(0));
-        assertTrue(cells(model), model.isSelected(0, null));
-        assertTrue(cells(model), model.isSelected(4));
+        assertTrue(model.isSelected(0), cells(model));
+        assertTrue(model.isSelected(0, null), cells(model));
+        assertTrue(model.isSelected(4), cells(model));
         assertEquals(2, model.getSelectedCells().size());
     }
 
@@ -434,19 +423,17 @@ private TreeTablePosition pos(int row, TreeTableColumn<String,?> col) {
         model.clearSelection();
         model.select(4, col1);
         model.selectFirst();
-        assertTrue(cells(model), model.isSelected(0, col1));
-        assertTrue(cells(model), model.isSelected(4, col1));
+        assertTrue(model.isSelected(0, col1), cells(model));
+        assertTrue(model.isSelected(4, col1), cells(model));
         assertEquals(2, model.getSelectedCells().size());
     }
 
-
-
     @Test public void selectLastRowInSingleSelectionRowMode() {
         model.setSelectionMode(SelectionMode.SINGLE);
         model.setCellSelectionEnabled(false);
         model.select(4);
         model.selectLast();
-        assertTrue(cells(model), model.isSelected(tableView.getExpandedItemCount() - 1));
+        assertTrue(model.isSelected(tableView.getExpandedItemCount() - 1), cells(model));
         assertEquals(1, model.getSelectedCells().size());
     }
 
@@ -455,7 +442,7 @@ private TreeTablePosition pos(int row, TreeTableColumn<String,?> col) {
         model.setCellSelectionEnabled(true);
         model.select(4, col1);
         model.selectLast();
-        assertTrue(cells(model), model.isSelected(tableView.getExpandedItemCount() - 1, col1));
+        assertTrue(model.isSelected(tableView.getExpandedItemCount() - 1, col1), cells(model));
         assertEquals(1, model.getSelectedCells().size());
     }
 
@@ -465,8 +452,8 @@ private TreeTablePosition pos(int row, TreeTableColumn<String,?> col) {
         model.clearSelection();
         model.select(4);
         model.selectLast();
-        assertTrue(cells(model), model.isSelected(tableView.getExpandedItemCount() - 1));
-        assertTrue(cells(model), model.isSelected(4));
+        assertTrue(model.isSelected(tableView.getExpandedItemCount() - 1), cells(model));
+        assertTrue(model.isSelected(4), cells(model));
         assertEquals(2, model.getSelectedCells().size());
     }
 
@@ -476,15 +463,15 @@ private TreeTablePosition pos(int row, TreeTableColumn<String,?> col) {
         model.clearSelection();
         model.select(4, col1);
         model.selectLast();
-        assertTrue(cells(model), model.isSelected(tableView.getExpandedItemCount() - 1, col1));
-        assertTrue(cells(model), model.isSelected(4, col1));
+        assertTrue(model.isSelected(tableView.getExpandedItemCount() - 1, col1), cells(model));
+        assertTrue(model.isSelected(4, col1), cells(model));
         assertEquals(2, model.getSelectedCells().size());
     }
 
     @Test public void selectCellInRowSelectionMode_expectCellInformationToRemain() {
         model.setCellSelectionEnabled(false);
         model.select(4, col0);
-        assertEquals(cells(model), col0, model.getSelectedCells().get(0).getTableColumn());
+        assertEquals(col0, model.getSelectedCells().get(0).getTableColumn(), cells(model));
         assertEquals(col0, focusModel.getFocusedCell().getTableColumn());
         assertTrue(model.isSelected(4, col0));
         assertTrue(model.isSelected(4));
@@ -497,41 +484,41 @@ public void selectIndividualCells() {
         model.clearSelection();
 
         model.select(0, col0);
-        assertTrue(cells(model), model.isSelected(0));
-        assertFalse(cells(model), model.isSelected(1));
-        assertFalse(cells(model), model.isSelected(2));
+        assertTrue(model.isSelected(0), cells(model));
+        assertFalse(model.isSelected(1), cells(model));
+        assertFalse(model.isSelected(2), cells(model));
 
         model.select(1, col0);
         model.select(1, col1);
-        assertTrue(cells(model), model.isSelected(0));
-        assertTrue(cells(model), model.isSelected(1));
-        assertFalse(cells(model), model.isSelected(2));
+        assertTrue(model.isSelected(0), cells(model));
+        assertTrue(model.isSelected(1), cells(model));
+        assertFalse(model.isSelected(2), cells(model));
 
         model.select(2, col0);
         model.select(2, col1);
         model.select(2, col2);
-        assertTrue(cells(model), model.isSelected(0));
-        assertTrue(cells(model), model.isSelected(1));
-        assertTrue(cells(model), model.isSelected(2));
+        assertTrue(model.isSelected(0), cells(model));
+        assertTrue(model.isSelected(1), cells(model));
+        assertTrue(model.isSelected(2), cells(model));
 
-        assertFalse(cells(model), model.isSelected(3));
+        assertFalse(model.isSelected(3), cells(model));
 
         assertEquals(6, model.getSelectedCells().size());
 
         model.clearSelection(0, col0);
-        assertFalse(cells(model), model.isSelected(0));
+        assertFalse(model.isSelected(0), cells(model));
 
         model.clearSelection(1, col0);
-        assertTrue(cells(model), model.isSelected(1));
+        assertTrue(model.isSelected(1), cells(model));
         model.clearSelection(1, col1);
-        assertFalse(cells(model), model.isSelected(1));
+        assertFalse(model.isSelected(1), cells(model));
 
         model.clearSelection(2, col0);
-        assertTrue(cells(model), model.isSelected(2));
+        assertTrue(model.isSelected(2), cells(model));
         model.clearSelection(2, col1);
-        assertTrue(cells(model), model.isSelected(2));
+        assertTrue(model.isSelected(2), cells(model));
         model.clearSelection(2, col2);
-        assertFalse(cells(model), model.isSelected(2));
+        assertFalse(model.isSelected(2), cells(model));
 
         assertEquals(0, model.getSelectedCells().size());
     }
@@ -544,8 +531,8 @@ public void selectIndividualCells() {
 
     @Test public void focusOnRow() {
         focusModel.focus(3);
-        assertTrue(focusedCell(), focusModel.isFocused(3));
-        assertTrue(focusedCell(), focusModel.isFocused(3, null));
+        assertTrue(focusModel.isFocused(3), focusedCell());
+        assertTrue(focusModel.isFocused(3, null), focusedCell());
         assertEquals(new TreeTablePosition(tableView, 3, null), focusModel.getFocusedCell());
         assertEquals(tableView.getTreeItem(3), focusModel.getFocusedItem());
     }
@@ -553,39 +540,39 @@ public void selectIndividualCells() {
     @Test public void focusOnNegativeRowIndex() {
         focusModel.focus(-20);
         assertEquals(new TreeTablePosition(tableView, -1, null), focusModel.getFocusedCell());
-        assertFalse(focusedCell(), focusModel.isFocused(-20, null));
+        assertFalse(focusModel.isFocused(-20, null), focusedCell());
     }
 
     @Test public void focusOutOfColumnsBounds() {
         focusModel.focus(3, null);
         assertEquals(new TreeTablePosition(tableView, 3, null), focusModel.getFocusedCell());
-        assertTrue(focusedCell(), focusModel.isFocused(3, null));
+        assertTrue(focusModel.isFocused(3, null), focusedCell());
     }
 
     @Test public void focusPreviousRow() {
         focusModel.focus(3);
         assertEquals(new TreeTablePosition(tableView, 3, null), focusModel.getFocusedCell());
-        assertTrue(focusedCell(), focusModel.isFocused(3));
-        assertTrue(focusedCell(), focusModel.isFocused(3, null));
+        assertTrue(focusModel.isFocused(3), focusedCell());
+        assertTrue(focusModel.isFocused(3, null), focusedCell());
 
         focusModel.focusPrevious();
         assertEquals(new TreeTablePosition(tableView, 2, null), focusModel.getFocusedCell());
-        assertTrue(focusedCell(), focusModel.isFocused(2));
-        assertTrue(focusedCell(), focusModel.isFocused(2, null));
+        assertTrue(focusModel.isFocused(2), focusedCell());
+        assertTrue(focusModel.isFocused(2, null), focusedCell());
     }
 
     @Test public void focusPreviousRowImmediately() {
         focusModel.focusPrevious();
         assertEquals(new TreeTablePosition(tableView, 0, null), focusModel.getFocusedCell());
-        assertTrue(focusedCell(), focusModel.isFocused(0, null));
+        assertTrue(focusModel.isFocused(0, null), focusedCell());
     }
 
     @Test public void focusPreviousRowFromFirstRow() {
         focusModel.focus(0);
         focusModel.focusPrevious();
         assertEquals(new TreeTablePosition(tableView, 0, null), focusModel.getFocusedCell());
-        assertTrue(focusedCell(), focusModel.isFocused(0));
-        assertTrue(focusedCell(), focusModel.isFocused(0, null));
+        assertTrue(focusModel.isFocused(0), focusedCell());
+        assertTrue(focusModel.isFocused(0, null), focusedCell());
     }
 
     @Test public void focusNextRow() {
@@ -593,8 +580,8 @@ public void selectIndividualCells() {
         focusModel.focusNext();
 
         assertEquals(new TreeTablePosition(tableView, 4, null), focusModel.getFocusedCell());
-        assertTrue(focusedCell(), focusModel.isFocused(4));
-        assertTrue(focusedCell(), focusModel.isFocused(4, null));
+        assertTrue(focusModel.isFocused(4), focusedCell());
+        assertTrue(focusModel.isFocused(4, null), focusedCell());
     }
 
     @Test public void focusNextRowImmediately() {
@@ -603,8 +590,8 @@ public void selectIndividualCells() {
         focusModel.focusNext();
 
         assertEquals(new TreeTablePosition(tableView, 1, null), focusModel.getFocusedCell());
-        assertTrue(focusedCell(), focusModel.isFocused(1));
-        assertTrue(focusedCell(), focusModel.isFocused(1, null));
+        assertTrue(focusModel.isFocused(1), focusedCell());
+        assertTrue(focusModel.isFocused(1, null), focusedCell());
     }
 
     @Test public void focusNextRowFromLastRow() {
@@ -613,28 +600,28 @@ public void selectIndividualCells() {
         focusModel.focusNext();
 
         assertEquals(new TreeTablePosition(tableView, rowCount, null), focusModel.getFocusedCell());
-        assertTrue(focusedCell(), focusModel.isFocused(rowCount));
-        assertTrue(focusedCell(), focusModel.isFocused(rowCount, null));
+        assertTrue(focusModel.isFocused(rowCount), focusedCell());
+        assertTrue(focusModel.isFocused(rowCount, null), focusedCell());
     }
 
     @Test public void focusAboveCell() {
         focusModel.focus(3, col1);
         assertEquals(new TreeTablePosition(tableView, 3, col1), focusModel.getFocusedCell());
-        assertTrue(focusedCell(), focusModel.isFocused(3, col1));
+        assertTrue(focusModel.isFocused(3, col1), focusedCell());
 
         focusModel.focusAboveCell();
         assertEquals(new TreeTablePosition(tableView, 2, col1), focusModel.getFocusedCell());
         // not sure about this - a row probably shouldn't be focused when we've given it specifically to a cell
-        assertTrue(focusedCell(), focusModel.isFocused(2));
-        assertTrue(focusedCell(), focusModel.isFocused(2, col1));
+        assertTrue(focusModel.isFocused(2), focusedCell());
+        assertTrue(focusModel.isFocused(2, col1), focusedCell());
     }
 
     @Test public void focusAboveCellFromFirstRow() {
         focusModel.focus(0, col1);
         focusModel.focusAboveCell();
         assertEquals(new TreeTablePosition(tableView, 0, col1), focusModel.getFocusedCell());
-        assertTrue(focusedCell(), focusModel.isFocused(0));
-        assertTrue(focusedCell(), focusModel.isFocused(0, col1));
+        assertTrue(focusModel.isFocused(0), focusedCell());
+        assertTrue(focusModel.isFocused(0, col1), focusedCell());
     }
 
     @Test public void focusBelowCell() {
@@ -642,8 +629,8 @@ public void selectIndividualCells() {
         focusModel.focusBelowCell();
 
         assertEquals(new TreeTablePosition(tableView, 4, col1), focusModel.getFocusedCell());
-        assertTrue(focusedCell(), focusModel.isFocused(4));
-        assertTrue(focusedCell(), focusModel.isFocused(4, col1));
+        assertTrue(focusModel.isFocused(4), focusedCell());
+        assertTrue(focusModel.isFocused(4, col1), focusedCell());
     }
 
     @Test public void focusBelowCellFromLastRow() {
@@ -652,8 +639,8 @@ public void selectIndividualCells() {
         focusModel.focusBelowCell();
 
         assertEquals(new TreeTablePosition(tableView, rowCount, col1), focusModel.getFocusedCell());
-        assertTrue(focusedCell(), focusModel.isFocused(rowCount));
-        assertTrue(focusedCell(), focusModel.isFocused(rowCount, col1));
+        assertTrue(focusModel.isFocused(rowCount), focusedCell());
+        assertTrue(focusModel.isFocused(rowCount, col1), focusedCell());
     }
 
     @Test public void focusLeftCell() {
@@ -661,8 +648,8 @@ public void selectIndividualCells() {
         focusModel.focusLeftCell();
 
         assertEquals(new TreeTablePosition(tableView, 3, col0), focusModel.getFocusedCell());
-        assertTrue(focusedCell(), focusModel.isFocused(3));
-        assertTrue(focusedCell(), focusModel.isFocused(3, col0));
+        assertTrue(focusModel.isFocused(3), focusedCell());
+        assertTrue(focusModel.isFocused(3, col0), focusedCell());
     }
 
     @Test public void focusLeftCellFromFirstColumn() {
@@ -670,8 +657,8 @@ public void selectIndividualCells() {
         focusModel.focusLeftCell();
 
         assertEquals(new TreeTablePosition(tableView, 3, col0), focusModel.getFocusedCell());
-        assertTrue(focusedCell(), focusModel.isFocused(3));
-        assertTrue(focusedCell(), focusModel.isFocused(3, col0));
+        assertTrue(focusModel.isFocused(3), focusedCell());
+        assertTrue(focusModel.isFocused(3, col0), focusedCell());
     }
 
     @Test public void focusLeftCellFromNullColumn() {
@@ -679,8 +666,8 @@ public void selectIndividualCells() {
         focusModel.focusLeftCell();
 
         assertEquals(new TreeTablePosition(tableView, 3, null), focusModel.getFocusedCell());
-        assertTrue(focusedCell(), focusModel.isFocused(3));
-        assertTrue(focusedCell(), focusModel.isFocused(3, null));
+        assertTrue(focusModel.isFocused(3), focusedCell());
+        assertTrue(focusModel.isFocused(3, null), focusedCell());
     }
 
     @Test public void focusRightCell() {
@@ -688,8 +675,8 @@ public void selectIndividualCells() {
         focusModel.focusRightCell();
 
         assertEquals(new TreeTablePosition(tableView, 3, col1), focusModel.getFocusedCell());
-        assertTrue(focusedCell(), focusModel.isFocused(3));
-        assertTrue(focusedCell(), focusModel.isFocused(3, col1));
+        assertTrue(focusModel.isFocused(3), focusedCell());
+        assertTrue(focusModel.isFocused(3, col1), focusedCell());
     }
 
     @Test public void focusRightCellFromEndColumn() {
@@ -699,8 +686,8 @@ public void selectIndividualCells() {
         focusModel.focusRightCell();
 
         assertEquals(new TreeTablePosition(tableView, 3, rightEdge), focusModel.getFocusedCell());
-        assertTrue(focusedCell(), focusModel.isFocused(3));
-        assertTrue(focusedCell(), focusModel.isFocused(3, rightEdge));
+        assertTrue(focusModel.isFocused(3), focusedCell());
+        assertTrue(focusModel.isFocused(3, rightEdge), focusedCell());
     }
 
     @Test public void test_rt33442() {
@@ -1017,10 +1004,10 @@ public void testSelectRowWhenInSingleCellSelectionModeIsSelected() {
         model.setCellSelectionEnabled(true);
         model.select(3);
         // test against contract
-        assertEquals("selected index", 3, model.getSelectedIndex());
-        assertTrue("contained in selected indices", model.getSelectedIndices().contains(3));
+        assertEquals(3, model.getSelectedIndex(), "selected index");
+        assertTrue(model.getSelectedIndices().contains(3), "contained in selected indices");
         // test against spec
-        assertEquals("is selected index", model.getSelectedIndices().contains(3), model.isSelected(3));
+        assertEquals(model.getSelectedIndices().contains(3), model.isSelected(3), "is selected index");
     }
 
     @Test
@@ -1059,11 +1046,11 @@ private void assertRowSelectionAfterSelectAndHideColumn(TreeTableView<Person> ta
         TreeTableColumn<Person, ?> column = table.getColumns().get(col);
 
         sm.select(row, column);
-        assertTrue("sanity: row " + row + "contained in selectedIndices", sm.getSelectedIndices().contains(row));
-        assertTrue("sanity: row must be selected" , sm.isSelected(row));
+        assertTrue(sm.getSelectedIndices().contains(row), "sanity: row " + row + "contained in selectedIndices");
+        assertTrue(sm.isSelected(row), "sanity: row must be selected");
         column.setVisible(false);
-        assertTrue("after hiding column: row " + row + "contained in selectedIndices", sm.getSelectedIndices().contains(row));
-        assertTrue("after hiding column: row must be selected" , sm.isSelected(row));
+        assertTrue(sm.getSelectedIndices().contains(row), "after hiding column: row " + row + "contained in selectedIndices");
+        assertTrue(sm.isSelected(row), "after hiding column: row must be selected");
     }
 
     /**
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableViewTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableViewTest.java
index 6c9a9154ee9..d51bf9f1cb6 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableViewTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableViewTest.java
@@ -27,15 +27,6 @@
 
 import static javafx.scene.control.TreeTableColumn.SortType.ASCENDING;
 import static javafx.scene.control.TreeTableColumn.SortType.DESCENDING;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -45,10 +36,6 @@
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
 import com.sun.javafx.scene.control.TableColumnBaseHelper;
 import com.sun.javafx.scene.control.TableColumnComparatorBase.TreeTableColumnComparator;
 import com.sun.javafx.scene.control.VirtualScrollBar;
@@ -127,6 +114,30 @@
 import test.com.sun.javafx.scene.control.test.Person;
 import test.com.sun.javafx.scene.control.test.RT_22463_Person;
 import test.javafx.collections.MockListObserver;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.Arguments;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertTimeout;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.params.provider.Arguments;
+import java.util.stream.Stream;
 
 public class TreeTableViewTest {
     private TreeTableView<String> treeTableView;
@@ -156,7 +167,8 @@ public class TreeTableViewTest {
             private TreeItem<String> judyMayer;
             private TreeItem<String> gregorySmith;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         treeTableView = new TreeTableView<>();
         sm = treeTableView.getSelectionModel();
         fm = treeTableView.getFocusModel();
@@ -195,7 +207,7 @@ public class TreeTableViewTest {
         );
     }
 
-    @After
+    @AfterEach
     public void cleanup() {
         if (stageLoader != null) {
             stageLoader.dispose();
@@ -430,7 +442,7 @@ private TreeTableColumn<String, String> initSortTestStructure() {
         verifySelectionAfterPermutation();
     }
 
-    @Ignore("JDK-8193442")
+    @Disabled("JDK-8193442")
     @Test public void testSelectionUpdatesCorrectlyAfterRemovingSelectedItem() {
         setupForPermutationTest();
         TreeItem<String> parentOfSelectedTreeItem = ((TreeItem<String>)sm.getSelectedItem()).getParent();
@@ -441,7 +453,7 @@ private TreeTableColumn<String, String> initSortTestStructure() {
         verifySelectionAfterPermutation();
     }
 
-    @Ignore("JDK-8248389")
+    @Disabled("JDK-8248389")
     @Test public void testSelectionUpdatesCorrectlyAfterAddingAnItemBeforeSelectedItem() {
         setupForPermutationTest();
         TreeItem<String> parentOfSelectedTreeItem = ((TreeItem<String>)sm.getSelectedItem()).getParent();
@@ -461,7 +473,7 @@ private TreeTableColumn<String, String> initSortTestStructure() {
         verifySelectionAfterPermutation();
     }
 
-    @Ignore("JDK-8193442")
+    @Disabled("JDK-8193442")
     @Test public void testSelectionUpdatesCorrectlyAfterChildReverseRemoveOneAndSetAll() {
         setupForPermutationTest();
         TreeItem<String> parentTreeItem = ((TreeItem<String>)sm.getSelectedItem()).getParent();
@@ -471,7 +483,7 @@ private TreeTableColumn<String, String> initSortTestStructure() {
         verifySelectionAfterPermutation();
     }
 
-    @Ignore("JDK-8193442")
+    @Disabled("JDK-8193442")
     @Test public void testSelectionUpdatesCorrectlyAfterChildRemoveOneAndSetAll() {
         TreeItem<String> parentTreeItem = ((TreeItem<String>)sm.getSelectedItem()).getParent();
         List<TreeItem<String>> children = new ArrayList<>(parentTreeItem.getChildren());
@@ -480,7 +492,7 @@ private TreeTableColumn<String, String> initSortTestStructure() {
         verifySelectionAfterPermutation();
     }
 
-    @Ignore("JDK-8193442")
+    @Disabled("JDK-8193442")
     @Test public void testSelectionUpdatesCorrectlyAfterChildRemoveOneAndSetAllAndSort() {
         TreeTableColumn<String, String> col = setupForPermutationTest();
         TreeItem<String> parentTreeItem = ((TreeItem<String>)sm.getSelectedItem()).getParent();
@@ -605,16 +617,14 @@ private void verifySelectedCells(List<TreeTablePosition<String, ?>> selectedCell
                     isCellStillSelected = true;
                 }
             }
-            assertTrue("The item (" + beforePos.getRow() + ", " + beforePos.getColumn() +
-                    ") lost selection during permutation", isCellStillSelected);
+            assertTrue(isCellStillSelected, "The item (" + beforePos.getRow() + ", " + beforePos.getColumn() + ") lost selection during permutation");
         }
     }
 
     private void verifySelectedItems(List<TreeItem<String>> selectedItems) {
         assertEquals(selectedItemsBefore.size(), selectedItems.size());
         for (TreeItem<String> item : selectedItemsBefore) {
-            assertTrue("The item (" + item + ") lost selection during permutation",
-                    selectedItems.contains(item));
+            assertTrue(selectedItems.contains(item), "The item (" + item + ") lost selection during permutation");
         }
     }
 
@@ -631,15 +641,15 @@ private void verifySelectionAfterPermutation() {
         assertEquals(expectedCountSelectedIndicesChangeEvent, countSelectedIndicesChangeEvent);
         assertEquals(expectedCountSelectedItemsChangeEvent, countSelectedItemsChangeEvent);
 
-        assertEquals("Selected Item should remain same", selectedItemBefore, sm.getSelectedItem());
-        assertEquals("Selected index should be updated", treeTableView.getRow(selectedItemBefore), sm.getSelectedIndex());
+        assertEquals(selectedItemBefore, sm.getSelectedItem(), "Selected Item should remain same");
+        assertEquals(treeTableView.getRow(selectedItemBefore), sm.getSelectedIndex(), "Selected index should be updated");
 
         verifySelectedCells(sm.getSelectedCells());
         verifySelectedItems(sm.getSelectedItems());
         verifySelectedIndices(sm.getSelectedIndices());
     }
 
-    @Ignore("This test is only valid if sort event consumption should revert changes")
+    @Disabled("This test is only valid if sort event consumption should revert changes")
     @Test public void testSortEventCanBeConsumedToStopSortOccurring_changeSortOrderList() {
         TreeTableColumn<String, String> col = initSortTestStructure();
         treeTableView.setOnSort(event -> {
@@ -667,7 +677,7 @@ private void verifySelectionAfterPermutation() {
         VirtualFlowTestUtils.assertListContainsItemsInOrder(treeTableView.getSortOrder(), col);
     }
 
-    @Ignore("This test is only valid if sort event consumption should revert changes")
+    @Disabled("This test is only valid if sort event consumption should revert changes")
     @Test public void testSortEventCanBeConsumedToStopSortOccurring_changeColumnSortType_AscendingToDescending() {
         TreeTableColumn<String, String> col = initSortTestStructure();
         assertEquals(ASCENDING, col.getSortType());
@@ -705,7 +715,7 @@ private void verifySelectionAfterPermutation() {
         VirtualFlowTestUtils.assertListContainsItemsInOrder(treeTableView.getSortOrder(), col);
     }
 
-    @Ignore("This test is only valid if sort event consumption should revert changes")
+    @Disabled("This test is only valid if sort event consumption should revert changes")
     @Test public void testSortEventCanBeConsumedToStopSortOccurring_changeColumnSortType_DescendingToNull() {
         TreeTableColumn<String, String> col = initSortTestStructure();
         col.setSortType(DESCENDING);
@@ -742,7 +752,7 @@ private void verifySelectionAfterPermutation() {
         VirtualFlowTestUtils.assertListContainsItemsInOrder(treeTableView.getSortOrder(), col);
     }
 
-    @Ignore("This test is only valid if sort event consumption should revert changes")
+    @Disabled("This test is only valid if sort event consumption should revert changes")
     @Test public void testSortEventCanBeConsumedToStopSortOccurring_changeColumnSortType_NullToAscending() {
         TreeTableColumn<String, String> col = initSortTestStructure();
         col.setSortType(null);
@@ -1239,7 +1249,7 @@ private void verifySelectionAfterPermutation() {
         assertSame(child1, treeTableView.getSelectionModel().getSelectedItem());
     }
 
-    @Ignore("Not yet supported")
+    @Disabled("Not yet supported")
     @Test public void settingTheSelectedItemToANonexistantItemAndThenSettingItemsWhichContainsItResultsInCorrectSelectedIndex() {
         treeTableView.getSelectionModel().select(child1);
         installChildren();
@@ -1247,7 +1257,7 @@ private void verifySelectionAfterPermutation() {
         assertSame(child1, treeTableView.getSelectionModel().getSelectedItem());
     }
 
-    @Ignore("Not yet supported")
+    @Disabled("Not yet supported")
     @Test public void ensureSelectionClearsWhenAllItemsAreRemoved_selectIndex0() {
         installChildren();
         treeTableView.getSelectionModel().select(0);
@@ -1256,7 +1266,7 @@ private void verifySelectionAfterPermutation() {
         assertEquals(null, treeTableView.getSelectionModel().getSelectedItem());
     }
 
-    @Ignore("Not yet supported")
+    @Disabled("Not yet supported")
     @Test public void ensureSelectionClearsWhenAllItemsAreRemoved_selectIndex2() {
         installChildren();
         treeTableView.getSelectionModel().select(2);
@@ -1265,7 +1275,7 @@ private void verifySelectionAfterPermutation() {
         assertEquals(null, treeTableView.getSelectionModel().getSelectedItem());
     }
 
-    @Ignore("Not yet supported")
+    @Disabled("Not yet supported")
     @Test public void ensureSelectedItemRemainsAccurateWhenItemsAreCleared() {
         installChildren();
         treeTableView.getSelectionModel().select(2);
@@ -1378,7 +1388,9 @@ private void verifySelectionAfterPermutation() {
     /*********************************************************************
      * Tests from bug reports                                            *
      ********************************************************************/
-    @Ignore @Test public void test_rt17112() {
+    @Disabled
+    @Test
+    public void test_rt17112() {
         TreeItem<String> root1 = new TreeItem<>("Root");
         root1.setExpanded(true);
         addChildren(root1, "child");
@@ -1449,7 +1461,7 @@ private void addChildren(TreeItem parent, String name) {
 
         TreeItem child0 = new TreeItem("child0");
         root.getChildren().add(0, child0);
-        assertTrue("Focused index: " + fm.getFocusedIndex(), fm.isFocused(2));
+        assertTrue(fm.isFocused(2), "Focused index: " + fm.getFocusedIndex());
     }
 
     @Test public void test_rt17522_focusShouldNotMoveWhenItemAddedAfterFocusIndex_1() {
@@ -1460,7 +1472,7 @@ private void addChildren(TreeItem parent, String name) {
 
         TreeItem child4 = new TreeItem("child4");
         root.getChildren().add(3, child4);
-        assertTrue("Focused index: " + fm.getFocusedIndex(), fm.isFocused(1));
+        assertTrue(fm.isFocused(1), "Focused index: " + fm.getFocusedIndex());
     }
 
     @Test public void test_rt17522_focusShouldBeMovedWhenFocusedItemIsRemoved_1() {
@@ -1691,7 +1703,7 @@ private void addChildren(TreeItem parent, String name) {
         }
     }
 
-    @Ignore("This test begun failing when createDefaultCellImpl was removed from TreeTableViewSkin on 28/3/2013")
+    @Disabled("This test begun failing when createDefaultCellImpl was removed from TreeTableViewSkin on 28/3/2013")
     @Test public void test_rt28534() {
         TreeItem root = new TreeItem("root");
         root.getChildren().setAll(
@@ -2323,7 +2335,7 @@ private void addLevel(TreeItem<Data> item, int level, int length) {
         // now collapse the salesDepartment, selection should
         // not jump down to the itSupport people
         salesDepartment.setExpanded(false);
-        assertTrue(sm.getSelectedIndices().toString(), sm.isSelected(1));   // salesDepartment
+        assertTrue(sm.isSelected(1), sm.getSelectedIndices().toString());   // salesDepartment
         assertTrue(treeTableView.getFocusModel().isFocused(1));
         assertEquals(1, sm.getSelectedCells().size());
     }
@@ -2343,7 +2355,7 @@ private void addLevel(TreeItem<Data> item, int level, int length) {
         assertEquals(1, sm.getSelectedIndices().size());
 
         salesDepartment.setExpanded(false);
-        assertTrue(debug(), sm.isSelected(2));   // itSupport
+        assertTrue(sm.isSelected(2), debug());   // itSupport
         assertTrue(treeTableView.getFocusModel().isFocused(2));
         assertEquals(1, sm.getSelectedIndices().size());
     }
@@ -2363,10 +2375,10 @@ private void addLevel(TreeItem<Data> item, int level, int length) {
         assertTrue(sm.isSelected(9));   // mikeGraham
         assertTrue(sm.isSelected(10));  // judyMayer
         assertTrue(treeTableView.getFocusModel().isFocused(10));
-        assertEquals(debug(), 3, sm.getSelectedIndices().size());
+        assertEquals(3, sm.getSelectedIndices().size(), debug());
 
         salesDepartment.setExpanded(false);
-        assertTrue(debug(), sm.isSelected(2));   // itSupport
+        assertTrue(sm.isSelected(2), debug());   // itSupport
         assertTrue(sm.isSelected(3));   // mikeGraham
         assertTrue(sm.isSelected(4));   // judyMayer
         assertTrue(treeTableView.getFocusModel().isFocused(4));
@@ -2388,7 +2400,7 @@ private void addLevel(TreeItem<Data> item, int level, int length) {
         assertEquals(1, sm.getSelectedIndices().size());
 
         salesDepartment.setExpanded(true);
-        assertTrue(debug(), sm.isSelected(8));   // itSupport
+        assertTrue(sm.isSelected(8), debug());   // itSupport
         assertTrue(treeTableView.getFocusModel().isFocused(8));
         assertEquals(1, sm.getSelectedIndices().size());
     }
@@ -2411,7 +2423,7 @@ private void addLevel(TreeItem<Data> item, int level, int length) {
         assertEquals(3, sm.getSelectedIndices().size());
 
         salesDepartment.setExpanded(true);
-        assertTrue(debug(), sm.isSelected(8));   // itSupport
+        assertTrue(sm.isSelected(8), debug());   // itSupport
         assertTrue(sm.isSelected(9));   // mikeGraham
         assertTrue(sm.isSelected(10));   // judyMayer
         assertTrue(treeTableView.getFocusModel().isFocused(10));
@@ -2439,7 +2451,7 @@ private void addLevel(TreeItem<Data> item, int level, int length) {
         VirtualFlowTestUtils.assertCellEmpty(VirtualFlowTestUtils.getCell(tableView, 3));
     }
 
-    @Ignore("This bug is not yet fixed")
+    @Disabled("This bug is not yet fixed")
     @Test public void test_rt31165() {
         installChildren();
         treeTableView.setEditable(true);
@@ -2734,7 +2746,7 @@ public void updateItem(String item, boolean empty) {
 
         // now test to ensure that CCC is still the only selected item, but now
         // located in index 1 (as the first child of the root)
-        assertTrue(debug(), sm.isSelected(1));
+        assertTrue(sm.isSelected(1), debug());
         assertEquals(1, sm.getSelectedIndex());
         assertEquals(1, sm.getSelectedIndices().size());
         assertTrue(sm.getSelectedIndices().contains(1));
@@ -3765,7 +3777,7 @@ protected <T> void assert_rt35857(ObservableList<T> items, MultipleSelectionMode
             items.removeAll(sm.getSelectedItems());
         }
         String modified = (retain ? " retainAll " : " removeAll ") + " selectedItems ";
-        assertEquals("expected list after" + modified, expected, items);
+        assertEquals(expected, items, "expected list after" + modified);
     }
 
 
@@ -4348,14 +4360,14 @@ private void test_rt_37538(boolean callCNextOnce, boolean callCNextInLoop) {
         // we should end up with the selection being on index 4, which is the
         // final location of the 'one' tree item, after sorting and expanding 'two'
         assertEquals(one, sm.getSelectedItem());
-        assertTrue(debug(), sm.isSelected(4));
+        assertTrue(sm.isSelected(4), debug());
 
         // this line would create a NPE
         VirtualFlowTestUtils.clickOnRow(treeTableView, 4, true);
 
         // The mouse click should not change selection at all
         assertEquals(one, sm.getSelectedItem());
-        assertTrue(debug(), sm.isSelected(4));
+        assertTrue(sm.isSelected(4), debug());
     }
 
     @Test public void test_rt_35395_testCell_fixedCellSize() {
@@ -4366,12 +4378,12 @@ private void test_rt_37538(boolean callCNextOnce, boolean callCNextInLoop) {
         test_rt_35395(true, false);
     }
 
-    @Ignore("Fix not yet developed for TreeTableView")
+    @Disabled("Fix not yet developed for TreeTableView")
     @Test public void test_rt_35395_testRow_fixedCellSize() {
         test_rt_35395(false, true);
     }
 
-    @Ignore("Fix not yet developed for TreeTableView")
+    @Disabled("Fix not yet developed for TreeTableView")
     @Test public void test_rt_35395_testRow_notFixedCellSize() {
         test_rt_35395(false, false);
     }
@@ -5552,7 +5564,7 @@ private void test_rt_16068(int indexToSelect, int indexToRemove, int expectedInd
         root.getChildren().remove(indexToRemove);
         assertEquals(expectedIndex, sm.getSelectedIndex());
         assertEquals(root.getChildren().get(expectedIndex).getValue(), sm.getSelectedItem().getValue());
-        assertEquals(debug(), expectedIndex, fm.getFocusedIndex());
+        assertEquals(expectedIndex, fm.getFocusedIndex(), debug());
         assertEquals(root.getChildren().get(expectedIndex).getValue(), fm.getFocusedItem().getValue());
     }
 
@@ -5635,8 +5647,7 @@ private TreeItem createSubTree(Object item, ObservableList<String> rawItems) {
         TreeItem child = createSubTree("child", rawItems);
         TreeItem grandChild = (TreeItem) child.getChildren().get(rawItems.size() - 1);
         root.getChildren().add(child);
-        assertTrue("row of item must be less than expandedItemCount, but was: " + treeTableView.getRow(grandChild),
-                treeTableView.getRow(grandChild) < treeTableView.getExpandedItemCount());
+        assertTrue(treeTableView.getRow(grandChild) < treeTableView.getExpandedItemCount(), "row of item must be less than expandedItemCount, but was: " + treeTableView.getRow(grandChild));
     }
 
     @Test public void test_rt_39661_rowOfGrandChildParentCollapsedUpdatedOnInsertAbove() {
@@ -5705,8 +5716,7 @@ private TreeItem createSubTree(Object item, ObservableList<String> rawItems) {
         expandedChild.setExpanded(true);
 
         root.getChildren().add(childIndex, expandedChild);
-        assertNotSame("getRow must depend on expansionState " + collapedGrandIndex,
-                collapedGrandIndex, treeTableView.getRow(expandedGrandChild));
+        assertNotSame(collapedGrandIndex, treeTableView.getRow(expandedGrandChild), "getRow must depend on expansionState " + collapedGrandIndex);
     }
 
     @Test public void test_rt_39661_rowOfGrandChildInCollapsedChild() {
@@ -5721,7 +5731,7 @@ private TreeItem createSubTree(Object item, ObservableList<String> rawItems) {
         int row = treeTableView.getRow(grandChild);
 
         // grandChild not visible, row coordinate in tree is not available
-        assertEquals("grandChild not visible", -1, row);
+        assertEquals(-1, row, "grandChild not visible");
 
         // the other way round: if we get a row, expect the item at the row be the grandChild
         if (row > -1) {
@@ -6003,7 +6013,7 @@ public int hashCode() {
         // but in index (last - 2).
         int expected = last - 2;
         assertEquals("5", sm.getSelectedItem().getValue());
-        assertEquals("selected index after disjoint removes above", expected, sm.getSelectedIndex());
+        assertEquals(expected, sm.getSelectedIndex(), "selected index after disjoint removes above");
     }
 
     /**
@@ -6080,8 +6090,8 @@ public int hashCode() {
 
         // disjoint remove of 2 elements above the last selected
         root.getChildren().removeAll(root.getChildren().get(1), root.getChildren().get(3));
-        assertEquals("sanity: selectedIndex must be shifted by -2", last - 2, sm.getSelectedIndex());
-        assertEquals("must fire single event on removes above", 1, rt_40012_count);
+        assertEquals(last - 2, sm.getSelectedIndex(), "sanity: selectedIndex must be shifted by -2");
+        assertEquals(1, rt_40012_count, "must fire single event on removes above");
     }
 
     /**
@@ -6118,8 +6128,8 @@ public void test_rt_40012_selectedItemNotificationOnDisjointRemovesAbove() {
 
         // disjoint remove of 2 elements above the last selected
         root.getChildren().removeAll(root.getChildren().get(1), root.getChildren().get(3));
-        assertEquals("sanity: selectedItem unchanged", lastItem, sm.getSelectedItem());
-        assertEquals("must not fire on unchanged selected item", 0, rt_40012_count);
+        assertEquals(lastItem, sm.getSelectedItem(), "sanity: selectedItem unchanged");
+        assertEquals(0, rt_40012_count, "must not fire on unchanged selected item");
     }
 
     private int rt_40010_count = 0;
@@ -6182,12 +6192,12 @@ public void test_rt_40012_selectedItemNotificationOnDisjointRemovesAbove() {
         int selected = sm.getSelectedIndex();
 
         sm.getSelectedIndices().addListener((ListChangeListener<Integer>) change -> {
-            assertEquals("sanity: selectedIndex unchanged", selected, sm.getSelectedIndex());
+            assertEquals(selected, sm.getSelectedIndex(), "sanity: selectedIndex unchanged");
             while(change.next()) {
-                assertEquals("single event on clearAndSelect already selected", 1, ++rt_40212_count);
+                assertEquals(1, ++rt_40212_count, "single event on clearAndSelect already selected");
 
                 boolean type = change.wasAdded() || change.wasRemoved() || change.wasPermutated() || change.wasUpdated();
-                assertTrue("at least one of the change types must be true", type);
+                assertTrue(type, "at least one of the change types must be true");
             }
         });
 
@@ -6211,7 +6221,7 @@ public void test_rt_40012_selectedItemNotificationOnDisjointRemovesAbove() {
         view.setShowRoot(false);
         MultipleSelectionModel<TreeItem<String>> sm = view.getSelectionModel();
 
-        assertFalse("sanity: test setup such that root is not showing", view.isShowRoot());
+        assertFalse(view.isShowRoot(), "sanity: test setup such that root is not showing");
         sm.select(0);
         assertEquals(0, sm.getSelectedIndex());
         assertEquals(view.getTreeItem(sm.getSelectedIndex()), sm.getSelectedItem());
@@ -6229,7 +6239,7 @@ public void test_rt_40012_selectedItemNotificationOnDisjointRemovesAbove() {
         view.setShowRoot(true);
         MultipleSelectionModel<TreeItem<String>> sm = view.getSelectionModel();
 
-        assertTrue("sanity: test setup such that root is showing", view.isShowRoot());
+        assertTrue(view.isShowRoot(), "sanity: test setup such that root is showing");
         sm.select(1);
         assertEquals(1, sm.getSelectedIndex());
         assertEquals(view.getTreeItem(sm.getSelectedIndex()), sm.getSelectedItem());
@@ -6247,7 +6257,7 @@ public void test_rt_40012_selectedItemNotificationOnDisjointRemovesAbove() {
         view.setShowRoot(true);
         MultipleSelectionModel<TreeItem<String>> sm = view.getSelectionModel();
 
-        assertTrue("sanity: test setup such that root is showing", view.isShowRoot());
+        assertTrue(view.isShowRoot(), "sanity: test setup such that root is showing");
         sm.select(0);
         assertEquals(0, sm.getSelectedIndex());
         assertEquals(view.getTreeItem(sm.getSelectedIndex()), sm.getSelectedItem());
@@ -6530,8 +6540,9 @@ public String toString() {
                     // expect to see [1,2,3] added at index 0
                     c.next();
                     assertEquals(3, c.getAddedSize());
-                    assertTrue("added: " + c.getAddedSubList(),
-                            c.getAddedSubList().containsAll(FXCollections.observableArrayList(1,2,3)));
+                    assertTrue(
+                            c.getAddedSubList().containsAll(FXCollections.observableArrayList(1,2,3)),
+                            "added: " + c.getAddedSubList());
                     assertEquals(0, c.getFrom());
                     break;
                 }
@@ -6562,8 +6573,9 @@ public String toString() {
                     // expect to see [1,2,3] added at index 0
                     c.next();
                     assertEquals(3, c.getAddedSize());
-                    assertTrue("added: " + c.getAddedSubList(),
-                            c.getAddedSubList().containsAll(FXCollections.observableArrayList(childNode1, item1, item2)));
+                    assertTrue(
+                            c.getAddedSubList().containsAll(FXCollections.observableArrayList(childNode1, item1, item2)),
+                            "added: " + c.getAddedSubList());
                     assertEquals(0, c.getFrom());
                     break;
                 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeViewKeyInputTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeViewKeyInputTest.java
index 36173649726..cdad97ce5d4 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeViewKeyInputTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeViewKeyInputTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,15 +25,33 @@
 
 package test.javafx.scene.control;
 
-import com.sun.javafx.scene.control.behavior.TreeCellBehavior;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.List;
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 import javafx.scene.Group;
 import javafx.scene.control.Button;
+import javafx.scene.control.FocusModel;
+import javafx.scene.control.IndexedCell;
+import javafx.scene.control.MultipleSelectionModel;
+import javafx.scene.control.SelectionMode;
+import javafx.scene.control.TreeItem;
+import javafx.scene.control.TreeTableColumn;
+import javafx.scene.control.TreeView;
 import javafx.scene.input.KeyCode;
-import java.util.List;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import com.sun.javafx.PlatformUtil;
+import com.sun.javafx.scene.control.behavior.TreeCellBehavior;
+import com.sun.javafx.tk.Toolkit;
 import com.sun.javafx.util.Utils;
 import test.com.sun.javafx.scene.control.behavior.TreeViewAnchorRetriever;
 import test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils;
@@ -41,24 +59,6 @@
 import test.com.sun.javafx.scene.control.infrastructure.KeyModifier;
 import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
 import test.com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils;
-import com.sun.javafx.tk.Toolkit;
-import javafx.scene.control.FocusModel;
-import javafx.scene.control.IndexedCell;
-import javafx.scene.control.MultipleSelectionModel;
-import javafx.scene.control.SelectionMode;
-import javafx.scene.control.TreeItem;
-import javafx.scene.control.TreeTableColumn;
-import javafx.scene.control.TreeView;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 
 public class TreeViewKeyInputTest {
     private TreeView<String> treeView;
@@ -83,7 +83,8 @@ public class TreeViewKeyInputTest {
         private final TreeItem<String> child9 = new TreeItem<>("Child 9");            // 12
         private final TreeItem<String> child10 = new TreeItem<>("Child 10");          // 13
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         // reset tree structure
         root.getChildren().clear();
         root.setExpanded(true);
@@ -125,7 +126,8 @@ public class TreeViewKeyInputTest {
         stageLoader.getStage().show();
     }
 
-    @After public void tearDown() {
+    @AfterEach
+    public void tearDown() {
         treeView.getSkin().dispose();
         stageLoader.dispose();
     }
@@ -202,7 +204,7 @@ private int getItemCount() {
     @Test public void testDownArrowDoesNotChangeSelectionWhenAtLastIndex() {
         int endIndex = getItemCount();
         sm.clearAndSelect(endIndex);
-        assertTrue(debug(), sm.isSelected(endIndex));
+        assertTrue(sm.isSelected(endIndex), debug());
         keyboard.doDownArrowPress();
         assertTrue(sm.isSelected(endIndex));
     }
@@ -324,7 +326,7 @@ private int getItemCount() {
     @Test public void testEndKey() {
         sm.clearAndSelect(3);
         keyboard.doKeyPress(KeyCode.END);
-        assertTrue(debug(), isSelected(getItemCount()));
+        assertTrue(isSelected(getItemCount()), debug());
         assertTrue(isNotSelected(1,2,3));
     }
 
@@ -352,7 +354,7 @@ private int getItemCount() {
         keyboard.doKeyPress(KeyCode.SPACE, KeyModifier.getShortcutKey(),
                 (Utils.isMac()  ? KeyModifier.CTRL : null));
         assertTrue(isNotSelected(5));
-        assertTrue(debug(), fm.isFocused(5));
+        assertTrue(fm.isFocused(5), debug());
         assertTrue(isAnchor(5));
     }
 
@@ -409,7 +411,7 @@ private int getItemCount() {
         keyboard.doDownArrowPress(KeyModifier.SHIFT);
         keyboard.doDownArrowPress(KeyModifier.SHIFT);
         keyboard.doUpArrowPress(KeyModifier.SHIFT);
-        assertTrue(debug(), sm.isSelected(0));
+        assertTrue(sm.isSelected(0), debug());
         assertTrue(sm.isSelected(1));
         assertFalse(sm.isSelected(2));
     }
@@ -554,7 +556,7 @@ private int getItemCount() {
         keyboard.doKeyPress(KeyCode.SPACE, KeyModifier.SHIFT);  // select 0,1,2
         assertTrue(isSelected(0, 1, 2));
         assertTrue(isNotSelected(3));
-        assertTrue(debug(), isAnchor(2));
+        assertTrue(isAnchor(2), debug());
     }
 
     // test 33
@@ -592,7 +594,7 @@ private int getItemCount() {
         keyboard.doKeyPress(KeyCode.SPACE, KeyModifier.SHIFT);  // select 0,1,2
         assertTrue(isSelected(0, 1, 2));
         assertTrue(isNotSelected(3, 4));
-        assertTrue(debug(), isAnchor(2));
+        assertTrue(isAnchor(2), debug());
     }
 
     // test 35
@@ -711,7 +713,7 @@ private int getItemCount() {
         keyboard.doKeyPress(KeyCode.HOME, KeyModifier.SHIFT);
         assertTrue(isSelected(0,1,2));
         assertTrue(isNotSelected(3,4));
-        assertTrue(debug(),isAnchor(2));
+        assertTrue(isAnchor(2), debug());
     }
 
     // test 51
@@ -730,7 +732,7 @@ private int getItemCount() {
         keyboard.doKeyPress(KeyCode.END, KeyModifier.SHIFT);
         assertTrue(isSelected(3,4,5,6,7,8,9));
         assertTrue(isNotSelected(0,1,2));
-        assertTrue(debug(),isAnchor(3));
+        assertTrue(isAnchor(3), debug());
     }
 
     // test 42
@@ -776,7 +778,7 @@ private int getItemCount() {
         keyboard.doKeyPress(KeyCode.HOME, KeyModifier.SHIFT);
         assertTrue(isSelected(0,1,2,3));
         assertTrue(isNotSelected(4,5));
-        assertTrue(debug(), isAnchor(3));
+        assertTrue(isAnchor(3), debug());
     }
 
     // test 49
@@ -841,7 +843,7 @@ private int getItemCount() {
 
         keyboard.doDownArrowPress(KeyModifier.getShortcutKey(), KeyModifier.SHIFT);
         keyboard.doDownArrowPress(KeyModifier.getShortcutKey(), KeyModifier.SHIFT);
-        assertTrue(debug(),isSelected(0,2,3,4));
+        assertTrue(isSelected(0,2,3,4));
         assertTrue(isAnchor(2));
     }
 
@@ -1150,7 +1152,7 @@ private int getItemCount() {
     }
 
     // Test 24 (TreeView test cases)
-    @Ignore("Not yet working")
+    @Disabled("Not yet working")
     @Test public void testExpandCollapseImpactOnSelection() {
         sm.clearAndSelect(5);
         assertTrue(child3.isExpanded());
@@ -1237,7 +1239,7 @@ private int getItemCount() {
 
         keyboard.doKeyPress(KeyCode.HOME, KeyModifier.SHIFT);
         assertTrue(isSelected(0,1,2,3,4,5));
-        assertTrue(debug(), isNotSelected(6,7,8,9));
+        assertTrue(isNotSelected(6,7,8,9), debug());
     }
 
     @Test public void test_rt14451_2() {
@@ -1249,7 +1251,7 @@ private int getItemCount() {
 
         keyboard.doKeyPress(KeyCode.HOME, KeyModifier.SHIFT);
         assertTrue(isSelected(0,1,2,3,4,5));
-        assertTrue(debug(), isNotSelected(6,7,8,9));
+        assertTrue(isNotSelected(6,7,8,9), debug());
 
         keyboard.doKeyPress(KeyCode.END, KeyModifier.SHIFT);
         assertTrue(isNotSelected(0,1,2,3,4));
@@ -1265,13 +1267,13 @@ private int getItemCount() {
     @Test public void test_rt26835_2() {
         sm.clearAndSelect(5);
         keyboard.doKeyPress(KeyCode.END, KeyModifier.getShortcutKey());
-        assertTrue(debug(), fm.isFocused(getItemCount()));
+        assertTrue(fm.isFocused(getItemCount()), debug());
     }
 
     @Test public void test_rt27175() {
         sm.clearAndSelect(5);
         keyboard.doKeyPress(KeyCode.HOME, KeyModifier.SHIFT, KeyModifier.getShortcutKey());
-        assertTrue(debug(), fm.isFocused(0));
+        assertTrue(fm.isFocused(0));
         assertTrue(isSelected(0,1,2,3,4,5));
     }
 
@@ -1752,7 +1754,7 @@ private int getItemCount() {
         assertTrue(isNotSelected(0,1));
         assertTrue(isSelected(2,3,4));
         assertEquals(3, sm.getSelectedItems().size());
-        assertTrue("Focus index incorrectly at: " + fm.getFocusedIndex(), fm.isFocused(4));
+        assertTrue(fm.isFocused(4), "Focus index incorrectly at: " + fm.getFocusedIndex());
     }
 
     @Test public void test_rt33301_multipleSelection_up() {
@@ -1888,7 +1890,7 @@ private int getItemCount() {
 
         keyboard.doKeyPress(KeyCode.SPACE,  KeyModifier.getShortcutKey(), KeyModifier.SHIFT);
         Toolkit.getToolkit().firePulse();
-        assertTrue(debug(), isSelected(0,1,2,3));
+        assertTrue(isSelected(0,1,2,3), debug());
         assertEquals(4, sm.getSelectedItems().size());
         assertTrue(fm.isFocused(3));
     }
@@ -2396,7 +2398,7 @@ private void test_rt_27709(SelectionMode mode, boolean resetSelection) {
         assertEquals(1, indices.size());
 
         keyboard.doKeyPress(KeyCode.END, KeyModifier.SHIFT);
-        assertEquals(debug(), expectedSize, indices.size());
+        assertEquals(expectedSize, indices.size(), debug());
         assertEquals(9, (int) indices.get(lookupIndex));
 
         if (resetSelection) {
@@ -2409,7 +2411,7 @@ private void test_rt_27709(SelectionMode mode, boolean resetSelection) {
 
         keyboard.doKeyPress(KeyCode.HOME, KeyModifier.SHIFT);
         assertEquals(expectedSize, indices.size());
-        assertTrue(debug(),sm.isSelected(0));
+        assertTrue(sm.isSelected(0), debug());
 
         if (resetSelection) {
             sm.clearAndSelect(0);
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeViewMouseInputTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeViewMouseInputTest.java
index a0651daa251..09bb03fa5ce 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeViewMouseInputTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeViewMouseInputTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,13 @@
 
 package test.javafx.scene.control;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
-
-import test.com.sun.javafx.scene.control.infrastructure.MouseEventFirer;
-import com.sun.javafx.tk.Toolkit;
 import javafx.collections.ListChangeListener;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
@@ -41,20 +42,16 @@
 import javafx.scene.control.TreeItem;
 import javafx.scene.control.TreeView;
 import javafx.scene.layout.VBox;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.tk.Toolkit;
 import test.com.sun.javafx.scene.control.behavior.TreeViewAnchorRetriever;
 import test.com.sun.javafx.scene.control.infrastructure.KeyModifier;
+import test.com.sun.javafx.scene.control.infrastructure.MouseEventFirer;
 import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
 import test.com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils;
 
-import static org.junit.Assert.*;
-import static org.junit.Assert.assertNotNull;
-
-//@Ignore("Disabling tests as they fail with OOM in continuous builds")
 public class TreeViewMouseInputTest {
     private TreeView<String> treeView;
     private MultipleSelectionModel<TreeItem<String>> sm;
@@ -75,7 +72,8 @@ public class TreeViewMouseInputTest {
         private TreeItem<String> child9;            // 12
         private TreeItem<String> child10;           // 13
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         root = new TreeItem<>("Root");             // 0
         child1 = new TreeItem<>("Child 1");        // 1
         child2 = new TreeItem<>("Child 2");        // 2
@@ -125,7 +123,8 @@ public class TreeViewMouseInputTest {
         fm = treeView.getFocusModel();
     }
 
-    @After public void tearDown() {
+    @AfterEach
+    public void tearDown() {
         treeView.getSkin().dispose();
     }
 
@@ -188,11 +187,11 @@ private int getItemCount() {
 
         // select all from 9 - 7
         VirtualFlowTestUtils.clickOnRow(treeView, 7, KeyModifier.SHIFT);
-        assertTrue(debug(), isSelected(7,8,9));
+        assertTrue(isSelected(7,8,9), debug());
 
         // select all from 9 - 7 - 5
         VirtualFlowTestUtils.clickOnRow(treeView, 5, KeyModifier.SHIFT);
-        assertTrue(debug(),isSelected(5,6,7,8,9));
+        assertTrue(isSelected(5,6,7,8,9), debug());
     }
 
     @Test public void test_rt29833_mouse_select_downwards() {
@@ -202,11 +201,11 @@ private int getItemCount() {
 
         // select all from 5 - 7
         VirtualFlowTestUtils.clickOnRow(treeView, 7, KeyModifier.SHIFT);
-        assertTrue(debug(), isSelected(5,6,7));
+        assertTrue(isSelected(5,6,7), debug());
 
         // select all from 5 - 7 - 9
         VirtualFlowTestUtils.clickOnRow(treeView, 9, KeyModifier.SHIFT);
-        assertTrue(debug(),isSelected(5,6,7,8,9));
+        assertTrue(isSelected(5,6,7,8,9), debug());
     }
 
     private int rt30394_count = 0;
@@ -350,10 +349,10 @@ private int getItemCount() {
         assertEquals(1, sm.getSelectedItems().size());
 
         VirtualFlowTestUtils.clickOnRow(treeView, 5, KeyModifier.SHIFT);
-        assertEquals("Actual selected index: " + sm.getSelectedIndex(), 5, sm.getSelectedIndex());
-        assertEquals("Actual focused index: " + fm.getFocusedIndex(), 5, fm.getFocusedIndex());
-        assertTrue("Selected indices: " + sm.getSelectedIndices(), sm.getSelectedIndices().contains(0));
-        assertTrue("Selected items: " + sm.getSelectedItems(), sm.getSelectedItems().contains(root));
+        assertEquals(5, sm.getSelectedIndex(), "Actual selected index: " + sm.getSelectedIndex());
+        assertEquals(5, fm.getFocusedIndex(), "Actual focused index: " + fm.getFocusedIndex());
+        assertTrue(sm.getSelectedIndices().contains(0), "Selected indices: " + sm.getSelectedIndices());
+        assertTrue(sm.getSelectedItems().contains(root), "Selected items: " + sm.getSelectedItems());
         assertEquals(6, sm.getSelectedItems().size());
     }
 
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeViewTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeViewTest.java
index 9261e3dbb1c..cb9aaff437d 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeViewTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeViewTest.java
@@ -25,27 +25,22 @@
 
 package test.javafx.scene.control;
 
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
-
-import javafx.scene.control.skin.TreeCellSkin;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.sun.javafx.application.PlatformImpl;
-import com.sun.javafx.scene.control.VirtualScrollBar;
-import com.sun.javafx.scene.control.behavior.TreeCellBehavior;
-import com.sun.javafx.tk.Toolkit;
-
-import static org.junit.Assert.*;
-import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.*;
-
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
@@ -75,6 +70,7 @@
 import javafx.scene.control.cell.CheckBoxTreeCell;
 import javafx.scene.control.cell.TextFieldTreeCell;
 import javafx.scene.control.skin.TextFieldSkin;
+import javafx.scene.control.skin.TreeCellSkin;
 import javafx.scene.image.ImageView;
 import javafx.scene.input.KeyCode;
 import javafx.scene.layout.VBox;
@@ -83,6 +79,14 @@
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
 import javafx.util.Callback;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.application.PlatformImpl;
+import com.sun.javafx.scene.control.VirtualScrollBar;
+import com.sun.javafx.scene.control.behavior.TreeCellBehavior;
+import com.sun.javafx.tk.Toolkit;
 import test.com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
 import test.com.sun.javafx.scene.control.infrastructure.KeyModifier;
 import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
@@ -134,7 +138,8 @@ private String debug() {
         return sb.toString();
     }
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         Thread.currentThread().setUncaughtExceptionHandler((thread, throwable) -> {
             if (throwable instanceof RuntimeException) {
                 throw (RuntimeException)throwable;
@@ -181,7 +186,7 @@ private String debug() {
         );
     }
 
-    @After
+    @AfterEach
     public void cleanup() {
         Thread.currentThread().setUncaughtExceptionHandler(null);
 
@@ -304,7 +309,7 @@ private void installChildren() {
         assertSame(child1, treeView.getSelectionModel().getSelectedItem());
     }
 
-    @Ignore("Not yet supported")
+    @Disabled("Not yet supported")
     @Test public void settingTheSelectedItemToANonexistantItemAndThenSettingItemsWhichContainsItResultsInCorrectSelectedIndex() {
         treeView.getSelectionModel().select(child1);
         installChildren();
@@ -312,7 +317,7 @@ private void installChildren() {
         assertSame(child1, treeView.getSelectionModel().getSelectedItem());
     }
 
-    @Ignore("Not yet supported")
+    @Disabled("Not yet supported")
     @Test public void ensureSelectionClearsWhenAllItemsAreRemoved_selectIndex0() {
         installChildren();
         treeView.getSelectionModel().select(0);
@@ -321,7 +326,7 @@ private void installChildren() {
         assertEquals(null, treeView.getSelectionModel().getSelectedItem());
     }
 
-    @Ignore("Not yet supported")
+    @Disabled("Not yet supported")
     @Test public void ensureSelectionClearsWhenAllItemsAreRemoved_selectIndex2() {
         installChildren();
         treeView.getSelectionModel().select(2);
@@ -330,7 +335,7 @@ private void installChildren() {
         assertEquals(null, treeView.getSelectionModel().getSelectedItem());
     }
 
-    @Ignore("Not yet supported")
+    @Disabled("Not yet supported")
     @Test public void ensureSelectedItemRemainsAccurateWhenItemsAreCleared() {
         installChildren();
         treeView.getSelectionModel().select(2);
@@ -445,7 +450,9 @@ private void installChildren() {
     /*********************************************************************
      * Tests from bug reports                                            *
      ********************************************************************/
-    @Ignore @Test public void test_rt17112() {
+    @Disabled
+    @Test
+    public void test_rt17112() {
         TreeItem<String> root1 = new TreeItem<>("Root");
         root1.setExpanded(true);
         addChildren(root1, "child");
@@ -516,7 +523,7 @@ private void addChildren(TreeItem parent, String name) {
 
         TreeItem child0 = new TreeItem("child0");
         root.getChildren().add(0, child0);
-        assertTrue("Focused index: " + fm.getFocusedIndex(), fm.isFocused(2));
+        assertTrue(fm.isFocused(2), "Focused index: " + fm.getFocusedIndex());
     }
 
     @Test public void test_rt17522_focusShouldNotMoveWhenItemAddedAfterFocusIndex() {
@@ -527,7 +534,7 @@ private void addChildren(TreeItem parent, String name) {
 
         TreeItem child4 = new TreeItem("child4");
         root.getChildren().add(3, child4);
-        assertTrue("Focused index: " + fm.getFocusedIndex(), fm.isFocused(1));
+        assertTrue(fm.isFocused(1), "Focused index: " + fm.getFocusedIndex());
     }
 
     @Test public void test_rt17522_focusShouldBeMovedWhenFocusedItemIsRemoved_1() {
@@ -918,7 +925,7 @@ private void addChildren(TreeItem parent, String name) {
         assertEquals(0, treeView.getSelectionModel().getSelectedIndex());
     }
 
-    @Ignore("Test passes from within IDE but not when run from command line. Needs more investigation.")
+    @Disabled("Test passes from within IDE but not when run from command line. Needs more investigation.")
     @Test public void test_rt28678() {
         TreeItem<String> s1, s2, s3, s4;
         ObservableList<TreeItem<String>> items = FXCollections.observableArrayList(
@@ -1794,7 +1801,7 @@ protected <T> void assert_rt35857(ObservableList<T> items, MultipleSelectionMode
             items.removeAll(sm.getSelectedItems());
         }
         String modified = (retain ? " retainAll " : " removeAll ") + " selectedItems ";
-        assertEquals("expected list after" + modified, expected, items);
+        assertEquals(expected, items, "expected list after" + modified);
     }
 
     @Test public void test_rt35857() {
@@ -2202,12 +2209,12 @@ private void test_rt_37538(boolean callCNextOnce, boolean callCNextInLoop) {
         sl.dispose();
     }
 
-    @Ignore("Fix not yet developed for TreeView")
+    @Disabled("Fix not yet developed for TreeView")
     @Test public void test_rt_35395_fixedCellSize() {
         test_rt_35395(true);
     }
 
-    @Ignore("Fix not yet developed for TreeView")
+    @Disabled("Fix not yet developed for TreeView")
     @Test public void test_rt_35395_notFixedCellSize() {
         test_rt_35395(false);
     }
@@ -3024,7 +3031,7 @@ private void test_rt_16068(int indexToSelect, int indexToRemove, int expectedInd
         root.getChildren().remove(indexToRemove);
         assertEquals(expectedIndex, sm.getSelectedIndex());
         assertEquals(root.getChildren().get(expectedIndex).getValue(), sm.getSelectedItem().getValue());
-        assertEquals(debug(), expectedIndex, fm.getFocusedIndex());
+        assertEquals(expectedIndex, fm.getFocusedIndex(), debug());
         assertEquals(root.getChildren().get(expectedIndex).getValue(), fm.getFocusedItem().getValue());
     }
 
@@ -3052,8 +3059,9 @@ private TreeItem createSubTree(Object item, ObservableList<String> rawItems) {
         TreeItem child = createSubTree("child", rawItems);
         TreeItem grandChild = (TreeItem) child.getChildren().get(rawItems.size() - 1);
         root.getChildren().add(child);
-        assertTrue("row of item must be less than expandedItemCount, but was: " + treeView.getRow(grandChild),
-                treeView.getRow(grandChild) < treeView.getExpandedItemCount());
+        assertTrue(
+                treeView.getRow(grandChild) < treeView.getExpandedItemCount(),
+                "row of item must be less than expandedItemCount, but was: " + treeView.getRow(grandChild));
     }
 
     @Test public void test_rt_39661_rowOfGrandChildParentCollapsedUpdatedOnInsertAbove() {
@@ -3118,8 +3126,9 @@ private TreeItem createSubTree(Object item, ObservableList<String> rawItems) {
         TreeItem expandedGrandChild = (TreeItem) expandedChild.getChildren().get(grandIndex);
         expandedChild.setExpanded(true);
         root.getChildren().add(childIndex, expandedChild);
-        assertNotSame("getRow must depend on expansionState " + collapedGrandIndex,
-                collapedGrandIndex, treeView.getRow(expandedGrandChild));
+        assertNotSame(
+                collapedGrandIndex, treeView.getRow(expandedGrandChild),
+                "getRow must depend on expansionState " + collapedGrandIndex);
     }
 
     @Test public void test_rt_39661_rowOfGrandChildInCollapsedChild() {
@@ -3134,7 +3143,7 @@ private TreeItem createSubTree(Object item, ObservableList<String> rawItems) {
         int row = treeView.getRow(grandChild);
 
         // grandChild not visible, row coordinate in tree is not available
-        assertEquals("grandChild not visible", -1, row);
+        assertEquals(-1, row, "grandChild not visible");
 
         // the other way round: if we get a row, expect the item at the row be the grandChild
         if (row > -1) {
@@ -3247,7 +3256,7 @@ public int hashCode() {
                 rt_39966_count++;
                 assertFalse(table.getSelectionModel().isEmpty());
             } else {
-                assertTrue(debug(), table.getSelectionModel().isEmpty());
+                assertTrue(table.getSelectionModel().isEmpty(), debug());
             }
         });
 
@@ -3257,7 +3266,7 @@ public int hashCode() {
         assertFalse(table.getSelectionModel().isEmpty());
 
         table.setRoot(null);
-        assertTrue(debug(),table.getSelectionModel().isEmpty());
+        assertTrue(table.getSelectionModel().isEmpty(), debug());
 
         sl.dispose();
     }
@@ -3295,7 +3304,7 @@ public int hashCode() {
         // but in index (last - 2).
         int expected = last - 2;
         assertEquals("5", sm.getSelectedItem().getValue());
-        assertEquals("selected index after disjoint removes above", expected, sm.getSelectedIndex());
+        assertEquals(expected, sm.getSelectedIndex(), "selected index after disjoint removes above");
     }
 
     /**
@@ -3364,8 +3373,8 @@ public int hashCode() {
 
         // disjoint remove of 2 elements above the last selected
         root.getChildren().removeAll(root.getChildren().get(1), root.getChildren().get(3));
-        assertEquals("sanity: selectedIndex must be shifted by -2", last - 2, sm.getSelectedIndex());
-        assertEquals("must fire single event on removes above", 1, rt_40012_count);
+        assertEquals(last - 2, sm.getSelectedIndex(), "sanity: selectedIndex must be shifted by -2");
+        assertEquals(1, rt_40012_count, "must fire single event on removes above");
     }
 
     /**
@@ -3398,8 +3407,8 @@ public void test_rt_40012_selectedItemNotificationOnDisjointRemovesAbove() {
 
         // disjoint remove of 2 elements above the last selected
         root.getChildren().removeAll(root.getChildren().get(1), root.getChildren().get(3));
-        assertEquals("sanity: selectedItem unchanged", lastItem, sm.getSelectedItem());
-        assertEquals("must not fire on unchanged selected item", 0, rt_40012_count);
+        assertEquals(lastItem, sm.getSelectedItem(), "sanity: selectedItem unchanged");
+        assertEquals(0, rt_40012_count, "must not fire on unchanged selected item");
     }
 
     private int rt_40010_count = 0;
@@ -3466,7 +3475,7 @@ public void test_rt_40012_selectedItemNotificationOnDisjointRemovesAbove() {
         sl.dispose();
     }
 
-    @Ignore("RT-39674 not yet fixed")
+    @Disabled("RT-39674 not yet fixed")
     @Test public void test_rt_39674_dynamicChildren() {
         TreeItem<Integer> root = createTreeItem(0);
         root.setExpanded(true);
@@ -3556,12 +3565,12 @@ private ObservableList<TreeItem<Integer>> buildChildren(TreeItem<Integer> TreeIt
         int selected = sm.getSelectedIndex();
 
         sm.getSelectedIndices().addListener((ListChangeListener<Integer>) change -> {
-            assertEquals("sanity: selectedIndex unchanged", selected, sm.getSelectedIndex());
+            assertEquals(selected, sm.getSelectedIndex(), "sanity: selectedIndex unchanged");
             while(change.next()) {
-                assertEquals("single event on clearAndSelect already selected", 1, ++rt_40212_count);
+                assertEquals(1, ++rt_40212_count, "single event on clearAndSelect already selected");
 
                 boolean type = change.wasAdded() || change.wasRemoved() || change.wasPermutated() || change.wasUpdated();
-                assertTrue("at least one of the change types must be true", type);
+                assertTrue(type, "at least one of the change types must be true");
             }
         });
 
@@ -3584,7 +3593,7 @@ private ObservableList<TreeItem<Integer>> buildChildren(TreeItem<Integer> TreeIt
         view.setShowRoot(false);
         MultipleSelectionModel<TreeItem<String>> sm = view.getSelectionModel();
 
-        assertFalse("sanity: test setup such that root is not showing", view.isShowRoot());
+        assertFalse(view.isShowRoot(), "sanity: test setup such that root is not showing");
         sm.select(0);
         assertEquals(0, sm.getSelectedIndex());
         assertEquals(view.getTreeItem(sm.getSelectedIndex()), sm.getSelectedItem());
@@ -3602,7 +3611,7 @@ private ObservableList<TreeItem<Integer>> buildChildren(TreeItem<Integer> TreeIt
         view.setShowRoot(true);
         MultipleSelectionModel<TreeItem<String>> sm = view.getSelectionModel();
 
-        assertTrue("sanity: test setup such that root is showing", view.isShowRoot());
+        assertTrue(view.isShowRoot(), "sanity: test setup such that root is showing");
         sm.select(1);
         assertEquals(1, sm.getSelectedIndex());
         assertEquals(view.getTreeItem(sm.getSelectedIndex()), sm.getSelectedItem());
@@ -3620,7 +3629,7 @@ private ObservableList<TreeItem<Integer>> buildChildren(TreeItem<Integer> TreeIt
         view.setShowRoot(true);
         MultipleSelectionModel<TreeItem<String>> sm = view.getSelectionModel();
 
-        assertTrue("sanity: test setup such that root is showing", view.isShowRoot());
+        assertTrue(view.isShowRoot(), "sanity: test setup such that root is showing");
         sm.select(0);
         assertEquals(0, sm.getSelectedIndex());
         assertEquals(view.getTreeItem(sm.getSelectedIndex()), sm.getSelectedItem());
@@ -3730,8 +3739,9 @@ private void test_jdk8131924(boolean showRoot) {
                     // expect to see [1,2,3] added at index 0
                     c.next();
                     assertEquals(3, c.getAddedSize());
-                    assertTrue("added: " + c.getAddedSubList(),
-                            c.getAddedSubList().containsAll(FXCollections.observableArrayList(1,2,3)));
+                    assertTrue(
+                            c.getAddedSubList().containsAll(FXCollections.observableArrayList(1,2,3)),
+                            "added: " + c.getAddedSubList());
                     assertEquals(0, c.getFrom());
                     break;
                 }
@@ -3762,8 +3772,9 @@ private void test_jdk8131924(boolean showRoot) {
                     // expect to see [1,2,3] added at index 0
                     c.next();
                     assertEquals(3, c.getAddedSize());
-                    assertTrue("added: " + c.getAddedSubList(),
-                            c.getAddedSubList().containsAll(FXCollections.observableArrayList(childNode1, item1, item2)));
+                    assertTrue(
+                            c.getAddedSubList().containsAll(FXCollections.observableArrayList(childNode1, item1, item2)),
+                            "added: " + c.getAddedSubList());
                     assertEquals(0, c.getFrom());
                     break;
                 }
@@ -3904,27 +3915,28 @@ public void testMisbehavingCancelEditTerminatesEdit() {
         TreeItem editingItem = treeView.getTreeItem(editingIndex);
         TreeItem intermediateTreeItem = treeView.getTreeItem(intermediate);
         treeView.edit(editingItem);
-        assertTrue("sanity: ", cell.isEditing());
+        assertTrue(cell.isEditing(), "sanity: ");
         try {
             treeView.edit(intermediateTreeItem);
         } catch (Exception ex) {
             // catching to test in finally
         } finally {
-            assertFalse("cell must not be editing", cell.isEditing());
-            assertEquals("table must be editing at intermediate index",
-                    intermediateTreeItem, treeView.getEditingItem());
+            assertFalse(cell.isEditing(), "cell must not be editing");
+            assertEquals(
+                    intermediateTreeItem, treeView.getEditingItem(),
+                    "table must be editing at intermediate index");
         }
         // test editing: second round
         // switch cell off editing by cell api
         treeView.edit(editingItem);
-        assertTrue("sanity: ", cell.isEditing());
+        assertTrue(cell.isEditing(), "sanity: ");
         try {
             cell.cancelEdit();
         } catch (Exception ex) {
             // catching to test in finally
         } finally {
-            assertFalse("cell must not be editing", cell.isEditing());
-            assertNull("table editing must be cancelled by cell", treeView.getEditingItem());
+            assertFalse(cell.isEditing(), "cell must not be editing");
+            assertNull(treeView.getEditingItem(), "table editing must be cancelled by cell");
         }
     }
 
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/CheckBoxListCellTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/CheckBoxListCellTest.java
index 0e275dc935d..4fb4cd3462f 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/CheckBoxListCellTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/CheckBoxListCellTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,12 @@
 
 package test.javafx.scene.control.cell;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.value.ObservableValue;
 import javafx.scene.control.CheckBox;
@@ -34,9 +39,8 @@
 import javafx.scene.control.cell.CheckBoxListCell;
 import javafx.util.Callback;
 import javafx.util.StringConverter;
-
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class CheckBoxListCellTest {
 
@@ -44,7 +48,8 @@ public class CheckBoxListCellTest {
     private Callback<Object, ObservableValue<Boolean>> callback;
     private StringConverter<Object> converter;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         booleanProperty = new SimpleBooleanProperty(false);
         callback = param -> booleanProperty;
         converter = new StringConverter<>() {
@@ -235,10 +240,12 @@ public class CheckBoxListCellTest {
      *
      **************************************************************************/
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void test_getSelectedPropertyIsNull() {
-        CheckBoxListCell<Object> cell = new CheckBoxListCell<>();
-        cell.updateItem("TEST", false);
+        assertThrows(NullPointerException.class, () -> {
+            CheckBoxListCell<Object> cell = new CheckBoxListCell<>();
+            cell.updateItem("TEST", false);
+        });
     }
 
     @Test public void test_updateItem_isEmpty_graphicIsNull() {
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/CheckBoxTableCellTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/CheckBoxTableCellTest.java
index d8d68a1f8da..a3453a0f879 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/CheckBoxTableCellTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/CheckBoxTableCellTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,12 @@
 
 package test.javafx.scene.control.cell;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.value.ObservableValue;
 import javafx.scene.control.CheckBox;
@@ -39,9 +40,8 @@
 import javafx.scene.control.cell.CheckBoxTableCell;
 import javafx.util.Callback;
 import javafx.util.StringConverter;
-
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class CheckBoxTableCellTest {
 
@@ -51,7 +51,8 @@ public class CheckBoxTableCellTest {
     private TableView<Object> tableView;
     private TableColumn<Object, Object> tableColumn;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         tableView = new TableView<>();
         tableColumn = new TableColumn<>();
         booleanProperty = new SimpleBooleanProperty(false);
@@ -251,10 +252,12 @@ private void setTableViewAndTableColumn(TableCell cell) {
      *
      **************************************************************************/
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void test_getSelectedPropertyIsNull() {
-        CheckBoxTableCell<Object, Object> cell = new CheckBoxTableCell<>();
-        cell.updateItem("TEST", false);
+        assertThrows(NullPointerException.class, () -> {
+            CheckBoxTableCell<Object, Object> cell = new CheckBoxTableCell<>();
+            cell.updateItem("TEST", false);
+        });
     }
 
     @Test public void test_updateItem_isEmpty_graphicIsNull() {
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/CheckBoxTreeCellTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/CheckBoxTreeCellTest.java
index 8c3aaeec4cf..f0e270a4710 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/CheckBoxTreeCellTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/CheckBoxTreeCellTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,23 +25,23 @@
 
 package test.javafx.scene.control.cell;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.value.ObservableValue;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.TreeCell;
-import javafx.scene.control.TreeView;
 import javafx.scene.control.TreeItem;
+import javafx.scene.control.TreeView;
 import javafx.scene.control.cell.CheckBoxTreeCell;
 import javafx.util.Callback;
 import javafx.util.StringConverter;
-
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class CheckBoxTreeCellTest {
 
@@ -49,7 +49,8 @@ public class CheckBoxTreeCellTest {
     private Callback<TreeItem<Object>, ObservableValue<Boolean>> callback;
     private StringConverter<TreeItem<Object>> converter;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         booleanProperty = new SimpleBooleanProperty(false);
         callback = param -> booleanProperty;
         converter = new StringConverter<>() {
@@ -282,10 +283,12 @@ public class CheckBoxTreeCellTest {
      *
      **************************************************************************/
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void test_getSelectedPropertyIsNull() {
-        CheckBoxTreeCell<Object> cell = new CheckBoxTreeCell<>(null);
-        cell.updateItem("TEST", false);
+        assertThrows(NullPointerException.class, () -> {
+            CheckBoxTreeCell<Object> cell = new CheckBoxTreeCell<>(null);
+            cell.updateItem("TEST", false);
+        });
     }
 
     @Test public void test_updateItem_isEmpty_graphicIsNull() {
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/CheckBoxTreeTableCellTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/CheckBoxTreeTableCellTest.java
index 0e26593bab1..45b10903e21 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/CheckBoxTreeTableCellTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/CheckBoxTreeTableCellTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,12 @@
 
 package test.javafx.scene.control.cell;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.value.ObservableValue;
 import javafx.scene.control.CheckBox;
@@ -39,9 +40,8 @@
 import javafx.scene.control.cell.CheckBoxTreeTableCell;
 import javafx.util.Callback;
 import javafx.util.StringConverter;
-
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class CheckBoxTreeTableCellTest {
 
@@ -51,7 +51,8 @@ public class CheckBoxTreeTableCellTest {
     private TreeTableView<Object> tableView;
     private TreeTableColumn<Object, Object> tableColumn;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         tableView = new TreeTableView<>();
         tableColumn = new TreeTableColumn<>();
         booleanProperty = new SimpleBooleanProperty(false);
@@ -250,10 +251,12 @@ private void setTableViewAndTableColumn(TreeTableCell cell) {
      *
      **************************************************************************/
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void test_getSelectedPropertyIsNull() {
-        CheckBoxTreeTableCell<Object, Object> cell = new CheckBoxTreeTableCell<>();
-        cell.updateItem("TEST", false);
+        assertThrows(NullPointerException.class, () -> {
+            CheckBoxTreeTableCell<Object, Object> cell = new CheckBoxTreeTableCell<>();
+            cell.updateItem("TEST", false);
+        });
     }
 
     @Test public void test_updateItem_isEmpty_graphicIsNull() {
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ChoiceBoxListCellTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ChoiceBoxListCellTest.java
index cbce48e9282..7abb02d53aa 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ChoiceBoxListCellTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ChoiceBoxListCellTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,11 @@
 
 package test.javafx.scene.control.cell;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.scene.control.ChoiceBox;
@@ -33,16 +38,15 @@
 import javafx.scene.control.cell.ChoiceBoxListCell;
 import javafx.util.Callback;
 import javafx.util.StringConverter;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ChoiceBoxListCellTest {
 
     private StringConverter<Object> converter;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         converter = new StringConverter<>() {
             @Override public String toString(Object object) {
                 return null;
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ChoiceBoxTableCellTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ChoiceBoxTableCellTest.java
index 83def212399..26059d5c7ed 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ChoiceBoxTableCellTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ChoiceBoxTableCellTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,11 @@
 
 package test.javafx.scene.control.cell;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.scene.control.ChoiceBox;
@@ -34,16 +39,15 @@
 import javafx.scene.control.cell.ChoiceBoxTableCell;
 import javafx.util.Callback;
 import javafx.util.StringConverter;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ChoiceBoxTableCellTest {
 
     private StringConverter<Object> converter;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         converter = new StringConverter<>() {
             @Override public String toString(Object object) {
                 return null;
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ChoiceBoxTreeCellTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ChoiceBoxTreeCellTest.java
index 16597d2b66e..9c489242858 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ChoiceBoxTreeCellTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ChoiceBoxTreeCellTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,11 @@
 
 package test.javafx.scene.control.cell;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.scene.control.ChoiceBox;
@@ -34,16 +39,15 @@
 import javafx.scene.control.cell.ChoiceBoxTreeCell;
 import javafx.util.Callback;
 import javafx.util.StringConverter;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ChoiceBoxTreeCellTest {
 
     private StringConverter<Object> converter;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         converter = new StringConverter<>() {
             @Override public String toString(Object object) {
                 return null;
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ChoiceBoxTreeTableCellTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ChoiceBoxTreeTableCellTest.java
index 4a495435e41..e0ca2cac3cf 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ChoiceBoxTreeTableCellTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ChoiceBoxTreeTableCellTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,22 +25,30 @@
 
 package test.javafx.scene.control.cell;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-import javafx.scene.control.*;
+import javafx.scene.control.ChoiceBox;
+import javafx.scene.control.TreeItem;
+import javafx.scene.control.TreeTableCell;
+import javafx.scene.control.TreeTableColumn;
+import javafx.scene.control.TreeTableView;
 import javafx.scene.control.cell.ChoiceBoxTreeTableCell;
 import javafx.util.Callback;
 import javafx.util.StringConverter;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ChoiceBoxTreeTableCellTest {
 
     private StringConverter<Object> converter;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         converter = new StringConverter<>() {
             @Override public String toString(Object object) {
                 return null;
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ComboBoxListCellTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ComboBoxListCellTest.java
index 8fb6b7a298c..136f389163d 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ComboBoxListCellTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ComboBoxListCellTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,11 @@
 
 package test.javafx.scene.control.cell;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.scene.control.ComboBox;
@@ -33,16 +38,15 @@
 import javafx.scene.control.cell.ComboBoxListCell;
 import javafx.util.Callback;
 import javafx.util.StringConverter;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ComboBoxListCellTest {
 
     private StringConverter<Object> converter;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         converter = new StringConverter<>() {
             @Override public String toString(Object object) {
                 return null;
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ComboBoxTableCellTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ComboBoxTableCellTest.java
index abd6f85cc8a..adaa1b203ef 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ComboBoxTableCellTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ComboBoxTableCellTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,11 @@
 
 package test.javafx.scene.control.cell;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.scene.control.ComboBox;
@@ -34,16 +39,15 @@
 import javafx.scene.control.cell.ComboBoxTableCell;
 import javafx.util.Callback;
 import javafx.util.StringConverter;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ComboBoxTableCellTest {
 
     private StringConverter<Object> converter;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         converter = new StringConverter<>() {
             @Override public String toString(Object object) {
                 return null;
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ComboBoxTreeCellTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ComboBoxTreeCellTest.java
index 22ab8679224..31f8810f312 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ComboBoxTreeCellTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ComboBoxTreeCellTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,11 @@
 
 package test.javafx.scene.control.cell;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.scene.control.ComboBox;
@@ -34,16 +39,15 @@
 import javafx.scene.control.cell.ComboBoxTreeCell;
 import javafx.util.Callback;
 import javafx.util.StringConverter;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ComboBoxTreeCellTest {
 
     private StringConverter<Object> converter;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         converter = new StringConverter<>() {
             @Override public String toString(Object object) {
                 return null;
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ComboBoxTreeTableCellTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ComboBoxTreeTableCellTest.java
index c879d80df27..ea3956c1bc2 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ComboBoxTreeTableCellTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ComboBoxTreeTableCellTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,23 +25,31 @@
 
 package test.javafx.scene.control.cell;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-import javafx.scene.control.*;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.TreeItem;
+import javafx.scene.control.TreeTableCell;
+import javafx.scene.control.TreeTableColumn;
+import javafx.scene.control.TreeTableView;
 import javafx.scene.control.cell.ComboBoxTableCell;
 import javafx.scene.control.cell.ComboBoxTreeTableCell;
 import javafx.util.Callback;
 import javafx.util.StringConverter;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ComboBoxTreeTableCellTest {
 
     private StringConverter<Object> converter;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         converter = new StringConverter<>() {
             @Override public String toString(Object object) {
                 return null;
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ListCellStartEditTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ListCellStartEditTest.java
index 8e3d2a74bb6..434889c4c1c 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ListCellStartEditTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ListCellStartEditTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,12 @@
 
 package test.javafx.scene.control.cell;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import java.util.Collection;
+import java.util.List;
+import java.util.function.Supplier;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -34,64 +40,51 @@
 import javafx.scene.control.cell.ChoiceBoxListCell;
 import javafx.scene.control.cell.ComboBoxListCell;
 import javafx.scene.control.cell.TextFieldListCell;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.function.Supplier;
-
-import static java.util.stream.Collectors.toList;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Parameterized tests for the {@link ListCell#startEdit()} method of {@link ListCell} and all sub implementations.
  * The {@link CheckBoxListCell} is special as in there the checkbox will be disabled based of the editability.
  */
-@RunWith(Parameterized.class)
 public class ListCellStartEditTest {
 
     private static final boolean[] EDITABLE_STATES = { true, false };
 
-    private final Supplier<ListCell<String>> listCellSupplier;
-
     private ListView<String> listView;
     private ListCell<String> listCell;
 
-    @Parameterized.Parameters
-    public static Collection<Object[]> data() {
-        return wrapAsObjectArray(List.of(ListCell::new, ComboBoxListCell::new, TextFieldListCell::new,
-                ChoiceBoxListCell::new, () -> new CheckBoxListCell<>(obj -> new SimpleBooleanProperty())));
-    }
-
-    private static Collection<Object[]> wrapAsObjectArray(List<Supplier<ListCell<?>>> listCells) {
-        return listCells.stream().map(cell -> new Object[] { cell }).collect(toList());
+    private static Collection<Supplier<ListCell<String>>> parameters() {
+        return List.of(
+            ListCell::new,
+            ComboBoxListCell::new,
+            TextFieldListCell::new,
+            ChoiceBoxListCell::new,
+            () -> new CheckBoxListCell<>(obj -> new SimpleBooleanProperty())
+        );
     }
 
-    public ListCellStartEditTest(Supplier<ListCell<String>> listCellSupplier) {
-        this.listCellSupplier = listCellSupplier;
-    }
-
-    @Before
-    public void setup() {
+    // @BeforeEach
+    // junit5 does not support parameterized class-level tests yet
+    public void setup(Supplier<ListCell<String>> listCellSupplier) {
         ObservableList<String> items = FXCollections.observableArrayList("1", "2", "3");
         listView = new ListView<>(items);
 
         listCell = listCellSupplier.get();
     }
 
-    @Test
-    public void testStartEditMustNotThrowNPE() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testStartEditMustNotThrowNPE(Supplier<ListCell<String>> listCellSupplier) {
+        setup(listCellSupplier);
         // A list cell without anything attached should not throw a NPE.
         listCell.startEdit();
     }
 
-    @Test
-    public void testStartEditRespectsEditable() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testStartEditRespectsEditable(Supplier<ListCell<String>> listCellSupplier) {
+        setup(listCellSupplier);
         listCell.updateIndex(0);
         listCell.updateListView(listView);
 
@@ -133,5 +126,4 @@ private void testStartEditImpl(boolean isListViewEditable, boolean isCellEditabl
         // Restore the editing state.
         listCell.cancelEdit();
     }
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ParameterisedPrebuiltCellTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ParameterisedPrebuiltCellTest.java
index 707aab03934..542d1f0f0e7 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ParameterisedPrebuiltCellTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ParameterisedPrebuiltCellTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,11 @@
 
 package test.javafx.scene.control.cell;
 
-import java.util.Arrays;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
 import java.util.Collection;
-
+import java.util.List;
 import javafx.scene.control.Cell;
 import javafx.scene.control.cell.CheckBoxListCell;
 import javafx.scene.control.cell.CheckBoxTableCell;
@@ -35,39 +37,32 @@
 import javafx.scene.control.cell.CheckBoxTreeTableCell;
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Rectangle;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import static org.junit.Assert.*;
-
-@RunWith(Parameterized.class)
 public class ParameterisedPrebuiltCellTest {
 
-    @Parameters public static Collection implementations() {
-        return Arrays.asList(new Object[][] {
-            { CheckBoxListCell.class },
-            { CheckBoxTableCell.class },
-            { CheckBoxTreeCell.class },
-            { CheckBoxTreeTableCell.class },
-        });
+    private static Collection<Class> parameters() {
+        return List.of(
+            CheckBoxListCell.class,
+            CheckBoxTableCell.class,
+            CheckBoxTreeCell.class,
+            CheckBoxTreeTableCell.class
+        );
     }
 
-    private Class<? extends Cell> cellClass;
     private Cell cell;
-
     private int count = 0;
 
-    public ParameterisedPrebuiltCellTest(Class<? extends Cell> cellClass) {
-        this.cellClass = cellClass;
-    }
-
-    @Before public void setup() throws Exception {
+    // @BeforeEach
+    // junit5 does not support parameterized class-level tests yet
+    private void setup(Class<? extends Cell> cellClass) {
         count = 0;
-        cell = cellClass.getDeclaredConstructor().newInstance();
+        try {
+            cell = cellClass.getDeclaredConstructor().newInstance();
+        } catch (Exception e) {
+            fail(e);
+        }
     }
 
 
@@ -77,13 +72,19 @@ public ParameterisedPrebuiltCellTest(Class<? extends Cell> cellClass) {
      *
      **************************************************************************/
 
-    @Test public void testSetText() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSetText(Class<? extends Cell> cellClass) {
+        setup(cellClass);
         assertNull(cell.getText());
         cell.setText("TEST");
         assertEquals("TEST", cell.getText());
     }
 
-    @Test public void testTextProperty() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testTextProperty(Class<? extends Cell> cellClass) {
+        setup(cellClass);
         assertEquals(0, count);
         cell.textProperty().addListener((observable, oldValue, newValue) -> {
             count++;
@@ -109,13 +110,19 @@ public ParameterisedPrebuiltCellTest(Class<? extends Cell> cellClass) {
      *
      **************************************************************************/
 
-    @Test public void testSetGraphic() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSetGraphic(Class<? extends Cell> cellClass) {
+        setup(cellClass);
         Rectangle rect = new Rectangle(10, 10, Color.RED);
         cell.setGraphic(rect);
         assertEquals(rect, cell.getGraphic());
     }
 
-    @Test public void testGraphicProperty() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testGraphicProperty(Class<? extends Cell> cellClass) {
+        setup(cellClass);
         assertEquals(0, count);
         cell.graphicProperty().addListener((observable, oldValue, newValue) -> {
             count++;
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ProgressBarTableCellTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ProgressBarTableCellTest.java
index 0cbc61bac0c..6eec6973312 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ProgressBarTableCellTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ProgressBarTableCellTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,11 @@
 
 package test.javafx.scene.control.cell;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.value.ObservableValue;
 import javafx.scene.control.ProgressBar;
@@ -34,10 +39,8 @@
 import javafx.scene.control.cell.ProgressBarTableCell;
 import javafx.util.Callback;
 import javafx.util.StringConverter;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ProgressBarTableCellTest {
 
@@ -47,7 +50,8 @@ public class ProgressBarTableCellTest {
     private TableView<Object> tableView;
     private TableColumn<Object, Object> tableColumn;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         tableView = new TableView<>();
         tableColumn = new TableColumn<>();
         booleanProperty = new SimpleBooleanProperty(false);
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ProgressBarTreeTableCellTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ProgressBarTreeTableCellTest.java
index 541e98aa7b0..53cd86f2e2a 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ProgressBarTreeTableCellTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/ProgressBarTreeTableCellTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,11 @@
 
 package test.javafx.scene.control.cell;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.value.ObservableValue;
 import javafx.scene.control.ProgressBar;
@@ -34,10 +39,8 @@
 import javafx.scene.control.cell.ProgressBarTreeTableCell;
 import javafx.util.Callback;
 import javafx.util.StringConverter;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ProgressBarTreeTableCellTest {
 
@@ -47,7 +50,8 @@ public class ProgressBarTreeTableCellTest {
     private TreeTableView<Object> tableView;
     private TreeTableColumn<Object, Object> tableColumn;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         tableView = new TreeTableView<>();
         tableColumn = new TreeTableColumn<>();
         booleanProperty = new SimpleBooleanProperty(false);
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/TableCellStartEditTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/TableCellStartEditTest.java
index 4729fd4de18..cf304a13fd3 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/TableCellStartEditTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/TableCellStartEditTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,12 @@
 
 package test.javafx.scene.control.cell;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import java.util.Collection;
+import java.util.List;
+import java.util.function.Supplier;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.scene.control.TableCell;
@@ -36,53 +42,36 @@
 import javafx.scene.control.cell.ComboBoxTableCell;
 import javafx.scene.control.cell.ProgressBarTableCell;
 import javafx.scene.control.cell.TextFieldTableCell;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.function.Supplier;
-
-import static java.util.stream.Collectors.toList;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Parameterized tests for the {@link TableCell#startEdit()} method of {@link TableCell} and all sub implementations.
  * The {@link CheckBoxTableCell} is special as in there the checkbox will be disabled based of the editability.
  */
-@RunWith(Parameterized.class)
 public class TableCellStartEditTest {
 
     private static final boolean[] EDITABLE_STATES = { true, false };
 
-    private final Supplier<TableCell<String, ?>> tableCellSupplier;
-
     private TableView<String> table;
     private TableRow<String> tableRow;
     private TableColumn<String, ?> tableColumn;
     private TableCell<String, ?> tableCell;
 
-
-    @Parameterized.Parameters
-    public static Collection<Object[]> data() {
-        return wrapAsObjectArray(List.of(TableCell::new, ComboBoxTableCell::new, TextFieldTableCell::new,
-                ChoiceBoxTableCell::new, CheckBoxTableCell::new, ProgressBarTableCell::new));
-    }
-
-    private static Collection<Object[]> wrapAsObjectArray(List<Supplier<TableCell<Object, ?>>> tableCells) {
-        return tableCells.stream().map(cell -> new Object[] { cell }).collect(toList());
+    private static Collection<Supplier<TableCell<String, ?>>> parameters() {
+        return List.of(
+            TableCell::new,
+            ComboBoxTableCell::new,
+            TextFieldTableCell::new,
+            ChoiceBoxTableCell::new,
+            CheckBoxTableCell::new,
+            ProgressBarTableCell::new
+        );
     }
 
-    public TableCellStartEditTest(Supplier<TableCell<String, ?>> tableCellSupplier) {
-        this.tableCellSupplier = tableCellSupplier;
-    }
-
-    @Before
-    public void setup() {
+    // @BeforeEach
+    // junit5 does not support parameterized class-level tests yet
+    public void setup(Supplier<TableCell<String, ?>> tableCellSupplier) {
         ObservableList<String> items = FXCollections.observableArrayList("1", "2", "3");
         table = new TableView<>(items);
 
@@ -94,14 +83,18 @@ public void setup() {
         tableCell = tableCellSupplier.get();
     }
 
-    @Test
-    public void testStartEditMustNotThrowNPE() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testStartEditMustNotThrowNPE(Supplier<TableCell<String, ?>> tableCellSupplier) {
+        setup(tableCellSupplier);
         // A table cell without anything attached should not throw a NPE.
         tableCell.startEdit();
     }
 
-    @Test
-    public void testStartEditRespectsEditable() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testStartEditRespectsEditable(Supplier<TableCell<String, ?>> tableCellSupplier) {
+        setup(tableCellSupplier);
         tableCell.updateIndex(0);
 
         tableCell.updateTableColumn(tableColumn);
@@ -159,5 +152,4 @@ private void testStartEditImpl(boolean isTableEditable, boolean isColumnEditable
         // Restore the editing state.
         tableCell.cancelEdit();
     }
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/TextFieldListCellTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/TextFieldListCellTest.java
index 55037f3cf4a..4860931cb47 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/TextFieldListCellTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/TextFieldListCellTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,21 +25,25 @@
 
 package test.javafx.scene.control.cell;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.scene.control.ListCell;
 import javafx.scene.control.ListView;
 import javafx.scene.control.cell.TextFieldListCell;
 import javafx.util.Callback;
 import javafx.util.StringConverter;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TextFieldListCellTest {
 
     private StringConverter<Object> converter;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         converter = new StringConverter<>() {
             @Override public String toString(Object object) {
                 return null;
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/TextFieldTableCellTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/TextFieldTableCellTest.java
index 64f23b62b18..3058840d467 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/TextFieldTableCellTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/TextFieldTableCellTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,11 @@
 
 package test.javafx.scene.control.cell;
 
-import test.com.sun.javafx.scene.control.infrastructure.MouseEventFirer;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.collections.FXCollections;
 import javafx.scene.control.TableCell;
@@ -36,16 +40,16 @@
 import javafx.scene.input.MouseButton;
 import javafx.util.Callback;
 import javafx.util.StringConverter;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import test.com.sun.javafx.scene.control.infrastructure.MouseEventFirer;
 
 public class TextFieldTableCellTest {
 
     private StringConverter<Object> converter;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         converter = new StringConverter<>() {
             @Override public String toString(Object object) {
                 return null;
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/TextFieldTreeCellTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/TextFieldTreeCellTest.java
index 08c55383880..61066c86181 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/TextFieldTreeCellTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/TextFieldTreeCellTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,22 +25,26 @@
 
 package test.javafx.scene.control.cell;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.scene.control.TreeCell;
 import javafx.scene.control.TreeItem;
 import javafx.scene.control.TreeView;
 import javafx.scene.control.cell.TextFieldTreeCell;
 import javafx.util.Callback;
 import javafx.util.StringConverter;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TextFieldTreeCellTest {
 
     private StringConverter<Object> converter;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         converter = new StringConverter<>() {
             @Override public String toString(Object object) {
                 return null;
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/TextFieldTreeTableCellTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/TextFieldTreeTableCellTest.java
index 692c9bbf214..cff1234742d 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/TextFieldTreeTableCellTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/TextFieldTreeTableCellTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,11 @@
 
 package test.javafx.scene.control.cell;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.scene.control.TreeItem;
 import javafx.scene.control.TreeTableCell;
 import javafx.scene.control.TreeTableColumn;
@@ -32,16 +37,15 @@
 import javafx.scene.control.cell.TextFieldTreeTableCell;
 import javafx.util.Callback;
 import javafx.util.StringConverter;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TextFieldTreeTableCellTest {
 
     private StringConverter<Object> converter;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         converter = new StringConverter<>() {
             @Override public String toString(Object object) {
                 return null;
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/TreeCellStartEditTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/TreeCellStartEditTest.java
index 1aa7b61c603..cb5c79544b0 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/TreeCellStartEditTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/TreeCellStartEditTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,12 @@
 
 package test.javafx.scene.control.cell;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import java.util.Collection;
+import java.util.List;
+import java.util.function.Supplier;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.scene.control.TreeCell;
 import javafx.scene.control.TreeItem;
@@ -33,50 +39,34 @@
 import javafx.scene.control.cell.ChoiceBoxTreeCell;
 import javafx.scene.control.cell.ComboBoxTreeCell;
 import javafx.scene.control.cell.TextFieldTreeCell;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.function.Supplier;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-import static java.util.stream.Collectors.toList;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
 
 /**
  * Parameterized tests for the {@link TreeCell#startEdit()} method of {@link TreeCell} and all sub implementations.
  * The {@link CheckBoxTreeCell} is special as in there the checkbox will be disabled based of the editability.
  */
-@RunWith(Parameterized.class)
 public class TreeCellStartEditTest {
 
     private static final boolean[] EDITABLE_STATES = { true, false };
 
-    private final Supplier<TreeCell<String>> treeCellSupplier;
-
     private TreeView<String> treeView;
     private TreeCell<String> treeCell;
 
-    @Parameterized.Parameters
-    public static Collection<Object[]> data() {
-        return wrapAsObjectArray(List.of(TreeCell::new, ComboBoxTreeCell::new, TextFieldTreeCell::new,
-                ChoiceBoxTreeCell::new,() -> new CheckBoxTreeCell<>(obj -> new SimpleBooleanProperty())));
-    }
-
-    private static Collection<Object[]> wrapAsObjectArray(List<Supplier<TreeCell<String>>> treeCells) {
-        return treeCells.stream().map(cell -> new Object[] { cell }).collect(toList());
-    }
-
-    public TreeCellStartEditTest(Supplier<TreeCell<String>> treeCellSupplier) {
-        this.treeCellSupplier = treeCellSupplier;
+    private static Collection<Supplier<TreeCell<String>>> parameters() {
+        return List.of(
+            TreeCell::new,
+            ComboBoxTreeCell::new,
+            TextFieldTreeCell::new,
+            ChoiceBoxTreeCell::new,
+            () -> new CheckBoxTreeCell<>(obj -> new SimpleBooleanProperty())
+        );
     }
 
-    @Before
-    public void setup() {
+    // @BeforeEach
+    // junit5 does not support parameterized class-level tests yet
+    public void setup(Supplier<TreeCell<String>> treeCellSupplier) {
         TreeItem<String> root = new TreeItem<>("1");
         root.getChildren().addAll(List.of(new TreeItem<>("2"), new TreeItem<>("3")));
         treeView = new TreeView<>(root);
@@ -84,14 +74,18 @@ public void setup() {
         treeCell = treeCellSupplier.get();
     }
 
-    @Test
-    public void testStartEditMustNotThrowNPE() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testStartEditMustNotThrowNPE(Supplier<TreeCell<String>> treeCellSupplier) {
+        setup(treeCellSupplier);
         // A tree cell without anything attached should not throw a NPE.
         treeCell.startEdit();
     }
 
-    @Test
-    public void testStartEditRespectsEditable() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testStartEditRespectsEditable(Supplier<TreeCell<String>> treeCellSupplier) {
+        setup(treeCellSupplier);
         treeCell.updateIndex(0);
 
         treeCell.updateTreeView(treeView);
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/TreeTableCellStartEditTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/TreeTableCellStartEditTest.java
index b438f1739c4..e16eaa4c86f 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/TreeTableCellStartEditTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/cell/TreeTableCellStartEditTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,12 @@
 
 package test.javafx.scene.control.cell;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import java.util.Collection;
+import java.util.List;
+import java.util.function.Supplier;
 import javafx.scene.control.TreeItem;
 import javafx.scene.control.TreeTableCell;
 import javafx.scene.control.TreeTableColumn;
@@ -35,55 +41,37 @@
 import javafx.scene.control.cell.ComboBoxTreeTableCell;
 import javafx.scene.control.cell.ProgressBarTreeTableCell;
 import javafx.scene.control.cell.TextFieldTreeTableCell;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.function.Supplier;
-
-import static java.util.stream.Collectors.toList;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Parameterized tests for the {@link TreeTableCell#startEdit()} method of {@link TreeTableCell} and all sub
  * implementations. The {@link CheckBoxTreeTableCell} is special as in there the checkbox will be disabled based of the
  * editability.
  */
-@RunWith(Parameterized.class)
 public class TreeTableCellStartEditTest {
 
     private static final boolean[] EDITABLE_STATES = { true, false };
 
-    private final Supplier<TreeTableCell<String, ?>> treeTableCellSupplier;
-
     private TreeTableView<String> treeTable;
     private TreeTableRow<String> treeTableRow;
     private TreeTableColumn<String, ?> treeTableColumn;
     private TreeTableCell<String, ?> treeTableCell;
 
-
-    @Parameterized.Parameters
-    public static Collection<Object[]> data() {
-        return wrapAsObjectArray(
-                List.of(TreeTableCell::new , ComboBoxTreeTableCell::new, TextFieldTreeTableCell::new,
-                        ChoiceBoxTreeTableCell::new, CheckBoxTreeTableCell::new, ProgressBarTreeTableCell::new));
-    }
-
-    private static Collection<Object[]> wrapAsObjectArray(List<Supplier<TreeTableCell<Object, ?>>> treeTableCells) {
-        return treeTableCells.stream().map(cell -> new Object[] { cell }).collect(toList());
-    }
-
-    public TreeTableCellStartEditTest(Supplier<TreeTableCell<String, ?>> treeTableCellSupplier) {
-        this.treeTableCellSupplier = treeTableCellSupplier;
+    private static Collection<Supplier<TreeTableCell<String, ?>>> parameters() {
+        return List.of(
+            TreeTableCell::new,
+            ComboBoxTreeTableCell::new,
+            TextFieldTreeTableCell::new,
+            ChoiceBoxTreeTableCell::new,
+            CheckBoxTreeTableCell::new,
+            ProgressBarTreeTableCell::new
+        );
     }
 
-    @Before
-    public void setup() {
+    // @BeforeEach
+    // junit5 does not support parameterized class-level tests yet
+    public void setup(Supplier<TreeTableCell<String, ?>> treeTableCellSupplier) {
         TreeItem<String> root = new TreeItem<>("1");
         root.getChildren().addAll(List.of(new TreeItem<>("2"), new TreeItem<>("3")));
         treeTable = new TreeTableView<>(root);
@@ -96,14 +84,18 @@ public void setup() {
         treeTableCell = treeTableCellSupplier.get();
     }
 
-    @Test
-    public void testStartEditMustNotThrowNPE() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testStartEditMustNotThrowNPE(Supplier<TreeTableCell<String, ?>> treeTableCellSupplier) {
+        setup(treeTableCellSupplier);
         // A tree table cell without anything attached should not throw a NPE.
         treeTableCell.startEdit();
     }
 
-    @Test
-    public void testStartEditRespectsEditable() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testStartEditRespectsEditable(Supplier<TreeTableCell<String, ?>> treeTableCellSupplier) {
+        setup(treeTableCellSupplier);
         treeTableCell.updateIndex(0);
 
         treeTableCell.updateTableColumn((TreeTableColumn) treeTableColumn);
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/css/PropertySizeTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/css/PropertySizeTest.java
index 9aee3cdac07..4521fed4f44 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/css/PropertySizeTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/css/PropertySizeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,16 +25,14 @@
 
 package test.javafx.scene.control.css;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import javafx.scene.Scene;
 import javafx.scene.control.Label;
 import javafx.scene.layout.HBox;
 import javafx.scene.text.Font;
-
-import org.junit.Test;
-import org.junit.Before;
-import org.junit.Ignore;
-
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class PropertySizeTest {
     private HBox root, p1, p2, p3, p4;
@@ -101,31 +99,29 @@ public TestLabel(Label label, String fontSize, String padding, String labelPaddi
         public void verifySizes() {
             root.applyCss();
             double fontSize = label.getFont().getSize();
-            assertEquals("Incorrect padding", padding.getValue(fontSize), label.getPadding().getLeft(), 0.1);
-            assertEquals("Incorrect labelPadding", labelPadding.getValue(fontSize), label.getLabelPadding().getLeft(), 0.1);
-            assertEquals("Incorrect max width", maxW.getValue(fontSize), label.getMaxWidth(), 0.1);
-            assertEquals("Incorrect min width", minW.getValue(fontSize), label.getMinWidth(), 0.1);
-            assertEquals("Incorrect pref width", prefW.getValue(fontSize), label.getPrefWidth(), 0.1);
-            assertEquals("Incorrect max Height", maxH.getValue(fontSize), label.getMaxHeight(), 0.1);
-            assertEquals("Incorrect min height", minH.getValue(fontSize), label.getMinHeight(), 0.1);
-            assertEquals("Incorrect pref height", prefH.getValue(fontSize), label.getPrefHeight(), 0.1);
-            assertEquals("Incorrect background radius", bgRadius.getValue(fontSize),
-                    label.getBackground().getFills().get(0).getRadii().getTopLeftHorizontalRadius(), 0.1);
-            assertEquals("Incorrect background insets", bgInsets.getValue(fontSize),
-                    label.getBackground().getFills().get(0).getInsets().getLeft(), 0.1);
+            assertEquals(padding.getValue(fontSize), label.getPadding().getLeft(), 0.1, "Incorrect padding");
+            assertEquals(labelPadding.getValue(fontSize), label.getLabelPadding().getLeft(), 0.1, "Incorrect labelPadding");
+            assertEquals(maxW.getValue(fontSize), label.getMaxWidth(), 0.1, "Incorrect max width");
+            assertEquals(minW.getValue(fontSize), label.getMinWidth(), 0.1, "Incorrect min width");
+            assertEquals(prefW.getValue(fontSize), label.getPrefWidth(), 0.1, "Incorrect pref width");
+            assertEquals(maxH.getValue(fontSize), label.getMaxHeight(), 0.1, "Incorrect max Height");
+            assertEquals(minH.getValue(fontSize), label.getMinHeight(), 0.1, "Incorrect min height");
+            assertEquals(prefH.getValue(fontSize), label.getPrefHeight(), 0.1, "Incorrect pref height");
+            assertEquals(bgRadius.getValue(fontSize), label.getBackground().getFills().get(0).getRadii().getTopLeftHorizontalRadius(), 0.1, "Incorrect background radius");
+            assertEquals(bgInsets.getValue(fontSize), label.getBackground().getFills().get(0).getInsets().getLeft(), 0.1, "Incorrect background insets");
         }
     }
 
     private void verifyFontSizes(double l0Font, double l1Font, double l2Font, double l3Font, double l4Font) {
         root.applyCss();
-        assertEquals("l0 font size is incorrect.", l0Font, l0.getFont().getSize(), 0.1);
-        assertEquals("l1 font size is incorrect.", l1Font, l1.getFont().getSize(), 0.1);
-        assertEquals("l2 font size is incorrect.", l2Font, l2.getFont().getSize(), 0.1);
-        assertEquals("l3 font size is incorrect.", l3Font, l3.getFont().getSize(), 0.1);
-        assertEquals("l4 font size is incorrect.", l4Font, l4.getFont().getSize(), 0.1);
+        assertEquals(l0Font, l0.getFont().getSize(), 0.1, "l0 font size is incorrect.");
+        assertEquals(l1Font, l1.getFont().getSize(), 0.1, "l1 font size is incorrect.");
+        assertEquals(l2Font, l2.getFont().getSize(), 0.1, "l2 font size is incorrect.");
+        assertEquals(l3Font, l3.getFont().getSize(), 0.1, "l3 font size is incorrect.");
+        assertEquals(l4Font, l4.getFont().getSize(), 0.1, "l4 font size is incorrect.");
     }
 
-    @Before
+    @BeforeEach
     public void setupTest() {
         l4 = new Label("L4");
         p4 = new HBox(l4);
@@ -237,7 +233,7 @@ public void relativeFontSizeSetOnAllNestedParentsAndControlsTest() {
                 p3FontSize * 0.35, p4FontSize * 0.3);
     }
 
-    @Ignore()
+    @Disabled
     @Test
     public void ideal_relativeFontSizeNestedParentControlTest() {
         root.setStyle("-fx-font-size: 0.9em");
@@ -292,7 +288,7 @@ public void relativeFontSizeOfNestedParentsTest() {
 
     // This is a specific combination where -fx-font-size of parents is same and test fails.
     // If we fix this then the test can be moved inside previous test.
-    @Ignore()
+    @Disabled
     @Test
     public void sameRelativeFontSizeOfNestedParentsTest() {
         testFontSizeOfParents(ROOT_FONT_SIZE + "px", "0.5em", "0.5em",
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ArrayLinkedListTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ArrayLinkedListTest.java
index 4009991bf7f..1363f27543b 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ArrayLinkedListTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ArrayLinkedListTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,14 +25,14 @@
 
 package test.javafx.scene.control.skin;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.scene.control.skin.VirtualFlowShim.ArrayLinkedListShim;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ArrayLinkedListTest {
     private ArrayLinkedListShim<String> list;
@@ -40,7 +40,8 @@ public class ArrayLinkedListTest {
     private String b = "b";
     private String c = "c";
 
-    @Before public void setUp() {
+    @BeforeEach
+    public void setUp() {
         list = new ArrayLinkedListShim<>();
     }
 
@@ -84,13 +85,11 @@ public class ArrayLinkedListTest {
         assertEquals(0, list.size());
     }
 
-    @Test public void testArrayLinkedList_Empty_GetResultsInArrayIndexOutOfBounds() {
-        try {
+    @Test
+    public void testArrayLinkedList_Empty_GetResultsInArrayIndexOutOfBounds() {
+        assertThrows(IndexOutOfBoundsException.class, () -> {
             list.get(0);
-            assertTrue("get didn't return an IndexOutOfBoundsException", false);
-        } catch (IndexOutOfBoundsException e) {
-            assertTrue(true);
-        }
+        });
     }
 
     @Test public void testArrayLinkedList_Empty_RemoveFirstIsNoOp() {
@@ -101,13 +100,11 @@ public class ArrayLinkedListTest {
         list.removeLast();
     }
 
-    @Test public void testArrayLinkedList_Empty_RemoveResultsInArrayIndexOutOfBounds() {
-        try {
+    @Test
+    public void testArrayLinkedList_Empty_RemoveResultsInArrayIndexOutOfBounds() {
+        assertThrows(IndexOutOfBoundsException.class, () -> {
             list.remove(0);
-            assertTrue("remove didn't return an IndexOutOfBoundsException", false);
-        } catch (IndexOutOfBoundsException e) {
-            assertTrue(true);
-        }
+        });
     }
 
     @Test public void testArrayLinkedList_GetFirst_AfterAddLast() {
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ButtonSkinTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ButtonSkinTest.java
index 71f318865b3..b6febae3d08 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ButtonSkinTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ButtonSkinTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,34 +25,29 @@
 
 package test.javafx.scene.control.skin;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
+import java.lang.ref.WeakReference;
 import javafx.beans.value.ObservableValue;
+import javafx.collections.ObservableList;
 import javafx.geometry.Insets;
-import javafx.scene.control.Button;
-
 import javafx.scene.Group;
+import javafx.scene.Node;
 import javafx.scene.Scene;
-import javafx.stage.Stage;
+import javafx.scene.control.Button;
+import javafx.scene.control.skin.ButtonSkin;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyCodeCombination;
-import javafx.scene.input.Mnemonic;
-import javafx.collections.ObservableList;
 import javafx.scene.input.KeyCombination;
-
-import com.sun.javafx.scene.control.behavior.MnemonicInfo.MnemonicKeyCombination;
-import javafx.scene.Node;
-import javafx.scene.control.skin.ButtonSkin;
+import javafx.scene.input.Mnemonic;
 import javafx.scene.shape.Rectangle;
-
-import org.junit.Before;
-import org.junit.After;
-import org.junit.Test;
-
-import java.lang.ref.WeakReference;
+import javafx.stage.Stage;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.scene.control.behavior.MnemonicInfo.MnemonicKeyCombination;
 
 /**
  */
@@ -60,7 +55,8 @@ public class ButtonSkinTest {
     private Button button;
     private ButtonSkinMock skin;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         button = new Button("Test");
         skin = new ButtonSkinMock(button);
         // Set some padding so that any places where padding was being
@@ -76,7 +72,8 @@ public class ButtonSkinTest {
         });
     }
 
-    @After public void cleanup() {
+    @AfterEach
+    public void cleanup() {
         Thread.currentThread().setUncaughtExceptionHandler(null);
     }
 
@@ -201,9 +198,9 @@ public void testOldSkinShouldGC() {
         skin = null;
 
         attemptGC(oldSkinRef);
-        assertNull("Old ButtonSkin must be GCed.", oldSkinRef.get());
-        assertNull("Default ButtonSkin must be GCed.", defSkinRef.get());
-        assertNotNull("Current ButtonSkin must NOT be GCed.", currSkinRef.get());
+        assertNull(oldSkinRef.get(), "Old ButtonSkin must be GCed.");
+        assertNull(defSkinRef.get(), "Default ButtonSkin must be GCed.");
+        assertNotNull(currSkinRef.get(), "Current ButtonSkin must NOT be GCed.");
     }
 
     @Test
@@ -223,9 +220,9 @@ public void testUnusedSkinShouldGC() {
         skin = null;
 
         attemptGC(skinRef1);
-        assertNull("Unused ButtonSkin must be GCed.", skinRef1.get());
-        assertNull("Unused ButtonSkin must be GCed.", skinRef2.get());
-        assertNotNull("Default ButtonSkin must NOT be GCed.", defSkinRef.get());
+        assertNull(skinRef1.get(), "Unused ButtonSkin must be GCed.");
+        assertNull(skinRef2.get(), "Unused ButtonSkin must be GCed.");
+        assertNotNull(defSkinRef.get(), "Default ButtonSkin must NOT be GCed.");
     }
 
     @Test
@@ -239,8 +236,8 @@ public void testButtonAndSkinShouldGC() {
         skin = null;
 
         attemptGC(skinRef);
-        assertNull("Button must be GCed.", buttonRef.get());
-        assertNull("ButtonSkin must be GCed.", skinRef.get());
+        assertNull(buttonRef.get(), "Button must be GCed.");
+        assertNull(skinRef.get(), "ButtonSkin must be GCed.");
     }
 
     @Test
@@ -272,7 +269,7 @@ public void testDefaultButtonNullSkinReleased() {
         assertNull(scene.getAccelerators().get(key));
 
         attemptGC(defSkinRef);
-        assertNull("ButtonSkin must be GCed", defSkinRef.get());
+        assertNull(defSkinRef.get(), "ButtonSkin must be GCed");
     }
 
     @Test
@@ -291,7 +288,7 @@ public void testCancelButtonNullSkinReleased() {
         assertNull(scene.getAccelerators().get(key));
 
         attemptGC(defSkinRef);
-        assertNull("ButtonSkin must be GCed", defSkinRef.get());
+        assertNull(defSkinRef.get(), "ButtonSkin must be GCed");
     }
 
     private void attemptGC(WeakReference<ButtonSkin> weakRef) {
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/CheckBoxSkinTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/CheckBoxSkinTest.java
index 5e3fce57c6d..519923715ef 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/CheckBoxSkinTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/CheckBoxSkinTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,20 +25,18 @@
 
 package test.javafx.scene.control.skin;
 
-import static org.junit.Assert.assertEquals;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import javafx.beans.value.ObservableValue;
 import javafx.geometry.Insets;
-import javafx.scene.control.CheckBox;
-import javafx.scene.control.skin.CheckBoxSkin;
-import com.sun.javafx.tk.Toolkit;
 import javafx.scene.Group;
 import javafx.scene.Scene;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.skin.CheckBoxSkin;
 import javafx.stage.Stage;
-
-import org.junit.BeforeClass;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.tk.Toolkit;
 
 /**
  */
@@ -49,11 +47,13 @@ public class CheckBoxSkinTest {
     private Scene scene;
     private Stage stage;
 
-    @BeforeClass public static void initToolKit() {
+    @BeforeAll
+    public static void initToolKit() {
         tk = Toolkit.getToolkit();
     }
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         checkbox = new CheckBox("Test");
         skin = new CheckBoxSkinMock(checkbox);
         // Set some padding so that any places where padding was being
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ChoiceBoxSkinTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ChoiceBoxSkinTest.java
index 24ca0ba0110..6859dde7112 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ChoiceBoxSkinTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ChoiceBoxSkinTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,15 +25,13 @@
 
 package test.javafx.scene.control.skin;
 
-import static org.junit.Assert.assertEquals;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import javafx.beans.value.ObservableValue;
 import javafx.geometry.Insets;
 import javafx.scene.control.ChoiceBox;
 import javafx.scene.control.skin.ChoiceBoxSkin;
-
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * This fails with IllegalStateException because of the toolkit's check for the FX application thread
@@ -42,7 +40,8 @@ public class ChoiceBoxSkinTest {
     private ChoiceBox choicebox;
     private ChoiceBoxSkinMock skin;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         choicebox = new ChoiceBox();
         skin = new ChoiceBoxSkinMock(choicebox);
         // Set some padding so that any places where padding was being
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ColorPickerSkinTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ColorPickerSkinTest.java
index 4bc5bea4b1d..71db8d90781 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ColorPickerSkinTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ColorPickerSkinTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,9 @@
 
 package test.javafx.scene.control.skin;
 
-import com.sun.javafx.scene.SceneHelper;
-import test.com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
-import test.com.sun.javafx.scene.control.infrastructure.MouseEventFirer;
-import test.com.sun.javafx.scene.control.infrastructure.MouseEventGenerator;
-import com.sun.javafx.tk.Toolkit;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.scene.Scene;
 import javafx.scene.control.ColorPicker;
 import javafx.scene.control.Hyperlink;
@@ -40,19 +38,21 @@
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.scene.SceneHelper;
+import com.sun.javafx.tk.Toolkit;
+import test.com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
+import test.com.sun.javafx.scene.control.infrastructure.MouseEventFirer;
+import test.com.sun.javafx.scene.control.infrastructure.MouseEventGenerator;
 
 public class ColorPickerSkinTest {
     private ColorPicker colorPicker;
     private Toolkit tk;
     private Stage stage;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         tk = Toolkit.getToolkit();
         colorPicker = new ColorPicker();
         Scene scene = new Scene(new VBox(20), 800, 600);
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ComboBoxListViewSkinTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ComboBoxListViewSkinTest.java
index 45dfa4b664c..2719212a448 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ComboBoxListViewSkinTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ComboBoxListViewSkinTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,15 +25,14 @@
 
 package test.javafx.scene.control.skin;
 
-import static org.junit.Assert.*;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.ListView;
 import javafx.scene.control.SelectionModel;
 import javafx.scene.control.skin.ComboBoxListViewSkin;
-
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ComboBoxListViewSkinTest {
     private ComboBox<String> comboBox;
@@ -42,7 +41,8 @@ public class ComboBoxListViewSkinTest {
     private SelectionModel<String> listSm;
     private ComboBoxListViewSkin<String> skin;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         comboBox = new ComboBox();
         skin = new ComboBoxListViewSkin(comboBox);
         comboBox.setSkin(skin);
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ConcreteVirtualContainerTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ConcreteVirtualContainerTest.java
index a2882800120..952c014d8eb 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ConcreteVirtualContainerTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ConcreteVirtualContainerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,15 +25,11 @@
 
 package test.javafx.scene.control.skin;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 import java.util.stream.Collectors;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
 import javafx.collections.FXCollections;
 import javafx.scene.control.ListView;
 import javafx.scene.control.TableView;
@@ -44,6 +40,7 @@
 import javafx.scene.control.skin.TableViewSkin;
 import javafx.scene.control.skin.TreeTableViewSkin;
 import javafx.scene.control.skin.TreeViewSkin;
+import org.junit.jupiter.api.Test;
 
 /**
  * Contains tests that should pass for all concrete implementations
@@ -59,8 +56,7 @@ public void testTableSkinCellCountInitial() {
         TableView<Locale> control = new TableView<>(FXCollections.observableArrayList(Locale.getAvailableLocales()));
         control.setSkin(new TableViewSkin<>(control) {
             {
-                assertEquals("flow's cellCount must be initialized", control.getItems().size(),
-                        getVirtualFlow().getCellCount());
+                assertEquals(control.getItems().size(), getVirtualFlow().getCellCount(), "flow's cellCount must be initialized");
             }
         });
     }
@@ -76,8 +72,7 @@ public void testTreeTableSkinCellCountInitial() {
         TreeTableView<Locale> control = new TreeTableView<>(root);
         control.setSkin(new TreeTableViewSkin<>(control) {
             {
-                assertEquals("flow's cellCount must be initialized", treeItems.size() + 1,
-                        getVirtualFlow().getCellCount());
+                assertEquals(treeItems.size() + 1, getVirtualFlow().getCellCount(), "flow's cellCount must be initialized");
             }
         });
     }
@@ -93,8 +88,7 @@ public void testTreeSkinCellCountInitial() {
         TreeView<Locale> control = new TreeView<>(root);
         control.setSkin(new TreeViewSkin<>(control) {
             {
-                assertEquals("flow's cellCount must be initialized", treeItems.size() +1,
-                        getVirtualFlow().getCellCount());
+                assertEquals(treeItems.size() + 1, getVirtualFlow().getCellCount(), "flow's cellCount must be initialized");
             }
         });
     }
@@ -104,8 +98,7 @@ public void testListSkinCellCountInitial() {
         ListView<Locale> control = new ListView<>(FXCollections.observableArrayList(Locale.getAvailableLocales()));
         control.setSkin(new ListViewSkin<>(control) {
             {
-                assertEquals("flow's cellCount must be initialized", control.getItems().size(),
-                        getVirtualFlow().getCellCount());
+                assertEquals(control.getItems().size(), getVirtualFlow().getCellCount(), "flow's cellCount must be initialized");
             }
         });
     }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/CustomListViewSkinTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/CustomListViewSkinTest.java
index c83d702aca4..95fe5bbe155 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/CustomListViewSkinTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/CustomListViewSkinTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,17 +25,15 @@
 
 package test.javafx.scene.control.skin;
 
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
-
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.scene.control.ListCell;
 import javafx.scene.control.ListView;
 import javafx.scene.control.skin.ListViewSkin;
-import javafx.scene.control.skin.VirtualFlowShim;
 import javafx.scene.control.skin.VirtualFlow;
-
-import org.junit.Before;
-import org.junit.Test;
+import javafx.scene.control.skin.VirtualFlowShim;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
   A custom ListViewSkin class that re-implements createVirtualFlow() method
@@ -89,7 +87,8 @@ public class CustomListViewSkinTest {
 
     private ListView<String> listViewObj = null;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         listViewObj = new ListView<>();
     }
 
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/EditAndScrollTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/EditAndScrollTest.java
index 80fe28285ec..9667e8f526f 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/EditAndScrollTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/EditAndScrollTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,13 +25,13 @@
 
 package test.javafx.scene.control.skin;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import static test.com.sun.javafx.scene.control.infrastructure.VirtualizedControlTestUtils.*;
-import static org.junit.Assert.*;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static test.com.sun.javafx.scene.control.infrastructure.VirtualizedControlTestUtils.fireMouseOnHorizontalTrack;
+import static test.com.sun.javafx.scene.control.infrastructure.VirtualizedControlTestUtils.fireMouseOnVerticalTrack;
+import static test.com.sun.javafx.scene.control.infrastructure.VirtualizedControlTestUtils.getHorizontalScrollBar;
+import static test.com.sun.javafx.scene.control.infrastructure.VirtualizedControlTestUtils.getVerticalScrollBar;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.geometry.Orientation;
@@ -58,6 +58,9 @@
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
 import javafx.util.converter.DefaultStringConverter;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test scrolling while editing, mainly fix for JDK-8272118 - do not cancel edit on mouse click.
@@ -127,12 +130,10 @@ public void testTreeTableViewEditing() {
         assertEquals(rows + 1, control.getExpandedItemCount());
         assertEquals(100, scene.getWidth(), 1);
         assertEquals(330, scene.getHeight(), 1);
-        assertTrue("sanity: vertical scrollbar visible for list " ,
-                getHorizontalScrollBar(control).isVisible());
-        assertTrue("sanity: vertical scrollbar visible for list " ,
-                getVerticalScrollBar(control).isVisible());
+        assertTrue(getHorizontalScrollBar(control).isVisible(), "sanity: vertical scrollbar visible for list ");
+        assertTrue(getVerticalScrollBar(control).isVisible(), "sanity: vertical scrollbar visible for list ");
         TreeTablePosition<?, ?> editingItem = new TreeTablePosition(control, editingRow, control.getColumns().get(0));
-        assertEquals("control must be editing at", editingItem, control.getEditingCell());
+        assertEquals(editingItem, control.getEditingCell(), "control must be editing at");
     }
 
     /**
@@ -206,12 +207,10 @@ public void testTableViewEditing() {
         assertEquals(rows, control.getItems().size());
         assertEquals(100, scene.getWidth(), 1);
         assertEquals(330, scene.getHeight(), 1);
-        assertTrue("sanity: vertical scrollbar visible for list " ,
-                getHorizontalScrollBar(control).isVisible());
-        assertTrue("sanity: vertical scrollbar visible for list " ,
-                getVerticalScrollBar(control).isVisible());
+        assertTrue(getHorizontalScrollBar(control).isVisible(), "sanity: vertical scrollbar visible for list ");
+        assertTrue(getVerticalScrollBar(control).isVisible(), "sanity: vertical scrollbar visible for list ");
         TablePosition<?, ?> editingItem = new TablePosition(control, editingRow, control.getColumns().get(0));
-        assertEquals("control must be editing at", editingItem, control.getEditingCell());
+        assertEquals(editingItem, control.getEditingCell(), "control must be editing at");
     }
 
     /**
@@ -282,12 +281,10 @@ public void testTreeViewEditing() {
         assertEquals(rows + 1, control.getExpandedItemCount());
         assertEquals(100, scene.getWidth(), 1);
         assertEquals(330, scene.getHeight(), 1);
-        assertTrue("sanity: vertical scrollbar visible for list " ,
-                getHorizontalScrollBar(control).isVisible());
-        assertTrue("sanity: vertical scrollbar visible for list " ,
-                getVerticalScrollBar(control).isVisible());
+        assertTrue(getHorizontalScrollBar(control).isVisible(), "sanity: vertical scrollbar visible for list ");
+        assertTrue(getVerticalScrollBar(control).isVisible(), "sanity: vertical scrollbar visible for list ");
         TreeItem<?> editingItem = control.getTreeItem(editingRow);
-        assertEquals("control must be editing at", editingItem, control.getEditingItem());
+        assertEquals(editingItem, control.getEditingItem(), "control must be editing at");
     }
 
     /**
@@ -349,11 +346,9 @@ public void testListViewEditing() {
         assertEquals(rows, control.getItems().size());
         assertEquals(100, scene.getWidth(), 1);
         assertEquals(330, scene.getHeight(), 1);
-        assertTrue("sanity: vertical scrollbar visible for list " ,
-                getHorizontalScrollBar(control).isVisible());
-        assertTrue("sanity: vertical scrollbar visible for list " ,
-                getVerticalScrollBar(control).isVisible());
-        assertEquals("control must be editing at", editingRow, control.getEditingIndex());
+        assertTrue(getHorizontalScrollBar(control).isVisible(), "sanity: vertical scrollbar visible for list ");
+        assertTrue(getVerticalScrollBar(control).isVisible(), "sanity: vertical scrollbar visible for list ");
+        assertEquals(editingRow, control.getEditingIndex(), "control must be editing at");
     }
 
     /**
@@ -393,8 +388,7 @@ private void assertFocusedAfterMouseOnScrollBar(Control control, Orientation dir
         } else {
             fireMouseOnVerticalTrack(control);
         }
-        assertEquals("virtualized control must be focusOwner after mouse on scrollbar",
-                control, scene.getFocusOwner());
+        assertEquals(control, scene.getFocusOwner(), "virtualized control must be focusOwner after mouse on scrollbar");
     }
 
 
@@ -456,7 +450,8 @@ protected void showControl(Control control, boolean focused, double width, doubl
         }
     }
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         Thread.currentThread().setUncaughtExceptionHandler((thread, throwable) -> {
             if (throwable instanceof RuntimeException) {
                 throw (RuntimeException)throwable;
@@ -468,7 +463,8 @@ protected void showControl(Control control, boolean focused, double width, doubl
         rows = 60;
     }
 
-    @After public void cleanup() {
+    @AfterEach
+    public void cleanup() {
         if (stage != null) stage.hide();
         Thread.currentThread().setUncaughtExceptionHandler(null);
     }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/HyperlinkSkinTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/HyperlinkSkinTest.java
index f9a5593bc47..21dcbe4285c 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/HyperlinkSkinTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/HyperlinkSkinTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,15 +25,13 @@
 
 package test.javafx.scene.control.skin;
 
-import static org.junit.Assert.assertEquals;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import javafx.beans.value.ObservableValue;
 import javafx.geometry.Insets;
 import javafx.scene.control.Hyperlink;
 import javafx.scene.control.skin.HyperlinkSkin;
-
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  */
@@ -41,7 +39,8 @@ public class HyperlinkSkinTest {
     private Hyperlink hyperlink;
     private HyperlinkSkinMock skin;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         hyperlink = new Hyperlink("Test");
         skin = new HyperlinkSkinMock(hyperlink);
         // Set some padding so that any places where padding was being
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/LabelSkinCreationTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/LabelSkinCreationTest.java
index 9a676d88951..f494fc54b8c 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/LabelSkinCreationTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/LabelSkinCreationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,120 +25,96 @@
 
 package test.javafx.scene.control.skin;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-
-import java.util.Arrays;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
 import java.util.Collection;
-
+import java.util.List;
 import javafx.scene.Node;
 import javafx.scene.control.ContentDisplay;
 import javafx.scene.control.Label;
+import javafx.scene.control.SkinBaseShim;
+import javafx.scene.control.skin.LabelSkin;
+import javafx.scene.control.skin.LabeledSkinBaseShim;
 import javafx.scene.paint.Color;
 import javafx.scene.paint.Paint;
 import javafx.scene.shape.Rectangle;
 import javafx.scene.text.Font;
 import javafx.scene.text.Text;
 import javafx.scene.text.TextAlignment;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import javafx.scene.control.SkinBaseShim;
-import javafx.scene.control.skin.LabelSkin;
-import javafx.scene.control.skin.LabeledSkinBaseShim;
-
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * A parameterized test suite for testing that a LabelSkin,
  * created with various different configurations, is setup
  * correctly.
  */
-@RunWith(Parameterized.class)
 public class LabelSkinCreationTest {
-    private Paint fill;
-    private Font font;
-    private TextAlignment align;
-    private boolean underline;
-    private boolean wrapText;
-    private ContentDisplay contentDisplay;
-    private Node graphic;
 
     private Label label;
     private LabelSkin skin;
     private Text text;
 
-    @SuppressWarnings("rawtypes")
-    @Parameters public static Collection implementations() {
+    private static Collection<Parameter> parameters() {
         Rectangle rect = new Rectangle();
         rect.setWidth(25);
         rect.setHeight(25);
-        return Arrays.asList(new Object[][] {
+        return List.of(
             // standard configuration
-            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.LEFT,   null },
+            new Parameter(Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.LEFT,   null),
             // specify only the fill
-            { Color.RED,   Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.LEFT,   null },
+            new Parameter(Color.RED,   Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.LEFT,   null),
             // specify only the font
-            { Color.BLACK, Font.font("Arial", 64), TextAlignment.LEFT,    false, false, ContentDisplay.LEFT,   null },
+            new Parameter(Color.BLACK, Font.font("Arial", 64), TextAlignment.LEFT,    false, false, ContentDisplay.LEFT,   null),
             // specify only the align
-            { Color.BLACK, Font.getDefault(),      TextAlignment.JUSTIFY, false, false, ContentDisplay.LEFT,   null },
+            new Parameter(Color.BLACK, Font.getDefault(),      TextAlignment.JUSTIFY, false, false, ContentDisplay.LEFT,   null),
             // specify only the underline
-            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    true,  false, ContentDisplay.LEFT,   null },
+            new Parameter(Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    true,  false, ContentDisplay.LEFT,   null),
             // specify only the wrapText
-            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, true,  ContentDisplay.LEFT,   null },
+            new Parameter(Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, true,  ContentDisplay.LEFT,   null),
             // specify only the contentDisplay
-            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.BOTTOM, null },
+            new Parameter(Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.BOTTOM, null),
             // specify only the graphic
-            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.LEFT,   rect },
+            new Parameter(Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.LEFT,   rect),
             // specify every type of content display with null graphic
-            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.BOTTOM,       null },
-            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.CENTER,       null },
-            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.GRAPHIC_ONLY, null },
-            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.LEFT,         null },
-            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.RIGHT,        null },
-            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.TEXT_ONLY,    null },
-            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.TOP,          null },
+            new Parameter(Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.BOTTOM,       null),
+            new Parameter(Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.CENTER,       null),
+            new Parameter(Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.GRAPHIC_ONLY, null),
+            new Parameter(Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.LEFT,         null),
+            new Parameter(Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.RIGHT,        null),
+            new Parameter(Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.TEXT_ONLY,    null),
+            new Parameter(Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.TOP,          null),
             // specify every type of content display with non-null graphic
-            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.BOTTOM,       rect },
-            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.CENTER,       rect },
-            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.GRAPHIC_ONLY, rect },
-            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.LEFT,         rect },
-            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.RIGHT,        rect },
-            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.TEXT_ONLY,    rect },
-            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.TOP,          rect },
-        });
+            new Parameter(Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.BOTTOM,       rect),
+            new Parameter(Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.CENTER,       rect),
+            new Parameter(Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.GRAPHIC_ONLY, rect),
+            new Parameter(Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.LEFT,         rect),
+            new Parameter(Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.RIGHT,        rect),
+            new Parameter(Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.TEXT_ONLY,    rect),
+            new Parameter(Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.TOP,          rect)
+        );
     }
 
-    public LabelSkinCreationTest(
+    private record Parameter(
             Paint fill,
             Font font,
             TextAlignment align,
             boolean underline,
             boolean wrapText,
             ContentDisplay contentDisplay,
-            Node graphic)
-    {
-        this.fill = fill;
-        this.font = font;
-        this.align = align;
-        this.underline = underline;
-        this.wrapText = wrapText;
-        this.contentDisplay = contentDisplay;
-        this.graphic = graphic;
-    }
+            Node graphic) { }
 
-    @Before public void setup() {
+    // @BeforeEach
+    // junit5 does not support parameterized class-level tests yet
+    public void setup(Parameter p) {
         label = new Label();
-        label.setTextFill(fill);
-        label.setFont(font);
-        label.setTextAlignment(align);
-        label.setUnderline(underline);
-        label.setWrapText(wrapText);
-        label.setContentDisplay(contentDisplay);
-        label.setGraphic(graphic);
+        label.setTextFill(p.fill);
+        label.setFont(p.font);
+        label.setTextAlignment(p.align);
+        label.setUnderline(p.underline);
+        label.setWrapText(p.wrapText);
+        label.setContentDisplay(p.contentDisplay);
+        label.setGraphic(p.graphic);
         label.setText("*");
         label.resize(30, 30);
         skin = new LabelSkin(label);
@@ -146,7 +122,10 @@ public LabelSkinCreationTest(
         text = LabeledSkinBaseShim.get_text(skin);
     }
 
-    @Test public void labelWasInitializedCorrectly() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void labelWasInitializedCorrectly(Parameter p) {
+        setup(p);
         assertSame(label.getTextFill(), text.getFill());
         assertSame(label.getFont(), text.getFont());
         assertSame(label.getTextAlignment(), text.getTextAlignment());
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/LabelSkinLayoutTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/LabelSkinLayoutTest.java
index 24ad803b22b..4af92423e57 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/LabelSkinLayoutTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/LabelSkinLayoutTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,10 @@
 
 package test.javafx.scene.control.skin;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-import java.util.Arrays;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import java.util.Collection;
-
+import java.util.List;
 import javafx.geometry.BoundingBox;
 import javafx.geometry.Bounds;
 import javafx.scene.Node;
@@ -42,28 +40,24 @@
 import javafx.scene.shape.Rectangle;
 import javafx.scene.text.Font;
 import javafx.scene.text.Text;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  */
-@RunWith(Parameterized.class)
 public class LabelSkinLayoutTest {
     private static final double GRAPHIC_WIDTH = 23;
     private static final double GRAPHIC_HEIGHT = 32;
     private static final double LABEL_WIDTH = 300;
     private static final double LABEL_HEIGHT = 300;
 
-    @SuppressWarnings("rawtypes")
-    @Parameters public static Collection implementations() {
-        return Arrays.asList(new Object[][] {
-                {-10},
-                {0},
-                {10}
+    private static Collection<Integer> parameters() {
+        return List.of(
+            -10,
+            0,
+            10
+        );
+    }
 //            { HPos.CENTER, VPos.BOTTOM, -10 },
 //            { HPos.CENTER, VPos.BOTTOM, 0 },
 //            { HPos.CENTER, VPos.BOTTOM, 10 },
@@ -91,27 +85,19 @@ public class LabelSkinLayoutTest {
 //            { HPos.RIGHT, VPos.TOP, -10 },
 //            { HPos.RIGHT, VPos.TOP, 0 },
 //            { HPos.RIGHT, VPos.TOP, 10 },
-        });
-    }
 
-    private int graphicTextGap = 0;
 //    private VPos vpos;
 //    private HPos hpos;
     private Label label;
     private LabelSkin skin;
     private Text text;
 
-    public LabelSkinLayoutTest(int graphicTextGap) {
-//    public LabelSkinLayoutTest(HPos hpos, VPos vpos, int graphicTextGap) {
-        this.graphicTextGap = graphicTextGap;
-//        this.hpos = hpos;
-//        this.vpos = vpos;
-    }
-
     // We will parameterize the hpos and vpos to use, but all of the other tests
     // are all done manually.
 
-    @Before public void setup() {
+    // @BeforeEach
+    // junit5 does not support parameterized class-level tests yet
+    public void setup(int graphicTextGap) {
         label = new Label();
         label.resize(LABEL_WIDTH, LABEL_HEIGHT);
         label.setGraphicTextGap(graphicTextGap);
@@ -183,7 +169,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
 //        }
     }
 
-    @Test public void graphic_nullText_TOP() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void graphic_nullText_TOP(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         label.setGraphic(graphic);
         label.setText(null);
@@ -199,7 +188,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertEquals(contentBounds.getHeight(), graphicBounds.getHeight(), 0);
     }
 
-    @Test public void graphic_emptyText_TOP() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void graphic_emptyText_TOP(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         label.setGraphic(graphic);
         label.setText("");
@@ -215,7 +207,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertEquals(contentBounds.getHeight(), graphicBounds.getHeight(), 0);
     }
 
-    @Test public void graphic_Text_TOP() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void graphic_Text_TOP(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         label.setGraphic(graphic);
         label.setText("Falcon");
@@ -237,7 +232,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertCenteredHorizontally(contentBounds, textBounds);
     }
 
-    @Test public void unmanagedGraphic_nullText_TOP() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void unmanagedGraphic_nullText_TOP(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         graphic.setManaged(false);
         label.setGraphic(graphic);
@@ -248,7 +246,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertNull(getContentBounds());
     }
 
-    @Test public void unmanagedGraphic_emptyText_TOP() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void unmanagedGraphic_emptyText_TOP(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         graphic.setManaged(false);
         label.setGraphic(graphic);
@@ -259,7 +260,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertNull(getContentBounds());
     }
 
-    @Test public void unmanagedGraphic_Text_TOP() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void unmanagedGraphic_Text_TOP(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         graphic.setManaged(false);
         label.setGraphic(graphic);
@@ -276,7 +280,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertEquals(contentBounds.getHeight(), textBounds.getHeight(), 0);
     }
 
-    @Test public void noGraphic_nullText_TOP() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void noGraphic_nullText_TOP(int graphicTextGap) {
+        setup(graphicTextGap);
         label.setText(null);
         label.setContentDisplay(ContentDisplay.TOP);
         label.layout();
@@ -284,7 +291,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertNull(getContentBounds());
     }
 
-    @Test public void noGraphic_emptyText_TOP() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void noGraphic_emptyText_TOP(int graphicTextGap) {
+        setup(graphicTextGap);
         label.setText("");
         label.setContentDisplay(ContentDisplay.TOP);
         label.layout();
@@ -292,7 +302,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertNull(getContentBounds());
     }
 
-    @Test public void noGraphic_Text_TOP() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void noGraphic_Text_TOP(int graphicTextGap) {
+        setup(graphicTextGap);
         label.setText("Falcon");
         label.setContentDisplay(ContentDisplay.TOP);
         label.layout();
@@ -307,7 +320,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
     }
 
     /** */
-    @Test public void graphic_nullText_RIGHT() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void graphic_nullText_RIGHT(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         label.setGraphic(graphic);
         label.setText(null);
@@ -323,7 +339,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertEquals(contentBounds.getHeight(), graphicBounds.getHeight(), 0);
     }
 
-    @Test public void graphic_emptyText_RIGHT() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void graphic_emptyText_RIGHT(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         label.setGraphic(graphic);
         label.setText("");
@@ -339,7 +358,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertEquals(contentBounds.getHeight(), graphicBounds.getHeight(), 0);
     }
 
-    @Test public void graphic_Text_RIGHT() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void graphic_Text_RIGHT(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         label.setGraphic(graphic);
         label.setText("Falcon");
@@ -360,7 +382,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertCenteredVertically(contentBounds, textBounds);
     }
 
-    @Test public void unmanagedGraphic_nullText_RIGHT() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void unmanagedGraphic_nullText_RIGHT(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         graphic.setManaged(false);
         label.setGraphic(graphic);
@@ -371,7 +396,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertNull(getContentBounds());
     }
 
-    @Test public void unmanagedGraphic_emptyText_RIGHT() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void unmanagedGraphic_emptyText_RIGHT(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         graphic.setManaged(false);
         label.setGraphic(graphic);
@@ -382,7 +410,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertNull(getContentBounds());
     }
 
-    @Test public void unmanagedGraphic_Text_RIGHT() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void unmanagedGraphic_Text_RIGHT(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         graphic.setManaged(false);
         label.setGraphic(graphic);
@@ -399,7 +430,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertEquals(contentBounds.getHeight(), textBounds.getHeight(), 0);
     }
 
-    @Test public void noGraphic_nullText_RIGHT() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void noGraphic_nullText_RIGHT(int graphicTextGap) {
+        setup(graphicTextGap);
         label.setText(null);
         label.setContentDisplay(ContentDisplay.RIGHT);
         label.layout();
@@ -407,7 +441,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertNull(getContentBounds());
     }
 
-    @Test public void noGraphic_emptyText_RIGHT() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void noGraphic_emptyText_RIGHT(int graphicTextGap) {
+        setup(graphicTextGap);
         label.setText("");
         label.setContentDisplay(ContentDisplay.RIGHT);
         label.layout();
@@ -415,7 +452,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertNull(getContentBounds());
     }
 
-    @Test public void noGraphic_Text_RIGHT() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void noGraphic_Text_RIGHT(int graphicTextGap) {
+        setup(graphicTextGap);
         label.setText("Falcon");
         label.setContentDisplay(ContentDisplay.RIGHT);
         label.layout();
@@ -430,7 +470,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
     }
 
     /** */
-    @Test public void graphic_nullText_BOTTOM() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void graphic_nullText_BOTTOM(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         label.setGraphic(graphic);
         label.setText(null);
@@ -446,7 +489,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertEquals(contentBounds.getHeight(), graphicBounds.getHeight(), 0);
     }
 
-    @Test public void graphic_emptyText_BOTTOM() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void graphic_emptyText_BOTTOM(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         label.setGraphic(graphic);
         label.setText("");
@@ -462,7 +508,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertEquals(contentBounds.getHeight(), graphicBounds.getHeight(), 0);
     }
 
-    @Test public void graphic_Text_BOTTOM() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void graphic_Text_BOTTOM(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         label.setGraphic(graphic);
         label.setText("Falcon");
@@ -484,7 +533,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertCenteredHorizontally(contentBounds, textBounds);
     }
 
-    @Test public void unmanagedGraphic_nullText_BOTTOM() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void unmanagedGraphic_nullText_BOTTOM(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         graphic.setManaged(false);
         label.setGraphic(graphic);
@@ -495,7 +547,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertNull(getContentBounds());
     }
 
-    @Test public void unmanagedGraphic_emptyText_BOTTOM() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void unmanagedGraphic_emptyText_BOTTOM(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         graphic.setManaged(false);
         label.setGraphic(graphic);
@@ -506,7 +561,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertNull(getContentBounds());
     }
 
-    @Test public void unmanagedGraphic_Text_BOTTOM() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void unmanagedGraphic_Text_BOTTOM(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         graphic.setManaged(false);
         label.setGraphic(graphic);
@@ -523,7 +581,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertEquals(contentBounds.getHeight(), textBounds.getHeight(), 0);
     }
 
-    @Test public void noGraphic_nullText_BOTTOM() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void noGraphic_nullText_BOTTOM(int graphicTextGap) {
+        setup(graphicTextGap);
         label.setText(null);
         label.setContentDisplay(ContentDisplay.BOTTOM);
         label.layout();
@@ -531,7 +592,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertNull(getContentBounds());
     }
 
-    @Test public void noGraphic_emptyText_BOTTOM() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void noGraphic_emptyText_BOTTOM(int graphicTextGap) {
+        setup(graphicTextGap);
         label.setText("");
         label.setContentDisplay(ContentDisplay.BOTTOM);
         label.layout();
@@ -539,7 +603,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertNull(getContentBounds());
     }
 
-    @Test public void noGraphic_Text_BOTTOM() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void noGraphic_Text_BOTTOM(int graphicTextGap) {
+        setup(graphicTextGap);
         label.setText("Falcon");
         label.setContentDisplay(ContentDisplay.BOTTOM);
         label.layout();
@@ -554,7 +621,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
     }
 
     /** */
-    @Test public void graphic_nullText_LEFT() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void graphic_nullText_LEFT(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         label.setGraphic(graphic);
         label.setText(null);
@@ -570,7 +640,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertEquals(contentBounds.getHeight(), graphicBounds.getHeight(), 0);
     }
 
-    @Test public void graphic_emptyText_LEFT() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void graphic_emptyText_LEFT(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         label.setGraphic(graphic);
         label.setText("");
@@ -586,7 +659,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertEquals(contentBounds.getHeight(), graphicBounds.getHeight(), 0);
     }
 
-    @Test public void graphic_Text_LEFT() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void graphic_Text_LEFT(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         label.setGraphic(graphic);
         label.setText("Falcon");
@@ -607,7 +683,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertCenteredVertically(contentBounds, textBounds);
     }
 
-    @Test public void unmanagedGraphic_nullText_LEFT() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void unmanagedGraphic_nullText_LEFT(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         graphic.setManaged(false);
         label.setGraphic(graphic);
@@ -618,7 +697,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertNull(getContentBounds());
     }
 
-    @Test public void unmanagedGraphic_emptyText_LEFT() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void unmanagedGraphic_emptyText_LEFT(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         graphic.setManaged(false);
         label.setGraphic(graphic);
@@ -629,7 +711,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertNull(getContentBounds());
     }
 
-    @Test public void unmanagedGraphic_Text_LEFT() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void unmanagedGraphic_Text_LEFT(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         graphic.setManaged(false);
         label.setGraphic(graphic);
@@ -646,7 +731,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertEquals(contentBounds.getHeight(), textBounds.getHeight(), 0);
     }
 
-    @Test public void noGraphic_nullText_LEFT() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void noGraphic_nullText_LEFT(int graphicTextGap) {
+        setup(graphicTextGap);
         label.setText(null);
         label.setContentDisplay(ContentDisplay.LEFT);
         label.layout();
@@ -654,7 +742,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertNull(getContentBounds());
     }
 
-    @Test public void noGraphic_emptyText_LEFT() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void noGraphic_emptyText_LEFT(int graphicTextGap) {
+        setup(graphicTextGap);
         label.setText("");
         label.setContentDisplay(ContentDisplay.LEFT);
         label.layout();
@@ -662,7 +753,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertNull(getContentBounds());
     }
 
-    @Test public void noGraphic_Text_LEFT() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void noGraphic_Text_LEFT(int graphicTextGap) {
+        setup(graphicTextGap);
         label.setText("Falcon");
         label.setContentDisplay(ContentDisplay.LEFT);
         label.layout();
@@ -677,7 +771,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
     }
 
     /** */
-    @Test public void graphic_nullText_CENTER() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void graphic_nullText_CENTER(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         label.setGraphic(graphic);
         label.setText(null);
@@ -693,7 +790,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertEquals(contentBounds.getHeight(), graphicBounds.getHeight(), 0);
     }
 
-    @Test public void graphic_emptyText_CENTER() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void graphic_emptyText_CENTER(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         label.setGraphic(graphic);
         label.setText("");
@@ -709,7 +809,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertEquals(contentBounds.getHeight(), graphicBounds.getHeight(), 0);
     }
 
-    @Test public void graphic_Text_CENTER() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void graphic_Text_CENTER(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         label.setGraphic(graphic);
         label.setText("Falcon");
@@ -731,7 +834,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertCenteredHorizontally(contentBounds, textBounds);
     }
 
-    @Test public void unmanagedGraphic_nullText_CENTER() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void unmanagedGraphic_nullText_CENTER(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         graphic.setManaged(false);
         label.setGraphic(graphic);
@@ -742,7 +848,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertNull(getContentBounds());
     }
 
-    @Test public void unmanagedGraphic_emptyText_CENTER() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void unmanagedGraphic_emptyText_CENTER(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         graphic.setManaged(false);
         label.setGraphic(graphic);
@@ -753,7 +862,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertNull(getContentBounds());
     }
 
-    @Test public void unmanagedGraphic_Text_CENTER() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void unmanagedGraphic_Text_CENTER(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         graphic.setManaged(false);
         label.setGraphic(graphic);
@@ -770,7 +882,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertEquals(contentBounds.getHeight(), textBounds.getHeight(), 0);
     }
 
-    @Test public void noGraphic_nullText_CENTER() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void noGraphic_nullText_CENTER(int graphicTextGap) {
+        setup(graphicTextGap);
         label.setText(null);
         label.setContentDisplay(ContentDisplay.CENTER);
         label.layout();
@@ -778,7 +893,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertNull(getContentBounds());
     }
 
-    @Test public void noGraphic_emptyText_CENTER() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void noGraphic_emptyText_CENTER(int graphicTextGap) {
+        setup(graphicTextGap);
         label.setText("");
         label.setContentDisplay(ContentDisplay.CENTER);
         label.layout();
@@ -786,7 +904,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertNull(getContentBounds());
     }
 
-    @Test public void noGraphic_Text_CENTER() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void noGraphic_Text_CENTER(int graphicTextGap) {
+        setup(graphicTextGap);
         label.setText("Falcon");
         label.setContentDisplay(ContentDisplay.CENTER);
         label.layout();
@@ -801,7 +922,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
     }
 
     /** */
-    @Test public void graphic_nullText_GRAPHIC_ONLY() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void graphic_nullText_GRAPHIC_ONLY(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         label.setGraphic(graphic);
         label.setText(null);
@@ -817,7 +941,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertEquals(contentBounds.getHeight(), graphicBounds.getHeight(), 0);
     }
 
-    @Test public void graphic_emptyText_GRAPHIC_ONLY() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void graphic_emptyText_GRAPHIC_ONLY(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         label.setGraphic(graphic);
         label.setText("");
@@ -833,7 +960,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertEquals(contentBounds.getHeight(), graphicBounds.getHeight(), 0);
     }
 
-    @Test public void graphic_Text_GRAPHIC_ONLY() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void graphic_Text_GRAPHIC_ONLY(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         label.setGraphic(graphic);
         label.setText("Falcon");
@@ -849,7 +979,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertEquals(contentBounds.getHeight(), graphicBounds.getHeight(), 0);
     }
 
-    @Test public void unmanagedGraphic_nullText_GRAPHIC_ONLY() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void unmanagedGraphic_nullText_GRAPHIC_ONLY(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         graphic.setManaged(false);
         label.setGraphic(graphic);
@@ -860,7 +993,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertNull(getContentBounds());
     }
 
-    @Test public void unmanagedGraphic_emptyText_GRAPHIC_ONLY() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void unmanagedGraphic_emptyText_GRAPHIC_ONLY(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         graphic.setManaged(false);
         label.setGraphic(graphic);
@@ -871,7 +1007,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertNull(getContentBounds());
     }
 
-    @Test public void unmanagedGraphic_Text_GRAPHIC_ONLY() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void unmanagedGraphic_Text_GRAPHIC_ONLY(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         graphic.setManaged(false);
         label.setGraphic(graphic);
@@ -882,7 +1021,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertNull(getContentBounds());
     }
 
-    @Test public void noGraphic_nullText_GRAPHIC_ONLY() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void noGraphic_nullText_GRAPHIC_ONLY(int graphicTextGap) {
+        setup(graphicTextGap);
         label.setText(null);
         label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
         label.layout();
@@ -890,7 +1032,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertNull(getContentBounds());
     }
 
-    @Test public void noGraphic_emptyText_GRAPHIC_ONLY() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void noGraphic_emptyText_GRAPHIC_ONLY(int graphicTextGap) {
+        setup(graphicTextGap);
         label.setText("");
         label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
         label.layout();
@@ -898,7 +1043,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertNull(getContentBounds());
     }
 
-    @Test public void noGraphic_Text_GRAPHIC_ONLY() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void noGraphic_Text_GRAPHIC_ONLY(int graphicTextGap) {
+        setup(graphicTextGap);
         label.setText("Falcon");
         label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
         label.layout();
@@ -907,7 +1055,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
     }
 
     /** */
-    @Test public void graphic_nullText_TEXT_ONLY() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void graphic_nullText_TEXT_ONLY(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         label.setGraphic(graphic);
         label.setText(null);
@@ -917,7 +1068,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertNull(getContentBounds());
     }
 
-    @Test public void graphic_emptyText_TEXT_ONLY() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void graphic_emptyText_TEXT_ONLY(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         label.setGraphic(graphic);
         label.setText("");
@@ -927,7 +1081,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertNull(getContentBounds());
     }
 
-    @Test public void graphic_Text_TEXT_ONLY() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void graphic_Text_TEXT_ONLY(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         label.setGraphic(graphic);
         label.setText("Falcon");
@@ -943,7 +1100,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertEquals(contentBounds.getHeight(), textBounds.getHeight(), 0);
     }
 
-    @Test public void unmanagedGraphic_nullText_TEXT_ONLY() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void unmanagedGraphic_nullText_TEXT_ONLY(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         graphic.setManaged(false);
         label.setGraphic(graphic);
@@ -954,7 +1114,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertNull(getContentBounds());
     }
 
-    @Test public void unmanagedGraphic_emptyText_TEXT_ONLY() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void unmanagedGraphic_emptyText_TEXT_ONLY(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         graphic.setManaged(false);
         label.setGraphic(graphic);
@@ -965,7 +1128,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertNull(getContentBounds());
     }
 
-    @Test public void unmanagedGraphic_Text_TEXT_ONLY() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void unmanagedGraphic_Text_TEXT_ONLY(int graphicTextGap) {
+        setup(graphicTextGap);
         Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
         graphic.setManaged(false);
         label.setGraphic(graphic);
@@ -982,7 +1148,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertEquals(contentBounds.getHeight(), textBounds.getHeight(), 0);
     }
 
-    @Test public void noGraphic_nullText_TEXT_ONLY() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void noGraphic_nullText_TEXT_ONLY(int graphicTextGap) {
+        setup(graphicTextGap);
         label.setText(null);
         label.setContentDisplay(ContentDisplay.TEXT_ONLY);
         label.layout();
@@ -990,7 +1159,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertNull(getContentBounds());
     }
 
-    @Test public void noGraphic_emptyText_TEXT_ONLY() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void noGraphic_emptyText_TEXT_ONLY(int graphicTextGap) {
+        setup(graphicTextGap);
         label.setText("");
         label.setContentDisplay(ContentDisplay.TEXT_ONLY);
         label.layout();
@@ -998,7 +1170,10 @@ private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
         assertNull(getContentBounds());
     }
 
-    @Test public void noGraphic_Text_TEXT_ONLY() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void noGraphic_Text_TEXT_ONLY(int graphicTextGap) {
+        setup(graphicTextGap);
         label.setText("Falcon");
         label.setContentDisplay(ContentDisplay.TEXT_ONLY);
         label.layout();
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/LabelSkinTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/LabelSkinTest.java
index 934b7cfafe0..0aff216b3ab 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/LabelSkinTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/LabelSkinTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,15 +25,14 @@
 
 package test.javafx.scene.control.skin;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
-import com.sun.javafx.scene.control.skin.Utils;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.beans.value.ObservableValue;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
+import javafx.scene.Group;
+import javafx.scene.Scene;
 import javafx.scene.control.ContentDisplay;
 import javafx.scene.control.Label;
 import javafx.scene.control.OverrunStyle;
@@ -48,13 +47,12 @@
 import javafx.scene.text.Font;
 import javafx.scene.text.Text;
 import javafx.scene.text.TextAlignment;
-import com.sun.javafx.tk.Toolkit;
-import javafx.scene.Group;
-import javafx.scene.Scene;
 import javafx.stage.Stage;
-
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.scene.control.skin.Utils;
+import com.sun.javafx.tk.Toolkit;
+import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
 
 /**
  * Need to test:
@@ -66,7 +64,8 @@ public class LabelSkinTest {
     private LabelSkinMock skin;
     private Text text;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         label = new Label();
         skin = new LabelSkinMock(label);
         // Set some padding so that any places where padding was being
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/MenuBarSkinTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/MenuBarSkinTest.java
index 462229d9185..5347bb59791 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/MenuBarSkinTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/MenuBarSkinTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,19 +25,9 @@
 
 package test.javafx.scene.control.skin;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.List;
-
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import com.sun.javafx.menu.MenuBase;
-import com.sun.javafx.stage.WindowHelper;
-import com.sun.javafx.tk.Toolkit;
-
 import javafx.beans.value.ObservableValue;
 import javafx.geometry.Insets;
 import javafx.scene.Group;
@@ -49,6 +39,12 @@
 import javafx.scene.control.skin.MenuBarSkinShim;
 import javafx.scene.input.KeyCode;
 import javafx.stage.Stage;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.menu.MenuBase;
+import com.sun.javafx.stage.WindowHelper;
+import com.sun.javafx.tk.Toolkit;
 import test.com.sun.javafx.pgstub.StubToolkit;
 import test.com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
 
@@ -62,12 +58,13 @@ public class MenuBarSkinTest {
     private Scene scene;
     private Stage stage;
 
-
-    @BeforeClass public static void initToolKit() {
+    @BeforeAll
+    public static void initToolKit() {
         tk = Toolkit.getToolkit();
     }
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         menubar = new MenuBar();
         menubar.setUseSystemMenuBar(false);
         menubar.getMenus().addAll(new Menu("File"), new Menu("Edit"));
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/MenuButtonSkinBaseTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/MenuButtonSkinBaseTest.java
index 50840c55654..0c7b957250a 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/MenuButtonSkinBaseTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/MenuButtonSkinBaseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,8 @@
 
 package test.javafx.scene.control.skin;
 
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.scene.Scene;
@@ -37,13 +35,15 @@
 import javafx.scene.control.skin.MenuButtonSkinBase;
 import javafx.scene.input.Mnemonic;
 import javafx.stage.Stage;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class MenuButtonSkinBaseTest {
 
     private MenuButton menubutton;
     private MenuItem menuItem;
 
-    @Before
+    @BeforeEach
     public void setup() {
         menubutton = new MenuButton();
         menuItem = new MenuItem("Menu Item");
@@ -56,7 +56,7 @@ public void testNoNullPointerOnRemovingFromTheSceneWhilePopupIsShowing() {
         Thread.UncaughtExceptionHandler originalExceptionHandler = Thread.currentThread().getUncaughtExceptionHandler();
 
         Thread.currentThread().setUncaughtExceptionHandler((t, e) -> {
-            Assert.fail("No exception expected, but was a " + e);
+            fail("No exception expected, but was a " + e);
             e.printStackTrace();
         });
 
@@ -87,7 +87,7 @@ public void testMnemonicsRemovedOnRemovingFromTheSceneWhilePopupIsShowing() {
             public void addMnemonic(Mnemonic m) {
                 if (menuItemMnemonic.get() != null) {
                     // The test is designed for only one mnemonic.
-                    Assert.fail("Test failure: More than one Mnemonic registered.");
+                    fail("Test failure: More than one Mnemonic registered.");
                 }
                 menuItemMnemonic.set(m);
                 super.addMnemonic(m);
@@ -109,6 +109,6 @@ public void removeMnemonic(Mnemonic m) {
         menuItem.setOnAction(e -> scene.setRoot(new MenuButton()));
         menuItem.fire();
 
-        Assert.assertNull("Mnemonic was not removed from the scene,", menuItemMnemonic.get());
+        assertNull(menuItemMnemonic.get(), "Mnemonic was not removed from the scene,");
     }
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/MenuButtonSkinTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/MenuButtonSkinTest.java
index 20692c220f0..56c72f64be3 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/MenuButtonSkinTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/MenuButtonSkinTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,16 +25,14 @@
 
 package test.javafx.scene.control.skin;
 
-import static org.junit.Assert.assertEquals;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import javafx.beans.value.ObservableValue;
 import javafx.geometry.Insets;
 import javafx.scene.control.MenuButton;
 import javafx.scene.control.MenuItem;
-
 import javafx.scene.control.skin.MenuButtonSkin;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * This fails with IllegalStateException because of the toolkit's check for the FX application thread
@@ -43,7 +41,8 @@ public class MenuButtonSkinTest {
     private MenuButton menubutton;
     private MenuButtonSkinMock skin;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         menubutton = new MenuButton();
         menubutton.getItems().addAll(new MenuItem("Vanilla"), new MenuItem("Chocolate"));
         skin = new MenuButtonSkinMock(menubutton);
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ProgressBarSkinTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ProgressBarSkinTest.java
index 54184728ba6..f47e39108bc 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ProgressBarSkinTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ProgressBarSkinTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,16 +25,10 @@
 
 package test.javafx.scene.control.skin;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.lang.ref.WeakReference;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.sun.javafx.tk.Toolkit;
-
-import static org.junit.Assert.*;
-
 import javafx.beans.value.ObservableValue;
 import javafx.scene.Scene;
 import javafx.scene.control.ProgressBar;
@@ -43,6 +37,10 @@
 import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 import javafx.stage.Stage;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.tk.Toolkit;
 import test.com.sun.javafx.pgstub.StubToolkit;
 
 /**
@@ -54,7 +52,8 @@ public class ProgressBarSkinTest {
     private Stage stage;
     private StackPane root;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         progressbar = new ProgressBar();
         skin = new ProgressBarSkinMock(progressbar);
         progressbar.setSkin(skin);
@@ -72,7 +71,7 @@ private void initStage() {
         stage.setScene(scene);
     }
 
-    @After
+    @AfterEach
     public void cleanup() {
         if (stage != null) {
             stage.hide();
@@ -98,11 +97,9 @@ public void testWidthListener() {
         // fire to force layout
         Toolkit.getToolkit().firePulse();
 
-        assertEquals("progressbar fills root", root.getWidth(),
-                progressbar.getWidth(), 0.5);
+        assertEquals(root.getWidth(), progressbar.getWidth(), 0.5, "progressbar fills root");
         Region innerBar = (Region) progressbar.lookup(".bar");
-        assertEquals("inner bar width updated",
-                progressbar.getWidth() * progress, innerBar.getWidth(), 0.5);
+        assertEquals(progressbar.getWidth() * progress, innerBar.getWidth(), 0.5, "inner bar width updated");
     }
 
     WeakReference<Skin<?>> weakSkinRef;
@@ -114,7 +111,7 @@ public void testWidthListenerGC() {
         weakSkinRef = new WeakReference<>(progressbar.getSkin());
         progressbar.setSkin(null);
         attemptGC(10);
-        assertNull("skin must be gc'ed", weakSkinRef.get());
+        assertNull(weakSkinRef.get(), "skin must be gc'ed");
     }
 
     private void attemptGC(int n) {
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ProgressIndicatorSkinTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ProgressIndicatorSkinTest.java
index e6703879463..5e9cfe9a204 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ProgressIndicatorSkinTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ProgressIndicatorSkinTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,20 +25,18 @@
 
 package test.javafx.scene.control.skin;
 
-import static org.junit.Assert.assertEquals;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import javafx.beans.value.ObservableValue;
-import javafx.scene.control.ProgressIndicator;
 import javafx.scene.Group;
-import javafx.scene.paint.Color;
 import javafx.scene.Scene;
+import javafx.scene.control.ProgressIndicator;
 import javafx.scene.control.skin.ProgressIndicatorSkin;
 import javafx.scene.control.skin.ProgressIndicatorSkinShim;
+import javafx.scene.paint.Color;
 import javafx.scene.paint.Paint;
 import javafx.stage.Stage;
-
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  */
@@ -46,7 +44,8 @@ public class ProgressIndicatorSkinTest {
     private ProgressIndicator progressindicator;
     private ProgressIndicatorSkinMock skin;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         progressindicator = new ProgressIndicator();
         skin = new ProgressIndicatorSkinMock(progressindicator);
         progressindicator.setSkin(skin);
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/QueryAccessibleAttributeTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/QueryAccessibleAttributeTest.java
index 9fd0085b743..524c80705b2 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/QueryAccessibleAttributeTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/QueryAccessibleAttributeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,40 +24,30 @@
  */
 package test.javafx.scene.control.skin;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import java.util.Collection;
-import java.util.List;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 import javafx.scene.AccessibleAttribute;
 import javafx.scene.Node;
 import javafx.scene.control.Control;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import test.com.sun.javafx.scene.control.infrastructure.ControlSkinFactory;
 
 /**
  * Tests whether queryAccessibleAttribute() in every Control handles all of the
  * AccessibleAttribute values without throwing an exception.
  */
-@RunWith(Parameterized.class)
 public class QueryAccessibleAttributeTest {
-    private Class<Node> nodeClass;
     private Node node;
 
-    @Parameterized.Parameters
-    public static Collection<Object[]> nodesUnderTest() {
-        List<Class<Control>> cs = ControlSkinFactory.getControlClasses();
-        return ControlSkinFactory.asArrays(cs);
+    private static Collection<Class<Control>> parameters() {
+        return ControlSkinFactory.getControlClasses();
     }
 
-    public QueryAccessibleAttributeTest(Class<Node> nodeClass) {
-        this.nodeClass = nodeClass;
-    }
-
-    @Before
-    public void setup() {
+    // @BeforeEach
+    // junit5 does not support parameterized class-level tests yet
+    public void setup(Class<Node> nodeClass) {
         Thread.currentThread().setUncaughtExceptionHandler((thread, err) -> {
             if (err instanceof RuntimeException) {
                 throw (RuntimeException)err;
@@ -70,7 +60,7 @@ public void setup() {
         assertNotNull(node);
     }
 
-    @After
+    @AfterEach
     public void cleanup() {
         Thread.currentThread().setUncaughtExceptionHandler(null);
     }
@@ -83,8 +73,10 @@ protected static <T extends Node> T createNode(Class<T> controlClass) {
         }
     }
 
-    @Test
-    public void queryAllAttributes() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void queryAllAttributes(Class<Node> nodeClass) {
+        setup(nodeClass);
         for (AccessibleAttribute a: AccessibleAttribute.values()) {
             // should throw no exceptions
             Object val = node.queryAccessibleAttribute(a);
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/RadioButtonSkinTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/RadioButtonSkinTest.java
index d526b090bb5..f2712668fc3 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/RadioButtonSkinTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/RadioButtonSkinTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,15 +25,13 @@
 
 package test.javafx.scene.control.skin;
 
-import static org.junit.Assert.assertEquals;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import javafx.beans.value.ObservableValue;
 import javafx.geometry.Insets;
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.skin.RadioButtonSkin;
-
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  */
@@ -41,7 +39,8 @@ public class RadioButtonSkinTest {
     private RadioButton radiobutton;
     private RadioButtonSkinMock skin;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         radiobutton = new RadioButton("Test");
         skin = new RadioButtonSkinMock(radiobutton);
         // Set some padding so that any places where padding was being
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ScrollBarSkinTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ScrollBarSkinTest.java
index 15cd9f871ec..d0c2c38f83e 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ScrollBarSkinTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ScrollBarSkinTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,15 +25,13 @@
 
 package test.javafx.scene.control.skin;
 
-import static org.junit.Assert.assertEquals;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import javafx.beans.value.ObservableValue;
 import javafx.geometry.Orientation;
 import javafx.scene.control.ScrollBar;
 import javafx.scene.control.skin.ScrollBarSkin;
-
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  */
@@ -41,7 +39,8 @@ public class ScrollBarSkinTest {
     private ScrollBar scrollbar;
     private ScrollBarSkinMock skin;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         scrollbar = new ScrollBar();
         skin = new ScrollBarSkinMock(scrollbar);
         scrollbar.setSkin(skin);
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ScrollPaneSkinTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ScrollPaneSkinTest.java
index 4ac53fd70d7..81d2bbf9ffe 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ScrollPaneSkinTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ScrollPaneSkinTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,10 @@
 
 package test.javafx.scene.control.skin;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
-
 import javafx.beans.value.ObservableValue;
 import javafx.event.Event;
 import javafx.event.EventType;
@@ -54,21 +52,18 @@
 import javafx.scene.layout.VBox;
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import com.sun.javafx.tk.Toolkit;
-
 import test.util.memory.JMemoryBuddy;
 
-
 public class ScrollPaneSkinTest {
     private ScrollPane scrollPane;
     private ScrollPaneSkinMock skin;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         scrollPane = new ScrollPane();
         skin = new ScrollPaneSkinMock(scrollPane);
         scrollPane.setSkin(skin);
@@ -640,7 +635,7 @@ public void growW() {
     ** check if scrollPane content Horizontal position compensates for content size change
     ** ignored, as we do swipe through ScrollEvents.
     */
-    @Ignore
+    @Disabled
     @Test public void checkIfSwipeDownEventsChangeAnything() {
 
         scrolled = false;
@@ -700,7 +695,7 @@ public void growW() {
     ** check if scrollPane content Horizontal position compensates for content size change
     ** ignored, as we do swipe through ScrollEvents.
     */
-    @Ignore
+    @Disabled
     @Test public void checkIfSwipeRightEventsChangeAnything() {
 
         scrolled = false;
@@ -909,7 +904,7 @@ public void testScrollPaneObjLeakWhenUsedSameContent() {
         }
 
         // one instance is still held by the 'content' label
-        assertEquals("One instance should be held by the 'content' label", 1, ct);
+        assertEquals(1, ct, "One instance should be held by the 'content' label");
 
         // releasing the last instance
         content = null;
@@ -921,6 +916,6 @@ public void testScrollPaneObjLeakWhenUsedSameContent() {
                 ct++;
             }
         }
-        assertEquals(ct + " references of ScrollPane are not freed.", 0, ct);
+        assertEquals(0, ct, ct + " references of ScrollPane are not freed.");
     }
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/SeparatorSkinLayoutTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/SeparatorSkinLayoutTest.java
index 9213219bb99..9d92726bba7 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/SeparatorSkinLayoutTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/SeparatorSkinLayoutTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.javafx.scene.control.skin;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import javafx.geometry.Bounds;
 import javafx.geometry.HPos;
 import javafx.geometry.Insets;
@@ -35,9 +35,8 @@
 import javafx.scene.control.SkinBaseShim;
 import javafx.scene.control.skin.SeparatorSkin;
 import javafx.scene.layout.Region;
-
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  */
@@ -46,7 +45,8 @@ public class SeparatorSkinLayoutTest {
     private SeparatorSkin skin;
     private Region line;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         separator = new Separator();
         skin = new SeparatorSkin(separator);
         // Set some padding so that any places where padding was being
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/SeparatorSkinTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/SeparatorSkinTest.java
index 6bb483a1447..0177a8145d0 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/SeparatorSkinTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/SeparatorSkinTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,9 @@
 
 package test.javafx.scene.control.skin;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.beans.value.ObservableValue;
 import javafx.geometry.HPos;
 import javafx.geometry.Insets;
@@ -38,10 +37,9 @@
 import javafx.scene.control.SkinBaseShim;
 import javafx.scene.control.skin.SeparatorSkin;
 import javafx.scene.layout.Region;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
  */
@@ -50,7 +48,8 @@ public class SeparatorSkinTest {
     private SeparatorSkinMock skin;
     private Region line;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         separator = new Separator();
         skin = new SeparatorSkinMock(separator);
         // Set some padding so that any places where padding was being
@@ -136,7 +135,7 @@ public class SeparatorSkinTest {
                 separator.minWidth(-1), 0);
     }
 
-    @Ignore
+    @Disabled
     @Test public void minWidthWhenHorizontalShouldBePositiveNonZeroPlusPadding() {
         separator.setOrientation(Orientation.HORIZONTAL);
         final Insets linePadding = line.getInsets();
@@ -153,7 +152,7 @@ public class SeparatorSkinTest {
      *                                                                          *
      ***************************************************************************/
 
-    @Ignore
+    @Disabled
     @Test public void minHeightWhenVerticalShouldBePositiveNonZeroPlusPadding() {
         separator.setOrientation(Orientation.VERTICAL);
         final Insets linePadding = line.getInsets();
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/SkinCleanupTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/SkinCleanupTest.java
index 7b264b08551..2ecd0df38a5 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/SkinCleanupTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/SkinCleanupTest.java
@@ -40,13 +40,13 @@
 import static javafx.scene.control.skin.TextInputSkinShim.setHandlePressed;
 import static javafx.scene.layout.Region.USE_COMPUTED_SIZE;
 import static javafx.scene.layout.Region.USE_PREF_SIZE;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static test.com.sun.javafx.scene.control.infrastructure.ControlSkinFactory.attemptGC;
 import static test.com.sun.javafx.scene.control.infrastructure.ControlSkinFactory.replaceSkin;
 import static test.com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils.getCell;
@@ -99,10 +99,10 @@
 import javafx.scene.text.Font;
 import javafx.scene.text.Text;
 import javafx.stage.Stage;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import com.sun.javafx.tk.Toolkit;
 import test.com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils;
 import test.com.sun.javafx.scene.control.test.Person;
@@ -121,15 +121,16 @@ public class SkinCleanupTest {
     /**
      * Test access to fixedCellSize via lookup (not listener)
      */
-    @Ignore("JDK-8277000")
+    @Disabled("JDK-8277000")
     @Test
     public void testTreeTableRowFixedCellSizeListener() {
         TreeTableView<Person> tableView = createPersonTreeTable(false);
         showControl(tableView, true);
         TreeTableRow<?> tableRow = (TreeTableRow<?>) getCell(tableView, 1);
         TreeTableRowSkin<?> rowSkin = (TreeTableRowSkin<?>) tableRow.getSkin();
-        assertNull("row skin must not have listener to fixedCellSize",
-                unregisterChangeListeners(rowSkin, tableView.fixedCellSizeProperty()));
+        assertNull(
+                unregisterChangeListeners(rowSkin, tableView.fixedCellSizeProperty()),
+                "row skin must not have listener to fixedCellSize");
     }
 
     /**
@@ -144,7 +145,7 @@ public void testTreeTablePrefRowWidthFixedCellSize() {
                 .mapToDouble(col -> col.getWidth())
                 .sum();
         TreeTableRow<?> tableRow = (TreeTableRow<?>) VirtualFlowTestUtils.getCell(table, 2);
-        assertEquals("pref row width for fixed cell size", totalColumnWidth, tableRow.prefWidth(-1), .1);
+        assertEquals(totalColumnWidth, tableRow.prefWidth(-1), .1, "pref row width for fixed cell size");
     }
 
     /**
@@ -158,7 +159,7 @@ public void testTreeTablePrefRowTreeTable() {
                 .mapToDouble(col -> col.getWidth())
                 .sum();
         TreeTableRow<?> tableRow = (TreeTableRow<?>) VirtualFlowTestUtils.getCell(table, 2);
-        assertEquals("sanity: pref row witdh for not fixed cell size", totalColumnWidth, tableRow.prefWidth(-1), .1);
+        assertEquals(totalColumnWidth, tableRow.prefWidth(-1), .1, "sanity: pref row witdh for not fixed cell size");
     }
 
     /**
@@ -173,7 +174,7 @@ public void testTreeTableRowTreeColumnListenerReplaceSkin() {
         replaceSkin(tableRow);
         tableView.setTreeColumn(tableView.getColumns().get(1));
         // note: the actual update happens only in layout, test the marker here
-        assertTrue("dirty marker must have been set", isDirty(tableRow));
+        assertTrue(isDirty(tableRow), "dirty marker must have been set");
     }
 
     /**
@@ -186,7 +187,7 @@ public void testTreeTableRowTreeColumnListener() {
         TreeTableRow<?> tableRow = (TreeTableRow<?>) getCell(tableView, 1);
         tableView.setTreeColumn(tableView.getColumns().get(1));
         // note: the actual update happens only in layout, test the marker here
-        assertTrue("dirty marker must have been set", isDirty(tableRow));
+        assertTrue(isDirty(tableRow), "dirty marker must have been set");
     }
 
     @Test
@@ -228,7 +229,7 @@ public void testTreeTableRowFixedCellSizeReplaceSkin() {
         replaceSkin(tableRow);
         double fixed = 200;
         tableView.setFixedCellSize(fixed);
-        assertEquals("fixed cell size: ", fixed, tableRow.prefHeight(-1), 1);
+        assertEquals(fixed, tableRow.prefHeight(-1), 1, "fixed cell size: ");
     }
 
     /**
@@ -241,7 +242,7 @@ public void testTreeTableRowFixedCellSize() {
         TreeTableRow<?> tableRow = (TreeTableRow<?>) getCell(tableView, 1);
         double fixed = 200;
         tableView.setFixedCellSize(fixed);
-        assertEquals("fixed cell size: ", fixed, tableRow.prefHeight(-1), 1);
+        assertEquals(fixed, tableRow.prefHeight(-1), 1, "fixed cell size: ");
     }
 
     @Test
@@ -250,10 +251,10 @@ public void testTreeTableRowFixedCellSizeEnabledReplaceSkin() {
         showControl(tableView, true);
         TreeTableRow<?> tableRow = (TreeTableRow<?>) getCell(tableView, 1);
         replaceSkin(tableRow);
-        assertFalse("fixed cell size disabled initially", isFixedCellSizeEnabled(tableRow));
+        assertFalse(isFixedCellSizeEnabled(tableRow), "fixed cell size disabled initially");
         double fixed = 200;
         tableView.setFixedCellSize(fixed);
-        assertTrue("fixed cell size enabled", isFixedCellSizeEnabled(tableRow));
+        assertTrue(isFixedCellSizeEnabled(tableRow), "fixed cell size enabled");
     }
 
     /**
@@ -264,10 +265,10 @@ public void testTreeTableRowFixedCellSizeEnabled() {
         TreeTableView<Person> tableView = createPersonTreeTable(false);
         showControl(tableView, true);
         TreeTableRow<?> tableRow = (TreeTableRow<?>) getCell(tableView, 1);
-        assertFalse("fixed cell size disabled initially", isFixedCellSizeEnabled(tableRow));
+        assertFalse(isFixedCellSizeEnabled(tableRow), "fixed cell size disabled initially");
         double fixed = 200;
         tableView.setFixedCellSize(fixed);
-        assertTrue("fixed cell size enabled", isFixedCellSizeEnabled(tableRow));
+        assertTrue(isFixedCellSizeEnabled(tableRow), "fixed cell size enabled");
     }
 
     @Test
@@ -307,7 +308,7 @@ protected void checkFollowsWidth(Region owner, Region skin) {
         // since we are dealing with tree/tables with unconstrained resize policies,
         // the row skin may not follow the width exactly. we'll check that the width
         // simply changes.
-        assertTrue("TreeTableRowSkin must follow the VirtualFlow width", widthAfter < (widthBefore - 10));
+        assertTrue(widthAfter < (widthBefore - 10), "TreeTableRowSkin must follow the VirtualFlow width");
     }
 
     /**
@@ -364,7 +365,7 @@ public void testTreeTableRowVirtualFlow() {
     /**
      * Here we configure a tableRow with table and install the row's skin.
      */
-    @Ignore("JDK-8274065")
+    @Disabled("JDK-8274065")
     @Test
     public void testTreeTableRowVirtualFlowInstallSkin() {
         TreeTableRow<?> tableRow = createTreeTableRow(1);
@@ -383,13 +384,13 @@ public void testTreeTableRowWithGraphicMemoryLeak() {
         WeakReference<?> weakRef = new WeakReference<>(replaceSkin(tableRow));
         assertNotNull(weakRef.get());
         attemptGC(weakRef);
-        assertEquals("Skin must be gc'ed", null, weakRef.get());
+        assertEquals(null, weakRef.get(), "Skin must be gc'ed");
     }
 
     /**
      * Fails in install skin NPE
      */
-    @Ignore("JDK-8274065")
+    @Disabled("JDK-8274065")
     @Test
     public void testTreeTableRowWithGraphicMemoryLeakInstallSkin() {
         TreeTableRow<?> tableRow = createTreeTableRow(1);
@@ -398,7 +399,7 @@ public void testTreeTableRowWithGraphicMemoryLeakInstallSkin() {
         WeakReference<?> weakRef = new WeakReference<>(replaceSkin(tableRow));
         assertNotNull(weakRef.get());
         attemptGC(weakRef);
-        assertEquals("Skin must be gc'ed", null, weakRef.get());
+        assertEquals(null, weakRef.get(), "Skin must be gc'ed");
     }
 
 
@@ -414,7 +415,7 @@ public void testTreeTableRowLeafColumnsListenerReplaceSkin() {
         TreeTableRow<?> tableRow = (TreeTableRow<?>) getCell(tableView, 1);
         replaceSkin(tableRow);
         tableView.getColumns().get(0).setVisible(false);
-        assertTrue("dirty marker must have been set", isDirty(tableRow));
+        assertTrue(isDirty(tableRow), "dirty marker must have been set");
     }
 
     /**
@@ -426,7 +427,7 @@ public void testTreeTableRowLeafColumnsListener() {
         showControl(tableView, true);
         TreeTableRow<?> tableRow = (TreeTableRow<?>) getCell(tableView, 1);
         tableView.getColumns().get(0).setVisible(false);
-        assertTrue("dirty marker must have been set", isDirty(tableRow));
+        assertTrue(isDirty(tableRow), "dirty marker must have been set");
     }
 
     /**
@@ -443,7 +444,7 @@ public void testTreeTableRowItemListenerReplaceSkin() {
         tableRow.updateIndex(index);
         List<IndexedCell<?>> cells = getCells(tableRow);
         assertEquals(tableView.getVisibleLeafColumns().size(), cells.size());
-        assertEquals("cell index must be updated", index, cells.get(0).getIndex());
+        assertEquals(index, cells.get(0).getIndex(), "cell index must be updated");
     }
 
     /**
@@ -459,7 +460,7 @@ public void testTreeTableRowItemListener() {
         tableRow.updateIndex(index);
         List<IndexedCell<?>> cells = getCells(tableRow);
         assertEquals(tableView.getVisibleLeafColumns().size(), cells.size());
-        assertEquals("cell index must be updated", index, cells.get(0).getIndex());
+        assertEquals(index, cells.get(0).getIndex(), "cell index must be updated");
    }
 
 
@@ -516,7 +517,7 @@ private TreeTableRow<?> createTreeTableRow(int index) {
         // note: must updateTable before updateIndex
         tableRow.updateTreeTableView(table);
         tableRow.updateIndex(index);
-        assertFalse("sanity: row must not be empty at index: " + index, tableRow.isEmpty());
+        assertFalse(tableRow.isEmpty(), "sanity: row must not be empty at index: " + index);
         return tableRow;
     }
 
@@ -549,15 +550,16 @@ private TreeTableView<Person> createPersonTreeTable(boolean installSkin) {
     /**
      * Test access to fixedCellSize via lookup (not listener)
      */
-    @Ignore("JDK-8277000")
+    @Disabled("JDK-8277000")
     @Test
     public void testTableRowFixedCellSizeListener() {
         TableView<Person> tableView = createPersonTable(false);
         showControl(tableView, true);
         TableRow<?> tableRow = (TableRow<?>) getCell(tableView, 1);
         TableRowSkin<?> rowSkin = (TableRowSkin<?>) tableRow.getSkin();
-        assertNull("row skin must not have listener to fixedCellSize",
-                unregisterChangeListeners(rowSkin, tableView.fixedCellSizeProperty()));
+        assertNull(
+                unregisterChangeListeners(rowSkin, tableView.fixedCellSizeProperty()),
+                "row skin must not have listener to fixedCellSize");
     }
 
     /**
@@ -572,7 +574,7 @@ public void testTablePrefRowWidthFixedCellSize() {
                 .mapToDouble(col -> col.getWidth())
                 .sum();
         TableRow<?> tableRow = (TableRow<?>) VirtualFlowTestUtils.getCell(table, 2);
-        assertEquals("pref row width for fixed cell size", totalColumnWidth, tableRow.prefWidth(-1), .1);
+        assertEquals(totalColumnWidth, tableRow.prefWidth(-1), .1, "pref row width for fixed cell size");
     }
 
     /**
@@ -586,7 +588,7 @@ public void testTablePrefRowWidth() {
                 .mapToDouble(col -> col.getWidth())
                 .sum();
         TableRow<?> tableRow = (TableRow<?>) VirtualFlowTestUtils.getCell(table, 2);
-        assertEquals("sanity: pref row witdh for not fixed cell size", totalColumnWidth, tableRow.prefWidth(-1), .1);
+        assertEquals(totalColumnWidth, tableRow.prefWidth(-1), .1, "sanity: pref row witdh for not fixed cell size");
     }
 
     @Test
@@ -597,7 +599,7 @@ public void testTableRowFixedCellSizeReplaceSkin() {
         replaceSkin(tableRow);
         double fixed = 200;
         tableView.setFixedCellSize(fixed);
-        assertEquals("fixed cell size: ", fixed, tableRow.prefHeight(-1), 1);
+        assertEquals(fixed, tableRow.prefHeight(-1), 1, "fixed cell size: ");
     }
 
     /**
@@ -610,7 +612,7 @@ public void testTableRowFixedCellSize() {
         TableRow<?> tableRow = (TableRow<?>) getCell(tableView, 1);
         double fixed = 200;
         tableView.setFixedCellSize(fixed);
-        assertEquals("fixed cell size: ", fixed, tableRow.prefHeight(-1), 1);
+        assertEquals(fixed, tableRow.prefHeight(-1), 1, "fixed cell size: ");
     }
 
     @Test
@@ -619,10 +621,10 @@ public void testTableRowFixedCellSizeEnabledReplaceSkin() {
         showControl(tableView, true);
         TableRow<?> tableRow = (TableRow<?>) getCell(tableView, 1);
         replaceSkin(tableRow);
-        assertFalse("fixed cell size disabled initially", isFixedCellSizeEnabled(tableRow));
+        assertFalse(isFixedCellSizeEnabled(tableRow), "fixed cell size disabled initially");
         double fixed = 200;
         tableView.setFixedCellSize(fixed);
-        assertTrue("fixed cell size enabled", isFixedCellSizeEnabled(tableRow));
+        assertTrue(isFixedCellSizeEnabled(tableRow), "fixed cell size enabled");
     }
 
     /**
@@ -633,10 +635,10 @@ public void testTableRowFixedCellSizeEnabled() {
         TableView<Person> tableView = createPersonTable(false);
         showControl(tableView, true);
         TableRow<?> tableRow = (TableRow<?>) getCell(tableView, 1);
-        assertFalse("fixed cell size disabled initially", isFixedCellSizeEnabled(tableRow));
+        assertFalse(isFixedCellSizeEnabled(tableRow), "fixed cell size disabled initially");
         double fixed = 200;
         tableView.setFixedCellSize(fixed);
-        assertTrue("fixed cell size enabled", isFixedCellSizeEnabled(tableRow));
+        assertTrue(isFixedCellSizeEnabled(tableRow), "fixed cell size enabled");
     }
 
     @Test
@@ -648,8 +650,9 @@ public void testTableRowVirtualFlowWidthListenerReplaceSkin() {
         replaceSkin(tableRow);
         Toolkit.getToolkit().firePulse();
         TableRowSkin<?> rowSkin = (TableRowSkin<?>) tableRow.getSkin();
-        assertNotNull("row skin must have listener to virtualFlow width",
-                unregisterChangeListeners(rowSkin, flow.widthProperty()));
+        assertNotNull(
+                unregisterChangeListeners(rowSkin, flow.widthProperty()),
+                "row skin must have listener to virtualFlow width");
     }
 
     /**
@@ -662,8 +665,9 @@ public void testTableRowVirtualFlowWidthListener() {
         VirtualFlow<?> flow = getVirtualFlow(tableView);
         TableRow<?> tableRow = (TableRow<?>) getCell(tableView, 1);
         TableRowSkin<?> rowSkin = (TableRowSkin<?>) tableRow.getSkin();
-        assertNotNull("row skin must have listener to virtualFlow width",
-                unregisterChangeListeners(rowSkin, flow.widthProperty()));
+        assertNotNull(
+                unregisterChangeListeners(rowSkin, flow.widthProperty()),
+                "row skin must have listener to virtualFlow width");
     }
 
     /**
@@ -722,7 +726,7 @@ public void testTableRowVirtualFlow() {
     /**
      * Here we configure a tableRow with table and install the row's skin.
      */
-    @Ignore("JDK-8274065")
+    @Disabled("JDK-8274065")
     @Test
     public void testTableRowVirtualFlowInstallSkin() {
         TableRow<?> tableRow = createTableRow(0);
@@ -746,7 +750,7 @@ public void testTableRowLeafColumnsListenerReplaceSkin() {
         replaceSkin(tableRow);
         tableView.getColumns().get(0).setVisible(false);
         // note: the actual update happens only in layout, test the marker here
-        assertTrue("dirty marker must have been set", isDirty(tableRow));
+        assertTrue(isDirty(tableRow), "dirty marker must have been set");
     }
 
     /**
@@ -759,7 +763,7 @@ public void testTableRowLeafColumnsListener() {
         TableRow<?> tableRow = (TableRow<?>) getCell(tableView, 1);
         tableView.getColumns().get(0).setVisible(false);
         // note: the actual update happens only in layout, test the marker here
-        assertTrue("dirty marker must have been set", isDirty(tableRow));
+        assertTrue(isDirty(tableRow), "dirty marker must have been set");
     }
 
     /**
@@ -776,7 +780,7 @@ public void testTableRowItemListenerReplaceSkin() {
         tableRow.updateIndex(index);
         List<IndexedCell<?>> cells = getCells(tableRow);
         assertEquals(tableView.getVisibleLeafColumns().size(), cells.size());
-        assertEquals("cell index must be updated", index, cells.get(0).getIndex());
+        assertEquals(index, cells.get(0).getIndex(), "cell index must be updated");
     }
 
     /**
@@ -793,7 +797,7 @@ public void testTableRowItemListener() {
         Toolkit.getToolkit().firePulse();
         List<IndexedCell<?>> cells = getCells(tableRow);
         assertEquals(tableView.getVisibleLeafColumns().size(), cells.size());
-        assertEquals("cell index must be updated", index, cells.get(0).getIndex());
+        assertEquals(index, cells.get(0).getIndex(), "cell index must be updated");
    }
 
 //-------------- helpers for TableRow tests
@@ -852,7 +856,7 @@ private TableRow<?> createTableRow(int index) {
         // note: must updateTable before updateIndex
         tableRow.updateTableView(table);
         tableRow.updateIndex(index);
-        assertFalse("sanity: row must not be empty at index: " + index, tableRow.isEmpty());
+        assertFalse(tableRow.isEmpty(), "sanity: row must not be empty at index: " + index);
         return tableRow;
     }
 
@@ -887,11 +891,11 @@ public void testScrollEventFilter() {
         ScrollEvent scrollEvent = new ScrollEvent(ScrollEvent.ANY, 0, 0, 0, 0, false, false, false, false,
                 true, // direct
                 false, 0, 0, 0, USE_PREF_SIZE, null, USE_COMPUTED_SIZE, null, 0, 0, null);
-        assertTrue("sanity: created a fake direct event", scrollEvent.isDirect());
+        assertTrue(scrollEvent.isDirect(), "sanity: created a fake direct event");
         // must use copy to detect change in consume
         ScrollEvent copy = scrollEvent.copyFor(area, area);
         Event.fireEvent(area, copy);
-        assertTrue("scrollEvent must be consumed", copy.isConsumed());
+        assertTrue(copy.isConsumed(), "scrollEvent must be consumed");
     }
 
     /**
@@ -905,9 +909,9 @@ public void testTextAreaSelectUpdate() {
         area.selectAll();
         textNode.getParent().getParent().layout();
         int end = area.getLength();
-        assertEquals("sanity: area caret moved to end", end, area.getCaretPosition());
-        assertEquals("sanity: area selection updated", end, area.getSelection().getEnd());
-        assertEquals("textNode end", end, textNode.getSelectionEnd());
+        assertEquals(end, area.getCaretPosition(), "sanity: area caret moved to end");
+        assertEquals(end, area.getSelection().getEnd(), "sanity: area selection updated");
+        assertEquals(end, textNode.getSelectionEnd(), "textNode end");
     }
 
     /**
@@ -931,7 +935,7 @@ public void testTextAreaSetWrapUpdate() {
     public void testTextAreaSetColumnCount() {
         TextArea area = new TextArea("some text");
         int prefColumn = area.getPrefColumnCount();
-        assertEquals("sanity: initial count", TextArea.DEFAULT_PREF_COLUMN_COUNT, prefColumn);
+        assertEquals(TextArea.DEFAULT_PREF_COLUMN_COUNT, prefColumn, "sanity: initial count");
         installDefaultSkin(area);
         replaceSkin(area);
         area.setPrefColumnCount(prefColumn * 2);
@@ -944,12 +948,12 @@ public void testTextAreaSetColumnCount() {
     public void testTextAreaSetColumnCountUpdate() {
         TextArea area = new TextArea("some text");
         int prefColumn = area.getPrefColumnCount();
-        assertEquals("sanity: initial count", TextArea.DEFAULT_PREF_COLUMN_COUNT, prefColumn);
+        assertEquals(TextArea.DEFAULT_PREF_COLUMN_COUNT, prefColumn, "sanity: initial count");
         installDefaultSkin(area);
         ScrollPane scrollPane = getScrollPane(area);
         double prefViewportWidth = scrollPane.getPrefViewportWidth();
         area.setPrefColumnCount(prefColumn * 2);
-        assertEquals("prefViewportWidth must be updated", prefViewportWidth * 2, scrollPane.getPrefViewportWidth(), 1);
+        assertEquals(prefViewportWidth * 2, scrollPane.getPrefViewportWidth(), 1, "prefViewportWidth must be updated");
     }
 
     /**
@@ -971,12 +975,12 @@ public void testTextAreaSetRowCount() {
     public void testTextAreaSetRowCountUpdate() {
         TextArea area = new TextArea("some text");
         int prefRows = area.getPrefRowCount();
-        assertEquals("sanity: initial row count", TextArea.DEFAULT_PREF_ROW_COUNT, prefRows);
+        assertEquals(TextArea.DEFAULT_PREF_ROW_COUNT, prefRows, "sanity: initial row count");
         installDefaultSkin(area);
         ScrollPane scrollPane = getScrollPane(area);
         double prefViewportHeight = scrollPane.getPrefViewportHeight();
         area.setPrefRowCount(prefRows * 2);
-        assertEquals("prefViewportHeight must be updated", prefViewportHeight * 2, scrollPane.getPrefViewportHeight(), 1);
+        assertEquals(prefViewportHeight * 2, scrollPane.getPrefViewportHeight(), 1, "prefViewportHeight must be updated");
     }
 
     /**
@@ -988,7 +992,7 @@ public void testTextAreaSetTextUpdate() {
         TextArea area = new TextArea(initial);
         installDefaultSkin(area);
         Text textNode = getTextNode(area);
-        assertEquals("sanity initial text sync'ed to textNode", initial, textNode.getText());
+        assertEquals(initial, textNode.getText(), "sanity initial text sync'ed to textNode");
         String replaced = "replaced text";
         area.setText(replaced);
         assertEquals(replaced, textNode.getText());
@@ -1012,9 +1016,9 @@ public void testTextAreaPrompt() {
     public void testTextAreaPromptUpdate() {
         TextArea area = new TextArea();
         installDefaultSkin(area);
-        assertNull("sanity: default prompt is null", getPromptNode(area));
+        assertNull(getPromptNode(area), "sanity: default prompt is null");
         area.setPromptText("prompt");
-        assertNotNull("prompt node must be created", getPromptNode(area));
+        assertNotNull(getPromptNode(area), "prompt node must be created");
     }
 
     @Test
@@ -1023,7 +1027,7 @@ public void testTextAreaChildren() {
         installDefaultSkin(area);
         int children = area.getChildrenUnmodifiable().size();
         replaceSkin(area);
-        assertEquals("children size must be unchanged: ", children, area.getChildrenUnmodifiable().size());
+        assertEquals(children, area.getChildrenUnmodifiable().size(), "children size must be unchanged: ");
     }
 
     /**
@@ -1048,8 +1052,8 @@ public void testTextAreaSetScrollLeftUpdate() {
         double scrollLeft = 500;
         area.setScrollLeft(scrollLeft);
         Toolkit.getToolkit().firePulse();
-        assertEquals("sanity: scrollLeft updated", scrollLeft, area.getScrollLeft(), 0.1);
-        assertTrue("scrollPane hValue > 0", scrollPane.getHvalue() > 0.0);
+        assertEquals(scrollLeft, area.getScrollLeft(), 0.1, "sanity: scrollLeft updated");
+        assertTrue(scrollPane.getHvalue() > 0.0, "scrollPane hValue > 0");
     }
 
     /**
@@ -1067,7 +1071,7 @@ public void testTextAreaSetScrollTop() {
     /**
      * Sanity: change of scrollTop must update scrollPane's vValue.
      */
-    @Ignore("8272082")
+    @Disabled("8272082")
     @Test
     public void testTextAreaSetScrollTopUpdate() {
         TextArea area = new TextArea(LOREM_IPSUM + LOREM_IPSUM);
@@ -1077,8 +1081,8 @@ public void testTextAreaSetScrollTopUpdate() {
         double scrollTop = 100;
         area.setScrollTop(scrollTop);
         Toolkit.getToolkit().firePulse();
-        assertEquals("sanity: scrollTop updated", scrollTop, area.getScrollTop(), 0.1);
-        assertTrue("scrollPane vValue > 0", scrollPane.getVvalue() > 0.0);
+        assertEquals(scrollTop, area.getScrollTop(), 0.1, "sanity: scrollTop updated");
+        assertTrue(scrollPane.getVvalue() > 0.0, "scrollPane vValue > 0");
     }
 
     public static final String LOREM_IPSUM = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, "
@@ -1113,7 +1117,7 @@ public void testTextFieldCaretPositionUpdate() {
         showControl(field, true);
         Text textNode = getTextNode(field);
         field.positionCaret(2);
-        assertEquals("textNode caret", field.getCaretPosition(), textNode.getCaretPosition());
+        assertEquals(field.getCaretPosition(), textNode.getCaretPosition(), "textNode caret");
     }
 
     /**
@@ -1137,9 +1141,9 @@ public void testTextFieldSelectionUpdate() {
         Text textNode = getTextNode(field);
         field.selectAll();
         int end = field.getLength();
-        assertEquals("sanity: field caret moved to end", end, field.getCaretPosition());
-        assertEquals("sanity: field selection updated", end, field.getSelection().getEnd());
-        assertEquals("textNode end", end, textNode.getSelectionEnd());
+        assertEquals(end, field.getCaretPosition(), "sanity: field caret moved to end");
+        assertEquals(end, field.getSelection().getEnd(), "sanity: field selection updated");
+        assertEquals(end, textNode.getSelectionEnd(), "textNode end");
     }
 
     /**
@@ -1190,13 +1194,13 @@ public void testTextFieldAlignmentUpdate() {
         // field to test: start with left, then change to right align while showing
         TextField field = new TextField("dummy");
         field.setPrefColumnCount(50);
-        assertEquals("sanity: ", Pos.CENTER_LEFT, field.getAlignment());
+        assertEquals(Pos.CENTER_LEFT, field.getAlignment(), "sanity: ");
         showControl(field, true);
         Toolkit.getToolkit().firePulse();
         double textTranslate = getTextTranslateX(field);
-        assertEquals("sanity:", 0, textTranslate, 1);
+        assertEquals(0, textTranslate, 1, "sanity:");
         field.setAlignment(Pos.CENTER_RIGHT);
-        assertEquals("translateX must be updated", rightTranslate, getTextTranslateX(field), 1);
+        assertEquals(rightTranslate, getTextTranslateX(field), 1, "translateX must be updated");
     }
 
     /**
@@ -1217,9 +1221,9 @@ public void testTextFieldPrompt() {
     public void testTextFieldPromptUpdate() {
         TextField field = new TextField();
         installDefaultSkin(field);
-        assertNull("sanity: default prompt is null", getPromptNode(field));
+        assertNull(getPromptNode(field), "sanity: default prompt is null");
         field.setPromptText("prompt");
-        assertNotNull("prompt node must be created", getPromptNode(field));
+        assertNotNull(getPromptNode(field), "prompt node must be created");
     }
 
     @Test
@@ -1228,7 +1232,7 @@ public void testTextFieldChildren() {
         installDefaultSkin(field);
         int children = field.getChildrenUnmodifiable().size();
         replaceSkin(field);
-        assertEquals("children size must be unchanged: ", children, field.getChildrenUnmodifiable().size());
+        assertEquals(children, field.getChildrenUnmodifiable().size(), "children size must be unchanged: ");
     }
 
 //--------------- TextInputControl
@@ -1245,7 +1249,7 @@ public void testTextInputMethodRequests() {
         field.selectRange(2, 5);
         String selected = field.getSelectedText();
         installDefaultSkin(field);
-        assertEquals("sanity: skin has set requests", selected, field.getInputMethodRequests().getSelectedText());
+        assertEquals(selected, field.getInputMethodRequests().getSelectedText(), "sanity: skin has set requests");
         field.getSkin().dispose();
         if (field.getInputMethodRequests() != null) {
             assertEquals(selected, field.getInputMethodRequests().getSelectedText());
@@ -1258,7 +1262,7 @@ public void testTextInputOnInputMethodTextChangedNoHandler() {
         field.setOnInputMethodTextChanged(null);
         installDefaultSkin(field);
         field.getSkin().dispose();
-        assertNull("skin dispose must remove handler it has installed", field.getOnInputMethodTextChanged());
+        assertNull(field.getOnInputMethodTextChanged(), "skin dispose must remove handler it has installed");
     }
 
     @Test
@@ -1267,10 +1271,11 @@ public void testTextInputOnInputMethodTextChangedWithHandler() {
         EventHandler<? super InputMethodEvent> handler = e -> {};
         field.setOnInputMethodTextChanged(handler);
         installDefaultSkin(field);
-        assertSame("sanity: skin must not replace handler", handler, field.getOnInputMethodTextChanged());
+        assertSame(handler, field.getOnInputMethodTextChanged(), "sanity: skin must not replace handler");
         field.getSkin().dispose();
-        assertSame("skin dispose must not remove handler that was installed by control",
-                handler, field.getOnInputMethodTextChanged());
+        assertSame(
+                handler, field.getOnInputMethodTextChanged(),
+                "skin dispose must not remove handler that was installed by control");
     }
 
     /**
@@ -1284,8 +1289,9 @@ public void testTextInputOnInputMethodTextChangedReplacedHandler() {
         EventHandler<? super InputMethodEvent> handler = e -> {};
         field.setOnInputMethodTextChanged(handler);
         field.getSkin().dispose();
-        assertSame("skin dispose must not remove handler that was installed by control",
-                handler, field.getOnInputMethodTextChanged());
+        assertSame(
+                handler, field.getOnInputMethodTextChanged(),
+                "skin dispose must not remove handler that was installed by control");
     }
 
     /**
@@ -1301,10 +1307,10 @@ public void testTextInputOnInputMethodTextChangedEvent() {
         InputMethodEvent event = new InputMethodEvent(InputMethodEvent.INPUT_METHOD_TEXT_CHANGED,
                 List.of(), prefix, 0);
         Event.fireEvent(field, event);
-        assertEquals("sanity: prefix must be committed", prefix + initialText, field.getText());
+        assertEquals(prefix + initialText, field.getText(), "sanity: prefix must be committed");
         replaceSkin(field);
         Event.fireEvent(field, event);
-        assertEquals(" prefix must be committed again", prefix + prefix + initialText, field.getText());
+        assertEquals(prefix + prefix + initialText, field.getText(), " prefix must be committed again");
     }
 
     /**
@@ -1322,8 +1328,8 @@ public void testTextInputUserOnInputMethodTextChangedHandler() {
 
         replaceSkin(field);
 
-        assertSame("user handler must not be changed", h, handler);
-        assertSame("replaced skin must not change handler", handler, field.getOnInputMethodTextChanged());
+        assertSame(h, handler, "user handler must not be changed");
+        assertSame(handler, field.getOnInputMethodTextChanged(), "replaced skin must not change handler");
     }
 
     /**
@@ -1338,7 +1344,7 @@ public void testTextInput_InputMethodRequestsIsResetOnReplacingSkin() {
         replaceSkin(t);
         InputMethodRequests im2 = t.getInputMethodRequests();
 
-        assertNotEquals("InputMethodRequests set by an old skin must be replaced by the new skin", im, im2);
+        assertNotEquals(im, im2, "InputMethodRequests set by an old skin must be replaced by the new skin");
     }
 
     /**
@@ -1352,24 +1358,24 @@ public void testTextInput_BothIME() {
         InputMethodRequests mr1 = t.getInputMethodRequests();
         EventHandler<? super InputMethodEvent> tc1 = t.getOnInputMethodTextChanged();
 
-        assertNotNull("InputMethodRequests must be set by a skin", mr1);
-        assertNotNull("onInputMethodTextChanged must be set by a skin", tc1);
+        assertNotNull(mr1, "InputMethodRequests must be set by a skin");
+        assertNotNull(tc1, "onInputMethodTextChanged must be set by a skin");
 
         replaceSkin(t);
         InputMethodRequests mr2 = t.getInputMethodRequests();
         EventHandler<? super InputMethodEvent> tc2 = t.getOnInputMethodTextChanged();
 
-        assertNotNull("InputMethodRequests must be set by a skin 2", mr2);
-        assertNotNull("onInputMethodTextChanged must be set by a skin 2", tc2);
+        assertNotNull(mr2, "InputMethodRequests must be set by a skin 2");
+        assertNotNull(tc2, "onInputMethodTextChanged must be set by a skin 2");
 
-        assertNotEquals("InputMethodRequests set by an old skin must be replaced by the new skin", mr1, mr2);
-        assertNotEquals("onInputMethodTextChanged set by an old skin must be replaced by the new skin", tc1, tc2);
+        assertNotEquals(mr1, mr2, "InputMethodRequests set by an old skin must be replaced by the new skin");
+        assertNotEquals(tc1, tc2, "onInputMethodTextChanged set by an old skin must be replaced by the new skin");
 
         t.setSkin(null);
         InputMethodRequests mr3 = t.getInputMethodRequests();
         EventHandler<? super InputMethodEvent> tc3 = t.getOnInputMethodTextChanged();
-        assertNull("InputMethodRequests must be cleared by uninstalling a skin", mr3);
-        assertNull("onInputMethodTextChanged must be cleared by uninstalling a skin", tc3);
+        assertNull(mr3, "InputMethodRequests must be cleared by uninstalling a skin");
+        assertNull(tc3, "onInputMethodTextChanged must be cleared by uninstalling a skin");
     }
 
     /**
@@ -1381,7 +1387,7 @@ public void testTextInput_UserMethodRequestsNotAffectedBySkin() {
         TextField t = new TextField();
         t.setInputMethodRequests(im);
         installDefaultSkin(t);
-        assertEquals("skin must not alter user-set InputMethodRequests", im, t.getInputMethodRequests());
+        assertEquals(im, t.getInputMethodRequests(), "skin must not alter user-set InputMethodRequests");
     }
 
     protected static InputMethodRequests createInputMethodRequests() {
@@ -1465,7 +1471,7 @@ public void testMemoryLeakAlternativeSkinWithRoot() {
         WeakReference<?> weakRef = new WeakReference<>(replaceSkin(treeView));
         assertNotNull(weakRef.get());
         attemptGC(weakRef);
-        assertEquals("Skin must be gc'ed", null, weakRef.get());
+        assertEquals(null, weakRef.get(), "Skin must be gc'ed");
     }
 
     /**
@@ -1500,9 +1506,10 @@ public void testTreeCellPrefHeightOnReplaceTreeView() {
         TreeView<Object> treeView = new TreeView<>();
         treeView.setFixedCellSize(100);
         cell.updateTreeView(treeView);
-        assertEquals("fixed cell set to value of new treeView",
+        assertEquals(
                 cell.getTreeView().getFixedCellSize(),
-                cell.prefHeight(-1), 1);
+                cell.prefHeight(-1), 1,
+                "fixed cell set to value of new treeView");
     }
 
 // ------------------ ListCell
@@ -1526,9 +1533,10 @@ public void testListCellPrefHeightOnReplaceListView() {
        ListView<Object> listView = new ListView<>();
        listView.setFixedCellSize(100);
        cell.updateListView(listView);
-       assertEquals("fixed cell set to value of new listView",
+       assertEquals(
                cell.getListView().getFixedCellSize(),
-               cell.prefHeight(-1), 1);
+               cell.prefHeight(-1), 1,
+               "fixed cell set to value of new listView");
    }
 
   //-------------- listView
@@ -1602,7 +1610,7 @@ public void testToolBarFocus() {
         Button outside = new Button("outside");
         showControl(outside, true);
         bar.requestFocus();
-        assertEquals("first item in toolbar must be focused", bar.getItems().get(0), scene.getFocusOwner());
+        assertEquals(bar.getItems().get(0), scene.getFocusOwner(), "first item in toolbar must be focused");
     }
 
 //-------- TabPane
@@ -1708,13 +1716,13 @@ protected void showControl(Control control, boolean focused, double sceneX, doub
         }
     }
 
-    @After
+    @AfterEach
     public void cleanup() {
         if (stage != null) stage.hide();
         Thread.currentThread().setUncaughtExceptionHandler(null);
     }
 
-    @Before
+    @BeforeEach
     public void setup() {
         Thread.currentThread().setUncaughtExceptionHandler((thread, throwable) -> {
             if (throwable instanceof RuntimeException) {
@@ -1724,7 +1732,4 @@ public void setup() {
             }
         });
     }
-
 }
-
-
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/SkinDisposeContractTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/SkinDisposeContractTest.java
index 510280fd8ac..80d4adf12a0 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/SkinDisposeContractTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/SkinDisposeContractTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,19 +25,14 @@
 
 package test.javafx.scene.control.skin;
 
+import static javafx.scene.control.ControlShim.installDefaultSkin;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlSkinFactory.createControl;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlSkinFactory.getControlClasses;
 import java.util.Collection;
-import java.util.List;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import static javafx.scene.control.ControlShim.*;
-import static test.com.sun.javafx.scene.control.infrastructure.ControlSkinFactory.*;
-
 import javafx.scene.control.Control;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test for https://bugs.openjdk.org/browse/JDK-8244112:
@@ -45,11 +40,9 @@
  * <p>
  * This test is parameterized in the type of control.
  */
-@RunWith(Parameterized.class)
 public class SkinDisposeContractTest {
 
     private Control control;
-    private Class<Control> controlClass;
 
     /**
      * Skin must support multiple calls to dispose.
@@ -61,8 +54,10 @@ public class SkinDisposeContractTest {
      * are commented with issue reference
      *
      */
-    @Test
-    public void testDefaultDispose() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testDefaultDispose(Class<Control> controlClass) {
+        setup(controlClass);
         installDefaultSkin(control);
         control.getSkin().dispose();
         control.getSkin().dispose();
@@ -70,27 +65,20 @@ public void testDefaultDispose() {
 
   //---------------- parameterized
 
-    // Note: name property not supported before junit 4.11
-    // Note: collection of single values supported since 4.12
-    @Parameterized.Parameters //(name = "{index}: {0} ")
-    public static Collection<Object[]> data() {
-        List<Class<Control>> controlClasses = getControlClasses();
-        return asArrays(controlClasses);
-    }
-
-    public SkinDisposeContractTest(Class<Control> controlClass) {
-        this.controlClass = controlClass;
+    private static Collection<Class<Control>> parameters() {
+        return getControlClasses();
     }
 
 //----------------------
 
-    @After
+    @AfterEach
     public void cleanup() {
         Thread.currentThread().setUncaughtExceptionHandler(null);
     }
 
-    @Before
-    public void setup() {
+    // @BeforeEach
+    // junit5 does not support parameterized class-level tests yet
+    public void setup(Class<Control> controlClass) {
         Thread.currentThread().setUncaughtExceptionHandler((thread, throwable) -> {
             if (throwable instanceof RuntimeException) {
                 throw (RuntimeException)throwable;
@@ -100,5 +88,4 @@ public void setup() {
         });
         control = createControl(controlClass);
     }
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/SkinLabeledCleanupTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/SkinLabeledCleanupTest.java
index 0d6e327824f..f5aefa09902 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/SkinLabeledCleanupTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/SkinLabeledCleanupTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,20 +25,15 @@
 
 package test.javafx.scene.control.skin;
 
+import static javafx.scene.control.ControlShim.installDefaultSkin;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlSkinFactory.attemptGC;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlSkinFactory.createControl;
+import static test.com.sun.javafx.scene.control.infrastructure.ControlSkinFactory.replaceSkin;
 import java.lang.ref.WeakReference;
 import java.util.Collection;
 import java.util.List;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import static javafx.scene.control.ControlShim.*;
-import static org.junit.Assert.*;
-import static test.com.sun.javafx.scene.control.infrastructure.ControlSkinFactory.*;
-
 import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.Hyperlink;
@@ -48,6 +43,9 @@
 import javafx.scene.control.TitledPane;
 import javafx.scene.control.ToggleButton;
 import javafx.scene.shape.Rectangle;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test skin cleanup for Labeled JDK-8247576
@@ -55,70 +53,69 @@
  * This test is parameterized on class of Labeled.
  *
  */
-@RunWith(Parameterized.class)
 public class SkinLabeledCleanupTest {
 
-    private Class<Labeled> labeledClass;
     private Labeled labeled;
 
     /**
      * First step was cleanup of graphicListener: removed guard against null skinnable.
      */
-    @Test
-    public void testLabeledGraphicDispose() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testLabeledGraphicDispose(Class<Labeled> labeledClass) {
+        setup(labeledClass);
         Rectangle graphic = (Rectangle) labeled.getGraphic();
         installDefaultSkin(labeled);
         labeled.getSkin().dispose();
         graphic.setWidth(500);
     }
 
-    @Test
-    public void testMemoryLeakAlternativeSkin() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testMemoryLeakAlternativeSkin(Class<Labeled> labeledClass) {
+        setup(labeledClass);
         installDefaultSkin(labeled);
         WeakReference<?> weakRef = new WeakReference<>(replaceSkin(labeled));
         assertNotNull(weakRef.get());
         attemptGC(weakRef);
-        assertEquals("Skin must be gc'ed", null, weakRef.get());
+        assertEquals(null, weakRef.get(), "Skin must be gc'ed");
     }
 
 //----------- parameterized
 
-    @Parameterized.Parameters //(name = "{index}: {0} ")
-    public static Collection<Object[]> data() {
-        List<Class> labeledClasses = List.of(
-               Button.class,
-               CheckBox.class,
-               Hyperlink.class,
-               Label.class,
-               // MenuButton is-a Labeled but its skin is-not-a LabeledSkinBase
-               // leaking has different reason/s
-               // MenuButton.class,
-               ToggleButton.class,
-               RadioButton.class,
-               TitledPane.class
-                );
-        return asArrays(labeledClasses);
-    }
-
-    public SkinLabeledCleanupTest(Class<Labeled> labeledClass) {
-        this.labeledClass = labeledClass;
+    private static Collection<Class<?>> parameters() {
+        return List.of(
+            Button.class,
+            CheckBox.class,
+            Hyperlink.class,
+            Label.class,
+            // MenuButton is-a Labeled but its skin is-not-a LabeledSkinBase
+            // leaking has different reason/s
+            // MenuButton.class,
+            ToggleButton.class,
+            RadioButton.class,
+            TitledPane.class
+        );
     }
 
 //---------------- setup/cleanup
 
-    @Test
-    public void testSetupState() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSetupState(Class<Labeled> labeledClass) {
+        setup(labeledClass);
         assertNotNull(labeled);
         assertNotNull(labeled.getGraphic());
     }
 
-    @After
+    @AfterEach
     public void cleanup() {
         Thread.currentThread().setUncaughtExceptionHandler(null);
     }
 
-    @Before
-    public void setup() {
+    // @BeforeEach
+    // junit5 does not support parameterized class-level tests yet
+    public void setup(Class<Labeled> labeledClass) {
         Thread.currentThread().setUncaughtExceptionHandler((thread, throwable) -> {
             if (throwable instanceof RuntimeException) {
                 throw (RuntimeException)throwable;
@@ -130,5 +127,4 @@ public void setup() {
         labeled = createControl(labeledClass);
         labeled.setGraphic(new Rectangle());
     }
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/SkinMemoryLeakTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/SkinMemoryLeakTest.java
index 7555fcfc07b..d47baee6403 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/SkinMemoryLeakTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/SkinMemoryLeakTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,35 +26,27 @@
 package test.javafx.scene.control.skin;
 
 import static javafx.scene.control.ControlShim.installDefaultSkin;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static test.com.sun.javafx.scene.control.infrastructure.ControlSkinFactory.asArrays;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static test.com.sun.javafx.scene.control.infrastructure.ControlSkinFactory.attemptGC;
 import static test.com.sun.javafx.scene.control.infrastructure.ControlSkinFactory.createControl;
 import static test.com.sun.javafx.scene.control.infrastructure.ControlSkinFactory.getControlClasses;
 import static test.com.sun.javafx.scene.control.infrastructure.ControlSkinFactory.replaceSkin;
-
 import java.lang.ref.WeakReference;
 import java.util.Collection;
-import java.util.List;
-
 import javafx.scene.Scene;
 import javafx.scene.control.Control;
 import javafx.scene.control.Skin;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import com.sun.javafx.tk.Toolkit;
 
 /**
@@ -62,10 +54,8 @@
  * <p>
  * This test is parameterized on control type.
  */
-@RunWith(Parameterized.class)
 public class SkinMemoryLeakTest {
 
-    private Class<Control> controlClass;
     private Control control;
 
 //--------- tests
@@ -73,8 +63,10 @@ public class SkinMemoryLeakTest {
     /**
      * default skin -> set another instance of default skin
      */
-    @Test
-    public void testMemoryLeakSameSkinClass() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testMemoryLeakSameSkinClass(Class<Control> controlClass) {
+        setup(controlClass);
         installDefaultSkin(control);
         Skin<?> skin = control.getSkin();
         WeakReference<?> weakRef = new WeakReference<>(skin);
@@ -85,15 +77,17 @@ public void testMemoryLeakSameSkinClass() {
         Toolkit.getToolkit().firePulse();
 
         attemptGC(weakRef);
-        assertNull("Unused Skin must be gc'ed", weakRef.get());
+        assertNull(weakRef.get(), "Unused Skin must be gc'ed");
     }
 
     /**
      * default skin -> set another instance of default skin,
      * with scene property set.
      */
-    @Test
-    public void testMemoryLeakSameSkinClassWithScene() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testMemoryLeakSameSkinClassWithScene(Class<Control> controlClass) {
+        setup(controlClass);
         showControl(control, true);
         installDefaultSkin(control);
         Skin<?> skin = control.getSkin();
@@ -105,33 +99,40 @@ public void testMemoryLeakSameSkinClassWithScene() {
         Toolkit.getToolkit().firePulse();
 
         attemptGC(weakRef);
-        assertNull("Unused Skin must be gc'ed", weakRef.get());
+        assertNull(weakRef.get(), "Unused Skin must be gc'ed");
     }
 
-    @Test
-    public void testControlChildrenSameSkinClass() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testControlChildrenSameSkinClass(Class<Control> controlClass) {
+        setup(controlClass);
         installDefaultSkin(control);
         int childCount = control.getChildrenUnmodifiable().size();
         installDefaultSkin(control);
-        assertEquals("Old skin should dispose children when a new skin is set",
-                childCount, control.getChildrenUnmodifiable().size());
+        assertEquals(
+                childCount, control.getChildrenUnmodifiable().size(),
+                "Old skin should dispose children when a new skin is set");
     }
 
-    @Test
-    public void testSetSkinOfSameClass() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSetSkinOfSameClass(Class<Control> controlClass) {
+        setup(controlClass);
         installDefaultSkin(control);
         Skin<?> oldSkin = control.getSkin();
         installDefaultSkin(control);
         Skin<?> newSkin = control.getSkin();
 
-        assertNotEquals("New skin was not set", oldSkin, newSkin);
+        assertNotEquals(oldSkin, newSkin, "New skin was not set");
     }
 
     /**
      * default skin -> set alternative
      */
-    @Test
-    public void testMemoryLeakAlternativeSkin() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testMemoryLeakAlternativeSkin(Class<Control> controlClass) {
+        setup(controlClass);
         installDefaultSkin(control);
         Skin<?> replacedSkin = replaceSkin(control);
         WeakReference<?> weakRef = new WeakReference<>(replacedSkin);
@@ -142,15 +143,17 @@ public void testMemoryLeakAlternativeSkin() {
         Toolkit.getToolkit().firePulse();
 
         attemptGC(weakRef);
-        assertEquals("Skin must be gc'ed", null, weakRef.get());
+        assertEquals(null, weakRef.get(), "Skin must be gc'ed");
     }
 
     /**
      * default skin -> set alternative,
      * with scene property set
      */
-    @Test
-    public void testMemoryLeakAlternativeSkinWithScene() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testMemoryLeakAlternativeSkinWithScene(Class<Control> controlClass) {
+        setup(controlClass);
         showControl(control, true);
         installDefaultSkin(control);
         Skin<?> replacedSkin = replaceSkin(control);
@@ -162,14 +165,16 @@ public void testMemoryLeakAlternativeSkinWithScene() {
         Toolkit.getToolkit().firePulse();
 
         attemptGC(weakRef);
-        assertEquals("Skin must be gc'ed", null, weakRef.get());
+        assertEquals(null, weakRef.get(), "Skin must be gc'ed");
     }
 
     /**
      * default skin -> set alternative while showing
      */
-    @Test
-    public void testMemoryLeakAlternativeSkinShowing() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testMemoryLeakAlternativeSkinShowing(Class<Control> controlClass) {
+        setup(controlClass);
         showControl(control, true);
         Skin<?> replacedSkin = replaceSkin(control);
         WeakReference<?> weakRef = new WeakReference<>(replacedSkin);
@@ -180,30 +185,26 @@ public void testMemoryLeakAlternativeSkinShowing() {
         Toolkit.getToolkit().firePulse();
 
         attemptGC(weakRef);
-        assertEquals("Skin must be gc'ed", null, weakRef.get());
+        assertEquals(null, weakRef.get(), "Skin must be gc'ed");
     }
 
-    @Test
-    public void testControlChildren() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testControlChildren(Class<Control> controlClass) {
+        setup(controlClass);
         installDefaultSkin(control);
         int childCount = control.getChildrenUnmodifiable().size();
         String skinClass = control.getSkin().getClass().getSimpleName();
         replaceSkin(control);
-        assertEquals(skinClass + " must remove direct children that it has added",
-                childCount, control.getChildrenUnmodifiable().size());
+        assertEquals(
+                childCount, control.getChildrenUnmodifiable().size(),
+                skinClass + " must remove direct children that it has added");
     }
 
 //------------ parameters
 
-    // Note: name property not supported before junit 4.11
-    @Parameterized.Parameters //(name = "{index}: {0} ")
-    public static Collection<Object[]> data() {
-        List<Class<Control>> controlClasses = getControlClasses();
-        return asArrays(controlClasses);
-    }
-
-    public SkinMemoryLeakTest(Class<Control> controlClass) {
-        this.controlClass = controlClass;
+    private static Collection<Class<Control>> parameters() {
+        return getControlClasses();
     }
 
 //------------ setup
@@ -238,8 +239,9 @@ protected void showControl(Control control, boolean focused) {
         }
     }
 
-    @Before
-    public void setup() {
+    // @BeforeEach
+    // junit5 does not support parameterized class-level tests yet
+    public void setup(Class<Control> controlClass) {
         Thread.currentThread().setUncaughtExceptionHandler((thread, throwable) -> {
             if (throwable instanceof RuntimeException) {
                 throw (RuntimeException)throwable;
@@ -251,10 +253,9 @@ public void setup() {
         assertNotNull(control);
     }
 
-    @After
+    @AfterEach
     public void cleanup() {
         if (stage != null) stage.hide();
         Thread.currentThread().setUncaughtExceptionHandler(null);
     }
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/SkinPopupContractTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/SkinPopupContractTest.java
index 6c4b896d298..3af01d6a309 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/SkinPopupContractTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/SkinPopupContractTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,11 @@
 
 package test.javafx.scene.control.skin;
 
-import org.junit.Test;
-
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.Tooltip;
 import javafx.scene.control.skin.ContextMenuSkin;
 import javafx.scene.control.skin.TooltipSkin;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests for Skinnables that are not Controls.
@@ -52,5 +51,4 @@ public void testContextMenuSkinDispose() {
         contextMenu.getSkin().dispose();
         contextMenu.getSkin().dispose();
     }
-
 }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/SliderSkinTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/SliderSkinTest.java
index c66dc438226..02b970cca6a 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/SliderSkinTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/SliderSkinTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,14 +25,13 @@
 
 package test.javafx.scene.control.skin;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import javafx.beans.value.ObservableValue;
 import javafx.geometry.Orientation;
-import static org.junit.Assert.assertEquals;
 import javafx.scene.control.Slider;
 import javafx.scene.control.skin.SliderSkin;
-
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  */
@@ -40,7 +39,8 @@ public class SliderSkinTest {
     private Slider slider;
     private SliderSkinMock skin;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         slider = new Slider();
         skin = new SliderSkinMock(slider);
         slider.setSkin(skin);
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/SpinnerSkinTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/SpinnerSkinTest.java
index d34fb3976a6..01c5390ddf1 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/SpinnerSkinTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/SpinnerSkinTest.java
@@ -25,7 +25,7 @@
 
 package test.javafx.scene.control.skin;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import javafx.animation.Animation.Status;
 import javafx.geometry.BoundingBox;
 import javafx.geometry.Insets;
@@ -36,8 +36,8 @@
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Region;
 import javafx.stage.Stage;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import com.sun.javafx.scene.control.behavior.SpinnerBehavior;
 import com.sun.javafx.scene.control.behavior.SpinnerBehaviorShim;
 
@@ -71,7 +71,7 @@ public class SpinnerSkinTest {
     private Region decrementArrowButton;
     private Region incrementArrowButton;
 
-    @Before
+    @BeforeEach
     public void before() {
         spinner = new Spinner<>();
         spinner.resize(CONTROL_WIDTH, CONTROL_HEIGHT);
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/TabPaneHeaderScrollTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/TabPaneHeaderScrollTest.java
index 29da85537a5..0ac0d1486f3 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/TabPaneHeaderScrollTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/TabPaneHeaderScrollTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,21 +25,20 @@
 
 package test.javafx.scene.control.skin;
 
+import static javafx.scene.control.skin.TabPaneSkinShim.disableAnimations;
+import static javafx.scene.control.skin.TabPaneSkinShim.getHeaderAreaScrollOffset;
+import static javafx.scene.control.skin.TabPaneSkinShim.getTabHeaders;
+import static javafx.scene.control.skin.TabPaneSkinShim.isTabsFit;
+import static javafx.scene.control.skin.TabPaneSkinShim.setHeaderAreaScrollOffset;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.sun.javafx.scene.control.TabObservableList;
-import com.sun.javafx.tk.Toolkit;
-
-import static javafx.scene.control.skin.TabPaneSkinShim.*;
-import static org.junit.Assert.*;
-
 import javafx.geometry.Side;
 import javafx.scene.Node;
 import javafx.scene.Scene;
@@ -50,6 +49,11 @@
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.scene.control.TabObservableList;
+import com.sun.javafx.tk.Toolkit;
 
 /**
  * Tests around keeping the selected tab header in visible range of header area.
@@ -84,7 +88,7 @@ public void testMoveBySetAll() {
         tabs.add(0, selectedTab);
         tabPane.getTabs().setAll(tabs);
         Toolkit.getToolkit().firePulse();
-        assertEquals("scrolled to leading edge", 0, getHeaderAreaScrollOffset(tabPane), 1);
+        assertEquals(0, getHeaderAreaScrollOffset(tabPane), 1, "scrolled to leading edge");
     }
 
     /**
@@ -101,7 +105,7 @@ public void testMoveByTabObservableList() {
         // move selected tab to first
         ((TabObservableList<Tab>) tabPane.getTabs()).reorder(selectedTab, tabPane.getTabs().get(0));
         Toolkit.getToolkit().firePulse();
-        assertEquals("scrolled to leading edge", 0, getHeaderAreaScrollOffset(tabPane), 1);
+        assertEquals(0, getHeaderAreaScrollOffset(tabPane), 1, "scrolled to leading edge");
     }
 
     /**
@@ -132,7 +136,7 @@ public void testRemoveSelectedAsLast() {
         tabPane.getTabs().remove(last);
         Toolkit.getToolkit().firePulse();
 
-        assertEquals("scrollOffset adjusted: ", scrollOffset + expectedDelta, getHeaderAreaScrollOffset(tabPane), 1);
+        assertEquals(scrollOffset + expectedDelta, getHeaderAreaScrollOffset(tabPane), 1, "scrollOffset adjusted: ");
     }
 
     /**
@@ -167,7 +171,7 @@ public void testRemoveLastIfSelectedIsSecondLast() {
         tabPane.getTabs().remove(last);
         Toolkit.getToolkit().firePulse();
 
-        assertEquals("scrollOffset adjusted: ", scrollOffset + expectedDelta, getHeaderAreaScrollOffset(tabPane), 1);
+        assertEquals(scrollOffset + expectedDelta, getHeaderAreaScrollOffset(tabPane), 1, "scrollOffset adjusted: ");
     }
 
     @Test
@@ -180,15 +184,15 @@ public void testRemoveBefore() {
         // state before tabs modification
         double selectedTabOffset = getTabHeaderOffset(tabPane, selectedTab);
         double scrollOffset = getHeaderAreaScrollOffset(tabPane);
-        assertEquals("sanity: tab visible but not scrolled", 0, scrollOffset, 1);
+        assertEquals(0, scrollOffset, 1, "sanity: tab visible but not scrolled");
 
         // scroll selected to leading edge
         setHeaderAreaScrollOffset(tabPane, - selectedTabOffset);
         Toolkit.getToolkit().firePulse();
-        assertEquals("sanity: really scrolled", - selectedTabOffset, getHeaderAreaScrollOffset(tabPane), 1);
+        assertEquals(-selectedTabOffset, getHeaderAreaScrollOffset(tabPane), 1, "sanity: really scrolled");
         tabPane.getTabs().remove(0);
         Toolkit.getToolkit().firePulse();
-        assertEquals("scroll offset", - getTabHeaderOffset(tabPane, selectedTab), getHeaderAreaScrollOffset(tabPane), 1);
+        assertEquals(-getTabHeaderOffset(tabPane, selectedTab), getHeaderAreaScrollOffset(tabPane), 1, "scroll offset");
     }
 
     @Test
@@ -207,8 +211,8 @@ public void testAddBefore() {
         Toolkit.getToolkit().firePulse();
         Node addedHeader = getTabHeaderFor(tabPane, added);
         double addedWidth = addedHeader.prefWidth(-1);
-        assertEquals("sanity", selectedTabOffset + addedWidth, getTabHeaderOffset(tabPane, selectedTab), 1);
-        assertEquals("scroll offset", scrollOffset - addedWidth, getHeaderAreaScrollOffset(tabPane), 1);
+        assertEquals(selectedTabOffset + addedWidth, getTabHeaderOffset(tabPane, selectedTab), 1, "sanity");
+        assertEquals(scrollOffset - addedWidth, getHeaderAreaScrollOffset(tabPane), 1, "scroll offset");
     }
 
     /**
@@ -239,8 +243,8 @@ private void assertScrollOnDecreaseSize(Side side) {
 
         // assert scroll state (== no scroll) before resize
         double noScrollOffset = getHeaderAreaScrollOffset(tabPane);
-        assertEquals("scrollOffset for fitting tabs", 0, noScrollOffset, 1);
-        assertEquals("bounds minX", tabOffset, header.getBoundsInParent().getMinX(), 1);
+        assertEquals(0, noScrollOffset, 1, "scrollOffset for fitting tabs");
+        assertEquals(tabOffset, header.getBoundsInParent().getMinX(), 1, "bounds minX");
 
         // force resize of tabPane by decreasing max size.
         if (side.isHorizontal()) {
@@ -252,9 +256,9 @@ private void assertScrollOnDecreaseSize(Side side) {
 
         // assert scroll state after resize
         double scrollOffset = getHeaderAreaScrollOffset(tabPane);
-        assertFalse("sanity: not fitting after resize", isTabsFit(tabPane));
-        assertTrue("header must be scrolled", scrollOffset < 0);
-        assertEquals("bounds minX", tabOffset, - scrollOffset + header.getBoundsInParent().getMinX(), 0);
+        assertFalse(isTabsFit(tabPane), "sanity: not fitting after resize");
+        assertTrue(scrollOffset < 0, "header must be scrolled");
+        assertEquals(tabOffset, - scrollOffset + header.getBoundsInParent().getMinX(), 0, "bounds minX");
     }
 
     /**
@@ -329,13 +333,14 @@ private void assertScrolledToLastAndBack() {
         double scrollPerTab = firstHeader.prefWidth(-1);
         double scrollPerThirdOfTabs = THIRD_OF * scrollPerTab;
         double scrollOffset = getHeaderAreaScrollOffset(tabPane);
-        assertTrue("scrollOffset must be negative", scrollOffset < 0);
-        assertTrue("scrollOffset " + scrollOffset + "must be much greater than multiple tab widths " + scrollPerThirdOfTabs ,
-                scrollPerThirdOfTabs < - scrollOffset);
+        assertTrue(scrollOffset < 0, "scrollOffset must be negative");
+        assertTrue(
+                scrollPerThirdOfTabs < - scrollOffset,
+                "scrollOffset " + scrollOffset + "must be much greater than multiple tab widths " + scrollPerThirdOfTabs);
         tabPane.getSelectionModel().select(1);
         Toolkit.getToolkit().firePulse();
         // scrolled back such that second header is at the leading edge of the header area
-        assertEquals("scrollOffset", scrollPerTab, - getHeaderAreaScrollOffset(tabPane), 1);
+        assertEquals(scrollPerTab, - getHeaderAreaScrollOffset(tabPane), 1, "scrollOffset");
     }
 
 //------------- setup and initial state testing
@@ -405,7 +410,7 @@ protected TabPane createTabPane(int max) {
         return tabPane;
     }
 
-    @Before
+    @BeforeEach
     public void setup() {
         Thread.currentThread().setUncaughtExceptionHandler((thread, throwable) -> {
             if (throwable instanceof RuntimeException) {
@@ -417,7 +422,7 @@ public void setup() {
         tabPane = createTabPane();
     }
 
-    @After
+    @AfterEach
     public void cleanup() {
         if (stage != null) stage.hide();
         Thread.currentThread().setUncaughtExceptionHandler(null);
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/TabPaneSkinHeaderOrderTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/TabPaneSkinHeaderOrderTest.java
index 387352b8103..c0c01c2644c 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/TabPaneSkinHeaderOrderTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/TabPaneSkinHeaderOrderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,11 @@
 
 package test.javafx.scene.control.skin;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
 import java.util.ArrayList;
 import java.util.List;
-
 import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.control.Tab;
@@ -36,12 +38,10 @@
 import javafx.scene.control.skin.TabPaneSkinShim;
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
  * Testing sync'ing of tab headers with tabs.
@@ -66,7 +66,7 @@ public void testSetAllCollectionWithAdditionalTabs() {
         assertSyncTabHeaders();
     }
 
-    @Ignore("JDK-8245528")
+    @Disabled("JDK-8245528")
     @Test
     public void testSetExistingTabAtDifferentIndex() {
         Tab t5 = tabPane.getTabs().get(4);
@@ -74,7 +74,7 @@ public void testSetExistingTabAtDifferentIndex() {
         assertSyncTabHeaders();
     }
 
-    @Ignore("JDK-8245528")
+    @Disabled("JDK-8245528")
     // Does not fail in system test with tab header animations not disabled.
     // Does not fail with even number of tabs.
     // Looks like that it fails in scenarios when an existing tab's position is
@@ -197,14 +197,14 @@ public void testAddSingleInMiddle() {
         assertSyncTabHeaders();
     }
 
-    @Ignore("JDK-8245528")
+    @Disabled("JDK-8245528")
     @Test
     public void testAddSingleExistingTab() {
         tabPane.getTabs().add(1, tabPane.getTabs().get(3));
         assertSyncTabHeaders();
     }
 
-    @Ignore("JDK-8245528")
+    @Disabled("JDK-8245528")
     @Test
     public void testAddMultipleExistingTabsAtBeginning() {
         List<Tab> added = List.of(tabPane.getTabs().get(3),
@@ -251,12 +251,12 @@ protected void assertSyncTabHeaders() {
     }
 
     protected void assertSyncHeaders(List<Tab> tabs, List<Node> headers) {
-        assertEquals("sanity: same size", tabs.size(), headers.size());
+        assertEquals(tabs.size(), headers.size(), "sanity: same size");
         for (int i = 0; i < tabs.size(); i++) {
             Tab headerTab = (Tab) headers.get(i).getProperties().get(Tab.class);
-            assertSame("tab at " + i + ", is: " + tabs.get(i).getText()
-                + " but in header it is: " + headerTab.getText(),
-                tabs.get(i), headerTab);
+            assertSame(
+                tabs.get(i), headerTab,
+                "tab at " + i + ", is: " + tabs.get(i).getText() + " but in header it is: " + headerTab.getText());
         }
     }
 
@@ -269,12 +269,12 @@ public void testSetupState() {
         assertEquals(expected, root.getChildren());
     }
 
-    @After
+    @AfterEach
     public void cleanup() {
         stage.hide();
     }
 
-    @Before
+    @BeforeEach
     public void setup() {
         root = new VBox();
         scene = new Scene(root);
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/TableColumnHeaderTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/TableColumnHeaderTest.java
index 3209b89c450..f5560080670 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/TableColumnHeaderTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/TableColumnHeaderTest.java
@@ -25,7 +25,9 @@
 
 package test.javafx.scene.control.skin;
 
-import com.sun.javafx.tk.Toolkit;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.event.Event;
@@ -39,23 +41,19 @@
 import javafx.scene.control.TableView;
 import javafx.scene.control.cell.PropertyValueFactory;
 import javafx.scene.control.skin.TableColumnHeader;
+import javafx.scene.control.skin.TableColumnHeaderShim;
 import javafx.scene.input.MouseButton;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.HBox;
-
 import javafx.scene.text.Text;
-import org.junit.Before;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.tk.Toolkit;
 import test.com.sun.javafx.scene.control.infrastructure.MouseEventFirer;
 import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
 import test.com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils;
 import test.com.sun.javafx.scene.control.test.Person;
-import javafx.scene.control.skin.TableColumnHeaderShim;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 
 public class TableColumnHeaderTest {
 
@@ -67,7 +65,7 @@ public class TableColumnHeaderTest {
     private static String NAME2 = "Orrin Davies";
     private static String NAME3 = "Emma Wilson";
 
-    @Before
+    @BeforeEach
     public void before() {
         ObservableList<Person> model = FXCollections.observableArrayList(
                 new Person(NAME0, 76),
@@ -89,7 +87,7 @@ public void before() {
         firstColumnHeader = VirtualFlowTestUtils.getTableColumnHeader(tableView, column);
     }
 
-    @After
+    @AfterEach
     public void after() {
         sl.dispose();
     }
@@ -143,8 +141,7 @@ public void test_resizeColumnToFitContent() {
         double width = column.getWidth();
         TableColumnHeaderShim.resizeColumnToFitContent(firstColumnHeader, -1);
 
-        assertEquals("Width must be the same",
-                width, column.getWidth(), 0.001);
+        assertEquals(width, column.getWidth(), 0.001, "Width must be the same");
     }
 
     /**
@@ -159,19 +156,16 @@ public void test_resizeColumnToFitContentIncrease() {
 
         tableView.getItems().get(0).setFirstName("This is a big text inside that column");
 
-        assertEquals("Width must be the same",
-                width, column.getWidth(), 0.001);
+        assertEquals(width, column.getWidth(), 0.001, "Width must be the same");
 
         TableColumnHeaderShim.resizeColumnToFitContent(firstColumnHeader, -1);
-        assertTrue("Column width must be greater",
-                width < column.getWidth());
+        assertTrue(width < column.getWidth(), "Column width must be greater");
 
         //Back to initial value
         tableView.getItems().get(0).setFirstName(NAME0);
 
         TableColumnHeaderShim.resizeColumnToFitContent(firstColumnHeader, -1);
-        assertEquals("Width must be equal to initial value",
-                width, column.getWidth(), 0.001);
+        assertEquals(width, column.getWidth(), 0.001, "Width must be equal to initial value");
     }
 
     /**
@@ -189,12 +183,14 @@ public void test_resizeColumnToFitContentDecrease() {
         tableView.getItems().get(2).setFirstName("small");
         tableView.getItems().get(3).setFirstName("small");
 
-        assertEquals("Width must be the same",
-                width, column.getWidth(), 0.001);
+        assertEquals(
+                width, column.getWidth(), 0.001,
+                "Width must be the same");
 
         TableColumnHeaderShim.resizeColumnToFitContent(firstColumnHeader, -1);
-        assertTrue("Column width must be smaller",
-                width > column.getWidth());
+        assertTrue(
+                width > column.getWidth(),
+                "Column width must be smaller");
 
         //Back to initial value
         tableView.getItems().get(0).setFirstName(NAME0);
@@ -203,8 +199,9 @@ public void test_resizeColumnToFitContentDecrease() {
         tableView.getItems().get(3).setFirstName(NAME3);
 
         TableColumnHeaderShim.resizeColumnToFitContent(firstColumnHeader, -1);
-        assertEquals("Width must be equal to initial value",
-                width, column.getWidth(), 0.001);
+        assertEquals(
+                width, column.getWidth(), 0.001,
+                "Width must be equal to initial value");
     }
 
     /**
@@ -219,18 +216,21 @@ public void test_resizeColumnToFitContentHeader() {
 
         column.setText("This is a big text inside that column");
 
-        assertEquals("Width must be the same",
-                width, column.getWidth(), 0.001);
+        assertEquals(
+                width, column.getWidth(), 0.001,
+                "Width must be the same");
 
         TableColumnHeaderShim.resizeColumnToFitContent(firstColumnHeader, -1);
-        assertTrue("Column width must be greater",
-                width < column.getWidth());
+        assertTrue(
+                width < column.getWidth(),
+                "Column width must be greater");
 
         //Back to initial value
         column.setText("Col");
         TableColumnHeaderShim.resizeColumnToFitContent(firstColumnHeader, 3);
-        assertEquals("Width must be equal to initial value",
-                width, column.getWidth(), 0.001);
+        assertEquals(
+                width, column.getWidth(), 0.001,
+                "Width must be equal to initial value");
     }
 
     /**
@@ -247,8 +247,9 @@ public void test_resizeColumnToFitContentMaxRow() {
 
 
         TableColumnHeaderShim.resizeColumnToFitContent(firstColumnHeader, 3);
-        assertEquals("Width must be the same",
-                width, column.getWidth(), 0.001);
+        assertEquals(
+                width, column.getWidth(), 0.001,
+                "Width must be the same");
 
 
         //Back to initial value
@@ -256,8 +257,9 @@ public void test_resizeColumnToFitContentMaxRow() {
 
 
         TableColumnHeaderShim.resizeColumnToFitContent(firstColumnHeader, 3);
-        assertEquals("Width must be equal to initial value",
-                width, column.getWidth(), 0.001);
+        assertEquals(
+                width, column.getWidth(), 0.001,
+                "Width must be equal to initial value");
     }
 
     /** Row style must affect the required column width */
@@ -271,7 +273,7 @@ public void test_resizeColumnToFitContentRowStyle() {
 
         tableView.setRowFactory(this::createLargeRow);
         TableColumnHeaderShim.resizeColumnToFitContent(firstColumnHeader, -1);
-        assertTrue("Column width must be greater", width < column.getWidth());
+        assertTrue(width < column.getWidth(), "Column width must be greater");
     }
 
     /** Test resizeColumnToFitContent in the presence of a non-standard row skin */
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/TableRowSkinTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/TableRowSkinTest.java
index 7f15c7c697a..85b3c0121e3 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/TableRowSkinTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/TableRowSkinTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024 Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,10 @@
 
 package test.javafx.scene.control.skin;
 
-import com.sun.javafx.tk.Toolkit;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -41,25 +44,21 @@
 import javafx.scene.control.skin.TableColumnHeader;
 import javafx.scene.control.skin.TableColumnHeaderShim;
 import javafx.scene.control.skin.TableRowSkin;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.tk.Toolkit;
 import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
 import test.com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils;
 import test.com.sun.javafx.scene.control.test.Person;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
 public class TableRowSkinTest {
 
     private TableView<Person> tableView;
     private StageLoader stageLoader;
     private TableColumnHeader firstColumnHeader;
 
-    @Before
+    @BeforeEach
     public void before() {
         tableView = new TableView<>();
 
@@ -338,7 +337,7 @@ public void cellsShouldBeAddedInRowFixedCellSize() {
         assertEquals(5, row.getChildrenUnmodifiable().stream().filter(TableCell.class::isInstance).count());
     }
 
-    @After
+    @AfterEach
     public void after() {
         stageLoader.dispose();
     }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/TextInputControlSkinTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/TextInputControlSkinTest.java
index 43914c648ae..8221e2e46b6 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/TextInputControlSkinTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/TextInputControlSkinTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,17 +25,17 @@
 
 package test.javafx.scene.control.skin;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.concurrent.atomic.AtomicBoolean;
 import javafx.geometry.Point2D;
+import javafx.scene.control.PasswordField;
 import javafx.scene.control.TextArea;
 import javafx.scene.control.TextField;
-import javafx.scene.control.PasswordField;
 import javafx.scene.control.skin.TextAreaSkin;
 import javafx.scene.control.skin.TextFieldSkin;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import org.junit.jupiter.api.Test;
 
 /**
  *
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ToggleButtonSkinTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ToggleButtonSkinTest.java
index 6663f16e871..221c058e987 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ToggleButtonSkinTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ToggleButtonSkinTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,15 +25,13 @@
 
 package test.javafx.scene.control.skin;
 
-import static org.junit.Assert.assertEquals;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import javafx.beans.value.ObservableValue;
 import javafx.geometry.Insets;
 import javafx.scene.control.ToggleButton;
 import javafx.scene.control.skin.ToggleButtonSkin;
-
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  */
@@ -41,7 +39,8 @@ public class ToggleButtonSkinTest {
     private ToggleButton togglebutton;
     private ToggleButtonSkinMock skin;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         togglebutton = new ToggleButton("Test");
         skin = new ToggleButtonSkinMock(togglebutton);
         // Set some padding so that any places where padding was being
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ToolBarSkinTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ToolBarSkinTest.java
index 1ec0d984713..f4434c09ed0 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ToolBarSkinTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ToolBarSkinTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,17 +25,15 @@
 
 package test.javafx.scene.control.skin;
 
-import static org.junit.Assert.assertEquals;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import javafx.beans.value.ObservableValue;
 import javafx.geometry.Insets;
 import javafx.geometry.Orientation;
 import javafx.scene.control.Button;
 import javafx.scene.control.ToolBar;
 import javafx.scene.control.skin.ToolBarSkin;
-
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * This fails with IllegalStateException because of the toolkit's check for the FX application thread
@@ -44,7 +42,8 @@ public class ToolBarSkinTest {
     private ToolBar toolbar;
     private ToolBarSkinMock skin;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         toolbar = new ToolBar();
         toolbar.getItems().addAll(new Button("Cut"), new Button("Copy"));
         skin = new ToolBarSkinMock(toolbar);
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/TreeTableColumnHeaderTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/TreeTableColumnHeaderTest.java
index 99e1da23086..8695e0de188 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/TreeTableColumnHeaderTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/TreeTableColumnHeaderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,8 @@
 
 package test.javafx.scene.control.skin;
 
-import com.sun.javafx.tk.Toolkit;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.List;
 import javafx.scene.Node;
 import javafx.scene.control.Skin;
 import javafx.scene.control.TreeItem;
@@ -36,17 +37,14 @@
 import javafx.scene.control.skin.TableColumnHeader;
 import javafx.scene.control.skin.TableColumnHeaderShim;
 import javafx.scene.layout.HBox;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.tk.Toolkit;
 import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
 import test.com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils;
 import test.com.sun.javafx.scene.control.test.Person;
 
-import java.util.List;
-
-import static org.junit.Assert.assertTrue;
-
 public class TreeTableColumnHeaderTest {
 
     private TableColumnHeader firstColumnHeader;
@@ -57,7 +55,7 @@ public class TreeTableColumnHeaderTest {
     private static String NAME2 = "Orrin Davies";
     private static String NAME3 = "Emma Wilson";
 
-    @Before
+    @BeforeEach
     public void before() {
         TreeItem<Person> root = new TreeItem<>(new Person("Witty quotes", "", ""));
         root.getChildren().addAll(List.of(
@@ -83,7 +81,7 @@ public void before() {
         firstColumnHeader = VirtualFlowTestUtils.getTableColumnHeader(treeTableView, column);
     }
 
-    @After
+    @AfterEach
     public void after() {
         sl.dispose();
     }
@@ -99,7 +97,7 @@ public void test_resizeColumnToFitContentRowStyle() {
 
         treeTableView.setRowFactory(this::createLargeRow);
         TableColumnHeaderShim.resizeColumnToFitContent(firstColumnHeader, -1);
-        assertTrue("Column width must be greater", width < column.getWidth());
+        assertTrue(width < column.getWidth(), "Column width must be greater");
     }
 
     /** Test resizeColumnToFitContent in the presence of a non-standard row skin */
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/TreeTableViewDisclosureNodeTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/TreeTableViewDisclosureNodeTest.java
index 0077552a594..d5fbb738e3a 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/TreeTableViewDisclosureNodeTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/TreeTableViewDisclosureNodeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,18 +25,14 @@
 
 package test.javafx.scene.control.skin;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static test.com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils.getCell;
 import java.util.List;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.sun.javafx.tk.Toolkit;
-
-import static org.junit.Assert.*;
-import static test.com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils.*;
-
 import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.scene.Node;
 import javafx.scene.Scene;
@@ -50,6 +46,11 @@
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.tk.Toolkit;
 import test.com.sun.javafx.scene.control.infrastructure.MouseEventFirer;
 
 /**
@@ -87,29 +88,30 @@ public void testSelectChildLeafAfterExpand() {
 
         TreeItem<String> grandChild = child.getChildren().get(0);
         int grandChildRowIndex = treeTable.getRow(grandChild);
-        assertTrue("sanity: grandChild is leaf", grandChild.isLeaf());
-        assertFalse("sanity: grandChild not selected", sm.isSelected(grandChildRowIndex));
+        assertTrue(grandChild.isLeaf(), "sanity: grandChild is leaf");
+        assertFalse(sm.isSelected(grandChildRowIndex), "sanity: grandChild not selected");
         fireMouseIntoIndentationRegion(grandChildRowIndex);
-        assertTrue("grandChild must be selected " + grandChildRowIndex, sm.isSelected(grandChildRowIndex));
+        assertTrue(sm.isSelected(grandChildRowIndex), "grandChild must be selected " + grandChildRowIndex);
     }
 
     /**
      * This is the deeper reason for JDK-8253597: on re-use of a treeTableRow
      * in leaf rows, the disclosureNode is not removed
      */
-    @Test @Ignore("real-cleanup")
+    @Test
+    @Disabled("real-cleanup")
     public void testRowReuse() {
         showTreeTable();
         TreeItem<String> expandedChild = root.getChildren().get(rootExpandedChildIndex);
         TreeItem<String> grandChild = expandedChild.getChildren().get(0);
         int grandChildRowIndex = treeTable.getRow(grandChild);
-        assertNull("leaf must not have disclosureNode", getDisclosureNode(grandChildRowIndex));
+        assertNull(getDisclosureNode(grandChildRowIndex), "leaf must not have disclosureNode");
         // collapse/expand cycle
         expandedChild.setExpanded(false);
         Toolkit.getToolkit().firePulse();
         expandedChild.setExpanded(true);
         Toolkit.getToolkit().firePulse();
-        assertNull("leaf must not have disclosureNode", getDisclosureNode(grandChildRowIndex));
+        assertNull(getDisclosureNode(grandChildRowIndex), "leaf must not have disclosureNode");
     }
 
     /**
@@ -122,7 +124,7 @@ public void testSelectChildLeaf() {
         TreeItem<String> grandChild = expandedChild.getChildren().get(0);
         int grandChildRowIndex = treeTable.getRow(grandChild);
         fireMouseIntoIndentationRegion(grandChildRowIndex);
-        assertTrue("row must be selected" + grandChildRowIndex, sm.isSelected(grandChildRowIndex));
+        assertTrue(sm.isSelected(grandChildRowIndex), "row must be selected" + grandChildRowIndex);
     }
 
     /**
@@ -134,7 +136,7 @@ public void testSelectRootLeaf() {
         TreeItem<String> leafChild = root.getChildren().get(rootLeafChildIndex);
         int leafChildRowIndex = treeTable.getRow(leafChild);
         fireMouseIntoIndentationRegion(leafChildRowIndex);
-        assertTrue("row must be selected" + leafChildRowIndex, sm.isSelected(leafChildRowIndex));
+        assertTrue(sm.isSelected(leafChildRowIndex), "row must be selected" + leafChildRowIndex);
    }
 
     /**
@@ -146,7 +148,7 @@ public void testExpandCollapsedChild() {
         TreeItem<String> child = root.getChildren().get(rootCollapsedChildIndex);
         boolean expanded = child.isExpanded();
         fireMouseIntoIndentationRegion(treeTable.getRow(child));
-        assertEquals("expansion state changed" + child.getValue(), !expanded,  child.isExpanded());
+        assertEquals(!expanded,  child.isExpanded(), "expansion state changed" + child.getValue());
     }
 
     /**
@@ -188,8 +190,8 @@ protected void fireMouseIntoIndentationRegion(int rowIndex) {
      */
     protected void assertHasVisibleDisclosureNode(int rowIndex) {
         Node disclosure = getDisclosureNode(rowIndex);
-        assertNotNull("disclosureNode must added", disclosure);
-        assertTrue("disclosureNode must be visible", disclosure.isVisible());
+        assertNotNull(disclosure, "disclosureNode must added");
+        assertTrue(disclosure.isVisible(), "disclosureNode must be visible");
     }
 
 // ------ accessor helpers
@@ -217,8 +219,8 @@ protected TreeTableRow<?> getTableRow(TreeItem<String> treeItem) {
      */
     protected TreeTableRow<?> getTableRow(int rowIndex) {
         IndexedCell<?> tableRow = getCell(treeTable, rowIndex);
-        assertTrue("sanity: expect TreeTableRow but was: " + tableRow, tableRow instanceof TreeTableRow);
-        assertEquals("sanity: row index", rowIndex, tableRow.getIndex());
+        assertTrue(tableRow instanceof TreeTableRow, "sanity: expect TreeTableRow but was: " + tableRow);
+        assertEquals(rowIndex, tableRow.getIndex(), "sanity: row index");
         return (TreeTableRow<?>) tableRow;
     }
 
@@ -291,7 +293,7 @@ protected void fillTree(TreeItem<String> rootItem) {
         }
     }
 
-    @Before
+    @BeforeEach
     public void setup() {
         Thread.currentThread().setUncaughtExceptionHandler((thread, throwable) -> {
             if (throwable instanceof RuntimeException) {
@@ -315,7 +317,7 @@ public void setup() {
         treeTable.getColumns().add(treeColumn);
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         if (stage != null) stage.hide();
         Thread.currentThread().setUncaughtExceptionHandler(null);
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/TreeTableViewIndentationTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/TreeTableViewIndentationTest.java
index e9019398b01..efa87ea4d0d 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/TreeTableViewIndentationTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/TreeTableViewIndentationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,8 @@
 
 package test.javafx.scene.control.skin;
 
-import com.sun.javafx.tk.Toolkit;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.List;
 import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.scene.control.TreeItem;
@@ -35,16 +36,13 @@
 import javafx.scene.control.TreeTableView;
 import javafx.scene.control.skin.LabeledSkinBase;
 import javafx.scene.control.skin.LabeledSkinBaseShim;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.tk.Toolkit;
 import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
 import test.com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils;
 
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-
 /**
  * Tests for the indentation of the {@link javafx.scene.control.TreeTableView}.
  */
@@ -54,7 +52,7 @@ public class TreeTableViewIndentationTest {
     private TreeTableColumn<String, String> column;
     private StageLoader stageLoader;
 
-    @Before
+    @BeforeEach
     public void setup() {
         treeTableView = new TreeTableView<>();
 
@@ -68,7 +66,7 @@ public void setup() {
         stageLoader = new StageLoader(treeTableView);
     }
 
-    @After
+    @AfterEach
     public void cleanup() {
         stageLoader.dispose();
     }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/VirtualFlowSubClassTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/VirtualFlowSubClassTest.java
index 65d22b6e7f4..c532ac176ba 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/VirtualFlowSubClassTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/VirtualFlowSubClassTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,12 @@
 
 package test.javafx.scene.control.skin;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import javafx.scene.control.IndexedCell;
 import javafx.scene.control.skin.VirtualFlowShim;
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests some protected methods of the VirtualFlow when overriding it.
@@ -48,7 +48,8 @@ public class VirtualFlowSubClassTest {
     // is 200 wide and 100 tall.
     private SubVirtualFlow<IndexedCell> flow;
 
-    @Before public void setUp() {
+    @BeforeEach
+    public void setUp() {
         list = new VirtualFlowShim.ArrayLinkedListShim<>();
         a = new CellStub(flow, "A");
         b = new CellStub(flow, "B");
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/VirtualFlowTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/VirtualFlowTest.java
index 33cefa73313..a785040e091 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/VirtualFlowTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/VirtualFlowTest.java
@@ -25,44 +25,37 @@
 
 package test.javafx.scene.control.skin;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 import java.util.AbstractList;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedList;
-
+import java.util.List;
+import java.util.function.DoubleSupplier;
+import java.util.function.Supplier;
 import javafx.beans.InvalidationListener;
 import javafx.event.Event;
-import javafx.scene.control.IndexedCell;
 import javafx.scene.Node;
 import javafx.scene.Scene;
-import javafx.scene.shape.Circle;
-
-import test.javafx.scene.control.SkinStub;
-import javafx.scene.input.ScrollEvent;
-import javafx.scene.layout.HBox;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-import java.util.List;
-import java.util.function.DoubleSupplier;
-import java.util.function.Supplier;
-
+import javafx.scene.control.IndexedCell;
 import javafx.scene.control.IndexedCellShim;
 import javafx.scene.control.ScrollBar;
 import javafx.scene.control.skin.VirtualFlowShim;
 import javafx.scene.control.skin.VirtualFlowShim.ArrayLinkedListShim;
+import javafx.scene.input.ScrollEvent;
+import javafx.scene.layout.HBox;
+import javafx.scene.shape.Circle;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import test.javafx.scene.control.SkinStub;
 
 /**
  * Tests for the VirtualFlow class. VirtualFlow is the guts of the ListView,
@@ -82,7 +75,8 @@ public class VirtualFlowTest {
     private VirtualFlowShim<IndexedCell> flow;
 
 
-    @Before public void setUp() {
+    @BeforeEach
+    public void setUp() {
         prefSizeCounter = 0;
         list = new ArrayLinkedListShim<>();
         a = new CellStub(flow, "A");
@@ -142,17 +136,19 @@ private void pulse() {
      * list are exactly the same.
      */
     private void assertMatch(List<IndexedCell> control, AbstractList<IndexedCell> list) {
-        assertEquals("The control and list did not have the same sizes. " +
-                     "Expected " + control.size() + " but was " + list.size(),
-                     control.size(), list.size());
+        assertEquals(
+                     control.size(), list.size(),
+                     "The control and list did not have the same sizes. " +
+                     "Expected " + control.size() + " but was " + list.size());
         int index = 0;
         Iterator<IndexedCell> itr = control.iterator();
         while (itr.hasNext()) {
             IndexedCell cell = itr.next();
             IndexedCell cell2 = list.get(index);
-            assertSame("The control and list did not have the same item at " +
-                       "index " + index + ". Expected " + cell + " but was " + cell2,
-                       cell, cell2);
+            assertSame(
+                       cell, cell2,
+                       "The control and list did not have the same item at " +
+                       "index " + index + ". Expected " + cell + " but was " + cell2);
             index++;
         }
     }
@@ -166,39 +162,47 @@ public <T extends IndexedCell> void assertMinimalNumberOfCellsAreUsed(VirtualFlo
         IndexedCell lastCell = VirtualFlowShim.<T>cells_getLast(flow.cells);
         if (flow.isVertical()) {
             // First make sure that enough cells were created
-            assertTrue("There is a gap between the top of the viewport and the first cell",
-                       firstCell.getLayoutY() <= 0);
-            assertTrue("There is a gap between the bottom of the last cell and the bottom of the viewport",
-                       lastCell.getLayoutY() + lastCell.getHeight() >= flow.getViewportLength());
+            assertTrue(
+                       firstCell.getLayoutY() <= 0,
+                       "There is a gap between the top of the viewport and the first cell");
+            assertTrue(
+                       lastCell.getLayoutY() + lastCell.getHeight() >= flow.getViewportLength(),
+                       "There is a gap between the bottom of the last cell and the bottom of the viewport");
 
             // Now make sure that no extra cells were created.
             if (VirtualFlowShim.cells_size(flow.cells) > 3) {
                 IndexedCell secondLastCell = VirtualFlowShim.<T>cells_get(flow.cells, VirtualFlowShim.cells_size(flow.cells) - 2);
                 IndexedCell secondCell = VirtualFlowShim.<T>cells_get(flow.cells, 1);
-                assertFalse("There are more cells created before the start of " +
-                            "the flow than necessary",
-                            secondCell.getLayoutY() <= 0);
-                assertFalse("There are more cells created after the end of the " +
-                            "flow than necessary",
-                            secondLastCell.getLayoutY() + secondLastCell.getHeight() >= flow.getViewportLength());
+                assertFalse(
+                            secondCell.getLayoutY() <= 0,
+                            "There are more cells created before the start of " +
+                            "the flow than necessary");
+                assertFalse(
+                            secondLastCell.getLayoutY() + secondLastCell.getHeight() >= flow.getViewportLength(),
+                            "There are more cells created after the end of the " +
+                            "flow than necessary");
             }
         } else {
             // First make sure that enough cells were created
-            assertTrue("There is a gap between the left of the viewport and the first cell",
-                       firstCell.getLayoutX() <= 0);
-            assertTrue("There is a gap between the right of the last cell and the right of the viewport",
-                       lastCell.getLayoutX() + lastCell.getWidth() >= flow.getViewportLength());
+            assertTrue(
+                       firstCell.getLayoutX() <= 0,
+                       "There is a gap between the left of the viewport and the first cell");
+            assertTrue(
+                       lastCell.getLayoutX() + lastCell.getWidth() >= flow.getViewportLength(),
+                       "There is a gap between the right of the last cell and the right of the viewport");
 
             // Now make sure that no extra cells were created.
             if (VirtualFlowShim.cells_size(flow.cells) > 3) {
                 IndexedCell secondLastCell = VirtualFlowShim.<T>cells_get(flow.cells, VirtualFlowShim.cells_size(flow.cells) - 2);
                 IndexedCell secondCell = VirtualFlowShim.<T>cells_get(flow.cells, 1);
-                assertFalse("There are more cells created before the start of " +
-                            "the flow than necessary",
-                            secondCell.getLayoutX() <= 0);
-                assertFalse("There are more cells created after the end of the " +
-                            "flow than necessary",
-                            secondLastCell.getLayoutX() + secondLastCell.getWidth() >= flow.getViewportLength());
+                assertFalse(
+                            secondCell.getLayoutX() <= 0,
+                            "There are more cells created before the start of " +
+                            "the flow than necessary");
+                assertFalse(
+                            secondLastCell.getLayoutX() + secondLastCell.getWidth() >= flow.getViewportLength(),
+                            "There are more cells created after the end of the " +
+                            "flow than necessary");
             }
         }
     }
@@ -248,18 +252,18 @@ public <T extends IndexedCell> void assertMinimalNumberOfCellsAreUsed(VirtualFlo
     @Test public void testGeneralLayout_NoCells() {
         flow.setCellCount(0);
         pulse();
-        assertFalse("The hbar should have been invisible", flow.shim_getHbar().isVisible());
-        assertFalse("The vbar should have been invisible", flow.shim_getVbar().isVisible());
-        assertFalse("The corner should have been invisible", flow.get_corner().isVisible());
+        assertFalse(flow.shim_getHbar().isVisible(), "The hbar should have been invisible");
+        assertFalse(flow.shim_getVbar().isVisible(), "The vbar should have been invisible");
+        assertFalse(flow.get_corner().isVisible(), "The corner should have been invisible");
         assertEquals(flow.getWidth(), flow.get_clipView_getWidth(), 0.0);
         assertEquals(flow.getHeight(), flow.get_clipView_getHeight(), 0.0);
         assertMinimalNumberOfCellsAreUsed(flow);
 
         flow.setVertical(false);
         pulse();
-        assertFalse("The hbar should have been invisible", flow.shim_getHbar().isVisible());
-        assertFalse("The vbar should have been invisible", flow.shim_getVbar().isVisible());
-        assertFalse("The corner should have been invisible", flow.get_corner().isVisible());
+        assertFalse(flow.shim_getHbar().isVisible(), "The hbar should have been invisible");
+        assertFalse(flow.shim_getVbar().isVisible(), "The vbar should have been invisible");
+        assertFalse(flow.get_corner().isVisible(), "The corner should have been invisible");
 //        assertEquals(flow.getWidth(), flow.get_clipView_getWidth(), 0.0);
         assertEquals(flow.getWidth(),
                 flow.get_clipView_getWidth(), 0.0);
@@ -275,9 +279,9 @@ public <T extends IndexedCell> void assertMinimalNumberOfCellsAreUsed(VirtualFlo
     @Test public void testGeneralLayout_FewCells() {
         flow.setCellCount(3);
         pulse();
-        assertFalse("The hbar should have been invisible", flow.shim_getHbar().isVisible());
-        assertFalse("The vbar should have been invisible", flow.shim_getVbar().isVisible());
-        assertFalse("The corner should have been invisible", flow.get_corner().isVisible());
+        assertFalse(flow.shim_getHbar().isVisible(), "The hbar should have been invisible");
+        assertFalse(flow.shim_getVbar().isVisible(), "The vbar should have been invisible");
+        assertFalse(flow.get_corner().isVisible(), "The corner should have been invisible");
         assertEquals(flow.getWidth(), flow.get_clipView_getWidth(), 0.0);
         assertEquals(flow.getHeight(), flow.get_clipView_getHeight(), 0.0);
         assertEquals(12, VirtualFlowShim.cells_size(flow.cells)); // we stil have 12 cells (300px / 25px), even if only three filled cells exist
@@ -285,9 +289,9 @@ public <T extends IndexedCell> void assertMinimalNumberOfCellsAreUsed(VirtualFlo
 
         flow.setVertical(false);
         pulse();
-        assertFalse("The hbar should have been invisible", flow.shim_getHbar().isVisible());
-        assertFalse("The vbar should have been invisible", flow.shim_getVbar().isVisible());
-        assertFalse("The corner should have been invisible", flow.get_corner().isVisible());
+        assertFalse(flow.shim_getHbar().isVisible(), "The hbar should have been invisible");
+        assertFalse(flow.shim_getVbar().isVisible(), "The vbar should have been invisible");
+        assertFalse(flow.get_corner().isVisible(), "The corner should have been invisible");
         assertEquals(flow.getWidth(), flow.get_clipView_getWidth(), 0.0);
         assertEquals(flow.getHeight(), flow.get_clipView_getHeight(), 0.0);
 //        assertEquals(3, VirtualFlowShim.cells_size(flow.cells));
@@ -303,9 +307,9 @@ public <T extends IndexedCell> void assertMinimalNumberOfCellsAreUsed(VirtualFlo
         flow.setCellCount(3);
         flow.resize(50, flow.getHeight());
         pulse();
-        assertTrue("The hbar should have been visible", flow.shim_getHbar().isVisible());
-        assertFalse("The vbar should have been invisible", flow.shim_getVbar().isVisible());
-        assertFalse("The corner should have been invisible", flow.get_corner().isVisible());
+        assertTrue(flow.shim_getHbar().isVisible(), "The hbar should have been visible");
+        assertFalse(flow.shim_getVbar().isVisible(), "The vbar should have been invisible");
+        assertFalse(flow.get_corner().isVisible(), "The corner should have been invisible");
         assertEquals(flow.getWidth(), flow.get_clipView_getWidth(), 0.0);
         assertEquals(flow.getHeight(), flow.get_clipView_getHeight() + flow.shim_getHbar().getHeight(), 0.0);
         assertEquals(flow.shim_getHbar().getLayoutY(), flow.getHeight() - flow.shim_getHbar().getHeight(), 0.0);
@@ -314,9 +318,9 @@ public <T extends IndexedCell> void assertMinimalNumberOfCellsAreUsed(VirtualFlo
         flow.setVertical(false);
         flow.resize(300, 50);
         pulse();
-        assertFalse("The hbar should have been invisible", flow.shim_getHbar().isVisible());
-        assertTrue("The vbar should have been visible", flow.shim_getVbar().isVisible());
-        assertFalse("The corner should have been invisible", flow.get_corner().isVisible());
+        assertFalse(flow.shim_getHbar().isVisible(), "The hbar should have been invisible");
+        assertTrue(flow.shim_getVbar().isVisible(), "The vbar should have been visible");
+        assertFalse(flow.get_corner().isVisible(), "The corner should have been invisible");
         assertEquals(flow.getWidth(), flow.get_clipView_getWidth() + flow.shim_getVbar().getWidth(), 0.0);
         assertEquals(flow.getHeight(), flow.get_clipView_getHeight(), 0.0);
         assertEquals(flow.shim_getVbar().getLayoutX(), flow.getWidth() - flow.shim_getVbar().getWidth(), 0.0);
@@ -334,9 +338,9 @@ public <T extends IndexedCell> void assertMinimalNumberOfCellsAreUsed(VirtualFlo
         pulse();
         flow.resize(300, flow.getHeight());
         pulse();
-        assertFalse("The hbar should have been invisible", flow.shim_getHbar().isVisible());
-        assertFalse("The vbar should have been invisible", flow.shim_getVbar().isVisible());
-        assertFalse("The corner should have been invisible", flow.get_corner().isVisible());
+        assertFalse(flow.shim_getHbar().isVisible(), "The hbar should have been invisible");
+        assertFalse(flow.shim_getVbar().isVisible(), "The vbar should have been invisible");
+        assertFalse(flow.get_corner().isVisible(), "The corner should have been invisible");
         assertEquals(flow.getWidth(), flow.get_clipView_getWidth(), 0.0);
         assertEquals(flow.getHeight(), flow.get_clipView_getHeight(), 0.0);
         assertMinimalNumberOfCellsAreUsed(flow);
@@ -346,9 +350,9 @@ public <T extends IndexedCell> void assertMinimalNumberOfCellsAreUsed(VirtualFlo
         pulse();
         flow.resize(flow.getWidth(), 300);
         pulse();
-        assertFalse("The hbar should have been invisible", flow.shim_getHbar().isVisible());
-        assertFalse("The vbar should have been invisible", flow.shim_getVbar().isVisible());
-        assertFalse("The corner should have been invisible", flow.get_corner().isVisible());
+        assertFalse(flow.shim_getHbar().isVisible(), "The hbar should have been invisible");
+        assertFalse(flow.shim_getVbar().isVisible(), "The vbar should have been invisible");
+        assertFalse(flow.get_corner().isVisible(), "The corner should have been invisible");
         assertEquals(flow.getWidth(), flow.get_clipView_getWidth(), 0.0);
         assertEquals(flow.getHeight(), flow.get_clipView_getHeight(), 0.0);
         assertMinimalNumberOfCellsAreUsed(flow);
@@ -363,9 +367,9 @@ public <T extends IndexedCell> void assertMinimalNumberOfCellsAreUsed(VirtualFlo
      * Be sure to test for this explicitly some time!
      */
     @Test public void testGeneralLayout_ManyCells() {
-        assertFalse("The hbar should have been invisible", flow.shim_getHbar().isVisible());
-        assertTrue("The vbar should have been visible", flow.shim_getVbar().isVisible());
-        assertFalse("The corner should have been invisible", flow.get_corner().isVisible());
+        assertFalse(flow.shim_getHbar().isVisible(), "The hbar should have been invisible");
+        assertTrue(flow.shim_getVbar().isVisible(), "The vbar should have been visible");
+        assertFalse(flow.get_corner().isVisible(), "The corner should have been invisible");
         assertEquals(flow.getWidth(), flow.get_clipView_getWidth() + flow.shim_getVbar().getWidth(), 0.0);
         assertEquals(flow.getHeight(), flow.get_clipView_getHeight(), 0.0);
         assertEquals(flow.shim_getVbar().getLayoutX(), flow.getWidth() - flow.shim_getVbar().getWidth(), 0.0);
@@ -373,9 +377,9 @@ public <T extends IndexedCell> void assertMinimalNumberOfCellsAreUsed(VirtualFlo
 
         flow.setVertical(false);
         pulse();
-        assertTrue("The hbar should have been visible", flow.shim_getHbar().isVisible());
-        assertFalse("The vbar should have been invisible", flow.shim_getVbar().isVisible());
-        assertFalse("The corner should have been invisible", flow.get_corner().isVisible());
+        assertTrue(flow.shim_getHbar().isVisible(), "The hbar should have been visible");
+        assertFalse(flow.shim_getVbar().isVisible(), "The vbar should have been invisible");
+        assertFalse(flow.get_corner().isVisible(), "The corner should have been invisible");
         assertEquals(flow.getWidth(), flow.get_clipView_getWidth(), 0.0);
         assertEquals(flow.getHeight(), flow.get_clipView_getHeight() + flow.shim_getHbar().getHeight(), 0.0);
         assertEquals(flow.shim_getHbar().getLayoutY(), flow.getHeight() - flow.shim_getHbar().getHeight(), 0.0);
@@ -391,9 +395,9 @@ public <T extends IndexedCell> void assertMinimalNumberOfCellsAreUsed(VirtualFlo
         pulse();
         flow.setCellCount(100);
         pulse();
-        assertFalse("The hbar should have been invisible", flow.shim_getHbar().isVisible());
-        assertTrue("The vbar should have been visible", flow.shim_getVbar().isVisible());
-        assertFalse("The corner should have been invisible", flow.get_corner().isVisible());
+        assertFalse(flow.shim_getHbar().isVisible(), "The hbar should have been invisible");
+        assertTrue(flow.shim_getVbar().isVisible(), "The vbar should have been visible");
+        assertFalse(flow.get_corner().isVisible(), "The corner should have been invisible");
         assertEquals(flow.getWidth(), flow.get_clipView_getWidth() + flow.shim_getVbar().getWidth(), 0.0);
         assertEquals(flow.getHeight(), flow.get_clipView_getHeight(), 0.0);
         assertEquals(flow.shim_getVbar().getLayoutX(), flow.getWidth() - flow.shim_getVbar().getWidth(), 0.0);
@@ -404,9 +408,9 @@ public <T extends IndexedCell> void assertMinimalNumberOfCellsAreUsed(VirtualFlo
         pulse();
         flow.setCellCount(100);
         pulse();
-        assertTrue("The hbar should have been visible", flow.shim_getHbar().isVisible());
-        assertFalse("The vbar should have been invisible", flow.shim_getVbar().isVisible());
-        assertFalse("The corner should have been invisible", flow.get_corner().isVisible());
+        assertTrue(flow.shim_getHbar().isVisible(), "The hbar should have been visible");
+        assertFalse(flow.shim_getVbar().isVisible(), "The vbar should have been invisible");
+        assertFalse(flow.get_corner().isVisible(), "The corner should have been invisible");
         assertEquals(flow.getWidth(), flow.get_clipView_getWidth(), 0.0);
         assertEquals(flow.getHeight(), flow.get_clipView_getHeight() + flow.shim_getHbar().getHeight(), 0.0);
         assertEquals(flow.shim_getHbar().getLayoutY(), flow.getHeight() - flow.shim_getHbar().getHeight(), 0.0);
@@ -420,9 +424,9 @@ public <T extends IndexedCell> void assertMinimalNumberOfCellsAreUsed(VirtualFlo
     @Test public void testGeneralLayout_ManyCellsAndWide() {
         flow.resize(50, flow.getHeight());
         pulse();
-        assertTrue("The hbar should have been visible", flow.shim_getHbar().isVisible());
-        assertTrue("The vbar should have been visible", flow.shim_getVbar().isVisible());
-        assertTrue("The corner should have been visible", flow.get_corner().isVisible());
+        assertTrue(flow.shim_getHbar().isVisible(), "The hbar should have been visible");
+        assertTrue(flow.shim_getVbar().isVisible(), "The vbar should have been visible");
+        assertTrue(flow.get_corner().isVisible(), "The corner should have been visible");
         assertEquals(flow.getWidth(), flow.get_clipView_getWidth() + flow.shim_getVbar().getWidth(), 0.0);
         assertEquals(flow.getHeight(), flow.get_clipView_getHeight() + flow.shim_getHbar().getHeight(), 0.0);
         assertEquals(flow.shim_getVbar().getLayoutX(), flow.getWidth() - flow.shim_getVbar().getWidth(), 0.0);
@@ -437,9 +441,9 @@ public <T extends IndexedCell> void assertMinimalNumberOfCellsAreUsed(VirtualFlo
         flow.setVertical(false);
         flow.resize(300, 50);
         pulse();
-        assertTrue("The hbar should have been visible", flow.shim_getHbar().isVisible());
-        assertTrue("The vbar should have been visible", flow.shim_getVbar().isVisible());
-        assertTrue("The corner should have been visible", flow.get_corner().isVisible());
+        assertTrue(flow.shim_getHbar().isVisible(), "The hbar should have been visible");
+        assertTrue(flow.shim_getVbar().isVisible(), "The vbar should have been visible");
+        assertTrue(flow.get_corner().isVisible(), "The corner should have been visible");
         assertEquals(flow.getWidth(), flow.get_clipView_getWidth() + flow.shim_getVbar().getWidth(), 0.0);
         assertEquals(flow.getHeight(), flow.get_clipView_getHeight() + flow.shim_getHbar().getHeight(), 0.0);
         assertEquals(flow.shim_getVbar().getLayoutX(), flow.getWidth() - flow.shim_getVbar().getWidth(), 0.0);
@@ -503,7 +507,7 @@ public <T extends IndexedCell> void assertMinimalNumberOfCellsAreUsed(VirtualFlo
      * updated when we encounter a new cell (while scrolling for example) that
      * has a larger pref.
      */
-    @Ignore
+    @Disabled
     @Test public void testGeneralLayout_maxPrefBreadthUpdatedWhenEncounterLargerPref() {
         flow.setPosition(.28);
         pulse();
@@ -514,7 +518,7 @@ public <T extends IndexedCell> void assertMinimalNumberOfCellsAreUsed(VirtualFlo
      * Tests that if we encounter cells or pages of cells with smaller prefs
      * than the max pref that we will keep the max pref the same.
      */
-    @Ignore
+    @Disabled
     @Test public void testGeneralLayout_maxPrefBreadthRemainsSameWhenEncounterSmallerPref() {
         flow.setPosition(.28);
         pulse();
@@ -534,7 +538,7 @@ public <T extends IndexedCell> void assertMinimalNumberOfCellsAreUsed(VirtualFlo
     /**
      * Tests that changes to the cell count will not affect maxPrefBreadth.
      */
-    @Ignore
+    @Disabled
     @Test public void testGeneralLayout_maxPrefBreadthUnaffectedByCellCountChanges() {
         flow.setCellCount(10);
         pulse();
@@ -601,18 +605,18 @@ public <T extends IndexedCell> void assertMinimalNumberOfCellsAreUsed(VirtualFlo
     }
 
     @Test public void testGeneralLayout_ScrollToEndOfVirtual_BarStillVisible() {
-        assertTrue("The vbar was expected to be visible", flow.shim_getVbar().isVisible());
+        assertTrue(flow.shim_getVbar().isVisible(), "The vbar was expected to be visible");
         flow.setPosition(1);
         pulse();
-        assertTrue("The vbar was expected to be visible", flow.shim_getVbar().isVisible());
+        assertTrue(flow.shim_getVbar().isVisible(), "The vbar was expected to be visible");
 
         flow.setPosition(0);
         flow.setVertical(false);
         pulse();
-        assertTrue("The hbar was expected to be visible", flow.shim_getHbar().isVisible());
+        assertTrue(flow.shim_getHbar().isVisible(), "The hbar was expected to be visible");
         flow.setPosition(1);
         pulse();
-        assertTrue("The hbar was expected to be visible", flow.shim_getHbar().isVisible());
+        assertTrue(flow.shim_getHbar().isVisible(), "The hbar was expected to be visible");
     }
 
     // Need to test all the resize operations and make sure the position of
@@ -644,7 +648,7 @@ public <T extends IndexedCell> void assertMinimalNumberOfCellsAreUsed(VirtualFlo
         // and their heights, we should have more cells than we have space to
         // fit them and so only enough cells should be created to meet our
         // needs and not any more than that
-        assertTrue("All of the cells were created", VirtualFlowShim.cells_size(flow.cells) < flow.getCellCount());
+        assertTrue(VirtualFlowShim.cells_size(flow.cells) < flow.getCellCount(), "All of the cells were created");
         assertMinimalNumberOfCellsAreUsed(flow);
     }
 
@@ -727,7 +731,7 @@ public <T extends IndexedCell> void assertMinimalNumberOfCellsAreUsed(VirtualFlo
      * the cell for item #29), then the max pref is updated and the cells are
      * all resized to match.
      */
-    @Ignore
+    @Disabled
     @Test public void testCellLayout_ScrollingFindsCellWithLargemaxPrefBreadth() {
         flow.resize(50, flow.getHeight());
         flow.setPosition(.28); // happens to position such that #29 is visible
@@ -850,7 +854,7 @@ protected double computePrefHeight(double width) {
 
     @Test public void testCellLifeCycle_CellsAreCreatedOnLayout() {
         // when the flow was first created in setUp we do a layout()
-        assertTrue("The cells didn't get created", VirtualFlowShim.cells_size(flow.cells) > 0);
+        assertTrue(VirtualFlowShim.cells_size(flow.cells) > 0, "The cells didn't get created");
     }
 
 
@@ -931,10 +935,10 @@ protected double computePrefHeight(double width) {
     @Test public void testCreateCellFunctionChangesResultInNeedsLayoutAndNoCellsAndNoAccumCell() {
         assertFalse(flow.isNeedsLayout());
         flow.getCellLength(49); // forces accum cell to be created
-        assertNotNull("Accum cell was null", flow.get_accumCell());
+        assertNotNull(flow.get_accumCell(), "Accum cell was null");
         flow.setCellFactory(p -> new CellStub(flow));
         assertTrue(flow.isNeedsLayout());
-        assertNull("accumCell didn't get cleared", flow.get_accumCell());
+        assertNull(flow.get_accumCell(), "accumCell didn't get cleared");
     }
 
 
@@ -954,7 +958,7 @@ protected double computePrefHeight(double width) {
         pulse();
         assertEquals(100, flow.getCellCount());
         for (int i = 0; i < 50; i++) {
-            if (i != 29) assertEquals("Bad index: " + i, 25, flow.getCellLength(i), 0.0);
+            if (i != 29) assertEquals(25, flow.getCellLength(i), 0.0, "Bad index: " + i);
         }
     }
 
@@ -1050,7 +1054,7 @@ protected double computeMinHeight(double width) {
         flow.addLeadingCells(1, 0);
         flow.sheetChildren.addListener((InvalidationListener) (o) -> {
             int count = ((List) o).size();
-            assertTrue(Integer.toString(count), count <= 100);
+            assertTrue(count <= 100, Integer.toString(count));
         });
         flow.addTrailingCells(true);
     }
@@ -1117,7 +1121,7 @@ protected double computeMinHeight(double width) {
         flow.resize(50, flow.getHeight());
         flow.setPosition(1);
         pulse();
-        assertTrue("The hbar should have been visible", flow.shim_getHbar().isVisible());
+        assertTrue(flow.shim_getHbar().isVisible(), "The hbar should have been visible");
         assertMinimalNumberOfCellsAreUsed(flow);
         assertEquals(flow.getViewportLength()-25.0, VirtualFlowShim.<IndexedCell>cells_getLast(flow.cells).getLayoutY(), 0.0);
     }
@@ -1149,7 +1153,7 @@ private void assertLastCellInsideViewport(boolean vertical) {
         double cellLength = flow.getCellLength(count);
         double viewportLength = flow.getViewportLength();
 
-        assertEquals("Last cell must end on viewport size", viewportLength, (cellPosition + cellLength), 0.1);
+        assertEquals(viewportLength, (cellPosition + cellLength), 0.1, "Last cell must end on viewport size");
     }
 
     @Test
@@ -1186,7 +1190,7 @@ protected double computeMaxHeight(double width) {
         IndexedCell<?> cell = flow.getCell(cellCount - 1);
         double cellPosition = flow.getCellPosition(cell);
 
-        assertEquals("Last cell must be aligned to top of the viewport", 0, cellPosition, 0.1);
+        assertEquals(0, cellPosition, 0.1, "Last cell must be aligned to top of the viewport");
     }
 
     @Test
@@ -1221,14 +1225,14 @@ public void testPositionCellRemainsConstant() {
 
         IndexedCell vc = flow.getCell(0);
         double cellPosition = flow.getCellPosition(vc);
-        assertEquals("Wrong first cell position", -10d, cellPosition, 0d);
+        assertEquals(-10d, cellPosition, 0d, "Wrong first cell position");
 
         for (int i = 1; i < 10; i++) {
             flow.setCellCount(20 + i);
             pulse();
             vc = flow.getCell(0);
             cellPosition = flow.getCellPosition(vc);
-            assertEquals("Wrong first cell position after inserting " + i + " cells", -10d, cellPosition, 0d);
+            assertEquals(-10d, cellPosition, 0d, "Wrong first cell position after inserting " + i + " cells");
         }
     }
 
@@ -1251,14 +1255,14 @@ public void testPositionCellRemainsConstantWithManyItems() {
         IndexedCell vc = flow.getCell(33);
         double cellPosition = flow.getCellPosition(vc);
         // cell 33 should be at (32 x 25 + 1 x 100) - 911 = -11
-        assertEquals("Wrong first cell position", -11d, cellPosition, 0d);
+        assertEquals(-11d, cellPosition, 0d, "Wrong first cell position");
 
         for (int i = 1; i < 10; i++) {
             flow.setCellCount(100 + i);
             pulse();
             vc = flow.getCell(33);
             cellPosition = flow.getCellPosition(vc);
-            assertEquals("First cell position changed after adding " + i + " cells on large irregular list", -11d, cellPosition, 0d);
+            assertEquals(-11d, cellPosition, 0d, "First cell position changed after adding " + i + " cells on large irregular list");
         }
     }
 
@@ -1273,26 +1277,26 @@ public void testSheetChildrenRemainsConstant() {
         pulse();
 
         int sheetChildrenSize = flow.sheetChildren.size();
-        assertEquals("Wrong number of sheet children", 12, sheetChildrenSize);
+        assertEquals(12, sheetChildrenSize, "Wrong number of sheet children");
 
         for (int i = 1; i < 50; i++) {
             flow.setCellCount(20 + i);
             pulse();
             sheetChildrenSize = flow.sheetChildren.size();
-            assertEquals("Wrong number of sheet children after inserting " + i + " items", 12, sheetChildrenSize);
+            assertEquals(12, sheetChildrenSize, "Wrong number of sheet children after inserting " + i + " items");
         }
 
         for (int i = 1; i < 50; i++) {
             flow.setCellCount(70 - i);
             pulse();
             sheetChildrenSize = flow.sheetChildren.size();
-            assertEquals("Wrong number of sheet children after removing " + i + " items", 12, sheetChildrenSize);
+            assertEquals(12, sheetChildrenSize, "Wrong number of sheet children after removing " + i + " items");
         }
 
         flow.setCellCount(0);
         pulse();
         sheetChildrenSize = flow.sheetChildren.size();
-        assertEquals("Wrong number of sheet children after removing all items", 12, sheetChildrenSize);
+        assertEquals(12, sheetChildrenSize, "Wrong number of sheet children after removing all items");
     }
 
     @Test
@@ -1323,7 +1327,7 @@ protected double computeMinHeight(double width) {
         pulse();
         flow.sheetChildren.addListener((InvalidationListener) (o) -> {
             int count = ((List) o).size();
-            assertTrue(Integer.toString(count), count < 101);
+            assertTrue(count < 101, Integer.toString(count));
         });
         flow.scrollTo(99);
         pulse();
@@ -1453,10 +1457,10 @@ protected double computeMaxHeight(double width) {
         double orig = flow.getPosition();
         flow.scrollPixels(10);
         double pos = flow.getPosition();
-        assertFalse("Moving in positive direction should not decrease position", pos < orig);
+        assertFalse(pos < orig, "Moving in positive direction should not decrease position");
         flow.scrollPixels(-50);
         double neg = flow.getPosition();
-        assertFalse("Moving in negative direction should not increase position", neg > pos);
+        assertFalse(neg > pos, "Moving in negative direction should not increase position");
     }
 
     @Test public void testReverseOrderForCircleFlow() {
@@ -1464,10 +1468,10 @@ protected double computeMaxHeight(double width) {
         double orig = vf.getPosition();
         vf.scrollPixels(10);
         double pos = vf.getPosition();
-        assertFalse("Moving in positive direction should not decrease position", pos < orig);
+        assertFalse(pos < orig, "Moving in positive direction should not decrease position");
         vf.scrollPixels(-50);
         double neg = vf.getPosition();
-        assertFalse("Moving in negative direction should not increase position", neg > pos);
+        assertFalse(neg > pos, "Moving in negative direction should not increase position");
     }
 
     @Test public void testGradualMoveForCircleFlow() {
@@ -1493,11 +1497,11 @@ protected double computeMaxHeight(double width) {
                 double diff = Math.abs((newDelta-delta)/newDelta);
                 // System.err.println("diff = "+diff);
                 // maximum 10% difference allowed
-                assertTrue("Too much variation while scrolling (from "+s0+" to "+s1+")", diff < 0.1);
+                assertTrue(diff < 0.1, "Too much variation while scrolling (from "+s0+" to "+s1+")");
             }
             // System.err.println("S1 = "+s1);
             // System.err.println("pos = "+vf.getPosition());
-            assertFalse("Thumb moving in the wrong direction at index ", s1 < s0);
+            assertFalse(s1 < s0, "Thumb moving in the wrong direction at index ");
             s0 = s1;
             delta = newDelta;
             position = newPosition;

From 5bec3f8e83f514063b767585b039d27c0bb46a0f Mon Sep 17 00:00:00 2001
From: Jay Bhaskar <jbhaskar@openjdk.org>
Date: Tue, 24 Sep 2024 00:26:43 +0000
Subject: [PATCH 48/75] 8339511: [TestBug] Convert Non parametrized base tests
 to JUnit 5

Reviewed-by: kcr, angorya
---
 .../BidirectionalContentBindingListTest.java  |  44 +--
 .../BidirectionalContentBindingMapTest.java   |  44 +--
 .../BidirectionalContentBindingSetTest.java   |  44 +--
 .../binding/ContentBindingListTest.java       |  53 ++--
 .../javafx/binding/ContentBindingMapTest.java |  38 +--
 .../javafx/binding/ContentBindingSetTest.java |  44 +--
 .../javafx/binding/ErrorLoggingUtiltity.java  |   2 +-
 .../binding/ExpressionHelperBaseTest.java     |   6 +-
 .../javafx/binding/ExpressionHelperTest.java  |  50 ++--
 .../binding/ExpressionHelperUtilityTest.java  |  26 +-
 .../binding/ListExpressionHelperTest.java     |  63 +++--
 .../binding/MapExpressionHelperTest.java      |  12 +-
 .../sun/javafx/binding/SelectBindingTest.java |  24 +-
 .../binding/SetExpressionHelperTest.java      |  12 +-
 .../javafx/binding/StringFormatterTest.java   | 168 +++++++-----
 .../com/sun/javafx/binding/TestLogging.java   |   2 +-
 .../collections/ListListenerHelperTest.java   |  37 ++-
 .../collections/MapListenerHelperTest.java    |  38 ++-
 .../javafx/collections/MappingChangeTest.java |   8 +-
 .../collections/NonIterableChangeTest.java    |   8 +-
 .../collections/SetListenerHelperTest.java    |  38 ++-
 .../event/CompositeEventDispatcherTest.java   |  76 +++---
 .../event/CompositeEventHandlerTest.java      | 104 +++----
 .../javafx/event/EventChangingDispatcher.java |   8 +-
 .../javafx/event/EventDispatchTreeTest.java   | 117 ++++----
 .../javafx/event/EventHandlerManagerTest.java | 229 +++++++++-------
 .../com/sun/javafx/runtime/ModuleTest.java    |   4 +-
 .../sun/javafx/runtime/VersionInfoTest.java   |  10 +-
 .../beans/InvalidationListenerMock.java       |   2 +-
 .../beans/WeakInvalidationListenerTest.java   |  16 +-
 .../property/BooleanPropertyBaseTest.java     |  31 ++-
 .../beans/property/BooleanPropertyTest.java   |   8 +-
 .../property/DoublePropertyBaseTest.java      |  31 ++-
 .../beans/property/DoublePropertyTest.java    |   8 +-
 .../beans/property/FloatPropertyBaseTest.java |  31 ++-
 .../beans/property/FloatPropertyTest.java     |   8 +-
 .../property/IntegerPropertyBaseTest.java     |  31 ++-
 .../beans/property/IntegerPropertyTest.java   |   8 +-
 .../beans/property/ListPropertyBaseTest.java  |  26 +-
 .../beans/property/ListPropertyTest.java      |   6 +-
 .../beans/property/LongPropertyBaseTest.java  |  31 ++-
 .../beans/property/LongPropertyTest.java      |   8 +-
 .../beans/property/MapPropertyBaseTest.java   |  26 +-
 .../beans/property/MapPropertyTest.java       |   6 +-
 .../property/ObjectPropertyBaseTest.java      |  32 ++-
 .../property/ObjectPropertyLeakTest.java      |   8 +-
 .../beans/property/ObjectPropertyTest.java    |   6 +-
 .../beans/property/PropertyReferenceTest.java |  43 +--
 .../PropertyReferenceWithInterfacesTest.java  |   8 +-
 .../ReadOnlyBooleanPropertyBaseTest.java      |   6 +-
 .../property/ReadOnlyBooleanPropertyTest.java |   9 +-
 .../property/ReadOnlyBooleanWrapperTest.java  |  31 ++-
 .../ReadOnlyDoublePropertyBaseTest.java       |   7 +-
 .../property/ReadOnlyDoublePropertyTest.java  |   9 +-
 .../property/ReadOnlyDoubleWrapperTest.java   |  31 ++-
 .../ReadOnlyFloatPropertyBaseTest.java        |   7 +-
 .../property/ReadOnlyFloatPropertyTest.java   |   9 +-
 .../property/ReadOnlyFloatWrapperTest.java    |  31 ++-
 .../ReadOnlyIntegerPropertyBaseTest.java      |   7 +-
 .../property/ReadOnlyIntegerPropertyTest.java |   8 +-
 .../property/ReadOnlyIntegerWrapperTest.java  |  31 ++-
 .../ReadOnlyListPropertyBaseTest.java         |   8 +-
 .../property/ReadOnlyListPropertyTest.java    |   8 +-
 .../property/ReadOnlyListWrapperTest.java     |  26 +-
 .../ReadOnlyLongPropertyBaseTest.java         |   6 +-
 .../property/ReadOnlyLongPropertyTest.java    |   8 +-
 .../property/ReadOnlyLongWrapperTest.java     |  31 ++-
 .../property/ReadOnlyMapPropertyBaseTest.java |   8 +-
 .../property/ReadOnlyMapPropertyTest.java     |   8 +-
 .../property/ReadOnlyMapWrapperTest.java      |  26 +-
 .../ReadOnlyObjectPropertyBaseTest.java       |   6 +-
 .../property/ReadOnlyObjectPropertyTest.java  |   8 +-
 .../property/ReadOnlyObjectWrapperTest.java   |  31 ++-
 .../property/ReadOnlySetPropertyBaseTest.java |   8 +-
 .../property/ReadOnlySetPropertyTest.java     |   8 +-
 .../property/ReadOnlySetWrapperTest.java      |  26 +-
 .../ReadOnlyStringPropertyBaseTest.java       |   6 +-
 .../property/ReadOnlyStringPropertyTest.java  |   8 +-
 .../property/ReadOnlyStringWrapperTest.java   |  31 ++-
 .../beans/property/SetPropertyBaseTest.java   |  26 +-
 .../beans/property/SetPropertyTest.java       |   6 +-
 .../property/SimpleBooleanPropertyTest.java   |   4 +-
 .../property/SimpleDoublePropertyTest.java    |   4 +-
 .../property/SimpleFloatPropertyTest.java     |   4 +-
 .../property/SimpleIntegerPropertyTest.java   |   4 +-
 .../property/SimpleListPropertyTest.java      |   4 +-
 .../property/SimpleLongPropertyTest.java      |   4 +-
 .../property/SimpleObjectPropertyTest.java    |   4 +-
 .../property/SimpleStringPropertyTest.java    |   4 +-
 .../property/StringPropertyBaseTest.java      |  31 ++-
 .../beans/property/StringPropertyTest.java    |   6 +-
 .../adapter/JavaBeanBooleanPropertyTest.java  |   2 +-
 .../JavaBeanBooleanProperty_prim_Test.java    |   2 +-
 .../adapter/JavaBeanDoublePropertyTest.java   |   2 +-
 .../JavaBeanDoubleProperty_prim_Test.java     |   2 +-
 .../JavaBeanFloatPropertyBuilderaTest.java    |   2 +-
 .../JavaBeanFloatProperty_prim_Test.java      |   2 +-
 .../adapter/JavaBeanIntegerPropertyTest.java  |   2 +-
 .../JavaBeanIntegerProperty_prim_Test.java    |   2 +-
 .../adapter/JavaBeanLongPropertyTest.java     |   2 +-
 .../JavaBeanLongProperty_prim_Test.java       |   2 +-
 .../adapter/JavaBeanObjectPropertyTest.java   |   2 +-
 .../adapter/JavaBeanStringPropertyTest.java   |   2 +-
 .../ReadOnlyJavaBeanBooleanPropertyTest.java  |   2 +-
 ...OnlyJavaBeanBooleanProperty_prim_Test.java |   2 +-
 .../ReadOnlyJavaBeanDoublePropertyTest.java   |   2 +-
 ...dOnlyJavaBeanDoubleProperty_prim_Test.java |   2 +-
 .../ReadOnlyJavaBeanFloatPropertyTest.java    |   2 +-
 ...adOnlyJavaBeanFloatProperty_prim_Test.java |   2 +-
 .../ReadOnlyJavaBeanIntegerPropertyTest.java  |   2 +-
 ...OnlyJavaBeanIntegerProperty_prim_Test.java |   2 +-
 .../ReadOnlyJavaBeanLongPropertyTest.java     |   2 +-
 ...eadOnlyJavaBeanLongProperty_prim_Test.java |   2 +-
 .../ReadOnlyJavaBeanObjectPropertyTest.java   |   2 +-
 .../ReadOnlyJavaBeanPropertyTestBase.java     |  33 ++-
 .../ReadOnlyJavaBeanStringPropertyTest.java   |   2 +-
 .../beans/value/ChangeListenerMock.java       |   2 +-
 .../beans/value/ObservableValueBaseTest.java  |  35 ++-
 .../ObservableValueFluentBindingsTest.java    |   1 +
 .../beans/value/WeakChangeListenerTest.java   |  11 +-
 .../javafx/binding/BindingToStringTest.java   |   8 +-
 .../javafx/binding/BindingsArrayTest.java     | 254 ++++++++++++------
 .../javafx/binding/BindingsBooleanTest.java   |  57 ++--
 .../javafx/binding/BindingsIsNullTest.java    |  25 +-
 .../test/javafx/binding/BindingsListTest.java | 254 ++++++++++++------
 .../test/javafx/binding/BindingsMapTest.java  | 193 ++++++++-----
 .../test/javafx/binding/BindingsSetTest.java  |  29 +-
 .../test/javafx/binding/DependencyUtils.java  |   2 +-
 .../test/javafx/binding/ListBindingTest.java  |  10 +-
 .../test/javafx/binding/MapBindingTest.java   |   8 +-
 .../test/javafx/binding/SetBindingTest.java   |   8 +-
 .../test/javafx/binding/WhenTestBase.java     |  42 ++-
 .../AbstractNumberExpressionTest.java         |  47 ++--
 .../expression/BooleanExpressionTest.java     |  17 +-
 .../expression/DoubleExpressionTest.java      |  17 +-
 .../expression/FloatExpressionTest.java       |  17 +-
 .../expression/IntegerExpressionTest.java     |  18 +-
 .../expression/ListExpressionTest.java        |  19 +-
 .../expression/LongExpressionTest.java        |  18 +-
 .../binding/expression/MapExpressionTest.java |   8 +-
 .../expression/ObjectExpressionTest.java      |  20 +-
 .../binding/expression/SetExpressionTest.java |   8 +-
 .../expression/StringExpressionTest.java      |  20 +-
 .../javafx/collections/FXCollectionsTest.java |  13 +-
 .../collections/ListChangeBuilderTest.java    |  52 ++--
 .../javafx/collections/MockArrayObserver.java |  32 +--
 .../javafx/collections/MockListObserver.java  |  14 +-
 .../javafx/collections/MockMapObserver.java   |  10 +-
 .../javafx/collections/MockSetObserver.java   |  12 +-
 .../collections/TransformationListTest.java   |  12 +-
 .../VetoableObservableListTest.java           | 140 +++++-----
 .../WeakListChangeListenerTest.java           |  11 +-
 .../WeakMapChangeListenerTest.java            |  11 +-
 .../WeakSetChangeListenerTest.java            |  11 +-
 .../event/EventSerializationEventExists.java  |  12 +-
 .../javafx/event/EventSerializationTest.java  |  18 +-
 .../java/test/javafx/event/EventTest.java     |  10 +-
 .../java/test/javafx/util/DurationTest.java   |   8 +-
 .../BigDecimalStringConverterTest.java        |   8 +-
 .../BigIntegerStringConverterTest.java        |  10 +-
 .../converter/BooleanStringConverterTest.java |   8 +-
 .../converter/ByteStringConverterTest.java    |  10 +-
 .../CharacterStringConverterTest.java         |  10 +-
 .../converter/DefaultStringConverterTest.java |   8 +-
 .../converter/DoubleStringConverterTest.java  |   8 +-
 .../converter/FloatStringConverterTest.java   |   8 +-
 .../converter/IntegerStringConverterTest.java |   8 +-
 .../converter/LongStringConverterTest.java    |   8 +-
 .../PercentageStringConverterTest.java        |   8 +-
 .../converter/ShortStringConverterTest.java   |   8 +-
 170 files changed, 2336 insertions(+), 1592 deletions(-)

diff --git a/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/BidirectionalContentBindingListTest.java b/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/BidirectionalContentBindingListTest.java
index 9db802c65cc..eb006e4f4f3 100644
--- a/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/BidirectionalContentBindingListTest.java
+++ b/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/BidirectionalContentBindingListTest.java
@@ -29,14 +29,14 @@
 import javafx.beans.binding.Bindings;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class BidirectionalContentBindingListTest {
 
@@ -47,7 +47,7 @@ public class BidirectionalContentBindingListTest {
     private List<Integer> list1;
     private List<Integer> list2;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         list0 = new ArrayList<>();
         list1 = new ArrayList<>(Arrays.asList(-1));
@@ -100,19 +100,25 @@ public void testBind() {
         assertEquals(list2_sorted, op2);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testBind_Null_X() {
-        Bindings.bindContentBidirectional(null, op2);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.bindContentBidirectional(null, op2);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testBind_X_Null() {
-        Bindings.bindContentBidirectional(op1, null);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.bindContentBidirectional(op1, null);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testBind_X_Self() {
-        Bindings.bindContentBidirectional(op1, op1);
+        assertThrows(IllegalArgumentException.class, () -> {
+            Bindings.bindContentBidirectional(op1, op1);
+        });
     }
 
     @Test
@@ -158,19 +164,25 @@ public void testUnbind() {
         assertEquals(list2, op2);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testUnbind_Null_X() {
-        Bindings.unbindContentBidirectional(null, op2);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.unbindContentBidirectional(null, op2);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testUnbind_X_Null() {
-        Bindings.unbindContentBidirectional(op1, null);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.unbindContentBidirectional(op1, null);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testUnbind_X_Self() {
-        Bindings.unbindContentBidirectional(op1, op1);
+        assertThrows(IllegalArgumentException.class, () -> {
+            Bindings.unbindContentBidirectional(op1, op1);
+        });
     }
 
     @Test
diff --git a/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/BidirectionalContentBindingMapTest.java b/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/BidirectionalContentBindingMapTest.java
index 53a33bfc391..a185e39785a 100644
--- a/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/BidirectionalContentBindingMapTest.java
+++ b/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/BidirectionalContentBindingMapTest.java
@@ -29,13 +29,13 @@
 import javafx.beans.binding.Bindings;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableMap;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class BidirectionalContentBindingMapTest {
 
@@ -50,7 +50,7 @@ public class BidirectionalContentBindingMapTest {
     private Map<String, Integer> map1;
     private Map<String, Integer> map2;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         map0 = new HashMap<>();
         map1 = new HashMap<>();
@@ -102,19 +102,25 @@ public void testBind() {
         assertEquals(map2, op2);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testBind_Null_X() {
-        Bindings.bindContentBidirectional(null, op2);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.bindContentBidirectional(null, op2);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testBind_X_Null() {
-        Bindings.bindContentBidirectional(op1, null);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.bindContentBidirectional(op1, null);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testBind_X_Self() {
-        Bindings.bindContentBidirectional(op1, op1);
+        assertThrows(IllegalArgumentException.class, () -> {
+            Bindings.bindContentBidirectional(op1, op1);
+        });
     }
 
     @Test
@@ -164,19 +170,25 @@ public void testUnbind() {
         assertEquals(map2, op2);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testUnbind_Null_X() {
-        Bindings.unbindContentBidirectional(null, op2);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.unbindContentBidirectional(null, op2);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testUnbind_X_Null() {
-        Bindings.unbindContentBidirectional(op1, null);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.unbindContentBidirectional(op1, null);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testUnbind_X_Self() {
-        Bindings.unbindContentBidirectional(op1, op1);
+        assertThrows(IllegalArgumentException.class, () -> {
+            Bindings.unbindContentBidirectional(op1, op1);
+        });
     }
 
     @Test
diff --git a/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/BidirectionalContentBindingSetTest.java b/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/BidirectionalContentBindingSetTest.java
index 9529ecfc2e3..d6f4d21acd8 100644
--- a/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/BidirectionalContentBindingSetTest.java
+++ b/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/BidirectionalContentBindingSetTest.java
@@ -29,13 +29,13 @@
 import javafx.beans.binding.Bindings;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableSet;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashSet;
 import java.util.Set;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class BidirectionalContentBindingSetTest {
 
@@ -46,7 +46,7 @@ public class BidirectionalContentBindingSetTest {
     private Set<Integer> set1;
     private Set<Integer> set2;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         set0 = new HashSet<>();
         set1 = new HashSet<>();
@@ -98,19 +98,25 @@ public void testBind() {
         assertEquals(set2, op2);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testBind_Null_X() {
-        Bindings.bindContentBidirectional(null, op2);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.bindContentBidirectional(null, op2);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testBind_X_Null() {
-        Bindings.bindContentBidirectional(op1, null);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.bindContentBidirectional(op1, null);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testBind_X_Self() {
-        Bindings.bindContentBidirectional(op1, op1);
+        assertThrows(IllegalArgumentException.class, () -> {
+            Bindings.bindContentBidirectional(op1, op1);
+        });
     }
 
     @Test
@@ -160,19 +166,25 @@ public void testUnbind() {
         assertEquals(set2, op2);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testUnbind_Null_X() {
-        Bindings.unbindContentBidirectional(null, op2);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.unbindContentBidirectional(null, op2);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testUnbind_X_Null() {
-        Bindings.unbindContentBidirectional(op1, null);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.unbindContentBidirectional(op1, null);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testUnbind_X_Self() {
-        Bindings.unbindContentBidirectional(op1, op1);
+        assertThrows(IllegalArgumentException.class, () -> {
+            Bindings.unbindContentBidirectional(op1, op1);
+        });
     }
 
     @Test
diff --git a/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/ContentBindingListTest.java b/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/ContentBindingListTest.java
index 1c27a020ff7..733aa2b5201 100644
--- a/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/ContentBindingListTest.java
+++ b/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/ContentBindingListTest.java
@@ -29,14 +29,14 @@
 import javafx.beans.binding.Bindings;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class ContentBindingListTest {
 
@@ -47,7 +47,7 @@ public class ContentBindingListTest {
     private List<Integer> list1;
     private List<Integer> list2;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         list0 = new ArrayList<>();
         list1 = new ArrayList<>(Arrays.asList(0));
@@ -84,19 +84,25 @@ public void testBind() {
         assertEquals(list2_sorted, op2);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testBind_Null_X() {
-        Bindings.bindContent(null, op2);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.bindContent(null, op2);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testBind_X_Null() {
-        Bindings.bindContent(op1, null);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.bindContent(op1, null);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testBind_X_Self() {
-        Bindings.bindContent(op2, op2);
+        assertThrows(IllegalArgumentException.class, () -> {
+            Bindings.bindContent(op2, op2);
+        });
     }
 
     @Test
@@ -123,21 +129,28 @@ public void testUnbind() {
         assertEquals(list1, op2);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testUnbind_Null_X() {
-        Bindings.unbindContent(null, op2);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.unbindContent(null, op2);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testUnbind_X_Null() {
-        Bindings.unbindContent(op1, null);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.unbindContent(op1, null);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testUnbind_X_Self() {
-        Bindings.unbindContent(op2, op2);
+        assertThrows(IllegalArgumentException.class, () -> {
+            Bindings.unbindContent(op2, op2);
+        });
     }
 
+
     @Test
     public void testChaining() {
         Bindings.bindContent(op1, op2);
@@ -174,7 +187,7 @@ public void testHashCode() {
     }
 
     @Test
-    public void testEquals() {
+     public void testEquals() {
         final Object golden = ContentBinding.bind(op1, op2);
         ContentBinding.unbind(op1, op2);
 
@@ -187,7 +200,7 @@ public void testEquals() {
         ContentBinding.unbind(op2, op3);
         assertFalse(golden.equals(ContentBinding.bind(op2, op3)));
         ContentBinding.unbind(op2, op3);
-    }
+     }
 
     @Test
     public void testEqualsWithGCedProperty() {
@@ -209,8 +222,8 @@ public void testAlreadyBound() {
         final Thread.UncaughtExceptionHandler exceptionHandler =
                 Thread.currentThread().getUncaughtExceptionHandler();
         Thread.currentThread().setUncaughtExceptionHandler((t, e) -> {
-                throw new AssertionError("We don't expect any exceptions in this test!", e);
-            }
+                    throw new AssertionError("We don't expect any exceptions in this test!", e);
+                }
         );
 
         ContentBinding.bind(op1, op2);
diff --git a/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/ContentBindingMapTest.java b/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/ContentBindingMapTest.java
index 4a54b011776..ea0b34e1a68 100644
--- a/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/ContentBindingMapTest.java
+++ b/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/ContentBindingMapTest.java
@@ -29,13 +29,13 @@
 import javafx.beans.binding.Bindings;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableMap;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class ContentBindingMapTest {
 
@@ -50,7 +50,7 @@ public class ContentBindingMapTest {
     private Map<String, Integer> map1;
     private Map<String, Integer> map2;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         map0 = new HashMap<>();
         map1 = new HashMap<>();
@@ -87,19 +87,19 @@ public void testBind() {
         assertEquals(map2, op2);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testBind_Null_X() {
-        Bindings.bindContent(null, op2);
+        assertThrows(NullPointerException.class, () -> Bindings.bindContent(null, op2));
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testBind_X_Null() {
-        Bindings.bindContent(op1, null);
+        assertThrows(NullPointerException.class, () -> Bindings.bindContent(op1, null));
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testBind_X_Self() {
-        Bindings.bindContent(op2, op2);
+        assertThrows(IllegalArgumentException.class, () -> Bindings.bindContent(op2, op2));
     }
 
     @Test
@@ -127,19 +127,25 @@ public void testUnbind() {
         assertEquals(map1, op2);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testUnbind_Null_X() {
-        Bindings.unbindContent(null, op2);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.unbindContent(null, op2);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testUnbind_X_Null() {
-        Bindings.unbindContent(op1, null);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.unbindContent(op1, null);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testUnbind_X_Self() {
-        Bindings.unbindContent(op2, op2);
+        assertThrows(IllegalArgumentException.class, () -> {
+            Bindings.unbindContent(op2, op2);
+        });
     }
 
     @Test
diff --git a/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/ContentBindingSetTest.java b/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/ContentBindingSetTest.java
index b6473213f5c..ebb71e869d2 100644
--- a/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/ContentBindingSetTest.java
+++ b/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/ContentBindingSetTest.java
@@ -29,13 +29,13 @@
 import javafx.beans.binding.Bindings;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableSet;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashSet;
 import java.util.Set;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class ContentBindingSetTest {
 
@@ -46,7 +46,7 @@ public class ContentBindingSetTest {
     private Set<Integer> set1;
     private Set<Integer> set2;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         set0 = new HashSet<>();
         set1 = new HashSet<>();
@@ -83,19 +83,25 @@ public void testBind() {
         assertEquals(set2, op2);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testBind_Null_X() {
-        Bindings.bindContent(null, op2);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.bindContent(null, op2);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testBind_X_Null() {
-        Bindings.bindContent(op1, null);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.bindContent(op1, null);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testBind_X_Self() {
-        Bindings.bindContent(op2, op2);
+        assertThrows(IllegalArgumentException.class, () -> {
+            Bindings.bindContent(op2, op2);
+        });
     }
 
     @Test
@@ -123,19 +129,25 @@ public void testUnbind() {
         assertEquals(set1, op2);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testUnbind_Null_X() {
-        Bindings.unbindContent(null, op2);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.unbindContent(null, op2);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testUnbind_X_Null() {
-        Bindings.unbindContent(op1, null);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.unbindContent(op1, null);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testUnbind_X_Self() {
-        Bindings.unbindContent(op2, op2);
+        assertThrows(IllegalArgumentException.class, () -> {
+            Bindings.unbindContent(op2, op2);
+        });
     }
 
     @Test
diff --git a/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/ErrorLoggingUtiltity.java b/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/ErrorLoggingUtiltity.java
index f06b276dc0f..5b9cd6bae25 100644
--- a/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/ErrorLoggingUtiltity.java
+++ b/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/ErrorLoggingUtiltity.java
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.binding;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 import com.sun.javafx.logging.PlatformLogger.Level;
 
diff --git a/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/ExpressionHelperBaseTest.java b/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/ExpressionHelperBaseTest.java
index 8e7cd7d626c..ed9bbc7feb0 100644
--- a/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/ExpressionHelperBaseTest.java
+++ b/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/ExpressionHelperBaseTest.java
@@ -26,10 +26,10 @@
 package test.com.sun.javafx.binding;
 
 import com.sun.javafx.binding.ExpressionHelperBaseShim;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 import javafx.beans.WeakListener;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ExpressionHelperBaseTest {
 
@@ -163,6 +163,4 @@ public void testMultipleElements() {
         assertEquals(0, ExpressionHelperBaseShim.trim(2, array));
         assertArrayEquals(new Object[] {null, null, null}, array);
     }
-
-
 }
diff --git a/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/ExpressionHelperTest.java b/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/ExpressionHelperTest.java
index 9473ce910e9..ac31894ea27 100644
--- a/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/ExpressionHelperTest.java
+++ b/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/ExpressionHelperTest.java
@@ -25,9 +25,11 @@
 
 package test.com.sun.javafx.binding;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 
 import java.util.BitSet;
 import java.util.List;
@@ -35,8 +37,8 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import com.sun.javafx.binding.ExpressionHelper;
 import com.sun.javafx.binding.ExpressionHelperShim;
@@ -67,7 +69,7 @@ public class ExpressionHelperTest {
     private InvalidationListenerMock[] invalidationListener;
     private ChangeListenerMock<Object>[] changeListener;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         helper = null;
         observable = new ObservableValueStub(DATA_1);
@@ -79,34 +81,46 @@ public void setUp() {
         };
     }
 
-    @Test (expected = NullPointerException.class)
+    @Test
     public void testAddInvalidation_Null_X() {
-        ExpressionHelper.addListener(helper, null, invalidationListener[0]);
+        assertThrows(NullPointerException.class, () -> {
+            ExpressionHelper.addListener(helper, null, invalidationListener[0]);
+        });
     }
 
-    @Test (expected = NullPointerException.class)
+    @Test
     public void testAddInvalidation_X_Null() {
-        ExpressionHelper.addListener(helper, observable, (InvalidationListener) null);
+        assertThrows(NullPointerException.class, () -> {
+            ExpressionHelper.addListener(helper, observable, (InvalidationListener) null);
+        });
     }
 
-    @Test (expected = NullPointerException.class)
+    @Test
     public void testRemoveInvalidation_Null() {
-        ExpressionHelper.removeListener(helper, (InvalidationListener) null);
+        assertThrows(NullPointerException.class, () -> {
+            ExpressionHelper.removeListener(helper, (InvalidationListener) null);
+        });
     }
 
-    @Test (expected = NullPointerException.class)
+    @Test
     public void testAddChange_Null_X() {
-        ExpressionHelper.addListener(helper, null, changeListener[0]);
+        assertThrows(NullPointerException.class, () -> {
+            ExpressionHelper.addListener(helper, null, changeListener[0]);
+        });
     }
 
-    @Test (expected = NullPointerException.class)
+    @Test
     public void testAddChange_X_Null() {
-        ExpressionHelper.addListener(helper, observable, (ChangeListener) null);
+        assertThrows(NullPointerException.class, () -> {
+            ExpressionHelper.addListener(helper, observable, (ChangeListener) null);
+        });
     }
 
-    @Test (expected = NullPointerException.class)
+    @Test
     public void testRemoveChange_Null() {
-        ExpressionHelper.removeListener(helper, (ChangeListener) null);
+        assertThrows(NullPointerException.class, () -> {
+            ExpressionHelper.removeListener(helper, (ChangeListener) null);
+        });
     }
 
     @Test
diff --git a/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/ExpressionHelperUtilityTest.java b/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/ExpressionHelperUtilityTest.java
index e6b855ddd60..de5b7c49239 100644
--- a/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/ExpressionHelperUtilityTest.java
+++ b/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/ExpressionHelperUtilityTest.java
@@ -41,10 +41,10 @@
 import javafx.collections.ListChangeListener;
 import javafx.collections.MapChangeListener;
 import javafx.collections.SetChangeListener;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
-import org.junit.Before;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeEach;
 
 public class ExpressionHelperUtilityTest {
 
@@ -64,7 +64,7 @@ public class ExpressionHelperUtilityTest {
     private SetChangeListener setChangeListener1;
     private SetChangeListener setChangeListener2;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         observableValue = new SimpleStringProperty();
         observableList = new SimpleListProperty();
@@ -163,7 +163,7 @@ public void testGetInvalidationListenerFromList() {
         assertEquals(Collections.singletonList(invalidationListener1), ExpressionHelperUtility.getInvalidationListeners(observableList));
         observableList.addListener(invalidationListener2);
         assertTrue(Arrays.asList(invalidationListener1, invalidationListener2).equals(ExpressionHelperUtility.getInvalidationListeners(observableList))
-                           || Arrays.asList(invalidationListener2, invalidationListener1).equals(ExpressionHelperUtility.getInvalidationListeners(observableList)));
+                || Arrays.asList(invalidationListener2, invalidationListener1).equals(ExpressionHelperUtility.getInvalidationListeners(observableList)));
     }
 
     @Test
@@ -194,7 +194,7 @@ public void testGetChangeListenerFromList() {
         assertEquals(Collections.singletonList(changeListener1), ExpressionHelperUtility.getChangeListeners(observableList));
         observableList.addListener(changeListener2);
         assertTrue(Arrays.asList(changeListener1, changeListener2).equals(ExpressionHelperUtility.getChangeListeners(observableList))
-                           || Arrays.asList(changeListener2, changeListener1).equals(ExpressionHelperUtility.getChangeListeners(observableList)));
+                || Arrays.asList(changeListener2, changeListener1).equals(ExpressionHelperUtility.getChangeListeners(observableList)));
     }
 
     @Test
@@ -225,7 +225,7 @@ public void testGetListChangeListenerFromList() {
         assertEquals(Collections.singletonList(listChangeListener1), ExpressionHelperUtility.getListChangeListeners(observableList));
         observableList.addListener(listChangeListener2);
         assertTrue(Arrays.asList(listChangeListener1, listChangeListener2).equals(ExpressionHelperUtility.getListChangeListeners(observableList))
-                           || Arrays.asList(listChangeListener2, listChangeListener1).equals(ExpressionHelperUtility.getListChangeListeners(observableList)));
+                || Arrays.asList(listChangeListener2, listChangeListener1).equals(ExpressionHelperUtility.getListChangeListeners(observableList)));
     }
 
     @Test
@@ -256,7 +256,7 @@ public void testGetInvalidationListenerFromMap() {
         assertEquals(Collections.singletonList(invalidationListener1), ExpressionHelperUtility.getInvalidationListeners(observableMap));
         observableMap.addListener(invalidationListener2);
         assertTrue(Arrays.asList(invalidationListener1, invalidationListener2).equals(ExpressionHelperUtility.getInvalidationListeners(observableMap))
-                           || Arrays.asList(invalidationListener2, invalidationListener1).equals(ExpressionHelperUtility.getInvalidationListeners(observableMap)));
+                || Arrays.asList(invalidationListener2, invalidationListener1).equals(ExpressionHelperUtility.getInvalidationListeners(observableMap)));
     }
 
     @Test
@@ -287,7 +287,7 @@ public void testGetChangeListenerFromMap() {
         assertEquals(Collections.singletonList(changeListener1), ExpressionHelperUtility.getChangeListeners(observableMap));
         observableMap.addListener(changeListener2);
         assertTrue(Arrays.asList(changeListener1, changeListener2).equals(ExpressionHelperUtility.getChangeListeners(observableMap))
-                           || Arrays.asList(changeListener2, changeListener1).equals(ExpressionHelperUtility.getChangeListeners(observableMap)));
+                || Arrays.asList(changeListener2, changeListener1).equals(ExpressionHelperUtility.getChangeListeners(observableMap)));
     }
 
     @Test
@@ -318,7 +318,7 @@ public void testGetMapChangeListenerFromMap() {
         assertEquals(Collections.singletonList(mapChangeListener1), ExpressionHelperUtility.getMapChangeListeners(observableMap));
         observableMap.addListener(mapChangeListener2);
         assertTrue(Arrays.asList(mapChangeListener1, mapChangeListener2).equals(ExpressionHelperUtility.getMapChangeListeners(observableMap))
-                           || Arrays.asList(mapChangeListener2, mapChangeListener1).equals(ExpressionHelperUtility.getMapChangeListeners(observableMap)));
+                || Arrays.asList(mapChangeListener2, mapChangeListener1).equals(ExpressionHelperUtility.getMapChangeListeners(observableMap)));
     }
 
     @Test
@@ -349,7 +349,7 @@ public void testGetInvalidationListenerFromSet() {
         assertEquals(Collections.singletonList(invalidationListener1), ExpressionHelperUtility.getInvalidationListeners(observableSet));
         observableSet.addListener(invalidationListener2);
         assertTrue(Arrays.asList(invalidationListener1, invalidationListener2).equals(ExpressionHelperUtility.getInvalidationListeners(observableSet))
-                           || Arrays.asList(invalidationListener2, invalidationListener1).equals(ExpressionHelperUtility.getInvalidationListeners(observableSet)));
+                || Arrays.asList(invalidationListener2, invalidationListener1).equals(ExpressionHelperUtility.getInvalidationListeners(observableSet)));
     }
 
     @Test
@@ -380,7 +380,7 @@ public void testGetChangeListenerFromSet() {
         assertEquals(Collections.singletonList(changeListener1), ExpressionHelperUtility.getChangeListeners(observableSet));
         observableSet.addListener(changeListener2);
         assertTrue(Arrays.asList(changeListener1, changeListener2).equals(ExpressionHelperUtility.getChangeListeners(observableSet))
-                           || Arrays.asList(changeListener2, changeListener1).equals(ExpressionHelperUtility.getChangeListeners(observableSet)));
+                || Arrays.asList(changeListener2, changeListener1).equals(ExpressionHelperUtility.getChangeListeners(observableSet)));
     }
 
     @Test
@@ -411,7 +411,7 @@ public void testGetSetChangeListenerFromSet() {
         assertEquals(Collections.singletonList(setChangeListener1), ExpressionHelperUtility.getSetChangeListeners(observableSet));
         observableSet.addListener(setChangeListener2);
         assertTrue(Arrays.asList(setChangeListener1, setChangeListener2).equals(ExpressionHelperUtility.getSetChangeListeners(observableSet))
-                           || Arrays.asList(setChangeListener2, setChangeListener1).equals(ExpressionHelperUtility.getSetChangeListeners(observableSet)));
+                || Arrays.asList(setChangeListener2, setChangeListener1).equals(ExpressionHelperUtility.getSetChangeListeners(observableSet)));
     }
 
     private static class EmptyInvalidationListener implements InvalidationListener {
diff --git a/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/ListExpressionHelperTest.java b/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/ListExpressionHelperTest.java
index ef757daee97..c9ce8569886 100644
--- a/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/ListExpressionHelperTest.java
+++ b/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/ListExpressionHelperTest.java
@@ -42,8 +42,9 @@
 import test.javafx.collections.MockListObserver;
 import javafx.collections.ObservableList;
 import test.javafx.collections.WeakListChangeListenerMock;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.util.Arrays;
 
@@ -66,7 +67,7 @@ public class ListExpressionHelperTest {
     private ChangeListenerMock<? super ObservableList<Object>>[] changeListener;
     private MockListObserver<Object>[] listChangeListener;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         listItem = new Object();
         data1 = FXCollections.observableArrayList();
@@ -88,49 +89,67 @@ public void setUp() {
         };
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testAddInvalidation_Null_X() {
-        ListExpressionHelper.addListener(null, null, invalidationListener[0]);
+        assertThrows(NullPointerException.class, () -> {
+            ListExpressionHelper.addListener(null, null, invalidationListener[0]);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testAddInvalidation_X_Null() {
-        ListExpressionHelper.addListener(null, observable, (InvalidationListener)null);
+        assertThrows(NullPointerException.class, () -> {
+            ListExpressionHelper.addListener(null, observable, (InvalidationListener) null);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testRemoveInvalidation_Null() {
-        ListExpressionHelper.removeListener(null, (InvalidationListener) null);
+        assertThrows(NullPointerException.class, () -> {
+            ListExpressionHelper.removeListener(null, (InvalidationListener) null);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testAddChange_Null_X() {
-        ListExpressionHelper.addListener(null, null, changeListener[0]);
+        assertThrows(NullPointerException.class, () -> {
+            ListExpressionHelper.addListener(null, null, changeListener[0]);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testAddChange_X_Null() {
-        ListExpressionHelper.addListener(null, observable, (ChangeListener) null);
+        assertThrows(NullPointerException.class, () -> {
+            ListExpressionHelper.addListener(null, observable, (ChangeListener) null);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testRemoveChange_Null() {
-        ListExpressionHelper.removeListener(null, (ChangeListener) null);
+        assertThrows(NullPointerException.class, () -> {
+            ListExpressionHelper.removeListener(null, (ChangeListener) null);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testAddListChange_Null_X() {
-        ListExpressionHelper.addListener(null, null, listChangeListener[0]);
+        assertThrows(NullPointerException.class, () -> {
+            ListExpressionHelper.addListener(null, null, listChangeListener[0]);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testAddListChange_X_Null() {
-        ListExpressionHelper.addListener(null, observable, (ListChangeListener) null);
+        assertThrows(NullPointerException.class, () -> {
+            ListExpressionHelper.addListener(null, observable, (ListChangeListener) null);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testRemoveListChange_Null() {
-        ListExpressionHelper.removeListener(null, (ListChangeListener) null);
+        assertThrows(NullPointerException.class, () -> {
+            ListExpressionHelper.removeListener(null, (ListChangeListener) null);
+        });
     }
 
     @Test
@@ -951,7 +970,5 @@ public void testFireValueChangedEvent() {
         invalidationListener[0].check(observable, 1);
         changeListener[0].check(null, UNDEFINED, UNDEFINED, 0);
         listChangeListener[0].check0();
-
-
     }
 }
diff --git a/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/MapExpressionHelperTest.java b/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/MapExpressionHelperTest.java
index e8edc5f5f59..0d8d5caf57d 100644
--- a/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/MapExpressionHelperTest.java
+++ b/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/MapExpressionHelperTest.java
@@ -30,8 +30,8 @@
 import javafx.beans.property.SimpleMapProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableMap;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import test.javafx.beans.InvalidationListenerMock;
 import test.javafx.beans.value.ChangeListenerMock;
 import test.javafx.collections.MockMapObserver;
@@ -50,7 +50,7 @@ public class MapExpressionHelperTest {
     private ChangeListenerMock<? super ObservableMap<Object, Object>>[] changeListener;
     private MockMapObserver<Object, Object>[] mapChangeListener;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         key = new Object();
         value = new Object();
@@ -62,13 +62,13 @@ public void setUp() {
         observable = new SimpleMapProperty<>(data1);
 
         invalidationListener = new InvalidationListenerMock[]{
-            new InvalidationListenerMock(), new InvalidationListenerMock(), new InvalidationListenerMock()
+                new InvalidationListenerMock(), new InvalidationListenerMock(), new InvalidationListenerMock()
         };
         changeListener = new ChangeListenerMock[]{
-            new ChangeListenerMock(UNDEFINED), new ChangeListenerMock(UNDEFINED), new ChangeListenerMock(UNDEFINED)
+                new ChangeListenerMock(UNDEFINED), new ChangeListenerMock(UNDEFINED), new ChangeListenerMock(UNDEFINED)
         };
         mapChangeListener = new MockMapObserver[]{
-            new MockMapObserver<>(), new MockMapObserver<>(), new MockMapObserver<>()
+                new MockMapObserver<>(), new MockMapObserver<>(), new MockMapObserver<>()
         };
     }
 
diff --git a/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/SelectBindingTest.java b/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/SelectBindingTest.java
index bdd619f07c8..18a8913f8cf 100644
--- a/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/SelectBindingTest.java
+++ b/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/SelectBindingTest.java
@@ -41,11 +41,11 @@
 import javafx.beans.binding.StringBinding;
 import test.javafx.binding.Variable;
 import javafx.collections.ObservableList;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class SelectBindingTest {
 
@@ -101,13 +101,13 @@ public void removePropertyChangeListener(String property, PropertyChangeListener
     private StringBinding select;
     private ObservableList<?> dependencies;
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
         System.err.println("SelectBindingTest : log messages are expected from these tests.");
         ErrorLoggingUtiltity.reset();
     }
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         a = new Variable("a");
         b = new Variable("b");
@@ -381,9 +381,11 @@ public void testLong() {
         ErrorLoggingUtiltity.checkFine(NullPointerException.class);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void createWithRootNull() {
-        select = Bindings.selectString(null, "next", "name");
+        assertThrows(NullPointerException.class, () -> {
+            select = Bindings.selectString(null, "next", "name");
+        });
     }
 
     @Test
@@ -397,9 +399,11 @@ public void createWithNoSteps() {
         ErrorLoggingUtiltity.checkWarning(NullPointerException.class);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void createWithOneStepIsNull() {
-        select = Bindings.selectString(a.nextProperty(), null, "name");
+        assertThrows(NullPointerException.class, () -> {
+            select = Bindings.selectString(a.nextProperty(), null, "name");
+        });
     }
 
     @Test
diff --git a/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/SetExpressionHelperTest.java b/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/SetExpressionHelperTest.java
index cacd15d2cbe..326fadbfe2c 100644
--- a/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/SetExpressionHelperTest.java
+++ b/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/SetExpressionHelperTest.java
@@ -30,8 +30,8 @@
 import javafx.beans.property.SimpleSetProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableSet;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import test.javafx.beans.InvalidationListenerMock;
 import test.javafx.beans.value.ChangeListenerMock;
 import test.javafx.collections.MockSetObserver;
@@ -49,7 +49,7 @@ public class SetExpressionHelperTest {
     private ChangeListenerMock<? super ObservableSet<Object>>[] changeListener;
     private MockSetObserver<Object>[] setChangeListener;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         value = new Object();
         data1 = FXCollections.observableSet();
@@ -59,13 +59,13 @@ public void setUp() {
         observable = new SimpleSetProperty<>(data1);
 
         invalidationListener = new InvalidationListenerMock[]{
-            new InvalidationListenerMock(), new InvalidationListenerMock(), new InvalidationListenerMock()
+                new InvalidationListenerMock(), new InvalidationListenerMock(), new InvalidationListenerMock()
         };
         changeListener = new ChangeListenerMock[]{
-            new ChangeListenerMock(UNDEFINED), new ChangeListenerMock(UNDEFINED), new ChangeListenerMock(UNDEFINED)
+                new ChangeListenerMock(UNDEFINED), new ChangeListenerMock(UNDEFINED), new ChangeListenerMock(UNDEFINED)
         };
         setChangeListener = new MockSetObserver[]{
-            new MockSetObserver<>(), new MockSetObserver<>(), new MockSetObserver<>()
+                new MockSetObserver<>(), new MockSetObserver<>(), new MockSetObserver<>()
         };
     }
 
diff --git a/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/StringFormatterTest.java b/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/StringFormatterTest.java
index 913ae67a94d..298630cfde3 100644
--- a/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/StringFormatterTest.java
+++ b/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/StringFormatterTest.java
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.binding;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.Date;
 import java.util.IllegalFormatException;
@@ -50,8 +50,10 @@
 import javafx.beans.property.StringProperty;
 import test.javafx.binding.DependencyUtils;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class StringFormatterTest {
 
@@ -79,7 +81,7 @@ public class StringFormatterTest {
     private StringProperty stringV;
     private ObjectProperty<Date> dateV;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         double0 = 90.1243987;
         float0 = -897.4509f;
@@ -109,37 +111,37 @@ public void setUp() {
     @Test
     public void testConvert() {
         StringExpression s = Bindings.convert(doubleV);
-        DependencyUtils.checkDependencies(((StringBinding)s).getDependencies(), doubleV);
+        DependencyUtils.checkDependencies(((StringBinding) s).getDependencies(), doubleV);
         assertEquals(Double.toString(double0), s.get());
         doubleV.set(double1);
         assertEquals(Double.toString(double1), s.get());
 
         s = Bindings.convert(floatV);
-        DependencyUtils.checkDependencies(((StringBinding)s).getDependencies(), floatV);
+        DependencyUtils.checkDependencies(((StringBinding) s).getDependencies(), floatV);
         assertEquals(Float.toString(float0), s.get());
         floatV.set(float1);
         assertEquals(Float.toString(float1), s.get());
 
         s = Bindings.convert(longV);
-        DependencyUtils.checkDependencies(((StringBinding)s).getDependencies(), longV);
+        DependencyUtils.checkDependencies(((StringBinding) s).getDependencies(), longV);
         assertEquals(Long.toString(long0), s.get());
         longV.set(long1);
         assertEquals(Long.toString(long1), s.get());
 
         s = Bindings.convert(intV);
-        DependencyUtils.checkDependencies(((StringBinding)s).getDependencies(), intV);
+        DependencyUtils.checkDependencies(((StringBinding) s).getDependencies(), intV);
         assertEquals(Integer.toString(int0), s.get());
         intV.set(int1);
         assertEquals(Integer.toString(int1), s.get());
 
         s = Bindings.convert(booleanV);
-        DependencyUtils.checkDependencies(((StringBinding)s).getDependencies(), booleanV);
+        DependencyUtils.checkDependencies(((StringBinding) s).getDependencies(), booleanV);
         assertEquals(Boolean.toString(boolean0), s.get());
         booleanV.set(boolean1);
         assertEquals(Boolean.toString(boolean1), s.get());
 
         s = Bindings.convert(dateV);
-        DependencyUtils.checkDependencies(((StringBinding)s).getDependencies(), dateV);
+        DependencyUtils.checkDependencies(((StringBinding) s).getDependencies(), dateV);
         assertEquals(date0.toString(), s.get());
         dateV.set(date1);
         assertEquals(date1.toString(), s.get());
@@ -150,9 +152,11 @@ public void testConvert() {
         assertEquals(stringV, s);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testConvert_Null() {
-        Bindings.convert(null);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.convert(null);
+        });
     }
 
     @Test
@@ -169,7 +173,7 @@ public void testConcat() {
 
         // one variable
         s = Bindings.concat(dateV);
-        DependencyUtils.checkDependencies(((StringBinding)s).getDependencies(), dateV);
+        DependencyUtils.checkDependencies(((StringBinding) s).getDependencies(), dateV);
         assertEquals(date0.toString(), s.get());
         dateV.set(date1);
         assertEquals(date1.toString(), s.get());
@@ -184,7 +188,7 @@ public void testConcat() {
         // test all
         s = Bindings.concat(doubleV, double1, floatV, float1, longV, long1, intV, int1, booleanV, boolean1, stringV, string1, dateV, date1);
         DependencyUtils.checkDependencies(((StringBinding)s).getDependencies(), doubleV, floatV, longV, intV, booleanV, stringV, dateV);
-        assertEquals("" + double0 + double1 + float0 + float1 + long0 + long1 + int0 + int1+ boolean0 + boolean1 + string0 + string1 + date0 + date1, s.get());
+        assertEquals("" + double0 + double1 + float0 + float1 + long0 + long1 + int0 + int1 + boolean0 + boolean1 + string0 + string1 + date0 + date1, s.get());
         doubleV.set(double1);
         floatV.set(float1);
         longV.set(long1);
@@ -192,10 +196,14 @@ public void testConcat() {
         booleanV.set(boolean1);
         stringV.set(string1);
         dateV.set(date1);
-        assertEquals("" + double1 + double1 + float1 + float1 + long1 + long1 + int1 + int1 + boolean1 + boolean1 + string1 + string1 + date1 + date1, s.get());
+        assertEquals(
+                "" + double1 + double1 + float1 + float1 + long1 + long1 + int1 + int1 + boolean1 + boolean1 + string1 +
+                        string1 + date1 + date1, s.get());
         stringV.set(null);
         dateV.set(null);
-        assertEquals("" + double1 + double1 + float1 + float1 + long1 + long1 + int1 + int1 + boolean1 + boolean1 + "null" + string1 + "null" + date1, s.get());
+        assertEquals(
+                "" + double1 + double1 + float1 + float1 + long1 + long1 + int1 + int1 + boolean1 + boolean1 + "null" +
+                        string1 + "null" + date1, s.get());
     }
 
     @Test
@@ -213,7 +221,7 @@ public void testConvertWithDefaultLocale() {
             assertEquals(String.format(Locale.GERMAN, "Date: %tc", date1), s.get());
             // one variable
             s = Bindings.format("Date: %tc", dateV);
-            DependencyUtils.checkDependencies(((StringBinding)s).getDependencies(), dateV);
+            DependencyUtils.checkDependencies(((StringBinding) s).getDependencies(), dateV);
             assertEquals(String.format(Locale.GERMAN, "Date: %tc", date0), s.get());
             dateV.set(date1);
             assertEquals(String.format(Locale.GERMAN, "Date: %tc", date1), s.get());
@@ -223,10 +231,14 @@ public void testConvertWithDefaultLocale() {
 
             // test all
             s = Bindings.format("%8.3e, %8.3e, %6.3f, %6.3f, %d, %d, %d, %d, %s, %s, %s, %s, %tc, %tc",
-                    doubleV, double1, floatV, float1, longV, long1, intV, int1, booleanV, boolean1, stringV, string1, dateV, date1);
-            DependencyUtils.checkDependencies(((StringBinding)s).getDependencies(), doubleV, floatV, longV, intV, booleanV, stringV, dateV);
-            assertEquals(String.format(Locale.GERMAN, "%8.3e, %8.3e, %6.3f, %6.3f, %d, %d, %d, %d, %s, %s, %s, %s, %tc, %tc",
-                    double0, double1, float0, float1, long0, long1, int0, int1, boolean0, boolean1, string0, string1, date0, date1), s.get());
+                    doubleV, double1, floatV, float1, longV, long1, intV, int1, booleanV, boolean1, stringV, string1,
+                    dateV, date1);
+            DependencyUtils.checkDependencies(((StringBinding) s).getDependencies(), doubleV, floatV, longV, intV,
+                    booleanV, stringV, dateV);
+            assertEquals(
+                    String.format(Locale.GERMAN, "%8.3e, %8.3e, %6.3f, %6.3f, %d, %d, %d, %d, %s, %s, %s, %s, %tc, %tc",
+                            double0, double1, float0, float1, long0, long1, int0, int1, boolean0, boolean1, string0,
+                            string1, date0, date1), s.get());
             doubleV.set(double1);
             floatV.set(float1);
             longV.set(long1);
@@ -234,12 +246,16 @@ public void testConvertWithDefaultLocale() {
             booleanV.set(boolean1);
             stringV.set(string1);
             dateV.set(date1);
-            assertEquals(String.format(Locale.GERMAN, "%8.3e, %8.3e, %6.3f, %6.3f, %d, %d, %d, %d, %s, %s, %s, %s, %tc, %tc",
-                    double1, double1, float1, float1, long1, long1, int1, int1, boolean1, boolean1, string1, string1, date1, date1), s.get());
+            assertEquals(
+                    String.format(Locale.GERMAN, "%8.3e, %8.3e, %6.3f, %6.3f, %d, %d, %d, %d, %s, %s, %s, %s, %tc, %tc",
+                            double1, double1, float1, float1, long1, long1, int1, int1, boolean1, boolean1, string1,
+                            string1, date1, date1), s.get());
             stringV.set(null);
             dateV.set(null);
-            assertEquals(String.format(Locale.GERMAN, "%8.3e, %8.3e, %6.3f, %6.3f, %d, %d, %d, %d, %s, %s, %s, %s, %s, %tc",
-                    double1, double1, float1, float1, long1, long1, int1, int1, boolean1, boolean1, "null", string1, "null", date1), s.get());
+            assertEquals(
+                    String.format(Locale.GERMAN, "%8.3e, %8.3e, %6.3f, %6.3f, %d, %d, %d, %d, %s, %s, %s, %s, %s, %tc",
+                            double1, double1, float1, float1, long1, long1, int1, int1, boolean1, boolean1, "null",
+                            string1, "null", date1), s.get());
 
             // US Locale
             Locale.setDefault(Locale.US);
@@ -255,7 +271,7 @@ public void testConvertWithDefaultLocale() {
             assertEquals(String.format(Locale.US, "Date: %tc", date1), s.get());
             // one variable
             s = Bindings.format("Date: %tc", dateV);
-            DependencyUtils.checkDependencies(((StringBinding)s).getDependencies(), dateV);
+            DependencyUtils.checkDependencies(((StringBinding) s).getDependencies(), dateV);
             assertEquals(String.format(Locale.US, "Date: %tc", date0), s.get());
             dateV.set(date1);
             assertEquals(String.format(Locale.US, "Date: %tc", date1), s.get());
@@ -265,10 +281,14 @@ public void testConvertWithDefaultLocale() {
 
             // test all
             s = Bindings.format("%8.3e, %8.3e, %6.3f, %6.3f, %d, %d, %d, %d, %s, %s, %s, %s, %tc, %tc",
-                    doubleV, double1, floatV, float1, longV, long1, intV, int1, booleanV, boolean1, stringV, string1, dateV, date1);
-            DependencyUtils.checkDependencies(((StringBinding)s).getDependencies(), doubleV, floatV, longV, intV, booleanV, stringV, dateV);
-            assertEquals(String.format(Locale.US, "%8.3e, %8.3e, %6.3f, %6.3f, %d, %d, %d, %d, %s, %s, %s, %s, %tc, %tc",
-                    double0, double1, float0, float1, long0, long1, int0, int1, boolean0, boolean1, string0, string1, date0, date1), s.get());
+                    doubleV, double1, floatV, float1, longV, long1, intV, int1, booleanV, boolean1, stringV, string1,
+                    dateV, date1);
+            DependencyUtils.checkDependencies(((StringBinding) s).getDependencies(), doubleV, floatV, longV, intV,
+                    booleanV, stringV, dateV);
+            assertEquals(
+                    String.format(Locale.US, "%8.3e, %8.3e, %6.3f, %6.3f, %d, %d, %d, %d, %s, %s, %s, %s, %tc, %tc",
+                            double0, double1, float0, float1, long0, long1, int0, int1, boolean0, boolean1, string0,
+                            string1, date0, date1), s.get());
             doubleV.set(double1);
             floatV.set(float1);
             longV.set(long1);
@@ -276,30 +296,39 @@ public void testConvertWithDefaultLocale() {
             booleanV.set(boolean1);
             stringV.set(string1);
             dateV.set(date1);
-            assertEquals(String.format(Locale.US, "%8.3e, %8.3e, %6.3f, %6.3f, %d, %d, %d, %d, %s, %s, %s, %s, %tc, %tc",
-                    double1, double1, float1, float1, long1, long1, int1, int1, boolean1, boolean1, string1, string1, date1, date1), s.get());
+            assertEquals(
+                    String.format(Locale.US, "%8.3e, %8.3e, %6.3f, %6.3f, %d, %d, %d, %d, %s, %s, %s, %s, %tc, %tc",
+                            double1, double1, float1, float1, long1, long1, int1, int1, boolean1, boolean1, string1,
+                            string1, date1, date1), s.get());
             stringV.set(null);
             dateV.set(null);
             assertEquals(String.format(Locale.US, "%8.3e, %8.3e, %6.3f, %6.3f, %d, %d, %d, %d, %s, %s, %s, %s, %s, %tc",
-                    double1, double1, float1, float1, long1, long1, int1, int1, boolean1, boolean1, "null", string1, "null", date1), s.get());
+                    double1, double1, float1, float1, long1, long1, int1, int1, boolean1, boolean1, "null", string1,
+                    "null", date1), s.get());
         } finally {
             Locale.setDefault(defaultLocale);
         }
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testConvertWithDefaultLocale_Null() {
-        Bindings.format(null);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.format(null);
+        });
     }
 
-    @Test(expected=IllegalFormatException.class)
+    @Test
     public void testConvertWithDefaultLocale_IllegalObject() {
-        Bindings.format("%tc", double0);
+        assertThrows(IllegalFormatException.class, () -> {
+            Bindings.format("%tc", double0);
+        });
     }
 
-    @Test(expected=IllegalFormatException.class)
+    @Test
     public void testConvertWithDefaultLocale_IllegalValueModel() {
-        Bindings.format("%tc", doubleV);
+        assertThrows(IllegalFormatException.class, () -> {
+            Bindings.format("%tc", doubleV);
+        });
     }
 
     @Test
@@ -313,7 +342,7 @@ public void testConvertWithCustomLocale() {
         assertEquals(String.format(Locale.GERMAN, "Date: %tc", date1), s.get());
         // one variable
         s = Bindings.format(Locale.GERMAN, "Date: %tc", dateV);
-        DependencyUtils.checkDependencies(((StringBinding)s).getDependencies(), dateV);
+        DependencyUtils.checkDependencies(((StringBinding) s).getDependencies(), dateV);
         assertEquals(String.format(Locale.GERMAN, "Date: %tc", date0), s.get());
         dateV.set(date1);
         assertEquals(String.format(Locale.GERMAN, "Date: %tc", date1), s.get());
@@ -323,10 +352,14 @@ public void testConvertWithCustomLocale() {
 
         // test all
         s = Bindings.format(Locale.GERMAN, "%8.3e, %8.3e, %6.3f, %6.3f, %d, %d, %d, %d, %s, %s, %s, %s, %tc, %tc",
-                doubleV, double1, floatV, float1, longV, long1, intV, int1, booleanV, boolean1, stringV, string1, dateV, date1);
-        DependencyUtils.checkDependencies(((StringBinding)s).getDependencies(), doubleV, floatV, longV, intV, booleanV, stringV, dateV);
-        assertEquals(String.format(Locale.GERMAN, "%8.3e, %8.3e, %6.3f, %6.3f, %d, %d, %d, %d, %s, %s, %s, %s, %tc, %tc",
-                double0, double1, float0, float1, long0, long1, int0, int1, boolean0, boolean1, string0, string1, date0, date1), s.get());
+                doubleV, double1, floatV, float1, longV, long1, intV, int1, booleanV, boolean1, stringV, string1, dateV,
+                date1);
+        DependencyUtils.checkDependencies(((StringBinding) s).getDependencies(), doubleV, floatV, longV, intV, booleanV,
+                stringV, dateV);
+        assertEquals(
+                String.format(Locale.GERMAN, "%8.3e, %8.3e, %6.3f, %6.3f, %d, %d, %d, %d, %s, %s, %s, %s, %tc, %tc",
+                        double0, double1, float0, float1, long0, long1, int0, int1, boolean0, boolean1, string0,
+                        string1, date0, date1), s.get());
         doubleV.set(double1);
         floatV.set(float1);
         longV.set(long1);
@@ -334,12 +367,15 @@ public void testConvertWithCustomLocale() {
         booleanV.set(boolean1);
         stringV.set(string1);
         dateV.set(date1);
-        assertEquals(String.format(Locale.GERMAN, "%8.3e, %8.3e, %6.3f, %6.3f, %d, %d, %d, %d, %s, %s, %s, %s, %tc, %tc",
-                double1, double1, float1, float1, long1, long1, int1, int1, boolean1, boolean1, string1, string1, date1, date1), s.get());
+        assertEquals(
+                String.format(Locale.GERMAN, "%8.3e, %8.3e, %6.3f, %6.3f, %d, %d, %d, %d, %s, %s, %s, %s, %tc, %tc",
+                        double1, double1, float1, float1, long1, long1, int1, int1, boolean1, boolean1, string1,
+                        string1, date1, date1), s.get());
         stringV.set(null);
         dateV.set(null);
         assertEquals(String.format(Locale.GERMAN, "%8.3e, %8.3e, %6.3f, %6.3f, %d, %d, %d, %d, %s, %s, %s, %s, %s, %tc",
-                double1, double1, float1, float1, long1, long1, int1, int1, boolean1, boolean1, "null", string1, "null", date1), s.get());
+                double1, double1, float1, float1, long1, long1, int1, int1, boolean1, boolean1, "null", string1, "null",
+                date1), s.get());
 
         // US Locale
         doubleV.set(double0);
@@ -357,7 +393,7 @@ public void testConvertWithCustomLocale() {
         assertEquals(String.format(Locale.US, "Date: %tc", date1), s.get());
         // one variable
         s = Bindings.format(Locale.US, "Date: %tc", dateV);
-        DependencyUtils.checkDependencies(((StringBinding)s).getDependencies(), dateV);
+        DependencyUtils.checkDependencies(((StringBinding) s).getDependencies(), dateV);
         assertEquals(String.format(Locale.US, "Date: %tc", date0), s.get());
         dateV.set(date1);
         assertEquals(String.format(Locale.US, "Date: %tc", date1), s.get());
@@ -367,10 +403,13 @@ public void testConvertWithCustomLocale() {
 
         // test all
         s = Bindings.format(Locale.US, "%8.3e, %8.3e, %6.3f, %6.3f, %d, %d, %d, %d, %s, %s, %s, %s, %tc, %tc",
-                doubleV, double1, floatV, float1, longV, long1, intV, int1, booleanV, boolean1, stringV, string1, dateV, date1);
-        DependencyUtils.checkDependencies(((StringBinding)s).getDependencies(), doubleV, floatV, longV, intV, booleanV, stringV, dateV);
+                doubleV, double1, floatV, float1, longV, long1, intV, int1, booleanV, boolean1, stringV, string1, dateV,
+                date1);
+        DependencyUtils.checkDependencies(((StringBinding) s).getDependencies(), doubleV, floatV, longV, intV, booleanV,
+                stringV, dateV);
         assertEquals(String.format(Locale.US, "%8.3e, %8.3e, %6.3f, %6.3f, %d, %d, %d, %d, %s, %s, %s, %s, %tc, %tc",
-                double0, double1, float0, float1, long0, long1, int0, int1, boolean0, boolean1, string0, string1, date0, date1), s.get());
+                double0, double1, float0, float1, long0, long1, int0, int1, boolean0, boolean1, string0, string1, date0,
+                date1), s.get());
         doubleV.set(double1);
         floatV.set(float1);
         longV.set(long1);
@@ -379,25 +418,34 @@ public void testConvertWithCustomLocale() {
         stringV.set(string1);
         dateV.set(date1);
         assertEquals(String.format(Locale.US, "%8.3e, %8.3e, %6.3f, %6.3f, %d, %d, %d, %d, %s, %s, %s, %s, %tc, %tc",
-                double1, double1, float1, float1, long1, long1, int1, int1, boolean1, boolean1, string1, string1, date1, date1), s.get());
+                double1, double1, float1, float1, long1, long1, int1, int1, boolean1, boolean1, string1, string1, date1,
+                date1), s.get());
         stringV.set(null);
         dateV.set(null);
-        assertEquals(String.format(Locale.US, "%8.3e, %8.3e, %6.3f, %6.3f, %d, %d, %d, %d, %s, %s, %s, %s, %s, %tc",
-                double1, double1, float1, float1, long1, long1, int1, int1, boolean1, boolean1, "null", string1, "null", date1), s.get());
+        assertEquals(
+                String.format(Locale.US, "%8.3e, %8.3e, %6.3f, %6.3f, %d, %d, %d, %d, %s, %s, %s, %s, %s, %tc", double1,
+                        double1, float1, float1, long1, long1, int1, int1, boolean1, boolean1, "null", string1, "null",
+                        date1), s.get());
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testConvertWithCustomLocale_Null() {
-        Bindings.format(Locale.US, null);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.format(Locale.US, null);
+        });
     }
 
-    @Test(expected=IllegalFormatException.class)
+    @Test
     public void testConvertWithCustomLocale_IllegalObject() {
-        Bindings.format(Locale.US, "%tc", double0);
+        assertThrows(IllegalFormatException.class, () -> {
+            Bindings.format(Locale.US, "%tc", double0);
+        });
     }
 
-    @Test(expected=IllegalFormatException.class)
+    @Test
     public void testConvertWithCustomLocale_IllegalValueModel() {
-        Bindings.format(Locale.US, "%tc", doubleV);
+        assertThrows(IllegalFormatException.class, () -> {
+            Bindings.format(Locale.US, "%tc", doubleV);
+        });
     }
 }
diff --git a/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/TestLogging.java b/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/TestLogging.java
index 723f0aa6798..ced10248516 100644
--- a/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/TestLogging.java
+++ b/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/TestLogging.java
@@ -26,7 +26,7 @@
 package test.com.sun.javafx.binding;
 
 import com.sun.javafx.binding.Logging;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import test.util.memory.JMemoryBuddy;
 
 public class TestLogging {
diff --git a/modules/javafx.base/src/test/java/test/com/sun/javafx/collections/ListListenerHelperTest.java b/modules/javafx.base/src/test/java/test/com/sun/javafx/collections/ListListenerHelperTest.java
index d225c17e20b..c1657a4ade4 100644
--- a/modules/javafx.base/src/test/java/test/com/sun/javafx/collections/ListListenerHelperTest.java
+++ b/modules/javafx.base/src/test/java/test/com/sun/javafx/collections/ListListenerHelperTest.java
@@ -35,16 +35,17 @@
 import test.javafx.collections.MockListObserver;
 import javafx.collections.ObservableList;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.BitSet;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class ListListenerHelperTest {
 
@@ -57,7 +58,7 @@ public class ListListenerHelperTest {
     private ObservableList<Object> list;
     private ListChangeListener.Change<Object> change;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         invalidationListenerMock = new InvalidationListenerMock[] {
                 new InvalidationListenerMock(),
@@ -85,24 +86,32 @@ private void resetAllListeners() {
         }
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testAddInvalidationListener_Null() {
-        ListListenerHelper.addListener(helper, (InvalidationListener)null);
+        assertThrows(NullPointerException.class, () -> {
+            ListListenerHelper.addListener(helper, (InvalidationListener)null);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testRemoveInvalidationListener_Null() {
-        ListListenerHelper.removeListener(helper, (InvalidationListener) null);
+        assertThrows(NullPointerException.class, () -> {
+            ListListenerHelper.removeListener(helper, (InvalidationListener) null);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testRemoveListChangeListener_Null() {
-        ListListenerHelper.removeListener(helper, (ListChangeListener<Object>) null);
+        assertThrows(NullPointerException.class, () -> {
+            ListListenerHelper.removeListener(helper, (ListChangeListener<Object>) null);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testAddListChangeListener_Null() {
-        ListListenerHelper.addListener(helper, (ListChangeListener<Object>) null);
+        assertThrows(NullPointerException.class, () -> {
+            ListListenerHelper.addListener(helper, (ListChangeListener<Object>) null);
+        });
     }
 
     @Test
diff --git a/modules/javafx.base/src/test/java/test/com/sun/javafx/collections/MapListenerHelperTest.java b/modules/javafx.base/src/test/java/test/com/sun/javafx/collections/MapListenerHelperTest.java
index 70624f7fcb4..28308506250 100644
--- a/modules/javafx.base/src/test/java/test/com/sun/javafx/collections/MapListenerHelperTest.java
+++ b/modules/javafx.base/src/test/java/test/com/sun/javafx/collections/MapListenerHelperTest.java
@@ -34,16 +34,14 @@
 import javafx.beans.Observable;
 import javafx.collections.*;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.BitSet;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class MapListenerHelperTest {
 
@@ -56,7 +54,7 @@ public class MapListenerHelperTest {
     private ObservableMap<Object, Object> map;
     private MapChangeListener.Change<Object, Object> change;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         invalidationListenerMock = new InvalidationListenerMock[] {
                 new InvalidationListenerMock(),
@@ -84,26 +82,38 @@ private void resetAllListeners() {
         }
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testAddInvalidationListener_Null() {
-        MapListenerHelper.addListener(helper, (InvalidationListener)null);
+        assertThrows(NullPointerException.class, () -> {
+            MapListenerHelper.addListener(helper, (InvalidationListener)null);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+
+    @Test
     public void testRemoveInvalidationListener_Null() {
-        MapListenerHelper.removeListener(helper, (InvalidationListener) null);
+        assertThrows(NullPointerException.class, () -> {
+            MapListenerHelper.removeListener(helper, (InvalidationListener) null);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+
+    @Test
     public void testRemoveMapChangeListener_Null() {
-        MapListenerHelper.removeListener(helper, (MapChangeListener<Object, Object>) null);
+        assertThrows(NullPointerException.class, () -> {
+            MapListenerHelper.removeListener(helper, (MapChangeListener<Object, Object>) null);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+
+    @Test
     public void testAddMapChangeListener_Null() {
-        MapListenerHelper.addListener(helper, (MapChangeListener<Object, Object>) null);
+        assertThrows(NullPointerException.class, () -> {
+            MapListenerHelper.addListener(helper, (MapChangeListener<Object, Object>) null);
+        });
     }
 
+
     @Test
     public void testEmpty() {
         assertFalse(MapListenerHelper.hasListeners(helper));
diff --git a/modules/javafx.base/src/test/java/test/com/sun/javafx/collections/MappingChangeTest.java b/modules/javafx.base/src/test/java/test/com/sun/javafx/collections/MappingChangeTest.java
index fc56ddb1a2c..2086f4e8ade 100644
--- a/modules/javafx.base/src/test/java/test/com/sun/javafx/collections/MappingChangeTest.java
+++ b/modules/javafx.base/src/test/java/test/com/sun/javafx/collections/MappingChangeTest.java
@@ -32,16 +32,16 @@
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener.Change;
 import javafx.collections.ObservableList;
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class MappingChangeTest {
 
     ObservableList<Integer> originalList;
     ObservableList<String> list;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         originalList = FXCollections.observableArrayList(1, 2, 3, 4, 5);
         list = FXCollections.observableArrayList("1", "2", "3", "4", "5");
diff --git a/modules/javafx.base/src/test/java/test/com/sun/javafx/collections/NonIterableChangeTest.java b/modules/javafx.base/src/test/java/test/com/sun/javafx/collections/NonIterableChangeTest.java
index 8e8523b22d8..749130994f5 100644
--- a/modules/javafx.base/src/test/java/test/com/sun/javafx/collections/NonIterableChangeTest.java
+++ b/modules/javafx.base/src/test/java/test/com/sun/javafx/collections/NonIterableChangeTest.java
@@ -29,15 +29,15 @@
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener.Change;
 import javafx.collections.ObservableList;
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class NonIterableChangeTest {
 
     ObservableList<String> list;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         list = FXCollections.observableArrayList("a", "b", "c", "d", "e");
     }
diff --git a/modules/javafx.base/src/test/java/test/com/sun/javafx/collections/SetListenerHelperTest.java b/modules/javafx.base/src/test/java/test/com/sun/javafx/collections/SetListenerHelperTest.java
index 40c93b5d717..d95f46fb548 100644
--- a/modules/javafx.base/src/test/java/test/com/sun/javafx/collections/SetListenerHelperTest.java
+++ b/modules/javafx.base/src/test/java/test/com/sun/javafx/collections/SetListenerHelperTest.java
@@ -34,16 +34,14 @@
 import test.javafx.collections.MockSetObserver;
 import javafx.collections.ObservableSet;
 import javafx.collections.SetChangeListener;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.BitSet;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class SetListenerHelperTest {
 
@@ -56,7 +54,7 @@ public class SetListenerHelperTest {
     private ObservableSet<Object> set;
     private SetChangeListener.Change<Object> change;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         invalidationListenerMock = new InvalidationListenerMock[] {
                 new InvalidationListenerMock(),
@@ -84,26 +82,38 @@ private void resetAllListeners() {
         }
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testAddInvalidationListener_Null() {
-        SetListenerHelper.addListener(helper, (InvalidationListener)null);
+        assertThrows(NullPointerException.class, () -> {
+            SetListenerHelper.addListener(helper, (InvalidationListener)null);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+
+    @Test
     public void testRemoveInvalidationListener_Null() {
-        SetListenerHelper.removeListener(helper, (InvalidationListener) null);
+        assertThrows(NullPointerException.class, () -> {
+            SetListenerHelper.removeListener(helper, (InvalidationListener) null);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+
+    @Test
     public void testRemoveSetChangeListener_Null() {
-        SetListenerHelper.removeListener(helper, (SetChangeListener<Object>) null);
+        assertThrows(NullPointerException.class, () -> {
+            SetListenerHelper.removeListener(helper, (SetChangeListener<Object>) null);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+
+    @Test
     public void testAddSetChangeListener_Null() {
-        SetListenerHelper.addListener(helper, (SetChangeListener<Object>) null);
+        assertThrows(NullPointerException.class, () -> {
+            SetListenerHelper.addListener(helper, (SetChangeListener<Object>) null);
+        });
     }
 
+
     @Test
     public void testEmpty() {
         assertFalse(SetListenerHelper.hasListeners(helper));
diff --git a/modules/javafx.base/src/test/java/test/com/sun/javafx/event/CompositeEventDispatcherTest.java b/modules/javafx.base/src/test/java/test/com/sun/javafx/event/CompositeEventDispatcherTest.java
index 8a99a023ed1..a2cc0e41145 100644
--- a/modules/javafx.base/src/test/java/test/com/sun/javafx/event/CompositeEventDispatcherTest.java
+++ b/modules/javafx.base/src/test/java/test/com/sun/javafx/event/CompositeEventDispatcherTest.java
@@ -26,8 +26,10 @@
 package test.com.sun.javafx.event;
 
 import javafx.event.EventDispatchChain;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import org.junit.jupiter.api.Test;
 
 import test.com.sun.javafx.event.StubBasicEventDispatcher.ConsumeEvent;
 
@@ -41,49 +43,49 @@ public void eventDispatchTest() {
                 new EventCountingDispatcher();
         final EventDispatchChain eventDispatchChain =
                 StubEventDispatchChain.EMPTY_CHAIN
-                                      .append(compositeDispatcher)
-                                      .append(terminalDispatcher);
+                        .append(compositeDispatcher)
+                        .append(terminalDispatcher);
 
-        Assert.assertNotNull(eventDispatchChain.dispatchEvent(
-                                                    new EmptyEvent()));
+        assertNotNull(eventDispatchChain.dispatchEvent(
+                new EmptyEvent()));
         verifyEventCounters(compositeDispatcher, 1, 1, 1, 1, 1, 1);
-        Assert.assertEquals(1, terminalDispatcher.getCapturingEventCount());
+        assertEquals(1, terminalDispatcher.getCapturingEventCount());
 
         compositeDispatcher.getFirstChildDispatcher().setConsumeNextEvent(
                 ConsumeEvent.CAPTURING);
-        Assert.assertNull(eventDispatchChain.dispatchEvent(new EmptyEvent()));
+        assertNull(eventDispatchChain.dispatchEvent(new EmptyEvent()));
         verifyEventCounters(compositeDispatcher, 2, 1, 1, 1, 1, 1);
-        Assert.assertEquals(1, terminalDispatcher.getCapturingEventCount());
+        assertEquals(1, terminalDispatcher.getCapturingEventCount());
 
         compositeDispatcher.getSecondChildDispatcher().setConsumeNextEvent(
                 ConsumeEvent.CAPTURING);
-        Assert.assertNull(eventDispatchChain.dispatchEvent(new EmptyEvent()));
+        assertNull(eventDispatchChain.dispatchEvent(new EmptyEvent()));
         verifyEventCounters(compositeDispatcher, 3, 2, 1, 1, 1, 1);
-        Assert.assertEquals(1, terminalDispatcher.getCapturingEventCount());
+        assertEquals(1, terminalDispatcher.getCapturingEventCount());
 
         compositeDispatcher.getThirdChildDispatcher().setConsumeNextEvent(
                 ConsumeEvent.CAPTURING);
-        Assert.assertNull(eventDispatchChain.dispatchEvent(new EmptyEvent()));
+        assertNull(eventDispatchChain.dispatchEvent(new EmptyEvent()));
         verifyEventCounters(compositeDispatcher, 4, 3, 2, 1, 1, 1);
-        Assert.assertEquals(1, terminalDispatcher.getCapturingEventCount());
+        assertEquals(1, terminalDispatcher.getCapturingEventCount());
 
         compositeDispatcher.getThirdChildDispatcher().setConsumeNextEvent(
                 ConsumeEvent.BUBBLING);
-        Assert.assertNull(eventDispatchChain.dispatchEvent(new EmptyEvent()));
+        assertNull(eventDispatchChain.dispatchEvent(new EmptyEvent()));
         verifyEventCounters(compositeDispatcher, 5, 4, 3, 1, 1, 2);
-        Assert.assertEquals(2, terminalDispatcher.getCapturingEventCount());
+        assertEquals(2, terminalDispatcher.getCapturingEventCount());
 
         compositeDispatcher.getSecondChildDispatcher().setConsumeNextEvent(
                 ConsumeEvent.BUBBLING);
-        Assert.assertNull(eventDispatchChain.dispatchEvent(new EmptyEvent()));
+        assertNull(eventDispatchChain.dispatchEvent(new EmptyEvent()));
         verifyEventCounters(compositeDispatcher, 6, 5, 4, 1, 2, 3);
-        Assert.assertEquals(3, terminalDispatcher.getCapturingEventCount());
+        assertEquals(3, terminalDispatcher.getCapturingEventCount());
 
         compositeDispatcher.getFirstChildDispatcher().setConsumeNextEvent(
                 ConsumeEvent.BUBBLING);
-        Assert.assertNull(eventDispatchChain.dispatchEvent(new EmptyEvent()));
+        assertNull(eventDispatchChain.dispatchEvent(new EmptyEvent()));
         verifyEventCounters(compositeDispatcher, 7, 6, 5, 2, 3, 4);
-        Assert.assertEquals(4, terminalDispatcher.getCapturingEventCount());
+        assertEquals(4, terminalDispatcher.getCapturingEventCount());
     }
 
     private void verifyEventCounters(
@@ -94,23 +96,23 @@ private void verifyEventCounters(
             final int expectedChild1BubblingEventCount,
             final int expectedChild2BubblingEventCount,
             final int expectedChild3BubblingEventCount) {
-        Assert.assertEquals(expectedChild1CapturingEventCount,
-                            compositeDispatcher.getFirstChildDispatcher()
-                                               .getCapturingEventCount());
-        Assert.assertEquals(expectedChild2CapturingEventCount,
-                            compositeDispatcher.getSecondChildDispatcher()
-                                               .getCapturingEventCount());
-        Assert.assertEquals(expectedChild3CapturingEventCount,
-                            compositeDispatcher.getThirdChildDispatcher()
-                                               .getCapturingEventCount());
-        Assert.assertEquals(expectedChild1BubblingEventCount,
-                            compositeDispatcher.getFirstChildDispatcher()
-                                               .getBubblingEventCount());
-        Assert.assertEquals(expectedChild2BubblingEventCount,
-                            compositeDispatcher.getSecondChildDispatcher()
-                                               .getBubblingEventCount());
-        Assert.assertEquals(expectedChild3BubblingEventCount,
-                            compositeDispatcher.getThirdChildDispatcher()
-                                               .getBubblingEventCount());
+        assertEquals(expectedChild1CapturingEventCount,
+                compositeDispatcher.getFirstChildDispatcher()
+                        .getCapturingEventCount());
+        assertEquals(expectedChild2CapturingEventCount,
+                compositeDispatcher.getSecondChildDispatcher()
+                        .getCapturingEventCount());
+        assertEquals(expectedChild3CapturingEventCount,
+                compositeDispatcher.getThirdChildDispatcher()
+                        .getCapturingEventCount());
+        assertEquals(expectedChild1BubblingEventCount,
+                compositeDispatcher.getFirstChildDispatcher()
+                        .getBubblingEventCount());
+        assertEquals(expectedChild2BubblingEventCount,
+                compositeDispatcher.getSecondChildDispatcher()
+                        .getBubblingEventCount());
+        assertEquals(expectedChild3BubblingEventCount,
+                compositeDispatcher.getThirdChildDispatcher()
+                        .getBubblingEventCount());
     }
 }
diff --git a/modules/javafx.base/src/test/java/test/com/sun/javafx/event/CompositeEventHandlerTest.java b/modules/javafx.base/src/test/java/test/com/sun/javafx/event/CompositeEventHandlerTest.java
index 8701a809f90..2a4680235c6 100644
--- a/modules/javafx.base/src/test/java/test/com/sun/javafx/event/CompositeEventHandlerTest.java
+++ b/modules/javafx.base/src/test/java/test/com/sun/javafx/event/CompositeEventHandlerTest.java
@@ -28,20 +28,20 @@
 import com.sun.javafx.event.CompositeEventHandler;
 import com.sun.javafx.event.CompositeEventHandlerShim;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 import javafx.event.Event;
 import javafx.event.WeakEventHandler;
 import javafx.event.WeakEventHandlerUtil;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class CompositeEventHandlerTest {
     private CompositeEventHandler<Event> compositeEventHandler;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         compositeEventHandler = new CompositeEventHandler<>();
     }
@@ -59,11 +59,11 @@ public void testHasFilterWeakCleared() {
                 new WeakEventHandler<>(eventCountingHandler);
 
         compositeEventHandler.addEventFilter(weakEventHandler);
-        assertFalse("must not have handler after adding filter", compositeEventHandler.hasHandler());
-        assertTrue("must have filter", compositeEventHandler.hasFilter());
+        assertFalse(compositeEventHandler.hasHandler(), "must not have handler after adding filter");
+        assertTrue(compositeEventHandler.hasFilter(), "must have filter");
         WeakEventHandlerUtil.clear(weakEventHandler);
-        assertFalse("must not have filter", compositeEventHandler.hasFilter());
-        assertFalse("must not have handler", compositeEventHandler.hasHandler());
+        assertFalse(compositeEventHandler.hasFilter(), "must not have filter");
+        assertFalse(compositeEventHandler.hasHandler(), "must not have handler");
     }
 
     /**
@@ -76,13 +76,13 @@ public void testHasHandlerAddWeakClear() {
         final WeakEventHandler<Event> weakEventHandler =
                 new WeakEventHandler<>(eventCountingHandler);
         compositeEventHandler.addEventHandler(weakEventHandler);
-        assertTrue("sanity: really added?", CompositeEventHandlerShim.containsHandler(
-                compositeEventHandler, weakEventHandler));
-        assertFalse("must not have filter after adding handler", compositeEventHandler.hasFilter());
-        assertTrue("must have handler", compositeEventHandler.hasHandler());
+        assertTrue(CompositeEventHandlerShim.containsHandler(
+                compositeEventHandler, weakEventHandler), "sanity: really added?");
+        assertFalse(compositeEventHandler.hasFilter(), "must not have filter after adding handler");
+        assertTrue(compositeEventHandler.hasHandler(), "must have handler");
         WeakEventHandlerUtil.clear(weakEventHandler);
-        assertFalse("must not have handler", compositeEventHandler.hasHandler());
-        assertFalse("must not have filter", compositeEventHandler.hasFilter());
+        assertFalse(compositeEventHandler.hasHandler(), "must not have handler");
+        assertFalse(compositeEventHandler.hasFilter(), "must not have filter");
     }
 
     /**
@@ -98,11 +98,11 @@ public void testHasFilterWeak() {
                 new WeakEventHandler<>(eventCountingHandler);
 
         compositeEventHandler.addEventFilter(weakEventHandler);
-        assertFalse("must not have handler after adding filter", compositeEventHandler.hasHandler());
-        assertTrue("must have filter", compositeEventHandler.hasFilter());
+        assertFalse(compositeEventHandler.hasHandler(), "must not have handler after adding filter");
+        assertTrue(compositeEventHandler.hasFilter(), "must have filter");
         compositeEventHandler.removeEventFilter(weakEventHandler);
-        assertFalse("must not have filter", compositeEventHandler.hasFilter());
-        assertFalse("must not have handler", compositeEventHandler.hasHandler());
+        assertFalse(compositeEventHandler.hasFilter(), "must not have filter");
+        assertFalse(compositeEventHandler.hasHandler(), "must not have handler");
     }
 
     /**
@@ -115,13 +115,13 @@ public void testHasHandlerAddWeak() {
         final WeakEventHandler<Event> weakEventHandler =
                 new WeakEventHandler<>(eventCountingHandler);
         compositeEventHandler.addEventHandler(weakEventHandler);
-        assertTrue("sanity: really added?", CompositeEventHandlerShim.containsHandler(
-                compositeEventHandler, weakEventHandler));
-        assertFalse("must not have filter after adding handler", compositeEventHandler.hasFilter());
-        assertTrue("must have handler", compositeEventHandler.hasHandler());
+        assertTrue(CompositeEventHandlerShim.containsHandler(
+                compositeEventHandler, weakEventHandler), "sanity: really added?");
+        assertFalse(compositeEventHandler.hasFilter(), "must not have filter after adding handler");
+        assertTrue(compositeEventHandler.hasHandler(), "must have handler");
         compositeEventHandler.removeEventHandler(weakEventHandler);
-        assertFalse("must not have filter", compositeEventHandler.hasFilter());
-        assertFalse("must not have handler", compositeEventHandler.hasHandler());
+        assertFalse(compositeEventHandler.hasFilter(), "must not have filter");
+        assertFalse(compositeEventHandler.hasHandler(), "must not have handler");
     }
 
     /**
@@ -132,11 +132,11 @@ public void testHasFilter() {
         final EventCountingHandler<Event> eventCountingHandler =
                 new EventCountingHandler<>();
         compositeEventHandler.addEventFilter(eventCountingHandler);
-        assertFalse("must not have handler after adding filter", compositeEventHandler.hasHandler());
-        assertTrue("must have filter", compositeEventHandler.hasFilter());
+        assertFalse(compositeEventHandler.hasHandler(), "must not have handler after adding filter");
+        assertTrue(compositeEventHandler.hasFilter(), "must have filter");
         compositeEventHandler.removeEventFilter(eventCountingHandler);
-        assertFalse("must not have filter", compositeEventHandler.hasFilter());
-        assertFalse("must not have handler", compositeEventHandler.hasHandler());
+        assertFalse(compositeEventHandler.hasFilter(), "must not have filter");
+        assertFalse(compositeEventHandler.hasHandler(), "must not have handler");
     }
 
     /**
@@ -147,13 +147,13 @@ public void testHasHandlerAdd() {
         final EventCountingHandler<Event> eventCountingHandler =
                 new EventCountingHandler<>();
         compositeEventHandler.addEventHandler(eventCountingHandler);
-        assertTrue("sanity: really added?", CompositeEventHandlerShim.containsHandler(
-                compositeEventHandler, eventCountingHandler));
-        assertFalse("must not have filter after adding handler", compositeEventHandler.hasFilter());
-        assertTrue("must have handler", compositeEventHandler.hasHandler());
+        assertTrue(CompositeEventHandlerShim.containsHandler(
+                compositeEventHandler, eventCountingHandler), "sanity: really added?");
+        assertFalse(compositeEventHandler.hasFilter(), "must not have filter after adding handler");
+        assertTrue(compositeEventHandler.hasHandler(), "must have handler");
         compositeEventHandler.removeEventHandler(eventCountingHandler);
-        assertFalse("must not have filter", compositeEventHandler.hasFilter());
-        assertFalse("must not have handler", compositeEventHandler.hasHandler());
+        assertFalse(compositeEventHandler.hasFilter(), "must not have filter");
+        assertFalse(compositeEventHandler.hasHandler(), "must not have handler");
 
     }
 
@@ -165,11 +165,11 @@ public void testHasHandlerSingleton() {
         final EventCountingHandler<Event> eventCountingHandler =
                 new EventCountingHandler<>();
         compositeEventHandler.setEventHandler(eventCountingHandler);
-        assertFalse("must not have filter after set handler", compositeEventHandler.hasFilter());
-        assertTrue("must have handler", compositeEventHandler.hasHandler());
+        assertFalse(compositeEventHandler.hasFilter(), "must not have filter after set handler");
+        assertTrue(compositeEventHandler.hasHandler(), "must have handler");
         compositeEventHandler.setEventHandler(null);
-        assertFalse("must not have filter", compositeEventHandler.hasFilter());
-        assertFalse("must not have handler", compositeEventHandler.hasHandler());
+        assertFalse(compositeEventHandler.hasFilter(), "must not have filter");
+        assertFalse(compositeEventHandler.hasHandler(), "must not have handler");
     }
 
     @Test
@@ -181,21 +181,21 @@ public void weakEventHandlerTest() {
 
         compositeEventHandler.addEventHandler(weakEventHandler);
 
-        Assert.assertTrue(
-            CompositeEventHandlerShim.containsHandler(compositeEventHandler, weakEventHandler));
+        assertTrue(
+                CompositeEventHandlerShim.containsHandler(compositeEventHandler, weakEventHandler));
         compositeEventHandler.dispatchCapturingEvent(new EmptyEvent());
-        Assert.assertEquals(0, eventCountingHandler.getEventCount());
+        assertEquals(0, eventCountingHandler.getEventCount());
         compositeEventHandler.dispatchBubblingEvent(new EmptyEvent());
-        Assert.assertEquals(1, eventCountingHandler.getEventCount());
+        assertEquals(1, eventCountingHandler.getEventCount());
 
         WeakEventHandlerUtil.clear(weakEventHandler);
 
-        Assert.assertFalse(
+        assertFalse(
                 CompositeEventHandlerShim.containsHandler(compositeEventHandler, weakEventHandler));
         compositeEventHandler.dispatchCapturingEvent(new EmptyEvent());
-        Assert.assertEquals(1, eventCountingHandler.getEventCount());
+        assertEquals(1, eventCountingHandler.getEventCount());
         compositeEventHandler.dispatchBubblingEvent(new EmptyEvent());
-        Assert.assertEquals(1, eventCountingHandler.getEventCount());
+        assertEquals(1, eventCountingHandler.getEventCount());
     }
 
     @Test
@@ -207,20 +207,20 @@ public void weakEventFilterTest() {
 
         compositeEventHandler.addEventFilter(weakEventFilter);
 
-        Assert.assertTrue(
+        assertTrue(
                 CompositeEventHandlerShim.containsFilter(compositeEventHandler, weakEventFilter));
         compositeEventHandler.dispatchCapturingEvent(new EmptyEvent());
-        Assert.assertEquals(1, eventCountingFilter.getEventCount());
+        assertEquals(1, eventCountingFilter.getEventCount());
         compositeEventHandler.dispatchBubblingEvent(new EmptyEvent());
-        Assert.assertEquals(1, eventCountingFilter.getEventCount());
+        assertEquals(1, eventCountingFilter.getEventCount());
 
         WeakEventHandlerUtil.clear(weakEventFilter);
 
-        Assert.assertFalse(
+        assertFalse(
                 CompositeEventHandlerShim.containsFilter(compositeEventHandler, weakEventFilter));
         compositeEventHandler.dispatchCapturingEvent(new EmptyEvent());
-        Assert.assertEquals(1, eventCountingFilter.getEventCount());
+        assertEquals(1, eventCountingFilter.getEventCount());
         compositeEventHandler.dispatchBubblingEvent(new EmptyEvent());
-        Assert.assertEquals(1, eventCountingFilter.getEventCount());
+        assertEquals(1, eventCountingFilter.getEventCount());
     }
 }
diff --git a/modules/javafx.base/src/test/java/test/com/sun/javafx/event/EventChangingDispatcher.java b/modules/javafx.base/src/test/java/test/com/sun/javafx/event/EventChangingDispatcher.java
index f871eb098e3..a92ec35ef20 100644
--- a/modules/javafx.base/src/test/java/test/com/sun/javafx/event/EventChangingDispatcher.java
+++ b/modules/javafx.base/src/test/java/test/com/sun/javafx/event/EventChangingDispatcher.java
@@ -28,7 +28,7 @@
 import javafx.event.Event;
 import javafx.event.EventDispatchChain;
 
-import org.junit.Assert;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public final class EventChangingDispatcher extends LabeledEventDispatcher {
     private final Operation capturingPhaseOperation;
@@ -50,17 +50,17 @@ public EventChangingDispatcher(final String label,
     @Override
     public Event dispatchEvent(final Event event,
                                final EventDispatchChain tail) {
-        Assert.assertTrue(event instanceof ValueEvent);
+        assertTrue(event instanceof ValueEvent);
         ValueEvent valueEvent = (ValueEvent) event;
 
         if (capturingPhaseOperation != null) {
             valueEvent.setValue(capturingPhaseOperation.applyTo(
-                                    valueEvent.getValue()));
+                    valueEvent.getValue()));
         }
         valueEvent = (ValueEvent) tail.dispatchEvent(valueEvent);
         if (bubblingPhaseOperation != null) {
             valueEvent.setValue(bubblingPhaseOperation.applyTo(
-                                    valueEvent.getValue()));
+                    valueEvent.getValue()));
         }
 
         return valueEvent;
diff --git a/modules/javafx.base/src/test/java/test/com/sun/javafx/event/EventDispatchTreeTest.java b/modules/javafx.base/src/test/java/test/com/sun/javafx/event/EventDispatchTreeTest.java
index 7e8bb1d9991..701d5a93a5a 100644
--- a/modules/javafx.base/src/test/java/test/com/sun/javafx/event/EventDispatchTreeTest.java
+++ b/modules/javafx.base/src/test/java/test/com/sun/javafx/event/EventDispatchTreeTest.java
@@ -28,8 +28,9 @@
 import com.sun.javafx.event.EventDispatchTree;
 import com.sun.javafx.event.EventDispatchTreeImpl;
 import javafx.event.EventDispatcher;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public final class EventDispatchTreeTest {
     @Test
@@ -44,9 +45,9 @@ public void resetTest() {
         ((EventDispatchTreeImpl) eventDispatchTree).reset();
 
         eventDispatchTree = eventDispatchTree.append(dispatcherB)
-                                             .append(dispatcherC);
+                .append(dispatcherC);
 
-        Assert.assertEquals("(B->(C))", eventDispatchTree.toString());
+        assertEquals("(B->(C))", eventDispatchTree.toString());
     }
 
     @Test
@@ -62,40 +63,40 @@ public void mergeTreeTest() {
 
         eventDispatchTree =
                 eventDispatchTree.mergeTree(
-                    eventDispatchTree.createTree()
-                                     .append(dispatchers[0])
-                                     .append(dispatchers[1])
-                                     .append(dispatchers[2])
-                                     .append(dispatchers[3]));
+                                 eventDispatchTree.createTree()
+                                .append(dispatchers[0])
+                                .append(dispatchers[1])
+                                .append(dispatchers[2])
+                                .append(dispatchers[3]));
 
         eventDispatchTree =
                 eventDispatchTree.mergeTree(
-                    eventDispatchTree.createTree()
-                                     .append(dispatchers[4])
-                                     .append(dispatchers[6])
-                                     .prepend(dispatchers[2])
-                                     .prepend(dispatchers[1])
-                                     .prepend(dispatchers[0]));
+                                 eventDispatchTree.createTree()
+                                .append(dispatchers[4])
+                                .append(dispatchers[6])
+                                .prepend(dispatchers[2])
+                                .prepend(dispatchers[1])
+                                .prepend(dispatchers[0]));
 
         eventDispatchTree =
                 eventDispatchTree.mergeTree(
-                    eventDispatchTree.createTree()
-                                     .prepend(dispatchers[7])
-                                     .prepend(dispatchers[5])
-                                     .prepend(dispatchers[4])
-                                     .prepend(dispatchers[2])
-                                     .prepend(dispatchers[1])
-                                     .prepend(dispatchers[0]));
+                                 eventDispatchTree.createTree()
+                                .prepend(dispatchers[7])
+                                .prepend(dispatchers[5])
+                                .prepend(dispatchers[4])
+                                .prepend(dispatchers[2])
+                                .prepend(dispatchers[1])
+                                .prepend(dispatchers[0]));
 
         eventDispatchTree =
                 eventDispatchTree.mergeTree(
-                    eventDispatchTree.createTree()
-                                     .prepend(dispatchers[2])
-                                     .prepend(dispatchers[1])
-                                     .prepend(dispatchers[0])
-                                     .append(dispatchers[4])
-                                     .append(dispatchers[5])
-                                     .append(dispatchers[8]));
+                                 eventDispatchTree.createTree()
+                                .prepend(dispatchers[2])
+                                .prepend(dispatchers[1])
+                                .prepend(dispatchers[0])
+                                .append(dispatchers[4])
+                                .append(dispatchers[5])
+                                .append(dispatchers[8]));
 
 
         eventDispatchTree = eventDispatchTree.prepend(dispatchers[9]);
@@ -104,25 +105,25 @@ public void mergeTreeTest() {
 
         eventDispatchTree =
                 eventDispatchTree.mergeTree(
-                    eventDispatchTree.createTree()
-                                     .append(dispatchers[0])
-                                     .append(dispatchers[1])
-                                     .append(dispatchers[2])
-                                     .append(dispatchers[4])
-                                     .append(dispatchers[6])
-                                     .append(dispatchers[10])
-                                     .append(dispatchers[11]));
+                                 eventDispatchTree.createTree()
+                                .append(dispatchers[0])
+                                .append(dispatchers[1])
+                                .append(dispatchers[2])
+                                .append(dispatchers[4])
+                                .append(dispatchers[6])
+                                .append(dispatchers[10])
+                                .append(dispatchers[11]));
         eventDispatchTree =
                 eventDispatchTree.mergeTree(
-                    eventDispatchTree.createTree()
-                                     .append(dispatchers[9])
-                                     .append(dispatchers[0])
-                                     .append(dispatchers[1])
-                                     .append(dispatchers[2])
-                                     .append(dispatchers[4])
-                                     .append(dispatchers[6])
-                                     .append(dispatchers[10])
-                                     .append(dispatchers[11]));
+                                 eventDispatchTree.createTree()
+                                .append(dispatchers[9])
+                                .append(dispatchers[0])
+                                .append(dispatchers[1])
+                                .append(dispatchers[2])
+                                .append(dispatchers[4])
+                                .append(dispatchers[6])
+                                .append(dispatchers[10])
+                                .append(dispatchers[11]));
 
         //             /|
         //            9 0
@@ -141,10 +142,10 @@ public void mergeTreeTest() {
         //    |   |   |
         //   11  10   10
 
-        Assert.assertEquals(
+        assertEquals(
                 "(9->(0->(1->(2->(3->(10),4->(6->(10->(11)),5->"
-                    + "(7->(10),8->(10))))))),"
-                    + "0->(1->(2->(4->(6->(10->(11)))))))",
+                        + "(7->(10),8->(10))))))),"
+                        + "0->(1->(2->(4->(6->(10->(11)))))))",
                 eventDispatchTree.toString());
     }
 
@@ -163,19 +164,19 @@ public void dispatchEventTest() {
 
         eventDispatchTree =
                 eventDispatchTree.mergeTree(
-                    eventDispatchTree.createTree().append(dispatchers[2])
-                                                  .append(dispatchers[4]));
+                        eventDispatchTree.createTree().append(dispatchers[2])
+                                .append(dispatchers[4]));
 
         eventDispatchTree =
                 eventDispatchTree.mergeTree(
-                    eventDispatchTree.createTree().append(dispatchers[2])
-                                                  .append(dispatchers[5])
-                                                  .append(dispatchers[7]));
+                        eventDispatchTree.createTree().append(dispatchers[2])
+                                .append(dispatchers[5])
+                                .append(dispatchers[7]));
 
         eventDispatchTree =
                 eventDispatchTree.mergeTree(
-                    eventDispatchTree.createTree().append(dispatchers[3])
-                                                  .append(dispatchers[6]));
+                        eventDispatchTree.createTree().append(dispatchers[3])
+                                .append(dispatchers[6]));
 
         eventDispatchTree = eventDispatchTree.prepend(dispatchers[0]);
 
@@ -219,7 +220,7 @@ private static void verifyCapturingEventCounters(
             final EventCountingDispatcher[] dispatchers,
             final int... counters) {
         for (int i = 0; i < dispatchers.length; ++i) {
-            Assert.assertEquals(
+            assertEquals(
                     counters[i],
                     dispatchers[i].getCapturingEventCount());
         }
@@ -229,7 +230,7 @@ private static void verifyBubblingEventCounters(
             final EventCountingDispatcher[] dispatchers,
             final int... counters) {
         for (int i = 0; i < dispatchers.length; ++i) {
-            Assert.assertEquals(
+            assertEquals(
                     counters[i],
                     dispatchers[i].getBubblingEventCount());
         }
diff --git a/modules/javafx.base/src/test/java/test/com/sun/javafx/event/EventHandlerManagerTest.java b/modules/javafx.base/src/test/java/test/com/sun/javafx/event/EventHandlerManagerTest.java
index cfb0b75669a..e14302ffb5d 100644
--- a/modules/javafx.base/src/test/java/test/com/sun/javafx/event/EventHandlerManagerTest.java
+++ b/modules/javafx.base/src/test/java/test/com/sun/javafx/event/EventHandlerManagerTest.java
@@ -25,13 +25,13 @@
 
 package test.com.sun.javafx.event;
 
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import com.sun.javafx.event.EventHandlerManager;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 import javafx.event.Event;
 import javafx.event.EventDispatchChain;
@@ -44,7 +44,7 @@
 public final class EventHandlerManagerTest {
     private EventHandlerManager eventHandlerManager;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         eventHandlerManager = new EventHandlerManager(this);
     }
@@ -163,11 +163,11 @@ private void assertDispatch(ValueEvent sent, int expected) {
         ValueEvent received = (ValueEvent)
                 eventHandlerManager.dispatchEvent(sent, StubEventDispatchChain.EMPTY_CHAIN);
         String message = "value must be " + (same ? "unchanged " : "changed ");
-        assertEquals(message, expected, received.getValue());
+        assertEquals(expected, received.getValue(), message);
         if (same) {
-            assertSame("received event", sent, received);
+            assertSame(sent, received, "received event");
         } else {
-            assertNotSame("received event", sent, received);
+            assertNotSame(sent, received, "received event");
         }
     }
 
@@ -175,20 +175,20 @@ private void assertDispatch(ValueEvent sent, int expected) {
     public void shouldForwardEventsToChain() {
         final EventDispatchChain eventDispatchChain =
                 StubEventDispatchChain.EMPTY_CHAIN
-                                      .append(eventHandlerManager)
-                                      .append(new EventChangingDispatcher(
-                                                      Operation.add(4),
-                                                      Operation.div(3)));
+                        .append(eventHandlerManager)
+                        .append(new EventChangingDispatcher(
+                                Operation.add(4),
+                                Operation.div(3)));
 
         ValueEvent valueEvent;
 
         valueEvent = (ValueEvent) eventDispatchChain.dispatchEvent(
-                                          new ValueEvent(2));
-        Assert.assertEquals(2, valueEvent.getValue());
+                new ValueEvent(2));
+        assertEquals(2, valueEvent.getValue());
 
         valueEvent = (ValueEvent) eventDispatchChain.dispatchEvent(
-                                          new ValueEvent(5));
-        Assert.assertEquals(3, valueEvent.getValue());
+                new ValueEvent(5));
+        assertEquals(3, valueEvent.getValue());
     }
 
     @Test
@@ -218,11 +218,11 @@ public void shouldCallCorrectSingletonHandlers() {
         testValueEventDispatch(
                 eventHandlerManager, ValueEvent.VALUE_C, 5, 35);
 
-        Assert.assertEquals(0, emptyEventCountingHandler.getEventCount());
+        assertEquals(0, emptyEventCountingHandler.getEventCount());
         dispatchEmptyEvent(eventHandlerManager);
-        Assert.assertEquals(1, emptyEventCountingHandler.getEventCount());
+        assertEquals(1, emptyEventCountingHandler.getEventCount());
         dispatchEmptyEvent(eventHandlerManager);
-        Assert.assertEquals(2, emptyEventCountingHandler.getEventCount());
+        assertEquals(2, emptyEventCountingHandler.getEventCount());
     }
 
     @Test
@@ -282,11 +282,11 @@ public void shouldCallCorrectAddedHandlers() {
         testValueEventDispatch(
                 eventHandlerManager, ValueEvent.VALUE_C, 5, 210);
 
-        Assert.assertEquals(0, emptyEventCountingHandler.getEventCount());
+        assertEquals(0, emptyEventCountingHandler.getEventCount());
         dispatchEmptyEvent(eventHandlerManager);
-        Assert.assertEquals(1, emptyEventCountingHandler.getEventCount());
+        assertEquals(1, emptyEventCountingHandler.getEventCount());
         dispatchEmptyEvent(eventHandlerManager);
-        Assert.assertEquals(2, emptyEventCountingHandler.getEventCount());
+        assertEquals(2, emptyEventCountingHandler.getEventCount());
     }
 
     @Test
@@ -325,11 +325,11 @@ public void shouldCallCorrectAddedFilters() {
         testValueEventDispatch(
                 eventHandlerManager, ValueEvent.VALUE_C, 5, 210);
 
-        Assert.assertEquals(0, emptyEventCountingHandler.getEventCount());
+        assertEquals(0, emptyEventCountingHandler.getEventCount());
         dispatchEmptyEvent(eventHandlerManager);
-        Assert.assertEquals(1, emptyEventCountingHandler.getEventCount());
+        assertEquals(1, emptyEventCountingHandler.getEventCount());
         dispatchEmptyEvent(eventHandlerManager);
-        Assert.assertEquals(2, emptyEventCountingHandler.getEventCount());
+        assertEquals(2, emptyEventCountingHandler.getEventCount());
     }
 
     @Test
@@ -423,10 +423,10 @@ public void shouldNotAddFilterTwice() {
     public void shouldCallInCorrectOrder() {
         final EventDispatchChain eventDispatchChain =
                 StubEventDispatchChain.EMPTY_CHAIN
-                                      .append(eventHandlerManager)
-                                      .append(new EventChangingDispatcher(
-                                                      Operation.add(4),
-                                                      Operation.div(3)));
+                        .append(eventHandlerManager)
+                        .append(new EventChangingDispatcher(
+                                Operation.add(4),
+                                Operation.div(3)));
 
         eventHandlerManager.setEventHandler(
                 ValueEvent.VALUE_A,
@@ -441,8 +441,8 @@ public void shouldCallInCorrectOrder() {
         ValueEvent valueEvent;
 
         valueEvent = (ValueEvent) eventDispatchChain.dispatchEvent(
-                                          new ValueEvent(35));
-        Assert.assertEquals(16, valueEvent.getValue());
+                new ValueEvent(35));
+        assertEquals(16, valueEvent.getValue());
     }
 
     @Test
@@ -475,11 +475,11 @@ public void shouldCallHandlersForSuperTypes() {
         dispatchValueEvent(eventHandlerManager, ValueEvent.VALUE_C);
         dispatchEmptyEvent(eventHandlerManager);
 
-        Assert.assertEquals(5, rootEventCounter.getEventCount());
-        Assert.assertEquals(3, valueEventCounter.getEventCount());
-        Assert.assertEquals(1, valueAEventCounter.getEventCount());
-        Assert.assertEquals(1, valueBEventCounter.getEventCount());
-        Assert.assertEquals(2, emptyEventCounter.getEventCount());
+        assertEquals(5, rootEventCounter.getEventCount());
+        assertEquals(3, valueEventCounter.getEventCount());
+        assertEquals(1, valueAEventCounter.getEventCount());
+        assertEquals(1, valueBEventCounter.getEventCount());
+        assertEquals(2, emptyEventCounter.getEventCount());
     }
 
     @Test
@@ -512,11 +512,11 @@ public void shouldCallFiltersForSuperTypes() {
         dispatchValueEvent(eventHandlerManager, ValueEvent.VALUE_C);
         dispatchEmptyEvent(eventHandlerManager);
 
-        Assert.assertEquals(5, rootEventCounter.getEventCount());
-        Assert.assertEquals(3, valueEventCounter.getEventCount());
-        Assert.assertEquals(1, valueAEventCounter.getEventCount());
-        Assert.assertEquals(1, valueBEventCounter.getEventCount());
-        Assert.assertEquals(2, emptyEventCounter.getEventCount());
+        assertEquals(5, rootEventCounter.getEventCount());
+        assertEquals(3, valueEventCounter.getEventCount());
+        assertEquals(1, valueAEventCounter.getEventCount());
+        assertEquals(1, valueBEventCounter.getEventCount());
+        assertEquals(2, emptyEventCounter.getEventCount());
     }
 
     @Test
@@ -525,8 +525,8 @@ public void eventConsumedInHandlerTest() {
                 new EventCountingDispatcher();
         final EventDispatchChain eventDispatchChain =
                 StubEventDispatchChain.EMPTY_CHAIN
-                                      .append(eventHandlerManager)
-                                      .append(eventCountingDispatcher);
+                        .append(eventHandlerManager)
+                        .append(eventCountingDispatcher);
 
         final EventCountingHandler<Event> eventCountingFilter =
                 new EventCountingHandler<>();
@@ -541,11 +541,11 @@ public void eventConsumedInHandlerTest() {
         eventHandlerManager.addEventHandler(Event.ANY, eventCountingHandler);
         eventHandlerManager.addEventHandler(Event.ANY, eventConsumingHandler);
 
-        Assert.assertNull(eventDispatchChain.dispatchEvent(new EmptyEvent()));
-        Assert.assertEquals(1, eventCountingFilter.getEventCount());
-        Assert.assertEquals(
+        assertNull(eventDispatchChain.dispatchEvent(new EmptyEvent()));
+        assertEquals(1, eventCountingFilter.getEventCount());
+        assertEquals(
                 1, eventCountingDispatcher.getCapturingEventCount());
-        Assert.assertEquals(1, eventCountingHandler.getEventCount());
+        assertEquals(1, eventCountingHandler.getEventCount());
 
         eventHandlerManager.removeEventHandler(
                 Event.ANY, eventCountingHandler);
@@ -556,11 +556,11 @@ public void eventConsumedInHandlerTest() {
         eventHandlerManager.addEventHandler(Event.ANY, eventConsumingHandler);
         eventHandlerManager.addEventHandler(Event.ANY, eventCountingHandler);
 
-        Assert.assertNull(eventDispatchChain.dispatchEvent(new EmptyEvent()));
-        Assert.assertEquals(2, eventCountingFilter.getEventCount());
-        Assert.assertEquals(
+        assertNull(eventDispatchChain.dispatchEvent(new EmptyEvent()));
+        assertEquals(2, eventCountingFilter.getEventCount());
+        assertEquals(
                 2, eventCountingDispatcher.getCapturingEventCount());
-        Assert.assertEquals(2, eventCountingHandler.getEventCount());
+        assertEquals(2, eventCountingHandler.getEventCount());
     }
 
     @Test
@@ -569,8 +569,8 @@ public void eventConsumedInFilterTest() {
                 new EventCountingDispatcher();
         final EventDispatchChain eventDispatchChain =
                 StubEventDispatchChain.EMPTY_CHAIN
-                                      .append(eventHandlerManager)
-                                      .append(eventCountingDispatcher);
+                        .append(eventHandlerManager)
+                        .append(eventCountingDispatcher);
 
         final EventCountingHandler<Event> eventCountingFilter =
                 new EventCountingHandler<>();
@@ -585,11 +585,11 @@ public void eventConsumedInFilterTest() {
         eventHandlerManager.addEventFilter(Event.ANY, eventCountingFilter);
         eventHandlerManager.addEventFilter(Event.ANY, eventConsumingFilter);
 
-        Assert.assertNull(eventDispatchChain.dispatchEvent(new EmptyEvent()));
-        Assert.assertEquals(1, eventCountingFilter.getEventCount());
-        Assert.assertEquals(
+        assertNull(eventDispatchChain.dispatchEvent(new EmptyEvent()));
+        assertEquals(1, eventCountingFilter.getEventCount());
+        assertEquals(
                 0, eventCountingDispatcher.getCapturingEventCount());
-        Assert.assertEquals(0, eventCountingHandler.getEventCount());
+        assertEquals(0, eventCountingHandler.getEventCount());
 
         eventHandlerManager.removeEventFilter(Event.ANY, eventCountingFilter);
         eventHandlerManager.removeEventFilter(Event.ANY, eventConsumingFilter);
@@ -598,71 +598,98 @@ public void eventConsumedInFilterTest() {
         eventHandlerManager.addEventFilter(Event.ANY, eventConsumingFilter);
         eventHandlerManager.addEventFilter(Event.ANY, eventCountingFilter);
 
-        Assert.assertNull(eventDispatchChain.dispatchEvent(new EmptyEvent()));
-        Assert.assertEquals(2, eventCountingFilter.getEventCount());
-        Assert.assertEquals(
+        assertNull(eventDispatchChain.dispatchEvent(new EmptyEvent()));
+        assertEquals(2, eventCountingFilter.getEventCount());
+        assertEquals(
                 0, eventCountingDispatcher.getCapturingEventCount());
-        Assert.assertEquals(0, eventCountingHandler.getEventCount());
+        assertEquals(0, eventCountingHandler.getEventCount());
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void addEventHandlerShouldThrowNPEForNullEventType() {
-        eventHandlerManager.addEventHandler(
-                null,
-                event -> {
-                });
+        assertThrows(NullPointerException.class, () -> {
+                    eventHandlerManager.addEventHandler(
+                            null,
+                            event -> {
+                            });
+                }
+        );
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void addEventHandlerShouldThrowNPEForNullEventHandler() {
-        eventHandlerManager.addEventHandler(Event.ANY, null);
+        assertThrows(NullPointerException.class, () -> {
+            eventHandlerManager.addEventHandler(Event.ANY, null);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
+
+    @Test
     public void removeEventHandlerShouldThrowNPEForNullEventType() {
-        eventHandlerManager.removeEventHandler(
-                null,
-                event -> {
-                });
+        assertThrows(NullPointerException.class, () -> {
+                    eventHandlerManager.removeEventHandler(
+                            null,
+                            event -> {
+                            });
+                }
+        );
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void removeEventHandlerShouldThrowNPEForNullEventHandler() {
-        eventHandlerManager.removeEventHandler(Event.ANY, null);
+        assertThrows(NullPointerException.class, () -> {
+            eventHandlerManager.removeEventHandler(Event.ANY, null);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
+
+    @Test
     public void addEventFilterShouldThrowNPEForNullEventType() {
-        eventHandlerManager.addEventFilter(
-                null,
-                event -> {
-                });
+        assertThrows(NullPointerException.class, () -> {
+                    eventHandlerManager.addEventFilter(
+                            null,
+                            event -> {
+                            });
+                }
+        );
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void addEventFilterShouldThrowNPEForNullEventHandler() {
-        eventHandlerManager.addEventFilter(Event.ANY, null);
+        assertThrows(NullPointerException.class, () -> {
+            eventHandlerManager.addEventFilter(Event.ANY, null);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
+
+    @Test
     public void removeEventFilterShouldThrowNPEForNullEventType() {
-        eventHandlerManager.removeEventHandler(
-                null,
-                event -> {
-                });
+        assertThrows(NullPointerException.class, () -> {
+                    eventHandlerManager.removeEventHandler(
+                            null,
+                            event -> {
+                            });
+                }
+        );
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void removeEventFilterShouldThrowNPEForNullEventHandler() {
-        eventHandlerManager.removeEventHandler(Event.ANY, null);
+        assertThrows(NullPointerException.class, () -> {
+            eventHandlerManager.removeEventHandler(Event.ANY, null);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
+
+    @Test
     public void setEventHandlerShouldThrowNPEForNullEventType() {
-        eventHandlerManager.setEventHandler(
-                null,
-                event -> {
-                });
+        assertThrows(NullPointerException.class, () -> {
+                    eventHandlerManager.setEventHandler(
+                            null,
+                            event -> {
+                            });
+                }
+        );
     }
 
     private static void testValueEventDispatch(
@@ -672,23 +699,23 @@ private static void testValueEventDispatch(
             final int calculatedValue) {
         final ValueEvent valueEvent =
                 (ValueEvent) eventDispatcher.dispatchEvent(
-                                     new ValueEvent(eventType, initialValue),
-                                     StubEventDispatchChain.EMPTY_CHAIN);
-        Assert.assertEquals(calculatedValue, valueEvent.getValue());
+                        new ValueEvent(eventType, initialValue),
+                        StubEventDispatchChain.EMPTY_CHAIN);
+        assertEquals(calculatedValue, valueEvent.getValue());
     }
 
     private static Event dispatchEmptyEvent(
             final EventDispatcher eventDispatcher) {
         return eventDispatcher.dispatchEvent(
-                       new EmptyEvent(),
-                       StubEventDispatchChain.EMPTY_CHAIN);
+                new EmptyEvent(),
+                StubEventDispatchChain.EMPTY_CHAIN);
     }
 
     private static Event dispatchValueEvent(
             final EventDispatcher eventDispatcher,
             final EventType<ValueEvent> eventType) {
         return eventDispatcher.dispatchEvent(
-                       new ValueEvent(eventType, 0),
-                       StubEventDispatchChain.EMPTY_CHAIN);
+                new ValueEvent(eventType, 0),
+                StubEventDispatchChain.EMPTY_CHAIN);
     }
 }
diff --git a/modules/javafx.base/src/test/java/test/com/sun/javafx/runtime/ModuleTest.java b/modules/javafx.base/src/test/java/test/com/sun/javafx/runtime/ModuleTest.java
index d2e951dbb6f..58e800dcec2 100644
--- a/modules/javafx.base/src/test/java/test/com/sun/javafx/runtime/ModuleTest.java
+++ b/modules/javafx.base/src/test/java/test/com/sun/javafx/runtime/ModuleTest.java
@@ -27,9 +27,9 @@
 
 import java.lang.module.ModuleDescriptor;
 import javafx.beans.property.BooleanProperty;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * Simple test to ensure that javafx.base is a named, non-automatic module
diff --git a/modules/javafx.base/src/test/java/test/com/sun/javafx/runtime/VersionInfoTest.java b/modules/javafx.base/src/test/java/test/com/sun/javafx/runtime/VersionInfoTest.java
index ff5c33a57c6..581433ec35f 100644
--- a/modules/javafx.base/src/test/java/test/com/sun/javafx/runtime/VersionInfoTest.java
+++ b/modules/javafx.base/src/test/java/test/com/sun/javafx/runtime/VersionInfoTest.java
@@ -29,9 +29,9 @@
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.Properties;
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  */
@@ -107,7 +107,7 @@ public VersionInfoTest() {
         properties = new Properties();
     }
 
-    @Before
+    @BeforeEach
     public void setup() throws IOException {
         try (var reader = new FileReader(PROPERTIES_FILE)) {
             properties.load(reader);
@@ -180,7 +180,7 @@ public void testNonPublic() {
     public void testVersionFormat() {
         String version = VersionInfo.getVersion();
         String message = String.format("Wrong short version string: '%s'", version);
-        assertTrue(message, version.matches(SVSTR));
+        assertTrue(version.matches(SVSTR), message);
     }
 
     @Test
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/InvalidationListenerMock.java b/modules/javafx.base/src/test/java/test/javafx/beans/InvalidationListenerMock.java
index 6e688a03785..f37ded01b6d 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/InvalidationListenerMock.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/InvalidationListenerMock.java
@@ -27,7 +27,7 @@
 
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class InvalidationListenerMock implements InvalidationListener {
 
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/WeakInvalidationListenerTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/WeakInvalidationListenerTest.java
index 6bec0b28103..4bf74c93542 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/WeakInvalidationListenerTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/WeakInvalidationListenerTest.java
@@ -27,21 +27,25 @@
 
 import javafx.beans.InvalidationListener;
 import javafx.beans.WeakInvalidationListener;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class WeakInvalidationListenerTest {
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testConstructWithNull() {
-        new WeakInvalidationListener(null);
+        assertThrows(NullPointerException.class, () -> {
+            new WeakInvalidationListener(null);
+        });
     }
 
+
     @Test
     public void testHandle() {
         InvalidationListenerMock listener = new InvalidationListenerMock();
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/BooleanPropertyBaseTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/BooleanPropertyBaseTest.java
index e6ae3197ebe..0dd8f4f31cc 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/BooleanPropertyBaseTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/BooleanPropertyBaseTest.java
@@ -28,17 +28,18 @@
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.BooleanPropertyBase;
 import javafx.beans.property.SimpleBooleanProperty;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import test.javafx.beans.InvalidationListenerMock;
 import test.javafx.beans.value.ChangeListenerMock;
 import javafx.beans.value.ObservableBooleanValueStub;
 import javafx.beans.value.ObservableObjectValueStub;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class BooleanPropertyBaseTest {
 
@@ -51,7 +52,7 @@ public class BooleanPropertyBaseTest {
     private InvalidationListenerMock invalidationListener;
     private ChangeListenerMock<Boolean> changeListener;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         property = new BooleanPropertyMock();
         invalidationListener = new InvalidationListenerMock();
@@ -201,13 +202,16 @@ public void testEagerSetValue() {
         changeListener.check(property, false, true, 2);
     }
 
-    @Test(expected=RuntimeException.class)
+    @Test
     public void testSetBoundValue() {
-        final BooleanProperty v = new SimpleBooleanProperty(true);
-        property.bind(v);
-        property.set(true);
+        assertThrows(RuntimeException.class, () -> {
+            final BooleanProperty v = new SimpleBooleanProperty(true);
+            property.bind(v);
+            property.set(true);
+        });
     }
 
+
     @Test
     public void testLazyBind_primitive() {
         attachInvalidationListener();
@@ -348,11 +352,14 @@ public void testEagerBind_generic() {
         changeListener.check(property, true, false, 1);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testBindToNull() {
-        property.bind(null);
+        assertThrows(NullPointerException.class, () -> {
+            property.bind(null);
+        });
     }
 
+
     @Test
     public void testRebind() {
         attachInvalidationListener();
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/BooleanPropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/BooleanPropertyTest.java
index 07aea6a8b5a..89a05c2c512 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/BooleanPropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/BooleanPropertyTest.java
@@ -33,10 +33,10 @@
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class BooleanPropertyTest {
 
@@ -47,7 +47,7 @@ public class BooleanPropertyTest {
     private static final boolean VALUE_2 = false;
     private static final boolean DEFAULT = false;
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
         ErrorLoggingUtiltity.reset();
     }
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/DoublePropertyBaseTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/DoublePropertyBaseTest.java
index 4b25a40b8db..f031f4abc64 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/DoublePropertyBaseTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/DoublePropertyBaseTest.java
@@ -28,17 +28,18 @@
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.DoublePropertyBase;
 import javafx.beans.property.SimpleDoubleProperty;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import test.javafx.beans.InvalidationListenerMock;
 import test.javafx.beans.value.ChangeListenerMock;
 import javafx.beans.value.ObservableDoubleValueStub;
 import javafx.beans.value.ObservableValueStub;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class DoublePropertyBaseTest {
 
@@ -52,7 +53,7 @@ public class DoublePropertyBaseTest {
     private InvalidationListenerMock invalidationListener;
     private ChangeListenerMock<Number> changeListener;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         property = new DoublePropertyMock();
         invalidationListener = new InvalidationListenerMock();
@@ -202,13 +203,16 @@ public void testEagerSetValue() {
         changeListener.check(property, Math.PI, -Math.PI, 2);
     }
 
-    @Test(expected=RuntimeException.class)
+    @Test
     public void testSetBoundValue() {
-        final DoubleProperty v = new SimpleDoubleProperty(Math.PI);
-        property.bind(v);
-        property.set(Math.PI);
+        assertThrows(RuntimeException.class, () -> {
+            final DoubleProperty v = new SimpleDoubleProperty(Math.PI);
+            property.bind(v);
+            property.set(Math.PI);
+        });
     }
 
+
     @Test
     public void testLazyBind() {
         attachInvalidationListener();
@@ -353,11 +357,14 @@ public void testEagerBindObservableValue() {
         changeListener.check(property, value1, 0.0, 1);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testBindToNull() {
-        property.bind(null);
+        assertThrows(NullPointerException.class, () -> {
+            property.bind(null);
+        });
     }
 
+
     @Test
     public void testRebind() {
         attachInvalidationListener();
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/DoublePropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/DoublePropertyTest.java
index 9d59a464b32..92000249178 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/DoublePropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/DoublePropertyTest.java
@@ -33,10 +33,10 @@
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import test.com.sun.javafx.binding.ErrorLoggingUtiltity;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class DoublePropertyTest {
 
@@ -48,7 +48,7 @@ public class DoublePropertyTest {
     private static final double DEFAULT = 0.0;
     private static final double EPSILON = 1e-12;
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
         ErrorLoggingUtiltity.reset();
     }
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/FloatPropertyBaseTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/FloatPropertyBaseTest.java
index dfc6cd5457e..28370fca16b 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/FloatPropertyBaseTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/FloatPropertyBaseTest.java
@@ -28,17 +28,18 @@
 import javafx.beans.property.FloatProperty;
 import javafx.beans.property.FloatPropertyBase;
 import javafx.beans.property.SimpleFloatProperty;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import test.javafx.beans.InvalidationListenerMock;
 import test.javafx.beans.value.ChangeListenerMock;
 import javafx.beans.value.ObservableFloatValueStub;
 import javafx.beans.value.ObservableValueStub;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class FloatPropertyBaseTest {
 
@@ -54,7 +55,7 @@ public class FloatPropertyBaseTest {
     private InvalidationListenerMock invalidationListener;
     private ChangeListenerMock<Number> changeListener;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         property = new FloatPropertyMock();
         invalidationListener = new InvalidationListenerMock();
@@ -204,13 +205,16 @@ public void testEagerSetValue() {
         changeListener.check(property, PI, -PI, 2);
     }
 
-    @Test(expected=RuntimeException.class)
+    @Test
     public void testSetBoundValue() {
-        final FloatProperty v = new SimpleFloatProperty(PI);
-        property.bind(v);
-        property.set(PI);
+        assertThrows(RuntimeException.class, () -> {
+            final FloatProperty v = new SimpleFloatProperty(PI);
+            property.bind(v);
+            property.set(PI);
+        });
     }
 
+
     @Test
     public void testLazyBind() {
         attachInvalidationListener();
@@ -357,11 +361,14 @@ public void testEagerBindObservableValue() {
         changeListener.check(property, value1, 0.0f, 1);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testBindToNull() {
-        property.bind(null);
+        assertThrows(NullPointerException.class, () -> {
+            property.bind(null);
+        });
     }
 
+
     @Test
     public void testRebind() {
         attachInvalidationListener();
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/FloatPropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/FloatPropertyTest.java
index 5a69ce9df3a..b8fc31139f8 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/FloatPropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/FloatPropertyTest.java
@@ -33,10 +33,10 @@
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import test.com.sun.javafx.binding.ErrorLoggingUtiltity;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class FloatPropertyTest {
 
@@ -48,7 +48,7 @@ public class FloatPropertyTest {
     private static final float DEFAULT = 0.0f;
     private static final float EPSILON = 1e-6f;
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
         ErrorLoggingUtiltity.reset();
     }
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/IntegerPropertyBaseTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/IntegerPropertyBaseTest.java
index 11584bd48ff..a8b0eaa00e9 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/IntegerPropertyBaseTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/IntegerPropertyBaseTest.java
@@ -28,17 +28,18 @@
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.IntegerPropertyBase;
 import javafx.beans.property.SimpleIntegerProperty;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import test.javafx.beans.InvalidationListenerMock;
 import test.javafx.beans.value.ChangeListenerMock;
 import javafx.beans.value.ObservableIntegerValueStub;
 import javafx.beans.value.ObservableValueStub;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class IntegerPropertyBaseTest {
 
@@ -53,7 +54,7 @@ public class IntegerPropertyBaseTest {
     private InvalidationListenerMock invalidationListener;
     private ChangeListenerMock<Number> changeListener;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         property = new IntegerPropertyMock();
         invalidationListener = new InvalidationListenerMock();
@@ -203,13 +204,16 @@ public void testEagerSetValue() {
         changeListener.check(property, VALUE_1, -VALUE_1, 2);
     }
 
-    @Test(expected=RuntimeException.class)
+    @Test
     public void testSetBoundValue() {
-        final IntegerProperty v = new SimpleIntegerProperty(VALUE_1);
-        property.bind(v);
-        property.set(VALUE_1);
+        assertThrows(RuntimeException.class, () -> {
+            final IntegerProperty v = new SimpleIntegerProperty(VALUE_1);
+            property.bind(v);
+            property.set(VALUE_1);
+        });
     }
 
+
     @Test
     public void testLazyBind() {
         attachInvalidationListener();
@@ -348,11 +352,14 @@ public void testEagerBindObservableValue() {
         changeListener.check(property, value2, value1, 1);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testBindToNull() {
-        property.bind(null);
+        assertThrows(NullPointerException.class, () -> {
+            property.bind(null);
+        });
     }
 
+
     @Test
     public void testRebind() {
         attachInvalidationListener();
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/IntegerPropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/IntegerPropertyTest.java
index 4f9baf6bb08..764abe2c71e 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/IntegerPropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/IntegerPropertyTest.java
@@ -33,10 +33,10 @@
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import test.com.sun.javafx.binding.ErrorLoggingUtiltity;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class IntegerPropertyTest {
 
@@ -47,7 +47,7 @@ public class IntegerPropertyTest {
     private static final int VALUE_2 = -13;
     private static final int DEFAULT = 0;
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
         ErrorLoggingUtiltity.reset();
     }
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/ListPropertyBaseTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/ListPropertyBaseTest.java
index 2f22f40f5d9..73a3210d55d 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/ListPropertyBaseTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/ListPropertyBaseTest.java
@@ -32,8 +32,8 @@
 import javafx.collections.FXCollections;
 import test.javafx.collections.MockListObserver;
 import javafx.collections.ObservableList;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
 import java.util.List;
@@ -43,7 +43,7 @@
 import javafx.beans.property.SimpleListProperty;
 import test.javafx.collections.Person;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class ListPropertyBaseTest {
 
@@ -61,7 +61,7 @@ public class ListPropertyBaseTest {
     private ChangeListenerMock<ObservableList<Object>> changeListener;
     private MockListObserver<Object> listChangeListener;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         property = new ListPropertyMock();
         invalidationListener = new InvalidationListenerMock();
@@ -476,13 +476,16 @@ public void testSetValue_ListChange() {
         listChangeListener.check1AddRemove(property, VALUE_1a, 0, 1);
     }
 
-    @Test(expected = RuntimeException.class)
+    @Test
     public void testSetBoundValue() {
-        final ListProperty<Object> v = new SimpleListProperty<>(VALUE_1a);
-        property.bind(v);
-        property.set(VALUE_1a);
+        assertThrows(RuntimeException.class, () -> {
+            final ListProperty<Object> v = new SimpleListProperty<>(VALUE_1a);
+            property.bind(v);
+            property.set(VALUE_1a);
+        });
     }
 
+
     @Test
     public void testBind_Invalidation() {
         attachInvalidationListener();
@@ -582,11 +585,14 @@ public void testBind_ListChange() {
         listChangeListener.check0();
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testBindToNull() {
-        property.bind(null);
+        assertThrows(NullPointerException.class, () -> {
+            property.bind(null);
+        });
     }
 
+
     @Test
     public void testRebind() {
         attachInvalidationListener();
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/ListPropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/ListPropertyTest.java
index 113e5e5c283..19207bdcab6 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/ListPropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/ListPropertyTest.java
@@ -36,10 +36,10 @@
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class ListPropertyTest {
 
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/LongPropertyBaseTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/LongPropertyBaseTest.java
index 4aaaa159f36..b3dd9150917 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/LongPropertyBaseTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/LongPropertyBaseTest.java
@@ -28,17 +28,18 @@
 import javafx.beans.property.LongProperty;
 import javafx.beans.property.LongPropertyBase;
 import javafx.beans.property.SimpleLongProperty;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import test.javafx.beans.InvalidationListenerMock;
 import test.javafx.beans.value.ChangeListenerMock;
 import javafx.beans.value.ObservableLongValueStub;
 import javafx.beans.value.ObservableValueStub;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class LongPropertyBaseTest {
 
@@ -53,7 +54,7 @@ public class LongPropertyBaseTest {
     private InvalidationListenerMock invalidationListener;
     private ChangeListenerMock<Number> changeListener;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         property = new LongPropertyMock();
         invalidationListener = new InvalidationListenerMock();
@@ -203,13 +204,16 @@ public void testEagerSetValue() {
         changeListener.check(property, VALUE_1, -VALUE_1, 2);
     }
 
-    @Test(expected=RuntimeException.class)
+    @Test
     public void testSetBoundValue() {
-        final LongProperty v = new SimpleLongProperty(VALUE_1);
-        property.bind(v);
-        property.set(VALUE_1);
+        assertThrows(RuntimeException.class, () -> {
+            final LongProperty v = new SimpleLongProperty(VALUE_1);
+            property.bind(v);
+            property.set(VALUE_1);
+        });
     }
 
+
     @Test
     public void testLazyBind() {
         attachInvalidationListener();
@@ -348,11 +352,14 @@ public void testEagerBindObservableValue() {
         changeListener.check(property, value2, value1, 1);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testBindToNull() {
-        property.bind(null);
+        assertThrows(NullPointerException.class, () -> {
+            property.bind(null);
+        });
     }
 
+
     @Test
     public void testRebind() {
         attachInvalidationListener();
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/LongPropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/LongPropertyTest.java
index a30b174d3e0..065a95e7d17 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/LongPropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/LongPropertyTest.java
@@ -33,10 +33,10 @@
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import test.com.sun.javafx.binding.ErrorLoggingUtiltity;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class LongPropertyTest {
 
@@ -47,7 +47,7 @@ public class LongPropertyTest {
     private static final long VALUE_2 = -987654321L;
     private static final long DEFAULT = 0L;
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
         ErrorLoggingUtiltity.reset();
     }
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/MapPropertyBaseTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/MapPropertyBaseTest.java
index 9b14ad3bb34..d669f84fb97 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/MapPropertyBaseTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/MapPropertyBaseTest.java
@@ -31,8 +31,8 @@
 import javafx.collections.FXCollections;
 import test.javafx.collections.MockMapObserver;
 import javafx.collections.ObservableMap;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -41,7 +41,7 @@
 import javafx.beans.property.SimpleMapProperty;
 
 import static test.javafx.collections.MockMapObserver.Call;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class MapPropertyBaseTest {
 
@@ -81,7 +81,7 @@ public class MapPropertyBaseTest {
     private ChangeListenerMock<ObservableMap<Object, Object>> changeListener;
     private MockMapObserver<Object, Object> mapChangeListener;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         property = new MapPropertyMock();
         invalidationListener = new InvalidationListenerMock();
@@ -499,13 +499,16 @@ public void testMapValue_MapChange() {
         mapChangeListener.assertAdded(MockMapObserver.Tuple.tup(KEY_1b, DATA_1b));
     }
 
-    @Test(expected = RuntimeException.class)
+    @Test
     public void testMapBoundValue() {
-        final MapProperty<Object, Object> v = new SimpleMapProperty<>(VALUE_1a);
-        property.bind(v);
-        property.set(VALUE_1a);
+        assertThrows(RuntimeException.class, () -> {
+            final MapProperty<Object, Object> v = new SimpleMapProperty<>(VALUE_1a);
+            property.bind(v);
+            property.set(VALUE_1a);
+        });
     }
 
+
     @Test
     public void testBind_Invalidation() {
         attachInvalidationListener();
@@ -605,11 +608,14 @@ public void testBind_MapChange() {
         assertEquals(0, mapChangeListener.getCallsNumber());
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testBindToNull() {
-        property.bind(null);
+        assertThrows(NullPointerException.class, () -> {
+            property.bind(null);
+        });
     }
 
+
     @Test
     public void testRebind() {
         attachInvalidationListener();
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/MapPropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/MapPropertyTest.java
index 12f45f191da..ef7169a3a3c 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/MapPropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/MapPropertyTest.java
@@ -32,7 +32,7 @@
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableMap;
 import javafx.collections.MapChangeListener;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
 import javafx.beans.property.MapProperty;
@@ -40,8 +40,8 @@
 import javafx.beans.property.ReadOnlyIntegerProperty;
 import javafx.beans.property.SimpleMapProperty;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class MapPropertyTest {
 
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/ObjectPropertyBaseTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/ObjectPropertyBaseTest.java
index 270ac67a489..68ef1c8d1ff 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/ObjectPropertyBaseTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/ObjectPropertyBaseTest.java
@@ -28,16 +28,17 @@
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.ObjectPropertyBase;
 import javafx.beans.property.SimpleObjectProperty;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import test.javafx.beans.InvalidationListenerMock;
 import test.javafx.beans.value.ChangeListenerMock;
 import javafx.beans.value.ObservableObjectValueStub;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ObjectPropertyBaseTest {
 
@@ -54,7 +55,7 @@ public class ObjectPropertyBaseTest {
     private InvalidationListenerMock invalidationListener;
     private ChangeListenerMock<Object> changeListener;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         property = new ObjectPropertyMock();
         invalidationListener = new InvalidationListenerMock();
@@ -204,13 +205,16 @@ public void testEagerSetValue() {
         changeListener.check(property, VALUE_1a, VALUE_1b, 2);
     }
 
-    @Test(expected=RuntimeException.class)
+    @Test
     public void testSetBoundValue() {
-        final ObjectProperty<Object> v = new SimpleObjectProperty<>(VALUE_1a);
-        property.bind(v);
-        property.set(VALUE_1a);
+        assertThrows(RuntimeException.class, () -> {
+            final ObjectProperty<Object> v = new SimpleObjectProperty<>(VALUE_1a);
+            property.bind(v);
+            property.set(VALUE_1a);
+        });
     }
 
+
     @Test
     public void testLazyBind() {
         attachInvalidationListener();
@@ -275,11 +279,14 @@ public void testEagerBind() {
         changeListener.check(property, VALUE_1b, VALUE_1a, 1);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testBindToNull() {
-        property.bind(null);
+        assertThrows(NullPointerException.class, () -> {
+            property.bind(null);
+        });
     }
 
+
     @Test
     public void testRebind() {
         attachInvalidationListener();
@@ -443,5 +450,4 @@ private void reset() {
 
         @Override public String getName() { return name; }
     }
-
 }
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/ObjectPropertyLeakTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/ObjectPropertyLeakTest.java
index a67aca50071..77d3625c236 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/ObjectPropertyLeakTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/ObjectPropertyLeakTest.java
@@ -40,9 +40,9 @@
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleLongProperty;
 import javafx.beans.property.SimpleObjectProperty;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class ObjectPropertyLeakTest {
 
@@ -55,7 +55,7 @@ public class ObjectPropertyLeakTest {
     private final ArrayList<WeakReference<Property<?>>> wrappedRefs = new ArrayList<>();
 
     private void checkRefs(String name, int numExpected,
-            ArrayList<WeakReference<Property<?>>> refs) {
+                           ArrayList<WeakReference<Property<?>>> refs) {
 
         int count = 0;
         for (var ref : refs) {
@@ -63,7 +63,7 @@ private void checkRefs(String name, int numExpected,
         }
         final String msg = name + " properties should "
                 + (numExpected > 0 ? "NOT be GCed" : "be GCed");
-        assertEquals(msg, numExpected, count);
+        assertEquals(numExpected, count, msg);
     }
 
     private void commonLeakTest(int origExpected, int wrappedExpected)
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/ObjectPropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/ObjectPropertyTest.java
index 2fd419a846b..64ce4229bd5 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/ObjectPropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/ObjectPropertyTest.java
@@ -26,15 +26,15 @@
 package test.javafx.beans.property;
 
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 import javafx.beans.InvalidationListener;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ObjectPropertyTest {
 
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/PropertyReferenceTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/PropertyReferenceTest.java
index 1b1baad4ad1..db4bb7a21a8 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/PropertyReferenceTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/PropertyReferenceTest.java
@@ -25,11 +25,11 @@
 
 package test.javafx.beans.property;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 import test.javafx.beans.Person;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import com.sun.javafx.property.PropertyReference;
 
@@ -37,7 +37,7 @@ public class PropertyReferenceTest {
 
     private Person person;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         person = new Person();
     }
@@ -70,16 +70,22 @@ public void testNoRead() {
         assertEquals(-311, person.noRead.get());
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test
     public void testNoRead_IllegalRead() {
-        Person.NO_READ.get(person);
+        assertThrows(IllegalStateException.class, () -> {
+            Person.NO_READ.get(person);
+        });
     }
 
-    @Test(expected=IllegalStateException.class)
+
+    @Test
     public void testNoRead_IllegalReadProperty() {
-        Person.NO_READ.getProperty(person);
+        assertThrows(IllegalStateException.class, () -> {
+            Person.NO_READ.getProperty(person);
+        });
     }
 
+
     @Test
     public void testNoWrite() {
         final PropertyReference<Integer> property = new PropertyReference<>(Person.class, "noWrite");
@@ -96,11 +102,14 @@ public void testNoWrite() {
         assertEquals(Integer.valueOf(5125), property.get(person));
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test
     public void testNoWrite_IllegalWrite() {
-        Person.NO_WRITE.set(person, 1);
+        assertThrows(IllegalStateException.class, () -> {
+            Person.NO_WRITE.set(person, 1);
+        });
     }
 
+
     @Test
     public void testNoReadWrite() {
         final PropertyReference<Integer> property = new PropertyReference<>(Person.class, "noReadWrite");
@@ -108,14 +117,18 @@ public void testNoReadWrite() {
         assertFalse(property.isWritable());
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test
     public void testNoReadWrite_IllegalRead() {
-        Person.NO_READ_WRITE.get(person);
+        assertThrows(IllegalStateException.class, () -> {
+            Person.NO_READ_WRITE.get(person);
+        });
     }
 
-    @Test(expected=IllegalStateException.class)
+
+    @Test
     public void testNoReadWrite_IllegalWrite() {
-        Person.NO_READ_WRITE.set(person, 1);
+        assertThrows(IllegalStateException.class, () -> {
+            Person.NO_READ_WRITE.set(person, 1);
+        });
     }
-
 }
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/PropertyReferenceWithInterfacesTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/PropertyReferenceWithInterfacesTest.java
index 5b48530de17..504be3e9288 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/PropertyReferenceWithInterfacesTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/PropertyReferenceWithInterfacesTest.java
@@ -27,19 +27,19 @@
 
 import javafx.beans.property.StringProperty;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import com.sun.javafx.property.PropertyReference;
 import javafx.beans.property.SimpleStringProperty;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  *
  */
 public class PropertyReferenceWithInterfacesTest {
 
-    @Before public void setUp() {
+    @BeforeEach public void setUp() {
 
     }
 
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyBooleanPropertyBaseTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyBooleanPropertyBaseTest.java
index 81cd303036c..03dcf320238 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyBooleanPropertyBaseTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyBooleanPropertyBaseTest.java
@@ -29,8 +29,8 @@
 import test.javafx.beans.InvalidationListenerMock;
 import test.javafx.beans.value.ChangeListenerMock;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ReadOnlyBooleanPropertyBaseTest {
 
@@ -43,7 +43,7 @@ public class ReadOnlyBooleanPropertyBaseTest {
     private InvalidationListenerMock invalidationListener;
     private ChangeListenerMock<Boolean> changeListener;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         property = new ReadOnlyPropertyMock();
         invalidationListener = new InvalidationListenerMock();
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyBooleanPropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyBooleanPropertyTest.java
index fd1a5bd6456..be3a809f541 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyBooleanPropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyBooleanPropertyTest.java
@@ -25,21 +25,21 @@
 
 package test.javafx.beans.property;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import javafx.beans.InvalidationListener;
 import javafx.beans.property.ReadOnlyBooleanProperty;
 import javafx.beans.property.ReadOnlyBooleanWrapper;
 import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.beans.value.ChangeListener;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ReadOnlyBooleanPropertyTest {
 
     private static final boolean DEFAULT = false;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
     }
 
@@ -124,5 +124,4 @@ public void removeListener(InvalidationListener listener) {
         }
 
     }
-
 }
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyBooleanWrapperTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyBooleanWrapperTest.java
index 9f9418a735c..5b76967871a 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyBooleanWrapperTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyBooleanWrapperTest.java
@@ -30,17 +30,18 @@
 import javafx.beans.property.ReadOnlyBooleanProperty;
 import javafx.beans.property.ReadOnlyBooleanWrapper;
 import javafx.beans.property.SimpleBooleanProperty;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import test.javafx.beans.InvalidationListenerMock;
 import test.javafx.beans.value.ChangeListenerMock;
 import javafx.beans.value.ObservableBooleanValueStub;
 import javafx.beans.value.ObservableObjectValueStub;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ReadOnlyBooleanWrapperTest {
 
@@ -56,7 +57,7 @@ public class ReadOnlyBooleanWrapperTest {
     private ChangeListenerMock<Boolean> internalChangeListener;
     private ChangeListenerMock<Boolean> publicChangeListener;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         property = new ReadOnlyBooleanWrapperMock();
         readOnlyProperty = property.getReadOnlyProperty();
@@ -319,13 +320,16 @@ public void testPublicEagerSetValue() {
         publicChangeListener.check(readOnlyProperty, VALUE_2, VALUE_1, 2);
     }
 
-    @Test(expected=RuntimeException.class)
+    @Test
     public void testSetBoundValue() {
-        final BooleanProperty v = new SimpleBooleanProperty(VALUE_1);
-        property.bind(v);
-        property.set(VALUE_1);
+        assertThrows(RuntimeException.class, () -> {
+            final BooleanProperty v = new SimpleBooleanProperty(VALUE_1);
+            property.bind(v);
+            property.set(VALUE_1);
+        });
     }
 
+
     @Test
     public void testLazyBind_primitive() {
         attachInvalidationListeners();
@@ -550,11 +554,14 @@ public void testPublicEagerBind_generic() {
         publicChangeListener.check(readOnlyProperty, VALUE_2, VALUE_1, 1);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testBindToNull() {
-        property.bind(null);
+        assertThrows(NullPointerException.class, () -> {
+            property.bind(null);
+        });
     }
 
+
     @Test
     public void testRebind() {
         attachInvalidationListeners();
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyDoublePropertyBaseTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyDoublePropertyBaseTest.java
index 156aa3f9a82..17c1cd2e674 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyDoublePropertyBaseTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyDoublePropertyBaseTest.java
@@ -29,8 +29,8 @@
 import test.javafx.beans.InvalidationListenerMock;
 import test.javafx.beans.value.ChangeListenerMock;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ReadOnlyDoublePropertyBaseTest {
 
@@ -43,7 +43,7 @@ public class ReadOnlyDoublePropertyBaseTest {
     private InvalidationListenerMock invalidationListener;
     private ChangeListenerMock<Number> changeListener;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         property = new ReadOnlyPropertyMock();
         invalidationListener = new InvalidationListenerMock();
@@ -103,5 +103,4 @@ public double get() {
         }
 
     }
-
 }
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyDoublePropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyDoublePropertyTest.java
index 2b747950b78..e8e9c38e368 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyDoublePropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyDoublePropertyTest.java
@@ -25,22 +25,22 @@
 
 package test.javafx.beans.property;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import javafx.beans.InvalidationListener;
 import javafx.beans.property.ReadOnlyDoubleProperty;
 import javafx.beans.property.ReadOnlyDoubleWrapper;
 import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.beans.value.ChangeListener;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ReadOnlyDoublePropertyTest {
 
     private static final double DEFAULT = 0.0;
     private static final float EPSILON = 1e-6f;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
     }
 
@@ -124,5 +124,4 @@ public void removeListener(InvalidationListener listener) {
         }
 
     }
-
 }
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyDoubleWrapperTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyDoubleWrapperTest.java
index eecab629863..07fb4fdabea 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyDoubleWrapperTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyDoubleWrapperTest.java
@@ -30,17 +30,18 @@
 import javafx.beans.property.ReadOnlyDoubleProperty;
 import javafx.beans.property.ReadOnlyDoubleWrapper;
 import javafx.beans.property.SimpleDoubleProperty;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import test.javafx.beans.InvalidationListenerMock;
 import test.javafx.beans.value.ChangeListenerMock;
 import javafx.beans.value.ObservableDoubleValueStub;
 import javafx.beans.value.ObservableObjectValueStub;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ReadOnlyDoubleWrapperTest {
 
@@ -57,7 +58,7 @@ public class ReadOnlyDoubleWrapperTest {
     private ChangeListenerMock<Number> internalChangeListener;
     private ChangeListenerMock<Number> publicChangeListener;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         property = new ReadOnlyDoubleWrapperMock();
         readOnlyProperty = property.getReadOnlyProperty();
@@ -320,13 +321,16 @@ public void testPublicEagerSetValue() {
         publicChangeListener.check(readOnlyProperty, VALUE_2, VALUE_1, 2);
     }
 
-    @Test(expected=RuntimeException.class)
+    @Test
     public void testSetBoundValue() {
-        final DoubleProperty v = new SimpleDoubleProperty(VALUE_1);
-        property.bind(v);
-        property.set(VALUE_1);
+        assertThrows(RuntimeException.class, () -> {
+            final DoubleProperty v = new SimpleDoubleProperty(VALUE_1);
+            property.bind(v);
+            property.set(VALUE_1);
+        });
     }
 
+
     @Test
     public void testLazyBind_primitive() {
         attachInvalidationListeners();
@@ -551,11 +555,14 @@ public void testPublicEagerBind_generic() {
         publicChangeListener.check(readOnlyProperty, VALUE_2, VALUE_1, 1);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testBindToNull() {
-        property.bind(null);
+        assertThrows(NullPointerException.class, () -> {
+            property.bind(null);
+        });
     }
 
+
     @Test
     public void testRebind() {
         attachInvalidationListeners();
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyFloatPropertyBaseTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyFloatPropertyBaseTest.java
index 9b9f2af9652..e7cb8c5b982 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyFloatPropertyBaseTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyFloatPropertyBaseTest.java
@@ -29,8 +29,8 @@
 import test.javafx.beans.InvalidationListenerMock;
 import test.javafx.beans.value.ChangeListenerMock;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ReadOnlyFloatPropertyBaseTest {
 
@@ -43,7 +43,7 @@ public class ReadOnlyFloatPropertyBaseTest {
     private InvalidationListenerMock invalidationListener;
     private ChangeListenerMock<Number> changeListener;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         property = new ReadOnlyPropertyMock();
         invalidationListener = new InvalidationListenerMock();
@@ -103,5 +103,4 @@ public float get() {
         }
 
     }
-
 }
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyFloatPropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyFloatPropertyTest.java
index 0d5f0b1ad76..26f7fb9264f 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyFloatPropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyFloatPropertyTest.java
@@ -25,22 +25,22 @@
 
 package test.javafx.beans.property;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import javafx.beans.InvalidationListener;
 import javafx.beans.property.ReadOnlyFloatProperty;
 import javafx.beans.property.ReadOnlyFloatWrapper;
 import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.beans.value.ChangeListener;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ReadOnlyFloatPropertyTest {
 
     private static final float DEFAULT = 0.0f;
     private static final float EPSILON = 1e-6f;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
     }
 
@@ -124,5 +124,4 @@ public void removeListener(InvalidationListener listener) {
         }
 
     }
-
 }
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyFloatWrapperTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyFloatWrapperTest.java
index 10b3c32c815..74e426bba9f 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyFloatWrapperTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyFloatWrapperTest.java
@@ -30,17 +30,18 @@
 import javafx.beans.property.ReadOnlyFloatProperty;
 import javafx.beans.property.ReadOnlyFloatWrapper;
 import javafx.beans.property.SimpleFloatProperty;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import test.javafx.beans.InvalidationListenerMock;
 import test.javafx.beans.value.ChangeListenerMock;
 import javafx.beans.value.ObservableFloatValueStub;
 import javafx.beans.value.ObservableObjectValueStub;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ReadOnlyFloatWrapperTest {
 
@@ -57,7 +58,7 @@ public class ReadOnlyFloatWrapperTest {
     private ChangeListenerMock<Number> internalChangeListener;
     private ChangeListenerMock<Number> publicChangeListener;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         property = new ReadOnlyFloatWrapperMock();
         readOnlyProperty = property.getReadOnlyProperty();
@@ -320,13 +321,16 @@ public void testPublicEagerSetValue() {
         publicChangeListener.check(readOnlyProperty, VALUE_2, VALUE_1, 2);
     }
 
-    @Test(expected=RuntimeException.class)
+    @Test
     public void testSetBoundValue() {
-        final FloatProperty v = new SimpleFloatProperty(VALUE_1);
-        property.bind(v);
-        property.set(VALUE_1);
+        assertThrows(RuntimeException.class, () -> {
+            final FloatProperty v = new SimpleFloatProperty(VALUE_1);
+            property.bind(v);
+            property.set(VALUE_1);
+        });
     }
 
+
     @Test
     public void testLazyBind_primitive() {
         attachInvalidationListeners();
@@ -551,11 +555,14 @@ public void testPublicEagerBind_generic() {
         publicChangeListener.check(readOnlyProperty, VALUE_2, VALUE_1, 1);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testBindToNull() {
-        property.bind(null);
+        assertThrows(NullPointerException.class, () -> {
+            property.bind(null);
+        });
     }
 
+
     @Test
     public void testRebind() {
         attachInvalidationListeners();
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyIntegerPropertyBaseTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyIntegerPropertyBaseTest.java
index 23a4a557ebe..62e6b084384 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyIntegerPropertyBaseTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyIntegerPropertyBaseTest.java
@@ -29,8 +29,8 @@
 import test.javafx.beans.InvalidationListenerMock;
 import test.javafx.beans.value.ChangeListenerMock;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ReadOnlyIntegerPropertyBaseTest {
 
@@ -43,7 +43,7 @@ public class ReadOnlyIntegerPropertyBaseTest {
     private InvalidationListenerMock invalidationListener;
     private ChangeListenerMock<Number> changeListener;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         property = new ReadOnlyPropertyMock();
         invalidationListener = new InvalidationListenerMock();
@@ -103,5 +103,4 @@ public int get() {
         }
 
     }
-
 }
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyIntegerPropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyIntegerPropertyTest.java
index c90a20b0c11..0e6af5a25c1 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyIntegerPropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyIntegerPropertyTest.java
@@ -25,21 +25,21 @@
 
 package test.javafx.beans.property;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import javafx.beans.InvalidationListener;
 import javafx.beans.property.ReadOnlyIntegerProperty;
 import javafx.beans.property.ReadOnlyIntegerWrapper;
 import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.beans.value.ChangeListener;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ReadOnlyIntegerPropertyTest {
 
     private static final int DEFAULT = 0;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
     }
 
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyIntegerWrapperTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyIntegerWrapperTest.java
index 6f68e53a7b0..348bc94ae31 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyIntegerWrapperTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyIntegerWrapperTest.java
@@ -30,17 +30,18 @@
 import javafx.beans.property.ReadOnlyIntegerProperty;
 import javafx.beans.property.ReadOnlyIntegerWrapper;
 import javafx.beans.property.SimpleIntegerProperty;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import test.javafx.beans.InvalidationListenerMock;
 import test.javafx.beans.value.ChangeListenerMock;
 import javafx.beans.value.ObservableIntegerValueStub;
 import javafx.beans.value.ObservableObjectValueStub;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ReadOnlyIntegerWrapperTest {
 
@@ -56,7 +57,7 @@ public class ReadOnlyIntegerWrapperTest {
     private ChangeListenerMock<Number> internalChangeListener;
     private ChangeListenerMock<Number> publicChangeListener;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         property = new ReadOnlyIntegerWrapperMock();
         readOnlyProperty = property.getReadOnlyProperty();
@@ -319,13 +320,16 @@ public void testPublicEagerSetValue() {
         publicChangeListener.check(readOnlyProperty, VALUE_2, VALUE_1, 2);
     }
 
-    @Test(expected=RuntimeException.class)
+    @Test
     public void testSetBoundValue() {
-        final IntegerProperty v = new SimpleIntegerProperty(VALUE_1);
-        property.bind(v);
-        property.set(VALUE_1);
+        assertThrows(RuntimeException.class, () -> {
+            final IntegerProperty v = new SimpleIntegerProperty(VALUE_1);
+            property.bind(v);
+            property.set(VALUE_1);
+        });
     }
 
+
     @Test
     public void testLazyBind_primitive() {
         attachInvalidationListeners();
@@ -550,11 +554,14 @@ public void testPublicEagerBind_generic() {
         publicChangeListener.check(readOnlyProperty, VALUE_2, VALUE_1, 1);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testBindToNull() {
-        property.bind(null);
+        assertThrows(NullPointerException.class, () -> {
+            property.bind(null);
+        });
     }
 
+
     @Test
     public void testRebind() {
         attachInvalidationListeners();
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyListPropertyBaseTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyListPropertyBaseTest.java
index 892111e8918..8e3c55619be 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyListPropertyBaseTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyListPropertyBaseTest.java
@@ -33,10 +33,10 @@
 import test.javafx.beans.value.ChangeListenerMock;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class ReadOnlyListPropertyBaseTest {
 
@@ -49,7 +49,7 @@ public class ReadOnlyListPropertyBaseTest {
     private InvalidationListenerMock invalidationListener;
     private ChangeListenerMock<Object> changeListener;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         property = new ReadOnlyPropertyMock();
         invalidationListener = new InvalidationListenerMock();
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyListPropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyListPropertyTest.java
index e99eb1e6be4..babb965dc27 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyListPropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyListPropertyTest.java
@@ -32,16 +32,16 @@
 import javafx.beans.value.ChangeListener;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class ReadOnlyListPropertyTest {
 
     private static final Object DEFAULT = null;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
     }
 
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyListWrapperTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyListWrapperTest.java
index 57531e85b9b..ccea6dc3e48 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyListWrapperTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyListWrapperTest.java
@@ -37,10 +37,10 @@
 import javafx.beans.value.ObservableObjectValueStub;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class ReadOnlyListWrapperTest {
 
@@ -56,7 +56,7 @@ public class ReadOnlyListWrapperTest {
     private ChangeListenerMock<Object> internalChangeListener;
     private ChangeListenerMock<Object> publicChangeListener;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         property = new ReadOnlyListWrapperMock();
         readOnlyProperty = property.getReadOnlyProperty();
@@ -319,13 +319,16 @@ public void testPublicEagerSetValue() {
         publicChangeListener.check(readOnlyProperty, VALUE_2, VALUE_1, 2);
     }
 
-    @Test(expected=RuntimeException.class)
+    @Test
     public void testSetBoundValue() {
-        final ListProperty<Object> v = new SimpleListProperty<>(VALUE_1);
-        property.bind(v);
-        property.set(VALUE_1);
+        assertThrows(RuntimeException.class, () -> {
+            final ListProperty<Object> v = new SimpleListProperty<>(VALUE_1);
+            property.bind(v);
+            property.set(VALUE_1);
+        });
     }
 
+
     @Test
     public void testLazyBind_primitive() {
         attachInvalidationListeners();
@@ -550,11 +553,14 @@ public void testPublicEagerBind_generic() {
         publicChangeListener.check(readOnlyProperty, VALUE_2, VALUE_1, 1);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testBindToNull() {
-        property.bind(null);
+        assertThrows(NullPointerException.class, () -> {
+            property.bind(null);
+        });
     }
 
+
     @Test
     public void testRebind() {
         attachInvalidationListeners();
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyLongPropertyBaseTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyLongPropertyBaseTest.java
index af9cae4fa04..ee86ae36fd6 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyLongPropertyBaseTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyLongPropertyBaseTest.java
@@ -29,8 +29,8 @@
 import test.javafx.beans.InvalidationListenerMock;
 import test.javafx.beans.value.ChangeListenerMock;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ReadOnlyLongPropertyBaseTest {
 
@@ -43,7 +43,7 @@ public class ReadOnlyLongPropertyBaseTest {
     private InvalidationListenerMock invalidationListener;
     private ChangeListenerMock<Number> changeListener;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         property = new ReadOnlyPropertyMock();
         invalidationListener = new InvalidationListenerMock();
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyLongPropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyLongPropertyTest.java
index e36be0b88a2..a4ec5c9b29f 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyLongPropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyLongPropertyTest.java
@@ -25,7 +25,7 @@
 
 package test.javafx.beans.property;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import javafx.beans.InvalidationListener;
 import javafx.beans.property.ReadOnlyLongProperty;
 import javafx.beans.property.ReadOnlyLongWrapper;
@@ -33,14 +33,14 @@
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.beans.value.ChangeListener;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ReadOnlyLongPropertyTest {
 
     private static final long DEFAULT = 0L;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
     }
 
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyLongWrapperTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyLongWrapperTest.java
index effc50364b0..ef1c90e83cd 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyLongWrapperTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyLongWrapperTest.java
@@ -30,17 +30,18 @@
 import javafx.beans.property.ReadOnlyLongProperty;
 import javafx.beans.property.ReadOnlyLongWrapper;
 import javafx.beans.property.SimpleLongProperty;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import test.javafx.beans.InvalidationListenerMock;
 import test.javafx.beans.value.ChangeListenerMock;
 import javafx.beans.value.ObservableLongValueStub;
 import javafx.beans.value.ObservableObjectValueStub;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ReadOnlyLongWrapperTest {
 
@@ -56,7 +57,7 @@ public class ReadOnlyLongWrapperTest {
     private ChangeListenerMock<Number> internalChangeListener;
     private ChangeListenerMock<Number> publicChangeListener;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         property = new ReadOnlyLongWrapperMock();
         readOnlyProperty = property.getReadOnlyProperty();
@@ -319,13 +320,16 @@ public void testPublicEagerSetValue() {
         publicChangeListener.check(readOnlyProperty, VALUE_2, VALUE_1, 2);
     }
 
-    @Test(expected=RuntimeException.class)
+    @Test
     public void testSetBoundValue() {
-        final LongProperty v = new SimpleLongProperty(VALUE_1);
-        property.bind(v);
-        property.set(VALUE_1);
+        assertThrows(RuntimeException.class, () -> {
+            final LongProperty v = new SimpleLongProperty(VALUE_1);
+            property.bind(v);
+            property.set(VALUE_1);
+        });
     }
 
+
     @Test
     public void testLazyBind_primitive() {
         attachInvalidationListeners();
@@ -550,11 +554,14 @@ public void testPublicEagerBind_generic() {
         publicChangeListener.check(readOnlyProperty, VALUE_2, VALUE_1, 1);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testBindToNull() {
-        property.bind(null);
+        assertThrows(NullPointerException.class, () -> {
+            property.bind(null);
+        });
     }
 
+
     @Test
     public void testRebind() {
         attachInvalidationListeners();
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyMapPropertyBaseTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyMapPropertyBaseTest.java
index c98bdc8eb57..af9044a29a4 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyMapPropertyBaseTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyMapPropertyBaseTest.java
@@ -29,8 +29,8 @@
 import test.javafx.beans.value.ChangeListenerMock;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableMap;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
 import javafx.beans.property.ReadOnlyBooleanProperty;
@@ -38,7 +38,7 @@
 import javafx.beans.property.ReadOnlyMapPropertyBase;
 import javafx.beans.property.ReadOnlyMapPropertyBaseShim;
 
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class ReadOnlyMapPropertyBaseTest {
 
@@ -51,7 +51,7 @@ public class ReadOnlyMapPropertyBaseTest {
     private InvalidationListenerMock invalidationListener;
     private ChangeListenerMock<Object> changeListener;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         property = new ReadOnlyPropertyMock();
         invalidationListener = new InvalidationListenerMock();
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyMapPropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyMapPropertyTest.java
index 173e274d716..73f0b473b49 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyMapPropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyMapPropertyTest.java
@@ -32,16 +32,16 @@
 import javafx.beans.value.ChangeListener;
 import javafx.collections.MapChangeListener;
 import javafx.collections.ObservableMap;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class ReadOnlyMapPropertyTest {
 
     private static final Object DEFAULT = null;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
     }
 
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyMapWrapperTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyMapWrapperTest.java
index 66eacb534c6..af6c6941236 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyMapWrapperTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyMapWrapperTest.java
@@ -31,8 +31,8 @@
 import javafx.beans.value.ObservableObjectValueStub;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableMap;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
 import javafx.beans.property.MapProperty;
@@ -40,7 +40,7 @@
 import javafx.beans.property.ReadOnlyMapWrapper;
 import javafx.beans.property.SimpleMapProperty;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class ReadOnlyMapWrapperTest {
 
@@ -56,7 +56,7 @@ public class ReadOnlyMapWrapperTest {
     private ChangeListenerMock<Object> internalChangeListener;
     private ChangeListenerMock<Object> publicChangeListener;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         property = new ReadOnlyMapWrapperMock();
         readOnlyProperty = property.getReadOnlyProperty();
@@ -319,13 +319,16 @@ public void testPublicEagerMapValue() {
         publicChangeListener.check(readOnlyProperty, VALUE_2, VALUE_1, 2);
     }
 
-    @Test(expected=RuntimeException.class)
+    @Test
     public void testMapBoundValue() {
-        final MapProperty<Object, Object> v = new SimpleMapProperty<>(VALUE_1);
-        property.bind(v);
-        property.set(VALUE_1);
+        assertThrows(RuntimeException.class, () -> {
+            final MapProperty<Object, Object> v = new SimpleMapProperty<>(VALUE_1);
+            property.bind(v);
+            property.set(VALUE_1);
+        });
     }
 
+
     @Test
     public void testLazyBind_primitive() {
         attachInvalidationListeners();
@@ -550,11 +553,14 @@ public void testPublicEagerBind_generic() {
         publicChangeListener.check(readOnlyProperty, VALUE_2, VALUE_1, 1);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testBindToNull() {
-        property.bind(null);
+        assertThrows(NullPointerException.class, () -> {
+            property.bind(null);
+        });
     }
 
+
     @Test
     public void testRebind() {
         attachInvalidationListeners();
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyObjectPropertyBaseTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyObjectPropertyBaseTest.java
index a2513c9ce80..0bd43e2f507 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyObjectPropertyBaseTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyObjectPropertyBaseTest.java
@@ -30,8 +30,8 @@
 import test.javafx.beans.InvalidationListenerMock;
 import test.javafx.beans.value.ChangeListenerMock;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ReadOnlyObjectPropertyBaseTest {
 
@@ -44,7 +44,7 @@ public class ReadOnlyObjectPropertyBaseTest {
     private InvalidationListenerMock invalidationListener;
     private ChangeListenerMock<Object> changeListener;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         property = new ReadOnlyPropertyMock();
         invalidationListener = new InvalidationListenerMock();
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyObjectPropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyObjectPropertyTest.java
index 510548d76d5..96e84619f1c 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyObjectPropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyObjectPropertyTest.java
@@ -25,19 +25,19 @@
 
 package test.javafx.beans.property;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import javafx.beans.InvalidationListener;
 import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.beans.value.ChangeListener;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ReadOnlyObjectPropertyTest {
 
     private static final Object DEFAULT = null;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
     }
 
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyObjectWrapperTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyObjectWrapperTest.java
index 45b796e316e..c95d21b04f8 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyObjectWrapperTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyObjectWrapperTest.java
@@ -30,16 +30,17 @@
 import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.beans.property.SimpleObjectProperty;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import test.javafx.beans.InvalidationListenerMock;
 import test.javafx.beans.value.ChangeListenerMock;
 import javafx.beans.value.ObservableObjectValueStub;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ReadOnlyObjectWrapperTest {
 
@@ -55,7 +56,7 @@ public class ReadOnlyObjectWrapperTest {
     private ChangeListenerMock<Object> internalChangeListener;
     private ChangeListenerMock<Object> publicChangeListener;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         property = new ReadOnlyObjectWrapperMock();
         readOnlyProperty = property.getReadOnlyProperty();
@@ -318,13 +319,16 @@ public void testPublicEagerSetValue() {
         publicChangeListener.check(readOnlyProperty, VALUE_2, VALUE_1, 2);
     }
 
-    @Test(expected=RuntimeException.class)
+    @Test
     public void testSetBoundValue() {
-        final ObjectProperty<Object> v = new SimpleObjectProperty<>(VALUE_1);
-        property.bind(v);
-        property.set(VALUE_1);
+        assertThrows(RuntimeException.class, () -> {
+            final ObjectProperty<Object> v = new SimpleObjectProperty<>(VALUE_1);
+            property.bind(v);
+            property.set(VALUE_1);
+        });
     }
 
+
     @Test
     public void testLazyBind_primitive() {
         attachInvalidationListeners();
@@ -549,11 +553,14 @@ public void testPublicEagerBind_generic() {
         publicChangeListener.check(readOnlyProperty, VALUE_2, VALUE_1, 1);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testBindToNull() {
-        property.bind(null);
+        assertThrows(NullPointerException.class, () -> {
+            property.bind(null);
+        });
     }
 
+
     @Test
     public void testRebind() {
         attachInvalidationListeners();
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlySetPropertyBaseTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlySetPropertyBaseTest.java
index 23e5ea70979..7e1a47aefc7 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlySetPropertyBaseTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlySetPropertyBaseTest.java
@@ -33,10 +33,10 @@
 import test.javafx.beans.value.ChangeListenerMock;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableSet;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class ReadOnlySetPropertyBaseTest {
 
@@ -49,7 +49,7 @@ public class ReadOnlySetPropertyBaseTest {
     private InvalidationListenerMock invalidationListener;
     private ChangeListenerMock<Object> changeListener;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         property = new ReadOnlyPropertyMock();
         invalidationListener = new InvalidationListenerMock();
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlySetPropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlySetPropertyTest.java
index 0431afa8b8d..86f43f6adbc 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlySetPropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlySetPropertyTest.java
@@ -32,16 +32,16 @@
 import javafx.beans.value.ChangeListener;
 import javafx.collections.ObservableSet;
 import javafx.collections.SetChangeListener;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class ReadOnlySetPropertyTest {
 
     private static final Object DEFAULT = null;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
     }
 
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlySetWrapperTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlySetWrapperTest.java
index 71b35fdeaa6..8dde3719030 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlySetWrapperTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlySetWrapperTest.java
@@ -35,10 +35,10 @@
 import javafx.beans.value.ObservableObjectValueStub;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableSet;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class ReadOnlySetWrapperTest {
 
@@ -54,7 +54,7 @@ public class ReadOnlySetWrapperTest {
     private ChangeListenerMock<Object> internalChangeListener;
     private ChangeListenerMock<Object> publicChangeListener;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         property = new ReadOnlySetWrapperMock();
         readOnlyProperty = property.getReadOnlyProperty();
@@ -317,13 +317,16 @@ public void testPublicEagerSetValue() {
         publicChangeListener.check(readOnlyProperty, VALUE_2, VALUE_1, 2);
     }
 
-    @Test(expected=RuntimeException.class)
+    @Test
     public void testSetBoundValue() {
-        final SetProperty<Object> v = new SimpleSetProperty<>(VALUE_1);
-        property.bind(v);
-        property.set(VALUE_1);
+        assertThrows(RuntimeException.class, () -> {
+            final SetProperty<Object> v = new SimpleSetProperty<>(VALUE_1);
+            property.bind(v);
+            property.set(VALUE_1);
+        });
     }
 
+
     @Test
     public void testLazyBind_primitive() {
         attachInvalidationListeners();
@@ -548,11 +551,14 @@ public void testPublicEagerBind_generic() {
         publicChangeListener.check(readOnlyProperty, VALUE_2, VALUE_1, 1);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testBindToNull() {
-        property.bind(null);
+        assertThrows(NullPointerException.class, () -> {
+            property.bind(null);
+        });
     }
 
+
     @Test
     public void testRebind() {
         attachInvalidationListeners();
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyStringPropertyBaseTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyStringPropertyBaseTest.java
index 0751ccac60e..b3ffdb11361 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyStringPropertyBaseTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyStringPropertyBaseTest.java
@@ -29,8 +29,8 @@
 import test.javafx.beans.InvalidationListenerMock;
 import test.javafx.beans.value.ChangeListenerMock;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ReadOnlyStringPropertyBaseTest {
 
@@ -43,7 +43,7 @@ public class ReadOnlyStringPropertyBaseTest {
     private InvalidationListenerMock invalidationListener;
     private ChangeListenerMock<String> changeListener;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         property = new ReadOnlyPropertyMock();
         invalidationListener = new InvalidationListenerMock();
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyStringPropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyStringPropertyTest.java
index c1430befa2b..a595b2f895a 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyStringPropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyStringPropertyTest.java
@@ -25,19 +25,19 @@
 
 package test.javafx.beans.property;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import javafx.beans.InvalidationListener;
 import javafx.beans.property.ReadOnlyStringProperty;
 import javafx.beans.value.ChangeListener;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ReadOnlyStringPropertyTest {
 
     private static final String DEFAULT = null;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
     }
 
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyStringWrapperTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyStringWrapperTest.java
index 06092edb72b..58e50be58fe 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyStringWrapperTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/ReadOnlyStringWrapperTest.java
@@ -30,17 +30,18 @@
 import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import test.javafx.beans.InvalidationListenerMock;
 import test.javafx.beans.value.ChangeListenerMock;
 import javafx.beans.value.ObservableStringValueStub;
 import javafx.beans.value.ObservableObjectValueStub;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ReadOnlyStringWrapperTest {
 
@@ -56,7 +57,7 @@ public class ReadOnlyStringWrapperTest {
     private ChangeListenerMock<String> internalChangeListener;
     private ChangeListenerMock<String> publicChangeListener;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         property = new ReadOnlyStringWrapperMock();
         readOnlyProperty = property.getReadOnlyProperty();
@@ -319,13 +320,16 @@ public void testPublicEagerSetValue() {
         publicChangeListener.check(readOnlyProperty, VALUE_2, VALUE_1, 2);
     }
 
-    @Test(expected=RuntimeException.class)
+    @Test
     public void testSetBoundValue() {
-        final StringProperty v = new SimpleStringProperty(VALUE_1);
-        property.bind(v);
-        property.set(VALUE_1);
+        assertThrows(RuntimeException.class, () -> {
+            final StringProperty v = new SimpleStringProperty(VALUE_1);
+            property.bind(v);
+            property.set(VALUE_1);
+        });
     }
 
+
     @Test
     public void testLazyBind_primitive() {
         attachInvalidationListeners();
@@ -550,11 +554,14 @@ public void testPublicEagerBind_generic() {
         publicChangeListener.check(readOnlyProperty, VALUE_2, VALUE_1, 1);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testBindToNull() {
-        property.bind(null);
+        assertThrows(NullPointerException.class, () -> {
+            property.bind(null);
+        });
     }
 
+
     @Test
     public void testRebind() {
         attachInvalidationListeners();
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/SetPropertyBaseTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/SetPropertyBaseTest.java
index 2dd59159d06..83de79c48fa 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/SetPropertyBaseTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/SetPropertyBaseTest.java
@@ -33,12 +33,12 @@
 import test.javafx.beans.value.ChangeListenerMock;
 import javafx.beans.value.ObservableObjectValueStub;
 import javafx.collections.*;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import static test.javafx.collections.MockSetObserver.Call;
 import test.javafx.collections.MockSetObserver.Tuple;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class SetPropertyBaseTest {
 
@@ -61,7 +61,7 @@ public class SetPropertyBaseTest {
     private ChangeListenerMock<ObservableSet<Object>> changeListener;
     private MockSetObserver<Object> setChangeListener;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         property = new SetPropertyMock();
         invalidationListener = new InvalidationListenerMock();
@@ -435,13 +435,16 @@ public void testSetValue_SetChange() {
         setChangeListener.assertAdded(MockSetObserver.Tuple.tup(OBJECT_1b));
     }
 
-    @Test(expected = RuntimeException.class)
+    @Test
     public void testSetBoundValue() {
-        final SetProperty<Object> v = new SimpleSetProperty<>(VALUE_1a);
-        property.bind(v);
-        property.set(VALUE_1a);
+        assertThrows(RuntimeException.class, () -> {
+            final SetProperty<Object> v = new SimpleSetProperty<>(VALUE_1a);
+            property.bind(v);
+            property.set(VALUE_1a);
+        });
     }
 
+
     @Test
     public void testBind_Invalidation() {
         attachInvalidationListener();
@@ -541,11 +544,14 @@ public void testBind_SetChange() {
         assertEquals(0, setChangeListener.getCallsNumber());
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testBindToNull() {
-        property.bind(null);
+        assertThrows(NullPointerException.class, () -> {
+            property.bind(null);
+        });
     }
 
+
     @Test
     public void testRebind() {
         attachInvalidationListener();
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/SetPropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/SetPropertyTest.java
index 7f06b293f1d..126beb2ca87 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/SetPropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/SetPropertyTest.java
@@ -36,10 +36,10 @@
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableSet;
 import javafx.collections.SetChangeListener;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class SetPropertyTest {
 
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/SimpleBooleanPropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/SimpleBooleanPropertyTest.java
index d1ff6d7b52c..b7b447bf401 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/SimpleBooleanPropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/SimpleBooleanPropertyTest.java
@@ -28,9 +28,9 @@
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class SimpleBooleanPropertyTest {
 
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/SimpleDoublePropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/SimpleDoublePropertyTest.java
index ad295335ae4..b9d8cad8596 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/SimpleDoublePropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/SimpleDoublePropertyTest.java
@@ -28,9 +28,9 @@
 
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.SimpleDoubleProperty;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class SimpleDoublePropertyTest {
 
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/SimpleFloatPropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/SimpleFloatPropertyTest.java
index 417d5a86786..a07d08bc14e 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/SimpleFloatPropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/SimpleFloatPropertyTest.java
@@ -28,9 +28,9 @@
 
 import javafx.beans.property.FloatProperty;
 import javafx.beans.property.SimpleFloatProperty;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class SimpleFloatPropertyTest {
 
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/SimpleIntegerPropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/SimpleIntegerPropertyTest.java
index 614ab4e186d..cad93aa9641 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/SimpleIntegerPropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/SimpleIntegerPropertyTest.java
@@ -28,9 +28,9 @@
 
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class SimpleIntegerPropertyTest {
 
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/SimpleListPropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/SimpleListPropertyTest.java
index 0eed4ad91fb..2ebf22269e4 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/SimpleListPropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/SimpleListPropertyTest.java
@@ -30,9 +30,9 @@
 import javafx.beans.property.SimpleListProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class SimpleListPropertyTest {
 
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/SimpleLongPropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/SimpleLongPropertyTest.java
index e9767e8df92..2cce843129b 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/SimpleLongPropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/SimpleLongPropertyTest.java
@@ -28,9 +28,9 @@
 
 import javafx.beans.property.LongProperty;
 import javafx.beans.property.SimpleLongProperty;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class SimpleLongPropertyTest {
 
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/SimpleObjectPropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/SimpleObjectPropertyTest.java
index fdc9ab5fd5c..b8e43747e78 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/SimpleObjectPropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/SimpleObjectPropertyTest.java
@@ -28,9 +28,9 @@
 
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class SimpleObjectPropertyTest {
 
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/SimpleStringPropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/SimpleStringPropertyTest.java
index 8813dc0fde3..5ee2a67fa3f 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/SimpleStringPropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/SimpleStringPropertyTest.java
@@ -28,9 +28,9 @@
 
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class SimpleStringPropertyTest {
 
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/StringPropertyBaseTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/StringPropertyBaseTest.java
index 163f737a92c..cc09ec1ab4e 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/StringPropertyBaseTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/StringPropertyBaseTest.java
@@ -28,16 +28,17 @@
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.beans.property.StringPropertyBase;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import test.javafx.beans.InvalidationListenerMock;
 import test.javafx.beans.value.ChangeListenerMock;
 import javafx.beans.value.ObservableStringValueStub;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class StringPropertyBaseTest {
 
@@ -54,7 +55,7 @@ public class StringPropertyBaseTest {
     private InvalidationListenerMock invalidationListener;
     private ChangeListenerMock<String> changeListener;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         property = new StringPropertyMock();
         invalidationListener = new InvalidationListenerMock();
@@ -203,13 +204,16 @@ public void testEagerSetValue() {
         changeListener.check(property, VALUE_1a, VALUE_1b, 2);
     }
 
-    @Test(expected=RuntimeException.class)
+    @Test
     public void testSetBoundValue() {
-        final StringProperty v = new SimpleStringProperty(VALUE_1a);
-        property.bind(v);
-        property.set(VALUE_1a);
+        assertThrows(RuntimeException.class, () -> {
+            final StringProperty v = new SimpleStringProperty(VALUE_1a);
+            property.bind(v);
+            property.set(VALUE_1a);
+        });
     }
 
+
     @Test
     public void testLazyBind() {
         attachInvalidationListener();
@@ -274,11 +278,14 @@ public void testEagerBind() {
         changeListener.check(property, VALUE_1b, VALUE_1a, 1);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testBindToNull() {
-        property.bind(null);
+        assertThrows(NullPointerException.class, () -> {
+            property.bind(null);
+        });
     }
 
+
     @Test
     public void testRebind() {
         attachInvalidationListener();
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/StringPropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/StringPropertyTest.java
index bd36b05a381..d5ef109e184 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/StringPropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/StringPropertyTest.java
@@ -26,15 +26,15 @@
 package test.javafx.beans.property;
 
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 import javafx.beans.InvalidationListener;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class StringPropertyTest {
 
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanBooleanPropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanBooleanPropertyTest.java
index ef507c51f8e..97bde0002db 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanBooleanPropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanBooleanPropertyTest.java
@@ -32,7 +32,7 @@
 import javafx.beans.property.adapter.JavaBeanBooleanPropertyBuilder;
 import javafx.beans.property.adapter.JavaBeanProperty;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  */
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanBooleanProperty_prim_Test.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanBooleanProperty_prim_Test.java
index d1a968ce9a4..21460d0c88c 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanBooleanProperty_prim_Test.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanBooleanProperty_prim_Test.java
@@ -32,7 +32,7 @@
 import javafx.beans.property.adapter.JavaBeanBooleanPropertyBuilder;
 import javafx.beans.property.adapter.JavaBeanProperty;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  */
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanDoublePropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanDoublePropertyTest.java
index 7232b474c88..8cfd1ae223a 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanDoublePropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanDoublePropertyTest.java
@@ -32,7 +32,7 @@
 import javafx.beans.property.adapter.JavaBeanDoublePropertyBuilder;
 import javafx.beans.property.adapter.JavaBeanProperty;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  */
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanDoubleProperty_prim_Test.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanDoubleProperty_prim_Test.java
index ea18e2ee8f1..2329326ff0a 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanDoubleProperty_prim_Test.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanDoubleProperty_prim_Test.java
@@ -32,7 +32,7 @@
 import javafx.beans.property.adapter.JavaBeanDoublePropertyBuilder;
 import javafx.beans.property.adapter.JavaBeanProperty;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  */
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanFloatPropertyBuilderaTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanFloatPropertyBuilderaTest.java
index 90985ac9b8c..fa6d768f5db 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanFloatPropertyBuilderaTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanFloatPropertyBuilderaTest.java
@@ -32,7 +32,7 @@
 import javafx.beans.property.adapter.JavaBeanFloatPropertyBuilder;
 import javafx.beans.property.adapter.JavaBeanProperty;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  */
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanFloatProperty_prim_Test.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanFloatProperty_prim_Test.java
index 84c92ca85ad..384df11e9ca 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanFloatProperty_prim_Test.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanFloatProperty_prim_Test.java
@@ -32,7 +32,7 @@
 import javafx.beans.property.adapter.JavaBeanFloatPropertyBuilder;
 import javafx.beans.property.adapter.JavaBeanProperty;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  */
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanIntegerPropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanIntegerPropertyTest.java
index fa6ebef1421..85a088b1a4f 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanIntegerPropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanIntegerPropertyTest.java
@@ -32,7 +32,7 @@
 import javafx.beans.property.adapter.JavaBeanIntegerPropertyBuilder;
 import javafx.beans.property.adapter.JavaBeanProperty;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  */
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanIntegerProperty_prim_Test.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanIntegerProperty_prim_Test.java
index 0ca775120b8..d203b5202be 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanIntegerProperty_prim_Test.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanIntegerProperty_prim_Test.java
@@ -32,7 +32,7 @@
 import javafx.beans.property.adapter.JavaBeanIntegerPropertyBuilder;
 import javafx.beans.property.adapter.JavaBeanProperty;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  */
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanLongPropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanLongPropertyTest.java
index e9ca7a7cf37..abf30fe023d 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanLongPropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanLongPropertyTest.java
@@ -32,7 +32,7 @@
 import javafx.beans.property.adapter.JavaBeanLongPropertyBuilder;
 import javafx.beans.property.adapter.JavaBeanProperty;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  */
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanLongProperty_prim_Test.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanLongProperty_prim_Test.java
index 4f5c36ed6d1..585ca6037df 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanLongProperty_prim_Test.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanLongProperty_prim_Test.java
@@ -32,7 +32,7 @@
 import javafx.beans.property.adapter.JavaBeanLongPropertyBuilder;
 import javafx.beans.property.adapter.JavaBeanProperty;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  */
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanObjectPropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanObjectPropertyTest.java
index da71dbdd78e..fa26aa38c33 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanObjectPropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanObjectPropertyTest.java
@@ -32,7 +32,7 @@
 import javafx.beans.property.adapter.JavaBeanObjectPropertyBuilder;
 import javafx.beans.property.adapter.JavaBeanProperty;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  */
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanStringPropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanStringPropertyTest.java
index 00cd2156041..d59276f1b88 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanStringPropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/JavaBeanStringPropertyTest.java
@@ -32,7 +32,7 @@
 import javafx.beans.property.adapter.JavaBeanProperty;
 import javafx.beans.property.adapter.JavaBeanStringPropertyBuilder;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  */
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanBooleanPropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanBooleanPropertyTest.java
index 33a482bb74a..c2a5e51ceab 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanBooleanPropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanBooleanPropertyTest.java
@@ -29,7 +29,7 @@
 import javafx.beans.property.adapter.ReadOnlyJavaBeanBooleanPropertyBuilder;
 import javafx.beans.property.adapter.ReadOnlyJavaBeanProperty;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  */
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanBooleanProperty_prim_Test.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanBooleanProperty_prim_Test.java
index 5dac522a65d..87930c823dc 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanBooleanProperty_prim_Test.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanBooleanProperty_prim_Test.java
@@ -29,7 +29,7 @@
 import javafx.beans.property.adapter.ReadOnlyJavaBeanBooleanPropertyBuilder;
 import javafx.beans.property.adapter.ReadOnlyJavaBeanProperty;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  */
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanDoublePropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanDoublePropertyTest.java
index 97e1771e6ba..7cb13afe98f 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanDoublePropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanDoublePropertyTest.java
@@ -29,7 +29,7 @@
 import javafx.beans.property.adapter.ReadOnlyJavaBeanDoublePropertyBuilder;
 import javafx.beans.property.adapter.ReadOnlyJavaBeanProperty;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  */
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanDoubleProperty_prim_Test.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanDoubleProperty_prim_Test.java
index 309d2ac0bc8..befcfe225a3 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanDoubleProperty_prim_Test.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanDoubleProperty_prim_Test.java
@@ -29,7 +29,7 @@
 import javafx.beans.property.adapter.ReadOnlyJavaBeanDoublePropertyBuilder;
 import javafx.beans.property.adapter.ReadOnlyJavaBeanProperty;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  */
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanFloatPropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanFloatPropertyTest.java
index 9b5cc955f8b..19fc5e71c0e 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanFloatPropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanFloatPropertyTest.java
@@ -29,7 +29,7 @@
 import javafx.beans.property.adapter.ReadOnlyJavaBeanFloatPropertyBuilder;
 import javafx.beans.property.adapter.ReadOnlyJavaBeanProperty;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  */
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanFloatProperty_prim_Test.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanFloatProperty_prim_Test.java
index c04de380067..224c16ec075 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanFloatProperty_prim_Test.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanFloatProperty_prim_Test.java
@@ -29,7 +29,7 @@
 import javafx.beans.property.adapter.ReadOnlyJavaBeanFloatPropertyBuilder;
 import javafx.beans.property.adapter.ReadOnlyJavaBeanProperty;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  */
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanIntegerPropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanIntegerPropertyTest.java
index cd3a8cb0545..f351531ceb0 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanIntegerPropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanIntegerPropertyTest.java
@@ -29,7 +29,7 @@
 import javafx.beans.property.adapter.ReadOnlyJavaBeanIntegerPropertyBuilder;
 import javafx.beans.property.adapter.ReadOnlyJavaBeanProperty;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  */
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanIntegerProperty_prim_Test.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanIntegerProperty_prim_Test.java
index e4c6bbb3a73..87da5372808 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanIntegerProperty_prim_Test.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanIntegerProperty_prim_Test.java
@@ -29,7 +29,7 @@
 import javafx.beans.property.adapter.ReadOnlyJavaBeanIntegerPropertyBuilder;
 import javafx.beans.property.adapter.ReadOnlyJavaBeanProperty;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  */
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanLongPropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanLongPropertyTest.java
index c40c8eb76ac..e06746fa44a 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanLongPropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanLongPropertyTest.java
@@ -29,7 +29,7 @@
 import javafx.beans.property.adapter.ReadOnlyJavaBeanLongPropertyBuilder;
 import javafx.beans.property.adapter.ReadOnlyJavaBeanProperty;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  */
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanLongProperty_prim_Test.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanLongProperty_prim_Test.java
index d8a5db92def..53c4c4b6d70 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanLongProperty_prim_Test.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanLongProperty_prim_Test.java
@@ -29,7 +29,7 @@
 import javafx.beans.property.adapter.ReadOnlyJavaBeanLongPropertyBuilder;
 import javafx.beans.property.adapter.ReadOnlyJavaBeanProperty;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  */
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanObjectPropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanObjectPropertyTest.java
index 62428ae02fb..ac244e16179 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanObjectPropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanObjectPropertyTest.java
@@ -29,7 +29,7 @@
 import javafx.beans.property.adapter.ReadOnlyJavaBeanObjectPropertyBuilder;
 import javafx.beans.property.adapter.ReadOnlyJavaBeanProperty;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  */
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanPropertyTestBase.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanPropertyTestBase.java
index e130fd7461e..bb05bd148e5 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanPropertyTestBase.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanPropertyTestBase.java
@@ -29,8 +29,8 @@
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.value.ChangeListener;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyVetoException;
@@ -38,10 +38,10 @@
 import java.lang.reflect.UndeclaredThrowableException;
 import javafx.beans.property.adapter.ReadOnlyJavaBeanProperty;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
-*/
+ */
 public abstract class ReadOnlyJavaBeanPropertyTestBase<T> {
     private BeanStub<T> bean;
     private ReadOnlyJavaBeanProperty<T> property;
@@ -51,7 +51,7 @@ public abstract class ReadOnlyJavaBeanPropertyTestBase<T> {
     protected abstract T getValue(int index);
     protected abstract ReadOnlyJavaBeanProperty<T> extractProperty(Object bean) throws NoSuchMethodException;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         this.bean = createBean(getValue(0));
         try {
@@ -61,13 +61,15 @@ public void setUp() {
         }
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testSetup_WithNull() {
-        try {
-            this.property = extractProperty(null);
-        } catch (NoSuchMethodException e) {
-            fail();
-        }
+        assertThrows(NullPointerException.class, () -> {
+            try {
+                this.property = extractProperty(null);
+            } catch (NoSuchMethodException e) {
+                fail();
+            }
+        });
     }
 
     @Test
@@ -88,12 +90,15 @@ public void testGetAndSet() {
         }
     }
 
-    @Test(expected = UndeclaredThrowableException.class)
+    @Test
     public void testGet_Exception() {
-        bean.setFailureMode(true);
-        property.getValue();
+        assertThrows(UndeclaredThrowableException.class, () -> {
+            bean.setFailureMode(true);
+            property.getValue();
+        });
     }
 
+
     @Test
     public void testInvalidationListener() {
         final BooleanProperty fired = new SimpleBooleanProperty(false);
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanStringPropertyTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanStringPropertyTest.java
index ec66064fc38..ffe31eb9b3f 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanStringPropertyTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/property/adapter/ReadOnlyJavaBeanStringPropertyTest.java
@@ -29,7 +29,7 @@
 import javafx.beans.property.adapter.ReadOnlyJavaBeanProperty;
 import javafx.beans.property.adapter.ReadOnlyJavaBeanStringPropertyBuilder;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  */
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/value/ChangeListenerMock.java b/modules/javafx.base/src/test/java/test/javafx/beans/value/ChangeListenerMock.java
index 34441c03dbb..a7f53469135 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/value/ChangeListenerMock.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/value/ChangeListenerMock.java
@@ -27,7 +27,7 @@
 
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class ChangeListenerMock<T> implements ChangeListener<T> {
 
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/value/ObservableValueBaseTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/value/ObservableValueBaseTest.java
index 249c6ae3304..1f64f0c3066 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/value/ObservableValueBaseTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/value/ObservableValueBaseTest.java
@@ -31,8 +31,9 @@
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableObjectValueStub;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class ObservableValueBaseTest {
 
@@ -44,7 +45,7 @@ public class ObservableValueBaseTest {
     private InvalidationListenerMock invalidationListener;
     private ChangeListenerMock<Object> changeListener;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         valueModel = new ObservableObjectValueStub<>();
         invalidationListener = new InvalidationListenerMock();
@@ -178,26 +179,38 @@ public void testConcurrentRemove() {
         observer2.check(valueModel, 1);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testAddingNull_InvalidationListener() {
-        valueModel.addListener((InvalidationListener)null);
+        assertThrows(NullPointerException.class, () -> {
+            valueModel.addListener((InvalidationListener)null);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
+
+    @Test
     public void testAddingNull_ChangeListener() {
-        valueModel.addListener((ChangeListener<Object>)null);
+        assertThrows(NullPointerException.class, () -> {
+            valueModel.addListener((ChangeListener<Object>)null);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
+
+    @Test
     public void testRemovingNull_InvalidationListener() {
-        valueModel.removeListener((InvalidationListener)null);
+        assertThrows(NullPointerException.class, () -> {
+            valueModel.removeListener((InvalidationListener)null);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
+
+    @Test
     public void testRemovingNull_ChangeListener() {
-        valueModel.removeListener((ChangeListener<Object>)null);
+        assertThrows(NullPointerException.class, () -> {
+            valueModel.removeListener((ChangeListener<Object>)null);
+        });
     }
 
+
     private class AddingListenerMock extends InvalidationListenerMock {
         @Override public void invalidated(Observable valueModel) {
             super.invalidated(valueModel);
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/value/ObservableValueFluentBindingsTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/value/ObservableValueFluentBindingsTest.java
index b2c868fce3e..ffd7a4f9f4f 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/value/ObservableValueFluentBindingsTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/value/ObservableValueFluentBindingsTest.java
@@ -30,6 +30,7 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/modules/javafx.base/src/test/java/test/javafx/beans/value/WeakChangeListenerTest.java b/modules/javafx.base/src/test/java/test/javafx/beans/value/WeakChangeListenerTest.java
index 3288e0fd8aa..c20537e697e 100644
--- a/modules/javafx.base/src/test/java/test/javafx/beans/value/WeakChangeListenerTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/beans/value/WeakChangeListenerTest.java
@@ -29,17 +29,20 @@
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.beans.value.WeakChangeListener;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class WeakChangeListenerTest {
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testConstructWithNull() {
-        new WeakChangeListener<>(null);
+        assertThrows(NullPointerException.class, () -> {
+            new WeakChangeListener<>(null);
+        });
     }
 
+
     @Test
     public void testHandle() {
         ChangeListenerMock<Object> listener = new ChangeListenerMock<>(new Object());
diff --git a/modules/javafx.base/src/test/java/test/javafx/binding/BindingToStringTest.java b/modules/javafx.base/src/test/java/test/javafx/binding/BindingToStringTest.java
index eeebdbcf8d6..ad04e280a08 100644
--- a/modules/javafx.base/src/test/java/test/javafx/binding/BindingToStringTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/binding/BindingToStringTest.java
@@ -30,14 +30,14 @@
 import javafx.beans.property.*;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class BindingToStringTest {
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
     }
 
diff --git a/modules/javafx.base/src/test/java/test/javafx/binding/BindingsArrayTest.java b/modules/javafx.base/src/test/java/test/javafx/binding/BindingsArrayTest.java
index 6a35efbf30d..e353f4308a5 100644
--- a/modules/javafx.base/src/test/java/test/javafx/binding/BindingsArrayTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/binding/BindingsArrayTest.java
@@ -35,11 +35,11 @@
 import test.com.sun.javafx.binding.ErrorLoggingUtiltity;
 import javafx.collections.ObservableFloatArray;
 import javafx.collections.ObservableIntegerArray;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  */
@@ -56,12 +56,12 @@ public class BindingsArrayTest {
     private ObservableList<Object> list2;
     private IntegerProperty index;
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
         ErrorLoggingUtiltity.reset();
     }
 
-    @Before
+    @BeforeEach
     public void setUp() {
         property = new SimpleListProperty<>();
         list1 = FXCollections.<Object>observableArrayList(data1, data2);
@@ -87,11 +87,14 @@ public void testSize() {
         assertEquals(0, size.get());
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testSize_Null() {
-        Bindings.size((ObservableList<Object>) null);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.size((ObservableList<Object>) null);
+        });
     }
 
+
     @Test
     public void testIsEmpty() {
         final BooleanBinding empty = Bindings.isEmpty(property);
@@ -110,11 +113,14 @@ public void testIsEmpty() {
         assertTrue(empty.get());
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testIsEmpty_Null() {
-        Bindings.isEmpty((ObservableList<Object>) null);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.isEmpty((ObservableList<Object>) null);
+        });
     }
 
+
     @Test
     public void testIsNotEmpty() {
         final BooleanBinding notEmpty = Bindings.isNotEmpty(property);
@@ -133,11 +139,14 @@ public void testIsNotEmpty() {
         assertFalse(notEmpty.get());
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testIsNotEmpty_Null() {
-        Bindings.isNotEmpty((ObservableList<Object>) null);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.isNotEmpty((ObservableList<Object>) null);
+        });
     }
 
+
     @Test
     public void testValueAt_Constant() {
         final ObjectBinding<Object> binding0 = Bindings.valueAt(property, 0);
@@ -189,16 +198,22 @@ public void testValueAt_Constant() {
         ErrorLoggingUtiltity.checkFine(IndexOutOfBoundsException.class);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testValueAt_Constant_Null() {
-        Bindings.valueAt(null, 0);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.valueAt(null, 0);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+
+    @Test
     public void testValueAt_Constant_NegativeIndex() {
-        Bindings.valueAt(property, -1);
+        assertThrows(IllegalArgumentException.class, () -> {
+            Bindings.valueAt(property, -1);
+        });
     }
 
+
     @Test
     public void testValueAt_Variable() {
         final ObjectBinding<Object> binding = Bindings.valueAt(property, index);
@@ -262,16 +277,22 @@ public void testValueAt_Variable() {
         ErrorLoggingUtiltity.checkFine(IndexOutOfBoundsException.class);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testValueAt_Variable_Null() {
-        Bindings.valueAt((ObservableList<Object>)null, index);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.valueAt((ObservableList<Object>)null, index);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+
+    @Test
     public void testValueAt_Variable_NullIndex() {
-        Bindings.valueAt(property, null);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.valueAt(property, null);
+        });
     }
 
+
     @Test
     public void testBooleanValueAt_Constant() {
         final boolean defaultData = false;
@@ -330,17 +351,23 @@ public void testBooleanValueAt_Constant() {
         ErrorLoggingUtiltity.checkFine(IndexOutOfBoundsException.class);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testBooleanValueAt_Constant_Null() {
-        Bindings.booleanValueAt(null, 0);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.booleanValueAt(null, 0);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+
+    @Test
     public void testBooleanValueAt_Constant_NegativeIndex() {
-        final ListProperty<Boolean> localProperty = new SimpleListProperty<>();
-        Bindings.booleanValueAt(localProperty, -1);
+        assertThrows(IllegalArgumentException.class, () -> {
+            final ListProperty<Boolean> localProperty = new SimpleListProperty<>();
+            Bindings.booleanValueAt(localProperty, -1);
+        });
     }
 
+
     @Test
     public void testBooleanValueAt_Variable() {
         final boolean defaultData = false;
@@ -422,17 +449,23 @@ public void testBooleanValueAt_Variable() {
         ErrorLoggingUtiltity.checkFine(IndexOutOfBoundsException.class);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testBooleanValueAt_Variable_Null() {
-        Bindings.booleanValueAt((ObservableList<Boolean>)null, index);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.booleanValueAt((ObservableList<Boolean>)null, index);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+
+    @Test
     public void testBooleanValueAt_Variable_NullIndex() {
-        final ListProperty<Boolean> localProperty = new SimpleListProperty<>();
-        Bindings.booleanValueAt(localProperty, null);
+        assertThrows(NullPointerException.class, () -> {
+            final ListProperty<Boolean> localProperty = new SimpleListProperty<>();
+            Bindings.booleanValueAt(localProperty, null);
+        });
     }
 
+
     @Test
     public void testDoubleValueAt_Constant() {
         final double defaultData = 0.0;
@@ -491,17 +524,23 @@ public void testDoubleValueAt_Constant() {
         ErrorLoggingUtiltity.checkFine(IndexOutOfBoundsException.class);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testDoubleValueAt_Constant_Null() {
-        Bindings.doubleValueAt(null, 0);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.doubleValueAt(null, 0);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+
+    @Test
     public void testDoubleValueAt_Constant_NegativeIndex() {
-        final ListProperty<Double> localProperty = new SimpleListProperty<>();
-        Bindings.doubleValueAt(localProperty, -1);
+        assertThrows(IllegalArgumentException.class, () -> {
+            final ListProperty<Double> localProperty = new SimpleListProperty<>();
+            Bindings.doubleValueAt(localProperty, -1);
+        });
     }
 
+
     @Test
     public void testDoubleValueAt_Variable() {
         final double defaultData = 0.0;
@@ -583,17 +622,23 @@ public void testDoubleValueAt_Variable() {
         ErrorLoggingUtiltity.checkFine(IndexOutOfBoundsException.class);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testDoubleValueAt_Variable_Null() {
-        Bindings.doubleValueAt((ObservableList<Double>)null, index);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.doubleValueAt((ObservableList<Double>)null, index);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+
+    @Test
     public void testDoubleValueAt_Variable_NullIndex() {
-        final ListProperty<Double> localProperty = new SimpleListProperty<>();
-        Bindings.doubleValueAt(localProperty, null);
+        assertThrows(NullPointerException.class, () -> {
+            final ListProperty<Double> localProperty = new SimpleListProperty<>();
+            Bindings.doubleValueAt(localProperty, null);
+        });
     }
 
+
     @Test
     public void testFloatValueAt_Constant() {
         final float defaultData = 0.0f;
@@ -652,17 +697,23 @@ public void testFloatValueAt_Constant() {
         ErrorLoggingUtiltity.checkFine(IndexOutOfBoundsException.class);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testFloatValueAt_Constant_Null() {
-        Bindings.floatValueAt((ObservableFloatArray) null, 0);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.floatValueAt((ObservableFloatArray) null, 0);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+
+    @Test
     public void testFloatValueAt_Constant_NegativeIndex() {
-        final ListProperty<Float> localProperty = new SimpleListProperty<>();
-        Bindings.floatValueAt(localProperty, -1);
+        assertThrows(IllegalArgumentException.class, () -> {
+            final ListProperty<Float> localProperty = new SimpleListProperty<>();
+            Bindings.floatValueAt(localProperty, -1);
+        });
     }
 
+
     @Test
     public void testFloatValueAt_Variable() {
         final float defaultData = 0.0f;
@@ -744,17 +795,23 @@ public void testFloatValueAt_Variable() {
         ErrorLoggingUtiltity.checkFine(IndexOutOfBoundsException.class);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testFloatValueAt_Variable_Null() {
-        Bindings.floatValueAt((ObservableList<Float>)null, index);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.floatValueAt((ObservableList<Float>)null, index);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+
+    @Test
     public void testFloatValueAt_Variable_NullIndex() {
-        final ListProperty<Float> localProperty = new SimpleListProperty<>();
-        Bindings.floatValueAt(localProperty, null);
+        assertThrows(NullPointerException.class, () -> {
+            final ListProperty<Float> localProperty = new SimpleListProperty<>();
+            Bindings.floatValueAt(localProperty, null);
+        });
     }
 
+
     @Test
     public void testIntegerValueAt_Constant() {
         final int defaultData = 0;
@@ -813,17 +870,23 @@ public void testIntegerValueAt_Constant() {
         ErrorLoggingUtiltity.checkFine(IndexOutOfBoundsException.class);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testIntegerValueAt_Constant_Null() {
-        Bindings.integerValueAt((ObservableIntegerArray) null, 0);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.integerValueAt((ObservableIntegerArray) null, 0);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+
+    @Test
     public void testIntegerValueAt_Constant_NegativeIndex() {
-        final ListProperty<Integer> localProperty = new SimpleListProperty<>();
-        Bindings.integerValueAt(localProperty, -1);
+        assertThrows(IllegalArgumentException.class, () -> {
+            final ListProperty<Integer> localProperty = new SimpleListProperty<>();
+            Bindings.integerValueAt(localProperty, -1);
+        });
     }
 
+
     @Test
     public void testIntegerValueAt_Variable() {
         final int defaultData = 0;
@@ -905,17 +968,23 @@ public void testIntegerValueAt_Variable() {
         ErrorLoggingUtiltity.checkFine(IndexOutOfBoundsException.class);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testIntegerValueAt_Variable_Null() {
-        Bindings.integerValueAt((ObservableList<Integer>)null, index);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.integerValueAt((ObservableList<Integer>)null, index);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+
+    @Test
     public void testIntegerValueAt_Variable_NullIndex() {
-        final ListProperty<Integer> localProperty = new SimpleListProperty<>();
-        Bindings.integerValueAt(localProperty, null);
+        assertThrows(NullPointerException.class, () -> {
+            final ListProperty<Integer> localProperty = new SimpleListProperty<>();
+            Bindings.integerValueAt(localProperty, null);
+        });
     }
 
+
     @Test
     public void testLongValueAt_Constant() {
         final long defaultData = 0L;
@@ -974,17 +1043,23 @@ public void testLongValueAt_Constant() {
         ErrorLoggingUtiltity.checkFine(IndexOutOfBoundsException.class);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testLongValueAt_Constant_Null() {
-        Bindings.longValueAt(null, 0);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.longValueAt(null, 0);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+
+    @Test
     public void testLongValueAt_Constant_NegativeIndex() {
-        final ListProperty<Long> localProperty = new SimpleListProperty<>();
-        Bindings.longValueAt(localProperty, -1);
+        assertThrows(IllegalArgumentException.class, () -> {
+            final ListProperty<Long> localProperty = new SimpleListProperty<>();
+            Bindings.longValueAt(localProperty, -1);
+        });
     }
 
+
     @Test
     public void testLongValueAt_Variable() {
         final long defaultData = 0;
@@ -1066,17 +1141,23 @@ public void testLongValueAt_Variable() {
         ErrorLoggingUtiltity.checkFine(IndexOutOfBoundsException.class);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testLongValueAt_Variable_Null() {
-        Bindings.longValueAt((ObservableList<Long>)null, index);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.longValueAt((ObservableList<Long>)null, index);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+
+    @Test
     public void testLongValueAt_Variable_NullIndex() {
-        final ListProperty<Long> localProperty = new SimpleListProperty<>();
-        Bindings.longValueAt(localProperty, null);
+        assertThrows(NullPointerException.class, () -> {
+            final ListProperty<Long> localProperty = new SimpleListProperty<>();
+            Bindings.longValueAt(localProperty, null);
+        });
     }
 
+
     @Test
     public void testStringValueAt_Constant() {
         final String defaultData = null;
@@ -1135,17 +1216,23 @@ public void testStringValueAt_Constant() {
         ErrorLoggingUtiltity.checkFine(IndexOutOfBoundsException.class);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testStringValueAt_Constant_Null() {
-        Bindings.stringValueAt(null, 0);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.stringValueAt(null, 0);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+
+    @Test
     public void testStringValueAt_Constant_NegativeIndex() {
-        final ListProperty<String> localProperty = new SimpleListProperty<>();
-        Bindings.stringValueAt(localProperty, -1);
+        assertThrows(IllegalArgumentException.class, () -> {
+            final ListProperty<String> localProperty = new SimpleListProperty<>();
+            Bindings.stringValueAt(localProperty, -1);
+        });
     }
 
+
     @Test
     public void testStringValueAt_Variable() {
         final String defaultData = null;
@@ -1216,16 +1303,19 @@ public void testStringValueAt_Variable() {
         ErrorLoggingUtiltity.checkFine(IndexOutOfBoundsException.class);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testStringValueAt_Variable_Null() {
-        Bindings.stringValueAt((ObservableList<String>)null, index);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.stringValueAt((ObservableList<String>)null, index);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+
+    @Test
     public void testStringValueAt_Variable_NullIndex() {
-        final ListProperty<String> localProperty = new SimpleListProperty<>();
-        Bindings.stringValueAt(localProperty, null);
+        assertThrows(NullPointerException.class, () -> {
+            final ListProperty<String> localProperty = new SimpleListProperty<>();
+            Bindings.stringValueAt(localProperty, null);
+        });
     }
-
-
 }
diff --git a/modules/javafx.base/src/test/java/test/javafx/binding/BindingsBooleanTest.java b/modules/javafx.base/src/test/java/test/javafx/binding/BindingsBooleanTest.java
index 33e2871c3b0..64db420b627 100644
--- a/modules/javafx.base/src/test/java/test/javafx/binding/BindingsBooleanTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/binding/BindingsBooleanTest.java
@@ -25,7 +25,7 @@
 
 package test.javafx.binding;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 import javafx.beans.InvalidationListener;
 import test.javafx.beans.InvalidationListenerMock;
 import javafx.beans.binding.Bindings;
@@ -35,8 +35,8 @@
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableBooleanValue;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class BindingsBooleanTest {
 
@@ -44,7 +44,7 @@ public class BindingsBooleanTest {
     private BooleanProperty op2;
     private InvalidationListenerMock observer;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         op1 = new SimpleBooleanProperty(true);
         op2 = new SimpleBooleanProperty(false);
@@ -136,16 +136,22 @@ public void testAnd_WeakReference() {
         assertNull(op2.listener);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testAnd_null_x() {
-        Bindings.and(null, op1);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.and(null, op1);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
+
+    @Test
     public void testAnd_x_null() {
-        Bindings.and(op1, null);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.and(op1, null);
+        });
     }
 
+
     @SuppressWarnings("unused")
     @Test
     public void testOr() {
@@ -231,16 +237,22 @@ public void testOr_WeakReference() {
         assertNull(op2.listener);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testOr_null_x() {
-        Bindings.or(null, op1);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.or(null, op1);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
+
+    @Test
     public void testOr_x_null() {
-        Bindings.or(op1, null);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.or(op1, null);
+        });
     }
 
+
     @Test
     public void testNot() {
         final BooleanBinding binding = Bindings.not(op1);
@@ -274,11 +286,14 @@ public void testNot_Efficiency() {
         observer.check(binding, 1);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testNot_null() {
-        Bindings.not(null);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.not(null);
+        });
     }
 
+
     @Test
     public void testEqual() {
         final BooleanBinding binding = Bindings.equal(op1, op2);
@@ -338,16 +353,22 @@ public void testEqual_Self() {
         observer.check(binding, 1);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testEqual_null_x() {
-        Bindings.equal((ObservableBooleanValue)null, op1);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.equal((ObservableBooleanValue)null, op1);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
+
+    @Test
     public void testEqual_x_null() {
-        Bindings.equal(op1, (ObservableBooleanValue)null);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.equal(op1, (ObservableBooleanValue)null);
+        });
     }
 
+
     @Test
     public void testNotEqual() {
         final BooleanBinding binding = Bindings.notEqual(op1, op2);
diff --git a/modules/javafx.base/src/test/java/test/javafx/binding/BindingsIsNullTest.java b/modules/javafx.base/src/test/java/test/javafx/binding/BindingsIsNullTest.java
index aac6f17b909..f5af8eda810 100644
--- a/modules/javafx.base/src/test/java/test/javafx/binding/BindingsIsNullTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/binding/BindingsIsNullTest.java
@@ -25,8 +25,8 @@
 
 package test.javafx.binding;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import test.javafx.beans.InvalidationListenerMock;
 import javafx.beans.binding.Bindings;
@@ -36,8 +36,9 @@
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class BindingsIsNullTest {
 
@@ -45,7 +46,7 @@ public class BindingsIsNullTest {
     private StringProperty os;
     private InvalidationListenerMock observer;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         oo = new SimpleObjectProperty<>();
         os = new SimpleStringProperty();
@@ -136,14 +137,20 @@ public void test_String_IsNotNull() {
         observer.check(binding, 1);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void test_IsNull_NPE() {
-        Bindings.isNull(null);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.isNull(null);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
+
+    @Test
     public void test_IsNotNull_NPE() {
-        Bindings.isNotNull(null);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.isNotNull(null);
+        });
     }
 
+
 }
diff --git a/modules/javafx.base/src/test/java/test/javafx/binding/BindingsListTest.java b/modules/javafx.base/src/test/java/test/javafx/binding/BindingsListTest.java
index 31aa70a7cf1..834c8f5710b 100644
--- a/modules/javafx.base/src/test/java/test/javafx/binding/BindingsListTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/binding/BindingsListTest.java
@@ -33,11 +33,11 @@
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import test.com.sun.javafx.binding.ErrorLoggingUtiltity;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  */
@@ -54,12 +54,12 @@ public class BindingsListTest {
     private ObservableList<Object> list2;
     private IntegerProperty index;
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
         ErrorLoggingUtiltity.reset();
     }
 
-    @Before
+    @BeforeEach
     public void setUp() {
         property = new SimpleListProperty<>();
         list1 = FXCollections.<Object>observableArrayList(data1, data2);
@@ -85,11 +85,14 @@ public void testSize() {
         assertEquals(0, size.get());
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testSize_Null() {
-        Bindings.size((ObservableList<Object>) null);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.size((ObservableList<Object>) null);
+        });
     }
 
+
     @Test
     public void testIsEmpty() {
         final BooleanBinding empty = Bindings.isEmpty(property);
@@ -108,11 +111,14 @@ public void testIsEmpty() {
         assertTrue(empty.get());
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testIsEmpty_Null() {
-        Bindings.isEmpty((ObservableList<Object>) null);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.isEmpty((ObservableList<Object>) null);
+        });
     }
 
+
     @Test
     public void testIsNotEmpty() {
         final BooleanBinding notEmpty = Bindings.isNotEmpty(property);
@@ -131,11 +137,14 @@ public void testIsNotEmpty() {
         assertFalse(notEmpty.get());
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testIsNotEmpty_Null() {
-        Bindings.isNotEmpty((ObservableList<Object>) null);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.isNotEmpty((ObservableList<Object>) null);
+        });
     }
 
+
     @Test
     public void testValueAt_Constant() {
         final ObjectBinding<Object> binding0 = Bindings.valueAt(property, 0);
@@ -187,16 +196,22 @@ public void testValueAt_Constant() {
         ErrorLoggingUtiltity.checkFine(IndexOutOfBoundsException.class);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testValueAt_Constant_Null() {
-        Bindings.valueAt(null, 0);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.valueAt(null, 0);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+
+    @Test
     public void testValueAt_Constant_NegativeIndex() {
-        Bindings.valueAt(property, -1);
+        assertThrows(IllegalArgumentException.class, () -> {
+            Bindings.valueAt(property, -1);
+        });
     }
 
+
     @Test
     public void testValueAt_Variable() {
         final ObjectBinding<Object> binding = Bindings.valueAt(property, index);
@@ -260,16 +275,22 @@ public void testValueAt_Variable() {
         ErrorLoggingUtiltity.checkFine(IndexOutOfBoundsException.class);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testValueAt_Variable_Null() {
-        Bindings.valueAt((ObservableList<Object>)null, index);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.valueAt((ObservableList<Object>)null, index);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+
+    @Test
     public void testValueAt_Variable_NullIndex() {
-        Bindings.valueAt(property, null);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.valueAt(property, null);
+        });
     }
 
+
     @Test
     public void testBooleanValueAt_Constant() {
         final boolean defaultData = false;
@@ -328,17 +349,23 @@ public void testBooleanValueAt_Constant() {
         ErrorLoggingUtiltity.checkFine(IndexOutOfBoundsException.class);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testBooleanValueAt_Constant_Null() {
-        Bindings.booleanValueAt(null, 0);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.booleanValueAt(null, 0);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+
+    @Test
     public void testBooleanValueAt_Constant_NegativeIndex() {
-        final ListProperty<Boolean> localProperty = new SimpleListProperty<>();
-        Bindings.booleanValueAt(localProperty, -1);
+        assertThrows(IllegalArgumentException.class, () -> {
+            final ListProperty<Boolean> localProperty = new SimpleListProperty<>();
+            Bindings.booleanValueAt(localProperty, -1);
+        });
     }
 
+
     @Test
     public void testBooleanValueAt_Variable() {
         final boolean defaultData = false;
@@ -420,17 +447,23 @@ public void testBooleanValueAt_Variable() {
         ErrorLoggingUtiltity.checkFine(IndexOutOfBoundsException.class);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testBooleanValueAt_Variable_Null() {
-        Bindings.booleanValueAt((ObservableList<Boolean>)null, index);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.booleanValueAt((ObservableList<Boolean>)null, index);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+
+    @Test
     public void testBooleanValueAt_Variable_NullIndex() {
-        final ListProperty<Boolean> localProperty = new SimpleListProperty<>();
-        Bindings.booleanValueAt(localProperty, null);
+        assertThrows(NullPointerException.class, () -> {
+            final ListProperty<Boolean> localProperty = new SimpleListProperty<>();
+            Bindings.booleanValueAt(localProperty, null);
+        });
     }
 
+
     @Test
     public void testDoubleValueAt_Constant() {
         final double defaultData = 0.0;
@@ -489,17 +522,23 @@ public void testDoubleValueAt_Constant() {
         ErrorLoggingUtiltity.checkFine(IndexOutOfBoundsException.class);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testDoubleValueAt_Constant_Null() {
-        Bindings.doubleValueAt(null, 0);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.doubleValueAt(null, 0);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+
+    @Test
     public void testDoubleValueAt_Constant_NegativeIndex() {
-        final ListProperty<Double> localProperty = new SimpleListProperty<>();
-        Bindings.doubleValueAt(localProperty, -1);
+        assertThrows(IllegalArgumentException.class, () -> {
+            final ListProperty<Double> localProperty = new SimpleListProperty<>();
+            Bindings.doubleValueAt(localProperty, -1);
+        });
     }
 
+
     @Test
     public void testDoubleValueAt_Variable() {
         final double defaultData = 0.0;
@@ -581,17 +620,23 @@ public void testDoubleValueAt_Variable() {
         ErrorLoggingUtiltity.checkFine(IndexOutOfBoundsException.class);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testDoubleValueAt_Variable_Null() {
-        Bindings.doubleValueAt((ObservableList<Double>)null, index);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.doubleValueAt((ObservableList<Double>)null, index);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+
+    @Test
     public void testDoubleValueAt_Variable_NullIndex() {
-        final ListProperty<Double> localProperty = new SimpleListProperty<>();
-        Bindings.doubleValueAt(localProperty, null);
+        assertThrows(NullPointerException.class, () -> {
+            final ListProperty<Double> localProperty = new SimpleListProperty<>();
+            Bindings.doubleValueAt(localProperty, null);
+        });
     }
 
+
     @Test
     public void testFloatValueAt_Constant() {
         final float defaultData = 0.0f;
@@ -650,17 +695,23 @@ public void testFloatValueAt_Constant() {
         ErrorLoggingUtiltity.checkFine(IndexOutOfBoundsException.class);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testFloatValueAt_Constant_Null() {
-        Bindings.floatValueAt((ObservableList) null, 0);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.floatValueAt((ObservableList) null, 0);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+
+    @Test
     public void testFloatValueAt_Constant_NegativeIndex() {
-        final ListProperty<Float> localProperty = new SimpleListProperty<>();
-        Bindings.floatValueAt(localProperty, -1);
+        assertThrows(IllegalArgumentException.class, () -> {
+            final ListProperty<Float> localProperty = new SimpleListProperty<>();
+            Bindings.floatValueAt(localProperty, -1);
+        });
     }
 
+
     @Test
     public void testFloatValueAt_Variable() {
         final float defaultData = 0.0f;
@@ -742,17 +793,23 @@ public void testFloatValueAt_Variable() {
         ErrorLoggingUtiltity.checkFine(IndexOutOfBoundsException.class);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testFloatValueAt_Variable_Null() {
-        Bindings.floatValueAt((ObservableList<Float>)null, index);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.floatValueAt((ObservableList<Float>)null, index);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+
+    @Test
     public void testFloatValueAt_Variable_NullIndex() {
-        final ListProperty<Float> localProperty = new SimpleListProperty<>();
-        Bindings.floatValueAt(localProperty, null);
+        assertThrows(NullPointerException.class, () -> {
+            final ListProperty<Float> localProperty = new SimpleListProperty<>();
+            Bindings.floatValueAt(localProperty, null);
+        });
     }
 
+
     @Test
     public void testIntegerValueAt_Constant() {
         final int defaultData = 0;
@@ -811,17 +868,23 @@ public void testIntegerValueAt_Constant() {
         ErrorLoggingUtiltity.checkFine(IndexOutOfBoundsException.class);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testIntegerValueAt_Constant_Null() {
-        Bindings.integerValueAt((ObservableList) null, 0);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.integerValueAt((ObservableList) null, 0);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+
+    @Test
     public void testIntegerValueAt_Constant_NegativeIndex() {
-        final ListProperty<Integer> localProperty = new SimpleListProperty<>();
-        Bindings.integerValueAt(localProperty, -1);
+        assertThrows(IllegalArgumentException.class, () -> {
+            final ListProperty<Integer> localProperty = new SimpleListProperty<>();
+            Bindings.integerValueAt(localProperty, -1);
+        });
     }
 
+
     @Test
     public void testIntegerValueAt_Variable() {
         final int defaultData = 0;
@@ -903,17 +966,23 @@ public void testIntegerValueAt_Variable() {
         ErrorLoggingUtiltity.checkFine(IndexOutOfBoundsException.class);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testIntegerValueAt_Variable_Null() {
-        Bindings.integerValueAt((ObservableList<Integer>)null, index);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.integerValueAt((ObservableList<Integer>)null, index);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+
+    @Test
     public void testIntegerValueAt_Variable_NullIndex() {
-        final ListProperty<Integer> localProperty = new SimpleListProperty<>();
-        Bindings.integerValueAt(localProperty, null);
+        assertThrows(NullPointerException.class, () -> {
+            final ListProperty<Integer> localProperty = new SimpleListProperty<>();
+            Bindings.integerValueAt(localProperty, null);
+        });
     }
 
+
     @Test
     public void testLongValueAt_Constant() {
         final long defaultData = 0L;
@@ -972,17 +1041,23 @@ public void testLongValueAt_Constant() {
         ErrorLoggingUtiltity.checkFine(IndexOutOfBoundsException.class);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testLongValueAt_Constant_Null() {
-        Bindings.longValueAt(null, 0);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.longValueAt(null, 0);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+
+    @Test
     public void testLongValueAt_Constant_NegativeIndex() {
-        final ListProperty<Long> localProperty = new SimpleListProperty<>();
-        Bindings.longValueAt(localProperty, -1);
+        assertThrows(IllegalArgumentException.class, () -> {
+            final ListProperty<Long> localProperty = new SimpleListProperty<>();
+            Bindings.longValueAt(localProperty, -1);
+        });
     }
 
+
     @Test
     public void testLongValueAt_Variable() {
         final long defaultData = 0;
@@ -1064,17 +1139,23 @@ public void testLongValueAt_Variable() {
         ErrorLoggingUtiltity.checkFine(IndexOutOfBoundsException.class);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testLongValueAt_Variable_Null() {
-        Bindings.longValueAt((ObservableList<Long>)null, index);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.longValueAt((ObservableList<Long>)null, index);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+
+    @Test
     public void testLongValueAt_Variable_NullIndex() {
-        final ListProperty<Long> localProperty = new SimpleListProperty<>();
-        Bindings.longValueAt(localProperty, null);
+        assertThrows(NullPointerException.class, () -> {
+            final ListProperty<Long> localProperty = new SimpleListProperty<>();
+            Bindings.longValueAt(localProperty, null);
+        });
     }
 
+
     @Test
     public void testStringValueAt_Constant() {
         final String defaultData = null;
@@ -1133,17 +1214,23 @@ public void testStringValueAt_Constant() {
         ErrorLoggingUtiltity.checkFine(IndexOutOfBoundsException.class);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testStringValueAt_Constant_Null() {
-        Bindings.stringValueAt(null, 0);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.stringValueAt(null, 0);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+
+    @Test
     public void testStringValueAt_Constant_NegativeIndex() {
-        final ListProperty<String> localProperty = new SimpleListProperty<>();
-        Bindings.stringValueAt(localProperty, -1);
+        assertThrows(IllegalArgumentException.class, () -> {
+            final ListProperty<String> localProperty = new SimpleListProperty<>();
+            Bindings.stringValueAt(localProperty, -1);
+        });
     }
 
+
     @Test
     public void testStringValueAt_Variable() {
         final String defaultData = null;
@@ -1214,16 +1301,19 @@ public void testStringValueAt_Variable() {
         ErrorLoggingUtiltity.checkFine(IndexOutOfBoundsException.class);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testStringValueAt_Variable_Null() {
-        Bindings.stringValueAt((ObservableList<String>)null, index);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.stringValueAt((ObservableList<String>)null, index);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+
+    @Test
     public void testStringValueAt_Variable_NullIndex() {
-        final ListProperty<String> localProperty = new SimpleListProperty<>();
-        Bindings.stringValueAt(localProperty, null);
+        assertThrows(NullPointerException.class, () -> {
+            final ListProperty<String> localProperty = new SimpleListProperty<>();
+            Bindings.stringValueAt(localProperty, null);
+        });
     }
-
-
 }
diff --git a/modules/javafx.base/src/test/java/test/javafx/binding/BindingsMapTest.java b/modules/javafx.base/src/test/java/test/javafx/binding/BindingsMapTest.java
index e9ca746eacd..df2f65d126d 100644
--- a/modules/javafx.base/src/test/java/test/javafx/binding/BindingsMapTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/binding/BindingsMapTest.java
@@ -34,11 +34,11 @@
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableMap;
 import test.com.sun.javafx.binding.ErrorLoggingUtiltity;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class BindingsMapTest {
 
@@ -56,12 +56,12 @@ public class BindingsMapTest {
     private ObservableMap<String, Object> map2;
     private StringProperty index;
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
         ErrorLoggingUtiltity.reset();
     }
 
-    @Before
+    @BeforeEach
     public void setUp() {
         property = new SimpleMapProperty<>();
         map1 = FXCollections.observableHashMap();
@@ -90,11 +90,14 @@ public void testSize() {
         assertEquals(0, size.get());
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testSize_Null() {
-        Bindings.size((ObservableMap<String, Object>) null);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.size((ObservableMap<String, Object>) null);
+        });
     }
 
+
     @Test
     public void testIsEmpty() {
         final BooleanBinding empty = Bindings.isEmpty(property);
@@ -114,11 +117,14 @@ public void testIsEmpty() {
         assertTrue(empty.get());
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testIsEmpty_Null() {
-        Bindings.isEmpty((ObservableMap<String, Object>) null);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.isEmpty((ObservableMap<String, Object>) null);
+        });
     }
 
+
     @Test
     public void testIsNotEmpty() {
         final BooleanBinding notEmpty = Bindings.isNotEmpty(property);
@@ -138,11 +144,14 @@ public void testIsNotEmpty() {
         assertFalse(notEmpty.get());
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testIsNotEmpty_Null() {
-        Bindings.isNotEmpty((ObservableMap<String, Object>) null);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.isNotEmpty((ObservableMap<String, Object>) null);
+        });
     }
 
+
     @Test
     public void testValueAt_Constant() {
         final ObjectBinding<Object> binding0 = Bindings.valueAt(property, key1);
@@ -182,11 +191,14 @@ public void testValueAt_Constant() {
         assertNull(binding2.get());
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testValueAt_Constant_Null() {
-        Bindings.valueAt(null, key1);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.valueAt(null, key1);
+        });
     }
 
+
     @Test
     public void testValueAt_Variable() {
         final ObjectBinding<Object> binding = Bindings.valueAt(property, index);
@@ -239,16 +251,22 @@ public void testValueAt_Variable() {
         assertNull(binding.get());
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testValueAt_Variable_Null() {
-        Bindings.valueAt((ObservableMap<String, Object>)null, index);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.valueAt((ObservableMap<String, Object>)null, index);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+
+    @Test
     public void testValueAt_Variable_Null_2() {
-        Bindings.valueAt(property, (ObservableValue<String>)null);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.valueAt(property, (ObservableValue<String>)null);
+        });
     }
 
+
     @Test
     public void testBooleanValueAt_Constant() {
         final boolean defaultData = false;
@@ -310,11 +328,14 @@ public void testBooleanValueAt_Constant() {
         ErrorLoggingUtiltity.checkFine(NullPointerException.class);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testBooleanValueAt_Constant_Null() {
-        Bindings.booleanValueAt(null, key1);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.booleanValueAt(null, key1);
+        });
     }
 
+
     @Test
     public void testBooleanValueAt_Variable() {
         final boolean defaultData = false;
@@ -388,17 +409,23 @@ public void testBooleanValueAt_Variable() {
         ErrorLoggingUtiltity.checkFine(NullPointerException.class);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testBooleanValueAt_Variable_Null() {
-        Bindings.booleanValueAt((ObservableMap<String, Boolean>)null, index);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.booleanValueAt((ObservableMap<String, Boolean>)null, index);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+
+    @Test
     public void testBooleanValueAt_Variable_Null_2() {
-        final MapProperty<String, Boolean> localProperty = new SimpleMapProperty<>();
-        Bindings.booleanValueAt(localProperty, (ObservableValue<String>)null);
+        assertThrows(NullPointerException.class, () -> {
+            final MapProperty<String, Boolean> localProperty = new SimpleMapProperty<>();
+            Bindings.booleanValueAt(localProperty, (ObservableValue<String>)null);
+        });
     }
 
+
     @Test
     public void testDoubleValueAt_Constant() {
         final double defaultData = 0.0;
@@ -460,11 +487,14 @@ public void testDoubleValueAt_Constant() {
         ErrorLoggingUtiltity.checkFine(NullPointerException.class);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testDoubleValueAt_Constant_Null() {
-        Bindings.doubleValueAt(null, key1);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.doubleValueAt(null, key1);
+        });
     }
 
+
     @Test
     public void testDoubleValueAt_Variable() {
         final double defaultData = 0.0;
@@ -538,17 +568,23 @@ public void testDoubleValueAt_Variable() {
         ErrorLoggingUtiltity.checkFine(NullPointerException.class);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testDoubleValueAt_Variable_Null_1() {
-        Bindings.doubleValueAt((ObservableMap<String, Double>)null, index);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.doubleValueAt((ObservableMap<String, Double>)null, index);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+
+    @Test
     public void testDoubleValueAt_Variable_Null_2() {
-        final MapProperty<String, Double> localProperty = new SimpleMapProperty<>();
-        Bindings.doubleValueAt(localProperty, (ObservableValue<String>)null);
+        assertThrows(NullPointerException.class, () -> {
+            final MapProperty<String, Double> localProperty = new SimpleMapProperty<>();
+            Bindings.doubleValueAt(localProperty, (ObservableValue<String>)null);
+        });
     }
 
+
     @Test
     public void testFloatValueAt_Constant() {
         final float defaultData = 0.0f;
@@ -610,11 +646,14 @@ public void testFloatValueAt_Constant() {
         ErrorLoggingUtiltity.checkFine(NullPointerException.class);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testFloatValueAt_Constant_Null() {
-        Bindings.floatValueAt(null, key1);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.floatValueAt(null, key1);
+        });
     }
 
+
     @Test
     public void testFloatValueAt_Variable() {
         final float defaultData = 0.0f;
@@ -688,17 +727,23 @@ public void testFloatValueAt_Variable() {
         ErrorLoggingUtiltity.checkFine(NullPointerException.class);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testFloatValueAt_Variable_Null_1() {
-        Bindings.floatValueAt((ObservableMap<String, Float>)null, index);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.floatValueAt((ObservableMap<String, Float>)null, index);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+
+    @Test
     public void testFloatValueAt_Variable_Null_2() {
-        final MapProperty<String, Float> localProperty = new SimpleMapProperty<>();
-        Bindings.floatValueAt(localProperty, (ObservableValue<String>)null);
+        assertThrows(NullPointerException.class, () -> {
+            final MapProperty<String, Float> localProperty = new SimpleMapProperty<>();
+            Bindings.floatValueAt(localProperty, (ObservableValue<String>)null);
+        });
     }
 
+
     @Test
     public void testIntegerValueAt_Constant() {
         final int defaultData = 0;
@@ -760,11 +805,14 @@ public void testIntegerValueAt_Constant() {
         ErrorLoggingUtiltity.checkFine(NullPointerException.class);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testIntegerValueAt_Constant_Null() {
-        Bindings.integerValueAt(null, key1);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.integerValueAt(null, key1);
+        });
     }
 
+
     @Test
     public void testIntegerValueAt_Variable() {
         final int defaultData = 0;
@@ -838,17 +886,23 @@ public void testIntegerValueAt_Variable() {
         ErrorLoggingUtiltity.checkFine(NullPointerException.class);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testIntegerValueAt_Variable_Null_1() {
-        Bindings.integerValueAt((ObservableMap<String, Integer>)null, index);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.integerValueAt((ObservableMap<String, Integer>)null, index);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+
+    @Test
     public void testIntegerValueAt_Variable_Null_2() {
-        final MapProperty<String, Integer> localProperty = new SimpleMapProperty<>();
-        Bindings.integerValueAt(localProperty, (ObservableValue<String>)null);
+        assertThrows(NullPointerException.class, () -> {
+            final MapProperty<String, Integer> localProperty = new SimpleMapProperty<>();
+            Bindings.integerValueAt(localProperty, (ObservableValue<String>)null);
+        });
     }
 
+
     @Test
     public void testLongValueAt_Constant() {
         final long defaultData = 0L;
@@ -910,11 +964,14 @@ public void testLongValueAt_Constant() {
         ErrorLoggingUtiltity.checkFine(NullPointerException.class);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testLongValueAt_Constant_Null() {
-        Bindings.longValueAt(null, key1);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.longValueAt(null, key1);
+        });
     }
 
+
     @Test
     public void testLongValueAt_Variable() {
         final long defaultData = 0;
@@ -988,17 +1045,23 @@ public void testLongValueAt_Variable() {
         ErrorLoggingUtiltity.checkFine(NullPointerException.class);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testLongValueAt_Variable_Null() {
-        Bindings.longValueAt((ObservableMap<String, Long>)null, index);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.longValueAt((ObservableMap<String, Long>)null, index);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+
+    @Test
     public void testLongValueAt_Variable_Null_2() {
-        final MapProperty<String, Long> localProperty = new SimpleMapProperty<>();
-        Bindings.longValueAt(localProperty, (ObservableValue<String>)null);
+        assertThrows(NullPointerException.class, () -> {
+            final MapProperty<String, Long> localProperty = new SimpleMapProperty<>();
+            Bindings.longValueAt(localProperty, (ObservableValue<String>)null);
+        });
     }
 
+
     @Test
     public void testStringValueAt_Constant() {
         final String defaultData = null;
@@ -1047,11 +1110,14 @@ public void testStringValueAt_Constant() {
         assertEquals(defaultData, binding2.get());
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testStringValueAt_Constant_Null() {
-        Bindings.stringValueAt(null, key1);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.stringValueAt(null, key1);
+        });
     }
 
+
     @Test
     public void testStringValueAt_Variable() {
         final String defaultData = null;
@@ -1113,16 +1179,19 @@ public void testStringValueAt_Variable() {
         assertEquals(defaultData, binding.get());
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testStringValueAt_Variable_Null() {
-        Bindings.stringValueAt((ObservableMap<String, String>)null, index);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.stringValueAt((ObservableMap<String, String>)null, index);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+
+    @Test
     public void testStringValueAt_Variable_Null_2() {
-        final MapProperty<String, String> localProperty = new SimpleMapProperty<>();
-        Bindings.stringValueAt(localProperty, (ObservableValue<String>)null);
+        assertThrows(NullPointerException.class, () -> {
+            final MapProperty<String, String> localProperty = new SimpleMapProperty<>();
+            Bindings.stringValueAt(localProperty, (ObservableValue<String>)null);
+        });
     }
-
-
 }
diff --git a/modules/javafx.base/src/test/java/test/javafx/binding/BindingsSetTest.java b/modules/javafx.base/src/test/java/test/javafx/binding/BindingsSetTest.java
index 023e3364b1d..926f248f26d 100644
--- a/modules/javafx.base/src/test/java/test/javafx/binding/BindingsSetTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/binding/BindingsSetTest.java
@@ -30,10 +30,10 @@
 import javafx.beans.property.SimpleSetProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableSet;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class BindingsSetTest {
 
@@ -44,7 +44,7 @@ public class BindingsSetTest {
     private ObservableSet<Object> set1;
     private ObservableSet<Object> set2;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         property = new SimpleSetProperty<>();
         set1 = FXCollections.observableSet(data1, data2);
@@ -70,11 +70,14 @@ public void testSize() {
         assertEquals(0, size.get());
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testSize_Null() {
-        Bindings.size((ObservableSet<Object>) null);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.size((ObservableSet<Object>) null);
+        });
     }
 
+
     @Test
     public void testIsEmpty() {
         final BooleanBinding empty = Bindings.isEmpty(property);
@@ -94,11 +97,14 @@ public void testIsEmpty() {
         assertTrue(empty.get());
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testIsEmpty_Null() {
-        Bindings.isEmpty((ObservableSet<Object>) null);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.isEmpty((ObservableSet<Object>) null);
+        });
     }
 
+
     @Test
     public void testIsNotEmpty() {
         final BooleanBinding notEmpty = Bindings.isNotEmpty(property);
@@ -118,8 +124,11 @@ public void testIsNotEmpty() {
         assertFalse(notEmpty.get());
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testIsNotEmpty_Null() {
-        Bindings.isNotEmpty((ObservableSet<Object>) null);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.isNotEmpty((ObservableSet<Object>) null);
+        });
     }
+
 }
diff --git a/modules/javafx.base/src/test/java/test/javafx/binding/DependencyUtils.java b/modules/javafx.base/src/test/java/test/javafx/binding/DependencyUtils.java
index 70545c6c742..65645d72750 100644
--- a/modules/javafx.base/src/test/java/test/javafx/binding/DependencyUtils.java
+++ b/modules/javafx.base/src/test/java/test/javafx/binding/DependencyUtils.java
@@ -30,7 +30,7 @@
 import javafx.beans.binding.Binding;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class DependencyUtils {
 
diff --git a/modules/javafx.base/src/test/java/test/javafx/binding/ListBindingTest.java b/modules/javafx.base/src/test/java/test/javafx/binding/ListBindingTest.java
index 1a0ee835f35..286ab7b8c2b 100644
--- a/modules/javafx.base/src/test/java/test/javafx/binding/ListBindingTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/binding/ListBindingTest.java
@@ -35,13 +35,13 @@
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
 
-import static org.junit.Assert.*;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  */
@@ -60,7 +60,7 @@ public class ListBindingTest {
 
     private ListChangeListenerMock listener;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         dependency1 = new ObservableStub();
         dependency2 = new ObservableStub();
diff --git a/modules/javafx.base/src/test/java/test/javafx/binding/MapBindingTest.java b/modules/javafx.base/src/test/java/test/javafx/binding/MapBindingTest.java
index 6e8dadfe9ef..9e28bd02592 100644
--- a/modules/javafx.base/src/test/java/test/javafx/binding/MapBindingTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/binding/MapBindingTest.java
@@ -36,15 +36,15 @@
 import test.javafx.collections.MockMapObserver;
 import javafx.collections.ObservableList;
 import javafx.collections.ObservableMap;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
 import static test.javafx.collections.MockMapObserver.Call;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  */
@@ -70,7 +70,7 @@ public class MapBindingTest {
 
     private MockMapObserver<Object, Object> listener;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         dependency1 = new ObservableStub();
         dependency2 = new ObservableStub();
diff --git a/modules/javafx.base/src/test/java/test/javafx/binding/SetBindingTest.java b/modules/javafx.base/src/test/java/test/javafx/binding/SetBindingTest.java
index 32ab3444e32..269194a439b 100644
--- a/modules/javafx.base/src/test/java/test/javafx/binding/SetBindingTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/binding/SetBindingTest.java
@@ -36,11 +36,11 @@
 import test.javafx.collections.MockSetObserver;
 import javafx.collections.ObservableList;
 import javafx.collections.ObservableSet;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import static test.javafx.collections.MockSetObserver.Call;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  */
@@ -63,7 +63,7 @@ public class SetBindingTest {
 
     private MockSetObserver<Object> listener;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         dependency1 = new ObservableStub();
         dependency2 = new ObservableStub();
diff --git a/modules/javafx.base/src/test/java/test/javafx/binding/WhenTestBase.java b/modules/javafx.base/src/test/java/test/javafx/binding/WhenTestBase.java
index eca6e23ea3e..f065cee4282 100644
--- a/modules/javafx.base/src/test/java/test/javafx/binding/WhenTestBase.java
+++ b/modules/javafx.base/src/test/java/test/javafx/binding/WhenTestBase.java
@@ -33,8 +33,9 @@
 import javafx.beans.value.ObservableValue;
 import javafx.beans.value.WritableValue;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public abstract class WhenTestBase<T, P extends WritableValue<T> & ObservableValue<T>> {
 
@@ -70,7 +71,7 @@ public WhenTestBase(T v0, T v1, T v2, T v3, P p0, P... properties) {
         this.properties = properties;
     }
 
-    @Before
+    @BeforeEach
     public void setUp() {
         cond.set(false);
         p0.setValue(v0);
@@ -186,28 +187,43 @@ public void test_primitive_primitive() {
         }
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void test_Null() {
-        Bindings.when(null);
+        assertThrows(NullPointerException.class, () -> {
+            Bindings.when(null);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
+
+    @Test
     public void test_Null_expression() {
-        generatePropertyProperty(null, p0);
+        assertThrows(NullPointerException.class, () -> {
+            generatePropertyProperty(null, p0);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
+
+    @Test
     public void test_expression_Null() {
-        generatePropertyProperty(p0, null);
+        assertThrows(NullPointerException.class, () -> {
+            generatePropertyProperty(p0, null);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
+
+    @Test
     public void test_Null_primitive() {
-        generatePropertyPrimitive(null, v1);
+        assertThrows(NullPointerException.class, () -> {
+            generatePropertyPrimitive(null, v1);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
+
+    @Test
     public void test_primitive_Null() {
-        generatePrimitiveProperty(v0, null);
+        assertThrows(NullPointerException.class, () -> {
+            generatePrimitiveProperty(v0, null);
+        });
     }
+
 }
diff --git a/modules/javafx.base/src/test/java/test/javafx/binding/expression/AbstractNumberExpressionTest.java b/modules/javafx.base/src/test/java/test/javafx/binding/expression/AbstractNumberExpressionTest.java
index c59126b4dae..f9a12ea58e3 100644
--- a/modules/javafx.base/src/test/java/test/javafx/binding/expression/AbstractNumberExpressionTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/binding/expression/AbstractNumberExpressionTest.java
@@ -25,8 +25,8 @@
 
 package test.javafx.binding.expression;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Locale;
 
@@ -52,9 +52,10 @@
 import test.javafx.binding.DependencyUtils;
 import javafx.collections.FXCollections;
 
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class AbstractNumberExpressionTest {
 
@@ -71,7 +72,7 @@ public class AbstractNumberExpressionTest {
     private short short1;
     private byte byte1;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         data1 = 90224.8923;
         data2 = -13;
@@ -417,23 +418,27 @@ public void testFactory() {
         assertEquals(0, exp.intValue());
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testFactory_Null() {
-        NumberExpressionBase.numberExpression(null);
+        assertThrows(NullPointerException.class, () -> {
+            NumberExpressionBase.numberExpression(null);
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testFactory_UnknownClass() {
-        NumberExpressionBase.numberExpression(new ObservableNumberValue() {
-            @Override public void addListener(InvalidationListener observer) {}
-            @Override public void addListener(ChangeListener observer) {}
-            @Override public void removeListener(InvalidationListener observer) {}
-            @Override public void removeListener(ChangeListener observer) {}
-            @Override public Number getValue() {return null;}
-            @Override public int intValue() {return 0;}
-            @Override public long longValue() {return 0L;}
-            @Override public float floatValue() {return 0.0f;}
-            @Override public double doubleValue() {return 0.0;}
+        assertThrows(IllegalArgumentException.class, () -> {
+            NumberExpressionBase.numberExpression(new ObservableNumberValue() {
+                @Override public void addListener(InvalidationListener observer) {}
+                @Override public void addListener(ChangeListener observer) {}
+                @Override public void removeListener(InvalidationListener observer) {}
+                @Override public void removeListener(ChangeListener observer) {}
+                @Override public Number getValue() {return null;}
+                @Override public int intValue() {return 0;}
+                @Override public long longValue() {return 0L;}
+                @Override public float floatValue() {return 0.0f;}
+                @Override public double doubleValue() {return 0.0;}
+            });
         });
     }
 
@@ -447,7 +452,7 @@ public void testAsString() {
         assertEquals("42", s.get());
     }
 
-    @Ignore("RT-33413")
+    @Disabled("RT-33413")
     @Test
     public void testAsString_Format() {
         final Locale defaultLocale = Locale.getDefault();
@@ -472,7 +477,7 @@ public void testAsString_Format() {
         }
     }
 
-    @Ignore("RT-33413")
+    @Disabled("RT-33413")
     @Test
     public void testAsString_LocaleFormat() {
         // checking German default
diff --git a/modules/javafx.base/src/test/java/test/javafx/binding/expression/BooleanExpressionTest.java b/modules/javafx.base/src/test/java/test/javafx/binding/expression/BooleanExpressionTest.java
index 8a39f84135c..e1ee60f421c 100644
--- a/modules/javafx.base/src/test/java/test/javafx/binding/expression/BooleanExpressionTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/binding/expression/BooleanExpressionTest.java
@@ -25,8 +25,9 @@
 
 package test.javafx.binding.expression;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.binding.BooleanExpression;
 import javafx.beans.binding.ObjectExpression;
@@ -39,15 +40,15 @@
 import test.javafx.binding.DependencyUtils;
 import javafx.collections.FXCollections;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class BooleanExpressionTest {
 
     private BooleanProperty op1;
     private BooleanProperty op2;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         op1 = new SimpleBooleanProperty(true);
         op2 = new SimpleBooleanProperty(false);
@@ -195,8 +196,10 @@ public void testObjectToBoolean() {
         assertEquals(op1, BooleanExpression.booleanExpression((ObservableValue)op1));
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testFactory_Null() {
-        BooleanExpression.booleanExpression(null);
+        assertThrows(NullPointerException.class, () -> {
+            BooleanExpression.booleanExpression(null);
+        });
     }
 }
diff --git a/modules/javafx.base/src/test/java/test/javafx/binding/expression/DoubleExpressionTest.java b/modules/javafx.base/src/test/java/test/javafx/binding/expression/DoubleExpressionTest.java
index 40d9f38b03f..ebfdc75a771 100644
--- a/modules/javafx.base/src/test/java/test/javafx/binding/expression/DoubleExpressionTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/binding/expression/DoubleExpressionTest.java
@@ -25,7 +25,7 @@
 
 package test.javafx.binding.expression;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.beans.binding.DoubleBinding;
 import javafx.beans.binding.DoubleExpression;
 import javafx.beans.binding.ObjectExpression;
@@ -35,10 +35,11 @@
 import javafx.beans.value.ObservableValue;
 import javafx.beans.value.ObservableValueStub;
 import javafx.collections.FXCollections;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class DoubleExpressionTest {
 
@@ -53,7 +54,7 @@ public class DoubleExpressionTest {
     private short short1;
     private byte byte1;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         data = -67.0975;
         op1 = new SimpleDoubleProperty(data);
@@ -211,8 +212,10 @@ public void testObjectToDouble() {
         assertEquals(op1, DoubleExpression.doubleExpression((ObservableValue)op1));
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testFactory_Null() {
-        DoubleExpression.doubleExpression(null);
+        assertThrows(NullPointerException.class, () -> {
+            DoubleExpression.doubleExpression(null);
+        });
     }
 }
diff --git a/modules/javafx.base/src/test/java/test/javafx/binding/expression/FloatExpressionTest.java b/modules/javafx.base/src/test/java/test/javafx/binding/expression/FloatExpressionTest.java
index 6ef839f9b12..c6e4e1b76db 100644
--- a/modules/javafx.base/src/test/java/test/javafx/binding/expression/FloatExpressionTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/binding/expression/FloatExpressionTest.java
@@ -25,8 +25,9 @@
 
 package test.javafx.binding.expression;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import javafx.beans.binding.DoubleBinding;
 import javafx.beans.binding.FloatBinding;
 import javafx.beans.binding.FloatExpression;
@@ -38,8 +39,8 @@
 import javafx.beans.value.ObservableValueStub;
 import javafx.collections.FXCollections;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class FloatExpressionTest {
 
@@ -54,7 +55,7 @@ public class FloatExpressionTest {
     private short short1;
     private byte byte1;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         data = 2.1f;
         op1 = new SimpleFloatProperty(data);
@@ -213,8 +214,10 @@ public void testObjectToFloat() {
         assertEquals(op1, FloatExpression.floatExpression((ObservableValue)op1));
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testFactory_Null() {
-        FloatExpression.floatExpression(null);
+        assertThrows(NullPointerException.class, () -> {
+            FloatExpression.floatExpression(null);
+        });
     }
 }
diff --git a/modules/javafx.base/src/test/java/test/javafx/binding/expression/IntegerExpressionTest.java b/modules/javafx.base/src/test/java/test/javafx/binding/expression/IntegerExpressionTest.java
index ade1f2f286b..1b54e9d5703 100644
--- a/modules/javafx.base/src/test/java/test/javafx/binding/expression/IntegerExpressionTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/binding/expression/IntegerExpressionTest.java
@@ -25,8 +25,8 @@
 
 package test.javafx.binding.expression;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.beans.binding.DoubleBinding;
 import javafx.beans.binding.FloatBinding;
 import javafx.beans.binding.IntegerBinding;
@@ -40,8 +40,9 @@
 import javafx.beans.value.ObservableValueStub;
 import javafx.collections.FXCollections;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class IntegerExpressionTest {
 
@@ -56,7 +57,7 @@ public class IntegerExpressionTest {
     private short short1;
     private byte byte1;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         data = 34258;
         op1 = new SimpleIntegerProperty(data);
@@ -214,8 +215,11 @@ public void testObjectToInteger() {
         assertEquals(op1, IntegerExpression.integerExpression((ObservableValue)op1));
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testFactory_Null() {
-        IntegerExpression.integerExpression(null);
+        assertThrows(NullPointerException.class, () -> {
+            IntegerExpression.integerExpression(null);
+        });
     }
+
 }
diff --git a/modules/javafx.base/src/test/java/test/javafx/binding/expression/ListExpressionTest.java b/modules/javafx.base/src/test/java/test/javafx/binding/expression/ListExpressionTest.java
index 9dbadd87d80..c0f9833a6f9 100644
--- a/modules/javafx.base/src/test/java/test/javafx/binding/expression/ListExpressionTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/binding/expression/ListExpressionTest.java
@@ -36,11 +36,11 @@
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import test.com.sun.javafx.binding.ErrorLoggingUtiltity;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class ListExpressionTest {
 
@@ -54,7 +54,7 @@ public class ListExpressionTest {
     private ListProperty<Integer> op1;
     private ListProperty<Integer> op2;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         opNull = new SimpleListProperty<>();
         opEmpty = new SimpleListProperty<>(FXCollections.<Integer>observableArrayList());
@@ -62,7 +62,7 @@ public void setUp() {
         op2 = new SimpleListProperty<>(FXCollections.observableArrayList(data2_0, data2_1));
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
         ErrorLoggingUtiltity.reset();
     }
@@ -92,11 +92,14 @@ public void testValueAt_Constant() {
         ErrorLoggingUtiltity.checkFine(IndexOutOfBoundsException.class);
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testValueAt_Constant_NegativeIndex() {
-        op1.valueAt(-1);
+        assertThrows(IllegalArgumentException.class, () -> {
+            op1.valueAt(-1);
+        });
     }
 
+
     @Test
     public void testValueAt_Variable() {
         final IntegerProperty index = new SimpleIntegerProperty(-1);
diff --git a/modules/javafx.base/src/test/java/test/javafx/binding/expression/LongExpressionTest.java b/modules/javafx.base/src/test/java/test/javafx/binding/expression/LongExpressionTest.java
index d52921c821c..dc2a91bfd34 100644
--- a/modules/javafx.base/src/test/java/test/javafx/binding/expression/LongExpressionTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/binding/expression/LongExpressionTest.java
@@ -25,8 +25,8 @@
 
 package test.javafx.binding.expression;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.beans.binding.DoubleBinding;
 import javafx.beans.binding.FloatBinding;
 import javafx.beans.binding.LongBinding;
@@ -39,8 +39,9 @@
 import javafx.beans.value.ObservableValueStub;
 import javafx.collections.FXCollections;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class LongExpressionTest {
 
@@ -55,7 +56,7 @@ public class LongExpressionTest {
     private short short1;
     private byte byte1;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         data = 34258;
         op1 = new SimpleLongProperty(data);
@@ -213,8 +214,11 @@ public void testObjectToLong() {
         assertEquals(op1, LongExpression.longExpression((ObservableValue)op1));
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testFactory_Null() {
-        LongExpression.longExpression(null);
+        assertThrows(NullPointerException.class, () -> {
+            LongExpression.longExpression(null);
+        });
     }
+
 }
diff --git a/modules/javafx.base/src/test/java/test/javafx/binding/expression/MapExpressionTest.java b/modules/javafx.base/src/test/java/test/javafx/binding/expression/MapExpressionTest.java
index 39b350da0f5..9e798fbf05b 100644
--- a/modules/javafx.base/src/test/java/test/javafx/binding/expression/MapExpressionTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/binding/expression/MapExpressionTest.java
@@ -32,14 +32,14 @@
 import javafx.beans.property.SimpleMapProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableMap;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class MapExpressionTest {
 
@@ -57,7 +57,7 @@ public class MapExpressionTest {
     private MapProperty<Number, Integer> op1;
     private MapProperty<Number, Integer> op2;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         opNull = new SimpleMapProperty<>();
         opEmpty = new SimpleMapProperty<>(FXCollections.observableMap(Collections.<Number, Integer>emptyMap()));
diff --git a/modules/javafx.base/src/test/java/test/javafx/binding/expression/ObjectExpressionTest.java b/modules/javafx.base/src/test/java/test/javafx/binding/expression/ObjectExpressionTest.java
index 7dd0cb147be..521710ea336 100644
--- a/modules/javafx.base/src/test/java/test/javafx/binding/expression/ObjectExpressionTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/binding/expression/ObjectExpressionTest.java
@@ -25,8 +25,8 @@
 
 package test.javafx.binding.expression;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.binding.ObjectBinding;
 import javafx.beans.binding.ObjectExpression;
@@ -36,8 +36,9 @@
 import javafx.beans.value.ObservableObjectValueStub;
 import test.javafx.binding.DependencyUtils;
 import javafx.collections.FXCollections;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class ObjectExpressionTest {
 
@@ -46,7 +47,7 @@ public class ObjectExpressionTest {
     private ObjectProperty<Object> op1;
     private ObjectProperty<Object> op2;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         data1 = new Object();
         data2 = new Object();
@@ -122,12 +123,15 @@ public void testFactory() {
         assertEquals(op1, ObjectExpression.objectExpression(op1));
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testFactory_Null() {
-        ObjectExpression.objectExpression(null);
+        assertThrows(NullPointerException.class, () -> {
+            ObjectExpression.objectExpression(null);
+        });
     }
 
-     @Test
+
+    @Test
     public void testAsString() {
         final StringBinding binding = op1.asString();
         DependencyUtils.checkDependencies(binding.getDependencies(), op1);
diff --git a/modules/javafx.base/src/test/java/test/javafx/binding/expression/SetExpressionTest.java b/modules/javafx.base/src/test/java/test/javafx/binding/expression/SetExpressionTest.java
index e8c4abc1d7d..0c9a9edc90b 100644
--- a/modules/javafx.base/src/test/java/test/javafx/binding/expression/SetExpressionTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/binding/expression/SetExpressionTest.java
@@ -30,13 +30,13 @@
 import javafx.beans.property.SimpleSetProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableSet;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
 import java.util.Iterator;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class SetExpressionTest {
 
@@ -50,7 +50,7 @@ public class SetExpressionTest {
     private SetProperty<Integer> op1;
     private SetProperty<Integer> op2;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         opNull = new SimpleSetProperty<>();
         opEmpty = new SimpleSetProperty<>(FXCollections.<Integer>observableSet());
diff --git a/modules/javafx.base/src/test/java/test/javafx/binding/expression/StringExpressionTest.java b/modules/javafx.base/src/test/java/test/javafx/binding/expression/StringExpressionTest.java
index 44403475475..e7e7039f684 100644
--- a/modules/javafx.base/src/test/java/test/javafx/binding/expression/StringExpressionTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/binding/expression/StringExpressionTest.java
@@ -25,9 +25,9 @@
 
 package test.javafx.binding.expression;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.binding.IntegerBinding;
 import javafx.beans.binding.StringBinding;
@@ -37,8 +37,9 @@
 import javafx.beans.value.ObservableIntegerValueStub;
 import test.javafx.binding.DependencyUtils;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class StringExpressionTest {
 
@@ -48,7 +49,7 @@ public class StringExpressionTest {
     private StringProperty op1;
     private StringProperty op2;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         data1 = "Hello";
         data1_ic = "HeLlO";
@@ -288,9 +289,12 @@ public void testFactory() {
         assertEquals(op1, StringExpression.stringExpression(op1));
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testFactory_Null() {
-        StringExpression.stringExpression(null);
+        assertThrows(NullPointerException.class, () -> {
+            StringExpression.stringExpression(null);
+        });
     }
 
+
 }
diff --git a/modules/javafx.base/src/test/java/test/javafx/collections/FXCollectionsTest.java b/modules/javafx.base/src/test/java/test/javafx/collections/FXCollectionsTest.java
index c355255aa1f..90af192d7ea 100644
--- a/modules/javafx.base/src/test/java/test/javafx/collections/FXCollectionsTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/collections/FXCollectionsTest.java
@@ -26,7 +26,7 @@
 package test.javafx.collections;
 
 import javafx.beans.InvalidationListener;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.*;
 import java.util.function.BiConsumer;
@@ -38,7 +38,7 @@
 import javafx.collections.ObservableMap;
 import javafx.collections.ObservableSet;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class FXCollectionsTest {
 
@@ -88,7 +88,7 @@ public void testCreateObservableArrayListDoesNotModifyOriginalCollection() {
     public void concatTest() {
         ObservableList<String> seq =
                 FXCollections.concat(FXCollections.observableArrayList("foo", "bar"),
-                FXCollections.observableArrayList("foobar"));
+                        FXCollections.observableArrayList("foobar"));
         assertArrayEquals(new String[] {"foo", "bar", "foobar"}, seq.toArray(new String[0]));
         seq = FXCollections.concat();
         assertTrue(seq.isEmpty());
@@ -206,7 +206,7 @@ public void sortTest() {
 
     @Test
     public void sortTest2() {
-    //test sort on bigger elements, so that it is sorted with mergesort and not insert sort
+        //test sort on bigger elements, so that it is sorted with mergesort and not insert sort
         String[] content = new String[] { "q", "w", "e", "r", "t", "y", "u", "i", "o", "p" };
         ObservableList<String> seq = FXCollections.observableArrayList(content);
         final MockListObserver<String> observer = new MockListObserver<>();
@@ -248,13 +248,14 @@ private void doSort(ObservableList<String> seq, boolean permutation) {
         }
     }
 
-    @Test(expected=ClassCastException.class)
+    @Test
     @SuppressWarnings("unchecked")
     public void sortNotComparableTest() {
         ObservableList seq = FXCollections.observableArrayList(new Object(), new Object(), new Object());
-        FXCollections.sort(seq);
+        assertThrows(ClassCastException.class, () -> FXCollections.sort(seq));
     }
 
+
     @Test
     public void emptyObservableListTest() {
         ObservableList<String> seq = FXCollections.<String>emptyObservableList();
diff --git a/modules/javafx.base/src/test/java/test/javafx/collections/ListChangeBuilderTest.java b/modules/javafx.base/src/test/java/test/javafx/collections/ListChangeBuilderTest.java
index 4b91e1b2d39..2301e315d67 100644
--- a/modules/javafx.base/src/test/java/test/javafx/collections/ListChangeBuilderTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/collections/ListChangeBuilderTest.java
@@ -32,9 +32,9 @@
 import javafx.collections.ListChangeBuilderShim;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableListWrapperShim;
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class ListChangeBuilderTest {
 
@@ -43,7 +43,7 @@ public class ListChangeBuilderTest {
     private ArrayList<String> list;
     private MockListObserver<String> observer;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         observer = new MockListObserver<>();
         list = new ArrayList<>(Arrays.asList("a", "b", "c", "d"));
@@ -344,7 +344,7 @@ public void testAddAndPermutation() {
         builder.nextPermutation(0, 3, new int[] { 2, 0, 1}); // new order is "b", "c", "a", "d"
 
         builder.endChange();
-         // "c", "a", "d" before "b" was added
+        // "c", "a", "d" before "b" was added
         observer.checkPermutation(0, observableList, 0, 3, new int[] {1, 0, 2});
 
         observer.checkAddRemove(1, observableList, Collections.EMPTY_LIST, 0, 1);
@@ -429,36 +429,54 @@ public void testPermutationAddRemoveAndPermutation() {
         observer.checkAddRemove(1, observableList, removed, 0, 2);
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test
     public void testNextAddWithoutBegin() {
-        builder.nextAdd(0, 1);
+        assertThrows(IllegalStateException.class, () -> {
+            builder.nextAdd(0, 1);
+        });
     }
 
-    @Test(expected=IllegalStateException.class)
+
+    @Test
     public void testNextRemoveWithoutBegin() {
-        builder.nextRemove(0, (String)null);
+        assertThrows(IllegalStateException.class, () -> {
+            builder.nextRemove(0, (String)null);
+        });
     }
 
-    @Test(expected=IllegalStateException.class)
+
+    @Test
     public void testNextRemove2WithoutBegin() {
-        builder.nextRemove(0, Collections.EMPTY_LIST);
+        assertThrows(IllegalStateException.class, () -> {
+            builder.nextRemove(0, Collections.EMPTY_LIST);
+        });
     }
 
-    @Test(expected=IllegalStateException.class)
+
+    @Test
     public void testNextUpdateWithoutBegin() {
-        builder.nextUpdate(0);
+        assertThrows(IllegalStateException.class, () -> {
+            builder.nextUpdate(0);
+        });
     }
 
-    @Test(expected=IllegalStateException.class)
+
+    @Test
     public void testNextSetWithoutBegin() {
-        builder.nextSet(0, null);
+        assertThrows(IllegalStateException.class, () -> {
+            builder.nextSet(0, null);
+        });
     }
 
-    @Test(expected=IllegalStateException.class)
+
+    @Test
     public void testNextReplaceWithoutBegin() {
-        builder.nextReplace(0, 1, Collections.EMPTY_LIST);
+        assertThrows(IllegalStateException.class, () -> {
+            builder.nextReplace(0, 1, Collections.EMPTY_LIST);
+        });
     }
 
+
     @Test
     public void testEmpty() {
         builder.beginChange();
diff --git a/modules/javafx.base/src/test/java/test/javafx/collections/MockArrayObserver.java b/modules/javafx.base/src/test/java/test/javafx/collections/MockArrayObserver.java
index 6ae69a35875..811c22e56d8 100644
--- a/modules/javafx.base/src/test/java/test/javafx/collections/MockArrayObserver.java
+++ b/modules/javafx.base/src/test/java/test/javafx/collections/MockArrayObserver.java
@@ -27,7 +27,7 @@
 
 import javafx.collections.ArrayChangeListener;
 import javafx.collections.ObservableArray;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * A mock observer that tracks calls to its onChanged() method,
@@ -61,12 +61,12 @@ public void onChanged(T observableArray, boolean sizeChanged, int from, int to)
             call.to = to;
 
             // Check generic change assertions
-            assertFalse("Negative from index", from < 0);
-            assertFalse("Negative to index", to < 0);
-            assertFalse("from index is greater then to index", from > to);
-            assertFalse("No change in both elements and size", from == to && sizeChanged == false);
-            assertFalse("from index is greater than array size", from < to && from >= observableArray.size());
-            assertFalse("to index is greater than array size", from < to && to > observableArray.size());
+            assertFalse(from < 0, "Negative from index");
+            assertFalse(to < 0, "Negative to index");
+            assertFalse(from > to, "from index is greater then to index");
+            assertFalse(from == to && sizeChanged == false, "No change in both elements and size");
+            assertFalse(from < to && from >= observableArray.size(), "from index is greater than array size");
+            assertFalse(from < to && to > observableArray.size(), "to index is greater than array size");
         } else {
             tooManyCalls = true;
         }
@@ -77,15 +77,15 @@ public void check0() {
     }
 
     public void checkOnlySizeChanged(T array) {
-        assertFalse("Too many array change events", tooManyCalls);
+        assertFalse(tooManyCalls, "Too many array change events");
         assertSame(array, call.array);
         assertEquals(true, call.sizeChanged);
     }
 
     public void checkOnlyElementsChanged(T array,
-                       int from,
-                       int to) {
-        assertFalse("Too many array change events", tooManyCalls);
+                                         int from,
+                                         int to) {
+        assertFalse(tooManyCalls, "Too many array change events");
         assertSame(array, call.array);
         assertEquals(false, call.sizeChanged);
         assertEquals(from, call.from);
@@ -93,10 +93,10 @@ public void checkOnlyElementsChanged(T array,
     }
 
     public void check(T array,
-                       boolean sizeChanged,
-                       int from,
-                       int to) {
-        assertFalse("Too many array change events", tooManyCalls);
+                      boolean sizeChanged,
+                      int from,
+                      int to) {
+        assertFalse(tooManyCalls, "Too many array change events");
         assertSame(array, call.array);
         assertEquals(sizeChanged, call.sizeChanged);
         assertEquals(from, call.from);
@@ -104,7 +104,7 @@ public void check(T array,
     }
 
     public void check1() {
-        assertFalse("Too many array change events", tooManyCalls);
+        assertFalse(tooManyCalls, "Too many array change events");
         assertNotNull(call);
     }
 
diff --git a/modules/javafx.base/src/test/java/test/javafx/collections/MockListObserver.java b/modules/javafx.base/src/test/java/test/javafx/collections/MockListObserver.java
index 1b595283f52..6e64212cda5 100644
--- a/modules/javafx.base/src/test/java/test/javafx/collections/MockListObserver.java
+++ b/modules/javafx.base/src/test/java/test/javafx/collections/MockListObserver.java
@@ -34,7 +34,7 @@
 
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
-import static org.junit.Assert.* ;
+import static org.junit.jupiter.api.Assertions.* ;
 
 /**
  * A mock observer that tracks calls to its onChanged() method,
@@ -94,17 +94,17 @@ public void check0() {
     }
 
     public void check1AddRemove(ObservableList<E> list,
-                       List<E> removed,
-                       int from,
-                       int to) {
+                                List<E> removed,
+                                int from,
+                                int to) {
         checkN(1);
         checkAddRemove(0, list, removed, from, to);
     }
 
     public void checkAddRemove(int idx, ObservableList<E> list,
-                       List<E> removed,
-                       int from,
-                       int to) {
+                               List<E> removed,
+                               int from,
+                               int to) {
         checkAddRemove(idx, list, removed, Objects::equals, from, to);
     }
 
diff --git a/modules/javafx.base/src/test/java/test/javafx/collections/MockMapObserver.java b/modules/javafx.base/src/test/java/test/javafx/collections/MockMapObserver.java
index 45fd5af734a..87d49d185fb 100644
--- a/modules/javafx.base/src/test/java/test/javafx/collections/MockMapObserver.java
+++ b/modules/javafx.base/src/test/java/test/javafx/collections/MockMapObserver.java
@@ -29,7 +29,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import javafx.collections.MapChangeListener;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class MockMapObserver<K, V> implements MapChangeListener<K, V> {
 
@@ -57,7 +57,7 @@ public void assertAdded(Tuple<K, V> tuple) {
     }
 
     public void assertAdded(int call, Tuple<K, V> tuple) {
-        assertTrue("Missing call to the observer # " + call, call < calls.size());
+        assertTrue(call < calls.size(), "Missing call to the observer # " + call);
         assertEquals(calls.get(call).key, tuple.key);
         assertEquals(calls.get(call).added, tuple.val);
     }
@@ -65,14 +65,14 @@ public void assertAdded(int call, Tuple<K, V> tuple) {
     public void assertMultipleCalls(Call<K, V>... calls) {
         assertEquals(this.calls.size(), calls.length);
         for (Call<K,V> c : calls) {
-            assertTrue(Arrays.toString(calls) + " doesn't contain "  + c, this.calls.contains(c));
+            assertTrue(this.calls.contains(c), Arrays.toString(calls) + " doesn't contain " + c);
         }
     }
 
     public void assertMultipleRemove(Tuple<K, V>... tuples) {
         assertEquals(this.calls.size(), tuples.length);
         for (Tuple<K,V> t : tuples) {
-            assertTrue(calls + " doesn't contain "  + t, this.calls.contains(new Call<>(t.key, t.val, null)));
+            assertTrue(this.calls.contains(new Call<>(t.key, t.val, null)), calls + " doesn't contain " + t);
         }
     }
 
@@ -81,7 +81,7 @@ public void assertRemoved(Tuple<K, V> tuple) {
     }
 
     public void assertRemoved(int call, Tuple<K, V> tuple) {
-        assertTrue("Missing call to the observer # " + call, call < calls.size());
+        assertTrue(call < calls.size(), "Missing call to the observer # " + call);
         assertEquals(calls.get(call).key, tuple.key);
         assertEquals(calls.get(call).removed, tuple.val);
     }
diff --git a/modules/javafx.base/src/test/java/test/javafx/collections/MockSetObserver.java b/modules/javafx.base/src/test/java/test/javafx/collections/MockSetObserver.java
index 015b5791c14..f99cc1420f7 100644
--- a/modules/javafx.base/src/test/java/test/javafx/collections/MockSetObserver.java
+++ b/modules/javafx.base/src/test/java/test/javafx/collections/MockSetObserver.java
@@ -31,8 +31,8 @@
 import java.util.List;
 import javafx.collections.SetChangeListener;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class MockSetObserver<E> implements SetChangeListener<E> {
 
@@ -60,21 +60,21 @@ public void assertAdded(Tuple<E> tuple) {
     }
 
     public void assertAdded(int call, Tuple<E> tuple) {
-        assertTrue("Missing call to the observer # " + call, call < calls.size());
+        assertTrue(call < calls.size(), "Missing call to the observer # " + call);
         assertEquals(calls.get(call).added, tuple.val);
     }
 
     public void assertMultipleCalls(Call<E>... calls) {
         assertEquals(this.calls.size(), calls.length);
         for (Call<E> c : calls) {
-            assertTrue(Arrays.toString(calls) + " doesn't contain "  + c, this.calls.contains(c));
+            assertTrue(this.calls.contains(c), () -> Arrays.toString(calls) + " doesn't contain " + c);
         }
     }
 
     public void assertMultipleRemove(Tuple<E>... tuples) {
         assertEquals(this.calls.size(), tuples.length);
         for (Tuple<E> t : tuples) {
-            assertTrue(calls + " doesn't contain "  + t, this.calls.contains(new Call<>(t.val, null)));
+            assertTrue(this.calls.contains(new Call<>(t.val, null)), () -> calls + " doesn't contain " + t);
         }
     }
 
@@ -83,7 +83,7 @@ public void assertRemoved(Tuple<E> tuple) {
     }
 
     public void assertRemoved(int call, Tuple<E> tuple) {
-        assertTrue("Missing call to the observer # " + call, call < calls.size());
+        assertTrue(call < calls.size(), "Missing call to the observer # " + call);
         assertEquals(calls.get(call).removed, tuple.val);
     }
 
diff --git a/modules/javafx.base/src/test/java/test/javafx/collections/TransformationListTest.java b/modules/javafx.base/src/test/java/test/javafx/collections/TransformationListTest.java
index 97db70d56e7..23aba0a2d3e 100644
--- a/modules/javafx.base/src/test/java/test/javafx/collections/TransformationListTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/collections/TransformationListTest.java
@@ -30,15 +30,15 @@
 import javafx.collections.ListChangeListener.Change;
 import javafx.collections.ObservableList;
 import javafx.collections.transformation.TransformationList;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import static org.junit.Assert.* ;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.* ;
 
 /**
  *
  */
-@Ignore
+@Disabled
 public class TransformationListTest {
 
     private static class TransformationListImpl extends TransformationList<String, String> {
@@ -107,7 +107,7 @@ public void remove(int i, int i1) {
     private TransformationList<String, String> list1, list2;
     private ObservableList<String> list3;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         list3 = FXCollections.observableArrayList();
         list2 = new TransformationListImpl(list3);
diff --git a/modules/javafx.base/src/test/java/test/javafx/collections/VetoableObservableListTest.java b/modules/javafx.base/src/test/java/test/javafx/collections/VetoableObservableListTest.java
index 9433e79dd24..8e569821593 100644
--- a/modules/javafx.base/src/test/java/test/javafx/collections/VetoableObservableListTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/collections/VetoableObservableListTest.java
@@ -35,10 +35,10 @@
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  *
@@ -74,7 +74,7 @@ private void assertSingleCall(String[] added, int[] removed) {
         assertCall(0, added, removed);
     }
 
-    @Before
+    @BeforeEach
     public void setUp() {
         calls = new ArrayList<>();
         list = new VetoableListDecorator<>(FXCollections.<String>observableArrayList()) {
@@ -89,109 +89,102 @@ protected void onProposedChange(List<String> added, int... removed) {
     }
 
 
-    @Test(expected=NullPointerException.class)
-    @Ignore
+    @Test
+    @Disabled
     public void testNull_add() {
-        list.add(null);
-
+        assertThrows(NullPointerException.class, () -> list.add(null));
     }
 
-    @Test(expected=NullPointerException.class)
-    @Ignore
+    @Test
+    @Disabled
     public void testNull_add_indexed() {
-        list.add( 1, null);
-
+        assertThrows(NullPointerException.class, () -> list.add(1, null));
     }
 
-    @Test(expected=NullPointerException.class)
-    @Ignore
+    @Test
+    @Disabled
     public void testNull_addAll_collection() {
-        list.addAll(Arrays.asList("a", null, "b"));
-
+        assertThrows(NullPointerException.class, () -> list.addAll(Arrays.asList("a", null, "b")));
     }
 
-    @Test(expected=NullPointerException.class)
-    @Ignore
+    @Test
+    @Disabled
     public void testNull_addAll() {
-        list.addAll("a", null, "b");
-
+        assertThrows(NullPointerException.class, () -> list.addAll(Arrays.asList("a", null, "b")));
     }
 
-    @Test(expected=NullPointerException.class)
-    @Ignore
+    @Test
+    @Disabled
     public void testNull_addAll_collection_indexed() {
-        list.addAll(1, Arrays.asList("a", null, "b"));
-
+        assertThrows(NullPointerException.class, () -> list.addAll(1, Arrays.asList("a", null, "b")));
     }
 
-    @Test(expected=NullPointerException.class)
-    @Ignore
+    @Test
+    @Disabled
     public void testNull_set() {
-        list.set(1, null);
-
+        assertThrows(NullPointerException.class, () -> list.set(1, null));
     }
 
-    @Test(expected=NullPointerException.class)
-    @Ignore
+    @Test
+    @Disabled
     public void testNull_setAll() {
-        list.setAll("a", null);
-
+        assertThrows(NullPointerException.class, () -> list.setAll("a", null));
     }
 
-    @Test(expected=NullPointerException.class)
-    @Ignore
+    @Test
+    @Disabled
     public void testNull_setAll_collection() {
-        list.setAll(Arrays.asList("a", null, "b"));
+        assertThrows(NullPointerException.class, () -> list.setAll(Arrays.asList("a", null, "b")));
     }
 
-    @Test(expected=NullPointerException.class)
-    @Ignore
+    @Test
+    @Disabled
     public void testNull_listIterator_add() {
-        list.listIterator().add(null);
-
+        assertThrows(NullPointerException.class, () -> list.listIterator().add(null));
     }
-    @Test(expected=NullPointerException.class)
-    @Ignore
+
+    @Test
+    @Disabled
     public void testNull_listIterator_set() {
         ListIterator<String> it = list.listIterator();
         it.next();
-        it.set(null);
+        assertThrows(NullPointerException.class, () -> it.set(null));
     }
 
-    @Test(expected=NullPointerException.class)
-    @Ignore
+    @Test
+    @Disabled
     public void testNull_subList_add() {
-        list.subList(0, 1).add(null);
+        assertThrows(NullPointerException.class, () -> list.subList(0, 1).add(null));
     }
 
-    @Test(expected = NullPointerException.class)
-    @Ignore
+    @Test
+    @Disabled
     public void testNull_subList_add_indexed() {
-        list.subList(0, 1).add(0, null);
+        assertThrows(NullPointerException.class, () -> list.subList(0, 1).add(0, null));
     }
 
-    @Test(expected = NullPointerException.class)
-    @Ignore
+    @Test
+    @Disabled
     public void testNull_subList_addAll() {
-        list.subList(0, 1).addAll(Collections.<String>singleton(null));
+        assertThrows(NullPointerException.class, () -> list.subList(0, 1).addAll(Collections.<String>singleton(null)));
     }
 
-    @Test(expected = NullPointerException.class)
-    @Ignore
+    @Test
+    @Disabled
     public void testNull_subList_addAll_indexed() {
-        list.subList(0, 1).addAll(0, Collections.<String>singleton(null));
+        assertThrows(NullPointerException.class, () -> list.subList(0, 1).addAll(0, Collections.<String>singleton(null)));
     }
 
-    @Test(expected = NullPointerException.class)
-    @Ignore
+    @Test
+    @Disabled
     public void testNull_subList_set() {
-        list.subList(0, 1).set(0, null);
+        assertThrows(NullPointerException.class, () -> list.subList(0, 1).set(0, null));
     }
 
-    @Test(expected = NullPointerException.class)
-    @Ignore
+    @Test
+    @Disabled
     public void testNull_subList_listIterator() {
-        list.subList(0, 1).listIterator().add(null);
+        assertThrows(NullPointerException.class, () -> list.subList(0, 1).listIterator().add(null));
     }
 
     @Test
@@ -351,6 +344,7 @@ public void testConcurrencyAdd() {
         }
         assertCallCount(1);
     }
+
     @Test
     public void testConcurrencyAddAll() {
         boolean exception = false;
@@ -364,6 +358,7 @@ public void testConcurrencyAddAll() {
         }
         assertCallCount(1);
     }
+
     @Test
     public void testConcurrencyClear() {
         boolean exception = false;
@@ -377,6 +372,7 @@ public void testConcurrencyClear() {
         }
         assertCallCount(1);
     }
+
     @Test
     public void testConcurrencyRemove() {
         boolean exception = false;
@@ -390,6 +386,7 @@ public void testConcurrencyRemove() {
         }
         assertCallCount(1);
     }
+
     @Test
     public void testConcurrencyRemoveAll() {
         boolean exception = false;
@@ -403,6 +400,7 @@ public void testConcurrencyRemoveAll() {
         }
         assertCallCount(1);
     }
+
     @Test
     public void testConcurrencyRetainAll() {
         boolean exception = false;
@@ -416,6 +414,7 @@ public void testConcurrencyRetainAll() {
         }
         assertCallCount(1);
     }
+
     @Test
     public void testConcurrencySet() {
         boolean exception = false;
@@ -443,6 +442,7 @@ public void testConcurrencyIteratorRemove() {
         }
         assertCallCount(1);
     }
+
     @Test
     public void testConcurrencyIteratorAdd() {
         boolean exception = false;
@@ -456,6 +456,7 @@ public void testConcurrencyIteratorAdd() {
         }
         assertCallCount(1);
     }
+
     @Test
     public void testConcurrencyIteratorSet() {
         boolean exception = false;
@@ -470,17 +471,18 @@ public void testConcurrencyIteratorSet() {
         assertCallCount(1);
     }
 
-    @Test(expected=ConcurrentModificationException.class)
+    @Test
     public void testConcurrencyIteratorIterator() {
-        ListIterator<String> it1 = list.listIterator();
-        ListIterator<String> it2 = list.listIterator();
-        it1.next();
-        it2.next();
-        it1.remove();
-        it2.remove();
+        assertThrows(ConcurrentModificationException.class, () -> {
+            ListIterator<String> it1 = list.listIterator();
+            ListIterator<String> it2 = list.listIterator();
+            it1.next();
+            it2.next();
+            it1.remove();
+            it2.remove();
+        });
     }
 
-
     @Test
     public void testNonConcurrency() {
         ListIterator<String> it = list.listIterator();
diff --git a/modules/javafx.base/src/test/java/test/javafx/collections/WeakListChangeListenerTest.java b/modules/javafx.base/src/test/java/test/javafx/collections/WeakListChangeListenerTest.java
index af6beb35eae..bba42501813 100644
--- a/modules/javafx.base/src/test/java/test/javafx/collections/WeakListChangeListenerTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/collections/WeakListChangeListenerTest.java
@@ -27,22 +27,25 @@
 
 import com.sun.javafx.collections.NonIterableChange;
 import com.sun.javafx.collections.ObservableListWrapper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.WeakListChangeListener;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class WeakListChangeListenerTest {
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testConstructWithNull() {
-        new WeakListChangeListener<>(null);
+        assertThrows(NullPointerException.class, () -> {
+            new WeakListChangeListener<>(null);
+        });
     }
 
+
     @Test
     public void testHandle() {
         MockListObserver<Object> listener = new MockListObserver<>();
diff --git a/modules/javafx.base/src/test/java/test/javafx/collections/WeakMapChangeListenerTest.java b/modules/javafx.base/src/test/java/test/javafx/collections/WeakMapChangeListenerTest.java
index 2722a2c5700..96c69ae35e3 100644
--- a/modules/javafx.base/src/test/java/test/javafx/collections/WeakMapChangeListenerTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/collections/WeakMapChangeListenerTest.java
@@ -27,21 +27,24 @@
 
 import com.sun.javafx.binding.MapExpressionHelper;
 import com.sun.javafx.collections.ObservableMapWrapper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import javafx.collections.MapChangeListener;
 import javafx.collections.WeakMapChangeListener;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class WeakMapChangeListenerTest {
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testConstructWithNull() {
-        new WeakMapChangeListener<>(null);
+        assertThrows(NullPointerException.class, () -> {
+            new WeakMapChangeListener<>(null);
+        });
     }
 
+
     @Test
     public void testHandle() {
         MockMapObserver<Object, Object> listener = new MockMapObserver<>();
diff --git a/modules/javafx.base/src/test/java/test/javafx/collections/WeakSetChangeListenerTest.java b/modules/javafx.base/src/test/java/test/javafx/collections/WeakSetChangeListenerTest.java
index f36b3d3f4e2..ab1779abe15 100644
--- a/modules/javafx.base/src/test/java/test/javafx/collections/WeakSetChangeListenerTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/collections/WeakSetChangeListenerTest.java
@@ -27,21 +27,24 @@
 
 import com.sun.javafx.binding.SetExpressionHelper;
 import com.sun.javafx.collections.ObservableSetWrapper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashSet;
 import javafx.collections.SetChangeListener;
 import javafx.collections.WeakSetChangeListener;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class WeakSetChangeListenerTest {
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testConstructWithNull() {
-        new WeakSetChangeListener<>(null);
+        assertThrows(NullPointerException.class, () -> {
+            new WeakSetChangeListener<>(null);
+        });
     }
 
+
     @Test
     public void testHandle() {
         MockSetObserver<Object> listener = new MockSetObserver<>();
diff --git a/modules/javafx.base/src/test/java/test/javafx/event/EventSerializationEventExists.java b/modules/javafx.base/src/test/java/test/javafx/event/EventSerializationEventExists.java
index 1ce0a3b5efa..4efa42d5173 100644
--- a/modules/javafx.base/src/test/java/test/javafx/event/EventSerializationEventExists.java
+++ b/modules/javafx.base/src/test/java/test/javafx/event/EventSerializationEventExists.java
@@ -35,10 +35,10 @@
 import javafx.event.Event;
 import javafx.event.EventType;
 import javafx.event.EventTypeShim;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class EventSerializationEventExists {
 
@@ -46,7 +46,7 @@ public class EventSerializationEventExists {
     private ObjectOutputStream objectOutputStream;
     private ObjectInputStream objectInputStream;
 
-    @Before
+    @BeforeEach
     public void setUp() throws IOException {
         byteArrayOutputStream = new ByteArrayOutputStream();
         objectOutputStream = new ObjectOutputStream(byteArrayOutputStream);
@@ -57,7 +57,7 @@ public void turnToInput() throws IOException {
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testSerializationEventExists() throws IOException, ClassNotFoundException {
         EventType ev = null;
         try {
diff --git a/modules/javafx.base/src/test/java/test/javafx/event/EventSerializationTest.java b/modules/javafx.base/src/test/java/test/javafx/event/EventSerializationTest.java
index 26f3c989af7..ab48c28f485 100644
--- a/modules/javafx.base/src/test/java/test/javafx/event/EventSerializationTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/event/EventSerializationTest.java
@@ -37,10 +37,10 @@
 import javafx.event.Event;
 import javafx.event.EventType;
 import javafx.event.EventTypeShim;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  *
@@ -50,7 +50,7 @@ public class EventSerializationTest {
     private ObjectOutputStream objectOutputStream;
     private ObjectInputStream objectInputStream;
 
-    @Before
+    @BeforeEach
     public void setUp() throws IOException {
         byteArrayOutputStream = new ByteArrayOutputStream();
         objectOutputStream = new ObjectOutputStream(byteArrayOutputStream);
@@ -89,14 +89,16 @@ public void testNewEventTypeSerialization() throws IOException, ClassNotFoundExc
 
     }
 
-    @Test(expected=InvalidObjectException.class)
+    @Test
     public void testUnknownEventTypeSerialization() throws IOException, ClassNotFoundException {
         List<String> l = new ArrayList<>();
         l.add("UNKNOWN");
         Object e = EventTypeShim.getEventTypeSerialization(l);
 
-        objectOutputStream.writeObject(e);
-        turnToInput();
-        EventType eType = (EventType) objectInputStream.readObject();
+        assertThrows(InvalidObjectException.class, () -> {
+            objectOutputStream.writeObject(e);
+            turnToInput();
+            EventType eType = (EventType) objectInputStream.readObject();
+        });
     }
 }
diff --git a/modules/javafx.base/src/test/java/test/javafx/event/EventTest.java b/modules/javafx.base/src/test/java/test/javafx/event/EventTest.java
index 64ad7df608e..d7c1f5c91db 100644
--- a/modules/javafx.base/src/test/java/test/javafx/event/EventTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/event/EventTest.java
@@ -28,18 +28,22 @@
 import javafx.event.ActionEvent;
 import javafx.event.Event;
 import javafx.event.EventType;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /**
  *
  */
 public class EventTest {
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testTypeConflict() {
-        new EventType(Event.ANY, ActionEvent.ACTION.getName());
+        assertThrows(IllegalArgumentException.class, () -> {
+            new EventType(Event.ANY, ActionEvent.ACTION.getName());
+        });
     }
 
+
     @Test
     public void testTypeNew() {
         new EventType(Event.ANY, "TEST"); // should pass without exception
diff --git a/modules/javafx.base/src/test/java/test/javafx/util/DurationTest.java b/modules/javafx.base/src/test/java/test/javafx/util/DurationTest.java
index 5061dc25080..badfeec5e48 100644
--- a/modules/javafx.base/src/test/java/test/javafx/util/DurationTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/util/DurationTest.java
@@ -26,8 +26,8 @@
 package test.javafx.util;
 
 import javafx.util.Duration;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  */
@@ -235,9 +235,9 @@ public class DurationTest {
     }
 
     // toMinutes
-        // 0, +infinity, -infinity, Nan, positive value, negative value
+    // 0, +infinity, -infinity, Nan, positive value, negative value
     // toHours
-        // 0, +infinity, -infinity, Nan, positive value, negative value
+    // 0, +infinity, -infinity, Nan, positive value, negative value
 
 
     /************************************************************************************
diff --git a/modules/javafx.base/src/test/java/test/javafx/util/converter/BigDecimalStringConverterTest.java b/modules/javafx.base/src/test/java/test/javafx/util/converter/BigDecimalStringConverterTest.java
index 6503c9de48a..8ee31d53b58 100644
--- a/modules/javafx.base/src/test/java/test/javafx/util/converter/BigDecimalStringConverterTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/util/converter/BigDecimalStringConverterTest.java
@@ -27,11 +27,11 @@
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import javafx.util.converter.BigDecimalStringConverter;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  */
@@ -40,7 +40,7 @@ public class BigDecimalStringConverterTest {
 
     private final BigDecimal bigDecimal = new BigDecimal(BigInteger.TEN);
 
-    @Before public void setup() {
+    @BeforeEach public void setup() {
         converter = new BigDecimalStringConverter();
     }
 
diff --git a/modules/javafx.base/src/test/java/test/javafx/util/converter/BigIntegerStringConverterTest.java b/modules/javafx.base/src/test/java/test/javafx/util/converter/BigIntegerStringConverterTest.java
index f693922a846..7c02331b2d3 100644
--- a/modules/javafx.base/src/test/java/test/javafx/util/converter/BigIntegerStringConverterTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/util/converter/BigIntegerStringConverterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,17 +27,17 @@
 
 import java.math.BigInteger;
 import javafx.util.converter.BigIntegerStringConverter;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  */
 public class BigIntegerStringConverterTest {
     private BigIntegerStringConverter converter;
 
-    @Before public void setup() {
+    @BeforeEach public void setup() {
         converter = new BigIntegerStringConverter();
     }
 
diff --git a/modules/javafx.base/src/test/java/test/javafx/util/converter/BooleanStringConverterTest.java b/modules/javafx.base/src/test/java/test/javafx/util/converter/BooleanStringConverterTest.java
index 06699df4681..b933bbfd1a5 100644
--- a/modules/javafx.base/src/test/java/test/javafx/util/converter/BooleanStringConverterTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/util/converter/BooleanStringConverterTest.java
@@ -26,17 +26,17 @@
 package test.javafx.util.converter;
 
 import javafx.util.converter.BooleanStringConverter;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  */
 public class BooleanStringConverterTest {
     private BooleanStringConverter converter;
 
-    @Before public void setup() {
+    @BeforeEach public void setup() {
         converter = new BooleanStringConverter();
     }
 
diff --git a/modules/javafx.base/src/test/java/test/javafx/util/converter/ByteStringConverterTest.java b/modules/javafx.base/src/test/java/test/javafx/util/converter/ByteStringConverterTest.java
index b76dbf30b48..2502fc860ab 100644
--- a/modules/javafx.base/src/test/java/test/javafx/util/converter/ByteStringConverterTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/util/converter/ByteStringConverterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,10 +26,10 @@
 package test.javafx.util.converter;
 
 import javafx.util.converter.ByteStringConverter;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  */
@@ -38,7 +38,7 @@ public class ByteStringConverterTest {
 
     private final byte byteValue_10 = 10;
 
-    @Before public void setup() {
+    @BeforeEach public void setup() {
         converter = new ByteStringConverter();
     }
 
diff --git a/modules/javafx.base/src/test/java/test/javafx/util/converter/CharacterStringConverterTest.java b/modules/javafx.base/src/test/java/test/javafx/util/converter/CharacterStringConverterTest.java
index e5943a224c7..0fc7a21e3ba 100644
--- a/modules/javafx.base/src/test/java/test/javafx/util/converter/CharacterStringConverterTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/util/converter/CharacterStringConverterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,10 +26,10 @@
 package test.javafx.util.converter;
 
 import javafx.util.converter.CharacterStringConverter;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  */
@@ -39,7 +39,7 @@ public class CharacterStringConverterTest {
     private final char char_c = 'c';
     private final char char_C = 'C';
 
-    @Before public void setup() {
+    @BeforeEach public void setup() {
         converter = new CharacterStringConverter();
     }
 
diff --git a/modules/javafx.base/src/test/java/test/javafx/util/converter/DefaultStringConverterTest.java b/modules/javafx.base/src/test/java/test/javafx/util/converter/DefaultStringConverterTest.java
index 53dc54b5919..b1586f4595a 100644
--- a/modules/javafx.base/src/test/java/test/javafx/util/converter/DefaultStringConverterTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/util/converter/DefaultStringConverterTest.java
@@ -26,17 +26,17 @@
 package test.javafx.util.converter;
 
 import javafx.util.converter.DefaultStringConverter;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  */
 public class DefaultStringConverterTest {
     private DefaultStringConverter converter;
 
-    @Before public void setup() {
+    @BeforeEach public void setup() {
         converter = new DefaultStringConverter();
     }
 
diff --git a/modules/javafx.base/src/test/java/test/javafx/util/converter/DoubleStringConverterTest.java b/modules/javafx.base/src/test/java/test/javafx/util/converter/DoubleStringConverterTest.java
index f79f695f35a..feead6ee6d0 100644
--- a/modules/javafx.base/src/test/java/test/javafx/util/converter/DoubleStringConverterTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/util/converter/DoubleStringConverterTest.java
@@ -26,17 +26,17 @@
 package test.javafx.util.converter;
 
 import javafx.util.converter.DoubleStringConverter;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  */
 public class DoubleStringConverterTest {
     private DoubleStringConverter converter;
 
-    @Before public void setup() {
+    @BeforeEach public void setup() {
         converter = new DoubleStringConverter();
     }
 
diff --git a/modules/javafx.base/src/test/java/test/javafx/util/converter/FloatStringConverterTest.java b/modules/javafx.base/src/test/java/test/javafx/util/converter/FloatStringConverterTest.java
index b5e322e7d44..c97d6b48531 100644
--- a/modules/javafx.base/src/test/java/test/javafx/util/converter/FloatStringConverterTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/util/converter/FloatStringConverterTest.java
@@ -26,17 +26,17 @@
 package test.javafx.util.converter;
 
 import javafx.util.converter.FloatStringConverter;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  */
 public class FloatStringConverterTest {
     private FloatStringConverter converter;
 
-    @Before public void setup() {
+    @BeforeEach public void setup() {
         converter = new FloatStringConverter();
     }
 
diff --git a/modules/javafx.base/src/test/java/test/javafx/util/converter/IntegerStringConverterTest.java b/modules/javafx.base/src/test/java/test/javafx/util/converter/IntegerStringConverterTest.java
index af822628d54..daaeb477051 100644
--- a/modules/javafx.base/src/test/java/test/javafx/util/converter/IntegerStringConverterTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/util/converter/IntegerStringConverterTest.java
@@ -26,17 +26,17 @@
 package test.javafx.util.converter;
 
 import javafx.util.converter.IntegerStringConverter;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  */
 public class IntegerStringConverterTest {
     private IntegerStringConverter converter;
 
-    @Before public void setup() {
+    @BeforeEach public void setup() {
         converter = new IntegerStringConverter();
     }
 
diff --git a/modules/javafx.base/src/test/java/test/javafx/util/converter/LongStringConverterTest.java b/modules/javafx.base/src/test/java/test/javafx/util/converter/LongStringConverterTest.java
index b471e5b1759..5115a8a1002 100644
--- a/modules/javafx.base/src/test/java/test/javafx/util/converter/LongStringConverterTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/util/converter/LongStringConverterTest.java
@@ -26,17 +26,17 @@
 package test.javafx.util.converter;
 
 import javafx.util.converter.LongStringConverter;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  */
 public class LongStringConverterTest {
     private LongStringConverter converter;
 
-    @Before public void setup() {
+    @BeforeEach public void setup() {
         converter = new LongStringConverter();
     }
 
diff --git a/modules/javafx.base/src/test/java/test/javafx/util/converter/PercentageStringConverterTest.java b/modules/javafx.base/src/test/java/test/javafx/util/converter/PercentageStringConverterTest.java
index 6bf7e37ce98..50abc52972c 100644
--- a/modules/javafx.base/src/test/java/test/javafx/util/converter/PercentageStringConverterTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/util/converter/PercentageStringConverterTest.java
@@ -29,17 +29,17 @@
 import java.util.Locale;
 import javafx.util.converter.NumberStringConverterShim;
 import javafx.util.converter.PercentageStringConverter;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  */
 public class PercentageStringConverterTest {
     private PercentageStringConverter converter;
 
-    @Before public void setup() {
+    @BeforeEach public void setup() {
         converter = new PercentageStringConverter(Locale.US);
     }
 
diff --git a/modules/javafx.base/src/test/java/test/javafx/util/converter/ShortStringConverterTest.java b/modules/javafx.base/src/test/java/test/javafx/util/converter/ShortStringConverterTest.java
index b24093d697c..e7c57349567 100644
--- a/modules/javafx.base/src/test/java/test/javafx/util/converter/ShortStringConverterTest.java
+++ b/modules/javafx.base/src/test/java/test/javafx/util/converter/ShortStringConverterTest.java
@@ -26,10 +26,10 @@
 package test.javafx.util.converter;
 
 import javafx.util.converter.ShortStringConverter;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  */
@@ -38,7 +38,7 @@ public class ShortStringConverterTest {
 
     private final short shortValue_10 = 10;
 
-    @Before public void setup() {
+    @BeforeEach public void setup() {
         converter = new ShortStringConverter();
     }
 

From 417384066a4ed9be0cc2ff99320f6d5eb4d14a66 Mon Sep 17 00:00:00 2001
From: Lukasz Kostyra <lkostyra@openjdk.org>
Date: Tue, 24 Sep 2024 06:00:48 +0000
Subject: [PATCH 49/75] 8339512: [TestBug] Convert graphics tests to JUnit 5

Reviewed-by: angorya, mhanl
---
 .../com/sun/javafx/css/BooleanTypeTest.java   |    6 +-
 .../com/sun/javafx/css/CursorTypeTest.java    |    6 +-
 .../com/sun/javafx/css/EffectTypeTest.java    |   40 +-
 .../test/com/sun/javafx/css/EnumTypeTest.java |    8 +-
 .../com/sun/javafx/css/FontSizeTypeTest.java  |    7 +-
 .../com/sun/javafx/css/PseudoClassTest.java   |   41 +-
 .../test/com/sun/javafx/css/SizeTypeTest.java |    7 +-
 .../com/sun/javafx/css/StringTypeTest.java    |   15 +-
 .../com/sun/javafx/css/StyleManagerTest.java  |   20 +-
 .../test/com/sun/javafx/css/URLTypeTest.java  |    8 +-
 .../css/converters/URLConverterTest.java      |    7 +-
 .../sun/javafx/font/PrismFontFactoryTest.java |   32 +-
 .../com/sun/javafx/geom/BaseBoundsTest.java   |   10 +-
 .../javafx/geom/DirtyRegionContainerTest.java |   78 +-
 .../com/sun/javafx/geom/Path2DGrowTest.java   |   14 +-
 .../test/com/sun/javafx/geom/Path2DTest.java  |   10 +-
 .../sun/javafx/geom/TransformedShapeTest.java |    7 +-
 .../test/com/sun/javafx/geom/Vec3dTest.java   |    6 +-
 .../geom/transform/BaseTransformTest.java     |    7 +-
 .../transform/GeneralTransform3DTest.java     |   13 +-
 .../com/sun/javafx/iio/GIFLoaderTest.java     |   43 +-
 .../com/sun/javafx/iio/ImageHiDPITest.java    |   25 +-
 .../javafx/iio/ImageLoaderScalingTest.java    |   17 +-
 .../javafx/iio/bmp/BMPImageLoaderTest.java    |   22 +-
 .../sun/javafx/iio/common/ImageToolsTest.java |   22 +-
 .../javafx/iio/png/PNGImageLoaderTest.java    |   60 +-
 .../com/sun/javafx/image/ConverterTest.java   |   17 +-
 .../javafx/scene/KeyboardShortcutsTest.java   |   15 +-
 .../sun/javafx/scene/layout/RegionTest.java   |    5 +-
 .../javafx/scene/layout/ScaledMathTest.java   |    5 +-
 .../region/BackgroundFillConverterTest.java   |    7 +-
 .../layout/region/BackgroundFillTest.java     |   13 +-
 .../layout/region/BackgroundImageTest.java    |    7 +-
 .../region/BackgroundRepeatConverterTest.java |   22 +-
 .../scene/transform/TransformUtilsTest.java   |   56 +-
 .../traversal/TopMostTraversalEngineTest.java |   12 +-
 .../javafx/scene/traversal/TraversalTest.java |  137 +-
 .../traversal/TraverseInvisibleTest.java      |   65 +-
 .../sun/javafx/sg/prism/CacheFilterTest.java  |    8 +-
 .../javafx/sg/prism/ContentBoundsTest.java    |    7 +-
 .../com/sun/javafx/sg/prism/CullingTest.java  |   57 +-
 .../javafx/sg/prism/DirtyRegionClipTest.java  |   76 +-
 .../javafx/sg/prism/DirtyRegionTestBase.java  |   77 +-
 .../sg/prism/EffectDirtyRegionTest.java       |    9 +-
 .../javafx/sg/prism/GridDirtyRegionTest.java  |  104 +-
 .../sg/prism/GrowableDataBufferTest.java      |    8 +-
 .../com/sun/javafx/sg/prism/NGCircleTest.java |   18 +-
 .../sun/javafx/sg/prism/NGEllipseTest.java    |   17 +-
 .../sun/javafx/sg/prism/NGImageViewTest.java  |   15 +-
 .../com/sun/javafx/sg/prism/NGNodeTest.java   |   23 +-
 .../sun/javafx/sg/prism/NGRectangleTest.java  |   15 +-
 .../com/sun/javafx/sg/prism/NGRegionTest.java |   33 +-
 .../com/sun/javafx/sg/prism/NGShapeTest.java  |   19 +-
 .../javafx/sg/prism/NGTriangleMeshTest.java   |    7 +-
 .../javafx/sg/prism/OcclusionCullingTest.java |   11 +-
 .../sun/javafx/sg/prism/RenderRootTest.java   |   19 +-
 .../sun/javafx/test/CssMethodsTestBase.java   |   52 +-
 .../javafx/test/ObjectMethodsTestBase.java    |   47 +-
 .../test/OnInvalidateMethodsTestBase.java     |   19 +-
 .../sun/javafx/test/PropertiesTestBase.java   |   68 +-
 .../test/com/sun/javafx/test/TestHelper.java  |   14 +-
 .../com/sun/javafx/test/TransformHelper.java  |   35 +-
 .../com/sun/javafx/test/ValueComparator.java  |    8 +-
 .../javafx/tk/quantum/WindowStageTest.java    |   15 +-
 .../test/com/sun/javafx/util/UtilsTest.java   |   13 +-
 .../util/Utils_getScreenForPoint_Test.java    |   83 +-
 .../Utils_getScreenForRectangle_Test.java     |   85 +-
 .../javafx/util/WeakReferenceQueueTest.java   |   10 +-
 .../test/com/sun/prism/StrokedShapeTest.java  |   11 +-
 .../test/com/sun/scenario/SettingsTest.java   |   10 +-
 .../animation/AbstractPrimaryTimerTest.java   |   12 +-
 .../NumberTangentInterpolatorTest.java        |   12 +-
 .../animation/SplineInterpolatorTest.java     |   12 +-
 .../shared/FiniteClipEnvelopeTest.java        |   12 +-
 .../shared/GeneralClipInterpolatorTest.java   |   78 +-
 .../shared/InfiniteClipEnvelopeTest.java      |   12 +-
 .../shared/SimpleClipInterpolatorTest.java    |   30 +-
 .../shared/SingleLoopClipEnvelopeTest.java    |   13 +-
 .../shared/TimelineClipCoreTest.java          |   14 +-
 .../scenario/effect/rt_5239/RT_5239Test.java  |    6 +-
 .../test/javafx/animation/AnimationMock.java  |    4 +-
 .../animation/AnimationPulseReceiverTest.java |   20 +-
 .../animation/AnimationSetRateTest.java       |   14 +-
 .../test/javafx/animation/AnimationTest.java  |   38 +-
 .../javafx/animation/FadeTransitionTest.java  |   16 +-
 .../javafx/animation/FillTransitionTest.java  |   16 +-
 .../javafx/animation/InterpolatorTest.java    |    6 +-
 .../test/javafx/animation/KeyFrameTest.java   |   48 +-
 .../test/javafx/animation/KeyValueTest.java   |  127 +-
 .../animation/ParallelTransitionPlayTest.java |   11 +-
 .../animation/ParallelTransitionTest.java     |   15 +-
 .../javafx/animation/PathTransitionTest.java  |   12 +-
 .../javafx/animation/PauseTransitionTest.java |    8 +-
 .../animation/RotateTransitionTest.java       |   16 +-
 .../javafx/animation/ScaleTransitionTest.java |   16 +-
 .../SequentialTransitionPlayTest.java         |   11 +-
 .../animation/SequentialTransitionTest.java   |   15 +-
 .../animation/StrokeTransitionTest.java       |   16 +-
 .../javafx/animation/TimelinePlayTest.java    |   10 +-
 .../test/javafx/animation/TimelineTest.java   |   13 +-
 .../test/javafx/animation/TransitionTest.java |   15 +-
 .../animation/TranslateTransitionTest.java    |   16 +-
 .../concurrent/ScheduledServiceTest.java      |  273 ++-
 .../concurrent/ServiceExceptionTest.java      |  137 +-
 .../concurrent/ServiceLifecycleTest.java      |  673 +++---
 .../test/javafx/concurrent/ServiceTest.java   |   68 +-
 .../javafx/concurrent/ServiceTestBase.java    |   11 +-
 .../javafx/concurrent/TaskCancelTest.java     |   32 +-
 .../test/javafx/concurrent/TaskEventTest.java |  127 +-
 .../javafx/concurrent/TaskExceptionTest.java  |   69 +-
 .../javafx/concurrent/TaskProgressTest.java   |  104 +-
 .../javafx/concurrent/TaskSimpleTest.java     |   77 +-
 .../concurrent/TaskSwampEventQueueTest.java   |   15 +-
 .../java/test/javafx/css/CssLexerTest.java    |  123 +-
 .../java/test/javafx/css/CssMetaDataTest.java |   50 +-
 .../java/test/javafx/css/CssParserTest.java   |   16 +-
 .../java/test/javafx/css/DeclarationTest.java |   42 +-
 .../java/test/javafx/css/FontTypeTest.java    |   10 +-
 .../css/HonorDeveloperSettingsTest.java       |   24 +-
 .../java/test/javafx/css/InsetsTypeTest.java  |   20 +-
 .../css/Node_cssStateTransition_Test.java     |   16 +-
 .../javafx/css/Node_cssStyleMap_Test.java     |   21 +-
 .../java/test/javafx/css/PaintTypeTest.java   |    9 +-
 .../java/test/javafx/css/ParsedValueTest.java |   18 +-
 .../test/java/test/javafx/css/RuleTest.java   |   25 +-
 .../javafx/css/SelectorPartitioningTest.java  |   73 +-
 .../test/java/test/javafx/css/SizeTest.java   |   52 +-
 .../test/java/test/javafx/css/StyleTest.java  |   78 +-
 .../css/StyleablePropertyFactoryTest.java     |   76 +-
 ...ablePropertyFactory_createMethod_Test.java |   80 +-
 .../java/test/javafx/css/StylesheetTest.java  |   16 +-
 .../test/java/test/javafx/css/TypeTest.java   |    9 +-
 .../test/javafx/geometry/BoundingBoxTest.java |    9 +-
 .../test/javafx/geometry/Dimension2DTest.java |   12 +-
 .../java/test/javafx/geometry/InsetsTest.java |   12 +-
 .../test/javafx/geometry/Point2DTest.java     |   85 +-
 .../test/javafx/geometry/Point3DTest.java     |   87 +-
 .../java/test/javafx/geometry/PosTest.java    |   60 +-
 .../test/javafx/geometry/Rectangle2DTest.java |   25 +-
 .../test/javafx/print/JobSettingsTest.java    |   44 +-
 .../java/test/javafx/print/MarginsTest.java   |   13 +-
 .../test/javafx/print/PaperUnitsTest.java     |   32 +-
 .../test/javafx/print/PrinterJobTest.java     |   23 +-
 .../test/javafx/scene/AcceleratorsTest.java   |   43 +-
 .../java/test/javafx/scene/CameraTest.java    |    9 +-
 .../java/test/javafx/scene/CursorTest.java    |   38 +-
 .../java/test/javafx/scene/DepthTestTest.java |   32 +-
 .../java/test/javafx/scene/EventAnyTest.java  |  107 +-
 .../java/test/javafx/scene/FocusTest.java     |   23 +-
 .../java/test/javafx/scene/GroupTest.java     |   23 +-
 .../java/test/javafx/scene/HashCodeTest.java  |    6 +-
 .../test/javafx/scene/ImageCursorTest.java    |   18 +-
 .../scene/ImageCursor_findBestImage_Test.java |   83 +-
 .../ImageCursor_getCurrentFrame_Test.java     |   12 +-
 .../java/test/javafx/scene/LightBaseTest.java |  272 +--
 .../scene/LightBase_properties_Test.java      |   30 +-
 .../java/test/javafx/scene/Mouse3DTest.java   |   10 +-
 .../java/test/javafx/scene/MouseTest.java     |   48 +-
 .../test/java/test/javafx/scene/NodeTest.java |   47 +-
 .../Node_LocalToParentTransform_Test.java     |    8 +-
 .../Node_LocalToSceneTransform_Test.java      |    8 +-
 .../test/javafx/scene/Node_bind_Test.java     |  144 +-
 .../javafx/scene/Node_cssMethods_Test.java    |   32 +-
 .../Node_effectiveOrientation_Css_Test.java   |   19 +-
 .../scene/Node_effectiveOrientation_Test.java |  101 +-
 .../javafx/scene/Node_hasMirroring_Test.java  |   83 +-
 .../javafx/scene/Node_layoutSizes_Test.java   |   43 +-
 .../test/javafx/scene/Node_lookup_Test.java   |   20 +-
 .../javafx/scene/Node_onInvalidate_Test.java  |   82 +-
 .../javafx/scene/Node_properties_Test.java    |   26 +-
 .../test/java/test/javafx/scene/PaneTest.java |    7 +-
 .../java/test/javafx/scene/ParentTest.java    |   83 +-
 .../javafx/scene/Parent_cssMethods_Test.java  |   21 +-
 .../scene/Parent_recomputeBounds_Test.java    |    8 +-
 .../scene/Parent_structure_sync_Test.java     |   81 +-
 .../javafx/scene/PickAndContainsTest.java     |   12 +-
 .../java/test/javafx/scene/SceneTest.java     |  156 +-
 .../javafx/scene/Scene_properties_Test.java   |   26 +-
 .../scene/Scenegraph_eventHandlers_Test.java  |  124 +-
 .../java/test/javafx/scene/StructureTest.java |  406 ++--
 .../java/test/javafx/scene/SubSceneTest.java  |  140 +-
 .../javafx/scene/TreeShowingPropertyTest.java |   76 +-
 .../scene/bounds/BoundsPerformanceTest.java   |   25 +-
 .../javafx/scene/bounds/ClipBoundsTest.java   |   36 +-
 .../javafx/scene/bounds/EffectBoundsTest.java |   30 +-
 .../javafx/scene/bounds/GroupBoundsTest.java  |  114 +-
 .../javafx/scene/bounds/LayoutBoundsTest.java |   40 +-
 .../javafx/scene/bounds/NodeBoundsTest.java   |   20 +-
 .../scene/bounds/Transformed3DBoundsTest.java |   26 +-
 .../scene/bounds/TransformedBoundsTest.java   |   80 +-
 .../test/javafx/scene/canvas/CanvasTest.java  |  176 +-
 .../test/javafx/scene/effect/BlendTest.java   |   16 +-
 .../scene/effect/Blend_properties_Test.java   |   23 +-
 .../test/javafx/scene/effect/BloomTest.java   |   10 +-
 .../scene/effect/Bloom_properties_Test.java   |   23 +-
 .../test/javafx/scene/effect/BoxBlurTest.java |   15 +-
 .../scene/effect/BoxBlur_properties_Test.java |   23 +-
 .../javafx/scene/effect/ColorAdjustTest.java  |   10 +-
 .../effect/ColorAdjust_properties_Test.java   |   23 +-
 .../javafx/scene/effect/ColorInputTest.java   |   12 +-
 .../effect/ColorInput_properties_Test.java    |   23 +-
 .../scene/effect/DisplacementMapTest.java     |   18 +-
 .../DisplacementMap_properties_Test.java      |   23 +-
 .../javafx/scene/effect/DistantLightTest.java |   12 +-
 .../effect/DistantLight_properties_Test.java  |   23 +-
 .../javafx/scene/effect/DropShadowTest.java   |   12 +-
 .../effect/DropShadow_properties_Test.java    |   23 +-
 .../javafx/scene/effect/EffectInputTest.java  |   62 +-
 .../test/javafx/scene/effect/EffectTest.java  |   14 +-
 .../javafx/scene/effect/EffectsTestBase.java  |    6 +-
 .../javafx/scene/effect/FloatMapTest.java     |   11 +-
 .../effect/FloatMap_properties_Test.java      |   23 +-
 .../javafx/scene/effect/GaussianBlurTest.java |   10 +-
 .../effect/GaussianBlur_properties_Test.java  |   23 +-
 .../test/javafx/scene/effect/GlowTest.java    |   10 +-
 .../scene/effect/Glow_properties_Test.java    |   23 +-
 .../javafx/scene/effect/ImageInputTest.java   |   12 +-
 .../effect/ImageInput_properties_Test.java    |   23 +-
 .../javafx/scene/effect/InnerShadowTest.java  |   12 +-
 .../effect/InnerShadow_properties_Test.java   |   23 +-
 .../javafx/scene/effect/LightingTest.java     |   20 +-
 .../effect/Lighting_properties_Test.java      |   23 +-
 .../javafx/scene/effect/MotionBlurTest.java   |   10 +-
 .../effect/MotionBlur_properties_Test.java    |   23 +-
 .../effect/PerspectiveTransformTest.java      |   10 +-
 .../PerspectiveTransform_properties_Test.java |   23 +-
 .../javafx/scene/effect/PointLightTest.java   |   10 +-
 .../effect/PointLight_properties_Test.java    |   23 +-
 .../javafx/scene/effect/ReflectionTest.java   |   10 +-
 .../effect/Reflection_properties_Test.java    |   23 +-
 .../javafx/scene/effect/SepiaToneTest.java    |   10 +-
 .../effect/SepiaTone_properties_Test.java     |   23 +-
 .../test/javafx/scene/effect/ShadowTest.java  |   12 +-
 .../scene/effect/Shadow_properties_Test.java  |   23 +-
 .../javafx/scene/effect/SpotLightTest.java    |   16 +-
 .../effect/SpotLight_properties_Test.java     |   23 +-
 .../test/javafx/scene/image/ImageTest.java    |   69 +-
 .../javafx/scene/image/ImageViewTest.java     |   17 +-
 .../image/ImageView_cssMethods_Test.java      |   28 +-
 .../image/ImageView_verifyBounds_Test.java    |   92 +-
 .../image/ImageView_verifyContains_Test.java  |  124 +-
 .../javafx/scene/image/PixelBufferTest.java   |  113 +-
 .../javafx/scene/image/PixelFormatTest.java   |   18 +-
 .../scene/input/ClipboardContentTest.java     |   28 +-
 .../scene/input/ContextMenuEventTest.java     |   88 +-
 .../javafx/scene/input/DataFormatTest.java    |   82 +-
 .../javafx/scene/input/DragAndDropTest.java   |   45 +-
 .../javafx/scene/input/GestureEventTest.java  |   27 +-
 .../javafx/scene/input/InputEventTest.java    |   15 +-
 .../scene/input/InputMethodEventTest.java     |   13 +-
 .../scene/input/InputMethodTextRunTest.java   |   12 +-
 .../test/javafx/scene/input/KeyCodeTest.java  |   10 +-
 .../scene/input/KeyCombinationTest.java       |  199 +-
 .../KeyCombination_objectMethods_Test.java    |  236 +--
 .../test/javafx/scene/input/KeyEventTest.java |   14 +-
 .../scene/input/MouseDragEventTest.java       |   10 +-
 .../javafx/scene/input/MouseEventTest.java    |   36 +-
 .../javafx/scene/input/RotateEventTest.java   |   48 +-
 .../javafx/scene/input/ScrollEventTest.java   |   68 +-
 .../javafx/scene/input/SwipeEventTest.java    |   40 +-
 .../javafx/scene/input/TouchEventTest.java    |  608 +++---
 .../javafx/scene/input/ZoomEventTest.java     |   48 +-
 .../scene/layout/BackgroundFillTest.java      |   40 +-
 .../scene/layout/BackgroundImageTest.java     |   90 +-
 .../scene/layout/BackgroundPositionTest.java  |   33 +-
 .../scene/layout/BackgroundSizeTest.java      |  158 +-
 .../javafx/scene/layout/BackgroundTest.java   |  222 +-
 .../javafx/scene/layout/BaselineTest.java     |   18 +-
 .../javafx/scene/layout/BorderPaneTest.java   |   92 +-
 .../scene/layout/BorderStrokeStyleTest.java   |   67 +-
 .../javafx/scene/layout/BorderStrokeTest.java |    7 +-
 .../test/javafx/scene/layout/BorderTest.java  |  210 +-
 .../javafx/scene/layout/BorderWidthsTest.java |  114 +-
 .../javafx/scene/layout/FlowPaneTest.java     |   12 +-
 .../javafx/scene/layout/GridPaneTest.java     |   20 +-
 .../test/javafx/scene/layout/HBoxTest.java    |  142 +-
 .../javafx/scene/layout/RegionCSSTest.java    |  683 +++---
 .../javafx/scene/layout/RegionPickTest.java   |   75 +-
 .../test/javafx/scene/layout/RegionTest.java  |  316 ++-
 .../javafx/scene/layout/ResizabilityTest.java |   88 +-
 .../javafx/scene/layout/StackPaneTest.java    |   98 +-
 .../javafx/scene/layout/TilePaneTest.java     |  210 +-
 .../test/javafx/scene/layout/VBoxTest.java    |  127 +-
 .../test/javafx/scene/paint/ColorTest.java    |  176 +-
 .../javafx/scene/paint/ImagePatternTest.java  |   16 +-
 .../scene/paint/LinearGradientTest.java       |   42 +-
 .../javafx/scene/paint/PhongMaterialTest.java |    7 +-
 .../scene/paint/RadialGradientTest.java       |   42 +-
 .../test/javafx/scene/paint/StopListTest.java |    7 +-
 .../test/javafx/scene/paint/StopTest.java     |   12 +-
 .../java/test/javafx/scene/shape/ArcTest.java |   55 +-
 .../test/javafx/scene/shape/ArcToTest.java    |   38 +-
 .../scene/shape/ArcTo_onInvalidate_Test.java  |   39 +-
 .../scene/shape/ArcTo_properties_Test.java    |   23 +-
 .../scene/shape/Arc_onInvalidate_Test.java    |   38 +-
 .../scene/shape/Arc_properties_Test.java      |   23 +-
 .../test/javafx/scene/shape/BoundsTest.java   |   33 +-
 .../java/test/javafx/scene/shape/BoxTest.java |    8 +-
 .../test/javafx/scene/shape/CircleTest.java   |   35 +-
 .../scene/shape/Circle_onInvalidate_Test.java |   32 +-
 .../scene/shape/Circle_properties_Test.java   |   23 +-
 .../javafx/scene/shape/ClosePathTest.java     |   14 +-
 .../javafx/scene/shape/CubicCurveTest.java    |    8 +-
 .../javafx/scene/shape/CubicCurveToTest.java  |   44 +-
 .../shape/CubicCurveTo_onInvalidate_Test.java |   37 +-
 .../shape/CubicCurveTo_properties_Test.java   |   23 +-
 .../shape/CubicCurve_onInvalidate_Test.java   |   40 +-
 .../shape/CubicCurve_properties_Test.java     |   23 +-
 .../test/javafx/scene/shape/CylinderTest.java |    8 +-
 .../test/javafx/scene/shape/EllipseTest.java  |   40 +-
 .../shape/Ellipse_onInvalidate_Test.java      |   32 +-
 .../scene/shape/Ellipse_properties_Test.java  |   23 +-
 .../test/javafx/scene/shape/HLineToTest.java  |   17 +-
 .../shape/HLineTo_onInvalidate_Test.java      |   26 +-
 .../scene/shape/HLineTo_properties_Test.java  |   23 +-
 .../test/javafx/scene/shape/LineTest.java     |   23 +-
 .../test/javafx/scene/shape/LineToTest.java   |   20 +-
 .../scene/shape/LineTo_onInvalidate_Test.java |   28 +-
 .../scene/shape/LineTo_properties_Test.java   |   23 +-
 .../scene/shape/Line_onInvalidate_Test.java   |   32 +-
 .../scene/shape/Line_properties_Test.java     |   25 +-
 .../test/javafx/scene/shape/MoveToTest.java   |   26 +-
 .../scene/shape/MoveTo_onInvalidate_Test.java |   28 +-
 .../scene/shape/MoveTo_properties_Test.java   |   23 +-
 .../test/javafx/scene/shape/PathTest.java     |   40 +-
 .../scene/shape/Path_onInvalidate_Test.java   |   26 +-
 .../scene/shape/Path_properties_Test.java     |   23 +-
 .../test/javafx/scene/shape/PolygonTest.java  |   36 +-
 .../test/javafx/scene/shape/PolylineTest.java |   37 +-
 .../shape/PredefinedMeshManagerTest.java      |   14 +-
 .../javafx/scene/shape/QuadCurveTest.java     |   50 +-
 .../javafx/scene/shape/QuadCurveToTest.java   |   32 +-
 .../shape/QuadCurveTo_properties_Test.java    |   23 +-
 .../shape/QuadCurve_onInvalidate_Test.java    |   36 +-
 .../shape/QuadCurve_properties_Test.java      |   23 +-
 .../javafx/scene/shape/RectangleTest.java     |   49 +-
 .../shape/Rectangle_cssMethods_Test.java      |   21 +-
 .../shape/Rectangle_onInvalidate_Test.java    |   36 +-
 .../shape/Rectangle_properties_Test.java      |   23 +-
 .../test/javafx/scene/shape/SVGPathTest.java  |   17 +-
 .../shape/SVGPath_onInvalidate_Test.java      |   28 +-
 .../scene/shape/SVGPath_properties_Test.java  |   23 +-
 .../scene/shape/Shape3D_properties_Test.java  |   33 +-
 .../test/javafx/scene/shape/ShapeTest.java    |   59 +-
 .../scene/shape/Shape_cssMethods_Test.java    |   21 +-
 .../scene/shape/Shape_onInvalidate_Test.java  |   41 +-
 .../scene/shape/Shape_properties_Test.java    |   27 +-
 .../test/javafx/scene/shape/SphereTest.java   |    8 +-
 .../test/javafx/scene/shape/TestUtils.java    |    7 +-
 .../javafx/scene/shape/TriangleMeshTest.java  |  402 ++--
 .../test/javafx/scene/shape/VLineToTest.java  |   17 +-
 .../shape/VLineTo_onInvalidate_Test.java      |   26 +-
 .../scene/shape/VLineTo_properties_Test.java  |   23 +-
 .../javafx/scene/text/FontPostureTest.java    |    6 +-
 .../java/test/javafx/scene/text/FontTest.java |   14 +-
 .../javafx/scene/text/FontWeightTest.java     |    6 +-
 .../test/javafx/scene/text/TextFlowTest.java  |   11 +-
 .../java/test/javafx/scene/text/TextTest.java |   92 +-
 .../scene/text/Text_cssMethods_Test.java      |   21 +-
 .../scene/text/Text_onInvalidate_Test.java    |   46 +-
 .../scene/transform/AffineOperationsTest.java | 1490 +++++++------
 .../javafx/scene/transform/AffineTest.java    |  406 ++--
 .../transform/Affine_onInvalidate_Test.java   |   44 +-
 .../scene/transform/MatrixTypeTest.java       |    9 +-
 .../javafx/scene/transform/RotateTest.java    |   36 +-
 .../transform/Rotate_onInvalidate_Test.java   |   32 +-
 .../javafx/scene/transform/ScaleTest.java     |   13 +-
 .../transform/Scale_onInvalidate_Test.java    |   36 +-
 .../javafx/scene/transform/ShearTest.java     |   22 +-
 .../transform/Shear_onInvalidate_Test.java    |   32 +-
 .../transform/TransformChangedEventTest.java  |    6 +-
 .../scene/transform/TransformDeriveTest.java  |  243 +--
 .../transform/TransformOperationsTest.java    | 1864 +++++++++++------
 .../javafx/scene/transform/TransformTest.java |   12 +-
 .../transform/Transform_properties_Test.java  |   29 +-
 .../javafx/scene/transform/TranslateTest.java |   12 +-
 .../Translate_onInvalidate_Test.java          |   30 +-
 .../test/javafx/stage/CommonDialogsTest.java  |   73 +-
 .../java/test/javafx/stage/PopupTest.java     |   96 +-
 .../javafx/stage/Popup_parentWindow_Test.java |   27 +-
 .../java/test/javafx/stage/ScreenTest.java    |   14 +-
 .../javafx/stage/StageMutabilityTest.java     |   43 +-
 .../java/test/javafx/stage/StageTest.java     |   53 +-
 .../test/javafx/stage/WindowEventTest.java    |   12 +-
 .../java/test/javafx/stage/WindowTest.java    |   48 +-
 .../test/java/test/rt_5300/rt_5300Test.java   |   16 +-
 .../test/java/test/rt_6334/rt_6334Test.java   |   22 +-
 .../scenario/effect/compiler/SymbolTest.java  |   32 +-
 .../effect/compiler/lexer/BoolTest.java       |   12 +-
 .../effect/compiler/lexer/CommentTest.java    |   11 +-
 .../effect/compiler/lexer/FloatTest.java      |   11 +-
 .../effect/compiler/lexer/IdentifierTest.java |   24 +-
 .../effect/compiler/lexer/IntegerTest.java    |    9 +-
 .../effect/compiler/lexer/LexerBase.java      |   17 +-
 .../compiler/lexer/LineCommentTest.java       |    9 +-
 .../effect/compiler/lexer/TypeTest.java       |   33 +-
 .../effect/compiler/lexer/WhitespaceTest.java |   13 +-
 .../effect/compiler/parser/AddExprTest.java   |   28 +-
 .../compiler/parser/AssignmentExprTest.java   |   47 +-
 .../compiler/parser/EqualityExprTest.java     |   21 +-
 .../parser/ExternalDeclarationTest.java       |   30 +-
 .../compiler/parser/FieldSelectTest.java      |   69 +-
 .../parser/FullySpecifiedTypeTest.java        |   24 +-
 .../parser/IterationStatementTest.java        |   30 +-
 .../compiler/parser/JumpStatementTest.java    |   32 +-
 .../effect/compiler/parser/MultExprTest.java  |   28 +-
 .../compiler/parser/PrimaryExprTest.java      |   34 +-
 .../compiler/parser/RelationalExprTest.java   |   25 +-
 .../parser/SelectionStatementTest.java        |   22 +-
 .../effect/compiler/parser/UnaryExprTest.java |   36 +-
 410 files changed, 12216 insertions(+), 9815 deletions(-)

diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/BooleanTypeTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/BooleanTypeTest.java
index a8ef41a410b..54174e02269 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/BooleanTypeTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/BooleanTypeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,11 +26,11 @@
 package test.com.sun.javafx.css;
 
 import com.sun.javafx.css.ParsedValueImpl;
-import static org.junit.Assert.assertEquals;
 import javafx.css.ParsedValue;
 import javafx.scene.text.Font;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import javafx.css.converter.BooleanConverter;
 
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/CursorTypeTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/CursorTypeTest.java
index 6498788916b..6c8f65b7857 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/CursorTypeTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/CursorTypeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,12 +26,12 @@
 package test.com.sun.javafx.css;
 
 import com.sun.javafx.css.ParsedValueImpl;
-import static org.junit.Assert.*;
 import javafx.css.ParsedValue;
 import javafx.scene.Cursor;
 import javafx.scene.text.Font;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import javafx.css.converter.CursorConverter;
 
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/EffectTypeTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/EffectTypeTest.java
index 9628993d543..0c05199d036 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/EffectTypeTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/EffectTypeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 package test.com.sun.javafx.css;
 
 import com.sun.javafx.css.ParsedValueImpl;
-import static org.junit.Assert.assertEquals;
 import javafx.css.ParsedValue;
 import javafx.css.Size;
 import javafx.css.SizeUnits;
@@ -37,7 +36,8 @@
 import javafx.scene.paint.Color;
 import javafx.scene.text.Font;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import javafx.css.converter.EffectConverter;
 import javafx.css.converter.DeriveColorConverter;
@@ -124,29 +124,29 @@ ParsedValue<ParsedValue[], Effect> getDropShadowValue(DropShadow ds, boolean col
         return new ParsedValueImpl<>(vals, EffectConverter.DropShadowConverter.getInstance());
     }
 
-    void checkColor(String msg, Color c1, Color c2) {
-        assertEquals(msg + ".red", c1.getRed(), c2.getRed(), 0.001);
-        assertEquals(msg + ".blue", c1.getBlue(), c2.getBlue(), 0.001);
-        assertEquals(msg + ".green", c1.getGreen(), c2.getGreen(), 0.001);
-        assertEquals(msg + ".opacity", c1.getOpacity(), c2.getOpacity(), 0.001);
+    void checkColor(Color c1, Color c2, String msg) {
+        assertEquals(c1.getRed(), c2.getRed(), 0.001, msg + ".red");
+        assertEquals(c1.getBlue(), c2.getBlue(), 0.001, msg + ".blue");
+        assertEquals(c1.getGreen(), c2.getGreen(), 0.001, msg + ".green");
+        assertEquals(c1.getOpacity(), c2.getOpacity(), 0.001, msg + ".opacity");
     }
 
     void checkInnerShadow(String msg, InnerShadow o1, InnerShadow o2) {
-        assertEquals(msg + "innershadow.offsetX", o1.getOffsetX(), o2.getOffsetX(), 0.001);
-        assertEquals(msg + "innershadow.offsety", o1.getOffsetY(), o2.getOffsetY(), 0.001);
-        assertEquals(msg + "innershadow.choke", o1.getChoke(), o2.getChoke(), 0.001);
-        assertEquals(msg + "innershadow.radius", o1.getRadius(), o2.getRadius(), 0.001);
-        checkColor(msg + "innershadow", o1.getColor(), o2.getColor());
-        assertEquals(msg + "innershadow.blurType", o1.getBlurType(), o2.getBlurType());
+        assertEquals(o1.getOffsetX(), o2.getOffsetX(), 0.001, msg + "innershadow.offsetX");
+        assertEquals(o1.getOffsetY(), o2.getOffsetY(), 0.001, msg + "innershadow.offsety");
+        assertEquals(o1.getChoke(), o2.getChoke(), 0.001, msg + "innershadow.choke");
+        assertEquals(o1.getRadius(), o2.getRadius(), 0.001, msg + "innershadow.radius");
+        checkColor(o1.getColor(), o2.getColor(), msg + "innershadow");
+        assertEquals(o1.getBlurType(), o2.getBlurType(), msg + "innershadow.blurType");
     }
 
     void checkDropShadow(String msg, DropShadow o1, DropShadow o2) {
-        assertEquals(msg + "DropShadow.offsetX", o1.getOffsetX(), o2.getOffsetX(), 0.001);
-        assertEquals(msg + "DropShadow.offsety", o1.getOffsetY(), o2.getOffsetY(), 0.001);
-        assertEquals(msg + "DropShadow.spread", o1.getSpread(), o2.getSpread(), 0.001);
-        assertEquals(msg + "DropShadow.radius", o1.getRadius(), o2.getRadius(), 0.001);
-        checkColor(msg + "DropShadow", o1.getColor(), o2.getColor());
-        assertEquals(msg + "DropShadow.blurType", o1.getBlurType(), o2.getBlurType());
+        assertEquals(o1.getOffsetX(), o2.getOffsetX(), 0.001, msg + "DropShadow.offsetX");
+        assertEquals(o1.getOffsetY(), o2.getOffsetY(), 0.001, msg + "DropShadow.offsety");
+        assertEquals(o1.getSpread(), o2.getSpread(), 0.001, msg + "DropShadow.spread");
+        assertEquals(o1.getRadius(), o2.getRadius(), 0.001, msg + "DropShadow.radius");
+        checkColor(o1.getColor(), o2.getColor(), msg + "DropShadow");
+        assertEquals(o1.getBlurType(), o2.getBlurType(), msg + "DropShadow.blurType");
     }
 
     /**
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/EnumTypeTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/EnumTypeTest.java
index 994bb1893b6..a624a8e66dc 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/EnumTypeTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/EnumTypeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,14 +26,14 @@
 package test.com.sun.javafx.css;
 
 import com.sun.javafx.css.ParsedValueImpl;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
 import javafx.css.ParsedValue;
 import javafx.css.SizeUnits;
 import javafx.css.StyleConverter;
 import javafx.scene.text.Font;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import javafx.css.converter.EnumConverter;
 
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/FontSizeTypeTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/FontSizeTypeTest.java
index 05c98efe04a..7d627dd5e64 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/FontSizeTypeTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/FontSizeTypeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,8 +32,9 @@
 import javafx.css.SizeUnits;
 import javafx.css.SizeUnitsShim;
 import javafx.scene.text.Font;
-import static org.junit.Assert.assertEquals;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 
 public class FontSizeTypeTest {
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/PseudoClassTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/PseudoClassTest.java
index 67b4d8a5158..55cb06479ae 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/PseudoClassTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/PseudoClassTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,12 +38,19 @@
 import javafx.collections.ObservableSet;
 import javafx.collections.SetChangeListener;
 import javafx.css.PseudoClass;
-import static org.junit.Assert.*;
 
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  *
@@ -70,21 +77,21 @@ public class PseudoClassTest {
      * that happen to use a broken pseudo-class instance to fail undeterministically,
      * depending on whether or not they are executed before or after this class.
      */
-    @BeforeClass
-    public static void beforeClass() {
+    @BeforeAll
+    public static void beforeAll() {
         initialPseudoClassMap = new HashMap<>(PseudoClassStateShim.pseudoClassMap);
         initialPseudoClasses = new ArrayList<>(PseudoClassStateShim.pseudoClasses);
     }
 
-    @AfterClass
-    public static void afterClass() {
+    @AfterAll
+    public static void afterAll() {
         PseudoClassStateShim.pseudoClassMap.clear();
         PseudoClassStateShim.pseudoClassMap.putAll(initialPseudoClassMap);
         PseudoClassStateShim.pseudoClasses.clear();
         PseudoClassStateShim.pseudoClasses.addAll(initialPseudoClasses);
     }
 
-    @Before
+    @BeforeEach
     public void before() {
         PseudoClassStateShim.pseudoClassMap.clear();
         PseudoClassStateShim.pseudoClasses.clear();
@@ -771,13 +778,13 @@ public void testPseudoClassState_toString() {
         while(iter.hasNext()) {
 
             iterations += 1;
-            assertTrue (iterations+">"+pseudoClasses.length, iterations <= pseudoClasses.length);
+            assertTrue (iterations <= pseudoClasses.length, iterations+">"+pseudoClasses.length);
 
             PseudoClass pseudoClass = iter.next();
             assertEquals (pseudoClass, pseudoClasses[iterations-1]);
         }
 
-        assertTrue (pseudoClasses.length+"!="+iterations, pseudoClasses.length == iterations);
+        assertTrue (pseudoClasses.length == iterations, pseudoClasses.length+"!="+iterations);
 
     }
 
@@ -796,13 +803,13 @@ public void testPseudoClassState_toString() {
         while(iter.hasNext()) {
 
             iterations += 1;
-            assertTrue (iterations+">"+pseudoClasses.length, iterations <= pseudoClasses.length);
+            assertTrue (iterations <= pseudoClasses.length, iterations+">"+pseudoClasses.length);
 
             PseudoClass pseudoClass = iter.next();
             assertEquals (pseudoClass, pseudoClasses[iterations-1]);
         }
 
-        assertTrue (pseudoClasses.length+"!="+iterations, pseudoClasses.length == iterations);
+        assertTrue (pseudoClasses.length == iterations, pseudoClasses.length+"!="+iterations);
 
     }
 
@@ -830,7 +837,7 @@ public void testPseudoClassState_toString() {
             }
         }
 
-        assertTrue (nPseudoClasses+"!="+BitSetShim.size(states), nPseudoClasses == BitSetShim.size(states));
+        assertTrue (nPseudoClasses == BitSetShim.size(states), nPseudoClasses+"!="+BitSetShim.size(states));
 
     }
 
@@ -858,7 +865,7 @@ public void testPseudoClassState_toString() {
             }
         }
 
-        assertTrue (nPseudoClasses+"!="+BitSetShim.size(states), nPseudoClasses == BitSetShim.size(states));
+        assertTrue (nPseudoClasses == BitSetShim.size(states), nPseudoClasses+"!="+BitSetShim.size(states));
 
     }
 
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/SizeTypeTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/SizeTypeTest.java
index 4eb8704caa5..42c631447e2 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/SizeTypeTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/SizeTypeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 package test.com.sun.javafx.css;
 
 import com.sun.javafx.css.ParsedValueImpl;
-import static org.junit.Assert.assertEquals;
 
 import javafx.css.ParsedValue;
 import javafx.css.Size;
@@ -34,8 +33,8 @@
 import javafx.css.StyleConverter;
 import javafx.scene.text.Font;
 
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 
 public class SizeTypeTest {
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/StringTypeTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/StringTypeTest.java
index d462a49896a..7be6fd84294 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/StringTypeTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/StringTypeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,10 +30,11 @@
 import javafx.css.ParsedValue;
 import javafx.css.StyleConverter;
 import javafx.scene.text.Font;
-import org.junit.AfterClass;
-import static org.junit.Assert.assertEquals;
-import org.junit.BeforeClass;
-import org.junit.Test;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 
 public class StringTypeTest {
@@ -41,11 +42,11 @@ public class StringTypeTest {
     public StringTypeTest() {
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() throws Exception {
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDownClass() throws Exception {
     }
 
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/StyleManagerTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/StyleManagerTest.java
index c1dc02428a5..6241ac3c5bf 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/StyleManagerTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/StyleManagerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,9 +43,6 @@
 import javafx.scene.paint.Color;
 import javafx.scene.paint.Paint;
 import javafx.scene.shape.Rectangle;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.Test;
 
 import java.net.URL;
 import java.util.ArrayList;
@@ -55,7 +52,14 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  *
@@ -75,12 +79,12 @@ private static void resetStyleManager() {
         sm.set_hasDefaultUserAgentStylesheet(false);
     }
 
-    @Before
+    @BeforeEach
     public void setUp() {
         resetStyleManager();
     }
 
-    @AfterClass
+    @AfterAll
     public static void cleanupOnce() {
         resetStyleManager();
     }
@@ -1109,7 +1113,7 @@ public void testConcurrentAccess() {
             fail("Unexpected exception waiting for threads to finish");
         }
 
-        assertFalse("Exception during CSS processing on BG thread", err.get());
+        assertFalse(err.get(), "Exception during CSS processing on BG thread");
     }
 
     @Test
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/URLTypeTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/URLTypeTest.java
index e10ea62b438..fbe93286b46 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/URLTypeTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/URLTypeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,11 +26,11 @@
 package test.com.sun.javafx.css;
 
 import com.sun.javafx.css.ParsedValueImpl;
-import static org.junit.Assert.assertEquals;
 import javafx.css.ParsedValue;
 import javafx.scene.text.Font;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import javafx.css.converter.StringConverter;
 import javafx.css.converter.URLConverter;
@@ -101,7 +101,7 @@ public void testConvert() {
         assertEquals(testPairs.length, result.length);
         for(int n=0; n<result.length; n++) {
             String msg = "[" + n + "]" + "resolve \'" + testPairs[n][0] + "\'";
-            assertEquals(msg, testPairs[n][1], result[n]);
+            assertEquals(testPairs[n][1], result[n], msg);
         }
     }
 
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/converters/URLConverterTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/converters/URLConverterTest.java
index d56504aa3c7..78bfd7fc0ca 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/converters/URLConverterTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/converters/URLConverterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,9 +30,10 @@
 import javafx.scene.text.Font;
 import com.sun.javafx.css.ParsedValueImpl;
 import javafx.css.converter.URLConverter;
-import org.junit.Test;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 
 public class URLConverterTest {
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/font/PrismFontFactoryTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/font/PrismFontFactoryTest.java
index f45e7e4b1cf..919e88add9d 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/font/PrismFontFactoryTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/font/PrismFontFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,13 +31,9 @@
 package test.com.sun.javafx.font;
 
 import com.sun.javafx.font.PrismFontFactory;
-import org.junit.After;
-import org.junit.AfterClass;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 /**
  *
@@ -47,22 +43,6 @@ public class PrismFontFactoryTest {
     public PrismFontFactoryTest() {
     }
 
-    @BeforeClass
-    public static void setUpClass() throws Exception {
-    }
-
-    @AfterClass
-    public static void tearDownClass() throws Exception {
-    }
-
-    @Before
-    public void setUp() {
-    }
-
-    @After
-    public void tearDown() {
-    }
-
     /**
      * Test of getFontFactory method.
      */
@@ -70,9 +50,9 @@ public void tearDown() {
     public void testGetFontFactory() {
         PrismFontFactory expResult = null;
         PrismFontFactory result = PrismFontFactory.getFontFactory();
-        assertNotNull("Should never turn null", result);
+        assertNotNull(result, "Should never turn null");
         expResult = PrismFontFactory.getFontFactory();
-        assertEquals("Creates different instance of FontFactory", expResult, result);
+        assertEquals(expResult, result, "Creates different instance of FontFactory");
     }
 
 }
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/geom/BaseBoundsTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/geom/BaseBoundsTest.java
index 7a314145365..ec3322debb4 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/geom/BaseBoundsTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/geom/BaseBoundsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,11 +28,11 @@
 import com.sun.javafx.geom.BoxBounds;
 import com.sun.javafx.geom.RectBounds;
 import com.sun.javafx.geom.Rectangle;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class BaseBoundsTest {
 
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/geom/DirtyRegionContainerTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/geom/DirtyRegionContainerTest.java
index 9e90cea82ca..7c19752cd6b 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/geom/DirtyRegionContainerTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/geom/DirtyRegionContainerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,8 +27,11 @@
 
 import com.sun.javafx.geom.DirtyRegionContainer;
 import com.sun.javafx.geom.RectBounds;
-import junit.framework.Assert;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class DirtyRegionContainerTest {
 
@@ -41,14 +44,14 @@ public class DirtyRegionContainerTest {
     @Test
     public void test_maxSpace() {
         DirtyRegionContainer drc = new DirtyRegionContainer(10);
-        Assert.assertEquals(10, drc.maxSpace());
+        assertEquals(10, drc.maxSpace());
     }
 
     @Test
     public void test_size() {
         DirtyRegionContainer drc = new DirtyRegionContainer(5);
         drc.deriveWithNewRegions(nonIntersecting_3_Regions);
-        Assert.assertEquals(3, drc.size());
+        assertEquals(3, drc.size());
     }
 
     @Test
@@ -57,7 +60,7 @@ public void test_deriveWithNewBounds() {
         drc.deriveWithNewRegions(nonIntersecting_3_Regions);
         for (int i = 0; i < drc.size(); i++) {
             RectBounds rb = drc.getDirtyRegion(i);
-            Assert.assertEquals(nonIntersecting_3_Regions[i], rb);
+            assertEquals(nonIntersecting_3_Regions[i], rb);
         }
     }
 
@@ -67,7 +70,7 @@ public void test_deriveWithNewBounds_null() {
         drc.deriveWithNewRegions(null);
         for (int i = 0; i < drc.size(); i++) {
             RectBounds rb = drc.getDirtyRegion(i);
-            Assert.assertEquals(nonIntersecting_3_Regions[i], rb);
+            assertEquals(nonIntersecting_3_Regions[i], rb);
         }
     }
 
@@ -77,7 +80,7 @@ public void test_deriveWithNewBounds_zero_length () {
         drc.deriveWithNewRegions(new RectBounds[]{});
         for (int i = 0; i < drc.size(); i++) {
             RectBounds rb = drc.getDirtyRegion(i);
-            Assert.assertEquals(nonIntersecting_3_Regions[i], rb);
+            assertEquals(nonIntersecting_3_Regions[i], rb);
         }
     }
 
@@ -93,7 +96,7 @@ public void test_deriveWithNewBounds_biger_length () {
         drc.deriveWithNewRegions(arry);
         for (int i = 0; i < drc.size(); i++) {
             RectBounds rb = drc.getDirtyRegion(i);
-            Assert.assertEquals(arry[i], rb);
+            assertEquals(arry[i], rb);
         }
     }
 
@@ -101,22 +104,23 @@ public void test_deriveWithNewBounds_biger_length () {
     public void test_copy() {
         DirtyRegionContainer drc = getDRC_initialized();
         DirtyRegionContainer copyDrc = drc.copy();
-        Assert.assertTrue(copyDrc != drc);
-        Assert.assertEquals(copyDrc, drc);
+        assertTrue(copyDrc != drc);
+        assertEquals(copyDrc, drc);
     }
 
     @Test
     public void test_getDirtyRegion() {
         DirtyRegionContainer drc = getDRC_initialized();
         RectBounds dr = drc.getDirtyRegion(1);
-        Assert.assertEquals(new RectBounds(25, 25, 50, 50), dr);
+        assertEquals(new RectBounds(25, 25, 50, 50), dr);
     }
 
-    @Test (expected=ArrayIndexOutOfBoundsException.class)
+    @Test
     public void test_getDirtyRegion_AIOOBE() {
-        DirtyRegionContainer drc = getDRC_initialized();
-        RectBounds dr = drc.getDirtyRegion(10);
-        Assert.fail("Expected AIOOBE");
+        assertThrows(ArrayIndexOutOfBoundsException.class, () -> {
+            DirtyRegionContainer drc = getDRC_initialized();
+            RectBounds dr = drc.getDirtyRegion(10);
+        });
     }
 
     @Test
@@ -125,11 +129,11 @@ public void test_addDirtyRegion_non_intersecting() {
         RectBounds newregion = new RectBounds(150, 150, 200, 200);
         drc.addDirtyRegion(newregion);
 
-        Assert.assertEquals(4, drc.size());
+        assertEquals(4, drc.size());
         for(int i = 0; i < drc.size() - 1; i++) {
-            Assert.assertEquals(nonIntersecting_3_Regions[i], (drc.getDirtyRegion(i)));
+            assertEquals(nonIntersecting_3_Regions[i], (drc.getDirtyRegion(i)));
         }
-        Assert.assertEquals(drc.getDirtyRegion(drc.size() - 1), newregion);
+        assertEquals(drc.getDirtyRegion(drc.size() - 1), newregion);
     }
 
     @Test
@@ -138,10 +142,10 @@ public void test_addDirtyRegion_has_space_intersect_once() {
 
         drc.addDirtyRegion(new RectBounds(10, 10, 22, 15));
 
-        Assert.assertEquals(3, drc.size());
-        Assert.assertEquals(new RectBounds(60, 60, 100, 100), drc.getDirtyRegion(0));
-        Assert.assertEquals(new RectBounds(25, 25, 50, 50), drc.getDirtyRegion(1));
-        Assert.assertEquals(new RectBounds(0, 0, 22, 20), drc.getDirtyRegion(2));
+        assertEquals(3, drc.size());
+        assertEquals(new RectBounds(60, 60, 100, 100), drc.getDirtyRegion(0));
+        assertEquals(new RectBounds(25, 25, 50, 50), drc.getDirtyRegion(1));
+        assertEquals(new RectBounds(0, 0, 22, 20), drc.getDirtyRegion(2));
     }
 
     @Test
@@ -150,9 +154,9 @@ public void test_addDirtyRegion_has_space_intersect_twice() {
 
         drc.addDirtyRegion(new RectBounds(10, 10, 40, 40));
 
-        Assert.assertEquals(2, drc.size());
-        Assert.assertEquals(new RectBounds(60, 60, 100, 100), drc.getDirtyRegion(0));
-        Assert.assertEquals(new RectBounds(0, 0, 50, 50), drc.getDirtyRegion(1));
+        assertEquals(2, drc.size());
+        assertEquals(new RectBounds(60, 60, 100, 100), drc.getDirtyRegion(0));
+        assertEquals(new RectBounds(0, 0, 50, 50), drc.getDirtyRegion(1));
     }
 
     @Test
@@ -160,8 +164,8 @@ public void test_addDirtyRegion_has_space_intersect_all() {
         DirtyRegionContainer drc = getDRC_initialized();
         drc.addDirtyRegion(new RectBounds(10, 10, 80, 80));
 
-        Assert.assertEquals(1, drc.size());
-        Assert.assertEquals(new RectBounds(0, 0, 100, 100), drc.getDirtyRegion(0));
+        assertEquals(1, drc.size());
+        assertEquals(new RectBounds(0, 0, 100, 100), drc.getDirtyRegion(0));
     }
 
     @Test
@@ -171,11 +175,11 @@ public void test_addDirtyRegion_no_space_intersect_once() {
 
         drc.addDirtyRegion(new RectBounds(10, 10, 22, 15));
 
-        Assert.assertEquals(4, drc.size());
-        Assert.assertEquals(new RectBounds(120, 120, 150, 150), drc.getDirtyRegion(0));
-        Assert.assertEquals(new RectBounds(25, 25, 50, 50), drc.getDirtyRegion(1));
-        Assert.assertEquals(new RectBounds(60, 60, 100, 100), drc.getDirtyRegion(2));
-        Assert.assertEquals(new RectBounds(0, 0, 22, 20), drc.getDirtyRegion(3));
+        assertEquals(4, drc.size());
+        assertEquals(new RectBounds(120, 120, 150, 150), drc.getDirtyRegion(0));
+        assertEquals(new RectBounds(25, 25, 50, 50), drc.getDirtyRegion(1));
+        assertEquals(new RectBounds(60, 60, 100, 100), drc.getDirtyRegion(2));
+        assertEquals(new RectBounds(0, 0, 22, 20), drc.getDirtyRegion(3));
     }
 
     @Test
@@ -185,10 +189,10 @@ public void test_addDirtyRegion_no_space_intersect_twice() {
 
         drc.addDirtyRegion(new RectBounds(10, 10, 40, 40));
 
-        Assert.assertEquals(3, drc.size());
-        Assert.assertEquals(new RectBounds(120, 120, 150, 150), drc.getDirtyRegion(0));
-        Assert.assertEquals(new RectBounds(60, 60, 100, 100), drc.getDirtyRegion(1));
-        Assert.assertEquals(new RectBounds(0, 0, 50, 50), drc.getDirtyRegion(2));
+        assertEquals(3, drc.size());
+        assertEquals(new RectBounds(120, 120, 150, 150), drc.getDirtyRegion(0));
+        assertEquals(new RectBounds(60, 60, 100, 100), drc.getDirtyRegion(1));
+        assertEquals(new RectBounds(0, 0, 50, 50), drc.getDirtyRegion(2));
     }
 
     private DirtyRegionContainer getDRC_initialized() {
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/geom/Path2DGrowTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/geom/Path2DGrowTest.java
index 7fbd05f022a..0741461455c 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/geom/Path2DGrowTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/geom/Path2DGrowTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,11 @@
 package test.com.sun.javafx.geom;
 
 import com.sun.javafx.geom.Path2D;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+
+import java.util.concurrent.TimeUnit;
 
 /**
  * @test
@@ -81,13 +85,15 @@ static void log(String msg) {
         }
     }
 
-    @Test(timeout=10000)
+    @Test
+    @Timeout(value=10000, unit=TimeUnit.MILLISECONDS)
     public void testEmptyFloatPaths() {
         echo("\n - Test: new Path2D(0) ---");
         test(() -> new Path2D(Path2D.WIND_NON_ZERO, 0));
     }
 
-    @Test(timeout=10000)
+    @Test
+    @Timeout(value=10000, unit=TimeUnit.MILLISECONDS)
     public void testFloatPaths() {
         echo("\n - Test: new Path2D() ---");
         test(() -> new Path2D());
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/geom/Path2DTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/geom/Path2DTest.java
index 70d68aa9c09..5a371909dec 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/geom/Path2DTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/geom/Path2DTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,11 +33,11 @@
 import com.sun.javafx.geom.RectBounds;
 import com.sun.javafx.geom.Shape;
 import com.sun.javafx.geom.transform.BaseTransform;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class Path2DTest {
     void checkLine(PathIterator pi, float x1, float y1, float x2, float y2) {
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/geom/TransformedShapeTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/geom/TransformedShapeTest.java
index 2cffe8284aa..dca0947da49 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/geom/TransformedShapeTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/geom/TransformedShapeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,9 +34,10 @@
 import com.sun.javafx.geom.RoundRectangle2D;
 import com.sun.javafx.geom.Shape;
 import com.sun.javafx.geom.TransformedShape;
-import static junit.framework.Assert.assertEquals;
 import com.sun.javafx.geom.transform.BaseTransform;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  *
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/geom/Vec3dTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/geom/Vec3dTest.java
index c784ec38a6d..9a02bdd390f 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/geom/Vec3dTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/geom/Vec3dTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,9 +27,9 @@
 
 import com.sun.javafx.geom.Vec3d;
 import com.sun.javafx.geom.Vec3f;
-import org.junit.Test;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * PRELIMINARY unit tests for Vec3d.
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/geom/transform/BaseTransformTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/geom/transform/BaseTransformTest.java
index 6623d89a4ef..54ceccf4c87 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/geom/transform/BaseTransformTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/geom/transform/BaseTransformTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,8 +31,9 @@
 import com.sun.javafx.geom.transform.BaseTransform;
 import com.sun.javafx.geom.transform.Identity;
 import com.sun.javafx.geom.transform.Translate2D;
-import org.junit.Test;
-import static org.junit.Assert.*;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  *
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/geom/transform/GeneralTransform3DTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/geom/transform/GeneralTransform3DTest.java
index c00783679b9..0f99e81d7f1 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/geom/transform/GeneralTransform3DTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/geom/transform/GeneralTransform3DTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,10 +29,11 @@
 import com.sun.javafx.geom.transform.GeneralTransform3D;
 import com.sun.javafx.geom.Vec3d;
 import com.sun.javafx.geom.Vec3f;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import org.junit.BeforeClass;
-import org.junit.Test;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 /**
  * This Unit Test covers GeneralTransform3D and some of its calculations.
@@ -66,7 +67,7 @@ private void equals(Vec3f vec1, Vec3f vec2) {
         assertEquals(vec1.z, vec2.z, delta);
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
         generalTransform3D.set(mat);
     }
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/iio/GIFLoaderTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/iio/GIFLoaderTest.java
index 3cec4bcde86..e1dfa67d58c 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/iio/GIFLoaderTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/iio/GIFLoaderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,8 +31,15 @@
 import com.sun.javafx.iio.gif.GIFImageLoader2;
 import java.awt.image.*;
 import java.io.*;
-import static org.junit.Assert.*;
-import org.junit.Test;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 
 class TestStream extends InputStream {
@@ -53,14 +60,9 @@ public class GIFLoaderTest {
 
     @Test
     public void testCtorNPE() {
-        try {
+        assertThrows(NullPointerException.class, () -> {
             new GIFImageLoader2(null);
-        } catch (NullPointerException ex) {
-           return; // PASSED
-        } catch (IOException ioEx) {
-            fail("unexpected IOException:" + ioEx.toString());
-        }
-        fail("expected NPE after constructor invocation with null");
+        });
     }
 
 
@@ -71,14 +73,9 @@ public void testCtorReadBadHeader1()  {
             0,1,2,3,4
         };
 
-        try {
+        assertThrows(EOFException.class, () -> {
             new GIFImageLoader2(new TestStream(tooShortHeaderData));
-        } catch (EOFException ex) {
-            return; // PASSED
-        } catch (IOException ioEx) {
-            fail("unexpected IOException:" + ioEx.toString());
-        }
-        fail("expected EOF exception for streams lesser then 13 bytes");
+        });
     }
 
     @Test
@@ -88,14 +85,9 @@ public void testCtorReadBadHeader2()  {
             0, 0, 0, 0, 0, 0
         };
 
-        try {
+        assertThrows(EOFException.class, () -> {
             new GIFImageLoader2(new TestStream(tooShortHeaderData));
-        } catch (EOFException ex) {
-            return; // PASSED
-        } catch (IOException ioEx) {
-            fail("unexpected IOException:" + ioEx.toString());
-        }
-        fail("expected EOF exception for streams lesser then 13 bytes");
+        });
     }
 
     @Test
@@ -118,7 +110,8 @@ public void testCtorReadGoodHeader()  {
         }
     }
 
-    @Test (timeout=2000)
+    @Test
+    @Timeout(value=2000, unit=TimeUnit.MILLISECONDS)
     public void testCtorReadBadExtension()  {
         final byte badGifData[] = {
             'G', 'I', 'F', '8', '9', 'a',
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/iio/ImageHiDPITest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/iio/ImageHiDPITest.java
index 999fd799e62..89ff16cca52 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/iio/ImageHiDPITest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/iio/ImageHiDPITest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,10 +29,12 @@
 import com.sun.javafx.iio.ImageStorage;
 import com.sun.javafx.iio.ImageStorageException;
 import com.sun.prism.Image;
-import org.junit.Before;
-import org.junit.Test;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Test multiple calls to getPixel with both a normal image
@@ -46,7 +48,7 @@ public class ImageHiDPITest {
 
     private String imagePath;
 
-    @Before
+    @BeforeEach
     public void setup() {
         imagePath = this.getClass().getResource(IMAGE_NAME).toExternalForm();
         assertNotNull(imagePath);
@@ -62,12 +64,11 @@ private ImageFrame loadImage(String path, float pixelScale) {
             ImageFrame imageFrame = imageFrames[0];
             assertNotNull(imageFrame);
 
-            assertEquals("Unexpected pixel scale",
-                    pixelScale, imageFrame.getPixelScale(), 0.0001f);
+            assertEquals(pixelScale, imageFrame.getPixelScale(), 0.0001f, "Unexpected pixel scale");
 
             int width = imageFrame.getWidth();
             int height = imageFrame.getHeight();
-            assertTrue("Image size must be at least 8x8", width >= 8 && height >= 8);
+            assertTrue(width >= 8 && height >= 8, "Image size must be at least 8x8");
 
             return imageFrame;
         } catch (ImageStorageException ex) {
@@ -123,9 +124,9 @@ private void testPixelGet(float pixelScale) {
 
         for (int i = 0; i < xvals.length; i++) {
             int pix1 = image.getArgb(xvals[i], yvals[i]);
-            assertEquals("getArgb returns incorrect color", exColors[i], pix1);
+            assertEquals(exColors[i], pix1, "getArgb returns incorrect color");
             int pix2 = image.getArgb(xvals[i], yvals[i]);
-            assertEquals("second call to getArgb returns different result", pix1, pix2);
+            assertEquals(pix1, pix2, "second call to getArgb returns different result");
         }
     }
 
@@ -150,8 +151,8 @@ public void testScaledImageSize() {
         // Check that the size of the @2x image is twice that of the normal image
         int exWidth2 = imageFrame1.getWidth() * 2;
         int exHeight2 = imageFrame1.getHeight()* 2;
-        assertEquals("width of @2x image is wrong", exWidth2, imageFrame2.getWidth());
-        assertEquals("height of @2x image is wrong", exHeight2, imageFrame2.getHeight());
+        assertEquals(exWidth2, imageFrame2.getWidth(), "width of @2x image is wrong");
+        assertEquals(exHeight2, imageFrame2.getHeight(), "height of @2x image is wrong");
     }
 
 }
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/iio/ImageLoaderScalingTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/iio/ImageLoaderScalingTest.java
index 7f01a9965e0..356d5869a70 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/iio/ImageLoaderScalingTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/iio/ImageLoaderScalingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,8 +32,11 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import static org.junit.Assert.*;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class ImageLoaderScalingTest {
     // if true, the test will write original and scaled PNG files to the current directory
@@ -71,11 +74,9 @@ private void compare(Image img, Image expectedImg) {
                     if (writeFiles) {
                         writeImages(img, expectedImg);
                     }
-                    throw new org.junit.ComparisonFailure(
-                        "pixel " + x + ", " + y + " does not match",
-                        String.format("0x%08X", expected),
-                        String.format("0x%08X", actual)
-                    );
+                    fail(String.format("pixel " + x + ", " + y + " does not match; expected 0x%08X, actual 0x%08X",
+                        expected, actual
+                    ));
                 }
             }
         }
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/iio/bmp/BMPImageLoaderTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/iio/bmp/BMPImageLoaderTest.java
index c1a8605deb8..a0e95df7bb2 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/iio/bmp/BMPImageLoaderTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/iio/bmp/BMPImageLoaderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,8 +40,13 @@
 import java.io.InputStream;
 import javax.imageio.ImageIO;
 import javax.imageio.stream.MemoryCacheImageInputStream;
-import static org.junit.Assert.*;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class BMPImageLoaderTest {
     // if true, the test will write BMP files generated by JDK to the current directory
@@ -66,18 +71,17 @@ void compare(Image img, BufferedImage bImg) {
         assertNotNull(img);
         assertNotNull(bImg);
         int w = bImg.getWidth(), h = bImg.getHeight();
-        assertEquals("Unmatched width", w, img.getWidth());
-        assertEquals("Unmatched height", h, img.getHeight());
+        assertEquals(w, img.getWidth(), "Unmatched width");
+        assertEquals(h, img.getHeight(), "Unmatched height");
 
         for (int y = 0; y < h; y++) {
             for (int x = 0; x < w; x++) {
                 int p1 = bImg.getRGB(x, y);
                 int p2 = img.getArgb(x, y);
                 if (!compareRGB(p1, p2, 1)) {
-                    throw new org.junit.ComparisonFailure(
-                        "pixel " + x + ", " + y + " does not match",
-                        String.format("0x%08X", p1), String.format("0x%08X", p2)
-                    );
+                    fail(String.format("pixel " + x + ", " + y + " does not match; p1 0x%08X, p2 0x%08X",
+                        p1, p2
+                    ));
                 }
             }
         }
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/iio/common/ImageToolsTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/iio/common/ImageToolsTest.java
index 8db15723ba5..03f2b643306 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/iio/common/ImageToolsTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/iio/common/ImageToolsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,10 @@
 package test.com.sun.javafx.iio.common;
 
 import com.sun.javafx.iio.common.ImageTools;
-import static org.junit.Assert.*;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Random;
 
@@ -92,19 +94,19 @@ private static void assertComputeDimensions(int sw, int sh, int tw, int th) {
 
         // Result should always return dimensions in the range of 0 < x <= size,
         // and one dimension must be equal to one of the target dimensions.
-        assertTrue(msg, x <= tw);
-        assertTrue(msg, y <= th);
-        assertTrue(msg, x > 0);
-        assertTrue(msg, y > 0);
-        assertTrue(msg, x == tw || y == th);
+        assertTrue(x <= tw, msg);
+        assertTrue(y <= th, msg);
+        assertTrue(x > 0, msg);
+        assertTrue(y > 0, msg);
+        assertTrue(x == tw || y == th, msg);
 
         // Check the non-maxed dimension to see if it is within 1 pixel of the expected value
         // when calculated with the original aspect ratio:
         if (x != tw) {
-            assertTrue(msg, x == Math.floor(th * originalAspect) || x == Math.ceil(th * originalAspect));
+            assertTrue(x == Math.floor(th * originalAspect) || x == Math.ceil(th * originalAspect), msg);
         }
         if (y != th) {
-            assertTrue(msg, y == Math.floor(tw / originalAspect) || y == Math.ceil(tw / originalAspect));
+            assertTrue(y == Math.floor(tw / originalAspect) || y == Math.ceil(tw / originalAspect), msg);
         }
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/iio/png/PNGImageLoaderTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/iio/png/PNGImageLoaderTest.java
index 31789b1b3d0..1973a67cf1e 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/iio/png/PNGImageLoaderTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/iio/png/PNGImageLoaderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,11 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import org.junit.Test;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class PNGImageLoaderTest {
 
@@ -46,34 +50,40 @@ public void testRT35133() throws IOException {
         testImage(testStream);
     }
 
-    @Test(timeout = 1000, expected = IOException.class)
+    @Test
+    @Timeout(value=1000, unit=TimeUnit.MILLISECONDS)
     public void testRT27010() throws IOException {
-        int[] corruptedIDATLength = {
-            137, 80, 78, 71, 13, 10, 26, 10, // signature
-            0, 0, 0, 13, 0x49, 0x48, 0x44, 0x52, // IHDR chunk
-            0, 0, 4, 0, 0, 0, 4, 0, 8, 6, 0, 0, 0, // IHDR chunk data
-            0x7f, 0x1d, 0x2b, 0x83, // IHDR chunk crc
-            0x80, 0, 0x80, 0, 0x49, 0x44, 0x41, 0x54 // negative IDAT length
-        };
+        assertThrows(IOException.class, () -> {
+            int[] corruptedIDATLength = {
+                137, 80, 78, 71, 13, 10, 26, 10, // signature
+                0, 0, 0, 13, 0x49, 0x48, 0x44, 0x52, // IHDR chunk
+                0, 0, 4, 0, 0, 0, 4, 0, 8, 6, 0, 0, 0, // IHDR chunk data
+                0x7f, 0x1d, 0x2b, 0x83, // IHDR chunk crc
+                0x80, 0, 0x80, 0, 0x49, 0x44, 0x41, 0x54 // negative IDAT length
+            };
 
-        ByteArrayInputStream stream = ImageTestHelper.constructStreamFromInts(corruptedIDATLength);
-        testImage(stream);
+            ByteArrayInputStream stream = ImageTestHelper.constructStreamFromInts(corruptedIDATLength);
+            testImage(stream);
+        });
     }
 
-    @Test(timeout = 1000, expected = IOException.class)
+    @Test
+    @Timeout(value=1000, unit=TimeUnit.MILLISECONDS)
     public void testRT27010MultipleIDAT() throws IOException {
-        int[] corruptedIDATLength = {
-            137, 80, 78, 71, 13, 10, 26, 10, // signature
-            0, 0, 0, 13, 0x49, 0x48, 0x44, 0x52, // IHDR chunk
-            0, 0, 4, 0, 0, 0, 4, 0, 8, 6, 0, 0, 0, // IHDR chunk data
-            0x7f, 0x1d, 0x2b, 0x83, // IHDR chunk crc
-            0, 0, 0, 1, 0x49, 0x44, 0x41, 0x54, // first IDAT
-            0, // IDAT chunk data
-            0, 0, 0, 0, // IDAT chunk crc
-            0x80, 0, 0, 0, 0x49, 0x44, 0x41, 0x54, // second IDAT
-        };
+        assertThrows(IOException.class, () -> {
+            int[] corruptedIDATLength = {
+                137, 80, 78, 71, 13, 10, 26, 10, // signature
+                0, 0, 0, 13, 0x49, 0x48, 0x44, 0x52, // IHDR chunk
+                0, 0, 4, 0, 0, 0, 4, 0, 8, 6, 0, 0, 0, // IHDR chunk data
+                0x7f, 0x1d, 0x2b, 0x83, // IHDR chunk crc
+                0, 0, 0, 1, 0x49, 0x44, 0x41, 0x54, // first IDAT
+                0, // IDAT chunk data
+                0, 0, 0, 0, // IDAT chunk crc
+                0x80, 0, 0, 0, 0x49, 0x44, 0x41, 0x54, // second IDAT
+            };
 
-        ByteArrayInputStream stream = ImageTestHelper.constructStreamFromInts(corruptedIDATLength);
-        testImage(stream);
+            ByteArrayInputStream stream = ImageTestHelper.constructStreamFromInts(corruptedIDATLength);
+            testImage(stream);
+        });
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/image/ConverterTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/image/ConverterTest.java
index 61c78440d6b..bbcf108e35c 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/image/ConverterTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/image/ConverterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,14 +49,17 @@
 import com.sun.javafx.image.impl.ByteRgba;
 import com.sun.javafx.image.impl.IntArgb;
 import com.sun.javafx.image.impl.IntArgbPre;
-import static junit.framework.Assert.*;
 
 import java.nio.ByteBuffer;
 import java.nio.IntBuffer;
 import javafx.scene.image.PixelFormat;
 import javafx.scene.image.WritablePixelFormat;
 import javafx.scene.paint.Color;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  */
@@ -478,10 +481,10 @@ public String toString() {
     };
 
     static void checkArgb(int argb1, int argb2, double delta) {
-        assertEquals("alpha", (argb1 >> 24) & 0xff, (argb2 >> 24) & 0xff);
-        assertEquals("red",   (argb1 >> 16) & 0xff, (argb2 >> 16) & 0xff, delta);
-        assertEquals("green", (argb1 >>  8) & 0xff, (argb2 >>  8) & 0xff, delta);
-        assertEquals("blue",  (argb1      ) & 0xff, (argb2      ) & 0xff, delta);
+        assertEquals((argb1 >> 24) & 0xff, (argb2 >> 24) & 0xff, "alpha");
+        assertEquals((argb1 >> 16) & 0xff, (argb2 >> 16) & 0xff, delta, "red");
+        assertEquals((argb1 >>  8) & 0xff, (argb2 >>  8) & 0xff, delta, "green");
+        assertEquals((argb1      ) & 0xff, (argb2      ) & 0xff, delta, "blue");
     }
 
     void testget(ByteFormat bfmt, ByteBuffer bbuf, byte barr[], Color c) {
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/KeyboardShortcutsTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/KeyboardShortcutsTest.java
index 86c789d2108..8676792fedf 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/KeyboardShortcutsTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/KeyboardShortcutsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,10 +35,11 @@
 import javafx.scene.text.Text;
 import javafx.stage.Stage;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 
 /*
@@ -49,7 +50,7 @@ public final class KeyboardShortcutsTest {
     private Stage stage;
     private Scene scene;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         stage = new Stage();
         scene = new Scene(new Group(), 500, 500);
@@ -58,7 +59,7 @@ public void setUp() {
         stage.show();
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         stage = null;
         scene = null;
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/layout/RegionTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/layout/RegionTest.java
index 8d9aea2c2be..e505913bd4a 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/layout/RegionTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/layout/RegionTest.java
@@ -25,14 +25,15 @@
 
 package test.com.sun.javafx.scene.layout;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class RegionTest {
 
     public RegionTest() {
     }
 
-    @Test public void dummy() { }
+    @Test
+    public void dummy() { }
 //    CSSProperty getCssMetaDataByName(String name, List<CSSProperty> keys) {
 //        CSSProperty keyForName = null;
 //        for (CSSProperty k : keys) {
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/layout/ScaledMathTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/layout/ScaledMathTest.java
index f6ee9138cfe..d9f14fae5b0 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/layout/ScaledMathTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/layout/ScaledMathTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,8 @@
 
 package test.com.sun.javafx.scene.layout;
 
-import static org.junit.Assert.assertEquals;
-
 import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import com.sun.javafx.scene.layout.ScaledMath;
 
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/layout/region/BackgroundFillConverterTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/layout/region/BackgroundFillConverterTest.java
index b782ae80a1e..6c11fa94ea0 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/layout/region/BackgroundFillConverterTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/layout/region/BackgroundFillConverterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,14 +25,15 @@
 
 package test.com.sun.javafx.scene.layout.region;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests for the BackgroundFillConverter class
  */
 public class BackgroundFillConverterTest {
 
-    @Test public void dummy() { }
+    @Test
+    public void dummy() { }
     /*
         -fx-background-color:
         -fx-background-radius:
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/layout/region/BackgroundFillTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/layout/region/BackgroundFillTest.java
index c56b4103c42..a2551823eab 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/layout/region/BackgroundFillTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/layout/region/BackgroundFillTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,14 +25,15 @@
 
 package test.com.sun.javafx.scene.layout.region;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests for the BackgroundFill class
  */
 public class BackgroundFillTest {
 
-    @Test public void valuesAreSetCorrectly() {
+    @Test
+    public void valuesAreSetCorrectly() {
 //        BackgroundFill obj = new BackgroundFill(Color.ORANGE, 1, 2, 3, 4, new Insets(20));
 //        assertEquals(Color.ORANGE, obj.getFill());
 //        assertEquals(1, obj.getTopLeftCornerRadius(), 0);
@@ -42,7 +43,8 @@ public class BackgroundFillTest {
 //        assertEquals(new Insets(20), obj.getOffsets());
     }
 
-    @Test public void hashingReturnsSameObject() {
+    @Test
+    public void hashingReturnsSameObject() {
 //        HashMap<BackgroundFill, String> map = new HashMap<BackgroundFill, String>();
 //        BackgroundFill obj = new BackgroundFill(Color.ORANGE, 1, 2, 3, 4, new Insets(20));
 //        map.put(obj, "YES");
@@ -55,7 +57,8 @@ public class BackgroundFillTest {
 //        assertFalse(map.containsKey(different));
     }
 
-    @Test public void equality() {
+    @Test
+    public void equality() {
 //        BackgroundFill obj = new BackgroundFill(Color.ORANGE, 1, 2, 3, 4, new Insets(20));
 //        BackgroundFill equivalent = new BackgroundFill(Color.ORANGE, 1, 2, 3, 4, new Insets(20));
 //        assertTrue(obj.equals(equivalent));
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/layout/region/BackgroundImageTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/layout/region/BackgroundImageTest.java
index facb6dd4ee2..8eb65b01ca0 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/layout/region/BackgroundImageTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/layout/region/BackgroundImageTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,14 +25,15 @@
 
 package test.com.sun.javafx.scene.layout.region;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests for the BackgroundImage class
  */
 public class BackgroundImageTest {
 
-    @Test public void dummy() { }
+    @Test
+    public void dummy() { }
 
 //    @Test public void valuesAreSetCorrectly() {
 //        Image image = new Image("http://dummyUrl", true);
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/layout/region/BackgroundRepeatConverterTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/layout/region/BackgroundRepeatConverterTest.java
index 83bf443f454..cc3d19a6d04 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/layout/region/BackgroundRepeatConverterTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/layout/region/BackgroundRepeatConverterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,22 +26,23 @@
 package test.com.sun.javafx.scene.layout.region;
 
 import javafx.scene.layout.BackgroundRepeat;
-import org.junit.Test;
 import javafx.css.ParsedValue;
 import com.sun.javafx.css.ParsedValueImpl;
 import com.sun.javafx.scene.layout.region.RepeatStruct;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
 import com.sun.javafx.scene.layout.region.RepeatStructConverter;
 
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
 /**
  */
 public class BackgroundRepeatConverterTest {
     /*
         -fx-background-repeat:
      */
-    @Test public void scenario1() {
+    @Test
+    public void scenario1() {
         ParsedValueImpl<ParsedValue<String,BackgroundRepeat>[][], RepeatStruct[]> value =
                 new ParsedValueImpl<>(
                         new ParsedValueImpl[0][0], null
@@ -74,7 +75,8 @@ public void scenario2() {
     /*
         -fx-background-repeat: repeat round
      */
-    @Test public void scenario3() {
+    @Test
+    public void scenario3() {
         ParsedValue<String,BackgroundRepeat>[][] values = new ParsedValueImpl[][] {
                 { new ParsedValueImpl("repeat", null), new ParsedValueImpl("round", null) }
         };
@@ -92,7 +94,8 @@ public void scenario2() {
     /*
         -fx-background-repeat: space no-repeat
      */
-    @Test public void scenario4() {
+    @Test
+    public void scenario4() {
         ParsedValue<String,BackgroundRepeat>[][] values = new ParsedValueImpl[][] {
                 { new ParsedValueImpl("space", null), new ParsedValueImpl("no-repeat", null) }
         };
@@ -110,7 +113,8 @@ public void scenario2() {
     /*
         -fx-background-repeat: no-repeat repeat, space round
      */
-    @Test public void scenario5() {
+    @Test
+    public void scenario5() {
         ParsedValue<String,BackgroundRepeat>[][] values = new ParsedValueImpl[][] {
                 { new ParsedValueImpl("no-repeat", null), new ParsedValueImpl("repeat", null) },
                 { new ParsedValueImpl("space", null), new ParsedValueImpl("round", null) }
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/transform/TransformUtilsTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/transform/TransformUtilsTest.java
index f1599594989..1a0f633a38a 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/transform/TransformUtilsTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/transform/TransformUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,18 +25,22 @@
 
 package test.com.sun.javafx.scene.transform;
 
-import test.com.sun.javafx.test.TransformHelper;
-import javafx.scene.transform.Transform;
 import com.sun.javafx.geom.transform.Affine3D;
 import com.sun.javafx.scene.transform.TransformUtils;
 import java.util.LinkedList;
 import java.util.List;
+import javafx.scene.transform.Transform;
 import javafx.scene.transform.TransformShim;
-import test.javafx.scene.transform.TransformOperationsTest;
 import javafx.scene.transform.Translate;
-import static org.junit.Assert.*;
+import test.com.sun.javafx.test.TransformHelper;
+import test.javafx.scene.transform.TransformOperationsTest;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.provider.Arguments;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 public class TransformUtilsTest {
     @Test
@@ -99,8 +103,9 @@ public void immutableTransformShouldCopyCorrectly() {
 
     @Test public void testImmutableTransformState() {
         int counter = 0;
-        for (Object o : TransformOperationsTest.getParams()) {
-            Object[] arr = (Object[]) o;
+        List<Arguments> arguments = TransformOperationsTest.getParams().toList();
+        for (Arguments arg : arguments) {
+            Object[] arr = arg.get();
             if (arr[0] instanceof TransformShim.ImmutableTransformShim) {
                 TransformShim.ImmutableTransformShim t =
                         (TransformShim.ImmutableTransformShim) arr[0];
@@ -115,8 +120,9 @@ public void immutableTransformShouldCopyCorrectly() {
 
     @Test public void testReusedImmutableTransform() {
         int counter = 0;
-        for (Object o : TransformOperationsTest.getParams()) {
-            Object[] arr = (Object[]) o;
+        List<Arguments> arguments = TransformOperationsTest.getParams().toList();
+        for (Arguments arg : arguments) {
+            Object[] arr = arg.get();
             if (arr[0] instanceof TransformShim.ImmutableTransformShim) {
 
                 Transform t = (Transform) arr[0];
@@ -128,8 +134,9 @@ public void immutableTransformShouldCopyCorrectly() {
 
                 Transform returned = TransformUtils.immutableTransform(reuse, t);
 
-                assertSame("Checking reusing immutable transform to values of #"
-                        + counter + " of TransformOperationsTest", reuse, returned);
+                assertSame(reuse, returned,
+                        "Checking reusing immutable transform to values of #"
+                        + counter + " of TransformOperationsTest");
 
                 TransformHelper.assertStateOk(
                         "Checking reusing immutable transform to values of #"
@@ -145,8 +152,9 @@ public void immutableTransformShouldCopyCorrectly() {
                 // creating new
                 Transform returned2 = TransformUtils.immutableTransform(null, t);
 
-                assertNotSame("Checking reusing immutable transform to values of #"
-                        + counter + " of TransformOperationsTest", returned2, t);
+                assertNotSame(returned2, t,
+                        "Checking reusing immutable transform to values of #"
+                        + counter + " of TransformOperationsTest");
 
                 TransformHelper.assertStateOk(
                         "Checking reusing immutable transform to values of #"
@@ -167,8 +175,9 @@ public void immutableTransformShouldCopyCorrectly() {
     @Test public void testConcatenatedImmutableTransform() {
 
         List<TransformShim.ImmutableTransformShim> ts = new LinkedList<>();
-        for (Object o : TransformOperationsTest.getParams()) {
-            Object[] arr = (Object[]) o;
+        List<Arguments> arguments = TransformOperationsTest.getParams().toList();
+        for (Arguments arg : arguments) {
+            Object[] arr = arg.get();
             if (arr[0] instanceof TransformShim.ImmutableTransformShim) {
                 ts.add((TransformShim.ImmutableTransformShim) arr[0]);
             }
@@ -185,10 +194,11 @@ public void immutableTransformShouldCopyCorrectly() {
                     Transform conc = TransformUtils.immutableTransform(
                             clone, t1, t2);
 
-                    assertSame("Checking state of concatenation of "
+                    assertSame(clone, conc,
+                            "Checking state of concatenation of "
                             + "transform #" + outer + " and #" + inner +
                             " reusing #" + orig +
-                            " of TransformOperationsTest", clone, conc);
+                            " of TransformOperationsTest");
                     TransformHelper.assertStateOk(
                             "Checking state of concatenation of "
                             + "transform #" + outer + " and #" + inner +
@@ -210,12 +220,14 @@ public void immutableTransformShouldCopyCorrectly() {
                 Transform conc2 = TransformUtils.immutableTransform(
                         null, t1, t2);
 
-                assertNotSame("Checking state of concatenation of "
+                assertNotSame(conc2, t1,
+                        "Checking state of concatenation of "
                         + "transform #" + outer + " and #" + inner +
-                        " of TransformOperationsTest", conc2, t1);
-                assertNotSame("Checking state of concatenation of "
+                        " of TransformOperationsTest");
+                assertNotSame(conc2, t2,
+                        "Checking state of concatenation of "
                         + "transform #" + outer + " and #" + inner +
-                        " of TransformOperationsTest", conc2, t2);
+                        " of TransformOperationsTest");
                 TransformHelper.assertStateOk(
                         "Checking state of concatenation of "
                         + "transform #" + outer + " and #" + inner +
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TopMostTraversalEngineTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TopMostTraversalEngineTest.java
index 07fe069623b..20b7a2c3982 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TopMostTraversalEngineTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TopMostTraversalEngineTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,17 +38,17 @@
 import javafx.scene.Parent;
 import javafx.scene.ParentShim;
 import javafx.scene.shape.Rectangle;
-import org.junit.Before;
-import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class TopMostTraversalEngineTest {
     private TopMostTraversalEngineShim engine;
     private Group root;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         root = new Group();
         engine = new TopMostTraversalEngineShim(new ContainerTabOrderShim()) {
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TraversalTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TraversalTest.java
index a3d2c4fa98f..601d7680d8e 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TraversalTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TraversalTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,12 +30,8 @@
 import com.sun.javafx.scene.traversal.TraversalEngine;
 import com.sun.javafx.scene.traversal.TraversalMethod;
 import com.sun.javafx.scene.traversal.TraverseListener;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 
 import javafx.geometry.Bounds;
 import javafx.scene.Group;
@@ -44,25 +40,21 @@
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Tests for TraversalEngine with the default ContainerTabOrder algorithm,
  * tests if using the WeightedClosestCorner algorithm have been
  * left in comments.
  */
-@RunWith(Parameterized.class)
 public final class TraversalTest {
-    private final int fromNumber;
-    private final Direction direction;
-    private final int toNumber;
-    private final int toNumberTransformed;
-
     private Stage stage;
     private Scene scene;
     /**
@@ -88,72 +80,61 @@ public final class TraversalTest {
     /*
      * Parameters: [fromNumber], [direction], [toNumber], [toNumberTransformed]
      */
-    @Parameters
-    public static Collection data() {
-        return Arrays.asList(new Object[][] {
+    public static Stream<Arguments> data() {
+        return Stream.of(
             /* traversal from center */
-            { 5, Direction.LEFT, 4, 8 },
-            { 5, Direction.RIGHT, 6, 2 },
-            { 5, Direction.UP, 2, 4 },
-            { 5, Direction.DOWN, 8, 6 },
+            Arguments.of( 5, Direction.LEFT, 4, 8 ),
+            Arguments.of( 5, Direction.RIGHT, 6, 2 ),
+            Arguments.of( 5, Direction.UP, 2, 4 ),
+            Arguments.of( 5, Direction.DOWN, 8, 6 ),
 
             // using WeightedClosestCorner, target varies according to transform
-            //{ 5, Direction.PREVIOUS, 4, 8 },
-            //{ 5, Direction.NEXT, 6, 2 },
+            //Arguments.of( 5, Direction.PREVIOUS, 4, 8 ),
+            //Arguments.of( 5, Direction.NEXT, 6, 2 ),
 
             // using ContainerTabOrder, target is always the same
-            { 5, Direction.PREVIOUS, 4, 4 },
-            { 5, Direction.NEXT, 6, 6 },
+            Arguments.of( 5, Direction.PREVIOUS, 4, 4 ),
+            Arguments.of( 5, Direction.NEXT, 6, 6 ),
 
             /* traversal from borders (untransformed) */
-            { 4, Direction.LEFT, 4, 7 },
-            { 6, Direction.RIGHT, 6, 3 },
-            { 2, Direction.UP, 2, 1 },
-            { 8, Direction.DOWN, 8, 9 },
+            Arguments.of( 4, Direction.LEFT, 4, 7 ),
+            Arguments.of( 6, Direction.RIGHT, 6, 3 ),
+            Arguments.of( 2, Direction.UP, 2, 1 ),
+            Arguments.of( 8, Direction.DOWN, 8, 9 ),
 
             // using WeightedClosestCorner, target varies according to transform
-            //{ 4, Direction.PREVIOUS, 3, 7 },
-            //{ 1, Direction.PREVIOUS, 9, 4 },
-            //{ 6, Direction.NEXT, 7, 3 },
-            //{ 9, Direction.NEXT, 1, 6 },
+            //Arguments.of( 4, Direction.PREVIOUS, 3, 7 ),
+            //Arguments.of( 1, Direction.PREVIOUS, 9, 4 ),
+            //Arguments.of( 6, Direction.NEXT, 7, 3 ),
+            //Arguments.of( 9, Direction.NEXT, 1, 6 ),
 
             // using ContainerTabOrder, target always the same
-            { 4, Direction.PREVIOUS, 3, 3 },
-            { 1, Direction.PREVIOUS, 9, 9 },
-            { 6, Direction.NEXT, 7, 7 },
-            { 9, Direction.NEXT, 1, 1 },
+            Arguments.of( 4, Direction.PREVIOUS, 3, 3 ),
+            Arguments.of( 1, Direction.PREVIOUS, 9, 9 ),
+            Arguments.of( 6, Direction.NEXT, 7, 7 ),
+            Arguments.of( 9, Direction.NEXT, 1, 1 ),
 
             /* traversal from borders (transformed) */
-            { 2, Direction.RIGHT, 3, 2 },
-            { 8, Direction.LEFT, 7, 8 },
-            { 4, Direction.UP, 1, 4 },
-            { 6, Direction.DOWN, 9, 6 },
+            Arguments.of( 2, Direction.RIGHT, 3, 2 ),
+            Arguments.of( 8, Direction.LEFT, 7, 8 ),
+            Arguments.of( 4, Direction.UP, 1, 4 ),
+            Arguments.of( 6, Direction.DOWN, 9, 6 ),
 
             // using WeightedClosestCorner, target varies according to transform
-            //{ 8, Direction.PREVIOUS, 7, 1 },
-            //{ 7, Direction.PREVIOUS, 6, 3 },
-            //{ 2, Direction.NEXT, 3, 9 },
-            //{ 3, Direction.NEXT, 4, 7 }
+            //Arguments.of( 8, Direction.PREVIOUS, 7, 1 ),
+            //Arguments.of( 7, Direction.PREVIOUS, 6, 3 ),
+            //Arguments.of( 2, Direction.NEXT, 3, 9 ),
+            //Arguments.of( 3, Direction.NEXT, 4, 7)}
 
             // using ContainerTabOrder, target always the same
-            { 8, Direction.PREVIOUS, 7, 7 },
-            { 7, Direction.PREVIOUS, 6, 6 },
-            { 2, Direction.NEXT, 3, 3 },
-            { 3, Direction.NEXT, 4, 4 }
-        });
-    }
-
-    public TraversalTest(final int fromNumber,
-                         final Direction direction,
-                         final int toNumber,
-                         final int toNumberTransformed) {
-        this.fromNumber = fromNumber;
-        this.direction = direction;
-        this.toNumber = toNumber;
-        this.toNumberTransformed = toNumberTransformed;
+            Arguments.of( 8, Direction.PREVIOUS, 7, 7 ),
+            Arguments.of( 7, Direction.PREVIOUS, 6, 6 ),
+            Arguments.of( 2, Direction.NEXT, 3, 3 ),
+            Arguments.of( 3, Direction.NEXT, 4, 4)
+        );
     }
 
-    @Before
+    @BeforeEach
     public void setUp() {
         stage = new Stage();
         scene = new Scene(new Group(), 500, 500);
@@ -167,7 +148,7 @@ public void setUp() {
         stage.requestFocus();
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         stage = null;
         scene = null;
@@ -175,23 +156,35 @@ public void tearDown() {
         traversalEngine = null;
     }
 
-    @Test
-    public void untransformedTraversalTest() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void untransformedTraversalTest(int fromNumber,
+                                           Direction direction,
+                                           int toNumber,
+                                           int toNumberTransformed) {
         keypadNodes[fromNumber - 1].requestFocus();
         traversalEngine.trav(keypadNodes[fromNumber - 1], direction, TraversalMethod.DEFAULT);
         assertTrue(keypadNodes[toNumber - 1].isFocused());
     }
 
-    @Test
-    public void transformedTraversalTest() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void transformedTraversalTest(int fromNumber,
+                                         Direction direction,
+                                         int toNumber,
+                                         int toNumberTransformed) {
         scene.getRoot().setRotate(90);
         keypadNodes[fromNumber - 1].requestFocus();
         traversalEngine.trav(keypadNodes[fromNumber - 1], direction, TraversalMethod.DEFAULT);
         assertTrue(keypadNodes[toNumberTransformed - 1].isFocused());
     }
 
-    @Test
-    public void traverseListenerTest() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void traverseListenerTest(int fromNumber,
+                                     Direction direction,
+                                     int toNumber,
+                                     int toNumberTransformed) {
         final TraverseListenerImpl traverseListener =
                 new TraverseListenerImpl();
         traversalEngine.addTraverseListener(traverseListener);
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TraverseInvisibleTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TraverseInvisibleTest.java
index d0b102746d3..3640c32955a 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TraverseInvisibleTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TraverseInvisibleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,10 +30,8 @@
 import com.sun.javafx.scene.traversal.TraversalEngine;
 import com.sun.javafx.scene.traversal.TraversalMethod;
 import com.sun.javafx.scene.traversal.TraverseListener;
-import static org.junit.Assert.assertTrue;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 
 import javafx.geometry.Bounds;
 import javafx.scene.Group;
@@ -42,23 +40,17 @@
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Tests TraversalEngine with invisible nodes, using the default ContainerTabOrder algorithm,
  */
-@RunWith(Parameterized.class)
 public final class TraverseInvisibleTest {
-    private final int fromNumber;
-    private final Direction direction;
-    private final int invisibleNumber;
-    private final int toNumber;
-
     private Stage stage;
     private Scene scene;
     private Node[] keypadNodes;
@@ -72,29 +64,18 @@ public final class TraverseInvisibleTest {
     **    3 4 5
     **    6 7 8
     */
-    @Parameters
-    public static Collection data() {
-        return Arrays.asList(new Object[][] {
-            { 3, Direction.RIGHT, 4, 5},
-            { 5, Direction.LEFT, 4, 3},
-            { 4, Direction.NEXT, 5, 6},
-            { 6, Direction.PREVIOUS, 5, 4},
-            { 8, Direction.UP, 5, 2 },
-            { 2, Direction.DOWN, 5, 8 }
-        });
-    }
-
-    public TraverseInvisibleTest(final int fromNumber,
-                         final Direction direction,
-                         final int invisibleNumber,
-                         final int toNumber) {
-        this.fromNumber = fromNumber;
-        this.direction = direction;
-        this.invisibleNumber = invisibleNumber;
-        this.toNumber = toNumber;
+    public static Stream<Arguments> data() {
+        return Stream.of(
+            Arguments.of( 3, Direction.RIGHT, 4, 5),
+            Arguments.of( 5, Direction.LEFT, 4, 3),
+            Arguments.of( 4, Direction.NEXT, 5, 6),
+            Arguments.of( 6, Direction.PREVIOUS, 5, 4),
+            Arguments.of( 8, Direction.UP, 5, 2 ),
+            Arguments.of( 2, Direction.DOWN, 5, 8)
+        );
     }
 
-    @Before
+    @BeforeEach
     public void setUp() {
         stage = new Stage();
         scene = new Scene(new Group(), 500, 500);
@@ -107,7 +88,7 @@ public void setUp() {
         stage.requestFocus();
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         stage = null;
         scene = null;
@@ -115,8 +96,12 @@ public void tearDown() {
         traversalEngine = null;
     }
 
-    @Test
-    public void traverseOverInvisible() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void traverseOverInvisible(int fromNumber,
+                                      Direction direction,
+                                      int invisibleNumber,
+                                      int toNumber) {
         keypadNodes[fromNumber].requestFocus();
         keypadNodes[invisibleNumber].setVisible(false);
         traversalEngine.trav(keypadNodes[fromNumber], direction, TraversalMethod.DEFAULT);
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/CacheFilterTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/CacheFilterTest.java
index 8183648c0a0..16b40b31aab 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/CacheFilterTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/CacheFilterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,9 +34,11 @@
 import com.sun.javafx.sg.prism.NGNodeShim;
 import com.sun.javafx.sg.prism.NGRectangle;
 import javafx.scene.CacheHint;
-import org.junit.Test;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  */
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/ContentBoundsTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/ContentBoundsTest.java
index 20dd3d97eaa..3f3e7f0bd46 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/ContentBoundsTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/ContentBoundsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,8 +36,9 @@
 import com.sun.javafx.scene.NodeHelper;
 import com.sun.javafx.scene.SceneHelper;
 import com.sun.javafx.sg.prism.NGNode;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  */
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/CullingTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/CullingTest.java
index 21d8abc2408..5b326ad8ded 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/CullingTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/CullingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,8 +32,9 @@
 import com.sun.javafx.sg.prism.NGGroup;
 import com.sun.javafx.sg.prism.NGNode;
 import com.sun.javafx.sg.prism.NGNodeShim;
-import org.junit.Assert;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class CullingTest extends NGTestBase {
 
@@ -47,7 +48,7 @@ public void test_setCullBits_intersect() {
                     new RectBounds(70, 70, 170, 170)
                     });
         NGNodeShim.markCullRegions(bn,drc, -1, BaseTransform.IDENTITY_TRANSFORM, new GeneralTransform3D());
-        Assert.assertEquals(1 |(1 << 2), NGNodeShim.cullingBits(bn));
+        assertEquals(1 |(1 << 2), NGNodeShim.cullingBits(bn));
     }
 
     @Test
@@ -60,7 +61,7 @@ public void test_setCullBits_disjoint() {
                     new RectBounds(0, 101, 170, 170)
                     });
         NGNodeShim.markCullRegions(bn,drc, -1, BaseTransform.IDENTITY_TRANSFORM, new GeneralTransform3D());
-        Assert.assertEquals(0, NGNodeShim.cullingBits(bn));
+        assertEquals(0, NGNodeShim.cullingBits(bn));
     }
 
     @Test
@@ -73,7 +74,7 @@ public void test_setCullBits_within() {
                     new RectBounds(0, 0, 200, 200)
                     });
         NGNodeShim.markCullRegions(bn,drc, -1, BaseTransform.IDENTITY_TRANSFORM, new GeneralTransform3D());
-        Assert.assertEquals(2 | (2 << 2), NGNodeShim.cullingBits(bn));
+        assertEquals(2 | (2 << 2), NGNodeShim.cullingBits(bn));
     }
 
     @Test
@@ -86,7 +87,7 @@ public void test_setCullBits_region_within() {
                     new RectBounds(10, 10, 20, 20)
                     });
         NGNodeShim.markCullRegions(bn,drc, -1, BaseTransform.IDENTITY_TRANSFORM, new GeneralTransform3D());
-        Assert.assertEquals(1 | (1 << 2), NGNodeShim.cullingBits(bn));
+        assertEquals(1 | (1 << 2), NGNodeShim.cullingBits(bn));
     }
 
     @Test
@@ -99,7 +100,7 @@ public void test_setCullBits_empty() {
                     new RectBounds().makeEmpty()
                     });
         NGNodeShim.markCullRegions(bn,drc, -1, BaseTransform.IDENTITY_TRANSFORM, new GeneralTransform3D());
-        Assert.assertEquals(2, NGNodeShim.cullingBits(bn));
+        assertEquals(2, NGNodeShim.cullingBits(bn));
     }
 
     @Test
@@ -112,7 +113,7 @@ public void test_setCullBits_null() {
                     null
                     });
         NGNodeShim.markCullRegions(bn,drc, -1, BaseTransform.IDENTITY_TRANSFORM, new GeneralTransform3D());
-        Assert.assertEquals(2, NGNodeShim.cullingBits(bn));
+        assertEquals(2, NGNodeShim.cullingBits(bn));
     }
 
     @Test
@@ -121,7 +122,7 @@ public void test_setCullBits_empty_regions() {
         DirtyRegionContainer drc = new DirtyRegionContainer(2);
         drc.deriveWithNewRegions(new RectBounds[]{});
         NGNodeShim.markCullRegions(bn,drc, -1, BaseTransform.IDENTITY_TRANSFORM, new GeneralTransform3D());
-        Assert.assertEquals(0, NGNodeShim.cullingBits(bn));
+        assertEquals(0, NGNodeShim.cullingBits(bn));
     }
 
     @Test
@@ -133,9 +134,9 @@ public void test_group_disjoint() {
         DirtyRegionContainer drc = new DirtyRegionContainer(2);
         drc.deriveWithNewRegions(new RectBounds[]{new RectBounds(0, 0, 100, 100), new RectBounds(0, 110, 100, 210)});
         NGNodeShim.markCullRegions(gbn,drc, -1, BaseTransform.IDENTITY_TRANSFORM, new GeneralTransform3D());
-        Assert.assertEquals(0, NGNodeShim.cullingBits(gbn));
+        assertEquals(0, NGNodeShim.cullingBits(gbn));
         for(NGNode n : gbn.getChildren()) {
-            Assert.assertEquals(0, NGNodeShim.cullingBits(n));
+            assertEquals(0, NGNodeShim.cullingBits(n));
         }
     }
 
@@ -150,11 +151,11 @@ public void test_group_intersect() {
         NGNodeShim.markCullRegions(gbn,drc, -1, BaseTransform.IDENTITY_TRANSFORM, new GeneralTransform3D());
 
         //check group
-        Assert.assertEquals(1 | (1 << 2), NGNodeShim.cullingBits(gbn));
+        assertEquals(1 | (1 << 2), NGNodeShim.cullingBits(gbn));
 
         //check children
-        Assert.assertEquals(2, NGNodeShim.cullingBits(bn1));
-        Assert.assertEquals(2 << 2, NGNodeShim.cullingBits(bn2));
+        assertEquals(2, NGNodeShim.cullingBits(bn1));
+        assertEquals(2 << 2, NGNodeShim.cullingBits(bn2));
     }
 
     @Test
@@ -168,11 +169,11 @@ public void test_group_within() {
         NGNodeShim.markCullRegions(gbn,drc, -1, BaseTransform.IDENTITY_TRANSFORM, new GeneralTransform3D());
 
         //check group
-        Assert.assertEquals(2, NGNodeShim.cullingBits(gbn));
+        assertEquals(2, NGNodeShim.cullingBits(gbn));
 
         //check children (as the group is "completely covered", the children should not have been processed)
-        Assert.assertEquals(0, NGNodeShim.cullingBits(bn1));
-        Assert.assertEquals(0, NGNodeShim.cullingBits(bn2));
+        assertEquals(0, NGNodeShim.cullingBits(bn1));
+        assertEquals(0, NGNodeShim.cullingBits(bn2));
     }
 
     @Test
@@ -186,11 +187,11 @@ public void test_region_within_group() {
         NGNodeShim.markCullRegions(gbn,drc, -1, BaseTransform.IDENTITY_TRANSFORM, new GeneralTransform3D());
 
         //check group
-        Assert.assertEquals(1 | (1 << 2), NGNodeShim.cullingBits(gbn));
+        assertEquals(1 | (1 << 2), NGNodeShim.cullingBits(gbn));
 
         //check children
-        Assert.assertEquals(1, NGNodeShim.cullingBits(bn1));
-        Assert.assertEquals(1 << 2, NGNodeShim.cullingBits(bn2));
+        assertEquals(1, NGNodeShim.cullingBits(bn1));
+        assertEquals(1 << 2, NGNodeShim.cullingBits(bn2));
     }
 
     @Test
@@ -209,15 +210,15 @@ public void test_region_within_group_group() {
         NGNodeShim.markCullRegions(gbn,drc, -1, BaseTransform.IDENTITY_TRANSFORM, new GeneralTransform3D());
 
         //check group
-        Assert.assertEquals(1 | (1 << 2), NGNodeShim.cullingBits(gbn));
+        assertEquals(1 | (1 << 2), NGNodeShim.cullingBits(gbn));
 
         //check group1
-        Assert.assertEquals(1 | (1 << 2), NGNodeShim.cullingBits(g1bn));
+        assertEquals(1 | (1 << 2), NGNodeShim.cullingBits(g1bn));
 
         //check children
-        Assert.assertEquals(1, NGNodeShim.cullingBits(bn1));
-        Assert.assertEquals(1 << 2, NGNodeShim.cullingBits(bn2));
-        Assert.assertEquals(0, NGNodeShim.cullingBits(bn3));
+        assertEquals(1, NGNodeShim.cullingBits(bn1));
+        assertEquals(1 << 2, NGNodeShim.cullingBits(bn2));
+        assertEquals(0, NGNodeShim.cullingBits(bn3));
     }
 
     @Test
@@ -229,7 +230,7 @@ public void test_rectangle_group_full_within_then_partial() {
         drc.deriveWithNewRegions(new RectBounds[]{new RectBounds(0, 0, 160, 160), new RectBounds(80, 80, 100, 100)});
         NGNodeShim.markCullRegions(gbn,drc, -1, BaseTransform.IDENTITY_TRANSFORM, new GeneralTransform3D());
 
-        Assert.assertEquals(2 | (1 << 2), NGNodeShim.cullingBits(gbn));
-        Assert.assertEquals(1 << 2, NGNodeShim.cullingBits(bn1));
+        assertEquals(2 | (1 << 2), NGNodeShim.cullingBits(gbn));
+        assertEquals(1 << 2, NGNodeShim.cullingBits(bn1));
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/DirtyRegionClipTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/DirtyRegionClipTest.java
index ed0652cbeed..4f6d5a4b3d4 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/DirtyRegionClipTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/DirtyRegionClipTest.java
@@ -26,8 +26,8 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
+import java.util.stream.Stream;
 
 import com.sun.javafx.geom.BaseBounds;
 import com.sun.javafx.geom.DirtyRegionContainer;
@@ -36,13 +36,11 @@
 import com.sun.javafx.sg.prism.NGNode;
 import com.sun.javafx.sg.prism.NGRectangle;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-@RunWith(Parameterized.class)
 public class DirtyRegionClipTest extends DirtyRegionTestBase {
 
     /**
@@ -55,8 +53,7 @@ public class DirtyRegionClipTest extends DirtyRegionTestBase {
      * change to the node's geometry is, such that the test code can create the
      * union and test for the appropriate dirty region for this specific node.
      */
-    @Parameterized.Parameters
-    public static Collection createParameters() {
+    public static Stream<Arguments> createParameters() {
         // This polluter will translate the test node in a positive direction
         final Polluter pollutePositiveTranslation = new Polluter() {
             { tx = BaseTransform.getTranslateInstance(50, 50); }
@@ -66,7 +63,7 @@ public static Collection createParameters() {
 
         // We will populate this list with the parameters with which we will test.
         // Each Object[] within the params is composed of a Creator and a Polluter.
-        List<Object[]> params = new ArrayList<>();
+        Stream<Arguments> params = Stream.empty();
         // A standard list of polluters which applies to all tests
         List<Polluter> polluters = Arrays.asList(new Polluter[]{
                 pollutePositiveTranslation
@@ -74,10 +71,13 @@ public static Collection createParameters() {
 
         // Construct the Creator / Polluter pair for Groups
         for (final Polluter polluter : polluters) {
-            params.add(new Object[] {new Creator() {
-                @Override public NGNode create() { return createGroup(createRectangle(0, 0, 100, 100)); }
-                @Override public String toString() { return "Group with one Rectangle"; }
-            }, polluter});
+            params = appendArgument(params, Arguments.of(
+                new Creator() {
+                    @Override public NGNode create() { return createGroup(createRectangle(0, 0, 100, 100)); }
+                    @Override public String toString() { return "Group with one Rectangle"; }
+                },
+                polluter
+            ));
         }
 
         // Construct the Creator / Polluter pair for Rectangles
@@ -91,26 +91,32 @@ public static Collection createParameters() {
             @Override public String toString() { return "Pollute Rectangle Geometry"; }
         });
         for (final Polluter polluter : rectanglePolluters) {
-            params.add(new Object[] {new Creator() {
-                @Override public NGNode create() { return createRectangle(0, 0, 100, 100); }
-                @Override public String toString() { return "Rectangle"; }
-            }, polluter});
+            params = appendArgument(params, Arguments.of(
+                new Creator() {
+                    @Override public NGNode create() { return createRectangle(0, 0, 100, 100); }
+                    @Override public String toString() { return "Rectangle"; }
+                },
+                polluter
+            ));
         }
         // Return the populated params collection
         return params;
     }
 
-    public DirtyRegionClipTest(Creator creator, Polluter polluter) {
-        super(creator, polluter);
-    }
-
     /**
      * Constructs a non-overlapping grid of nodes. Each node is a direct child
      * of the root node. They may end up overlapping when they become dirty,
      * but they don't start out that way! Each node is placed where it belongs
      * in the grid by translating them into place.
+     *
+     * NOTE: This was a parametrized test initializer with @BeforeEach flag, but
+     * JUnit5 does not support parametrized classes yet. Make this a @BeforeEach
+     * method once it does.
      */
-    @Before public void setUp() {
+    @Override
+    protected void setUp(Creator creator, Polluter polluter) {
+        super.setUp(creator, polluter);
+
         // create the grid
         NGNode[] content = new NGNode[9];
         for (int row=0; row<3; row++) {
@@ -131,7 +137,11 @@ public DirtyRegionClipTest(Creator creator, Polluter polluter) {
         root.clearDirty();
     }
 
-    @Test public void sanityCheck() {
+    @ParameterizedTest
+    @MethodSource("createParameters")
+    public void sanityCheck(Creator creator, Polluter polluter) {
+        setUp(creator, polluter); // NOTE: JUnit5 does not (yet) support parametrized classes. Revert those changes once it does.
+
         NGNode node = root.getChildren().get(0);
         assertEquals(new RectBounds(0, 0, 100, 100), node.getContentBounds(new RectBounds(), BaseTransform.IDENTITY_TRANSFORM));
         assertEquals(new RectBounds(0, 0, 100, 100), node.getCompleteBounds(new RectBounds(), BaseTransform.IDENTITY_TRANSFORM));
@@ -149,7 +159,11 @@ public DirtyRegionClipTest(Creator creator, Polluter polluter) {
      * Dirty region bounds are bigger than clip bounds and whole clip lies
      * inside the dirty region.
      */
-    @Test public void dirtyRegionContainsClip() {
+    @ParameterizedTest
+    @MethodSource("createParameters")
+    public void dirtyRegionContainsClip(Creator creator, Polluter polluter) {
+        setUp(creator, polluter); // NOTE: JUnit5 does not (yet) support parametrized classes. Revert those changes once it does.
+
         windowClip = new RectBounds(115, 115, 120, 120);
 
         NGNode middleChild = root.getChildren().get(root.getChildren().size()/2);
@@ -159,7 +173,11 @@ public DirtyRegionClipTest(Creator creator, Polluter polluter) {
     /**
      * Dirty region bounds partially overlap with clip bounds.
      */
-    @Test public void dirtyRegionPartiallyOverlapsClip() {
+    @ParameterizedTest
+    @MethodSource("createParameters")
+    public void dirtyRegionPartiallyOverlapsClip(Creator creator, Polluter polluter) {
+        setUp(creator, polluter); // NOTE: JUnit5 does not (yet) support parametrized classes. Revert those changes once it does.
+
         windowClip = new RectBounds(90, 90, 120, 120);
 
         NGNode middleChild = root.getChildren().get(root.getChildren().size()/2);
@@ -170,7 +188,11 @@ public DirtyRegionClipTest(Creator creator, Polluter polluter) {
      * Dirty region bounds are smaller than clip bounds and the dirty region
      * lies inside the clip.
      */
-    @Test public void dirtyRegionDoesNotContainClip() {
+    @ParameterizedTest
+    @MethodSource("createParameters")
+    public void dirtyRegionDoesNotContainClip(Creator creator, Polluter polluter) {
+        setUp(creator, polluter); // NOTE: JUnit5 does not (yet) support parametrized classes. Revert those changes once it does.
+
         NGNode middleChild = root.getChildren().get(root.getChildren().size()/2);
         assertContainsClip(root, polluter.polluteAndGetExpectedBounds(middleChild), DirtyRegionContainer.DTR_OK);
     }
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/DirtyRegionTestBase.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/DirtyRegionTestBase.java
index 1c24322ca04..357894deeff 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/DirtyRegionTestBase.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/DirtyRegionTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,10 +32,10 @@
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Stream;
 import com.sun.javafx.geom.BaseBounds;
 import com.sun.javafx.geom.DirtyRegionContainer;
 import com.sun.javafx.geom.DirtyRegionPool;
@@ -49,8 +49,9 @@
 import com.sun.javafx.sg.prism.NGRegion;
 import com.sun.javafx.sg.prism.NGShape;
 import com.sun.prism.paint.Color;
-import org.junit.runners.Parameterized;
-import static org.junit.Assert.assertEquals;
+
+import org.junit.jupiter.params.provider.Arguments;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * A base class for all testing of the dirty regions. This class contains
@@ -69,6 +70,10 @@
  * combination of a node type & dirty method.
  */
 public class DirtyRegionTestBase extends NGTestBase {
+    protected static Stream<Arguments> appendArgument(Stream<Arguments> stream, Arguments arg) {
+        return Stream.concat(stream, Stream.of(arg));
+    }
+
     /**
      * Gets the test parameters to use when running these tests. The parameters
      * are a combination of a Polluter and a Creator. The Creator is used to
@@ -79,8 +84,7 @@ public class DirtyRegionTestBase extends NGTestBase {
      * change to the node's geometry is, such that the test code can create the
      * union and test for the appropriate dirty region for this specific node.
      */
-    @Parameterized.Parameters
-    public static Collection createParameters() {
+    public static Stream<Arguments> createParameters() {
         // This polluter will change the opacity of the test node
         final Polluter polluteOpacity = new Polluter() {
             @Override public void pollute(NGNode node) { node.setOpacity(.5f); }
@@ -201,7 +205,8 @@ public static Collection createParameters() {
 
         // We will populate this list with the parameters with which we will test.
         // Each Object[] within the params is composed of a Creator and a Polluter.
-        List<Object[]> params = new ArrayList<>();
+        Stream<Arguments> params = Stream.empty();
+        //List<Object[]> params = new ArrayList<>();
         // A standard list of polluters which applies to all tests
         List<Polluter> polluters = Arrays.asList(new Polluter[]{
                 polluteRotate,
@@ -216,10 +221,13 @@ public static Collection createParameters() {
         });
         // Construct the Creator / Polluter pair for Groups
         for (final Polluter polluter : polluters) {
-            params.add(new Object[] {new Creator() {
-                @Override public NGNode create() { return createGroup(createRectangle(0, 0, 100, 100)); }
-                @Override public String toString() { return "Group with one Rectangle"; }
-            }, polluter});
+            params = appendArgument(params, Arguments.of(
+                new Creator() {
+                    @Override public NGNode create() { return createGroup(createRectangle(0, 0, 100, 100)); }
+                    @Override public String toString() { return "Group with one Rectangle"; }
+                },
+                polluter
+            ));
         }
         // Construct the Creator / Polluter pair for Rectangles
         List<Polluter> rectanglePolluters = new ArrayList<>(polluters);
@@ -232,10 +240,13 @@ public static Collection createParameters() {
             @Override public String toString() { return "Pollute Rectangle Geometry"; }
         });
         for (final Polluter polluter : rectanglePolluters) {
-            params.add(new Object[] {new Creator() {
-                @Override public NGNode create() { return createRectangle(0, 0, 100, 100); }
-                @Override public String toString() { return "Rectangle"; }
-            }, polluter});
+            params = appendArgument(params, Arguments.of(
+                new Creator() {
+                    @Override public NGNode create() { return createRectangle(0, 0, 100, 100); }
+                    @Override public String toString() { return "Rectangle"; }
+                },
+                polluter
+            ));
         }
         // Construct the Creator / Polluter pair for Circles
         List<Polluter> circlePolluters = new ArrayList<>(polluters);
@@ -251,10 +262,13 @@ public static Collection createParameters() {
             @Override public String toString() { return "Pollute Circle Geometry"; }
         });
         for (final Polluter polluter : circlePolluters) {
-            params.add(new Object[] {new Creator() {
-                @Override public NGNode create() { return createCircle(50, 50, 50); }
-                @Override public String toString() { return "Circle"; }
-            }, polluter});
+            params = appendArgument(params, Arguments.of(
+                new Creator() {
+                    @Override public NGNode create() { return createCircle(50, 50, 50); }
+                    @Override public String toString() { return "Circle"; }
+                },
+                polluter
+            ));
         }
         // Return the populated params collection
         return params;
@@ -287,14 +301,9 @@ public static Collection createParameters() {
      */
     protected RectBounds windowClip = new RectBounds(-100000, -100000, 100000, 10000);
 
-    /**
-     * Creates a new DirtyRegionTestBase. Each subclass must have an identical
-     * constructor which simply passes the creator and polluter to this
-     * constructor. These instances are passed to the constructor by JUnit,
-     * so sub classes don't need to worry about creating these instances
-     * (and in fact must not do so).
-     */
-    protected DirtyRegionTestBase(Creator creator, Polluter polluter) {
+    // @BeforeEach
+    // commented out until JUnit5 supports parametrized class tests
+    protected void setUp(Creator creator, Polluter polluter) {
         this.creator = creator;
         this.polluter = polluter;
     }
@@ -340,7 +349,7 @@ protected void assertDirtyRegionEquals(NGNode start, RectBounds expected) {
                 Math.min(expected.getMaxX() + 1, dirtyRegion.getMaxX()),
                 Math.min(expected.getMaxY() + 1, dirtyRegion.getMaxY()));
         // Now make the check, and print useful error information in case it fails.
-        assertEquals("creator=" + creator + ", polluter=" + polluter, expected, dirtyRegion);
+        assertEquals(expected, dirtyRegion, "creator=" + creator + ", polluter=" + polluter);
     }
 
     /**
@@ -361,7 +370,7 @@ protected void assertContainsClip(NGNode start, RectBounds expectedDirtyRegion,
                 drc,
                 BaseTransform.IDENTITY_TRANSFORM, new GeneralTransform3D());
 
-        assertEquals(expectedStatus, status);
+        assertEquals(expectedStatus, status, "creator=" + creator + ", polluter=" + polluter);
 
         if (status == DirtyRegionContainer.DTR_OK) {
             assertDirtyRegionEquals(start, expectedDirtyRegion);
@@ -427,9 +436,8 @@ private void accumulateDirtyRegions() {
      * called, and throws an exception if it was not expected.
      */
     private void assertOnlyTheseNodesWereAskedToAccumulateDirtyRegions(NGNode start, Set<NGNode> nodes) {
-        assertEquals(
-                "creator=" + creator + ", polluter=" + polluter,
-                nodes.contains(start), ((TestNGNode)start).askedToAccumulateDirtyRegion());
+        assertEquals(nodes.contains(start), ((TestNGNode)start).askedToAccumulateDirtyRegion(),
+                     "creator=" + creator + ", polluter=" + polluter);
         if (start instanceof NGGroup) {
             for (NGNode child : ((NGGroup)start).getChildren()) {
                 assertOnlyTheseNodesWereAskedToAccumulateDirtyRegions(child, nodes);
@@ -442,9 +450,8 @@ private void assertOnlyTheseNodesWereAskedToAccumulateDirtyRegions(NGNode start,
      * compute the dirty region have been called, and throws an exception if it was not expected.
      */
     private void assertOnlyTheseNodesWereAskedToComputeDirtyRegions(NGNode start, Set<NGNode> nodes) {
-        assertEquals(
-                "creator=" + creator + ", polluter=" + polluter,
-                nodes.contains(start), ((TestNGNode)start).computedDirtyRegion());
+        assertEquals(nodes.contains(start), ((TestNGNode)start).computedDirtyRegion(),
+                     "creator=" + creator + ", polluter=" + polluter);
         if (start instanceof NGGroup) {
             for (NGNode child : ((NGGroup)start).getChildren()) {
                 assertOnlyTheseNodesWereAskedToComputeDirtyRegions(child, nodes);
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/EffectDirtyRegionTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/EffectDirtyRegionTest.java
index 983a6c458c0..49c62fdbf38 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/EffectDirtyRegionTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/EffectDirtyRegionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -51,8 +51,9 @@
 import com.sun.scenario.effect.MotionBlur;
 import com.sun.scenario.effect.Offset;
 import com.sun.scenario.effect.SepiaTone;
-import junit.framework.Assert;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class EffectDirtyRegionTest {
 
@@ -479,7 +480,7 @@ private void setupTest() {
 
     private void compareResult(DirtyRegionContainer expected, DirtyRegionContainer computed) {
         for (int i = 0; i < computed.size(); i++) {
-            Assert.assertEquals(expected.getDirtyRegion(i), computed.getDirtyRegion(i));
+            assertEquals(expected.getDirtyRegion(i), computed.getDirtyRegion(i));
         }
     }
 
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/GridDirtyRegionTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/GridDirtyRegionTest.java
index f0084b5894e..97c7cf9e9f8 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/GridDirtyRegionTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/GridDirtyRegionTest.java
@@ -32,12 +32,10 @@
 import com.sun.javafx.geom.transform.BaseTransform;
 import com.sun.javafx.sg.prism.NGNode;
 import com.sun.scenario.effect.DropShadow;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 /**
  * A series of tests where we are checking for the dirty region on a grid
@@ -50,7 +48,6 @@
  * must implement TestNGNode; the base class must set the "root" in the
  * parent class.
  */
-@RunWith(Parameterized.class)
 public class GridDirtyRegionTest extends DirtyRegionTestBase {
     /**
      * Specified to avoid magic numbers. There are several places where we
@@ -58,21 +55,18 @@ public class GridDirtyRegionTest extends DirtyRegionTestBase {
      */
     private static final float TRANSLATE_DELTA = 50;
 
-    /**
-     * Creates a new instance of the GridDirtyRegionTest. Since this is a
-     * parameterized test, we are passed the node creator and polluter.
-     */
-    public GridDirtyRegionTest(Creator creator, Polluter polluter) {
-        super(creator, polluter);
-    }
-
     /**
      * Constructs a non-overlapping grid of nodes. Each node is a direct child
      * of the root node. They may end up overlapping when they become dirty,
      * but they don't start out that way! Each node is placed where it belongs
      * in the grid by translating them into place.
+     *
+     * NOTE: This was a parametrized test initializer with @BeforeEach flag, but
+     * JUnit5 does not support parametrized classes yet. Make this a @BeforeEach
+     * method once it does.
      */
-    @Before public void setUp() {
+    @Override
+    protected void setUp(Creator creator, Polluter polluter) {
         // create the grid
         NGNode[] content = new NGNode[9];
         for (int row=0; row<3; row++) {
@@ -93,7 +87,11 @@ public GridDirtyRegionTest(Creator creator, Polluter polluter) {
         root.clearDirty();
     }
 
-    @Test public void sanityCheck() {
+    @ParameterizedTest
+    @MethodSource("createParameters")
+    public void sanityCheck(Creator creator, Polluter polluter) {
+        setUp(creator, polluter); // NOTE: JUnit5 does not (yet) support parametrized classes. Revert those changes once it does.
+
         NGNode node = root.getChildren().get(0);
         assertEquals(new RectBounds(0, 0, 100, 100), node.getContentBounds(new RectBounds(), BaseTransform.IDENTITY_TRANSFORM));
         assertEquals(new RectBounds(0, 0, 100, 100), node.getCompleteBounds(new RectBounds(), BaseTransform.IDENTITY_TRANSFORM));
@@ -107,12 +105,20 @@ public GridDirtyRegionTest(Creator creator, Polluter polluter) {
         assertEquals(new RectBounds(0, 110, 100, 210), node.getCompleteBounds(new RectBounds(), BaseTransform.IDENTITY_TRANSFORM));
     }
 
-    @Test public void cleanNodesShouldNotContributeToDirtyRegion() {
+    @ParameterizedTest
+    @MethodSource("createParameters")
+    public void cleanNodesShouldNotContributeToDirtyRegion(Creator creator, Polluter polluter) {
+        setUp(creator, polluter); // NOTE: JUnit5 does not (yet) support parametrized classes. Revert those changes once it does.
+
         // By default the scene should be clean
         assertDirtyRegionEquals(root, new RectBounds());
     }
 
-    @Test public void cleanChildNodesOnADirtyParentShouldNotContributeToDirtyRegion() {
+    @ParameterizedTest
+    @MethodSource("createParameters")
+    public void cleanChildNodesOnADirtyParentShouldNotContributeToDirtyRegion(Creator creator, Polluter polluter) {
+        setUp(creator, polluter); // NOTE: JUnit5 does not (yet) support parametrized classes. Revert those changes once it does.
+
         // Now if I translate the root, none of the child nodes
         // should contribute to the dirty region
         translate(root, TRANSLATE_DELTA, TRANSLATE_DELTA);
@@ -121,12 +127,20 @@ public GridDirtyRegionTest(Creator creator, Polluter polluter) {
         }
     }
 
-    @Test public void whenOnlyTheRootIsDirtyOnlyTheRootShouldBeAskedToAccumulateDirtyRegions() {
+    @ParameterizedTest
+    @MethodSource("createParameters")
+    public void whenOnlyTheRootIsDirtyOnlyTheRootShouldBeAskedToAccumulateDirtyRegions(Creator creator, Polluter polluter) {
+        setUp(creator, polluter); // NOTE: JUnit5 does not (yet) support parametrized classes. Revert those changes once it does.
+
         translate(root, TRANSLATE_DELTA, TRANSLATE_DELTA);
         assertOnlyTheseNodesAreAskedToAccumulateDirtyRegions(root);
     }
 
-    @Test public void cleanChildNodesOnACleanParentShouldNotContributeToDirtyRegion() {
+    @ParameterizedTest
+    @MethodSource("createParameters")
+    public void cleanChildNodesOnACleanParentShouldNotContributeToDirtyRegion(Creator creator, Polluter polluter) {
+        setUp(creator, polluter); // NOTE: JUnit5 does not (yet) support parametrized classes. Revert those changes once it does.
+
         // If I make one of the children dirty, then the child should contribute
         // to the dirty region, but none of the other nodes should. This test just
         // checks this second part -- that none of the other child nodes contribute.
@@ -139,7 +153,11 @@ public GridDirtyRegionTest(Creator creator, Polluter polluter) {
         }
     }
 
-    @Test public void whenOnlyASingleChildIsDirtyThenParentAndAllChildrenAreAskedToAccumulateDirtyRegions() {
+    @ParameterizedTest
+    @MethodSource("createParameters")
+    public void whenOnlyASingleChildIsDirtyThenParentAndAllChildrenAreAskedToAccumulateDirtyRegions(Creator creator, Polluter polluter) {
+        setUp(creator, polluter); // NOTE: JUnit5 does not (yet) support parametrized classes. Revert those changes once it does.
+
         NGNode middleChild = root.getChildren().get(root.getChildren().size()/2);
         polluter.pollute(middleChild);
         List<NGNode> nodes = new ArrayList<>(root.getChildren());
@@ -150,7 +168,11 @@ public GridDirtyRegionTest(Creator creator, Polluter polluter) {
         assertOnlyTheseNodesAreAskedToAccumulateDirtyRegions(arr);
     }
 
-    @Test public void whenOnlyASingleChildIsDirtyThenOnlyParentAndThatChildShouldComputeDirtyRegions() {
+    @ParameterizedTest
+    @MethodSource("createParameters")
+    public void whenOnlyASingleChildIsDirtyThenOnlyParentAndThatChildShouldComputeDirtyRegions(Creator creator, Polluter polluter) {
+        setUp(creator, polluter); // NOTE: JUnit5 does not (yet) support parametrized classes. Revert those changes once it does.
+
         NGNode middleChild = root.getChildren().get(root.getChildren().size()/2);
         polluter.pollute(middleChild);
         /*
@@ -162,12 +184,20 @@ public GridDirtyRegionTest(Creator creator, Polluter polluter) {
         assertOnlyTheseNodesAreAskedToComputeDirtyRegions(root, middleChild);
     }
 
-    @Test public void aDirtyChildNodeShouldFormTheDirtyRegionWhenItIsTheOnlyDirtyNode() {
+    @ParameterizedTest
+    @MethodSource("createParameters")
+    public void aDirtyChildNodeShouldFormTheDirtyRegionWhenItIsTheOnlyDirtyNode(Creator creator, Polluter polluter) {
+        setUp(creator, polluter); // NOTE: JUnit5 does not (yet) support parametrized classes. Revert those changes once it does.
+
         NGNode middleChild = root.getChildren().get(root.getChildren().size()/2);
         assertDirtyRegionEquals(root, polluter.polluteAndGetExpectedBounds(middleChild));
     }
 
-    @Test public void theUnionOfTwoDirtyChildNodesDirtyRegionsShouldFormTheDirtyRegionWhenTheyAreTheOnlyDirtyNodes() {
+    @ParameterizedTest
+    @MethodSource("createParameters")
+    public void theUnionOfTwoDirtyChildNodesDirtyRegionsShouldFormTheDirtyRegionWhenTheyAreTheOnlyDirtyNodes(Creator creator, Polluter polluter) {
+        setUp(creator, polluter); // NOTE: JUnit5 does not (yet) support parametrized classes. Revert those changes once it does.
+
         NGNode firstChild = root.getChildren().get(0);
         NGNode middleChild = root.getChildren().get(root.getChildren().size()/2);
         RectBounds firstChildArea = polluter.polluteAndGetExpectedBounds(firstChild);
@@ -176,7 +206,11 @@ public GridDirtyRegionTest(Creator creator, Polluter polluter) {
         assertDirtyRegionEquals(root, expected);
     }
 
-    @Test public void whenTheParentIsDirtyAndSomeChildrenAreDirtyTheParentBoundsShouldFormTheDirtyRegion() {
+    @ParameterizedTest
+    @MethodSource("createParameters")
+    public void whenTheParentIsDirtyAndSomeChildrenAreDirtyTheParentBoundsShouldFormTheDirtyRegion(Creator creator, Polluter polluter) {
+        setUp(creator, polluter); // NOTE: JUnit5 does not (yet) support parametrized classes. Revert those changes once it does.
+
         BaseBounds original = root.getCompleteBounds(new RectBounds(), BaseTransform.IDENTITY_TRANSFORM);
         translate(root, TRANSLATE_DELTA, TRANSLATE_DELTA);
         BaseBounds transformed = root.getCompleteBounds(new RectBounds(), BaseTransform.IDENTITY_TRANSFORM);
@@ -187,7 +221,11 @@ public GridDirtyRegionTest(Creator creator, Polluter polluter) {
         assertDirtyRegionEquals(root, expected);
     }
 
-    @Test public void anEffectShouldChangeTheTransformedBoundsOfAChild() {
+    @ParameterizedTest
+    @MethodSource("createParameters")
+    public void anEffectShouldChangeTheTransformedBoundsOfAChild(Creator creator, Polluter polluter) {
+        setUp(creator, polluter); // NOTE: JUnit5 does not (yet) support parametrized classes. Revert those changes once it does.
+
         NGNode middleChild = root.getChildren().get(root.getChildren().size()/2);
         BaseBounds oldTransformedBounds = middleChild.getCompleteBounds(new RectBounds(), BaseTransform.IDENTITY_TRANSFORM);
         DropShadow shadow = new DropShadow();
@@ -200,7 +238,11 @@ public GridDirtyRegionTest(Creator creator, Polluter polluter) {
         assertFalse(newTransformedBounds.equals(oldTransformedBounds));
     }
 
-    @Test public void whenAnEffectIsSetTheChildBecomesDirtyAndTheDirtyRegionIncludesTheEffectBounds() {
+    @ParameterizedTest
+    @MethodSource("createParameters")
+    public void whenAnEffectIsSetTheChildBecomesDirtyAndTheDirtyRegionIncludesTheEffectBounds(Creator creator, Polluter polluter) {
+        setUp(creator, polluter); // NOTE: JUnit5 does not (yet) support parametrized classes. Revert those changes once it does.
+
         NGNode middleChild = root.getChildren().get(root.getChildren().size()/2);
         DropShadow shadow = new DropShadow();
         shadow.setGaussianWidth(21);
@@ -214,7 +256,11 @@ public GridDirtyRegionTest(Creator creator, Polluter polluter) {
         assertDirtyRegionEquals(root, expected);
     }
 
-    @Test public void whenAnEffectIsChangedOnTheChildTheDirtyRegionIncludesTheOldAndNewEffectBounds() {
+    @ParameterizedTest
+    @MethodSource("createParameters")
+    public void whenAnEffectIsChangedOnTheChildTheDirtyRegionIncludesTheOldAndNewEffectBounds(Creator creator, Polluter polluter) {
+        setUp(creator, polluter); // NOTE: JUnit5 does not (yet) support parametrized classes. Revert those changes once it does.
+
         NGNode middleChild = root.getChildren().get(root.getChildren().size()/2);
         DropShadow shadow = new DropShadow();
         shadow.setGaussianWidth(21);
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/GrowableDataBufferTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/GrowableDataBufferTest.java
index 047b909a605..c2d9baa920f 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/GrowableDataBufferTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/GrowableDataBufferTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,10 +26,10 @@
 package test.com.sun.javafx.sg.prism;
 
 import com.sun.javafx.sg.prism.GrowableDataBuffer;
-import org.junit.Test;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  */
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/NGCircleTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/NGCircleTest.java
index 36284cf5d62..39571f16e62 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/NGCircleTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/NGCircleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,12 +29,13 @@
 import com.sun.javafx.sg.prism.NGCircle;
 import com.sun.javafx.sg.prism.NGNodeShim;
 import com.sun.prism.paint.Color;
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  */
@@ -42,7 +43,8 @@ public class NGCircleTest extends NGTestBase {
 
     NGCircle circle;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         circle = new NGCircle();
         circle.setFillPaint(Color.RED);
         circle.updateCircle(10, 10, 5);
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/NGEllipseTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/NGEllipseTest.java
index 8a054e8c2a0..f860d5a2596 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/NGEllipseTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/NGEllipseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,12 +29,13 @@
 import com.sun.javafx.sg.prism.NGEllipse;
 import com.sun.javafx.sg.prism.NGNodeShim;
 import com.sun.prism.paint.Color;
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  */
@@ -42,7 +43,7 @@ public class NGEllipseTest extends NGTestBase {
 
     NGEllipse ellipse;
 
-    @Before
+    @BeforeEach
     public void setup() {
         ellipse = new NGEllipse();
         ellipse.setFillPaint(Color.RED);
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/NGImageViewTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/NGImageViewTest.java
index 21bf72e1b10..df6e3dd9a1f 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/NGImageViewTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/NGImageViewTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,11 +29,12 @@
 import com.sun.javafx.sg.prism.NGImageView;
 import com.sun.javafx.sg.prism.NGNodeShim;
 import com.sun.prism.Image;
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  */
@@ -43,7 +44,7 @@ public class NGImageViewTest extends NGTestBase {
 
     NGImageView imageView;
 
-    @Before
+    @BeforeEach
     public void setup() {
         imageView = new NGImageView();
         imageView.setImage(ICON);
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/NGNodeTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/NGNodeTest.java
index 45804ffa8ef..fb69cf24c07 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/NGNodeTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/NGNodeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,22 +38,23 @@
 import com.sun.scenario.effect.Effect;
 import com.sun.scenario.effect.FilterContext;
 import com.sun.scenario.effect.ImageData;
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  */
 public class NGNodeTest extends NGTestBase {
     NGNodeMock n;
 
-    @Before
+    @BeforeEach
     public void setup() {
         n = new NGNodeMock();
     }
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/NGRectangleTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/NGRectangleTest.java
index 0230befc86d..22625a7dc9b 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/NGRectangleTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/NGRectangleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,11 +29,12 @@
 import com.sun.javafx.sg.prism.NGNodeShim;
 import com.sun.javafx.sg.prism.NGRectangle;
 import com.sun.prism.paint.Color;
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Tests for NGRectangle class
@@ -41,7 +42,7 @@
 public class NGRectangleTest extends NGTestBase {
     NGRectangleMock r;
 
-    @Before
+    @BeforeEach
     public void setup() {
         r = new NGRectangleMock();
         r.updateRectangle(0, 0, 100, 100, 0, 0);
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/NGRegionTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/NGRegionTest.java
index 15cd3d7d100..59ba74f4ccd 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/NGRegionTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/NGRegionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,14 +37,16 @@
 import javafx.scene.shape.LineTo;
 import javafx.scene.shape.MoveTo;
 import javafx.scene.shape.Path;
-import org.junit.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  */
 public class NGRegionTest {
-    @Test public void setOpaqueInsetsInvalidatesOpaqueRegion() {
+    @Test
+    public void setOpaqueInsetsInvalidatesOpaqueRegion() {
         NGRegion r = new NGRegion();
         r.getOpaqueRegion(); // Forces to validate the opaque region
         assertFalse(NGNodeShim.isOpaqueRegionInvalid(r)); // sanity check
@@ -52,7 +54,8 @@ public class NGRegionTest {
         assertTrue(NGNodeShim.isOpaqueRegionInvalid(r));
     }
 
-    @Test public void updateShapeInvalidatesOpaqueRegion() {
+    @Test
+    public void updateShapeInvalidatesOpaqueRegion() {
         NGRegion r = new NGRegion();
         r.getOpaqueRegion(); // Forces to validate the opaque region
         assertFalse(NGNodeShim.isOpaqueRegionInvalid(r)); // sanity check
@@ -62,7 +65,8 @@ public class NGRegionTest {
 
     // RT-13820: We change the shape internally and call this same method, so it
     // needs to invalidate the opaque region.
-    @Test public void updateShapeToSameInstanceInvalidatesOpaqueRegion() {
+    @Test
+    public void updateShapeToSameInstanceInvalidatesOpaqueRegion() {
         LineTo lineTo;
         Path p = new Path(
                 new MoveTo(10, 20),
@@ -79,7 +83,8 @@ public class NGRegionTest {
         assertTrue(NGNodeShim.isOpaqueRegionInvalid(r));
     }
 
-    @Test public void setSizeInvalidatesOpaqueRegion() {
+    @Test
+    public void setSizeInvalidatesOpaqueRegion() {
         NGRegion r = new NGRegion();
         r.getOpaqueRegion(); // Forces to validate the opaque region
         assertFalse(NGNodeShim.isOpaqueRegionInvalid(r)); // sanity check
@@ -93,7 +98,8 @@ public class NGRegionTest {
     // background is changed on the Region, setOpaqueInsets is called which invalidates
     // the opaque region).
 
-    @Test public void updateBackgroundWithSameSizeButTransparentFillInvalidatesOpaqueInsets() {
+    @Test
+    public void updateBackgroundWithSameSizeButTransparentFillInvalidatesOpaqueInsets() {
         Region r = new Region();
         NGRegion peer = NodeHelper.getPeer(r);
         r.setBackground(new Background(new BackgroundFill(Color.RED, null, null)));
@@ -105,7 +111,8 @@ public class NGRegionTest {
         assertTrue(NGNodeShim.isOpaqueRegionInvalid(peer));
     }
 
-    @Test public void updateBackgroundWithDifferentSizeBackgroundInvalidatesOpaqueInsets() {
+    @Test
+    public void updateBackgroundWithDifferentSizeBackgroundInvalidatesOpaqueInsets() {
         Region r = new Region();
         NGRegion peer = NodeHelper.getPeer(r);
         r.setBackground(new Background(new BackgroundFill(Color.RED, null, null)));
@@ -117,7 +124,8 @@ public class NGRegionTest {
         assertTrue(NGNodeShim.isOpaqueRegionInvalid(peer));
     }
 
-    @Test public void updateBackgroundWithDifferentSizeBackgroundInvalidatesOpaqueInsets2() {
+    @Test
+    public void updateBackgroundWithDifferentSizeBackgroundInvalidatesOpaqueInsets2() {
         Region r = new Region();
         NGRegion peer = NodeHelper.getPeer(r);
         r.setBackground(new Background(new BackgroundFill(Color.RED, null, null)));
@@ -129,7 +137,8 @@ public class NGRegionTest {
         assertTrue(NGNodeShim.isOpaqueRegionInvalid(peer));
     }
 
-    @Test public void updateBackgroundWithDifferentSizeBackgroundInvalidatesOpaqueInsets3() {
+    @Test
+    public void updateBackgroundWithDifferentSizeBackgroundInvalidatesOpaqueInsets3() {
         Region r = new Region();
         NGRegion peer = NodeHelper.getPeer(r);
         r.setBackground(new Background(new BackgroundFill(Color.RED, null, null)));
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/NGShapeTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/NGShapeTest.java
index ac77af24605..6a180c8a5f2 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/NGShapeTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/NGShapeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,20 +35,21 @@
 import com.sun.prism.paint.Color;
 import com.sun.prism.paint.LinearGradient;
 import com.sun.prism.paint.Stop;
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  */
 public class NGShapeTest extends NGTestBase {
     private NGShape shape;
 
-    @Before
+    @BeforeEach
     public void setup() {
         shape = new NGShape() {
             @Override
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/NGTriangleMeshTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/NGTriangleMeshTest.java
index 2a130349f11..c2cb3d23232 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/NGTriangleMeshTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/NGTriangleMeshTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,9 @@
 
 import com.sun.javafx.sg.prism.NGTriangleMeshShim;
 import java.util.Arrays;
-import static org.junit.Assert.assertArrayEquals;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class NGTriangleMeshTest {
 
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/OcclusionCullingTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/OcclusionCullingTest.java
index 8d1a9f02699..735f3db2a08 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/OcclusionCullingTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/OcclusionCullingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,10 +31,11 @@
 import com.sun.javafx.sg.prism.NGNode;
 import com.sun.javafx.sg.prism.NGNodeShim;
 import com.sun.javafx.sg.prism.NodePath;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  *
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/RenderRootTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/RenderRootTest.java
index 48d18477077..1cbed130717 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/RenderRootTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/sg/prism/RenderRootTest.java
@@ -35,11 +35,12 @@
 import com.sun.javafx.sg.prism.NGNodeShim;
 import com.sun.javafx.sg.prism.NGRectangle;
 import com.sun.javafx.sg.prism.NodePath;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Tests for the computation of the render root of a graph
@@ -65,7 +66,7 @@ public class RenderRootTest extends NGTestBase {
     private NGRectangle rect;
     private NGGroup root;
 
-    @Before
+    @BeforeEach
     public void setup() {
         rect = createRectangle(10, 10, 90, 90);
         root = createGroup(rect);
@@ -336,7 +337,7 @@ public void dirtyRegionCompletelyOutsideOfOpaqueRegion_Clean() {
     // Changing this behavior may cause rendering glitches for any application that
     // relies on this current behavior to render all root tree.
     // So we need to be extensive in testing before modifying the behavior.
-    @Ignore("JDK-8265510")
+    @Disabled("JDK-8265510")
     @Test
     public void emptyDirtyRegion1() {
         NodePath rootPath = getRenderRoot(root, 0, 0, -1, -1);
@@ -345,7 +346,7 @@ public void emptyDirtyRegion1() {
         // assertRenderRoot(null, rootPath);
     }
 
-    @Ignore("JDK-8265510")
+    @Disabled("JDK-8265510")
     @Test
     public void emptyDirtyRegion2() {
         NodePath rootPath = getRenderRoot(root, -1, -1, -2, -2);
@@ -354,7 +355,7 @@ public void emptyDirtyRegion2() {
         // assertRenderRoot(null, rootPath);
     }
 
-    @Ignore("JDK-8265510")
+    @Disabled("JDK-8265510")
     @Test
     public void invalidDirtyRegionOutsideOpaqueRegion() {
         NodePath rootPath = getRenderRoot(root, -10, -10, 5, 5);
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/test/CssMethodsTestBase.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/test/CssMethodsTestBase.java
index 3dbe7f6c8ff..5437db8f520 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/test/CssMethodsTestBase.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/test/CssMethodsTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,48 +25,48 @@
 
 package test.com.sun.javafx.test;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 import javafx.scene.Node;
 
-import org.junit.Test;
-
 import javafx.css.StyleConverter;
 import javafx.css.CssMetaData;
 import java.util.List;
 import javafx.css.Styleable;
 import javafx.css.StyleableProperty;
 
-public abstract class CssMethodsTestBase {
-    private final Configuration configuration;
-
-    public CssMethodsTestBase(final Configuration configuration) {
-        this.configuration = configuration;
-    }
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
+public abstract class CssMethodsTestBase {
 
-    @Test // This _must_ be the first test!
-    public void testCssDefaultSameAsPropertyDefault() {
+    // This _must_ be the first test!
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testCssDefaultSameAsPropertyDefault(Configuration configuration) {
         configuration.cssDefaultsTest();
     }
 
-    @Test
-    public void testCSSPropertyAndCSSPropertyReferenceEachOther() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testCSSPropertyAndCSSPropertyReferenceEachOther(Configuration configuration) {
         configuration.cssPropertyReferenceIntegrityTest();
     }
 
-    @Test
-    public void testCssSettable() throws Exception {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testCssSettable(Configuration configuration) {
         configuration.cssSettableTest();
     }
 
-    @Test
-    public void testCssSet() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testCssSet(Configuration configuration) {
         configuration.cssSetTest();
     }
 
-    public static Object[] config(
+    public static Configuration config(
             final Node node,
             final String propertyName,
             final Object initialValue,
@@ -79,7 +79,7 @@ public static Object[] config(
                                         cssPropertyValue));
     }
 
-    public static Object[] config(
+    public static Configuration config(
             final Node node,
             final String propertyName,
             final Object initialValue,
@@ -94,7 +94,7 @@ public static Object[] config(
                                         expectedFinalValue));
     }
 
-    public static Object[] config(
+    public static Configuration config(
             final Node node,
             final String propertyName,
             final Object initialValue,
@@ -109,8 +109,8 @@ public static Object[] config(
                                         comparator));
     }
 
-    public static Object[] config(final Configuration configuration) {
-        return new Object[] { configuration };
+    public static Configuration config(final Configuration configuration) {
+        return configuration;
     }
 
     private static CssMetaData<? extends Styleable, ?> getCssMetaData(Node node, String cssProperty) {
@@ -221,7 +221,7 @@ public Configuration(final Node node,
             this.comparator = comparator;
         }
 
-        public void cssSettableTest() throws Exception {
+        public void cssSettableTest() {
             assertFalse(UNDEFINED_KEY.isSettable(node));
             assertTrue(cssPropertyKey.isSettable(node));
 
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/test/ObjectMethodsTestBase.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/test/ObjectMethodsTestBase.java
index 9955f0eef1e..581705cc8bf 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/test/ObjectMethodsTestBase.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/test/ObjectMethodsTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,43 +25,42 @@
 
 package test.com.sun.javafx.test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.fail;
-
-import org.junit.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public abstract class ObjectMethodsTestBase {
-    private final Configuration configuration;
-
-    public ObjectMethodsTestBase(final Configuration configuration) {
-        this.configuration = configuration;
-    }
 
-    @Test
-    public void testEquals() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testEquals(Configuration configuration) {
         configuration.equalsTest();
     }
 
-    @Test
-    public void testHashCode() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testHashCode(Configuration configuration) {
         configuration.hashCodeTest();
     }
 
-    @Test
-    public void testToString() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testToString(Configuration configuration) {
         configuration.toStringTest();
     }
 
-    public static Object[] equalObjects(final Object... objects) {
+    public static Arguments equalObjects(final Object... objects) {
         return config(new Configuration(EQUAL_OBJECTS_EQUALS_TEST,
                                         EQUAL_OBJECTS_HASHCODE_TEST,
                                         EQUAL_OBJECTS_TOSTRING_TEST,
                                         objects));
     }
 
-    public static Object[] differentObjects(
+    public static Arguments differentObjects(
             final Object... objects) {
         return config(new Configuration(DIFFERENT_OBJECTS_EQUALS_TEST,
                                         DIFFERENT_OBJECTS_HARD_HASHCODE_TEST,
@@ -69,7 +68,7 @@ public static Object[] differentObjects(
                                         objects));
     }
 
-    public static Object[] differentObjectsEasyHashcode(
+    public static Arguments differentObjectsEasyHashcode(
             final Object... objects) {
         return config(new Configuration(DIFFERENT_OBJECTS_EQUALS_TEST,
                                         DIFFERENT_OBJECTS_EASY_HASHCODE_TEST,
@@ -77,7 +76,7 @@ public static Object[] differentObjectsEasyHashcode(
                                         objects));
     }
 
-    public static Object[] differentObjectsMediumHashcode(
+    public static Arguments differentObjectsMediumHashcode(
             final Object... objects) {
         return config(new Configuration(DIFFERENT_OBJECTS_EQUALS_TEST,
                                         DIFFERENT_OBJECTS_MEDIUM_HASHCODE_TEST,
@@ -85,8 +84,8 @@ public static Object[] differentObjectsMediumHashcode(
                                         objects));
     }
 
-    public static Object[] config(final Configuration configuration) {
-        return new Object[] { configuration };
+    public static Arguments config(final Configuration configuration) {
+        return Arguments.of( configuration );
     }
 
     public static final class Configuration {
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/test/OnInvalidateMethodsTestBase.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/test/OnInvalidateMethodsTestBase.java
index eadaaf54ae6..e89dbcf2341 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/test/OnInvalidateMethodsTestBase.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/test/OnInvalidateMethodsTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,6 @@
 
 package test.com.sun.javafx.test;
 
-import static org.junit.Assert.assertTrue;
-
 import java.lang.reflect.Method;
 import javafx.scene.Node;
 import test.javafx.scene.NodeTest;
@@ -36,21 +34,18 @@
 import javafx.scene.shape.Rectangle;
 import javafx.scene.transform.Transform;
 
-import org.junit.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import javafx.css.CssMetaData;
 import com.sun.javafx.scene.DirtyBits;
 
 public abstract class OnInvalidateMethodsTestBase {
 
-    private final Configuration configuration;
-
-    public OnInvalidateMethodsTestBase(final Configuration configuration) {
-        this.configuration = configuration;
-    }
-
-    @Test
-    public void testFireOnInvalidate() throws Exception {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testFireOnInvalidate(Configuration configuration) throws Exception {
         configuration.testFireOnInvalidate();
     }
 
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/test/PropertiesTestBase.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/test/PropertiesTestBase.java
index 4a59def4435..bae7ace6f33 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/test/PropertiesTestBase.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/test/PropertiesTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,41 +30,43 @@
 import javafx.beans.Observable;
 import javafx.beans.value.ObservableValue;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public abstract class PropertiesTestBase {
 
-    private final Configuration configuration;
-
-    public PropertiesTestBase(final Configuration configuration) {
-        this.configuration = configuration;
-    }
-
-    @Test
-    public void testGetBean() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testGetBean(Configuration configuration) {
         configuration.getBeanTest();
     }
 
-    @Test
-    public void testGetName() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testGetName(Configuration configuration) {
         configuration.getNameTest();
     }
 
-    @Test
-    public void testBasicAccess() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testBasicAccess(Configuration configuration) {
         configuration.basicAccessTest();
     }
 
-    @Test
-    public void testBinding() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testBinding(Configuration configuration) {
         configuration.bindingTest();
     }
 
     /**
      * Single bean, single property configuration.
      */
-    public static Object[] config(final Object bean,
+    public static Arguments config(final Object bean,
                                   final String propertyName,
                                   final Object propertyValue1,
                                   final Object propertyValue2) {
@@ -77,7 +79,7 @@ public static Object[] config(final Object bean,
     /**
      * Single bean, single property configuration with custom value comparator.
      */
-    public static Object[] config(final Object bean,
+    public static Arguments config(final Object bean,
                                   final String propertyName,
                                   final Object propertyValue1,
                                   final Object propertyValue2,
@@ -93,7 +95,7 @@ public static Object[] config(final Object bean,
      * Single bean, propertyA (source) and propertyB (dependent) property
      * configuration.
      */
-    public static Object[] config(final Object beanA,
+    public static Arguments config(final Object beanA,
                                   final String propertyAName,
                                   final Object propertyAValue1,
                                   final Object propertyAValue2,
@@ -113,7 +115,7 @@ public static Object[] config(final Object beanA,
      * BeanA with propertyA (source) and BeanB with propertyB (dependent)
      * configuration.
      */
-    public static Object[] config(final Object beanA,
+    public static Arguments config(final Object beanA,
                                   final String propertyAName,
                                   final Object propertyAValue1,
                                   final Object propertyAValue2,
@@ -135,7 +137,7 @@ public static Object[] config(final Object beanA,
      * BeanA with propertyA (source) and BeanB with propertyB (dependent)
      * with custom value comparator configuration.
      */
-    public static Object[] config(final Object beanA,
+    public static Arguments config(final Object beanA,
                                   final String propertyAName,
                                   final Object propertyAValue1,
                                   final Object propertyAValue2,
@@ -155,8 +157,8 @@ public static Object[] config(final Object beanA,
                                         propertyBComparator));
     }
 
-    public static Object[] config(final Configuration configuration) {
-        return new Object[] { configuration };
+    public static Arguments config(final Configuration configuration) {
+        return Arguments.of( configuration );
     }
 
     public static class Configuration {
@@ -261,8 +263,8 @@ public void getBeanTest() {
                     (ReadOnlyProperty<?>) BindingHelper.getPropertyModel(
                                                   beanB, propertyBReference);
 
-            Assert.assertSame(beanA, propertyA.getBean());
-            Assert.assertSame(beanB, propertyB.getBean());
+            assertSame(beanA, propertyA.getBean());
+            assertSame(beanB, propertyB.getBean());
         }
 
         public void getNameTest() {
@@ -273,10 +275,10 @@ public void getNameTest() {
                     (ReadOnlyProperty<?>) BindingHelper.getPropertyModel(
                                                   beanB, propertyBReference);
 
-            Assert.assertEquals(propertyAReference.getPropertyName(),
-                                propertyA.getName());
-            Assert.assertEquals(propertyBReference.getPropertyName(),
-                                propertyB.getName());
+            assertEquals(propertyAReference.getPropertyName(),
+                         propertyA.getName());
+            assertEquals(propertyBReference.getPropertyName(),
+                         propertyB.getName());
         }
 
         public void basicAccessTest() {
@@ -429,18 +431,18 @@ public void reset() {
 
         public void assertCalled() {
             if (counter == 0) {
-                Assert.fail("Listener has not been called!");
+                fail("Listener has not been called!");
                 return;
             }
 
             if (!allowMultipleNotifications && (counter > 1)) {
-                Assert.fail("Listener called multiple times!");
+                fail("Listener called multiple times!");
             }
         }
 
         public void assertNotCalled() {
             if (counter != 0) {
-                Assert.fail("Listener has been called!");
+                fail("Listener has been called!");
                 return;
             }
         }
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/test/TestHelper.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/test/TestHelper.java
index 8d15a640687..23457e81bfe 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/test/TestHelper.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/test/TestHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,8 @@
 
 package test.com.sun.javafx.test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.util.List;
 
@@ -41,10 +41,10 @@ public class TestHelper {
     // account
     // for stroke width
     public static void assertSimilar(Bounds expected, Bounds actual) {
-        assertEquals("minX", expected.getMinX(), actual.getMinX(), 1);
-        assertEquals("minY", expected.getMinY(), actual.getMinY(), 1);
-        assertEquals("maxX", expected.getMaxX(), actual.getMaxX(), 1);
-        assertEquals("maxY", expected.getMaxY(), actual.getMaxY(), 1);
+        assertEquals(expected.getMinX(), actual.getMinX(), 1, "minX");
+        assertEquals(expected.getMinY(), actual.getMinY(), 1, "minY");
+        assertEquals(expected.getMaxX(), actual.getMaxX(), 1, "maxX");
+        assertEquals(expected.getMaxY(), actual.getMaxY(), 1, "maxY");
     }
 
     public static final float EPSILON = 1.0e-4f;
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/test/TransformHelper.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/test/TransformHelper.java
index 1137c0c1343..9dddef4b120 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/test/TransformHelper.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/test/TransformHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,6 @@
 package test.com.sun.javafx.test;
 
 import javafx.scene.transform.Transform;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 import com.sun.javafx.geom.transform.Affine3D;
 import com.sun.javafx.geom.transform.BaseTransform;
 import com.sun.javafx.geom.transform.GeneralTransform3D;
@@ -40,6 +38,9 @@
 import javafx.scene.transform.Shear;
 import javafx.scene.transform.Translate;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 /**
  * Helper class for transform tests.
  */
@@ -133,18 +134,18 @@ public static void assertMatrix(Affine3D matrix,
      */
     public static void assertMatrix(String message, Transform matrix,
             Transform reference) {
-        assertEquals(message, reference.getMxx(), matrix.getMxx(), 0.00001);
-        assertEquals(message, reference.getMxy(), matrix.getMxy(), 0.00001);
-        assertEquals(message, reference.getMxz(), matrix.getMxz(), 0.00001);
-        assertEquals(message, reference.getTx(), matrix.getTx(), 0.00001);
-        assertEquals(message, reference.getMyx(), matrix.getMyx(), 0.00001);
-        assertEquals(message, reference.getMyy(), matrix.getMyy(), 0.00001);
-        assertEquals(message, reference.getMyz(), matrix.getMyz(), 0.00001);
-        assertEquals(message, reference.getTy(), matrix.getTy(), 0.00001);
-        assertEquals(message, reference.getMzx(), matrix.getMzx(), 0.00001);
-        assertEquals(message, reference.getMzy(), matrix.getMzy(), 0.00001);
-        assertEquals(message, reference.getMzz(), matrix.getMzz(), 0.00001);
-        assertEquals(message, reference.getTz(), matrix.getTz(), 0.00001);
+        assertEquals(reference.getMxx(), matrix.getMxx(), 0.00001, message);
+        assertEquals(reference.getMxy(), matrix.getMxy(), 0.00001, message);
+        assertEquals(reference.getMxz(), matrix.getMxz(), 0.00001, message);
+        assertEquals(reference.getTx(), matrix.getTx(), 0.00001, message);
+        assertEquals(reference.getMyx(), matrix.getMyx(), 0.00001, message);
+        assertEquals(reference.getMyy(), matrix.getMyy(), 0.00001, message);
+        assertEquals(reference.getMyz(), matrix.getMyz(), 0.00001, message);
+        assertEquals(reference.getTy(), matrix.getTy(), 0.00001, message);
+        assertEquals(reference.getMzx(), matrix.getMzx(), 0.00001, message);
+        assertEquals(reference.getMzy(), matrix.getMzy(), 0.00001, message);
+        assertEquals(reference.getMzz(), matrix.getMzz(), 0.00001, message);
+        assertEquals(reference.getTz(), matrix.getTz(), 0.00001, message);
     }
 
     /**
@@ -633,9 +634,9 @@ public static void assertStateOk(Transform t, int state3d, int state2d) {
 
     public static void assertStateOk(String message, Transform t, int state3d, int state2d) {
         TransformHelper.State3D expectedState3D = TransformHelper.getExpectedState3D(t);
-        assertEquals(message, expectedState3D.getValue(), state3d);
+        assertEquals(expectedState3D.getValue(), state3d, message);
         if (expectedState3D == TransformHelper.State3D.NON_3D) {
-            assertEquals(message, TransformHelper.getExpectedState2D(t).getValue(), state2d);
+            assertEquals(TransformHelper.getExpectedState2D(t).getValue(), state2d, message);
         }
     }
 
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/test/ValueComparator.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/test/ValueComparator.java
index 6800e23a152..a2477a20d64 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/test/ValueComparator.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/test/ValueComparator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.test;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public abstract class ValueComparator {
     public static final ValueComparator DEFAULT =
@@ -42,8 +42,8 @@ public boolean equals(final Object expected,
 
     public final void assertEquals(final Object expected,
                                    final Object actual) {
-        assertTrue("expected=" + expected + " actual=" + actual,
-                   equals(expected, actual));
+        assertTrue(equals(expected, actual),
+            "expected=" + expected + " actual=" + actual);
 
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/tk/quantum/WindowStageTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/tk/quantum/WindowStageTest.java
index e6a736adfd7..8d72218f265 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/tk/quantum/WindowStageTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/tk/quantum/WindowStageTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,8 +29,9 @@
 import com.sun.prism.Image;
 import java.util.ArrayList;
 import java.util.List;
-import org.junit.Assert;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class WindowStageTest {
 
@@ -49,16 +50,16 @@ public void bestIconSizeTest() {
 
         // sanity check
         Image image = WindowStageShim.findBestImage(images, 16, 16);
-        Assert.assertEquals(16, image.getWidth());
+        assertEquals(16, image.getWidth());
         image = WindowStageShim.findBestImage(images, 48, 48);
-        Assert.assertEquals(48, image.getWidth());
+        assertEquals(48, image.getWidth());
 
         //RT-39045
         image = WindowStageShim.findBestImage(images, 32, 32);
-        Assert.assertEquals(32, image.getWidth());
+        assertEquals(32, image.getWidth());
 
         // scaling up 32 pixels by 4 is better than 48 by 2+2/3
         image = WindowStageShim.findBestImage(images, 128, 128);
-        Assert.assertEquals(32, image.getWidth());
+        assertEquals(32, image.getWidth());
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/util/UtilsTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/util/UtilsTest.java
index f5d8b44be43..ca19162733c 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/util/UtilsTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/util/UtilsTest.java
@@ -26,7 +26,6 @@
 package test.com.sun.javafx.util;
 
 import com.sun.javafx.util.Utils;
-import static org.junit.Assert.assertEquals;
 
 import java.util.Arrays;
 
@@ -39,7 +38,9 @@
 import javafx.scene.layout.VBox;
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class UtilsTest {
     @Test
@@ -47,14 +48,14 @@ public void testSplit() {
         // normal use case
         String s = "VK_ENTER";
         String[] split = Utils.split(s, "_");
-        assertEquals("Array content: " + Arrays.toString(split),2, split.length);
+        assertEquals(2, split.length, "Array content: " + Arrays.toString(split));
         assertEquals("VK", split[0]);
         assertEquals("ENTER", split[1]);
 
         // normal use case
         s = "VK_LEFT_ARROW";
         split = Utils.split(s, "_");
-        assertEquals("Array content: " + Arrays.toString(split),3, split.length);
+        assertEquals(3, split.length, "Array content: " + Arrays.toString(split));
         assertEquals("VK", split[0]);
         assertEquals("LEFT", split[1]);
         assertEquals("ARROW", split[2]);
@@ -62,12 +63,12 @@ public void testSplit() {
         // split with same string as separator - expect empty array
         s = "VK_LEFT_ARROW";
         split = Utils.split(s, "VK_LEFT_ARROW");
-        assertEquals("Array content: " + Arrays.toString(split),0, split.length);
+        assertEquals(0, split.length, "Array content: " + Arrays.toString(split));
 
         // split with longer string as separator - expect empty array
         s = "VK_LEFT_ARROW";
         split = Utils.split(s, "VK_LEFT_ARROW_EXT");
-        assertEquals("Array content: " + Arrays.toString(split),0, split.length);
+        assertEquals(0, split.length, "Array content: " + Arrays.toString(split));
     }
 
     @Test
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/util/Utils_getScreenForPoint_Test.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/util/Utils_getScreenForPoint_Test.java
index 64d79fd5a7e..d45026875b3 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/util/Utils_getScreenForPoint_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/util/Utils_getScreenForPoint_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,51 +29,38 @@
 import test.com.sun.javafx.pgstub.StubToolkit.ScreenConfiguration;
 import com.sun.javafx.tk.Toolkit;
 import com.sun.javafx.util.Utils;
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.stage.Screen;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
 
-@RunWith(Parameterized.class)
-public final class Utils_getScreenForPoint_Test {
-    private final double x;
-    private final double y;
-    private final int expectedScreenIndex;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-    @Parameters
-    public static Collection data() {
-        return Arrays.asList(
-                new Object[] {
-                    config(100, 100, 0),
-                    config(2000, 200, 1),
-                    config(1920, 0, 0),
-                    config(1920, 200, 1),
-                    config(1920, 1100, 0),
-                    config(2020, 50, 0),
-                    config(2020, 70, 1),
-                    config(1970, -50, 0),
-                    config(2170, -50, 1),
-                    config(2020, 1150, 1),
-                    config(2020, 1170, 0),
-                    config(1970, 1250, 0),
-                    config(2170, 1250, 1)
-                });
-    }
+public final class Utils_getScreenForPoint_Test {
 
-    public Utils_getScreenForPoint_Test(
-            final double x, final double y, final int expectedScreenIndex) {
-        this.x = x;
-        this.y = y;
-        this.expectedScreenIndex = expectedScreenIndex;
+    public static Stream<Arguments> data() {
+        return Stream.of(
+            // x, y, expectedScreenIndex
+            Arguments.of(100, 100, 0),
+            Arguments.of(2000, 200, 1),
+            Arguments.of(1920, 0, 0),
+            Arguments.of(1920, 200, 1),
+            Arguments.of(1920, 1100, 0),
+            Arguments.of(2020, 50, 0),
+            Arguments.of(2020, 70, 1),
+            Arguments.of(1970, -50, 0),
+            Arguments.of(2170, -50, 1),
+            Arguments.of(2020, 1150, 1),
+            Arguments.of(2020, 1170, 0),
+            Arguments.of(1970, 1250, 0),
+            Arguments.of(2170, 1250, 1)
+        );
     }
 
-    @Before
+    @BeforeEach
     public void setUp() {
         ((StubToolkit) Toolkit.getToolkit()).setScreens(
                 new ScreenConfiguration(0, 0, 1920, 1200, 0, 0, 1920, 1172, 96),
@@ -81,20 +68,16 @@ public void setUp() {
                                         1920, 160, 1440, 900, 96));
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         ((StubToolkit) Toolkit.getToolkit()).resetScreens();
     }
 
-    @Test
-    public void test() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void test(double x, double y, int expectedScreenIndex) {
         final Screen selectedScreen = Utils.getScreenForPoint(x, y);
-        Assert.assertEquals(expectedScreenIndex,
-                            Screen.getScreens().indexOf(selectedScreen));
-    }
-
-    private static Object[] config(final double x, final double y,
-                                   final int expectedScreenIndex) {
-        return new Object[] { x, y, expectedScreenIndex };
+        assertEquals(expectedScreenIndex,
+                     Screen.getScreens().indexOf(selectedScreen));
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/util/Utils_getScreenForRectangle_Test.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/util/Utils_getScreenForRectangle_Test.java
index 2c247947153..237a026564e 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/util/Utils_getScreenForRectangle_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/util/Utils_getScreenForRectangle_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,50 +29,39 @@
 import test.com.sun.javafx.pgstub.StubToolkit.ScreenConfiguration;
 import com.sun.javafx.tk.Toolkit;
 import com.sun.javafx.util.Utils;
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.geometry.Rectangle2D;
 import javafx.stage.Screen;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
 
-@RunWith(Parameterized.class)
-public final class Utils_getScreenForRectangle_Test {
-    private final Rectangle2D rectangle;
-    private final int expectedScreenIndex;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-    @Parameters
-    public static Collection data() {
-        return Arrays.asList(
-                new Object[] {
-                    config(100, 100, 100, 100, 0),
-                    config(2020, 200, 100, 100, 1),
-                    config(1920 - 75, 200, 100, 100, 0),
-                    config(1920 - 25, 200, 100, 100, 1),
-                    config(0, 0, 3360, 1200, 0),
-                    config(2020, 50, 100, 100, 1),
-                    config(2020, 70, 100, 100, 1),
-                    config(1970, -50, 100, 100, 0),
-                    config(2170, -50, 100, 100, 1),
-                    config(2020, 1150, 100, 100, 1),
-                    config(2020, 1170, 100, 100, 0),
-                    config(1970, 1250, 100, 100, 0),
-                    config(2170, 1250, 100, 100, 1)
-                });
-    }
+public final class Utils_getScreenForRectangle_Test {
 
-    public Utils_getScreenForRectangle_Test(
-            final Rectangle2D rectangle, final int expectedScreenIndex) {
-        this.rectangle = rectangle;
-        this.expectedScreenIndex = expectedScreenIndex;
+    public static Stream<Arguments> data() {
+        return Stream.of(
+            // rectangle, expectedScreenIndex
+            Arguments.of(new Rectangle2D(100, 100, 100, 100), 0),
+            Arguments.of(new Rectangle2D(2020, 200, 100, 100), 1),
+            Arguments.of(new Rectangle2D(1920 - 75, 200, 100, 100), 0),
+            Arguments.of(new Rectangle2D(1920 - 25, 200, 100, 100), 1),
+            Arguments.of(new Rectangle2D(0, 0, 3360, 1200), 0),
+            Arguments.of(new Rectangle2D(2020, 50, 100, 100), 1),
+            Arguments.of(new Rectangle2D(2020, 70, 100, 100), 1),
+            Arguments.of(new Rectangle2D(1970, -50, 100, 100), 0),
+            Arguments.of(new Rectangle2D(2170, -50, 100, 100), 1),
+            Arguments.of(new Rectangle2D(2020, 1150, 100, 100), 1),
+            Arguments.of(new Rectangle2D(2020, 1170, 100, 100), 0),
+            Arguments.of(new Rectangle2D(1970, 1250, 100, 100), 0),
+            Arguments.of(new Rectangle2D(2170, 1250, 100, 100), 1)
+        );
     }
 
-    @Before
+    @BeforeEach
     public void setUp() {
         ((StubToolkit) Toolkit.getToolkit()).setScreens(
                 new ScreenConfiguration(0, 0, 1920, 1200, 0, 0, 1920, 1172, 96),
@@ -80,24 +69,16 @@ public void setUp() {
                                         1920, 160, 1440, 900, 96));
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         ((StubToolkit) Toolkit.getToolkit()).resetScreens();
     }
 
-    @Test
-    public void test() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void test(Rectangle2D rectangle, int expectedScreenIndex) {
         final Screen selectedScreen = Utils.getScreenForRectangle(rectangle);
-        Assert.assertEquals(expectedScreenIndex,
-                            Screen.getScreens().indexOf(selectedScreen));
-    }
-
-    private static Object[] config(final double x, final double y,
-                                   final double width, final double height,
-                                   final int expectedScreenIndex) {
-        return new Object[] {
-            new Rectangle2D(x, y, width, height),
-            expectedScreenIndex
-        };
+        assertEquals(expectedScreenIndex,
+                     Screen.getScreens().indexOf(selectedScreen));
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/util/WeakReferenceQueueTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/util/WeakReferenceQueueTest.java
index da0585fe6a0..039fdb34cfe 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/util/WeakReferenceQueueTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/util/WeakReferenceQueueTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,13 +27,13 @@
 
 import com.sun.javafx.util.WeakReferenceQueue;
 import com.sun.javafx.util.WeakReferenceQueueShim;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 
 import java.util.Iterator;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class WeakReferenceQueueTest {
     @Test
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/prism/StrokedShapeTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/prism/StrokedShapeTest.java
index dad099908c2..16ac85d0ff0 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/prism/StrokedShapeTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/prism/StrokedShapeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,16 +29,17 @@
 import com.sun.javafx.geom.transform.BaseTransform;
 import com.sun.prism.BasicStroke;
 import com.sun.prism.BasicStrokeShim;
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.*;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class StrokedShapeTest {
 
     BasicStroke stroke;
     Path2D path;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         stroke = new BasicStroke();
         BasicStrokeShim.set_width(stroke, 10);
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/scenario/SettingsTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/scenario/SettingsTest.java
index 8bcd18a52e7..96a2888d935 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/scenario/SettingsTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/scenario/SettingsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,13 +26,13 @@
 package test.com.sun.scenario;
 
 import com.sun.scenario.Settings;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 
 import javafx.util.Callback;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class SettingsTest {
 
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/scenario/animation/AbstractPrimaryTimerTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/scenario/animation/AbstractPrimaryTimerTest.java
index f6f51530a1f..8323b244bbd 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/scenario/animation/AbstractPrimaryTimerTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/scenario/animation/AbstractPrimaryTimerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,17 +30,19 @@
 import com.sun.scenario.animation.AbstractPrimaryTimer;
 import com.sun.scenario.animation.shared.PulseReceiver;
 import com.sun.scenario.animation.shared.TimerReceiver;
-import org.junit.Before;
-import org.junit.Test;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class AbstractPrimaryTimerTest {
 
     private AbstractPrimaryTimerStub timer;
 
 
-    @Before
+    @BeforeEach
     public void setUp() {
         timer = new AbstractPrimaryTimerStub();
     }
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/scenario/animation/NumberTangentInterpolatorTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/scenario/animation/NumberTangentInterpolatorTest.java
index 6ed8403c124..456652594d8 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/scenario/animation/NumberTangentInterpolatorTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/scenario/animation/NumberTangentInterpolatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,11 +28,13 @@
 
 import com.sun.scenario.animation.NumberTangentInterpolator;
 import javafx.animation.Interpolator;
-import static org.junit.Assert.*;
 import static javafx.util.Duration.*;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class NumberTangentInterpolatorTest {
 
@@ -41,7 +43,7 @@ public class NumberTangentInterpolatorTest {
 
     private NumberTangentInterpolator interpolator;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         interpolator = new NumberTangentInterpolator(ZERO, 0);
     }
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/scenario/animation/SplineInterpolatorTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/scenario/animation/SplineInterpolatorTest.java
index 6388617ecb4..56738d51ce3 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/scenario/animation/SplineInterpolatorTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/scenario/animation/SplineInterpolatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,16 +26,18 @@
 
 import com.sun.scenario.animation.SplineInterpolator;
 import javafx.animation.Interpolator;
-import static org.junit.Assert.*;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class SplineInterpolatorTest {
 
     private SplineInterpolator interpolator;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         interpolator = new SplineInterpolator(0.2, 0.1, 0.3, 0.4);
     }
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/scenario/animation/shared/FiniteClipEnvelopeTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/scenario/animation/shared/FiniteClipEnvelopeTest.java
index 9665222b7e3..6ce6b8ec95c 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/scenario/animation/shared/FiniteClipEnvelopeTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/scenario/animation/shared/FiniteClipEnvelopeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,10 +36,12 @@
 import test.javafx.animation.AnimationMock;
 import test.javafx.animation.AnimationMock.Command;
 import javafx.util.Duration;
-import org.junit.Before;
-import org.junit.Test;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class FiniteClipEnvelopeTest {
 
@@ -48,7 +50,7 @@ public class FiniteClipEnvelopeTest {
     private ClipEnvelope clip;
     private AnimationMock animation;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         animation = new AnimationMock(Toolkit.getToolkit().getPrimaryTimer(), AnimationMock.DEFAULT_DURATION, AnimationMock.DEFAULT_RATE, 9, AnimationMock.DEFAULT_AUTOREVERSE);
         clip = new FiniteClipEnvelopeShim(animation);
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/scenario/animation/shared/GeneralClipInterpolatorTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/scenario/animation/shared/GeneralClipInterpolatorTest.java
index 494406efb40..b1e9d2e3432 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/scenario/animation/shared/GeneralClipInterpolatorTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/scenario/animation/shared/GeneralClipInterpolatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,17 +27,17 @@
 
 import com.sun.javafx.animation.TickCalculation;
 import com.sun.scenario.animation.shared.GeneralClipInterpolatorShim;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
 import javafx.animation.KeyFrame;
 import javafx.animation.KeyValue;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.util.Duration;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class GeneralClipInterpolatorTest {
 
@@ -538,10 +538,10 @@ public void test_DuplicateKeyValue() {
         assertEquals(40, v1.get());
         assertEquals(100, v2.get());
         gci1.interpolate(TickCalculation.fromMillis(1600));
-        assertTrue("v1.get(): " + v1.get(), (52 == v1.get()) || (-20 == v1.get()));
+        assertTrue((52 == v1.get()) || (-20 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(40, v2.get());
         gci1.interpolate(TickCalculation.fromMillis(2000));
-        assertTrue("v1.get(): " + v1.get(), (60 == v1.get()) || (-60 == v1.get()));
+        assertTrue((60 == v1.get()) || (-60 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(0, v2.get());
 
         // single value in start, duplicate value in mid, single value in end
@@ -553,13 +553,13 @@ public void test_DuplicateKeyValue() {
         assertEquals(30, v1.get());
         assertEquals(0, v2.get());
         gci2.interpolate(TickCalculation.fromMillis(300));
-        assertTrue("v1.get(): " + v1.get(), (33 == v1.get()) || (9 == v1.get()));
+        assertTrue((33 == v1.get()) || (9 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(30, v2.get());
         gci2.interpolate(TickCalculation.fromMillis(1000));
-        assertTrue("v1.get(): " + v1.get(), (40 == v1.get()) || (-40 == v1.get()));
+        assertTrue((40 == v1.get()) || (-40 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(100, v2.get());
         gci2.interpolate(TickCalculation.fromMillis(1600));
-        assertTrue("v1.get(): " + v1.get(), (52 == v1.get()) || (20 == v1.get()));
+        assertTrue((52 == v1.get()) || (20 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(40, v2.get());
         gci2.interpolate(TickCalculation.fromMillis(2000));
         assertEquals(60, v1.get());
@@ -571,10 +571,10 @@ public void test_DuplicateKeyValue() {
         v2.set(0);
         gci3.validate(true);
         gci3.interpolate(TickCalculation.fromMillis(0));
-        assertTrue("v1.get(): " + v1.get(), (30 == v1.get()) || (-30 == v1.get()));
+        assertTrue((30 == v1.get()) || (-30 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(0, v2.get());
         gci3.interpolate(TickCalculation.fromMillis(300));
-        assertTrue("v1.get(): " + v1.get(), (33 == v1.get()) || (-9 == v1.get()));
+        assertTrue((33 == v1.get()) || (-9 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(30, v2.get());
         gci3.interpolate(TickCalculation.fromMillis(1000));
         assertEquals(40, v1.get());
@@ -592,16 +592,16 @@ public void test_DuplicateKeyValue() {
         v2.set(0);
         gci4.validate(true);
         gci4.interpolate(TickCalculation.fromMillis(0));
-        assertTrue("v1.get(): " + v1.get(), (30 == v1.get()) || (-30 == v1.get()));
+        assertTrue((30 == v1.get()) || (-30 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(0, v2.get());
         gci4.interpolate(TickCalculation.fromMillis(300));
-        assertTrue("v1.get(): " + v1.get(), (33 == v1.get()) || (9 == v1.get()) || (-9 == v1.get()) || (-33 == v1.get()));
+        assertTrue((33 == v1.get()) || (9 == v1.get()) || (-9 == v1.get()) || (-33 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(30, v2.get());
         gci4.interpolate(TickCalculation.fromMillis(1000));
-        assertTrue("v1.get(): " + v1.get(), (40 == v1.get()) || (-40 == v1.get()));
+        assertTrue((40 == v1.get()) || (-40 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(100, v2.get());
         gci4.interpolate(TickCalculation.fromMillis(1600));
-        assertTrue("v1.get(): " + v1.get(), (52 == v1.get()) || (20 == v1.get()));
+        assertTrue((52 == v1.get()) || (20 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(40, v2.get());
         gci4.interpolate(TickCalculation.fromMillis(2000));
         assertEquals(60, v1.get());
@@ -613,19 +613,19 @@ public void test_DuplicateKeyValue() {
         v2.set(0);
         gci5.validate(true);
         gci5.interpolate(TickCalculation.fromMillis(0));
-        assertTrue("v1.get(): " + v1.get(), (30 == v1.get()) || (-30 == v1.get()));
+        assertTrue((30 == v1.get()) || (-30 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(0, v2.get());
         gci5.interpolate(TickCalculation.fromMillis(300));
-        assertTrue("v1.get(): " + v1.get(), (33 == v1.get()) || (-9 == v1.get()));
+        assertTrue((33 == v1.get()) || (-9 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(30, v2.get());
         gci5.interpolate(TickCalculation.fromMillis(1000));
         assertEquals(40, v1.get());
         assertEquals(100, v2.get());
         gci5.interpolate(TickCalculation.fromMillis(1600));
-        assertTrue("v1.get(): " + v1.get(), (52 == v1.get()) || (-20 == v1.get()));
+        assertTrue((52 == v1.get()) || (-20 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(40, v2.get());
         gci5.interpolate(TickCalculation.fromMillis(2000));
-        assertTrue("v1.get(): " + v1.get(), (60 == v1.get()) || (-60 == v1.get()));
+        assertTrue((60 == v1.get()) || (-60 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(0, v2.get());
 
         // single value in start, duplicate value in mid, duplicate value in end
@@ -637,16 +637,16 @@ public void test_DuplicateKeyValue() {
         assertEquals(30, v1.get());
         assertEquals(0, v2.get());
         gci6.interpolate(TickCalculation.fromMillis(300));
-        assertTrue("v1.get(): " + v1.get(), (33 == v1.get()) || (9 == v1.get()));
+        assertTrue((33 == v1.get()) || (9 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(30, v2.get());
         gci6.interpolate(TickCalculation.fromMillis(1000));
-        assertTrue("v1.get(): " + v1.get(), (40 == v1.get()) || (-40 == v1.get()));
+        assertTrue((40 == v1.get()) || (-40 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(100, v2.get());
         gci6.interpolate(TickCalculation.fromMillis(1600));
-        assertTrue("v1.get(): " + v1.get(), (52 == v1.get()) || (-20 == v1.get()) || (20 == v1.get()) || (-52 == v1.get()));
+        assertTrue((52 == v1.get()) || (-20 == v1.get()) || (20 == v1.get()) || (-52 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(40, v2.get());
         gci6.interpolate(TickCalculation.fromMillis(2000));
-        assertTrue("v1.get(): " + v1.get(), (60 == v1.get()) || (-60 == v1.get()));
+        assertTrue((60 == v1.get()) || (-60 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(0, v2.get());
 
         // duplicate value in start, duplicate value in mid, duplicate value in end
@@ -655,19 +655,19 @@ public void test_DuplicateKeyValue() {
         v2.set(0);
         gci7.validate(true);
         gci7.interpolate(TickCalculation.fromMillis(0));
-        assertTrue("v1.get(): " + v1.get(), (30 == v1.get()) || (-30 == v1.get()));
+        assertTrue((30 == v1.get()) || (-30 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(0, v2.get());
         gci7.interpolate(TickCalculation.fromMillis(300));
-        assertTrue("v1.get(): " + v1.get(), (33 == v1.get()) || (9 == v1.get()) || (-9 == v1.get()) || (-33 == v1.get()));
+        assertTrue((33 == v1.get()) || (9 == v1.get()) || (-9 == v1.get()) || (-33 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(30, v2.get());
         gci7.interpolate(TickCalculation.fromMillis(1000));
-        assertTrue("v1.get(): " + v1.get(), (40 == v1.get()) || (-40 == v1.get()));
+        assertTrue((40 == v1.get()) || (-40 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(100, v2.get());
         gci7.interpolate(TickCalculation.fromMillis(1600));
-        assertTrue("v1.get(): " + v1.get(), (52 == v1.get()) || (-20 == v1.get()) || (20 == v1.get()) || (-52 == v1.get()));
+        assertTrue((52 == v1.get()) || (-20 == v1.get()) || (20 == v1.get()) || (-52 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(40, v2.get());
         gci7.interpolate(TickCalculation.fromMillis(2000));
-        assertTrue("v1.get(): " + v1.get(), (60 == v1.get()) || (-60 == v1.get()));
+        assertTrue((60 == v1.get()) || (-60 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(0, v2.get());
 
         // no value in start, single value in mid, duplicate value in end
@@ -685,10 +685,10 @@ public void test_DuplicateKeyValue() {
         assertEquals(40, v1.get());
         assertEquals(100, v2.get());
         gci8.interpolate(TickCalculation.fromMillis(1600));
-        assertTrue("v1.get(): " + v1.get(), (52 == v1.get()) || (-20 == v1.get()));
+        assertTrue((52 == v1.get()) || (-20 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(40, v2.get());
         gci8.interpolate(TickCalculation.fromMillis(2000));
-        assertTrue("v1.get(): " + v1.get(), (60 == v1.get()) || (-60 == v1.get()));
+        assertTrue((60 == v1.get()) || (-60 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(0, v2.get());
 
         // no value in start, duplicate value in mid, single value in end
@@ -700,13 +700,13 @@ public void test_DuplicateKeyValue() {
         assertEquals(0, v1.get());
         assertEquals(0, v2.get());
         gci9.interpolate(TickCalculation.fromMillis(400));
-        assertTrue("v1.get(): " + v1.get(), (16 == v1.get()) || (-16 == v1.get()));
+        assertTrue((16 == v1.get()) || (-16 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(40, v2.get());
         gci9.interpolate(TickCalculation.fromMillis(1000));
-        assertTrue("v1.get(): " + v1.get(), (40 == v1.get()) || (-40 == v1.get()));
+        assertTrue((40 == v1.get()) || (-40 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(100, v2.get());
         gci9.interpolate(TickCalculation.fromMillis(1600));
-        assertTrue("v1.get(): " + v1.get(), (52 == v1.get()) || (20 == v1.get()));
+        assertTrue((52 == v1.get()) || (20 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(40, v2.get());
         gci9.interpolate(TickCalculation.fromMillis(2000));
         assertEquals(60, v1.get());
@@ -721,16 +721,16 @@ public void test_DuplicateKeyValue() {
         assertEquals(0, v1.get());
         assertEquals(0, v2.get());
         gci10.interpolate(TickCalculation.fromMillis(400));
-        assertTrue("v1.get(): " + v1.get(), (16 == v1.get()) || (-16 == v1.get()));
+        assertTrue((16 == v1.get()) || (-16 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(40, v2.get());
         gci10.interpolate(TickCalculation.fromMillis(1000));
-        assertTrue("v1.get(): " + v1.get(), (40 == v1.get()) || (-40 == v1.get()));
+        assertTrue((40 == v1.get()) || (-40 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(100, v2.get());
         gci10.interpolate(TickCalculation.fromMillis(1600));
-        assertTrue("v1.get(): " + v1.get(), (52 == v1.get()) || (-20 == v1.get()) || (20 == v1.get()) || (-52 == v1.get()));
+        assertTrue((52 == v1.get()) || (-20 == v1.get()) || (20 == v1.get()) || (-52 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(40, v2.get());
         gci10.interpolate(TickCalculation.fromMillis(2000));
-        assertTrue("v1.get(): " + v1.get(), (60 == v1.get()) || (-60 == v1.get()));
+        assertTrue((60 == v1.get()) || (-60 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(0, v2.get());
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/scenario/animation/shared/InfiniteClipEnvelopeTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/scenario/animation/shared/InfiniteClipEnvelopeTest.java
index 231649df687..157292c53d9 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/scenario/animation/shared/InfiniteClipEnvelopeTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/scenario/animation/shared/InfiniteClipEnvelopeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,10 +36,12 @@
 import test.javafx.animation.AnimationMock;
 import test.javafx.animation.AnimationMock.Command;
 import javafx.util.Duration;
-import org.junit.Before;
-import org.junit.Test;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class InfiniteClipEnvelopeTest {
 
@@ -48,7 +50,7 @@ public class InfiniteClipEnvelopeTest {
     private ClipEnvelope clip;
     private AnimationMock animation;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         animation = new AnimationMock(Toolkit.getToolkit().getPrimaryTimer(), AnimationMock.DEFAULT_DURATION, AnimationMock.DEFAULT_RATE, Animation.INDEFINITE, AnimationMock.DEFAULT_AUTOREVERSE);
         clip = new InfiniteClipEnvelopeShim(animation);
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/scenario/animation/shared/SimpleClipInterpolatorTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/scenario/animation/shared/SimpleClipInterpolatorTest.java
index 3463aef96c3..cdcc7f0918d 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/scenario/animation/shared/SimpleClipInterpolatorTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/scenario/animation/shared/SimpleClipInterpolatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,17 +27,17 @@
 
 import com.sun.javafx.animation.TickCalculation;
 import com.sun.scenario.animation.shared.SimpleClipInterpolatorShim;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
 import javafx.animation.KeyFrame;
 import javafx.animation.KeyValue;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.util.Duration;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class SimpleClipInterpolatorTest {
 
@@ -370,10 +370,10 @@ public void test_DuplicateKeyValue() {
         assertEquals(30, v1.get());
         assertEquals(0, v2.get());
         sci1.interpolate(TickCalculation.fromMillis(300));
-        assertTrue("v1.get(): " + v1.get(), (33 == v1.get()) || (9 == v1.get()));
+        assertTrue((33 == v1.get()) || (9 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(30, v2.get());
         sci1.interpolate(TickCalculation.fromMillis(1000));
-        assertTrue("v1.get(): " + v1.get(), (40 == v1.get()) || (-40 == v1.get()));
+        assertTrue((40 == v1.get()) || (-40 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(100, v2.get());
 
         // duplicate value in start, single value in end
@@ -382,10 +382,10 @@ public void test_DuplicateKeyValue() {
         v2.set(0);
         sci2.validate(true);
         sci2.interpolate(TickCalculation.fromMillis(0));
-        assertTrue("v1.get(): " + v1.get(), (30 == v1.get()) || (-30 == v1.get()));
+        assertTrue((30 == v1.get()) || (-30 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(0, v2.get());
         sci2.interpolate(TickCalculation.fromMillis(300));
-        assertTrue("v1.get(): " + v1.get(), (33 == v1.get()) || (-9 == v1.get()));
+        assertTrue((33 == v1.get()) || (-9 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(30, v2.get());
         sci2.interpolate(TickCalculation.fromMillis(1000));
         assertEquals(40, v1.get());
@@ -397,13 +397,13 @@ public void test_DuplicateKeyValue() {
         v2.set(0);
         sci3.validate(true);
         sci3.interpolate(TickCalculation.fromMillis(0));
-        assertTrue("v1.get(): " + v1.get(), (30 == v1.get()) || (-30 == v1.get()));
+        assertTrue((30 == v1.get()) || (-30 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(0, v2.get());
         sci3.interpolate(TickCalculation.fromMillis(300));
-        assertTrue("v1.get(): " + v1.get(), (33 == v1.get()) || (9 == v1.get()) || (-9 == v1.get()) || (-33 == v1.get()));
+        assertTrue((33 == v1.get()) || (9 == v1.get()) || (-9 == v1.get()) || (-33 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(30, v2.get());
         sci3.interpolate(TickCalculation.fromMillis(1000));
-        assertTrue("v1.get(): " + v1.get(), (40 == v1.get()) || (-40 == v1.get()));
+        assertTrue((40 == v1.get()) || (-40 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(100, v2.get());
 
         // no value in start, duplicate value in end
@@ -415,10 +415,10 @@ public void test_DuplicateKeyValue() {
         assertEquals(0, v1.get());
         assertEquals(0, v2.get());
         sci4.interpolate(TickCalculation.fromMillis(400));
-        assertTrue("v1.get(): " + v1.get(), (16 == v1.get()) || (-16 == v1.get()));
+        assertTrue((16 == v1.get()) || (-16 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(40, v2.get());
         sci4.interpolate(TickCalculation.fromMillis(1000));
-        assertTrue("v1.get(): " + v1.get(), (40 == v1.get()) || (-40 == v1.get()));
+        assertTrue((40 == v1.get()) || (-40 == v1.get()), "v1.get(): " + v1.get());
         assertEquals(100, v2.get());
     }
 
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/scenario/animation/shared/SingleLoopClipEnvelopeTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/scenario/animation/shared/SingleLoopClipEnvelopeTest.java
index 01791acc861..afdd271eae3 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/scenario/animation/shared/SingleLoopClipEnvelopeTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/scenario/animation/shared/SingleLoopClipEnvelopeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,10 +33,13 @@
 import test.javafx.animation.AnimationMock;
 import test.javafx.animation.AnimationMock.Command;
 import javafx.util.Duration;
-import org.junit.Before;
-import org.junit.Test;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class SingleLoopClipEnvelopeTest {
 
@@ -46,7 +49,7 @@ public class SingleLoopClipEnvelopeTest {
     private ClipEnvelope clip;
     private AnimationMock animation;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         animation = new AnimationMock(Toolkit.getToolkit().getPrimaryTimer(), AnimationMock.DEFAULT_DURATION, AnimationMock.DEFAULT_RATE, 1, AnimationMock.DEFAULT_AUTOREVERSE);
         clip = new SingleLoopClipEnvelopeShim(animation);
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/scenario/animation/shared/TimelineClipCoreTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/scenario/animation/shared/TimelineClipCoreTest.java
index 50fe8dba503..0dea77b2a37 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/scenario/animation/shared/TimelineClipCoreTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/scenario/animation/shared/TimelineClipCoreTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,9 +26,6 @@
 package test.com.sun.scenario.animation.shared;
 
 import com.sun.scenario.animation.shared.TimelineClipCore;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 import javafx.animation.KeyFrame;
 import javafx.animation.KeyValue;
 import javafx.animation.Timeline;
@@ -38,8 +35,11 @@
 import javafx.event.EventHandler;
 import javafx.util.Duration;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -58,7 +58,7 @@ public class TimelineClipCoreTest {
 
     private boolean tmpBool;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         target = new SimpleIntegerProperty();
 
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/scenario/effect/rt_5239/RT_5239Test.java b/modules/javafx.graphics/src/test/java/test/com/sun/scenario/effect/rt_5239/RT_5239Test.java
index eadb651ad9c..90d3b454c45 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/scenario/effect/rt_5239/RT_5239Test.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/scenario/effect/rt_5239/RT_5239Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,9 +32,9 @@
 import com.sun.scenario.effect.Effect;
 import com.sun.scenario.effect.Flood;
 import com.sun.scenario.effect.InnerShadow;
-import org.junit.Test;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Fix to verify RT-5239
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/animation/AnimationMock.java b/modules/javafx.graphics/src/test/java/test/javafx/animation/AnimationMock.java
index 4677ee4778a..8edbfe696c1 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/animation/AnimationMock.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/animation/AnimationMock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
 import javafx.util.Duration;
 import com.sun.scenario.animation.AbstractPrimaryTimer;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class AnimationMock extends AnimationImpl {
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/animation/AnimationPulseReceiverTest.java b/modules/javafx.graphics/src/test/java/test/javafx/animation/AnimationPulseReceiverTest.java
index 7818c6b0e7e..6c5d4ef17fc 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/animation/AnimationPulseReceiverTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/animation/AnimationPulseReceiverTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,14 +25,14 @@
 
 package test.javafx.animation;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 import com.sun.javafx.tk.Toolkit;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import javafx.util.Duration;
 
@@ -43,13 +43,13 @@ public class AnimationPulseReceiverTest {
     private AbstractPrimaryTimerMock timer;
     private AnimationMock animation;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         timer = new AbstractPrimaryTimerMock();
         animation = new AnimationMock(timer, Duration.INDEFINITE, 1.0, 1, false);
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         animation.doStop();
     }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/animation/AnimationSetRateTest.java b/modules/javafx.graphics/src/test/java/test/javafx/animation/AnimationSetRateTest.java
index a0a1d805e50..9fa76b2582b 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/animation/AnimationSetRateTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/animation/AnimationSetRateTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,12 +29,12 @@
 import javafx.animation.Animation.Status;
 import javafx.util.Duration;
 import test.com.sun.scenario.animation.shared.ClipEnvelopeMock;
-import org.junit.Before;
-import org.junit.Test;
 
 import com.sun.scenario.animation.shared.SingleLoopClipEnvelopeShim;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class AnimationSetRateTest {
 
@@ -44,7 +44,7 @@ public class AnimationSetRateTest {
     private AnimationImpl animation;
     private ClipEnvelopeMock clipEnvelope;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         timer = new AbstractPrimaryTimerMock();
         clipEnvelope = new ClipEnvelopeMock();
@@ -388,7 +388,7 @@ public void testFlipRateAndPlayForPausedNonEmbeddedAnimation() {
         clip.timePulse(5);
         animation.pause();
         long timeAfter = clip.getTicks();
-        assertEquals("A pulse to 10 at rate 0.2 with deltaTicks = 0 should reach 10 * 0.2 = 2", 2, timeBefore);
-        assertEquals("A pulse to 5 at rate -0.2 with deltaTicks = 4 should reach 4 + 5 * (-0.2) = 3", 3, timeAfter);
+        assertEquals(2, timeBefore, "A pulse to 10 at rate 0.2 with deltaTicks = 0 should reach 10 * 0.2 = 2");
+        assertEquals(3, timeAfter, "A pulse to 5 at rate -0.2 with deltaTicks = 4 should reach 4 + 5 * (-0.2) = 3");
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/animation/AnimationTest.java b/modules/javafx.graphics/src/test/java/test/javafx/animation/AnimationTest.java
index 2f9376ad317..22b7e9074c8 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/animation/AnimationTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/animation/AnimationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,12 +35,14 @@
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.util.Duration;
-import org.junit.After;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import org.junit.Before;
-import org.junit.Test;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class AnimationTest {
 
@@ -59,7 +61,7 @@ public class AnimationTest {
     private AnimationImpl animation;
     private ClipEnvelopeMock clipEnvelope;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         timer = new AbstractPrimaryTimerMock();
         clipEnvelope = new ClipEnvelopeMock();
@@ -68,7 +70,7 @@ public void setUp() {
         clipEnvelope.setAnimation(animation);
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         animation.stop();
     }
@@ -244,14 +246,18 @@ public void testDurationRoundingError() {
         assertEquals(0, clipEnvelope.getLastJumpTo());
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testJumpTo_Null() {
-        animation.jumpTo((Duration)null);
+        assertThrows(NullPointerException.class, () -> {
+            animation.jumpTo((Duration)null);
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testJumpTo_UNKNOWN() {
-        animation.jumpTo(Duration.UNKNOWN);
+        assertThrows(IllegalArgumentException.class, () -> {
+            animation.jumpTo(Duration.UNKNOWN);
+        });
     }
 
     @Test
@@ -318,9 +324,11 @@ public void testJumpToCuePoint_ZeroLengthAnimation() {
         assertEquals(Duration.ZERO, animation.getCurrentTime());
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testJumpToCuePoint_Null() {
-        animation.jumpTo((String)null);
+        assertThrows(NullPointerException.class, () -> {
+            animation.jumpTo((String)null);
+        });
     }
 
     @Test
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/animation/FadeTransitionTest.java b/modules/javafx.graphics/src/test/java/test/javafx/animation/FadeTransitionTest.java
index 4ad5848f3c5..637cdf209e9 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/animation/FadeTransitionTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/animation/FadeTransitionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,16 +30,16 @@
 import javafx.animation.Interpolator;
 import javafx.animation.ParallelTransition;
 import javafx.animation.TransitionShim;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 import javafx.scene.Node;
 import javafx.scene.shape.Rectangle;
 import javafx.util.Duration;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class FadeTransitionTest {
 
@@ -52,7 +52,7 @@ public class FadeTransitionTest {
 
     private Node node;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         node = new Rectangle();
     }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/animation/FillTransitionTest.java b/modules/javafx.graphics/src/test/java/test/javafx/animation/FillTransitionTest.java
index d39c64d4294..55ab9989f95 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/animation/FillTransitionTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/animation/FillTransitionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,10 +30,6 @@
 import javafx.animation.Interpolator;
 import javafx.animation.ParallelTransition;
 import javafx.animation.TransitionShim;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 import javafx.scene.Group;
 import javafx.scene.paint.Color;
 import javafx.scene.paint.LinearGradient;
@@ -43,8 +39,12 @@
 import javafx.scene.shape.Shape;
 import javafx.util.Duration;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class FillTransitionTest {
 
@@ -57,7 +57,7 @@ public class FillTransitionTest {
 
     private Shape shape;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         shape = new Rectangle();
     }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/animation/InterpolatorTest.java b/modules/javafx.graphics/src/test/java/test/javafx/animation/InterpolatorTest.java
index cdea6f4aabf..b39a6b5ac86 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/animation/InterpolatorTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/animation/InterpolatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,9 +32,9 @@
 import javafx.animation.KeyValue;
 import javafx.beans.property.SimpleLongProperty;
 import javafx.util.Duration;
-import static org.junit.Assert.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class InterpolatorTest {
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/animation/KeyFrameTest.java b/modules/javafx.graphics/src/test/java/test/javafx/animation/KeyFrameTest.java
index f9e4c84ac80..c53cba6f260 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/animation/KeyFrameTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/animation/KeyFrameTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,10 +26,6 @@
 package test.javafx.animation;
 
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
@@ -43,7 +39,11 @@
 import javafx.event.EventHandler;
 import javafx.util.Duration;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class KeyFrameTest {
     private static final Duration TIME = Duration.ONE;
@@ -130,19 +130,25 @@ private <T> void assertSetEquals(T[] expected, Set<T> result) {
         assertSetEquals(TWO_KEYVALUES, kf2.getValues());
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testConstructor_ObservableList_DurationIsNull(){
-        new KeyFrame(null, NAME, ACTION, TWO_KEYVALUES_COL);
+        assertThrows(NullPointerException.class, () -> {
+            new KeyFrame(null, NAME, ACTION, TWO_KEYVALUES_COL);
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testConstructor_ObservableList_DurationIsNegative(){
-        new KeyFrame(Duration.millis(-1), NAME, ACTION, TWO_KEYVALUES_COL);
+        assertThrows(IllegalArgumentException.class, () -> {
+            new KeyFrame(Duration.millis(-1), NAME, ACTION, TWO_KEYVALUES_COL);
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testConstructor_ObservableList_DuratinIsUnknown(){
-        new KeyFrame(Duration.UNKNOWN, NAME, ACTION, TWO_KEYVALUES_COL);
+        assertThrows(IllegalArgumentException.class, () -> {
+            new KeyFrame(Duration.UNKNOWN, NAME, ACTION, TWO_KEYVALUES_COL);
+        });
     }
 
     @Test public void testConstructor_Time_Name_Action_Valus() {
@@ -212,19 +218,25 @@ public void testConstructor_ObservableList_DuratinIsUnknown(){
         assertSetEquals(NO_KEYVALUES, kf6.getValues());
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testConstructor_KeyValues_DurationIsNull(){
-        new KeyFrame(null, NAME, ACTION, TWO_KEYVALUES);
+        assertThrows(NullPointerException.class, () -> {
+            new KeyFrame(null, NAME, ACTION, TWO_KEYVALUES);
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testConstructor_KeyValues_DurationIsNegative(){
-        new KeyFrame(Duration.millis(-1), NAME, ACTION, TWO_KEYVALUES);
+        assertThrows(IllegalArgumentException.class, () -> {
+            new KeyFrame(Duration.millis(-1), NAME, ACTION, TWO_KEYVALUES);
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testConstructor_KeyValues_DurationIsUnknown(){
-        new KeyFrame(Duration.UNKNOWN, NAME, ACTION, TWO_KEYVALUES);
+        assertThrows(IllegalArgumentException.class, () -> {
+            new KeyFrame(Duration.UNKNOWN, NAME, ACTION, TWO_KEYVALUES);
+        });
     }
 
     @Test public void testConstructor_Time_Action_Valus() {
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/animation/KeyValueTest.java b/modules/javafx.graphics/src/test/java/test/javafx/animation/KeyValueTest.java
index 22847648f3e..74d28ad83c2 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/animation/KeyValueTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/animation/KeyValueTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
 import com.sun.javafx.animation.KeyValueType;
 import javafx.animation.Interpolator;
 import javafx.animation.KeyValue;
-import static org.junit.Assert.assertEquals;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.FloatProperty;
@@ -48,7 +47,9 @@
 import javafx.beans.value.WritableLongValue;
 import javafx.beans.value.WritableValue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class KeyValueTest {
 
@@ -77,15 +78,19 @@ public void testBooleanFactory_Interpolator() {
         assertKeyValue(KeyValueType.BOOLEAN, v, Boolean.TRUE, Interpolator.EASE_BOTH, kv);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testBooleanFactory_Interpolator_NullTarget() {
-        new KeyValue(null, true, Interpolator.EASE_BOTH);
+        assertThrows(NullPointerException.class, () -> {
+            new KeyValue(null, true, Interpolator.EASE_BOTH);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testBooleanFactory_Interpolator_NullInterpolator() {
-        final BooleanProperty v = new SimpleBooleanProperty();
-        new KeyValue(v, true, null);
+        assertThrows(NullPointerException.class, () -> {
+            final BooleanProperty v = new SimpleBooleanProperty();
+            new KeyValue(v, true, null);
+        });
     }
 
 
@@ -97,9 +102,11 @@ public void testBooleanFactory() {
         assertKeyValue(KeyValueType.BOOLEAN, v, Boolean.TRUE, Interpolator.LINEAR, kv);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testBooleanFactory_NullTarget() {
-        new KeyValue(null, true);
+        assertThrows(NullPointerException.class, () -> {
+            new KeyValue(null, true);
+        });
     }
 
 
@@ -112,15 +119,19 @@ public void testDoubleFactory_Interpolator() {
         assertEquals(Math.PI, ((Number)kv.getEndValue()).doubleValue(), EPSILON_DOUBLE);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testDoubleFactory_Interpolator_NullTarget() {
-        new KeyValue(null, Math.PI, Interpolator.EASE_BOTH);
+        assertThrows(NullPointerException.class, () -> {
+            new KeyValue(null, Math.PI, Interpolator.EASE_BOTH);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testDoubleFactory_Interpolator_NullInterpolator() {
-        final DoubleProperty v = new SimpleDoubleProperty();
-        new KeyValue(v, Math.PI, null);
+        assertThrows(NullPointerException.class, () -> {
+            final DoubleProperty v = new SimpleDoubleProperty();
+            new KeyValue(v, Math.PI, null);
+        });
     }
 
 
@@ -133,9 +144,11 @@ public void testDoubleFactory() {
         assertEquals(Math.E, ((Number)kv.getEndValue()).doubleValue(), EPSILON_DOUBLE);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testDoubleFactory_NullTarget() {
-        new KeyValue(null, Math.E);
+        assertThrows(NullPointerException.class, () -> {
+            new KeyValue(null, Math.E);
+        });
     }
 
 
@@ -148,15 +161,19 @@ public void testFloatFactory_Interpolator() {
         assertEquals((float)Math.E, ((Number)kv.getEndValue()).floatValue(), EPSILON_FLOAT);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testFloatFactory_Interpolator_NullTarget() {
-        new KeyValue((WritableFloatValue)null, (float)Math.E, Interpolator.EASE_BOTH);
+        assertThrows(NullPointerException.class, () -> {
+            new KeyValue((WritableFloatValue)null, (float)Math.E, Interpolator.EASE_BOTH);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testFloatFactory_Interpolator_NullInterpolator() {
-        final FloatProperty v = new SimpleFloatProperty();
-        new KeyValue(v, (float)Math.E, null);
+        assertThrows(NullPointerException.class, () -> {
+            final FloatProperty v = new SimpleFloatProperty();
+            new KeyValue(v, (float)Math.E, null);
+        });
     }
 
 
@@ -169,9 +186,11 @@ public void testFloatFactory() {
         assertEquals((float)Math.PI, ((Number)kv.getEndValue()).floatValue(), EPSILON_FLOAT);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testFloatFactory_NullTarget() {
-        new KeyValue((WritableFloatValue)null, (float)Math.PI);
+        assertThrows(NullPointerException.class, () -> {
+            new KeyValue((WritableFloatValue)null, (float)Math.PI);
+        });
     }
 
 
@@ -183,15 +202,19 @@ public void testIntegerFactory_Interpolator() {
         assertKeyValue(KeyValueType.INTEGER, v, Integer.MAX_VALUE, Interpolator.EASE_BOTH, kv);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testIntegerFactory_Interpolator_NullTarget() {
-        new KeyValue((WritableIntegerValue)null, 1, Interpolator.EASE_BOTH);
+        assertThrows(NullPointerException.class, () -> {
+            new KeyValue((WritableIntegerValue)null, 1, Interpolator.EASE_BOTH);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testIntegerFactory_Interpolator_NullInterpolator() {
-        final IntegerProperty v = new SimpleIntegerProperty();
-        new KeyValue(v, 1, null);
+        assertThrows(NullPointerException.class, () -> {
+            final IntegerProperty v = new SimpleIntegerProperty();
+            new KeyValue(v, 1, null);
+        });
     }
 
 
@@ -203,9 +226,11 @@ public void testIntegerFactory() {
         assertKeyValue(KeyValueType.INTEGER, v, Integer.MIN_VALUE, Interpolator.LINEAR, kv);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testIntegerFactory_NullTarget() {
-        new KeyValue((WritableIntegerValue)null, Integer.MIN_VALUE);
+        assertThrows(NullPointerException.class, () -> {
+            new KeyValue((WritableIntegerValue)null, Integer.MIN_VALUE);
+        });
     }
 
 
@@ -217,15 +242,19 @@ public void testLongFactory_Interpolator() {
         assertKeyValue(KeyValueType.LONG, v, Long.MAX_VALUE, Interpolator.EASE_BOTH, kv);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testLongFactory_Interpolator_NullTarget() {
-        new KeyValue((WritableLongValue)null, 1L, Interpolator.EASE_BOTH);
+        assertThrows(NullPointerException.class, () -> {
+            new KeyValue((WritableLongValue)null, 1L, Interpolator.EASE_BOTH);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testLongFactory_Interpolator_NullInterpolator() {
-        final LongProperty v = new SimpleLongProperty();
-        new KeyValue(v, 1L, null);
+        assertThrows(NullPointerException.class, () -> {
+            final LongProperty v = new SimpleLongProperty();
+            new KeyValue(v, 1L, null);
+        });
     }
 
 
@@ -237,9 +266,11 @@ public void testLongFactory() {
         assertKeyValue(KeyValueType.LONG, v, Long.MIN_VALUE, Interpolator.LINEAR, kv);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testLongFactory_NullTarget() {
-        new KeyValue((WritableLongValue)null, Long.MIN_VALUE);
+        assertThrows(NullPointerException.class, () -> {
+            new KeyValue((WritableLongValue)null, Long.MIN_VALUE);
+        });
     }
 
 
@@ -251,15 +282,19 @@ public void testObjectFactory_Interpolator() {
         assertKeyValue(KeyValueType.OBJECT, v, "Hello World", Interpolator.EASE_BOTH, kv);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testObjectFactory_Interpolator_NullTarget() {
-        new KeyValue(null, "Hello World", Interpolator.EASE_BOTH);
+        assertThrows(NullPointerException.class, () -> {
+            new KeyValue(null, "Hello World", Interpolator.EASE_BOTH);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testObjectFactory_Interpolator_NullInterpolator() {
-        final StringProperty v = new SimpleStringProperty();
-        new KeyValue(v, "Hello World", null);
+        assertThrows(NullPointerException.class, () -> {
+            final StringProperty v = new SimpleStringProperty();
+            new KeyValue(v, "Hello World", null);
+        });
     }
 
 
@@ -271,9 +306,11 @@ public void testObjectFactory() {
         assertKeyValue(KeyValueType.OBJECT, v, "Goodbye World", Interpolator.LINEAR, kv);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testObjectFactory_NullTarget() {
-        new KeyValue(null, "Goodbye World");
+        assertThrows(NullPointerException.class, () -> {
+            new KeyValue(null, "Goodbye World");
+        });
     }
 
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/animation/ParallelTransitionPlayTest.java b/modules/javafx.graphics/src/test/java/test/javafx/animation/ParallelTransitionPlayTest.java
index d1e8656f8b0..1a098e720fa 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/animation/ParallelTransitionPlayTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/animation/ParallelTransitionPlayTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,9 +35,10 @@
 import javafx.beans.property.LongProperty;
 import javafx.beans.property.SimpleLongProperty;
 import javafx.util.Duration;
-import static org.junit.Assert.assertEquals;
-import org.junit.Before;
-import org.junit.Test;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class ParallelTransitionPlayTest {
     public static final double TICK_MILLIS = TickCalculation.toMillis(100);
@@ -54,7 +55,7 @@ public class ParallelTransitionPlayTest {
     Transition child1Y;
     Transition childByX;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         amt = new AbstractPrimaryTimerMock();
         pt = ParallelTransitionShim.getParallelTransition(amt);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/animation/ParallelTransitionTest.java b/modules/javafx.graphics/src/test/java/test/javafx/animation/ParallelTransitionTest.java
index 4a44d338e3c..2f39438ac84 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/animation/ParallelTransitionTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/animation/ParallelTransitionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,6 @@
 
 package test.javafx.animation;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
 import java.util.Arrays;
 import javafx.animation.Animation;
 import javafx.animation.Interpolator;
@@ -38,8 +34,11 @@
 import javafx.scene.shape.Rectangle;
 import javafx.util.Duration;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class ParallelTransitionTest {
 
@@ -54,7 +53,7 @@ public class ParallelTransitionTest {
     private Animation child2;
     private Animation child3;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         node = new Rectangle();
         child1 = new AnimationDummy(ONE_SEC);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/animation/PathTransitionTest.java b/modules/javafx.graphics/src/test/java/test/javafx/animation/PathTransitionTest.java
index fe23c630d9b..8e2ca5aa2cb 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/animation/PathTransitionTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/animation/PathTransitionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,16 +27,16 @@
 
 import javafx.animation.Interpolator;
 import javafx.animation.PathTransition;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
 import javafx.scene.Node;
 import javafx.scene.shape.Circle;
 import javafx.scene.shape.Rectangle;
 import javafx.scene.shape.Shape;
 import javafx.util.Duration;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class PathTransitionTest {
 
@@ -48,7 +48,7 @@ public class PathTransitionTest {
     private Shape path;
     private Node node;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         path = new Circle();
         node = new Rectangle();
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/animation/PauseTransitionTest.java b/modules/javafx.graphics/src/test/java/test/javafx/animation/PauseTransitionTest.java
index 22e15c1520e..e8f016ef1dc 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/animation/PauseTransitionTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/animation/PauseTransitionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,11 +26,11 @@
 package test.javafx.animation;
 
 import javafx.animation.PauseTransition;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
 import javafx.util.Duration;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class PauseTransitionTest {
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/animation/RotateTransitionTest.java b/modules/javafx.graphics/src/test/java/test/javafx/animation/RotateTransitionTest.java
index 9af69e9899a..599d76bbaa9 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/animation/RotateTransitionTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/animation/RotateTransitionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,17 +30,17 @@
 import javafx.animation.ParallelTransition;
 import javafx.animation.RotateTransition;
 import javafx.animation.TransitionShim;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 import javafx.geometry.Point3D;
 import javafx.scene.Node;
 import javafx.scene.shape.Rectangle;
 import javafx.util.Duration;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class RotateTransitionTest {
 
@@ -53,7 +53,7 @@ public class RotateTransitionTest {
 
     private Node node;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         node = new Rectangle();
     }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/animation/ScaleTransitionTest.java b/modules/javafx.graphics/src/test/java/test/javafx/animation/ScaleTransitionTest.java
index e276fb46baf..0787a8c3b12 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/animation/ScaleTransitionTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/animation/ScaleTransitionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,16 +30,16 @@
 import javafx.animation.ParallelTransition;
 import javafx.animation.ScaleTransition;
 import javafx.animation.TransitionShim;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 import javafx.scene.Node;
 import javafx.scene.shape.Rectangle;
 import javafx.util.Duration;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class ScaleTransitionTest {
 
@@ -52,7 +52,7 @@ public class ScaleTransitionTest {
 
     private Node node;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         node = new Rectangle();
     }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/animation/SequentialTransitionPlayTest.java b/modules/javafx.graphics/src/test/java/test/javafx/animation/SequentialTransitionPlayTest.java
index b0024f3c7d1..f75fcba5f73 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/animation/SequentialTransitionPlayTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/animation/SequentialTransitionPlayTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,9 +35,10 @@
 import javafx.beans.property.LongProperty;
 import javafx.beans.property.SimpleLongProperty;
 import javafx.util.Duration;
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.*;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class SequentialTransitionPlayTest {
 
@@ -53,7 +54,7 @@ public class SequentialTransitionPlayTest {
     Transition childByX;
     Transition childByX2;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         amt = new AbstractPrimaryTimerMock();
         st = SequentialTransitionShim.getSequentialTransition(amt);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/animation/SequentialTransitionTest.java b/modules/javafx.graphics/src/test/java/test/javafx/animation/SequentialTransitionTest.java
index ccc963be19a..3448b5a5b9e 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/animation/SequentialTransitionTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/animation/SequentialTransitionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,6 @@
 
 package test.javafx.animation;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
 import java.util.Arrays;
 import javafx.animation.Animation;
 import javafx.animation.Interpolator;
@@ -38,8 +34,11 @@
 import javafx.scene.shape.Rectangle;
 import javafx.util.Duration;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class SequentialTransitionTest {
 
@@ -55,7 +54,7 @@ public class SequentialTransitionTest {
     private Animation child2;
     private Animation child3;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         node = new Rectangle();
         child1 = new AnimationDummy(ONE_SEC);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/animation/StrokeTransitionTest.java b/modules/javafx.graphics/src/test/java/test/javafx/animation/StrokeTransitionTest.java
index 5323e1cfa4f..58e47ec4aef 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/animation/StrokeTransitionTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/animation/StrokeTransitionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,10 +30,6 @@
 import javafx.animation.ParallelTransition;
 import javafx.animation.StrokeTransition;
 import javafx.animation.TransitionShim;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 import javafx.scene.Group;
 import javafx.scene.paint.Color;
 import javafx.scene.paint.LinearGradient;
@@ -43,8 +39,12 @@
 import javafx.scene.shape.Shape;
 import javafx.util.Duration;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class StrokeTransitionTest {
 
@@ -57,7 +57,7 @@ public class StrokeTransitionTest {
 
     private Shape shape;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         shape = new Rectangle();
     }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/animation/TimelinePlayTest.java b/modules/javafx.graphics/src/test/java/test/javafx/animation/TimelinePlayTest.java
index ad02bedfc1a..d70c0a1c97b 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/animation/TimelinePlayTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/animation/TimelinePlayTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,10 +36,10 @@
 import javafx.collections.ObservableList;
 import javafx.util.Duration;
 import javafx.util.Pair;
-import org.junit.Before;
-import org.junit.Test;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class TimelinePlayTest {
 
@@ -51,7 +51,7 @@ public class TimelinePlayTest {
     private static final double EPSILON = 1e-12;
 
 
-    @Before
+    @BeforeEach
     public void setUp() {
         amt = new AbstractPrimaryTimerMock();
         timeline = TimelineShim.getTimeline(amt);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/animation/TimelineTest.java b/modules/javafx.graphics/src/test/java/test/javafx/animation/TimelineTest.java
index c52f6ccf33a..09fe845d197 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/animation/TimelineTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/animation/TimelineTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,6 @@
 
 package test.javafx.animation;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 import java.util.Arrays;
 import java.util.Collections;
 
@@ -37,8 +34,10 @@
 import javafx.animation.Timeline;
 import javafx.util.Duration;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 
 /**
@@ -54,7 +53,7 @@ public class TimelineTest {
 
     private Timeline timeline;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         timeline = new Timeline();
     }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/animation/TransitionTest.java b/modules/javafx.graphics/src/test/java/test/javafx/animation/TransitionTest.java
index 5a097fbf162..2af261268f4 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/animation/TransitionTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/animation/TransitionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,6 @@
 
 package test.javafx.animation;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
 import com.sun.javafx.tk.Toolkit;
 import javafx.animation.Interpolator;
 import javafx.animation.ParallelTransition;
@@ -37,8 +33,11 @@
 import javafx.scene.shape.Rectangle;
 import javafx.util.Duration;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 
 public class TransitionTest {
@@ -48,7 +47,7 @@ public class TransitionTest {
 
     private TransitionImpl transition;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         transition = new TransitionImpl(Duration.millis(1000));
     }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/animation/TranslateTransitionTest.java b/modules/javafx.graphics/src/test/java/test/javafx/animation/TranslateTransitionTest.java
index a6cf4f7657e..9a067176600 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/animation/TranslateTransitionTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/animation/TranslateTransitionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,16 +30,16 @@
 import javafx.animation.ParallelTransition;
 import javafx.animation.TransitionShim;
 import javafx.animation.TranslateTransition;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 import javafx.scene.Node;
 import javafx.scene.shape.Rectangle;
 import javafx.util.Duration;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class TranslateTransitionTest {
 
@@ -52,7 +52,7 @@ public class TranslateTransitionTest {
 
     private Node node;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         node = new Rectangle();
     }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/concurrent/ScheduledServiceTest.java b/modules/javafx.graphics/src/test/java/test/javafx/concurrent/ScheduledServiceTest.java
index be5aa6b4275..41a43aebef1 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/concurrent/ScheduledServiceTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/concurrent/ScheduledServiceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,11 +37,13 @@
 import javafx.concurrent.Service;
 import javafx.concurrent.Task;
 import javafx.concurrent.Worker;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Tests for the ScheduledService.
@@ -79,7 +81,7 @@ public class ScheduledServiceTest extends ServiceTestBase {
      */
     private long wallClock;
 
-    @Override protected TestServiceFactory setupServiceFactory() {
+    private TestServiceFactory setupServiceFactory() {
         return new TestServiceFactory() {
             @Override public AbstractTask createTestTask() {
                 return taskFactory == null ? new SimpleTask() : taskFactory.call(null);
@@ -91,8 +93,9 @@ public class ScheduledServiceTest extends ServiceTestBase {
         };
     }
 
-    @Override public void setup() {
-        super.setup();
+    @BeforeEach
+    public void setup() {
+        setup(setupServiceFactory());
         s = (ScheduledServiceMock) service;
         wallClock = 0;
     }
@@ -103,247 +106,289 @@ public class ScheduledServiceTest extends ServiceTestBase {
      * account the maximum cumulative period value.                                                   *
      *************************************************************************************************/
 
-    @Test public void setCumulativePeriod_MaxIsInfinity_TwoSeconds() {
+    @Test
+    public void setCumulativePeriod_MaxIsInfinity_TwoSeconds() {
         ScheduledServiceShim.setCumulativePeriod(s, Duration.seconds(2));
         assertEquals(Duration.seconds(2), s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIsInfinity_Negative() {
+    @Test
+    public void setCumulativePeriod_MaxIsInfinity_Negative() {
         ScheduledServiceShim.setCumulativePeriod(s, Duration.seconds(-2));
         assertEquals(Duration.ZERO, s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIsInfinity_NegativeInfinity() {
+    @Test
+    public void setCumulativePeriod_MaxIsInfinity_NegativeInfinity() {
         ScheduledServiceShim.setCumulativePeriod(s, Duration.seconds(Double.NEGATIVE_INFINITY));
         assertEquals(Duration.ZERO, s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIsInfinity_NaN() {
+    @Test
+    public void setCumulativePeriod_MaxIsInfinity_NaN() {
         ScheduledServiceShim.setCumulativePeriod(s, Duration.seconds(Double.NaN));
         assertEquals(Duration.UNKNOWN, s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIsInfinity_PositiveInfinity() {
+    @Test
+    public void setCumulativePeriod_MaxIsInfinity_PositiveInfinity() {
         ScheduledServiceShim.setCumulativePeriod(s, Duration.seconds(Double.POSITIVE_INFINITY));
         assertEquals(Duration.INDEFINITE, s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIsInfinity_MAX_VALUE() {
+    @Test
+    public void setCumulativePeriod_MaxIsInfinity_MAX_VALUE() {
         ScheduledServiceShim.setCumulativePeriod(s, Duration.millis(Double.MAX_VALUE));
         assertEquals(Duration.millis(Double.MAX_VALUE), s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIsNaN_TwoSeconds() {
+    @Test
+    public void setCumulativePeriod_MaxIsNaN_TwoSeconds() {
         s.setMaximumCumulativePeriod(Duration.UNKNOWN);
         ScheduledServiceShim.setCumulativePeriod(s, Duration.seconds(2));
         assertEquals(Duration.seconds(2), s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIsNaN_Negative() {
+    @Test
+    public void setCumulativePeriod_MaxIsNaN_Negative() {
         s.setMaximumCumulativePeriod(Duration.UNKNOWN);
         ScheduledServiceShim.setCumulativePeriod(s, Duration.seconds(-2));
         assertEquals(Duration.ZERO, s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIsNaN_NegativeInfinity() {
+    @Test
+    public void setCumulativePeriod_MaxIsNaN_NegativeInfinity() {
         s.setMaximumCumulativePeriod(Duration.UNKNOWN);
         ScheduledServiceShim.setCumulativePeriod(s, Duration.seconds(Double.NEGATIVE_INFINITY));
         assertEquals(Duration.ZERO, s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIsNaN_NaN() {
+    @Test
+    public void setCumulativePeriod_MaxIsNaN_NaN() {
         s.setMaximumCumulativePeriod(Duration.UNKNOWN);
         ScheduledServiceShim.setCumulativePeriod(s, Duration.seconds(Double.NaN));
         assertEquals(Duration.UNKNOWN, s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIsNaN_PositiveInfinity() {
+    @Test
+    public void setCumulativePeriod_MaxIsNaN_PositiveInfinity() {
         s.setMaximumCumulativePeriod(Duration.UNKNOWN);
         ScheduledServiceShim.setCumulativePeriod(s, Duration.seconds(Double.POSITIVE_INFINITY));
         assertEquals(Duration.INDEFINITE, s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIsNaN_MAX_VALUE() {
+    @Test
+    public void setCumulativePeriod_MaxIsNaN_MAX_VALUE() {
         s.setMaximumCumulativePeriod(Duration.UNKNOWN);
         ScheduledServiceShim.setCumulativePeriod(s, Duration.millis(Double.MAX_VALUE));
         assertEquals(Duration.millis(Double.MAX_VALUE), s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIsNull_TwoSeconds() {
+    @Test
+    public void setCumulativePeriod_MaxIsNull_TwoSeconds() {
         s.setMaximumCumulativePeriod(null);
         ScheduledServiceShim.setCumulativePeriod(s, Duration.seconds(2));
         assertEquals(Duration.seconds(2), s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIsNull_Negative() {
+    @Test
+    public void setCumulativePeriod_MaxIsNull_Negative() {
         s.setMaximumCumulativePeriod(null);
         ScheduledServiceShim.setCumulativePeriod(s, Duration.seconds(-2));
         assertEquals(Duration.ZERO, s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIsNull_NegativeInfinity() {
+    @Test
+    public void setCumulativePeriod_MaxIsNull_NegativeInfinity() {
         s.setMaximumCumulativePeriod(null);
         ScheduledServiceShim.setCumulativePeriod(s, Duration.seconds(Double.NEGATIVE_INFINITY));
         assertEquals(Duration.ZERO, s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIsNull_NaN() {
+    @Test
+    public void setCumulativePeriod_MaxIsNull_NaN() {
         s.setMaximumCumulativePeriod(null);
         ScheduledServiceShim.setCumulativePeriod(s, Duration.seconds(Double.NaN));
         assertEquals(Duration.UNKNOWN, s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIsNull_PositiveInfinity() {
+    @Test
+    public void setCumulativePeriod_MaxIsNull_PositiveInfinity() {
         s.setMaximumCumulativePeriod(null);
         ScheduledServiceShim.setCumulativePeriod(s, Duration.seconds(Double.POSITIVE_INFINITY));
         assertEquals(Duration.INDEFINITE, s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIsNull_MAX_VALUE() {
+    @Test
+    public void setCumulativePeriod_MaxIsNull_MAX_VALUE() {
         s.setMaximumCumulativePeriod(null);
         ScheduledServiceShim.setCumulativePeriod(s, Duration.millis(Double.MAX_VALUE));
         assertEquals(Duration.millis(Double.MAX_VALUE), s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIs10_TwoSeconds() {
+    @Test
+    public void setCumulativePeriod_MaxIs10_TwoSeconds() {
         s.setMaximumCumulativePeriod(Duration.seconds(10));
         ScheduledServiceShim.setCumulativePeriod(s, Duration.seconds(2));
         assertEquals(Duration.seconds(2), s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIs10_TenSeconds() {
+    @Test
+    public void setCumulativePeriod_MaxIs10_TenSeconds() {
         s.setMaximumCumulativePeriod(Duration.seconds(10));
         ScheduledServiceShim.setCumulativePeriod(s, Duration.seconds(10));
         assertEquals(Duration.seconds(10), s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIs10_TwelveSeconds() {
+    @Test
+    public void setCumulativePeriod_MaxIs10_TwelveSeconds() {
         s.setMaximumCumulativePeriod(Duration.seconds(10));
         ScheduledServiceShim.setCumulativePeriod(s, Duration.seconds(12));
         assertEquals(Duration.seconds(10), s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIs10_Negative() {
+    @Test
+    public void setCumulativePeriod_MaxIs10_Negative() {
         s.setMaximumCumulativePeriod(Duration.seconds(10));
         ScheduledServiceShim.setCumulativePeriod(s, Duration.seconds(-2));
         assertEquals(Duration.ZERO, s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIs10_NegativeInfinity() {
+    @Test
+    public void setCumulativePeriod_MaxIs10_NegativeInfinity() {
         s.setMaximumCumulativePeriod(Duration.seconds(10));
         ScheduledServiceShim.setCumulativePeriod(s, Duration.seconds(Double.NEGATIVE_INFINITY));
         assertEquals(Duration.ZERO, s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIs10_NaN() {
+    @Test
+    public void setCumulativePeriod_MaxIs10_NaN() {
         s.setMaximumCumulativePeriod(Duration.seconds(10));
         ScheduledServiceShim.setCumulativePeriod(s, Duration.seconds(Double.NaN));
         assertEquals(Duration.UNKNOWN, s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIs10_PositiveInfinity() {
+    @Test
+    public void setCumulativePeriod_MaxIs10_PositiveInfinity() {
         s.setMaximumCumulativePeriod(Duration.seconds(10));
         ScheduledServiceShim.setCumulativePeriod(s, Duration.seconds(Double.POSITIVE_INFINITY));
         assertEquals(Duration.seconds(10), s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIs10_MAX_VALUE() {
+    @Test
+    public void setCumulativePeriod_MaxIs10_MAX_VALUE() {
         s.setMaximumCumulativePeriod(Duration.seconds(10));
         ScheduledServiceShim.setCumulativePeriod(s, Duration.millis(Double.MAX_VALUE));
         assertEquals(Duration.seconds(10), s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIs0_TwoSeconds() {
+    @Test
+    public void setCumulativePeriod_MaxIs0_TwoSeconds() {
         s.setMaximumCumulativePeriod(Duration.ZERO);
         ScheduledServiceShim.setCumulativePeriod(s, Duration.seconds(2));
         assertEquals(Duration.ZERO, s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIs0_TenSeconds() {
+    @Test
+    public void setCumulativePeriod_MaxIs0_TenSeconds() {
         s.setMaximumCumulativePeriod(Duration.ZERO);
         ScheduledServiceShim.setCumulativePeriod(s, Duration.seconds(10));
         assertEquals(Duration.ZERO, s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIs0_TwelveSeconds() {
+    @Test
+    public void setCumulativePeriod_MaxIs0_TwelveSeconds() {
         s.setMaximumCumulativePeriod(Duration.ZERO);
         ScheduledServiceShim.setCumulativePeriod(s, Duration.seconds(12));
         assertEquals(Duration.ZERO, s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIs0_Negative() {
+    @Test
+    public void setCumulativePeriod_MaxIs0_Negative() {
         s.setMaximumCumulativePeriod(Duration.ZERO);
         ScheduledServiceShim.setCumulativePeriod(s, Duration.seconds(-2));
         assertEquals(Duration.ZERO, s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIs0_NegativeInfinity() {
+    @Test
+    public void setCumulativePeriod_MaxIs0_NegativeInfinity() {
         s.setMaximumCumulativePeriod(Duration.ZERO);
         ScheduledServiceShim.setCumulativePeriod(s, Duration.seconds(Double.NEGATIVE_INFINITY));
         assertEquals(Duration.ZERO, s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIs0_NaN() {
+    @Test
+    public void setCumulativePeriod_MaxIs0_NaN() {
         s.setMaximumCumulativePeriod(Duration.ZERO);
         ScheduledServiceShim.setCumulativePeriod(s, Duration.seconds(Double.NaN));
         assertEquals(Duration.UNKNOWN, s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIs0_PositiveInfinity() {
+    @Test
+    public void setCumulativePeriod_MaxIs0_PositiveInfinity() {
         s.setMaximumCumulativePeriod(Duration.ZERO);
         ScheduledServiceShim.setCumulativePeriod(s, Duration.seconds(Double.POSITIVE_INFINITY));
         assertEquals(Duration.ZERO, s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIs0_MAX_VALUE() {
+    @Test
+    public void setCumulativePeriod_MaxIs0_MAX_VALUE() {
         s.setMaximumCumulativePeriod(Duration.ZERO);
         ScheduledServiceShim.setCumulativePeriod(s, Duration.millis(Double.MAX_VALUE));
         assertEquals(Duration.ZERO, s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIsNegative_TwoSeconds() {
+    @Test
+    public void setCumulativePeriod_MaxIsNegative_TwoSeconds() {
         s.setMaximumCumulativePeriod(Duration.seconds(-1));
         ScheduledServiceShim.setCumulativePeriod(s, Duration.seconds(2));
         assertEquals(Duration.ZERO, s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIsNegative_TenSeconds() {
+    @Test
+    public void setCumulativePeriod_MaxIsNegative_TenSeconds() {
         s.setMaximumCumulativePeriod(Duration.seconds(-1));
         ScheduledServiceShim.setCumulativePeriod(s, Duration.seconds(10));
         assertEquals(Duration.ZERO, s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIsNegative_TwelveSeconds() {
+    @Test
+    public void setCumulativePeriod_MaxIsNegative_TwelveSeconds() {
         s.setMaximumCumulativePeriod(Duration.seconds(-1));
         ScheduledServiceShim.setCumulativePeriod(s, Duration.seconds(12));
         assertEquals(Duration.ZERO, s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIsNegative_Negative() {
+    @Test
+    public void setCumulativePeriod_MaxIsNegative_Negative() {
         s.setMaximumCumulativePeriod(Duration.seconds(-1));
         ScheduledServiceShim.setCumulativePeriod(s, Duration.seconds(-2));
         assertEquals(Duration.ZERO, s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIsNegative_NegativeInfinity() {
+    @Test
+    public void setCumulativePeriod_MaxIsNegative_NegativeInfinity() {
         s.setMaximumCumulativePeriod(Duration.seconds(-1));
         ScheduledServiceShim.setCumulativePeriod(s, Duration.seconds(Double.NEGATIVE_INFINITY));
         assertEquals(Duration.ZERO, s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIsNegative_NaN() {
+    @Test
+    public void setCumulativePeriod_MaxIsNegative_NaN() {
         s.setMaximumCumulativePeriod(Duration.seconds(-1));
         ScheduledServiceShim.setCumulativePeriod(s, Duration.seconds(Double.NaN));
         assertEquals(Duration.UNKNOWN, s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIsNegative_PositiveInfinity() {
+    @Test
+    public void setCumulativePeriod_MaxIsNegative_PositiveInfinity() {
         s.setMaximumCumulativePeriod(Duration.seconds(-1));
         ScheduledServiceShim.setCumulativePeriod(s, Duration.seconds(Double.POSITIVE_INFINITY));
         assertEquals(Duration.ZERO, s.getCumulativePeriod());
     }
 
-    @Test public void setCumulativePeriod_MaxIsNegative_MAX_VALUE() {
+    @Test
+    public void setCumulativePeriod_MaxIsNegative_MAX_VALUE() {
         s.setMaximumCumulativePeriod(Duration.seconds(-1));
         ScheduledServiceShim.setCumulativePeriod(s, Duration.millis(Double.MAX_VALUE));
         assertEquals(Duration.ZERO, s.getCumulativePeriod());
@@ -359,31 +404,36 @@ public class ScheduledServiceTest extends ServiceTestBase {
     //     delay works on restart
     //     delay works on reset / start
 
-    @Test public void delayIsHonored_Positive() {
+    @Test
+    public void delayIsHonored_Positive() {
         s.setDelay(Duration.seconds(1));
         s.start();
         assertEquals(1000, wallClock);
     }
 
-    @Test public void delayIsHonored_Unknown() {
+    @Test
+    public void delayIsHonored_Unknown() {
         s.setDelay(Duration.UNKNOWN);
         s.start();
         assertEquals(0, wallClock);
     }
 
-    @Test public void delayIsHonored_Infinite() {
+    @Test
+    public void delayIsHonored_Infinite() {
         s.setDelay(Duration.INDEFINITE);
         s.start();
         assertEquals(Long.MAX_VALUE, wallClock);
     }
 
-    @Test public void delayIsHonored_ZERO() {
+    @Test
+    public void delayIsHonored_ZERO() {
         s.setDelay(Duration.ZERO);
         s.start();
         assertEquals(0, wallClock);
     }
 
-    @Test public void delayIsNotUsedOnSubsequentIteration() {
+    @Test
+    public void delayIsNotUsedOnSubsequentIteration() {
         s.setDelay(Duration.seconds(1));
         s.setPeriod(Duration.seconds(3));
         s.start();
@@ -391,7 +441,8 @@ public class ScheduledServiceTest extends ServiceTestBase {
         assertEquals(4000, wallClock); // 1 sec initial delay + 3 second iteration delay
     }
 
-    @Test public void delayIsUsedOnRestart() {
+    @Test
+    public void delayIsUsedOnRestart() {
         s.setDelay(Duration.seconds(1));
         s.setPeriod(Duration.seconds(3));
         s.start();
@@ -402,7 +453,8 @@ public class ScheduledServiceTest extends ServiceTestBase {
         assertEquals(1000, wallClock);
     }
 
-    @Test public void delayIsUsedOnStartFollowingReset() {
+    @Test
+    public void delayIsUsedOnStartFollowingReset() {
         s.setDelay(Duration.seconds(1));
         s.setPeriod(Duration.seconds(3));
         s.start();
@@ -423,14 +475,16 @@ public class ScheduledServiceTest extends ServiceTestBase {
     //         run time > period
     //     start of last period is reset after "reset" call (or restart)
 
-    @Test public void periodDoesNotContributeToDelay() {
+    @Test
+    public void periodDoesNotContributeToDelay() {
         s.setDelay(Duration.seconds(1));
         s.setPeriod(Duration.seconds(3));
         s.start();
         assertEquals(1000, wallClock);
     }
 
-    @Test public void executionTimeLessThanPeriod() {
+    @Test
+    public void executionTimeLessThanPeriod() {
         s.setDelay(Duration.seconds(1));
         s.setPeriod(Duration.seconds(3));
         s.start();
@@ -438,7 +492,8 @@ public class ScheduledServiceTest extends ServiceTestBase {
         assertEquals(4000, wallClock); // 1 sec initial delay + 3 second iteration delay
     }
 
-    @Test public void executionTimeEqualsPeriod() {
+    @Test
+    public void executionTimeEqualsPeriod() {
         s.setDelay(Duration.seconds(1));
         s.setPeriod(Duration.seconds(3));
         s.start();
@@ -447,7 +502,8 @@ public class ScheduledServiceTest extends ServiceTestBase {
         assertEquals(4000, wallClock);
     }
 
-    @Test public void executionTimeExceedsPeriod() {
+    @Test
+    public void executionTimeExceedsPeriod() {
         s.setDelay(Duration.seconds(1));
         s.setPeriod(Duration.seconds(3));
         s.start();
@@ -456,7 +512,8 @@ public class ScheduledServiceTest extends ServiceTestBase {
         assertEquals(7000, wallClock);
     }
 
-    @Test public void startOfPeriodIsResetAfterReset() {
+    @Test
+    public void startOfPeriodIsResetAfterReset() {
         s.setDelay(Duration.seconds(1));
         s.setPeriod(Duration.seconds(3));
         s.start();
@@ -470,7 +527,8 @@ public class ScheduledServiceTest extends ServiceTestBase {
         assertEquals(4000, wallClock);
     }
 
-    @Test public void startOfPeriodIsResetAfterRestart() {
+    @Test
+    public void startOfPeriodIsResetAfterRestart() {
         s.setDelay(Duration.seconds(1));
         s.setPeriod(Duration.seconds(3));
         s.start();
@@ -489,7 +547,8 @@ public class ScheduledServiceTest extends ServiceTestBase {
     //     on task failure, cumulative period is increased according to compute backoff
     //          EXPONENTIAL_BACKOFF_STRATEGY, LOGARITHMIC_BACKOFF_STRATEGY, LINEAR_BACKOFF_STRATEGY, custom backoff
 
-    @Test public void onFailureCumulativePeriodIsIncreased_EXPONENTIAL_BACKOFF_zero() {
+    @Test
+    public void onFailureCumulativePeriodIsIncreased_EXPONENTIAL_BACKOFF_zero() {
         s.setBackoffStrategy(ScheduledService.EXPONENTIAL_BACKOFF_STRATEGY);
         s.setPeriod(Duration.ZERO);
         taskFactory = EPIC_FAIL_FACTORY;
@@ -497,7 +556,8 @@ public class ScheduledServiceTest extends ServiceTestBase {
         assertEquals(Duration.millis(Math.exp(1)), s.getCumulativePeriod());
     }
 
-    @Test public void onFailureCumulativePeriodIsIncreased_EXPONENTIAL_BACKOFF_one() {
+    @Test
+    public void onFailureCumulativePeriodIsIncreased_EXPONENTIAL_BACKOFF_one() {
         s.setBackoffStrategy(ScheduledService.EXPONENTIAL_BACKOFF_STRATEGY);
         s.setPeriod(Duration.seconds(1));
         taskFactory = EPIC_FAIL_FACTORY;
@@ -505,7 +565,8 @@ public class ScheduledServiceTest extends ServiceTestBase {
         assertEquals(Duration.millis(1000 + (1000 * Math.exp(1))), s.getCumulativePeriod());
     }
 
-    @Test public void onFailureCumulativePeriodIsIncreased_EXPONENTIAL_BACKOFF_indefinite() {
+    @Test
+    public void onFailureCumulativePeriodIsIncreased_EXPONENTIAL_BACKOFF_indefinite() {
         s.setBackoffStrategy(ScheduledService.EXPONENTIAL_BACKOFF_STRATEGY);
         s.setPeriod(Duration.INDEFINITE);
         taskFactory = EPIC_FAIL_FACTORY;
@@ -513,7 +574,8 @@ public class ScheduledServiceTest extends ServiceTestBase {
         assertEquals(Duration.INDEFINITE, s.getCumulativePeriod());
     }
 
-    @Test public void onFailureCumulativePeriodIsIncreased_EXPONENTIAL_BACKOFF_unknown() {
+    @Test
+    public void onFailureCumulativePeriodIsIncreased_EXPONENTIAL_BACKOFF_unknown() {
         s.setBackoffStrategy(ScheduledService.EXPONENTIAL_BACKOFF_STRATEGY);
         s.setPeriod(Duration.UNKNOWN);
         taskFactory = EPIC_FAIL_FACTORY;
@@ -521,7 +583,8 @@ public class ScheduledServiceTest extends ServiceTestBase {
         assertEquals(Duration.UNKNOWN, s.getCumulativePeriod());
     }
 
-    @Test public void onFailureCumulativePeriodIsIncreased_LOGARITHMIC_BACKOFF_zero() {
+    @Test
+    public void onFailureCumulativePeriodIsIncreased_LOGARITHMIC_BACKOFF_zero() {
         s.setBackoffStrategy(ScheduledService.LOGARITHMIC_BACKOFF_STRATEGY);
         s.setPeriod(Duration.ZERO);
         taskFactory = EPIC_FAIL_FACTORY;
@@ -529,7 +592,8 @@ public class ScheduledServiceTest extends ServiceTestBase {
         assertEquals(Duration.millis(Math.log1p(1)), s.getCumulativePeriod());
     }
 
-    @Test public void onFailureCumulativePeriodIsIncreased_LOGARITHMIC_BACKOFF_one() {
+    @Test
+    public void onFailureCumulativePeriodIsIncreased_LOGARITHMIC_BACKOFF_one() {
         s.setBackoffStrategy(ScheduledService.LOGARITHMIC_BACKOFF_STRATEGY);
         s.setPeriod(Duration.seconds(1));
         taskFactory = EPIC_FAIL_FACTORY;
@@ -537,7 +601,8 @@ public class ScheduledServiceTest extends ServiceTestBase {
         assertEquals(Duration.millis(1000 + (1000 * Math.log1p(1))), s.getCumulativePeriod());
     }
 
-    @Test public void onFailureCumulativePeriodIsIncreased_LOGARITHMIC_BACKOFF_indefinite() {
+    @Test
+    public void onFailureCumulativePeriodIsIncreased_LOGARITHMIC_BACKOFF_indefinite() {
         s.setBackoffStrategy(ScheduledService.LOGARITHMIC_BACKOFF_STRATEGY);
         s.setPeriod(Duration.INDEFINITE);
         taskFactory = EPIC_FAIL_FACTORY;
@@ -545,7 +610,8 @@ public class ScheduledServiceTest extends ServiceTestBase {
         assertEquals(Duration.INDEFINITE, s.getCumulativePeriod());
     }
 
-    @Test public void onFailureCumulativePeriodIsIncreased_LOGARITHMIC_BACKOFF_unknown() {
+    @Test
+    public void onFailureCumulativePeriodIsIncreased_LOGARITHMIC_BACKOFF_unknown() {
         s.setBackoffStrategy(ScheduledService.LOGARITHMIC_BACKOFF_STRATEGY);
         s.setPeriod(Duration.UNKNOWN);
         taskFactory = EPIC_FAIL_FACTORY;
@@ -553,7 +619,8 @@ public class ScheduledServiceTest extends ServiceTestBase {
         assertEquals(Duration.UNKNOWN, s.getCumulativePeriod());
     }
 
-    @Test public void onFailureCumulativePeriodIsIncreased_LINEAR_BACKOFF_zero() {
+    @Test
+    public void onFailureCumulativePeriodIsIncreased_LINEAR_BACKOFF_zero() {
         s.setBackoffStrategy(ScheduledService.LINEAR_BACKOFF_STRATEGY);
         s.setPeriod(Duration.ZERO);
         taskFactory = EPIC_FAIL_FACTORY;
@@ -561,7 +628,8 @@ public class ScheduledServiceTest extends ServiceTestBase {
         assertEquals(Duration.millis(1), s.getCumulativePeriod());
     }
 
-    @Test public void onFailureCumulativePeriodIsIncreased_LINEAR_BACKOFF_one() {
+    @Test
+    public void onFailureCumulativePeriodIsIncreased_LINEAR_BACKOFF_one() {
         s.setBackoffStrategy(ScheduledService.LINEAR_BACKOFF_STRATEGY);
         s.setPeriod(Duration.seconds(1));
         taskFactory = EPIC_FAIL_FACTORY;
@@ -569,7 +637,8 @@ public class ScheduledServiceTest extends ServiceTestBase {
         assertEquals(Duration.millis(1000 + (1000 * 1)), s.getCumulativePeriod());
     }
 
-    @Test public void onFailureCumulativePeriodIsIncreased_LINEAR_BACKOFF_indefinite() {
+    @Test
+    public void onFailureCumulativePeriodIsIncreased_LINEAR_BACKOFF_indefinite() {
         s.setBackoffStrategy(ScheduledService.LINEAR_BACKOFF_STRATEGY);
         s.setPeriod(Duration.INDEFINITE);
         taskFactory = EPIC_FAIL_FACTORY;
@@ -577,7 +646,8 @@ public class ScheduledServiceTest extends ServiceTestBase {
         assertEquals(Duration.INDEFINITE, s.getCumulativePeriod());
     }
 
-    @Test public void onFailureCumulativePeriodIsIncreased_LINEAR_BACKOFF_unknown() {
+    @Test
+    public void onFailureCumulativePeriodIsIncreased_LINEAR_BACKOFF_unknown() {
         s.setBackoffStrategy(ScheduledService.LINEAR_BACKOFF_STRATEGY);
         s.setPeriod(Duration.UNKNOWN);
         taskFactory = EPIC_FAIL_FACTORY;
@@ -593,7 +663,8 @@ public class ScheduledServiceTest extends ServiceTestBase {
     //     cumulative period is modified on failure (tested in onFailure*** tests)
     //     cumulative period is not modified on cancel
 
-    @Test public void cumulativePeriodSetWhenScheduled() {
+    @Test
+    public void cumulativePeriodSetWhenScheduled() {
         assertEquals(Duration.ZERO, s.getCumulativePeriod());
         s.setPeriod(Duration.seconds(1));
         assertEquals(Duration.ZERO, s.getCumulativePeriod());
@@ -601,14 +672,16 @@ public class ScheduledServiceTest extends ServiceTestBase {
         assertEquals(Duration.seconds(1), s.getCumulativePeriod());
     }
 
-    @Test public void cumulativePeriodDoesNotChangeOnSuccessfulRun() {
+    @Test
+    public void cumulativePeriodDoesNotChangeOnSuccessfulRun() {
         s.setPeriod(Duration.seconds(1));
         s.start();
         s.iterate();
         assertEquals(Duration.seconds(1), s.getCumulativePeriod());
     }
 
-    @Test public void cumulativePeriodResetOnSuccessfulRun() {
+    @Test
+    public void cumulativePeriodResetOnSuccessfulRun() {
         final AtomicInteger counter = new AtomicInteger();
         taskFactory = param -> new AbstractTask() {
             @Override protected String call() throws Exception {
@@ -625,7 +698,8 @@ public class ScheduledServiceTest extends ServiceTestBase {
         assertEquals(Duration.seconds(1), s.getCumulativePeriod());
     }
 
-    @Test public void cumulativePeriodDoesNotChangeOnCancelRun() {
+    @Test
+    public void cumulativePeriodDoesNotChangeOnCancelRun() {
         s.setPeriod(Duration.seconds(1));
         s.start();
         s.iterate();
@@ -638,7 +712,8 @@ public class ScheduledServiceTest extends ServiceTestBase {
     //     value of true causes a new iteration if the task fails
     //     value of false causes the Service to enter Failed state if the task fails.
 
-    @Test public void restartOnFailure_True() {
+    @Test
+    public void restartOnFailure_True() {
         final AtomicInteger counter = new AtomicInteger();
         taskFactory = new Callback<>() {
             @Override public AbstractTask call(Void param) {
@@ -656,7 +731,8 @@ public class ScheduledServiceTest extends ServiceTestBase {
         assertEquals(2, counter.get());
     }
 
-    @Test public void restartOnFailure_False() {
+    @Test
+    public void restartOnFailure_False() {
         final AtomicInteger counter = new AtomicInteger();
         taskFactory = new Callback<>() {
             @Override public AbstractTask call(Void param) {
@@ -682,7 +758,8 @@ public class ScheduledServiceTest extends ServiceTestBase {
     //     currentFailureCount increments on each failure by 1
     //     currentFailureCount is reset on "reset" and "restart"
 
-    @Test public void serviceIteratesWhile_CurrentFailureCount_IsLessThan_MaximumFailureCount() {
+    @Test
+    public void serviceIteratesWhile_CurrentFailureCount_IsLessThan_MaximumFailureCount() {
         final AtomicInteger counter = new AtomicInteger();
         taskFactory = new Callback<>() {
             @Override public AbstractTask call(Void param) {
@@ -704,7 +781,8 @@ public class ScheduledServiceTest extends ServiceTestBase {
         assertEquals(counter.get(), s.getCurrentFailureCount());
     }
 
-    @Test public void currentFailureCountIsResetOnRestart() {
+    @Test
+    public void currentFailureCountIsResetOnRestart() {
         taskFactory = EPIC_FAIL_FACTORY;
         s.start();
         for (int i=0; i<10; i++) s.iterate();
@@ -713,7 +791,8 @@ public class ScheduledServiceTest extends ServiceTestBase {
         assertEquals(0, s.getCurrentFailureCount());
     }
 
-    @Test public void currentFailureCountIsResetOnReset() {
+    @Test
+    public void currentFailureCountIsResetOnReset() {
         taskFactory = EPIC_FAIL_FACTORY;
         s.start();
         for (int i=0; i<10; i++) s.iterate();
@@ -722,7 +801,8 @@ public class ScheduledServiceTest extends ServiceTestBase {
         assertEquals(0, s.getCurrentFailureCount());
     }
 
-    @Test public void currentFailureCountIsNotResetOnCancel() {
+    @Test
+    public void currentFailureCountIsNotResetOnCancel() {
         taskFactory = EPIC_FAIL_FACTORY;
         s.start();
         for (int i=0; i<10; i++) s.iterate();
@@ -737,23 +817,27 @@ public class ScheduledServiceTest extends ServiceTestBase {
     //     last value equals value from successful iteration (1 & 2)
     //     last value is cleared on "restart" / "reset"
 
-    @Test public void lastValueIsInitiallyNull() {
+    @Test
+    public void lastValueIsInitiallyNull() {
         assertNull(s.getLastValue());
     }
 
-    @Test public void lastValueIsNullAfterFailedFirstIteration() {
+    @Test
+    public void lastValueIsNullAfterFailedFirstIteration() {
         taskFactory = EPIC_FAIL_FACTORY;
         s.start();
         assertNull(s.getLastValue());
     }
 
-    @Test public void lastValueIsSetAfterSuccessfulFirstIteration() {
+    @Test
+    public void lastValueIsSetAfterSuccessfulFirstIteration() {
         s.start();
         assertEquals("Sentinel", s.getLastValue());
         assertNull(s.getValue());
     }
 
-    @Test public void lastValueIsSetAfterFailedFirstIterationAndSuccessfulSecondIteration() {
+    @Test
+    public void lastValueIsSetAfterFailedFirstIterationAndSuccessfulSecondIteration() {
         final AtomicInteger counter = new AtomicInteger();
         taskFactory = param -> new AbstractTask() {
             @Override protected String call() throws Exception {
@@ -770,7 +854,8 @@ public class ScheduledServiceTest extends ServiceTestBase {
         assertNull(s.getValue());
     }
 
-    @Test public void lastValueIsUnchangedAfterSuccessfulFirstIterationAndFailedSecondIteration() {
+    @Test
+    public void lastValueIsUnchangedAfterSuccessfulFirstIterationAndFailedSecondIteration() {
         final AtomicInteger counter = new AtomicInteger();
         taskFactory = param -> new AbstractTask() {
             @Override protected String call() throws Exception {
@@ -787,7 +872,8 @@ public class ScheduledServiceTest extends ServiceTestBase {
         assertNull(s.getValue());
     }
 
-    @Test public void lastValueIsClearedOnReset() {
+    @Test
+    public void lastValueIsClearedOnReset() {
         s.start();
         assertEquals("Sentinel", s.getLastValue());
         s.cancel();
@@ -796,7 +882,8 @@ public class ScheduledServiceTest extends ServiceTestBase {
         assertNull(s.getLastValue());
     }
 
-    @Test public void callingCancelFromOnSucceededEventHandlerShouldStopScheduledService() {
+    @Test
+    public void callingCancelFromOnSucceededEventHandlerShouldStopScheduledService() {
         AtomicBoolean onReadyCalled = new AtomicBoolean();
         AtomicBoolean onScheduledCalled = new AtomicBoolean();
         AtomicBoolean onCancelledCalled = new AtomicBoolean();
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/concurrent/ServiceExceptionTest.java b/modules/javafx.graphics/src/test/java/test/javafx/concurrent/ServiceExceptionTest.java
index fcc01983fae..b658a03bb89 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/concurrent/ServiceExceptionTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/concurrent/ServiceExceptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,45 +25,45 @@
 
 package test.javafx.concurrent;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import java.util.concurrent.atomic.AtomicBoolean;
 import javafx.concurrent.Worker;
 import test.javafx.concurrent.mocks.EpicFailTask;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * This tests that state is correct when a Task throws an exception partway through.
  * In this particular case, the progress is updated to 50% before the exception
  * occurs.
  */
-@RunWith(Parameterized.class)
 public class ServiceExceptionTest extends ServiceTestBase {
-    @Parameterized.Parameters public static Collection implementations() {
-        return Arrays.asList(new Object[][]{
-                { new Exception("Exception") },
-                { new IllegalArgumentException("IAE") },
-                { new NullPointerException("NPE") },
-                { new RuntimeException("RuntimeException") }
-        });
-    }
-
-    private Exception exception;
 
-    public ServiceExceptionTest(Exception th) {
-        this.exception = th;
+    public static Stream<Arguments> implementations() {
+        return Stream.of(
+            setupServiceFactory(new Exception("Exception")),
+            setupServiceFactory(new IllegalArgumentException("IAE")),
+            setupServiceFactory(new NullPointerException("NPE")),
+            setupServiceFactory(new RuntimeException("RuntimeException"))
+        );
     }
 
-    @Override protected TestServiceFactory setupServiceFactory() {
-        return new TestServiceFactory() {
-            @Override public AbstractTask createTestTask() {
-                return new EpicFailTask(ServiceExceptionTest.this.exception);
-            }
-        };
+    private static Arguments setupServiceFactory(Exception exception) {
+        return Arguments.of(
+            new TestServiceFactory() {
+                @Override public AbstractTask createTestTask() {
+                    return new EpicFailTask(exception);
+                }
+            },
+            exception
+        );
     }
 
     /************************************************************************
@@ -75,14 +75,20 @@ public ServiceExceptionTest(Exception th) {
     /**
      * Whenever the exception occurs we should have the exception property set
      */
-    @Test public void exceptionShouldBeSet() {
+    @ParameterizedTest
+    @MethodSource("implementations")
+    public void exceptionShouldBeSet(TestServiceFactory factory, Exception exception) {
+        setup(factory);
         service.start();
         handleEvents();
         assertSame(exception, service.getException());
         assertSame(exception, service.exceptionProperty().get());
     }
 
-    @Test public void exceptionPropertyNotification() {
+    @ParameterizedTest
+    @MethodSource("implementations")
+    public void exceptionPropertyNotification(TestServiceFactory factory, Exception exception) {
+        setup(factory);
         final AtomicBoolean passed = new AtomicBoolean(false);
         service.exceptionProperty().addListener((o, oldValue, newValue) -> passed.set(newValue == exception));
         service.start();
@@ -93,21 +99,30 @@ public ServiceExceptionTest(Exception th) {
     /**
      * The value should always be null if an exception occurs before the end of the Task.
      */
-    @Test public void valueShouldBeNull() {
+    @ParameterizedTest
+    @MethodSource("implementations")
+    public void valueShouldBeNull(TestServiceFactory factory, Exception exception) {
+        setup(factory);
         service.start();
         handleEvents();
         assertNull(service.getValue());
         assertNull(service.valueProperty().get());
     }
 
-    @Test public void runningShouldBeFalse() {
+    @ParameterizedTest
+    @MethodSource("implementations")
+    public void runningShouldBeFalse(TestServiceFactory factory, Exception exception) {
+        setup(factory);
         service.start();
         handleEvents();
         assertFalse(service.isRunning());
         assertFalse(service.runningProperty().get());
     }
 
-    @Test public void runningPropertyNotification() {
+    @ParameterizedTest
+    @MethodSource("implementations")
+    public void runningPropertyNotification(TestServiceFactory factory, Exception exception) {
+        setup(factory);
         final AtomicBoolean passed = new AtomicBoolean(false);
         service.runningProperty().addListener((o, oldValue, newValue) -> passed.set(!newValue));
         service.start();
@@ -115,14 +130,20 @@ public ServiceExceptionTest(Exception th) {
         assertTrue(passed.get());
     }
 
-    @Test public void workDoneShouldBeTen() {
+    @ParameterizedTest
+    @MethodSource("implementations")
+    public void workDoneShouldBeTen(TestServiceFactory factory, Exception exception) {
+        setup(factory);
         service.start();
         handleEvents();
         assertEquals(10, service.getWorkDone(), 0);
         assertEquals(10, service.workDoneProperty().get(), 0);
     }
 
-    @Test public void workDonePropertyNotification() {
+    @ParameterizedTest
+    @MethodSource("implementations")
+    public void workDonePropertyNotification(TestServiceFactory factory, Exception exception) {
+        setup(factory);
         final AtomicBoolean passed = new AtomicBoolean(false);
         service.workDoneProperty().addListener((observable, oldValue, newValue) -> passed.set(newValue.doubleValue() == 10));
         service.start();
@@ -130,14 +151,20 @@ public ServiceExceptionTest(Exception th) {
         assertTrue(passed.get());
     }
 
-    @Test public void totalWorkShouldBeTwenty() {
+    @ParameterizedTest
+    @MethodSource("implementations")
+    public void totalWorkShouldBeTwenty(TestServiceFactory factory, Exception exception) {
+        setup(factory);
         service.start();
         handleEvents();
         assertEquals(20, service.getTotalWork(), 0);
         assertEquals(20, service.totalWorkProperty().get(), 0);
     }
 
-    @Test public void totalWorkPropertyNotification() {
+    @ParameterizedTest
+    @MethodSource("implementations")
+    public void totalWorkPropertyNotification(TestServiceFactory factory, Exception exception) {
+        setup(factory);
         final AtomicBoolean passed = new AtomicBoolean(false);
         service.totalWorkProperty().addListener((observable, oldValue, newValue) -> passed.set(newValue.doubleValue() == 20));
         service.start();
@@ -145,14 +172,20 @@ public ServiceExceptionTest(Exception th) {
         assertTrue(passed.get());
     }
 
-    @Test public void afterRunningProgressShouldBe_FiftyPercent() {
+    @ParameterizedTest
+    @MethodSource("implementations")
+    public void afterRunningProgressShouldBe_FiftyPercent(TestServiceFactory factory, Exception exception) {
+        setup(factory);
         service.start();
         handleEvents();
         assertEquals(.5, service.getProgress(), 0);
         assertEquals(.5, service.progressProperty().get(), 0);
     }
 
-    @Test public void progressPropertyNotification() {
+    @ParameterizedTest
+    @MethodSource("implementations")
+    public void progressPropertyNotification(TestServiceFactory factory, Exception exception) {
+        setup(factory);
         final AtomicBoolean passed = new AtomicBoolean(false);
         service.progressProperty().addListener((observable, oldValue, newValue) -> passed.set(newValue.doubleValue() == .5));
         service.start();
@@ -160,14 +193,20 @@ public ServiceExceptionTest(Exception th) {
         assertTrue(passed.get());
     }
 
-    @Test public void stateShouldBe_FAILED() {
+    @ParameterizedTest
+    @MethodSource("implementations")
+    public void stateShouldBe_FAILED(TestServiceFactory factory, Exception exception) {
+        setup(factory);
         service.start();
         handleEvents();
         assertSame(Worker.State.FAILED, service.getState());
         assertSame(Worker.State.FAILED, service.stateProperty().get());
     }
 
-    @Test public void statePropertyNotification() {
+    @ParameterizedTest
+    @MethodSource("implementations")
+    public void statePropertyNotification(TestServiceFactory factory, Exception exception) {
+        setup(factory);
         final AtomicBoolean passed = new AtomicBoolean(false);
         service.stateProperty().addListener((observable, oldValue, newValue) -> passed.set(newValue == Worker.State.FAILED));
         service.start();
@@ -175,14 +214,20 @@ public ServiceExceptionTest(Exception th) {
         assertTrue(passed.get());
     }
 
-    @Test public void messageShouldBeLastSetValue() {
+    @ParameterizedTest
+    @MethodSource("implementations")
+    public void messageShouldBeLastSetValue(TestServiceFactory factory, Exception exception) {
+        setup(factory);
         service.start();
         handleEvents();
         assertEquals("About to fail", service.getMessage());
         assertEquals("About to fail", service.messageProperty().get());
     }
 
-    @Test public void messagePropertyNotification() {
+    @ParameterizedTest
+    @MethodSource("implementations")
+    public void messagePropertyNotification(TestServiceFactory factory, Exception exception) {
+        setup(factory);
         final AtomicBoolean passed = new AtomicBoolean(false);
         service.messageProperty().addListener((observable, oldValue, newValue) -> passed.set("About to fail".equals(service.getMessage())));
         service.start();
@@ -190,14 +235,20 @@ public ServiceExceptionTest(Exception th) {
         assertTrue(passed.get());
     }
 
-    @Test public void titleShouldBeLastSetValue() {
+    @ParameterizedTest
+    @MethodSource("implementations")
+    public void titleShouldBeLastSetValue(TestServiceFactory factory, Exception exception) {
+        setup(factory);
         service.start();
         handleEvents();
         assertEquals("Epic Fail", service.getTitle());
         assertEquals("Epic Fail", service.titleProperty().get());
     }
 
-    @Test public void titlePropertyNotification() {
+    @ParameterizedTest
+    @MethodSource("implementations")
+    public void titlePropertyNotification(TestServiceFactory factory, Exception exception) {
+        setup(factory);
         final AtomicBoolean passed = new AtomicBoolean(false);
         service.titleProperty().addListener((observable, oldValue, newValue) -> passed.set("Epic Fail".equals(service.getTitle())));
         service.start();
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/concurrent/ServiceLifecycleTest.java b/modules/javafx.graphics/src/test/java/test/javafx/concurrent/ServiceLifecycleTest.java
index 429af867cde..0aeff697608 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/concurrent/ServiceLifecycleTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/concurrent/ServiceLifecycleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,14 +40,17 @@
 import javafx.concurrent.TaskShim;
 import javafx.concurrent.Worker;
 import javafx.concurrent.WorkerStateEvent;
-import org.junit.After;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Tests various rules regarding the lifecycle of a Service.
@@ -66,7 +69,7 @@ public class ServiceLifecycleTest extends ServiceTestBase {
      */
     protected ManualTask task;
 
-    @Override protected TestServiceFactory setupServiceFactory() {
+    private TestServiceFactory setupServiceFactory() {
         return new TestServiceFactory() {
             @Override public AbstractTask createTestTask() {
                 return task = new ManualTask();
@@ -74,11 +77,18 @@ public class ServiceLifecycleTest extends ServiceTestBase {
         };
     }
 
-    @Override protected Executor createExecutor() {
+    @Override
+    protected Executor createExecutor() {
         return executor = new ManualExecutor(super.createExecutor());
     }
 
-    @After public void tearDown() {
+    @BeforeEach
+    public void setup() {
+        super.setup(setupServiceFactory());
+    }
+
+    @AfterEach
+    public void tearDown() {
         if (task != null) task.finish.set(true);
     }
 
@@ -156,37 +166,43 @@ public boolean cancel(boolean mayInterruptIfRunning) {
      * Tests while in the ready state                                       *
      ***********************************************************************/
 
-    @Test public void callingStartInReadyStateSchedulesJob() {
+    @Test
+    public void callingStartInReadyStateSchedulesJob() {
         assertNull(executor.scheduled);
         service.start();
         assertNotNull(executor.scheduled);
     }
 
-    @Test public void callingStartInReadyMovesToScheduledState() {
+    @Test
+    public void callingStartInReadyMovesToScheduledState() {
         service.start();
         assertSame(Worker.State.SCHEDULED, service.getState());
         assertSame(Worker.State.SCHEDULED, service.stateProperty().get());
     }
 
-    @Test public void callingRestartInReadyStateSchedulesJob() {
+    @Test
+    public void callingRestartInReadyStateSchedulesJob() {
         assertNull(executor.scheduled);
         service.restart();
         assertNotNull(executor.scheduled);
     }
 
-    @Test public void callingRestartInReadyMovesToScheduledState() {
+    @Test
+    public void callingRestartInReadyMovesToScheduledState() {
         service.restart();
         assertSame(Worker.State.SCHEDULED, service.getState());
         assertSame(Worker.State.SCHEDULED, service.stateProperty().get());
     }
 
-    @Test public void callingCancelInReadyStateMovesToCancelledState() {
+    @Test
+    public void callingCancelInReadyStateMovesToCancelledState() {
         service.cancel();
         assertSame(Worker.State.CANCELLED, service.getState());
         assertSame(Worker.State.CANCELLED, service.stateProperty().get());
     }
 
-    @Test public void callingResetInReadyStateHasNoEffect() {
+    @Test
+    public void callingResetInReadyStateHasNoEffect() {
         service.reset();
         assertSame(Worker.State.READY, service.getState());
         assertSame(Worker.State.READY, service.stateProperty().get());
@@ -196,20 +212,24 @@ public boolean cancel(boolean mayInterruptIfRunning) {
      * Tests while in the scheduled state                                   *
      ***********************************************************************/
 
-    @Test(expected = IllegalStateException.class)
+    @Test
     public void callingStartInScheduledStateIsISE() {
-        service.start();
-        service.start();
+        assertThrows(IllegalStateException.class, () -> {
+            service.start();
+            service.start();
+        });
     }
 
-    @Test public void callingCancelInScheduledStateResultsInCancelledState() {
+    @Test
+    public void callingCancelInScheduledStateResultsInCancelledState() {
         service.start();
         service.cancel();
         assertSame(Worker.State.CANCELLED, service.getState());
         assertSame(Worker.State.CANCELLED, service.stateProperty().get());
     }
 
-    @Test public void callingRestartInScheduledStateShouldCancelAndReschedule() {
+    @Test
+    public void callingRestartInScheduledStateShouldCancelAndReschedule() {
         service.start();
         service.restart();
         assertSame(Worker.State.SCHEDULED, service.getState());
@@ -224,7 +244,8 @@ public void callingStartInScheduledStateIsISE() {
      * state of the service is off. At least, that is what is happening with
      * RT-20880. The fix allows this test to pass.
      */
-    @Test public void callingRestartInScheduledStateShouldCancelAndReschedule_RT_20880() {
+    @Test
+    public void callingRestartInScheduledStateShouldCancelAndReschedule_RT_20880() {
         service.start();
         task.failToCancel = true;
         service.restart();
@@ -232,69 +253,81 @@ public void callingStartInScheduledStateIsISE() {
         assertSame(Worker.State.SCHEDULED, service.stateProperty().get());
     }
 
-    @Test(expected = IllegalStateException.class)
+    @Test
     public void callingResetInScheduledStateThrowsISE() {
-        service.start();
-        service.reset();
+        assertThrows(IllegalStateException.class, () -> {
+            service.start();
+            service.reset();
+        });
     }
 
-    @Test public void stateChangesToRunningWhenExecutorExecutes() {
+    @Test
+    public void stateChangesToRunningWhenExecutorExecutes() {
         service.start();
         executor.executeScheduled();
         assertSame(Worker.State.RUNNING, service.getState());
         assertSame(Worker.State.RUNNING, service.stateProperty().get());
     }
 
-    @Test public void exceptionShouldBeNullInScheduledState() {
+    @Test
+    public void exceptionShouldBeNullInScheduledState() {
         service.start();
         assertNull(service.getException());
         assertNull(service.exceptionProperty().get());
     }
 
-    @Test public void valueShouldBeNullInScheduledState() {
+    @Test
+    public void valueShouldBeNullInScheduledState() {
         service.start();
         assertNull(service.getValue());
         assertNull(service.valueProperty().get());
     }
 
-    @Test public void runningShouldBeTrueInScheduledState() {
+    @Test
+    public void runningShouldBeTrueInScheduledState() {
         service.start();
         assertTrue(service.isRunning());
         assertTrue(service.runningProperty().get());
     }
 
-    @Test public void runningPropertyNotificationInScheduledState() {
+    @Test
+    public void runningPropertyNotificationInScheduledState() {
         final AtomicBoolean passed = new AtomicBoolean(false);
         service.runningProperty().addListener((o, oldValue, newValue) -> passed.set(newValue));
         service.start();
         assertTrue(passed.get());
     }
 
-    @Test public void workDoneShouldBeNegativeOneInitiallyInScheduledState() {
+    @Test
+    public void workDoneShouldBeNegativeOneInitiallyInScheduledState() {
         service.start();
         assertEquals(-1, service.getWorkDone(), 0);
         assertEquals(-1, service.workDoneProperty().get(), 0);
     }
 
-    @Test public void totalWorkShouldBeNegativeOneAtStartOfScheduledState() {
+    @Test
+    public void totalWorkShouldBeNegativeOneAtStartOfScheduledState() {
         service.start();
         assertEquals(-1, service.getTotalWork(), 0);
         assertEquals(-1, service.totalWorkProperty().get(), 0);
     }
 
-    @Test public void progressShouldBeNegativeOneAtStartOfScheduledState() {
+    @Test
+    public void progressShouldBeNegativeOneAtStartOfScheduledState() {
         service.start();
         assertEquals(-1, service.getProgress(), 0);
         assertEquals(-1, task.progressProperty().get(), 0);
     }
 
-    @Test public void messageShouldBeEmptyStringWhenEnteringScheduledState() {
+    @Test
+    public void messageShouldBeEmptyStringWhenEnteringScheduledState() {
         service.start();
         assertEquals("", service.getMessage());
         assertEquals("", task.messageProperty().get());
     }
 
-    @Test public void titleShouldBeEmptyStringAtStartOfScheduledState() {
+    @Test
+    public void titleShouldBeEmptyStringAtStartOfScheduledState() {
         service.start();
         assertEquals("", service.getTitle());
         assertEquals("", task.titleProperty().get());
@@ -304,21 +337,26 @@ public void callingResetInScheduledStateThrowsISE() {
      * Tests while in the running state                                     *
      ***********************************************************************/
 
-    @Test(expected = IllegalStateException.class)
+    @Test
     public void callingStartInRunningStateIsISE() {
-        service.start();
-        executor.executeScheduled();
-        service.start();
+        assertThrows(IllegalStateException.class, () -> {
+            service.start();
+            executor.executeScheduled();
+            service.start();
+        });
     }
 
-    @Test(expected = IllegalStateException.class)
+    @Test
     public void callingResetInRunningStateIsISE() {
-        service.start();
-        executor.executeScheduled();
-        service.reset();
+        assertThrows(IllegalStateException.class, () -> {
+            service.start();
+            executor.executeScheduled();
+            service.reset();
+        });
     }
 
-    @Test public void callingRestartInRunningStateCancelsAndReschedules() {
+    @Test
+    public void callingRestartInRunningStateCancelsAndReschedules() {
         service.start();
         executor.executeScheduled();
         service.restart();
@@ -326,7 +364,8 @@ public void callingResetInRunningStateIsISE() {
         assertSame(Worker.State.SCHEDULED, service.stateProperty().get());
     }
 
-    @Test public void callingCancelInRunningStateResultsInCancelledState() {
+    @Test
+    public void callingCancelInRunningStateResultsInCancelledState() {
         service.start();
         executor.executeScheduled();
         service.cancel();
@@ -334,28 +373,32 @@ public void callingResetInRunningStateIsISE() {
         assertSame(Worker.State.CANCELLED, service.stateProperty().get());
     }
 
-    @Test public void exceptionShouldBeNullInRunningState() {
+    @Test
+    public void exceptionShouldBeNullInRunningState() {
         service.start();
         executor.executeScheduled();
         assertNull(service.getException());
         assertNull(service.exceptionProperty().get());
     }
 
-    @Test public void valueShouldBeNullInRunningState() {
+    @Test
+    public void valueShouldBeNullInRunningState() {
         service.start();
         executor.executeScheduled();
         assertNull(service.getValue());
         assertNull(service.valueProperty().get());
     }
 
-    @Test public void runningShouldBeTrueInRunningState() {
+    @Test
+    public void runningShouldBeTrueInRunningState() {
         service.start();
         executor.executeScheduled();
         assertTrue(service.isRunning());
         assertTrue(service.runningProperty().get());
     }
 
-    @Test public void runningPropertyNotificationInRunningState() {
+    @Test
+    public void runningPropertyNotificationInRunningState() {
         final AtomicBoolean passed = new AtomicBoolean(false);
         service.runningProperty().addListener((o, oldValue, newValue) -> passed.set(newValue));
         service.start();
@@ -363,14 +406,16 @@ public void callingResetInRunningStateIsISE() {
         assertTrue(passed.get());
     }
 
-    @Test public void workDoneShouldBeNegativeOneInitiallyInRunningState() {
+    @Test
+    public void workDoneShouldBeNegativeOneInitiallyInRunningState() {
         service.start();
         executor.executeScheduled();
         assertEquals(-1, service.getWorkDone(), 0);
         assertEquals(-1, service.workDoneProperty().get(), 0);
     }
 
-    @Test public void workDoneShouldAdvanceTo10() {
+    @Test
+    public void workDoneShouldAdvanceTo10() {
         service.start();
         executor.executeScheduled();
         task.progress(10, 20);
@@ -378,7 +423,8 @@ public void callingResetInRunningStateIsISE() {
         assertEquals(10, service.workDoneProperty().get(), 0);
     }
 
-    @Test public void workDonePropertyNotification() {
+    @Test
+    public void workDonePropertyNotification() {
         final AtomicBoolean passed = new AtomicBoolean(false);
         service.workDoneProperty().addListener((o, oldValue, newValue) -> passed.set(newValue.doubleValue() == 10));
         service.start();
@@ -387,14 +433,16 @@ public void callingResetInRunningStateIsISE() {
         assertTrue(passed.get());
     }
 
-    @Test public void totalWorkShouldBeNegativeOneAtStartOfRunning() {
+    @Test
+    public void totalWorkShouldBeNegativeOneAtStartOfRunning() {
         service.start();
         executor.executeScheduled();
         assertEquals(-1, service.getTotalWork(), 0);
         assertEquals(-1, service.totalWorkProperty().get(), 0);
     }
 
-    @Test public void totalWorkShouldBeTwenty() {
+    @Test
+    public void totalWorkShouldBeTwenty() {
         service.start();
         executor.executeScheduled();
         task.progress(10, 20);
@@ -402,7 +450,8 @@ public void callingResetInRunningStateIsISE() {
         assertEquals(20, service.totalWorkProperty().get(), 0);
     }
 
-    @Test public void totalWorkPropertyNotification() {
+    @Test
+    public void totalWorkPropertyNotification() {
         final AtomicBoolean passed = new AtomicBoolean(false);
         service.totalWorkProperty().addListener((o, oldValue, newValue) -> passed.set(newValue.doubleValue() == 20));
         service.start();
@@ -411,14 +460,16 @@ public void callingResetInRunningStateIsISE() {
         assertTrue(passed.get());
     }
 
-    @Test public void progressShouldBeNegativeOneAtStartOfRunningState() {
+    @Test
+    public void progressShouldBeNegativeOneAtStartOfRunningState() {
         service.start();
         executor.executeScheduled();
         assertEquals(-1, service.getProgress(), 0);
         assertEquals(-1, task.progressProperty().get(), 0);
     }
 
-    @Test public void afterRunningProgressShouldBe_FiftyPercent() {
+    @Test
+    public void afterRunningProgressShouldBe_FiftyPercent() {
         service.start();
         executor.executeScheduled();
         task.progress(10, 20);
@@ -426,7 +477,8 @@ public void callingResetInRunningStateIsISE() {
         assertEquals(.5, task.progressProperty().get(), 0);
     }
 
-    @Test public void progressPropertyNotification() {
+    @Test
+    public void progressPropertyNotification() {
         final AtomicBoolean passed = new AtomicBoolean(false);
         service.start();
         task.progressProperty().addListener((o, oldValue, newValue) -> passed.set(newValue.doubleValue() == .5));
@@ -435,14 +487,16 @@ public void callingResetInRunningStateIsISE() {
         assertTrue(passed.get());
     }
 
-    @Test public void messageShouldBeEmptyStringWhenEnteringRunningState() {
+    @Test
+    public void messageShouldBeEmptyStringWhenEnteringRunningState() {
         service.start();
         executor.executeScheduled();
         assertEquals("", service.getMessage());
         assertEquals("", task.messageProperty().get());
     }
 
-    @Test public void messageShouldBeLastSetValue() {
+    @Test
+    public void messageShouldBeLastSetValue() {
         service.start();
         executor.executeScheduled();
         task.message("Running");
@@ -450,7 +504,8 @@ public void callingResetInRunningStateIsISE() {
         assertEquals("Running", task.messageProperty().get());
     }
 
-    @Test public void messagePropertyNotification() {
+    @Test
+    public void messagePropertyNotification() {
         final AtomicBoolean passed = new AtomicBoolean(false);
         service.start();
         task.messageProperty().addListener((o, oldValue, newValue) -> passed.set("Running".equals(service.getMessage())));
@@ -459,14 +514,16 @@ public void callingResetInRunningStateIsISE() {
         assertTrue(passed.get());
     }
 
-    @Test public void titleShouldBeEmptyStringAtStartOfRunningState() {
+    @Test
+    public void titleShouldBeEmptyStringAtStartOfRunningState() {
         service.start();
         executor.executeScheduled();
         assertEquals("", service.getTitle());
         assertEquals("", task.titleProperty().get());
     }
 
-    @Test public void titleShouldBeLastSetValue() {
+    @Test
+    public void titleShouldBeLastSetValue() {
         service.start();
         executor.executeScheduled();
         task.title("Title");
@@ -474,7 +531,8 @@ public void callingResetInRunningStateIsISE() {
         assertEquals("Title", task.titleProperty().get());
     }
 
-    @Test public void titlePropertyNotification() {
+    @Test
+    public void titlePropertyNotification() {
         final AtomicBoolean passed = new AtomicBoolean(false);
         service.start();
         task.titleProperty().addListener((o, oldValue, newValue) -> passed.set("Title".equals(service.getTitle())));
@@ -487,15 +545,18 @@ public void callingResetInRunningStateIsISE() {
      * Throw an exception in the running state                              *
      ***********************************************************************/
 
-    @Test(expected = IllegalStateException.class)
+    @Test
     public void callingStartInFailedStateIsISE() {
-        service.start();
-        executor.executeScheduled();
-        task.fail(new Exception("anything"));
-        service.start();
+        assertThrows(IllegalStateException.class, () -> {
+            service.start();
+            executor.executeScheduled();
+            task.fail(new Exception("anything"));
+            service.start();
+        });
     }
 
-    @Test public void callingResetInFailedStateResetsStateToREADY() {
+    @Test
+    public void callingResetInFailedStateResetsStateToREADY() {
         service.start();
         executor.executeScheduled();
         task.fail(new Exception("anything"));
@@ -505,7 +566,8 @@ public void callingStartInFailedStateIsISE() {
         assertSame(Worker.State.READY, service.stateProperty().get());
     }
 
-    @Test public void callingResetInFailedStateResetsValueToNull() {
+    @Test
+    public void callingResetInFailedStateResetsValueToNull() {
         service.start();
         executor.executeScheduled();
         task.fail(new Exception("anything"));
@@ -515,7 +577,8 @@ public void callingStartInFailedStateIsISE() {
         assertNull(service.valueProperty().get());
     }
 
-    @Test public void callingResetInFailedStateResetsExceptionToNull() {
+    @Test
+    public void callingResetInFailedStateResetsExceptionToNull() {
         service.start();
         executor.executeScheduled();
         task.fail(new Exception("anything"));
@@ -525,7 +588,8 @@ public void callingStartInFailedStateIsISE() {
         assertNull(service.exceptionProperty().get());
     }
 
-    @Test public void callingResetInFailedStateResetsWorkDoneToNegativeOne() {
+    @Test
+    public void callingResetInFailedStateResetsWorkDoneToNegativeOne() {
         service.start();
         executor.executeScheduled();
         task.progress(10, 20);
@@ -536,7 +600,8 @@ public void callingStartInFailedStateIsISE() {
         assertEquals(-1, service.workDoneProperty().get(), 0);
     }
 
-    @Test public void callingResetInFailedStateResetsTotalWorkToNegativeOne() {
+    @Test
+    public void callingResetInFailedStateResetsTotalWorkToNegativeOne() {
         service.start();
         executor.executeScheduled();
         task.progress(10, 20);
@@ -547,7 +612,8 @@ public void callingStartInFailedStateIsISE() {
         assertEquals(-1, service.totalWorkProperty().get(), 0);
     }
 
-    @Test public void callingResetInFailedStateResetsProgressToNegativeOne() {
+    @Test
+    public void callingResetInFailedStateResetsProgressToNegativeOne() {
         service.start();
         executor.executeScheduled();
         task.progress(10, 20);
@@ -558,7 +624,8 @@ public void callingStartInFailedStateIsISE() {
         assertEquals(-1, service.progressProperty().get(), 0);
     }
 
-    @Test public void callingResetInFailedStateResetsRunningToFalse() {
+    @Test
+    public void callingResetInFailedStateResetsRunningToFalse() {
         service.start();
         executor.executeScheduled();
         task.fail(new Exception("anything"));
@@ -568,7 +635,8 @@ public void callingStartInFailedStateIsISE() {
         assertFalse(service.runningProperty().get());
     }
 
-    @Test public void callingResetInFailedStateResetsMessageToEmptyString() {
+    @Test
+    public void callingResetInFailedStateResetsMessageToEmptyString() {
         service.start();
         executor.executeScheduled();
         task.message("Message");
@@ -579,7 +647,8 @@ public void callingStartInFailedStateIsISE() {
         assertEquals("", service.messageProperty().get());
     }
 
-    @Test public void callingResetInFailedStateResetsTitleToEmptyString() {
+    @Test
+    public void callingResetInFailedStateResetsTitleToEmptyString() {
         service.start();
         executor.executeScheduled();
         task.title("Title");
@@ -590,7 +659,8 @@ public void callingStartInFailedStateIsISE() {
         assertEquals("", service.titleProperty().get());
     }
 
-    @Test public void callingRestartInFailedStateReschedules() {
+    @Test
+    public void callingRestartInFailedStateReschedules() {
         service.start();
         executor.executeScheduled();
         task.fail(new Exception("anything"));
@@ -599,7 +669,8 @@ public void callingStartInFailedStateIsISE() {
         assertSame(Worker.State.SCHEDULED, service.stateProperty().get());
     }
 
-    @Test public void callingCancelInFailedStateResultsInNoChange() {
+    @Test
+    public void callingCancelInFailedStateResultsInNoChange() {
         service.start();
         executor.executeScheduled();
         task.fail(new Exception("anything"));
@@ -612,16 +683,19 @@ public void callingStartInFailedStateIsISE() {
      * Proper Completion of a task                                          *
      ***********************************************************************/
 
-    @Test(expected = IllegalStateException.class)
+    @Test
     public void callingStartInSucceededStateIsISE() {
-        service.start();
-        executor.executeScheduled();
-        task.progress(20, 20);
-        task.complete();
-        service.start();
+        assertThrows(IllegalStateException.class, () -> {
+            service.start();
+            executor.executeScheduled();
+            task.progress(20, 20);
+            task.complete();
+            service.start();
+        });
     }
 
-    @Test public void callingResetInSucceededStateResetsStateToREADY() {
+    @Test
+    public void callingResetInSucceededStateResetsStateToREADY() {
         service.start();
         executor.executeScheduled();
         task.progress(20, 20);
@@ -632,7 +706,8 @@ public void callingStartInSucceededStateIsISE() {
         assertSame(Worker.State.READY, service.stateProperty().get());
     }
 
-    @Test public void callingResetInSucceededStateResetsValueToNull() {
+    @Test
+    public void callingResetInSucceededStateResetsValueToNull() {
         service.start();
         executor.executeScheduled();
         task.progress(20, 20);
@@ -643,7 +718,8 @@ public void callingStartInSucceededStateIsISE() {
         assertNull(service.valueProperty().get());
     }
 
-    @Test public void callingResetInSucceededStateResetsExceptionToNull() {
+    @Test
+    public void callingResetInSucceededStateResetsExceptionToNull() {
         service.start();
         executor.executeScheduled();
         task.progress(20, 20);
@@ -654,7 +730,8 @@ public void callingStartInSucceededStateIsISE() {
         assertNull(service.exceptionProperty().get());
     }
 
-    @Test public void callingResetInSucceededStateResetsWorkDoneToNegativeOne() {
+    @Test
+    public void callingResetInSucceededStateResetsWorkDoneToNegativeOne() {
         service.start();
         executor.executeScheduled();
         task.progress(20, 20);
@@ -665,7 +742,8 @@ public void callingStartInSucceededStateIsISE() {
         assertEquals(-1, service.workDoneProperty().get(), 0);
     }
 
-    @Test public void callingResetInSucceededStateResetsTotalWorkToNegativeOne() {
+    @Test
+    public void callingResetInSucceededStateResetsTotalWorkToNegativeOne() {
         service.start();
         executor.executeScheduled();
         task.progress(20, 20);
@@ -676,7 +754,8 @@ public void callingStartInSucceededStateIsISE() {
         assertEquals(-1, service.totalWorkProperty().get(), 0);
     }
 
-    @Test public void callingResetInSucceededStateResetsProgressToNegativeOne() {
+    @Test
+    public void callingResetInSucceededStateResetsProgressToNegativeOne() {
         service.start();
         executor.executeScheduled();
         task.progress(20, 20);
@@ -687,7 +766,8 @@ public void callingStartInSucceededStateIsISE() {
         assertEquals(-1, service.progressProperty().get(), 0);
     }
 
-    @Test public void callingResetInSucceededStateResetsRunningToFalse() {
+    @Test
+    public void callingResetInSucceededStateResetsRunningToFalse() {
         service.start();
         executor.executeScheduled();
         task.progress(20, 20);
@@ -698,7 +778,8 @@ public void callingStartInSucceededStateIsISE() {
         assertFalse(service.runningProperty().get());
     }
 
-    @Test public void callingResetInSucceededStateResetsMessageToEmptyString() {
+    @Test
+    public void callingResetInSucceededStateResetsMessageToEmptyString() {
         service.start();
         executor.executeScheduled();
         task.message("Message");
@@ -710,7 +791,8 @@ public void callingStartInSucceededStateIsISE() {
         assertEquals("", service.messageProperty().get());
     }
 
-    @Test public void callingResetInSucceededStateResetsTitleToEmptyString() {
+    @Test
+    public void callingResetInSucceededStateResetsTitleToEmptyString() {
         service.start();
         executor.executeScheduled();
         task.title("Title");
@@ -722,7 +804,8 @@ public void callingStartInSucceededStateIsISE() {
         assertEquals("", service.titleProperty().get());
     }
 
-    @Test public void callingRestartInSucceededStateReschedules() {
+    @Test
+    public void callingRestartInSucceededStateReschedules() {
         service.start();
         executor.executeScheduled();
         task.progress(20, 20);
@@ -732,7 +815,8 @@ public void callingStartInSucceededStateIsISE() {
         assertSame(Worker.State.SCHEDULED, service.stateProperty().get());
     }
 
-    @Test public void callingCancelInSucceededStateResultsInNoChange() {
+    @Test
+    public void callingCancelInSucceededStateResultsInNoChange() {
         service.start();
         executor.executeScheduled();
         task.progress(20, 20);
@@ -748,20 +832,24 @@ public void callingStartInSucceededStateIsISE() {
      *                                                                         *
      **************************************************************************/
 
-    @Test public void onReadyPropertyNameShouldMatchMethodName() {
+    @Test
+    public void onReadyPropertyNameShouldMatchMethodName() {
         assertEquals("onReady", service.onReadyProperty().getName());
     }
 
-    @Test public void onReadyBeanShouldMatchService() {
+    @Test
+    public void onReadyBeanShouldMatchService() {
         assertSame(service, service.onReadyProperty().getBean());
     }
 
-    @Test public void onReadyIsInitializedToNull() {
+    @Test
+    public void onReadyIsInitializedToNull() {
         assertNull(service.getOnReady());
         assertNull(service.onReadyProperty().get());
     }
 
-    @Test public void onReadyFilterCalledBefore_onReady() {
+    @Test
+    public void onReadyFilterCalledBefore_onReady() {
         final AtomicBoolean filterCalled = new AtomicBoolean(false);
         final AtomicBoolean filterCalledFirst = new AtomicBoolean(false);
         service.start();
@@ -776,7 +864,8 @@ public void callingStartInSucceededStateIsISE() {
         assertTrue(filterCalledFirst.get());
     }
 
-    @Test public void onReadyHandlerCalled() {
+    @Test
+    public void onReadyHandlerCalled() {
         final AtomicBoolean handlerCalled = new AtomicBoolean(false);
         service.start();
         executor.executeScheduled();
@@ -789,7 +878,8 @@ public void callingStartInSucceededStateIsISE() {
         assertTrue(handlerCalled.get());
     }
 
-    @Test public void removed_onReadyHandlerNotCalled() {
+    @Test
+    public void removed_onReadyHandlerNotCalled() {
         final AtomicBoolean handlerCalled = new AtomicBoolean(false);
         final AtomicBoolean sanity = new AtomicBoolean(false);
         service.start();
@@ -805,7 +895,8 @@ public void callingStartInSucceededStateIsISE() {
         assertFalse(handlerCalled.get());
     }
 
-    @Test public void removed_onReadyFilterNotCalled() {
+    @Test
+    public void removed_onReadyFilterNotCalled() {
         final AtomicBoolean filterCalled = new AtomicBoolean(false);
         final AtomicBoolean sanity = new AtomicBoolean(false);
         service.start();
@@ -821,7 +912,8 @@ public void callingStartInSucceededStateIsISE() {
         assertFalse(filterCalled.get());
     }
 
-    @Test public void cancelCalledFromOnReady() {
+    @Test
+    public void cancelCalledFromOnReady() {
         final AtomicInteger cancelNotificationCount = new AtomicInteger();
         service.start();
         executor.executeScheduled();
@@ -844,20 +936,24 @@ public void callingStartInSucceededStateIsISE() {
      *                                                                         *
      **************************************************************************/
 
-    @Test public void onScheduledPropertyNameShouldMatchMethodName() {
+    @Test
+    public void onScheduledPropertyNameShouldMatchMethodName() {
         assertEquals("onScheduled", service.onScheduledProperty().getName());
     }
 
-    @Test public void onScheduledBeanShouldMatchService() {
+    @Test
+    public void onScheduledBeanShouldMatchService() {
         assertSame(service, service.onScheduledProperty().getBean());
     }
 
-    @Test public void onScheduledIsInitializedToNull() {
+    @Test
+    public void onScheduledIsInitializedToNull() {
         assertNull(service.getOnScheduled());
         assertNull(service.onScheduledProperty().get());
     }
 
-    @Test public void onScheduledFilterCalledBefore_onScheduled() {
+    @Test
+    public void onScheduledFilterCalledBefore_onScheduled() {
         final AtomicBoolean filterCalled = new AtomicBoolean(false);
         final AtomicBoolean filterCalledFirst = new AtomicBoolean(false);
         service.addEventFilter(WorkerStateEvent.WORKER_STATE_SCHEDULED, workerStateEvent -> filterCalled.set(true));
@@ -870,7 +966,8 @@ public void callingStartInSucceededStateIsISE() {
         assertTrue(filterCalledFirst.get());
     }
 
-    @Test public void scheduledCalledAfterHandler() {
+    @Test
+    public void scheduledCalledAfterHandler() {
         final AtomicBoolean handlerCalled = new AtomicBoolean(false);
         service.setOnScheduled(workerStateEvent -> handlerCalled.set(true));
 
@@ -881,7 +978,8 @@ public void callingStartInSucceededStateIsISE() {
         assertTrue(handlerCalled.get() && factory.getCurrentTask().scheduledSemaphore.getQueueLength() == 0);
     }
 
-    @Test public void scheduledCalledAfterHandlerEvenIfConsumed() {
+    @Test
+    public void scheduledCalledAfterHandlerEvenIfConsumed() {
         final AtomicBoolean handlerCalled = new AtomicBoolean(false);
         service.setOnScheduled(workerStateEvent -> {
             handlerCalled.set(true);
@@ -895,7 +993,8 @@ public void callingStartInSucceededStateIsISE() {
         assertTrue(handlerCalled.get() && factory.getCurrentTask().scheduledSemaphore.getQueueLength() == 0);
     }
 
-    @Test public void onScheduledHandlerCalled() {
+    @Test
+    public void onScheduledHandlerCalled() {
         final AtomicBoolean handlerCalled = new AtomicBoolean(false);
         service.addEventHandler(WorkerStateEvent.WORKER_STATE_SCHEDULED, workerStateEvent -> handlerCalled.set(true));
 
@@ -905,7 +1004,8 @@ public void callingStartInSucceededStateIsISE() {
         assertTrue(handlerCalled.get());
     }
 
-    @Test public void removed_onScheduledHandlerNotCalled() {
+    @Test
+    public void removed_onScheduledHandlerNotCalled() {
         final AtomicBoolean handlerCalled = new AtomicBoolean(false);
         final AtomicBoolean sanity = new AtomicBoolean(false);
         EventHandler<WorkerStateEvent> handler = workerStateEvent -> handlerCalled.set(true);
@@ -919,7 +1019,8 @@ public void callingStartInSucceededStateIsISE() {
         assertFalse(handlerCalled.get());
     }
 
-    @Test public void removed_onScheduledFilterNotCalled() {
+    @Test
+    public void removed_onScheduledFilterNotCalled() {
         final AtomicBoolean filterCalled = new AtomicBoolean(false);
         final AtomicBoolean sanity = new AtomicBoolean(false);
         EventHandler<WorkerStateEvent> filter = workerStateEvent -> filterCalled.set(true);
@@ -933,7 +1034,8 @@ public void callingStartInSucceededStateIsISE() {
         assertFalse(filterCalled.get());
     }
 
-    @Test public void cancelCalledFromOnScheduled() {
+    @Test
+    public void cancelCalledFromOnScheduled() {
         final AtomicInteger cancelNotificationCount = new AtomicInteger();
         service.addEventFilter(WorkerStateEvent.WORKER_STATE_SCHEDULED, workerStateEvent -> {
             service.cancel();
@@ -954,20 +1056,24 @@ public void callingStartInSucceededStateIsISE() {
      *                                                                         *
      **************************************************************************/
 
-    @Test public void onRunningPropertyNameShouldMatchMethodName() {
+    @Test
+    public void onRunningPropertyNameShouldMatchMethodName() {
         assertEquals("onRunning", service.onRunningProperty().getName());
     }
 
-    @Test public void onRunningBeanShouldMatchService() {
+    @Test
+    public void onRunningBeanShouldMatchService() {
         assertSame(service, service.onRunningProperty().getBean());
     }
 
-    @Test public void onRunningIsInitializedToNull() {
+    @Test
+    public void onRunningIsInitializedToNull() {
         assertNull(service.getOnRunning());
         assertNull(service.onRunningProperty().get());
     }
 
-    @Test public void onRunningFilterCalledBefore_onRunning() {
+    @Test
+    public void onRunningFilterCalledBefore_onRunning() {
         final AtomicBoolean filterCalled = new AtomicBoolean(false);
         final AtomicBoolean filterCalledFirst = new AtomicBoolean(false);
         service.addEventFilter(WorkerStateEvent.WORKER_STATE_RUNNING, workerStateEvent -> filterCalled.set(true));
@@ -980,7 +1086,8 @@ public void callingStartInSucceededStateIsISE() {
         assertTrue(filterCalledFirst.get());
     }
 
-    @Test public void runningCalledAfterHandler() {
+    @Test
+    public void runningCalledAfterHandler() {
         final AtomicBoolean handlerCalled = new AtomicBoolean(false);
         service.setOnRunning(workerStateEvent -> handlerCalled.set(true));
 
@@ -991,7 +1098,8 @@ public void callingStartInSucceededStateIsISE() {
         assertTrue(handlerCalled.get() && factory.getCurrentTask().runningSemaphore.getQueueLength() == 0);
     }
 
-    @Test public void runningCalledAfterHandlerEvenIfConsumed() {
+    @Test
+    public void runningCalledAfterHandlerEvenIfConsumed() {
         final AtomicBoolean handlerCalled = new AtomicBoolean(false);
         service.setOnRunning(workerStateEvent -> {
             handlerCalled.set(true);
@@ -1005,7 +1113,8 @@ public void callingStartInSucceededStateIsISE() {
         assertTrue(handlerCalled.get() && factory.getCurrentTask().runningSemaphore.getQueueLength() == 0);
     }
 
-    @Test public void onRunningHandlerCalled() {
+    @Test
+    public void onRunningHandlerCalled() {
         final AtomicBoolean handlerCalled = new AtomicBoolean(false);
         service.addEventHandler(WorkerStateEvent.WORKER_STATE_RUNNING, workerStateEvent -> handlerCalled.set(true));
 
@@ -1015,7 +1124,8 @@ public void callingStartInSucceededStateIsISE() {
         assertTrue(handlerCalled.get());
     }
 
-    @Test public void removed_onRunningHandlerNotCalled() {
+    @Test
+    public void removed_onRunningHandlerNotCalled() {
         final AtomicBoolean handlerCalled = new AtomicBoolean(false);
         final AtomicBoolean sanity = new AtomicBoolean(false);
         EventHandler<WorkerStateEvent> handler = workerStateEvent -> handlerCalled.set(true);
@@ -1029,7 +1139,8 @@ public void callingStartInSucceededStateIsISE() {
         assertFalse(handlerCalled.get());
     }
 
-    @Test public void removed_onRunningFilterNotCalled() {
+    @Test
+    public void removed_onRunningFilterNotCalled() {
         final AtomicBoolean filterCalled = new AtomicBoolean(false);
         final AtomicBoolean sanity = new AtomicBoolean(false);
         EventHandler<WorkerStateEvent> filter = workerStateEvent -> filterCalled.set(true);
@@ -1043,7 +1154,8 @@ public void callingStartInSucceededStateIsISE() {
         assertFalse(filterCalled.get());
     }
 
-    @Test public void cancelCalledFromOnRunning() {
+    @Test
+    public void cancelCalledFromOnRunning() {
         final AtomicInteger cancelNotificationCount = new AtomicInteger();
         service.addEventFilter(WorkerStateEvent.WORKER_STATE_RUNNING, workerStateEvent -> {
             service.cancel();
@@ -1064,20 +1176,24 @@ public void callingStartInSucceededStateIsISE() {
      *                                                                         *
      **************************************************************************/
 
-    @Test public void onSucceededPropertyNameShouldMatchMethodName() {
+    @Test
+    public void onSucceededPropertyNameShouldMatchMethodName() {
         assertEquals("onSucceeded", service.onSucceededProperty().getName());
     }
 
-    @Test public void onSucceededBeanShouldMatchService() {
+    @Test
+    public void onSucceededBeanShouldMatchService() {
         assertSame(service, service.onSucceededProperty().getBean());
     }
 
-    @Test public void onSucceededIsInitializedToNull() {
+    @Test
+    public void onSucceededIsInitializedToNull() {
         assertNull(service.getOnSucceeded());
         assertNull(service.onSucceededProperty().get());
     }
 
-    @Test public void onSucceededFilterCalledBefore_onSucceeded() {
+    @Test
+    public void onSucceededFilterCalledBefore_onSucceeded() {
         final AtomicBoolean filterCalled = new AtomicBoolean(false);
         final AtomicBoolean filterCalledFirst = new AtomicBoolean(false);
         service.addEventFilter(WorkerStateEvent.WORKER_STATE_SUCCEEDED, workerStateEvent -> filterCalled.set(true));
@@ -1091,7 +1207,8 @@ public void callingStartInSucceededStateIsISE() {
         assertTrue(filterCalledFirst.get());
     }
 
-    @Test public void succeededCalledAfterHandler() {
+    @Test
+    public void succeededCalledAfterHandler() {
         final AtomicBoolean handlerCalled = new AtomicBoolean(false);
         service.setOnSucceeded(workerStateEvent -> handlerCalled.set(true));
 
@@ -1103,7 +1220,8 @@ public void callingStartInSucceededStateIsISE() {
         assertTrue(handlerCalled.get() && factory.getCurrentTask().succeededSemaphore.getQueueLength() == 0);
     }
 
-    @Test public void succeededCalledAfterHandlerEvenIfConsumed() {
+    @Test
+    public void succeededCalledAfterHandlerEvenIfConsumed() {
         final AtomicBoolean handlerCalled = new AtomicBoolean(false);
         service.setOnSucceeded(workerStateEvent -> {
             handlerCalled.set(true);
@@ -1118,7 +1236,8 @@ public void callingStartInSucceededStateIsISE() {
         assertTrue(handlerCalled.get() && factory.getCurrentTask().succeededSemaphore.getQueueLength() == 0);
     }
 
-    @Test public void onSucceededHandlerCalled() {
+    @Test
+    public void onSucceededHandlerCalled() {
         final AtomicBoolean handlerCalled = new AtomicBoolean(false);
         service.addEventHandler(WorkerStateEvent.WORKER_STATE_SUCCEEDED, workerStateEvent -> handlerCalled.set(true));
 
@@ -1129,7 +1248,8 @@ public void callingStartInSucceededStateIsISE() {
         assertTrue(handlerCalled.get());
     }
 
-    @Test public void removed_onSucceededHandlerNotCalled() {
+    @Test
+    public void removed_onSucceededHandlerNotCalled() {
         final AtomicBoolean handlerCalled = new AtomicBoolean(false);
         final AtomicBoolean sanity = new AtomicBoolean(false);
         EventHandler<WorkerStateEvent> handler = workerStateEvent -> handlerCalled.set(true);
@@ -1144,7 +1264,8 @@ public void callingStartInSucceededStateIsISE() {
         assertFalse(handlerCalled.get());
     }
 
-    @Test public void removed_onSucceededFilterNotCalled() {
+    @Test
+    public void removed_onSucceededFilterNotCalled() {
         final AtomicBoolean filterCalled = new AtomicBoolean(false);
         final AtomicBoolean sanity = new AtomicBoolean(false);
         EventHandler<WorkerStateEvent> filter = workerStateEvent -> filterCalled.set(true);
@@ -1157,7 +1278,8 @@ public void callingStartInSucceededStateIsISE() {
         task.complete();
     }
 
-    @Test public void cancelCalledFromOnSucceeded() {
+    @Test
+    public void cancelCalledFromOnSucceeded() {
         final AtomicInteger cancelNotificationCount = new AtomicInteger();
         service.addEventFilter(WorkerStateEvent.WORKER_STATE_SUCCEEDED, workerStateEvent -> {
             service.cancel();
@@ -1179,20 +1301,24 @@ public void callingStartInSucceededStateIsISE() {
      *                                                                         *
      **************************************************************************/
 
-    @Test public void onCancelledPropertyNameShouldMatchMethodName() {
+    @Test
+    public void onCancelledPropertyNameShouldMatchMethodName() {
         assertEquals("onCancelled", service.onCancelledProperty().getName());
     }
 
-    @Test public void onCancelledBeanShouldMatchService() {
+    @Test
+    public void onCancelledBeanShouldMatchService() {
         assertSame(service, service.onCancelledProperty().getBean());
     }
 
-    @Test public void onCancelledIsInitializedToNull() {
+    @Test
+    public void onCancelledIsInitializedToNull() {
         assertNull(service.getOnCancelled());
         assertNull(service.onCancelledProperty().get());
     }
 
-    @Test public void onCancelledFilterCalledBefore_onCancelled() {
+    @Test
+    public void onCancelledFilterCalledBefore_onCancelled() {
         final AtomicBoolean filterCalled = new AtomicBoolean(false);
         final AtomicBoolean filterCalledFirst = new AtomicBoolean(false);
         service.addEventFilter(WorkerStateEvent.WORKER_STATE_CANCELLED, workerStateEvent -> filterCalled.set(true));
@@ -1206,7 +1332,8 @@ public void callingStartInSucceededStateIsISE() {
         assertTrue(filterCalledFirst.get());
     }
 
-    @Test public void cancelledCalledAfterHandler() {
+    @Test
+    public void cancelledCalledAfterHandler() {
         final AtomicBoolean handlerCalled = new AtomicBoolean(false);
         service.setOnCancelled(workerStateEvent -> handlerCalled.set(true));
 
@@ -1218,7 +1345,8 @@ public void callingStartInSucceededStateIsISE() {
         assertTrue(handlerCalled.get() && factory.getCurrentTask().cancelledSemaphore.getQueueLength() == 0);
     }
 
-    @Test public void cancelledCalledAfterHandlerEvenIfConsumed() {
+    @Test
+    public void cancelledCalledAfterHandlerEvenIfConsumed() {
         final AtomicBoolean handlerCalled = new AtomicBoolean(false);
         service.setOnCancelled(workerStateEvent -> {
             handlerCalled.set(true);
@@ -1233,7 +1361,8 @@ public void callingStartInSucceededStateIsISE() {
         assertTrue(handlerCalled.get() && factory.getCurrentTask().cancelledSemaphore.getQueueLength() == 0);
     }
 
-    @Test public void onCancelledHandlerCalled() {
+    @Test
+    public void onCancelledHandlerCalled() {
         final AtomicBoolean handlerCalled = new AtomicBoolean(false);
         service.addEventHandler(WorkerStateEvent.WORKER_STATE_CANCELLED, workerStateEvent -> handlerCalled.set(true));
 
@@ -1244,7 +1373,8 @@ public void callingStartInSucceededStateIsISE() {
         assertTrue(handlerCalled.get());
     }
 
-    @Test public void removed_onCancelledHandlerNotCalled() {
+    @Test
+    public void removed_onCancelledHandlerNotCalled() {
         final AtomicBoolean handlerCalled = new AtomicBoolean(false);
         final AtomicBoolean sanity = new AtomicBoolean(false);
         EventHandler<WorkerStateEvent> handler = workerStateEvent -> handlerCalled.set(true);
@@ -1259,7 +1389,8 @@ public void callingStartInSucceededStateIsISE() {
         assertFalse(handlerCalled.get());
     }
 
-    @Test public void removed_onCancelledFilterNotCalled() {
+    @Test
+    public void removed_onCancelledFilterNotCalled() {
         final AtomicBoolean filterCalled = new AtomicBoolean(false);
         final AtomicBoolean sanity = new AtomicBoolean(false);
         EventHandler<WorkerStateEvent> filter = workerStateEvent -> filterCalled.set(true);
@@ -1274,7 +1405,8 @@ public void callingStartInSucceededStateIsISE() {
         assertFalse(filterCalled.get());
     }
 
-    @Test public void cancelCalledFromOnCancelled() {
+    @Test
+    public void cancelCalledFromOnCancelled() {
         final AtomicInteger cancelNotificationCount = new AtomicInteger();
         service.addEventFilter(WorkerStateEvent.WORKER_STATE_CANCELLED, workerStateEvent -> {
             service.cancel();
@@ -1290,7 +1422,8 @@ public void callingStartInSucceededStateIsISE() {
         assertEquals(1, cancelNotificationCount.get());
     }
 
-    @Test public void cancelCalledFromOnFailed() {
+    @Test
+    public void cancelCalledFromOnFailed() {
         final AtomicInteger cancelNotificationCount = new AtomicInteger();
         service.addEventFilter(WorkerStateEvent.WORKER_STATE_FAILED, workerStateEvent -> {
             service.cancel();
@@ -1312,20 +1445,24 @@ public void callingStartInSucceededStateIsISE() {
      *                                                                         *
      **************************************************************************/
 
-    @Test public void onFailedPropertyNameShouldMatchMethodName() {
+    @Test
+    public void onFailedPropertyNameShouldMatchMethodName() {
         assertEquals("onFailed", service.onFailedProperty().getName());
     }
 
-    @Test public void onFailedBeanShouldMatchService() {
+    @Test
+    public void onFailedBeanShouldMatchService() {
         assertSame(service, service.onFailedProperty().getBean());
     }
 
-    @Test public void onFailedIsInitializedToNull() {
+    @Test
+    public void onFailedIsInitializedToNull() {
         assertNull(service.getOnFailed());
         assertNull(service.onFailedProperty().get());
     }
 
-    @Test public void onFailedFilterCalledBefore_onFailed() {
+    @Test
+    public void onFailedFilterCalledBefore_onFailed() {
         final AtomicBoolean filterCalled = new AtomicBoolean(false);
         final AtomicBoolean filterCalledFirst = new AtomicBoolean(false);
         service.addEventFilter(WorkerStateEvent.WORKER_STATE_FAILED, workerStateEvent -> filterCalled.set(true));
@@ -1339,7 +1476,8 @@ public void callingStartInSucceededStateIsISE() {
         assertTrue(filterCalledFirst.get());
     }
 
-    @Test public void failedCalledAfterHandler() {
+    @Test
+    public void failedCalledAfterHandler() {
         final AtomicBoolean handlerCalled = new AtomicBoolean(false);
         service.setOnFailed(workerStateEvent -> handlerCalled.set(true));
 
@@ -1351,7 +1489,8 @@ public void callingStartInSucceededStateIsISE() {
         assertTrue(handlerCalled.get() && factory.getCurrentTask().failedSemaphore.getQueueLength() == 0);
     }
 
-    @Test public void failedCalledAfterHandlerEvenIfConsumed() {
+    @Test
+    public void failedCalledAfterHandlerEvenIfConsumed() {
         final AtomicBoolean handlerCalled = new AtomicBoolean(false);
         service.setOnFailed(workerStateEvent -> handlerCalled.set(true));
 
@@ -1363,7 +1502,8 @@ public void callingStartInSucceededStateIsISE() {
         assertTrue(handlerCalled.get() && factory.getCurrentTask().failedSemaphore.getQueueLength() == 0);
     }
 
-    @Test public void onFailedHandlerCalled() {
+    @Test
+    public void onFailedHandlerCalled() {
         final AtomicBoolean handlerCalled = new AtomicBoolean(false);
         service.addEventHandler(WorkerStateEvent.WORKER_STATE_FAILED, workerStateEvent -> handlerCalled.set(true));
 
@@ -1374,7 +1514,8 @@ public void callingStartInSucceededStateIsISE() {
         assertTrue(handlerCalled.get());
     }
 
-    @Test public void removed_onFailedHandlerNotCalled() {
+    @Test
+    public void removed_onFailedHandlerNotCalled() {
         final AtomicBoolean handlerCalled = new AtomicBoolean(false);
         final AtomicBoolean sanity = new AtomicBoolean(false);
         EventHandler<WorkerStateEvent> handler = workerStateEvent -> handlerCalled.set(true);
@@ -1389,7 +1530,8 @@ public void callingStartInSucceededStateIsISE() {
         assertFalse(handlerCalled.get());
     }
 
-    @Test public void removed_onFailedFilterNotCalled() {
+    @Test
+    public void removed_onFailedFilterNotCalled() {
         final AtomicBoolean filterCalled = new AtomicBoolean(false);
         final AtomicBoolean sanity = new AtomicBoolean(false);
         EventHandler<WorkerStateEvent> filter = workerStateEvent -> filterCalled.set(true);
@@ -1412,7 +1554,8 @@ public void callingStartInSucceededStateIsISE() {
      *                                                                         *
      **************************************************************************/
 
-    @Test public void canCreateServiceOnRandomThread() {
+    @Test
+    public void canCreateServiceOnRandomThread() {
         RandomThread random = new RandomThread(() -> {
             DoNothingService s = null;
             try {
@@ -1424,7 +1567,8 @@ public void callingStartInSucceededStateIsISE() {
         random.test();
     }
 
-    @Test public void canGetReferencesToPropertiesOnRandomThread() {
+    @Test
+    public void canGetReferencesToPropertiesOnRandomThread() {
         RandomThread random = new RandomThread(() -> {
             DoNothingService s = null;
             try {
@@ -1452,7 +1596,8 @@ public void callingStartInSucceededStateIsISE() {
         random.test();
     }
 
-    @Test public void canInvokeGettersOnRandomThread() {
+    @Test
+    public void canInvokeGettersOnRandomThread() {
         RandomThread random = new RandomThread(() -> {
             DoNothingService s = null;
             try {
@@ -1480,7 +1625,8 @@ public void callingStartInSucceededStateIsISE() {
         random.test();
     }
 
-    @Test public void canInvokeSettersOnRandomThread() {
+    @Test
+    public void canInvokeSettersOnRandomThread() {
         RandomThread random = new RandomThread(() -> {
             DoNothingService s = null;
             try {
@@ -1506,7 +1652,8 @@ public void callingStartInSucceededStateIsISE() {
         random.test();
     }
 
-    @Test public void canInvokeStartOnRandomThread() {
+    @Test
+    public void canInvokeStartOnRandomThread() {
         RandomThread random = new RandomThread(() -> {
             DoNothingService s = null;
             try {
@@ -1519,298 +1666,297 @@ public void callingStartInSucceededStateIsISE() {
         random.test();
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokeRestartOnRandomThreadAfterStart() throws Throwable {
-        assertThrowsException(s -> s.restart());
+        assertThrowsException(IllegalStateException.class, s -> s.restart());
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokeCancelOnRandomThreadAfterStart() throws Throwable {
-        assertThrowsException(s -> {
+        assertThrowsException(IllegalStateException.class, s -> {
             s.cancel();
         });
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokeSettersOnRandomThreadAfterStart_1() throws Throwable {
-        assertThrowsException(s ->
-                ServiceShim.setEventHandler(s, WorkerStateEvent.ANY, event -> {
-        }));
+        assertThrowsException(IllegalStateException.class, s ->
+                ServiceShim.setEventHandler(s, WorkerStateEvent.ANY, event -> { }));
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokeSettersOnRandomThreadAfterStart_2() throws Throwable {
-        assertThrowsException(s -> s.setOnCancelled(event -> {
-        }));
+        assertThrowsException(IllegalStateException.class, s -> s.setOnCancelled(event -> { }));
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokeSettersOnRandomThreadAfterStart_3() throws Throwable {
-        assertThrowsException(s -> s.setOnFailed(event -> { }));
+        assertThrowsException(IllegalStateException.class, s -> s.setOnFailed(event -> { }));
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokeSettersOnRandomThreadAfterStart_4() throws Throwable {
-        assertThrowsException(s -> s.setOnReady(event -> { }));
+        assertThrowsException(IllegalStateException.class, s -> s.setOnReady(event -> { }));
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokeSettersOnRandomThreadAfterStart_5() throws Throwable {
-        assertThrowsException(s -> s.setOnRunning(event -> { }));
+        assertThrowsException(IllegalStateException.class, s -> s.setOnRunning(event -> { }));
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokeSettersOnRandomThreadAfterStart_6() throws Throwable {
-        assertThrowsException(s -> s.setOnScheduled(event -> {
-        }));
+        assertThrowsException(IllegalStateException.class, s -> s.setOnScheduled(event -> { }));
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokeSettersOnRandomThreadAfterStart_7() throws Throwable {
-        assertThrowsException(s -> s.setOnSucceeded(event -> { }));
+        assertThrowsException(IllegalStateException.class, s -> s.setOnSucceeded(event -> { }));
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokeGettersOnRandomThreadAfterStart_1() throws Throwable {
-        assertThrowsException(s -> {
+        assertThrowsException(IllegalStateException.class, s -> {
             s.getException();
         });
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokeGettersOnRandomThreadAfterStart_2() throws Throwable {
-        assertThrowsException(s -> {
+        assertThrowsException(IllegalStateException.class, s -> {
             s.getExecutor();
         });
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokeGettersOnRandomThreadAfterStart_3() throws Throwable {
-        assertThrowsException(s -> {
+        assertThrowsException(IllegalStateException.class, s -> {
             s.getMessage();
         });
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokeGettersOnRandomThreadAfterStart_4() throws Throwable {
-        assertThrowsException(s -> {
+        assertThrowsException(IllegalStateException.class, s -> {
             s.getProgress();
         });
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokeGettersOnRandomThreadAfterStart_5() throws Throwable {
-        assertThrowsException(s -> {
+        assertThrowsException(IllegalStateException.class, s -> {
             s.getOnCancelled();
         });
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokeGettersOnRandomThreadAfterStart_6() throws Throwable {
-        assertThrowsException(s -> {
+        assertThrowsException(IllegalStateException.class, s -> {
             s.getOnFailed();
         });
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokeGettersOnRandomThreadAfterStart_7() throws Throwable {
-        assertThrowsException(s -> {
+        assertThrowsException(IllegalStateException.class, s -> {
             s.getOnReady();
         });
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokeGettersOnRandomThreadAfterStart_8() throws Throwable {
-        assertThrowsException(s -> {
+        assertThrowsException(IllegalStateException.class, s -> {
             s.getOnRunning();
         });
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokeGettersOnRandomThreadAfterStart_9() throws Throwable {
-        assertThrowsException(s -> {
+        assertThrowsException(IllegalStateException.class, s -> {
             s.getOnScheduled();
         });
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokeGettersOnRandomThreadAfterStart_10() throws Throwable {
-        assertThrowsException(s -> {
+        assertThrowsException(IllegalStateException.class, s -> {
             s.getOnSucceeded();
         });
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokeGettersOnRandomThreadAfterStart_11() throws Throwable {
-        assertThrowsException(s -> {
+        assertThrowsException(IllegalStateException.class, s -> {
             s.isRunning();
         });
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokeGettersOnRandomThreadAfterStart_12() throws Throwable {
-        assertThrowsException(s -> {
+        assertThrowsException(IllegalStateException.class, s -> {
             s.getState();
         });
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokeGettersOnRandomThreadAfterStart_13() throws Throwable {
-        assertThrowsException(s -> {
+        assertThrowsException(IllegalStateException.class, s -> {
             s.getTitle();
         });
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokeGettersOnRandomThreadAfterStart_14() throws Throwable {
-        assertThrowsException(s -> {
+        assertThrowsException(IllegalStateException.class, s -> {
             s.getTotalWork();
         });
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokeGettersOnRandomThreadAfterStart_15() throws Throwable {
-        assertThrowsException(s -> {
+        assertThrowsException(IllegalStateException.class, s -> {
             s.getValue();
         });
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokeGettersOnRandomThreadAfterStart_16() throws Throwable {
-        assertThrowsException(s -> {
+        assertThrowsException(IllegalStateException.class, s -> {
             s.getValue();
         });
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokePropertyGettersOnRandomThreadAfterStart_1() throws Throwable {
-        assertThrowsException(s -> {
+        assertThrowsException(IllegalStateException.class, s -> {
             s.exceptionProperty();
         });
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokePropertyGettersOnRandomThreadAfterStart_2() throws Throwable {
-        assertThrowsException(s -> {
+        assertThrowsException(IllegalStateException.class, s -> {
             s.executorProperty();
         });
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokePropertyGettersOnRandomThreadAfterStart_3() throws Throwable {
-        assertThrowsException(s -> {
+        assertThrowsException(IllegalStateException.class, s -> {
             s.messageProperty();
         });
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokePropertyGettersOnRandomThreadAfterStart_4() throws Throwable {
-        assertThrowsException(s -> {
+        assertThrowsException(IllegalStateException.class, s -> {
             s.progressProperty();
         });
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokePropertyGettersOnRandomThreadAfterStart_5() throws Throwable {
-        assertThrowsException(s -> {
+        assertThrowsException(IllegalStateException.class, s -> {
             s.onCancelledProperty();
         });
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokePropertyGettersOnRandomThreadAfterStart_6() throws Throwable {
-        assertThrowsException(s -> {
+        assertThrowsException(IllegalStateException.class, s -> {
             s.onFailedProperty();
         });
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokePropertyGettersOnRandomThreadAfterStart_7() throws Throwable {
-        assertThrowsException(s -> {
+        assertThrowsException(IllegalStateException.class, s -> {
             s.onReadyProperty();
         });
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokePropertyGettersOnRandomThreadAfterStart_8() throws Throwable {
-        assertThrowsException(s -> {
+        assertThrowsException(IllegalStateException.class, s -> {
             s.onRunningProperty();
         });
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokePropertyGettersOnRandomThreadAfterStart_9() throws Throwable {
-        assertThrowsException(s -> {
+        assertThrowsException(IllegalStateException.class, s -> {
             s.onScheduledProperty();
         });
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokePropertyGettersOnRandomThreadAfterStart_10() throws Throwable {
-        assertThrowsException(s -> {
+        assertThrowsException(IllegalStateException.class, s -> {
             s.onSucceededProperty();
         });
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokePropertyGettersOnRandomThreadAfterStart_11() throws Throwable {
-        assertThrowsException(s -> {
+        assertThrowsException(IllegalStateException.class, s -> {
             s.runningProperty();
         });
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokePropertyGettersOnRandomThreadAfterStart_12() throws Throwable {
-        assertThrowsException(s -> {
+        assertThrowsException(IllegalStateException.class, s -> {
             s.stateProperty();
         });
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokePropertyGettersOnRandomThreadAfterStart_13() throws Throwable {
-        assertThrowsException(s -> {
+        assertThrowsException(IllegalStateException.class, s -> {
             s.titleProperty();
         });
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokePropertyGettersOnRandomThreadAfterStart_14() throws Throwable {
-        assertThrowsException(s -> {
+        assertThrowsException(IllegalStateException.class, s -> {
             s.totalWorkProperty();
         });
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokePropertyGettersOnRandomThreadAfterStart_15() throws Throwable {
-        assertThrowsException(s -> {
+        assertThrowsException(IllegalStateException.class, s -> {
             s.valueProperty();
         });
     }
 
-    @Test (expected = IllegalStateException.class)
+    @Test
     public void cannotInvokePropertyGettersOnRandomThreadAfterStart_16() throws Throwable {
-        assertThrowsException(s -> {
+        assertThrowsException(IllegalStateException.class, s -> {
             s.workDoneProperty();
         });
     }
 
-    private void assertThrowsException(final ServiceTestExecution c) throws Throwable {
-        RandomThread random = new RandomThread(() -> {
-            DoNothingService s = null;
+    private void assertThrowsException(Class<? extends Throwable> exceptionClass, final ServiceTestExecution c) throws Throwable {
+        assertThrows(exceptionClass, () -> {
+            RandomThread random = new RandomThread(() -> {
+                DoNothingService s = null;
+                try {
+                    s = new DoNothingService();
+                    s.start();
+                    c.test(s);
+                } finally {
+                    if (s != null) s.shutdown();
+                }
+            });
+
             try {
-                s = new DoNothingService();
-                s.start();
-                c.test(s);
-            } finally {
-                if (s != null) s.shutdown();
+                random.test();
+            } catch (AssertionError er) {
+                throw er.getCause();
             }
         });
-
-        try {
-            random.test();
-        } catch (AssertionError er) {
-            throw er.getCause();
-        }
     }
 
     private interface ServiceTestExecution {
@@ -1920,7 +2066,8 @@ public void runLater(Runnable r) {
      *                                                                         *
      **************************************************************************/
 
-    @Test public void eventFiredOnSubclassWorks() {
+    @Test
+    public void eventFiredOnSubclassWorks() {
         final AtomicBoolean result = new AtomicBoolean(false);
         TestServiceFactory factory = new TestServiceFactory() {
             @Override public AbstractTask createTestTask() {
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/concurrent/ServiceTest.java b/modules/javafx.graphics/src/test/java/test/javafx/concurrent/ServiceTest.java
index d14d7e0ad35..01dc5a12686 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/concurrent/ServiceTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/concurrent/ServiceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,8 @@
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import test.javafx.concurrent.mocks.SimpleTask;
+
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -37,21 +39,24 @@
 import javafx.concurrent.Task;
 import javafx.concurrent.TaskShim;
 import javafx.concurrent.Worker;
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 /**
  */
 public class ServiceTest {
     private Service<String> service;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         // I don't use the AbstractService here because I don't want to
         // take advantage of the built in executor / threading stuff
         service = new ServiceShim<>() {
@@ -73,7 +78,8 @@ public class ServiceTest {
     /**
      * Tests that the executor property is null by default
      */
-    @Test public void executorDefaultsToNull() {
+    @Test
+    public void executorDefaultsToNull() {
         assertNull(service.getExecutor());
         assertNull(service.executorProperty().get());
     }
@@ -83,7 +89,8 @@ public class ServiceTest {
      * to some non-default setting and check that the same instance is
      * then set on the service
      */
-    @Test public void executorCanBeSet() {
+    @Test
+    public void executorCanBeSet() {
         final Executor e = command -> { };
         service.setExecutor(e);
         assertSame(e, service.getExecutor());
@@ -93,7 +100,8 @@ public class ServiceTest {
     /**
      * Tests that you can bind the executor property of a Service
      */
-    @Test public void executorCanBeBound() {
+    @Test
+    public void executorCanBeBound() {
         final Executor e = command -> { };
         ObjectProperty<Executor> other = new SimpleObjectProperty<>(e);
         service.executorProperty().bind(other);
@@ -108,7 +116,8 @@ public class ServiceTest {
      * Tests that if you specify a custom executor, then it is used when
      * you attempt to run a service
      */
-    @Test public void executorIsUsed() {
+    @Test
+    public void executorIsUsed() {
         final AtomicBoolean results = new AtomicBoolean(false);
         final Executor e = command -> results.set(true);
         service.setExecutor(e);
@@ -120,47 +129,56 @@ public class ServiceTest {
      * Test initial values for properties                             *
      *****************************************************************/
 
-    @Test public void stateDefaultsTo_READY() {
+    @Test
+    public void stateDefaultsTo_READY() {
         assertSame(Worker.State.READY, service.getState());
         assertSame(Worker.State.READY, service.stateProperty().get());
     }
 
-    @Test public void valueDefaultsToNull() {
+    @Test
+    public void valueDefaultsToNull() {
         assertNull(service.getValue());
         assertNull(service.valueProperty().get());
     }
 
-    @Test public void exceptionDefaultsToNull() {
+    @Test
+    public void exceptionDefaultsToNull() {
         assertNull(service.getException());
         assertNull(service.exceptionProperty().get());
     }
 
-    @Test public void workDoneDefaultsTo_NegativeOne() {
+    @Test
+    public void workDoneDefaultsTo_NegativeOne() {
         assertEquals(-1, service.getWorkDone(), 0);
         assertEquals(-1, service.workDoneProperty().get(), 0);
     }
 
-    @Test public void totalWorkDefaultsTo_NegativeOne() {
+    @Test
+    public void totalWorkDefaultsTo_NegativeOne() {
         assertEquals(-1, service.getTotalWork(), 0);
         assertEquals(-1, service.totalWorkProperty().get(), 0);
     }
 
-    @Test public void progressDefaultsTo_NegativeOne() {
+    @Test
+    public void progressDefaultsTo_NegativeOne() {
         assertEquals(-1, service.getProgress(), 0);
         assertEquals(-1, service.progressProperty().get(), 0);
     }
 
-    @Test public void runningDefaultsToFalse() {
+    @Test
+    public void runningDefaultsToFalse() {
         assertFalse(service.isRunning());
         assertFalse(service.runningProperty().get());
     }
 
-    @Test public void messageDefaultsToEmptyString() {
+    @Test
+    public void messageDefaultsToEmptyString() {
         assertEquals("", service.getMessage());
         assertEquals("", service.messageProperty().get());
     }
 
-    @Test public void titleDefaultsToEmptyString() {
+    @Test
+    public void titleDefaultsToEmptyString() {
         assertEquals("", service.getTitle());
         assertEquals("", service.titleProperty().get());
     }
@@ -172,7 +190,9 @@ public class ServiceTest {
     // This test should be reliable. Each of the concurrent tasks takes 1 second to complete
     // and several micro / milliseconds to get setup and execute. So 2 seconds should be more
     // than enough time.
-    @Test(timeout = 2000) public void testManyServicesRunConcurrently() throws Exception {
+    @Test
+    @Timeout(value=2000, unit=TimeUnit.MILLISECONDS)
+    public void testManyServicesRunConcurrently() throws InterruptedException {
         if (PlatformUtil.isWindows()) {
             assumeTrue(Boolean.getBoolean("unstable.test")); // JDK-8284552
         }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/concurrent/ServiceTestBase.java b/modules/javafx.graphics/src/test/java/test/javafx/concurrent/ServiceTestBase.java
index 6c28f56a75b..1d908ecb9d9 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/concurrent/ServiceTestBase.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/concurrent/ServiceTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.Executor;
 import javafx.concurrent.Service;
-import org.junit.Before;
 
 /**
  * Base class for tests of the Service class. This class has built into it
@@ -41,7 +40,6 @@ public abstract class ServiceTestBase {
     protected TestServiceFactory factory;
     protected Service<String> service;
 
-    protected abstract TestServiceFactory setupServiceFactory();
     protected Executor createExecutor() {
         return command -> {
             if (command == null) Thread.dumpStack();
@@ -61,8 +59,11 @@ protected Executor createExecutor() {
         };
     }
 
-    @Before public void setup() {
-        factory = setupServiceFactory();
+    // NOTE: This should be reverted once parametrized class tests are added to JUnit5
+    //       For now, tests call this manually
+    // @BeforeEach
+    protected void setup(TestServiceFactory factory) {
+        this.factory = factory;
         factory.test = this;
         service = factory.createService();
         service.setExecutor(createExecutor());
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/concurrent/TaskCancelTest.java b/modules/javafx.graphics/src/test/java/test/javafx/concurrent/TaskCancelTest.java
index 174fd25c6ce..bd85a91ad7b 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/concurrent/TaskCancelTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/concurrent/TaskCancelTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,10 +31,13 @@
 import test.javafx.concurrent.mocks.InfiniteTask;
 import test.javafx.concurrent.mocks.RunAwayTask;
 import test.javafx.concurrent.mocks.SimpleTask;
-import org.junit.Before;
-import org.junit.Test;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Tests what happens to a Task if it is canceled in each of the various
@@ -48,7 +51,8 @@ public class TaskCancelTest {
      */
     private InfiniteTask task;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         task = new InfiniteTask();
     }
 
@@ -56,7 +60,8 @@ public class TaskCancelTest {
      * Since the task begins in the ready state, I can just cancel it and
      * see what happens.
      */
-    @Test public void cancellingA_READY_TaskShouldChangeStateTo_CANCELLED() {
+    @Test
+    public void cancellingA_READY_TaskShouldChangeStateTo_CANCELLED() {
         assertTrue(task.cancel());
         assertEquals(Worker.State.CANCELLED, task.getState());
         assertTrue(task.isDone());
@@ -67,7 +72,8 @@ public class TaskCancelTest {
      * (it just changes the Task state correctly). So put it in the
      * Scheduled state and then cancel it and see what happens.
      */
-    @Test public void cancellingA_SCHEDULED_TaskShouldChangeStateTo_CANCELLED() {
+    @Test
+    public void cancellingA_SCHEDULED_TaskShouldChangeStateTo_CANCELLED() {
         task.simulateSchedule();
         assertTrue(task.cancel());
         assertEquals(Worker.State.CANCELLED, task.getState());
@@ -84,7 +90,8 @@ public class TaskCancelTest {
      *
      * @throws Exception shouldn't throw anything unless th.join fails
      */
-    @Test public void cancellingA_RUNNING_TaskShouldChangeStateTo_CANCELLED() throws Exception {
+    @Test
+    public void cancellingA_RUNNING_TaskShouldChangeStateTo_CANCELLED() throws Exception {
         Thread th = new Thread(task);
         th.start();
         task.runningSemaphore.acquire();
@@ -102,7 +109,8 @@ public class TaskCancelTest {
      * In this case I don't want to use the infinite task, so I'll just
      * use a SimpleTask instead
      */
-    @Test public void cancellingA_SUCCEEDED_TaskShouldNotChangeTo_CANCELLED() {
+    @Test
+    public void cancellingA_SUCCEEDED_TaskShouldNotChangeTo_CANCELLED() {
         Task t = new SimpleTask();
         t.run();
         assertFalse(t.cancel());
@@ -114,7 +122,8 @@ public class TaskCancelTest {
      * Although I could end up using the infinite task for this one, I'm going
      * to go ahead and reuse the epic fail task instead
      */
-    @Test public void cancellingA_FAILED_TaskShouldNotChangeTo_CANCELLED() {
+    @Test
+    public void cancellingA_FAILED_TaskShouldNotChangeTo_CANCELLED() {
         Task t = new EpicFailTask();
         t.run();
         assertFalse(t.cancel());
@@ -125,7 +134,8 @@ public class TaskCancelTest {
     /**
      *
      */
-    @Test public void aFreeRunningCancelledTaskReturnValueShouldBeIgnored() throws Exception {
+    @Test
+    public void aFreeRunningCancelledTaskReturnValueShouldBeIgnored() throws Exception {
         RunAwayTask runAway = new RunAwayTask() {
                 @Override
                 protected void loop(int count) throws Exception {
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/concurrent/TaskEventTest.java b/modules/javafx.graphics/src/test/java/test/javafx/concurrent/TaskEventTest.java
index e9a54ef0f7f..e54b081e8fa 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/concurrent/TaskEventTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/concurrent/TaskEventTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,9 +34,13 @@
 import test.javafx.concurrent.mocks.MythicalEvent;
 import test.javafx.concurrent.mocks.SimpleTask;
 import javafx.event.EventHandler;
-import org.junit.Test;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Tests that the event notification machinery on Task works as expected.
@@ -53,23 +57,27 @@ public class TaskEventTest {
      *
      **************************************************************************/
 
-    @Test public void onScheduledPropertyNameShouldMatchMethodName() {
+    @Test
+    public void onScheduledPropertyNameShouldMatchMethodName() {
         Task task = new SimpleTask();
         assertEquals("onScheduled", task.onScheduledProperty().getName());
     }
 
-    @Test public void onScheduledBeanShouldMatchTask() {
+    @Test
+    public void onScheduledBeanShouldMatchTask() {
         Task task = new SimpleTask();
         assertSame(task, task.onScheduledProperty().getBean());
     }
 
-    @Test public void onScheduledIsInitializedToNull() {
+    @Test
+    public void onScheduledIsInitializedToNull() {
         Task task = new SimpleTask();
         assertNull(task.getOnScheduled());
         assertNull(task.onScheduledProperty().get());
     }
 
-    @Test public void onScheduledCalledWhenSetViaProperty() {
+    @Test
+    public void onScheduledCalledWhenSetViaProperty() {
         final AtomicBoolean handlerCalled = new AtomicBoolean(false);
         SimpleTask task = new SimpleTask();
         task.onScheduledProperty().set(workerStateEvent -> handlerCalled.set(true));
@@ -79,7 +87,8 @@ public class TaskEventTest {
         assertTrue(handlerCalled.get());
     }
 
-    @Test public void onScheduledFilterCalledBefore_onScheduled() {
+    @Test
+    public void onScheduledFilterCalledBefore_onScheduled() {
         SimpleTask task = new SimpleTask();
         final AtomicBoolean filterCalled = new AtomicBoolean(false);
         final AtomicBoolean filterCalledFirst = new AtomicBoolean(false);
@@ -92,7 +101,8 @@ public class TaskEventTest {
         assertTrue(filterCalledFirst.get());
     }
 
-    @Test public void scheduledCalledAfterHandler() {
+    @Test
+    public void scheduledCalledAfterHandler() {
         final AtomicBoolean handlerCalled = new AtomicBoolean(false);
         final AtomicBoolean scheduledCalledLast = new AtomicBoolean(false);
         SimpleTask task = new SimpleTask() {
@@ -108,7 +118,8 @@ public class TaskEventTest {
         assertTrue(scheduledCalledLast.get());
     }
 
-    @Test public void scheduledCalledAfterHandlerEvenIfConsumed() {
+    @Test
+    public void scheduledCalledAfterHandlerEvenIfConsumed() {
         final AtomicBoolean scheduledCalled = new AtomicBoolean(false);
         SimpleTask task = new SimpleTask() {
             @Override protected void scheduled() {
@@ -123,7 +134,8 @@ public class TaskEventTest {
         assertTrue(scheduledCalled.get());
     }
 
-    @Test public void onScheduledHandlerCalled() {
+    @Test
+    public void onScheduledHandlerCalled() {
         final AtomicBoolean handlerCalled = new AtomicBoolean(false);
         SimpleTask task = new SimpleTask();
         task.addEventHandler(WorkerStateEvent.WORKER_STATE_SCHEDULED, workerStateEvent -> handlerCalled.set(true));
@@ -133,7 +145,8 @@ public class TaskEventTest {
         assertTrue(handlerCalled.get());
     }
 
-    @Test public void removed_onScheduledHandlerNotCalled() {
+    @Test
+    public void removed_onScheduledHandlerNotCalled() {
         final AtomicBoolean handlerCalled = new AtomicBoolean(false);
         final AtomicBoolean sanity = new AtomicBoolean(false);
         SimpleTask task = new SimpleTask();
@@ -147,7 +160,8 @@ public class TaskEventTest {
         assertFalse(handlerCalled.get());
     }
 
-    @Test public void removed_onScheduledFilterNotCalled() {
+    @Test
+    public void removed_onScheduledFilterNotCalled() {
         final AtomicBoolean filterCalled = new AtomicBoolean(false);
         final AtomicBoolean sanity = new AtomicBoolean(false);
         SimpleTask task = new SimpleTask();
@@ -167,23 +181,27 @@ public class TaskEventTest {
      *
      **************************************************************************/
 
-    @Test public void onRunningPropertyNameShouldMatchMethodName() {
+    @Test
+    public void onRunningPropertyNameShouldMatchMethodName() {
         Task task = new SimpleTask();
         assertEquals("onRunning", task.onRunningProperty().getName());
     }
 
-    @Test public void onRunningBeanShouldMatchTask() {
+    @Test
+    public void onRunningBeanShouldMatchTask() {
         Task task = new SimpleTask();
         assertSame(task, task.onRunningProperty().getBean());
     }
 
-    @Test public void onRunningIsInitializedToNull() {
+    @Test
+    public void onRunningIsInitializedToNull() {
         Task task = new SimpleTask();
         assertNull(task.getOnRunning());
         assertNull(task.onRunningProperty().get());
     }
 
-    @Test public void onRunningCalledWhenSetViaProperty() {
+    @Test
+    public void onRunningCalledWhenSetViaProperty() {
         final AtomicBoolean handlerCalled = new AtomicBoolean(false);
         SimpleTask task = new SimpleTask();
         task.onRunningProperty().set(workerStateEvent -> handlerCalled.set(true));
@@ -193,7 +211,8 @@ public class TaskEventTest {
         assertTrue(handlerCalled.get());
     }
 
-    @Test public void onRunningFilterCalledBefore_onRunning() {
+    @Test
+    public void onRunningFilterCalledBefore_onRunning() {
         SimpleTask task = new SimpleTask();
         final AtomicBoolean filterCalled = new AtomicBoolean(false);
         final AtomicBoolean filterCalledFirst = new AtomicBoolean(false);
@@ -206,7 +225,8 @@ public class TaskEventTest {
         assertTrue(filterCalledFirst.get());
     }
 
-    @Test public void runningCalledAfterHandler() {
+    @Test
+    public void runningCalledAfterHandler() {
         final AtomicBoolean handlerCalled = new AtomicBoolean(false);
         final AtomicBoolean runningCalledLast = new AtomicBoolean(false);
         SimpleTask task = new SimpleTask() {
@@ -221,7 +241,8 @@ public class TaskEventTest {
         assertTrue(runningCalledLast.get());
     }
 
-    @Test public void runningCalledAfterHandlerEvenIfConsumed() {
+    @Test
+    public void runningCalledAfterHandlerEvenIfConsumed() {
         final AtomicBoolean runningCalled = new AtomicBoolean(false);
         SimpleTask task = new SimpleTask() {
             @Override protected void running() {
@@ -241,23 +262,27 @@ public class TaskEventTest {
      *
      **************************************************************************/
 
-    @Test public void onSucceededPropertyNameShouldMatchMethodName() {
+    @Test
+    public void onSucceededPropertyNameShouldMatchMethodName() {
         Task task = new SimpleTask();
         assertEquals("onSucceeded", task.onSucceededProperty().getName());
     }
 
-    @Test public void onSucceededBeanShouldMatchTask() {
+    @Test
+    public void onSucceededBeanShouldMatchTask() {
         Task task = new SimpleTask();
         assertSame(task, task.onSucceededProperty().getBean());
     }
 
-    @Test public void onSucceededIsInitializedToNull() {
+    @Test
+    public void onSucceededIsInitializedToNull() {
         Task task = new SimpleTask();
         assertNull(task.getOnSucceeded());
         assertNull(task.onSucceededProperty().get());
     }
 
-    @Test public void onSucceededCalledWhenSetViaProperty() {
+    @Test
+    public void onSucceededCalledWhenSetViaProperty() {
         final AtomicBoolean handlerCalled = new AtomicBoolean(false);
         SimpleTask task = new SimpleTask();
         task.onSucceededProperty().set(workerStateEvent -> handlerCalled.set(true));
@@ -267,7 +292,8 @@ public class TaskEventTest {
         assertTrue(handlerCalled.get());
     }
 
-    @Test public void onSucceededFilterCalledBefore_onSucceeded() {
+    @Test
+    public void onSucceededFilterCalledBefore_onSucceeded() {
         SimpleTask task = new SimpleTask();
         final AtomicBoolean filterCalled = new AtomicBoolean(false);
         final AtomicBoolean filterCalledFirst = new AtomicBoolean(false);
@@ -279,7 +305,8 @@ public class TaskEventTest {
         assertTrue(filterCalledFirst.get());
     }
 
-    @Test public void succeededCalledAfterHandler() {
+    @Test
+    public void succeededCalledAfterHandler() {
         final AtomicBoolean handlerCalled = new AtomicBoolean(false);
         final AtomicBoolean succeededCalledLast = new AtomicBoolean(false);
         SimpleTask task = new SimpleTask() {
@@ -294,7 +321,8 @@ public class TaskEventTest {
         assertTrue(succeededCalledLast.get());
     }
 
-    @Test public void succeededCalledAfterHandlerEvenIfConsumed() {
+    @Test
+    public void succeededCalledAfterHandlerEvenIfConsumed() {
         final AtomicBoolean succeededCalled = new AtomicBoolean(false);
         SimpleTask task = new SimpleTask() {
             @Override protected void succeeded() {
@@ -314,23 +342,27 @@ public class TaskEventTest {
      *
      **************************************************************************/
 
-    @Test public void onCancelledPropertyNameShouldMatchMethodName() {
+    @Test
+    public void onCancelledPropertyNameShouldMatchMethodName() {
         Task task = new SimpleTask();
         assertEquals("onCancelled", task.onCancelledProperty().getName());
     }
 
-    @Test public void onCancelledBeanShouldMatchTask() {
+    @Test
+    public void onCancelledBeanShouldMatchTask() {
         Task task = new SimpleTask();
         assertSame(task, task.onCancelledProperty().getBean());
     }
 
-    @Test public void onCancelledIsInitializedToNull() {
+    @Test
+    public void onCancelledIsInitializedToNull() {
         Task task = new SimpleTask();
         assertNull(task.getOnCancelled());
         assertNull(task.onCancelledProperty().get());
     }
 
-    @Test public void onCancelledCalledWhenSetViaProperty() throws Exception {
+    @Test
+    public void onCancelledCalledWhenSetViaProperty() throws Exception {
         final AtomicBoolean handlerCalled = new AtomicBoolean(false);
         InfiniteTask task = new InfiniteTask();
         task.onCancelledProperty().set(workerStateEvent -> handlerCalled.set(true));
@@ -343,7 +375,8 @@ public class TaskEventTest {
         assertTrue(handlerCalled.get());
     }
 
-    @Test public void onCancelledFilterCalledBefore_onCancelled() throws Exception {
+    @Test
+    public void onCancelledFilterCalledBefore_onCancelled() throws Exception {
         InfiniteTask task = new InfiniteTask();
         final AtomicBoolean filterCalled = new AtomicBoolean(false);
         final AtomicBoolean filterCalledFirst = new AtomicBoolean(false);
@@ -358,7 +391,8 @@ public class TaskEventTest {
         assertTrue(filterCalledFirst.get());
     }
 
-    @Test public void cancelledCalledAfterHandler() throws Exception {
+    @Test
+    public void cancelledCalledAfterHandler() throws Exception {
         final AtomicBoolean handlerCalled = new AtomicBoolean(false);
         final AtomicBoolean cancelledCalledLast = new AtomicBoolean(false);
         InfiniteTask task = new InfiniteTask() {
@@ -376,7 +410,8 @@ public class TaskEventTest {
         assertTrue(cancelledCalledLast.get());
     }
 
-    @Test public void cancelledCalledAfterHandlerEvenIfConsumed() throws Exception {
+    @Test
+    public void cancelledCalledAfterHandlerEvenIfConsumed() throws Exception {
         final AtomicBoolean cancelledCalled = new AtomicBoolean(false);
         InfiniteTask task = new InfiniteTask() {
             @Override protected void cancelled() {
@@ -399,23 +434,27 @@ public class TaskEventTest {
      *
      **************************************************************************/
 
-    @Test public void onFailedPropertyNameShouldMatchMethodName() {
+    @Test
+    public void onFailedPropertyNameShouldMatchMethodName() {
         Task task = new SimpleTask();
         assertEquals("onFailed", task.onFailedProperty().getName());
     }
 
-    @Test public void onFailedBeanShouldMatchTask() {
+    @Test
+    public void onFailedBeanShouldMatchTask() {
         Task task = new SimpleTask();
         assertSame(task, task.onFailedProperty().getBean());
     }
 
-    @Test public void onFailedIsInitializedToNull() {
+    @Test
+    public void onFailedIsInitializedToNull() {
         Task task = new SimpleTask();
         assertNull(task.getOnFailed());
         assertNull(task.onFailedProperty().get());
     }
 
-    @Test public void onFailedCalledWhenSetViaProperty() {
+    @Test
+    public void onFailedCalledWhenSetViaProperty() {
         final AtomicBoolean handlerCalled = new AtomicBoolean(false);
         Task<String> task = new EpicFailTask();
         task.onFailedProperty().set(workerStateEvent -> handlerCalled.set(true));
@@ -425,7 +464,8 @@ public class TaskEventTest {
         assertTrue(handlerCalled.get());
     }
 
-    @Test public void onFailedFilterCalledBefore_onFailed() {
+    @Test
+    public void onFailedFilterCalledBefore_onFailed() {
         Task<String> task = new EpicFailTask();
         final AtomicBoolean filterCalled = new AtomicBoolean(false);
         final AtomicBoolean filterCalledFirst = new AtomicBoolean(false);
@@ -437,7 +477,8 @@ public class TaskEventTest {
         assertTrue(filterCalledFirst.get());
     }
 
-    @Test public void failedCalledAfterHandler() {
+    @Test
+    public void failedCalledAfterHandler() {
         final AtomicBoolean handlerCalled = new AtomicBoolean(false);
         final AtomicBoolean failedCalledLast = new AtomicBoolean(false);
         EpicFailTask task = new EpicFailTask() {
@@ -452,7 +493,8 @@ public class TaskEventTest {
         assertTrue(failedCalledLast.get());
     }
 
-    @Test public void failedCalledAfterHandlerEvenIfConsumed() {
+    @Test
+    public void failedCalledAfterHandlerEvenIfConsumed() {
         final AtomicBoolean failedCalled = new AtomicBoolean(false);
         EpicFailTask task = new EpicFailTask() {
             @Override protected void failed() {
@@ -473,7 +515,8 @@ public class TaskEventTest {
      *
      **************************************************************************/
 
-    @Test public void eventFiredOnSubclassWorks() {
+    @Test
+    public void eventFiredOnSubclassWorks() {
         final AtomicBoolean result = new AtomicBoolean(false);
         MythicalTask task = new MythicalTask();
         task.setHandler(mythicalEvent -> result.set(true));
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/concurrent/TaskExceptionTest.java b/modules/javafx.graphics/src/test/java/test/javafx/concurrent/TaskExceptionTest.java
index 3f26c2e85de..acf31acf749 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/concurrent/TaskExceptionTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/concurrent/TaskExceptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,38 +25,33 @@
 
 package test.javafx.concurrent;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.concurrent.Task;
 import javafx.concurrent.Worker;
 
 import test.javafx.concurrent.mocks.EpicFailTask;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
-@RunWith(Parameterized.class)
 public class TaskExceptionTest {
-    @Parameterized.Parameters public static Collection implementations() {
-        return Arrays.asList(new Object[][]{
-                {new Exception("Exception")},
-                {new IllegalArgumentException("IAE")},
-                {new NullPointerException("NPE")},
-                {new RuntimeException("RuntimeException")}
-        });
+
+    public static Stream<Arguments> implementations() {
+        return Stream.of(
+            Arguments.of(new Exception("Exception")),
+            Arguments.of(new IllegalArgumentException("IAE")),
+            Arguments.of(new NullPointerException("NPE")),
+            Arguments.of(new RuntimeException("RuntimeException"))
+        );
     }
 
-    private Exception exception;
     private Task task;
 
-    public TaskExceptionTest(Exception th) {
-        this.exception = th;
-    }
-
-    @Before public void setup() {
+    public void setup(Exception exception) {
         task = new EpicFailTask(exception);
     }
 
@@ -66,32 +61,50 @@ public TaskExceptionTest(Exception th) {
      * arbitrary state.
      ***********************************************************************/
 
-    @Test public void afterRunningExceptionShouldBeSet() {
+    @ParameterizedTest
+    @MethodSource("implementations")
+    public void afterRunningExceptionShouldBeSet(Exception exception) {
+        setup(exception); // NOTE this should be a @BeforeEach call, restore after JUnit5 adds Parametrized classes
         task.run();
         assertNotNull(task.getException());
     }
 
-    @Test public void afterRunningValueShouldBe_Null() {
+    @ParameterizedTest
+    @MethodSource("implementations")
+    public void afterRunningValueShouldBe_Null(Exception exception) {
+        setup(exception); // NOTE this should be a @BeforeEach call, restore after JUnit5 adds Parametrized classes
         task.run();
         assertNull(task.getValue());
     }
 
-    @Test public void afterRunningWorkDoneShouldBe_10() {
+    @ParameterizedTest
+    @MethodSource("implementations")
+    public void afterRunningWorkDoneShouldBe_10(Exception exception) {
+        setup(exception); // NOTE this should be a @BeforeEach call, restore after JUnit5 adds Parametrized classes
         task.run();
         assertEquals(10, task.getWorkDone(), 0);
     }
 
-    @Test public void afterRunningTotalWorkShouldBe_20() {
+    @ParameterizedTest
+    @MethodSource("implementations")
+    public void afterRunningTotalWorkShouldBe_20(Exception exception) {
+        setup(exception); // NOTE this should be a @BeforeEach call, restore after JUnit5 adds Parametrized classes
         task.run();
         assertEquals(20, task.getTotalWork(), 0);
     }
 
-    @Test public void afterRunningProgressShouldBe_FiftyPercent() {
+    @ParameterizedTest
+    @MethodSource("implementations")
+    public void afterRunningProgressShouldBe_FiftyPercent(Exception exception) {
+        setup(exception); // NOTE this should be a @BeforeEach call, restore after JUnit5 adds Parametrized classes
         task.run();
         assertEquals(.5, task.getProgress(), 0);
     }
 
-    @Test public void afterRunningStateShouldBe_FAILED() {
+    @ParameterizedTest
+    @MethodSource("implementations")
+    public void afterRunningStateShouldBe_FAILED(Exception exception) {
+        setup(exception); // NOTE this should be a @BeforeEach call, restore after JUnit5 adds Parametrized classes
         task.run();
         assertEquals(Worker.State.FAILED, task.getState());
     }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/concurrent/TaskProgressTest.java b/modules/javafx.graphics/src/test/java/test/javafx/concurrent/TaskProgressTest.java
index 06d50f6f6e2..9477bcee8d5 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/concurrent/TaskProgressTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/concurrent/TaskProgressTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,10 +28,10 @@
 import javafx.concurrent.Task;
 import javafx.concurrent.TaskShim;
 import test.javafx.concurrent.mocks.ProgressingTask;
-import org.junit.Before;
-import org.junit.Test;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * A Task which always completes normally, but which also progresses from
@@ -42,7 +42,8 @@
 public class TaskProgressTest {
     private Task task;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         task = new ProgressingTask();
     }
 
@@ -51,17 +52,20 @@ public class TaskProgressTest {
      * percentDone have correct values.
      ***********************************************************************/
 
-    @Test public void afterRunningWorkDoneShouldBe_20() {
+    @Test
+    public void afterRunningWorkDoneShouldBe_20() {
         task.run();
         assertEquals(20, task.getWorkDone(), 0);
     }
 
-    @Test public void afterRunningTotalWorkShouldBe_20() {
+    @Test
+    public void afterRunningTotalWorkShouldBe_20() {
         task.run();
         assertEquals(20, task.getTotalWork(), 0);
     }
 
-    @Test public void afterRunningProgressShouldBe_1() {
+    @Test
+    public void afterRunningProgressShouldBe_1() {
         task.run();
         assertEquals(1, task.getProgress(), 0);
     }
@@ -71,91 +75,104 @@ public class TaskProgressTest {
      * expected outputs according to the specification
      ***********************************************************************/
 
-    @Test public void updateProgress_Long_0_100() {
+    @Test
+    public void updateProgress_Long_0_100() {
         TaskShim.updateProgress(task, 0, 100);
         assertEquals(0, task.getProgress(), 0);
         assertEquals(0, task.getWorkDone(), 0);
         assertEquals(100, task.getTotalWork(), 0);
     }
 
-    @Test public void updateProgress_Long_n1_100() {
+    @Test
+    public void updateProgress_Long_n1_100() {
         TaskShim.updateProgress(task, -1, 100);
         assertEquals(-1, task.getProgress(), 0);
         assertEquals(-1, task.getWorkDone(), 0);
         assertEquals(100, task.getTotalWork(), 0);
     }
 
-    @Test public void updateProgress_Long_n10_100() {
+    @Test
+    public void updateProgress_Long_n10_100() {
         TaskShim.updateProgress(task, -10, 100);
         assertEquals(-1, task.getProgress(), 0);
         assertEquals(-1, task.getWorkDone(), 0);
         assertEquals(100, task.getTotalWork(), 0);
     }
 
-    @Test public void updateProgress_Long_MIN_VALUE_100() {
+    @Test
+    public void updateProgress_Long_MIN_VALUE_100() {
         TaskShim.updateProgress(task, Long.MIN_VALUE, 100);
         assertEquals(-1, task.getProgress(), 0);
         assertEquals(-1, task.getWorkDone(), 0);
         assertEquals(100, task.getTotalWork(), 0);
     }
 
-    @Test public void updateProgress_Long_10_100() {
+    @Test
+    public void updateProgress_Long_10_100() {
         TaskShim.updateProgress(task, 10, 100);
         assertEquals(.1, task.getProgress(), 0);
         assertEquals(10, task.getWorkDone(), 0);
         assertEquals(100, task.getTotalWork(), 0);
     }
 
-    @Test public void updateProgress_Long_100_100() {
+    @Test
+    public void updateProgress_Long_100_100() {
         TaskShim.updateProgress(task, 100, 100);
         assertEquals(1, task.getProgress(), 0);
         assertEquals(100, task.getWorkDone(), 0);
         assertEquals(100, task.getTotalWork(), 0);
     }
 
-    @Test public void updateProgress_Long_110_100() {
+    @Test
+    public void updateProgress_Long_110_100() {
         TaskShim.updateProgress(task, 110, 100);
         assertEquals(1, task.getProgress(), 0);
         assertEquals(100, task.getWorkDone(), 0);
         assertEquals(100, task.getTotalWork(), 0);
     }
 
-    @Test public void updateProgress_Long_MAX_VALUE_100() {
+    @Test
+    public void updateProgress_Long_MAX_VALUE_100() {
         TaskShim.updateProgress(task, Long.MAX_VALUE, 100);
         assertEquals(1, task.getProgress(), 0);
         assertEquals(100, task.getWorkDone(), 0);
         assertEquals(100, task.getTotalWork(), 0);
     }
 
-    @Test public void updateProgress_Long_0_n1() {
+    @Test
+    public void updateProgress_Long_0_n1() {
         TaskShim.updateProgress(task, 0, -1);
         assertEquals(-1, task.getProgress(), 0);
         assertEquals(-1, task.getWorkDone(), 0);
         assertEquals(-1, task.getTotalWork(), 0);
     }
 
-    @Test public void updateProgress_Long_0_n10() {
+    @Test
+    public void updateProgress_Long_0_n10() {
         TaskShim.updateProgress(task, 0, -10);
         assertEquals(-1, task.getProgress(), 0);
         assertEquals(-1, task.getWorkDone(), 0);
         assertEquals(-1, task.getTotalWork(), 0);
     }
 
-    @Test public void updateProgress_Long_0_MIN_VALUE() {
+    @Test
+    public void updateProgress_Long_0_MIN_VALUE() {
         TaskShim.updateProgress(task, 0, Long.MIN_VALUE);
         assertEquals(-1, task.getProgress(), 0);
         assertEquals(-1, task.getWorkDone(), 0);
         assertEquals(-1, task.getTotalWork(), 0);
     }
 
-    @Test public void updateProgress_Long_100_10() {
+    @Test
+    public void updateProgress_Long_100_10() {
         TaskShim.updateProgress(task, 100, 10);
         assertEquals(1, task.getProgress(), 0);
         assertEquals(10, task.getWorkDone(), 0);
         assertEquals(10, task.getTotalWork(), 0);
     }
 
-    @Test public void updateProgress_Long_100_MAX_VALUE() {
+    @Test
+    public void updateProgress_Long_100_MAX_VALUE() {
         TaskShim.updateProgress(task, 100, Long.MAX_VALUE);
         assertEquals(100.0 / Long.MAX_VALUE, task.getProgress(), 0);
         assertEquals(100, task.getWorkDone(), 0);
@@ -163,105 +180,120 @@ public class TaskProgressTest {
     }
 
     /* Now test the Double variants (Infinity, NaN)*/
-    @Test public void updateProgress_Double_Infinity_100() {
+    @Test
+    public void updateProgress_Double_Infinity_100() {
         TaskShim.updateProgress(task, Double.POSITIVE_INFINITY, 100);
         assertEquals(-1, task.getProgress(), 0);
         assertEquals(-1, task.getWorkDone(), 0);
         assertEquals(100, task.getTotalWork(), 0);
     }
 
-    @Test public void updateProgress_Double_NInfinity_100() {
+    @Test
+    public void updateProgress_Double_NInfinity_100() {
         TaskShim.updateProgress(task, Double.NEGATIVE_INFINITY, 100);
         assertEquals(-1, task.getProgress(), 0);
         assertEquals(-1, task.getWorkDone(), 0);
         assertEquals(100, task.getTotalWork(), 0);
     }
 
-    @Test public void updateProgress_Double_NaN_100() {
+    @Test
+    public void updateProgress_Double_NaN_100() {
         TaskShim.updateProgress(task, Double.NaN, 100);
         assertEquals(-1, task.getProgress(), 0);
         assertEquals(-1, task.getWorkDone(), 0);
         assertEquals(100, task.getTotalWork(), 0);
     }
 
-    @Test public void updateProgress_Double_0_Infinity() {
+    @Test
+    public void updateProgress_Double_0_Infinity() {
         TaskShim.updateProgress(task, 0, Double.POSITIVE_INFINITY);
         assertEquals(-1, task.getProgress(), 0);
         assertEquals(-1, task.getWorkDone(), 0);
         assertEquals(-1, task.getTotalWork(), 0);
     }
 
-    @Test public void updateProgress_Double_0_NInfinity() {
+    @Test
+    public void updateProgress_Double_0_NInfinity() {
         TaskShim.updateProgress(task, 0, Double.NEGATIVE_INFINITY);
         assertEquals(-1, task.getProgress(), 0);
         assertEquals(-1, task.getWorkDone(), 0);
         assertEquals(-1, task.getTotalWork(), 0);
     }
 
-    @Test public void updateProgress_Double_0_NaN() {
+    @Test
+    public void updateProgress_Double_0_NaN() {
         TaskShim.updateProgress(task, 0, Double.NaN);
         assertEquals(-1, task.getProgress(), 0);
         assertEquals(-1, task.getWorkDone(), 0);
         assertEquals(-1, task.getTotalWork(), 0);
     }
 
-    @Test public void updateProgress_Double_Infinity_Infinity() {
+    @Test
+    public void updateProgress_Double_Infinity_Infinity() {
         TaskShim.updateProgress(task, Double.POSITIVE_INFINITY, Double.POSITIVE_INFINITY);
         assertEquals(-1, task.getProgress(), 0);
         assertEquals(-1, task.getWorkDone(), 0);
         assertEquals(-1, task.getTotalWork(), 0);
     }
 
-    @Test public void updateProgress_Double_NInfinity_Infinity() {
+    @Test
+    public void updateProgress_Double_NInfinity_Infinity() {
         TaskShim.updateProgress(task, Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY);
         assertEquals(-1, task.getProgress(), 0);
         assertEquals(-1, task.getWorkDone(), 0);
         assertEquals(-1, task.getTotalWork(), 0);
     }
 
-    @Test public void updateProgress_Double_Infinity_NInfinity() {
+    @Test
+    public void updateProgress_Double_Infinity_NInfinity() {
         TaskShim.updateProgress(task, Double.POSITIVE_INFINITY, Double.NEGATIVE_INFINITY);
         assertEquals(-1, task.getProgress(), 0);
         assertEquals(-1, task.getWorkDone(), 0);
         assertEquals(-1, task.getTotalWork(), 0);
     }
 
-    @Test public void updateProgress_Double_NInfinity_NInfinity() {
+    @Test
+    public void updateProgress_Double_NInfinity_NInfinity() {
         TaskShim.updateProgress(task, Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY);
         assertEquals(-1, task.getProgress(), 0);
         assertEquals(-1, task.getWorkDone(), 0);
         assertEquals(-1, task.getTotalWork(), 0);
     }
 
-    @Test public void updateProgress_Double_Infinity_NaN() {
+    @Test
+    public void updateProgress_Double_Infinity_NaN() {
         TaskShim.updateProgress(task, Double.POSITIVE_INFINITY, Double.NaN);
         assertEquals(-1, task.getProgress(), 0);
         assertEquals(-1, task.getWorkDone(), 0);
         assertEquals(-1, task.getTotalWork(), 0);
     }
 
-    @Test public void updateProgress_Double_NInfinity_NaN() {
+    @Test
+    public void updateProgress_Double_NInfinity_NaN() {
         TaskShim.updateProgress(task, Double.NEGATIVE_INFINITY, Double.NaN);
         assertEquals(-1, task.getProgress(), 0);
         assertEquals(-1, task.getWorkDone(), 0);
         assertEquals(-1, task.getTotalWork(), 0);
     }
 
-    @Test public void updateProgress_Double_NaN_Infinity() {
+    @Test
+    public void updateProgress_Double_NaN_Infinity() {
         TaskShim.updateProgress(task, Double.NaN, Double.POSITIVE_INFINITY);
         assertEquals(-1, task.getProgress(), 0);
         assertEquals(-1, task.getWorkDone(), 0);
         assertEquals(-1, task.getTotalWork(), 0);
     }
 
-    @Test public void updateProgress_Double_NaN_NInfinity() {
+    @Test
+    public void updateProgress_Double_NaN_NInfinity() {
         TaskShim.updateProgress(task, Double.NaN, Double.NEGATIVE_INFINITY);
         assertEquals(-1, task.getProgress(), 0);
         assertEquals(-1, task.getWorkDone(), 0);
         assertEquals(-1, task.getTotalWork(), 0);
     }
 
-    @Test public void updateProgress_Double_NaN_NaN() {
+    @Test
+    public void updateProgress_Double_NaN_NaN() {
         TaskShim.updateProgress(task, Double.NaN, Double.NaN);
         assertEquals(-1, task.getProgress(), 0);
         assertEquals(-1, task.getWorkDone(), 0);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/concurrent/TaskSimpleTest.java b/modules/javafx.graphics/src/test/java/test/javafx/concurrent/TaskSimpleTest.java
index 7bbe9f4c76c..c0b8cc82d5c 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/concurrent/TaskSimpleTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/concurrent/TaskSimpleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,10 +31,13 @@
 import javafx.concurrent.Worker;
 
 import test.javafx.concurrent.mocks.SimpleTask;
-import org.junit.Before;
-import org.junit.Test;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * A Task which simply completes normally. It never throws an Exception.
@@ -44,7 +47,8 @@
 public class TaskSimpleTest {
     private Task<String> task;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         task = new SimpleTask();
 
         // Checks that the running property is always correct.
@@ -62,47 +66,58 @@ public class TaskSimpleTest {
      * Test the initial values for the Task,
      ***********************************************************************/
 
-    @Test public void stateShouldBe_READY_ByDefault() {
+    @Test
+    public void stateShouldBe_READY_ByDefault() {
         assertEquals(Worker.State.READY, task.getState());
     }
 
-    @Test public void workDoneShouldBe_Indeterminate_ByDefault() {
+    @Test
+    public void workDoneShouldBe_Indeterminate_ByDefault() {
         assertEquals(-1, task.getWorkDone(), 0);
     }
 
-    @Test public void totalWorkShouldBe_Indeterminate_ByDefault() {
+    @Test
+    public void totalWorkShouldBe_Indeterminate_ByDefault() {
         assertEquals(-1, task.getTotalWork(), 0);
     }
 
-    @Test public void progressShouldBe_Indeterminate_ByDefault() {
+    @Test
+    public void progressShouldBe_Indeterminate_ByDefault() {
         assertEquals(-1, task.getWorkDone(), 0);
     }
 
-    @Test public void valueShouldBe_Null_ByDefault() {
+    @Test
+    public void valueShouldBe_Null_ByDefault() {
         assertNull(task.getValue());
     }
 
-    @Test public void exceptionShouldBe_Null_ByDefault() {
+    @Test
+    public void exceptionShouldBe_Null_ByDefault() {
         assertNull(task.getException());
     }
 
-    @Test public void runningShouldBe_False_ByDefault() {
+    @Test
+    public void runningShouldBe_False_ByDefault() {
         assertEquals(false, task.isRunning());
     }
 
-    @Test public void messageShouldBe_EmptyString_ByDefault() {
+    @Test
+    public void messageShouldBe_EmptyString_ByDefault() {
         assertEquals("", task.getMessage());
     }
 
-    @Test public void titleShouldBe_EmptyString_ByDefault() {
+    @Test
+    public void titleShouldBe_EmptyString_ByDefault() {
         assertEquals("", task.getTitle());
     }
 
-    @Test public void isCancelledShouldBe_False_ByDefault() {
+    @Test
+    public void isCancelledShouldBe_False_ByDefault() {
         assertEquals(false, task.isCancelled());
     }
 
-    @Test public void isDoneShouldBe_False_ByDefault() {
+    @Test
+    public void isDoneShouldBe_False_ByDefault() {
         assertEquals(false, task.isDone());
     }
 
@@ -114,7 +129,8 @@ public class TaskSimpleTest {
      * exception should be null, running should be false.
      ***********************************************************************/
 
-    @Test public void afterRunningStatesShouldHaveBeen_SCHEDULED_RUNNING_SUCCEEDED() {
+    @Test
+    public void afterRunningStatesShouldHaveBeen_SCHEDULED_RUNNING_SUCCEEDED() {
         final List<Worker.State> states = new ArrayList<>();
         task.stateProperty().addListener((observable, oldValue, newValue) -> {
             states.add(newValue);
@@ -129,47 +145,56 @@ public class TaskSimpleTest {
         });
     }
 
-    @Test public void afterRunningWorkDoneShouldBe_Indeterminate() {
+    @Test
+    public void afterRunningWorkDoneShouldBe_Indeterminate() {
         task.run();
         assertEquals(-1, task.getWorkDone(), 0);
     }
 
-    @Test public void afterRunningTotalWorkShouldBe_Indeterminate() {
+    @Test
+    public void afterRunningTotalWorkShouldBe_Indeterminate() {
         task.run();
         assertEquals(-1, task.getTotalWork(), 0);
     }
 
-    @Test public void afterRunningProgressShouldBe_Indeterminate() {
+    @Test
+    public void afterRunningProgressShouldBe_Indeterminate() {
         task.run();
         assertEquals(-1, task.getWorkDone(), 0);
     }
 
-    @Test public void afterRunningValueShouldBe_Finished() {
+    @Test
+    public void afterRunningValueShouldBe_Finished() {
         task.run();
         assertEquals("Sentinel", task.getValue());
     }
 
-    @Test public void afterRunningExceptionShouldBe_Null() {
+    @Test
+    public void afterRunningExceptionShouldBe_Null() {
         task.run();
         assertNull(task.getException());
     }
 
-    @Test public void afterRunningMessageShouldBe_EmptyString() {
+    @Test
+    public void afterRunningMessageShouldBe_EmptyString() {
         task.run();
         assertEquals("", task.getMessage());
     }
 
-    @Test public void afterRunningTitleShouldBe_EmptyString() {
+    @Test
+    public void afterRunningTitleShouldBe_EmptyString() {
         task.run();
         assertEquals("", task.getTitle());
     }
 
-    @Test public void afterRunning_isCancelled_ShouldBe_False() {
+    @Test
+    public void afterRunning_isCancelled_ShouldBe_False() {
         task.run();
         assertEquals(false, task.isCancelled());
     }
 
-    @Test public void afterRunning_isDone_ShouldBe_True() {
+    @Test
+    public void afterRunning_isDone_ShouldBe_True() {
         task.run();
         assertEquals(true, task.isDone());
     }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/concurrent/TaskSwampEventQueueTest.java b/modules/javafx.graphics/src/test/java/test/javafx/concurrent/TaskSwampEventQueueTest.java
index 0046f5f0b70..37cc3346972 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/concurrent/TaskSwampEventQueueTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/concurrent/TaskSwampEventQueueTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,11 +30,11 @@
 import java.util.concurrent.CyclicBarrier;
 import javafx.concurrent.Task;
 
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-import static org.junit.Assume.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 /**
  * In this test, the Task is going to attempt to totally swamp the
@@ -52,7 +52,8 @@ public class TaskSwampEventQueueTest {
     private Task task;
     private Thread th;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         barrier = new CyclicBarrier(2);
         eventQueue = new ArrayList<>();
         task = new AbstractTask() {
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/css/CssLexerTest.java b/modules/javafx.graphics/src/test/java/test/javafx/css/CssLexerTest.java
index 408363dfc40..05ca0c2059b 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/css/CssLexerTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/css/CssLexerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,38 +35,35 @@
 import java.util.Collections;
 import java.util.List;
 import javafx.css.CssLexerShim;
-import static org.junit.Assert.*;
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
 
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class CssLexerTest {
 
     public CssLexerTest() {
     }
 
-    private void checkTokens(List<TokenShim> resultTokens, TokenShim... expectedTokens)
-        throws org.junit.ComparisonFailure {
+    private void checkTokens(List<TokenShim> resultTokens, TokenShim... expectedTokens) {
 
         if (expectedTokens.length != resultTokens.size()) {
-            throw new org.junit.ComparisonFailure(
-                "lengths do not match",
-                    Arrays.toString(expectedTokens),
-                resultTokens.toString()
+            fail(
+                "lengths do not match; " +
+                "expected: " + Arrays.toString(expectedTokens) +
+                "actual: " + resultTokens.toString()
             );
         }
-
         for (int n = 0; n<expectedTokens.length; n++) {
 
             final TokenShim result = resultTokens.get(n);
             final TokenShim expected = expectedTokens[n];
 
             if (expected.getType() != result.getType()) {
-                throw new org.junit.ComparisonFailure(
-                    "token " + n + " types do not match",
-                    Arrays.toString(expectedTokens),
-                    resultTokens.toString()
+                fail(
+                    "token " + n + " types do not match; " +
+                    "expected: " + Arrays.toString(expectedTokens) +
+                    "actual: " + resultTokens.toString()
                 );
             }
 
@@ -74,10 +71,10 @@ private void checkTokens(List<TokenShim> resultTokens, TokenShim... expectedToke
             final String resultText = result.getText();
 
             if (expectedText == null ? resultText != null : !expectedText.equals(resultText)) {
-                throw new org.junit.ComparisonFailure(
-                    "token " + n + " text does not match",
-                    Arrays.toString(expectedTokens),
-                    resultTokens.toString()
+                fail(
+                    "token " + n + " text does not match; " +
+                    "expected: " + Arrays.toString(expectedTokens) +
+                    "actual: " + resultTokens.toString()
                 );
             }
         }
@@ -100,7 +97,7 @@ List<TokenShim> getTokens(String string) {
         return Collections.unmodifiableList(tokens);
     }
 
-    private void lexDigitsWithUnits(String units, int type) throws org.junit.ComparisonFailure {
+    private void lexDigitsWithUnits(String units, int type) {
 
         checkTokens(getTokens("123"+units), new TokenShim(type, "123"+units), TokenShim.EOF_TOKEN);
         checkTokens(getTokens("123.45"+units), new TokenShim(type, "123.45"+units), TokenShim.EOF_TOKEN);
@@ -323,8 +320,8 @@ public void testTokenOffset() {
 
         for(int n=0; n<tlist.size(); n++) {
             TokenShim tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+            assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
+            assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
 
     }
@@ -355,8 +352,8 @@ public void testTokenLineAndOffsetWithCR() {
 
         for(int n=0; n<tlist.size(); n++) {
             TokenShim tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+            assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
+            assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
 
     }
@@ -387,8 +384,8 @@ public void testTokenLineAndOffsetWithLF() {
 
         for(int n=0; n<tlist.size(); n++) {
             TokenShim tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+            assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
+            assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
 
     }
@@ -419,8 +416,8 @@ public void testTokenLineAndOffsetWithCRLF() {
 
         for(int n=0; n<tlist.size(); n++) {
             TokenShim tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+            assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
+            assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
 
     }
@@ -445,8 +442,8 @@ public void testTokenOffsetWithEmbeddedComment() {
 
         for(int n=0; n<tlist.size(); n++) {
             TokenShim tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+            assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
+            assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
     }
 
@@ -471,8 +468,8 @@ public void testTokenLineAndOffsetWithLeadingComment() {
 
         for(int n=0; n<tlist.size(); n++) {
             TokenShim tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+            assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
+            assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
     }
 
@@ -499,8 +496,8 @@ public void testTokenOffsetWithFunction() {
 
         for(int n=0; n<tlist.size(); n++) {
             TokenShim tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+            assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
+            assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
     }
 
@@ -524,8 +521,8 @@ public void testTokenOffsetWithHash() {
 
         for(int n=0; n<tlist.size(); n++) {
             TokenShim tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+            assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
+            assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
     }
 
@@ -549,8 +546,8 @@ public void testTokenOffsetWithDigits() {
 
         for(int n=0; n<tlist.size(); n++) {
             TokenShim tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+            assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
+            assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
     }
 
@@ -576,8 +573,8 @@ public void testTokenOffsetWithBangImportant() {
 
         for(int n=0; n<tlist.size(); n++) {
             TokenShim tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+            assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
+            assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
     }
 
@@ -603,8 +600,8 @@ public void testTokenOffsetWithSkip() {
 
         for(int n=0; n<tlist.size(); n++) {
             TokenShim tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+            assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
+            assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
     }
 
@@ -628,8 +625,8 @@ public void testTokenOffsetWithInvalid() {
 
         for(int n=0; n<tlist.size(); n++) {
             TokenShim tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+            assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
+            assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
     }
 
@@ -667,8 +664,8 @@ public void testTokenLineAndOffsetMoreFully() {
 
         for(int n=0; n<tlist.size(); n++) {
             TokenShim tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+            assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
+            assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
     }
 
@@ -688,8 +685,8 @@ public void testScanUrl() {
 
         for(int n=0; n<tlist.size(); n++) {
             TokenShim tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+            assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
+            assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
 
     }
@@ -710,8 +707,8 @@ public void testScanUrlWithWhiteSpace() {
 
         for(int n=0; n<tlist.size(); n++) {
             TokenShim tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+            assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
+            assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
 
     }
@@ -732,8 +729,8 @@ public void testScanQuotedUrlWithWhiteSpace() {
 
         for(int n=0; n<tlist.size(); n++) {
             TokenShim tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+            assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
+            assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
 
     }
@@ -754,8 +751,8 @@ public void testScanQuotedUrl() {
 
         for(int n=0; n<tlist.size(); n++) {
             TokenShim tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+            assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
+            assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
 
     }
@@ -776,8 +773,8 @@ public void testScanUrlWithEscapes() {
 
         for(int n=0; n<tlist.size(); n++) {
             TokenShim tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+            assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
+            assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
 
     }
@@ -798,8 +795,8 @@ public void testScanQuotedUrlWithEscapes() {
 
         for(int n=0; n<tlist.size(); n++) {
             TokenShim tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+            assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
+            assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
 
     }
@@ -820,8 +817,8 @@ public void testScanUrlWithSyntaxError() {
 
         for(int n=0; n<tlist.size(); n++) {
             TokenShim tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+            assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
+            assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
 
     }
@@ -842,8 +839,8 @@ public void testScanQuotedUrlWithSyntaxError() {
 
         for(int n=0; n<tlist.size(); n++) {
             TokenShim tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+            assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
+            assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
 
     }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/css/CssMetaDataTest.java b/modules/javafx.graphics/src/test/java/test/javafx/css/CssMetaDataTest.java
index a8c8245c7c8..c5fc31234e6 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/css/CssMetaDataTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/css/CssMetaDataTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -76,11 +76,15 @@
 import javafx.css.Stylesheet;
 import javafx.css.StylesheetShim;
 
-import org.junit.After;
-import org.junit.Test;
-import org.junit.Ignore;
-
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Disabled;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 enum TestEnum {
     LEFT,
@@ -110,7 +114,7 @@ private static void resetStyleManager() {
         sm.hasDefaultUserAgentStylesheet = false;
     }
 
-    @After
+    @AfterEach
     public void cleanup() {
         resetStyleManager();
     }
@@ -272,7 +276,7 @@ static CascadingStyle createCascadingStyle(Selector selector, Declaration declar
         );
     }
 
-    @Ignore("JDK-8234142")
+    @Disabled("JDK-8234142")
     @Test
     public void testGetMatchingStyles() {
 
@@ -378,7 +382,7 @@ public void testGetMatchingStyles() {
         assertTrue(actuals.isEmpty());
     }
 
-    @Ignore("JDK-8234142")
+    @Disabled("JDK-8234142")
     @Test
     public void testGetMatchingStylesWithInlineStyleOnParent() {
 
@@ -501,7 +505,7 @@ public void testGetMatchingStylesWithInlineStyleOnParent() {
         assertTrue(actuals.isEmpty());
     }
 
-    @Ignore("JDK-8234142")
+    @Disabled("JDK-8234142")
     @Test
     public void testGetMatchingStylesWithInlineStyleOnLeaf() {
 
@@ -625,7 +629,7 @@ public void testGetMatchingStylesWithInlineStyleOnLeaf() {
         assertTrue(actuals.isEmpty());
     }
 
-    @Ignore("JDK-8234142")
+    @Disabled("JDK-8234142")
     @Test
     public void testGetMatchingStylesWithInlineStyleOnRootAndLeaf() {
 
@@ -753,7 +757,7 @@ public void testGetMatchingStylesWithInlineStyleOnRootAndLeaf() {
         assertTrue(actuals.isEmpty());
     }
 
-    @Ignore("JDK-8234142")
+    @Disabled("JDK-8234142")
     @Test
     public void testGetMatchingStylesShouldNotReturnAncestorPropertyIfNotInherited() {
 
@@ -862,7 +866,7 @@ public void testGetMatchingStylesShouldNotReturnAncestorPropertyIfNotInherited()
         assertTrue(actuals.isEmpty());
     }
 
-    @Ignore("JDK-8234142")
+    @Disabled("JDK-8234142")
     @Test
     public void testGetMatchingStylesShouldNotReturnInlineAncestorPropertyIfNotInherited() {
 
@@ -965,10 +969,10 @@ public void testGetMatchingStylesShouldNotReturnInlineAncestorPropertyIfNotInher
         for (Style style : expecteds) {
             actuals.remove(style);
         }
-        assertTrue(actuals.toString(), actuals.isEmpty());
+        assertTrue(actuals.isEmpty(), actuals.toString());
     }
 
-    @Ignore("JDK-8234142")
+    @Disabled("JDK-8234142")
     @Test
     public void testGetMatchingStylesReturnsInheritedProperty() {
 
@@ -1049,7 +1053,7 @@ public void testGetMatchingStylesReturnsInheritedProperty() {
         assertTrue(actuals.isEmpty());
     }
 
-    @Ignore("JDK-8234142")
+    @Disabled("JDK-8234142")
     @Test
     public void testGetMatchingStylesReturnsSubProperty() {
 
@@ -1146,7 +1150,7 @@ public void testRT18097() {
                 f = new File(base.toURI());
             }
             //System.err.println(f.getPath());
-            assertTrue("" + f.getCanonicalPath() + " is not a directory", f.isDirectory());
+            assertTrue(f.isDirectory(), "" + f.getCanonicalPath() + " is not a directory");
             recursiveCheck(f, f.getPath().length() - 7);
         } catch (Exception ex) {
             ex.printStackTrace(System.err);
@@ -1171,7 +1175,7 @@ private static void checkClass(Class someClass) {
 
                     what = someClass.getName() + " " + styleable.getProperty();
                     WritableValue writable = styleable.getStyleableProperty(node);
-                    assertNotNull(what, writable);
+                    assertNotNull(writable, what);
 
                     Object defaultValue = writable.getValue();
                     Object initialValue = styleable.getInitialValue((Node) someClass.getDeclaredConstructor().newInstance());
@@ -1182,12 +1186,12 @@ private static void checkClass(Class someClass) {
                         assert(initialValue instanceof Number);
                         double d1 = ((Number)defaultValue).doubleValue();
                         double d2 = ((Number)initialValue).doubleValue();
-                        assertEquals(what, d1, d2, .001);
+                        assertEquals(d1, d2, .001, what);
 
                     } else if (defaultValue != null && defaultValue.getClass().isArray()) {
-                        assertTrue(what, Arrays.equals((Object[])defaultValue, (Object[])initialValue));
+                        assertTrue(Arrays.equals((Object[])defaultValue, (Object[])initialValue), what);
                     } else {
-                        assertEquals(what, defaultValue, initialValue);
+                        assertEquals(defaultValue, initialValue, what);
                     }
 
                 }
@@ -1236,7 +1240,7 @@ private static void recursiveCheck(File directory, int pathLength) {
         }
     }
 
-    @Ignore("JDK-8234143") // Tested CssMetaData#set method, which is deprecated.
+    @Disabled("JDK-8234143") // Tested CssMetaData#set method, which is deprecated.
     @Test
     public void testRT_21185() {
 
@@ -1276,7 +1280,7 @@ public void testRT_21185() {
 
     }
 
-    @Ignore("JDK-8234142")
+    @Disabled("JDK-8234142")
     @Test
     public void testRT_24606() {
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/css/CssParserTest.java b/modules/javafx.graphics/src/test/java/test/javafx/css/CssParserTest.java
index 8751534090b..9532b510678 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/css/CssParserTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/css/CssParserTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,8 +50,14 @@
 import javafx.scene.paint.Stop;
 import javafx.scene.text.Font;
 import javafx.util.Duration;
-import org.junit.Test;
-import static org.junit.Assert.*;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 
 public class CssParserTest {
@@ -64,7 +70,7 @@ public void testRT_16959() {
         // RT-16959 is an infinite loop on incomplete linear gradient
         ParsedValue result = new CssParserShim(instance)
                 .parseExpr("-fx-background-color", "linear-gradient(from 0% 0% to 0% 100%, )");
-        assertNull("parseExpr", result);
+        assertNull(result, "parseExpr");
 
         // The bad syntax should be skipped. The stylesheet should have one
         // linear gradient with colors red, white, blue.
@@ -148,7 +154,7 @@ public void testParseSizeWithInvalidDigits() {
 
         // RT-16959 is an infinite loop on incomplete linear gradient
         ParsedValue result = new CssParserShim(instance).parseExpr("-fx-font-size", "10ptx");
-        assertNull("parseExpr", result);
+        assertNull(result, "parseExpr");
 
         // The bad syntax should be skipped.
         Stylesheet ss = instance.parse(
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/css/DeclarationTest.java b/modules/javafx.graphics/src/test/java/test/javafx/css/DeclarationTest.java
index 46c54687a81..72c6eda1c05 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/css/DeclarationTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/css/DeclarationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,8 +29,8 @@
 import com.sun.javafx.css.ParsedValueImpl;
 
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Collections;
+import java.util.stream.Stream;
 import javafx.css.Declaration;
 import javafx.css.DeclarationShim;
 import javafx.css.RuleShim;
@@ -38,14 +38,12 @@
 import javafx.css.StyleOrigin;
 import javafx.css.Stylesheet;
 import javafx.css.StylesheetShim;
-import org.junit.Test;
-import static org.junit.Assert.*;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-@RunWith(Parameterized.class)
 public class DeclarationTest {
 
     private static class Data {
@@ -62,14 +60,7 @@ private static class Data {
         }
     }
 
-    public DeclarationTest(Data data) {
-        this.data = data;
-    }
-    private final Data data;
-
-
-    @Parameters
-    public static Collection data() {
+    public static Stream<Arguments> data() {
 
         int n = 0;
         final int GI = n++; // green inline
@@ -123,22 +114,21 @@ public static Collection data() {
             }
         };
 
-        return Arrays.asList(new Object[] {
-            new Object[] { new Data(DECLS[GA1], DECLS[GA2], true) },
-            new Object[] { new Data(DECLS[GA1], DECLS[YA1], false) },
-            new Object[] { new Data(DECLS[GA1], DECLS[GI],  false) }
-        });
+        return Stream.of(
+            Arguments.of(new Data(DECLS[GA1], DECLS[GA2], true)),
+            Arguments.of(new Data(DECLS[GA1], DECLS[YA1], false)),
+            Arguments.of(new Data(DECLS[GA1], DECLS[GI],  false))
+        );
     }
 
-    @Test
-    public void testEquals() {
-
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testEquals(Data data) {
         Declaration instance = data.d1;
         Declaration obj = data.d2;
         boolean expected = data.expected;
         boolean actual = instance.equals(obj);
-        assertTrue(data.toString(), expected == actual);
-
+        assertTrue(expected == actual, data.toString());
     }
 
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/css/FontTypeTest.java b/modules/javafx.graphics/src/test/java/test/javafx/css/FontTypeTest.java
index 846002c2dfe..384ae6da767 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/css/FontTypeTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/css/FontTypeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,8 +40,8 @@
 import javafx.scene.text.FontWeight;
 import javafx.scene.text.Text;
 
-import static org.junit.Assert.*;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 
 public class FontTypeTest {
@@ -50,8 +50,8 @@ public FontTypeTest() {
     }
 
     void checkFont(Font expResult, Font result) {
-        assertEquals("family", expResult.getFamily(), result.getFamily());
-        assertEquals("size", expResult.getSize(), result.getSize(), 0.001);
+        assertEquals(expResult.getFamily(), result.getFamily(), "family");
+        assertEquals(expResult.getSize(), result.getSize(), 0.001, "size");
         // TODO: how to check for weight and posture?
     }
     /**
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/css/HonorDeveloperSettingsTest.java b/modules/javafx.graphics/src/test/java/test/javafx/css/HonorDeveloperSettingsTest.java
index 87e3c0bad60..e326a03faca 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/css/HonorDeveloperSettingsTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/css/HonorDeveloperSettingsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,6 @@
 
 package test.javafx.css;
 
-import static org.junit.Assert.*;
-
 import com.sun.javafx.css.StyleManager;
 import com.sun.javafx.PlatformUtil;
 
@@ -38,11 +36,15 @@
 import javafx.scene.text.FontSmoothingType;
 import javafx.scene.text.Text;
 import javafx.stage.Stage;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import static org.junit.Assume.assumeTrue;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 /**
  * AKA: RT-7401. Tests that the pattern used works by testing opacity
@@ -65,19 +67,19 @@ private void resetStyleManager() {
         sm.hasDefaultUserAgentStylesheet = false;
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
         if (PlatformUtil.isUnix()) {
             assumeTrue(Boolean.getBoolean("unstable.test")); // JDK-8267425
         }
     }
 
-    @After
+    @AfterEach
     public void cleanup() {
         resetStyleManager();
     }
 
-    @Before
+    @BeforeEach
     public void setUp() {
         rect = new Rectangle();
         rect.setId("rectangle");
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/css/InsetsTypeTest.java b/modules/javafx.graphics/src/test/java/test/javafx/css/InsetsTypeTest.java
index ae69efb1dce..c921f643a41 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/css/InsetsTypeTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/css/InsetsTypeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,17 +25,17 @@
 
 package test.javafx.css;
 
-import static org.junit.Assert.assertEquals;
 import javafx.geometry.Insets;
 import javafx.scene.text.Font;
 
-import org.junit.Before;
-import org.junit.Test;
-
 import javafx.css.CssParser;
 import javafx.css.ParsedValue;
 import javafx.css.Stylesheet;
 
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 
 public class InsetsTypeTest {
 
@@ -58,7 +58,7 @@ public class InsetsTypeTest {
           {4.0f, 0.0f, 1.0f} }
     };
 
-    @Before
+    @BeforeEach
     public void setup() {
         css = new String[fvals.length];
         expResults = new Insets[fvals.length][];
@@ -93,10 +93,10 @@ final Insets makeInsets(float[] vals) {
     }
 
     void checkInsets(String msg, Insets expResult, Insets result) {
-        assertEquals(msg + "top", expResult.getTop(), result.getTop(), 0.01);
-        assertEquals(msg + "right", expResult.getRight(), result.getRight(), 0.01);
-        assertEquals(msg + "bottom", expResult.getBottom(), result.getBottom(), 0.01);
-        assertEquals(msg + "left", expResult.getLeft(), result.getLeft(), 0.01);
+        assertEquals(expResult.getTop(), result.getTop(), 0.01, msg + "top");
+        assertEquals(expResult.getRight(), result.getRight(), 0.01, msg + "right");
+        assertEquals(expResult.getBottom(), result.getBottom(), 0.01, msg + "bottom");
+        assertEquals(expResult.getLeft(), result.getLeft(), 0.01, msg + "left");
     }
 
     @Test
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/css/Node_cssStateTransition_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/css/Node_cssStateTransition_Test.java
index 0c0e78bd1cc..c00f78b7460 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/css/Node_cssStateTransition_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/css/Node_cssStateTransition_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
 
 package test.javafx.css;
 
-
 import com.sun.javafx.css.StyleManager;
 
 import java.io.IOException;
@@ -39,11 +38,12 @@
 import javafx.scene.paint.Color;
 import javafx.scene.paint.Paint;
 import javafx.scene.shape.Rectangle;
-import static org.junit.Assert.*;
 
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class Node_cssStateTransition_Test {
 
@@ -59,12 +59,12 @@ private static void resetStyleManager() {
         sm.hasDefaultUserAgentStylesheet = false;
     }
 
-    @Before
+    @BeforeEach
     public void setUp() {
         resetStyleManager();
     }
 
-    @AfterClass
+    @AfterAll
     public static void cleanupOnce() {
         resetStyleManager();
     }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/css/Node_cssStyleMap_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/css/Node_cssStyleMap_Test.java
index 292ca597fba..b295377ce08 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/css/Node_cssStyleMap_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/css/Node_cssStyleMap_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -57,11 +57,12 @@
 import javafx.scene.shape.Rectangle;
 import javafx.scene.text.Text;
 
-import static org.junit.Assert.*;
-
-import org.junit.After;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class Node_cssStyleMap_Test {
 
@@ -89,7 +90,7 @@ private void checkFoundStyle(Property<?> property, Map<StyleableProperty<?>, Lis
                 break;
             }
         }
-        assertNotNull(pname, declaration);
+        assertNotNull(declaration, pname);
 
         Style style = null;
         for(Style s : styles) {
@@ -98,7 +99,7 @@ private void checkFoundStyle(Property<?> property, Map<StyleableProperty<?>, Lis
                 break;
             }
         }
-        assertNotNull(pname, style);
+        assertNotNull(style, pname);
 
         assert(style.getDeclaration() == declaration);
 
@@ -113,12 +114,12 @@ private static void resetStyleManager() {
         sm.hasDefaultUserAgentStylesheet = false;
     }
 
-    @After
+    @AfterEach
     public void cleanup() {
         resetStyleManager();
     }
 
-    @Ignore("JDK-8234241")
+    @Disabled("JDK-8234241")
     @Test
     public void testStyleMap() {
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/css/PaintTypeTest.java b/modules/javafx.graphics/src/test/java/test/javafx/css/PaintTypeTest.java
index 69171637798..28a91f3d74c 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/css/PaintTypeTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/css/PaintTypeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,8 +41,9 @@
 import javafx.css.Stylesheet;
 import javafx.css.converter.PaintConverter;
 import javafx.css.converter.StopConverter;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 
 public class PaintTypeTest {
@@ -180,7 +181,7 @@ public void testPaintTypeWithCSS() {
 
             for(int j=0; j<paints.length; j++) {
                 String msg = Integer.toString(i) + "." + Integer.toString(j);
-                assertEquals(msg, expResults[i][j], paints[j][0]);
+                assertEquals(expResults[i][j], paints[j][0], msg);
             }
         }
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/css/ParsedValueTest.java b/modules/javafx.graphics/src/test/java/test/javafx/css/ParsedValueTest.java
index 3c670be3082..b3e08be41f2 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/css/ParsedValueTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/css/ParsedValueTest.java
@@ -25,10 +25,6 @@
 
 package test.javafx.css;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 import com.sun.javafx.css.ParsedValueImpl;
 import javafx.css.StylesheetShim;
 import javafx.css.StyleConverter.StringStore;
@@ -36,8 +32,6 @@
 
 import javafx.scene.text.Font;
 
-import org.junit.Test;
-
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
@@ -47,6 +41,12 @@
 import javafx.css.Size;
 import javafx.css.SizeUnits;
 
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
 public class ParsedValueTest {
 
     public ParsedValueTest() {
@@ -406,7 +406,7 @@ private void writeBinary(ParsedValueImpl parsedValue) {
             parsedValue.writeBinary(dos, stringStore);
             dos.close();
         } catch (IOException ioe) {
-            org.junit.Assert.fail(parsedValue.toString());
+            fail(parsedValue.toString());
         }
 
     }
@@ -495,10 +495,10 @@ private void writeAndReadBinary(ParsedValueImpl<?,?> parsedValue) {
             ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
             DataInputStream dis = new DataInputStream(bais);
             ParsedValue<?,?> pv = ParsedValueImpl.readBinary(StylesheetShim.BINARY_CSS_VERSION, dis, strings);
-            org.junit.Assert.assertEquals(parsedValue, pv);
+            assertEquals(parsedValue, pv);
         } catch (IOException ioe) {
             System.err.println(ioe);
-            org.junit.Assert.fail(parsedValue.toString());
+            fail(parsedValue.toString());
         }
 
     }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/css/RuleTest.java b/modules/javafx.graphics/src/test/java/test/javafx/css/RuleTest.java
index 09fd2040344..c0373e2ed6f 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/css/RuleTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/css/RuleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,11 +42,14 @@
 import javafx.css.StyleOrigin;
 import javafx.css.Stylesheet;
 import javafx.scene.Node;
-import org.junit.AfterClass;
-import org.junit.Test;
-import static org.junit.Assert.*;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
 
 
 public class RuleTest {
@@ -54,11 +57,11 @@ public class RuleTest {
     public RuleTest() {
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() throws Exception {
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDownClass() throws Exception {
     }
 
@@ -153,7 +156,7 @@ public void testGetOriginAfterRemovingRuleFromStylesheet() {
         assertNull(result);
     }
 
-    @Ignore("JDK-8234154")
+    @Disabled("JDK-8234154")
     @Test
     public void testApplies() {
         System.out.println("applies");
@@ -165,7 +168,7 @@ public void testApplies() {
         fail("The test case is a prototype.");
     }
 
-    @Ignore("JDK-8234154")
+    @Disabled("JDK-8234154")
     @Test
     public void testWriteBinary() throws Exception {
         System.out.println("writeBinary");
@@ -176,7 +179,7 @@ public void testWriteBinary() throws Exception {
         fail("The test case is a prototype.");
     }
 
-    @Ignore("JDK-8234154")
+    @Disabled("JDK-8234154")
     @Test
     public void testReadBinary() throws Exception {
         System.out.println("readBinary");
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/css/SelectorPartitioningTest.java b/modules/javafx.graphics/src/test/java/test/javafx/css/SelectorPartitioningTest.java
index 47771bec293..de910e1bb52 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/css/SelectorPartitioningTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/css/SelectorPartitioningTest.java
@@ -29,7 +29,7 @@
 import com.sun.javafx.css.SimpleSelector;
 
 import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import java.util.List;
 import javafx.css.CssParser;
 import javafx.css.Declaration;
@@ -39,21 +39,18 @@
 import javafx.css.Selector;
 import javafx.css.Stylesheet;
 import javafx.scene.paint.Color;
-import org.junit.Test;
-import static org.junit.Assert.*;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-@RunWith(Parameterized.class)
 public class SelectorPartitioningTest {
 
-    public SelectorPartitioningTest(final Data data) {
-        this.data = data;
+    public SelectorPartitioningTest() {
         this.instance = new SelectorPartitioning();
     }
-    private final Data data;
     private final SelectorPartitioning instance;
 
     private static class Data {
@@ -119,45 +116,44 @@ static String combineStylesheets(Data... data) {
     }
 
 
-    @Parameters
-    public static Collection data() {
+    public static Stream<Arguments> data() {
 
         int red = 0;
         int green = 0;
         int blue = 0;
-        return Arrays.asList(new Object[] {
+        return Stream.of (
             /* selector = * */
-            new Object[] {new SimpleData("*", null, null, Color.rgb(red += 10, 0, 0))},
+            Arguments.of(new SimpleData("*", null, null, Color.rgb(red += 10, 0, 0))),
             /* selector = A */
-            new Object[] {new SimpleData("A", null, null, Color.rgb(red += 10, 0, 0))},
+            Arguments.of(new SimpleData("A", null, null, Color.rgb(red += 10, 0, 0))),
             /* selector = * A.b */
-            new Object[] {new SimpleData("A", "b", null, Color.rgb(red += 10, 0, 0))},
+            Arguments.of(new SimpleData("A", "b", null, Color.rgb(red += 10, 0, 0))),
             /* selector = A#c */
-            new Object[] {new SimpleData("A", null, "c", Color.rgb(red += 10, 0, 0))},
+            Arguments.of(new SimpleData("A", null, "c", Color.rgb(red += 10, 0, 0))),
             /* selector = A.b#c */
-            new Object[] {new SimpleData("A", "b", "c", Color.rgb(red += 10, 0, 0))},
+            Arguments.of(new SimpleData("A", "b", "c", Color.rgb(red += 10, 0, 0))),
             /* selector = *.b */
-            new Object[] {new SimpleData("*", "b", null, Color.rgb(red += 10, 0, 0))},
+            Arguments.of(new SimpleData("*", "b", null, Color.rgb(red += 10, 0, 0))),
             /* selector = *#c */
-            new Object[] {new SimpleData("*", null, "c", Color.rgb(red += 10, 0, 0))},
+            Arguments.of(new SimpleData("*", null, "c", Color.rgb(red += 10, 0, 0))),
             /* selector = *.b#c */
-            new Object[] {new SimpleData("*", "b", "c", Color.rgb(red += 10, 0, 0))},
+            Arguments.of(new SimpleData("*", "b", "c", Color.rgb(red += 10, 0, 0))),
 
-            new Object[] {
+            Arguments.of(
                 new ComplexData(
                     (SimpleSelector)Selector.createSelector("*.b"),
                     new SimpleData("*", "b", null, Color.rgb(0, green += 10, 0), true),
                     new SimpleData("*", "c", null, Color.rgb(0, green += 10, 0), false),
                     new SimpleData("*", "b.c", null, Color.rgb(0, green += 10, 0), false)
-                )},
-            new Object[] {
+                )),
+            Arguments.of(
                 new ComplexData(
                     (SimpleSelector)Selector.createSelector("*.b.c"),
                     new SimpleData("*", "b", null, Color.rgb(0, green += 10, 0), true),
                     new SimpleData("*", "c", null, Color.rgb(0, green += 10, 0), true),
                     new SimpleData("*", "b.c", null, Color.rgb(0, green += 10, 0), true)
-                )},
-            new Object[] {
+                )),
+            Arguments.of(
                 new ComplexData(
                     (SimpleSelector)Selector.createSelector("A.b"),
                     new SimpleData("*", "b", null, Color.rgb(0, green += 10, 0), true),
@@ -165,8 +161,8 @@ public static Collection data() {
                     new SimpleData("*", null, null, Color.rgb(0, green += 10, 0), true),
                     new SimpleData("*", "c", null, Color.rgb(0, green += 10, 0), false),
                     new SimpleData("*", "b.c", null, Color.rgb(0, green += 10, 0), false)
-                )},
-            new Object[] {
+                )),
+            Arguments.of(
                 new ComplexData(
                     (SimpleSelector)Selector.createSelector("A.c"),
                     new SimpleData("*", "b", null, Color.rgb(0, green += 10, 0), false),
@@ -174,8 +170,8 @@ public static Collection data() {
                     new SimpleData("*", null, null, Color.rgb(0, green += 10, 0), true),
                     new SimpleData("*", "c", null, Color.rgb(0, green += 10, 0), true),
                     new SimpleData("*", "b.c", null, Color.rgb(0, green += 10, 0), false)
-                )},
-            new Object[] {
+                )),
+            Arguments.of(
                 new ComplexData(
                     (SimpleSelector)Selector.createSelector("A.b.c"),
                     new SimpleData("*", "b", null, Color.rgb(0, green += 10, 0), true),
@@ -183,12 +179,13 @@ public static Collection data() {
                     new SimpleData("*", null, null, Color.rgb(0, green += 10, 0), true),
                     new SimpleData("*", "c", null, Color.rgb(0, green += 10, 0), true),
                     new SimpleData("*", "b.c", null, Color.rgb(0, green += 10, 0), true)
-                )}
-        });
+                ))
+        );
     }
 
-    @Test
-    public void testSelectorPartitionAndMatch() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testSelectorPartitionAndMatch(Data data) {
 
         Stylesheet stylesheet =
                 new CssParser().parse(data.stylesheetText);
@@ -224,9 +221,9 @@ private void testWithSimpleData(SimpleData simpleData, Stylesheet stylesheet) {
 
         Color color = (Color)DeclarationShim.get_parsedValue(decl).convert(null);
 
-        assertEquals(simpleData.selector.toString(), data.color.getRed(), color.getRed(), 0.00001);
-        assertEquals(simpleData.selector.toString(), data.color.getGreen(), color.getGreen(), 0.00001);
-        assertEquals(simpleData.selector.toString(), data.color.getBlue(), color.getBlue(), 0.00001);
+        assertEquals(simpleData.color.getRed(), color.getRed(), 0.00001, simpleData.selector.toString());
+        assertEquals(simpleData.color.getGreen(), color.getGreen(), 0.00001, simpleData.selector.toString());
+        assertEquals(simpleData.color.getBlue(), color.getBlue(), 0.00001, simpleData.selector.toString());
 
     }
 
@@ -241,7 +238,7 @@ private void testWithComplexData(ComplexData complexData, Stylesheet stylesheet)
             for (SimpleData datum : complexData.data) {
                 Selector s2 = datum.selector;
                 if (s1.equals(s2)) {
-                    assertTrue(s1.toString() + " != " + s2.toString(), datum.matches);
+                    assertTrue(datum.matches, s1.toString() + " != " + s2.toString());
                 }
             }
         }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/css/SizeTest.java b/modules/javafx.graphics/src/test/java/test/javafx/css/SizeTest.java
index 9a6a724e39b..c79cee6ee53 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/css/SizeTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/css/SizeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,10 +28,10 @@
 import javafx.css.Size;
 import javafx.css.SizeShim;
 import javafx.css.SizeUnits;
-import static org.junit.Assert.assertEquals;
 import javafx.scene.text.Font;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 
 public class SizeTest {
@@ -54,48 +54,48 @@ public void testPoints() {
         Size instance = new Size(12.0, SizeUnits.PX);
         double expResult = 12.0  * (POINTS_PER_INCH/DOTS_PER_INCH);
         double result = SizeShim.points(instance, font);
-        assertEquals("px", expResult, result, 0.01);
+        assertEquals(expResult, result, 0.01, "px");
 
         instance = new Size(12.0, SizeUnits.PT);
         expResult = 12.0; // PT is absolute
         result = SizeShim.points(instance, font);
-        assertEquals("pt", expResult, result, 0.01);
+        assertEquals(expResult, result, 0.01, "pt");
 
         instance = new Size(50.0, SizeUnits.PERCENT);
         expResult = 0.5 * pointSize;
         result = SizeShim.points(instance, pointSize, font);
-        assertEquals("%", expResult, result, 0.01);
+        assertEquals(expResult, result, 0.01, "%");
 
         instance = new Size(2, SizeUnits.EM);
         expResult = 2 * pointSize;
         result = SizeShim.points(instance, font);
-        assertEquals("em", expResult, result, 0.01);
+        assertEquals(expResult, result, 0.01, "em");
 
         instance = new Size(1.0, SizeUnits.EX);
         expResult = 0.5 * pointSize;
         result = SizeShim.points(instance, font);
-        assertEquals("ex", expResult, result, 0.01);
+        assertEquals(expResult, result, 0.01, "ex");
 
 
         instance = new Size(1.0, SizeUnits.CM);
         expResult = POINTS_PER_INCH/2.54; // CM is absolute (pts per inch/cm per inch)
         result = SizeShim.points(instance, font);
-        assertEquals("cm", expResult, result, 0.01);
+        assertEquals(expResult, result, 0.01, "cm");
 
         instance = new Size(1.0, SizeUnits.MM);
         expResult = POINTS_PER_INCH/25.4; // MM is absolute (pts per inch/mm per inch)
         result = SizeShim.points(instance, font);
-        assertEquals("mm", expResult, result, 0.01);
+        assertEquals(expResult, result, 0.01, "mm");
 
         instance = new Size(1.0, SizeUnits.IN);
         expResult = POINTS_PER_INCH; // IN is absolute (pts per inch)
         result = SizeShim.points(instance, font);
-        assertEquals("in", expResult, result, 0.01);
+        assertEquals(expResult, result, 0.01, "in");
 
         instance = new Size(1.0, SizeUnits.PC);
         expResult = 12.0; // PC is absolute (pts per pica)
         result = SizeShim.points(instance, font);
-        assertEquals("pc", expResult, result, 0.01);
+        assertEquals(expResult, result, 0.01, "pc");
 
     }
 
@@ -111,50 +111,50 @@ public void testPixels() {
         Size instance = new Size(12.0, SizeUnits.PX);
         double expResult = 12.0;
         double result = instance.pixels(font);
-        assertEquals("px", expResult, result, 0.01);
+        assertEquals(expResult, result, 0.01, "px");
 
         instance = new Size(12.0, SizeUnits.PT);
         expResult = 12.0 * (DOTS_PER_INCH / POINTS_PER_INCH);
         result = instance.pixels(font);
-        assertEquals("pt", expResult, result, 0.01);
+        assertEquals(expResult, result, 0.01, "pt");
 
         instance = new Size(50.0, SizeUnits.PERCENT);
         expResult = .5 * pixelSize;
         result = instance.pixels(pixelSize, font);
-        assertEquals("%", expResult, result, 0.01);
+        assertEquals(expResult, result, 0.01, "%");
 
         instance = new Size(2, SizeUnits.EM);
         expResult = 2 * pixelSize;
         result = instance.pixels(font);
-        assertEquals("em", expResult, result, 0.01);
+        assertEquals(expResult, result, 0.01, "em");
 
         instance = new Size(1.0, SizeUnits.EX);
         expResult = .5 * pixelSize;
         result = instance.pixels(font);
-        assertEquals("ex", expResult, result, 0.01);
+        assertEquals(expResult, result, 0.01, "ex");
 
         instance = new Size(1.0, SizeUnits.CM);
         // 1 cm / cm per inch
         expResult = (1/2.54f) * DOTS_PER_INCH;
         result = instance.pixels(font);
-        assertEquals("cm", expResult, result, 0.01);
+        assertEquals(expResult, result, 0.01, "cm");
 
         instance = new Size(1.0, SizeUnits.MM);
         // 1mm / mm per inch
         expResult = (1/25.4f) * DOTS_PER_INCH;
         result = instance.pixels(font);
-        assertEquals("mm", expResult, result, 0.01f);
+        assertEquals(expResult, result, 0.01f, "mm");
 
         instance = new Size(1.0, SizeUnits.IN);
         expResult = DOTS_PER_INCH;
         result = instance.pixels(font);
-        assertEquals("in", expResult, result, 0.01f);
+        assertEquals(expResult, result, 0.01f, "in");
 
         instance = new Size(1.0, SizeUnits.PC);
         // 1pc * 12 pt per pc yields points, then convert points to pixels
         expResult = (1*12.0) * (DOTS_PER_INCH / POINTS_PER_INCH);
         result = instance.pixels(1.0, font);
-        assertEquals("pc", expResult, result, 0.01f);
+        assertEquals(expResult, result, 0.01f, "pc");
 
     }
 
@@ -171,15 +171,15 @@ public void testAngles() {
 
         Size instance = new Size(0.5*Math.PI, SizeUnits.RAD);
         double result = instance.pixels();
-        assertEquals("1/2pi rad to deg", expResult, result, 0.01);
+        assertEquals(expResult, result, 0.01, "1/2pi rad to deg");
 
         instance = new Size(100, SizeUnits.GRAD);
         result = instance.pixels();
-        assertEquals("100grad to deg", expResult, result, 0.01);
+        assertEquals(expResult, result, 0.01, "100grad to deg");
 
         instance = new Size(.25, SizeUnits.TURN);
         result = instance.pixels();
-        assertEquals(".25turn to deg", expResult, result, 0.01);
+        assertEquals(expResult, result, 0.01, ".25turn to deg");
     }
 
     /**
@@ -192,11 +192,11 @@ public void testTime() {
 
         Size instance = new Size(90, SizeUnits.S);
         double result = instance.pixels();
-        assertEquals("90s", expResult, result, 0.01);
+        assertEquals(expResult, result, 0.01, "90s");
 
         instance = new Size(90, SizeUnits.MS);
         result = instance.pixels();
-        assertEquals("90ms", expResult, result, 0.01);
+        assertEquals(expResult, result, 0.01, "90ms");
 
     }
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/css/StyleTest.java b/modules/javafx.graphics/src/test/java/test/javafx/css/StyleTest.java
index 6ffab691caa..a7d34aff123 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/css/StyleTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/css/StyleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,7 @@
 
 package test.javafx.css;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.css.CssParser;
 import javafx.css.Declaration;
 import javafx.css.Rule;
@@ -34,14 +33,12 @@
 import javafx.css.Selector;
 import javafx.css.Style;
 import javafx.css.Stylesheet;
-import org.junit.Test;
-import static org.junit.Assert.*;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-@RunWith(Parameterized.class)
 public class StyleTest {
 
     private static class Data {
@@ -58,11 +55,6 @@ private static class Data {
         }
     }
 
-    public StyleTest(Data data) {
-        this.data = data;
-    }
-    private final Data data;
-
     private static Style createStyle(String stylesheetText) {
 
         Stylesheet stylesheet = new CssParser().parse(stylesheetText);
@@ -72,43 +64,43 @@ private static Style createStyle(String stylesheetText) {
         return new Style(sel, decl);
     }
 
-    @Parameters
-    public static Collection data() {
+    public static Stream<Arguments> data() {
 
-        return Arrays.asList(new Object[] {
-            new Object[] { new Data("*.style { -fx-fill: red; }",
-                                    "*.style { -fx-fill: red; }", true) },
-            new Object[] { new Data("*.style { -fx-fill: red; }",
-                                    "*.bad   { -fx-fill: red; }", false) },
-            new Object[] { new Data("*.style:p { -fx-fill: red; }",
-                                    "*.style:p { -fx-fill: red; }", true) },
-            new Object[] { new Data("*.style:p { -fx-fill: red; }",
-                                    "*.style:q { -fx-fill: red; }", false) },
-            new Object[] { new Data("*.style:p { -fx-fill: red; }",
-                                    "*.bad:p   { -fx-fill: red; }", false) },
-            new Object[] { new Data("*.style#c { -fx-fill: red; }",
-                                    "*.style#c { -fx-fill: red; }", true) },
-            new Object[] { new Data("*.style#c { -fx-fill: red; }",
-                                    "*.style#d { -fx-fill: red; }", false) },
-            new Object[] { new Data("*.style#c:p { -fx-fill: red; }",
-                                    "*.style#c:p { -fx-fill: red; }", true) },
-            new Object[] { new Data("*.style#c:p { -fx-fill: red; }",
-                                    "*.style#c:q { -fx-fill: red; }", false) },
-            new Object[] { new Data("*.style { -fx-fill: red; }",
-                                    "*.style { -fx-fill: green; }", false) },
-            new Object[] { new Data("*.style { -fx-border-color: red; }",
-                                    "*.style { -fx-fill: red; }", false) },
-        });
+        return Stream.of(
+            Arguments.of( new Data("*.style { -fx-fill: red; }",
+                                   "*.style { -fx-fill: red; }", true) ),
+            Arguments.of( new Data("*.style { -fx-fill: red; }",
+                                   "*.bad   { -fx-fill: red; }", false) ),
+            Arguments.of( new Data("*.style:p { -fx-fill: red; }",
+                                   "*.style:p { -fx-fill: red; }", true) ),
+            Arguments.of( new Data("*.style:p { -fx-fill: red; }",
+                                   "*.style:q { -fx-fill: red; }", false) ),
+            Arguments.of( new Data("*.style:p { -fx-fill: red; }",
+                                   "*.bad:p   { -fx-fill: red; }", false) ),
+            Arguments.of( new Data("*.style#c { -fx-fill: red; }",
+                                   "*.style#c { -fx-fill: red; }", true) ),
+            Arguments.of( new Data("*.style#c { -fx-fill: red; }",
+                                   "*.style#d { -fx-fill: red; }", false) ),
+            Arguments.of( new Data("*.style#c:p { -fx-fill: red; }",
+                                   "*.style#c:p { -fx-fill: red; }", true) ),
+            Arguments.of( new Data("*.style#c:p { -fx-fill: red; }",
+                                   "*.style#c:q { -fx-fill: red; }", false) ),
+            Arguments.of( new Data("*.style { -fx-fill: red; }",
+                                   "*.style { -fx-fill: green; }", false) ),
+            Arguments.of( new Data("*.style { -fx-border-color: red; }",
+                                   "*.style { -fx-fill: red; }", false) )
+        );
     }
 
-    @Test
-    public void testEquals() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testEquals(Data data) {
 
         Style instance = createStyle(data.s1);
         Style obj = createStyle(data.s2);
         boolean expected = data.expected;
         boolean actual = instance.equals(obj);
-        assertTrue(data.toString(), expected == actual);
+        assertTrue(expected == actual, data.toString());
 
     }
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/css/StyleablePropertyFactoryTest.java b/modules/javafx.graphics/src/test/java/test/javafx/css/StyleablePropertyFactoryTest.java
index a2e9729d9c5..1a9c1e4b209 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/css/StyleablePropertyFactoryTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/css/StyleablePropertyFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,16 +42,8 @@
 import javafx.scene.paint.Stop;
 import javafx.scene.text.Font;
 import javafx.util.Duration;
-import org.hamcrest.BaseMatcher;
-import org.hamcrest.CoreMatchers;
-import org.hamcrest.Description;
-import org.hamcrest.Matcher;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import java.util.List;
 import javafx.css.CssMetaData;
 import javafx.css.Styleable;
@@ -59,9 +51,16 @@
 import javafx.css.StyleablePropertyFactory;
 import javafx.css.SimpleStyleableBooleanProperty;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import org.hamcrest.BaseMatcher;
+import org.hamcrest.CoreMatchers;
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+import static org.hamcrest.MatcherAssert.assertThat;
 
-@RunWith(Parameterized.class)
 public class StyleablePropertyFactoryTest {
 
     private static class Data<T> {
@@ -83,20 +82,13 @@ private static class Data<T> {
         }
     }
 
-    private final Data data;
-
-    public StyleablePropertyFactoryTest(Data data) {
-        this.data = data;
-    }
-
-    @Parameterized.Parameters
-    public static Collection<Data[]> data() {
+    public static Stream<Arguments> data() {
 
-        return Arrays.asList(new Data[][]{
-                {new Data("myBoolean", "-my-boolean: true;", Boolean.TRUE)},
-                {new Data("myColor", "-my-color: red;", Color.RED)},
-                {new Data("myDuration", "-my-duration: 30ms;", Duration.millis(30))},
-                {new Data("myEffect", "-my-effect: innershadow(gaussian, red, 10, .5, 1, 1);",
+        return Stream.of(
+            Arguments.of(new Data("myBoolean", "-my-boolean: true;", Boolean.TRUE)),
+            Arguments.of(new Data("myColor", "-my-color: red;", Color.RED)),
+            Arguments.of(new Data("myDuration", "-my-duration: 30ms;", Duration.millis(30))),
+            Arguments.of(new Data("myEffect", "-my-effect: innershadow(gaussian, red, 10, .5, 1, 1);",
                         new InnerShadow(BlurType.GAUSSIAN, Color.RED, 10, .5, 1, 1),
                         new BaseMatcher<InnerShadow>() {
                             @Override
@@ -114,26 +106,26 @@ public void describeTo(Description description) {
                                 description.appendText("InnerShadow(BlurType.GAUSSIAN, Color.RED, 10, .5, 1, 1)");
                             }
                         })
-                },
-                {new Data("myPos", "-my-pos: bottom-right;", Pos.BOTTOM_RIGHT)},
-                {new Data("myFont", "-my-font: 18 system;", Font.font("system", 18))},
-                {new Data("myInsets", "-my-insets: 1 2 3 4;", new Insets(1,2,3,4))},
-                {new Data("myInsets", "-my-insets: 5;", new Insets(5,5,5,5))},
-                {new Data("myInsets", "-my-insets: 7 8;", new Insets(7,8,7,8))},
-                {new Data("myInsets", "-my-insets: 9 10 11;", new Insets(9,10,11,10))},
-                {new Data("myPaint", "-my-paint: linear-gradient(from 0% 0% to 100% 100%, red 0%, black 100%);",
+                ),
+            Arguments.of(new Data("myPos", "-my-pos: bottom-right;", Pos.BOTTOM_RIGHT)),
+            Arguments.of(new Data("myFont", "-my-font: 18 system;", Font.font("system", 18))),
+            Arguments.of(new Data("myInsets", "-my-insets: 1 2 3 4;", new Insets(1,2,3,4))),
+            Arguments.of(new Data("myInsets", "-my-insets: 5;", new Insets(5,5,5,5))),
+            Arguments.of(new Data("myInsets", "-my-insets: 7 8;", new Insets(7,8,7,8))),
+            Arguments.of(new Data("myInsets", "-my-insets: 9 10 11;", new Insets(9,10,11,10))),
+            Arguments.of(new Data("myPaint", "-my-paint: linear-gradient(from 0% 0% to 100% 100%, red 0%, black 100%);",
                         new LinearGradient(0,0,1,1,true, CycleMethod.NO_CYCLE,new Stop[] { new Stop(0,Color.RED), new Stop(1,Color.BLACK) }))
-                },
-                {new Data("myNumber", "-my-number: 2em;", Font.getDefault().getSize()*2)},
-                {new Data("myString", "-my-string: \"yaba daba do\";", "yaba daba do")},
-                {new Data("myUrl", "-my-url: url('http://www.oracle.com');", "http://www.oracle.com")},
-                {new Data("mySelected", "-my-selected: false;", Boolean.FALSE)}
-        });
-
+                ),
+            Arguments.of(new Data("myNumber", "-my-number: 2em;", Font.getDefault().getSize()*2)),
+            Arguments.of(new Data("myString", "-my-string: \"yaba daba do\";", "yaba daba do")),
+            Arguments.of(new Data("myUrl", "-my-url: url('http://www.oracle.com');", "http://www.oracle.com")),
+            Arguments.of(new Data("mySelected", "-my-selected: false;", Boolean.FALSE))
+        );
     }
 
-    @Test
-    public void theTest() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void theTest(Data data) {
         MyStyleable styleable = new MyStyleable();
         styleable.setStyle(data.style);
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/css/StyleablePropertyFactory_createMethod_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/css/StyleablePropertyFactory_createMethod_Test.java
index 1545ec2270d..b396d935f66 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/css/StyleablePropertyFactory_createMethod_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/css/StyleablePropertyFactory_createMethod_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,14 +36,9 @@
 import javafx.scene.paint.Paint;
 import javafx.scene.text.Font;
 import javafx.util.Duration;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 
 import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import java.util.List;
 import java.util.function.Function;
 import javafx.css.CssMetaData;
@@ -54,17 +49,20 @@
 import javafx.css.StyleablePropertyFactory;
 import javafx.css.StyleablePropertyFactoryShim;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.fail;
-import static org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.fail;
 
-@RunWith(Parameterized.class)
 public class StyleablePropertyFactory_createMethod_Test {
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         StyleablePropertyFactoryShim.clearDataForTesting(MyStyleable.styleablePropertyFactory);
         StyleablePropertyFactoryShim.clearDataForTesting(MyStyleable1.styleablePropertyFactory);
         StyleablePropertyFactoryShim.clearDataForTesting(MyStyleable2.styleablePropertyFactory);
@@ -83,28 +81,21 @@ private static class Data<T> {
         }
     }
 
-    private final Data data;
-    public StyleablePropertyFactory_createMethod_Test(Data data) {
-        this.data = data;
-    }
-
-    @Parameters
-    public static Collection<Data[]> data() {
-
-        return Arrays.asList(new Data[][] {
-                { new Data("createStyleableBooleanProperty", StyleConverter.getBooleanConverter(), Boolean.TRUE) },
-                { new Data("createStyleableColorProperty",   StyleConverter.getColorConverter(), Color.YELLOW)   },
-                { new Data("createStyleableDurationProperty",   StyleConverter.getDurationConverter(), Duration.millis(30))   },
-                { new Data("createStyleableEffectProperty",  StyleConverter.getEffectConverter(), new InnerShadow(10d, Color.RED)) },
-                { new Data("createStyleableEnumProperty", StyleConverter.getEnumConverter(Pos.class), Pos.CENTER) },
-                { new Data("createStyleableFontProperty", StyleConverter.getFontConverter(), Font.font(18)) },
-                { new Data("createStyleableInsetsProperty", StyleConverter.getInsetsConverter(), new Insets(1,1,1,1)) },
-                { new Data("createStyleableNumberProperty", StyleConverter.getSizeConverter(), Double.valueOf(42d)) },
-                { new Data("createStyleablePaintProperty", StyleConverter.getPaintConverter(), Color.BLUE) },
-                { new Data("createStyleableStringProperty", StyleConverter.getStringConverter(), "ABC") },
-                { new Data("createStyleableUrlProperty", StyleConverter.getUrlConverter(), "http://oracle.com") }
-        });
-
+    public static Stream<Arguments> data() {
+
+        return Stream.of(
+            Arguments.of( new Data("createStyleableBooleanProperty", StyleConverter.getBooleanConverter(), Boolean.TRUE) ),
+            Arguments.of( new Data("createStyleableColorProperty",   StyleConverter.getColorConverter(), Color.YELLOW)   ),
+            Arguments.of( new Data("createStyleableDurationProperty",   StyleConverter.getDurationConverter(), Duration.millis(30))   ),
+            Arguments.of( new Data("createStyleableEffectProperty",  StyleConverter.getEffectConverter(), new InnerShadow(10d, Color.RED)) ),
+            Arguments.of( new Data("createStyleableEnumProperty", StyleConverter.getEnumConverter(Pos.class), Pos.CENTER) ),
+            Arguments.of( new Data("createStyleableFontProperty", StyleConverter.getFontConverter(), Font.font(18)) ),
+            Arguments.of( new Data("createStyleableInsetsProperty", StyleConverter.getInsetsConverter(), new Insets(1,1,1,1)) ),
+            Arguments.of( new Data("createStyleableNumberProperty", StyleConverter.getSizeConverter(), Double.valueOf(42d)) ),
+            Arguments.of( new Data("createStyleablePaintProperty", StyleConverter.getPaintConverter(), Color.BLUE) ),
+            Arguments.of( new Data("createStyleableStringProperty", StyleConverter.getStringConverter(), "ABC") ),
+            Arguments.of( new Data("createStyleableUrlProperty", StyleConverter.getUrlConverter(), "http://oracle.com") )
+        );
     }
 
     void check(MyStyleable<?>  styleable, StyleConverter<?,?> converter, boolean inherits) {
@@ -122,7 +113,7 @@ void check(MyStyleable<?>  styleable, StyleConverter<?,?> converter, boolean inh
         }
 
         assertEquals(styleable.getProp().getCssMetaData().getInitialValue(null), styleable.getProp().getValue());
-        assertEquals(styleable.getProp().getCssMetaData().toString(), Boolean.valueOf(inherits), styleable.getProp().getCssMetaData().isInherits());
+        assertEquals(Boolean.valueOf(inherits), styleable.getProp().getCssMetaData().isInherits(), styleable.getProp().getCssMetaData().toString());
 
         List<CssMetaData<? extends Styleable,?>> list = styleable.getCssMetaData();
         assert list != null;
@@ -146,18 +137,19 @@ void check(MyStyleable<?> styleable1, MyStyleable<?> styleable2, StyleConverter
         assertSame(styleable1.getProp().getCssMetaData(), styleable2.getProp().getCssMetaData());
     }
 
-    @Test
-    public void theTest() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void theTest(Data data) {
 
         if ("createStyleableEnumProperty".equals(data.createMethodName)) {
-            testEnum();
+            testEnum(data);
         } else {
-            testOther();
+            testOther(data);
         }
 
     }
 
-    void testEnum() {
+    void testEnum(Data data) {
         final Class c = data.initialValue.getClass();
         // zero
         final MyStyleable<?> styleable = new MyStyleableEnum();
@@ -192,7 +184,7 @@ void testEnum() {
 //        assertNotSame(styleable1.getProp().getCssMetaData(), styleable2.getProp().getCssMetaData());
     }
 
-    void testOther() {
+    void testOther(Data data) {
          // zero
         final MyStyleable<?> styleable = new MyStyleable();
         styleable.setProp(data.createMethodName);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/css/StylesheetTest.java b/modules/javafx.graphics/src/test/java/test/javafx/css/StylesheetTest.java
index 6311d4466d6..570e59f5efa 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/css/StylesheetTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/css/StylesheetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -71,10 +71,12 @@
 import javafx.scene.text.FontSmoothingType;
 import javafx.scene.text.TextAlignment;
 import javafx.stage.Stage;
-import org.junit.*;
-import static org.junit.Assert.*;
-import static org.junit.Assert.assertEquals;
 
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class StylesheetTest {
 
@@ -270,9 +272,9 @@ public void testLoadBinary() {
             for (int n=0; n<cssRules.size(); n++) {
                 Rule expected = cssRules.get(n);
                 Rule actual = bssRules.get(n);
-                assertEquals(Integer.toString(n),
-                        RuleShim.getUnobservedDeclarationList(expected),
-                        RuleShim.getUnobservedDeclarationList(actual));
+                assertEquals(RuleShim.getUnobservedDeclarationList(expected),
+                             RuleShim.getUnobservedDeclarationList(actual),
+                             Integer.toString(n));
             }
 
         } catch (IOException ioe) {
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/css/TypeTest.java b/modules/javafx.graphics/src/test/java/test/javafx/css/TypeTest.java
index bea22a7f1b2..dba87d3c2e5 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/css/TypeTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/css/TypeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,9 +30,10 @@
 import javafx.css.ParsedValue;
 import javafx.css.Rule;
 import javafx.css.Stylesheet;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
 
 
 public class TypeTest {
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/geometry/BoundingBoxTest.java b/modules/javafx.graphics/src/test/java/test/javafx/geometry/BoundingBoxTest.java
index d743588524e..513db54d735 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/geometry/BoundingBoxTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/geometry/BoundingBoxTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,8 +29,11 @@
 import javafx.geometry.Bounds;
 import javafx.geometry.Point2D;
 
-import static org.junit.Assert.*;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class BoundingBoxTest {
     @Test
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/geometry/Dimension2DTest.java b/modules/javafx.graphics/src/test/java/test/javafx/geometry/Dimension2DTest.java
index b85a249c0db..cdae1649ae3 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/geometry/Dimension2DTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/geometry/Dimension2DTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,12 +26,12 @@
 package test.javafx.geometry;
 
 import javafx.geometry.Dimension2D;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class Dimension2DTest {
     @Test
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/geometry/InsetsTest.java b/modules/javafx.graphics/src/test/java/test/javafx/geometry/InsetsTest.java
index 88efdded4e8..5e4c387089b 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/geometry/InsetsTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/geometry/InsetsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,12 +26,12 @@
 package test.javafx.geometry;
 
 import javafx.geometry.Insets;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class InsetsTest {
     @Test
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/geometry/Point2DTest.java b/modules/javafx.graphics/src/test/java/test/javafx/geometry/Point2DTest.java
index 6445e694e95..2f449715746 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/geometry/Point2DTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/geometry/Point2DTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,12 +27,13 @@
 
 import javafx.geometry.Point2D;
 import javafx.geometry.Point3D;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class Point2DTest {
 
@@ -88,10 +89,12 @@ public void testAdd() {
         assertEquals(new Point2D(1, 7), p1.add(-1, 3));
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testAddNull() {
-        Point2D point = new Point2D(1, 2);
-        point.add(null);
+        assertThrows(NullPointerException.class, () -> {
+            Point2D point = new Point2D(1, 2);
+            point.add(null);
+        });
     }
 
     @Test
@@ -103,10 +106,12 @@ public void testSubtract() {
         assertEquals(new Point2D(3, 1), p1.subtract(-1, 3));
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testSubtractNull() {
-        Point2D point = new Point2D(1, 2);
-        point.subtract(null);
+        assertThrows(NullPointerException.class, () -> {
+            Point2D point = new Point2D(1, 2);
+            point.subtract(null);
+        });
     }
 
     @Test
@@ -144,10 +149,12 @@ public void testMidpoint() {
         assertEquals(new Point2D(0.5, -1), p1.midpoint(1, -2));
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testMidpointNull() {
-        Point2D point = new Point2D(1, 2);
-        point.midpoint(null);
+        assertThrows(NullPointerException.class, () -> {
+            Point2D point = new Point2D(1, 2);
+            point.midpoint(null);
+        });
     }
 
     @Test
@@ -167,10 +174,12 @@ public void testVectorAngle() {
         assertEquals(Double.NaN, p2.angle(p2, p4), 0.000001);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testVectorAngleNull() {
-        Point2D point = new Point2D(1, 2);
-        point.angle(null);
+        assertThrows(NullPointerException.class, () -> {
+            Point2D point = new Point2D(1, 2);
+            point.angle(null);
+        });
     }
 
     @Test
@@ -187,16 +196,20 @@ public void testPointAngle() {
         assertEquals(0, p2.angle(p3, p4), 0.000001);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testPointAngle1Null() {
-        Point2D point = new Point2D(1, 2);
-        point.angle(null, new Point2D(2, 8));
+        assertThrows(NullPointerException.class, () -> {
+            Point2D point = new Point2D(1, 2);
+            point.angle(null, new Point2D(2, 8));
+        });
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testPointAngle2Null() {
-        Point2D point = new Point2D(2, 3);
-        point.angle(new Point2D(5, 3), null);
+        assertThrows(NullPointerException.class, () -> {
+            Point2D point = new Point2D(2, 3);
+            point.angle(new Point2D(5, 3), null);
+        });
     }
 
     @Test
@@ -241,10 +254,12 @@ public void testDotProduct() {
         assertEquals(2, p3.dotProduct(-4, -5), 0.000001);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testDotProductNull() {
-        Point2D point = new Point2D(1, 2);
-        point.dotProduct(null);
+        assertThrows(NullPointerException.class, () -> {
+            Point2D point = new Point2D(1, 2);
+            point.dotProduct(null);
+        });
     }
 
     @Test
@@ -259,10 +274,12 @@ public void testCrossProduct() {
         assertEquals(new Point3D(0, 0, 6), p3.crossProduct(p2));
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testCrossProductNull() {
-        Point2D point = new Point2D(1, 2);
-        point.crossProduct(null);
+        assertThrows(NullPointerException.class, () -> {
+            Point2D point = new Point2D(1, 2);
+            point.crossProduct(null);
+        });
     }
 
     @Test
@@ -286,8 +303,8 @@ public void testInterpolate() {
         Point2D p1 = new Point2D(1, 0);
         Point2D p2 = new Point2D(0, -1);
 
-        assertEquals("t=0: should return the initial point", p1, p1.interpolate(p2, 0));
-        assertEquals("t=1: should return the final point", p2, p1.interpolate(p2, 1));
+        assertEquals(p1, p1.interpolate(p2, 0), "t=0: should return the initial point");
+        assertEquals(p2, p1.interpolate(p2, 1), "t=1: should return the final point");
         testNearEquality("t=0.25: should return 25% from the inital point", 0.75, -0.25, p1.interpolate(p2, 0.25));
         testNearEquality("t=0.5: should return 50% from the inital point", 0.5, -0.5, p1.interpolate(p2, 0.5));
         testNearEquality("t=0.75: should return 75% from the inital point", 0.25, -0.75, p1.interpolate(p2, 0.75));
@@ -298,8 +315,8 @@ public void testInterpolate() {
     }
 
     private void testNearEquality(String message, double expectedX, double expectedY, Point2D result) {
-        assertEquals(message, expectedX, result.getX(), 1e-15);
-        assertEquals(message, expectedY, result.getY(), 1e-15);
+        assertEquals(expectedX, result.getX(), 1e-15, message);
+        assertEquals(expectedY, result.getY(), 1e-15, message);
     }
 
     @Test
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/geometry/Point3DTest.java b/modules/javafx.graphics/src/test/java/test/javafx/geometry/Point3DTest.java
index e4c45a7080d..eeb59d54ae2 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/geometry/Point3DTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/geometry/Point3DTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,12 +26,13 @@
 package test.javafx.geometry;
 
 import javafx.geometry.Point3D;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class Point3DTest {
 
@@ -82,10 +83,12 @@ public void testAdd() {
         assertEquals(new Point3D(1, 7, 13), p1.add(-1, 3, 5));
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testAddNull() {
-        Point3D point = new Point3D(1, 2, 3);
-        point.add(null);
+        assertThrows(NullPointerException.class, () -> {
+            Point3D point = new Point3D(1, 2, 3);
+            point.add(null);
+        });
     }
 
     @Test
@@ -97,10 +100,12 @@ public void testSubtract() {
         assertEquals(new Point3D(3, 1, 2), p1.subtract(-1, 3, 6));
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testSubtractNull() {
-        Point3D point = new Point3D(1, 2, 3);
-        point.subtract(null);
+        assertThrows(NullPointerException.class, () -> {
+            Point3D point = new Point3D(1, 2, 3);
+            point.subtract(null);
+        });
     }
 
     @Test
@@ -138,10 +143,12 @@ public void testMidpoint() {
         assertEquals(new Point3D(0.5, -1, 1.5), p1.midpoint(1, -2, 3));
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testMidpointNull() {
-        Point3D point = new Point3D(1, 2, 3);
-        point.midpoint(null);
+        assertThrows(NullPointerException.class, () -> {
+            Point3D point = new Point3D(1, 2, 3);
+            point.midpoint(null);
+        });
     }
 
     @Test
@@ -160,10 +167,12 @@ public void testVectorAngle() {
         assertEquals(135, p2.angle(-1, 0, -1), 0.000001);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testVectorAngleNull() {
-        Point3D point = new Point3D(1, 2, 3);
-        point.angle(null);
+        assertThrows(NullPointerException.class, () -> {
+            Point3D point = new Point3D(1, 2, 3);
+            point.angle(null);
+        });
     }
 
     @Test
@@ -197,16 +206,20 @@ public void testPointAngle() {
         assertEquals(Double.NaN, p2.angle(p2, p4), 0.000001);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testPointAngle1Null() {
-        Point3D point = new Point3D(1, 2, 3);
-        point.angle(null, new Point3D(2, 8, 4));
+        assertThrows(NullPointerException.class, () -> {
+            Point3D point = new Point3D(1, 2, 3);
+            point.angle(null, new Point3D(2, 8, 4));
+        });
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testPointAngle2Null() {
-        Point3D point = new Point3D(1, 2, 3);
-        point.angle(new Point3D(8, 5, 3), null);
+        assertThrows(NullPointerException.class, () -> {
+            Point3D point = new Point3D(1, 2, 3);
+            point.angle(new Point3D(8, 5, 3), null);
+        });
     }
 
     @Test
@@ -251,10 +264,12 @@ public void testDotProduct() {
         assertEquals(20, p3.dotProduct(-4, -5, 6), 0.000001);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testDotProductNull() {
-        Point3D point = new Point3D(1, 2, 3);
-        point.dotProduct(null);
+        assertThrows(NullPointerException.class, () -> {
+            Point3D point = new Point3D(1, 2, 3);
+            point.dotProduct(null);
+        });
     }
 
     @Test
@@ -269,10 +284,12 @@ public void testCrossProduct() {
         assertEquals(new Point3D(6, 0, 0), p3.crossProduct(p2));
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testCrossProductNull() {
-        Point3D point = new Point3D(1, 2, 3);
-        point.crossProduct(null);
+        assertThrows(NullPointerException.class, () -> {
+            Point3D point = new Point3D(1, 2, 3);
+            point.crossProduct(null);
+        });
     }
 
     @Test
@@ -280,8 +297,8 @@ public void testInterpolate() {
         Point3D p1 = new Point3D(1, 0, 3.5);
         Point3D p2 = new Point3D(0, -1, -1);
 
-        assertEquals("t=0: should return the initial point", p1, p1.interpolate(p2, 0));
-        assertEquals("t=1: should return the final point", p2, p1.interpolate(p2, 1));
+        assertEquals(p1, p1.interpolate(p2, 0), "t=0: should return the initial point");
+        assertEquals(p2, p1.interpolate(p2, 1), "t=1: should return the final point");
         testNearEquality("t=0.25: should return 25% from the inital point", 0.75, -0.25, 2.375, p1.interpolate(p2, 0.25));
         testNearEquality("t=0.5: should return 50% from the inital point", 0.5, -0.5, 1.25, p1.interpolate(p2, 0.5));
         testNearEquality("t=0.75: should return 75% from the inital point", 0.25, -0.75, 0.125, p1.interpolate(p2, 0.75));
@@ -292,9 +309,9 @@ public void testInterpolate() {
     }
 
     private void testNearEquality(String message, double expectedX, double expectedY, double expectedZ, Point3D result) {
-        assertEquals(message, expectedX, result.getX(), 1e-15);
-        assertEquals(message, expectedY, result.getY(), 1e-15);
-        assertEquals(message, expectedZ, result.getZ(), 1e-15);
+        assertEquals(expectedX, result.getX(), 1e-15, message);
+        assertEquals(expectedY, result.getY(), 1e-15, message);
+        assertEquals(expectedZ, result.getZ(), 1e-15, message);
     }
 
     @Test
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/geometry/PosTest.java b/modules/javafx.graphics/src/test/java/test/javafx/geometry/PosTest.java
index 260b38f7054..5a19bd46904 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/geometry/PosTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/geometry/PosTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
 
 package test.javafx.geometry;
 
-import static java.util.Arrays.asList;
 import static javafx.geometry.HPos.LEFT;
 import static javafx.geometry.HPos.RIGHT;
 import static javafx.geometry.Pos.BASELINE_CENTER;
@@ -42,51 +41,40 @@
 import static javafx.geometry.VPos.BASELINE;
 import static javafx.geometry.VPos.BOTTOM;
 import static javafx.geometry.VPos.TOP;
-import static junit.framework.Assert.assertEquals;
 
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.geometry.HPos;
 import javafx.geometry.Pos;
 import javafx.geometry.VPos;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 
-@RunWith(Parameterized.class)
 public class PosTest {
 
-    @Parameters
-    public static Collection<Object[]> parameters() {
-        return asList(new Object[][] {
-                {TOP_LEFT, TOP, LEFT},
-                {TOP_CENTER, TOP, HPos.CENTER},
-                {TOP_RIGHT, TOP, RIGHT},
-                {CENTER_LEFT, VPos.CENTER, LEFT},
-                {Pos.CENTER, VPos.CENTER, HPos.CENTER},
-                {CENTER_RIGHT, VPos.CENTER, RIGHT},
-                {BOTTOM_LEFT, BOTTOM, LEFT},
-                {BOTTOM_CENTER, BOTTOM, HPos.CENTER},
-                {BOTTOM_RIGHT, BOTTOM, RIGHT},
-                {BASELINE_LEFT, BASELINE, LEFT},
-                {BASELINE_CENTER, BASELINE, HPos.CENTER},
-                {BASELINE_RIGHT, BASELINE, RIGHT},
-         });
+    public static Stream<Arguments> parameters() {
+        return Stream.of(
+            Arguments.of(TOP_LEFT, TOP, LEFT),
+            Arguments.of(TOP_CENTER, TOP, HPos.CENTER),
+            Arguments.of(TOP_RIGHT, TOP, RIGHT),
+            Arguments.of(CENTER_LEFT, VPos.CENTER, LEFT),
+            Arguments.of(Pos.CENTER, VPos.CENTER, HPos.CENTER),
+            Arguments.of(CENTER_RIGHT, VPos.CENTER, RIGHT),
+            Arguments.of(BOTTOM_LEFT, BOTTOM, LEFT),
+            Arguments.of(BOTTOM_CENTER, BOTTOM, HPos.CENTER),
+            Arguments.of(BOTTOM_RIGHT, BOTTOM, RIGHT),
+            Arguments.of(BASELINE_LEFT, BASELINE, LEFT),
+            Arguments.of(BASELINE_CENTER, BASELINE, HPos.CENTER),
+            Arguments.of(BASELINE_RIGHT, BASELINE, RIGHT)
+         );
     }
 
-    private final Pos pos;
-    private final VPos vpos;
-    private final HPos hpos;
-
-    public PosTest(Pos pos, VPos vpos, HPos hpos) {
-        this.pos = pos;
-        this.vpos = vpos;
-        this.hpos = hpos;
-    }
-
-    @Test public void shouldHaveVPosAndHPos() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void shouldHaveVPosAndHPos(Pos pos, VPos vpos, HPos hpos) {
         assertEquals(pos.getVpos(), vpos);
         assertEquals(pos.getHpos(), hpos);
     }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/geometry/Rectangle2DTest.java b/modules/javafx.graphics/src/test/java/test/javafx/geometry/Rectangle2DTest.java
index cbd8052a24b..b8ad55d3cf5 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/geometry/Rectangle2DTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/geometry/Rectangle2DTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,23 +27,28 @@
 
 import javafx.geometry.Point2D;
 import javafx.geometry.Rectangle2D;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class Rectangle2DTest {
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testConstruction1() {
-        new Rectangle2D(0, 0, -1, 0);
+        assertThrows(IllegalArgumentException.class, () -> {
+            new Rectangle2D(0, 0, -1, 0);
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testConstruction2() {
-        new Rectangle2D(0, 0, 0, -1);
+        assertThrows(IllegalArgumentException.class, () -> {
+            new Rectangle2D(0, 0, 0, -1);
+        });
     }
 
     @Test
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/print/JobSettingsTest.java b/modules/javafx.graphics/src/test/java/test/javafx/print/JobSettingsTest.java
index 671d0f2de08..b748e00ae64 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/print/JobSettingsTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/print/JobSettingsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,25 +25,26 @@
 
 package test.javafx.print;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import org.junit.Before;
-import org.junit.Test;
-
 import javafx.beans.property.*;
 
 import javafx.print.*;
 import java.util.*;
 
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 public class JobSettingsTest {
 
-  @Test public void dummyTest() {
+  @Test
+  public void dummyTest() {
   }
 
 
   private PrinterJob job;
 
-  @Before
+  @BeforeEach
   public void setUp() {
      try {
          job = PrinterJob.createPrinterJob();
@@ -57,7 +58,8 @@ public void setUp() {
      }
   }
 
-  @Test public void testCopiesSettings() {
+  @Test
+  public void testCopiesSettings() {
      if (job == null) {
          return;
      }
@@ -73,7 +75,8 @@ public void setUp() {
      assertEquals(copies, js.getCopies());
   }
 
-  @Test public void testPageRangeSettings() {
+  @Test
+  public void testPageRangeSettings() {
      if (job == null) {
          return;
      }
@@ -93,7 +96,8 @@ public void setUp() {
         }
   }
 
-  @Test public void testPrintColorSettings() {
+  @Test
+  public void testPrintColorSettings() {
      PrinterJob job = PrinterJob.createPrinterJob();
 
      if (job == null) {
@@ -118,7 +122,8 @@ public void setUp() {
      }
   }
 
-  @Test public void testPrintResolutions() {
+  @Test
+  public void testPrintResolutions() {
      if (job == null) {
          return;
      }
@@ -142,7 +147,8 @@ public void setUp() {
   }
 
 
-   @Test public void testPrintSides() {
+   @Test
+   public void testPrintSides() {
      if (job == null) {
          return;
      }
@@ -171,7 +177,8 @@ public void setUp() {
   }
 
 
-  @Test public void testPageOrientation() {
+  @Test
+  public void testPageOrientation() {
      if (job == null) {
          return;
      }
@@ -192,7 +199,8 @@ public void setUp() {
      assertEquals(newpageorientation, pagelayout.getPageOrientation());
   }
 
-    @Test public void testPaper() {
+    @Test
+    public void testPaper() {
      if (job == null) {
          return;
      }
@@ -235,7 +243,8 @@ public void setUp() {
      }
   }
 
-  @Test public void testPaperSource() {
+  @Test
+  public void testPaperSource() {
      if (job == null) {
          return;
      }
@@ -259,7 +268,8 @@ public void setUp() {
      }
   }
 
-  @Test public void testCollationSettings() {
+  @Test
+  public void testCollationSettings() {
      if (job == null) {
          return;
      }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/print/MarginsTest.java b/modules/javafx.graphics/src/test/java/test/javafx/print/MarginsTest.java
index 637993e6761..b723123584d 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/print/MarginsTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/print/MarginsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,16 +39,17 @@
 import static javax.print.attribute.standard.MediaPrintableArea.INCH;
 import javax.print.attribute.standard.MediaSizeName;
 
-import org.junit.Test;
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeNotNull;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 public class MarginsTest {
 
-    @Test public void test() {
+    @Test
+    public void test() {
 
         Printer printer = Printer.getDefaultPrinter();
-        assumeNotNull(printer);
+        assumeTrue(printer != null);
 
         PageLayout layout =
              printer.createPageLayout(Paper.NA_LETTER,
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/print/PaperUnitsTest.java b/modules/javafx.graphics/src/test/java/test/javafx/print/PaperUnitsTest.java
index eab8e92e8ee..fd188f5ee53 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/print/PaperUnitsTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/print/PaperUnitsTest.java
@@ -25,20 +25,22 @@
 
 package test.javafx.print;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import org.junit.Test;
-
 import javafx.print.Paper;
 import com.sun.javafx.print.PrintHelper;
 import com.sun.javafx.print.Units;
 
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 public class PaperUnitsTest {
 
-  @Test public void dummyTest() {
+  @Test
+  public void dummyTest() {
   }
 
-  @Test public void createPaperPts() {
+  @Test
+  public void createPaperPts() {
      double wid = 100.0;
      double hgt = 200.0;
      Paper p = PrintHelper.createPaper("TestPOINT", wid, hgt, Units.POINT);
@@ -46,11 +48,12 @@ public class PaperUnitsTest {
      int ptsHgt = (int)p.getHeight();
      int expectedPtsWid = (int)wid;
      int expectedPtsHgt = (int)hgt;
-     assertTrue("Points width is not as expected", ptsWid == expectedPtsWid);
-     assertTrue("Points height is not as expected", ptsHgt == expectedPtsHgt);
+     assertTrue(ptsWid == expectedPtsWid, "Points width is not as expected");
+     assertTrue(ptsHgt == expectedPtsHgt, "Points height is not as expected");
    }
 
-  @Test public void createPaperInches() {
+  @Test
+  public void createPaperInches() {
      double inWid = 100.0;
      double inHgt = 200.0;
      Paper p = PrintHelper.createPaper("TestINCH", inWid, inHgt, Units.INCH);
@@ -58,11 +61,12 @@ public class PaperUnitsTest {
      int ptsHgt = (int)p.getHeight();
      int expectedPtsWid = (int)((inWid * 72) + 0.5);
      int expectedPtsHgt = (int)((inHgt * 72) + 0.5);
-     assertTrue("Inches width is not as expected", ptsWid == expectedPtsWid);
-     assertTrue("Inches height is not as expected", ptsHgt == expectedPtsHgt);
+     assertTrue(ptsWid == expectedPtsWid, "Inches width is not as expected");
+     assertTrue(ptsHgt == expectedPtsHgt, "Inches height is not as expected");
    }
 
-  @Test public void createPaperMM() {
+  @Test
+  public void createPaperMM() {
      double mmWid = 100.0;
      double mmHgt = 200.0;
      Paper p = PrintHelper.createPaper("TestMM", mmWid, mmHgt, Units.MM);
@@ -70,7 +74,7 @@ public class PaperUnitsTest {
      double ptsHgt = p.getHeight();
      double expectedPtsWid = (mmWid * 72) / 25.4;
      double expectedPtsHgt = (mmHgt * 72) / 25.4;
-     assertEquals("MM width is not as expected", ptsWid, expectedPtsWid, 0.001);
-     assertEquals("MM height is not as expected", ptsHgt, expectedPtsHgt, 0.001);
+     assertEquals(ptsWid, expectedPtsWid, 0.001, "MM width is not as expected");
+     assertEquals(ptsHgt, expectedPtsHgt, 0.001, "MM height is not as expected");
    }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/print/PrinterJobTest.java b/modules/javafx.graphics/src/test/java/test/javafx/print/PrinterJobTest.java
index 9af154198e3..da2d9511f93 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/print/PrinterJobTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/print/PrinterJobTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,25 +25,26 @@
 
 package test.javafx.print;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import org.junit.Before;
-import org.junit.Test;
-
 import javafx.beans.property.ObjectProperty;
 
 import javafx.print.Printer;
 import javafx.print.PrinterJob;
 
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 public class PrinterJobTest {
 
-  @Test public void dummyTest() {
+  @Test
+  public void dummyTest() {
   }
 
 
   private PrinterJob job;
 
-  @Before
+  @BeforeEach
   public void setUp() {
      try {
          job = PrinterJob.createPrinterJob();
@@ -57,7 +58,8 @@ public void setUp() {
      }
   }
 
-  @Test public void testPrinter() {
+  @Test
+  public void testPrinter() {
      if (job == null) {
          return;
      }
@@ -68,7 +70,8 @@ public void setUp() {
      assertEquals(printer, job.getPrinter());
    }
 
-  @Test public void testPrinterProperty() {
+  @Test
+  public void testPrinterProperty() {
      if (job == null) {
          return;
      }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/AcceleratorsTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/AcceleratorsTest.java
index d2712d2d3b5..7ac7ec570b4 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/AcceleratorsTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/AcceleratorsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,8 +30,6 @@
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyCombination;
 import javafx.scene.input.KeyEvent;
-import org.junit.Before;
-import org.junit.Test;
 
 import java.util.ConcurrentModificationException;
 import java.util.Iterator;
@@ -40,16 +38,19 @@
 import javafx.scene.Group;
 import javafx.scene.Scene;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class AcceleratorsTest {
 
     private Scene scene;
     private ObservableMap<KeyCombination, Runnable> accelerators;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         scene = new Scene(new Group());
         accelerators = scene.getAccelerators();
@@ -79,22 +80,24 @@ public void testAcceleratorRemovedWhenExecuted() {
         assertTrue(executed.get());
     }
 
-    @Test(expected = ConcurrentModificationException.class)
+    @Test
     public void testAcceleratorComodification() {
-        final KeyCombination altA = KeyCombination.keyCombination("Alt + A");
-        final KeyCombination altB = KeyCombination.keyCombination("Alt + B");
-        accelerators.put(altA, () -> {
-        });
-        accelerators.put(altB, () -> {
-        });
+        assertThrows(ConcurrentModificationException.class, () -> {
+            final KeyCombination altA = KeyCombination.keyCombination("Alt + A");
+            final KeyCombination altB = KeyCombination.keyCombination("Alt + B");
+            accelerators.put(altA, () -> {
+            });
+            accelerators.put(altB, () -> {
+            });
 
-        final Iterator<Map.Entry<KeyCombination, Runnable>> iterator = accelerators.entrySet().iterator();
-        iterator.next();
+            final Iterator<Map.Entry<KeyCombination, Runnable>> iterator = accelerators.entrySet().iterator();
+            iterator.next();
 
-        final Iterator<Map.Entry<KeyCombination, Runnable>> iterator1 = accelerators.entrySet().iterator();
-        iterator1.next();
-        iterator1.remove();
+            final Iterator<Map.Entry<KeyCombination, Runnable>> iterator1 = accelerators.entrySet().iterator();
+            iterator1.next();
+            iterator1.remove();
 
-        iterator.next();
+            iterator.next();
+        });
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/CameraTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/CameraTest.java
index 5a5133e5b67..53660dd80c4 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/CameraTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/CameraTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,12 +47,15 @@
 import javafx.scene.SubSceneShim;
 import javafx.scene.transform.NonInvertibleTransformException;
 import javafx.stage.Stage;
-import org.junit.Test;
 
-import static org.junit.Assert.*;
 import test.com.sun.javafx.scene.StubParallelCameraHelper;
 import test.com.sun.javafx.scene.StubPerspectiveCameraHelper;
 
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
 public class CameraTest {
 
     static final GeneralTransform3D DEFAULT_PROJVIEW_TX;
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/CursorTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/CursorTest.java
index acd9d8a4bc3..2dc57d33631 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/CursorTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/CursorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,15 +33,15 @@
 import javafx.scene.ImageCursor;
 import javafx.scene.image.Image;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class CursorTest {
 
-    @Test public void test_cursorFromUppercaseName() {
+    @Test
+    public void test_cursorFromUppercaseName() {
         assertEquals(Cursor.DEFAULT, Cursor.cursor("DEFAULT"));
         assertEquals(Cursor.CLOSED_HAND, Cursor.cursor("CLOSED_HAND"));
         assertEquals(Cursor.CROSSHAIR, Cursor.cursor("CROSSHAIR"));
@@ -62,7 +62,8 @@ public class CursorTest {
         assertEquals(Cursor.W_RESIZE, Cursor.cursor("W_RESIZE"));
     }
 
-    @Test public void test_cursorFromLowercaseName() {
+    @Test
+    public void test_cursorFromLowercaseName() {
         assertEquals(Cursor.DEFAULT, Cursor.cursor("default"));
         assertEquals(Cursor.CLOSED_HAND, Cursor.cursor("closed_hand"));
         assertEquals(Cursor.CROSSHAIR, Cursor.cursor("crosshair"));
@@ -83,7 +84,8 @@ public class CursorTest {
         assertEquals(Cursor.W_RESIZE, Cursor.cursor("w_resize"));
     }
 
-    @Test public void test_cursorFromUrl() {
+    @Test
+    public void test_cursorFromUrl() {
         final StubImageLoaderFactory imageLoaderFactory =
                 ((StubToolkit) Toolkit.getToolkit()).getImageLoaderFactory();
 
@@ -98,18 +100,24 @@ public class CursorTest {
         assertEquals(imageUrl, cursorImage.getUrl());
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void test_cursorFromNull() {
-        Cursor.cursor(null);
+        assertThrows(NullPointerException.class, () -> {
+            Cursor.cursor(null);
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void test_cursorFromInvalidUrl() {
-        Cursor.cursor("file//:cursor.png");
+        assertThrows(IllegalArgumentException.class, () -> {
+            Cursor.cursor("file//:cursor.png");
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void test_cursorFromInvalidName() {
-        Cursor.cursor("crosslair");
+        assertThrows(IllegalArgumentException.class, () -> {
+            Cursor.cursor("crosslair");
+        });
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/DepthTestTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/DepthTestTest.java
index f77d077ee1a..cae3cc95738 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/DepthTestTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/DepthTestTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,12 +29,13 @@
 import javafx.scene.Group;
 import javafx.scene.Node;
 import javafx.scene.NodeShim;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+
 import javafx.scene.shape.Rectangle;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Tests for depth test features.
@@ -45,7 +46,8 @@ public class DepthTestTest {
     /**
      * Tests the default value for a single node with no parent
      */
-    @Test public void testDepthTestSingleDefault() {
+    @Test
+    public void testDepthTestSingleDefault() {
         Node node = new Rectangle();
         assertEquals(node.getDepthTest(), DepthTest.INHERIT);
         assertTrue(NodeShim.isDerivedDepthTest(node));
@@ -54,7 +56,8 @@ public class DepthTestTest {
     /**
      * Tests the default values for a group node with a child node
      */
-    @Test public void testDepthTestParentChildDefaults() {
+    @Test
+    public void testDepthTestParentChildDefaults() {
         Group group = new Group();
         Node node = new Rectangle();
         group.getChildren().add(node);
@@ -68,7 +71,8 @@ public class DepthTestTest {
     /**
      * Tests setting the value for a single node with no parent
      */
-    @Test public void testDepthTestSingleSet() {
+    @Test
+    public void testDepthTestSingleSet() {
         Node node = new Rectangle();
         assertEquals(node.getDepthTest(), DepthTest.INHERIT);
         assertTrue(NodeShim.isDerivedDepthTest(node));
@@ -89,7 +93,8 @@ public class DepthTestTest {
     /**
      * Tests setting values for a group node with a child node
      */
-    @Test public void testDepthTestParentChildSet() {
+    @Test
+    public void testDepthTestParentChildSet() {
         Group group = new Group();
         Node node = new Rectangle();
         group.getChildren().add(node);
@@ -195,7 +200,8 @@ public class DepthTestTest {
      * Tests setting values for a group node with a child node, and ensures
      * that the state is correct when adding and removing the child node.
      */
-    @Test public void testDepthTestParentChildRemove() {
+    @Test
+    public void testDepthTestParentChildRemove() {
         Group group = new Group();
         Node node = new Rectangle();
         group.getChildren().add(node);
@@ -269,7 +275,8 @@ public class DepthTestTest {
      * Tests two levels of children and ensures that the state is correct when
      * adding and removing the second group.
      */
-    @Test public void testDepthTestMutliParentChildRemove() {
+    @Test
+    public void testDepthTestMutliParentChildRemove() {
         Group root = new Group();
         Group group = new Group();
         root.getChildren().add(group);
@@ -319,7 +326,8 @@ public class DepthTestTest {
      * Tests two levels of children and ensures that the state is correct when
      * reparenting a group of nodes.
      */
-    @Test public void testDepthTestReparent() {
+    @Test
+    public void testDepthTestReparent() {
         Group root1 = new Group();
         Group root2 = new Group();
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/EventAnyTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/EventAnyTest.java
index b5646b3c1f7..11a83ddc663 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/EventAnyTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/EventAnyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
 import com.sun.javafx.stage.FocusUngrabEvent;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.event.ActionEvent;
 import javafx.event.Event;
 import javafx.event.EventType;
@@ -55,68 +55,59 @@
 import javafx.scene.transform.TransformChangedEvent;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-import static org.junit.Assert.assertTrue;
-import org.junit.Test;
 
-@RunWith(Parameterized.class)
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 public class EventAnyTest {
-    @Parameters
-    public static Collection getParams() {
-        return Arrays.asList(new Object[][] {
-            { ActionEvent.ANY,           actionEvent(),           true},
-            { ActionEvent.ANY,           focusUngrabEvent(),      false},
-            { FocusUngrabEvent.ANY,      focusUngrabEvent(),      true},
-            { FocusUngrabEvent.ANY,      actionEvent(),           false},
-            { ContextMenuEvent.ANY,      contextMenuEvent(),      true},
-            { ContextMenuEvent.ANY,      actionEvent(),           false},
-            { DragEvent.ANY,             dragEvent(),             true },
-            { DragEvent.ANY,             keyEvent(),              false },
-            { InputMethodEvent.ANY,      inputMethodEvent(),      true },
-            { InputMethodEvent.ANY,      keyEvent(),              false },
-            { KeyEvent.ANY,              keyEvent(),              true },
-            { KeyEvent.ANY,              inputMethodEvent(),      false },
-            { MouseDragEvent.ANY,        mouseDragEvent(),        true },
-            { MouseDragEvent.ANY,        mouseEvent(),            false },
-            { MouseEvent.ANY,            mouseEvent(),            true },
-            { MouseEvent.ANY,            mouseDragEvent(),        true },
-            { MouseEvent.ANY,            keyEvent(),              false },
-            { RotateEvent.ANY,           rotateEvent(),           true },
-            { RotateEvent.ANY,           zoomEvent(),             false },
-            { ZoomEvent.ANY,             zoomEvent(),             true },
-            { ZoomEvent.ANY,             rotateEvent(),           false },
-            { ScrollEvent.ANY,           scrollEvent(),           true },
-            { ScrollEvent.ANY,           swipeEvent(),            false },
-            { SwipeEvent.ANY,            swipeEvent(),            true },
-            { SwipeEvent.ANY,            scrollEvent(),           false },
-            { TouchEvent.ANY,            touchEvent(),            true },
-            { TouchEvent.ANY,            rotateEvent(),           false },
-            { TransformChangedEvent.ANY, transformChangedEvent(), true },
-            { TransformChangedEvent.ANY, mouseEvent(),            false },
-            { WindowEvent.ANY,           windowEvent(),           true },
-            { WindowEvent.ANY,           actionEvent(),           false },
-            { GestureEvent.ANY,          rotateEvent(),           true },
-            { GestureEvent.ANY,          mouseEvent(),            false },
-            { InputEvent.ANY,            mouseEvent(),            true },
-            { InputEvent.ANY,            actionEvent(),           false },
-        });
+
+    public static Stream<Arguments> getParams() {
+        return Stream.of(
+            Arguments.of( ActionEvent.ANY,           actionEvent(),           true),
+            Arguments.of( ActionEvent.ANY,           focusUngrabEvent(),      false),
+            Arguments.of( FocusUngrabEvent.ANY,      focusUngrabEvent(),      true),
+            Arguments.of( FocusUngrabEvent.ANY,      actionEvent(),           false),
+            Arguments.of( ContextMenuEvent.ANY,      contextMenuEvent(),      true),
+            Arguments.of( ContextMenuEvent.ANY,      actionEvent(),           false),
+            Arguments.of( DragEvent.ANY,             dragEvent(),             true ),
+            Arguments.of( DragEvent.ANY,             keyEvent(),              false ),
+            Arguments.of( InputMethodEvent.ANY,      inputMethodEvent(),      true ),
+            Arguments.of( InputMethodEvent.ANY,      keyEvent(),              false ),
+            Arguments.of( KeyEvent.ANY,              keyEvent(),              true ),
+            Arguments.of( KeyEvent.ANY,              inputMethodEvent(),      false ),
+            Arguments.of( MouseDragEvent.ANY,        mouseDragEvent(),        true ),
+            Arguments.of( MouseDragEvent.ANY,        mouseEvent(),            false ),
+            Arguments.of( MouseEvent.ANY,            mouseEvent(),            true ),
+            Arguments.of( MouseEvent.ANY,            mouseDragEvent(),        true ),
+            Arguments.of( MouseEvent.ANY,            keyEvent(),              false ),
+            Arguments.of( RotateEvent.ANY,           rotateEvent(),           true ),
+            Arguments.of( RotateEvent.ANY,           zoomEvent(),             false ),
+            Arguments.of( ZoomEvent.ANY,             zoomEvent(),             true ),
+            Arguments.of( ZoomEvent.ANY,             rotateEvent(),           false ),
+            Arguments.of( ScrollEvent.ANY,           scrollEvent(),           true ),
+            Arguments.of( ScrollEvent.ANY,           swipeEvent(),            false ),
+            Arguments.of( SwipeEvent.ANY,            swipeEvent(),            true ),
+            Arguments.of( SwipeEvent.ANY,            scrollEvent(),           false ),
+            Arguments.of( TouchEvent.ANY,            touchEvent(),            true ),
+            Arguments.of( TouchEvent.ANY,            rotateEvent(),           false ),
+            Arguments.of( TransformChangedEvent.ANY, transformChangedEvent(), true ),
+            Arguments.of( TransformChangedEvent.ANY, mouseEvent(),            false ),
+            Arguments.of( WindowEvent.ANY,           windowEvent(),           true ),
+            Arguments.of( WindowEvent.ANY,           actionEvent(),           false ),
+            Arguments.of( GestureEvent.ANY,          rotateEvent(),           true ),
+            Arguments.of( GestureEvent.ANY,          mouseEvent(),            false ),
+            Arguments.of( InputEvent.ANY,            mouseEvent(),            true ),
+            Arguments.of( InputEvent.ANY,            actionEvent(),           false )
+        );
     }
 
     private boolean delivered;
-    private EventType type;
-    private Event event;
-    private boolean matches;
-
-    public EventAnyTest(EventType type, Event event, boolean matches) {
-        this.type = type;
-        this.event = event;
-        this.matches = matches;
-    }
 
-    @Test
-    public void testEventDelivery() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testEventDelivery(EventType type, Event event, boolean matches) {
         Node n = new Rectangle();
         delivered = false;
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java
index 44e20fee08f..36d84a038ce 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java
@@ -25,7 +25,6 @@
 
 package test.javafx.scene;
 
-
 import com.sun.javafx.scene.SceneHelper;
 import javafx.event.Event;
 import javafx.event.EventTarget;
@@ -34,12 +33,6 @@
 import test.com.sun.javafx.pgstub.StubScene;
 import test.com.sun.javafx.pgstub.StubToolkit;
 import com.sun.javafx.tk.Toolkit;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -59,9 +52,15 @@
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class FocusTest {
 
@@ -72,7 +71,7 @@ public class FocusTest {
     private StubToolkit toolkit;
     private boolean actionTaken;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         stage = new Stage();
         scene = new Scene(new Group(), 500, 500);
@@ -85,7 +84,7 @@ public void setUp() {
         toolkit = (StubToolkit) Toolkit.getToolkit();
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         stage.hide();
         stage = null;
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/GroupTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/GroupTest.java
index 042463938b1..7d3131cfe8f 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/GroupTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/GroupTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,13 +35,14 @@
 import javafx.scene.Group;
 import javafx.scene.Node;
 import javafx.scene.ParentShim;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * Tests various aspects of Group.
@@ -304,7 +305,7 @@ public void testMultiInit() {
         try {
             ParentShim.getChildren(group2).add(node);
         } catch (Throwable t) {
-            assertNull("unexpected exception", t);
+            assertNull(t, "unexpected exception");
         }
 
         assertEquals(0, ParentShim.getChildren(group1).size());
@@ -374,7 +375,7 @@ public void testMultiAdd() {
         try {
             ParentShim.getChildren(group2).add(node);
         } catch(Throwable t) {
-            assertNull("unexpected exception", t);
+            assertNull(t, "unexpected exception");
         }
 
         assertEquals(0, ParentShim.getChildren(group1).size());
@@ -426,7 +427,7 @@ public void testMultiAdd2() {
         try {
             ParentShim.getChildren(group2).add(node);
         } catch (Throwable t) {
-            assertNull("unexpected exception", t);
+            assertNull(t, "unexpected exception");
         }
 
         assertEquals(0, ParentShim.getChildren(group1).size());
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/HashCodeTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/HashCodeTest.java
index b5ffaca2f48..249577b4ad8 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/HashCodeTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/HashCodeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,14 +25,14 @@
 
 package test.javafx.scene;
 
-import static org.junit.Assert.fail;
 import javafx.geometry.BoundingBox;
 import javafx.geometry.Bounds;
 import javafx.geometry.Point2D;
 import javafx.geometry.Rectangle2D;
 import javafx.scene.paint.Color;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.fail;
 
 
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/ImageCursorTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/ImageCursorTest.java
index 2c316b0ee20..3158a9a46c0 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/ImageCursorTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/ImageCursorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,18 +30,12 @@
 import static test.javafx.scene.image.TestImages.TEST_IMAGE_100x200;
 import static test.javafx.scene.image.TestImages.TEST_IMAGE_200x100;
 import static test.javafx.scene.image.TestImages.TEST_IMAGE_32x32;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
 
 import javafx.beans.InvalidationListener;
 import javafx.geometry.Dimension2D;
 import javafx.scene.image.Image;
 import test.javafx.scene.image.TestImages;
 
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
 import test.com.sun.javafx.pgstub.CursorSizeConverter;
 import test.com.sun.javafx.pgstub.StubAsyncImageLoader;
 import test.com.sun.javafx.pgstub.StubImageLoaderFactory;
@@ -51,13 +45,19 @@
 import com.sun.javafx.tk.Toolkit;
 import javafx.scene.ImageCursor;
 
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+
 public final class ImageCursorTest {
     private static StubToolkit toolkit;
 
     private static CursorSizeConverter oldCursorSizeConverter;
     private static int oldMaximumCursorColors;
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
         toolkit = (StubToolkit) Toolkit.getToolkit();
 
@@ -65,7 +65,7 @@ public static void setUpClass() {
         oldMaximumCursorColors = toolkit.getMaximumCursorColors();
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDownClass() {
         toolkit.setCursorSizeConverter(oldCursorSizeConverter);
         toolkit.setMaximumCursorColors(oldMaximumCursorColors);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/ImageCursor_findBestImage_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/ImageCursor_findBestImage_Test.java
index 41edc2629f1..a6f89368260 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/ImageCursor_findBestImage_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/ImageCursor_findBestImage_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,25 +25,22 @@
 
 package test.javafx.scene;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 
 import javafx.scene.image.Image;
 import test.javafx.scene.image.TestImages;
 
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
 import test.com.sun.javafx.pgstub.CursorSizeConverter;
 import test.com.sun.javafx.pgstub.StubToolkit;
 import com.sun.javafx.tk.Toolkit;
 import javafx.scene.ImageCursor;
 
-@RunWith(Parameterized.class)
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
 public final class ImageCursor_findBestImage_Test {
     private static final Image[] TEST_CURSOR_IMAGES = {
         TestImages.TEST_IMAGE_32x32,
@@ -55,15 +52,6 @@ public final class ImageCursor_findBestImage_Test {
     private static StubToolkit toolkit;
     private static CursorSizeConverter oldCursorSizeConverter;
 
-    private final int bestWidth;
-    private final int bestHeight;
-    private final float hotspotX;
-    private final float hotspotY;
-
-    private final int expectedIndex;
-    private final float expectedHotspotX;
-    private final float expectedHotspotY;
-
 
     /*
      * Parameters: [bestWidth], [bestHeight], [hotspotX], [hotspotY],
@@ -71,50 +59,39 @@ public final class ImageCursor_findBestImage_Test {
      *             [expected hotspotX],
      *             [expected hotspotY]
      */
-    @Parameters
-    public static Collection data() {
-        return Arrays.asList(new Object[][] {
-            { 32, 64, 0, 0, 2, 0, 0 },
-            { 64, 32, 32, 32, 3, 63, 31 },
-            { 48, 64, 16, 16, 2, 16, 32 },
-            { 64, 48, 16, 16, 3, 32, 16 },
-            { 92, 92, 16, 4, 1, 32, 8 },
-            { 16, 16, 4, 16, 0, 4, 16 },
-            { 16, 32, 0, 0, 0, 0, 0 },
-            { 32, 16, 0, 0, 0, 0, 0 }
-        });
+    public static Stream<Arguments> data() {
+        return Stream.of(
+            Arguments.of( 32, 64, 0, 0, 2, 0, 0 ),
+            Arguments.of( 64, 32, 32, 32, 3, 63, 31 ),
+            Arguments.of( 48, 64, 16, 16, 2, 16, 32 ),
+            Arguments.of( 64, 48, 16, 16, 3, 32, 16 ),
+            Arguments.of( 92, 92, 16, 4, 1, 32, 8 ),
+            Arguments.of( 16, 16, 4, 16, 0, 4, 16 ),
+            Arguments.of( 16, 32, 0, 0, 0, 0, 0 ),
+            Arguments.of( 32, 16, 0, 0, 0, 0, 0 )
+        );
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
         toolkit = (StubToolkit) Toolkit.getToolkit();
         oldCursorSizeConverter = toolkit.getCursorSizeConverter();
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDownClass() {
         toolkit.setCursorSizeConverter(oldCursorSizeConverter);
     }
 
-    public ImageCursor_findBestImage_Test(final int bestWidth,
-                                              final int bestHeight,
-                                              final float hotspotX,
-                                              final float hotspotY,
-                                              final int expectedIndex,
-                                              final float expectedHotspotX,
-                                              final float expectedHotspotY) {
-        this.bestWidth = bestWidth;
-        this.bestHeight = bestHeight;
-        this.hotspotX = hotspotX;
-        this.hotspotY = hotspotY;
-
-        this.expectedIndex = expectedIndex;
-        this.expectedHotspotX = expectedHotspotX;
-        this.expectedHotspotY = expectedHotspotY;
-    }
-
-    @Test
-    public void findBestImageTest() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void findBestImageTest(int bestWidth,
+                                  int bestHeight,
+                                  float hotspotX,
+                                  float hotspotY,
+                                  int expectedIndex,
+                                  float expectedHotspotX,
+                                  float expectedHotspotY) {
         toolkit.setCursorSizeConverter(
                 CursorSizeConverter.createConstantConverter(bestWidth,
                                                             bestHeight));
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/ImageCursor_getCurrentFrame_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/ImageCursor_getCurrentFrame_Test.java
index 6b450d57d3b..149d3adca5c 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/ImageCursor_getCurrentFrame_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/ImageCursor_getCurrentFrame_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,20 +26,20 @@
 package test.javafx.scene;
 
 import static test.javafx.scene.image.TestImages.TEST_ERROR_IMAGE;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertSame;
 import javafx.scene.image.Image;
 import test.javafx.scene.image.TestImages;
 
-import org.junit.Test;
-
 import test.com.sun.javafx.pgstub.StubToolkit;
 import com.sun.javafx.tk.Toolkit;
 import javafx.scene.Cursor;
 import javafx.scene.CursorShim;
 import javafx.scene.ImageCursor;
 
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
+
 public final class ImageCursor_getCurrentFrame_Test {
     private final StubToolkit toolkit;
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/LightBaseTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/LightBaseTest.java
index 086ead28857..ec642f828ab 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/LightBaseTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/LightBaseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,6 @@
 
 package test.javafx.scene;
 
-import static org.junit.Assert.*;
-
 import javafx.collections.ObservableList;
 import javafx.scene.Group;
 import javafx.scene.Node;
@@ -38,9 +36,11 @@
 import javafx.scene.shape.Sphere;
 import javafx.stage.Stage;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.sun.javafx.scene.DirtyBits;
 import com.sun.javafx.sg.prism.NGLightBaseShim;
@@ -89,13 +89,13 @@ public class LightBaseTest {
     private StubToolkit toolkit = (StubToolkit) Toolkit.getToolkit();
     private Stage stage = new Stage();
 
-    @Before
+    @BeforeEach
     public void setUp() {
         stage.setScene(new Scene(root));
         stage.show();
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         stage.close();
     }
@@ -123,228 +123,228 @@ public void testMarkChildrenDirtyAndIsAffected() {
     }
 
     private void verifyInitialState() {
-        assertTrue("Scope list should be empty", scope.isEmpty());
-        assertTrue("Exclusion scope should be empty", exclusionScope.isEmpty());
+        assertTrue(scope.isEmpty(), "Scope list should be empty");
+        assertTrue(exclusionScope.isEmpty(), "Exclusion scope should be empty");
 
         toolkit.fireTestPulse();
-        assertTrue(SCOPE_EMPTY_AFFECTED, isAffected(shape1));
-        assertTrue(SCOPE_EMPTY_AFFECTED, isAffected(shape2));
-        assertTrue(SCOPE_EMPTY_AFFECTED, isAffected(shape3));
-        assertTrue(SCOPE_EMPTY_AFFECTED, isAffected(shape4));
+        assertTrue(isAffected(shape1), SCOPE_EMPTY_AFFECTED);
+        assertTrue(isAffected(shape2), SCOPE_EMPTY_AFFECTED);
+        assertTrue(isAffected(shape3), SCOPE_EMPTY_AFFECTED);
+        assertTrue(isAffected(shape4), SCOPE_EMPTY_AFFECTED);
     }
 
     private void addShape1ToScope() {
         scope.add(shape1);
-        assertTrue(ADD_SCOPE, scope.contains(shape1)); // shape1
-        assertFalse(NO_CHANGE_EXC_SCOPE, exclusionScope.contains(shape1));
+        assertTrue(scope.contains(shape1)); // shap, ADD_SCOPEe1
+        assertFalse(exclusionScope.contains(shape1), NO_CHANGE_EXC_SCOPE);
 
-        assertTrue(CHANGE_DIRTY, isDrawModeDirty(shape1));
+        assertTrue(isDrawModeDirty(shape1), CHANGE_DIRTY);
         // shapes 2-4 fell out of scope when it ceased being empty so they need a redraw (depending on their parents'
         // inclusion in the scopes too). However, we are testing here only markChildrenDirty. Redraw happens anyway for
         // all shapes through the scene when NodeHelper.markDirty is called.
-        assertFalse(NO_CHANGE_NOT_DIRTY, isDrawModeDirty(shape2));
-        assertFalse(NO_CHANGE_NOT_DIRTY, isDrawModeDirty(shape3));
-        assertFalse(NO_CHANGE_NOT_DIRTY, isDrawModeDirty(shape4));
+        assertFalse(isDrawModeDirty(shape2), NO_CHANGE_NOT_DIRTY);
+        assertFalse(isDrawModeDirty(shape3), NO_CHANGE_NOT_DIRTY);
+        assertFalse(isDrawModeDirty(shape4), NO_CHANGE_NOT_DIRTY);
 
         toolkit.fireTestPulse();
-        assertTrue(IN_SCOPE_AFFECTED, isAffected(shape1));
-        assertFalse(NOT_IN_SCOPE_NOT_AFFECTED, isAffected(shape2));
-        assertFalse(NOT_IN_SCOPE_NOT_AFFECTED, isAffected(shape3));
-        assertFalse(NOT_IN_SCOPE_NOT_AFFECTED, isAffected(shape4));
+        assertTrue(isAffected(shape1), IN_SCOPE_AFFECTED);
+        assertFalse(isAffected(shape2), NOT_IN_SCOPE_NOT_AFFECTED);
+        assertFalse(isAffected(shape3), NOT_IN_SCOPE_NOT_AFFECTED);
+        assertFalse(isAffected(shape4), NOT_IN_SCOPE_NOT_AFFECTED);
     }
 
     private void addParent1ToScope() {
         scope.add(parent1);
-        assertTrue(ADD_SCOPE, scope.contains(parent1)); // shape1, parent1
-        assertFalse(NO_CHANGE_EXC_SCOPE, exclusionScope.contains(parent1));
+        assertTrue(scope.contains(parent1)); // shape1, paren, ADD_SCOPEt1
+        assertFalse(exclusionScope.contains(parent1), NO_CHANGE_EXC_SCOPE);
 
-        assertFalse(NO_CHANGE_NOT_DIRTY, isDrawModeDirty(shape1));
-        assertTrue(PARENT_CHANGE_DIRTY, isDrawModeDirty(shape2));
-        assertFalse(NO_CHANGE_NOT_DIRTY, isDrawModeDirty(shape3));
-        assertFalse(NO_CHANGE_NOT_DIRTY, isDrawModeDirty(shape4));
+        assertFalse(isDrawModeDirty(shape1), NO_CHANGE_NOT_DIRTY);
+        assertTrue(isDrawModeDirty(shape2), PARENT_CHANGE_DIRTY);
+        assertFalse(isDrawModeDirty(shape3), NO_CHANGE_NOT_DIRTY);
+        assertFalse(isDrawModeDirty(shape4), NO_CHANGE_NOT_DIRTY);
 
         toolkit.fireTestPulse();
-        assertTrue(IN_SCOPE_AFFECTED, isAffected(shape1));
-        assertTrue(PARENT_IN_SCOPE_AFFECTED, isAffected(shape2));
-        assertFalse(NOT_IN_SCOPE_NOT_AFFECTED, isAffected(shape3));
-        assertFalse(NOT_IN_SCOPE_NOT_AFFECTED, isAffected(shape4));
+        assertTrue(isAffected(shape1), IN_SCOPE_AFFECTED);
+        assertTrue(isAffected(shape2), PARENT_IN_SCOPE_AFFECTED);
+        assertFalse(isAffected(shape3), NOT_IN_SCOPE_NOT_AFFECTED);
+        assertFalse(isAffected(shape4), NOT_IN_SCOPE_NOT_AFFECTED);
     }
 
     private void addShape2ToExcScope() {
         exclusionScope.add(shape2);
-        assertFalse(NO_CHANGE_SCOPE, scope.contains(shape2)); // shape1, parent1
-        assertTrue(ADD_EXC_SCOPE, exclusionScope.contains(shape2)); // shape2
+        assertFalse(scope.contains(shape2)); // shape1, paren, NO_CHANGE_SCOPEt1
+        assertTrue(exclusionScope.contains(shape2)); // shap, ADD_EXC_SCOPEe2
 
-        assertFalse(NO_CHANGE_NOT_DIRTY, isDrawModeDirty(shape1));
-        assertTrue(CHANGE_DIRTY, isDrawModeDirty(shape2));
-        assertFalse(NO_CHANGE_NOT_DIRTY, isDrawModeDirty(shape3));
-        assertFalse(NO_CHANGE_NOT_DIRTY, isDrawModeDirty(shape4));
+        assertFalse(isDrawModeDirty(shape1), NO_CHANGE_NOT_DIRTY);
+        assertTrue(isDrawModeDirty(shape2), CHANGE_DIRTY);
+        assertFalse(isDrawModeDirty(shape3), NO_CHANGE_NOT_DIRTY);
+        assertFalse(isDrawModeDirty(shape4), NO_CHANGE_NOT_DIRTY);
 
         toolkit.fireTestPulse();
-        assertTrue(IN_SCOPE_AFFECTED, isAffected(shape1));
-        assertFalse(IN_EXC_SCOPE_NOT_AFFECTED, isAffected(shape2));
-        assertFalse(NOT_IN_SCOPE_NOT_AFFECTED, isAffected(shape3));
-        assertFalse(NOT_IN_SCOPE_NOT_AFFECTED, isAffected(shape4));
+        assertTrue(isAffected(shape1), IN_SCOPE_AFFECTED);
+        assertFalse(isAffected(shape2), IN_EXC_SCOPE_NOT_AFFECTED);
+        assertFalse(isAffected(shape3), NOT_IN_SCOPE_NOT_AFFECTED);
+        assertFalse(isAffected(shape4), NOT_IN_SCOPE_NOT_AFFECTED);
     }
 
     private void addRootToScope() {
         scope.add(root);
-        assertTrue(ADD_SCOPE, scope.contains(root)); // shape1, parent1, root
-        assertFalse(NO_CHANGE_EXC_SCOPE, exclusionScope.contains(root)); // shape2
+        assertTrue(scope.contains(root)); // shape1, parent1, ro, ADD_SCOPEot
+        assertFalse(exclusionScope.contains(root)); // shap, NO_CHANGE_EXC_SCOPEe2
 
-        assertFalse(NO_CHANGE_NOT_DIRTY, isDrawModeDirty(shape1));
-        assertFalse(NO_CHANGE_NOT_DIRTY, isDrawModeDirty(shape2));
-        assertTrue(PARENT_CHANGE_DIRTY, isDrawModeDirty(shape3));
-        assertTrue(PARENT_CHANGE_DIRTY, isDrawModeDirty(shape4));
+        assertFalse(isDrawModeDirty(shape1), NO_CHANGE_NOT_DIRTY);
+        assertFalse(isDrawModeDirty(shape2), NO_CHANGE_NOT_DIRTY);
+        assertTrue(isDrawModeDirty(shape3), PARENT_CHANGE_DIRTY);
+        assertTrue(isDrawModeDirty(shape4), PARENT_CHANGE_DIRTY);
 
         toolkit.fireTestPulse();
-        assertTrue(IN_SCOPE_AFFECTED, isAffected(shape1));
-        assertFalse(IN_EXC_SCOPE_NOT_AFFECTED, isAffected(shape2));
-        assertTrue(PARENT_IN_SCOPE_AFFECTED, isAffected(shape3));
-        assertTrue(PARENT_IN_SCOPE_AFFECTED, isAffected(shape4));
+        assertTrue(isAffected(shape1), IN_SCOPE_AFFECTED);
+        assertFalse(isAffected(shape2), IN_EXC_SCOPE_NOT_AFFECTED);
+        assertTrue(isAffected(shape3), PARENT_IN_SCOPE_AFFECTED);
+        assertTrue(isAffected(shape4), PARENT_IN_SCOPE_AFFECTED);
     }
 
     private void moveParent1ToExcScope() {
         exclusionScope.add(parent1);
-        assertFalse(SILENT_REMOVE_SCOPE, scope.contains(parent1)); // shape1, root
-        assertTrue(ADD_EXC_SCOPE, exclusionScope.contains(parent1)); // shape2, parent1
+        assertFalse(scope.contains(parent1)); // shape1, ro, SILENT_REMOVE_SCOPEot
+        assertTrue(exclusionScope.contains(parent1)); // shape2, paren, ADD_EXC_SCOPEt1
 
-        assertFalse(NO_CHANGE_NOT_DIRTY, isDrawModeDirty(shape1));
-        assertFalse(NO_CHANGE_NOT_DIRTY, isDrawModeDirty(shape2));
-        assertFalse(NO_CHANGE_NOT_DIRTY, isDrawModeDirty(shape3));
-        assertFalse(NO_CHANGE_NOT_DIRTY, isDrawModeDirty(shape4));
+        assertFalse(isDrawModeDirty(shape1), NO_CHANGE_NOT_DIRTY);
+        assertFalse(isDrawModeDirty(shape2), NO_CHANGE_NOT_DIRTY);
+        assertFalse(isDrawModeDirty(shape3), NO_CHANGE_NOT_DIRTY);
+        assertFalse(isDrawModeDirty(shape4), NO_CHANGE_NOT_DIRTY);
 
         toolkit.fireTestPulse();
-        assertTrue(IN_SCOPE_AFFECTED, isAffected(shape1));
-        assertFalse(IN_EXC_SCOPE_NOT_AFFECTED, isAffected(shape2));
-        assertTrue(PARENT_IN_SCOPE_AFFECTED, isAffected(shape3));
-        assertTrue(PARENT_IN_SCOPE_AFFECTED, isAffected(shape4));
+        assertTrue(isAffected(shape1), IN_SCOPE_AFFECTED);
+        assertFalse(isAffected(shape2), IN_EXC_SCOPE_NOT_AFFECTED);
+        assertTrue(isAffected(shape3), PARENT_IN_SCOPE_AFFECTED);
+        assertTrue(isAffected(shape4), PARENT_IN_SCOPE_AFFECTED);
     }
 
     private void moveShape2ToScope() {
         scope.add(shape2);
-        assertTrue(ADD_SCOPE, scope.contains(shape2)); // shape1, root, shape2
-        assertFalse(SILENT_REMOVE_EXC_SCOPE, exclusionScope.contains(shape2)); // parent1
+        assertTrue(scope.contains(shape2)); // shape1, root, shap, ADD_SCOPEe2
+        assertFalse(exclusionScope.contains(shape2)); // paren, SILENT_REMOVE_EXC_SCOPEt1
 
-        assertFalse(NO_CHANGE_NOT_DIRTY, isDrawModeDirty(shape1));
-        assertTrue(CHANGE_DIRTY, isDrawModeDirty(shape2));
-        assertFalse(NO_CHANGE_NOT_DIRTY, isDrawModeDirty(shape3));
-        assertFalse(NO_CHANGE_NOT_DIRTY, isDrawModeDirty(shape4));
+        assertFalse(isDrawModeDirty(shape1), NO_CHANGE_NOT_DIRTY);
+        assertTrue(isDrawModeDirty(shape2), CHANGE_DIRTY);
+        assertFalse(isDrawModeDirty(shape3), NO_CHANGE_NOT_DIRTY);
+        assertFalse(isDrawModeDirty(shape4), NO_CHANGE_NOT_DIRTY);
 
         toolkit.fireTestPulse();
-        assertTrue(IN_SCOPE_AFFECTED, isAffected(shape1));
-        assertTrue(IN_SCOPE_AFFECTED, isAffected(shape2));
-        assertTrue(PARENT_IN_SCOPE_AFFECTED, isAffected(shape3));
-        assertTrue(PARENT_IN_SCOPE_AFFECTED, isAffected(shape4));
+        assertTrue(isAffected(shape1), IN_SCOPE_AFFECTED);
+        assertTrue(isAffected(shape2), IN_SCOPE_AFFECTED);
+        assertTrue(isAffected(shape3), PARENT_IN_SCOPE_AFFECTED);
+        assertTrue(isAffected(shape4), PARENT_IN_SCOPE_AFFECTED);
     }
 
     private void removeShape1FromScope() {
         scope.remove(shape1);
-        assertFalse(REMOVE_SCOPE, scope.contains(shape1)); // root, shape2
-        assertFalse(NO_CHANGE_EXC_SCOPE, exclusionScope.contains(shape1)); // parent1
+        assertFalse(scope.contains(shape1)); // root, shap, REMOVE_SCOPEe2
+        assertFalse(exclusionScope.contains(shape1)); // paren, NO_CHANGE_EXC_SCOPEt1
 
-        assertTrue(CHANGE_DIRTY, isDrawModeDirty(shape1));
-        assertFalse(NO_CHANGE_NOT_DIRTY, isDrawModeDirty(shape2));
-        assertFalse(NO_CHANGE_NOT_DIRTY, isDrawModeDirty(shape3));
-        assertFalse(NO_CHANGE_NOT_DIRTY, isDrawModeDirty(shape4));
+        assertTrue(isDrawModeDirty(shape1), CHANGE_DIRTY);
+        assertFalse(isDrawModeDirty(shape2), NO_CHANGE_NOT_DIRTY);
+        assertFalse(isDrawModeDirty(shape3), NO_CHANGE_NOT_DIRTY);
+        assertFalse(isDrawModeDirty(shape4), NO_CHANGE_NOT_DIRTY);
 
         toolkit.fireTestPulse();
-        assertFalse(PARENT_IN_EXC_SCOPE_NOT_AFFECTED, isAffected(shape1));
-        assertTrue(IN_SCOPE_AFFECTED, isAffected(shape2));
-        assertTrue(PARENT_IN_SCOPE_AFFECTED, isAffected(shape3));
-        assertTrue(PARENT_IN_SCOPE_AFFECTED, isAffected(shape4));
+        assertFalse(isAffected(shape1), PARENT_IN_EXC_SCOPE_NOT_AFFECTED);
+        assertTrue(isAffected(shape2), IN_SCOPE_AFFECTED);
+        assertTrue(isAffected(shape3), PARENT_IN_SCOPE_AFFECTED);
+        assertTrue(isAffected(shape4), PARENT_IN_SCOPE_AFFECTED);
     }
 
     private void removeRootFromScope() {
         scope.remove(root);
-        assertFalse(REMOVE_SCOPE, scope.contains(root)); // shape2
-        assertFalse(NO_CHANGE_EXC_SCOPE, exclusionScope.contains(root)); // parent1
+        assertFalse(scope.contains(root)); // shap, REMOVE_SCOPEe2
+        assertFalse(exclusionScope.contains(root)); // paren, NO_CHANGE_EXC_SCOPEt1
 
-        assertFalse(NO_CHANGE_NOT_DIRTY, isDrawModeDirty(shape1));
-        assertFalse(NO_CHANGE_NOT_DIRTY, isDrawModeDirty(shape2));
-        assertTrue(PARENT_CHANGE_DIRTY, isDrawModeDirty(shape3));
-        assertTrue(PARENT_CHANGE_DIRTY, isDrawModeDirty(shape4));
+        assertFalse(isDrawModeDirty(shape1), NO_CHANGE_NOT_DIRTY);
+        assertFalse(isDrawModeDirty(shape2), NO_CHANGE_NOT_DIRTY);
+        assertTrue(isDrawModeDirty(shape3), PARENT_CHANGE_DIRTY);
+        assertTrue(isDrawModeDirty(shape4), PARENT_CHANGE_DIRTY);
 
         toolkit.fireTestPulse();
-        assertFalse(PARENT_IN_EXC_SCOPE_NOT_AFFECTED, isAffected(shape1));
-        assertTrue(IN_SCOPE_AFFECTED, isAffected(shape2));
-        assertFalse(NOT_IN_SCOPE_NOT_AFFECTED, isAffected(shape3));
-        assertFalse(NOT_IN_SCOPE_NOT_AFFECTED, isAffected(shape4));
+        assertFalse(isAffected(shape1), PARENT_IN_EXC_SCOPE_NOT_AFFECTED);
+        assertTrue(isAffected(shape2), IN_SCOPE_AFFECTED);
+        assertFalse(isAffected(shape3), NOT_IN_SCOPE_NOT_AFFECTED);
+        assertFalse(isAffected(shape4), NOT_IN_SCOPE_NOT_AFFECTED);
     }
 
     private void moveShape2ToExcScope() {
         exclusionScope.add(shape2);
-        assertFalse(SILENT_REMOVE_SCOPE, scope.contains(shape2));
-        assertTrue(ADD_EXC_SCOPE, exclusionScope.contains(shape2)); // parent1, shape2
+        assertFalse(scope.contains(shape2), SILENT_REMOVE_SCOPE);
+        assertTrue(exclusionScope.contains(shape2)); // parent1, shap, ADD_EXC_SCOPEe2
 
-        assertFalse(NO_CHANGE_NOT_DIRTY, isDrawModeDirty(shape1));
-        assertTrue(CHANGE_DIRTY, isDrawModeDirty(shape2));
-        assertFalse(NO_CHANGE_NOT_DIRTY, isDrawModeDirty(shape3));
-        assertFalse(NO_CHANGE_NOT_DIRTY, isDrawModeDirty(shape4));
+        assertFalse(isDrawModeDirty(shape1), NO_CHANGE_NOT_DIRTY);
+        assertTrue(isDrawModeDirty(shape2), CHANGE_DIRTY);
+        assertFalse(isDrawModeDirty(shape3), NO_CHANGE_NOT_DIRTY);
+        assertFalse(isDrawModeDirty(shape4), NO_CHANGE_NOT_DIRTY);
 
         toolkit.fireTestPulse();
-        assertFalse(PARENT_IN_EXC_SCOPE_NOT_AFFECTED, isAffected(shape1));
-        assertFalse(IN_EXC_SCOPE_NOT_AFFECTED, isAffected(shape2));
-        assertTrue(SCOPE_EMPTY_AFFECTED, isAffected(shape3));
-        assertTrue(SCOPE_EMPTY_AFFECTED, isAffected(shape4));
+        assertFalse(isAffected(shape1), PARENT_IN_EXC_SCOPE_NOT_AFFECTED);
+        assertFalse(isAffected(shape2), IN_EXC_SCOPE_NOT_AFFECTED);
+        assertTrue(isAffected(shape3), SCOPE_EMPTY_AFFECTED);
+        assertTrue(isAffected(shape4), SCOPE_EMPTY_AFFECTED);
     }
 
     private void moveParent1ToScope() {
         scope.add(parent1);
-        assertTrue(ADD_SCOPE, scope.contains(parent1)); // parent1
-        assertFalse(SILENT_REMOVE_EXC_SCOPE, exclusionScope.contains(parent1)); // shape2
+        assertTrue(scope.contains(parent1)); // paren, ADD_SCOPEt1
+        assertFalse(exclusionScope.contains(parent1)); // shap, SILENT_REMOVE_EXC_SCOPEe2
 
-        assertTrue(PARENT_CHANGE_DIRTY, isDrawModeDirty(shape1));
-        assertFalse(NO_CHANGE_NOT_DIRTY, isDrawModeDirty(shape2));
-        assertFalse(NO_CHANGE_NOT_DIRTY, isDrawModeDirty(shape3));
-        assertFalse(NO_CHANGE_NOT_DIRTY, isDrawModeDirty(shape4));
+        assertTrue(isDrawModeDirty(shape1), PARENT_CHANGE_DIRTY);
+        assertFalse(isDrawModeDirty(shape2), NO_CHANGE_NOT_DIRTY);
+        assertFalse(isDrawModeDirty(shape3), NO_CHANGE_NOT_DIRTY);
+        assertFalse(isDrawModeDirty(shape4), NO_CHANGE_NOT_DIRTY);
 
         toolkit.fireTestPulse();
-        assertTrue(PARENT_IN_SCOPE_AFFECTED, isAffected(shape1));
-        assertFalse(IN_EXC_SCOPE_NOT_AFFECTED, isAffected(shape2));
-        assertFalse(NOT_IN_SCOPE_NOT_AFFECTED, isAffected(shape3));
-        assertFalse(NOT_IN_SCOPE_NOT_AFFECTED, isAffected(shape4));
+        assertTrue(isAffected(shape1), PARENT_IN_SCOPE_AFFECTED);
+        assertFalse(isAffected(shape2), IN_EXC_SCOPE_NOT_AFFECTED);
+        assertFalse(isAffected(shape3), NOT_IN_SCOPE_NOT_AFFECTED);
+        assertFalse(isAffected(shape4), NOT_IN_SCOPE_NOT_AFFECTED);
     }
 
     private void removeShape2FromExcScope() {
         exclusionScope.remove(shape2);
-        assertFalse(NO_CHANGE_SCOPE, scope.contains(shape2)); // parent1
-        assertFalse(REMOVE_EXC_SCOPE, exclusionScope.contains(shape2));
+        assertFalse(scope.contains(shape2)); // paren, NO_CHANGE_SCOPEt1
+        assertFalse(exclusionScope.contains(shape2), REMOVE_EXC_SCOPE);
 
-        assertFalse(NO_CHANGE_NOT_DIRTY, isDrawModeDirty(shape1));
-        assertTrue(CHANGE_DIRTY, isDrawModeDirty(shape2));
-        assertFalse(NO_CHANGE_NOT_DIRTY, isDrawModeDirty(shape3));
-        assertFalse(NO_CHANGE_NOT_DIRTY, isDrawModeDirty(shape4));
+        assertFalse(isDrawModeDirty(shape1), NO_CHANGE_NOT_DIRTY);
+        assertTrue(isDrawModeDirty(shape2), CHANGE_DIRTY);
+        assertFalse(isDrawModeDirty(shape3), NO_CHANGE_NOT_DIRTY);
+        assertFalse(isDrawModeDirty(shape4), NO_CHANGE_NOT_DIRTY);
 
         toolkit.fireTestPulse();
-        assertTrue(PARENT_IN_SCOPE_AFFECTED, isAffected(shape1));
-        assertTrue(PARENT_IN_SCOPE_AFFECTED, isAffected(shape2));
-        assertFalse(NOT_IN_SCOPE_NOT_AFFECTED, isAffected(shape3));
-        assertFalse(NOT_IN_SCOPE_NOT_AFFECTED, isAffected(shape4));
+        assertTrue(isAffected(shape1), PARENT_IN_SCOPE_AFFECTED);
+        assertTrue(isAffected(shape2), PARENT_IN_SCOPE_AFFECTED);
+        assertFalse(isAffected(shape3), NOT_IN_SCOPE_NOT_AFFECTED);
+        assertFalse(isAffected(shape4), NOT_IN_SCOPE_NOT_AFFECTED);
     }
 
     private void removeParent1FromScope() {
         scope.remove(parent1);
-        assertFalse(REMOVE_SCOPE, scope.contains(parent1));
-        assertFalse(NO_CHANGE_EXC_SCOPE, exclusionScope.contains(parent1));
+        assertFalse(scope.contains(parent1), REMOVE_SCOPE);
+        assertFalse(exclusionScope.contains(parent1), NO_CHANGE_EXC_SCOPE);
 
-        assertTrue(PARENT_CHANGE_DIRTY, isDrawModeDirty(shape1));
-        assertTrue(PARENT_CHANGE_DIRTY, isDrawModeDirty(shape2));
+        assertTrue(isDrawModeDirty(shape1), PARENT_CHANGE_DIRTY);
+        assertTrue(isDrawModeDirty(shape2), PARENT_CHANGE_DIRTY);
         // Shapes 3 and 4 require redraw because scope became empty, but they are not marked dirty by markChildrenDirty
         // because they or their parents didn't change scope.
-        assertFalse(NO_CHANGE_NOT_DIRTY, isDrawModeDirty(shape3));
-        assertFalse(NO_CHANGE_NOT_DIRTY, isDrawModeDirty(shape4));
+        assertFalse(isDrawModeDirty(shape3), NO_CHANGE_NOT_DIRTY);
+        assertFalse(isDrawModeDirty(shape4), NO_CHANGE_NOT_DIRTY);
 
         toolkit.fireTestPulse();
-        assertTrue(SCOPE_EMPTY_AFFECTED, isAffected(shape1));
-        assertTrue(SCOPE_EMPTY_AFFECTED, isAffected(shape2));
-        assertTrue(SCOPE_EMPTY_AFFECTED, isAffected(shape3));
-        assertTrue(SCOPE_EMPTY_AFFECTED, isAffected(shape4));
+        assertTrue(isAffected(shape1), SCOPE_EMPTY_AFFECTED);
+        assertTrue(isAffected(shape2), SCOPE_EMPTY_AFFECTED);
+        assertTrue(isAffected(shape3), SCOPE_EMPTY_AFFECTED);
+        assertTrue(isAffected(shape4), SCOPE_EMPTY_AFFECTED);
     }
 
     private void verifyEmpty() {
-        assertTrue("Scope is empty", scope.isEmpty());
-        assertTrue("Exclusion scope is empty", exclusionScope.isEmpty());
+        assertTrue(scope.isEmpty(), "Scope is empty");
+        assertTrue(exclusionScope.isEmpty(), "Exclusion scope is empty");
     }
 
     private boolean isAffected(Shape3D shape) {
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/LightBase_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/LightBase_properties_Test.java
index fdeb4822d0f..e589da065a7 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/LightBase_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/LightBase_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,33 +24,23 @@
  */
 package test.javafx.scene;
 
-import test.com.sun.javafx.test.PropertiesTestBase;
-import java.util.ArrayList;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.scene.PointLight;
 import javafx.scene.paint.Color;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
 
-@RunWith(Parameterized.class)
-public final class LightBase_properties_Test extends PropertiesTestBase {
+import org.junit.jupiter.params.provider.Arguments;
+import test.com.sun.javafx.test.PropertiesTestBase;
 
-    @Parameters
-    public static Collection data() {
-        ArrayList array = new ArrayList();
+public final class LightBase_properties_Test extends PropertiesTestBase {
 
+    public static Stream<Arguments> data() {
         // simple property tests
         PointLight testLight = createPointLight();
 
-        array.add(config(testLight, "lightOn", true, false));
-        array.add(config(testLight, "color", Color.WHITE, null));
-
-        return array;
-    }
-
-    public LightBase_properties_Test(final Configuration configuration) {
-        super(configuration);
+        return Stream.of(
+            config(testLight, "lightOn", true, false),
+            config(testLight, "color", Color.WHITE, null)
+        );
     }
 
     private static PointLight createPointLight() {
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/Mouse3DTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/Mouse3DTest.java
index 71271f7be80..5e04ce707dd 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/Mouse3DTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/Mouse3DTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,8 +56,12 @@
 import javafx.scene.shape.TriangleMesh;
 import javafx.scene.transform.Rotate;
 import javafx.stage.Stage;
-import static org.junit.Assert.*;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 public class Mouse3DTest {
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/MouseTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/MouseTest.java
index b27ec7cd331..3aaaceb7bff 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/MouseTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/MouseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,15 +27,11 @@
 
 import com.sun.javafx.scene.SceneHelper;
 import test.com.sun.javafx.test.MouseEventGenerator;
-import static org.junit.Assert.*;
 import javafx.event.EventHandler;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
 
-import org.junit.Assert;
-import org.junit.Test;
-
 import test.com.sun.javafx.pgstub.StubScene;
 import test.com.sun.javafx.pgstub.StubToolkit;
 import com.sun.javafx.tk.Toolkit;
@@ -53,6 +49,14 @@
 import javafx.scene.paint.Color;
 import javafx.scene.transform.Rotate;
 
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 public class MouseTest {
 
     private static final double DONT_TEST = 0.0;
@@ -999,10 +1003,10 @@ public void nodeWithNoninvertibleTransformShouldGetNanCoords() {
 
         scene.smallSquareTracker.node.addEventHandler(MouseEvent.MOUSE_RELEASED,
                 event -> {
-                    Assert.assertEquals(Double.NaN, event.getX(), 0.0001);
-                    Assert.assertEquals(Double.NaN, event.getY(), 0.0001);
-                    Assert.assertEquals(251.0, event.getSceneX(), 0.0001);
-                    Assert.assertEquals(251.0, event.getSceneY(), 0.0001);
+                    assertEquals(Double.NaN, event.getX(), 0.0001);
+                    assertEquals(Double.NaN, event.getY(), 0.0001);
+                    assertEquals(251.0, event.getSceneX(), 0.0001);
+                    assertEquals(251.0, event.getSceneY(), 0.0001);
                 }
         );
 
@@ -1296,7 +1300,7 @@ public void coordinatesShouldBeFlattenedWhenBubblingOutOfSubScene() {
         s.innerRect1.setTranslateZ(10);
 
         s.parent1.setOnMouseMoved(event -> {
-            Assert.assertEquals(5, event.getZ(), 0.00001);
+            assertEquals(5, event.getZ(), 0.00001);
             assertSame(s.innerRect1, event.getTarget());
             s.called = true;
         });
@@ -1338,12 +1342,12 @@ public void coordinatesShouldBeRecomputedToSubSceneProjectionPlane() {
         s.innerRect1.setOnMouseExited(event -> {
             assertSame(s.innerRect2, event.getPickResult().getIntersectedNode());
             assertSame(s.innerRect1, event.getTarget());
-            Assert.assertEquals(16.58, event.getPickResult().getIntersectedPoint().getX(), 0.1);
-            Assert.assertEquals(7.33, event.getPickResult().getIntersectedPoint().getY(), 0.1);
-            Assert.assertEquals(0.0, event.getPickResult().getIntersectedPoint().getZ(), 0.0001);
-            Assert.assertEquals(295.81, event.getX(), 0.1);
-            Assert.assertEquals(57.64, event.getY(), 0.1);
-            Assert.assertEquals(-3.0, event.getZ(), 0.1);
+            assertEquals(16.58, event.getPickResult().getIntersectedPoint().getX(), 0.1);
+            assertEquals(7.33, event.getPickResult().getIntersectedPoint().getY(), 0.1);
+            assertEquals(0.0, event.getPickResult().getIntersectedPoint().getZ(), 0.0001);
+            assertEquals(295.81, event.getX(), 0.1);
+            assertEquals(57.64, event.getY(), 0.1);
+            assertEquals(-3.0, event.getZ(), 0.1);
 
             s.called = true;
         });
@@ -1373,12 +1377,12 @@ public void coordinatesShouldBeRecomputedToNodeLocalCoordsOfSubSceneProjectionPl
         s.innerRect1.setOnMouseExited(event -> {
             assertSame(s.innerRect2, event.getPickResult().getIntersectedNode());
             assertSame(s.innerRect1, event.getTarget());
-            Assert.assertEquals(14.07, event.getPickResult().getIntersectedPoint().getX(), 0.1);
-            Assert.assertEquals(5.97, event.getPickResult().getIntersectedPoint().getY(), 0.1);
-            Assert.assertEquals(0.0, event.getPickResult().getIntersectedPoint().getZ(), 0.0001);
-            Assert.assertEquals(216.49, event.getX(), 0.1);
-            Assert.assertEquals(57.64, event.getY(), 0.1);
-            Assert.assertEquals(-191.49, event.getZ(), 0.1);
+            assertEquals(14.07, event.getPickResult().getIntersectedPoint().getX(), 0.1);
+            assertEquals(5.97, event.getPickResult().getIntersectedPoint().getY(), 0.1);
+            assertEquals(0.0, event.getPickResult().getIntersectedPoint().getZ(), 0.0001);
+            assertEquals(216.49, event.getX(), 0.1);
+            assertEquals(57.64, event.getY(), 0.1);
+            assertEquals(-191.49, event.getZ(), 0.1);
 
             s.called = true;
         });
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/NodeTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/NodeTest.java
index 9123aaf9cba..bd043238fef 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/NodeTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/NodeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,9 +59,6 @@
 import javafx.scene.shape.*;
 import javafx.scene.transform.Rotate;
 import javafx.scene.transform.Transform;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
 
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Method;
@@ -84,14 +81,21 @@
 import javafx.scene.transform.Translate;
 import javafx.stage.Stage;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 /**
  * Tests various aspects of Node.
  *
  */
 public class NodeTest {
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
 
     // Things to test:
         // When parent is changed, should cursor on toolkit change as well if
@@ -170,14 +174,16 @@ public void testGetPseudoClassStatesShouldReturnSameSet() {
         Rectangle node = new Rectangle();
         Set<PseudoClass> set1 = node.getPseudoClassStates();
         Set<PseudoClass> set2 = node.getPseudoClassStates();
-        assertSame("getPseudoClassStates() should always return the same instance",
-                set1, set2);
+        assertSame(set1, set2,
+                   "getPseudoClassStates() should always return the same instance");
     }
 
-    @Test(expected=UnsupportedOperationException.class)
+    @Test
     public void testPseudoClassStatesIsUnmodifiable() {
-        Node node = new Rectangle();
-        node.getPseudoClassStates().add(PseudoClass.getPseudoClass("dummy"));
+        assertThrows(UnsupportedOperationException.class, () -> {
+            Node node = new Rectangle();
+            node.getPseudoClassStates().add(PseudoClass.getPseudoClass("dummy"));
+        });
     }
 
     @Test
@@ -214,7 +220,7 @@ public void testPseudoClassStatesNotGCed() {
         Node node = new Rectangle();
         WeakReference<Set<?>> weakRef = new WeakReference<>(node.getPseudoClassStates());
         TestUtils.attemptGC(weakRef);
-        assertNotNull("pseudoClassStates must not be gc'ed", weakRef.get());
+        assertNotNull(weakRef.get(), "pseudoClassStates must not be gc'ed");
     }
 
 // TODO disable this because it depends on TestNode
@@ -961,13 +967,14 @@ public void testInvalidClip() {
         clip2.setClip(rectA);
         rectA.setClip(clip1);
         assertEquals(rectA.getClip(), clip1);
-        thrown.expect(IllegalArgumentException.class);
-        try {
-            rectA.setClip(clip2);
-        } catch (final IllegalArgumentException e) {
-            assertNotSame(rectA.getClip(), clip2);
-            throw e;
-        }
+        assertThrows(IllegalArgumentException.class, () -> {
+            try {
+                rectA.setClip(clip2);
+            } catch (final IllegalArgumentException e) {
+                assertNotSame(rectA.getClip(), clip2);
+                throw e;
+            }
+        });
     }
 
     @Test public void testProperties() {
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_LocalToParentTransform_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_LocalToParentTransform_Test.java
index 42625462cd4..9e41f20033a 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_LocalToParentTransform_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_LocalToParentTransform_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,8 +30,10 @@
 import javafx.scene.transform.Translate;
 import javafx.scene.shape.Rectangle;
 import javafx.scene.Node;
-import org.junit.Test;
-import static org.junit.Assert.*;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class Node_LocalToParentTransform_Test {
     private boolean notified;
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_LocalToSceneTransform_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_LocalToSceneTransform_Test.java
index 70ceb534618..bda34e8eb6a 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_LocalToSceneTransform_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_LocalToSceneTransform_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,8 +33,10 @@
 import javafx.scene.Node;
 import javafx.scene.NodeShim;
 import javafx.scene.transform.Transform;
-import org.junit.Test;
-import static org.junit.Assert.*;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class Node_LocalToSceneTransform_Test {
     private boolean notified;
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_bind_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_bind_Test.java
index 91f28587702..975d9e87203 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_bind_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_bind_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,6 @@
 
 package test.javafx.scene;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.scene.Node;
@@ -35,79 +33,87 @@
 import javafx.scene.effect.Shadow;
 import javafx.scene.shape.Rectangle;
 
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
 
 public class Node_bind_Test {
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
 
-     @Test public void testClip() {
-         Rectangle rectA = new Rectangle(300, 300);
-         Rectangle clip1 = new Rectangle(10, 10);
-         Rectangle clip2 = new Rectangle(100, 100);
-         ObjectProperty<Node> v = new SimpleObjectProperty<>(clip1);
-         rectA.clipProperty().bind(v);
-         assertEquals(rectA.getClip(), clip1);
-         v.set(clip2);
-         assertEquals(rectA.getClip(), clip2);
-     }
+    @AfterEach
+    private void tearDownEach() {
+        Thread.currentThread().setUncaughtExceptionHandler(null);
+    }
 
-     int countIllegalArgumentException = 0;
-     @Test public void testIllegalClip() {
-         Thread.currentThread().setUncaughtExceptionHandler((thread, throwable) -> {
-             if (throwable instanceof IllegalArgumentException) {
-                 countIllegalArgumentException++;
-             } else {
-                 Thread.currentThread().getThreadGroup().uncaughtException(thread, throwable);
-             }
-         });
-         Rectangle rectA = new Rectangle(300, 300);
-         Rectangle clip1 = new Rectangle(10, 10);
-         Rectangle clip2 = new Rectangle(100, 100);
-         clip2.setClip(rectA);
-         ObjectProperty<Node> v = new SimpleObjectProperty<>(clip1);
-         rectA.clipProperty().bind(v);
-         assertEquals(rectA.getClip(), clip1);
-         v.set(clip2);
-         assertNotSame(rectA.getClip(), clip2);
+    @Test
+    public void testClip() {
+        Rectangle rectA = new Rectangle(300, 300);
+        Rectangle clip1 = new Rectangle(10, 10);
+        Rectangle clip2 = new Rectangle(100, 100);
+        ObjectProperty<Node> v = new SimpleObjectProperty<>(clip1);
+        rectA.clipProperty().bind(v);
+        assertEquals(rectA.getClip(), clip1);
+        v.set(clip2);
+        assertEquals(rectA.getClip(), clip2);
+    }
 
-         assertEquals("Cycle in effect chain detected, exception should occur once.", 1, countIllegalArgumentException);
-         Thread.currentThread().setUncaughtExceptionHandler(null);
-     }
+    int countIllegalArgumentException = 0;
+    @Test
+    public void testIllegalClip() {
+        Thread.currentThread().setUncaughtExceptionHandler((thread, throwable) -> {
+            if (throwable instanceof IllegalArgumentException) {
+                countIllegalArgumentException++;
+            } else {
+                Thread.currentThread().getThreadGroup().uncaughtException(thread, throwable);
+            }
+        });
+        Rectangle rectA = new Rectangle(300, 300);
+        Rectangle clip1 = new Rectangle(10, 10);
+        Rectangle clip2 = new Rectangle(100, 100);
+        clip2.setClip(rectA);
+        ObjectProperty<Node> v = new SimpleObjectProperty<>(clip1);
+        rectA.clipProperty().bind(v);
+        assertEquals(rectA.getClip(), clip1);
+        v.set(clip2);
+        assertNotSame(rectA.getClip(), clip2);
 
-     @Test public void testBackToLegalClip() {
-         countIllegalArgumentException = 0;
-         Thread.currentThread().setUncaughtExceptionHandler((thread, throwable) -> {
-             if (throwable instanceof IllegalArgumentException) {
-                 countIllegalArgumentException++;
-             } else {
-                 Thread.currentThread().getThreadGroup().uncaughtException(thread, throwable);
-             }
-         });
-         Rectangle rectA = new Rectangle(300, 300);
-         Rectangle clip1 = new Rectangle(10, 10);
-         Rectangle clip2 = new Rectangle(100, 100);
-         clip2.setClip(rectA);
-         ObjectProperty<Node> v = new SimpleObjectProperty<>(clip1);
-         rectA.clipProperty().bind(v);
-         assertEquals(rectA.getClip(), clip1);
-         v.set(clip2);
-         assertEquals(rectA.getClip(), clip1);
+        assertEquals(1, countIllegalArgumentException, "Cycle in effect chain detected, exception should occur once.");
+        Thread.currentThread().setUncaughtExceptionHandler(null);
+    }
 
-         assertEquals("Cycle in effect chain detected, exception should occur once.", 1, countIllegalArgumentException);
-         Thread.currentThread().setUncaughtExceptionHandler(null);
-     }
+    @Test
+    public void testBackToLegalClip() {
+        countIllegalArgumentException = 0;
+        Thread.currentThread().setUncaughtExceptionHandler((thread, throwable) -> {
+            if (throwable instanceof IllegalArgumentException) {
+                countIllegalArgumentException++;
+            } else {
+                Thread.currentThread().getThreadGroup().uncaughtException(thread, throwable);
+            }
+        });
+        Rectangle rectA = new Rectangle(300, 300);
+        Rectangle clip1 = new Rectangle(10, 10);
+        Rectangle clip2 = new Rectangle(100, 100);
+        clip2.setClip(rectA);
+        ObjectProperty<Node> v = new SimpleObjectProperty<>(clip1);
+        rectA.clipProperty().bind(v);
+        assertEquals(rectA.getClip(), clip1);
+        v.set(clip2);
+        assertEquals(rectA.getClip(), clip1);
 
-     @Test public void testEffect() {
-         Shadow effect1 = new Shadow();
-         Blend effect2 = new Blend();
-         Rectangle rectA = new Rectangle(100, 100);
-         ObjectProperty<Effect> v = new SimpleObjectProperty<>(effect1);
-         rectA.effectProperty().bind(v);
-         assertEquals(rectA.getEffect(), effect1);
-         v.set(effect2);
-         assertEquals(rectA.getEffect(), effect2);
+        assertEquals(1, countIllegalArgumentException, "Cycle in effect chain detected, exception should occur once.");
+        // UEH set to null in @AfterEach
      }
+
+    @Test
+    public void testEffect() {
+        Shadow effect1 = new Shadow();
+        Blend effect2 = new Blend();
+        Rectangle rectA = new Rectangle(100, 100);
+        ObjectProperty<Effect> v = new SimpleObjectProperty<>(effect1);
+        rectA.effectProperty().bind(v);
+        assertEquals(rectA.getEffect(), effect1);
+        v.set(effect2);
+        assertEquals(rectA.getEffect(), effect2);
+    }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_cssMethods_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_cssMethods_Test.java
index cde44ea63f9..dec7b1c1d0c 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_cssMethods_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_cssMethods_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,19 +25,13 @@
 
 package test.javafx.scene;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 
 import javafx.scene.effect.BlendMode;
 import javafx.scene.effect.Shadow;
 import javafx.scene.image.Image;
 import javafx.scene.shape.Rectangle;
 
-import org.junit.BeforeClass;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
 import test.com.sun.javafx.pgstub.StubImageLoaderFactory;
 import test.com.sun.javafx.pgstub.StubPlatformImageInfo;
 import test.com.sun.javafx.pgstub.StubToolkit;
@@ -48,12 +42,13 @@
 import javafx.scene.ImageCursor;
 import javafx.scene.Node;
 
-@RunWith(Parameterized.class)
+import org.junit.jupiter.api.BeforeAll;
+
 public final class Node_cssMethods_Test extends CssMethodsTestBase {
     private static final Node TEST_NODE = new Rectangle();
     private static final String TEST_CURSOR_URL = "file:cursor.png";
 
-    @BeforeClass
+    @BeforeAll
     public static void configureImageLoaderFactory() {
         final StubImageLoaderFactory imageLoaderFactory =
                 ((StubToolkit) Toolkit.getToolkit()).getImageLoaderFactory();
@@ -63,9 +58,8 @@ public static void configureImageLoaderFactory() {
                 new StubPlatformImageInfo(32, 32));
     }
 
-    @Parameters
-    public static Collection data() {
-        return Arrays.asList(new Object[] {
+    public static Stream<Configuration> data() {
+        return Stream.of(
             config(TEST_NODE, "cursor", null, "-fx-cursor", Cursor.cursor(TEST_CURSOR_URL),
                    new ValueComparator() {
                        @Override
@@ -107,11 +101,11 @@ public boolean equals(final Object expected,
             config("translateY", 0.0, "-fx-translate-y", 20.0),
             config("translateY", 1.0, "-fx-translate-y", null, 0.0),
             config("translateZ", 0.0, "-fx-translate-z", 30.0),
-            config("translateZ", 1.0, "-fx-translate-z", null, 0.0),
-        });
+            config("translateZ", 1.0, "-fx-translate-z", null, 0.0)
+        );
     }
 
-    public static Object[] config(
+    public static Configuration config(
             final String propertyName,
             final Object initialValue,
             final String cssPropertyKey,
@@ -120,7 +114,7 @@ public static Object[] config(
                       cssPropertyKey, cssPropertyValue);
     }
 
-    public static Object[] config(
+    public static Configuration config(
             final String propertyName,
             final Object initialValue,
             final String cssPropertyKey,
@@ -129,8 +123,4 @@ public static Object[] config(
         return config(TEST_NODE, propertyName, initialValue,
                       cssPropertyKey, cssPropertyValue, expectedFinalValue);
     }
-
-    public Node_cssMethods_Test(final Configuration configuration) {
-        super(configuration);
-    }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_effectiveOrientation_Css_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_effectiveOrientation_Css_Test.java
index 251245b5133..c32529fe5c5 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_effectiveOrientation_Css_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_effectiveOrientation_Css_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,23 +34,24 @@
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
-import org.junit.After;
-import org.junit.Ignore;
-import org.junit.Test;
-import static org.junit.Assert.*;
-import org.junit.Before;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Test :dir functional pseudo-class
  */
-@Ignore("JDK-8234152")
+@Disabled("JDK-8234152")
 public class Node_effectiveOrientation_Css_Test {
 
     private Group root;
     private Scene scene;
     private Stage stage;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         root = new Group();
         scene = new Scene(root);
@@ -60,7 +61,7 @@ public void setUp() {
         stage.requestFocus();
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         resetStyleManager();
         stage.hide();
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_effectiveOrientation_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_effectiveOrientation_Test.java
index dc5dc739fd2..985ccf73d5a 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_effectiveOrientation_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_effectiveOrientation_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,24 +26,19 @@
 package test.javafx.scene;
 
 import test.com.sun.javafx.test.NodeOrientationTestBase;
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.geometry.NodeOrientation;
 import javafx.scene.Group;
 import javafx.scene.Node;
 import javafx.scene.Scene;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
 
-@RunWith(Parameterized.class)
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public final class Node_effectiveOrientation_Test
         extends NodeOrientationTestBase {
-    private final Scene testScene;
-    private final String orientationUpdate;
-    private final String expectedOrientation;
 
     private static Scene lriiliScene() {
         return ltrScene(
@@ -105,51 +100,43 @@ private static Scene lrIiilScene() {
     /*
      * Parameters: [testScene], [orientationUpdate], [expectedOrientation]
      */
-    @Parameters
-    public static Collection data() {
-        return Arrays.asList(
-                new Object[][] {
-                        { lriiliScene(), "......", "LRRRLL" },
-                        { lriiliScene(), ".I....", "LLLLLL" },
-                        { lriiliScene(), "...L..", "LRRLLL" },
-                        { lriiliScene(), "....I.", "LRRRRR" },
-                        { lriiliScene(), "RIIIII", "RRRRRR" },
-
-                        {
-                            lriiliWithSubSceneScene(),
-                            ".......", "LRRRLL"
-                        },
-                        {
-                            lriiliWithSubSceneScene(),
-                            ".L.....", "LLLLLL"
-                        },
-
-                        { liirliPrecachedScene(), "......", "LLLRLL" },
-                        { liirliPrecachedScene(), "R.....", "RRRRLL" },
-                        { liirliPrecachedScene(), "...I..", "LLLLLL" },
-                        { liirliPrecachedScene(), "R..IR.", "RRRRRR" },
-
-                        {
-                            riirliPlugedPrecachedScenegraphScene(),
-                            "......", "RRRRLL"
-                        },
-
-                        { lrIiilScene(), "......", "LRRRRL" },
-                        { lrIiilScene(), ".L....", "LLLLLL" }
-                    });
-    }
-
-    public Node_effectiveOrientation_Test(
-            final Scene testScene,
-            final String orientationUpdate,
-            final String expectedOrientation) {
-        this.testScene = testScene;
-        this.orientationUpdate = orientationUpdate;
-        this.expectedOrientation = expectedOrientation;
+    public static Stream<Arguments> data() {
+        return Stream.of(
+            Arguments.of(lriiliScene(), "......", "LRRRLL" ),
+            Arguments.of(lriiliScene(), ".I....", "LLLLLL" ),
+            Arguments.of(lriiliScene(), "...L..", "LRRLLL" ),
+            Arguments.of(lriiliScene(), "....I.", "LRRRRR" ),
+            Arguments.of(lriiliScene(), "RIIIII", "RRRRRR" ),
+
+            Arguments.of(
+                lriiliWithSubSceneScene(),
+                ".......", "LRRRLL"
+            ),
+            Arguments.of(
+                lriiliWithSubSceneScene(),
+                ".L.....", "LLLLLL"
+            ),
+
+            Arguments.of(liirliPrecachedScene(), "......", "LLLRLL" ),
+            Arguments.of(liirliPrecachedScene(), "R.....", "RRRRLL" ),
+            Arguments.of(liirliPrecachedScene(), "...I..", "LLLLLL" ),
+            Arguments.of(liirliPrecachedScene(), "R..IR.", "RRRRRR" ),
+
+            Arguments.of(
+                riirliPlugedPrecachedScenegraphScene(),
+                "......", "RRRRLL"
+            ),
+
+            Arguments.of(lrIiilScene(), "......", "LRRRRL" ),
+            Arguments.of(lrIiilScene(), ".L....", "LLLLLL" )
+        );
     }
 
-    @Test
-    public void effectiveOrientationTest() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void effectiveOrientationTest(Scene testScene,
+                                         String orientationUpdate,
+                                         String expectedOrientation) {
         updateOrientation(testScene, orientationUpdate);
         assertOrientation(testScene, expectedOrientation);
     }
@@ -158,8 +145,8 @@ private static void assertOrientation(
             final Scene scene,
             final String expectedOrientation) {
         final String actualOrientation = collectOrientation(scene);
-        Assert.assertEquals("Orientation mismatch",
-                            expectedOrientation, actualOrientation);
+        assertEquals(expectedOrientation, actualOrientation,
+                     "Orientation mismatch");
     }
 
     private static final StateEncoder EFFECTIVE_ORIENTATION_ENCODER =
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_hasMirroring_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_hasMirroring_Test.java
index ab2e70740eb..69a976eab63 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_hasMirroring_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_hasMirroring_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,22 +26,17 @@
 package test.javafx.scene;
 
 import test.com.sun.javafx.test.NodeOrientationTestBase;
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.scene.Node;
 import javafx.scene.NodeShim;
 import javafx.scene.Scene;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
 
-@RunWith(Parameterized.class)
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public final class Node_hasMirroring_Test extends NodeOrientationTestBase {
-    private final Scene testScene;
-    private final String orientationUpdate;
-    private final String expectedMirroring;
 
     private static Scene lriiliScene() {
         return ltrScene(
@@ -92,42 +87,34 @@ private static Scene lrIiilScene() {
     /*
      * Parameters: [testScene], [orientationUpdate], [expectedMirroring]
      */
-    @Parameters
-    public static Collection data() {
-        return Arrays.asList(
-                new Object[][] {
-                        { lriiliScene(), "......", ".M..M." }, // LRRRLL
-                        { lriiliScene(), ".I....", "......" }, // LLLLLL
-                        { lriiliScene(), "...L..", ".M.M.." }, // LRRLLL
-                        { lriiliScene(), "....I.", ".M...." }, // LRRRRR
-                        { lriiliScene(), "RIIIII", ".M...." }, // RRRRRR
-
-                        {
-                            lriiliWithSubSceneScene(),
-                            "......", ".M..M."
-                        },
-
-                        /* effective: LRRRLL, automatic: LRLLLL */
-                        { lrIiliScene(), "......", ".MMMM." },
-                        /* effective: LRLRLR, automatic: LRLLLR */
-                        { lrLRlrScene(), "......", ".MM..M" },
-
-                        /* effective: LRRRRL, automatic: LRLRRL */
-                        { lrIiilScene(), "...R..", ".MMM.M" },
-                    });
-    }
-
-    public Node_hasMirroring_Test(
-            final Scene testScene,
-            final String orientationUpdate,
-            final String expectedMirroring) {
-        this.testScene = testScene;
-        this.orientationUpdate = orientationUpdate;
-        this.expectedMirroring = expectedMirroring;
+    public static Stream<Arguments> data() {
+        return Stream.of(
+            Arguments.of( lriiliScene(), "......", ".M..M." ), // LRRRLL
+            Arguments.of( lriiliScene(), ".I....", "......" ), // LLLLLL
+            Arguments.of( lriiliScene(), "...L..", ".M.M.." ), // LRRLLL
+            Arguments.of( lriiliScene(), "....I.", ".M...." ), // LRRRRR
+            Arguments.of( lriiliScene(), "RIIIII", ".M...." ), // RRRRRR
+
+            Arguments.of(
+                lriiliWithSubSceneScene(),
+                "......", ".M..M."
+            ),
+
+            /* effective: LRRRLL, automatic: LRLLLL */
+            Arguments.of( lrIiliScene(), "......", ".MMMM." ),
+            /* effective: LRLRLR, automatic: LRLLLR */
+            Arguments.of( lrLRlrScene(), "......", ".MM..M" ),
+
+            /* effective: LRRRRL, automatic: LRLRRL */
+            Arguments.of( lrIiilScene(), "...R..", ".MMM.M" )
+        );
     }
 
-    @Test
-    public void hasMirroringTest() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void hasMirroringTest(Scene testScene,
+                                 String orientationUpdate,
+                                 String expectedMirroring) {
         updateOrientation(testScene, orientationUpdate);
         assertMirroring(testScene, expectedMirroring);
     }
@@ -136,8 +123,8 @@ private static void assertMirroring(
             final Scene scene,
             final String expectedMirroring) {
         final String actualMirroring = collectMirroring(scene);
-        Assert.assertEquals("Mirroring mismatch",
-                            expectedMirroring, actualMirroring);
+        assertEquals(expectedMirroring, actualMirroring,
+                     "Mirroring mismatch");
     }
 
     private static final StateEncoder HAS_MIRRORING_ENCODER =
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_layoutSizes_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_layoutSizes_Test.java
index 2177d3ec7d8..374e41b9e12 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_layoutSizes_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_layoutSizes_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,8 +30,9 @@
 import javafx.geometry.Bounds;
 import javafx.scene.Node;
 import javafx.scene.shape.Rectangle;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Tests for the layout size methods on Node. In particular, we need to ensure that
@@ -44,7 +45,8 @@ public class Node_layoutSizes_Test {
      * the rectangle. I've offset the rectangle x/y to make sure we're using the width and
      * not the maxX for this calculation.
      */
-    @Test public void Node_prefWidth_BasedOnLayoutBounds() {
+    @Test
+    public void Node_prefWidth_BasedOnLayoutBounds() {
         Rectangle node = new Rectangle(10, 10, 100, 100);
         assertEquals(100, node.prefWidth(-1), 0);
         assertEquals(100, node.prefWidth(5), 0);
@@ -54,7 +56,8 @@ public class Node_layoutSizes_Test {
      * A specialized computeLayoutBounds implementation, to make sure it is the
      * layout bounds from which we're gathering this information.
      */
-    @Test public void Node_prefWidth_BasedOnLayoutBounds2() {
+    @Test
+    public void Node_prefWidth_BasedOnLayoutBounds2() {
         SpecialRect node = new SpecialRect(10, 10, 100, 100);
         node.setTestBB(0, 0, 50, 50);
         assertEquals(50, node.prefWidth(-1), 0);
@@ -64,7 +67,8 @@ public class Node_layoutSizes_Test {
     /**
      * If the layout bounds has a NaN, it shouldn't leak out through node.prefWidth
      */
-    @Test public void Node_prefWidth_BasedOnLayoutBounds_CleansUpAfterBadBounds() {
+    @Test
+    public void Node_prefWidth_BasedOnLayoutBounds_CleansUpAfterBadBounds() {
         SpecialRect node = new SpecialRect(10, 10, 100, 100);
         node.setTestBB(0, 0, Double.NaN, 50);
         assertEquals(0, node.prefWidth(-1), 0);
@@ -74,7 +78,8 @@ public class Node_layoutSizes_Test {
     /**
      * If the layout bounds has a negative value, it shouldn't leak out through node.prefWidth
      */
-    @Test public void Node_prefWidth_BasedOnLayoutBounds_CleansUpAfterBadBounds2() {
+    @Test
+    public void Node_prefWidth_BasedOnLayoutBounds_CleansUpAfterBadBounds2() {
         SpecialRect node = new SpecialRect(10, 10, 100, 100);
         node.setTestBB(0, 0, -10, 50);
         assertEquals(0, node.prefWidth(-1), 0);
@@ -86,7 +91,8 @@ public class Node_layoutSizes_Test {
      * the rectangle. I've offset the rectangle x/y to make sure we're using the height and
      * not the maxY for this calculation.
      */
-    @Test public void Node_prefHeight_BasedOnLayoutBounds() {
+    @Test
+    public void Node_prefHeight_BasedOnLayoutBounds() {
         Rectangle node = new Rectangle(10, 10, 100, 100);
         assertEquals(100, node.prefHeight(-1), 0);
         assertEquals(100, node.prefHeight(5), 0);
@@ -96,7 +102,8 @@ public class Node_layoutSizes_Test {
      * A specialized computeLayoutBounds implementation, to make sure it is the
      * layout bounds from which we're gathering this information.
      */
-    @Test public void Node_prefHeight_BasedOnLayoutBounds2() {
+    @Test
+    public void Node_prefHeight_BasedOnLayoutBounds2() {
         SpecialRect node = new SpecialRect(10, 10, 100, 100);
         node.setTestBB(0, 0, 50, 50);
         assertEquals(50, node.prefHeight(-1), 0);
@@ -106,7 +113,8 @@ public class Node_layoutSizes_Test {
     /**
      * If the layout bounds has a NaN, it shouldn't leak out through node.prefHeight
      */
-    @Test public void Node_prefHeight_BasedOnLayoutBounds_CleansUpAfterBadBounds() {
+    @Test
+    public void Node_prefHeight_BasedOnLayoutBounds_CleansUpAfterBadBounds() {
         SpecialRect node = new SpecialRect(10, 10, 100, 100);
         node.setTestBB(0, 0, 50, Double.NaN);
         assertEquals(0, node.prefHeight(-1), 0);
@@ -116,7 +124,8 @@ public class Node_layoutSizes_Test {
     /**
      * If the layout bounds has a negative value, it shouldn't leak out through node.prefHeight
      */
-    @Test public void Node_prefHeight_BasedOnLayoutBounds_CleansUpAfterBadBounds2() {
+    @Test
+    public void Node_prefHeight_BasedOnLayoutBounds_CleansUpAfterBadBounds2() {
         SpecialRect node = new SpecialRect(10, 10, 100, 100);
         node.setTestBB(0, 0, 50, -10);
         assertEquals(0, node.prefHeight(-1), 0);
@@ -128,7 +137,8 @@ public class Node_layoutSizes_Test {
      * be something nonsensical, we know in the test that the pref width is being used
      * and not the layout bounds width.
      */
-    @Test public void Node_minWidth_SameAsPrefWidth() {
+    @Test
+    public void Node_minWidth_SameAsPrefWidth() {
         Rectangle node = new Rectangle(10, 10, 100, 100) {
             @Override public double prefWidth(double height) {
                 return 500;
@@ -144,7 +154,8 @@ public class Node_layoutSizes_Test {
      * be something nonsensical, we know in the test that the pref height is being used
      * and not the layout bounds height.
      */
-    @Test public void Node_minHeight_SameAsPrefHeight() {
+    @Test
+    public void Node_minHeight_SameAsPrefHeight() {
         Rectangle node = new Rectangle(10, 10, 100, 100) {
             @Override public double prefHeight(double height) {
                 return 500;
@@ -160,7 +171,8 @@ public class Node_layoutSizes_Test {
      * be something nonsensical, we know in the test that the pref width is being used
      * and not the layout bounds width.
      */
-    @Test public void Node_maxWidth_SameAsPrefWidth() {
+    @Test
+    public void Node_maxWidth_SameAsPrefWidth() {
         Rectangle node = new Rectangle(10, 10, 100, 100) {
             @Override public double prefWidth(double height) {
                 return 500;
@@ -176,7 +188,8 @@ public class Node_layoutSizes_Test {
      * be something nonsensical, we know in the test that the pref height is being used
      * and not the layout bounds height.
      */
-    @Test public void Node_maxHeight_SameAsPrefHeight() {
+    @Test
+    public void Node_maxHeight_SameAsPrefHeight() {
         Rectangle node = new Rectangle(10, 10, 100, 100) {
             @Override public double prefHeight(double height) {
                 return 500;
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_lookup_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_lookup_Test.java
index 6e2f24fc14b..27fff41d0d3 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_lookup_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_lookup_Test.java
@@ -25,10 +25,6 @@
 
 package test.javafx.scene;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
 import java.util.Set;
 
 import javafx.css.PseudoClass;
@@ -36,8 +32,11 @@
 import javafx.scene.Node;
 import javafx.scene.ParentShim;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class Node_lookup_Test {
     //                  Group & #root
@@ -47,7 +46,8 @@ public class Node_lookup_Test {
     //           .d    #e        .d   .g:testPseudo1   .h.g:testPseudo1:testPseudo2
     private Group root, a, bc, d, e, d2, f, g, hg;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         root = new Group();
         root.setId("root");
         a = new Group();
@@ -76,7 +76,8 @@ public class Node_lookup_Test {
         ParentShim.getChildren(f).addAll(g, hg);
     }
 
-    @Test public void test_lookup_on_nodes_without_pseudo_classes() {
+    @Test
+    public void test_lookup_on_nodes_without_pseudo_classes() {
         Node found = root.lookup("Group");
         assertSame(root, found);
 
@@ -99,7 +100,8 @@ public class Node_lookup_Test {
         assertSame(bc, found);
     }
 
-    @Test public void test_lookupAll_on_nodes_without_pseudo_classes() {
+    @Test
+    public void test_lookupAll_on_nodes_without_pseudo_classes() {
         Set<Node> nodes = root.lookupAll("#a");
         assertEquals(1, nodes.size());
         assertTrue(nodes.contains(a));
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_onInvalidate_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_onInvalidate_Test.java
index f1cce5072f6..cebd1dd2e76 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_onInvalidate_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_onInvalidate_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,7 @@
 
 package test.javafx.scene;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import java.util.List;
 
 import javafx.scene.effect.BlendMode;
@@ -34,58 +33,49 @@
 import javafx.scene.shape.Rectangle;
 import javafx.scene.transform.Rotate;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
 import javafx.css.CssMetaData;
 import com.sun.javafx.scene.DirtyBits;
-import test.com.sun.javafx.test.OnInvalidateMethodsTestBase;
 import javafx.css.Styleable;
 import javafx.scene.CacheHint;
 import javafx.scene.Cursor;
 import javafx.scene.Node;
 
-@RunWith(Parameterized.class)
-public class Node_onInvalidate_Test extends OnInvalidateMethodsTestBase {
+import org.junit.jupiter.params.provider.Arguments;
+import test.com.sun.javafx.test.OnInvalidateMethodsTestBase;
 
-    public Node_onInvalidate_Test(Configuration configuration) {
-        super(configuration);
-    }
+public class Node_onInvalidate_Test extends OnInvalidateMethodsTestBase {
 
-    @Parameters
-    public static Collection<Object[]>data() {
-        Object[][] data = new Object[][] {
-            {new Configuration(Rectangle.class, "visible", false, new DirtyBits[] {DirtyBits.NODE_VISIBLE, DirtyBits.NODE_BOUNDS})},
-            {new Configuration(Rectangle.class, "cursor", Cursor.WAIT, new CssMetaData[] {findCssCSSProperty("-fx-cursor")})},
-            {new Configuration(Rectangle.class, "opacity", 0.5, new CssMetaData[] {findCssCSSProperty("-fx-opacity")})},
-            {new Configuration(Rectangle.class, "opacity", 0.5, new DirtyBits[] {DirtyBits.NODE_OPACITY})},
-            {new Configuration(Rectangle.class, "viewOrder", 0.5, new CssMetaData[] {findCssCSSProperty("-fx-view-order")})},
-            {new Configuration(Rectangle.class, "viewOrder", 0.5, new DirtyBits[] {DirtyBits.NODE_VIEW_ORDER})},
-            {new Configuration(Rectangle.class, "blendMode", BlendMode.DARKEN, new CssMetaData[] {findCssCSSProperty("-fx-blend-mode")})},
-            {new Configuration(Rectangle.class, "blendMode", BlendMode.DARKEN, new DirtyBits[] {DirtyBits.NODE_BLENDMODE})},
-            {new Configuration(Rectangle.class, "cache", true, new DirtyBits[] {DirtyBits.NODE_CACHE})},
-            {new Configuration(Rectangle.class, "cacheHint", CacheHint.QUALITY, new DirtyBits[] {DirtyBits.NODE_CACHE})},
-            {new Configuration(Rectangle.class, "effect", new Shadow(), new CssMetaData[] {findCssCSSProperty("-fx-effect")})},
-            {new Configuration(Rectangle.class, "translateX", 1.5, new CssMetaData[] {findCssCSSProperty("-fx-translate-x")})},
-            {new Configuration(Rectangle.class, "translateX", 1.5, new DirtyBits[] {DirtyBits.NODE_TRANSFORM})},
-            {new Configuration(Rectangle.class, "translateY", 1.5, new CssMetaData[] {findCssCSSProperty("-fx-translate-y")})},
-            {new Configuration(Rectangle.class, "translateY", 1.5, new DirtyBits[] {DirtyBits.NODE_TRANSFORM})},
-            {new Configuration(Rectangle.class, "translateZ", 1.5, new CssMetaData[] {findCssCSSProperty("-fx-translate-z")})},
-            {new Configuration(Rectangle.class, "translateZ", 1.5, new DirtyBits[] {DirtyBits.NODE_TRANSFORM})},
-            {new Configuration(Rectangle.class, "scaleX", 5.5, new CssMetaData[] {findCssCSSProperty("-fx-scale-x")})},
-            {new Configuration(Rectangle.class, "scaleX", 5.5, new DirtyBits[] {DirtyBits.NODE_TRANSFORM})},
-            {new Configuration(Rectangle.class, "scaleY", 5.5, new CssMetaData[] {findCssCSSProperty("-fx-scale-y")})},
-            {new Configuration(Rectangle.class, "scaleY", 5.5, new DirtyBits[] {DirtyBits.NODE_TRANSFORM})},
-            {new Configuration(Rectangle.class, "scaleZ", 5.5, new CssMetaData[] {findCssCSSProperty("-fx-scale-z")})},
-            {new Configuration(Rectangle.class, "scaleZ", 5.5, new DirtyBits[] {DirtyBits.NODE_TRANSFORM})},
-            {new Configuration(Rectangle.class, "rotate", 55, new CssMetaData[] {findCssCSSProperty("-fx-rotate")})},
-            {new Configuration(Rectangle.class, "rotate", 55, new DirtyBits[] {DirtyBits.NODE_TRANSFORM})},
-            {new Configuration(Rectangle.class, "rotationAxis", Rotate.X_AXIS, new DirtyBits[] {DirtyBits.NODE_TRANSFORM})},
-            {new Configuration(Rectangle.class, "clip", new Rectangle(10, 10), new DirtyBits[] {DirtyBits.NODE_CLIP})},
-            {new Configuration(Rectangle.class, "focusTraversable", true, new CssMetaData[] {findCssCSSProperty("-fx-focus-traversable")})}
-        };
-        return Arrays.asList(data);
+    public static Stream<Arguments> data() {
+        return Stream.of(
+            Arguments.of( new Configuration(Rectangle.class, "visible", false, new DirtyBits[] {DirtyBits.NODE_VISIBLE, DirtyBits.NODE_BOUNDS}) ),
+            Arguments.of( new Configuration(Rectangle.class, "cursor", Cursor.WAIT, new CssMetaData[] {findCssCSSProperty("-fx-cursor")}) ),
+            Arguments.of( new Configuration(Rectangle.class, "opacity", 0.5, new CssMetaData[] {findCssCSSProperty("-fx-opacity")}) ),
+            Arguments.of( new Configuration(Rectangle.class, "opacity", 0.5, new DirtyBits[] {DirtyBits.NODE_OPACITY}) ),
+            Arguments.of( new Configuration(Rectangle.class, "viewOrder", 0.5, new CssMetaData[] {findCssCSSProperty("-fx-view-order")}) ),
+            Arguments.of( new Configuration(Rectangle.class, "viewOrder", 0.5, new DirtyBits[] {DirtyBits.NODE_VIEW_ORDER}) ),
+            Arguments.of( new Configuration(Rectangle.class, "blendMode", BlendMode.DARKEN, new CssMetaData[] {findCssCSSProperty("-fx-blend-mode")}) ),
+            Arguments.of( new Configuration(Rectangle.class, "blendMode", BlendMode.DARKEN, new DirtyBits[] {DirtyBits.NODE_BLENDMODE}) ),
+            Arguments.of( new Configuration(Rectangle.class, "cache", true, new DirtyBits[] {DirtyBits.NODE_CACHE}) ),
+            Arguments.of( new Configuration(Rectangle.class, "cacheHint", CacheHint.QUALITY, new DirtyBits[] {DirtyBits.NODE_CACHE}) ),
+            Arguments.of( new Configuration(Rectangle.class, "effect", new Shadow(), new CssMetaData[] {findCssCSSProperty("-fx-effect")}) ),
+            Arguments.of( new Configuration(Rectangle.class, "translateX", 1.5, new CssMetaData[] {findCssCSSProperty("-fx-translate-x")}) ),
+            Arguments.of( new Configuration(Rectangle.class, "translateX", 1.5, new DirtyBits[] {DirtyBits.NODE_TRANSFORM}) ),
+            Arguments.of( new Configuration(Rectangle.class, "translateY", 1.5, new CssMetaData[] {findCssCSSProperty("-fx-translate-y")}) ),
+            Arguments.of( new Configuration(Rectangle.class, "translateY", 1.5, new DirtyBits[] {DirtyBits.NODE_TRANSFORM}) ),
+            Arguments.of( new Configuration(Rectangle.class, "translateZ", 1.5, new CssMetaData[] {findCssCSSProperty("-fx-translate-z")}) ),
+            Arguments.of( new Configuration(Rectangle.class, "translateZ", 1.5, new DirtyBits[] {DirtyBits.NODE_TRANSFORM}) ),
+            Arguments.of( new Configuration(Rectangle.class, "scaleX", 5.5, new CssMetaData[] {findCssCSSProperty("-fx-scale-x")}) ),
+            Arguments.of( new Configuration(Rectangle.class, "scaleX", 5.5, new DirtyBits[] {DirtyBits.NODE_TRANSFORM}) ),
+            Arguments.of( new Configuration(Rectangle.class, "scaleY", 5.5, new CssMetaData[] {findCssCSSProperty("-fx-scale-y")}) ),
+            Arguments.of( new Configuration(Rectangle.class, "scaleY", 5.5, new DirtyBits[] {DirtyBits.NODE_TRANSFORM}) ),
+            Arguments.of( new Configuration(Rectangle.class, "scaleZ", 5.5, new CssMetaData[] {findCssCSSProperty("-fx-scale-z")}) ),
+            Arguments.of( new Configuration(Rectangle.class, "scaleZ", 5.5, new DirtyBits[] {DirtyBits.NODE_TRANSFORM}) ),
+            Arguments.of( new Configuration(Rectangle.class, "rotate", 55, new CssMetaData[] {findCssCSSProperty("-fx-rotate")}) ),
+            Arguments.of( new Configuration(Rectangle.class, "rotate", 55, new DirtyBits[] {DirtyBits.NODE_TRANSFORM}) ),
+            Arguments.of( new Configuration(Rectangle.class, "rotationAxis", Rotate.X_AXIS, new DirtyBits[] {DirtyBits.NODE_TRANSFORM}) ),
+            Arguments.of( new Configuration(Rectangle.class, "clip", new Rectangle(10, 10), new DirtyBits[] {DirtyBits.NODE_CLIP}) ),
+            Arguments.of( new Configuration(Rectangle.class, "focusTraversable", true, new CssMetaData[] {findCssCSSProperty("-fx-focus-traversable")}) )
+        );
     }
 
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_properties_Test.java
index 19aeec05f26..7b2bafd5ff3 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,7 @@
 
 package test.javafx.scene;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 
 import javafx.event.EventHandler;
 import javafx.geometry.Point2D;
@@ -36,12 +35,7 @@
 import javafx.scene.shape.Rectangle;
 import javafx.scene.transform.Rotate;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
 import com.sun.javafx.event.EventHandlerManager;
-import test.com.sun.javafx.test.PropertiesTestBase;
 import javafx.geometry.NodeOrientation;
 import javafx.scene.CacheHint;
 import javafx.scene.Cursor;
@@ -49,10 +43,12 @@
 import javafx.scene.Group;
 import javafx.scene.Node;
 
-@RunWith(Parameterized.class)
+import org.junit.jupiter.params.provider.Arguments;
+import test.com.sun.javafx.test.PropertiesTestBase;
+
 public final class Node_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
+
+    public static Stream<Arguments> data() {
         final Group testParent = new Group();
         final Node testNode = new Rectangle();
         testParent.getChildren().add(testNode);
@@ -61,7 +57,7 @@ public static Collection data() {
                 event -> {
                 };
 
-        return Arrays.asList(new Object[] {
+        return Stream.of(
 //            config(testNode, "parent", , ),
 //            config(testNode, "scene", , ),
             config(testNode, "id", "rect_1", "rect_2"),
@@ -156,10 +152,6 @@ public String getSelectedText() {
                    testNode, "effectiveNodeOrientation",
                        NodeOrientation.LEFT_TO_RIGHT,
                        NodeOrientation.RIGHT_TO_LEFT)
-        });
-    }
-
-    public Node_properties_Test(final Configuration configuration) {
-        super(configuration);
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/PaneTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/PaneTest.java
index 43ee8256bd8..42ac6b94e50 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/PaneTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/PaneTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,8 +29,9 @@
 import test.javafx.scene.layout.MockRegion;
 import javafx.scene.layout.Pane;
 import javafx.scene.shape.Rectangle;
-import static org.junit.Assert.assertEquals;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class PaneTest {
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/ParentTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/ParentTest.java
index 512d3d76d26..f5314ad5fed 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/ParentTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/ParentTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,23 +42,28 @@
 import javafx.scene.Scene;
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class ParentTest {
     private StubToolkit toolkit;
     private Stage stage;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         toolkit = (StubToolkit) Toolkit.getToolkit();
         stage = new Stage();
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         stage.close();
     }
@@ -375,35 +380,41 @@ public void testDuplicates() {
         }
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testAddingNullChild() {
-        Group g = new Group();
-        ParentShim.getChildren(g).add(null);
+        assertThrows(NullPointerException.class, () -> {
+            Group g = new Group();
+            ParentShim.getChildren(g).add(null);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testNullCheckIsDoneBeforeTestForDuplicates() {
-        Group g = new Group();
-        ParentShim.getChildren(g).addAll(null, new Rectangle(), null);
+        assertThrows(NullPointerException.class, () -> {
+            Group g = new Group();
+            ParentShim.getChildren(g).addAll(null, new Rectangle(), null);
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testAddingClipNodeTwice() {
-        Group g = new Group();
-
-        Node clipParent = new Rectangle();
-        Node clipNode = new Rectangle();
+        assertThrows(IllegalArgumentException.class, () -> {
+            Group g = new Group();
+
+            Node clipParent = new Rectangle();
+            Node clipNode = new Rectangle();
+
+            clipParent.setClip(clipNode);
+            try {
+                // try to add node which is already set as a clip
+                ParentShim.getChildren(g).add(clipNode);
+                fail();
+            } catch (IllegalArgumentException e) {
+            }
 
-        clipParent.setClip(clipNode);
-        try {
-            // try to add node which is already set as a clip
+            // try again
             ParentShim.getChildren(g).add(clipNode);
-            fail();
-        } catch (IllegalArgumentException e) {
-        }
-
-        // try again
-        ParentShim.getChildren(g).add(clipNode);
+        });
     }
 
     @Test
@@ -426,17 +437,19 @@ public void testAddingFixedClipNode() {
         ParentShim.getChildren(g).add(clipNode);
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testFalsePermutation() {
-        Group g = new Group();
+        assertThrows(IllegalArgumentException.class, () -> {
+            Group g = new Group();
 
-        Rectangle r1 = new Rectangle();
-        Rectangle r2 = new Rectangle();
-        Rectangle r3 = new Rectangle();
-        Rectangle r4 = new Rectangle();
+            Rectangle r1 = new Rectangle();
+            Rectangle r2 = new Rectangle();
+            Rectangle r3 = new Rectangle();
+            Rectangle r4 = new Rectangle();
 
-        ParentShim.getChildren(g).addAll(r1, r2, r3, r4);
-        ParentShim.getChildren(g).setAll(r1, r2, r2, r4);
+            ParentShim.getChildren(g).addAll(r1, r2, r3, r4);
+            ParentShim.getChildren(g).setAll(r1, r2, r2, r4);
+        });
     }
 
     @Test
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/Parent_cssMethods_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/Parent_cssMethods_Test.java
index b9b510bd935..ca716a0410e 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/Parent_cssMethods_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/Parent_cssMethods_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,29 +25,18 @@
 
 package test.javafx.scene;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.scene.Group;
 import javafx.scene.Parent;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
 import test.com.sun.javafx.test.CssMethodsTestBase;
 
-@RunWith(Parameterized.class)
 public class Parent_cssMethods_Test extends CssMethodsTestBase {
     private static final Parent TEST_PARENT = new Group();
 
-    @Parameters
-    public static Collection data() {
-        return Arrays.asList(new Object[] {
+    public static Stream<Configuration> data() {
+        return Stream.of(
             config(TEST_PARENT, "translateX", 0.0, "-fx-translate-x", 10.0)
-        });
-    }
-
-    public Parent_cssMethods_Test(final Configuration configuration) {
-        super(configuration);
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/Parent_recomputeBounds_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/Parent_recomputeBounds_Test.java
index 8553c42ac2e..2fa583b6d2b 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/Parent_recomputeBounds_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/Parent_recomputeBounds_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,8 +28,6 @@
 import test.com.sun.javafx.test.TestHelper;
 import javafx.geometry.BoundingBox;
 import javafx.scene.transform.Rotate;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 import javafx.geometry.Bounds;
 import javafx.geometry.Point2D;
 import javafx.scene.Group;
@@ -39,7 +37,9 @@
 import javafx.scene.shape.Circle;
 import javafx.scene.transform.Translate;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class Parent_recomputeBounds_Test {
     private static final Rectangle r1 = new Rectangle(100, 100, 100, 100);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/Parent_structure_sync_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/Parent_structure_sync_Test.java
index 6b1ca264b16..3445782ee08 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/Parent_structure_sync_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/Parent_structure_sync_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,10 +38,14 @@
 import javafx.scene.layout.BorderPane;
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
-import org.junit.Before;
-import org.junit.Test;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Tests to make sure the synchronization of children between a Parent and PGGroup
@@ -52,7 +56,8 @@ public class Parent_structure_sync_Test {
     private Parent parent;
     private NGGroup peer;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         parent = new Group();
         r1 = new Rectangle(0, 0, 10, 10);
         r2 = new Rectangle(0, 0, 10, 10);
@@ -73,18 +78,21 @@ private void sync() {
         ((StubToolkit) Toolkit.getToolkit()).firePulse();
     }
 
-    @Test public void emptyParentShouldHaveEmptyPGGroup() {
+    @Test
+    public void emptyParentShouldHaveEmptyPGGroup() {
         assertTrue(peer.getChildren().isEmpty());
     }
 
-    @Test public void childAddedToEmptyParentShouldBeInPGGroup() {
+    @Test
+    public void childAddedToEmptyParentShouldBeInPGGroup() {
         ParentShim.getChildren(parent).add(r1);
         sync();
         assertEquals(1, peer.getChildren().size());
         assertSame(NodeHelper.getPeer(r1), peer.getChildren().get(0));
     }
 
-    @Test public void childrenAddedToEmptyParentShouldAllBeInPGGroup() {
+    @Test
+    public void childrenAddedToEmptyParentShouldAllBeInPGGroup() {
         ParentShim.getChildren(parent).addAll(r1, r2, r3);
         sync();
         assertEquals(3, peer.getChildren().size());
@@ -93,7 +101,8 @@ private void sync() {
         assertSame(NodeHelper.getPeer(r3), peer.getChildren().get(2));
     }
 
-    @Test public void addingAChildToTheBack() {
+    @Test
+    public void addingAChildToTheBack() {
         ParentShim.getChildren(parent).addAll(r2, r3, r4);
         sync();
         ParentShim.getChildren(parent).add(0, r1);
@@ -105,7 +114,8 @@ private void sync() {
         assertSame(NodeHelper.getPeer(r4), peer.getChildren().get(3));
     }
 
-    @Test public void addingAChildToTheFront() {
+    @Test
+    public void addingAChildToTheFront() {
         ParentShim.getChildren(parent).addAll(r1, r2, r3);
         sync();
         ParentShim.getChildren(parent).add(r4);
@@ -117,7 +127,8 @@ private void sync() {
         assertSame(NodeHelper.getPeer(r4), peer.getChildren().get(3));
     }
 
-    @Test public void addingAChildToTheCenter() {
+    @Test
+    public void addingAChildToTheCenter() {
         ParentShim.getChildren(parent).addAll(r1, r2, r4);
         sync();
         ParentShim.getChildren(parent).add(2, r3);
@@ -129,7 +140,8 @@ private void sync() {
         assertSame(NodeHelper.getPeer(r4), peer.getChildren().get(3));
     }
 
-    @Test public void removingAChildFromTheFront() {
+    @Test
+    public void removingAChildFromTheFront() {
         ParentShim.getChildren(parent).addAll(r1, r2, r3, r4);
         sync();
         ParentShim.getChildren(parent).remove(3);
@@ -140,7 +152,8 @@ private void sync() {
         assertSame(NodeHelper.getPeer(r3), peer.getChildren().get(2));
     }
 
-    @Test public void removingAChildFromTheBack() {
+    @Test
+    public void removingAChildFromTheBack() {
         ParentShim.getChildren(parent).addAll(r4, r1, r2, r3);
         sync();
         ParentShim.getChildren(parent).remove(0);
@@ -151,7 +164,8 @@ private void sync() {
         assertSame(NodeHelper.getPeer(r3), peer.getChildren().get(2));
     }
 
-    @Test public void removingAChildFromTheCenter() {
+    @Test
+    public void removingAChildFromTheCenter() {
         ParentShim.getChildren(parent).addAll(r1, r2, r4, r3);
         sync();
         ParentShim.getChildren(parent).remove(2);
@@ -162,7 +176,8 @@ private void sync() {
         assertSame(NodeHelper.getPeer(r3), peer.getChildren().get(2));
     }
 
-    @Test public void movingAChildFromTheBackToTheFront() {
+    @Test
+    public void movingAChildFromTheBackToTheFront() {
         ParentShim.getChildren(parent).addAll(r4, r1, r2, r3);
         sync();
         r4.toFront();
@@ -174,7 +189,8 @@ private void sync() {
         assertSame(NodeHelper.getPeer(r4), peer.getChildren().get(3));
     }
 
-    @Test public void movingAChildFromTheBackToTheFrontAndAddingAChild() {
+    @Test
+    public void movingAChildFromTheBackToTheFrontAndAddingAChild() {
         ParentShim.getChildren(parent).addAll(r4, r1, r2, r3);
         sync();
         r4.toFront();
@@ -188,7 +204,8 @@ private void sync() {
         assertSame(NodeHelper.getPeer(r5), peer.getChildren().get(4));
     }
 
-    @Test public void movingAChildFromTheBackToTheFrontAndRemovingAChild() {
+    @Test
+    public void movingAChildFromTheBackToTheFrontAndRemovingAChild() {
         ParentShim.getChildren(parent).addAll(r3, r1, r4, r2);
         sync();
         r3.toFront();
@@ -200,7 +217,8 @@ private void sync() {
         assertSame(NodeHelper.getPeer(r3), peer.getChildren().get(2));
     }
 
-    @Test public void movingAChildFromTheBackToTheFrontAndThenRemovingTheChild() {
+    @Test
+    public void movingAChildFromTheBackToTheFrontAndThenRemovingTheChild() {
         ParentShim.getChildren(parent).addAll(r4, r1, r2, r3);
         sync();
         r4.toFront();
@@ -212,7 +230,8 @@ private void sync() {
         assertSame(NodeHelper.getPeer(r3), peer.getChildren().get(2));
     }
 
-    @Test public void movingAChildFromTheCenterToTheFront() {
+    @Test
+    public void movingAChildFromTheCenterToTheFront() {
         ParentShim.getChildren(parent).addAll(r1, r2, r4, r3);
         sync();
         r4.toFront();
@@ -224,7 +243,8 @@ private void sync() {
         assertSame(NodeHelper.getPeer(r4), peer.getChildren().get(3));
     }
 
-    @Test public void movingAChildFromTheCenterToTheBack() {
+    @Test
+    public void movingAChildFromTheCenterToTheBack() {
         ParentShim.getChildren(parent).addAll(r2, r3, r1, r4);
         sync();
         r1.toBack();
@@ -236,7 +256,8 @@ private void sync() {
         assertSame(NodeHelper.getPeer(r4), peer.getChildren().get(3));
     }
 
-    @Test public void movingAChildFromTheCenterToTheFrontAndAddingAChild() {
+    @Test
+    public void movingAChildFromTheCenterToTheFrontAndAddingAChild() {
         ParentShim.getChildren(parent).addAll(r1, r2, r4, r3);
         sync();
         r4.toFront();
@@ -250,7 +271,8 @@ private void sync() {
         assertSame(NodeHelper.getPeer(r5), peer.getChildren().get(4));
     }
 
-    @Test public void movingAChildFromTheCenterToTheFrontAndRemovingAChild() {
+    @Test
+    public void movingAChildFromTheCenterToTheFrontAndRemovingAChild() {
         ParentShim.getChildren(parent).addAll(r1, r2, r3, r4);
         sync();
         r3.toFront();
@@ -262,7 +284,8 @@ private void sync() {
         assertSame(NodeHelper.getPeer(r3), peer.getChildren().get(2));
     }
 
-    @Test public void movingAChildFromTheCenterToTheFrontAndThenRemovingTheChild() {
+    @Test
+    public void movingAChildFromTheCenterToTheFrontAndThenRemovingTheChild() {
         ParentShim.getChildren(parent).addAll(r1, r2, r4, r3);
         sync();
         r4.toFront();
@@ -274,7 +297,8 @@ private void sync() {
         assertSame(NodeHelper.getPeer(r3), peer.getChildren().get(2));
     }
 
-    @Test public void movingAChildFromTheFrontToTheBack() {
+    @Test
+    public void movingAChildFromTheFrontToTheBack() {
         ParentShim.getChildren(parent).addAll(r2, r3, r4, r1);
         sync();
         r1.toBack();
@@ -286,7 +310,8 @@ private void sync() {
         assertSame(NodeHelper.getPeer(r4), peer.getChildren().get(3));
     }
 
-    @Test public void movingAChildFromTheFrontToTheBackAndAddingAChild() {
+    @Test
+    public void movingAChildFromTheFrontToTheBackAndAddingAChild() {
         ParentShim.getChildren(parent).addAll(r2, r3, r4, r1);
         sync();
         r1.toBack();
@@ -300,7 +325,8 @@ private void sync() {
         assertSame(NodeHelper.getPeer(r5), peer.getChildren().get(4));
     }
 
-    @Test public void movingAChildFromTheFrontToTheBackAndRemovingAChild() {
+    @Test
+    public void movingAChildFromTheFrontToTheBackAndRemovingAChild() {
         ParentShim.getChildren(parent).addAll(r2, r3, r4, r1);
         sync();
         r1.toBack();
@@ -312,7 +338,8 @@ private void sync() {
         assertSame(NodeHelper.getPeer(r3), peer.getChildren().get(2));
     }
 
-    @Test public void movingAChildFromTheFrontToTheBackAndThenRemovingTheChild() {
+    @Test
+    public void movingAChildFromTheFrontToTheBackAndThenRemovingTheChild() {
         ParentShim.getChildren(parent).addAll(r1, r2, r3, r4);
         sync();
         r4.toBack();
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/PickAndContainsTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/PickAndContainsTest.java
index 6c61bacd846..10e7b636cb1 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/PickAndContainsTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/PickAndContainsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,14 +28,14 @@
 import javafx.scene.Group;
 import javafx.scene.Scene;
 import javafx.scene.SceneShim;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
 import javafx.scene.shape.Circle;
 import javafx.scene.shape.Rectangle;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Tests various aspects of Picking.
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/SceneTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/SceneTest.java
index 4469bdf3afb..c3708474041 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/SceneTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/SceneTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,10 +48,6 @@
 import javafx.application.Platform;
 import javafx.scene.input.MouseEvent;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
 import java.lang.ref.WeakReference;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -68,9 +64,17 @@
 import javafx.scene.SubScene;
 import test.util.memory.JMemoryBuddy;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * Tests various aspects of Scene.
@@ -83,14 +87,14 @@ public class SceneTest {
     private boolean handler2Called = false;
 
 
-    @Before
+    @BeforeEach
     public void setUp() {
         stage = new Stage();
         stage.show();
         stage.requestFocus();
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         stage.hide();
     }
@@ -166,15 +170,19 @@ public void isOnFxAppThread() {
         assertTrue(Platform.isFxApplicationThread());
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testNullRoot() {
-        Scene scene = new Scene(null);
+        assertThrows(NullPointerException.class, () -> {
+            Scene scene = new Scene(null);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testSetNullRoot() {
-        Scene scene = new Scene(new Group());
-        scene.setRoot(null);
+        assertThrows(NullPointerException.class, () -> {
+            Scene scene = new Scene(new Group());
+            scene.setRoot(null);
+        });
     }
 
     @Test
@@ -651,62 +659,72 @@ public void testSetNullCamera() {
         assertNull(scene.getCamera());
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testSetIllegalCameraFromOtherScene() {
-        Camera camera = new PerspectiveCamera();
+        assertThrows(IllegalArgumentException.class, () -> {
+            Camera camera = new PerspectiveCamera();
 
-        Scene scene1 = new Scene(new Group(camera));
-        Scene scene2 = new Scene(new Group());
+            Scene scene1 = new Scene(new Group(camera));
+            Scene scene2 = new Scene(new Group());
 
-        scene1.setCamera(camera);
-        scene2.setCamera(camera);
+            scene1.setCamera(camera);
+            scene2.setCamera(camera);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testSetIllegalCameraFromItsSubScene() {
-        Camera camera = new PerspectiveCamera();
+        assertThrows(IllegalArgumentException.class, () -> {
+            Camera camera = new PerspectiveCamera();
 
-        SubScene subScene = new SubScene(new Group(camera), 150, 150);
-        Scene scene = new Scene(new Group(subScene));
+            SubScene subScene = new SubScene(new Group(camera), 150, 150);
+            Scene scene = new Scene(new Group(subScene));
 
-        subScene.setCamera(camera);
-        scene.setCamera(camera);
+            subScene.setCamera(camera);
+            scene.setCamera(camera);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testSetIllegalCameraFromOtherSubScene() {
-        Camera camera = new PerspectiveCamera();
+        assertThrows(IllegalArgumentException.class, () -> {
+            Camera camera = new PerspectiveCamera();
 
-        Scene scene = new Scene(new Group());
+            Scene scene = new Scene(new Group());
 
-        SubScene subScene = new SubScene(new Group(camera), 150, 150);
-        Scene otherScene = new Scene(new Group(subScene));
+            SubScene subScene = new SubScene(new Group(camera), 150, 150);
+            Scene otherScene = new Scene(new Group(subScene));
 
-        subScene.setCamera(camera);
-        scene.setCamera(camera);
+            subScene.setCamera(camera);
+            scene.setCamera(camera);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testSetIllegalCameraFromSubScene() {
-        Camera camera = new PerspectiveCamera();
+        assertThrows(IllegalArgumentException.class, () -> {
+            Camera camera = new PerspectiveCamera();
 
-        SubScene subScene = new SubScene(new Group(camera), 150, 150);
-        Scene scene = new Scene(new Group());
+            SubScene subScene = new SubScene(new Group(camera), 150, 150);
+            Scene scene = new Scene(new Group());
 
-        subScene.setCamera(camera);
-        scene.setCamera(camera);
+            subScene.setCamera(camera);
+            scene.setCamera(camera);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testSetIllegalCameraFromNestedSubScene() {
-        Camera camera = new PerspectiveCamera();
+        assertThrows(IllegalArgumentException.class, () -> {
+            Camera camera = new PerspectiveCamera();
 
-        SubScene nestedSubScene = new SubScene(new Group(camera), 100, 100);
-        SubScene subScene = new SubScene(new Group(nestedSubScene), 150, 150);
-        Scene scene = new Scene(new Group(subScene));
+            SubScene nestedSubScene = new SubScene(new Group(camera), 100, 100);
+            SubScene subScene = new SubScene(new Group(nestedSubScene), 150, 150);
+            Scene scene = new Scene(new Group(subScene));
 
-        nestedSubScene.setCamera(camera);
-        scene.setCamera(camera);
+            nestedSubScene.setCamera(camera);
+            scene.setCamera(camera);
+        });
     }
 
     @Test
@@ -762,22 +780,26 @@ public void testDefaultCameraUpdatesPG() {
         assertEquals(20, camera.getNearClip(), 0.00001);
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void scenesCannotShareCamera() {
-        Scene scene = new Scene(new Group(), 300, 200);
-        Scene scene2 = new Scene(new Group(), 300, 200);
-        Camera cam = new ParallelCamera();
-        scene.setCamera(cam);
-        scene2.setCamera(cam);
+        assertThrows(IllegalArgumentException.class, () -> {
+            Scene scene = new Scene(new Group(), 300, 200);
+            Scene scene2 = new Scene(new Group(), 300, 200);
+            Camera cam = new ParallelCamera();
+            scene.setCamera(cam);
+            scene2.setCamera(cam);
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void subSceneAndSceneCannotShareCamera() {
-        SubScene sub = new SubScene(new Group(), 100, 100);
-        Scene scene = new Scene(new Group(sub), 300, 200);
-        Camera cam = new ParallelCamera();
-        sub.setCamera(cam);
-        scene.setCamera(cam);
+        assertThrows(IllegalArgumentException.class, () -> {
+            SubScene sub = new SubScene(new Group(), 100, 100);
+            Scene scene = new Scene(new Group(sub), 300, 200);
+            Camera cam = new ParallelCamera();
+            sub.setCamera(cam);
+            scene.setCamera(cam);
+        });
     }
 
     @Test
@@ -878,16 +900,20 @@ public void testNodeCursorChangePropagatesToScenePeer() {
      *                                                                         *
      **************************************************************************/
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testAddNullPreLayoutPulseListener() {
-        Scene scene = new Scene(new Group(), 300, 300);
-        scene.addPreLayoutPulseListener(null);
+        assertThrows(NullPointerException.class, () -> {
+            Scene scene = new Scene(new Group(), 300, 300);
+            scene.addPreLayoutPulseListener(null);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testAddNullPostLayoutPulseListener() {
-        Scene scene = new Scene(new Group(), 300, 300);
-        scene.addPostLayoutPulseListener(null);
+        assertThrows(NullPointerException.class, () -> {
+            Scene scene = new Scene(new Group(), 300, 300);
+            scene.addPostLayoutPulseListener(null);
+        });
     }
 
     @Test public void testRemoveNullPreLayoutPulseListener_nullListenersList() {
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/Scene_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/Scene_properties_Test.java
index 0da9b69d97f..7bd6f5f1b1e 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/Scene_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/Scene_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,7 @@
 package test.javafx.scene;
 
 import com.sun.javafx.event.EventHandlerManager;
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.event.EventHandler;
 import javafx.geometry.NodeOrientation;
 import javafx.scene.Cursor;
@@ -37,19 +36,16 @@
 import javafx.scene.PerspectiveCamera;
 import javafx.scene.paint.Color;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import test.com.sun.javafx.test.PropertiesTestBase;
 import test.com.sun.javafx.test.objects.TestScene;
 import test.com.sun.javafx.test.objects.TestStage;
 import javafx.scene.layout.Pane;
 
-@RunWith(Parameterized.class)
+import org.junit.jupiter.params.provider.Arguments;
+import test.com.sun.javafx.test.PropertiesTestBase;
+
 public final class Scene_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
+
+    public static Stream<Arguments> data() {
         final TestScene testScene = new TestScene(new Group());
 
         final TestStage testStage1 = new TestStage("STAGE_1");
@@ -65,7 +61,7 @@ public static Collection data() {
                               "window", testStage1, testStage2);
         windowCfg.setAllowMultipleNotifications(true);
 
-        return Arrays.asList(new Object[] {
+        return Stream.of(
             config(windowCfg),
 //            config(testScene, "x", , ),
 //            config(testScene, "y", , ),
@@ -132,10 +128,6 @@ public static Collection data() {
                                       NodeOrientation.RIGHT_TO_LEFT,
                    "effectiveNodeOrientation", NodeOrientation.LEFT_TO_RIGHT,
                                                NodeOrientation.RIGHT_TO_LEFT)
-        });
-    }
-
-    public Scene_properties_Test(final Configuration configuration) {
-        super(configuration);
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/Scenegraph_eventHandlers_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/Scenegraph_eventHandlers_Test.java
index a1132a1c175..75943002958 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/Scenegraph_eventHandlers_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/Scenegraph_eventHandlers_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,7 @@
 
 package test.javafx.scene;
 
-import static org.junit.Assert.assertEquals;
-
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 
 import javafx.event.Event;
 import javafx.event.EventHandler;
@@ -41,113 +38,124 @@
 import javafx.scene.input.MouseEvent;
 import javafx.scene.shape.Rectangle;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import test.com.sun.javafx.test.PropertyReference;
 import test.com.sun.javafx.test.MouseEventGenerator;
 import javafx.scene.input.ContextMenuEvent;
 import javafx.scene.input.SwipeEvent;
 
-@RunWith(Parameterized.class)
 public final class Scenegraph_eventHandlers_Test {
-    private final EventType<?> eventType;
-    private final PropertyReference sceneOnHandlerPropRef;
-    private final PropertyReference nodeOnHandlerPropRef;
-    private final Event triggeringEvent;
 
-    @Parameters
-    public static Collection data() {
+    public static Stream<Arguments> data() {
         final MouseEventGenerator mouseEventGenerator =
                 new MouseEventGenerator();
-        return Arrays.asList(new Object[][] {
-            {
+        return Stream.of(
+            config(
                 KeyEvent.KEY_PRESSED,
                 "onKeyPressed",
                 createTestKeyEvent(KeyEvent.KEY_PRESSED)
-            }, {
+            ),
+            config(
                 KeyEvent.KEY_RELEASED,
                 "onKeyReleased",
                 createTestKeyEvent(KeyEvent.KEY_RELEASED)
-            }, {
+            ),
+            config(
                 KeyEvent.KEY_TYPED,
                 "onKeyTyped",
                 createTestKeyEvent(KeyEvent.KEY_TYPED)
-            }, {
+            ),
+            config(
                 MouseEvent.MOUSE_PRESSED,
                 "onMousePressed",
                 mouseEventGenerator.generateMouseEvent(
                         MouseEvent.MOUSE_PRESSED, 0, 0)
-            }, {
+            ),
+            config(
                 MouseEvent.MOUSE_RELEASED,
                 "onMouseReleased",
                 mouseEventGenerator.generateMouseEvent(
                         MouseEvent.MOUSE_RELEASED, 0, 0)
-            }, {
+            ),
+            config(
                 MouseEvent.MOUSE_CLICKED,
                 "onMouseClicked",
                 mouseEventGenerator.generateMouseEvent(
                         MouseEvent.MOUSE_CLICKED, 0, 0)
-            }, {
+            ),
+            config(
                 MouseEvent.MOUSE_ENTERED,
                 "onMouseEntered",
                 mouseEventGenerator.generateMouseEvent(
                         MouseEvent.MOUSE_ENTERED, 0, 0)
-            }, {
+            ),
+            config(
                 MouseEvent.MOUSE_EXITED,
                 "onMouseExited",
                 mouseEventGenerator.generateMouseEvent(
                         MouseEvent.MOUSE_EXITED, 0, 0)
-            }, {
+            ),
+            config(
                 MouseEvent.MOUSE_MOVED,
                 "onMouseMoved",
                 mouseEventGenerator.generateMouseEvent(
                         MouseEvent.MOUSE_MOVED, 0, 0)
-            }, {
+            ),
+            config(
                 MouseEvent.MOUSE_DRAGGED,
                 "onMouseDragged",
                 mouseEventGenerator.generateMouseEvent(
                         MouseEvent.MOUSE_DRAGGED, 0, 0)
-            }, {
+            ),
+            config(
                 SwipeEvent.SWIPE_LEFT,
                 "onSwipeLeft",
                 createSwipeEvent(SwipeEvent.SWIPE_LEFT)
-            }, {
+            ),
+            config(
                 SwipeEvent.SWIPE_RIGHT,
                 "onSwipeRight",
                 createSwipeEvent(SwipeEvent.SWIPE_RIGHT)
-            }, {
+            ),
+            config(
                 SwipeEvent.SWIPE_UP,
                 "onSwipeUp",
                 createSwipeEvent(SwipeEvent.SWIPE_UP)
-            }, {
+            ),
+            config(
                 SwipeEvent.SWIPE_DOWN,
                 "onSwipeDown",
                 createSwipeEvent(SwipeEvent.SWIPE_DOWN)
-            }, {
+            ),
+            config(
                 ContextMenuEvent.CONTEXT_MENU_REQUESTED,
                 "onContextMenuRequested",
                 createContextMenuEvent()
-            }
-        });
+            )
+        );
     }
 
-    public Scenegraph_eventHandlers_Test(
-            final EventType<?> eventType,
-            final String onHandlerName,
-            final Event triggeringEvent) {
-        this.eventType = eventType;
-        this.sceneOnHandlerPropRef =
-                PropertyReference.createForBean(Scene.class, onHandlerName);
-        this.nodeOnHandlerPropRef =
-                PropertyReference.createForBean(Node.class, onHandlerName);
-        this.triggeringEvent = triggeringEvent;
+    private static Arguments config(final EventType<?> eventType,
+                                    final String onHandlerName,
+                                    final Event triggeringEvent) {
+        return Arguments.of(
+            eventType,
+            PropertyReference.createForBean(Scene.class, onHandlerName),
+            PropertyReference.createForBean(Node.class, onHandlerName),
+            triggeringEvent
+        );
     }
 
-    @Test
-    public void shouldCallRegisteredHandlers() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void shouldCallRegisteredHandlers(EventType<?> eventType,
+                                             PropertyReference sceneOnHandlerPropRef,
+                                             PropertyReference nodeOnHandlerPropRef,
+                                             Event triggeringEvent) {
         final EventCountingHandler sceneHandler = new EventCountingHandler();
         final EventCountingHandler lNodeHandler = new EventCountingHandler();
         final EventCountingHandler rNodeHandler = new EventCountingHandler();
@@ -206,8 +214,12 @@ public void shouldCallRegisteredHandlers() {
         assertEquals(1, rlNodeHandler.getCounter());
     }
 
-    @Test
-    public void shouldNotCallHandlersWithoutDispatcher() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void shouldNotCallHandlersWithoutDispatcher(EventType<?> eventType,
+                                                       PropertyReference sceneOnHandlerPropRef,
+                                                       PropertyReference nodeOnHandlerPropRef,
+                                                       Event triggeringEvent) {
         final EventCountingHandler sceneHandler = new EventCountingHandler();
         final EventCountingHandler rootHandler = new EventCountingHandler();
         final EventCountingHandler leafHandler = new EventCountingHandler();
@@ -242,8 +254,12 @@ public void shouldNotCallHandlersWithoutDispatcher() {
         assertEquals(1, leafHandler.getCounter());
     }
 
-    @Test
-    public void shouldNotPropagateConsumedCapturingEvents() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void shouldNotPropagateConsumedCapturingEvents(EventType<?> eventType,
+                                                          PropertyReference sceneOnHandlerPropRef,
+                                                          PropertyReference nodeOnHandlerPropRef,
+                                                          Event triggeringEvent) {
         final EventCountingHandler sceneHandler = new EventCountingHandler();
         final EventCountingHandler rlNodeHandler = new EventCountingHandler();
 
@@ -278,8 +294,12 @@ public void shouldNotPropagateConsumedCapturingEvents() {
         setEventHandler(TEST_RL_NODE, nodeOnHandlerPropRef, null);
     }
 
-    @Test
-    public void shouldNotPropagateConsumedBubblingEvents() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void shouldNotPropagateConsumedBubblingEvents(EventType<?> eventType,
+                                                         PropertyReference sceneOnHandlerPropRef,
+                                                         PropertyReference nodeOnHandlerPropRef,
+                                                         Event triggeringEvent) {
         final EventCountingHandler sceneHandler = new EventCountingHandler();
         final EventCountingHandler rootNodeHandler = new EventCountingHandler();
         final EventCountingHandler rlNodeHandler = new EventCountingHandler();
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/StructureTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/StructureTest.java
index 5b51c509715..ac016e0acdf 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/StructureTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/StructureTest.java
@@ -36,17 +36,17 @@
 import javafx.scene.Parent;
 import javafx.scene.ParentShim;
 import javafx.scene.Scene;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 import test.com.sun.javafx.scene.StubNodeHelper;
 import test.com.sun.javafx.scene.StubParentHelper;
 
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
 
 /**
  * Tests structural aspects of scene graph manipulation. See RT-4095.
@@ -69,9 +69,6 @@
  */
 
 public class StructureTest {
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
-
     // TODO:
     //  - various nasty observableArrayList updates to Group.content and Scene.content.
     //  - various bind expressions.
@@ -154,9 +151,9 @@ boolean notRoot(Parent root, Scene scene) {
     public void testOrphan() {
         Node n = new StubNode();
 
-        assertNull("clipParent is null", NodeShim.getClipParent(n));
-        assertNull("parent is null", n.getParent());
-        assertNull("scene is null", n.getScene());
+        assertNull(NodeShim.getClipParent(n), "clipParent is null");
+        assertNull(n.getParent(), "parent is null");
+        assertNull(n.getScene(), "scene is null");
     }
 
     @Test
@@ -165,10 +162,10 @@ public void testSimpleCL() {
         StubNode child = new StubNode();
         parent.setClip(child);
 
-        assertSame("parent.clip is child", child, parent.getClip());
-        assertSame("child.clipParent is parent", parent, NodeShim.getClipParent(child));
-        assertNull("child.parent is null", child.getParent());
-        assertNull("scene is null", child.getScene());
+        assertSame(child, parent.getClip(), "parent.clip is child");
+        assertSame(parent, NodeShim.getClipParent(child), "child.clipParent is parent");
+        assertNull(child.getParent(), "child.parent is null");
+        assertNull(child.getScene(), "scene is null");
     }
 
     @Test
@@ -176,11 +173,11 @@ public void testSimpleG() {
         StubNode child = new StubNode();
         Group group = new Group(child);
 
-        assertNull("group.clip is null", group.getClip());
-        assertTrue("isChild of group", isChild(child, group));
-        assertNull("child.clipParent is null", NodeShim.getClipParent(child));
-        assertSame("child.parent is parent", group, child.getParent());
-        assertNull("child.getScene() is null", child.getScene());
+        assertNull(group.getClip(), "group.clip is null");
+        assertTrue(isChild(child, group), "isChild of group");
+        assertNull(NodeShim.getClipParent(child), "child.clipParent is null");
+        assertSame(group, child.getParent(), "child.parent is parent");
+        assertNull(child.getScene(), "child.getScene() is null");
     }
 
     @Test
@@ -188,9 +185,9 @@ public void testSimpleS() {
         StubParent root = new StubParent();
         Scene scene = new Scene(root);
 
-        assertTrue("isChild of scene", isRoot(root, scene));
-        assertNull("child.clipParent is null", NodeShim.getClipParent(root));
-        assertSame("child.getScene() is scene", scene, root.getScene());
+        assertTrue(isRoot(root, scene), "isChild of scene");
+        assertNull(NodeShim.getClipParent(root), "child.clipParent is null");
+        assertSame(scene, root.getScene(), "child.getScene() is scene");
     }
 
     @Test
@@ -200,8 +197,8 @@ public void testSceneInsertGroup1() {
         Scene scene = new Scene(group);
         ParentShim.getChildren(group).add(child);
 
-        assertSame("group.getScene() is scene", scene, group.getScene());
-        assertSame("child.getScene() is scene", scene, child.getScene());
+        assertSame(scene, group.getScene(), "group.getScene() is scene");
+        assertSame(scene, child.getScene(), "child.getScene() is scene");
     }
 
     @Test
@@ -212,29 +209,31 @@ public void testSceneInsertGroup2() {
         ParentShim.getChildren(group).add(child);
 
 
-        assertSame("group.getScene() is scene", scene, group.getScene());
-        assertSame("child.getScene() is scene", scene, child.getScene());
+        assertSame(scene, group.getScene(), "group.getScene() is scene");
+        assertSame(scene, child.getScene(), "child.getScene() is scene");
     }
 
-    @Test public void testUnparentCL() {
+    @Test
+    public void testUnparentCL() {
         StubNode child = new StubNode();
         StubNode parent = new StubNode();
         parent.setClip(child);
         parent.setClip(null);
 
-        assertNull("parent.clip is null", parent.getClip());
-        assertNull("child.clipParent is null", NodeShim.getClipParent(child));
+        assertNull(parent.getClip(), "parent.clip is null");
+        assertNull(NodeShim.getClipParent(child), "child.clipParent is null");
     }
 
-    @Test public void testUnparentG() {
+    @Test
+    public void testUnparentG() {
         StubNode child = new StubNode();
         Group parent = new Group(child);
 
         ParentShim.getChildren(parent).remove(child);
 
 
-        assertEquals("parent.content is zero size", 0, ParentShim.getChildren(parent).size());
-        assertNull("child.parent is null", child.getParent());
+        assertEquals(0, ParentShim.getChildren(parent).size(), "parent.content is zero size");
+        assertNull(child.getParent(), "child.parent is null");
     }
 
     //----------------------------------
@@ -245,26 +244,29 @@ public void testSceneInsertGroup2() {
     // This is the cross product: {CL,CU,G,S}x{CL,CU,G,S} so there
     // are sixteen cases.
 
-    @Test public void testSwitchCLCL() {
+    @Test
+    public void testSwitchCLCL() {
         StubNode child = new StubNode();
         StubNode p1 = new StubNode();
         p1.setClip(child);
         StubNode p2 = new StubNode();
-        thrown.expect(IllegalArgumentException.class);
-        try {
-            p2.setClip(child);
-        } catch (final IllegalArgumentException e) {
-            assertSame("p1.clip is child", child, p1.getClip());
-            assertNull("p2.clip is null", p2.getClip());
-            assertSame("child.clipParent is p1",
-                       p1, NodeShim.getClipParent(child));
-            assertNull("child.parent is null", child.getParent());
-            assertNull("child.getScene() is null", child.getScene());
-            throw e;
-        }
+        assertThrows(IllegalArgumentException.class, () -> {
+            try {
+                p2.setClip(child);
+            } catch (final IllegalArgumentException e) {
+                assertSame(child, p1.getClip(), "p1.clip is child");
+                assertNull(p2.getClip(), "p2.clip is null");
+                assertSame(p1, NodeShim.getClipParent(child),
+                           "child.clipParent is p1");
+                assertNull(child.getParent(), "child.parent is null");
+                assertNull(child.getScene(), "child.getScene() is null");
+                throw e;
+            }
+        });
     }
 
-    @Test public void testSwitchCLG() {
+    @Test
+    public void testSwitchCLG() {
         StubNode child = new StubNode();
         StubNode p1 = new StubNode();
         p1.setClip(child);
@@ -277,15 +279,16 @@ public void testSceneInsertGroup2() {
             // expected
         }
 
-        assertSame("p1.clip is child", child, p1.getClip());
-        assertNull("p2.clip is null", p2.getClip());
-        assertTrue("notChild of p2", notChild(child, p2));
-        assertSame("child.clipParent is p1", p1, NodeShim.getClipParent(child));
-        assertNull("child.parent is null", child.getParent());
-        assertNull("child.getScene() is null", child.getScene());
+        assertSame(child, p1.getClip(), "p1.clip is child");
+        assertNull(p2.getClip(), "p2.clip is null");
+        assertTrue(notChild(child, p2), "notChild of p2");
+        assertSame(p1, NodeShim.getClipParent(child), "child.clipParent is p1");
+        assertNull(child.getParent(), "child.parent is null");
+        assertNull(child.getScene(), "child.getScene() is null");
     }
 
-    @Test public void testSwitchCLS() {
+    @Test
+    public void testSwitchCLS() {
         StubParent clipNode = new StubParent();
         StubNode p1 = new StubNode();
         p1.setClip(clipNode);
@@ -295,127 +298,137 @@ public void testSceneInsertGroup2() {
         } catch (Throwable t) {
             //expected
         }
-        assertSame("p1.clip is child", clipNode, p1.getClip());
-        assertSame("child.clipParent is p1", p1, NodeShim.getClipParent(clipNode));
-        assertNull("child.parent is null", clipNode.getParent());
-        assertNull("child.getScene() is null", clipNode.getScene());
+        assertSame(clipNode, p1.getClip(), "p1.clip is child");
+        assertSame(p1, NodeShim.getClipParent(clipNode), "child.clipParent is p1");
+        assertNull(clipNode.getParent(), "child.parent is null");
+        assertNull(clipNode.getScene(), "child.getScene() is null");
     }
 
-    @Test public void testSwitchGCL() {
+    @Test
+    public void testSwitchGCL() {
         StubNode child = new StubNode();
         Group p1 = new Group(child);
         StubNode p2 = new StubNode();
-        thrown.expect(IllegalArgumentException.class);
-        try {
-            p2.setClip(child);
-        } catch (final IllegalArgumentException e) {
-            assertNull("p1.clip is null", p1.getClip());
-            assertTrue("isChild of p1", isChild(child, p1));
-            assertNull("p2.clip is null", p2.getClip());
-            assertNull("child.clipParent is null", NodeShim.getClipParent(child));
-            assertSame("child.parent is p1", p1, child.getParent());
-            assertNull("child.getScene() is null", child.getScene());
-            throw e;
-        }
+        assertThrows(IllegalArgumentException.class, () -> {
+            try {
+                p2.setClip(child);
+            } catch (final IllegalArgumentException e) {
+                assertNull(p1.getClip(), "p1.clip is null");
+                assertTrue(isChild(child, p1), "isChild of p1");
+                assertNull(p2.getClip(), "p2.clip is null");
+                assertNull(NodeShim.getClipParent(child), "child.clipParent is null");
+                assertSame(p1, child.getParent(), "child.parent is p1");
+                assertNull(child.getScene(), "child.getScene() is null");
+                throw e;
+            }
+        });
     }
 
 // TODO XXX TEMPORARY STOPGAP POLICY RT-4095 -- TEST DISABLED
 
-//    @Test public void testSwitchGG() {
+//    @Test
+//    public void testSwitchGG() {
 //        var child = new StubNode();
 //        var p1 = Group { content: [ child ] };
 //        setHandler();
 //        var p2 = Group { content: [ child ] };
 //
-//        assertTrue("caught IllegalArgumentException", caught instanceof IllegalArgumentException);
-//        assertNull("p1.clip is null", p1.clip);
-//        assertTrue("isChild of p1", isChild(child, p1));
-//        assertNull("p2.clip is null", p2.clip);
-//        assertTrue("notChild of p2", notChild(child, p2));
-//        assertNull("child.clipParent is null", NodeShim.getClipParent(child));
-//        assertSame("child.parent is p1", p1, child.parent);
-//        assertNull("child.getScene() is null", child.getScene());
+//        assertTrue(caught instanceof IllegalArgumentException, "caught IllegalArgumentException");
+//        assertNull(p1.clip, "p1.clip is null");
+//        assertTrue(isChild(child, p1), "isChild of p1");
+//        assertNull(p2.clip, "p2.clip is null");
+//        assertTrue(notChild(child, p2), "notChild of p2");
+//        assertNull(NodeShim.getClipParent(child), "child.clipParent is null");
+//        assertSame(p1, child.parent, "child.parent is p1");
+//        assertNull(child.getScene(), "child.getScene() is null");
 //    }
 
 // TODO XXX TEMPORARY STOPGAP POLICY RT-4095 -- TEST DISABLED
 
-//    @Test public void testSwitchGS() {
+//    @Test
+//    public void testSwitchGS() {
 //        var child = new StubNode();
 //        var p1 = Group { content: [ child ] };
 //        setHandler();
 //        var p2 = Scene { content: [ child ] };
 //
-//        assertTrue("caught IllegalArgumentException", caught instanceof IllegalArgumentException);
-//        assertNull("p1.clip is null", p1.clip);
-//        assertTrue("isChild of p1", isChild(child, p1));
-//        assertTrue("notChild of p2", notChild(child, p2));
-//        assertNull("child.clipParent is null", NodeShim.getClipParent(child));
-//        assertSame("child.parent is p1", p1, child.parent);
-//        assertNull("child.getScene() is null", child.getScene());
+//        assertTrue(caught instanceof IllegalArgumentException, "caught IllegalArgumentException");
+//        assertNull(p1.clip, "p1.clip is null");
+//        assertTrue(isChild(child, p1), "isChild of p1");
+//        assertTrue(notChild(child, p2), "notChild of p2");
+//        assertNull(NodeShim.getClipParent(child), "child.clipParent is null");
+//        assertSame(p1, child.parent, "child.parent is p1");
+//        assertNull(child.getScene(), "child.getScene() is null");
 //    }
 
 // TODO XXX TEMPORARY STOPGAP POLICY RT-4095 -- TEST OF STOPGAP POLICY
 
-    @Test public void testSwitchGGStopgap() {
+    @Test
+    public void testSwitchGGStopgap() {
         StubNode child = new StubNode();
         Group p1 = new Group(child);
         Group p2 = new Group(child);
 
-        assertTrue("notChild of p1", notChild(child, p1));
-        assertTrue("isChild of p2", isChild(child, p2));
-        assertSame("child.parent is p2", p2, child.getParent());
+        assertTrue(notChild(child, p1), "notChild of p1");
+        assertTrue(isChild(child, p2), "isChild of p2");
+        assertSame(p2, child.getParent(), "child.parent is p2");
     }
 
-    @Test public void testSwitchSCL() {
+    @Test
+    public void testSwitchSCL() {
         StubParent root = new StubParent();
         Scene scene = new Scene(root);
         StubNode p2 = new StubNode();
-        thrown.expect(IllegalArgumentException.class);
-        try {
-            p2.setClip(root);
-        } catch (final IllegalArgumentException e) {
-            assertTrue("isRoot of scene", isRoot(root, scene));
-            assertNull("p2.clip is null", p2.getClip());
-            assertNull("root.clipParent is null", NodeShim.getClipParent(root));
-            assertSame("root.getScene() is scene", scene, root.getScene());
-            throw e;
-        }
+        assertThrows(IllegalArgumentException.class, () -> {
+            try {
+                p2.setClip(root);
+            } catch (final IllegalArgumentException e) {
+                assertTrue(isRoot(root, scene), "isRoot of scene");
+                assertNull(p2.getClip(), "p2.clip is null");
+                assertNull(NodeShim.getClipParent(root), "root.clipParent is null");
+                assertSame(scene, root.getScene(), "root.getScene() is scene");
+                throw e;
+            }
+        });
     }
 
 
 // TODO XXX TEMPORARY STOPGAP POLICY RT-4095 -- TEST DISABLED
 
-//    @Test public void testSwitchSG() {
+//    @Test
+//    public void testSwitchSG() {
 //        var child = new StubNode();
 //        var p1 = Scene { content: [ child ] };
 //        setHandler();
 //        var p2 = Group { content: [ child ] };
 //
-//        assertTrue("caught IllegalArgumentException", caught instanceof IllegalArgumentException);
-//        assertTrue("isChild of p1", isChild(child, p1));
-//        assertNull("p2.clip is null", p2.clip);
-//        assertTrue("notChild of p2", notChild(child, p2));
-//        assertNull("child.clipParent is null", NodeShim.getClipParent(child));
-//        assertSame("child.parent is p1.impl_root", p1.impl_root, child.parent);
-//        assertSame("child.getScene() is p1", p1, child.getScene());
+//        assertTrue(caught instanceof IllegalArgumentException, "caught IllegalArgumentException");
+//        assertTrue(isChild(child, p1), "isChild of p1");
+//        assertNull(p2.clip, "p2.clip is null");
+//        assertTrue(notChild(child, p2), "notChild of p2");
+//        assertNull(NodeShim.getClipParent(child), "child.clipParent is null");
+//        assertSame(p1.impl_root, child.parent, "child.parent is p1.impl_root");
+//        assertSame(p1, child.getScene(), "child.getScene() is p1");
 //    }
 
 // TODO XXX TEMPORARY STOPGAP POLICY RT-4095 -- TEST DISABLED
 
-//    @Test public void testSwitchSS() {
+//    @Test
+//    public void testSwitchSS() {
 //        var child = new StubNode();
 //        var p1 = Scene { content: [ child ] };
 //        setHandler();
 //        var p2 = Scene { content: [ child ] };
 //
-//        assertTrue("isChild of p1", isChild(child, p1));
-//        assertTrue("notChild of p2", notChild(child, p2));
-//        assertNull("child.clipParent is null", NodeShim.getClipParent(child));
-//        assertSame("child.parent is p1.impl_root", p1.impl_root, child.parent);
-//        assertSame("child.getScene() is p1", p1, child.getScene());
+//        assertTrue(isChild(child, p1), "isChild of p1");
+//        assertTrue(notChild(child, p2), "notChild of p2");
+//        assertNull(NodeShim.getClipParent(child), "child.clipParent is null");
+//        assertSame(p1.impl_root, child.parent, "child.parent is p1.impl_root");
+//        assertSame(p1, child.getScene(), "child.getScene() is p1");
 //    }
 
-    @Test public void testGroupInsert() {
+    @Test
+    public void testGroupInsert() {
         StubNode n0 = new StubNode();
         n0.setId("n0");
         StubNode n1 = new StubNode();
@@ -432,15 +445,16 @@ public void testSceneInsertGroup2() {
             // expected
         }
 
-        assertEquals("g.content is size 3", 3, ParentShim.getChildren(g).size());
-        assertSame("g.content[0] is n0", n0, ParentShim.getChildren(g).get(0));
-        assertSame("g.content[1] is n1", n1, ParentShim.getChildren(g).get(1));
-        assertSame("g.content[2] is n2", n2, ParentShim.getChildren(g).get(2));
+        assertEquals(3, ParentShim.getChildren(g).size(), "g.content is size 3");
+        assertSame(n0, ParentShim.getChildren(g).get(0), "g.content[0] is n0");
+        assertSame(n1, ParentShim.getChildren(g).get(1), "g.content[1] is n1");
+        assertSame(n2, ParentShim.getChildren(g).get(2), "g.content[2] is n2");
 
     }
 
 
-    @Test public void testGroupReplace1() {
+    @Test
+    public void testGroupReplace1() {
         StubNode n0 = new StubNode();
         n0.setId("n0");
         StubNode n1 = new StubNode();
@@ -460,12 +474,13 @@ public void testSceneInsertGroup2() {
             // expected
         }
 
-        assertEquals("g.content is size 2", 2, ParentShim.getChildren(g).size());
-        assertSame("g.content[0] is n0", n0, ParentShim.getChildren(g).get(0));
-        assertSame("g.content[1] is n2", n2, ParentShim.getChildren(g).get(1));
+        assertEquals(2, ParentShim.getChildren(g).size(), "g.content is size 2");
+        assertSame(n0, ParentShim.getChildren(g).get(0), "g.content[0] is n0");
+        assertSame(n2, ParentShim.getChildren(g).get(1), "g.content[1] is n2");
     }
 
-    @Test public void testGroupReplace2() {
+    @Test
+    public void testGroupReplace2() {
         StubNode n0 = new StubNode();
         n0.setId("n0");
         StubNode n1 = new StubNode();
@@ -481,13 +496,14 @@ public void testSceneInsertGroup2() {
             //Expected
         }
 
-        assertEquals("g.content is size 3", 3, ParentShim.getChildren(g).size());
-        assertSame("g.content[0] is n0", n0, ParentShim.getChildren(g).get(0));
-        assertSame("g.content[1] is n1", n1, ParentShim.getChildren(g).get(1));
-        assertSame("g.content[2] is n2", n2, ParentShim.getChildren(g).get(2));
+        assertEquals(3, ParentShim.getChildren(g).size(), "g.content is size 3");
+        assertSame(n0, ParentShim.getChildren(g).get(0), "g.content[0] is n0");
+        assertSame(n1, ParentShim.getChildren(g).get(1), "g.content[1] is n1");
+        assertSame(n2, ParentShim.getChildren(g).get(2), "g.content[2] is n2");
     }
 
-    @Test public void testGroupReplace3() {
+    @Test
+    public void testGroupReplace3() {
         StubNode n0 = new StubNode();
         n0.setId("n0");
         StubNode n1 = new StubNode();
@@ -498,10 +514,10 @@ public void testSceneInsertGroup2() {
         ParentShim.getChildren(g).set(1, n1);
         ParentShim.getChildren(g).set(2, n2);
 
-        assertEquals("g.content is size 3", 3, ParentShim.getChildren(g).size());
-        assertSame("g.content[0] is n0", n0, ParentShim.getChildren(g).get(0));
-        assertSame("g.content[1] is n1", n1, ParentShim.getChildren(g).get(1));
-        assertSame("g.content[2] is n2", n2, ParentShim.getChildren(g).get(2));
+        assertEquals(3, ParentShim.getChildren(g).size(), "g.content is size 3");
+        assertSame(n0, ParentShim.getChildren(g).get(0), "g.content[0] is n0");
+        assertSame(n1, ParentShim.getChildren(g).get(1), "g.content[1] is n1");
+        assertSame(n2, ParentShim.getChildren(g).get(2), "g.content[2] is n2");
     }
 
     //---------------------
@@ -517,42 +533,47 @@ public void testSceneInsertGroup2() {
 
     // Test only {CL,G}x{CL,G} for now.
 
-    @Test public void testCircularCLCL() {
+    @Test
+    public void testCircularCLCL() {
         StubNode node1 = new StubNode();
         StubNode node2 = new StubNode();
         node2.setClip(node1);
-        thrown.expect(IllegalArgumentException.class);
-        try {
-            node1.setClip(node2);
-        } catch (final IllegalArgumentException e) {
-            assertNull("node1.clip is null", node1.getClip());
-            assertSame("node1.clipParent is node2",
-                       node2,
-                       NodeShim.getClipParent(node1));
-            assertSame("node2.clip is node1", node1, node2.getClip());
-            assertNull("node2.clipParent is null", NodeShim.getClipParent(node2));
-            throw e;
-        }
+        assertThrows(IllegalArgumentException.class, () -> {
+            try {
+                node1.setClip(node2);
+            } catch (final IllegalArgumentException e) {
+                assertNull(node1.getClip(), "node1.clip is null");
+                assertSame(node2,
+                           NodeShim.getClipParent(node1),
+                           "node1.clipParent is node2");
+                assertSame(node1, node2.getClip(), "node2.clip is node1");
+                assertNull(NodeShim.getClipParent(node2), "node2.clipParent is null");
+                throw e;
+            }
+        });
     }
 
-    @Test public void testCircularCLG() {
+    @Test
+    public void testCircularCLG() {
         StubNode node1 = new StubNode();
         Group node2 = new Group(node1);
-        thrown.expect(IllegalArgumentException.class);
-        try {
-            node1.setClip(node2);
-        } catch (final IllegalArgumentException e) {
-            assertNull("node1.clip is null", node1.getClip());
-            assertNull("node1.clipParent is null", NodeShim.getClipParent(node1));
-            assertSame("node1.parent is node2", node2, node1.getParent());
-            assertNull("node2.clip is null", node2.getClip());
-            assertNull("node2.clipParent is null", NodeShim.getClipParent(node2));
-            assertTrue("node1 is child of node2", isChild(node1, node2));
-            throw e;
-        }
+        assertThrows(IllegalArgumentException.class, () -> {
+            try {
+                node1.setClip(node2);
+            } catch (final IllegalArgumentException e) {
+                assertNull(node1.getClip(), "node1.clip is null");
+                assertNull(NodeShim.getClipParent(node1), "node1.clipParent is null");
+                assertSame(node2, node1.getParent(), "node1.parent is node2");
+                assertNull(node2.getClip(), "node2.clip is null");
+                assertNull(NodeShim.getClipParent(node2), "node2.clipParent is null");
+                assertTrue(isChild(node1, node2), "node1 is child of node2");
+                throw e;
+            }
+        });
     }
 
-    @Test public void testCircularGCL() {
+    @Test
+    public void testCircularGCL() {
         Group node1 = new Group();
         StubNode node2 = new StubNode();
         node2.setClip(node1);
@@ -565,15 +586,16 @@ public void testSceneInsertGroup2() {
             // expected
         }
 
-        assertNull("node1.clip is null", node1.getClip());
-        assertSame("node1.clipParent is node2", node2, NodeShim.getClipParent(node1));
-        assertTrue("node2 is not child of node1", notChild(node2, node1));
-        assertSame("node2.clip is node1", node1, node2.getClip());
-        assertNull("node2.clipParent is null", NodeShim.getClipParent(node2));
-        assertNull("node2.parent is null", node2.getParent());
+        assertNull(node1.getClip(), "node1.clip is null");
+        assertSame(node2, NodeShim.getClipParent(node1), "node1.clipParent is node2");
+        assertTrue(notChild(node2, node1), "node2 is not child of node1");
+        assertSame(node1, node2.getClip(), "node2.clip is node1");
+        assertNull(NodeShim.getClipParent(node2), "node2.clipParent is null");
+        assertNull(node2.getParent(), "node2.parent is null");
     }
 
-    @Test public void testCircularGG() {
+    @Test
+    public void testCircularGG() {
         Group node1 = new Group();
         Group node2 = new Group(node1);
 
@@ -585,25 +607,28 @@ public void testSceneInsertGroup2() {
             // expected
         }
 
-        assertSame("node1.parent is node2", node2, node1.getParent());
-        assertTrue("node2 is not a child of node1", notChild(node2, node1));
-        assertNull("node2.parent is null", node2.getParent());
-        assertTrue("node1 is child of node2", isChild(node1, node2));
+        assertSame(node2, node1.getParent(), "node1.parent is node2");
+        assertTrue(notChild(node2, node1), "node2 is not a child of node1");
+        assertNull(node2.getParent(), "node2.parent is null");
+        assertTrue(isChild(node1, node2), "node1 is child of node2");
     }
 
-    @Test public void testCircularSelfCL() {
+    @Test
+    public void testCircularSelfCL() {
         StubNode node1 = new StubNode();
-        thrown.expect(IllegalArgumentException.class);
-        try {
-            node1.setClip(node1);
-        } catch (final IllegalArgumentException e) {
-            assertNull("node1.clip is null", node1.getClip());
-            assertNull("node1.clipParent is null", NodeShim.getClipParent(node1));
-            throw e;
-        }
+        assertThrows(IllegalArgumentException.class, () -> {
+            try {
+                node1.setClip(node1);
+            } catch (final IllegalArgumentException e) {
+                assertNull(node1.getClip(), "node1.clip is null");
+                assertNull(NodeShim.getClipParent(node1), "node1.clipParent is null");
+                throw e;
+            }
+        });
     }
 
-    @Test public void testCircularSelfG() {
+    @Test
+    public void testCircularSelfG() {
         Group node1 = new Group();
 
         ObservableList<Node> content = ParentShim.getChildren(node1);
@@ -614,8 +639,8 @@ public void testSceneInsertGroup2() {
             // expected
         }
 
-        assertTrue("node1 is not a child of itself", notChild(node1, node1));
-        assertNull("node1.parent is null", node1.getParent());
+        assertTrue(notChild(node1, node1), "node1 is not a child of itself");
+        assertNull(node1.getParent(), "node1.parent is null");
     }
 
     //------------------------
@@ -631,7 +656,8 @@ public void testSceneInsertGroup2() {
     // don't test these cases for now.
 
 // FAILS:
-//    @Test public void testBindClip() {
+//    @Test
+//    public void testBindClip() {
 //        var c:Node = null;
 //        var p1 = StubNode { clip: bind c id: "p1" };
 //        var p2 = StubNode { clip: bind c id: "p2" };
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/SubSceneTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/SubSceneTest.java
index 58500d39d46..76547d589b4 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/SubSceneTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/SubSceneTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,12 +40,14 @@
 import javafx.scene.SubScene;
 import javafx.scene.SubSceneShim;
 import javafx.scene.layout.Pane;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import org.junit.Test;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class SubSceneTest {
 
@@ -54,15 +56,19 @@ public void isOnFxAppThread() {
         assertTrue(Platform.isFxApplicationThread());
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testNullRoot() {
-        SubScene subScene = new SubScene(null, 10, 10);
+        assertThrows(NullPointerException.class, () -> {
+            SubScene subScene = new SubScene(null, 10, 10);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testSetNullRoot() {
-        SubScene subScene = new SubScene(new Group(), 10, 10);
-        subScene.setRoot(null);
+        assertThrows(NullPointerException.class, () -> {
+            SubScene subScene = new SubScene(new Group(), 10, 10);
+            subScene.setRoot(null);
+        });
     }
 
     @Test
@@ -181,67 +187,77 @@ public void testSetNullCamera() {
         assertNull(subScene.getCamera());
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testSetIllegalCameraFromOtherScene() {
-        Camera camera = new PerspectiveCamera();
+        assertThrows(IllegalArgumentException.class, () -> {
+            Camera camera = new PerspectiveCamera();
 
-        Scene scene = new Scene(new Group(camera));
+            Scene scene = new Scene(new Group(camera));
 
-        SubScene subScene = new SubScene(new Group(), 150, 150);
-        Scene otherScene = new Scene(new Group(subScene));
+            SubScene subScene = new SubScene(new Group(), 150, 150);
+            Scene otherScene = new Scene(new Group(subScene));
 
-        scene.setCamera(camera);
-        subScene.setCamera(camera);
+            scene.setCamera(camera);
+            subScene.setCamera(camera);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testSetIllegalCameraFromItsScene() {
-        Camera camera = new PerspectiveCamera();
+        assertThrows(IllegalArgumentException.class, () -> {
+            Camera camera = new PerspectiveCamera();
 
-        SubScene subScene = new SubScene(new Group(), 150, 150);
-        Scene scene = new Scene(new Group(camera, subScene));
+            SubScene subScene = new SubScene(new Group(), 150, 150);
+            Scene scene = new Scene(new Group(camera, subScene));
 
-        scene.setCamera(camera);
-        subScene.setCamera(camera);
+            scene.setCamera(camera);
+            subScene.setCamera(camera);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testSetIllegalCameraFromOtherSubScene() {
-        Camera camera = new PerspectiveCamera();
+        assertThrows(IllegalArgumentException.class, () -> {
+            Camera camera = new PerspectiveCamera();
 
-        SubScene subScene = new SubScene(new Group(), 150, 150);
-        Scene scene = new Scene(new Group(subScene));
+            SubScene subScene = new SubScene(new Group(), 150, 150);
+            Scene scene = new Scene(new Group(subScene));
 
-        SubScene otherSubScene = new SubScene(new Group(camera), 100, 100);
-        Scene otherScene = new Scene(new Group(otherSubScene));
+            SubScene otherSubScene = new SubScene(new Group(camera), 100, 100);
+            Scene otherScene = new Scene(new Group(otherSubScene));
 
-        otherSubScene.setCamera(camera);
-        subScene.setCamera(camera);
+            otherSubScene.setCamera(camera);
+            subScene.setCamera(camera);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testSetIllegalCameraFromSubScene() {
-        Camera camera = new PerspectiveCamera();
+        assertThrows(IllegalArgumentException.class, () -> {
+            Camera camera = new PerspectiveCamera();
 
-        SubScene subScene = new SubScene(new Group(), 150, 150);
-        Scene scene = new Scene(new Group(subScene));
+            SubScene subScene = new SubScene(new Group(), 150, 150);
+            Scene scene = new Scene(new Group(subScene));
 
-        SubScene otherSubScene = new SubScene(new Group(camera), 100, 100);
+            SubScene otherSubScene = new SubScene(new Group(camera), 100, 100);
 
-        otherSubScene.setCamera(camera);
-        subScene.setCamera(camera);
+            otherSubScene.setCamera(camera);
+            subScene.setCamera(camera);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testSetIllegalCameraFromNestedSubScene() {
-        Camera camera = new PerspectiveCamera();
+        assertThrows(IllegalArgumentException.class, () -> {
+            Camera camera = new PerspectiveCamera();
 
-        SubScene nestedSubScene = new SubScene(new Group(camera), 100, 100);
-        SubScene subScene = new SubScene(new Group(nestedSubScene), 150, 150);
-        Scene scene = new Scene(new Group(subScene));
+            SubScene nestedSubScene = new SubScene(new Group(camera), 100, 100);
+            SubScene subScene = new SubScene(new Group(nestedSubScene), 150, 150);
+            Scene scene = new Scene(new Group(subScene));
 
-        nestedSubScene.setCamera(camera);
-        subScene.setCamera(camera);
+            nestedSubScene.setCamera(camera);
+            subScene.setCamera(camera);
+        });
     }
 
     @Test
@@ -304,23 +320,27 @@ public void testDefaultCameraUpdatesPG() {
         assertEquals(20, peer.getCamera().getNearClip(), 0.00001);
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void subScenesCannotShareCamera() {
-        SubScene sub = new SubScene(new Group(), 100, 100);
-        SubScene sub2 = new SubScene(new Group(), 100, 100);
-        Scene scene = new Scene(new Group(sub, sub2), 300, 200);
-        Camera cam = new ParallelCamera();
-        sub.setCamera(cam);
-        sub2.setCamera(cam);
+        assertThrows(IllegalArgumentException.class, () -> {
+            SubScene sub = new SubScene(new Group(), 100, 100);
+            SubScene sub2 = new SubScene(new Group(), 100, 100);
+            Scene scene = new Scene(new Group(sub, sub2), 300, 200);
+            Camera cam = new ParallelCamera();
+            sub.setCamera(cam);
+            sub2.setCamera(cam);
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void sceneAndSubSceneCannotShareCamera() {
-        SubScene sub = new SubScene(new Group(), 100, 100);
-        Scene scene = new Scene(new Group(sub), 300, 200);
-        Camera cam = new ParallelCamera();
-        scene.setCamera(cam);
-        sub.setCamera(cam);
+        assertThrows(IllegalArgumentException.class, () -> {
+            SubScene sub = new SubScene(new Group(), 100, 100);
+            Scene scene = new Scene(new Group(sub), 300, 200);
+            Camera cam = new ParallelCamera();
+            scene.setCamera(cam);
+            sub.setCamera(cam);
+        });
     }
 
     @Test
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/TreeShowingPropertyTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/TreeShowingPropertyTest.java
index 55d748df0c3..ae56c48b690 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/TreeShowingPropertyTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/TreeShowingPropertyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,28 +33,23 @@
 import javafx.scene.SubScene;
 import javafx.scene.layout.StackPane;
 import javafx.stage.Stage;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Supplier;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-@RunWith(Parameterized.class)
 public class TreeShowingPropertyTest {
-    private final Parent root;
-    private final Node node;
-    private final TreeShowingProperty property;
+    private Parent root;
+    private Node node;
+    private TreeShowingProperty property;
 
-    @Parameters
-    public static Collection<Object[]> parameters() {
+    public static Stream<Supplier<RootAndNodeToTest>> parameters() {
         Supplier<RootAndNodeToTest> supplier1 = () -> {
             Node node = new StackPane();
             return new RootAndNodeToTest(new StackPane(node), node);
@@ -65,7 +60,10 @@ public static Collection<Object[]> parameters() {
             return new RootAndNodeToTest(new StackPane(new SubScene(node, 100.0, 100.0)), node);
         };
 
-        return Arrays.asList(new Object[][] { { supplier1 }, { supplier2 } });
+        return Stream.of(
+            supplier1,
+            supplier2
+        );
     }
 
     static class RootAndNodeToTest {
@@ -78,7 +76,7 @@ static class RootAndNodeToTest {
         Node nodeToTest;
     }
 
-    public TreeShowingPropertyTest(Supplier<RootAndNodeToTest> nodeSupplier) {
+    private void setUp(Supplier<RootAndNodeToTest> nodeSupplier) {
         RootAndNodeToTest nodes = nodeSupplier.get();
 
         this.root = nodes.root;
@@ -86,13 +84,17 @@ public TreeShowingPropertyTest(Supplier<RootAndNodeToTest> nodeSupplier) {
         this.property = new TreeShowingProperty(this.node);
     }
 
-    @Test
-    public void nodeNotAttachedToSceneShouldNotBeShowing() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void nodeNotAttachedToSceneShouldNotBeShowing(Supplier<RootAndNodeToTest> nodeSupplier) {
+        setUp(nodeSupplier);
         assertFalse(property.get());
     }
 
-    @Test
-    public void getShouldTrackChangesInShowingStateForGivenNode() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void getShouldTrackChangesInShowingStateForGivenNode(Supplier<RootAndNodeToTest> nodeSupplier) {
+        setUp(nodeSupplier);
         assertFalse(property.get());  // not showing initially as not attached to a Scene
 
         Scene scene = new Scene(root);
@@ -113,8 +115,10 @@ public void getShouldTrackChangesInShowingStateForGivenNode() {
         assertFalse(property.get());  // not showing again as Window is hidden
     }
 
-    @Test
-    public void changeListenerShouldRegisterAndUnregisterCorrectly() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void changeListenerShouldRegisterAndUnregisterCorrectly(Supplier<RootAndNodeToTest> nodeSupplier) {
+        setUp(nodeSupplier);
         AtomicReference<Boolean> state = new AtomicReference<>();
         ChangeListener<Boolean> listener = (obs, old, current) -> state.set(current);
 
@@ -135,8 +139,10 @@ public void changeListenerShouldRegisterAndUnregisterCorrectly() {
         assertNull(state.getAndSet(null));  // no change fired as listener was unregistered
     }
 
-    @Test
-    public void invalidationListenerShouldRegisterAndUnregisterCorrectly() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void invalidationListenerShouldRegisterAndUnregisterCorrectly(Supplier<RootAndNodeToTest> nodeSupplier) {
+        setUp(nodeSupplier);
         AtomicReference<Boolean> state = new AtomicReference<>();
         InvalidationListener listener = obs -> state.set(true);
 
@@ -158,8 +164,10 @@ public void invalidationListenerShouldRegisterAndUnregisterCorrectly() {
         assertNull(state.getAndSet(null));  // expect no invalidation as listener was unregistered
     }
 
-    @Test
-    public void changeListenerShouldTrackShowingState() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void changeListenerShouldTrackShowingState(Supplier<RootAndNodeToTest> nodeSupplier) {
+        setUp(nodeSupplier);
         AtomicReference<Boolean> state = new AtomicReference<>();
 
         property.addListener((obs, old, current) -> state.set(current));
@@ -216,8 +224,10 @@ public void changeListenerShouldTrackShowingState() {
         assertTrue(state.getAndSet(null));  // making root part of a different visible scene should trigger showing change
     }
 
-    @Test
-    public void invalidationListenerShouldNotifyOfChangesInShowingState() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void invalidationListenerShouldNotifyOfChangesInShowingState(Supplier<RootAndNodeToTest> nodeSupplier) {
+        setUp(nodeSupplier);
         AtomicReference<Boolean> state = new AtomicReference<>();
 
         property.addListener(obs -> state.set(true));
@@ -287,8 +297,10 @@ public void invalidationListenerShouldNotifyOfChangesInShowingState() {
         assertTrue(state.getAndSet(null));  // making root part of a different visible scene should trigger invalidation
     }
 
-    @Test
-    public void disposeShouldUnregisterListenersOnGivenNode() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void disposeShouldUnregisterListenersOnGivenNode(Supplier<RootAndNodeToTest> nodeSupplier) {
+        setUp(nodeSupplier);
         AtomicReference<Boolean> state = new AtomicReference<>();
 
         property.addListener((obs, old, current) -> state.set(current));
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/bounds/BoundsPerformanceTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/bounds/BoundsPerformanceTest.java
index 65397144c16..0bbdc9e65ff 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/bounds/BoundsPerformanceTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/bounds/BoundsPerformanceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,12 +31,12 @@
 
 package test.javafx.scene.bounds;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertSame;
 import javafx.geometry.Bounds;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 public class BoundsPerformanceTest {
 
@@ -57,7 +57,8 @@ public class BoundsPerformanceTest {
      * only invalidates and requires recomputation of boundsInParent --
      * boundsInLocal and geom bounds are not touched.
      */
-    public @Test void testPerformance_TransformChangesOnlyAffectBoundsInParent() {
+    @Test
+    public void testPerformance_TransformChangesOnlyAffectBoundsInParent() {
         PerfNode n = new PerfNode();
         Bounds originalBoundsInParent = n.getBoundsInParent();
         Bounds originalBoundsInLocal = n.getBoundsInLocal();
@@ -76,7 +77,8 @@ public class BoundsPerformanceTest {
         assertNotSame(originalBoundsInParent, newBoundsInParent);
     }
 
-    public @Test void testPerformance_GeomChangesAffectEverything() {
+    @Test
+    public void testPerformance_GeomChangesAffectEverything() {
         PerfNode n = new PerfNode();
         Bounds originalBoundsInParent = n.getBoundsInParent();
         Bounds originalBoundsInLocal = n.getBoundsInLocal();
@@ -94,7 +96,8 @@ public class BoundsPerformanceTest {
         assertNotSame(originalBoundsInParent, newBoundsInParent);
     }
 
-    public @Test void testPerformance_ComputeGeomNotCalledDuringStartup() {
+    @Test
+    public void testPerformance_ComputeGeomNotCalledDuringStartup() {
         PerfNode n = new PerfNode(100, 100, 10, 10);
         assertEquals(0, n.geomComputeCount);
 
@@ -106,7 +109,8 @@ public class BoundsPerformanceTest {
 
     // Tests that if I set the x or y on the ResizablePerfNode, that it doesn't
     // * cause a new layout bounds to be created.
-    public @Test void testPerformance_LayoutBoundsOfResizableNotAffectedByChangesToOtherGeom() {
+    @Test
+    public void testPerformance_LayoutBoundsOfResizableNotAffectedByChangesToOtherGeom() {
         ResizablePerfNode n = new ResizablePerfNode();
         Bounds originalLayoutBounds = n.getLayoutBounds();
         n.setX(100);
@@ -117,7 +121,8 @@ public class BoundsPerformanceTest {
         assertNotSame(originalLayoutBounds, newLayoutBounds);
     }
 
-    public @Test void testPerformance_ChangingMultipleGeomOnlyCallsComputeGeomOnce() {
+    @Test
+    public void testPerformance_ChangingMultipleGeomOnlyCallsComputeGeomOnce() {
         PerfNode n = new PerfNode();
         Bounds originalBoundsInParent = n.getBoundsInParent();
         Bounds originalBoundsInLocal = n.getBoundsInLocal();
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/bounds/ClipBoundsTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/bounds/ClipBoundsTest.java
index 00264468da4..6b2adabb73a 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/bounds/ClipBoundsTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/bounds/ClipBoundsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,12 +26,12 @@
 package test.javafx.scene.bounds;
 
 import static test.com.sun.javafx.test.TestHelper.box;
-import static org.junit.Assert.assertEquals;
 import javafx.scene.Group;
 import javafx.scene.shape.Polygon;
 import javafx.scene.shape.Rectangle;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class ClipBoundsTest {
 
@@ -47,7 +47,8 @@ public class ClipBoundsTest {
 
     // a simple test that clipping a rectangle with another rectangle gives
     // the appropriate boundsInLocal
-    public @Test void testClippingWithRectangle() {
+    @Test
+    public void testClippingWithRectangle() {
         // the intersection of the clip & rect will be 10, 10, 90, 90
         Rectangle rect = new Rectangle(100, 100);
         Rectangle clip = new Rectangle(10, 10, 100, 100);
@@ -58,7 +59,8 @@ public class ClipBoundsTest {
     }
 
     // test clipping with a group clips according to the groups bounds
-    public @Test void testClippingWithGroup() {
+    @Test
+    public void testClippingWithGroup() {
         Rectangle r1 = new Rectangle(20, 20, 50, 50);
         Rectangle r2 = new Rectangle(90, 20, 50, 50);
         Group group = new Group(r1, r2);
@@ -70,7 +72,8 @@ public class ClipBoundsTest {
     }
 
     // test clipping with a node that is also clipped yields the correct bounds
-    public @Test void testClippingWithClippedRectangle() {
+    @Test
+    public void testClippingWithClippedRectangle() {
         // clip's bounds should be 20, 20, 50, 50
         Rectangle clip = new Rectangle(10, 10, 100, 100);
         Rectangle clipClip = new Rectangle(20, 20, 50, 50);
@@ -83,7 +86,8 @@ public class ClipBoundsTest {
     }
 
     // test clipping with a clipped node where the subclip changes
-    public @Test void testSwappingSubClipOnClippingRectangle() {
+    @Test
+    public void testSwappingSubClipOnClippingRectangle() {
         // clip's bounds should be 20, 20, 50, 50
         Rectangle clip = new Rectangle(10, 10, 100, 100);
         Rectangle clipClip = new Rectangle(20, 20, 50, 50);
@@ -103,7 +107,8 @@ public class ClipBoundsTest {
     }
 
     // test clipping with a node with a complex clip yields the correct bounds
-    public @Test void testClippingWithComplexClippedRectangle() {
+    @Test
+    public void testClippingWithComplexClippedRectangle() {
         // clip's bounds should be 20, 20, 50, 50
         Rectangle clip = new Rectangle(10, 10, 100, 100);
         Polygon polyClip = new Polygon(new double[] {
@@ -121,7 +126,8 @@ public class ClipBoundsTest {
     // test clipping with text results in the right bounds
 
     // test changing the clips bounds also changes the bounds of the clip parent
-    public @Test void testChangingClipBounds() {
+    @Test
+    public void testChangingClipBounds() {
         Rectangle clip = new Rectangle(50, 50);
         Rectangle rect = new Rectangle(100, 100);
         rect.setClip(clip);
@@ -136,7 +142,8 @@ public class ClipBoundsTest {
     }
 
     // test setting a clip changes the bounds
-    public @Test void testSettingClip() {
+    @Test
+    public void testSettingClip() {
         Rectangle rect = new Rectangle(100, 100);
 
         assertEquals(box(0, 0, 100, 100), rect.getBoundsInLocal());
@@ -149,7 +156,8 @@ public class ClipBoundsTest {
     }
 
     // test swapping clips changes the bounds
-    public @Test void testSwappingClip() {
+    @Test
+    public void testSwappingClip() {
         Rectangle clip = new Rectangle(50, 50);
         Rectangle rect = new Rectangle(100, 100);
         rect.setClip(clip);
@@ -163,7 +171,8 @@ public class ClipBoundsTest {
     }
 
     // test removing the clip changes the bounds
-    public @Test void testRemovingClip() {
+    @Test
+    public void testRemovingClip() {
         Rectangle clip = new Rectangle(50, 50);
         Rectangle rect = new Rectangle(100, 100);
         rect.setClip(clip);
@@ -176,7 +185,8 @@ public class ClipBoundsTest {
     }
 
     // test setting the clip and changing the geom of the Node give right bounds
-    public @Test void testClippingAndChangingGeometry() {
+    @Test
+    public void testClippingAndChangingGeometry() {
         Rectangle clip = new Rectangle(50, 50);
         Rectangle rect = new Rectangle(100, 100);
         rect.setClip(clip);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/bounds/EffectBoundsTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/bounds/EffectBoundsTest.java
index 0ec475ae350..b490f389212 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/bounds/EffectBoundsTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/bounds/EffectBoundsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,19 +26,20 @@
 package test.javafx.scene.bounds;
 
 import static test.com.sun.javafx.test.TestHelper.box;
-import static org.junit.Assert.assertEquals;
 import javafx.scene.effect.DropShadow;
 import javafx.scene.effect.Glow;
 import javafx.scene.effect.Reflection;
 import javafx.scene.shape.Rectangle;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 
 public class EffectBoundsTest {
 
     // test setting an effect on a Node alters the bounds
-    public @Test void testBoundsOnRectangleWithShadow() {
+    @Test
+    public void testBoundsOnRectangleWithShadow() {
         Rectangle rect = new Rectangle(100, 100);
         DropShadow ds = new DropShadow();
         ds.setRadius(2);
@@ -49,7 +50,8 @@ public class EffectBoundsTest {
     }
 
     // test setting an effect on a Node and removing the effect is right bounds
-    public @Test void testBoundsOnRectangleWithShadowRemoved() {
+    @Test
+    public void testBoundsOnRectangleWithShadowRemoved() {
         Rectangle rect = new Rectangle(100, 100);
         DropShadow ds = new DropShadow();
         ds.setRadius(2);
@@ -65,7 +67,8 @@ public class EffectBoundsTest {
 
     // test setting an effect on a Node and changing the effect params
     //   (which causes the effect bounds to change) will update the bounds
-    public @Test void testBoundsOnRectangleWithShadowChanged() {
+    @Test
+    public void testBoundsOnRectangleWithShadowChanged() {
         Rectangle rect = new Rectangle(100, 100);
         DropShadow ds = new DropShadow();
         ds.setRadius(2);
@@ -81,7 +84,8 @@ public class EffectBoundsTest {
 
     // test setting chained effects on a Node and changing the effect params
     //   (which causes the effect bounds to change) will update the bounds
-    public @Test void testBoundsOnRectangleWithShadowAndGlowChanged() {
+    @Test
+    public void testBoundsOnRectangleWithShadowAndGlowChanged() {
         Rectangle rect = new Rectangle(100, 100);
         DropShadow ds = new DropShadow();
         ds.setRadius(2);
@@ -98,7 +102,8 @@ public class EffectBoundsTest {
     }
 
     // test setting an effect on a Node and a Clip works as expected
-    public @Test void testBoundsOnRectangleWithShadowAndClip() {
+    @Test
+    public void testBoundsOnRectangleWithShadowAndClip() {
         Rectangle rect = new Rectangle(100, 100);
         DropShadow ds = new DropShadow();
         ds.setRadius(2);
@@ -110,7 +115,8 @@ public class EffectBoundsTest {
     }
 
     // test setting an effect on a Node alters the bounds
-    public @Test void testBoundsOnRectangleWithShadowAndReflection() {
+    @Test
+    public void testBoundsOnRectangleWithShadowAndReflection() {
         Rectangle rect = new Rectangle(100, 100);
         DropShadow ds = new DropShadow();
         ds.setRadius(2);
@@ -125,7 +131,8 @@ public class EffectBoundsTest {
     // test setting an effect on two Nodes and changing the effect params
     //   (which causes the effect bounds to change) will update the bounds
     // of both nodes
-    public @Test void testBoundsOnRectanglesWithShadowChanged() {
+    @Test
+    public void testBoundsOnRectanglesWithShadowChanged() {
         Rectangle rect1 = new Rectangle(100, 100);
         Rectangle rect2 = new Rectangle(100, 100);
         DropShadow ds = new DropShadow();
@@ -148,7 +155,8 @@ public class EffectBoundsTest {
     // test setting two effects on two Nodes and changing the effect params
     //   (which causes the effect bounds to change) will update the bounds
     // of both nodes
-    public @Test void testBoundsOnRectanglesWithShadowAndGlowChanged() {
+    @Test
+    public void testBoundsOnRectanglesWithShadowAndGlowChanged() {
         Rectangle rect1 = new Rectangle(100, 100);
         Rectangle rect2 = new Rectangle(100, 100);
         DropShadow ds = new DropShadow();
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/bounds/GroupBoundsTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/bounds/GroupBoundsTest.java
index 094ea474103..37f88d0a6c1 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/bounds/GroupBoundsTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/bounds/GroupBoundsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
 import static test.com.sun.javafx.test.TestHelper.assertGroupBounds;
 import static test.com.sun.javafx.test.TestHelper.box;
 import static test.com.sun.javafx.test.TestHelper.formatBounds;
-import static junit.framework.Assert.assertEquals;
 
 import java.util.LinkedList;
 
@@ -38,7 +37,8 @@
 import javafx.scene.Group;
 import javafx.scene.shape.Rectangle;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class GroupBoundsTest {
 
@@ -48,14 +48,14 @@ public class GroupBoundsTest {
      **************************************************************************/
 
     // test that an empty group has empty bounds
-    public @Test
-    void testGroupBounds_Empty() {
+    @Test
+    public void testGroupBounds_Empty() {
         assertGroupBounds(new Group());
     }
 
     // test that adding a node to a group updates the Groups bounds
-    public @Test
-    void testGroupBounds_AddRect() {
+    @Test
+    public void testGroupBounds_AddRect() {
         Group g = new Group();
         assertGroupBounds(g);
 
@@ -67,8 +67,8 @@ void testGroupBounds_AddRect() {
     }
 
     // test that changing a node in a group updates the groups bounds
-    public @Test
-    void testGroupBounds_ChangeRect() {
+    @Test
+    public void testGroupBounds_ChangeRect() {
         Rectangle r1 = new Rectangle(20, 20, 50, 50);
         Rectangle r2 = new Rectangle(90, 20, 50, 50);
         Group g = new Group(r1, r2);
@@ -82,8 +82,8 @@ void testGroupBounds_ChangeRect() {
     }
 
     // test that removing a node from the group updates the Groups bounds
-    public @Test
-    void testGroupBounds_RemoveRect() {
+    @Test
+    public void testGroupBounds_RemoveRect() {
         Rectangle r1 = new Rectangle(20, 20, 50, 50);
         Rectangle r2 = new Rectangle(90, 20, 50, 50);
         Group g = new Group(r1, r2);
@@ -96,8 +96,8 @@ void testGroupBounds_RemoveRect() {
         assertGroupBounds(g);
     }
 
-    public @Test
-    void testGroupBounds_RemoveAllChildNodesAndAddOneBack() {
+    @Test
+    public void testGroupBounds_RemoveAllChildNodesAndAddOneBack() {
         Rectangle r1 = new Rectangle(20, 20, 50, 50);
         Rectangle r2 = new Rectangle(90, 20, 50, 50);
         Group g = new Group(r1, r2);
@@ -111,8 +111,8 @@ void testGroupBounds_RemoveAllChildNodesAndAddOneBack() {
 
     // test that adding the first node to a Group, which node is an invisible
     // node, gets the right answer for the Group's bounds.
-    public @Test
-    void testGroupBounds_InitialNodeInvisible() {
+    @Test
+    public void testGroupBounds_InitialNodeInvisible() {
         Rectangle r1 = new Rectangle(20, 20, 50, 50);
         r1.setVisible(false);
         Group g = new Group(r1);
@@ -121,8 +121,8 @@ void testGroupBounds_InitialNodeInvisible() {
     }
 
     // test that adding invisible nodes to a group doesn't update the bounds
-    public @Test
-    void testGroupBounds_InvisibleNodes() {
+    @Test
+    public void testGroupBounds_InvisibleNodes() {
         Rectangle r1 = new Rectangle(20, 20, 50, 50);
         Rectangle r2 = new Rectangle(90, 20, 50, 50);
         Group g = new Group(r1, r2);
@@ -135,8 +135,8 @@ void testGroupBounds_InvisibleNodes() {
     }
 
     // test that adding zero sized nodes does update a Groups bounds
-    public @Test
-    void testGroupBounds_ZeroSizedNodes() {
+    @Test
+    public void testGroupBounds_ZeroSizedNodes() {
         Rectangle r1 = new Rectangle(20, 20, 50, 50);
         Rectangle r2 = new Rectangle(90, 20, 50, 50);
         Group g = new Group(r1, r2);
@@ -148,8 +148,8 @@ void testGroupBounds_ZeroSizedNodes() {
     }
 
     // test that making a node invisible updates the groups bounds
-    public @Test
-    void testGroupBounds_NodeMadeInvisible() {
+    @Test
+    public void testGroupBounds_NodeMadeInvisible() {
         Rectangle r1 = new Rectangle(20, 20, 50, 50);
         Rectangle r2 = new Rectangle(90, 20, 50, 50);
         Group g = new Group(r1, r2);
@@ -159,8 +159,8 @@ void testGroupBounds_NodeMadeInvisible() {
         assertGroupBounds(g);
     }
 
-    public @Test
-    void testGroupBounds_NodeWithNoWidthMadeInvisible() {
+    @Test
+    public void testGroupBounds_NodeWithNoWidthMadeInvisible() {
         Rectangle r1 = new Rectangle(20, 20, 50, 50);
         Rectangle r2 = new Rectangle(90, 20, 0, 50);
         Group g = new Group(r1, r2);
@@ -170,16 +170,16 @@ void testGroupBounds_NodeWithNoWidthMadeInvisible() {
         assertGroupBounds(g);
     }
 
-    public @Test
-    void testGroupBounds_FirstNodeHasNoWidthSecondNodeDoes() {
+    @Test
+    public void testGroupBounds_FirstNodeHasNoWidthSecondNodeDoes() {
         Rectangle r1 = new Rectangle(20, 20, 0, 50);
         Rectangle r2 = new Rectangle(90, 20, 50, 50);
         Group g = new Group(r1, r2);
         assertGroupBounds(g);
     }
 
-    public @Test
-    void testGroupBounds_FirstNodeHasNoWidthSecondNodeDoes_Added() {
+    @Test
+    public void testGroupBounds_FirstNodeHasNoWidthSecondNodeDoes_Added() {
         Rectangle r1 = new Rectangle(20, 20, 0, 50);
         Rectangle r2 = new Rectangle(90, 20, 50, 50);
         Group g = new Group();
@@ -190,8 +190,8 @@ void testGroupBounds_FirstNodeHasNoWidthSecondNodeDoes_Added() {
         assertGroupBounds(g);
     }
 
-    public @Test
-    void testGroupBounds_FirstNodeHasNoWidthSecondNodeDoes_ClearedThenAdded() {
+    @Test
+    public void testGroupBounds_FirstNodeHasNoWidthSecondNodeDoes_ClearedThenAdded() {
         Rectangle r1 = new Rectangle(20, 20, 0, 50);
         Rectangle r2 = new Rectangle(90, 20, 50, 50);
         Rectangle r3 = new Rectangle(10, 15, 75, 20);
@@ -206,8 +206,8 @@ void testGroupBounds_FirstNodeHasNoWidthSecondNodeDoes_ClearedThenAdded() {
     // this test uncovered a bug when using the GroupBoundsHelper. It needs
     // two invisible nodes to tickle it You also have to ask assert the bounds
     // after each change or it may not fail
-    public @Test
-    void testGroupBounds_TwoNodesMadeInvisible_ThenNodeAdded() {
+    @Test
+    public void testGroupBounds_TwoNodesMadeInvisible_ThenNodeAdded() {
         Rectangle r1 = new Rectangle(20, 20, 50, 50);
         Rectangle r2 = new Rectangle(90, 20, 50, 50);
         Rectangle r3 = new Rectangle(10, 15, 75, 20);
@@ -226,8 +226,8 @@ void testGroupBounds_TwoNodesMadeInvisible_ThenNodeAdded() {
         assertGroupBounds(g);
     }
 
-    public @Test
-    void testGroupBounds_TogglingVisiblityToFalseAndTrueWhileExpandingBounds() {
+    @Test
+    public void testGroupBounds_TogglingVisiblityToFalseAndTrueWhileExpandingBounds() {
         Rectangle r1 = new Rectangle(20, 20, 50, 50);
         Rectangle r2 = new Rectangle(90, 20, 50, 50);
         Rectangle r3 = new Rectangle(10, 15, 75, 20);
@@ -264,8 +264,8 @@ private Group createGroupWithRects() {
 
     // Started out as a simple test and now pretty well covers all the use
     // cases. Oops. Bad Richard.
-    public @Test
-    void testMovingNodesTowardCenterOfGroupAndOther() {
+    @Test
+    public void testMovingNodesTowardCenterOfGroupAndOther() {
         Group group = createGroupWithRects();
 
         // move the 1, 3, 5, 7 nodes in towards the center. Doing so should not
@@ -314,8 +314,8 @@ void testMovingNodesTowardCenterOfGroupAndOther() {
         assertEquals(box(300, 300, 50, 50), group.getBoundsInLocal());
     }
 
-    public @Test
-    void testMovingNodesAwayFromCenterOfGroup() {
+    @Test
+    public void testMovingNodesAwayFromCenterOfGroup() {
         Group group = createGroupWithRects();
 
         ((Rectangle) group.getChildren().get(4)).setX(600);
@@ -323,8 +323,8 @@ void testMovingNodesAwayFromCenterOfGroup() {
         assertEquals(box(100, 100, 550, 550), group.getBoundsInLocal());
     }
 
-    public @Test
-    void testMovingNodesWithinInteriorOfGroup() {
+    @Test
+    public void testMovingNodesWithinInteriorOfGroup() {
         Group group = createGroupWithRects();
 
         ((Rectangle) group.getChildren().get(4)).setX(250);
@@ -332,8 +332,8 @@ void testMovingNodesWithinInteriorOfGroup() {
         assertEquals(box(100, 100, 250, 250), group.getBoundsInLocal());
     }
 
-    public @Test
-    void testMovingExteriorNodesOnExterior() {
+    @Test
+    public void testMovingExteriorNodesOnExterior() {
         Group group = createGroupWithRects();
 
         ((Rectangle) group.getChildren().get(0)).setY(150);
@@ -348,16 +348,16 @@ void testMovingExteriorNodesOnExterior() {
         assertEquals(box(100, 100, 250, 250), group.getBoundsInLocal());
     }
 
-    public @Test
-    void testRemovingInteriorNodes() {
+    @Test
+    public void testRemovingInteriorNodes() {
         Group group = createGroupWithRects();
 
         group.getChildren().remove(4);
         assertEquals(box(100, 100, 250, 250), group.getBoundsInLocal());
     }
 
-    public @Test
-    void testRemovingExteriorNodes() {
+    @Test
+    public void testRemovingExteriorNodes() {
         Group group = createGroupWithRects();
 
         group.getChildren().remove(7);
@@ -384,8 +384,8 @@ void testRemovingExteriorNodes() {
     // rectangles to the Group, and check the groups bounds at each stage.
     // Also randomly make some invisible, some visible, remove some, toggle
     // visibility, and so forth.
-    public @Test
-    void testGroupBounds_Stress() {
+    @Test
+    public void testGroupBounds_Stress() {
         boolean fullTest = Boolean.getBoolean("test.everything");
         if (fullTest) {
             Group g = new Group();
@@ -470,8 +470,8 @@ void testGroupBounds_Stress() {
     }
 
     // here is a special test for getPivotX and getPivotY
-    @Test
-    public void testPivotXAndPivotY() {
+ @Test
+ public void testPivotXAndPivotY() {
         Rectangle rect = new Rectangle(100, 100);
         assertEquals(50.0f, (float) NodeHelper.getPivotX(rect));
         assertEquals(50.0f, (float) NodeHelper.getPivotY(rect));
@@ -491,8 +491,8 @@ public void testPivotXAndPivotY() {
      * case. * *
      **************************************************************************/
 
-    public @Test
-    void testBoundsForGroup() {
+    @Test
+    public void testBoundsForGroup() {
         Rectangle r1 = new Rectangle(20, 20, 50, 50);
         Rectangle r2 = new Rectangle(90, 20, 50, 50);
         Group group = new Group(r1, r2);
@@ -505,8 +505,8 @@ void testBoundsForGroup() {
     /**
      * Just a basic test to make sure basic group node bounds calculation works
      */
-    public @Test
-    void testBoundsForGroup_childGeomChanging() {
+    @Test
+    public void testBoundsForGroup_childGeomChanging() {
         Rectangle rect = new Rectangle();
         rect.setId("rect");
         Rectangle square = new Rectangle();
@@ -537,8 +537,8 @@ void testBoundsForGroup_childGeomChanging() {
         assertBoundsEqual(box(25, 25, 125, 55), group.getBoundsInLocal());
     }
 
-    public @Test
-    void testBoundsInParentOfGroup() {
+    @Test
+    public void testBoundsInParentOfGroup() {
         Rectangle rect = new Rectangle(50, 50, 100, 30);
         rect.setId("rect");
         Group group = new Group(rect);
@@ -554,8 +554,8 @@ void testBoundsInParentOfGroup() {
      * bounds change, and then I ask for the new bounds, that the bounds are
      * valid.
      */
-    public @Test
-    void testRequestingBoundsOnGroupWithNoListenersWorks() {
+    @Test
+    public void testRequestingBoundsOnGroupWithNoListenersWorks() {
         Group group = new Group(new Rectangle(50, 50, 100, 30));
 
         assertBoundsEqual(box(50, 50, 100, 30), group.getBoundsInLocal());
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/bounds/LayoutBoundsTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/bounds/LayoutBoundsTest.java
index e7dd42321d0..fd25cb9d978 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/bounds/LayoutBoundsTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/bounds/LayoutBoundsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,19 +33,19 @@
 import javafx.scene.transform.Scale;
 import javafx.scene.transform.Translate;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class LayoutBoundsTest {
 
-    public @Test
-    void testLayoutBoundsForLeafNode() {
+    @Test
+    public void testLayoutBoundsForLeafNode() {
         Rectangle rect = new Rectangle(10, 10, 100, 100);
 
         assertBoundsEqual(box(10, 10, 100, 100), rect.getLayoutBounds());
     }
 
-    public @Test
-    void testLayoutBoundsUpdatedForLeafNode() {
+    @Test
+    public void testLayoutBoundsUpdatedForLeafNode() {
         Rectangle rect = new Rectangle(10, 10, 100, 100);
 
         rect.setWidth(200);
@@ -55,8 +55,8 @@ void testLayoutBoundsUpdatedForLeafNode() {
         assertBoundsEqual(box(20, 10, 200, 100), rect.getLayoutBounds());
     }
 
-    public @Test
-    void testEffectNotIncludedInLayoutBounds() {
+    @Test
+    public void testEffectNotIncludedInLayoutBounds() {
         Rectangle rect = new Rectangle(10, 10, 100, 100);
         DropShadow ds = new DropShadow();
         ds.setOffsetY(5);
@@ -66,16 +66,16 @@ void testEffectNotIncludedInLayoutBounds() {
         assertBoundsEqual(box(10, 10, 100, 100), rect.getLayoutBounds());
     }
 
-    public @Test
-    void testClipNotIncludedInLayoutBounds() {
+    @Test
+    public void testClipNotIncludedInLayoutBounds() {
         Rectangle rect = new Rectangle(10, 10, 100, 100);
         rect.setClip(new Rectangle(25, 25, 25, 25));
 
         assertBoundsEqual(box(10, 10, 100, 100), rect.getLayoutBounds());
     }
 
-    public @Test
-    void testTransformsNotIncludedInLayoutBounds() {
+    @Test
+    public void testTransformsNotIncludedInLayoutBounds() {
         Rectangle rect = new Rectangle(10, 10, 100, 100);
         rect.getTransforms().add(new Scale(2, 15));
         rect.getTransforms().add(new Translate(20, 30));
@@ -91,8 +91,8 @@ void testTransformsNotIncludedInLayoutBounds() {
         assertBoundsEqual(box(10, 10, 100, 100), rect.getLayoutBounds());
     }
 
-    public @Test
-    void testLayoutBoundsForGroup() {
+    @Test
+    public void testLayoutBoundsForGroup() {
         Group group = new Group(new Rectangle(10, 10, 100, 100), new Rectangle(
                 110, 10, 200, 100));
         assertBoundsEqual(box(10, 10, 300, 100), group.getLayoutBounds());
@@ -104,8 +104,8 @@ void testLayoutBoundsForGroup() {
         assertBoundsEqual(box(50, 10, 260, 200), group.getLayoutBounds());
     }
 
-    public @Test
-    void testEffectOnLayoutBoundsForGroup() {
+    @Test
+    public void testEffectOnLayoutBoundsForGroup() {
         Rectangle r1 = new Rectangle(10, 10, 100, 100);
         DropShadow ds1 = new DropShadow();
         ds1.setOffsetX(5);
@@ -123,8 +123,8 @@ void testEffectOnLayoutBoundsForGroup() {
         assertBoundsEqual(box(6, 6, 304, 118), group.getLayoutBounds());
     }
 
-    public @Test
-    void testClipOnLayoutBoundsForGroup() {
+    @Test
+    public void testClipOnLayoutBoundsForGroup() {
         Rectangle r1 = new Rectangle(10, 10, 100, 100);
         r1.setClip(new Rectangle(60, 60, 50, 100));
         Group group = new Group(r1, new Rectangle(110, 10, 200, 100));
@@ -136,8 +136,8 @@ void testClipOnLayoutBoundsForGroup() {
         assertBoundsEqual(box(60, 10, 250, 100), group.getLayoutBounds());
     }
 
-    public @Test
-    void testTransformsOnLayoutBoundsForGroup() {
+    @Test
+    public void testTransformsOnLayoutBoundsForGroup() {
         Rectangle r1 = new Rectangle(10, 10, 100, 100);
         r1.getTransforms().add(new Scale(2, 2));
         Group group = new Group(r1, new Rectangle(120, 20, 200, 100));
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/bounds/NodeBoundsTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/bounds/NodeBoundsTest.java
index 80ce62caf05..46cd416cdff 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/bounds/NodeBoundsTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/bounds/NodeBoundsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,25 +30,25 @@
 import static test.com.sun.javafx.test.TestHelper.box;
 import javafx.scene.shape.Rectangle;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class NodeBoundsTest {
 
-    public @Test
-    void testBoundsForLeafNode() {
+    @Test
+    public void testBoundsForLeafNode() {
         Rectangle rect = new Rectangle(10, 10, 50, 50);
         assertSimilar(box(10, 10, 50, 50), rect.getBoundsInLocal());
     }
 
-    public @Test
-    void testBounds3DForLeafNode() {
+    @Test
+    public void testBounds3DForLeafNode() {
         Rectangle rect = new Rectangle(10, 10, 50, 50);
         rect.setTranslateZ(30);
         assertSimilar(box(10, 10, 30, 50, 50, 30), rect.getBoundsInLocal());
     }
 
-    public @Test
-    void testBoundsForInvisibleLeafNode() {
+    @Test
+    public void testBoundsForInvisibleLeafNode() {
         Rectangle rect = new Rectangle(10, 10, 50, 50);
         rect.setVisible(false);
 
@@ -64,8 +64,8 @@ void testBoundsForInvisibleLeafNode() {
         assertBoundsEqual(rect.getBoundsInLocal(), rect.getBoundsInParent());
     }
 
-    public @Test
-    void testBoundsForLeafNodeUpdatesWhenGeomChanges() {
+    @Test
+    public void testBoundsForLeafNodeUpdatesWhenGeomChanges() {
         Rectangle rect = new Rectangle();
 
         assertBoundsEqual(box(0, 0, 0, 0), rect.getBoundsInLocal());
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/bounds/Transformed3DBoundsTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/bounds/Transformed3DBoundsTest.java
index 7a0a64989cb..8602cbf6423 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/bounds/Transformed3DBoundsTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/bounds/Transformed3DBoundsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,12 +27,12 @@
 
 import static test.com.sun.javafx.test.TestHelper.assertSimilar;
 import static test.com.sun.javafx.test.TestHelper.box;
-import static org.junit.Assert.assertEquals;
 import javafx.geometry.BoundingBox;
 import javafx.scene.shape.Rectangle;
 import javafx.scene.transform.Rotate;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class Transformed3DBoundsTest {
 
@@ -42,8 +42,8 @@ public class Transformed3DBoundsTest {
      * getBoundsInLocal() values * for these nodes are correct. * * /
      **************************************************************************/
 
-    public @Test
-    void test3DBoundsForTranslatedRectangle() {
+    @Test
+    public void test3DBoundsForTranslatedRectangle() {
         Rectangle rect = new Rectangle(100, 100);
         rect.setTranslateX(10);
         rect.setTranslateY(10);
@@ -68,8 +68,8 @@ void test3DBoundsForTranslatedRectangle() {
 
     // this test specifically checks to make sure the minX,, width, height
     // invariants are correct in this case
-    public @Test
-    void test3DBoundsForNegativeScaledRectangle() {
+    @Test
+    public void test3DBoundsForNegativeScaledRectangle() {
         Rectangle rect = new Rectangle(100, 100);
         rect.setScaleX(2);
         rect.setScaleY(2);
@@ -90,8 +90,8 @@ void test3DBoundsForNegativeScaledRectangle() {
                               rect.localToScene(rect.getBoundsInLocal())));
     }
 
-    public @Test
-    void testBoundsForXRotatedRectangle() {
+    @Test
+    public void testBoundsForXRotatedRectangle() {
         Rectangle rect = new Rectangle(100, 100);
         rect.setRotate(90);
         rect.setRotationAxis(Rotate.X_AXIS);
@@ -111,8 +111,8 @@ void testBoundsForXRotatedRectangle() {
                               rect.localToScene(rect.getBoundsInLocal())));
     }
 
-    public @Test
-    void testBoundsForYRotatedRectangle() {
+    @Test
+    public void testBoundsForYRotatedRectangle() {
         Rectangle rect = new Rectangle(100, 100);
         rect.setRotate(90);
         rect.setRotationAxis(Rotate.Y_AXIS);
@@ -132,8 +132,8 @@ void testBoundsForYRotatedRectangle() {
                               rect.localToScene(rect.getBoundsInLocal())));
     }
 
-    public @Test
-    void testBoundsForZRotatedRectangle() {
+    @Test
+    public void testBoundsForZRotatedRectangle() {
         Rectangle rect = new Rectangle(100, 100);
         rect.setRotate(90);
         rect.setRotationAxis(Rotate.Z_AXIS);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/bounds/TransformedBoundsTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/bounds/TransformedBoundsTest.java
index ef7c5096474..78b89f49138 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/bounds/TransformedBoundsTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/bounds/TransformedBoundsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
 import static test.com.sun.javafx.test.TestHelper.assertBoundsEqual;
 import static test.com.sun.javafx.test.TestHelper.assertSimilar;
 import static test.com.sun.javafx.test.TestHelper.box;
-import static org.junit.Assert.assertEquals;
 import javafx.geometry.BoundingBox;
 import javafx.scene.Group;
 import javafx.scene.shape.Rectangle;
@@ -36,7 +35,8 @@
 import javafx.scene.transform.Scale;
 import javafx.scene.transform.Translate;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class TransformedBoundsTest {
 
@@ -46,8 +46,8 @@ public class TransformedBoundsTest {
      * getBoundsInLocal() values * for these nodes are correct. * * /
      **************************************************************************/
 
-    public @Test
-    void testBoundsForTranslatedRectangle() {
+    @Test
+    public void testBoundsForTranslatedRectangle() {
         Rectangle rect = new Rectangle(100, 100);
         rect.setTranslateX(10);
         rect.setTranslateY(10);
@@ -59,8 +59,8 @@ void testBoundsForTranslatedRectangle() {
 
     // this test specifically checks to make sure the minX,, width, height
     // invariants are correct in this case
-    public @Test
-    void testBoundsForNegativeScaledRectangle() {
+    @Test
+    public void testBoundsForNegativeScaledRectangle() {
         Rectangle rect = new Rectangle(100, 100);
         rect.setScaleX(-1);
         rect.setScaleY(-1);
@@ -70,8 +70,8 @@ void testBoundsForNegativeScaledRectangle() {
         assertEquals(rect.getBoundsInLocal(), rect.getLayoutBounds());
     }
 
-    public @Test
-    void testBoundsForRotatedRectangle() {
+    @Test
+    public void testBoundsForRotatedRectangle() {
         Rectangle rect = new Rectangle(100, 100);
         rect.setRotate(45);
 
@@ -81,8 +81,8 @@ void testBoundsForRotatedRectangle() {
         assertEquals(rect.getBoundsInLocal(), rect.getLayoutBounds());
     }
 
-    public @Test
-    void testBoundsForRotatedGroupOfRectangles() {
+    @Test
+    public void testBoundsForRotatedGroupOfRectangles() {
         Group group = new Group(new Rectangle(100, 100), new Rectangle(2, 2,
                 96, 96));
         group.setRotate(45);
@@ -93,8 +93,8 @@ void testBoundsForRotatedGroupOfRectangles() {
         assertEquals(group.getBoundsInLocal(), group.getLayoutBounds());
     }
 
-    public @Test
-    void testBoundsForRotatedRectangleUsingTransforms() {
+    @Test
+    public void testBoundsForRotatedRectangleUsingTransforms() {
         Rectangle rect = new Rectangle(100, 100);
         rect.getTransforms().add(new Rotate(45)); // rotates about 0, 0 rather
                                                   // than the center!
@@ -104,8 +104,8 @@ void testBoundsForRotatedRectangleUsingTransforms() {
         assertEquals(rect.getBoundsInLocal(), rect.getLayoutBounds());
     }
 
-    public @Test
-    void testBoundsForTransformedRectangleInTransformedGroup() {
+    @Test
+    public void testBoundsForTransformedRectangleInTransformedGroup() {
         Rectangle rect = new Rectangle(100, 100);
         rect.setTranslateX(100);
         Group group = new Group(rect);
@@ -119,8 +119,8 @@ void testBoundsForTransformedRectangleInTransformedGroup() {
         assertEquals(rect.getBoundsInParent(), group.getLayoutBounds());
     }
 
-    public @Test
-    void testUnTransformedBounds() {
+    @Test
+    public void testUnTransformedBounds() {
         Rectangle rect = new Rectangle(3, 7, 17, 19);
         BoundingBox bb = box(3, 7, 17, 19);
 
@@ -131,8 +131,8 @@ void testUnTransformedBounds() {
         assertSimilar(bb, rect.sceneToLocal(rect.getBoundsInLocal()));
     }
 
-    public @Test
-    void testTranslateTxBounds() {
+    @Test
+    public void testTranslateTxBounds() {
         Rectangle rect = new Rectangle(3, 7, 17, 19);
         rect.getTransforms().add(new Translate(20, 30));
         BoundingBox tbb = box(23, 37, 17, 19);
@@ -143,8 +143,8 @@ void testTranslateTxBounds() {
         assertSimilar(tbb, rect.localToScene(rect.getBoundsInLocal()));
     }
 
-    public @Test
-    void testTranslatedBounds() {
+    @Test
+    public void testTranslatedBounds() {
         Rectangle rect = new Rectangle(3, 7, 17, 19);
         rect.setTranslateX(20);
         rect.setTranslateY(30);
@@ -161,8 +161,8 @@ void testTranslatedBounds() {
                 rect.sceneToLocal(rect.localToScene(rect.getBoundsInLocal())));
     }
 
-    public @Test
-    void testScaleTxBounds() {
+    @Test
+    public void testScaleTxBounds() {
         Rectangle rect = new Rectangle(3, 7, 17, 19);
         rect.getTransforms().add(new Scale(2, 3));
 
@@ -179,8 +179,8 @@ void testScaleTxBounds() {
                 rect.sceneToLocal(rect.localToScene(rect.getBoundsInLocal())));
     }
 
-    public @Test
-    void testScaledBounds() {
+    @Test
+    public void testScaledBounds() {
         Rectangle rect = new Rectangle(3, 7, 17, 19);
         rect.setScaleX(2);
         rect.setScaleY(3);
@@ -198,8 +198,8 @@ void testScaledBounds() {
                 rect.sceneToLocal(rect.localToScene(rect.getBoundsInLocal())));
     }
 
-    public @Test
-    void testRotateTx11Bounds() {
+    @Test
+    public void testRotateTx11Bounds() {
         Rectangle rect = new Rectangle(3, 7, 17, 19);
         BoundingBox bb = box(3, 7, 17, 19);
         rect.getTransforms().add(new Rotate(11));
@@ -212,8 +212,8 @@ void testRotateTx11Bounds() {
         assertSimilar(tbb, rect.localToScene(rect.getBoundsInLocal()));
     }
 
-    public @Test
-    void testRotateTx90Bounds() {
+    @Test
+    public void testRotateTx90Bounds() {
         Rectangle rect = new Rectangle(3, 7, 17, 19);
         BoundingBox bb = box(3, 7, 17, 19);
         rect.getTransforms().add(new Rotate(90));
@@ -226,8 +226,8 @@ void testRotateTx90Bounds() {
         assertSimilar(tbb, rect.localToScene(rect.getBoundsInLocal()));
     }
 
-    public @Test
-    void testRotated90Bounds() {
+    @Test
+    public void testRotated90Bounds() {
         Rectangle rect = new Rectangle(3, 7, 17, 19);
         BoundingBox bb = box(3, 7, 17, 19);
         rect.setRotate(90);
@@ -241,8 +241,8 @@ void testRotated90Bounds() {
         assertSimilar(tbb, rect.localToScene(rect.getBoundsInLocal()));
     }
 
-    public @Test
-    void testRotated120Bounds() {
+    @Test
+    public void testRotated120Bounds() {
         Rectangle rect = new Rectangle(3, 7, 17, 19);
         BoundingBox bb = box(3, 7, 17, 19);
         rect.setRotate(120);
@@ -255,8 +255,8 @@ void testRotated120Bounds() {
         assertSimilar(tbb, rect.localToScene(rect.getBoundsInLocal()));
     }
 
-    public @Test
-    void testNotificationOnBoundsChangeForLeafNode() {
+    @Test
+    public void testNotificationOnBoundsChangeForLeafNode() {
         Rectangle rect = new Rectangle();
 
         rect.setX(50);
@@ -268,7 +268,7 @@ void testNotificationOnBoundsChangeForLeafNode() {
         assertBoundsEqual(box(50, 50, 100, 30), rect.getBoundsInLocal());
     }
 
-    @Test
+@Test
     public void testNotificationOnBoundsChangeForTransformedLeafNode() {
         final Rectangle rect = new Rectangle(-50, -50, 100, 100);
         rect.getTransforms().add(new Rotate(-45));
@@ -293,8 +293,8 @@ public void testNotificationOnBoundsChangeForTransformedLeafNode() {
                 rect.getBoundsInParent());
     }
 
-    public @Test
-    void testBoundsWithTransform() {
+    @Test
+    public void testBoundsWithTransform() {
         Rectangle rect = new Rectangle();
         rect.setScaleX(0.5f);
         rect.setScaleY(0.5f);
@@ -311,8 +311,8 @@ void testBoundsWithTransform() {
         assertBoundsEqual(box(75, 57.5, 50, 15), rect.getBoundsInParent());
     }
 
-    public @Test
-    void testNotificationOnBoundsChangeForTransforms() {
+    @Test
+    public void testNotificationOnBoundsChangeForTransforms() {
         Rectangle rect = new Rectangle();
         rect.setScaleX(0.5f);
         rect.setScaleY(0.5f);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/canvas/CanvasTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/canvas/CanvasTest.java
index 9da2ce26128..f942f8a6595 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/canvas/CanvasTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/canvas/CanvasTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,33 +42,35 @@
 import javafx.scene.transform.Affine;
 import javafx.scene.transform.Rotate;
 import javafx.scene.transform.Transform;
-import org.junit.Before;
-import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 public class CanvasTest {
 
     private Canvas canvas;
     private GraphicsContext gc;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         canvas = new Canvas();
         gc = canvas.getGraphicsContext2D();
     }
 
-    @Test public void testPropertyPropagation_visible() throws Exception {
+    @Test
+    public void testPropertyPropagation_visible() throws Exception {
         NodeTest.testBooleanPropertyPropagation(canvas, "visible", false, true);
     }
 
     //maybe test doing stuff from different threads
-    @Test public void testGetGC2() throws Exception {
+    @Test
+    public void testGetGC2() throws Exception {
         GraphicsContext gc2 = canvas.getGraphicsContext2D();
         GraphicsContext gc3 = canvas.getGraphicsContext2D();
         GraphicsContext gc4 = canvas.getGraphicsContext2D();
@@ -80,19 +82,23 @@ public void setUp() {
     }
 
     //basic tests make sure that the methods do not blow up.
-    @Test public void testGCfillRect_basic() throws Exception {
+    @Test
+    public void testGCfillRect_basic() throws Exception {
         gc.fillRect(0, 0, 1, 1);
     }
 
-    @Test public void testGCfillOval_basic() throws Exception {
+    @Test
+    public void testGCfillOval_basic() throws Exception {
         gc.fillOval(0, 0, 1, 1);
     }
 
-    @Test public void testGCfillRoundRect_basic() throws Exception {
+    @Test
+    public void testGCfillRoundRect_basic() throws Exception {
         gc.fillRoundRect(0, 0, 1, 1, 2, 2);
     }
 
-    @Test public void testGCfillText_basic() throws Exception {
+    @Test
+    public void testGCfillText_basic() throws Exception {
         gc.fillText("Test", 0, 0);
         gc.fillText("Test", 0, 0, 0);
         gc.fillText("", 0, 0, 0);
@@ -101,7 +107,8 @@ public void setUp() {
         gc.fillText(null, 0, 0, 0);
     }
 
-    @Test public void testGCfillPolygon_basic() throws Exception {
+    @Test
+    public void testGCfillPolygon_basic() throws Exception {
         double[] xPoints = {0.0,10.0};
         double[] yPoints = {0.0,10.0};
         gc.fillPolygon( xPoints, yPoints, 2);
@@ -109,32 +116,38 @@ public void setUp() {
         gc.fillPolygon( null, yPoints, 2);
     }
 
-    @Test public void testGCfillArc_basic() throws Exception {
+    @Test
+    public void testGCfillArc_basic() throws Exception {
         gc.fillArc(10, 10, 100, 100, 0, 40, ArcType.OPEN);
         gc.fillArc(10, 10, 100, 100, 0, 360, ArcType.CHORD);
         gc.fillArc(10, 10, 100, 100, 0, 361, ArcType.ROUND);
         gc.fillArc(10, 10, 100, 100, 0, 361, null);
     }
 
-    @Test public void testGCdrawRect_basic() throws Exception {
+    @Test
+    public void testGCdrawRect_basic() throws Exception {
         gc.rect(0, 0, 1, 1);
     }
 
-    @Test public void testGCdrawOval_basic() throws Exception {
+    @Test
+    public void testGCdrawOval_basic() throws Exception {
         gc.strokeOval(0, 0, 1, 1);
     }
 
-    @Test public void testGCdrawRoundRect_basic() throws Exception {
+    @Test
+    public void testGCdrawRoundRect_basic() throws Exception {
         gc.strokeRoundRect(0, 0, 1, 1, 2, 2);
     }
 
-    @Test public void testGCstrokeText_basic() throws Exception {
+    @Test
+    public void testGCstrokeText_basic() throws Exception {
         gc.strokeText("Test", 0, 0);
         gc.strokeText("", 0, 0);
         gc.strokeText(null, 0, 0);
     }
 
-    @Test public void testGCdrawPolygon_basic() throws Exception {
+    @Test
+    public void testGCdrawPolygon_basic() throws Exception {
         double[] xPoints = {0.0,10.0};
         double[] yPoints = {0.0,10.0};
         gc.strokePolygon( xPoints, yPoints, 2);
@@ -142,14 +155,16 @@ public void setUp() {
         gc.strokePolygon( xPoints, null, 2);
     }
 
-    @Test public void testGCdrawArc_basic() throws Exception {
+    @Test
+    public void testGCdrawArc_basic() throws Exception {
         gc.strokeArc(10, 10, 100, 100, 0, 40, ArcType.OPEN);
         gc.strokeArc(10, 10, 100, 100, 0, 360, ArcType.CHORD);
         gc.strokeArc(10, 10, 100, 100, 0, 361, ArcType.ROUND);
         gc.strokeArc(10, 10, 100, 100, 0, 361, null);
     }
 
-    @Test public void testGCfillPath_basic() throws Exception {
+    @Test
+    public void testGCfillPath_basic() throws Exception {
         gc.arcTo(0, 0, 5, 5, 5);
         gc.moveTo(50, 50);
         gc.lineTo(100, 100);
@@ -162,7 +177,8 @@ public void setUp() {
         gc.closePath();
     }
 
-    @Test public void testGCclip_basic() throws Exception {
+    @Test
+    public void testGCclip_basic() throws Exception {
         gc.beginPath();
         gc.moveTo(50, 50);
         gc.lineTo(100, 100);
@@ -172,7 +188,8 @@ public void setUp() {
         gc.clip();
     }
 
-    @Test public void testGCfillDrawPath_basic() throws Exception {
+    @Test
+    public void testGCfillDrawPath_basic() throws Exception {
         gc.beginPath();
         gc.moveTo(50, 50);
         gc.lineTo(100, 100);
@@ -183,35 +200,43 @@ public void setUp() {
         gc.fill();
     }
 
-    @Test public void testGCPath_LineTo_NoMoveto() throws Exception {
+    @Test
+    public void testGCPath_LineTo_NoMoveto() throws Exception {
         gc.lineTo(10, 10);
     }
 
-    @Test public void testGCPath_QuadraticCurveTo_NoMoveto() throws Exception {
+    @Test
+    public void testGCPath_QuadraticCurveTo_NoMoveto() throws Exception {
         gc.quadraticCurveTo(10, 10, 20, 20);
     }
 
-    @Test public void testGCPath_BezierCurveTo_NoMoveto() throws Exception {
+    @Test
+    public void testGCPath_BezierCurveTo_NoMoveto() throws Exception {
         gc.bezierCurveTo(10, 10, 20, 20, 30, 30);
     }
 
-    @Test public void testGCPath_ArcTo_NoMoveto() throws Exception {
+    @Test
+    public void testGCPath_ArcTo_NoMoveto() throws Exception {
         gc.arcTo(10, 10, 20, 20, 30);
     }
 
-    @Test public void testGCPath_Arc_NoMoveto() throws Exception {
+    @Test
+    public void testGCPath_Arc_NoMoveto() throws Exception {
         gc.arc(10, 10, 20, 20, 30, 30);
     }
 
-    @Test public void testGCPath_ClosePath_NoMoveto() throws Exception {
+    @Test
+    public void testGCPath_ClosePath_NoMoveto() throws Exception {
         gc.closePath();
     }
 
-    @Test public void testGCPath_Rect_NoMoveto() throws Exception {
+    @Test
+    public void testGCPath_Rect_NoMoveto() throws Exception {
         gc.rect(10, 10, 20, 20);
     }
 
-    @Test public void testGCState_Translate() throws Exception {
+    @Test
+    public void testGCState_Translate() throws Exception {
         gc.translate(50, 50);
         Affine result = gc.getTransform();
         Affine expected = new Affine();
@@ -222,7 +247,8 @@ public void setUp() {
         assertMatrix(result, expected);
     }
 
-    @Test public void testGCState_Scale() throws Exception {
+    @Test
+    public void testGCState_Scale() throws Exception {
         gc.scale(3, 3);
         Affine result = gc.getTransform();
         Affine expected = new Affine();
@@ -233,7 +259,8 @@ public void setUp() {
         assertMatrix(result, expected);
     }
 
-    @Test public void testGCState_Rotate() throws Exception {
+    @Test
+    public void testGCState_Rotate() throws Exception {
         gc.rotate(45.0);
         Affine result = gc.getTransform();
 
@@ -242,7 +269,8 @@ public void setUp() {
         assertMatrix(result, expected);
     }
 
-    @Test public void testGCState_getTransform() throws Exception {
+    @Test
+    public void testGCState_getTransform() throws Exception {
         Affine expected = new Affine();
         gc.setTransform(expected);
         Affine result = gc.getTransform();
@@ -257,7 +285,8 @@ public void setUp() {
         assertMatrix(result2, expected);
     }
 
-    @Test public void testGCState_FillStrokeSaveRestore() throws Exception {
+    @Test
+    public void testGCState_FillStrokeSaveRestore() throws Exception {
         Affine expected = new Affine();
         gc.setTransform(expected);
         Affine result = gc.getTransform();
@@ -281,14 +310,16 @@ public void setUp() {
         assertMatrix(result, expected);
     }
 
-    @Test public void testGCState_SetStroke() {
+    @Test
+    public void testGCState_SetStroke() {
         gc.setStroke(Color.RED);
         assertEquals(Color.RED, gc.getStroke());
         gc.setStroke(null);
         assertEquals(Color.RED, gc.getStroke());
     }
 
-    @Test public void testGCState_Fill_Null() {
+    @Test
+    public void testGCState_Fill_Null() {
         gc.setFill(Color.BLACK);
         assertEquals(Color.BLACK, gc.getFill());
         gc.setFill(Color.RED);
@@ -297,14 +328,16 @@ public void setUp() {
         assertEquals(gc.getFill(), Color.RED);
     }
 
-    @Test public void testGCState_FillRule_Null() {
+    @Test
+    public void testGCState_FillRule_Null() {
         gc.setFillRule(FillRule.EVEN_ODD);
         assertEquals(FillRule.EVEN_ODD, gc.getFillRule());
         gc.setFillRule(null);
         assertEquals(FillRule.EVEN_ODD, gc.getFillRule());
     }
 
-    @Test public void testGCState_Font_Null() {
+    @Test
+    public void testGCState_Font_Null() {
         Font f = new Font(10);
         gc.setFont(f);
         assertEquals(f, gc.getFont());
@@ -312,28 +345,32 @@ public void setUp() {
         assertEquals(f, gc.getFont());
     }
 
-    @Test public void testGCState_FontSmoothing_Null() {
+    @Test
+    public void testGCState_FontSmoothing_Null() {
         gc.setFontSmoothingType(FontSmoothingType.GRAY);
         assertEquals(FontSmoothingType.GRAY, gc.getFontSmoothingType());
         gc.setFontSmoothingType(null);
         assertEquals(FontSmoothingType.GRAY, gc.getFontSmoothingType());
     }
 
-    @Test public void testGCState_TextBaseline_Null() {
+    @Test
+    public void testGCState_TextBaseline_Null() {
         gc.setTextBaseline(VPos.BASELINE);
         assertEquals(VPos.BASELINE, gc.getTextBaseline());
         gc.setTextBaseline(null);
         assertEquals(VPos.BASELINE, gc.getTextBaseline());
     }
 
-    @Test public void testGCState_TextAlign_Null() {
+    @Test
+    public void testGCState_TextAlign_Null() {
         gc.setTextAlign(TextAlignment.JUSTIFY);
         assertEquals(TextAlignment.JUSTIFY, gc.getTextAlign());
         gc.setTextAlign(null);
         assertEquals(TextAlignment.JUSTIFY, gc.getTextAlign());
     }
 
-    @Test public void testGCState_Line() throws Exception {
+    @Test
+    public void testGCState_Line() throws Exception {
         gc.setLineCap(StrokeLineCap.BUTT);
         gc.setLineJoin(StrokeLineJoin.MITER);
         gc.setLineWidth(5);
@@ -363,7 +400,7 @@ public void setUp() {
     }
 
     @Test
-    public void testGCState_LineCapNull() throws Exception {
+        public void testGCState_LineCapNull() throws Exception {
         gc.setLineCap(StrokeLineCap.BUTT);
         gc.setLineCap(null);
         assertEquals(gc.getLineCap(), StrokeLineCap.BUTT);
@@ -376,7 +413,7 @@ public void testGCState_LineCapNull() throws Exception {
     }
 
     @Test
-    public void testGCState_LineJoinNull() throws Exception {
+        public void testGCState_LineJoinNull() throws Exception {
         gc.setLineJoin(StrokeLineJoin.BEVEL);
         gc.setLineJoin(null);
         assertEquals(gc.getLineJoin(), StrokeLineJoin.BEVEL);
@@ -389,7 +426,7 @@ public void testGCState_LineJoinNull() throws Exception {
     }
 
     @Test
-    public void testGCState_LineDashNonPositive() throws Exception {
+        public void testGCState_LineDashNonPositive() throws Exception {
         gc.setLineDashes(20, 10);
         assertArrayEquals(gc.getLineDashes(), new double[] {20, 10}, 0.00001);
         gc.setLineDashes(1, Double.NaN);
@@ -401,7 +438,7 @@ public void testGCState_LineDashNonPositive() throws Exception {
     }
 
     @Test
-    public void testGCState_LineDashNull() throws Exception {
+        public void testGCState_LineDashNull() throws Exception {
         gc.setLineDashes(10, 10);
         assertNotNull(gc.getLineDashes());
         gc.setLineDashes(null);
@@ -424,7 +461,7 @@ public void testGCState_LineDashNull() throws Exception {
     }
 
     @Test
-    public void testGCState_LineDashOddLength() throws Exception {
+        public void testGCState_LineDashOddLength() throws Exception {
         gc.setLineDashes(10);
         assertArrayEquals(gc.getLineDashes(), new double[] {10, 10}, 0.00001);
         gc.setLineDashes(10, 20, 30);
@@ -432,7 +469,7 @@ public void testGCState_LineDashOddLength() throws Exception {
     }
 
     @Test
-    public void testGCState_LineDashOffsetNonFinite() throws Exception {
+        public void testGCState_LineDashOffsetNonFinite() throws Exception {
         gc.setLineDashOffset(5.0);
         assertEquals(gc.getLineDashOffset(), 5.0, 0.00001);
         gc.setLineDashOffset(Double.NaN);
@@ -443,7 +480,8 @@ public void testGCState_LineDashOffsetNonFinite() throws Exception {
         assertEquals(gc.getLineDashOffset(), 5.0, 0.00001);
     }
 
-    @Test public void testGCState_BlendMode() throws Exception {
+    @Test
+    public void testGCState_BlendMode() throws Exception {
         gc.setGlobalBlendMode(BlendMode.ADD);
         gc.setGlobalAlpha(0);
 
@@ -458,48 +496,56 @@ public void testGCState_LineDashOffsetNonFinite() throws Exception {
         assertEquals(0, gc.getGlobalAlpha(), 0.000001);
     }
 
-    @Test public void testGCState_BlendMode_Null() {
+    @Test
+    public void testGCState_BlendMode_Null() {
         gc.setGlobalBlendMode(BlendMode.ADD);
         assertEquals(BlendMode.ADD, gc.getGlobalBlendMode());
         gc.setGlobalBlendMode(null);
         assertEquals(BlendMode.ADD, gc.getGlobalBlendMode());
     }
 
-    @Test public void testGCState_ImageSmoothing() {
-        assertTrue("Image smoothing should be enabled by default.", gc.isImageSmoothing());
+    @Test
+    public void testGCState_ImageSmoothing() {
+        assertTrue(gc.isImageSmoothing(), "Image smoothing should be enabled by default.");
         // Disable image smoothing.
         gc.setImageSmoothing(false);
-        assertFalse("Image smoothing should be disabled.", gc.isImageSmoothing());
+        assertFalse(gc.isImageSmoothing(), "Image smoothing should be disabled.");
         // Reset image smoothing to true.
         gc.setImageSmoothing(true);
-        assertTrue("Image smoothing should be enabled.", gc.isImageSmoothing());
+        assertTrue(gc.isImageSmoothing(), "Image smoothing should be enabled.");
     }
 
-    @Test public void testGCappendSVGPath_Null() {
+    @Test
+    public void testGCappendSVGPath_Null() {
         gc.appendSVGPath("m 0 0");
         gc.appendSVGPath("Q 150 -300 300 0");
         gc.appendSVGPath(null);
     }
 
-    @Test public void testGCappendSVGPath_IncorrectPath() {
+    @Test
+    public void testGCappendSVGPath_IncorrectPath() {
         gc.appendSVGPath("Q 150 -300 300 0"); // No move at the beginning
     }
 
-    @Test public void testGCappendSVGPath_IncorrectPath2() {
+    @Test
+    public void testGCappendSVGPath_IncorrectPath2() {
         gc.appendSVGPath("F 150"); // No move at the beginning
     }
 
-    @Test public void testGCapplyEffect_Null() {
+    @Test
+    public void testGCapplyEffect_Null() {
         gc.applyEffect(null);
     }
 
-    @Test public void testGCdrawImage_Null() {
+    @Test
+    public void testGCdrawImage_Null() {
         gc.drawImage(null, 0 ,0);
         gc.drawImage(null, 0 ,0, 100, 100);
         gc.drawImage(null, 0, 0, 100, 100, 0, 0, 100, 100);
     }
 
-    @Test public void testGCdrawImage_InProgress() {
+    @Test
+    public void testGCdrawImage_InProgress() {
         ImageForTesting image = new ImageForTesting("http://something.png", false);
         image.updateProgress(0.5);
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/BlendTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/BlendTest.java
index b1c7f88682d..7f3baf47159 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/BlendTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/BlendTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,14 +26,14 @@
 package test.javafx.scene.effect;
 
 import static test.com.sun.javafx.test.TestHelper.box;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import com.sun.scenario.effect.Blend.Mode;
 import javafx.scene.effect.Blend;
@@ -47,7 +47,7 @@
 public class BlendTest extends EffectsTestBase {
     private Blend effect;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         effect = new Blend();
         setupTest(effect);
@@ -411,7 +411,7 @@ public void testCyclesForBoundInput() {
         assertEquals(f, effect.getBottomInput());
         assertEquals(f, effect.getTopInput());
 
-        assertEquals("Cycle in effect chain detected, exception should occur 5 times.", 5, countIllegalArgumentException);
+        assertEquals(5, countIllegalArgumentException, "Cycle in effect chain detected, exception should occur 5 times.");
         Thread.currentThread().setUncaughtExceptionHandler(null);
     }
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/Blend_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/Blend_properties_Test.java
index 81696b7c870..52e6d466c8d 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/Blend_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/Blend_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,33 +25,24 @@
 
 package test.javafx.scene.effect;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.scene.effect.Blend;
 import javafx.scene.effect.BlendMode;
 import javafx.scene.effect.BoxBlur;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.PropertiesTestBase;
 
-@RunWith(Parameterized.class)
 public final class Blend_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
+
+    public static Stream<Arguments> data() {
         final Blend testBlend = new Blend();
 
-        return Arrays.asList(new Object[] {
+        return Stream.of(
             config(testBlend, "mode", BlendMode.SRC_OVER, BlendMode.SRC_ATOP),
             config(testBlend, "opacity", 1.0, 0.5),
             config(testBlend, "bottomInput", null, new BoxBlur()),
             config(testBlend, "topInput", null, new BoxBlur())
-        });
-    }
-
-    public Blend_properties_Test(final Configuration configuration) {
-        super(configuration);
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/BloomTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/BloomTest.java
index 0904da7c848..f730a5b52c2 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/BloomTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/BloomTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,15 +29,15 @@
 import javafx.scene.effect.BoxBlur;
 import javafx.scene.effect.EffectShim;
 import static test.com.sun.javafx.test.TestHelper.box;
-import static org.junit.Assert.assertEquals;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class BloomTest extends EffectsTestBase {
     private Bloom effect;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         effect = new Bloom();
         setupTest(effect);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/Bloom_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/Bloom_properties_Test.java
index feae9566e79..7bad9d1ca4b 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/Bloom_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/Bloom_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,30 +25,21 @@
 
 package test.javafx.scene.effect;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.scene.effect.Bloom;
 import javafx.scene.effect.BoxBlur;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.PropertiesTestBase;
 
-@RunWith(Parameterized.class)
 public final class Bloom_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
+
+    public static Stream<Arguments> data() {
         final Bloom testBloom = new Bloom();
 
-        return Arrays.asList(new Object[] {
+        return Stream.of(
             config(testBloom, "input", null, new BoxBlur()),
             config(testBloom, "threshold", 0.3, 0.6)
-        });
-    }
-
-    public Bloom_properties_Test(final Configuration configuration) {
-        super(configuration);
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/BoxBlurTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/BoxBlurTest.java
index 578fa5960ba..d0f4a99a810 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/BoxBlurTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/BoxBlurTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,25 +28,20 @@
 import com.sun.scenario.effect.EffectHelper;
 import javafx.scene.effect.BoxBlur;
 import javafx.scene.effect.EffectShim;
-import static org.junit.Assert.assertEquals;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class BoxBlurTest extends EffectsTestBase {
     private BoxBlur effect;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         effect = new BoxBlur();
         setupTest(effect);
     }
 
-    @After
-    public void tearDown() {
-    }
-
     @Test
     public void testSetWidth() {
         // try setting correct value
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/BoxBlur_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/BoxBlur_properties_Test.java
index d035937ed51..1564c472965 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/BoxBlur_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/BoxBlur_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,26 +28,21 @@
 import static test.com.sun.javafx.test.TestHelper.box;
 
 import java.util.ArrayList;
-import java.util.Collection;
+import java.util.stream.Stream;
 
 import javafx.scene.Node;
 import javafx.scene.effect.BoxBlur;
 import javafx.scene.effect.ColorAdjust;
 import javafx.scene.shape.Rectangle;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import test.com.sun.javafx.test.BBoxComparator;
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.PropertiesTestBase;
+import test.com.sun.javafx.test.BBoxComparator;
 
-@RunWith(Parameterized.class)
 public final class BoxBlur_properties_Test extends PropertiesTestBase {
 
-    @Parameters
-    public static Collection data() {
-        ArrayList array = new ArrayList();
+    public static Stream<Arguments> data() {
+        ArrayList<Arguments> array = new ArrayList<Arguments>();
 
         // simple property tests
         final BoxBlur testBoxBlur = new BoxBlur();
@@ -134,11 +129,7 @@ public static Collection data() {
                 box(-4.0, -4.0, 108.0, 108.0),
                 new BBoxComparator(0.01)));
 
-        return array;
-    }
-
-    public BoxBlur_properties_Test(final Configuration configuration) {
-        super(configuration);
+        return array.stream();
     }
 
     private static Rectangle createTestNode() {
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/ColorAdjustTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/ColorAdjustTest.java
index a996e27a400..98d9360035a 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/ColorAdjustTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/ColorAdjustTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,15 +29,15 @@
 import javafx.scene.effect.BoxBlur;
 import javafx.scene.effect.ColorAdjust;
 import static test.com.sun.javafx.test.TestHelper.box;
-import static org.junit.Assert.assertEquals;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class ColorAdjustTest extends EffectsTestBase {
     private ColorAdjust effect;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         effect = new ColorAdjust();
         setupTest(effect);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/ColorAdjust_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/ColorAdjust_properties_Test.java
index b180b97ecc0..ccc6c8826af 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/ColorAdjust_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/ColorAdjust_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,33 +25,24 @@
 
 package test.javafx.scene.effect;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.scene.effect.BoxBlur;
 import javafx.scene.effect.ColorAdjust;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.PropertiesTestBase;
 
-@RunWith(Parameterized.class)
 public final class ColorAdjust_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
+
+    public static Stream<Arguments> data() {
         final ColorAdjust testColorAdjust = new ColorAdjust();
 
-        return Arrays.asList(new Object[] {
+        return Stream.of(
             config(testColorAdjust, "input", null, new BoxBlur()),
             config(testColorAdjust, "hue", 0.0, 0.5),
             config(testColorAdjust, "saturation", 0.0, 0.5),
             config(testColorAdjust, "brightness", 0.0, 0.5),
             config(testColorAdjust, "contrast", 0.0, 0.5)
-        });
-    }
-
-    public ColorAdjust_properties_Test(final Configuration configuration) {
-        super(configuration);
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/ColorInputTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/ColorInputTest.java
index c39bedd38b8..3dc2b0808c0 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/ColorInputTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/ColorInputTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,12 @@
 
 package test.javafx.scene.effect;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
 import javafx.scene.paint.Color;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import com.sun.javafx.geom.RectBounds;
 import com.sun.javafx.tk.Toolkit;
@@ -40,7 +40,7 @@
 public class ColorInputTest extends EffectsTestBase {
     private ColorInput effect;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         effect = new ColorInput();
         setupTest(effect);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/ColorInput_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/ColorInput_properties_Test.java
index 9619f18bd4b..f83bf4df325 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/ColorInput_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/ColorInput_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
 import static test.com.sun.javafx.test.TestHelper.box;
 
 import java.util.ArrayList;
-import java.util.Collection;
+import java.util.stream.Stream;
 
 import javafx.scene.Node;
 import javafx.scene.effect.ColorAdjust;
@@ -36,19 +36,14 @@
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Rectangle;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import test.com.sun.javafx.test.BBoxComparator;
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.PropertiesTestBase;
+import test.com.sun.javafx.test.BBoxComparator;
 
-@RunWith(Parameterized.class)
 public final class ColorInput_properties_Test extends PropertiesTestBase {
 
-    @Parameters
-    public static Collection data() {
-        ArrayList array = new ArrayList();
+    public static Stream<Arguments> data() {
+        ArrayList<Arguments> array = new ArrayList<Arguments>();
 
         // simple property tests
         final ColorInput testColorInput = new ColorInput();
@@ -133,11 +128,7 @@ public static Collection data() {
                 box(0.0, 50.0, 50.0, 50.0),
                 new BBoxComparator(0.01)));
 
-        return array;
-    }
-
-    public ColorInput_properties_Test(final Configuration configuration) {
-        super(configuration);
+        return array.stream();
     }
 
     private static Rectangle createTestNode() {
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/DisplacementMapTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/DisplacementMapTest.java
index 7a987b47943..22a8805b5aa 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/DisplacementMapTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/DisplacementMapTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,19 +30,19 @@
 import javafx.scene.effect.DisplacementMap;
 import javafx.scene.effect.FloatMap;
 import static test.com.sun.javafx.test.TestHelper.box;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class DisplacementMapTest extends EffectsTestBase {
     private DisplacementMap effect;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         effect = new DisplacementMap();
         setupTest(effect);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/DisplacementMap_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/DisplacementMap_properties_Test.java
index 72b79db5661..d696a0d1556 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/DisplacementMap_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/DisplacementMap_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,25 +25,20 @@
 
 package test.javafx.scene.effect;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.scene.effect.BoxBlur;
 import javafx.scene.effect.DisplacementMap;
 import javafx.scene.effect.FloatMap;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.PropertiesTestBase;
 
-@RunWith(Parameterized.class)
 public final class DisplacementMap_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
+
+    public static Stream<Arguments> data() {
         final DisplacementMap testDisplacementMap = new DisplacementMap();
 
-        return Arrays.asList(new Object[] {
+        return Stream.of(
             config(testDisplacementMap, "input", null, new BoxBlur()),
             config(testDisplacementMap, "mapData", null, new FloatMap()),
             config(testDisplacementMap, "scaleX", 1.0, 0.5),
@@ -51,10 +46,6 @@ public static Collection data() {
             config(testDisplacementMap, "offsetX", 0.0, 10.0),
             config(testDisplacementMap, "offsetY", 0.0, 10.0),
             config(testDisplacementMap, "wrap", false, true)
-        });
-    }
-
-    public DisplacementMap_properties_Test(final Configuration configuration) {
-        super(configuration);
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/DistantLightTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/DistantLightTest.java
index c6cc9f347d5..a9cdc8f2315 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/DistantLightTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/DistantLightTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,12 @@
 
 package test.javafx.scene.effect;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
 import javafx.scene.paint.Color;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import com.sun.scenario.effect.Color4f;
 import javafx.scene.effect.Light;
@@ -39,7 +39,7 @@
 public class DistantLightTest extends LightTestBase {
     private Light.Distant effect;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         effect = new Light.Distant();
         setupTest(effect);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/DistantLight_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/DistantLight_properties_Test.java
index e0a3e4ae542..3fa5486a13d 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/DistantLight_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/DistantLight_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,29 +25,20 @@
 
 package test.javafx.scene.effect;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.scene.effect.Light;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.PropertiesTestBase;
 
-@RunWith(Parameterized.class)
 public final class DistantLight_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
+
+    public static Stream<Arguments> data() {
         final Light.Distant testDistantLight = new Light.Distant();
 
-        return Arrays.asList(new Object[] {
+        return Stream.of(
             config(testDistantLight, "azimuth", 45.0, -135.0),
             config(testDistantLight, "elevation", 45.0, 30.0)
-        });
-    }
-
-    public DistantLight_properties_Test(final Configuration configuration) {
-        super(configuration);
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/DropShadowTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/DropShadowTest.java
index a9d0c9d7f45..b28e3c6cd44 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/DropShadowTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/DropShadowTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,14 +25,14 @@
 
 package test.javafx.scene.effect;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.SimpleDoubleProperty;
 import javafx.scene.paint.Color;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import com.sun.scenario.effect.AbstractShadow.ShadowMode;
 import com.sun.scenario.effect.Color4f;
@@ -44,7 +44,7 @@
 public class DropShadowTest extends EffectsTestBase {
     private DropShadow effect;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         effect = new DropShadow();
         setupTest(effect);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/DropShadow_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/DropShadow_properties_Test.java
index 570390f769c..98e0c64cfe3 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/DropShadow_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/DropShadow_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
 import static test.com.sun.javafx.test.TestHelper.box;
 
 import java.util.ArrayList;
-import java.util.Collection;
+import java.util.stream.Stream;
 
 import javafx.scene.Node;
 import javafx.scene.effect.BlurType;
@@ -38,19 +38,14 @@
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Rectangle;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import test.com.sun.javafx.test.BBoxComparator;
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.PropertiesTestBase;
+import test.com.sun.javafx.test.BBoxComparator;
 
-@RunWith(Parameterized.class)
 public final class DropShadow_properties_Test extends PropertiesTestBase {
 
-    @Parameters
-    public static Collection data() {
-        ArrayList array = new ArrayList();
+    public static Stream<Arguments> data() {
+        ArrayList<Arguments> array = new ArrayList<Arguments>();
 
         // simple property tests
         final DropShadow testDropShadow = new DropShadow();
@@ -213,11 +208,7 @@ public static Collection data() {
                 box(-11.0, -11.0, 122.0, 122.0),
                 new BBoxComparator(0.01)));
 
-        return array;
-    }
-
-    public DropShadow_properties_Test(final Configuration configuration) {
-        super(configuration);
+        return array.stream();
     }
 
     private static Rectangle createTestNode() {
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/EffectInputTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/EffectInputTest.java
index 0e12c5277d4..80c9f633318 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/EffectInputTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/EffectInputTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,15 +25,9 @@
 
 package test.javafx.scene.effect;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
+import java.util.stream.Stream;
 
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
@@ -43,20 +37,20 @@
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import test.com.sun.javafx.pgstub.StubToolkit;
 import com.sun.javafx.tk.Toolkit;
 import com.sun.scenario.effect.EffectHelper;
 import javafx.scene.effect.Effect;
 
-@RunWith(Parameterized.class)
 public class EffectInputTest {
-    private String effect1Name = null;
-    private String effect2Name = null;
     private Node n = null;
 
     final static String[] effects = new String[] {
@@ -66,21 +60,17 @@ public class EffectInputTest {
         "Reflection", "SepiaTone", "Shadow"
     };
 
-    @Parameters
-    public static Collection parameters() {
-        List list = new ArrayList();
+    public static Stream<Arguments> parameters() {
+        Stream<Arguments> stream = Stream.empty();
         for (int i = 0; i < effects.length; i++) {
             for (int j = i; j < effects.length; j++) {
-                list.add(new String[] { effects[i], effects[j] });
+                stream = Stream.concat(stream, Stream.of(Arguments.of( effects[i], effects[j] )));
             }
         }
-        return list;
+        return stream;
     }
 
-    public EffectInputTest(final String effect1,
-                           final String effect2) {
-        this.effect1Name = effect1;
-        this.effect2Name = effect2;
+    public EffectInputTest() {
         Group root = new Group();
         Scene scene = new Scene(root);
         Stage stage = new Stage();
@@ -108,8 +98,14 @@ private Method getPGInputMethod(String effectName) throws Exception {
         }
     }
 
-    @Test
-    public void testInput() throws Exception  {
+    @AfterEach
+    private void tearDownEach() {
+        Thread.currentThread().setUncaughtExceptionHandler(null);
+    }
+
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testInput(String effect1Name, String effect2Name) throws Exception  {
         final Class effect1Class = Class.forName("javafx.scene.effect." + effect1Name);
         final Class effect2Class = Class.forName("javafx.scene.effect." + effect2Name);
 
@@ -153,8 +149,9 @@ public void testInput() throws Exception  {
         assertEquals(EffectHelper.getPeer(effect1), pgGetInput2.invoke(EffectHelper.getPeer(effect2)));
     }
 
-    @Test
-    public void testCycle() throws Exception  {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testCycle(String effect1Name, String effect2Name) throws Exception  {
         final Class effect1Class = Class.forName("javafx.scene.effect." + effect1Name);
         final Class effect2Class = Class.forName("javafx.scene.effect." + effect2Name);
 
@@ -186,8 +183,9 @@ public void testCycle() throws Exception  {
     }
 
     int countIllegalArgumentException = 0;
-    @Test
-    public void testCycleForBoundInput() throws Exception  {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testCycleForBoundInput(String effect1Name, String effect2Name) throws Exception  {
         Thread.currentThread().setUncaughtExceptionHandler((thread, throwable) -> {
             if (throwable instanceof IllegalArgumentException) {
                 countIllegalArgumentException++;
@@ -219,7 +217,7 @@ public void testCycleForBoundInput() throws Exception  {
         v.set(effect2);
         assertEquals(null, getInput1.invoke(effect1));
 
-        assertEquals("Cycle in effect chain detected, exception should occur 2 times.", 2, countIllegalArgumentException);
-        Thread.currentThread().setUncaughtExceptionHandler(null);
+        assertEquals(2, countIllegalArgumentException, "Cycle in effect chain detected, exception should occur 2 times.");
+        // UEH set to null in @AfterEach
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/EffectTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/EffectTest.java
index b03cb80198e..f27f23b045a 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/EffectTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/EffectTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,6 @@
 
 package test.javafx.scene.effect;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.scene.Group;
@@ -37,7 +32,12 @@
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import test.com.sun.javafx.pgstub.StubToolkit;
 import com.sun.javafx.tk.Toolkit;
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/EffectsTestBase.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/EffectsTestBase.java
index d54a10a862d..f6043bb9fc0 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/EffectsTestBase.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/EffectsTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,6 @@
 
 package test.javafx.scene.effect;
 
-import static org.junit.Assert.assertEquals;
-
 import java.lang.reflect.Method;
 
 import javafx.beans.property.BooleanProperty;
@@ -51,6 +49,8 @@
 import javafx.scene.effect.BoxBlur;
 import javafx.scene.effect.Effect;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class EffectsTestBase {
     private Scene scene;
     private StubToolkit toolkit;
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/FloatMapTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/FloatMapTest.java
index 0b740a7d452..11bfb57426d 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/FloatMapTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/FloatMapTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,6 @@
 
 package test.javafx.scene.effect;
 
-import static org.junit.Assert.assertEquals;
-
 import java.lang.reflect.Method;
 
 import javafx.beans.property.IntegerProperty;
@@ -35,14 +33,15 @@
 import javafx.scene.effect.FloatMap;
 import javafx.scene.effect.FloatMapShim;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class FloatMapTest extends EffectsTestBase {
     private FloatMap floatMap;
     private DisplacementMap displacementMap;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         floatMap = new FloatMap();
         displacementMap = new DisplacementMap();
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/FloatMap_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/FloatMap_properties_Test.java
index 27511fe20b8..86e8d225c98 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/FloatMap_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/FloatMap_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,29 +25,20 @@
 
 package test.javafx.scene.effect;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.scene.effect.FloatMap;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.PropertiesTestBase;
 
-@RunWith(Parameterized.class)
 public final class FloatMap_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
+
+    public static Stream<Arguments> data() {
         final FloatMap testFloatMap = new FloatMap();
 
-        return Arrays.asList(new Object[] {
+        return Stream.of(
             config(testFloatMap, "width", 64, 128),
             config(testFloatMap, "height", 64, 128)
-        });
-    }
-
-    public FloatMap_properties_Test(final Configuration configuration) {
-        super(configuration);
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/GaussianBlurTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/GaussianBlurTest.java
index 9aa7a027e70..30011e69830 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/GaussianBlurTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/GaussianBlurTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,15 +28,15 @@
 import com.sun.scenario.effect.EffectHelper;
 import javafx.scene.effect.BoxBlur;
 import javafx.scene.effect.GaussianBlur;
-import static org.junit.Assert.assertEquals;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class GaussianBlurTest extends EffectsTestBase {
     private GaussianBlur effect;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         effect = new GaussianBlur();
         setupTest(effect);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/GaussianBlur_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/GaussianBlur_properties_Test.java
index baa00b3233a..724c08c6b4b 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/GaussianBlur_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/GaussianBlur_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
 import static test.com.sun.javafx.test.TestHelper.box;
 
 import java.util.ArrayList;
-import java.util.Collection;
+import java.util.stream.Stream;
 
 import javafx.scene.Node;
 import javafx.scene.effect.BoxBlur;
@@ -36,19 +36,14 @@
 import javafx.scene.effect.Glow;
 import javafx.scene.shape.Rectangle;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import test.com.sun.javafx.test.BBoxComparator;
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.PropertiesTestBase;
+import test.com.sun.javafx.test.BBoxComparator;
 
-@RunWith(Parameterized.class)
 public final class GaussianBlur_properties_Test extends PropertiesTestBase {
 
-    @Parameters
-    public static Collection data() {
-        ArrayList array = new ArrayList();
+    public static Stream<Arguments> data() {
+        ArrayList<Arguments> array = new ArrayList<Arguments>();
 
         // simple property tests
         final GaussianBlur testGaussianBlur = new GaussianBlur();
@@ -94,11 +89,7 @@ public static Collection data() {
                 box(-12.0, -12.0, 124.0, 124.0),
                 new BBoxComparator(0.01)));
 
-        return array;
-    }
-
-    public GaussianBlur_properties_Test(final Configuration configuration) {
-        super(configuration);
+        return array.stream();
     }
 
     private static Rectangle createTestNode() {
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/GlowTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/GlowTest.java
index 9ceb09d59cf..f16aab955fe 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/GlowTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/GlowTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,15 +29,15 @@
 import javafx.scene.effect.BoxBlur;
 import javafx.scene.effect.Glow;
 import static test.com.sun.javafx.test.TestHelper.box;
-import static org.junit.Assert.assertEquals;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class GlowTest extends EffectsTestBase {
     private Glow effect;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         effect = new Glow();
         setupTest(effect);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/Glow_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/Glow_properties_Test.java
index 54b029a1b6d..f9dfdfec244 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/Glow_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/Glow_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,30 +25,21 @@
 
 package test.javafx.scene.effect;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.scene.effect.BoxBlur;
 import javafx.scene.effect.Glow;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.PropertiesTestBase;
 
-@RunWith(Parameterized.class)
 public final class Glow_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
+
+    public static Stream<Arguments> data() {
         final Glow testGlow = new Glow();
 
-        return Arrays.asList(new Object[] {
+        return Stream.of(
             config(testGlow, "input", null, new BoxBlur()),
             config(testGlow, "level", 0.3, 0.6)
-        });
-    }
-
-    public Glow_properties_Test(final Configuration configuration) {
-        super(configuration);
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/ImageInputTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/ImageInputTest.java
index 8f46b4b494c..a89a468061a 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/ImageInputTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/ImageInputTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,15 +25,15 @@
 
 package test.javafx.scene.effect;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.scene.image.Image;
 import test.javafx.scene.image.TestImages;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import com.sun.javafx.geom.Point2D;
 import com.sun.javafx.tk.Toolkit;
@@ -43,7 +43,7 @@
 public class ImageInputTest extends EffectsTestBase {
     private ImageInput effect;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         effect = new ImageInput();
         setupTest(effect);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/ImageInput_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/ImageInput_properties_Test.java
index 733d5afbf85..823fe4b76ec 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/ImageInput_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/ImageInput_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
 import static test.com.sun.javafx.test.TestHelper.box;
 
 import java.util.ArrayList;
-import java.util.Collection;
+import java.util.stream.Stream;
 
 import javafx.scene.Node;
 import javafx.scene.effect.ColorAdjust;
@@ -36,19 +36,14 @@
 import test.javafx.scene.image.TestImages;
 import javafx.scene.shape.Rectangle;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import test.com.sun.javafx.test.BBoxComparator;
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.PropertiesTestBase;
+import test.com.sun.javafx.test.BBoxComparator;
 
-@RunWith(Parameterized.class)
 public final class ImageInput_properties_Test extends PropertiesTestBase {
 
-    @Parameters
-    public static Collection data() {
-        ArrayList array = new ArrayList();
+    public static Stream<Arguments> data() {
+        ArrayList<Arguments> array = new ArrayList<Arguments>();
 
         // simple property tests
         final ImageInput testImageInput = new ImageInput();
@@ -120,11 +115,7 @@ public static Collection data() {
                 box(0.0, 50.0, 32.0, 32.0),
                 new BBoxComparator(0.01)));
 
-        return array;
-    }
-
-    public ImageInput_properties_Test(final Configuration configuration) {
-        super(configuration);
+        return array.stream();
     }
 
     private static Rectangle createTestNode() {
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/InnerShadowTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/InnerShadowTest.java
index 2fddcfb16ac..9da8fb85f4b 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/InnerShadowTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/InnerShadowTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,14 +26,14 @@
 package test.javafx.scene.effect;
 
 import static test.com.sun.javafx.test.TestHelper.box;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.SimpleDoubleProperty;
 import javafx.scene.paint.Color;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import com.sun.scenario.effect.AbstractShadow.ShadowMode;
 import com.sun.scenario.effect.Color4f;
@@ -57,7 +57,7 @@ public class InnerShadowTest extends EffectsTestBase {
                 (float) Color.BLACK.getOpacity()
                 );
 
-    @Before
+    @BeforeEach
     public void setUp() {
         effect = new InnerShadow();
         setupTest(effect);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/InnerShadow_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/InnerShadow_properties_Test.java
index 806fad3e1e6..07c02b1cc61 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/InnerShadow_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/InnerShadow_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,26 +25,21 @@
 
 package test.javafx.scene.effect;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.scene.effect.BlurType;
 import javafx.scene.effect.BoxBlur;
 import javafx.scene.effect.InnerShadow;
 import javafx.scene.paint.Color;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.PropertiesTestBase;
 
-@RunWith(Parameterized.class)
 public final class InnerShadow_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
+
+    public static Stream<Arguments> data() {
         final InnerShadow testInnerShadow = new InnerShadow();
 
-        return Arrays.asList(new Object[] {
+        return Stream.of(
             config(testInnerShadow, "input", null, new BoxBlur()),
             config(testInnerShadow, "radius", 20.0, 40.0),
             config(testInnerShadow, "width", 100.0, 200.0),
@@ -55,10 +50,6 @@ public static Collection data() {
             config(testInnerShadow, "color", Color.BLACK, Color.RED),
             config(testInnerShadow, "offsetX", 0.0, 50.0),
             config(testInnerShadow, "offsetY", 0.0, 50.0)
-        });
-    }
-
-    public InnerShadow_properties_Test(final Configuration configuration) {
-        super(configuration);
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/LightingTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/LightingTest.java
index 5cabc86e05c..79ff9c80f56 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/LightingTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/LightingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,11 +27,6 @@
 
 import static test.com.sun.javafx.test.TestHelper.box;
 import com.sun.scenario.effect.Color4f;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.scene.effect.BoxBlur;
@@ -43,13 +38,18 @@
 import javafx.scene.effect.Shadow;
 import javafx.scene.paint.Color;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class LightingTest extends EffectsTestBase {
     private Lighting effect;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         effect = new Lighting();
         setupTest(effect);
@@ -460,7 +460,7 @@ public void testCyclesForBoundInput() {
         assertEquals(null, effect.getContentInput());
         assertEquals(null, effect.getBumpInput());
 
-        assertEquals("Cycle in effect chain detected, exception should occur 5 times.", 5, countIllegalArgumentException);
+        assertEquals(5, countIllegalArgumentException, "Cycle in effect chain detected, exception should occur 5 times.");
         Thread.currentThread().setUncaughtExceptionHandler(null);
     }
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/Lighting_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/Lighting_properties_Test.java
index ffcc3698468..2264619b600 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/Lighting_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/Lighting_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,25 +25,20 @@
 
 package test.javafx.scene.effect;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.scene.effect.BoxBlur;
 import javafx.scene.effect.Light;
 import javafx.scene.effect.Lighting;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.PropertiesTestBase;
 
-@RunWith(Parameterized.class)
 public final class Lighting_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
+
+    public static Stream<Arguments> data() {
         final Lighting testLighting = new Lighting();
 
-        return Arrays.asList(new Object[] {
+        return Stream.of(
             config(testLighting, "light",
                    new Light.Distant(),
                    new Light.Point()),
@@ -53,10 +48,6 @@ public static Collection data() {
             config(testLighting, "specularConstant", 0.3, 0.6),
             config(testLighting, "specularExponent", 20.0, 30.0),
             config(testLighting, "surfaceScale", 1.5, 0.5)
-        });
-    }
-
-    public Lighting_properties_Test(final Configuration configuration) {
-        super(configuration);
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/MotionBlurTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/MotionBlurTest.java
index ef7656a31b6..b103bd95cf5 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/MotionBlurTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/MotionBlurTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,15 +28,15 @@
 import com.sun.scenario.effect.EffectHelper;
 import javafx.scene.effect.BoxBlur;
 import javafx.scene.effect.MotionBlur;
-import static org.junit.Assert.assertEquals;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class MotionBlurTest extends EffectsTestBase {
     private MotionBlur effect;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         effect = new MotionBlur();
         setupTest(effect);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/MotionBlur_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/MotionBlur_properties_Test.java
index 2fdda7bee65..2fd49e49507 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/MotionBlur_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/MotionBlur_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
 import static test.com.sun.javafx.test.TestHelper.box;
 
 import java.util.ArrayList;
-import java.util.Collection;
+import java.util.stream.Stream;
 
 import javafx.scene.Node;
 import javafx.scene.effect.BoxBlur;
@@ -36,19 +36,14 @@
 import javafx.scene.effect.MotionBlur;
 import javafx.scene.shape.Rectangle;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import test.com.sun.javafx.test.BBoxComparator;
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.PropertiesTestBase;
+import test.com.sun.javafx.test.BBoxComparator;
 
-@RunWith(Parameterized.class)
 public final class MotionBlur_properties_Test extends PropertiesTestBase {
 
-    @Parameters
-    public static Collection data() {
-        ArrayList array = new ArrayList();
+    public static Stream<Arguments> data() {
+        ArrayList<Arguments> array = new ArrayList<Arguments>();
 
         // simple property tests
         final MotionBlur testMotionBlur = new MotionBlur();
@@ -113,11 +108,7 @@ public static Collection data() {
                 box(-12.0, -2.0, 124.0, 104.0),
                 new BBoxComparator(0.01)));
 
-        return array;
-    }
-
-    public MotionBlur_properties_Test(final Configuration configuration) {
-        super(configuration);
+        return array.stream();
     }
 
     private static Rectangle createTestNode() {
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/PerspectiveTransformTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/PerspectiveTransformTest.java
index 7ac7700ef99..45eb6a412e8 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/PerspectiveTransformTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/PerspectiveTransformTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,15 +26,15 @@
 package test.javafx.scene.effect;
 
 import javafx.scene.effect.PerspectiveTransform;
-import static org.junit.Assert.assertEquals;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class PerspectiveTransformTest extends EffectsTestBase {
     private PerspectiveTransform effect;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         effect = new PerspectiveTransform();
         setupTest(effect);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/PerspectiveTransform_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/PerspectiveTransform_properties_Test.java
index 56b28cdf530..6ca454ce27f 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/PerspectiveTransform_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/PerspectiveTransform_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
 import static test.com.sun.javafx.test.TestHelper.box;
 
 import java.util.ArrayList;
-import java.util.Collection;
+import java.util.stream.Stream;
 
 import javafx.scene.Node;
 import javafx.scene.effect.BoxBlur;
@@ -36,19 +36,14 @@
 import javafx.scene.effect.PerspectiveTransform;
 import javafx.scene.shape.Rectangle;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import test.com.sun.javafx.test.BBoxComparator;
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.PropertiesTestBase;
+import test.com.sun.javafx.test.BBoxComparator;
 
-@RunWith(Parameterized.class)
 public final class PerspectiveTransform_properties_Test extends PropertiesTestBase {
 
-    @Parameters
-    public static Collection data() {
-        ArrayList array = new ArrayList();
+    public static Stream<Arguments> data() {
+        ArrayList<Arguments> array = new ArrayList<Arguments>();
 
         // simple property tests
         final PerspectiveTransform testPerspectiveTransform =
@@ -238,11 +233,8 @@ public static Collection data() {
                 box(0.0, 0.0, 100.0, 100.0),
                 box(0.0, 0.0, 100.0, 100.0),
                 new BBoxComparator(0.01)));
-        return array;
-    }
 
-    public PerspectiveTransform_properties_Test(final Configuration configuration) {
-        super(configuration);
+        return array.stream();
     }
 
     private static Rectangle createTestNode() {
@@ -251,7 +243,6 @@ private static Rectangle createTestNode() {
         return r;
     }
 
-
     private static Rectangle createTestNodeWithChainedEffect() {
         Rectangle r = new Rectangle(100, 100);
         ColorAdjust c = new ColorAdjust();
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/PointLightTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/PointLightTest.java
index 0d8290628f2..6ee726a74a1 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/PointLightTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/PointLightTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,11 @@
 
 package test.javafx.scene.effect;
 
-import static org.junit.Assert.assertEquals;
 import javafx.scene.paint.Color;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import com.sun.scenario.effect.Color4f;
 import javafx.scene.effect.Light;
@@ -38,7 +38,7 @@
 public class PointLightTest extends LightTestBase {
     private Light.Point effect;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         effect = new Light.Point();
         setupTest(effect);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/PointLight_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/PointLight_properties_Test.java
index bad5e4241a3..12ac162c5e4 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/PointLight_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/PointLight_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,30 +25,21 @@
 
 package test.javafx.scene.effect;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.scene.effect.Light;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.PropertiesTestBase;
 
-@RunWith(Parameterized.class)
 public final class PointLight_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
+
+    public static Stream<Arguments> data() {
         final Light.Point testPointLight = new Light.Point();
 
-        return Arrays.asList(new Object[] {
+        return Stream.of(
             config(testPointLight, "x", 0.0, -100.0),
             config(testPointLight, "y", 0.0, -100.0),
             config(testPointLight, "z", 0.0, 50.0)
-        });
-    }
-
-    public PointLight_properties_Test(final Configuration configuration) {
-        super(configuration);
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/ReflectionTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/ReflectionTest.java
index 07df4568b9b..7c4ec9b2ecf 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/ReflectionTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/ReflectionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,15 +28,15 @@
 import com.sun.scenario.effect.EffectHelper;
 import javafx.scene.effect.BoxBlur;
 import javafx.scene.effect.Reflection;
-import static org.junit.Assert.assertEquals;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class ReflectionTest extends EffectsTestBase {
     private Reflection effect;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         effect = new Reflection();
         setupTest(effect);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/Reflection_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/Reflection_properties_Test.java
index 59db2fda01d..1c68878f359 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/Reflection_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/Reflection_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
 import static test.com.sun.javafx.test.TestHelper.box;
 
 import java.util.ArrayList;
-import java.util.Collection;
+import java.util.stream.Stream;
 
 import javafx.scene.Node;
 import javafx.scene.effect.BoxBlur;
@@ -36,19 +36,14 @@
 import javafx.scene.effect.Reflection;
 import javafx.scene.shape.Rectangle;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import test.com.sun.javafx.test.BBoxComparator;
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.PropertiesTestBase;
+import test.com.sun.javafx.test.BBoxComparator;
 
-@RunWith(Parameterized.class)
 public final class Reflection_properties_Test extends PropertiesTestBase {
 
-    @Parameters
-    public static Collection data() {
-        ArrayList array = new ArrayList();
+    public static Stream<Arguments> data() {
+        ArrayList<Arguments> array = new ArrayList<Arguments>();
 
         // simple property tests
         final Reflection testReflection = new Reflection();
@@ -115,11 +110,7 @@ public static Collection data() {
                 box(-2.0, -2.0, 104.0, 182.0),
                 new BBoxComparator(0.01)));
 
-        return array;
-    }
-
-    public Reflection_properties_Test(final Configuration configuration) {
-        super(configuration);
+        return array.stream();
     }
 
     private static Rectangle createTestNode() {
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/SepiaToneTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/SepiaToneTest.java
index 3a2a1e5d4f3..15880850bec 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/SepiaToneTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/SepiaToneTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,15 +29,15 @@
 import javafx.scene.effect.BoxBlur;
 import javafx.scene.effect.SepiaTone;
 import static test.com.sun.javafx.test.TestHelper.box;
-import static org.junit.Assert.assertEquals;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class SepiaToneTest extends EffectsTestBase {
     private SepiaTone effect;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         effect = new SepiaTone();
         setupTest(effect);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/SepiaTone_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/SepiaTone_properties_Test.java
index 71dd882d48e..4b249692c60 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/SepiaTone_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/SepiaTone_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,30 +25,21 @@
 
 package test.javafx.scene.effect;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.scene.effect.BoxBlur;
 import javafx.scene.effect.SepiaTone;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.PropertiesTestBase;
 
-@RunWith(Parameterized.class)
 public final class SepiaTone_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
+
+    public static Stream<Arguments> data() {
         final SepiaTone testSepiaTone = new SepiaTone();
 
-        return Arrays.asList(new Object[] {
+        return Stream.of(
             config(testSepiaTone, "input", null, new BoxBlur()),
             config(testSepiaTone, "level", 0.3, 0.6)
-        });
-    }
-
-    public SepiaTone_properties_Test(final Configuration configuration) {
-        super(configuration);
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/ShadowTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/ShadowTest.java
index c3613b891d7..148c344efff 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/ShadowTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/ShadowTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,14 +25,14 @@
 
 package test.javafx.scene.effect;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.SimpleDoubleProperty;
 import javafx.scene.paint.Color;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import com.sun.scenario.effect.AbstractShadow.ShadowMode;
 import com.sun.scenario.effect.Color4f;
@@ -44,7 +44,7 @@
 public class ShadowTest extends EffectsTestBase {
     private Shadow effect;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         effect = new Shadow();
         setupTest(effect);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/Shadow_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/Shadow_properties_Test.java
index 600f066e62b..b171cbd4a2f 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/Shadow_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/Shadow_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
 import static test.com.sun.javafx.test.TestHelper.box;
 
 import java.util.ArrayList;
-import java.util.Collection;
+import java.util.stream.Stream;
 
 import javafx.scene.Node;
 import javafx.scene.effect.BlurType;
@@ -38,19 +38,14 @@
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Rectangle;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import test.com.sun.javafx.test.BBoxComparator;
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.PropertiesTestBase;
+import test.com.sun.javafx.test.BBoxComparator;
 
-@RunWith(Parameterized.class)
 public final class Shadow_properties_Test extends PropertiesTestBase {
 
-    @Parameters
-    public static Collection data() {
-        ArrayList array = new ArrayList();
+    public static Stream<Arguments> data() {
+        ArrayList<Arguments> array = new ArrayList<Arguments>();
 
         // simple property tests
         final Shadow testShadow = new Shadow();
@@ -173,11 +168,7 @@ public static Collection data() {
                 box(-11.0, -11.0, 122.0, 122.0),
                 new BBoxComparator(0.01)));
 
-        return array;
-    }
-
-    public Shadow_properties_Test(final Configuration configuration) {
-        super(configuration);
+        return array.stream();
     }
 
     private static Rectangle createTestNode() {
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/SpotLightTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/SpotLightTest.java
index 51843a9d0a0..dc9d23870ed 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/SpotLightTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/SpotLightTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,25 +25,21 @@
 
 package test.javafx.scene.effect;
 
-import static org.junit.Assert.assertEquals;
 import javafx.scene.paint.Color;
 
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
 import com.sun.scenario.effect.Color4f;
 import javafx.scene.effect.Light;
 import javafx.scene.effect.LightShim;
 
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class SpotLightTest extends LightTestBase {
 
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
     private Light.Spot effect;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         effect = new Light.Spot();
         setupTest(effect);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/SpotLight_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/SpotLight_properties_Test.java
index 582a88f6e2f..daf46feed13 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/SpotLight_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/effect/SpotLight_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,31 +25,22 @@
 
 package test.javafx.scene.effect;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.scene.effect.Light;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.PropertiesTestBase;
 
-@RunWith(Parameterized.class)
 public final class SpotLight_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
+
+    public static Stream<Arguments> data() {
         final Light.Spot testSpotLight = new Light.Spot();
 
-        return Arrays.asList(new Object[] {
+        return Stream.of(
             config(testSpotLight, "pointsAtX", 0.0, 100.0),
             config(testSpotLight, "pointsAtY", 0.0, 100.0),
             config(testSpotLight, "pointsAtZ", 0.0, 100.0),
             config(testSpotLight, "specularExponent", 1.0, 3.0)
-        });
-    }
-
-    public SpotLight_properties_Test(final Configuration configuration) {
-        super(configuration);
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/image/ImageTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/image/ImageTest.java
index 1488bec2172..35ef30faa3f 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/image/ImageTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/image/ImageTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,8 +34,6 @@
 import test.com.sun.javafx.test.PropertyInvalidationCounter;
 import com.sun.javafx.tk.Toolkit;
 import javafx.beans.InvalidationListener;
-import org.junit.Before;
-import org.junit.Test;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
@@ -44,7 +42,14 @@
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageShim;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public final class ImageTest {
     private final StubToolkit toolkit;
@@ -55,7 +60,7 @@ public ImageTest() {
         imageLoaderFactory = toolkit.getImageLoaderFactory();
     }
 
-    @Before
+    @BeforeEach
     public void setUp() {
         imageLoaderFactory.reset();
     }
@@ -513,48 +518,66 @@ public void createImageFromClasspathTest_withLeadingSlash() {
         verifyLoadedImage(image, 0, 0, false, false, 100, 200);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void createImageFromNullUrlTest() {
-        new Image((String) null);
+        assertThrows(NullPointerException.class, () -> {
+            new Image((String) null);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void createImageAsyncFromNullUrlTest() {
-        new Image(null, true);
+        assertThrows(NullPointerException.class, () -> {
+            new Image(null, true);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void createImageFromNullInputStreamTest() {
-        new Image((InputStream) null);
+        assertThrows(NullPointerException.class, () -> {
+            new Image((InputStream) null);
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void createImageFromEmptyUrlTest() {
-        new Image("");
+        assertThrows(IllegalArgumentException.class, () -> {
+            new Image("");
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void createImageAsyncFromEmptyUrlTest() {
-        new Image("", true);
+        assertThrows(IllegalArgumentException.class, () -> {
+            new Image("", true);
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void createImageFromInvalidUrlTest() {
-        new Image(":");
+        assertThrows(IllegalArgumentException.class, () -> {
+            new Image(":");
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void createImageAsyncFromInvalidUrlTest() {
-        new Image(":", true);
+        assertThrows(IllegalArgumentException.class, () -> {
+            new Image(":", true);
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void createImageFromUnsupportedUrlTest() {
-        new Image("unsupported:image.png");
+        assertThrows(IllegalArgumentException.class, () -> {
+            new Image("unsupported:image.png");
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void createImageAsyncFromUnsupportedUrlTest() {
-        new Image("unsupported:image.png", true);
+        assertThrows(IllegalArgumentException.class, () -> {
+            new Image("unsupported:image.png", true);
+        });
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/image/ImageViewTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/image/ImageViewTest.java
index 3a128e6184d..7347416d336 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/image/ImageViewTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/image/ImageViewTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,9 +34,6 @@
 import com.sun.javafx.tk.Toolkit;
 import javafx.geometry.Rectangle2D;
 import test.javafx.scene.NodeTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
 
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
@@ -45,18 +42,24 @@
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public final class ImageViewTest {
     private ImageView imageView;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         imageView = new StubImageView();
         imageView.setImage(TestImages.TEST_IMAGE_100x200);
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         imageView = null;
     }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/image/ImageView_cssMethods_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/image/ImageView_cssMethods_Test.java
index 12f1f541484..4cfb74a2ec8 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/image/ImageView_cssMethods_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/image/ImageView_cssMethods_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,13 +25,7 @@
 
 package test.javafx.scene.image;
 
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.BeforeClass;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import java.util.stream.Stream;
 
 import test.com.sun.javafx.pgstub.StubImageLoaderFactory;
 import test.com.sun.javafx.pgstub.StubPlatformImageInfo;
@@ -42,7 +36,8 @@
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 
-@RunWith(Parameterized.class)
+import org.junit.jupiter.api.BeforeAll;
+
 public final class ImageView_cssMethods_Test extends CssMethodsTestBase {
     private static final ImageView TEST_IMAGE_VIEW = new ImageView();
     private static final String TEST_IMAGE_URL1 = "file:test_image_1.png";
@@ -59,7 +54,7 @@ public boolean equals(final Object expected,
             };
 
 
-    @BeforeClass
+    @BeforeAll
     public static void configureImageLoaderFactory() {
         final StubImageLoaderFactory imageLoaderFactory =
                 ((StubToolkit) Toolkit.getToolkit()).getImageLoaderFactory();
@@ -72,22 +67,17 @@ public static void configureImageLoaderFactory() {
                 new StubPlatformImageInfo(48, 48));
     }
 
-    @Parameters
-    public static Collection data() {
+    public static Stream<Configuration> data() {
         boolean smooth = ImageView.SMOOTH_DEFAULT;
 
-        return Arrays.asList(new Object[] {
+        return Stream.of(
             config(TEST_IMAGE_VIEW, "image", null, "-fx-image", TEST_IMAGE_URL1, IMAGE_COMPARATOR),
             config(TEST_IMAGE_VIEW, "image", TestImages.TEST_IMAGE_32x32, "-fx-image", TEST_IMAGE_URL2, IMAGE_COMPARATOR),
             config(TEST_IMAGE_VIEW, "translateX", 0.0, "-fx-translate-x", 10.0),
             config(TEST_IMAGE_VIEW, "fitHeight", 0.0, "-fx-fit-height", 10.0),
             config(TEST_IMAGE_VIEW, "fitWidth", 0.0, "-fx-fit-width", 10.0),
             config(TEST_IMAGE_VIEW, "preserveRatio", false, "-fx-preserve-ratio", true),
-            config(TEST_IMAGE_VIEW, "smooth", smooth, "-fx-smooth", !smooth),
-        });
-    }
-
-    public ImageView_cssMethods_Test(final Configuration configuration) {
-        super(configuration);
+            config(TEST_IMAGE_VIEW, "smooth", smooth, "-fx-smooth", !smooth)
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/image/ImageView_verifyBounds_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/image/ImageView_verifyBounds_Test.java
index 9be1f97a0b2..cf10d538f54 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/image/ImageView_verifyBounds_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/image/ImageView_verifyBounds_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,106 +31,98 @@
 import static test.javafx.scene.image.TestImages.TEST_IMAGE_100x200;
 import static test.javafx.scene.image.TestImages.TEST_IMAGE_200x100;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 
 import javafx.geometry.BoundingBox;
 import javafx.scene.image.ImageView;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.api.AfterEach;
+// import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@RunWith(Parameterized.class)
 public final class ImageView_verifyBounds_Test {
 
-    private final ImageViewConfig imageViewConfig;
-    private final BoundingBox expectedBounds;
-
     private ImageView imageView;
 
     /*
      * Parameters: [image view config], [expected bounds]
      */
-    @Parameters
-    public static Collection data() {
-        return Arrays.asList(new Object[][] {
-            { config(TEST_IMAGE_100x200, 0, 0), box(0, 0, 100, 200) },
-            { config(TEST_IMAGE_200x100, 20, 10), box(20, 10, 200, 100) },
-            {
+    public static Stream<Arguments> data() {
+        return Stream.of(
+            Arguments.of( config(TEST_IMAGE_100x200, 0, 0), box(0, 0, 100, 200) ),
+            Arguments.of( config(TEST_IMAGE_200x100, 20, 10), box(20, 10, 200, 100) ),
+            Arguments.of(
                 config(null, 0, 0, 400, 400, false),
                 box(0, 0, 400, 400)
-            },
-            {
+            ),
+            Arguments.of(
                 config(TEST_IMAGE_100x200, 10, 20, 0, 400, false),
                 box(10, 20, 100, 400)
-            },
-            {
+            ),
+            Arguments.of(
                 config(TEST_IMAGE_200x100, 20, 10, 400, 0, false),
                 box(20, 10, 400, 100)
-            },
-            {
+            ),
+            Arguments.of(
                 config(null, 0, 0, 400, 400, true),
                 box(0, 0, 400, 400)
-            },
-            {
+            ),
+            Arguments.of(
                 config(TEST_IMAGE_100x200, 10, 20, 400, 400, true),
                 box(10, 20, 200, 400)
-            },
-            {
+            ),
+            Arguments.of(
                 config(TEST_IMAGE_200x100, 20, 10, 400, 400, true),
                 box(20, 10, 400, 200)
-            },
-            {
+            ),
+            Arguments.of(
                 config(TEST_IMAGE_100x200, 10, 20,
                        -50, 100, 200, 100,
                        400, 0, true),
                 box(10, 20, 400, 200)
-            },
-            {
+            ),
+            Arguments.of(
                 config(TEST_IMAGE_200x100, 20, 10,
                        100, -50, 100, 200,
                        0, 400, true),
                 box(20, 10, 200, 400)
-            },
+            ),
             /* tests for invalid viewport */
-            {
+            Arguments.of(
                 config(TEST_IMAGE_200x100, 0, 0,
                        0, 0, 0, 100,
                        400, 400, true),
                 box(0, 0, 400, 200)
-            },
-            {
+            ),
+            Arguments.of(
                 config(TEST_IMAGE_100x200, 0, 0,
                        0, 0, 100, 0,
                        400, 400, true),
                 box(0, 0, 200, 400)
-            }
-        });
-    }
-
-    public ImageView_verifyBounds_Test(final ImageViewConfig imageViewConfig,
-                                       final BoundingBox expectedBounds) {
-        this.imageViewConfig = imageViewConfig;
-        this.expectedBounds = expectedBounds;
+            )
+        );
     }
 
-    @Before
-    public void setUp() {
+    // NOTE: This should be reverted once parametrized class tests are added to JUnit5
+    //       For now, tests call this manually
+    // @BeforeEach
+    public void setUp(ImageViewConfig imageViewConfig) {
         imageView = new ImageView();
         imageViewConfig.applyTo(imageView);
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         imageView = null;
     }
 
-    @Test
-    public void verifyBounds() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void verifyBounds(ImageViewConfig imageViewConfig,
+                             BoundingBox expectedBounds) {
+        setUp(imageViewConfig);
         assertBoundsEqual(expectedBounds, imageView.getBoundsInLocal());
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/image/ImageView_verifyContains_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/image/ImageView_verifyContains_Test.java
index fe0dbc90d94..f6b8252a81f 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/image/ImageView_verifyContains_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/image/ImageView_verifyContains_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,27 +28,19 @@
 import static test.javafx.scene.image.ImageViewConfig.config;
 import static test.javafx.scene.image.TestImages.TEST_IMAGE_100x200;
 import static test.javafx.scene.image.TestImages.TEST_IMAGE_200x100;
-import static org.junit.Assert.assertEquals;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.scene.image.ImageView;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-@RunWith(Parameterized.class)
 public class ImageView_verifyContains_Test {
 
-    private final ImageViewConfig imageViewConfig;
-    private final float x;
-    private final float y;
-    private final boolean expectedContainsResult;
-
     private ImageView imageView;
 
     /*
@@ -63,107 +55,103 @@ public class ImageView_verifyContains_Test {
      * FFF|TTT
      * FFF|TTT
      */
-    @Parameters
-    public static Collection data() {
-        return Arrays.asList(new Object[][] {
-            { config(null, 0, 0), 0, 0, false },
-            { config(TEST_IMAGE_100x200, 0, 0), 25, 50, true },
-            { config(TEST_IMAGE_100x200, 25, 50), 25 + 75, 50 + 50, false },
-            { config(TEST_IMAGE_100x200, 25, 0), 25 + 25, 150, false },
-            { config(TEST_IMAGE_100x200, 0, 50), 75, 50 + 150, true },
-            { config(TEST_IMAGE_200x100, 0, 0), 250, 75, false },
-            { config(TEST_IMAGE_200x100, 50, 25), 50 + 150, 25 + 125, false },
-            { config(TEST_IMAGE_200x100, 50, 0), 0, 25, false },
-            { config(TEST_IMAGE_200x100, 0, 25), 50, 0, false },
-            {
+    public static Stream<Arguments> data() {
+        return Stream.of(
+            Arguments.of( config(null, 0, 0), 0, 0, false ),
+            Arguments.of( config(TEST_IMAGE_100x200, 0, 0), 25, 50, true ),
+            Arguments.of( config(TEST_IMAGE_100x200, 25, 50), 25 + 75, 50 + 50, false ),
+            Arguments.of( config(TEST_IMAGE_100x200, 25, 0), 25 + 25, 150, false ),
+            Arguments.of( config(TEST_IMAGE_100x200, 0, 50), 75, 50 + 150, true ),
+            Arguments.of( config(TEST_IMAGE_200x100, 0, 0), 250, 75, false ),
+            Arguments.of( config(TEST_IMAGE_200x100, 50, 25), 50 + 150, 25 + 125, false ),
+            Arguments.of( config(TEST_IMAGE_200x100, 50, 0), 0, 25, false ),
+            Arguments.of( config(TEST_IMAGE_200x100, 0, 25), 50, 0, false ),
+            Arguments.of(
                 config(null, 0, 0, 400, 400, false),
                 200, 200, false
-            },
-            {
+            ),
+            Arguments.of(
                 config(TEST_IMAGE_100x200, 50, 0, 0, 400, false),
                 50 + 25, 100, true
-            },
-            {
+            ),
+            Arguments.of(
                 config(TEST_IMAGE_200x100, 0, 50, 400, 0, false),
                 300, 50 + 75, true
-            },
-            {
+            ),
+            Arguments.of(
                 config(TEST_IMAGE_100x200, 0, 200, 400, 400, true),
                 150, 200 + 300, true
-            },
-            {
+            ),
+            Arguments.of(
                 config(TEST_IMAGE_200x100, 200, 0, 400, 400, true),
                 200 + 100, 50, true
-            },
-            {
+            ),
+            Arguments.of(
                 config(TEST_IMAGE_100x200, 0, 0,
                        50, 0, 100, 200,
                        0, 400, true),
                 50, 300, true
-            },
-            {
+            ),
+            Arguments.of(
                 config(TEST_IMAGE_100x200, 0, 0,
                        -50, 0, 100, 200,
                        400, 400, true),
                 50, 100, false
-            },
-            {
+            ),
+            Arguments.of(
                 config(TEST_IMAGE_100x200, 0, 0,
                        50, 50, 50, 150,
                        400, 400, false),
                 395, 395, true
-            },
-            {
+            ),
+            Arguments.of(
                 config(TEST_IMAGE_200x100, 20, 10,
                        0, 50, 200, 100,
                        400, 0, true),
                 300, 50, true
-            },
-            {
+            ),
+            Arguments.of(
                 config(TEST_IMAGE_200x100, 20, 10,
                        0, -50, 200, 100,
                        400, 0, true),
                 100, 50, false
-            },
+            )
 //            /* tests for invalid viewport */
-//            {
+//            Arguments.of(
 //                config(TEST_IMAGE_200x100, 0, 0,
 //                       0, 0, 0, 100,
 //                       400, 400, true),
 //                0, 0, false
-//            },
-//            {
+//            ),
+//            Arguments.of(
 //                config(TEST_IMAGE_100x200, 0, 0,
 //                       0, 0, 100, 0,
 //                       400, 400, true),
 //                0, 0, false
-//            }
-        });
-    }
-
-    public ImageView_verifyContains_Test(final ImageViewConfig imageViewConfig,
-                                         final float x,
-                                         final float y,
-                                         final boolean expectedContainsResult) {
-        this.imageViewConfig = imageViewConfig;
-        this.x = x;
-        this.y = y;
-        this.expectedContainsResult = expectedContainsResult;
+//            )
+        );
     }
 
-    @Before
-    public void setUp() {
+    // NOTE: This should be reverted once parametrized class tests are added to JUnit5
+    //       For now, tests call this manually
+    // @BeforeEach
+    public void setUp(ImageViewConfig imageViewConfig) {
         imageView = new ImageView();
         imageViewConfig.applyTo(imageView);
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         imageView = null;
     }
 
-    @Test
-    public void verifyContains() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void verifyContains(ImageViewConfig imageViewConfig,
+                               float x,
+                               float y,
+                               boolean expectedContainsResult) {
+        setUp(imageViewConfig);
         assertEquals(expectedContainsResult,
                      imageView.contains(x, y));
     }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/image/PixelBufferTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/image/PixelBufferTest.java
index b89a6e8ecdd..61362d3bf3c 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/image/PixelBufferTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/image/PixelBufferTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,11 +34,10 @@
 import javafx.scene.image.WritableImage;
 import javafx.util.Callback;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.fail;
-
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public final class PixelBufferTest {
     private static final int WIDTH = 10;
@@ -61,65 +60,51 @@ public void testCreatePixelBufferWithByteBGRAPrePF() {
 
     @Test
     public void testCreatePixelBufferWithLessCapacityBuffer() {
-        try {
+        assertThrows(IllegalArgumentException.class, () -> {
             new PixelBuffer<>(WIDTH, HEIGHT + 1, BYTE_BUFFER, BYTE_BGRA_PRE_PF);
-            fail("Expected IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-        }
+        });
     }
 
     @Test
     public void testCreatePixelBufferDimensionsOverflow() {
-        try {
+        assertThrows(IllegalArgumentException.class, () -> {
             new PixelBuffer<>(0xFFFFF, 0xFFFFF, BYTE_BUFFER, BYTE_BGRA_PRE_PF);
-            fail("Expected IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-        }
+        });
     }
 
     @Test
     public void testCreatePixelBufferWx4xHIsMaxint() {
-        try {
+        assertThrows(IllegalArgumentException.class, () -> {
             new PixelBuffer<>(0x4000, 0x8000, BYTE_BUFFER, BYTE_BGRA_PRE_PF);
-            fail("Expected IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-        }
+        });
     }
 
     @Test
     public void testCreatePixelBufferWidth0() {
-        try {
+        assertThrows(IllegalArgumentException.class, () -> {
             new PixelBuffer<>(0, HEIGHT, BYTE_BUFFER, BYTE_BGRA_PRE_PF);
-            fail("Expected IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-        }
+        });
     }
 
     @Test
     public void testCreatePixelBufferHeight0() {
-        try {
+        assertThrows(IllegalArgumentException.class, () -> {
             new PixelBuffer<>(WIDTH, 0, BYTE_BUFFER, BYTE_BGRA_PRE_PF);
-            fail("Expected IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-        }
+        });
     }
 
     @Test
     public void testCreatePixelBufferBufferNull() {
-        try {
+        assertThrows(NullPointerException.class, () -> {
             new PixelBuffer<>(WIDTH, HEIGHT, null, BYTE_BGRA_PRE_PF);
-            fail("Expected NullPointerException");
-        } catch (NullPointerException expected) {
-        }
+        });
     }
 
     @Test
     public void testCreatePixeBufferPixelFormatNull() {
-        try {
+        assertThrows(NullPointerException.class, () -> {
             new PixelBuffer<>(WIDTH, HEIGHT, BYTE_BUFFER, null);
-            fail("Expected NullPointerException");
-        } catch (NullPointerException expected) {
-        }
+        });
     }
 
     @Test
@@ -146,12 +131,10 @@ public void testUpdatePixelBufferEmptyBufferUpdate() {
 
     @Test
     public void testUpdatePixelBufferCallbackNull() {
-        try {
+        assertThrows(NullPointerException.class, () -> {
             PixelBuffer<ByteBuffer> pixelBuffer = new PixelBuffer<>(WIDTH, HEIGHT, BYTE_BUFFER, BYTE_BGRA_PRE_PF);
             pixelBuffer.updateBuffer(null);
-            fail("Expected NullPointerException");
-        } catch (NullPointerException expected) {
-        }
+        });
     }
 
     @Test
@@ -165,76 +148,60 @@ public void testCreatePixelBufferIntArgbPrePF() {
 
     @Test
     public void testCreatePixelBufferIntArgbPreLessCapacityBuffer() {
-        try {
+        assertThrows(IllegalArgumentException.class, () -> {
             new PixelBuffer<>(WIDTH, HEIGHT + 1, INT_BUFFER, INT_ARGB_PRE_PF);
-            fail("Expected IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-        }
+        });
     }
 
     @Test
     public void testCreatePixelBufferIntArgbPreDimensionsOverflow() {
-        try {
+        assertThrows(IllegalArgumentException.class, () -> {
             new PixelBuffer<>(0xFFFFF, 0xFFFFF, INT_BUFFER, INT_ARGB_PRE_PF);
-            fail("Expected IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-        }
+        });
     }
 
     @Test
     public void testCreatePixelBufferIntArgbPreWxHIsMaxint() {
-        try {
+        assertThrows(IllegalArgumentException.class, () -> {
             new PixelBuffer<>(0x8000, 0x10000, INT_BUFFER, INT_ARGB_PRE_PF);
-            fail("Expected IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-        }
+        });
     }
 
     @Test
     public void testCreatePixelBufferIntArgbPF() {
-        try {
+        assertThrows(IllegalArgumentException.class, () -> {
             new PixelBuffer<>(WIDTH, HEIGHT, INT_BUFFER, PixelFormat.getIntArgbInstance());
-            fail("Expected IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-        }
+        });
     }
 
     @Test
     public void testCreatePixelBufferByteBgraPF() {
-        try {
+        assertThrows(IllegalArgumentException.class, () -> {
             new PixelBuffer<>(WIDTH, HEIGHT, BYTE_BUFFER, PixelFormat.getByteBgraInstance());
-            fail("Expected IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-        }
+        });
     }
 
     @Test
     public void testCreatePixelBufferByteRgbPF() {
-        try {
+        assertThrows(IllegalArgumentException.class, () -> {
             new PixelBuffer<>(WIDTH, HEIGHT, BYTE_BUFFER, PixelFormat.getByteRgbInstance());
-            fail("Expected IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-        }
+        });
     }
 
     @Test
     @SuppressWarnings("unchecked")
     public void testCreatePixelBufferIntBufferByteBgraPrePF() {
-        try {
+        assertThrows(IllegalArgumentException.class, () -> {
             new PixelBuffer(WIDTH, HEIGHT, INT_BUFFER, BYTE_BGRA_PRE_PF);
-            fail("Expected IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-        }
+        });
     }
 
     @Test
     @SuppressWarnings("unchecked")
     public void testCreatePixelBufferByteBufferIntArgbPrePF() {
-        try {
+        assertThrows(IllegalArgumentException.class, () -> {
             new PixelBuffer(WIDTH, HEIGHT, BYTE_BUFFER, INT_ARGB_PRE_PF);
-            fail("Expected IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-        }
+        });
     }
 
     @Test
@@ -248,10 +215,8 @@ public void testCreateWritableImageUsingPB() {
     public void testWritableImageGetPixelWriter() {
         PixelBuffer<ByteBuffer> pixelBuffer = new PixelBuffer<>(WIDTH, HEIGHT, BYTE_BUFFER, BYTE_BGRA_PRE_PF);
         WritableImage image = new WritableImage(pixelBuffer);
-        try {
+        assertThrows(UnsupportedOperationException.class, () -> {
             image.getPixelWriter();
-            fail("Expected UnsupportedOperationException");
-        } catch (UnsupportedOperationException expected) {
-        }
+        });
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/image/PixelFormatTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/image/PixelFormatTest.java
index 39598ffe941..333fda2ea5b 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/image/PixelFormatTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/image/PixelFormatTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,15 +25,15 @@
 
 package test.javafx.scene.image;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-
 import java.nio.ByteBuffer;
 import java.nio.IntBuffer;
 import javafx.scene.image.PixelFormat;
 import javafx.scene.image.WritablePixelFormat;
 import javafx.scene.paint.Color;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public final class PixelFormatTest {
     static Color derive(Color c, double opacity) {
@@ -55,10 +55,10 @@ static Color derive(Color c, double opacity) {
     };
 
     static void checkArgb(int argb1, int argb2, double delta) {
-        assertEquals("alpha", (argb1 >> 24) & 0xff, (argb2 >> 24) & 0xff);
-        assertEquals("red",   (argb1 >> 16) & 0xff, (argb2 >> 16) & 0xff, delta);
-        assertEquals("green", (argb1 >>  8) & 0xff, (argb2 >>  8) & 0xff, delta);
-        assertEquals("blue",  (argb1      ) & 0xff, (argb2      ) & 0xff, delta);
+        assertEquals((argb1 >> 24) & 0xff, (argb2 >> 24) & 0xff, "alpha");
+        assertEquals((argb1 >> 16) & 0xff, (argb2 >> 16) & 0xff, delta, "red");
+        assertEquals((argb1 >>  8) & 0xff, (argb2 >>  8) & 0xff, delta, "green");
+        assertEquals((argb1      ) & 0xff, (argb2      ) & 0xff, delta, "blue");
     }
 
     void test(PixelFormat<ByteBuffer> pfb, ByteBuffer bbuf, Color c,
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/ClipboardContentTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/ClipboardContentTest.java
index 47c6240fc59..dc4bdab96f8 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/ClipboardContentTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/ClipboardContentTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,8 +34,14 @@
 import java.util.Arrays;
 import javafx.scene.image.Image;
 import javafx.scene.input.ClipboardContent;
-import org.junit.Test;
-import static org.junit.Assert.*;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class ClipboardContentTest {
 
@@ -224,13 +230,15 @@ public void noFilesShouldBePutByPath() {
         assertEquals(0, cc.getFiles().size());
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void nullFilesByPathShouldRemoveFiles() {
-        ClipboardContent cc = new ClipboardContent();
-        cc.putFilesByPath(new ArrayList<String>(0));
-        cc.putFilesByPath(null);
-
-        assertFalse(cc.hasFiles());
-        assertNull(cc.getFiles());
+        assertThrows(NullPointerException.class, () -> {
+            ClipboardContent cc = new ClipboardContent();
+            cc.putFilesByPath(new ArrayList<String>(0));
+            cc.putFilesByPath(null);
+
+            assertFalse(cc.hasFiles());
+            assertNull(cc.getFiles());
+        });
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/ContextMenuEventTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/ContextMenuEventTest.java
index f86c4b2c0b9..301262995a4 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/ContextMenuEventTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/ContextMenuEventTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,11 +29,6 @@
 import test.com.sun.javafx.pgstub.StubScene;
 import javafx.event.Event;
 import javafx.scene.Group;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
 import javafx.scene.Scene;
 import javafx.scene.shape.Rectangle;
 import javafx.geometry.Point3D;
@@ -41,12 +36,17 @@
 import javafx.scene.input.PickResult;
 import javafx.stage.Stage;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class ContextMenuEventTest {
 
-    @Test public void testShortConstructor() {
+    @Test
+    public void testShortConstructor() {
         Rectangle node = new Rectangle(10, 10);
         node.setTranslateX(3);
         node.setTranslateY(2);
@@ -76,7 +76,8 @@ public class ContextMenuEventTest {
         assertTrue(e.isKeyboardTrigger());
     }
 
-    @Test public void testShortConstructorWithoutPickResult() {
+    @Test
+    public void testShortConstructorWithoutPickResult() {
         ContextMenuEvent e = new ContextMenuEvent(
                 ContextMenuEvent.CONTEXT_MENU_REQUESTED, 10, 20, 30, 40,
                 false, null);
@@ -96,7 +97,8 @@ public class ContextMenuEventTest {
         assertSame(Event.NULL_SOURCE_TARGET, e.getTarget());
     }
 
-    @Test public void testLongConstructor() {
+    @Test
+    public void testLongConstructor() {
         Rectangle node = new Rectangle(10, 10);
         node.setTranslateX(3);
         node.setTranslateY(2);
@@ -129,7 +131,8 @@ public class ContextMenuEventTest {
     }
 
 
-    @Test public void testLongConstructorWithoutPickResult() {
+    @Test
+    public void testLongConstructorWithoutPickResult() {
         Rectangle n1 = new Rectangle(10, 10);
         Rectangle n2 = new Rectangle(10, 10);
         ContextMenuEvent e = new ContextMenuEvent(n1, n2,
@@ -152,7 +155,8 @@ public class ContextMenuEventTest {
         assertEquals(0, e.getPickResult().getIntersectedPoint().getZ(), 10e-20);
     }
 
-    @Test public void mouseTriggerKeepsCoordinates() {
+    @Test
+    public void mouseTriggerKeepsCoordinates() {
         Rectangle rect = new Rectangle(100, 100);
         rect.setTranslateX(100);
         rect.setTranslateY(100);
@@ -164,12 +168,12 @@ public class ContextMenuEventTest {
         rect.requestFocus();
 
         rect.setOnContextMenuRequested(event -> {
-            Assert.assertEquals(1.0, event.getX(), 0.0001);
-            Assert.assertEquals(101, event.getSceneX(), 0.0001);
-            Assert.assertEquals(201, event.getScreenX(), 0.0001);
-            Assert.assertEquals(2.0, event.getY(), 0.0001);
-            Assert.assertEquals(102, event.getSceneY(), 0.0001);
-            Assert.assertEquals(202, event.getScreenY(), 0.0001);
+            assertEquals(1.0, event.getX(), 0.0001);
+            assertEquals(101, event.getSceneX(), 0.0001);
+            assertEquals(201, event.getScreenX(), 0.0001);
+            assertEquals(2.0, event.getY(), 0.0001);
+            assertEquals(102, event.getSceneY(), 0.0001);
+            assertEquals(202, event.getScreenY(), 0.0001);
             assertFalse(event.isKeyboardTrigger());
         });
 
@@ -177,7 +181,8 @@ public class ContextMenuEventTest {
                 101, 102, 201, 202, false);
     }
 
-    @Test public void keyTriggerSetsCoordinatesToFocusOwner() {
+    @Test
+    public void keyTriggerSetsCoordinatesToFocusOwner() {
         Rectangle rect = new Rectangle(100, 100);
         rect.setTranslateX(100);
         rect.setTranslateY(100);
@@ -189,12 +194,12 @@ public class ContextMenuEventTest {
         rect.requestFocus();
 
         rect.setOnContextMenuRequested(event -> {
-            Assert.assertEquals(25.0, event.getX(), 0.0001);
-            Assert.assertEquals(125, event.getSceneX(), 0.0001);
-            Assert.assertEquals(225, event.getScreenX(), 0.0001);
-            Assert.assertEquals(50.0, event.getY(), 0.0001);
-            Assert.assertEquals(150, event.getSceneY(), 0.0001);
-            Assert.assertEquals(250, event.getScreenY(), 0.0001);
+            assertEquals(25.0, event.getX(), 0.0001);
+            assertEquals(125, event.getSceneX(), 0.0001);
+            assertEquals(225, event.getScreenX(), 0.0001);
+            assertEquals(50.0, event.getY(), 0.0001);
+            assertEquals(150, event.getSceneY(), 0.0001);
+            assertEquals(250, event.getScreenY(), 0.0001);
             assertTrue(event.isKeyboardTrigger());
         });
 
@@ -216,24 +221,24 @@ public void shouldCompute3dCoordinates() {
         rect.requestFocus();
 
         rect.setOnContextMenuRequested(event -> {
-            Assert.assertEquals(1.0, event.getX(), 0.0001);
-            Assert.assertEquals(101, event.getSceneX(), 0.0001);
-            Assert.assertEquals(201, event.getScreenX(), 0.0001);
-            Assert.assertEquals(2.0, event.getY(), 0.0001);
-            Assert.assertEquals(102, event.getSceneY(), 0.0001);
-            Assert.assertEquals(202, event.getScreenY(), 0.0001);
-            Assert.assertEquals(0, event.getZ(), 0.0001);
+            assertEquals(1.0, event.getX(), 0.0001);
+            assertEquals(101, event.getSceneX(), 0.0001);
+            assertEquals(201, event.getScreenX(), 0.0001);
+            assertEquals(2.0, event.getY(), 0.0001);
+            assertEquals(102, event.getSceneY(), 0.0001);
+            assertEquals(202, event.getScreenY(), 0.0001);
+            assertEquals(0, event.getZ(), 0.0001);
             assertFalse(event.isKeyboardTrigger());
         });
 
         scene.setOnContextMenuRequested(event -> {
-            Assert.assertEquals(101.0, event.getX(), 0.0001);
-            Assert.assertEquals(101, event.getSceneX(), 0.0001);
-            Assert.assertEquals(201, event.getScreenX(), 0.0001);
-            Assert.assertEquals(102.0, event.getY(), 0.0001);
-            Assert.assertEquals(102, event.getSceneY(), 0.0001);
-            Assert.assertEquals(202, event.getScreenY(), 0.0001);
-            Assert.assertEquals(50, event.getZ(), 0.0001);
+            assertEquals(101.0, event.getX(), 0.0001);
+            assertEquals(101, event.getSceneX(), 0.0001);
+            assertEquals(201, event.getScreenX(), 0.0001);
+            assertEquals(102.0, event.getY(), 0.0001);
+            assertEquals(102, event.getSceneY(), 0.0001);
+            assertEquals(202, event.getScreenY(), 0.0001);
+            assertEquals(50, event.getZ(), 0.0001);
             assertFalse(event.isKeyboardTrigger());
         });
 
@@ -241,7 +246,8 @@ public void shouldCompute3dCoordinates() {
                 101, 102, 201, 202, false);
     }
 
-    @Test public void pickResultIsFromEventCoordinates() {
+    @Test
+    public void pickResultIsFromEventCoordinates() {
         final Rectangle rect = new Rectangle(100, 100);
         rect.setTranslateX(100);
         rect.setTranslateY(100);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/DataFormatTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/DataFormatTest.java
index acf9a276af8..6d1fd0fc7f9 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/DataFormatTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/DataFormatTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,46 +25,40 @@
 
 package test.javafx.scene.input;
 
-import java.util.Collection;
-import org.junit.runners.Parameterized.Parameters;
-import org.junit.runners.Parameterized;
-import java.util.Arrays;
+import java.util.stream.Stream;
 import javafx.scene.input.DataFormat;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import static org.junit.Assert.*;
 
-@RunWith(Parameterized.class)
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 public class DataFormatTest {
 
     static DataFormat customFormat = new DataFormat("Custom1", "Custom2");
     static DataFormat uniqueFormat = new DataFormat("Unique");
 
-    @Parameters
-    public static Collection getParams() {
-        return Arrays.asList(new Object[][] {
-            { DataFormat.PLAIN_TEXT, "text/plain", null },
-            { DataFormat.HTML, "text/html", null },
-            { DataFormat.RTF, "text/rtf", null },
-            { DataFormat.URL, "text/uri-list", null },
-            { DataFormat.IMAGE, "application/x-java-rawimage", null },
-            { DataFormat.FILES, "application/x-java-file-list",  "java.file-list" },
-            { customFormat, "Custom1", "Custom2" }
-        });
-    }
 
-    private DataFormat format;
-    private String mime1;
-    private String mime2;
-
-    public DataFormatTest(DataFormat format, String mime1, String mime2) {
-        this.format = format;
-        this.mime1 = mime1;
-        this.mime2 = mime2;
+    public static Stream<Arguments> getParams() {
+        return Stream.of(
+            Arguments.of( DataFormat.PLAIN_TEXT, "text/plain", null ),
+            Arguments.of( DataFormat.HTML, "text/html", null ),
+            Arguments.of( DataFormat.RTF, "text/rtf", null ),
+            Arguments.of( DataFormat.URL, "text/uri-list", null ),
+            Arguments.of( DataFormat.IMAGE, "application/x-java-rawimage", null ),
+            Arguments.of( DataFormat.FILES, "application/x-java-file-list",  "java.file-list" ),
+            Arguments.of( customFormat, "Custom1", "Custom2" )
+        );
     }
 
-    @Test
-    public void testMimeTypes() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testMimeTypes(DataFormat format, String mime1, String mime2) {
         assertEquals(mime2 != null ? 2 : 1, format.getIdentifiers().size());
         assertTrue(format.getIdentifiers().contains(mime1));
         if (mime2 != null) {
@@ -72,29 +66,35 @@ public void testMimeTypes() {
         }
     }
 
-    @Test
-    public void dataFormatsShouldBeFound() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void dataFormatsShouldBeFound(DataFormat format, String mime1, String mime2) {
         assertSame(format, DataFormat.lookupMimeType(mime1));
         if (mime2 != null) {
             assertSame(format, DataFormat.lookupMimeType(mime2));
         }
     }
 
-    @Test
-    public void testToString() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testToString(DataFormat format, String mime1, String mime2) {
         assertNotNull(customFormat.toString());
         assertFalse("".equals(customFormat.toString()));
     }
 
-    @Test(expected=IllegalArgumentException.class)
-    public void shouldNotBePossibleToReuseMimeTypes() {
-        DataFormat customEqual = new DataFormat(format.getIdentifiers().toArray(
-                new String[format.getIdentifiers().size()]));
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void shouldNotBePossibleToReuseMimeTypes(DataFormat format, String mime1, String mime2) {
+        assertThrows(IllegalArgumentException.class, () -> {
+            DataFormat customEqual = new DataFormat(format.getIdentifiers().toArray(
+                    new String[format.getIdentifiers().size()]));
+        });
     }
 
 
-    @Test
-    public void testEqualsAndHashCode() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testEqualsAndHashCode(DataFormat format, String mime1, String mime2) {
         //cannot have two different equal data formats
         assertEquals(format, format);
         assertEquals(format.hashCode(), format.hashCode());
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/DragAndDropTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/DragAndDropTest.java
index 855f1e414bb..ff025b7615c 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/DragAndDropTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/DragAndDropTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,6 @@
 package test.javafx.scene.input;
 
 import com.sun.javafx.scene.SceneHelper;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
 
 import java.security.AccessControlContext;
 import java.util.ArrayList;
@@ -45,11 +43,6 @@
 import javafx.stage.Stage;
 import javafx.util.Pair;
 
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
 import test.com.sun.javafx.pgstub.StubToolkit;
 import com.sun.javafx.tk.TKClipboard;
 import com.sun.javafx.tk.TKDragGestureListener;
@@ -69,11 +62,17 @@
 import javafx.scene.input.MouseEvent;
 import javafx.scene.input.PickResult;
 import javafx.scene.input.TransferMode;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class DragAndDropTest {
 
@@ -82,7 +81,7 @@ public class DragAndDropTest {
     private boolean detected;
     private Node dragSource;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         counter = 0;
         detected = false;
@@ -90,7 +89,7 @@ public void setUp() {
         ((StubToolkit) Toolkit.getToolkit()).setDndDelegate(toolkit);
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         ((StubToolkit) Toolkit.getToolkit()).setDndDelegate(null);
         toolkit = null;
@@ -935,8 +934,8 @@ public void dropDoneShouldBeSentToGestureSource() {
             event.setDropCompleted(true);
         });
         src.getParent().setOnDragDone(event -> {
-            Assert.assertEquals(TransferMode.MOVE, event.getTransferMode());
-            Assert.assertEquals(TransferMode.MOVE, event.getAcceptedTransferMode());
+            assertEquals(TransferMode.MOVE, event.getTransferMode());
+            assertEquals(TransferMode.MOVE, event.getAcceptedTransferMode());
             counter++;
         });
 
@@ -1449,16 +1448,16 @@ public void shouldCompute3dCoordinates() {
         n.setOnDragDetected(stringSource(TransferMode.ANY));
         n.setOnDragOver(event -> {
             counter++;
-            Assert.assertEquals(52, event.getX(), 0.00001);
-            Assert.assertEquals(52, event.getY(), 0.00001);
-            Assert.assertEquals(0, event.getZ(), 0.00001);
+            assertEquals(52, event.getX(), 0.00001);
+            assertEquals(52, event.getY(), 0.00001);
+            assertEquals(0, event.getZ(), 0.00001);
         });
 
         n.getScene().setOnDragOver(event -> {
             counter++;
-            Assert.assertEquals(52, event.getX(), 0.00001);
-            Assert.assertEquals(52, event.getY(), 0.00001);
-            Assert.assertEquals(50, event.getZ(), 0.00001);
+            assertEquals(52, event.getX(), 0.00001);
+            assertEquals(52, event.getY(), 0.00001);
+            assertEquals(50, event.getZ(), 0.00001);
         });
 
         SceneHelper.processMouseEvent(n.getScene(),
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/GestureEventTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/GestureEventTest.java
index 13848f4d6f6..30e0b7e1f9b 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/GestureEventTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/GestureEventTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,16 +31,18 @@
 import javafx.scene.input.GestureEventShim;
 import javafx.scene.input.PickResult;
 import javafx.scene.shape.Rectangle;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class GestureEventTest {
 
-    @Test public void testShortConstructor() {
+    @Test
+    public void testShortConstructor() {
         Rectangle node = new Rectangle();
         node.setTranslateX(3);
         node.setTranslateY(2);
@@ -81,7 +83,8 @@ public class GestureEventTest {
         assertFalse(e.isInertia());
     }
 
-    @Test public void testShortConstructorWithoutPickResult() {
+    @Test
+    public void testShortConstructorWithoutPickResult() {
         GestureEvent e = GestureEventShim.getGestureEvent(
                 GestureEvent.ANY, 10, 20, 30, 40,
                 false, true, false, true, false, true, null);
@@ -102,7 +105,8 @@ public class GestureEventTest {
         assertSame(Event.NULL_SOURCE_TARGET, e.getTarget());
     }
 
-    @Test public void testLongConstructor() {
+    @Test
+    public void testLongConstructor() {
         Rectangle node = new Rectangle(10, 10);
         node.setTranslateX(3);
         node.setTranslateY(2);
@@ -147,7 +151,8 @@ public class GestureEventTest {
     }
 
 
-    @Test public void testLongConstructorWithoutPickResult() {
+    @Test
+    public void testLongConstructorWithoutPickResult() {
         Rectangle n1 = new Rectangle(10, 10);
         Rectangle n2 = new Rectangle(10, 10);
         GestureEvent e = GestureEventShim.getGestureEvent(
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/InputEventTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/InputEventTest.java
index 07ec9adc31c..260ed30c099 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/InputEventTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/InputEventTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,13 +28,15 @@
 import javafx.event.Event;
 import javafx.scene.input.InputEvent;
 import javafx.scene.shape.Rectangle;
-import org.junit.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertSame;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 public class InputEventTest {
 
-    @Test public void testShortConstructor() {
+    @Test
+    public void testShortConstructor() {
         Rectangle node = new Rectangle(10, 10);
         node.setTranslateX(3);
         node.setTranslateY(2);
@@ -47,7 +49,8 @@ public class InputEventTest {
         assertSame(Event.NULL_SOURCE_TARGET, e.getTarget());
     }
 
-    @Test public void testLongConstructor() {
+    @Test
+    public void testLongConstructor() {
         Rectangle n1 = new Rectangle(10, 10);
         Rectangle n2 = new Rectangle(10, 10);
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/InputMethodEventTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/InputMethodEventTest.java
index 1ae4f68d678..bef82a75170 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/InputMethodEventTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/InputMethodEventTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,17 +25,16 @@
 
 package test.javafx.scene.input;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
 import javafx.collections.ObservableList;
 import javafx.scene.Node;
 import javafx.scene.input.InputMethodEvent;
 import javafx.scene.input.InputMethodTextRun;
 
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 public class InputMethodEventTest {
     private final Node node1 = new TestNode();
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/InputMethodTextRunTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/InputMethodTextRunTest.java
index 0abc0662488..10f53b4d636 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/InputMethodTextRunTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/InputMethodTextRunTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,12 +27,12 @@
 
 import javafx.scene.input.InputMethodHighlight;
 import javafx.scene.input.InputMethodTextRun;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 public class InputMethodTextRunTest {
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/KeyCodeTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/KeyCodeTest.java
index f425a6b171a..fbb4d08c838 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/KeyCodeTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/KeyCodeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,11 +27,11 @@
 
 import com.sun.javafx.scene.input.KeyCodeMap;
 import javafx.scene.input.KeyCode;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 public class KeyCodeTest {
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/KeyCombinationTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/KeyCombinationTest.java
index c39270cd13b..82e43d346a2 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/KeyCombinationTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/KeyCombinationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,9 +30,6 @@
 import static javafx.scene.input.KeyCombination.CONTROL_DOWN;
 import static javafx.scene.input.KeyCombination.SHIFT_ANY;
 import static javafx.scene.input.KeyCombination.SHIFT_DOWN;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -40,10 +37,6 @@
 import javafx.event.Event;
 import javafx.scene.input.KeyCombination.ModifierValue;
 
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
 import test.com.sun.javafx.pgstub.StubToolkit;
 import com.sun.javafx.scene.input.KeyCodeMap;
 import com.sun.javafx.tk.Toolkit;
@@ -53,6 +46,14 @@
 import javafx.scene.input.KeyCombination;
 import javafx.scene.input.KeyEvent;
 
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 
 public class KeyCombinationTest {
     final KeyEvent ctrlAltQEvent = new KeyEvent(null, Event.NULL_SOURCE_TARGET, KeyEvent.KEY_PRESSED,
@@ -85,7 +86,7 @@ public class KeyCombinationTest {
     final KeyEvent altShiftQuoteEvent = new KeyEvent(null, Event.NULL_SOURCE_TARGET, KeyEvent.KEY_PRESSED,
             "~", null, KeyCodeMap.valueOf(0xDE), true, false, true, false);
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpCharToKeyCodeMap() {
         final Map<String, KeyCode> charToKeyCodeMap =
                 new HashMap<>();
@@ -118,7 +119,7 @@ public static void setUpCharToKeyCodeMap() {
                 charToKeyCodeMap);
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDownCharToKeyCodeMap() {
         ((StubToolkit) Toolkit.getToolkit()).setCharToKeyCodeMap(null);
     }
@@ -364,140 +365,184 @@ public void testKeyCombinationWithShortcutModifier() {
         assertTrue(altIgnoreShortcutC.match(metaAltC));
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void constructor1ShouldThrowNPEForNullKeyCode() {
-        new KeyCodeCombination(null, ModifierValue.UP,
-                                     ModifierValue.UP,
-                                     ModifierValue.UP,
-                                     ModifierValue.UP,
-                                     ModifierValue.UP);
+        assertThrows(NullPointerException.class, () -> {
+            new KeyCodeCombination(null, ModifierValue.UP,
+                                         ModifierValue.UP,
+                                         ModifierValue.UP,
+                                         ModifierValue.UP,
+                                         ModifierValue.UP);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void constructor1ShouldThrowNPEForNullKeyCharacter() {
-        new KeyCharacterCombination(null, ModifierValue.UP,
-                                          ModifierValue.UP,
-                                          ModifierValue.UP,
-                                          ModifierValue.UP,
-                                          ModifierValue.UP);
+        assertThrows(NullPointerException.class, () -> {
+            new KeyCharacterCombination(null, ModifierValue.UP,
+                                              ModifierValue.UP,
+                                              ModifierValue.UP,
+                                              ModifierValue.UP,
+                                              ModifierValue.UP);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void constructor1ShouldThrowNPEForNullModifier() {
-        new KeyCodeCombination(KeyCode.Q, ModifierValue.UP,
-                                          null,
-                                          ModifierValue.UP,
-                                          ModifierValue.UP,
-                                          ModifierValue.UP);
-    }
-
-    @Test(expected=IllegalArgumentException.class)
-    public void constructor1ShouldThrowIAEForModifierKeyCode() {
-        new KeyCodeCombination(KeyCode.SHIFT, ModifierValue.UP,
-                                              ModifierValue.UP,
+        assertThrows(NullPointerException.class, () -> {
+            new KeyCodeCombination(KeyCode.Q, ModifierValue.UP,
+                                              null,
                                               ModifierValue.UP,
                                               ModifierValue.UP,
                                               ModifierValue.UP);
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
-    public void constructor1ShouldThrowIAEForUndefinedKeyCode() {
-        new KeyCodeCombination(KeyCode.UNDEFINED, ModifierValue.UP,
+    @Test
+    public void constructor1ShouldThrowIAEForModifierKeyCode() {
+        assertThrows(IllegalArgumentException.class, () -> {
+            new KeyCodeCombination(KeyCode.SHIFT, ModifierValue.UP,
                                                   ModifierValue.UP,
                                                   ModifierValue.UP,
                                                   ModifierValue.UP,
                                                   ModifierValue.UP);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
+    public void constructor1ShouldThrowIAEForUndefinedKeyCode() {
+        assertThrows(IllegalArgumentException.class, () -> {
+            new KeyCodeCombination(KeyCode.UNDEFINED, ModifierValue.UP,
+                                                      ModifierValue.UP,
+                                                      ModifierValue.UP,
+                                                      ModifierValue.UP,
+                                                      ModifierValue.UP);
+        });
+    }
+
+    @Test
     public void constructor2ShouldThrowNPEForNullKeyCode() {
-        new KeyCodeCombination(null);
+        assertThrows(NullPointerException.class, () -> {
+            new KeyCodeCombination(null);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void constructor2ShouldThrowNPEForNullKeyCharacter() {
-        new KeyCharacterCombination(null);
+        assertThrows(NullPointerException.class, () -> {
+            new KeyCharacterCombination(null);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void constructor2ShouldThrowNPEForNullModifier() {
-        new KeyCharacterCombination("q", ALT_DOWN, null, SHIFT_ANY);
+        assertThrows(NullPointerException.class, () -> {
+            new KeyCharacterCombination("q", ALT_DOWN, null, SHIFT_ANY);
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void constructor2ShouldThrowIAEForModifierKeyCode() {
-        new KeyCodeCombination(KeyCode.CONTROL);
+        assertThrows(IllegalArgumentException.class, () -> {
+            new KeyCodeCombination(KeyCode.CONTROL);
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void constructor2ShouldThrowIAEForUndefinedKeyCode() {
-        new KeyCodeCombination(KeyCode.UNDEFINED);
+        assertThrows(IllegalArgumentException.class, () -> {
+            new KeyCodeCombination(KeyCode.UNDEFINED);
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void constructor2ShouldThrowIAEForDuplicateModifiers() {
-        new KeyCodeCombination(KeyCode.Q,
-                               ALT_DOWN,
-                               CONTROL_DOWN,
-                               ALT_DOWN);
+        assertThrows(IllegalArgumentException.class, () -> {
+            new KeyCodeCombination(KeyCode.Q,
+                                   ALT_DOWN,
+                                   CONTROL_DOWN,
+                                   ALT_DOWN);
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void constructor2ShouldThrowIAEForConflictingModifiers() {
-        new KeyCodeCombination(KeyCode.Q,
-                               SHIFT_DOWN,
-                               CONTROL_ANY,
-                               SHIFT_ANY);
+        assertThrows(IllegalArgumentException.class, () -> {
+            new KeyCodeCombination(KeyCode.Q,
+                                   SHIFT_DOWN,
+                                   CONTROL_ANY,
+                                   SHIFT_ANY);
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void keyCombinationShouldThrowIAEForDuplicateModifiers() {
-        KeyCombination.keyCombination("Ctrl + Shift + Ctrl + Q");
+        assertThrows(IllegalArgumentException.class, () -> {
+            KeyCombination.keyCombination("Ctrl + Shift + Ctrl + Q");
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void keyCombinationShouldThrowIAEForConflictingModifiers() {
-        KeyCombination.keyCombination("Ctrl + Ignore Shift + Alt + Shift + Q");
+        assertThrows(IllegalArgumentException.class, () -> {
+            KeyCombination.keyCombination("Ctrl + Ignore Shift + Alt + Shift + Q");
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void keyCombinationShouldThrowIAEForMissingMainKey() {
-        KeyCombination.keyCombination("Ctrl + Shift");
+        assertThrows(IllegalArgumentException.class, () -> {
+            KeyCombination.keyCombination("Ctrl + Shift");
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void keyCombinationShouldThrowIAEForUndefinedMainKey() {
-        KeyCombination.keyCombination("Ctrl + Shift + Undefined");
+        assertThrows(IllegalArgumentException.class, () -> {
+            KeyCombination.keyCombination("Ctrl + Shift + Undefined");
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void keyCombinationShouldThrowIAEForExtraMainKey1() {
-        KeyCombination.keyCombination("Ctrl + Shift + Q + 'W'");
+        assertThrows(IllegalArgumentException.class, () -> {
+            KeyCombination.keyCombination("Ctrl + Shift + Q + 'W'");
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void keyCombinationShouldThrowIAEForExtraMainKey2() {
-        KeyCombination.keyCombination("Ctrl + Shift + 'W' + Q");
+        assertThrows(IllegalArgumentException.class, () -> {
+            KeyCombination.keyCombination("Ctrl + Shift + 'W' + Q");
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void keyCombinationShouldThrowIAEForInvalidSyntax1() {
-        KeyCombination.keyCombination("  +  Ctrl + Q");
+        assertThrows(IllegalArgumentException.class, () -> {
+            KeyCombination.keyCombination("  +  Ctrl + Q");
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void keyCombinationShouldThrowIAEForInvalidSyntax2() {
-        KeyCombination.keyCombination("Ctrl ++ Q");
+        assertThrows(IllegalArgumentException.class, () -> {
+            KeyCombination.keyCombination("Ctrl ++ Q");
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void keyCombinationShouldThrowIAEForInvalidSyntax3() {
-        KeyCombination.keyCombination("Ctrl + Q +");
+        assertThrows(IllegalArgumentException.class, () -> {
+            KeyCombination.keyCombination("Ctrl + Q +");
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void keyCombinationShouldThrowIAEForUnclosedQuote() {
-        KeyCombination.keyCombination("Quote '");
+        assertThrows(IllegalArgumentException.class, () -> {
+            KeyCombination.keyCombination("Quote '");
+        });
     }
 
     @Test
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/KeyCombination_objectMethods_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/KeyCombination_objectMethods_Test.java
index f0857194702..fbf82dd753a 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/KeyCombination_objectMethods_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/KeyCombination_objectMethods_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,8 +32,7 @@
 import static javafx.scene.input.KeyCombination.SHORTCUT_ANY;
 import static javafx.scene.input.KeyCombination.SHORTCUT_DOWN;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.scene.input.KeyCharacterCombination;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyCodeCombination;
@@ -41,128 +40,119 @@
 
 import javafx.scene.input.KeyCombination.ModifierValue;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
 import test.com.sun.javafx.test.ObjectMethodsTestBase;
 
-@RunWith(Parameterized.class)
-public final class KeyCombination_objectMethods_Test
-        extends ObjectMethodsTestBase {
-    @Parameters
-    public static Collection data() {
-        return Arrays.asList(new Object[] {
-                equalObjects(
-                        new KeyCodeCombination(KeyCode.R,
-                                               ModifierValue.ANY,
-                                               ModifierValue.DOWN,
-                                               ModifierValue.UP,
-                                               ModifierValue.UP,
-                                               ModifierValue.ANY),
-                        new KeyCodeCombination(KeyCode.R,
-                                               CONTROL_DOWN,
-                                               SHIFT_ANY,
-                                               SHORTCUT_ANY),
-                        KeyCombination.keyCombination(
-                                "Ignore Shortcut + Ctrl + Ignore Shift + R")),
-                equalObjects(
-                        new KeyCodeCombination(KeyCode.C,
-                                               ModifierValue.UP,
-                                               ModifierValue.UP,
-                                               ModifierValue.UP,
-                                               ModifierValue.UP,
-                                               ModifierValue.DOWN),
-                        new KeyCodeCombination(KeyCode.C,
-                                               SHORTCUT_DOWN),
-                        KeyCombination.keyCombination("Shortcut + C")),
-                equalObjects(
-                        new KeyCharacterCombination("x",
-                                                    ModifierValue.UP,
-                                                    ModifierValue.UP,
-                                                    ModifierValue.ANY,
-                                                    ModifierValue.DOWN,
-                                                    ModifierValue.UP),
-                        new KeyCharacterCombination(
-                                "x",
-                                ALT_ANY,
-                                META_DOWN),
-                        KeyCombination.keyCombination(
-                                "Ignore Alt + Meta + 'x'")),
-                differentObjects(
-                        new KeyCodeCombination(KeyCode.R,
-                                               ModifierValue.ANY,
-                                               ModifierValue.DOWN,
-                                               ModifierValue.UP,
-                                               ModifierValue.UP,
-                                               ModifierValue.UP),
-                        new KeyCodeCombination(KeyCode.A,
-                                               CONTROL_DOWN,
-                                               SHIFT_ANY),
-                        new KeyCodeCombination(KeyCode.R,
-                                               CONTROL_DOWN,
-                                               SHIFT_ANY,
-                                               ALT_ANY),
-                        KeyCombination.keyCombination(
-                                "Ctrl + Shift + R"),
-                        KeyCombination.keyCombination(
-                                "Ignore Shift + R"),
-                        KeyCombination.keyCombination(
-                                "Ctrl + Ignore Shift + K")),
-                differentObjects(
-                        new KeyCharacterCombination("x",
-                                                    ModifierValue.UP,
-                                                    ModifierValue.UP,
-                                                    ModifierValue.ANY,
-                                                    ModifierValue.DOWN,
-                                                    ModifierValue.UP),
-                        new KeyCharacterCombination("X",
-                                                    ModifierValue.UP,
-                                                    ModifierValue.UP,
-                                                    ModifierValue.ANY,
-                                                    ModifierValue.DOWN,
-                                                    ModifierValue.UP),
-                        new KeyCharacterCombination(
-                                "y",
-                                ALT_ANY,
-                                META_DOWN),
-                        new KeyCharacterCombination(
-                                "x",
-                                ALT_ANY,
-                                META_DOWN,
-                                SHORTCUT_DOWN),
-                        new KeyCharacterCombination(
-                                "x",
-                                ALT_ANY),
-                        KeyCombination.keyCombination(
-                                "Alt + Meta + 'x'"),
-                        KeyCombination.keyCombination(
-                                "Ignore Alt + Meta + Ctrl + 'x'"),
-                        KeyCombination.keyCombination(
-                                "Ignore Alt + Meta + 'z'")),
-                differentObjectsMediumHashcode(
-                        new KeyCodeCombination(KeyCode.Q,
-                                               ModifierValue.UP,
-                                               ModifierValue.UP,
-                                               ModifierValue.ANY,
-                                               ModifierValue.DOWN,
-                                               ModifierValue.UP),
-                        new KeyCharacterCombination("Q",
-                                                    ModifierValue.UP,
-                                                    ModifierValue.UP,
-                                                    ModifierValue.ANY,
-                                                    ModifierValue.DOWN,
-                                                    ModifierValue.UP),
-                        KeyCombination.keyCombination("Ctrl + Alt + 'X'"),
-                        KeyCombination.keyCombination("Ctrl + Alt + X"),
-                        new KeyCombination() {
-                        },
-                        new Object())
-            });
-    }
+import org.junit.jupiter.params.provider.Arguments;
+
+public final class KeyCombination_objectMethods_Test extends ObjectMethodsTestBase {
 
-    public KeyCombination_objectMethods_Test(
-            final Configuration configuration) {
-        super(configuration);
+    public static Stream<Arguments> data() {
+        return Stream.of(
+            equalObjects(
+                new KeyCodeCombination(KeyCode.R,
+                                       ModifierValue.ANY,
+                                       ModifierValue.DOWN,
+                                       ModifierValue.UP,
+                                       ModifierValue.UP,
+                                       ModifierValue.ANY),
+                new KeyCodeCombination(KeyCode.R,
+                                       CONTROL_DOWN,
+                                       SHIFT_ANY,
+                                       SHORTCUT_ANY),
+                KeyCombination.keyCombination(
+                        "Ignore Shortcut + Ctrl + Ignore Shift + R")),
+            equalObjects(
+                new KeyCodeCombination(KeyCode.C,
+                                       ModifierValue.UP,
+                                       ModifierValue.UP,
+                                       ModifierValue.UP,
+                                       ModifierValue.UP,
+                                       ModifierValue.DOWN),
+                new KeyCodeCombination(KeyCode.C,
+                                       SHORTCUT_DOWN),
+                KeyCombination.keyCombination("Shortcut + C")),
+            equalObjects(
+                new KeyCharacterCombination("x",
+                                            ModifierValue.UP,
+                                            ModifierValue.UP,
+                                            ModifierValue.ANY,
+                                            ModifierValue.DOWN,
+                                            ModifierValue.UP),
+                new KeyCharacterCombination(
+                        "x",
+                        ALT_ANY,
+                        META_DOWN),
+                KeyCombination.keyCombination(
+                        "Ignore Alt + Meta + 'x'")),
+            differentObjects(
+                new KeyCodeCombination(KeyCode.R,
+                                        ModifierValue.ANY,
+                                        ModifierValue.DOWN,
+                                        ModifierValue.UP,
+                                        ModifierValue.UP,
+                                        ModifierValue.UP),
+                new KeyCodeCombination(KeyCode.A,
+                                        CONTROL_DOWN,
+                                        SHIFT_ANY),
+                new KeyCodeCombination(KeyCode.R,
+                                        CONTROL_DOWN,
+                                        SHIFT_ANY,
+                                        ALT_ANY),
+                KeyCombination.keyCombination(
+                        "Ctrl + Shift + R"),
+                KeyCombination.keyCombination(
+                        "Ignore Shift + R"),
+                KeyCombination.keyCombination(
+                        "Ctrl + Ignore Shift + K")),
+            differentObjects(
+                new KeyCharacterCombination("x",
+                                            ModifierValue.UP,
+                                            ModifierValue.UP,
+                                            ModifierValue.ANY,
+                                            ModifierValue.DOWN,
+                                            ModifierValue.UP),
+                new KeyCharacterCombination("X",
+                                            ModifierValue.UP,
+                                            ModifierValue.UP,
+                                            ModifierValue.ANY,
+                                            ModifierValue.DOWN,
+                                            ModifierValue.UP),
+                new KeyCharacterCombination(
+                        "y",
+                        ALT_ANY,
+                        META_DOWN),
+                new KeyCharacterCombination(
+                        "x",
+                        ALT_ANY,
+                        META_DOWN,
+                        SHORTCUT_DOWN),
+                new KeyCharacterCombination(
+                        "x",
+                        ALT_ANY),
+                KeyCombination.keyCombination(
+                        "Alt + Meta + 'x'"),
+                KeyCombination.keyCombination(
+                        "Ignore Alt + Meta + Ctrl + 'x'"),
+                KeyCombination.keyCombination(
+                        "Ignore Alt + Meta + 'z'")),
+            differentObjectsMediumHashcode(
+                new KeyCodeCombination(KeyCode.Q,
+                                        ModifierValue.UP,
+                                        ModifierValue.UP,
+                                        ModifierValue.ANY,
+                                        ModifierValue.DOWN,
+                                        ModifierValue.UP),
+                new KeyCharacterCombination("Q",
+                                            ModifierValue.UP,
+                                            ModifierValue.UP,
+                                            ModifierValue.ANY,
+                                            ModifierValue.DOWN,
+                                            ModifierValue.UP),
+                KeyCombination.keyCombination("Ctrl + Alt + 'X'"),
+                KeyCombination.keyCombination("Ctrl + Alt + X"),
+                new KeyCombination() {
+                },
+                new Object())
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/KeyEventTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/KeyEventTest.java
index 23a07087667..1b850a9fafa 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/KeyEventTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/KeyEventTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,17 +26,17 @@
 package test.javafx.scene.input;
 
 import com.sun.javafx.scene.input.KeyCodeMap;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
 import javafx.scene.Node;
 import javafx.event.EventTarget;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class KeyEventTest {
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/MouseDragEventTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/MouseDragEventTest.java
index 6221c8eeddf..c5f6cad5941 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/MouseDragEventTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/MouseDragEventTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,8 +42,12 @@
 import javafx.scene.input.MouseEvent;
 import javafx.scene.input.PickResult;
 
-import static org.junit.Assert.*;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class MouseDragEventTest {
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/MouseEventTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/MouseEventTest.java
index e09e236cd4d..3d5fb80f33a 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/MouseEventTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/MouseEventTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,13 +33,13 @@
 import javafx.scene.input.MouseEvent;
 import javafx.scene.input.PickResult;
 import javafx.scene.shape.Rectangle;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class MouseEventTest {
 
@@ -50,7 +50,8 @@ public class MouseEventTest {
             11, 12, 13, 14, MouseButton.PRIMARY, 2,
             true, false, true, false, false, true, false, false, true, false, null);
 
-    @Test public void testShortConstructor() {
+    @Test
+    public void testShortConstructor() {
         Rectangle node = new Rectangle();
         node.setTranslateX(3);
         node.setTranslateY(2);
@@ -111,7 +112,8 @@ public class MouseEventTest {
         assertFalse(e.isStillSincePress());
     }
 
-    @Test public void testToStringMatchingBrackets() {
+    @Test
+    public void testToStringMatchingBrackets() {
         Rectangle node = new Rectangle();
         node.setTranslateX(3);
         node.setTranslateY(2);
@@ -142,14 +144,15 @@ public class MouseEventTest {
                     break;
                 case ']':
                     --bracketCount;
-                    assertTrue("Too many closing brackets: " + str, bracketCount >= 0);
+                    assertTrue(bracketCount >= 0, "Too many closing brackets: " + str);
                     break;
             }
         }
-        assertEquals("Too few closing brackets: " + str, 0, bracketCount);
+        assertEquals(0, bracketCount, "Too few closing brackets: " + str);
     }
 
-    @Test public void testShortConstructorWithoutPickResult() {
+    @Test
+    public void testShortConstructorWithoutPickResult() {
         MouseDragEvent e = new MouseDragEvent(MouseDragEvent.MOUSE_DRAG_OVER,
                 10, 20, 30, 40, MouseButton.MIDDLE, 3,
                 true, false, false, true,
@@ -171,7 +174,8 @@ public class MouseEventTest {
         assertSame(Event.NULL_SOURCE_TARGET, e.getTarget());
     }
 
-    @Test public void testLongConstructor() {
+    @Test
+    public void testLongConstructor() {
         Rectangle n1 = new Rectangle(10, 10);
         Rectangle n2 = new Rectangle(10, 10);
         Rectangle node = new Rectangle();
@@ -236,7 +240,8 @@ public class MouseEventTest {
         assertFalse(e.isStillSincePress());
     }
 
-    @Test public void testLongConstructorWithoutPickResult() {
+    @Test
+    public void testLongConstructorWithoutPickResult() {
         Rectangle n1 = new Rectangle(10, 10);
         Rectangle n2 = new Rectangle(10, 10);
         MouseEvent e = new MouseEvent(n1, n2, MouseEvent.MOUSE_DRAGGED,
@@ -260,7 +265,8 @@ public class MouseEventTest {
         assertEquals(0, e.getPickResult().getIntersectedPoint().getZ(), 10e-20);
     }
 
-    @Test public void testFullConstructorWithoutPickResult() {
+    @Test
+    public void testFullConstructorWithoutPickResult() {
         Rectangle n1 = new Rectangle(10, 10);
         Rectangle n2 = new Rectangle(10, 10);
         MouseEvent e = new MouseEvent(n1, n2, MouseEvent.MOUSE_DRAGGED,
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/RotateEventTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/RotateEventTest.java
index ada87de4109..5a765d6a28d 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/RotateEventTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/RotateEventTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,9 +38,13 @@
 import javafx.scene.input.RotateEvent;
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
-import org.junit.Assert;
-import org.junit.Test;
-import static org.junit.Assert.*;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class RotateEventTest {
 
@@ -218,8 +222,8 @@ public void shouldPassAngles() {
 
         rotated = false;
         rect.setOnRotate(event -> {
-            Assert.assertEquals(90, event.getAngle(), 0.0001);
-            Assert.assertEquals(-180, event.getTotalAngle(), 0.0001);
+            assertEquals(90, event.getAngle(), 0.0001);
+            assertEquals(-180, event.getTotalAngle(), 0.0001);
             rotated = true;
         });
 
@@ -421,16 +425,16 @@ public void shouldCompute3dCoordinates() {
         rotated = false;
         rotated2 = false;
         rect.setOnRotate(event -> {
-            Assert.assertEquals(150, event.getX(), 0.00001);
-            Assert.assertEquals(150, event.getY(), 0.00001);
-            Assert.assertEquals(0, event.getZ(), 0.00001);
+            assertEquals(150, event.getX(), 0.00001);
+            assertEquals(150, event.getY(), 0.00001);
+            assertEquals(0, event.getZ(), 0.00001);
             rotated = true;
         });
 
         scene.setOnRotate(event -> {
-            Assert.assertEquals(150, event.getX(), 0.00001);
-            Assert.assertEquals(150, event.getY(), 0.00001);
-            Assert.assertEquals(50, event.getZ(), 0.00001);
+            assertEquals(150, event.getX(), 0.00001);
+            assertEquals(150, event.getY(), 0.00001);
+            assertEquals(50, event.getZ(), 0.00001);
             rotated2 = true;
         });
 
@@ -518,8 +522,8 @@ public void unknownLocationShouldBeReplacedByMouseLocation() {
         rotated = false;
         rotated2 = false;
         rect2.setOnRotationStarted(event -> {
-            Assert.assertEquals(250.0, event.getSceneX(), 0.0001);
-            Assert.assertEquals(250.0, event.getSceneY(), 0.0001);
+            assertEquals(250.0, event.getSceneX(), 0.0001);
+            assertEquals(250.0, event.getSceneY(), 0.0001);
             rotated2 = true;
         });
         SceneHelper.processMouseEvent(scene, generator.generateMouseEvent(
@@ -534,8 +538,8 @@ public void unknownLocationShouldBeReplacedByMouseLocation() {
         rotated = false;
         rotated2 = false;
         rect2.setOnRotate(event -> {
-            Assert.assertEquals(150.0, event.getSceneX(), 0.0001);
-            Assert.assertEquals(150.0, event.getSceneY(), 0.0001);
+            assertEquals(150.0, event.getSceneX(), 0.0001);
+            assertEquals(150.0, event.getSceneY(), 0.0001);
             rotated2 = true;
         });
         SceneHelper.processMouseEvent(scene, generator.generateMouseEvent(
@@ -550,8 +554,8 @@ public void unknownLocationShouldBeReplacedByMouseLocation() {
         rotated = false;
         rotated2 = false;
         rect2.setOnRotationFinished(event -> {
-            Assert.assertEquals(150.0, event.getSceneX(), 0.0001);
-            Assert.assertEquals(150.0, event.getSceneY(), 0.0001);
+            assertEquals(150.0, event.getSceneX(), 0.0001);
+            assertEquals(150.0, event.getSceneY(), 0.0001);
             rotated2 = true;
         });
         ((StubScene) SceneHelper.getPeer(scene)).getListener().rotateEvent(
@@ -568,8 +572,8 @@ public void finishedLocationShouldBeFixed() {
         Rectangle rect =
                 (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0);
         rect.setOnRotationFinished(event -> {
-            Assert.assertEquals(250.0, event.getSceneX(), 0.0001);
-            Assert.assertEquals(250.0, event.getSceneY(), 0.0001);
+            assertEquals(250.0, event.getSceneX(), 0.0001);
+            assertEquals(250.0, event.getSceneY(), 0.0001);
             rotated = true;
         });
 
@@ -600,8 +604,8 @@ public void unknownLocalShouldBeFixedByMousePosition() {
         Rectangle rect =
                 (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0);
         rect.setOnRotate(event -> {
-            Assert.assertEquals(150.0, event.getSceneX(), 0.0001);
-            Assert.assertEquals(150.0, event.getSceneY(), 0.0001);
+            assertEquals(150.0, event.getSceneX(), 0.0001);
+            assertEquals(150.0, event.getSceneY(), 0.0001);
             rotated = true;
         });
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/ScrollEventTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/ScrollEventTest.java
index 39cb96db419..56ebc6d7b34 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/ScrollEventTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/ScrollEventTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,9 +38,13 @@
 import javafx.scene.input.ScrollEvent;
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
-import org.junit.Assert;
-import org.junit.Test;
-import static org.junit.Assert.*;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class ScrollEventTest {
 
@@ -239,10 +243,10 @@ public void shouldUseMultiplier() {
 
         scrolled = false;
         rect.setOnScroll(event -> {
-            Assert.assertEquals(66.0, event.getDeltaX(), 0.0001);
-            Assert.assertEquals(99.0, event.getDeltaY(), 0.0001);
-            Assert.assertEquals(132.0, event.getTotalDeltaX(), 0.0001);
-            Assert.assertEquals(198.0, event.getTotalDeltaY(), 0.0001);
+            assertEquals(66.0, event.getDeltaX(), 0.0001);
+            assertEquals(99.0, event.getDeltaY(), 0.0001);
+            assertEquals(132.0, event.getTotalDeltaX(), 0.0001);
+            assertEquals(198.0, event.getTotalDeltaY(), 0.0001);
             scrolled = true;
         });
 
@@ -261,8 +265,8 @@ public void shouldUseTextDeltasForUnitsAndValues() {
 
         scrolled = false;
         rect.setOnScroll(event -> {
-            Assert.assertEquals(0.0, event.getTextDeltaX(), 0.0001);
-            Assert.assertEquals(0.0, event.getTextDeltaY(), 0.0001);
+            assertEquals(0.0, event.getTextDeltaX(), 0.0001);
+            assertEquals(0.0, event.getTextDeltaY(), 0.0001);
             assertSame(ScrollEvent.HorizontalTextScrollUnits.NONE, event.getTextDeltaXUnits());
             assertSame(ScrollEvent.VerticalTextScrollUnits.NONE, event.getTextDeltaYUnits());
             scrolled = true;
@@ -274,8 +278,8 @@ public void shouldUseTextDeltasForUnitsAndValues() {
 
         scrolled = false;
         rect.setOnScroll(event -> {
-            Assert.assertEquals(8.0, event.getTextDeltaX(), 0.0001);
-            Assert.assertEquals(15.0, event.getTextDeltaY(), 0.0001);
+            assertEquals(8.0, event.getTextDeltaX(), 0.0001);
+            assertEquals(15.0, event.getTextDeltaY(), 0.0001);
             assertSame(ScrollEvent.HorizontalTextScrollUnits.CHARACTERS, event.getTextDeltaXUnits());
             assertSame(ScrollEvent.VerticalTextScrollUnits.LINES, event.getTextDeltaYUnits());
             scrolled = true;
@@ -287,8 +291,8 @@ public void shouldUseTextDeltasForUnitsAndValues() {
 
         scrolled = false;
         rect.setOnScroll(event -> {
-            Assert.assertEquals(0.0, event.getTextDeltaX(), 0.0001);
-            Assert.assertEquals(3.0, event.getTextDeltaY(), 0.0001);
+            assertEquals(0.0, event.getTextDeltaX(), 0.0001);
+            assertEquals(3.0, event.getTextDeltaY(), 0.0001);
             assertSame(ScrollEvent.HorizontalTextScrollUnits.NONE, event.getTextDeltaXUnits());
             assertSame(ScrollEvent.VerticalTextScrollUnits.PAGES, event.getTextDeltaYUnits());
             scrolled = true;
@@ -395,7 +399,7 @@ public void shouldPassTouchCount() {
 
         scrolled = false;
         rect.setOnScroll(event -> {
-            Assert.assertEquals(0, event.getTouchCount());
+            assertEquals(0, event.getTouchCount());
             scrolled = true;
         });
         ((StubScene) SceneHelper.getPeer(scene)).getListener().scrollEvent(
@@ -405,7 +409,7 @@ public void shouldPassTouchCount() {
 
         scrolled = false;
         rect.setOnScroll(event -> {
-            Assert.assertEquals(5, event.getTouchCount());
+            assertEquals(5, event.getTouchCount());
             scrolled = true;
         });
         ((StubScene) SceneHelper.getPeer(scene)).getListener().scrollEvent(
@@ -527,16 +531,16 @@ public void shouldCompute3dCoordinates() {
         scrolled = false;
         scrolled2 = false;
         rect.setOnScroll(event -> {
-            Assert.assertEquals(150, event.getX(), 0.00001);
-            Assert.assertEquals(150, event.getY(), 0.00001);
-            Assert.assertEquals(0, event.getZ(), 0.00001);
+            assertEquals(150, event.getX(), 0.00001);
+            assertEquals(150, event.getY(), 0.00001);
+            assertEquals(0, event.getZ(), 0.00001);
             scrolled = true;
         });
 
         scene.setOnScroll(event -> {
-            Assert.assertEquals(150, event.getX(), 0.00001);
-            Assert.assertEquals(150, event.getY(), 0.00001);
-            Assert.assertEquals(50, event.getZ(), 0.00001);
+            assertEquals(150, event.getX(), 0.00001);
+            assertEquals(150, event.getY(), 0.00001);
+            assertEquals(50, event.getZ(), 0.00001);
             scrolled2 = true;
         });
 
@@ -692,8 +696,8 @@ public void unknownLocationShouldBeReplacedByMouseLocation() {
         scrolled = false;
         scrolled2 = false;
         rect2.setOnScrollStarted(event -> {
-            Assert.assertEquals(250.0, event.getSceneX(), 0.0001);
-            Assert.assertEquals(250.0, event.getSceneY(), 0.0001);
+            assertEquals(250.0, event.getSceneX(), 0.0001);
+            assertEquals(250.0, event.getSceneY(), 0.0001);
             scrolled2 = true;
         });
         SceneHelper.processMouseEvent(scene, generator.generateMouseEvent(
@@ -708,8 +712,8 @@ public void unknownLocationShouldBeReplacedByMouseLocation() {
         scrolled = false;
         scrolled2 = false;
         rect2.setOnScroll(event -> {
-            Assert.assertEquals(150.0, event.getSceneX(), 0.0001);
-            Assert.assertEquals(150.0, event.getSceneY(), 0.0001);
+            assertEquals(150.0, event.getSceneX(), 0.0001);
+            assertEquals(150.0, event.getSceneY(), 0.0001);
             scrolled2 = true;
         });
         SceneHelper.processMouseEvent(scene, generator.generateMouseEvent(
@@ -724,8 +728,8 @@ public void unknownLocationShouldBeReplacedByMouseLocation() {
         scrolled = false;
         scrolled2 = false;
         rect2.setOnScrollFinished(event -> {
-            Assert.assertEquals(150.0, event.getSceneX(), 0.0001);
-            Assert.assertEquals(150.0, event.getSceneY(), 0.0001);
+            assertEquals(150.0, event.getSceneX(), 0.0001);
+            assertEquals(150.0, event.getSceneY(), 0.0001);
             scrolled2 = true;
         });
         ((StubScene) SceneHelper.getPeer(scene)).getListener().scrollEvent(
@@ -742,8 +746,8 @@ public void finishedLocationShouldBeFixed() {
         Rectangle rect =
                 (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0);
         rect.setOnScrollFinished(event -> {
-            Assert.assertEquals(250.0, event.getSceneX(), 0.0001);
-            Assert.assertEquals(250.0, event.getSceneY(), 0.0001);
+            assertEquals(250.0, event.getSceneX(), 0.0001);
+            assertEquals(250.0, event.getSceneY(), 0.0001);
             scrolled = true;
         });
 
@@ -775,8 +779,8 @@ public void unknownLocalShouldBeFixedByMousePosition() {
                 (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0);
 
         rect.setOnScroll(event -> {
-            Assert.assertEquals(150.0, event.getSceneX(), 0.0001);
-            Assert.assertEquals(150.0, event.getSceneY(), 0.0001);
+            assertEquals(150.0, event.getSceneX(), 0.0001);
+            assertEquals(150.0, event.getSceneY(), 0.0001);
             scrolled = true;
         });
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/SwipeEventTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/SwipeEventTest.java
index 6a8ef4de8ba..a29e034000d 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/SwipeEventTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/SwipeEventTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,9 +38,13 @@
 import javafx.scene.input.SwipeEvent;
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
-import org.junit.Assert;
-import org.junit.Test;
-import static org.junit.Assert.*;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class SwipeEventTest {
 
@@ -210,7 +214,7 @@ public void shouldPassTouchCount() {
         swiped = false;
 
         rect.setOnSwipeUp(event -> {
-            Assert.assertEquals(3, event.getTouchCount());
+            assertEquals(3, event.getTouchCount());
             swiped = true;
         });
 
@@ -230,10 +234,10 @@ public void shouldPassCoordinates() {
         swiped = false;
 
         rect.setOnSwipeUp(event -> {
-            Assert.assertEquals(151.0, event.getX(), 0.0001);
-            Assert.assertEquals(152.0, event.getY(), 0.0001);
-            Assert.assertEquals(153.0, event.getScreenX(), 0.0001);
-            Assert.assertEquals(154.0, event.getScreenY(), 0.0001);
+            assertEquals(151.0, event.getX(), 0.0001);
+            assertEquals(152.0, event.getY(), 0.0001);
+            assertEquals(153.0, event.getScreenX(), 0.0001);
+            assertEquals(154.0, event.getScreenY(), 0.0001);
             swiped = true;
         });
 
@@ -253,7 +257,7 @@ public void shouldPassDirect() {
         swiped = false;
 
         rect.setOnSwipeDown(event -> {
-            Assert.assertEquals(swiped, event.isDirect());
+            assertEquals(swiped, event.isDirect());
             swiped = !swiped;
         });
 
@@ -280,16 +284,16 @@ public void shouldCompute3dCoordinates() {
         swiped = false;
         swiped2 = false;
         rect.setOnSwipeLeft(event -> {
-            Assert.assertEquals(150, event.getX(), 0.00001);
-            Assert.assertEquals(150, event.getY(), 0.00001);
-            Assert.assertEquals(0, event.getZ(), 0.00001);
+            assertEquals(150, event.getX(), 0.00001);
+            assertEquals(150, event.getY(), 0.00001);
+            assertEquals(0, event.getZ(), 0.00001);
             swiped = true;
         });
 
         scene.setOnSwipeLeft(event -> {
-            Assert.assertEquals(150, event.getX(), 0.00001);
-            Assert.assertEquals(150, event.getY(), 0.00001);
-            Assert.assertEquals(50, event.getZ(), 0.00001);
+            assertEquals(150, event.getX(), 0.00001);
+            assertEquals(150, event.getY(), 0.00001);
+            assertEquals(50, event.getZ(), 0.00001);
             swiped2 = true;
         });
 
@@ -369,8 +373,8 @@ public void unknownLocalShouldBeFixedByMousePosition() {
                 (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0);
 
         rect.setOnSwipeRight(event -> {
-            Assert.assertEquals(150.0, event.getSceneX(), 0.0001);
-            Assert.assertEquals(150.0, event.getSceneY(), 0.0001);
+            assertEquals(150.0, event.getSceneX(), 0.0001);
+            assertEquals(150.0, event.getSceneY(), 0.0001);
             swiped = true;
         });
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/TouchEventTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/TouchEventTest.java
index 351f4862064..e2114d28c6d 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/TouchEventTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/TouchEventTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,9 +39,15 @@
 import javafx.scene.input.PickResult;
 import javafx.scene.input.TouchEvent;
 import javafx.scene.input.TouchPoint;
-import org.junit.Assert;
-import org.junit.Test;
-import static org.junit.Assert.*;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class TouchEventTest {
     private static final int SANE_BENCHMARK_CYCLES = 1000000;
@@ -183,22 +189,22 @@ public void shouldPassModifiers() {
             touched++;
             switch(touched) {
                 case 1:
-                    Assert.assertEquals(true, event.isShiftDown());
-                    Assert.assertEquals(false, event.isControlDown());
-                    Assert.assertEquals(true, event.isAltDown());
-                    Assert.assertEquals(false, event.isMetaDown());
+                    assertEquals(true, event.isShiftDown());
+                    assertEquals(false, event.isControlDown());
+                    assertEquals(true, event.isAltDown());
+                    assertEquals(false, event.isMetaDown());
                     break;
                 case 2:
-                    Assert.assertEquals(false, event.isShiftDown());
-                    Assert.assertEquals(true, event.isControlDown());
-                    Assert.assertEquals(false, event.isAltDown());
-                    Assert.assertEquals(true, event.isMetaDown());
+                    assertEquals(false, event.isShiftDown());
+                    assertEquals(true, event.isControlDown());
+                    assertEquals(false, event.isAltDown());
+                    assertEquals(true, event.isMetaDown());
                     break;
                 case 3:
-                    Assert.assertEquals(false, event.isShiftDown());
-                    Assert.assertEquals(true, event.isControlDown());
-                    Assert.assertEquals(true, event.isAltDown());
-                    Assert.assertEquals(false, event.isMetaDown());
+                    assertEquals(false, event.isShiftDown());
+                    assertEquals(true, event.isControlDown());
+                    assertEquals(true, event.isAltDown());
+                    assertEquals(false, event.isMetaDown());
                     break;
                 default:
                     fail("Wrong touch point id " + event.getTouchPoint().getId());
@@ -237,22 +243,22 @@ public void shouldCountTouchesCorrectly() {
             touched++;
             switch(touched) {
                 case 1:
-                    Assert.assertEquals(1, event.getTouchCount());
-                    Assert.assertEquals(1, event.getTouchPoints().size());
+                    assertEquals(1, event.getTouchCount());
+                    assertEquals(1, event.getTouchPoints().size());
                     break;
                 case 2:
                 case 3:
-                    Assert.assertEquals(2, event.getTouchCount());
-                    Assert.assertEquals(2, event.getTouchPoints().size());
+                    assertEquals(2, event.getTouchCount());
+                    assertEquals(2, event.getTouchPoints().size());
                     break;
                 case 4:
                 case 5:
-                    Assert.assertEquals(2, event.getTouchCount());
-                    Assert.assertEquals(2, event.getTouchPoints().size());
+                    assertEquals(2, event.getTouchCount());
+                    assertEquals(2, event.getTouchPoints().size());
                     break;
                 case 6:
-                    Assert.assertEquals(1, event.getTouchCount());
-                    Assert.assertEquals(1, event.getTouchPoints().size());
+                    assertEquals(1, event.getTouchCount());
+                    assertEquals(1, event.getTouchPoints().size());
                     break;
                 default:
                     fail("Wrong touch point id " + event.getTouchPoint().getId());
@@ -301,18 +307,18 @@ public void shouldGenerateCorrectEventSetIDs() {
             touched++;
             switch(touched) {
                 case 1:
-                    Assert.assertEquals(1, event.getEventSetId());
+                    assertEquals(1, event.getEventSetId());
                     break;
                 case 2:
                 case 3:
-                    Assert.assertEquals(2, event.getEventSetId());
+                    assertEquals(2, event.getEventSetId());
                     break;
                 case 4:
                 case 5:
-                    Assert.assertEquals(3, event.getEventSetId());
+                    assertEquals(3, event.getEventSetId());
                     break;
                 case 6:
-                    Assert.assertEquals(4, event.getEventSetId());
+                    assertEquals(4, event.getEventSetId());
                     break;
                 default:
                     fail("Wrong touch point id " + event.getTouchPoint().getId());
@@ -361,18 +367,18 @@ public void shouldReIDTouchPoints() {
             touched++;
             switch(event.getTouchPoint().getId()) {
                 case 1:
-                    Assert.assertEquals(110.0, event.getTouchPoint().getX(), 0.0001);
-                    Assert.assertEquals(110.0, event.getTouchPoint().getY(), 0.0001);
+                    assertEquals(110.0, event.getTouchPoint().getX(), 0.0001);
+                    assertEquals(110.0, event.getTouchPoint().getY(), 0.0001);
                     assertEquals(1, touched);
                     break;
                 case 2:
-                    Assert.assertEquals(120.0, event.getTouchPoint().getX(), 0.0001);
-                    Assert.assertEquals(120.0, event.getTouchPoint().getY(), 0.0001);
+                    assertEquals(120.0, event.getTouchPoint().getX(), 0.0001);
+                    assertEquals(120.0, event.getTouchPoint().getY(), 0.0001);
                     assertEquals(2, touched);
                     break;
                 case 3:
-                    Assert.assertEquals(130.0, event.getTouchPoint().getX(), 0.0001);
-                    Assert.assertEquals(130.0, event.getTouchPoint().getY(), 0.0001);
+                    assertEquals(130.0, event.getTouchPoint().getX(), 0.0001);
+                    assertEquals(130.0, event.getTouchPoint().getY(), 0.0001);
                     assertEquals(3, touched);
                     break;
                 default:
@@ -404,18 +410,18 @@ public void shouldNotReuseTouchPointID() {
             touched++;
             switch(event.getTouchPoint().getId()) {
                 case 1:
-                    Assert.assertEquals(110.0, event.getTouchPoint().getX(), 0.0001);
-                    Assert.assertEquals(110.0, event.getTouchPoint().getY(), 0.0001);
+                    assertEquals(110.0, event.getTouchPoint().getX(), 0.0001);
+                    assertEquals(110.0, event.getTouchPoint().getY(), 0.0001);
                     assertEquals(1, touched);
                     break;
                 case 2:
-                    Assert.assertEquals(120.0, event.getTouchPoint().getX(), 0.0001);
-                    Assert.assertEquals(120.0, event.getTouchPoint().getY(), 0.0001);
+                    assertEquals(120.0, event.getTouchPoint().getX(), 0.0001);
+                    assertEquals(120.0, event.getTouchPoint().getY(), 0.0001);
                     assertEquals(2, touched);
                     break;
                 case 3:
-                    Assert.assertEquals(130.0, event.getTouchPoint().getX(), 0.0001);
-                    Assert.assertEquals(130.0, event.getTouchPoint().getY(), 0.0001);
+                    assertEquals(130.0, event.getTouchPoint().getX(), 0.0001);
+                    assertEquals(130.0, event.getTouchPoint().getY(), 0.0001);
                     assertEquals(3, touched);
                     break;
                 default:
@@ -461,24 +467,24 @@ public void shouldMaintainPressOrder() {
             touched++;
             switch(event.getTouchPoint().getId()) {
                 case 1:
-                    Assert.assertEquals(110.0, event.getTouchPoint().getX(), 0.0001);
-                    Assert.assertEquals(110.0, event.getTouchPoint().getY(), 0.0001);
-                    Assert.assertEquals(1, event.getTouchPoints().get(0).getId());
-                    Assert.assertEquals(2, event.getTouchPoints().get(1).getId());
+                    assertEquals(110.0, event.getTouchPoint().getX(), 0.0001);
+                    assertEquals(110.0, event.getTouchPoint().getY(), 0.0001);
+                    assertEquals(1, event.getTouchPoints().get(0).getId());
+                    assertEquals(2, event.getTouchPoints().get(1).getId());
                     assertEquals(1, touched);
                     break;
                 case 2:
-                    Assert.assertEquals(120.0, event.getTouchPoint().getX(), 0.0001);
-                    Assert.assertEquals(120.0, event.getTouchPoint().getY(), 0.0001);
-                    Assert.assertEquals(1, event.getTouchPoints().get(0).getId());
-                    Assert.assertEquals(2, event.getTouchPoints().get(1).getId());
+                    assertEquals(120.0, event.getTouchPoint().getX(), 0.0001);
+                    assertEquals(120.0, event.getTouchPoint().getY(), 0.0001);
+                    assertEquals(1, event.getTouchPoints().get(0).getId());
+                    assertEquals(2, event.getTouchPoints().get(1).getId());
                     assertEquals(2, touched);
                     break;
                 case 3:
-                    Assert.assertEquals(130.0, event.getTouchPoint().getX(), 0.0001);
-                    Assert.assertEquals(130.0, event.getTouchPoint().getY(), 0.0001);
-                    Assert.assertEquals(1, event.getTouchPoints().get(0).getId());
-                    Assert.assertEquals(3, event.getTouchPoints().get(1).getId());
+                    assertEquals(130.0, event.getTouchPoint().getX(), 0.0001);
+                    assertEquals(130.0, event.getTouchPoint().getY(), 0.0001);
+                    assertEquals(1, event.getTouchPoints().get(0).getId());
+                    assertEquals(3, event.getTouchPoints().get(1).getId());
                     assertEquals(3, touched);
                     break;
                 default:
@@ -524,17 +530,17 @@ public void shouldMaintainIDMapping() {
             touched++;
             switch(event.getTouchPoint().getId()) {
                 case 1:
-                    Assert.assertEquals(110.0, event.getTouchPoint().getX(), 0.0001);
-                    Assert.assertEquals(110.0, event.getTouchPoint().getY(), 0.0001);
-                    Assert.assertEquals(1, event.getTouchPoints().get(0).getId());
-                    Assert.assertEquals(2, event.getTouchPoints().get(1).getId());
+                    assertEquals(110.0, event.getTouchPoint().getX(), 0.0001);
+                    assertEquals(110.0, event.getTouchPoint().getY(), 0.0001);
+                    assertEquals(1, event.getTouchPoints().get(0).getId());
+                    assertEquals(2, event.getTouchPoints().get(1).getId());
                     assertEquals(1, touched);
                     break;
                 case 2:
-                    Assert.assertEquals(120.0, event.getTouchPoint().getX(), 0.0001);
-                    Assert.assertEquals(120.0, event.getTouchPoint().getY(), 0.0001);
-                    Assert.assertEquals(1, event.getTouchPoints().get(0).getId());
-                    Assert.assertEquals(2, event.getTouchPoints().get(1).getId());
+                    assertEquals(120.0, event.getTouchPoint().getX(), 0.0001);
+                    assertEquals(120.0, event.getTouchPoint().getY(), 0.0001);
+                    assertEquals(1, event.getTouchPoints().get(0).getId());
+                    assertEquals(2, event.getTouchPoints().get(1).getId());
                     assertEquals(2, touched);
                     break;
                 default:
@@ -546,17 +552,17 @@ public void shouldMaintainIDMapping() {
             touched++;
             switch(event.getTouchPoint().getId()) {
                 case 1:
-                    Assert.assertEquals(120.0, event.getTouchPoint().getX(), 0.0001);
-                    Assert.assertEquals(120.0, event.getTouchPoint().getY(), 0.0001);
-                    Assert.assertEquals(1, event.getTouchPoints().get(0).getId());
-                    Assert.assertEquals(2, event.getTouchPoints().get(1).getId());
+                    assertEquals(120.0, event.getTouchPoint().getX(), 0.0001);
+                    assertEquals(120.0, event.getTouchPoint().getY(), 0.0001);
+                    assertEquals(1, event.getTouchPoints().get(0).getId());
+                    assertEquals(2, event.getTouchPoints().get(1).getId());
                     assertEquals(3, touched);
                     break;
                 case 2:
-                    Assert.assertEquals(110.0, event.getTouchPoint().getX(), 0.0001);
-                    Assert.assertEquals(110.0, event.getTouchPoint().getY(), 0.0001);
-                    Assert.assertEquals(1, event.getTouchPoints().get(0).getId());
-                    Assert.assertEquals(2, event.getTouchPoints().get(1).getId());
+                    assertEquals(110.0, event.getTouchPoint().getX(), 0.0001);
+                    assertEquals(110.0, event.getTouchPoint().getY(), 0.0001);
+                    assertEquals(1, event.getTouchPoints().get(0).getId());
+                    assertEquals(2, event.getTouchPoints().get(1).getId());
                     assertEquals(4, touched);
                     break;
                 default:
@@ -594,24 +600,24 @@ public void shouldMaintainIDMappingInDynamicConditions() {
             touched++;
             switch(event.getTouchPoint().getId()) {
                 case 1:
-                    Assert.assertEquals(110.0, event.getTouchPoint().getX(), 0.0001);
-                    Assert.assertEquals(110.0, event.getTouchPoint().getY(), 0.0001);
-                    Assert.assertEquals(1, event.getTouchPoints().get(0).getId());
-                    Assert.assertEquals(2, event.getTouchPoints().get(1).getId());
+                    assertEquals(110.0, event.getTouchPoint().getX(), 0.0001);
+                    assertEquals(110.0, event.getTouchPoint().getY(), 0.0001);
+                    assertEquals(1, event.getTouchPoints().get(0).getId());
+                    assertEquals(2, event.getTouchPoints().get(1).getId());
                     assertEquals(1, touched);
                     break;
                 case 2:
-                    Assert.assertEquals(120.0, event.getTouchPoint().getX(), 0.0001);
-                    Assert.assertEquals(120.0, event.getTouchPoint().getY(), 0.0001);
-                    Assert.assertEquals(1, event.getTouchPoints().get(0).getId());
-                    Assert.assertEquals(2, event.getTouchPoints().get(1).getId());
+                    assertEquals(120.0, event.getTouchPoint().getX(), 0.0001);
+                    assertEquals(120.0, event.getTouchPoint().getY(), 0.0001);
+                    assertEquals(1, event.getTouchPoints().get(0).getId());
+                    assertEquals(2, event.getTouchPoints().get(1).getId());
                     assertEquals(2, touched);
                     break;
                 case 3:
-                    Assert.assertEquals(160.0, event.getTouchPoint().getX(), 0.0001);
-                    Assert.assertEquals(160.0, event.getTouchPoint().getY(), 0.0001);
-                    Assert.assertEquals(2, event.getTouchPoints().get(0).getId());
-                    Assert.assertEquals(3, event.getTouchPoints().get(1).getId());
+                    assertEquals(160.0, event.getTouchPoint().getX(), 0.0001);
+                    assertEquals(160.0, event.getTouchPoint().getY(), 0.0001);
+                    assertEquals(2, event.getTouchPoints().get(0).getId());
+                    assertEquals(3, event.getTouchPoints().get(1).getId());
                     assertEquals(3, touched);
                     break;
                 default:
@@ -623,17 +629,17 @@ public void shouldMaintainIDMappingInDynamicConditions() {
             touched++;
             switch(event.getTouchPoint().getId()) {
                 case 2:
-                    Assert.assertEquals(120.0, event.getTouchPoint().getX(), 0.0001);
-                    Assert.assertEquals(120.0, event.getTouchPoint().getY(), 0.0001);
-                    Assert.assertEquals(2, event.getTouchPoints().get(0).getId());
-                    Assert.assertEquals(3, event.getTouchPoints().get(1).getId());
+                    assertEquals(120.0, event.getTouchPoint().getX(), 0.0001);
+                    assertEquals(120.0, event.getTouchPoint().getY(), 0.0001);
+                    assertEquals(2, event.getTouchPoints().get(0).getId());
+                    assertEquals(3, event.getTouchPoints().get(1).getId());
                     assertEquals(4, touched);
                     break;
                 case 3:
-                    Assert.assertEquals(160.0, event.getTouchPoint().getX(), 0.0001);
-                    Assert.assertEquals(160.0, event.getTouchPoint().getY(), 0.0001);
-                    Assert.assertEquals(2, event.getTouchPoints().get(0).getId());
-                    Assert.assertEquals(3, event.getTouchPoints().get(1).getId());
+                    assertEquals(160.0, event.getTouchPoint().getX(), 0.0001);
+                    assertEquals(160.0, event.getTouchPoint().getY(), 0.0001);
+                    assertEquals(2, event.getTouchPoints().get(0).getId());
+                    assertEquals(3, event.getTouchPoints().get(1).getId());
                     assertEquals(5, touched);
                     break;
                 default:
@@ -688,23 +694,23 @@ public void shouldResetIDsAfterGesture() {
             switch(touched) {
                 case 1:
                 case 2:
-                    Assert.assertEquals(1, event.getEventSetId());
-                    Assert.assertEquals(touched, event.getTouchPoint().getId());
+                    assertEquals(1, event.getEventSetId());
+                    assertEquals(touched, event.getTouchPoint().getId());
                     break;
                 case 3:
                 case 4:
-                    Assert.assertEquals(2, event.getEventSetId());
-                    Assert.assertEquals(touched - 2, event.getTouchPoint().getId());
+                    assertEquals(2, event.getEventSetId());
+                    assertEquals(touched - 2, event.getTouchPoint().getId());
                     break;
                 case 5:
                 case 6:
-                    Assert.assertEquals(1, event.getEventSetId());
-                    Assert.assertEquals(touched - 4, event.getTouchPoint().getId());
+                    assertEquals(1, event.getEventSetId());
+                    assertEquals(touched - 4, event.getTouchPoint().getId());
                     break;
                 case 7:
                 case 8:
-                    Assert.assertEquals(2, event.getEventSetId());
-                    Assert.assertEquals(touched - 6, event.getTouchPoint().getId());
+                    assertEquals(2, event.getEventSetId());
+                    assertEquals(touched - 6, event.getTouchPoint().getId());
                     break;
                 default:
                     fail("Wrong touch point id " + event.getTouchPoint().getId());
@@ -840,16 +846,16 @@ public void shouldCompute3dCoordinates() {
         touched = 0;
         rect.addEventHandler(TouchEvent.ANY, event -> {
             touched++;
-            Assert.assertEquals(110, event.getTouchPoint().getX(), 0.00001);
-            Assert.assertEquals(110, event.getTouchPoint().getY(), 0.00001);
-            Assert.assertEquals(0, event.getTouchPoint().getZ(), 0.00001);
+            assertEquals(110, event.getTouchPoint().getX(), 0.00001);
+            assertEquals(110, event.getTouchPoint().getY(), 0.00001);
+            assertEquals(0, event.getTouchPoint().getZ(), 0.00001);
         });
 
         scene.addEventHandler(TouchEvent.ANY, event -> {
             touched++;
-            Assert.assertEquals(110, event.getTouchPoint().getX(), 0.00001);
-            Assert.assertEquals(110, event.getTouchPoint().getY(), 0.00001);
-            Assert.assertEquals(50, event.getTouchPoint().getZ(), 0.00001);
+            assertEquals(110, event.getTouchPoint().getX(), 0.00001);
+            assertEquals(110, event.getTouchPoint().getY(), 0.00001);
+            assertEquals(50, event.getTouchPoint().getZ(), 0.00001);
         });
 
         ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventBegin(
@@ -1047,22 +1053,22 @@ public void shouldPickAndGrabTouchPoints() {
             touched++;
             switch(touched) {
                 case 1:
-                    Assert.assertEquals(1, event.getTouchPoint().getId());
-                    Assert.assertEquals(150.0, event.getTouchPoint().getX(), 0.0001);
-                    Assert.assertEquals(155.0, event.getTouchPoint().getY(), 0.0001);
-                    Assert.assertEquals(150.0, event.getTouchPoint().getSceneX(), 0.0001);
-                    Assert.assertEquals(155.0, event.getTouchPoint().getSceneY(), 0.0001);
-                    Assert.assertEquals(1150.0, event.getTouchPoint().getScreenX(), 0.0001);
-                    Assert.assertEquals(1155.0, event.getTouchPoint().getScreenY(), 0.0001);
+                    assertEquals(1, event.getTouchPoint().getId());
+                    assertEquals(150.0, event.getTouchPoint().getX(), 0.0001);
+                    assertEquals(155.0, event.getTouchPoint().getY(), 0.0001);
+                    assertEquals(150.0, event.getTouchPoint().getSceneX(), 0.0001);
+                    assertEquals(155.0, event.getTouchPoint().getSceneY(), 0.0001);
+                    assertEquals(1150.0, event.getTouchPoint().getScreenX(), 0.0001);
+                    assertEquals(1155.0, event.getTouchPoint().getScreenY(), 0.0001);
                     break;
                 case 3:
-                    Assert.assertEquals(1, event.getTouchPoint().getId());
-                    Assert.assertEquals(250.0, event.getTouchPoint().getX(), 0.0001);
-                    Assert.assertEquals(255.0, event.getTouchPoint().getY(), 0.0001);
-                    Assert.assertEquals(250.0, event.getTouchPoint().getSceneX(), 0.0001);
-                    Assert.assertEquals(255.0, event.getTouchPoint().getSceneY(), 0.0001);
-                    Assert.assertEquals(1250.0, event.getTouchPoint().getScreenX(), 0.0001);
-                    Assert.assertEquals(1255.0, event.getTouchPoint().getScreenY(), 0.0001);
+                    assertEquals(1, event.getTouchPoint().getId());
+                    assertEquals(250.0, event.getTouchPoint().getX(), 0.0001);
+                    assertEquals(255.0, event.getTouchPoint().getY(), 0.0001);
+                    assertEquals(250.0, event.getTouchPoint().getSceneX(), 0.0001);
+                    assertEquals(255.0, event.getTouchPoint().getSceneY(), 0.0001);
+                    assertEquals(1250.0, event.getTouchPoint().getScreenX(), 0.0001);
+                    assertEquals(1255.0, event.getTouchPoint().getScreenY(), 0.0001);
                     break;
                 default:
                     fail("Wrong touch point delivery");
@@ -1073,22 +1079,22 @@ public void shouldPickAndGrabTouchPoints() {
             touched++;
             switch(touched) {
                 case 2:
-                    Assert.assertEquals(2, event.getTouchPoint().getId());
-                    Assert.assertEquals(260.0, event.getTouchPoint().getX(), 0.0001);
-                    Assert.assertEquals(265.0, event.getTouchPoint().getY(), 0.0001);
-                    Assert.assertEquals(260.0, event.getTouchPoint().getSceneX(), 0.0001);
-                    Assert.assertEquals(265.0, event.getTouchPoint().getSceneY(), 0.0001);
-                    Assert.assertEquals(1260.0, event.getTouchPoint().getScreenX(), 0.0001);
-                    Assert.assertEquals(1265.0, event.getTouchPoint().getScreenY(), 0.0001);
+                    assertEquals(2, event.getTouchPoint().getId());
+                    assertEquals(260.0, event.getTouchPoint().getX(), 0.0001);
+                    assertEquals(265.0, event.getTouchPoint().getY(), 0.0001);
+                    assertEquals(260.0, event.getTouchPoint().getSceneX(), 0.0001);
+                    assertEquals(265.0, event.getTouchPoint().getSceneY(), 0.0001);
+                    assertEquals(1260.0, event.getTouchPoint().getScreenX(), 0.0001);
+                    assertEquals(1265.0, event.getTouchPoint().getScreenY(), 0.0001);
                     break;
                 case 4:
-                    Assert.assertEquals(2, event.getTouchPoint().getId());
-                    Assert.assertEquals(160.0, event.getTouchPoint().getX(), 0.0001);
-                    Assert.assertEquals(165.0, event.getTouchPoint().getY(), 0.0001);
-                    Assert.assertEquals(160.0, event.getTouchPoint().getSceneX(), 0.0001);
-                    Assert.assertEquals(165.0, event.getTouchPoint().getSceneY(), 0.0001);
-                    Assert.assertEquals(1160.0, event.getTouchPoint().getScreenX(), 0.0001);
-                    Assert.assertEquals(1165.0, event.getTouchPoint().getScreenY(), 0.0001);
+                    assertEquals(2, event.getTouchPoint().getId());
+                    assertEquals(160.0, event.getTouchPoint().getX(), 0.0001);
+                    assertEquals(165.0, event.getTouchPoint().getY(), 0.0001);
+                    assertEquals(160.0, event.getTouchPoint().getSceneX(), 0.0001);
+                    assertEquals(165.0, event.getTouchPoint().getSceneY(), 0.0001);
+                    assertEquals(1160.0, event.getTouchPoint().getScreenX(), 0.0001);
+                    assertEquals(1165.0, event.getTouchPoint().getScreenY(), 0.0001);
                     break;
                 default:
                     fail("Wrong touch point delivery");
@@ -1128,23 +1134,23 @@ public void ungrabShouldEnablePickingForTouchPoints() {
             touched++;
             switch(touched) {
                 case 1:
-                    Assert.assertEquals(1, event.getTouchPoint().getId());
-                    Assert.assertEquals(150.0, event.getTouchPoint().getX(), 0.0001);
-                    Assert.assertEquals(155.0, event.getTouchPoint().getY(), 0.0001);
-                    Assert.assertEquals(150.0, event.getTouchPoint().getSceneX(), 0.0001);
-                    Assert.assertEquals(155.0, event.getTouchPoint().getSceneY(), 0.0001);
-                    Assert.assertEquals(1150.0, event.getTouchPoint().getScreenX(), 0.0001);
-                    Assert.assertEquals(1155.0, event.getTouchPoint().getScreenY(), 0.0001);
+                    assertEquals(1, event.getTouchPoint().getId());
+                    assertEquals(150.0, event.getTouchPoint().getX(), 0.0001);
+                    assertEquals(155.0, event.getTouchPoint().getY(), 0.0001);
+                    assertEquals(150.0, event.getTouchPoint().getSceneX(), 0.0001);
+                    assertEquals(155.0, event.getTouchPoint().getSceneY(), 0.0001);
+                    assertEquals(1150.0, event.getTouchPoint().getScreenX(), 0.0001);
+                    assertEquals(1155.0, event.getTouchPoint().getScreenY(), 0.0001);
                     event.getTouchPoint().ungrab();
                     break;
                 case 4:
-                    Assert.assertEquals(2, event.getTouchPoint().getId());
-                    Assert.assertEquals(160.0, event.getTouchPoint().getX(), 0.0001);
-                    Assert.assertEquals(165.0, event.getTouchPoint().getY(), 0.0001);
-                    Assert.assertEquals(160.0, event.getTouchPoint().getSceneX(), 0.0001);
-                    Assert.assertEquals(165.0, event.getTouchPoint().getSceneY(), 0.0001);
-                    Assert.assertEquals(1160.0, event.getTouchPoint().getScreenX(), 0.0001);
-                    Assert.assertEquals(1165.0, event.getTouchPoint().getScreenY(), 0.0001);
+                    assertEquals(2, event.getTouchPoint().getId());
+                    assertEquals(160.0, event.getTouchPoint().getX(), 0.0001);
+                    assertEquals(165.0, event.getTouchPoint().getY(), 0.0001);
+                    assertEquals(160.0, event.getTouchPoint().getSceneX(), 0.0001);
+                    assertEquals(165.0, event.getTouchPoint().getSceneY(), 0.0001);
+                    assertEquals(1160.0, event.getTouchPoint().getScreenX(), 0.0001);
+                    assertEquals(1165.0, event.getTouchPoint().getScreenY(), 0.0001);
                     break;
                 default:
                     fail("Wrong touch point delivery");
@@ -1155,23 +1161,23 @@ public void ungrabShouldEnablePickingForTouchPoints() {
             touched++;
             switch(touched) {
                 case 2:
-                    Assert.assertEquals(2, event.getTouchPoint().getId());
-                    Assert.assertEquals(260.0, event.getTouchPoint().getX(), 0.0001);
-                    Assert.assertEquals(265.0, event.getTouchPoint().getY(), 0.0001);
-                    Assert.assertEquals(260.0, event.getTouchPoint().getSceneX(), 0.0001);
-                    Assert.assertEquals(265.0, event.getTouchPoint().getSceneY(), 0.0001);
-                    Assert.assertEquals(1260.0, event.getTouchPoint().getScreenX(), 0.0001);
-                    Assert.assertEquals(1265.0, event.getTouchPoint().getScreenY(), 0.0001);
+                    assertEquals(2, event.getTouchPoint().getId());
+                    assertEquals(260.0, event.getTouchPoint().getX(), 0.0001);
+                    assertEquals(265.0, event.getTouchPoint().getY(), 0.0001);
+                    assertEquals(260.0, event.getTouchPoint().getSceneX(), 0.0001);
+                    assertEquals(265.0, event.getTouchPoint().getSceneY(), 0.0001);
+                    assertEquals(1260.0, event.getTouchPoint().getScreenX(), 0.0001);
+                    assertEquals(1265.0, event.getTouchPoint().getScreenY(), 0.0001);
                     event.getTouchPoint().ungrab();
                     break;
                 case 3:
-                    Assert.assertEquals(1, event.getTouchPoint().getId());
-                    Assert.assertEquals(250.0, event.getTouchPoint().getX(), 0.0001);
-                    Assert.assertEquals(255.0, event.getTouchPoint().getY(), 0.0001);
-                    Assert.assertEquals(250.0, event.getTouchPoint().getSceneX(), 0.0001);
-                    Assert.assertEquals(255.0, event.getTouchPoint().getSceneY(), 0.0001);
-                    Assert.assertEquals(1250.0, event.getTouchPoint().getScreenX(), 0.0001);
-                    Assert.assertEquals(1255.0, event.getTouchPoint().getScreenY(), 0.0001);
+                    assertEquals(1, event.getTouchPoint().getId());
+                    assertEquals(250.0, event.getTouchPoint().getX(), 0.0001);
+                    assertEquals(255.0, event.getTouchPoint().getY(), 0.0001);
+                    assertEquals(250.0, event.getTouchPoint().getSceneX(), 0.0001);
+                    assertEquals(255.0, event.getTouchPoint().getSceneY(), 0.0001);
+                    assertEquals(1250.0, event.getTouchPoint().getScreenX(), 0.0001);
+                    assertEquals(1255.0, event.getTouchPoint().getScreenY(), 0.0001);
                     break;
                 default:
                     fail("Wrong touch point delivery");
@@ -1211,32 +1217,32 @@ public void grabWithArgShouldAffectDelivery() {
             touched++;
             switch(touched) {
                 case 1:
-                    Assert.assertEquals(1, event.getTouchPoint().getId());
-                    Assert.assertEquals(150.0, event.getTouchPoint().getX(), 0.0001);
-                    Assert.assertEquals(155.0, event.getTouchPoint().getY(), 0.0001);
-                    Assert.assertEquals(150.0, event.getTouchPoint().getSceneX(), 0.0001);
-                    Assert.assertEquals(155.0, event.getTouchPoint().getSceneY(), 0.0001);
-                    Assert.assertEquals(1150.0, event.getTouchPoint().getScreenX(), 0.0001);
-                    Assert.assertEquals(1155.0, event.getTouchPoint().getScreenY(), 0.0001);
+                    assertEquals(1, event.getTouchPoint().getId());
+                    assertEquals(150.0, event.getTouchPoint().getX(), 0.0001);
+                    assertEquals(155.0, event.getTouchPoint().getY(), 0.0001);
+                    assertEquals(150.0, event.getTouchPoint().getSceneX(), 0.0001);
+                    assertEquals(155.0, event.getTouchPoint().getSceneY(), 0.0001);
+                    assertEquals(1150.0, event.getTouchPoint().getScreenX(), 0.0001);
+                    assertEquals(1155.0, event.getTouchPoint().getScreenY(), 0.0001);
                     event.getTouchPoints().get(1).grab(rect1);
                     break;
                 case 3:
-                    Assert.assertEquals(1, event.getTouchPoint().getId());
-                    Assert.assertEquals(250.0, event.getTouchPoint().getX(), 0.0001);
-                    Assert.assertEquals(255.0, event.getTouchPoint().getY(), 0.0001);
-                    Assert.assertEquals(250.0, event.getTouchPoint().getSceneX(), 0.0001);
-                    Assert.assertEquals(255.0, event.getTouchPoint().getSceneY(), 0.0001);
-                    Assert.assertEquals(1250.0, event.getTouchPoint().getScreenX(), 0.0001);
-                    Assert.assertEquals(1255.0, event.getTouchPoint().getScreenY(), 0.0001);
+                    assertEquals(1, event.getTouchPoint().getId());
+                    assertEquals(250.0, event.getTouchPoint().getX(), 0.0001);
+                    assertEquals(255.0, event.getTouchPoint().getY(), 0.0001);
+                    assertEquals(250.0, event.getTouchPoint().getSceneX(), 0.0001);
+                    assertEquals(255.0, event.getTouchPoint().getSceneY(), 0.0001);
+                    assertEquals(1250.0, event.getTouchPoint().getScreenX(), 0.0001);
+                    assertEquals(1255.0, event.getTouchPoint().getScreenY(), 0.0001);
                     break;
                 case 4:
-                    Assert.assertEquals(2, event.getTouchPoint().getId());
-                    Assert.assertEquals(160.0, event.getTouchPoint().getX(), 0.0001);
-                    Assert.assertEquals(165.0, event.getTouchPoint().getY(), 0.0001);
-                    Assert.assertEquals(160.0, event.getTouchPoint().getSceneX(), 0.0001);
-                    Assert.assertEquals(165.0, event.getTouchPoint().getSceneY(), 0.0001);
-                    Assert.assertEquals(1160.0, event.getTouchPoint().getScreenX(), 0.0001);
-                    Assert.assertEquals(1165.0, event.getTouchPoint().getScreenY(), 0.0001);
+                    assertEquals(2, event.getTouchPoint().getId());
+                    assertEquals(160.0, event.getTouchPoint().getX(), 0.0001);
+                    assertEquals(165.0, event.getTouchPoint().getY(), 0.0001);
+                    assertEquals(160.0, event.getTouchPoint().getSceneX(), 0.0001);
+                    assertEquals(165.0, event.getTouchPoint().getSceneY(), 0.0001);
+                    assertEquals(1160.0, event.getTouchPoint().getScreenX(), 0.0001);
+                    assertEquals(1165.0, event.getTouchPoint().getScreenY(), 0.0001);
                     break;
                 default:
                     fail("Wrong touch point delivery");
@@ -1247,13 +1253,13 @@ public void grabWithArgShouldAffectDelivery() {
             touched++;
             switch(touched) {
                 case 2:
-                    Assert.assertEquals(2, event.getTouchPoint().getId());
-                    Assert.assertEquals(260.0, event.getTouchPoint().getX(), 0.0001);
-                    Assert.assertEquals(265.0, event.getTouchPoint().getY(), 0.0001);
-                    Assert.assertEquals(260.0, event.getTouchPoint().getSceneX(), 0.0001);
-                    Assert.assertEquals(265.0, event.getTouchPoint().getSceneY(), 0.0001);
-                    Assert.assertEquals(1260.0, event.getTouchPoint().getScreenX(), 0.0001);
-                    Assert.assertEquals(1265.0, event.getTouchPoint().getScreenY(), 0.0001);
+                    assertEquals(2, event.getTouchPoint().getId());
+                    assertEquals(260.0, event.getTouchPoint().getX(), 0.0001);
+                    assertEquals(265.0, event.getTouchPoint().getY(), 0.0001);
+                    assertEquals(260.0, event.getTouchPoint().getSceneX(), 0.0001);
+                    assertEquals(265.0, event.getTouchPoint().getSceneY(), 0.0001);
+                    assertEquals(1260.0, event.getTouchPoint().getScreenX(), 0.0001);
+                    assertEquals(1265.0, event.getTouchPoint().getScreenY(), 0.0001);
                     break;
                 default:
                     fail("Wrong touch point delivery");
@@ -1293,32 +1299,32 @@ public void grabWithoutArgShouldAffectDelivery() {
             touched++;
             switch(touched) {
                 case 1:
-                    Assert.assertEquals(1, event.getTouchPoint().getId());
-                    Assert.assertEquals(150.0, event.getTouchPoint().getX(), 0.0001);
-                    Assert.assertEquals(155.0, event.getTouchPoint().getY(), 0.0001);
-                    Assert.assertEquals(150.0, event.getTouchPoint().getSceneX(), 0.0001);
-                    Assert.assertEquals(155.0, event.getTouchPoint().getSceneY(), 0.0001);
-                    Assert.assertEquals(1150.0, event.getTouchPoint().getScreenX(), 0.0001);
-                    Assert.assertEquals(1155.0, event.getTouchPoint().getScreenY(), 0.0001);
+                    assertEquals(1, event.getTouchPoint().getId());
+                    assertEquals(150.0, event.getTouchPoint().getX(), 0.0001);
+                    assertEquals(155.0, event.getTouchPoint().getY(), 0.0001);
+                    assertEquals(150.0, event.getTouchPoint().getSceneX(), 0.0001);
+                    assertEquals(155.0, event.getTouchPoint().getSceneY(), 0.0001);
+                    assertEquals(1150.0, event.getTouchPoint().getScreenX(), 0.0001);
+                    assertEquals(1155.0, event.getTouchPoint().getScreenY(), 0.0001);
                     event.getTouchPoints().get(1).grab();
                     break;
                 case 3:
-                    Assert.assertEquals(1, event.getTouchPoint().getId());
-                    Assert.assertEquals(250.0, event.getTouchPoint().getX(), 0.0001);
-                    Assert.assertEquals(255.0, event.getTouchPoint().getY(), 0.0001);
-                    Assert.assertEquals(250.0, event.getTouchPoint().getSceneX(), 0.0001);
-                    Assert.assertEquals(255.0, event.getTouchPoint().getSceneY(), 0.0001);
-                    Assert.assertEquals(1250.0, event.getTouchPoint().getScreenX(), 0.0001);
-                    Assert.assertEquals(1255.0, event.getTouchPoint().getScreenY(), 0.0001);
+                    assertEquals(1, event.getTouchPoint().getId());
+                    assertEquals(250.0, event.getTouchPoint().getX(), 0.0001);
+                    assertEquals(255.0, event.getTouchPoint().getY(), 0.0001);
+                    assertEquals(250.0, event.getTouchPoint().getSceneX(), 0.0001);
+                    assertEquals(255.0, event.getTouchPoint().getSceneY(), 0.0001);
+                    assertEquals(1250.0, event.getTouchPoint().getScreenX(), 0.0001);
+                    assertEquals(1255.0, event.getTouchPoint().getScreenY(), 0.0001);
                     break;
                 case 4:
-                    Assert.assertEquals(2, event.getTouchPoint().getId());
-                    Assert.assertEquals(160.0, event.getTouchPoint().getX(), 0.0001);
-                    Assert.assertEquals(165.0, event.getTouchPoint().getY(), 0.0001);
-                    Assert.assertEquals(160.0, event.getTouchPoint().getSceneX(), 0.0001);
-                    Assert.assertEquals(165.0, event.getTouchPoint().getSceneY(), 0.0001);
-                    Assert.assertEquals(1160.0, event.getTouchPoint().getScreenX(), 0.0001);
-                    Assert.assertEquals(1165.0, event.getTouchPoint().getScreenY(), 0.0001);
+                    assertEquals(2, event.getTouchPoint().getId());
+                    assertEquals(160.0, event.getTouchPoint().getX(), 0.0001);
+                    assertEquals(165.0, event.getTouchPoint().getY(), 0.0001);
+                    assertEquals(160.0, event.getTouchPoint().getSceneX(), 0.0001);
+                    assertEquals(165.0, event.getTouchPoint().getSceneY(), 0.0001);
+                    assertEquals(1160.0, event.getTouchPoint().getScreenX(), 0.0001);
+                    assertEquals(1165.0, event.getTouchPoint().getScreenY(), 0.0001);
                     break;
                 default:
                     fail("Wrong touch point delivery");
@@ -1329,13 +1335,13 @@ public void grabWithoutArgShouldAffectDelivery() {
             touched++;
             switch(touched) {
                 case 2:
-                    Assert.assertEquals(2, event.getTouchPoint().getId());
-                    Assert.assertEquals(260.0, event.getTouchPoint().getX(), 0.0001);
-                    Assert.assertEquals(265.0, event.getTouchPoint().getY(), 0.0001);
-                    Assert.assertEquals(260.0, event.getTouchPoint().getSceneX(), 0.0001);
-                    Assert.assertEquals(265.0, event.getTouchPoint().getSceneY(), 0.0001);
-                    Assert.assertEquals(1260.0, event.getTouchPoint().getScreenX(), 0.0001);
-                    Assert.assertEquals(1265.0, event.getTouchPoint().getScreenY(), 0.0001);
+                    assertEquals(2, event.getTouchPoint().getId());
+                    assertEquals(260.0, event.getTouchPoint().getX(), 0.0001);
+                    assertEquals(265.0, event.getTouchPoint().getY(), 0.0001);
+                    assertEquals(260.0, event.getTouchPoint().getSceneX(), 0.0001);
+                    assertEquals(265.0, event.getTouchPoint().getSceneY(), 0.0001);
+                    assertEquals(1260.0, event.getTouchPoint().getScreenX(), 0.0001);
+                    assertEquals(1265.0, event.getTouchPoint().getScreenY(), 0.0001);
                     break;
                 default:
                     fail("Wrong touch point delivery");
@@ -1374,23 +1380,23 @@ public void pointsShouldBeTransformedCorrectly() {
             touched++;
             switch(touched) {
                 case 1:
-                    Assert.assertEquals(115.0, event.getTouchPoint().getX(), 0.0001);
-                    Assert.assertEquals(125.0, event.getTouchPoint().getY(), 0.0001);
-                    Assert.assertEquals(130.0, event.getTouchPoint().getSceneX(), 0.0001);
-                    Assert.assertEquals(130.0, event.getTouchPoint().getSceneY(), 0.0001);
+                    assertEquals(115.0, event.getTouchPoint().getX(), 0.0001);
+                    assertEquals(125.0, event.getTouchPoint().getY(), 0.0001);
+                    assertEquals(130.0, event.getTouchPoint().getSceneX(), 0.0001);
+                    assertEquals(130.0, event.getTouchPoint().getSceneY(), 0.0001);
                     break;
                 case 2:
                 case 3:
                 case 4:
                 case 5:
-                    Assert.assertEquals(115.0, event.getTouchPoints().get(0).getX(), 0.0001);
-                    Assert.assertEquals(125.0, event.getTouchPoints().get(0).getY(), 0.0001);
-                    Assert.assertEquals(130.0, event.getTouchPoints().get(0).getSceneX(), 0.0001);
-                    Assert.assertEquals(130.0, event.getTouchPoints().get(0).getSceneY(), 0.0001);
-                    Assert.assertEquals(125.0, event.getTouchPoints().get(1).getX(), 0.0001);
-                    Assert.assertEquals(135.0, event.getTouchPoints().get(1).getY(), 0.0001);
-                    Assert.assertEquals(140.0, event.getTouchPoints().get(1).getSceneX(), 0.0001);
-                    Assert.assertEquals(140.0, event.getTouchPoints().get(1).getSceneY(), 0.0001);
+                    assertEquals(115.0, event.getTouchPoints().get(0).getX(), 0.0001);
+                    assertEquals(125.0, event.getTouchPoints().get(0).getY(), 0.0001);
+                    assertEquals(130.0, event.getTouchPoints().get(0).getSceneX(), 0.0001);
+                    assertEquals(130.0, event.getTouchPoints().get(0).getSceneY(), 0.0001);
+                    assertEquals(125.0, event.getTouchPoints().get(1).getX(), 0.0001);
+                    assertEquals(135.0, event.getTouchPoints().get(1).getY(), 0.0001);
+                    assertEquals(140.0, event.getTouchPoints().get(1).getSceneX(), 0.0001);
+                    assertEquals(140.0, event.getTouchPoints().get(1).getSceneY(), 0.0001);
                     break;
                 default:
                     fail("Wrong touch point id " + event.getTouchPoint().getId());
@@ -1444,89 +1450,99 @@ public void shouldIgnoreIndirectTouchEvents() {
         ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventEnd();
     }
 
-    @Test(expected=RuntimeException.class)
+    @Test
     public void shouldThrowREOnWrongSmallId() {
-        Scene scene = createScene();
-        Rectangle rect =
-                (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0);
-
-        ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventBegin(
-                System.currentTimeMillis(), 1, true, false, false, false, false);
-        ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventNext(
-                TouchPoint.State.PRESSED, 1, 110, 110, 110, 110);
-        ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventEnd();
-
-        ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventBegin(
-                System.currentTimeMillis(), 1, true, false, false, false, false);
-        ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventNext(
-                TouchPoint.State.MOVED, 2, 110, 110, 110, 110);
-        ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventEnd();
+        assertThrows(RuntimeException.class, () -> {
+            Scene scene = createScene();
+            Rectangle rect =
+                    (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0);
+
+            ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventBegin(
+                    System.currentTimeMillis(), 1, true, false, false, false, false);
+            ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventNext(
+                    TouchPoint.State.PRESSED, 1, 110, 110, 110, 110);
+            ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventEnd();
+
+            ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventBegin(
+                    System.currentTimeMillis(), 1, true, false, false, false, false);
+            ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventNext(
+                    TouchPoint.State.MOVED, 2, 110, 110, 110, 110);
+            ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventEnd();
+        });
     }
 
-    @Test(expected=RuntimeException.class)
+    @Test
     public void shouldThrowREOnWrongLargeId() {
-        Scene scene = createScene();
-        Rectangle rect =
-                (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0);
-
-        ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventBegin(
-                System.currentTimeMillis(), 1, true, false, false, false, false);
-        ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventNext(
-                TouchPoint.State.PRESSED, 1368, 110, 110, 110, 110);
-        ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventEnd();
-
-        ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventBegin(
-                System.currentTimeMillis(), 1, true, false, false, false, false);
-        ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventNext(
-                TouchPoint.State.MOVED, 127, 110, 110, 110, 110);
-        ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventEnd();
+        assertThrows(RuntimeException.class, () -> {
+            Scene scene = createScene();
+            Rectangle rect =
+                    (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0);
+
+            ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventBegin(
+                    System.currentTimeMillis(), 1, true, false, false, false, false);
+            ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventNext(
+                    TouchPoint.State.PRESSED, 1368, 110, 110, 110, 110);
+            ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventEnd();
+
+            ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventBegin(
+                    System.currentTimeMillis(), 1, true, false, false, false, false);
+            ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventNext(
+                    TouchPoint.State.MOVED, 127, 110, 110, 110, 110);
+            ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventEnd();
+        });
     }
 
-    @Test(expected=RuntimeException.class)
+    @Test
     public void shouldThrowREOnBigTPNumber() {
-        Scene scene = createScene();
-        Rectangle rect =
-                (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0);
-
-        ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventBegin(
-                System.currentTimeMillis(), 1, true, false, false, false, false);
-        ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventNext(
-                TouchPoint.State.PRESSED, 1368, 110, 110, 110, 110);
-        ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventNext(
-                TouchPoint.State.PRESSED, 1, 110, 110, 110, 110);
-        ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventEnd();
+        assertThrows(RuntimeException.class, () -> {
+            Scene scene = createScene();
+            Rectangle rect =
+                    (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0);
+
+            ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventBegin(
+                    System.currentTimeMillis(), 1, true, false, false, false, false);
+            ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventNext(
+                    TouchPoint.State.PRESSED, 1368, 110, 110, 110, 110);
+            ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventNext(
+                    TouchPoint.State.PRESSED, 1, 110, 110, 110, 110);
+            ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventEnd();
+        });
     }
 
-    @Test(expected=RuntimeException.class)
+    @Test
     public void shouldThrowREOnSmallTPNumber() {
-        Scene scene = createScene();
-        Rectangle rect =
-                (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0);
-
-        ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventBegin(
-                System.currentTimeMillis(), 2, true, false, false, false, false);
-        ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventNext(
-                TouchPoint.State.PRESSED, 1368, 110, 110, 110, 110);
-        ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventEnd();
+        assertThrows(RuntimeException.class, () -> {
+            Scene scene = createScene();
+            Rectangle rect =
+                    (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0);
+
+            ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventBegin(
+                    System.currentTimeMillis(), 2, true, false, false, false, false);
+            ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventNext(
+                    TouchPoint.State.PRESSED, 1368, 110, 110, 110, 110);
+            ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventEnd();
+        });
     }
 
-    @Test(expected=RuntimeException.class)
+    @Test
     public void shouldThrowREOnLostRelease() {
-        Scene scene = createScene();
-        Rectangle rect =
-                (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0);
-
-        ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventBegin(
-                System.currentTimeMillis(), 1, true, false, false, false, false);
-        ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventNext(
-                TouchPoint.State.PRESSED, 1368, 110, 110, 110, 110);
-        ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventEnd();
-
-        ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventBegin(
-                System.currentTimeMillis(), 1, true, false, false, false, false);
-        ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventNext(
-                TouchPoint.State.PRESSED, 1, 110, 110, 110, 110);
-        ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventEnd();
+        assertThrows(RuntimeException.class, () -> {
+            Scene scene = createScene();
+            Rectangle rect =
+                    (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0);
+
+            ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventBegin(
+                    System.currentTimeMillis(), 1, true, false, false, false, false);
+            ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventNext(
+                    TouchPoint.State.PRESSED, 1368, 110, 110, 110, 110);
+            ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventEnd();
+
+            ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventBegin(
+                    System.currentTimeMillis(), 1, true, false, false, false, false);
+            ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventNext(
+                    TouchPoint.State.PRESSED, 1, 110, 110, 110, 110);
+            ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventEnd();
+        });
     }
 
     private Scene createScene() {
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/ZoomEventTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/ZoomEventTest.java
index 9523a8d15e0..0c9723cf556 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/ZoomEventTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/ZoomEventTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,9 +38,13 @@
 import javafx.scene.input.ZoomEvent;
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
-import org.junit.Assert;
-import org.junit.Test;
-import static org.junit.Assert.*;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class ZoomEventTest {
 
@@ -218,8 +222,8 @@ public void shouldPassFactors() {
 
         zoomed = false;
         rect.setOnZoom(event -> {
-            Assert.assertEquals(1.2, event.getZoomFactor(), 0.0001);
-            Assert.assertEquals(2.4, event.getTotalZoomFactor(), 0.0001);
+            assertEquals(1.2, event.getZoomFactor(), 0.0001);
+            assertEquals(2.4, event.getTotalZoomFactor(), 0.0001);
             zoomed = true;
         });
 
@@ -421,16 +425,16 @@ public void shouldCompute3dCoordinates() {
         zoomed = false;
         zoomed2 = false;
         rect.setOnZoom(event -> {
-            Assert.assertEquals(150, event.getX(), 0.00001);
-            Assert.assertEquals(150, event.getY(), 0.00001);
-            Assert.assertEquals(0, event.getZ(), 0.00001);
+            assertEquals(150, event.getX(), 0.00001);
+            assertEquals(150, event.getY(), 0.00001);
+            assertEquals(0, event.getZ(), 0.00001);
             zoomed = true;
         });
 
         scene.setOnZoom(event -> {
-            Assert.assertEquals(150, event.getX(), 0.00001);
-            Assert.assertEquals(150, event.getY(), 0.00001);
-            Assert.assertEquals(50, event.getZ(), 0.00001);
+            assertEquals(150, event.getX(), 0.00001);
+            assertEquals(150, event.getY(), 0.00001);
+            assertEquals(50, event.getZ(), 0.00001);
             zoomed2 = true;
         });
 
@@ -518,8 +522,8 @@ public void unknownLocationShouldBeReplacedByMouseLocation() {
         zoomed = false;
         zoomed2 = false;
         rect2.setOnZoomStarted(event -> {
-            Assert.assertEquals(250.0, event.getSceneX(), 0.0001);
-            Assert.assertEquals(250.0, event.getSceneY(), 0.0001);
+            assertEquals(250.0, event.getSceneX(), 0.0001);
+            assertEquals(250.0, event.getSceneY(), 0.0001);
             zoomed2 = true;
         });
         SceneHelper.processMouseEvent(scene, generator.generateMouseEvent(
@@ -534,8 +538,8 @@ public void unknownLocationShouldBeReplacedByMouseLocation() {
         zoomed = false;
         zoomed2 = false;
         rect2.setOnZoom(event -> {
-            Assert.assertEquals(150.0, event.getSceneX(), 0.0001);
-            Assert.assertEquals(150.0, event.getSceneY(), 0.0001);
+            assertEquals(150.0, event.getSceneX(), 0.0001);
+            assertEquals(150.0, event.getSceneY(), 0.0001);
             zoomed2 = true;
         });
         SceneHelper.processMouseEvent(scene, generator.generateMouseEvent(
@@ -550,8 +554,8 @@ public void unknownLocationShouldBeReplacedByMouseLocation() {
         zoomed = false;
         zoomed2 = false;
         rect2.setOnZoomFinished(event -> {
-            Assert.assertEquals(150.0, event.getSceneX(), 0.0001);
-            Assert.assertEquals(150.0, event.getSceneY(), 0.0001);
+            assertEquals(150.0, event.getSceneX(), 0.0001);
+            assertEquals(150.0, event.getSceneY(), 0.0001);
             zoomed2 = true;
         });
         ((StubScene) SceneHelper.getPeer(scene)).getListener().zoomEvent(
@@ -568,8 +572,8 @@ public void finishedLocationShouldBeFixed() {
         Rectangle rect =
                 (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0);
         rect.setOnZoomFinished(event -> {
-            Assert.assertEquals(250.0, event.getSceneX(), 0.0001);
-            Assert.assertEquals(250.0, event.getSceneY(), 0.0001);
+            assertEquals(250.0, event.getSceneX(), 0.0001);
+            assertEquals(250.0, event.getSceneY(), 0.0001);
             zoomed = true;
         });
 
@@ -601,8 +605,8 @@ public void unknownLocalShouldBeFixedByMousePosition() {
                 (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0);
 
         rect.setOnZoom(event -> {
-            Assert.assertEquals(150.0, event.getSceneX(), 0.0001);
-            Assert.assertEquals(150.0, event.getSceneY(), 0.0001);
+            assertEquals(150.0, event.getSceneX(), 0.0001);
+            assertEquals(150.0, event.getSceneY(), 0.0001);
             zoomed = true;
         });
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundFillTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundFillTest.java
index 8eea7226b5c..8328d6fd622 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundFillTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundFillTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,71 +29,83 @@
 import javafx.scene.layout.BackgroundFill;
 import javafx.scene.layout.CornerRadii;
 import javafx.scene.paint.Color;
-import org.junit.Test;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 /**
  * Simple tests for BackgroundFill
  */
 public class BackgroundFillTest {
-    @Test public void nullPaintDefaultsToTransparent() {
+    @Test
+    public void nullPaintDefaultsToTransparent() {
         BackgroundFill fill = new BackgroundFill(null, new CornerRadii(3), new Insets(4));
         assertEquals(Color.TRANSPARENT, fill.getFill());
     }
 
-    @Test public void nullRadiusDefaultsToEmpty() {
+    @Test
+    public void nullRadiusDefaultsToEmpty() {
         BackgroundFill fill = new BackgroundFill(Color.ORANGE, null, new Insets(2));
         assertEquals(CornerRadii.EMPTY, fill.getRadii());
     }
 
-    @Test public void nullInsetsDefaultsToEmpty() {
+    @Test
+    public void nullInsetsDefaultsToEmpty() {
         BackgroundFill fill = new BackgroundFill(Color.ORANGE, new CornerRadii(2), null);
         assertEquals(Insets.EMPTY, fill.getInsets());
     }
 
-    @Test public void equivalentFills() {
+    @Test
+    public void equivalentFills() {
         BackgroundFill a = new BackgroundFill(Color.ORANGE, new CornerRadii(2), new Insets(3));
         BackgroundFill b = new BackgroundFill(Color.ORANGE, new CornerRadii(2), new Insets(3));
         assertEquals(a, b);
     }
 
-    @Test public void differentFills() {
+    @Test
+    public void differentFills() {
         BackgroundFill a = new BackgroundFill(Color.ORANGE, new CornerRadii(2), new Insets(3));
         BackgroundFill b = new BackgroundFill(Color.RED, new CornerRadii(2), new Insets(3));
         assertFalse(a.equals(b));
     }
 
-    @Test public void differentFills2() {
+    @Test
+    public void differentFills2() {
         BackgroundFill a = new BackgroundFill(Color.ORANGE, new CornerRadii(2), new Insets(3));
         BackgroundFill b = new BackgroundFill(Color.ORANGE, new CornerRadii(1), new Insets(3));
         assertFalse(a.equals(b));
     }
 
-    @Test public void differentFills3() {
+    @Test
+    public void differentFills3() {
         BackgroundFill a = new BackgroundFill(Color.ORANGE, new CornerRadii(2), new Insets(3));
         BackgroundFill b = new BackgroundFill(Color.ORANGE, new CornerRadii(2), new Insets(1));
         assertFalse(a.equals(b));
     }
 
-    @Test public void equalsAgainstNull() {
+    @Test
+    public void equalsAgainstNull() {
         BackgroundFill a = new BackgroundFill(Color.ORANGE, new CornerRadii(2), new Insets(3));
         assertFalse(a.equals(null));
     }
 
     @SuppressWarnings("unlikely-arg-type")
-    @Test public void equalsAgainstRandomObject() {
+    @Test
+    public void equalsAgainstRandomObject() {
         BackgroundFill a = new BackgroundFill(Color.ORANGE, new CornerRadii(2), new Insets(3));
         assertFalse(a.equals("Some random object"));
     }
 
-    @Test public void equivalentHaveSameHash() {
+    @Test
+    public void equivalentHaveSameHash() {
         BackgroundFill a = new BackgroundFill(Color.ORANGE, new CornerRadii(2), new Insets(3));
         BackgroundFill b = new BackgroundFill(Color.ORANGE, new CornerRadii(2), new Insets(3));
         assertEquals(a.hashCode(), b.hashCode());
     }
 
-    @Test public void toStringCausesNoError() {
+    @Test
+    public void toStringCausesNoError() {
         BackgroundFill f = new BackgroundFill(null, null, null);
         f.toString();
     }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundImageTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundImageTest.java
index c364a82b773..74d6f7c89d2 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundImageTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundImageTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,10 +30,13 @@
 import javafx.scene.layout.BackgroundImage;
 import javafx.scene.layout.BackgroundPosition;
 import javafx.scene.layout.BackgroundSize;
-import org.junit.Test;
 
 import static javafx.scene.layout.BackgroundRepeat.*;
-import static org.junit.Assert.*;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /**
  */
@@ -47,7 +50,8 @@ public class BackgroundImageTest {
     private static final Image IMAGE_1 = new Image("test/javafx/scene/layout/red.png");
     private static final Image IMAGE_2 = new Image("test/javafx/scene/layout/blue.png");
 
-    @Test public void instanceCreation() {
+    @Test
+    public void instanceCreation() {
         BackgroundImage image = new BackgroundImage(IMAGE_1, REPEAT, REPEAT, POS_1, SIZE_1);
         assertEquals(IMAGE_1,  image.getImage());
         assertEquals(REPEAT, image.getRepeatX());
@@ -56,7 +60,8 @@ public class BackgroundImageTest {
         assertEquals(SIZE_1, image.getSize());
     }
 
-    @Test public void instanceCreation2() {
+    @Test
+    public void instanceCreation2() {
         BackgroundImage image = new BackgroundImage(IMAGE_2, NO_REPEAT, ROUND, POS_2, SIZE_2);
         assertEquals(IMAGE_2,  image.getImage());
         assertEquals(NO_REPEAT, image.getRepeatX());
@@ -65,12 +70,15 @@ public class BackgroundImageTest {
         assertEquals(SIZE_2, image.getSize());
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void instanceCreationNullImage() {
-        new BackgroundImage(null, NO_REPEAT, ROUND, POS_2, SIZE_2);
+        assertThrows(NullPointerException.class, () -> {
+            new BackgroundImage(null, NO_REPEAT, ROUND, POS_2, SIZE_2);
+        });
     }
 
-    @Test public void instanceCreationNullRepeatXDefaultsToREPEAT() {
+    @Test
+    public void instanceCreationNullRepeatXDefaultsToREPEAT() {
         BackgroundImage image = new BackgroundImage(IMAGE_1, null, REPEAT, POS_1, SIZE_1);
         assertEquals(IMAGE_1,  image.getImage());
         assertEquals(REPEAT, image.getRepeatX());
@@ -79,7 +87,8 @@ public void instanceCreationNullImage() {
         assertEquals(SIZE_1, image.getSize());
     }
 
-    @Test public void instanceCreationNullRepeatYDefaultsToREPEAT() {
+    @Test
+    public void instanceCreationNullRepeatYDefaultsToREPEAT() {
         BackgroundImage image = new BackgroundImage(IMAGE_1, REPEAT, null, POS_1, SIZE_1);
         assertEquals(IMAGE_1,  image.getImage());
         assertEquals(REPEAT, image.getRepeatX());
@@ -88,7 +97,8 @@ public void instanceCreationNullImage() {
         assertEquals(SIZE_1, image.getSize());
     }
 
-    @Test public void instanceCreationNullPositionDefaultsToDEFAULT() {
+    @Test
+    public void instanceCreationNullPositionDefaultsToDEFAULT() {
         BackgroundImage image = new BackgroundImage(IMAGE_1, REPEAT, REPEAT, null, SIZE_1);
         assertEquals(IMAGE_1,  image.getImage());
         assertEquals(REPEAT, image.getRepeatX());
@@ -97,7 +107,8 @@ public void instanceCreationNullImage() {
         assertEquals(SIZE_1, image.getSize());
     }
 
-    @Test public void instanceCreationNullSizeDefaultsToDEFAULT() {
+    @Test
+    public void instanceCreationNullSizeDefaultsToDEFAULT() {
         BackgroundImage image = new BackgroundImage(IMAGE_1, REPEAT, REPEAT, POS_1, null);
         assertEquals(IMAGE_1,  image.getImage());
         assertEquals(REPEAT, image.getRepeatX());
@@ -106,115 +117,134 @@ public void instanceCreationNullImage() {
         assertEquals(BackgroundSize.DEFAULT, image.getSize());
     }
 
-    @Test public void equivalent() {
+    @Test
+    public void equivalent() {
         BackgroundImage a = new BackgroundImage(IMAGE_1, REPEAT, REPEAT, POS_1, SIZE_1);
         BackgroundImage b = new BackgroundImage(IMAGE_1, REPEAT, REPEAT, POS_1, SIZE_1);
         assertEquals(a, b);
     }
 
-    @Test public void equivalent2() {
+    @Test
+    public void equivalent2() {
         BackgroundImage a = new BackgroundImage(IMAGE_1, SPACE, REPEAT, POS_1, SIZE_1);
         BackgroundImage b = new BackgroundImage(IMAGE_1, SPACE, REPEAT, POS_1, SIZE_1);
         assertEquals(a, b);
     }
 
-    @Test public void equivalent3() {
+    @Test
+    public void equivalent3() {
         BackgroundImage a = new BackgroundImage(IMAGE_1, REPEAT, ROUND, POS_1, SIZE_1);
         BackgroundImage b = new BackgroundImage(IMAGE_1, REPEAT, ROUND, POS_1, SIZE_1);
         assertEquals(a, b);
     }
 
-    @Test public void equivalent4() {
+    @Test
+    public void equivalent4() {
         BackgroundImage a = new BackgroundImage(IMAGE_1, REPEAT, REPEAT, POS_2, SIZE_1);
         BackgroundImage b = new BackgroundImage(IMAGE_1, REPEAT, REPEAT, POS_2, SIZE_1);
         assertEquals(a, b);
     }
 
-    @Test public void equivalent5() {
+    @Test
+    public void equivalent5() {
         BackgroundImage a = new BackgroundImage(IMAGE_1, REPEAT, REPEAT, POS_1, SIZE_2);
         BackgroundImage b = new BackgroundImage(IMAGE_1, REPEAT, REPEAT, POS_1, SIZE_2);
         assertEquals(a, b);
     }
 
-    @Test public void equivalent6() {
+    @Test
+    public void equivalent6() {
         BackgroundImage a = new BackgroundImage(IMAGE_1, REPEAT, REPEAT, POS_2, SIZE_2);
         BackgroundImage b = new BackgroundImage(IMAGE_1, REPEAT, REPEAT, BackgroundPosition.DEFAULT, BackgroundSize.DEFAULT);
         assertEquals(a, b);
     }
 
-    @Test public void equivalentHasSameHashCode() {
+    @Test
+    public void equivalentHasSameHashCode() {
         BackgroundImage a = new BackgroundImage(IMAGE_1, REPEAT, REPEAT, POS_1, SIZE_1);
         BackgroundImage b = new BackgroundImage(IMAGE_1, REPEAT, REPEAT, POS_1, SIZE_1);
         assertEquals(a.hashCode(), b.hashCode());
     }
 
-    @Test public void equivalentHasSameHashCode2() {
+    @Test
+    public void equivalentHasSameHashCode2() {
         BackgroundImage a = new BackgroundImage(IMAGE_1, SPACE, REPEAT, POS_1, SIZE_1);
         BackgroundImage b = new BackgroundImage(IMAGE_1, SPACE, REPEAT, POS_1, SIZE_1);
         assertEquals(a.hashCode(), b.hashCode());
     }
 
-    @Test public void equivalentHasSameHashCode3() {
+    @Test
+    public void equivalentHasSameHashCode3() {
         BackgroundImage a = new BackgroundImage(IMAGE_1, REPEAT, ROUND, POS_1, SIZE_1);
         BackgroundImage b = new BackgroundImage(IMAGE_1, REPEAT, ROUND, POS_1, SIZE_1);
         assertEquals(a.hashCode(), b.hashCode());
     }
 
-    @Test public void equivalentHasSameHashCode4() {
+    @Test
+    public void equivalentHasSameHashCode4() {
         BackgroundImage a = new BackgroundImage(IMAGE_1, REPEAT, REPEAT, POS_2, SIZE_1);
         BackgroundImage b = new BackgroundImage(IMAGE_1, REPEAT, REPEAT, POS_2, SIZE_1);
         assertEquals(a.hashCode(), b.hashCode());
     }
 
-    @Test public void equivalentHasSameHashCode5() {
+    @Test
+    public void equivalentHasSameHashCode5() {
         BackgroundImage a = new BackgroundImage(IMAGE_1, REPEAT, REPEAT, POS_1, SIZE_2);
         BackgroundImage b = new BackgroundImage(IMAGE_1, REPEAT, REPEAT, POS_1, SIZE_2);
         assertEquals(a.hashCode(), b.hashCode());
     }
 
-    @Test public void equivalentHasSameHashCode6() {
+    @Test
+    public void equivalentHasSameHashCode6() {
         BackgroundImage a = new BackgroundImage(IMAGE_1, REPEAT, REPEAT, POS_2, SIZE_2);
         BackgroundImage b = new BackgroundImage(IMAGE_1, REPEAT, REPEAT, BackgroundPosition.DEFAULT, BackgroundSize.DEFAULT);
         assertEquals(a.hashCode(), b.hashCode());
     }
 
-    @Test public void notEquivalent() {
+    @Test
+    public void notEquivalent() {
         BackgroundImage a = new BackgroundImage(IMAGE_1, REPEAT, REPEAT, POS_1, SIZE_1);
         BackgroundImage b = new BackgroundImage(IMAGE_2, REPEAT, REPEAT, POS_1, SIZE_1);
         assertFalse(a.equals(b));
     }
 
-    @Test public void notEquivalent2() {
+    @Test
+    public void notEquivalent2() {
         BackgroundImage a = new BackgroundImage(IMAGE_1, SPACE, REPEAT, POS_1, SIZE_1);
         BackgroundImage b = new BackgroundImage(IMAGE_1, ROUND, REPEAT, POS_1, SIZE_1);
         assertFalse(a.equals(b));
     }
 
-    @Test public void notEquivalent3() {
+    @Test
+    public void notEquivalent3() {
         BackgroundImage a = new BackgroundImage(IMAGE_1, REPEAT, ROUND, POS_1, SIZE_1);
         BackgroundImage b = new BackgroundImage(IMAGE_1, REPEAT, REPEAT, POS_1, SIZE_1);
         assertFalse(a.equals(b));
     }
 
-    @Test public void notEquivalent4() {
+    @Test
+    public void notEquivalent4() {
         BackgroundImage a = new BackgroundImage(IMAGE_1, REPEAT, REPEAT, POS_1, SIZE_1);
         BackgroundImage b = new BackgroundImage(IMAGE_1, REPEAT, REPEAT, POS_2, SIZE_1);
         assertFalse(a.equals(b));
     }
 
-    @Test public void notEquivalent5() {
+    @Test
+    public void notEquivalent5() {
         BackgroundImage a = new BackgroundImage(IMAGE_1, REPEAT, REPEAT, POS_1, SIZE_1);
         BackgroundImage b = new BackgroundImage(IMAGE_1, REPEAT, REPEAT, POS_1, SIZE_2);
         assertFalse(a.equals(b));
     }
 
-    @Test public void notEquivalentWithNull() {
+    @Test
+    public void notEquivalentWithNull() {
         BackgroundImage a = new BackgroundImage(IMAGE_1, REPEAT, REPEAT, POS_2, SIZE_2);
         assertFalse(a.equals(null));
     }
 
     @SuppressWarnings("unlikely-arg-type")
-    @Test public void notEquivalentWithRandom() {
+    @Test
+    public void notEquivalentWithRandom() {
         BackgroundImage a = new BackgroundImage(IMAGE_1, REPEAT, REPEAT, POS_2, SIZE_2);
         assertFalse(a.equals("Some random string"));
     }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundPositionTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundPositionTest.java
index 8b8d359be01..cf559fd7286 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundPositionTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundPositionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,9 +27,12 @@
 
 import javafx.geometry.Side;
 import javafx.scene.layout.BackgroundPosition;
-import org.junit.Test;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /**
  */
@@ -61,14 +64,18 @@ public class BackgroundPositionTest {
         assertEquals(Side.LEFT, pos.getHorizontalSide());
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void TOPHorizontalSideFails() {
-        new BackgroundPosition(Side.TOP, 10, true, Side.BOTTOM, 20, true);
+        assertThrows(IllegalArgumentException.class, () -> {
+            new BackgroundPosition(Side.TOP, 10, true, Side.BOTTOM, 20, true);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void BOTTOMHorizontalSideFails() {
-        new BackgroundPosition(Side.BOTTOM, 10, true, Side.BOTTOM, 20, true);
+        assertThrows(IllegalArgumentException.class, () -> {
+            new BackgroundPosition(Side.BOTTOM, 10, true, Side.BOTTOM, 20, true);
+        });
     }
 
     @Test public void negativeHorizontalPositionOK() {
@@ -81,14 +88,18 @@ public void BOTTOMHorizontalSideFails() {
         assertEquals(Side.TOP, pos.getVerticalSide());
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void LEFTVerticalSideFails() {
-        new BackgroundPosition(Side.LEFT, 10, true, Side.LEFT, 20, true);
+        assertThrows(IllegalArgumentException.class, () -> {
+            new BackgroundPosition(Side.LEFT, 10, true, Side.LEFT, 20, true);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void RIGHTVerticalSideFails() {
-        new BackgroundPosition(Side.LEFT, 10, true, Side.RIGHT, 20, true);
+        assertThrows(IllegalArgumentException.class, () -> {
+            new BackgroundPosition(Side.LEFT, 10, true, Side.RIGHT, 20, true);
+        });
     }
 
     @Test public void negativeVerticalPositionOK() {
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundSizeTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundSizeTest.java
index 7170668e64d..f9efa3f0c2a 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundSizeTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundSizeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,15 +26,19 @@
 package test.javafx.scene.layout;
 
 import javafx.scene.layout.BackgroundSize;
-import org.junit.Ignore;
-import org.junit.Test;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /**
  */
 public class BackgroundSizeTest {
-    @Test public void instanceCreation() {
+    @Test
+    public void instanceCreation() {
         BackgroundSize size = new BackgroundSize(1, 2, true, false, true, false);
         assertEquals(1, size.getWidth(), 0);
         assertEquals(2, size.getHeight(), 0);
@@ -44,7 +48,8 @@ public class BackgroundSizeTest {
         assertFalse(size.isCover());
     }
 
-    @Test public void instanceCreation2() {
+    @Test
+    public void instanceCreation2() {
         BackgroundSize size = new BackgroundSize(0, Double.MAX_VALUE, false, true, false, true);
         assertEquals(0, size.getWidth(), 0);
         assertEquals(Double.MAX_VALUE, size.getHeight(), 0);
@@ -54,7 +59,8 @@ public class BackgroundSizeTest {
         assertTrue(size.isCover());
     }
 
-    @Test public void instanceCreation3() {
+    @Test
+    public void instanceCreation3() {
         BackgroundSize size = new BackgroundSize(.5, .5, true, true, false, false);
         assertEquals(.5, size.getWidth(), 0);
         assertEquals(.5, size.getHeight(), 0);
@@ -64,185 +70,227 @@ public class BackgroundSizeTest {
         assertFalse(size.isCover());
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void negativeWidthThrowsException() {
-        new BackgroundSize(-.2, 1, true, true, false, false);
+        assertThrows(IllegalArgumentException.class, () -> {
+            new BackgroundSize(-.2, 1, true, true, false, false);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void negativeWidthThrowsException2() {
-        new BackgroundSize(-2, 1, true, true, false, false);
+        assertThrows(IllegalArgumentException.class, () -> {
+            new BackgroundSize(-2, 1, true, true, false, false);
+        });
     }
 
-    @Ignore("JDK-8234090")
-    @Test(expected = IllegalArgumentException.class)
+    @Disabled("JDK-8234090")
+    @Test
     public void positiveInfinityWidthThrowsException() {
-        new BackgroundSize(Double.POSITIVE_INFINITY, 1, true, true, false, false);
+        assertThrows(IllegalArgumentException.class, () -> {
+            new BackgroundSize(Double.POSITIVE_INFINITY, 1, true, true, false, false);
+        });
     }
 
-    @Ignore("JDK-8234090")
-    @Test(expected = IllegalArgumentException.class)
+    @Disabled("JDK-8234090")
+    @Test
     public void negativeInfinityWidthThrowsException() {
-        new BackgroundSize(Double.NEGATIVE_INFINITY, 1, true, true, false, false);
+        assertThrows(IllegalArgumentException.class, () -> {
+            new BackgroundSize(Double.NEGATIVE_INFINITY, 1, true, true, false, false);
+        });
     }
 
-    @Ignore("JDK-8234090")
-    @Test(expected = IllegalArgumentException.class)
+    @Disabled("JDK-8234090")
+    @Test
     public void nanWidthThrowsException() {
-        new BackgroundSize(Double.NaN, 1, true, true, false, false);
+        assertThrows(IllegalArgumentException.class, () -> {
+            new BackgroundSize(Double.NaN, 1, true, true, false, false);
+        });
     }
 
-    @Test public void negativeZeroWidthIsOK() {
+    @Test
+    public void negativeZeroWidthIsOK() {
         BackgroundSize size = new BackgroundSize(-0, 1, true, true, false, false);
         assertEquals(0, size.getWidth(), 0);
     }
 
-    @Test public void autoWidthIsOK() {
+    @Test
+    public void autoWidthIsOK() {
         BackgroundSize size = new BackgroundSize(-1, 1, true, true, false, false);
         assertEquals(BackgroundSize.AUTO, size.getWidth(), 0);
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void negativeHeightThrowsException() {
-        new BackgroundSize(1, -.1, true, true, false, false);
+        assertThrows(IllegalArgumentException.class, () -> {
+            new BackgroundSize(1, -.1, true, true, false, false);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void negativeHeightThrowsException2() {
-        new BackgroundSize(1, -2, true, true, false, false);
+        assertThrows(IllegalArgumentException.class, () -> {
+            new BackgroundSize(1, -2, true, true, false, false);
+        });
     }
 
-    @Ignore("JDK-8234090")
-    @Test(expected = IllegalArgumentException.class)
+    @Disabled("JDK-8234090")
+    @Test
     public void positiveInfinityHeightThrowsException() {
-        new BackgroundSize(1, Double.POSITIVE_INFINITY, true, true, false, false);
+        assertThrows(IllegalArgumentException.class, () -> {
+            new BackgroundSize(1, Double.POSITIVE_INFINITY, true, true, false, false);
+        });
     }
 
-    @Ignore("JDK-8234090")
-    @Test(expected = IllegalArgumentException.class)
+    @Disabled("JDK-8234090")
+    @Test
     public void negativeInfinityHeightThrowsException() {
-        new BackgroundSize(1, Double.NEGATIVE_INFINITY, true, true, false, false);
+        assertThrows(IllegalArgumentException.class, () -> {
+            new BackgroundSize(1, Double.NEGATIVE_INFINITY, true, true, false, false);
+        });
     }
 
-    @Ignore("JDK-8234090")
-    @Test(expected = IllegalArgumentException.class)
+    @Disabled("JDK-8234090")
+    @Test
     public void nanHeightThrowsException() {
-        new BackgroundSize(1, Double.NaN, true, true, false, false);
+        assertThrows(IllegalArgumentException.class, () -> {
+            new BackgroundSize(1, Double.NaN, true, true, false, false);
+        });
     }
 
-    @Test public void negativeZeroHeightIsOK() {
+    @Test
+    public void negativeZeroHeightIsOK() {
         BackgroundSize size = new BackgroundSize(1, -0, true, true, false, false);
         assertEquals(0, size.getHeight(), 0);
     }
 
-    @Test public void autoHeightIsOK() {
+    @Test
+    public void autoHeightIsOK() {
         BackgroundSize size = new BackgroundSize(1, -1, true, true, false, false);
         assertEquals(BackgroundSize.AUTO, size.getHeight(), 0);
     }
 
-    @Test public void equivalent() {
+    @Test
+    public void equivalent() {
         BackgroundSize a = new BackgroundSize(1, .5, true, true, true, true);
         BackgroundSize b = new BackgroundSize(1, .5, true, true, true, true);
         assertEquals(a, b);
     }
 
-    @Test public void equivalent2() {
+    @Test
+    public void equivalent2() {
         BackgroundSize a = new BackgroundSize(1, .5, false, true, true, true);
         BackgroundSize b = new BackgroundSize(1, .5, false, true, true, true);
         assertEquals(a, b);
     }
 
-    @Test public void equivalent3() {
+    @Test
+    public void equivalent3() {
         BackgroundSize a = new BackgroundSize(1, .5, true, false, true, true);
         BackgroundSize b = new BackgroundSize(1, .5, true, false, true, true);
         assertEquals(a, b);
     }
 
-    @Test public void equivalent4() {
+    @Test
+    public void equivalent4() {
         BackgroundSize a = new BackgroundSize(1, .5, true, true, false, true);
         BackgroundSize b = new BackgroundSize(1, .5, true, true, false, true);
         assertEquals(a, b);
     }
 
-    @Test public void equivalent5() {
+    @Test
+    public void equivalent5() {
         BackgroundSize a = new BackgroundSize(1, .5, true, true, true, false);
         BackgroundSize b = new BackgroundSize(1, .5, true, true, true, false);
         assertEquals(a, b);
     }
 
-    @Test public void equivalentHaveSameHashCode() {
+    @Test
+    public void equivalentHaveSameHashCode() {
         BackgroundSize a = new BackgroundSize(1, .5, true, true, true, true);
         BackgroundSize b = new BackgroundSize(1, .5, true, true, true, true);
         assertEquals(a.hashCode(), b.hashCode());
     }
 
-    @Test public void equivalentHaveSameHashCode2() {
+    @Test
+    public void equivalentHaveSameHashCode2() {
         BackgroundSize a = new BackgroundSize(1, .5, false, true, true, true);
         BackgroundSize b = new BackgroundSize(1, .5, false, true, true, true);
         assertEquals(a.hashCode(), b.hashCode());
     }
 
-    @Test public void equivalentHaveSameHashCode3() {
+    @Test
+    public void equivalentHaveSameHashCode3() {
         BackgroundSize a = new BackgroundSize(1, .5, true, false, true, true);
         BackgroundSize b = new BackgroundSize(1, .5, true, false, true, true);
         assertEquals(a.hashCode(), b.hashCode());
     }
 
-    @Test public void equivalentHaveSameHashCode4() {
+    @Test
+    public void equivalentHaveSameHashCode4() {
         BackgroundSize a = new BackgroundSize(1, .5, true, true, false, true);
         BackgroundSize b = new BackgroundSize(1, .5, true, true, false, true);
         assertEquals(a.hashCode(), b.hashCode());
     }
 
-    @Test public void equivalentHaveSameHashCode5() {
+    @Test
+    public void equivalentHaveSameHashCode5() {
         BackgroundSize a = new BackgroundSize(1, .5, true, true, true, false);
         BackgroundSize b = new BackgroundSize(1, .5, true, true, true, false);
         assertEquals(a.hashCode(), b.hashCode());
     }
 
-    @Test public void notEquivalent() {
+    @Test
+    public void notEquivalent() {
         BackgroundSize a = new BackgroundSize(0, .5, true, true, true, true);
         BackgroundSize b = new BackgroundSize(1, .5, true, true, true, true);
         assertFalse(a.equals(b));
     }
 
-    @Test public void notEquivalent2() {
+    @Test
+    public void notEquivalent2() {
         BackgroundSize a = new BackgroundSize(1, 1, true, true, true, true);
         BackgroundSize b = new BackgroundSize(1, .5, true, true, true, true);
         assertFalse(a.equals(b));
     }
 
-    @Test public void notEquivalent3() {
+    @Test
+    public void notEquivalent3() {
         BackgroundSize a = new BackgroundSize(1, .5, false, true, true, true);
         BackgroundSize b = new BackgroundSize(1, .5, true, true, true, true);
         assertFalse(a.equals(b));
     }
 
-    @Test public void notEquivalent4() {
+    @Test
+    public void notEquivalent4() {
         BackgroundSize a = new BackgroundSize(1, .5, true, false, true, true);
         BackgroundSize b = new BackgroundSize(1, .5, true, true, true, true);
         assertFalse(a.equals(b));
     }
 
-    @Test public void notEquivalent5() {
+    @Test
+    public void notEquivalent5() {
         BackgroundSize a = new BackgroundSize(1, .5, true, true, false, true);
         BackgroundSize b = new BackgroundSize(1, .5, true, true, true, true);
         assertFalse(a.equals(b));
     }
 
-    @Test public void notEquivalent6() {
+    @Test
+    public void notEquivalent6() {
         BackgroundSize a = new BackgroundSize(1, .5, true, true, true, false);
         BackgroundSize b = new BackgroundSize(1, .5, true, true, true, true);
         assertFalse(a.equals(b));
     }
 
-    @Test public void notEqualToNull() {
+    @Test
+    public void notEqualToNull() {
         BackgroundSize a = new BackgroundSize(1, .5, true, true, true, false);
         assertFalse(a.equals(null));
     }
 
     @SuppressWarnings("unlikely-arg-type")
-    @Test public void notEqualToRandom() {
+    @Test
+    public void notEqualToRandom() {
         BackgroundSize a = new BackgroundSize(1, .5, true, true, true, false);
         assertFalse(a.equals("Some random object"));
     }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundTest.java
index dc6cf27119b..4a5230de5ab 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,10 +35,15 @@
 import javafx.scene.layout.BackgroundShim;
 import javafx.scene.layout.CornerRadii;
 import javafx.scene.paint.Color;
-import org.junit.Test;
 
 import static javafx.scene.layout.BackgroundRepeat.*;
-import static org.junit.Assert.*;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /**
  */
@@ -66,7 +71,8 @@ public class BackgroundTest {
             new BackgroundImage(IMAGE_4, NO_REPEAT, NO_REPEAT, null, null)
     };
 
-    @Test public void instanceCreation() {
+    @Test
+    public void instanceCreation() {
         Background b = new Background(FILLS_1, IMAGES_1);
         assertEquals(FILLS_1.length, b.getFills().size(), 0);
         assertEquals(FILLS_1[0], b.getFills().get(0));
@@ -74,7 +80,8 @@ public class BackgroundTest {
         assertEquals(IMAGES_1[0], b.getImages().get(0));
     }
 
-    @Test public void instanceCreation2() {
+    @Test
+    public void instanceCreation2() {
         Background b = new Background(FILLS_2, IMAGES_2);
         assertEquals(FILLS_2.length, b.getFills().size(), 0);
         assertEquals(FILLS_2[0], b.getFills().get(0));
@@ -85,35 +92,40 @@ public class BackgroundTest {
         assertEquals(IMAGES_2[2], b.getImages().get(2));
     }
 
-    @Test public void instanceCreationNullFills() {
+    @Test
+    public void instanceCreationNullFills() {
         Background b = new Background(null, IMAGES_1);
         assertEquals(0, b.getFills().size(), 0);
         assertEquals(IMAGES_1.length, b.getImages().size(), 0);
         assertEquals(IMAGES_1[0], b.getImages().get(0));
     }
 
-    @Test public void instanceCreationEmptyFills() {
+    @Test
+    public void instanceCreationEmptyFills() {
         Background b = new Background(new BackgroundFill[0], IMAGES_1);
         assertEquals(0, b.getFills().size(), 0);
         assertEquals(IMAGES_1.length, b.getImages().size(), 0);
         assertEquals(IMAGES_1[0], b.getImages().get(0));
     }
 
-    @Test public void instanceCreationNullImages() {
+    @Test
+    public void instanceCreationNullImages() {
         Background b = new Background(FILLS_1, null);
         assertEquals(FILLS_1.length, b.getFills().size(), 0);
         assertEquals(FILLS_1[0], b.getFills().get(0));
         assertEquals(0, b.getImages().size(), 0);
     }
 
-    @Test public void instanceCreationEmptyImages() {
+    @Test
+    public void instanceCreationEmptyImages() {
         Background b = new Background(FILLS_1, new BackgroundImage[0]);
         assertEquals(FILLS_1.length, b.getFills().size(), 0);
         assertEquals(FILLS_1[0], b.getFills().get(0));
         assertEquals(0, b.getImages().size(), 0);
     }
 
-    @Test public void instanceCreationWithNullsInTheFillArray() {
+    @Test
+    public void instanceCreationWithNullsInTheFillArray() {
         final BackgroundFill[] fills = new BackgroundFill[] {
                 null,
                 new BackgroundFill(Color.GREEN, new CornerRadii(3), new Insets(4)),
@@ -125,7 +137,8 @@ public class BackgroundTest {
         assertEquals(FILLS_2[1], b.getFills().get(1));
     }
 
-    @Test public void instanceCreationWithNullsInTheFillArray2() {
+    @Test
+    public void instanceCreationWithNullsInTheFillArray2() {
         final BackgroundFill[] fills = new BackgroundFill[] {
                 new BackgroundFill(Color.GREEN, new CornerRadii(3), new Insets(4)),
                 null,
@@ -137,7 +150,8 @@ public class BackgroundTest {
         assertEquals(FILLS_2[1], b.getFills().get(1));
     }
 
-    @Test public void instanceCreationWithNullsInTheFillArray3() {
+    @Test
+    public void instanceCreationWithNullsInTheFillArray3() {
         final BackgroundFill[] fills = new BackgroundFill[] {
                 new BackgroundFill(Color.GREEN, new CornerRadii(3), new Insets(4)),
                 new BackgroundFill(Color.BLUE, new CornerRadii(6), new Insets(8)),
@@ -149,7 +163,8 @@ public class BackgroundTest {
         assertEquals(FILLS_2[1], b.getFills().get(1));
     }
 
-    @Test public void instanceCreationWithNullsInTheFillArray4() {
+    @Test
+    public void instanceCreationWithNullsInTheFillArray4() {
         final BackgroundFill[] fills = new BackgroundFill[] {
                 null
         };
@@ -157,7 +172,8 @@ public class BackgroundTest {
         assertEquals(0, b.getFills().size(), 0);
     }
 
-    @Test public void instanceCreationWithNullsInTheImageArray() {
+    @Test
+    public void instanceCreationWithNullsInTheImageArray() {
         final BackgroundImage[] images = new BackgroundImage[] {
                 null,
                 new BackgroundImage(IMAGE_2, SPACE, SPACE, null, null),
@@ -171,7 +187,8 @@ public class BackgroundTest {
         assertEquals(IMAGES_2[2], b.getImages().get(2));
     }
 
-    @Test public void instanceCreationWithNullsInTheImageArray2() {
+    @Test
+    public void instanceCreationWithNullsInTheImageArray2() {
         final BackgroundImage[] images = new BackgroundImage[] {
                 new BackgroundImage(IMAGE_2, SPACE, SPACE, null, null),
                 null,
@@ -185,7 +202,8 @@ public class BackgroundTest {
         assertEquals(IMAGES_2[2], b.getImages().get(2));
     }
 
-    @Test public void instanceCreationWithNullsInTheImageArray3() {
+    @Test
+    public void instanceCreationWithNullsInTheImageArray3() {
         final BackgroundImage[] images = new BackgroundImage[] {
                 new BackgroundImage(IMAGE_2, SPACE, SPACE, null, null),
                 new BackgroundImage(IMAGE_3, ROUND, ROUND, null, null),
@@ -199,7 +217,8 @@ public class BackgroundTest {
         assertEquals(IMAGES_2[2], b.getImages().get(2));
     }
 
-    @Test public void instanceCreationWithNullsInTheImageArray4() {
+    @Test
+    public void instanceCreationWithNullsInTheImageArray4() {
         final BackgroundImage[] images = new BackgroundImage[] {
                 null
         };
@@ -207,7 +226,8 @@ public class BackgroundTest {
         assertEquals(0, b.getImages().size(), 0);
     }
 
-    @Test public void suppliedBackgroundFillsMutatedLaterDoNotChangeFills() {
+    @Test
+    public void suppliedBackgroundFillsMutatedLaterDoNotChangeFills() {
         final BackgroundFill fill = new BackgroundFill(Color.GREEN, new CornerRadii(3), new Insets(4));
         final BackgroundFill[] fills = new BackgroundFill[] { fill };
         Background b = new Background(fills, null);
@@ -219,7 +239,8 @@ public class BackgroundTest {
         assertSame(fill, b2.getFills().get(0));
     }
 
-    @Test public void suppliedBackgroundImagesMutatedLaterDoNotChangeImages() {
+    @Test
+    public void suppliedBackgroundImagesMutatedLaterDoNotChangeImages() {
         final BackgroundImage image = new BackgroundImage(IMAGE_2, SPACE, SPACE, null, null);
         final BackgroundImage[] images = new BackgroundImage[] { image };
         Background b = new Background(null, images);
@@ -231,23 +252,28 @@ public class BackgroundTest {
         assertSame(image, b2.getImages().get(0));
     }
 
-    @Test(expected = UnsupportedOperationException.class)
+    @Test
     public void fillsIsUnmodifiable() {
-        final BackgroundFill fill = new BackgroundFill(Color.GREEN, new CornerRadii(3), new Insets(4));
-        final BackgroundFill[] fills = new BackgroundFill[] { fill };
-        Background b = new Background(fills);
-        b.getFills().add(new BackgroundFill(Color.BLUE, new CornerRadii(6), new Insets(8)));
+        assertThrows(UnsupportedOperationException.class, () -> {
+            final BackgroundFill fill = new BackgroundFill(Color.GREEN, new CornerRadii(3), new Insets(4));
+            final BackgroundFill[] fills = new BackgroundFill[] { fill };
+            Background b = new Background(fills);
+            b.getFills().add(new BackgroundFill(Color.BLUE, new CornerRadii(6), new Insets(8)));
+        });
     }
 
-    @Test(expected = UnsupportedOperationException.class)
+    @Test
     public void imagesIsUnmodifiable() {
-        final BackgroundImage image = new BackgroundImage(IMAGE_2, SPACE, SPACE, null, null);
-        final BackgroundImage[] images = new BackgroundImage[] { image };
-        Background b = new Background(images);
-        b.getImages().add(new BackgroundImage(IMAGE_3, ROUND, ROUND, null, null));
+        assertThrows(UnsupportedOperationException.class, () -> {
+            final BackgroundImage image = new BackgroundImage(IMAGE_2, SPACE, SPACE, null, null);
+            final BackgroundImage[] images = new BackgroundImage[] { image };
+            Background b = new Background(images);
+            b.getImages().add(new BackgroundImage(IMAGE_3, ROUND, ROUND, null, null));
+        });
     }
 
-    @Test public void backgroundOutsetsAreDefinedByFills() {
+    @Test
+    public void backgroundOutsetsAreDefinedByFills() {
         final BackgroundFill[] fills = new BackgroundFill[] {
                 new BackgroundFill(Color.RED, new CornerRadii(3), new Insets(-1, 5, 5, 5)),
                 new BackgroundFill(Color.GREEN, new CornerRadii(6), new Insets(8)),
@@ -262,7 +288,8 @@ public void imagesIsUnmodifiable() {
         assertEquals(new Insets(7, 2, 8, 8), b.getOutsets());
     }
 
-    @Test public void backgroundImagesDoNotContributeToOutsets() {
+    @Test
+    public void backgroundImagesDoNotContributeToOutsets() {
         final BackgroundImage[] images = new BackgroundImage[] {
                 new BackgroundImage(IMAGE_1, null, null,
                         new BackgroundPosition(Side.LEFT, -10, false, Side.TOP, -10, false),
@@ -273,73 +300,85 @@ public void imagesIsUnmodifiable() {
         assertEquals(Insets.EMPTY, b.getOutsets());
     }
 
-    @Test public void equivalent() {
+    @Test
+    public void equivalent() {
         Background a = new Background((BackgroundFill[])null, null);
         Background b = new Background((BackgroundFill[])null, null);
         assertEquals(a, b);
     }
 
-    @Test public void equivalent2() {
+    @Test
+    public void equivalent2() {
         Background a = new Background(FILLS_2, null);
         Background b = new Background(FILLS_2, null);
         assertEquals(a, b);
     }
 
-    @Test public void equivalent3() {
+    @Test
+    public void equivalent3() {
         Background a = new Background(null, IMAGES_2);
         Background b = new Background(null, IMAGES_2);
         assertEquals(a, b);
     }
 
-    @Test public void equivalentHasSameHashCode() {
+    @Test
+    public void equivalentHasSameHashCode() {
         Background a = new Background((BackgroundFill[])null, null);
         Background b = new Background((BackgroundFill[])null, null);
         assertEquals(a.hashCode(), b.hashCode());
     }
 
-    @Test public void equivalentHasSameHashCode2() {
+    @Test
+    public void equivalentHasSameHashCode2() {
         Background a = new Background(FILLS_2, null);
         Background b = new Background(FILLS_2, null);
         assertEquals(a.hashCode(), b.hashCode());
     }
 
-    @Test public void equivalentHasSameHashCode3() {
+    @Test
+    public void equivalentHasSameHashCode3() {
         Background a = new Background(null, IMAGES_2);
         Background b = new Background(null, IMAGES_2);
         assertEquals(a.hashCode(), b.hashCode());
     }
 
-    @Test public void notEqual() {
+    @Test
+    public void notEqual() {
         Background a = new Background(FILLS_1, null);
         Background b = new Background((BackgroundFill[])null, null);
         assertFalse(a.equals(b));
     }
 
-    @Test public void notEqual2() {
+    @Test
+    public void notEqual2() {
         Background a = new Background((BackgroundFill[])null, null);
         Background b = new Background(FILLS_2, null);
         assertFalse(a.equals(b));
     }
 
-    @Test public void notEqual3() {
+    @Test
+    public void notEqual3() {
         Background a = new Background(null, IMAGES_1);
         Background b = new Background((BackgroundFill[])null, null);
         assertFalse(a.equals(b));
     }
 
-    @Test public void notEqual4() {
+    @Test
+    public void notEqual4() {
         Background a = new Background((BackgroundFill[])null, null);
         Background b = new Background(null, IMAGES_2);
         assertFalse(a.equals(b));
     }
 
-    @Test public void notEqualWithNull() {
+    @Test
+    public void notEqualWithNull() {
         Background a = new Background((BackgroundFill[])null, null);
         assertFalse(a.equals(null));
     }
 
     @SuppressWarnings("unlikely-arg-type")
-    @Test public void notEqualWithRandom() {
+    @Test
+    public void notEqualWithRandom() {
         Background a = new Background((BackgroundFill[])null, null);
         assertFalse(a.equals("Some random String"));
     }
@@ -351,7 +390,8 @@ public void imagesIsUnmodifiable() {
      *                                                                        *
      *************************************************************************/
 
-    @Test public void opaqueInsets_nullFillsResultsInNaN() {
+    @Test
+    public void opaqueInsets_nullFillsResultsInNaN() {
         Background b = new Background((BackgroundFill[])null, null);
         final double[] trbl = new double[4];
         BackgroundShim.computeOpaqueInsets(b, 100, 50, trbl);
@@ -361,7 +401,8 @@ public void imagesIsUnmodifiable() {
         assertTrue(Double.isNaN(trbl[3]));
     }
 
-    @Test public void opaqueInsets_transparentFillsResultsInNaN() {
+    @Test
+    public void opaqueInsets_transparentFillsResultsInNaN() {
         BackgroundFill f = new BackgroundFill(Color.TRANSPARENT, null, null);
         Background b = new Background(new BackgroundFill[] { f }, null);
         final double[] trbl = new double[4];
@@ -372,7 +413,8 @@ public void imagesIsUnmodifiable() {
         assertTrue(Double.isNaN(trbl[3]));
     }
 
-    @Test public void opaqueInsets_transparentFillsResultsInNaN2() {
+    @Test
+    public void opaqueInsets_transparentFillsResultsInNaN2() {
         BackgroundFill f = new BackgroundFill(Color.rgb(255, 0, 0, 0), null, null);
         Background b = new Background(new BackgroundFill[] { f }, null);
         final double[] trbl = new double[4];
@@ -383,7 +425,8 @@ public void imagesIsUnmodifiable() {
         assertTrue(Double.isNaN(trbl[3]));
     }
 
-    @Test public void opaqueInsets_transparentFillsResultsInNaN3() {
+    @Test
+    public void opaqueInsets_transparentFillsResultsInNaN3() {
         BackgroundFill f = new BackgroundFill(Color.TRANSPARENT, null, null);
         BackgroundFill f2 = new BackgroundFill(Color.rgb(255, 0, 0, 0), null, null);
         Background b = new Background(new BackgroundFill[] { f, f2 }, null);
@@ -395,7 +438,8 @@ public void imagesIsUnmodifiable() {
         assertTrue(Double.isNaN(trbl[3]));
     }
 
-    @Test public void opaqueInsets_transparentFillsMixedWithNonTransparentFills() {
+    @Test
+    public void opaqueInsets_transparentFillsMixedWithNonTransparentFills() {
         BackgroundFill f = new BackgroundFill(Color.TRANSPARENT, null, null);
         BackgroundFill f2 = new BackgroundFill(Color.RED, null, new Insets(1));
         Background b = new Background(new BackgroundFill[] { f, f2 }, null);
@@ -407,7 +451,8 @@ public void imagesIsUnmodifiable() {
         assertEquals(1, trbl[3], 0);
     }
 
-    @Test public void opaqueInsets_transparentFillsMixedWithNonTransparentFills2() {
+    @Test
+    public void opaqueInsets_transparentFillsMixedWithNonTransparentFills2() {
         BackgroundFill f = new BackgroundFill(Color.TRANSPARENT, null, null);
         BackgroundFill f2 = new BackgroundFill(Color.RED, null, new Insets(-1));
         Background b = new Background(new BackgroundFill[] { f, f2 }, null);
@@ -419,7 +464,8 @@ public void imagesIsUnmodifiable() {
         assertEquals(-1, trbl[3], 0);
     }
 
-    @Test public void opaqueInsets_nestedOpaqueRectangles_LargestRectangleUsed() {
+    @Test
+    public void opaqueInsets_nestedOpaqueRectangles_LargestRectangleUsed() {
         BackgroundFill f = new BackgroundFill(Color.RED, null, new Insets(0));
         BackgroundFill f2 = new BackgroundFill(Color.GREEN, null, new Insets(1));
         BackgroundFill f3 = new BackgroundFill(Color.BLUE, null, new Insets(2));
@@ -432,7 +478,8 @@ public void imagesIsUnmodifiable() {
         assertEquals(0, trbl[3], 0);
     }
 
-    @Test public void opaqueInsets_nestedOpaqueRectangles_LargestRectangleUsed2() {
+    @Test
+    public void opaqueInsets_nestedOpaqueRectangles_LargestRectangleUsed2() {
         BackgroundFill f = new BackgroundFill(Color.RED, null, new Insets(-1));
         BackgroundFill f2 = new BackgroundFill(Color.GREEN, null, new Insets(0));
         BackgroundFill f3 = new BackgroundFill(Color.BLUE, null, new Insets(1));
@@ -445,7 +492,8 @@ public void imagesIsUnmodifiable() {
         assertEquals(-1, trbl[3], 0);
     }
 
-    @Test public void opaqueInsets_nestedOpaqueRectangles_LargestRectangleUsed3() {
+    @Test
+    public void opaqueInsets_nestedOpaqueRectangles_LargestRectangleUsed3() {
         BackgroundFill f = new BackgroundFill(Color.RED, null, new Insets(10));
         BackgroundFill f2 = new BackgroundFill(Color.GREEN, null, new Insets(1));
         BackgroundFill f3 = new BackgroundFill(Color.BLUE, null, new Insets(2));
@@ -458,7 +506,8 @@ public void imagesIsUnmodifiable() {
         assertEquals(1, trbl[3], 0);
     }
 
-    @Test public void opaqueInsets_nestedOpaqueRectangles_LargestRectangleUsed4() {
+    @Test
+    public void opaqueInsets_nestedOpaqueRectangles_LargestRectangleUsed4() {
         BackgroundFill f = new BackgroundFill(Color.RED, null, new Insets(0));
         BackgroundFill f2 = new BackgroundFill(Color.GREEN, null, new Insets(1));
         BackgroundFill f3 = new BackgroundFill(Color.BLUE, null, new Insets(-2));
@@ -471,7 +520,8 @@ public void imagesIsUnmodifiable() {
         assertEquals(-2, trbl[3], 0);
     }
 
-    @Test public void opaqueInsets_offsetOpaqueRectangles_completelyContained_LargestRectangleUsed() {
+    @Test
+    public void opaqueInsets_offsetOpaqueRectangles_completelyContained_LargestRectangleUsed() {
         BackgroundFill f = new BackgroundFill(Color.RED, null, new Insets(0));
         BackgroundFill f2 = new BackgroundFill(Color.GREEN, null, new Insets(1, 0, 0, 0));
         BackgroundFill f3 = new BackgroundFill(Color.BLUE, null, new Insets(0, 1, 0, 0));
@@ -487,7 +537,8 @@ public void imagesIsUnmodifiable() {
     }
 
     // Even when the big rectangle is not the first, does it still work?
-    @Test public void opaqueInsets_offsetOpaqueRectangles_completelyContained_LargestRectangleUsed2() {
+    @Test
+    public void opaqueInsets_offsetOpaqueRectangles_completelyContained_LargestRectangleUsed2() {
         BackgroundFill f = new BackgroundFill(Color.YELLOW, null, new Insets(0, 0, 1, 0));
         BackgroundFill f2 = new BackgroundFill(Color.GREEN, null, new Insets(1, 0, 0, 0));
         BackgroundFill f3 = new BackgroundFill(Color.BLUE, null, new Insets(0, 1, 0, 0));
@@ -502,7 +553,8 @@ public void imagesIsUnmodifiable() {
         assertEquals(0, trbl[3], 0);
     }
 
-    @Test public void opaqueInsets_offsetOpaqueRectangles_UnionUsed() {
+    @Test
+    public void opaqueInsets_offsetOpaqueRectangles_UnionUsed() {
         BackgroundFill f = new BackgroundFill(Color.RED, null, new Insets(10, 0, 0, 0));
         BackgroundFill f2 = new BackgroundFill(Color.GREEN, null, new Insets(0, 10, 0, 0));
         BackgroundFill f3 = new BackgroundFill(Color.BLUE, null, new Insets(0, 0, 10, 0));
@@ -516,7 +568,8 @@ public void imagesIsUnmodifiable() {
         assertEquals(0, trbl[3], 0);
     }
 
-    @Test public void opaqueInsets_offsetOpaqueRectangles_UnionUsed2() {
+    @Test
+    public void opaqueInsets_offsetOpaqueRectangles_UnionUsed2() {
         BackgroundFill f = new BackgroundFill(Color.RED, null, new Insets(10, 0, 0, 0));
         BackgroundFill f2 = new BackgroundFill(Color.GREEN, null, new Insets(10, 10, 0, 0));
         BackgroundFill f3 = new BackgroundFill(Color.BLUE, null, new Insets(10, 10, 10, 0));
@@ -534,7 +587,8 @@ public void imagesIsUnmodifiable() {
     // the one currently being used. We could use the bounds of f, the bounds of f2, or the
     // intersection of the bounds of f and f2. It turns out in this case, the intersection
     // would be smaller, but the bounds of f and f2 are equal in size.
-    @Test public void opaqueInsets_offsetOpaqueRectangles_LargestUsed() {
+    @Test
+    public void opaqueInsets_offsetOpaqueRectangles_LargestUsed() {
         BackgroundFill f = new BackgroundFill(Color.RED, null, new Insets(10));
         BackgroundFill f2 = new BackgroundFill(Color.GREEN, null, new Insets(20, 0, 0, 20));
         Background b = new Background(new BackgroundFill[] { f, f2 }, null);
@@ -550,7 +604,8 @@ public void imagesIsUnmodifiable() {
     // of a single fill is correct for any given set of corner radii, because after
     // the opaque region for a single fill is computed, thereafter the rest of the
     // implementation is all the same
-    @Test public void opaqueInsets_uniformCornerRadii() {
+    @Test
+    public void opaqueInsets_uniformCornerRadii() {
         BackgroundFill f = new BackgroundFill(Color.RED, new CornerRadii(3), null);
         Background b = new Background(new BackgroundFill[] { f }, null);
         final double[] trbl = new double[4];
@@ -561,7 +616,8 @@ public void imagesIsUnmodifiable() {
         assertEquals(1.5, trbl[3], 0);
     }
 
-    @Test public void opaqueInsets_nonUniformCornerRadii() {
+    @Test
+    public void opaqueInsets_nonUniformCornerRadii() {
         BackgroundFill f = new BackgroundFill(Color.RED, new CornerRadii(1, 2, 3, 4, false), null);
         Background b = new Background(new BackgroundFill[] { f }, null);
         final double[] trbl = new double[4];
@@ -572,7 +628,8 @@ public void imagesIsUnmodifiable() {
         assertEquals(2, trbl[3], 0);
     }
 
-    @Test public void opaqueInsets_nonUniformCornerRadii2() {
+    @Test
+    public void opaqueInsets_nonUniformCornerRadii2() {
         BackgroundFill f = new BackgroundFill(Color.RED, new CornerRadii(1, 2, 3, 4, 5, 6, 7, 8,
                                                                          false, false, false, false,
                                                                          false, false, false, false), null);
@@ -585,7 +642,8 @@ public void imagesIsUnmodifiable() {
         assertEquals(4, trbl[3], 0);
     }
 
-    @Test public void opaqueInsetsPercent_uniformCornerRadii() {
+    @Test
+    public void opaqueInsetsPercent_uniformCornerRadii() {
         BackgroundFill f = new BackgroundFill(Color.RED, new CornerRadii(.1, true), null);
         Background b = new Background(new BackgroundFill[] { f }, null);
         final double[] trbl = new double[4];
@@ -596,7 +654,8 @@ public void imagesIsUnmodifiable() {
         assertEquals(5, trbl[3], 0);
     }
 
-    @Test public void opaqueInsetsPercent_nonUniformCornerRadii() {
+    @Test
+    public void opaqueInsetsPercent_nonUniformCornerRadii() {
         BackgroundFill f = new BackgroundFill(Color.RED, new CornerRadii(.1, .2, .3, .4, true), null);
         Background b = new Background(new BackgroundFill[] { f }, null);
         final double[] trbl = new double[4];
@@ -607,7 +666,8 @@ public void imagesIsUnmodifiable() {
         assertEquals(20, trbl[3], 0); // bottom-left-horizontal dominates at 20
     }
 
-    @Test public void opaqueInsetsPercent_nonUniformCornerRadii2() {
+    @Test
+    public void opaqueInsetsPercent_nonUniformCornerRadii2() {
         BackgroundFill f = new BackgroundFill(Color.RED, new CornerRadii(.1, .15, .2, .25, .3, .35, .4, .45,
                                                                          true, true, true, true,
                                                                          true, true, true, true), null);
@@ -620,7 +680,8 @@ public void imagesIsUnmodifiable() {
         assertEquals(22.5, trbl[3], 0); // bottom-left-horizontal dominates at 22.5
     }
 
-    @Test public void opaqueInsetsPercent_nonUniformCornerRadii3() {
+    @Test
+    public void opaqueInsetsPercent_nonUniformCornerRadii3() {
         BackgroundFill f = new BackgroundFill(Color.RED, new CornerRadii(.1, 15, .2, 25, .3, 35, .4, 45,
                                                                          true, false, true, false,
                                                                          true, false, true, false), null);
@@ -633,7 +694,8 @@ public void imagesIsUnmodifiable() {
         assertEquals(22.5, trbl[3], 0); // bottom-left-horizontal dominates at 22.5
     }
 
-    @Test public void opaqueInsetsPercent_nonUniformCornerRadii4() {
+    @Test
+    public void opaqueInsetsPercent_nonUniformCornerRadii4() {
         BackgroundFill f = new BackgroundFill(Color.RED, new CornerRadii(10, .15, 20, .25, 30, .35, 40, .45,
                                                                          false, true, false, true,
                                                                          false, true, false, true), null);
@@ -646,7 +708,8 @@ public void imagesIsUnmodifiable() {
         assertEquals(22.5, trbl[3], 0); // bottom-left-horizontal dominates at 22.5
     }
 
-    @Test public void backgroundFillsArePercentageBased_AllPercentageBased() {
+    @Test
+    public void backgroundFillsArePercentageBased_AllPercentageBased() {
         BackgroundFill f = new BackgroundFill(Color.RED, new CornerRadii(.5, true), new Insets(10, 0, 0, 0));
         BackgroundFill f2 = new BackgroundFill(Color.GREEN, new CornerRadii(.4, true), new Insets(0, 10, 0, 0));
         BackgroundFill f3 = new BackgroundFill(Color.BLUE, new CornerRadii(.3, true), new Insets(0, 0, 10, 0));
@@ -655,7 +718,8 @@ public void imagesIsUnmodifiable() {
         assertTrue(b.isFillPercentageBased());
     }
 
-    @Test public void backgroundFillsArePercentageBased_OnePercentageBased() {
+    @Test
+    public void backgroundFillsArePercentageBased_OnePercentageBased() {
         BackgroundFill f = new BackgroundFill(Color.RED, new CornerRadii(5), new Insets(10, 0, 0, 0));
         BackgroundFill f2 = new BackgroundFill(Color.GREEN, new CornerRadii(4), new Insets(0, 10, 0, 0));
         BackgroundFill f3 = new BackgroundFill(Color.BLUE, new CornerRadii(.3, true), new Insets(0, 0, 10, 0));
@@ -664,7 +728,8 @@ public void imagesIsUnmodifiable() {
         assertTrue(b.isFillPercentageBased());
     }
 
-    @Test public void backgroundFillsArePercentageBased_OneCornerOfOne() {
+    @Test
+    public void backgroundFillsArePercentageBased_OneCornerOfOne() {
         BackgroundFill f = new BackgroundFill(Color.RED, new CornerRadii(5, 5, .5, 5, 5, 5, 5, 5,
                 false, false, true, false, false, false, false, false), new Insets(10, 0, 0, 0));
         BackgroundFill f2 = new BackgroundFill(Color.GREEN, new CornerRadii(4), new Insets(0, 10, 0, 0));
@@ -674,7 +739,8 @@ public void imagesIsUnmodifiable() {
         assertTrue(b.isFillPercentageBased());
     }
 
-    @Test public void backgroundFillsAreNotPercentageBased() {
+    @Test
+    public void backgroundFillsAreNotPercentageBased() {
         BackgroundFill f = new BackgroundFill(Color.RED, new CornerRadii(5), new Insets(10, 0, 0, 0));
         BackgroundFill f2 = new BackgroundFill(Color.GREEN, new CornerRadii(4), new Insets(0, 10, 0, 0));
         BackgroundFill f3 = new BackgroundFill(Color.BLUE, new CornerRadii(3), new Insets(0, 0, 10, 0));
@@ -683,12 +749,14 @@ public void imagesIsUnmodifiable() {
         assertFalse(b.isFillPercentageBased());
     }
 
-    @Test public void backgroundFillsAreNotPercentageBased_NoFills() {
+    @Test
+    public void backgroundFillsAreNotPercentageBased_NoFills() {
         Background b = new Background(new BackgroundFill[0]);
         assertFalse(b.isFillPercentageBased());
     }
 
-    @Test public void backgroundFillsAreNotPercentageBased_NullRadii() {
+    @Test
+    public void backgroundFillsAreNotPercentageBased_NullRadii() {
         BackgroundFill f = new BackgroundFill(Color.RED, null, new Insets(10, 0, 0, 0));
         BackgroundFill f2 = new BackgroundFill(Color.GREEN, null, new Insets(0, 10, 0, 0));
         BackgroundFill f3 = new BackgroundFill(Color.BLUE, null, new Insets(0, 0, 10, 0));
@@ -697,7 +765,8 @@ public void imagesIsUnmodifiable() {
         assertFalse(b.isFillPercentageBased());
     }
 
-    @Test public void backgroundFillsAreNotPercentageBased_OneEmpty() {
+    @Test
+    public void backgroundFillsAreNotPercentageBased_OneEmpty() {
         BackgroundFill f = new BackgroundFill(Color.RED, CornerRadii.EMPTY, new Insets(10, 0, 0, 0));
         BackgroundFill f2 = new BackgroundFill(Color.GREEN, new CornerRadii(4), new Insets(0, 10, 0, 0));
         BackgroundFill f3 = new BackgroundFill(Color.BLUE, new CornerRadii(3), new Insets(0, 0, 10, 0));
@@ -706,7 +775,8 @@ public void imagesIsUnmodifiable() {
         assertFalse(b.isFillPercentageBased());
     }
 
-    @Test public void backgroundFillsAreNotPercentageBased_AllEmpty() {
+    @Test
+    public void backgroundFillsAreNotPercentageBased_AllEmpty() {
         BackgroundFill f = new BackgroundFill(Color.RED, CornerRadii.EMPTY, new Insets(10, 0, 0, 0));
         BackgroundFill f2 = new BackgroundFill(Color.GREEN, CornerRadii.EMPTY, new Insets(0, 10, 0, 0));
         BackgroundFill f3 = new BackgroundFill(Color.BLUE, CornerRadii.EMPTY, new Insets(0, 0, 10, 0));
@@ -719,14 +789,14 @@ public void imagesIsUnmodifiable() {
     public void testSingleFill() {
         var background1 = Background.fill(Color.BEIGE);
         var background2 = new Background(new BackgroundFill(Color.BEIGE, null, null));
-        assertEquals("The factory method should give the same result as the constructor", background1, background2);
+        assertEquals(background1, background2, "The factory method should give the same result as the constructor");
     }
 
     @Test
     public void testSingleFillWithNullPaint() {
         var background1 = Background.fill(null);
         var background2 = new Background(new BackgroundFill(null, null, null));
-        assertEquals("The factory method should give the same result as the constructor", background1, background2);
+        assertEquals(background1, background2, "The factory method should give the same result as the constructor");
     }
 
     // TODO: What happens if the corner radii become so big that we would end up with a negative opaque
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BaselineTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BaselineTest.java
index 163efc10f44..4bd438ad22a 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BaselineTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BaselineTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,13 +25,13 @@
 
 package test.javafx.scene.layout;
 
-import static org.junit.Assert.assertEquals;
 import javafx.scene.Parent;
 import javafx.scene.ParentShim;
 import javafx.scene.shape.Rectangle;
 import javafx.scene.text.Text;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Tests baseline offsets on various classes
@@ -41,24 +41,28 @@ public class BaselineTest {
 
     // test isResizable on key base classes
 
-    @Test public void testShapeBaselineAtBottom() {
+    @Test
+    public void testShapeBaselineAtBottom() {
         Rectangle rect = new Rectangle(100,200);
         assertEquals(200, rect.getBaselineOffset(),1e-100);
     }
 
-    @Test public void testTextBaseline() {
+    @Test
+    public void testTextBaseline() {
         Text text = new Text("Graphically");
         float size = (float) text.getFont().getSize();
         assertEquals(size, text.getBaselineOffset(),1e-100);
     }
 
-    @Test public void testParentBaselineMatchesFirstChild() {
+    @Test
+    public void testParentBaselineMatchesFirstChild() {
         Parent p = new MockParent();
         p.layout();
         assertEquals(180, p.getBaselineOffset(),1e-100);
     }
 
-    @Test public void testParentBaselineIgnoresUnmanagedChild() {
+    @Test
+    public void testParentBaselineIgnoresUnmanagedChild() {
         MockParent p = new MockParent();
         Rectangle r = new Rectangle(20,30);
         r.setManaged(false);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderPaneTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderPaneTest.java
index ec11cf86d24..e737ec0bc42 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderPaneTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderPaneTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,24 +26,29 @@
 package test.javafx.scene.layout;
 
 import javafx.geometry.Insets;
-import static org.junit.Assert.*;
 import javafx.geometry.Orientation;
 import javafx.scene.ParentShim;
 import javafx.scene.layout.BorderPane;
-import org.junit.Before;
 
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 
 public class BorderPaneTest {
 
     BorderPane borderpane;
 
-    @Before public void setUp() {
+    @BeforeEach
+    public void setUp() {
         this.borderpane = new BorderPane();
     }
 
-    @Test public void testEmptyBorderPane() {
+    @Test
+    public void testEmptyBorderPane() {
         assertNull(borderpane.getTop());
         assertNull(borderpane.getCenter());
         assertNull(borderpane.getBottom());
@@ -51,7 +56,8 @@ public class BorderPaneTest {
         assertNull(borderpane.getRight());
     }
 
-    @Test public void testChildrenRemovedDirectly() {
+    @Test
+    public void testChildrenRemovedDirectly() {
         MockResizable node = new MockResizable(10,20, 100,200, 700,800);
 
         borderpane.setCenter(node);
@@ -141,7 +147,8 @@ public class BorderPaneTest {
 
     }
 
-    @Test public void testCenterChildOnly() {
+    @Test
+    public void testCenterChildOnly() {
         MockResizable center = new MockResizable(10,20, 100,200, 700,800);
         borderpane.setCenter(center);
 
@@ -164,7 +171,8 @@ public class BorderPaneTest {
 
     }
 
-    @Test public void testTopChildOnly() {
+    @Test
+    public void testTopChildOnly() {
         MockResizable top = new MockResizable(10,20, 100,200, 700,800);
         borderpane.setTop(top);
 
@@ -186,7 +194,8 @@ public class BorderPaneTest {
         assertEquals(200, top.getHeight(), 1e-100);
     }
 
-    @Test public void testBottomChildOnly() {
+    @Test
+    public void testBottomChildOnly() {
         MockResizable bottom = new MockResizable(10,20, 100,200, 700,800);
         borderpane.setBottom(bottom);
 
@@ -208,7 +217,8 @@ public class BorderPaneTest {
         assertEquals(200, bottom.getHeight(), 1e-100);
     }
 
-    @Test public void testRightChildOnly() {
+    @Test
+    public void testRightChildOnly() {
         MockResizable right = new MockResizable(10,20, 100,200, 700,800);
         borderpane.setRight(right);
 
@@ -230,7 +240,8 @@ public class BorderPaneTest {
         assertEquals(200, right.getHeight(), 1e-100);
     }
 
-    @Test public void testLeftChildOnly() {
+    @Test
+    public void testLeftChildOnly() {
         MockResizable left = new MockResizable(10,20, 100,200, 700,800);
         borderpane.setLeft(left);
 
@@ -252,7 +263,8 @@ public class BorderPaneTest {
         assertEquals(200, left.getHeight(), 1e-100);
     }
 
-    @Test public void testChildrenInAllPositions() {
+    @Test
+    public void testChildrenInAllPositions() {
         MockResizable center = new MockResizable(10,20, 100,200, 1000,1000);
         borderpane.setCenter(center);
         MockResizable top = new MockResizable(100,10, 200, 20, 1000,1000);
@@ -314,7 +326,8 @@ public class BorderPaneTest {
 
     }
 
-    @Test public void testWithBiasedChildren() {
+    @Test
+    public void testWithBiasedChildren() {
         MockBiased top = new MockBiased(Orientation.HORIZONTAL, 100, 20); // 300 x 6.666
         borderpane.setTop(top);
 
@@ -374,7 +387,8 @@ public class BorderPaneTest {
 
     }
 
-    @Test public void testWithHorizontalBiasedChildrenAtPrefSize() {
+    @Test
+    public void testWithHorizontalBiasedChildrenAtPrefSize() {
         MockResizable top = new MockResizable(400, 100);
         borderpane.setTop(top);
 
@@ -423,7 +437,8 @@ public class BorderPaneTest {
         assertEquals(100, bottom.getLayoutBounds().getHeight(), 1e-200);
     }
 
-    @Test public void testWithHorizontalBiasedChildrenGrowing() {
+    @Test
+    public void testWithHorizontalBiasedChildrenGrowing() {
         MockBiased top = new MockBiased(Orientation.HORIZONTAL, 200, 100);
         borderpane.setTop(top);
 
@@ -470,7 +485,8 @@ public class BorderPaneTest {
         assertEquals(100, bottom.getLayoutBounds().getHeight(), 1e-200);
     }
 
-    @Test public void testWithHorizontalBiasedChildrenShrinking() {
+    @Test
+    public void testWithHorizontalBiasedChildrenShrinking() {
         MockBiased top = new MockBiased(Orientation.HORIZONTAL, 200, 100);
         borderpane.setTop(top);
 
@@ -516,7 +532,8 @@ public class BorderPaneTest {
         assertEquals(100, bottom.getLayoutBounds().getHeight(), 1e-200);
     }
 
-    @Test public void testWithVerticalBiasedChildrenAtPrefSize() {
+    @Test
+    public void testWithVerticalBiasedChildrenAtPrefSize() {
         MockResizable top = new MockResizable(400, 100);
         borderpane.setTop(top);
 
@@ -565,7 +582,8 @@ public class BorderPaneTest {
         assertEquals(100, bottom.getLayoutBounds().getHeight(), 1e-200);
     }
 
-    @Test public void testWithVerticalBiasedChildrenGrowing() {
+    @Test
+    public void testWithVerticalBiasedChildrenGrowing() {
         MockBiased top = new MockBiased(Orientation.VERTICAL, 200, 100);
         borderpane.setTop(top);
 
@@ -615,7 +633,8 @@ public class BorderPaneTest {
         assertEquals(100, bottom.getLayoutBounds().getHeight(), 1e-200);
     }
 
-    @Test public void testWithVerticalBiasedChildrenShrinking() {
+    @Test
+    public void testWithVerticalBiasedChildrenShrinking() {
         MockBiased top = new MockBiased(Orientation.VERTICAL, 200, 100);
         borderpane.setTop(top);
 
@@ -696,7 +715,8 @@ public class BorderPaneTest {
         assertEquals(100, bottom.getLayoutBounds().getHeight(), 1e-200);
     }
 
-    @Test public void testFitsTopChildWithinBounds() {
+    @Test
+    public void testFitsTopChildWithinBounds() {
         MockResizable child = new MockResizable(10,20, 100,200, 700,800);
         borderpane.setTop(child);
 
@@ -707,7 +727,8 @@ public class BorderPaneTest {
         assertEquals(200, child.getHeight(), 1e-100); //Top always at it's pref height
     }
 
-    @Test public void testFitsBottomChildWithinBounds() {
+    @Test
+    public void testFitsBottomChildWithinBounds() {
         MockResizable child = new MockResizable(10,20, 100,200, 700,800);
         borderpane.setBottom(child);
 
@@ -718,7 +739,8 @@ public class BorderPaneTest {
         assertEquals(200, child.getHeight(), 1e-100); //Bottom always at it's pref height
     }
 
-    @Test public void testFitsLeftChildWithinBounds() {
+    @Test
+    public void testFitsLeftChildWithinBounds() {
         MockResizable child = new MockResizable(10,20, 100,200, 700,800);
         borderpane.setLeft(child);
 
@@ -729,7 +751,8 @@ public class BorderPaneTest {
         assertEquals(50, child.getHeight(), 1e-100);
     }
 
-    @Test public void testFitsRightChildWithinBounds() {
+    @Test
+    public void testFitsRightChildWithinBounds() {
         MockResizable child = new MockResizable(10,20, 100,200, 700,800);
         borderpane.setRight(child);
 
@@ -740,7 +763,8 @@ public class BorderPaneTest {
         assertEquals(50, child.getHeight(), 1e-100);
     }
 
-    @Test public void testFitsCenterChildWithinBounds() {
+    @Test
+    public void testFitsCenterChildWithinBounds() {
         MockResizable child = new MockResizable(10,20, 100,200, 700,800);
         borderpane.setCenter(child);
 
@@ -751,7 +775,8 @@ public class BorderPaneTest {
         assertEquals(50, child.getHeight(), 1e-100);
     }
 
-    @Test public void testFitsAllChildrenWithinBounds() {
+    @Test
+    public void testFitsAllChildrenWithinBounds() {
         MockResizable top = new MockResizable(10,20, 200,100, 700,800);
         MockResizable bottom = new MockResizable(10,20, 200,100, 700,800);
         MockResizable left = new MockResizable(10,20, 100,200, 700,800);
@@ -789,7 +814,8 @@ public class BorderPaneTest {
         assertEquals(100, center.getLayoutY(), 1e-100);
     }
 
-    @Test public void testTopChildWithMargin() {
+    @Test
+    public void testTopChildWithMargin() {
         MockResizable top = new MockResizable(10,10,130,30,150,50);
         MockResizable center = new MockResizable(10,10,100,100,200,200);
         Insets insets = new Insets(10, 5, 20, 30);
@@ -817,7 +843,8 @@ public class BorderPaneTest {
         assertEquals(60, center.getLayoutY(), 1e-100);
     }
 
-    @Test public void testBottomChildWithMargin() {
+    @Test
+    public void testBottomChildWithMargin() {
         MockResizable bottom = new MockResizable(10,10,130,30,150,50);
         MockResizable center = new MockResizable(10,10,100,100,200,200);
         Insets insets = new Insets(10, 5, 20, 30);
@@ -843,7 +870,8 @@ public class BorderPaneTest {
         assertEquals(0, center.getLayoutY(), 1e-100);
     }
 
-    @Test public void testLeftChildWithMargin() {
+    @Test
+    public void testLeftChildWithMargin() {
         MockResizable left = new MockResizable(10,10,130,130,150,150);
         MockResizable center = new MockResizable(10,10,100,100,200,200);
         Insets insets = new Insets(5, 10, 30, 20);
@@ -869,7 +897,8 @@ public class BorderPaneTest {
         assertEquals(0, center.getLayoutY(), 1e-100);
     }
 
-    @Test public void testRightChildWithMargin() {
+    @Test
+    public void testRightChildWithMargin() {
         MockResizable right = new MockResizable(10,10,130,130,150,150);
         MockResizable center = new MockResizable(10,10,100,100,200,200);
         Insets insets = new Insets(5, 10, 30, 20);
@@ -895,7 +924,8 @@ public class BorderPaneTest {
         assertEquals(0, center.getLayoutY(), 1e-100);
     }
 
-    @Test public void testCenterChildWithMargin() {
+    @Test
+    public void testCenterChildWithMargin() {
         MockResizable center = new MockResizable(10,10,100,100,200,200);
         Insets insets = new Insets(5, 10, 30, 20);
         BorderPane.setMargin(center, insets);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderStrokeStyleTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderStrokeStyleTest.java
index 40cd41f0066..69057578be1 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderStrokeStyleTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderStrokeStyleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,14 +31,17 @@
 import javafx.scene.shape.StrokeLineCap;
 import javafx.scene.shape.StrokeLineJoin;
 import javafx.scene.shape.StrokeType;
-import org.junit.Test;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /**
  */
 public class BorderStrokeStyleTest {
-    @Test public void instanceCreation() {
+    @Test
+    public void instanceCreation() {
         BorderStrokeStyle style = new BorderStrokeStyle(null, null, null, 1, 2, null);
         assertEquals(StrokeType.CENTERED, style.getType());
         assertEquals(StrokeLineJoin.MITER, style.getLineJoin());
@@ -48,7 +51,8 @@ public class BorderStrokeStyleTest {
         assertEquals(0, style.getDashArray().size());
     }
 
-    @Test public void instanceCreation2() {
+    @Test
+    public void instanceCreation2() {
         List<Double> dashArray = new ArrayList<>();
         dashArray.add(1.0);
         dashArray.add(4.0);
@@ -64,54 +68,63 @@ public class BorderStrokeStyleTest {
         assertEquals(4.0, style.getDashArray().get(1), 0);
     }
 
-    @Test(expected = UnsupportedOperationException.class)
+    @Test
     public void dashArrayIsImmutable() {
-        BorderStrokeStyle style = new BorderStrokeStyle(null, null, null, 10, 2, null);
-        style.getDashArray().add(1.0);
+        assertThrows(UnsupportedOperationException.class, () -> {
+            BorderStrokeStyle style = new BorderStrokeStyle(null, null, null, 10, 2, null);
+            style.getDashArray().add(1.0);
+        });
     }
 
-    @Test public void changesToDashArrayPassedToConstructorHaveNoEffect() {
+    @Test
+    public void changesToDashArrayPassedToConstructorHaveNoEffect() {
         List<Double> dashArray = new ArrayList<>();
         BorderStrokeStyle style = new BorderStrokeStyle(null, null, null, 1, 2, dashArray);
         dashArray.add(4.0);
         assertEquals(0, style.getDashArray().size());
     }
 
-    @Test public void identity() {
+    @Test
+    public void identity() {
         BorderStrokeStyle style = new BorderStrokeStyle(null, null, null, 10, 2, null);
         assertEquals(style, style);
         assertEquals(style.hashCode(), style.hashCode());
     }
 
-    @Test public void equality() {
+    @Test
+    public void equality() {
         BorderStrokeStyle a = new BorderStrokeStyle(null, null, null, 10, 2, null);
         BorderStrokeStyle b = new BorderStrokeStyle(null, null, null, 10, 2, null);
         assertEquals(a, b);
         assertEquals(a.hashCode(), b.hashCode());
     }
 
-    @Test public void equality2() {
+    @Test
+    public void equality2() {
         BorderStrokeStyle a = new BorderStrokeStyle(StrokeType.OUTSIDE, null, null, 10, 2, null);
         BorderStrokeStyle b = new BorderStrokeStyle(StrokeType.OUTSIDE, null, null, 10, 2, null);
         assertEquals(a, b);
         assertEquals(a.hashCode(), b.hashCode());
     }
 
-    @Test public void equality3() {
+    @Test
+    public void equality3() {
         BorderStrokeStyle a = new BorderStrokeStyle(null, StrokeLineJoin.ROUND, null, 10, 2, null);
         BorderStrokeStyle b = new BorderStrokeStyle(null, StrokeLineJoin.ROUND, null, 10, 2, null);
         assertEquals(a, b);
         assertEquals(a.hashCode(), b.hashCode());
     }
 
-    @Test public void equality4() {
+    @Test
+    public void equality4() {
         BorderStrokeStyle a = new BorderStrokeStyle(null, null, StrokeLineCap.ROUND, 10, 2, null);
         BorderStrokeStyle b = new BorderStrokeStyle(null, null, StrokeLineCap.ROUND, 10, 2, null);
         assertEquals(a, b);
         assertEquals(a.hashCode(), b.hashCode());
     }
 
-    @Test public void equality5() {
+    @Test
+    public void equality5() {
         List<Double> dashArray1 = new ArrayList<>();
         dashArray1.add(1.0);
         dashArray1.add(4.0);
@@ -126,37 +139,43 @@ public void dashArrayIsImmutable() {
         assertEquals(a.hashCode(), b.hashCode());
     }
 
-    @Test public void notEqual() {
+    @Test
+    public void notEqual() {
         BorderStrokeStyle a = new BorderStrokeStyle(null, null, null, 10, 0, null);
         BorderStrokeStyle b = new BorderStrokeStyle(StrokeType.OUTSIDE, null, null, 10, 0, null);
         assertFalse(a.equals(b));
     }
 
-    @Test public void notEqual2() {
+    @Test
+    public void notEqual2() {
         BorderStrokeStyle a = new BorderStrokeStyle(null, null, null, 10, 0, null);
         BorderStrokeStyle b = new BorderStrokeStyle(null, StrokeLineJoin.ROUND, null, 10, 0, null);
         assertFalse(a.equals(b));
     }
 
-    @Test public void notEqual3() {
+    @Test
+    public void notEqual3() {
         BorderStrokeStyle a = new BorderStrokeStyle(null, null, null, 10, 0, null);
         BorderStrokeStyle b = new BorderStrokeStyle(null, null, StrokeLineCap.ROUND, 10, 0, null);
         assertFalse(a.equals(b));
     }
 
-    @Test public void notEqual4() {
+    @Test
+    public void notEqual4() {
         BorderStrokeStyle a = new BorderStrokeStyle(null, null, null, 10, 0, null);
         BorderStrokeStyle b = new BorderStrokeStyle(null, null, null, 20, 0, null);
         assertFalse(a.equals(b));
     }
 
-    @Test public void notEqual5() {
+    @Test
+    public void notEqual5() {
         BorderStrokeStyle a = new BorderStrokeStyle(null, null, null, 10, 0, null);
         BorderStrokeStyle b = new BorderStrokeStyle(null, null, null, 10, 1, null);
         assertFalse(a.equals(b));
     }
 
-    @Test public void notEqual6() {
+    @Test
+    public void notEqual6() {
         List<Double> dashArray1 = new ArrayList<>();
         dashArray1.add(1.0);
         dashArray1.add(4.0);
@@ -165,13 +184,15 @@ public void dashArrayIsImmutable() {
         assertFalse(a.equals(b));
     }
 
-    @Test public void notEqualWithNull() {
+    @Test
+    public void notEqualWithNull() {
         BorderStrokeStyle a = new BorderStrokeStyle(null, null, null, 10, 0, null);
         assertFalse(a.equals(null));
     }
 
     @SuppressWarnings("unlikely-arg-type")
-    @Test public void notEqualWithRandom() {
+    @Test
+    public void notEqualWithRandom() {
         BorderStrokeStyle a = new BorderStrokeStyle(null, null, null, 10, 0, null);
         assertFalse(a.equals("Some random string"));
     }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderStrokeTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderStrokeTest.java
index a075c1df11d..bf28171e622 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderStrokeTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderStrokeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,13 @@
 
 package test.javafx.scene.layout;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests for BorderStroke.
  */
 public class BorderStrokeTest {
     // be sure to test the innerEdge and outerEdge, I had bugs there!
-    @Test public void dummy() { }
+    @Test
+    public void dummy() { }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderTest.java
index 4774c661229..d6f3801d950 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,10 +36,14 @@
 import javafx.scene.layout.CornerRadii;
 import javafx.scene.paint.Color;
 import javafx.scene.shape.StrokeType;
-import org.junit.Test;
-
 import static javafx.scene.layout.BorderRepeat.*;
-import static org.junit.Assert.*;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /**
  * Tests for Border.
@@ -68,7 +72,8 @@ public class BorderTest {
             new BorderImage(IMAGE_4, new BorderWidths(3), Insets.EMPTY, new BorderWidths(3, 4, 5, 6), true, STRETCH, SPACE)
     };
 
-    @Test public void instanceCreation() {
+    @Test
+    public void instanceCreation() {
         Border b = new Border(STROKES_1, IMAGES_1);
         assertEquals(STROKES_1.length, b.getStrokes().size(), 0);
         assertEquals(STROKES_1[0], b.getStrokes().get(0));
@@ -76,7 +81,8 @@ public class BorderTest {
         assertEquals(IMAGES_1[0], b.getImages().get(0));
     }
 
-    @Test public void instanceCreation2() {
+    @Test
+    public void instanceCreation2() {
         Border b = new Border(STROKES_2, IMAGES_2);
         assertEquals(STROKES_2.length, b.getStrokes().size(), 0);
         assertEquals(STROKES_2[0], b.getStrokes().get(0));
@@ -87,35 +93,40 @@ public class BorderTest {
         assertEquals(IMAGES_2[2], b.getImages().get(2));
     }
 
-    @Test public void instanceCreationNullstrokes() {
+    @Test
+    public void instanceCreationNullstrokes() {
         Border b = new Border(null, IMAGES_1);
         assertEquals(0, b.getStrokes().size(), 0);
         assertEquals(IMAGES_1.length, b.getImages().size(), 0);
         assertEquals(IMAGES_1[0], b.getImages().get(0));
     }
 
-    @Test public void instanceCreationEmptystrokes() {
+    @Test
+    public void instanceCreationEmptystrokes() {
         Border b = new Border(new BorderStroke[0], IMAGES_1);
         assertEquals(0, b.getStrokes().size(), 0);
         assertEquals(IMAGES_1.length, b.getImages().size(), 0);
         assertEquals(IMAGES_1[0], b.getImages().get(0));
     }
 
-    @Test public void instanceCreationNullImages() {
+    @Test
+    public void instanceCreationNullImages() {
         Border b = new Border(STROKES_1, null);
         assertEquals(STROKES_1.length, b.getStrokes().size(), 0);
         assertEquals(STROKES_1[0], b.getStrokes().get(0));
         assertEquals(0, b.getImages().size(), 0);
     }
 
-    @Test public void instanceCreationEmptyImages() {
+    @Test
+    public void instanceCreationEmptyImages() {
         Border b = new Border(STROKES_1, new BorderImage[0]);
         assertEquals(STROKES_1.length, b.getStrokes().size(), 0);
         assertEquals(STROKES_1[0], b.getStrokes().get(0));
         assertEquals(0, b.getImages().size(), 0);
     }
 
-    @Test public void instanceCreationWithNullsInTheFillArray() {
+    @Test
+    public void instanceCreationWithNullsInTheFillArray() {
         final BorderStroke[] strokes = new BorderStroke[] {
                 null,
                 new BorderStroke(Color.GREEN, BorderStrokeStyle.SOLID, new CornerRadii(3), new BorderWidths(4)),
@@ -127,7 +138,8 @@ public class BorderTest {
         assertEquals(strokes[2], b.getStrokes().get(1));
     }
 
-    @Test public void instanceCreationWithNullsInTheFillArray2() {
+    @Test
+    public void instanceCreationWithNullsInTheFillArray2() {
         final BorderStroke[] strokes = new BorderStroke[] {
                 new BorderStroke(Color.GREEN, BorderStrokeStyle.SOLID, new CornerRadii(3), new BorderWidths(4)),
                 null,
@@ -139,7 +151,8 @@ public class BorderTest {
         assertEquals(strokes[2], b.getStrokes().get(1));
     }
 
-    @Test public void instanceCreationWithNullsInTheFillArray3() {
+    @Test
+    public void instanceCreationWithNullsInTheFillArray3() {
         final BorderStroke[] strokes = new BorderStroke[] {
                 new BorderStroke(Color.GREEN, BorderStrokeStyle.SOLID, new CornerRadii(3), new BorderWidths(4)),
                 new BorderStroke(Color.BLUE, BorderStrokeStyle.SOLID, new CornerRadii(6), new BorderWidths(8)),
@@ -151,7 +164,8 @@ public class BorderTest {
         assertEquals(strokes[1], b.getStrokes().get(1));
     }
 
-    @Test public void instanceCreationWithNullsInTheFillArray4() {
+    @Test
+    public void instanceCreationWithNullsInTheFillArray4() {
         final BorderStroke[] strokes = new BorderStroke[] {
                 null
         };
@@ -159,7 +173,8 @@ public class BorderTest {
         assertEquals(0, b.getStrokes().size(), 0);
     }
 
-    @Test public void instanceCreationWithNullsInTheImageArray() {
+    @Test
+    public void instanceCreationWithNullsInTheImageArray() {
         final BorderImage[] images = new BorderImage[] {
                 null,
                 new BorderImage(IMAGE_2, new BorderWidths(3), new Insets(4), BorderWidths.EMPTY, false, REPEAT, REPEAT),
@@ -173,7 +188,8 @@ public class BorderTest {
         assertEquals(IMAGES_2[2], b.getImages().get(2));
     }
 
-    @Test public void instanceCreationWithNullsInTheImageArray2() {
+    @Test
+    public void instanceCreationWithNullsInTheImageArray2() {
         final BorderImage[] images = new BorderImage[] {
                 new BorderImage(IMAGE_2, new BorderWidths(3), new Insets(4), BorderWidths.EMPTY, false, REPEAT, REPEAT),
                 null,
@@ -187,7 +203,8 @@ public class BorderTest {
         assertEquals(IMAGES_2[2], b.getImages().get(2));
     }
 
-    @Test public void instanceCreationWithNullsInTheImageArray3() {
+    @Test
+    public void instanceCreationWithNullsInTheImageArray3() {
         final BorderImage[] images = new BorderImage[] {
                 new BorderImage(IMAGE_2, new BorderWidths(3), new Insets(4), BorderWidths.EMPTY, false, REPEAT, REPEAT),
                 new BorderImage(IMAGE_3, new BorderWidths(6), new Insets(2), BorderWidths.EMPTY, false, SPACE, ROUND),
@@ -201,7 +218,8 @@ public class BorderTest {
         assertEquals(IMAGES_2[2], b.getImages().get(2));
     }
 
-    @Test public void instanceCreationWithNullsInTheImageArray4() {
+    @Test
+    public void instanceCreationWithNullsInTheImageArray4() {
         final BorderImage[] images = new BorderImage[] {
                 null
         };
@@ -209,7 +227,8 @@ public class BorderTest {
         assertEquals(0, b.getImages().size(), 0);
     }
 
-    @Test public void suppliedBorderStrokesMutatedLaterDoNotChangeStrokes() {
+    @Test
+    public void suppliedBorderStrokesMutatedLaterDoNotChangeStrokes() {
         final BorderStroke stroke = new BorderStroke(Color.GREEN, BorderStrokeStyle.SOLID, new CornerRadii(3), new BorderWidths(4));
         final BorderStroke[] strokes = new BorderStroke[] { stroke };
         Border b = new Border(strokes, null);
@@ -221,7 +240,8 @@ public class BorderTest {
         assertSame(stroke, b2.getStrokes().get(0));
     }
 
-    @Test public void suppliedBorderImagesMutatedLaterDoNotChangeImages() {
+    @Test
+    public void suppliedBorderImagesMutatedLaterDoNotChangeImages() {
         final BorderImage image = new BorderImage(IMAGE_2, new BorderWidths(3), new Insets(4),
                                                   BorderWidths.EMPTY, false, REPEAT, REPEAT);
         final BorderImage[] images = new BorderImage[] { image };
@@ -234,27 +254,32 @@ public class BorderTest {
         assertSame(image, b2.getImages().get(0));
     }
 
-    @Test(expected = UnsupportedOperationException.class)
+    @Test
     public void strokesIsUnmodifiable() {
-        final BorderStroke stroke = new BorderStroke(Color.GREEN, BorderStrokeStyle.SOLID, new CornerRadii(3), new BorderWidths(4));
-        final BorderStroke[] strokes = new BorderStroke[] { stroke };
-        Border b = new Border(strokes);
-        b.getStrokes().add(new BorderStroke(Color.BLUE, BorderStrokeStyle.SOLID, new CornerRadii(6), new BorderWidths(8)));
+        assertThrows(UnsupportedOperationException.class, () -> {
+            final BorderStroke stroke = new BorderStroke(Color.GREEN, BorderStrokeStyle.SOLID, new CornerRadii(3), new BorderWidths(4));
+            final BorderStroke[] strokes = new BorderStroke[] { stroke };
+            Border b = new Border(strokes);
+            b.getStrokes().add(new BorderStroke(Color.BLUE, BorderStrokeStyle.SOLID, new CornerRadii(6), new BorderWidths(8)));
+        });
     }
 
-    @Test(expected = UnsupportedOperationException.class)
+    @Test
     public void imagesIsUnmodifiable() {
-        final BorderImage image = new BorderImage(IMAGE_2, new BorderWidths(3), new Insets(4),
-                                                  BorderWidths.EMPTY, false, REPEAT, REPEAT);
-        final BorderImage[] images = new BorderImage[] { image };
-        Border b = new Border(images);
-        b.getImages().add(
-                new BorderImage(
-                        IMAGE_4, new BorderWidths(3), Insets.EMPTY,
-                        new BorderWidths(3, 4, 5, 6), true, STRETCH, SPACE));
+        assertThrows(UnsupportedOperationException.class, () -> {
+            final BorderImage image = new BorderImage(IMAGE_2, new BorderWidths(3), new Insets(4),
+                                                      BorderWidths.EMPTY, false, REPEAT, REPEAT);
+            final BorderImage[] images = new BorderImage[] { image };
+            Border b = new Border(images);
+            b.getImages().add(
+                    new BorderImage(
+                            IMAGE_4, new BorderWidths(3), Insets.EMPTY,
+                            new BorderWidths(3, 4, 5, 6), true, STRETCH, SPACE));
+        });
     }
 
-    @Test public void insetsAndOutsets_twoPixelOuterStroke() {
+    @Test
+    public void insetsAndOutsets_twoPixelOuterStroke() {
         BorderStrokeStyle style = new BorderStrokeStyle(StrokeType.OUTSIDE, null, null, 0, 0, null);
         BorderStroke stroke = new BorderStroke(Color.ORANGE, style, new CornerRadii(5), new BorderWidths(2));
         Border border = new Border(new BorderStroke[] { stroke }, null);
@@ -265,7 +290,8 @@ IMAGE_4, new BorderWidths(3), Insets.EMPTY,
         assertEquals(new Insets(0), border.getInsets());
     }
 
-    @Test public void insetsAndOutsets_singlePixelOuterStroke() {
+    @Test
+    public void insetsAndOutsets_singlePixelOuterStroke() {
         BorderStrokeStyle style = new BorderStrokeStyle(StrokeType.OUTSIDE, null, null, 0, 0, null);
         BorderStroke stroke = new BorderStroke(Color.ORANGE, style, new CornerRadii(5), new BorderWidths(1));
         Border border = new Border(new BorderStroke[] { stroke }, null);
@@ -276,7 +302,8 @@ IMAGE_4, new BorderWidths(3), Insets.EMPTY,
         assertEquals(new Insets(0), border.getInsets());
     }
 
-    @Test public void insetsAndOutsets_singlePixelCenteredStroke() {
+    @Test
+    public void insetsAndOutsets_singlePixelCenteredStroke() {
         BorderStrokeStyle style = new BorderStrokeStyle(StrokeType.CENTERED, null, null, 0, 0, null);
         BorderStroke stroke = new BorderStroke(Color.ORANGE, style, new CornerRadii(5), new BorderWidths(1));
         Border border = new Border(new BorderStroke[] { stroke }, null);
@@ -287,7 +314,8 @@ IMAGE_4, new BorderWidths(3), Insets.EMPTY,
         assertEquals(new Insets(.5), border.getInsets());
     }
 
-    @Test public void insetsAndOutsets_singlePixelInnerStroke() {
+    @Test
+    public void insetsAndOutsets_singlePixelInnerStroke() {
         BorderStrokeStyle style = new BorderStrokeStyle(StrokeType.INSIDE, null, null, 0, 0, null);
         BorderStroke stroke = new BorderStroke(Color.ORANGE, style, new CornerRadii(5), new BorderWidths(1));
         Border border = new Border(new BorderStroke[] { stroke }, null);
@@ -298,7 +326,8 @@ IMAGE_4, new BorderWidths(3), Insets.EMPTY,
         assertEquals(new Insets(1), border.getInsets());
     }
 
-    @Test public void insetsAndOutsets_twoPixelOuterStroke_PositiveInsets() {
+    @Test
+    public void insetsAndOutsets_twoPixelOuterStroke_PositiveInsets() {
         BorderStrokeStyle style = new BorderStrokeStyle(StrokeType.OUTSIDE, null, null, 0, 0, null);
         BorderStroke stroke = new BorderStroke(Color.ORANGE, style, new CornerRadii(5), new BorderWidths(2), new Insets(1, 2, 3, 4));
         Border border = new Border(new BorderStroke[] { stroke }, null);
@@ -306,7 +335,8 @@ IMAGE_4, new BorderWidths(3), Insets.EMPTY,
         assertEquals(new Insets(1, 2, 3, 4), border.getInsets());
     }
 
-    @Test public void insetsAndOutsets_singlePixelOuterStroke_PositiveInsets() {
+    @Test
+    public void insetsAndOutsets_singlePixelOuterStroke_PositiveInsets() {
         BorderStrokeStyle style = new BorderStrokeStyle(StrokeType.OUTSIDE, null, null, 0, 0, null);
         BorderStroke stroke = new BorderStroke(Color.ORANGE, style, new CornerRadii(5), new BorderWidths(1), new Insets(1, 2, 3, 4));
         Border border = new Border(new BorderStroke[] { stroke }, null);
@@ -314,7 +344,8 @@ IMAGE_4, new BorderWidths(3), Insets.EMPTY,
         assertEquals(new Insets(1, 2, 3, 4), border.getInsets());
     }
 
-    @Test public void insetsAndOutsets_singlePixelCenteredStroke_PositiveInsets() {
+    @Test
+    public void insetsAndOutsets_singlePixelCenteredStroke_PositiveInsets() {
         BorderStrokeStyle style = new BorderStrokeStyle(StrokeType.CENTERED, null, null, 0, 0, null);
         BorderStroke stroke = new BorderStroke(Color.ORANGE, style, new CornerRadii(5), new BorderWidths(1), new Insets(1, 2, 3, 4));
         Border border = new Border(new BorderStroke[] { stroke }, null);
@@ -322,7 +353,8 @@ IMAGE_4, new BorderWidths(3), Insets.EMPTY,
         assertEquals(new Insets(1.5, 2.5, 3.5, 4.5), border.getInsets());
     }
 
-    @Test public void insetsAndOutsets_singlePixelInnerStroke_PositiveInsets() {
+    @Test
+    public void insetsAndOutsets_singlePixelInnerStroke_PositiveInsets() {
         BorderStrokeStyle style = new BorderStrokeStyle(StrokeType.INSIDE, null, null, 0, 0, null);
         BorderStroke stroke = new BorderStroke(Color.ORANGE, style, new CornerRadii(5), new BorderWidths(1), new Insets(1, 2, 3, 4));
         Border border = new Border(new BorderStroke[] { stroke }, null);
@@ -330,7 +362,8 @@ IMAGE_4, new BorderWidths(3), Insets.EMPTY,
         assertEquals(new Insets(2, 3, 4, 5), border.getInsets());
     }
 
-    @Test public void insetsAndOutsets_twoPixelOuterStroke_NegativeInsets() {
+    @Test
+    public void insetsAndOutsets_twoPixelOuterStroke_NegativeInsets() {
         BorderStrokeStyle style = new BorderStrokeStyle(StrokeType.OUTSIDE, null, null, 0, 0, null);
         BorderStroke stroke = new BorderStroke(Color.ORANGE, style, new CornerRadii(5), new BorderWidths(2), new Insets(-1, -2, -3, -4));
         Border border = new Border(new BorderStroke[] { stroke }, null);
@@ -338,7 +371,8 @@ IMAGE_4, new BorderWidths(3), Insets.EMPTY,
         assertEquals(new Insets(0), border.getInsets());
     }
 
-    @Test public void insetsAndOutsets_singlePixelOuterStroke_NegativeInsets() {
+    @Test
+    public void insetsAndOutsets_singlePixelOuterStroke_NegativeInsets() {
         BorderStrokeStyle style = new BorderStrokeStyle(StrokeType.OUTSIDE, null, null, 0, 0, null);
         BorderStroke stroke = new BorderStroke(Color.ORANGE, style, new CornerRadii(5), new BorderWidths(1), new Insets(-1, -2, -3, -4));
         Border border = new Border(new BorderStroke[] { stroke }, null);
@@ -346,7 +380,8 @@ IMAGE_4, new BorderWidths(3), Insets.EMPTY,
         assertEquals(new Insets(0), border.getInsets());
     }
 
-    @Test public void insetsAndOutsets_singlePixelCenteredStroke_NegativeInsets() {
+    @Test
+    public void insetsAndOutsets_singlePixelCenteredStroke_NegativeInsets() {
         BorderStrokeStyle style = new BorderStrokeStyle(StrokeType.CENTERED, null, null, 0, 0, null);
         BorderStroke stroke = new BorderStroke(Color.ORANGE, style, new CornerRadii(5), new BorderWidths(1), new Insets(-1, -2, -3, -4));
         Border border = new Border(new BorderStroke[] { stroke }, null);
@@ -354,7 +389,8 @@ IMAGE_4, new BorderWidths(3), Insets.EMPTY,
         assertEquals(new Insets(0), border.getInsets());
     }
 
-    @Test public void insetsAndOutsets_singlePixelInnerStroke_NegativeInsets() {
+    @Test
+    public void insetsAndOutsets_singlePixelInnerStroke_NegativeInsets() {
         BorderStrokeStyle style = new BorderStrokeStyle(StrokeType.INSIDE, null, null, 0, 0, null);
         BorderStroke stroke = new BorderStroke(Color.ORANGE, style, new CornerRadii(5), new BorderWidths(1), new Insets(-1, -2, -3, -4));
         Border border = new Border(new BorderStroke[] { stroke }, null);
@@ -362,47 +398,54 @@ IMAGE_4, new BorderWidths(3), Insets.EMPTY,
         assertEquals(new Insets(0), border.getInsets());
     }
 
-    @Test public void insetsAndOutsets_singlePixelImageWidthNoInsets() {
+    @Test
+    public void insetsAndOutsets_singlePixelImageWidthNoInsets() {
         BorderImage image = new BorderImage(IMAGE_1, new BorderWidths(1), new Insets(0), null, false, null, null);
         Border border = new Border(null, new BorderImage[] { image });
         assertEquals(new Insets(0), border.getOutsets());
         assertEquals(new Insets(1), border.getInsets());
     }
 
-    @Test public void insetsAndOutsets_singlePixelImageWidthWithPositiveInsets() {
+    @Test
+    public void insetsAndOutsets_singlePixelImageWidthWithPositiveInsets() {
         BorderImage image = new BorderImage(IMAGE_1, new BorderWidths(1), new Insets(10), null, false, null, null);
         Border border = new Border(null, new BorderImage[] { image });
         assertEquals(new Insets(0), border.getOutsets());
         assertEquals(new Insets(11), border.getInsets());
     }
 
-    @Test public void insetsAndOutsets_singlePixelImageWidthWithNegativeInsets() {
+    @Test
+    public void insetsAndOutsets_singlePixelImageWidthWithNegativeInsets() {
         BorderImage image = new BorderImage(IMAGE_1, new BorderWidths(1), new Insets(-10), null, false, null, null);
         Border border = new Border(null, new BorderImage[] { image });
         assertEquals(new Insets(10), border.getOutsets());
         assertEquals(new Insets(0), border.getInsets());
     }
 
-    @Test public void insetsAndOutsets_triplePixelImageWidthWithNegativeInsets() {
+    @Test
+    public void insetsAndOutsets_triplePixelImageWidthWithNegativeInsets() {
         BorderImage image = new BorderImage(IMAGE_1, new BorderWidths(3), new Insets(-1), null, false, null, null);
         Border border = new Border(null, new BorderImage[] { image });
         assertEquals(new Insets(1), border.getOutsets());
         assertEquals(new Insets(2), border.getInsets());
     }
 
-    @Test public void equivalent() {
+    @Test
+    public void equivalent() {
         Border a = new Border((BorderStroke[])null, null);
         Border b = new Border((BorderStroke[])null, null);
         assertEquals(a, b);
     }
 
-    @Test public void equivalent2() {
+    @Test
+    public void equivalent2() {
         Border a = new Border(STROKES_2, null);
         Border b = new Border(STROKES_2, null);
         assertEquals(a, b);
     }
 
-    @Test public void equivalent2b() {
+    @Test
+    public void equivalent2b() {
         final BorderStroke[] strokes = new BorderStroke[] {
             new BorderStroke(Color.GREEN, BorderStrokeStyle.DASHED, new CornerRadii(3), new BorderWidths(4)),
             new BorderStroke(Color.BLUE, BorderStrokeStyle.DOTTED, new CornerRadii(6), new BorderWidths(8))
@@ -414,7 +457,8 @@ IMAGE_4, new BorderWidths(3), Insets.EMPTY,
         assertEquals(a, b);
     }
 
-    @Test public void equivalent2c() {
+    @Test
+    public void equivalent2c() {
         final BorderStroke[] strokes = new BorderStroke[] {
             new BorderStroke(Color.GREEN, BorderStrokeStyle.DASHED, new CornerRadii(3), new BorderWidths(4)),
             new BorderStroke(Color.BLUE, BorderStrokeStyle.DOTTED, new CornerRadii(6), new BorderWidths(8))
@@ -424,13 +468,15 @@ IMAGE_4, new BorderWidths(3), Insets.EMPTY,
         assertEquals(a, b);
     }
 
-    @Test public void equivalent3() {
+    @Test
+    public void equivalent3() {
         Border a = new Border(null, IMAGES_2);
         Border b = new Border(null, IMAGES_2);
         assertEquals(a, b);
     }
 
-    @Test public void equivalent3b() {
+    @Test
+    public void equivalent3b() {
         final BorderImage[] images = new BorderImage[] {
                 new BorderImage(IMAGE_2, new BorderWidths(3), new Insets(4), BorderWidths.EMPTY, false, REPEAT, REPEAT),
                 new BorderImage(IMAGE_3, new BorderWidths(6), new Insets(2), BorderWidths.EMPTY, false, SPACE, ROUND),
@@ -441,7 +487,8 @@ IMAGE_4, new BorderWidths(3), Insets.EMPTY,
         assertEquals(a, b);
     }
 
-    @Test public void equivalent3c() {
+    @Test
+    public void equivalent3c() {
         final BorderImage[] images = new BorderImage[] {
                 new BorderImage(IMAGE_2, new BorderWidths(3), new Insets(4), BorderWidths.EMPTY, false, REPEAT, REPEAT),
                 new BorderImage(IMAGE_3, new BorderWidths(6), new Insets(2), BorderWidths.EMPTY, false, SPACE, ROUND),
@@ -452,71 +499,83 @@ IMAGE_4, new BorderWidths(3), Insets.EMPTY,
         assertEquals(a, b);
     }
 
-    @Test public void equivalentWithSelf() {
+    @Test
+    public void equivalentWithSelf() {
         Border a = new Border(null, IMAGES_2);
         assertTrue(a.equals(a));
     }
 
-    @Test public void equivalentHasSameHashCode() {
+    @Test
+    public void equivalentHasSameHashCode() {
         Border a = new Border((BorderStroke[])null, null);
         Border b = new Border((BorderStroke[])null, null);
         assertEquals(a.hashCode(), b.hashCode());
     }
 
-    @Test public void equivalentHasSameHashCode2() {
+    @Test
+    public void equivalentHasSameHashCode2() {
         Border a = new Border(STROKES_2, null);
         Border b = new Border(STROKES_2, null);
         assertEquals(a.hashCode(), b.hashCode());
     }
 
-    @Test public void equivalentHasSameHashCode3() {
+    @Test
+    public void equivalentHasSameHashCode3() {
         Border a = new Border(null, IMAGES_2);
         Border b = new Border(null, IMAGES_2);
         assertEquals(a.hashCode(), b.hashCode());
     }
 
-    @Test public void equivalentWithSelfHashCode() {
+    @Test
+    public void equivalentWithSelfHashCode() {
         Border a = new Border(null, IMAGES_2);
         assertEquals(a.hashCode(), a.hashCode());
     }
 
-    @Test public void notEqual() {
+    @Test
+    public void notEqual() {
         Border a = new Border(STROKES_1, null);
         Border b = new Border((BorderStroke[])null, null);
         assertFalse(a.equals(b));
     }
 
-    @Test public void notEqual2() {
+    @Test
+    public void notEqual2() {
         Border a = new Border((BorderStroke[])null, null);
         Border b = new Border(STROKES_2, null);
         assertFalse(a.equals(b));
     }
 
-    @Test public void notEqual3() {
+    @Test
+    public void notEqual3() {
         Border a = new Border(null, IMAGES_1);
         Border b = new Border((BorderStroke[])null, null);
         assertFalse(a.equals(b));
     }
 
-    @Test public void notEqual4() {
+    @Test
+    public void notEqual4() {
         Border a = new Border((BorderStroke[])null, null);
         Border b = new Border(null, IMAGES_2);
         assertFalse(a.equals(b));
     }
 
-    @Test public void notEqual5() {
+    @Test
+    public void notEqual5() {
         Border a = new Border(null, IMAGES_1);
         Border b = new Border(null, IMAGES_2);
         assertFalse(a.equals(b));
     }
 
-    @Test public void notEqual6() {
+    @Test
+    public void notEqual6() {
         Border a = new Border(STROKES_1, null);
         Border b = new Border(STROKES_2, null);
         assertFalse(a.equals(b));
     }
 
-    @Test public void notEqualButHaveSameHashCode() {
+    @Test
+    public void notEqualButHaveSameHashCode() {
         Border a = new Border(STROKES_1, null);
         Border b = new Border(STROKES_2, null);
         // Because Border is final, the only way to test this
@@ -534,7 +593,8 @@ IMAGE_4, new BorderWidths(3), Insets.EMPTY,
         assertFalse(a.equals(b));
     }
 
-    @Test public void notEqualButHaveSameHashCode2() {
+    @Test
+    public void notEqualButHaveSameHashCode2() {
         Border a = new Border(null, IMAGES_1);
         Border b = new Border(null, IMAGES_2);
         // Because Border is final, the only way to test this
@@ -552,13 +612,15 @@ IMAGE_4, new BorderWidths(3), Insets.EMPTY,
         assertFalse(a.equals(b));
     }
 
-    @Test public void notEqualWithNull() {
+    @Test
+    public void notEqualWithNull() {
         Border a = new Border((BorderStroke[])null, null);
         assertFalse(a.equals(null));
     }
 
     @SuppressWarnings("unlikely-arg-type")
-    @Test public void notEqualWithRandom() {
+    @Test
+    public void notEqualWithRandom() {
         Border a = new Border((BorderStroke[])null, null);
         assertFalse(a.equals("Some random String"));
     }
@@ -567,13 +629,13 @@ IMAGE_4, new BorderWidths(3), Insets.EMPTY,
     public void testSingleStroke() {
         var border1 = Border.stroke(Color.BEIGE);
         var border2 = new Border(new BorderStroke(Color.BEIGE, BorderStrokeStyle.SOLID, null, null));
-        assertEquals("The factory method should give the same result as the constructor", border2, border1);
+        assertEquals(border2, border1, "The factory method should give the same result as the constructor");
     }
 
     @Test
     public void testSingleStrokeWithNullPaint() {
         var border1 = Border.stroke(null);
         var border2 = new Border(new BorderStroke(null, BorderStrokeStyle.SOLID, null, null));
-        assertEquals("The factory method should give the same result as the constructor", border2, border1);
+        assertEquals(border2, border1, "The factory method should give the same result as the constructor");
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderWidthsTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderWidthsTest.java
index edd6a649958..84a5410c146 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderWidthsTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderWidthsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,16 +26,20 @@
 package test.javafx.scene.layout;
 
 import javafx.scene.layout.BorderWidths;
-import org.junit.Test;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /**
  * TODO The spec doesn't seem to indicate, but what do we do (if anything) with percentages
  * above 100%?
  */
 public class BorderWidthsTest {
-    @Test public void instanceCreation() {
+    @Test
+    public void instanceCreation() {
         BorderWidths widths = new BorderWidths(1, 2, 3, 4, false, true, false, true);
         assertEquals(1, widths.getTop(), 0);
         assertEquals(2, widths.getRight(), 0);
@@ -47,7 +51,8 @@ public class BorderWidthsTest {
         assertTrue(widths.isLeftAsPercentage());
     }
 
-    @Test public void instanceCreation2() {
+    @Test
+    public void instanceCreation2() {
         BorderWidths widths = new BorderWidths(1, 2, 3, 4, true, false, true, false);
         assertEquals(1, widths.getTop(), 0);
         assertEquals(2, widths.getRight(), 0);
@@ -59,7 +64,8 @@ public class BorderWidthsTest {
         assertFalse(widths.isLeftAsPercentage());
     }
 
-    @Test public void instanceCreation3() {
+    @Test
+    public void instanceCreation3() {
         BorderWidths widths = new BorderWidths(1, 2, 3, 4, true, false, false, true);
         assertEquals(1, widths.getTop(), 0);
         assertEquals(2, widths.getRight(), 0);
@@ -71,7 +77,8 @@ public class BorderWidthsTest {
         assertTrue(widths.isLeftAsPercentage());
     }
 
-    @Test public void instanceCreation4() {
+    @Test
+    public void instanceCreation4() {
         BorderWidths widths = new BorderWidths(100);
         assertEquals(100, widths.getTop(), 0);
         assertEquals(100, widths.getRight(), 0);
@@ -83,7 +90,8 @@ public class BorderWidthsTest {
         assertFalse(widths.isLeftAsPercentage());
     }
 
-    @Test public void instanceCreation5() {
+    @Test
+    public void instanceCreation5() {
         BorderWidths widths = new BorderWidths(1, 2, 3, 4);
         assertEquals(1, widths.getTop(), 0);
         assertEquals(2, widths.getRight(), 0);
@@ -95,115 +103,145 @@ public class BorderWidthsTest {
         assertFalse(widths.isLeftAsPercentage());
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void cannotSpecifyNegativeWidth() {
-        new BorderWidths(-2);
+        assertThrows(IllegalArgumentException.class, () -> {
+            new BorderWidths(-2);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void cannotSpecifyNegativeTop() {
-        new BorderWidths(-2, 0, 0, 0, false, false, false, false);
+        assertThrows(IllegalArgumentException.class, () -> {
+            new BorderWidths(-2, 0, 0, 0, false, false, false, false);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void cannotSpecifyNegativeTop2() {
-        new BorderWidths(-2, 0, 0, 0);
+        assertThrows(IllegalArgumentException.class, () -> {
+            new BorderWidths(-2, 0, 0, 0);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void cannotSpecifyNegativeRight() {
-        new BorderWidths(0, -2, 0, 0, false, false, false, false);
+        assertThrows(IllegalArgumentException.class, () -> {
+            new BorderWidths(0, -2, 0, 0, false, false, false, false);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void cannotSpecifyNegativeRight2() {
-        new BorderWidths(0, -2, 0, 0);
+        assertThrows(IllegalArgumentException.class, () -> {
+            new BorderWidths(0, -2, 0, 0);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void cannotSpecifyNegativeBottom() {
-        new BorderWidths(0, 0, -2, 0, false, false, false, false);
+        assertThrows(IllegalArgumentException.class, () -> {
+            new BorderWidths(0, 0, -2, 0, false, false, false, false);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void cannotSpecifyNegativeBottom2() {
-        new BorderWidths(0, 0, -2, 0);
+        assertThrows(IllegalArgumentException.class, () -> {
+            new BorderWidths(0, 0, -2, 0);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void cannotSpecifyNegativeLeft() {
-        new BorderWidths(0, 0, 0, -2, false, false, false, false);
+        assertThrows(IllegalArgumentException.class, () -> {
+            new BorderWidths(0, 0, 0, -2, false, false, false, false);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void cannotSpecifyNegativeLeft2() {
-        new BorderWidths(0, 0, 0, -2);
+        assertThrows(IllegalArgumentException.class, () -> {
+            new BorderWidths(0, 0, 0, -2);
+        });
     }
 
-    @Test public void equality() {
+    @Test
+    public void equality() {
         BorderWidths a = new BorderWidths(1, 2, 3, 4, true, false, false, true);
         BorderWidths b = new BorderWidths(1, 2, 3, 4, true, false, false, true);
         assertEquals(a, b);
     }
 
-    @Test public void same() {
+    @Test
+    public void same() {
         assertEquals(BorderWidths.DEFAULT, BorderWidths.DEFAULT);
     }
 
-    @Test public void different() {
+    @Test
+    public void different() {
         BorderWidths a = new BorderWidths(1, 2, 3, 4, true, false, false, true);
         BorderWidths b = new BorderWidths(2, 2, 3, 4, true, false, false, true);
         assertFalse(a.equals(b));
     }
 
-    @Test public void different2() {
+    @Test
+    public void different2() {
         BorderWidths a = new BorderWidths(1, 2, 3, 4, true, false, false, true);
         BorderWidths b = new BorderWidths(1, 3, 3, 4, true, false, false, true);
         assertFalse(a.equals(b));
     }
 
-    @Test public void different3() {
+    @Test
+    public void different3() {
         BorderWidths a = new BorderWidths(1, 2, 3, 4, true, false, false, true);
         BorderWidths b = new BorderWidths(1, 2, 4, 4, true, false, false, true);
         assertFalse(a.equals(b));
     }
 
-    @Test public void different4() {
+    @Test
+    public void different4() {
         BorderWidths a = new BorderWidths(1, 2, 3, 4, true, false, false, true);
         BorderWidths b = new BorderWidths(1, 2, 3, 5, true, false, false, true);
         assertFalse(a.equals(b));
     }
 
-    @Test public void different5() {
+    @Test
+    public void different5() {
         BorderWidths a = new BorderWidths(1, 2, 3, 4, true, false, false, true);
         BorderWidths b = new BorderWidths(1, 2, 3, 4, false, false, false, true);
         assertFalse(a.equals(b));
     }
 
-    @Test public void different6() {
+    @Test
+    public void different6() {
         BorderWidths a = new BorderWidths(1, 2, 3, 4, true, false, false, true);
         BorderWidths b = new BorderWidths(1, 2, 3, 4, true, true, false, true);
         assertFalse(a.equals(b));
     }
 
-    @Test public void different7() {
+    @Test
+    public void different7() {
         BorderWidths a = new BorderWidths(1, 2, 3, 4, true, false, false, true);
         BorderWidths b = new BorderWidths(1, 2, 3, 4, true, false, true, true);
         assertFalse(a.equals(b));
     }
 
-    @Test public void different8() {
+    @Test
+    public void different8() {
         BorderWidths a = new BorderWidths(1, 2, 3, 4, true, false, false, true);
         BorderWidths b = new BorderWidths(1, 2, 3, 4, true, false, false, false);
         assertFalse(a.equals(b));
     }
 
-    @Test public void noEqualToNull() {
+    @Test
+    public void noEqualToNull() {
         assertFalse(BorderWidths.DEFAULT.equals(null));
     }
 
     @SuppressWarnings("unlikely-arg-type")
-    @Test public void noEqualToRandom() {
+    @Test
+    public void noEqualToRandom() {
         assertFalse(BorderWidths.DEFAULT.equals("Some random value"));
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/FlowPaneTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/FlowPaneTest.java
index a73d05f769d..6276587b8f4 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/FlowPaneTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/FlowPaneTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,6 @@
 
 package test.javafx.scene.layout;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
 import javafx.geometry.HPos;
 import javafx.geometry.Insets;
 import javafx.geometry.Orientation;
@@ -36,15 +34,17 @@
 import javafx.scene.ParentShim;
 import javafx.scene.layout.FlowPane;
 import javafx.scene.shape.Rectangle;
-import org.junit.Before;
 
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 
 public class FlowPaneTest {
     FlowPane flowpane;
 
-    @Before public void setUp() {
+    @BeforeEach public void setUp() {
         this.flowpane = new FlowPane();
     }
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/GridPaneTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/GridPaneTest.java
index 3d610e2d06f..57a35d3fea7 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/GridPaneTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/GridPaneTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,6 @@
 
 package test.javafx.scene.layout;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 import javafx.geometry.HPos;
 import javafx.geometry.Insets;
 import javafx.geometry.Orientation;
@@ -43,14 +39,18 @@
 import javafx.scene.layout.RowConstraints;
 import javafx.scene.shape.Rectangle;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 
 public class GridPaneTest {
     GridPane gridpane;
 
-    @Before public void setUp() {
+    @BeforeEach public void setUp() {
         this.gridpane = new GridPane();
     }
 
@@ -70,8 +70,8 @@ public class GridPaneTest {
         gridpane.autosize();
         gridpane.layout();
 
-        assertNull(null, gridpane.getAlignment());
-        assertNull(null, gridpane.alignmentProperty().get());
+        assertNull(gridpane.getAlignment());
+        assertNull(gridpane.alignmentProperty().get());
     }
 
     @Test public void testSimpleGridPane() {
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/HBoxTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/HBoxTest.java
index cb17ea1d0ac..718b76e1de7 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/HBoxTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/HBoxTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,6 @@
 
 package test.javafx.scene.layout;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 import javafx.geometry.Insets;
 import javafx.geometry.Orientation;
 import javafx.geometry.Pos;
@@ -37,36 +34,43 @@
 import javafx.scene.layout.Priority;
 import javafx.scene.shape.Rectangle;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 
 public class HBoxTest {
     HBox hbox;
 
-    @Before public void setUp() {
+    @BeforeEach
+    public void setUp() {
         this.hbox = new HBox();
     }
 
 
-    @Test public void testHBoxDefaults() {
+    @Test
+    public void testHBoxDefaults() {
         assertEquals(0, hbox.getSpacing(), 1e-100);
         assertTrue(hbox.isFillHeight());
         assertEquals(Pos.TOP_LEFT, hbox.getAlignment());
     }
 
-    @Test public void testHBoxNulls() {
+    @Test
+    public void testHBoxNulls() {
         hbox.setAlignment(null);
 
         // this musn't throw NPE
         hbox.autosize();
         hbox.layout();
 
-        assertNull(null, hbox.getAlignment());
-        assertNull(null, hbox.alignmentProperty().get());
+        assertNull(hbox.getAlignment());
+        assertNull(hbox.alignmentProperty().get());
     }
 
-    @Test public void testSimpleHBox() {
+    @Test
+    public void testSimpleHBox() {
         MockResizable child1 = new MockResizable(100,200, 300,400, 500,600);
         Rectangle child2 = new Rectangle(100, 100);
         ParentShim.getChildren(hbox).addAll(child1, child2);
@@ -99,7 +103,8 @@ public class HBoxTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testHBoxSpacing() {
+    @Test
+    public void testHBoxSpacing() {
         hbox.setSpacing(10);
         MockResizable child1 = new MockResizable(100,200, 300,400, 500,600);
         Rectangle child2 = new Rectangle(100, 100);
@@ -133,7 +138,8 @@ public class HBoxTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testHBoxFillHeight() {
+    @Test
+    public void testHBoxFillHeight() {
         hbox.setFillHeight(false);
         hbox.setAlignment(Pos.TOP_CENTER);
         MockResizable child1 = new MockResizable(100,100, 200,300, 500,600);
@@ -168,7 +174,8 @@ public class HBoxTest {
         assertEquals(400, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testHBoxAlignmentTopLeft() {
+    @Test
+    public void testHBoxAlignmentTopLeft() {
         MockResizable child1 = new MockResizable(300,400);
         Rectangle child2 = new Rectangle(100, 100);
         ParentShim.getChildren(hbox).addAll(child1, child2);
@@ -186,7 +193,8 @@ public class HBoxTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testHBoxAlignmentTopCenter() {
+    @Test
+    public void testHBoxAlignmentTopCenter() {
         MockResizable child1 = new MockResizable(300,400);
         Rectangle child2 = new Rectangle(100, 100);
         ParentShim.getChildren(hbox).addAll(child1, child2);
@@ -204,7 +212,8 @@ public class HBoxTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testHBoxAlignmentTopRight() {
+    @Test
+    public void testHBoxAlignmentTopRight() {
         MockResizable child1 = new MockResizable(300,400);
         Rectangle child2 = new Rectangle(100, 100);
         ParentShim.getChildren(hbox).addAll(child1, child2);
@@ -222,7 +231,8 @@ public class HBoxTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testHBoxAlignmentCenterLeft() {
+    @Test
+    public void testHBoxAlignmentCenterLeft() {
         MockResizable child1 = new MockResizable(300,400);
         Rectangle child2 = new Rectangle(100, 100);
         ParentShim.getChildren(hbox).addAll(child1, child2);
@@ -240,7 +250,8 @@ public class HBoxTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testHBoxAlignmentCenter() {
+    @Test
+    public void testHBoxAlignmentCenter() {
         MockResizable child1 = new MockResizable(300,400);
         Rectangle child2 = new Rectangle(100, 100);
         ParentShim.getChildren(hbox).addAll(child1, child2);
@@ -258,7 +269,8 @@ public class HBoxTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testHBoxAlignmentCenterRight() {
+    @Test
+    public void testHBoxAlignmentCenterRight() {
         MockResizable child1 = new MockResizable(300,400);
         Rectangle child2 = new Rectangle(100, 100);
         ParentShim.getChildren(hbox).addAll(child1, child2);
@@ -276,7 +288,8 @@ public class HBoxTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testHBoxAlignmentBottomLeft() {
+    @Test
+    public void testHBoxAlignmentBottomLeft() {
         MockResizable child1 = new MockResizable(300,400);
         Rectangle child2 = new Rectangle(100, 100);
         ParentShim.getChildren(hbox).addAll(child1, child2);
@@ -294,7 +307,8 @@ public class HBoxTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testHBoxAlignmentBottomCenter() {
+    @Test
+    public void testHBoxAlignmentBottomCenter() {
         MockResizable child1 = new MockResizable(300,400);
         Rectangle child2 = new Rectangle(100, 100);
         ParentShim.getChildren(hbox).addAll(child1, child2);
@@ -312,7 +326,8 @@ public class HBoxTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testHBoxAlignmentBottomRight() {
+    @Test
+    public void testHBoxAlignmentBottomRight() {
         MockResizable child1 = new MockResizable(300,400);
         Rectangle child2 = new Rectangle(100, 100);
         ParentShim.getChildren(hbox).addAll(child1, child2);
@@ -330,7 +345,8 @@ public class HBoxTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testHBoxAlignmentBaselineLeft() {
+    @Test
+    public void testHBoxAlignmentBaselineLeft() {
         MockResizable child1 = new MockResizable(300,300); // baseline=290
         Rectangle child2 = new Rectangle(100, 100);
         ParentShim.getChildren(hbox).addAll(child1, child2);
@@ -349,7 +365,8 @@ public class HBoxTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testHBoxAlignmentBaselineCenter() {
+    @Test
+    public void testHBoxAlignmentBaselineCenter() {
         MockResizable child1 = new MockResizable(300,300); // baseline=290
         Rectangle child2 = new Rectangle(100, 100);
         ParentShim.getChildren(hbox).addAll(child1, child2);
@@ -368,7 +385,8 @@ public class HBoxTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testHBoxAlignmentBaselineRight() {
+    @Test
+    public void testHBoxAlignmentBaselineRight() {
         MockResizable child1 = new MockResizable(300,300); // baseline=290
         Rectangle child2 = new Rectangle(100, 100);
         ParentShim.getChildren(hbox).addAll(child1, child2);
@@ -387,7 +405,8 @@ public class HBoxTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testHBoxAlignmentBaselineLeftComputed() {
+    @Test
+    public void testHBoxAlignmentBaselineLeftComputed() {
         MockResizable child1 = new MockResizable(300,300) {
             @Override public double getBaselineOffset() {
                 return BASELINE_OFFSET_SAME_AS_HEIGHT; // should be prefHeight
@@ -410,7 +429,8 @@ public class HBoxTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testHBoxAlignmentBaselineCenterComputed() {
+    @Test
+    public void testHBoxAlignmentBaselineCenterComputed() {
         MockResizable child1 = new MockResizable(300,300) {
             @Override public double getBaselineOffset() {
                 return BASELINE_OFFSET_SAME_AS_HEIGHT; // should be prefHeight
@@ -433,7 +453,8 @@ public class HBoxTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testHBoxAlignmentBaselineRightComputed() {
+    @Test
+    public void testHBoxAlignmentBaselineRightComputed() {
         MockResizable child1 = new MockResizable(300,300) {
             @Override public double getBaselineOffset() {
                 return BASELINE_OFFSET_SAME_AS_HEIGHT; // should be prefHeight
@@ -459,7 +480,8 @@ public class HBoxTest {
 
     /* Content Bias */
 
-    @Test public void testHBoxContentBiasNullNoChildHasContentBias() {
+    @Test
+    public void testHBoxContentBiasNullNoChildHasContentBias() {
         Rectangle r = new Rectangle(100,100);
         MockResizable child = new MockResizable(200,100);
         ParentShim.getChildren(hbox).addAll(r, child);
@@ -470,7 +492,8 @@ public class HBoxTest {
         assertEquals(300, hbox.prefWidth(200), 0);
     }
 
-    @Test public void testHBoxContentBiasVERTICALIfChildVERTICAL() {
+    @Test
+    public void testHBoxContentBiasVERTICALIfChildVERTICAL() {
         Rectangle r = new Rectangle(100,50);
         MockBiased biased = new MockBiased(Orientation.VERTICAL, 200, 100);
         MockResizable child = new MockResizable(100,100);
@@ -480,7 +503,8 @@ public class HBoxTest {
 
     }
 
-    @Test public void testHBoxWithVerticalContentBiasAtPrefSize() {
+    @Test
+    public void testHBoxWithVerticalContentBiasAtPrefSize() {
         Rectangle rect1 = new Rectangle(100,50);
         MockBiased biased2 = new MockBiased(Orientation.VERTICAL, 200, 100);
         MockResizable resizable3 = new MockResizable(100,100);
@@ -503,7 +527,8 @@ public class HBoxTest {
         assertEquals(0, resizable3.getLayoutY(), 1e-100);
     }
 
-    @Test public void testHBoxWithVerticalContentBiasWithVerticalShrinking() {
+    @Test
+    public void testHBoxWithVerticalContentBiasWithVerticalShrinking() {
         Rectangle rect1 = new Rectangle(100,50);
         MockBiased biased2 = new MockBiased(Orientation.VERTICAL, 200, 100);
         MockResizable resizable3 = new MockResizable(100,100);
@@ -526,7 +551,8 @@ public class HBoxTest {
         assertEquals(0, resizable3.getLayoutY(), 1e-100);
     }
 
-    @Test public void testHBoxWithVerticalContentBiasWithVerticalGrowing() {
+    @Test
+    public void testHBoxWithVerticalContentBiasWithVerticalGrowing() {
         Rectangle rect1 = new Rectangle(100,50);
         MockBiased biased2 = new MockBiased(Orientation.VERTICAL, 200, 100);
         MockResizable resizable3 = new MockResizable(100,100);
@@ -548,7 +574,8 @@ public class HBoxTest {
         assertEquals(0, resizable3.getLayoutY(), 1e-100);
     }
 
-    @Test public void testHBoxContentBiasHORIZONTALIfChildHORIZONTAL() {
+    @Test
+    public void testHBoxContentBiasHORIZONTALIfChildHORIZONTAL() {
         Rectangle r = new Rectangle(100,100);
         MockBiased biased = new MockBiased(Orientation.HORIZONTAL, 200, 100);
         MockResizable child = new MockResizable(100,100);
@@ -557,7 +584,8 @@ public class HBoxTest {
         assertEquals(Orientation.HORIZONTAL, hbox.getContentBias());
     }
 
-    @Test public void testHBoxWithHorizontalContentBiasAtPrefSize() {
+    @Test
+    public void testHBoxWithHorizontalContentBiasAtPrefSize() {
         Rectangle rect1 = new Rectangle(100,50);
         MockBiased biased2 = new MockBiased(Orientation.HORIZONTAL, 200, 100);
         MockResizable resizable3 = new MockResizable(100,100);
@@ -580,7 +608,8 @@ public class HBoxTest {
         assertEquals(0, resizable3.getLayoutY(), 1e-100);
     }
 
-    @Test public void testHBoxWithHorizontalContentBiasWithHorizontalShrinking() {
+    @Test
+    public void testHBoxWithHorizontalContentBiasWithHorizontalShrinking() {
         Rectangle rect1 = new Rectangle(100,50);
         MockBiased biased2 = new MockBiased(Orientation.HORIZONTAL, 200, 100);
         MockResizable resizable3 = new MockResizable(100,100);
@@ -602,7 +631,8 @@ public class HBoxTest {
         assertEquals(0, resizable3.getLayoutY(), 1e-100);
     }
 
-    @Test public void testHBoxWithHorizontalContentBiasWithHorizontalGrowingFillHeightFalse() {
+    @Test
+    public void testHBoxWithHorizontalContentBiasWithHorizontalGrowingFillHeightFalse() {
         hbox.setFillHeight(false);
 
         Rectangle rect1 = new Rectangle(100,50);
@@ -628,7 +658,8 @@ public class HBoxTest {
         assertEquals(0, resizable3.getLayoutY(), 1e-100);
     }
 
-    @Test public void testHBoxWithHorizontalContentBiasWithHorizontalGrowingFillHeightTrue() {
+    @Test
+    public void testHBoxWithHorizontalContentBiasWithHorizontalGrowingFillHeightTrue() {
         hbox.setFillHeight(true);
 
         Rectangle rect1 = new Rectangle(100,50);
@@ -657,7 +688,8 @@ public class HBoxTest {
 
 
 
-//    @Test public void testHBoxContentBiasNullIfFillHeightFalse() {
+//    @Test
+//    public void testHBoxContentBiasNullIfFillHeightFalse() {
 //        hbox.setFillHeight(false);
 //        Rectangle r = new Rectangle(100,100);
 //        MockBiased biased = new MockBiased(Orientation.VERTICAL, 200, 100);
@@ -670,7 +702,8 @@ public class HBoxTest {
 //        assertEquals(400, hbox.prefWidth(200), 0);
 //    }
 
-//    @Test public void testHBoxContentBiasNullIfChildHORIZONTALAndFillHeightTrue() {
+//    @Test
+//    public void testHBoxContentBiasNullIfChildHORIZONTALAndFillHeightTrue() {
 //        hbox.setFillHeight(true);
 //        Rectangle r = new Rectangle(100,100);
 //        MockBiased biased = new MockBiased(Orientation.HORIZONTAL, 100, 200);
@@ -683,7 +716,8 @@ public class HBoxTest {
 //        assertEquals(200, hbox.prefHeight(200), 0);
 //    }
 //
-//    @Test public void testHBoxContentBiasNullIfChildHORIZONTALAndFillHeightFalse() {
+//    @Test
+//    public void testHBoxContentBiasNullIfChildHORIZONTALAndFillHeightFalse() {
 //        hbox.setFillHeight(false);
 //        Rectangle r = new Rectangle(100,100);
 //        MockBiased biased = new MockBiased(Orientation.HORIZONTAL, 100, 200);
@@ -696,7 +730,8 @@ public class HBoxTest {
 //        assertEquals(200, hbox.prefHeight(200), 0);
 //    }
 
-    @Test public void testHBoxSetMarginConstraint() {
+    @Test
+    public void testHBoxSetMarginConstraint() {
         MockResizable child1 = new MockResizable(100,200, 300,400, 500,600);
 
         assertNull(HBox.getMargin(child1));
@@ -709,7 +744,8 @@ public class HBoxTest {
         assertNull(HBox.getMargin(child1));
     }
 
-    @Test public void testHBoxMarginConstraint() {
+    @Test
+    public void testHBoxMarginConstraint() {
         HBox hbox = new HBox();
         MockResizable child1 = new MockResizable(100,200, 300,400, 500,600);
         Rectangle child2 = new Rectangle(100, 100);
@@ -745,7 +781,8 @@ public class HBoxTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testHBoxSetHgrowConstraint() {
+    @Test
+    public void testHBoxSetHgrowConstraint() {
         MockResizable child1 = new MockResizable(100,200, 300,400, 500,600);
 
         assertNull(HBox.getHgrow(child1));
@@ -757,7 +794,8 @@ public class HBoxTest {
         assertNull(HBox.getHgrow(child1));
     }
 
-    @Test public void testHBoxHgrowConstraint() {
+    @Test
+    public void testHBoxHgrowConstraint() {
         HBox hbox = new HBox();
         MockResizable child1 = new MockResizable(100,200, 300,400, 500,600);
         Rectangle child2 = new Rectangle(100, 100);
@@ -793,7 +831,8 @@ public class HBoxTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testHBoxWithHorizontalBiasedChild() {
+    @Test
+    public void testHBoxWithHorizontalBiasedChild() {
         HBox hbox = new HBox();
         System.out.println("************************************");
 
@@ -837,7 +876,8 @@ public class HBoxTest {
 
     }
 
-    @Test public void testHBoxWithVerticalBiasedChild() {
+    @Test
+    public void testHBoxWithVerticalBiasedChild() {
         HBox hbox = new HBox();
 
         MockBiased biased = new MockBiased(Orientation.VERTICAL, 100,100);
@@ -873,7 +913,8 @@ public class HBoxTest {
 
     }
 
-    @Test public void testMaxWidthHonoredWhenGrowing() {
+    @Test
+    public void testMaxWidthHonoredWhenGrowing() {
         MockRegion child = new MockRegion(10,10,100,100,300,300);
         MockRegion child2 = new MockRegion(10,10,100,100,200,200);
         HBox.setHgrow(child, Priority.ALWAYS);
@@ -889,7 +930,8 @@ public class HBoxTest {
         assertEquals(300, child2.getLayoutX(), 0);
     }
 
-    @Test public void testBaselineOffset() {
+    @Test
+    public void testBaselineOffset() {
         hbox.setAlignment(Pos.BASELINE_CENTER);
         MockResizable child = new MockResizable(100, 100);
         MockResizable child2 = new MockResizable(100, 150);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/RegionCSSTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/RegionCSSTest.java
index 3eda4cb15e4..a7efe15d108 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/RegionCSSTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/RegionCSSTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,9 +33,6 @@
 import javafx.geometry.Side;
 import javafx.scene.Scene;
 import javafx.scene.paint.Color;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
 
 import java.net.MalformedURLException;
 import java.net.URI;
@@ -55,7 +52,12 @@
 import javafx.scene.layout.Region;
 
 import static javafx.scene.layout.BackgroundSize.*;
-import static org.junit.Assert.*;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 /**
  * All of these tests are based on information contained in the CSS 3 borders
@@ -128,7 +130,8 @@ private static void installImage(final String str) {
 
     }
 
-    @Before public void setUp() {
+    @BeforeEach
+    public void setUp() {
         region = new Region();
         scene = new Scene(region);
 
@@ -144,7 +147,8 @@ private static void installImage(final String str) {
      *                                                                        *
      *************************************************************************/
 
-    @Test public void nothingSpecified() {
+    @Test
+    public void nothingSpecified() {
         region.setStyle("-fx-padding: 1;");
         processCSS();
 
@@ -162,7 +166,8 @@ private static void installImage(final String str) {
      *                                                                        *
      *************************************************************************/
 
-    @Test public void fillIsNull() {
+    @Test
+    public void fillIsNull() {
         region.setStyle("-fx-background-color: null;");
         processCSS();
 
@@ -171,7 +176,8 @@ private static void installImage(final String str) {
         assertNull(region.getBorder());
     }
 
-    @Test public void fillIsTransparent() {
+    @Test
+    public void fillIsTransparent() {
         region.setStyle("-fx-background-color: transparent;");
         processCSS();
 
@@ -183,7 +189,8 @@ private static void installImage(final String str) {
         assertEquals(expected, fill);
     }
 
-    @Test public void fillIsSpecifiedOnly() {
+    @Test
+    public void fillIsSpecifiedOnly() {
         region.setStyle("-fx-background-color: purple;");
         processCSS();
 
@@ -195,7 +202,8 @@ private static void installImage(final String str) {
         assertEquals(expected, fill);
     }
 
-    @Test public void insetsIsSpecifiedOnly() {
+    @Test
+    public void insetsIsSpecifiedOnly() {
         region.setStyle("-fx-background-insets: 1;");
         processCSS();
 
@@ -203,7 +211,8 @@ private static void installImage(final String str) {
         assertNull(region.getBorder());
     }
 
-    @Test public void radiusIsSpecifiedOnly() {
+    @Test
+    public void radiusIsSpecifiedOnly() {
         region.setStyle("-fx-background-radius: 1;");
         processCSS();
 
@@ -211,7 +220,8 @@ private static void installImage(final String str) {
         assertNull(region.getBorder());
     }
 
-    @Test public void testWithExcessInsets() {
+    @Test
+    public void testWithExcessInsets() {
         region.setStyle(
                 "-fx-background-color: red;" +
                 "-fx-background-insets: 0 0 -1 0, 0, 1, 2;");
@@ -226,7 +236,8 @@ private static void installImage(final String str) {
         assertEquals(expected, fill);
     }
 
-    @Test public void testWithExcessRadius() {
+    @Test
+    public void testWithExcessRadius() {
         region.setStyle(
                 "-fx-background-color: red;" +
                 "-fx-background-radius: 0 0 0 0, 0, 1, 2;");
@@ -241,7 +252,8 @@ private static void installImage(final String str) {
         assertEquals(expected, fill);
     }
 
-    @Test public void backgroundScenario1() {
+    @Test
+    public void backgroundScenario1() {
         region.setStyle(
                 "-fx-background-color: red;" +
                 "-fx-background-insets: 0 0 -1 0, 0, 1, 2;" +
@@ -259,7 +271,8 @@ private static void installImage(final String str) {
         assertEquals(expected, fill);
     }
 
-    @Test public void backgroundScenario2() {
+    @Test
+    public void backgroundScenario2() {
         region.setStyle(
                 "-fx-background-color: red, green, blue, yellow;" +
                 "-fx-background-insets: 0 0 -1 0, 1;" +
@@ -289,7 +302,8 @@ private static void installImage(final String str) {
         assertEquals(expected, fill);
     }
 
-    @Test public void backgroundScenario3() {
+    @Test
+    public void backgroundScenario3() {
         region.setStyle(
                 "-fx-background-color: red, green, blue, yellow;" +
                 "-fx-background-insets: 0 0 -1 0, 0, 1, 2;" +
@@ -321,7 +335,8 @@ private static void installImage(final String str) {
      * From the specification: http://www.w3.org/TR/css3-background/
      * This is "Example 1", except modified for multiple background fills
      */
-    @Test public void specExample1_ModifiedForBackgroundFill() {
+    @Test
+    public void specExample1_ModifiedForBackgroundFill() {
         region.setStyle(
                 "-fx-background-color: red, green, blue;" +
                 "-fx-background-insets: 1, 2, 3, 4;" + // An extra value here, which should be ignored
@@ -344,7 +359,8 @@ private static void installImage(final String str) {
     }
 
     // See example 23 in http://www.w3.org/TR/css3-background/#the-border-radius
-    @Test public void testBackgroundRadiusWithHorizontalAndVerticalRadii() {
+    @Test
+    public void testBackgroundRadiusWithHorizontalAndVerticalRadii() {
 
         region.setStyle("-fx-background-color: black; -fx-background-radius: 2px 1px 4px / 0.5px 3px;");
         processCSS();
@@ -382,7 +398,8 @@ private static void installImage(final String str) {
      * in this file are checking one specific aspect of the functionality tested
      * herein.
      */
-    @Test public void specExample1() {
+    @Test
+    public void specExample1() {
         region.setStyle(
                 "-fx-background-image: url(test/javafx/scene/layout/red.png), url(test/javafx/scene/layout/green.png), url(test/javafx/scene/layout/blue.png);" +
                 "-fx-background-position: center center, 20% 80%, top left, bottom right;" +
@@ -417,7 +434,8 @@ private static void installImage(final String str) {
         assertEquals(expected, image);
     }
 
-    @Test public void backgroundImageRepeat_repeatX() {
+    @Test
+    public void backgroundImageRepeat_repeatX() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-repeat: repeat-x;");
@@ -435,7 +453,8 @@ private static void installImage(final String str) {
         assertEquals(expected, image);
     }
 
-    @Test public void backgroundImageRepeat_repeatY() {
+    @Test
+    public void backgroundImageRepeat_repeatY() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-repeat: repeat-y;");
@@ -453,7 +472,8 @@ private static void installImage(final String str) {
         assertEquals(expected, image);
     }
 
-    @Test public void backgroundImageRepeat_repeat() {
+    @Test
+    public void backgroundImageRepeat_repeat() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-repeat: repeat;");
@@ -471,7 +491,8 @@ private static void installImage(final String str) {
         assertEquals(expected, image);
     }
 
-    @Test public void backgroundImageRepeat_space() {
+    @Test
+    public void backgroundImageRepeat_space() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-repeat: space;");
@@ -489,7 +510,8 @@ private static void installImage(final String str) {
         assertEquals(expected, image);
     }
 
-    @Test public void backgroundImageRepeat_round() {
+    @Test
+    public void backgroundImageRepeat_round() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-repeat: round;");
@@ -507,7 +529,8 @@ private static void installImage(final String str) {
         assertEquals(expected, image);
     }
 
-    @Test public void backgroundImageRepeat_noRepeat() {
+    @Test
+    public void backgroundImageRepeat_noRepeat() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-repeat: no-repeat;");
@@ -525,7 +548,8 @@ private static void installImage(final String str) {
         assertEquals(expected, image);
     }
 
-    @Test public void backgroundImageRepeat_repeat_space() {
+    @Test
+    public void backgroundImageRepeat_repeat_space() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-repeat: repeat space;");
@@ -543,7 +567,8 @@ private static void installImage(final String str) {
         assertEquals(expected, image);
     }
 
-    @Test public void backgroundImageRepeat_round_noRepeat() {
+    @Test
+    public void backgroundImageRepeat_round_noRepeat() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-repeat: round no-repeat;");
@@ -565,7 +590,8 @@ private static void installImage(final String str) {
     // try "50% left" -- shouldn't work
     // try 3 values... remaining one should be 0
     // If only one value is specified, the second value is assumed to be ???center??? -- whatever this means...
-    @Test public void backgroundImagePosition_right_bottom() {
+    @Test
+    public void backgroundImagePosition_right_bottom() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-position: right 20px bottom 10px;");
@@ -618,7 +644,8 @@ private static String dump(BackgroundPosition position) {
         return b.toString();
     }
 
-    @Test public void backgroundImagePosition_bottom_right() {
+    @Test
+    public void backgroundImagePosition_bottom_right() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-position: bottom 10px right 20px;");
@@ -636,7 +663,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void backgroundImagePosition_top() {
+    @Test
+    public void backgroundImagePosition_top() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-position: top;");
@@ -654,7 +682,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test  public void backgroundImagePosition_left() {
+    @Test
+    public void backgroundImagePosition_left() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-position: left;");
@@ -672,7 +701,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void backgroundImagePosition_center() {
+    @Test
+    public void backgroundImagePosition_center() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-position: center;");
@@ -690,7 +720,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void backgroundImagePosition_right() {
+    @Test
+    public void backgroundImagePosition_right() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-position: right;");
@@ -708,7 +739,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void backgroundImagePosition_bottom() {
+    @Test
+    public void backgroundImagePosition_bottom() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-position: bottom;");
@@ -726,7 +758,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void backgroundImagePosition_center_top() {
+    @Test
+    public void backgroundImagePosition_center_top() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-position: center top;");
@@ -744,7 +777,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void backgroundImagePosition_Example8_1() {
+    @Test
+    public void backgroundImagePosition_Example8_1() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-position: left 10px top 15px;");
@@ -762,7 +796,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void backgroundImagePosition_Example8_2() {
+    @Test
+    public void backgroundImagePosition_Example8_2() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-position: left top;");
@@ -780,7 +815,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void backgroundImagePosition_Example8_3() {
+    @Test
+    public void backgroundImagePosition_Example8_3() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-position: 10px 15px;");
@@ -798,7 +834,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void backgroundImagePosition_Example8_4() {
+    @Test
+    public void backgroundImagePosition_Example8_4() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-position: left 15px;");
@@ -816,7 +853,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void backgroundImagePosition_Example8_5() {
+    @Test
+    public void backgroundImagePosition_Example8_5() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-position: 10px top;");
@@ -834,7 +872,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void backgroundImagePosition_Example8_6() {
+    @Test
+    public void backgroundImagePosition_Example8_6() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-position: left top 15px;");
@@ -852,7 +891,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void backgroundImagePosition_Example8_7() {
+    @Test
+    public void backgroundImagePosition_Example8_7() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-position: left 10px top;");
@@ -870,7 +910,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void backgroundImagePosition_Example10_1() {
+    @Test
+    public void backgroundImagePosition_Example10_1() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-position: right top;");
@@ -888,7 +929,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void backgroundImagePosition_Example10_2() {
+    @Test
+    public void backgroundImagePosition_Example10_2() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-position: top center;");
@@ -906,7 +948,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void backgroundImagePosition_Example11() {
+    @Test
+    public void backgroundImagePosition_Example11() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-position: 100% 100%;");
@@ -924,7 +967,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void backgroundImagePosition_75Percent() {
+    @Test
+    public void backgroundImagePosition_75Percent() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-position: 75% 75%;");
@@ -942,7 +986,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void backgroundImagePosition_Example12() {
+    @Test
+    public void backgroundImagePosition_Example12() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-position: right 10% bottom 10%;");
@@ -960,8 +1005,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Ignore("JDK-8091576") // -fx-background-clip is not implemented.
-    @Test public void backgroundClip_defaultValue() {
+    @Disabled("JDK-8091576") // -fx-background-clip is not implemented.
+    @Test
+    public void backgroundClip_defaultValue() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');");
         processCSS();
@@ -981,8 +1027,9 @@ private static String dump(BackgroundPosition position) {
 //        assertEquals(expected, image);
     }
 
-    @Ignore("JDK-8091576") // -fx-background-clip is not implemented.
-    @Test public void backgroundClip_BorderBox() {
+    @Disabled("JDK-8091576") // -fx-background-clip is not implemented.
+    @Test
+    public void backgroundClip_BorderBox() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-clip: border-box");
@@ -1002,8 +1049,9 @@ private static String dump(BackgroundPosition position) {
 //        assertEquals(expected, image);
     }
 
-    @Ignore("JDK-8091576") // -fx-background-clip is not implemented.
-    @Test public void backgroundClip_PaddingBox() {
+    @Disabled("JDK-8091576") // -fx-background-clip is not implemented.
+    @Test
+    public void backgroundClip_PaddingBox() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-clip: padding-box");
@@ -1023,8 +1071,9 @@ private static String dump(BackgroundPosition position) {
 //        assertEquals(expected, image);
     }
 
-    @Ignore("JDK-8091576") // -fx-background-clip is not implemented.
-    @Test public void backgroundClip_ContentBox() {
+    @Disabled("JDK-8091576") // -fx-background-clip is not implemented.
+    @Test
+    public void backgroundClip_ContentBox() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-clip: content-box");
@@ -1044,8 +1093,9 @@ private static String dump(BackgroundPosition position) {
 //        assertEquals(expected, image);
     }
 
-    @Ignore("JDK-8091576") // -fx-background-origin is not implemented.
-    @Test public void backgroundOrigin_defaultValue() {
+    @Disabled("JDK-8091576") // -fx-background-origin is not implemented.
+    @Test
+    public void backgroundOrigin_defaultValue() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');");
         processCSS();
@@ -1065,8 +1115,9 @@ private static String dump(BackgroundPosition position) {
 //        assertEquals(expected, image);
     }
 
-    @Ignore("JDK-8091576") // -fx-background-origin is not implemented.
-    @Test public void backgroundOrigin_BorderBox() {
+    @Disabled("JDK-8091576") // -fx-background-origin is not implemented.
+    @Test
+    public void backgroundOrigin_BorderBox() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-origin: border-box");
@@ -1087,8 +1138,9 @@ private static String dump(BackgroundPosition position) {
 //        assertEquals(expected, image);
     }
 
-    @Ignore("JDK-8091576") // -fx-background-origin is not implemented.
-    @Test public void backgroundOrigin_PaddingBox() {
+    @Disabled("JDK-8091576") // -fx-background-origin is not implemented.
+    @Test
+    public void backgroundOrigin_PaddingBox() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-origin: padding-box");
@@ -1108,8 +1160,9 @@ private static String dump(BackgroundPosition position) {
 //        assertEquals(expected, image);
     }
 
-    @Ignore("JDK-8091576") // -fx-background-origin is not implemented.
-    @Test public void backgroundOrigin_ContentBox() {
+    @Disabled("JDK-8091576") // -fx-background-origin is not implemented.
+    @Test
+    public void backgroundOrigin_ContentBox() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-origin: content-box");
@@ -1129,7 +1182,8 @@ private static String dump(BackgroundPosition position) {
 //        assertEquals(expected, image);
     }
 
-    @Test public void backgroundSize_defaultValue() {
+    @Test
+    public void backgroundSize_defaultValue() {
         region.setStyle("-fx-background-image: url('test/javafx/scene/layout/red.png');");
         processCSS();
 
@@ -1145,7 +1199,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void backgroundSize_cover() {
+    @Test
+    public void backgroundSize_cover() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-size: cover;");
@@ -1163,7 +1218,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void backgroundSize_contain() {
+    @Test
+    public void backgroundSize_contain() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-size: contain;");
@@ -1181,7 +1237,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void backgroundSize_length() {
+    @Test
+    public void backgroundSize_length() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-size: 170px;");
@@ -1199,7 +1256,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void backgroundSize_percent() {
+    @Test
+    public void backgroundSize_percent() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-size: 65%;");
@@ -1217,7 +1275,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void backgroundSize_auto() {
+    @Test
+    public void backgroundSize_auto() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-size: auto;");
@@ -1235,7 +1294,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void backgroundSize_length_length() {
+    @Test
+    public void backgroundSize_length_length() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-size: 10px 20px;");
@@ -1253,7 +1313,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void backgroundSize_length_percent() {
+    @Test
+    public void backgroundSize_length_percent() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-size: 50px 25%;");
@@ -1271,7 +1332,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void backgroundSize_length_auto() {
+    @Test
+    public void backgroundSize_length_auto() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-size: 40px auto;");
@@ -1289,7 +1351,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void backgroundSize_percent_length() {
+    @Test
+    public void backgroundSize_percent_length() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-size: 25% 30px;");
@@ -1307,7 +1370,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void backgroundSize_percent_percent() {
+    @Test
+    public void backgroundSize_percent_percent() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-size: 25% 75%;");
@@ -1325,7 +1389,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void backgroundSize_percent_auto() {
+    @Test
+    public void backgroundSize_percent_auto() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-size: 25% auto;");
@@ -1343,7 +1408,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void backgroundSize_auto_length() {
+    @Test
+    public void backgroundSize_auto_length() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-size: auto 25px;");
@@ -1361,7 +1427,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void backgroundSize_auto_percent() {
+    @Test
+    public void backgroundSize_auto_percent() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-size: auto 50%;");
@@ -1379,7 +1446,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void backgroundSize_auto_auto() {
+    @Test
+    public void backgroundSize_auto_auto() {
         region.setStyle(
                 "-fx-background-image: url('test/javafx/scene/layout/red.png');" +
                 "-fx-background-size: auto auto;");
@@ -1407,7 +1475,8 @@ private static String dump(BackgroundPosition position) {
      *                                                                        *
      *************************************************************************/
 
-    @Test public void borderStrokeStyleIsNull() {
+    @Test
+    public void borderStrokeStyleIsNull() {
         region.setStyle("-fx-border-style: null;");
         processCSS();
 
@@ -1416,8 +1485,9 @@ private static String dump(BackgroundPosition position) {
         assertNull(region.getBorder());
     }
 
-    @Ignore("JDK-8091576") // -fx-border-style-top is not implemented.
-    @Test public void borderStyle_top() {
+    @Disabled("JDK-8091576") // -fx-border-style-top is not implemented.
+    @Test
+    public void borderStyle_top() {
         region.setStyle("-fx-border-style-top: solid;");
         processCSS();
 
@@ -1434,8 +1504,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // -fx-border-style-right is not implemented.
-    @Test public void borderStyle_right() {
+    @Disabled("JDK-8091576") // -fx-border-style-right is not implemented.
+    @Test
+    public void borderStyle_right() {
         region.setStyle("-fx-border-style-right: solid;");
         processCSS();
 
@@ -1452,8 +1523,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // -fx-border-style-bottom is not implemented.
-    @Test public void borderStyle_bottom() {
+    @Disabled("JDK-8091576") // -fx-border-style-bottom is not implemented.
+    @Test
+    public void borderStyle_bottom() {
         region.setStyle("-fx-border-style-bottom: solid;");
         processCSS();
 
@@ -1470,8 +1542,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // -fx-border-style-left is not implemented.
-    @Test public void borderStyle_left() {
+    @Disabled("JDK-8091576") // -fx-border-style-left is not implemented.
+    @Test
+    public void borderStyle_left() {
         region.setStyle("-fx-border-style-left: solid;");
         processCSS();
 
@@ -1488,8 +1561,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576")
-    @Test public void borderStyle_top_right() {
+    @Disabled("JDK-8091576")
+    @Test
+    public void borderStyle_top_right() {
         region.setStyle(
                 "-fx-border-style-top: solid;" +
                 "-fx-border-style-right: dashed;");
@@ -1508,8 +1582,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576")
-    @Test public void borderStyle_bottom_top() {
+    @Disabled("JDK-8091576")
+    @Test
+    public void borderStyle_bottom_top() {
         region.setStyle(
                 "-fx-border-style-top: solid;" +
                 "-fx-border-style-bottom: dashed;");
@@ -1528,8 +1603,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576")
-    @Test public void borderStyle_left_bottom() {
+    @Disabled("JDK-8091576")
+    @Test
+    public void borderStyle_left_bottom() {
         region.setStyle(
                 "-fx-border-style-bottom: solid;" +
                 "-fx-border-style-left: dashed;");
@@ -1548,7 +1624,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Test public void borderStyle_none() {
+    @Test
+    public void borderStyle_none() {
         region.setStyle("-fx-border-style: none;");
         processCSS();
 
@@ -1557,7 +1634,8 @@ private static String dump(BackgroundPosition position) {
         assertNull(region.getBorder());
     }
 
-    @Test public void borderStyle_hidden() {
+    @Test
+    public void borderStyle_hidden() {
         region.setStyle("-fx-border-style: hidden;");
         processCSS();
 
@@ -1566,7 +1644,8 @@ private static String dump(BackgroundPosition position) {
         assertNull(region.getBorder());
     }
 
-    @Test public void borderStyle_dotted() {
+    @Test
+    public void borderStyle_dotted() {
         region.setStyle("-fx-border-color: black; -fx-border-style: dotted;");
         processCSS();
 
@@ -1582,7 +1661,8 @@ private static String dump(BackgroundPosition position) {
     }
 
     // border-style: dashed
-    @Test public void borderStyle_dashed() {
+    @Test
+    public void borderStyle_dashed() {
         region.setStyle("-fx-border-color: black; -fx-border-style: dashed;");
         processCSS();
 
@@ -1597,7 +1677,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Test public void borderStyle_solid() {
+    @Test
+    public void borderStyle_solid() {
         region.setStyle("-fx-border-color: black; -fx-border-style: solid;");
         processCSS();
 
@@ -1612,8 +1693,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // double value not implemented.
-    @Test public void borderStyle_double() {
+    @Disabled("JDK-8091576") // double value not implemented.
+    @Test
+    public void borderStyle_double() {
         region.setStyle("-fx-border-color: black; -fx-border-style: double;");
         processCSS();
 
@@ -1629,8 +1711,9 @@ private static String dump(BackgroundPosition position) {
 //        assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // groove value not implemented.
-    @Test public void borderStyle_groove() {
+    @Disabled("JDK-8091576") // groove value not implemented.
+    @Test
+    public void borderStyle_groove() {
         region.setStyle("-fx-border-color: black; -fx-border-style: groove;");
         processCSS();
 
@@ -1646,8 +1729,9 @@ private static String dump(BackgroundPosition position) {
 //        assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // ridge value not implemented.
-    @Test public void borderStyle_ridge() {
+    @Disabled("JDK-8091576") // ridge value not implemented.
+    @Test
+    public void borderStyle_ridge() {
         region.setStyle("-fx-border-color: black; -fx-border-style: ridge;");
         processCSS();
 
@@ -1663,8 +1747,9 @@ private static String dump(BackgroundPosition position) {
 //        assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // inset value not implemented.
-    @Test public void borderStyle_inset() {
+    @Disabled("JDK-8091576") // inset value not implemented.
+    @Test
+    public void borderStyle_inset() {
         region.setStyle("-fx-border-color: black; -fx-border-style: inset;");
         processCSS();
 
@@ -1680,8 +1765,9 @@ private static String dump(BackgroundPosition position) {
 //        assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // outset value not implemented.
-    @Test public void borderStyle_outset() {
+    @Disabled("JDK-8091576") // outset value not implemented.
+    @Test
+    public void borderStyle_outset() {
         region.setStyle("-fx-border-color: black; -fx-border-style: outset;");
         processCSS();
 
@@ -1697,7 +1783,8 @@ private static String dump(BackgroundPosition position) {
 //        assertEquals(expected, stroke);
     }
 
-    @Test public void borderStyle_solid_dotted() {
+    @Test
+    public void borderStyle_solid_dotted() {
         region.setStyle("-fx-border-color: black; -fx-border-style: solid dotted;");
         processCSS();
 
@@ -1713,7 +1800,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Test public void borderStyle_solid_dotted_dashed() {
+    @Test
+    public void borderStyle_solid_dotted_dashed() {
         region.setStyle("-fx-border-color: black; -fx-border-style: solid dotted dashed;");
         processCSS();
 
@@ -1729,8 +1817,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // ridge value not implemented.
-    @Test public void borderStyle_solid_dotted_dashed_ridge() {
+    @Disabled("JDK-8091576") // ridge value not implemented.
+    @Test
+    public void borderStyle_solid_dotted_dashed_ridge() {
         region.setStyle("-fx-border-color: black; -fx-border-style: solid dotted dashed ridge;");
         processCSS();
 
@@ -1747,8 +1836,9 @@ private static String dump(BackgroundPosition position) {
 //        assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // -fx-border-width-top is not implemented.
-    @Test public void borderStrokeWidth_top() {
+    @Disabled("JDK-8091576") // -fx-border-width-top is not implemented.
+    @Test
+    public void borderStrokeWidth_top() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-width-top: 10px;");
@@ -1764,8 +1854,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // -fx-border-width-right is not implemented.
-    @Test public void borderStrokeWidth_right() {
+    @Disabled("JDK-8091576") // -fx-border-width-right is not implemented.
+    @Test
+    public void borderStrokeWidth_right() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-width-right: 10px;");
@@ -1781,8 +1872,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // -fx-border-width-bottom is not implemented.
-    @Test public void borderStrokeWidth_bottom() {
+    @Disabled("JDK-8091576") // -fx-border-width-bottom is not implemented.
+    @Test
+    public void borderStrokeWidth_bottom() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-width-bottom: 10px;");
@@ -1798,8 +1890,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // -fx-border-width-left is not implemented.
-    @Test public void borderStrokeWidth_left() {
+    @Disabled("JDK-8091576") // -fx-border-width-left is not implemented.
+    @Test
+    public void borderStrokeWidth_left() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-width-left: 10px;");
@@ -1815,8 +1908,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576")
-    @Test public void borderStrokeWidth_top_right() {
+    @Disabled("JDK-8091576")
+    @Test
+    public void borderStrokeWidth_top_right() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-width-top: 10px;" +
@@ -1833,8 +1927,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576")
-    @Test public void borderStrokeWidth_top_bottom() {
+    @Disabled("JDK-8091576")
+    @Test
+    public void borderStrokeWidth_top_bottom() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-width-top: 10px;" +
@@ -1851,8 +1946,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576")
-    @Test public void borderStrokeWidth_left_bottom() {
+    @Disabled("JDK-8091576")
+    @Test
+    public void borderStrokeWidth_left_bottom() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-width-left: 10px;" +
@@ -1869,7 +1965,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Test public void borderStrokeWidth2() {
+    @Test
+    public void borderStrokeWidth2() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-width: 1px 2px;");
@@ -1884,7 +1981,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Test public void borderStrokeWidth3() {
+    @Test
+    public void borderStrokeWidth3() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-width: 1px 2px 3px;");
@@ -1899,7 +1997,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Test public void borderStrokeWidth4() {
+    @Test
+    public void borderStrokeWidth4() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-width: 1px 2px 3px 4px;");
@@ -1914,8 +2013,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // thin value is not implemented.
-    @Test public void borderStrokeWidth_thin() {
+    @Disabled("JDK-8091576") // thin value is not implemented.
+    @Test
+    public void borderStrokeWidth_thin() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-width: thin;");
@@ -1931,8 +2031,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // thick value is not implemented.
-    @Test public void borderStrokeWidth_thick() {
+    @Disabled("JDK-8091576") // thick value is not implemented.
+    @Test
+    public void borderStrokeWidth_thick() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-width: thick;");
@@ -1948,8 +2049,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // medium value is not implemented.
-    @Test public void borderStrokeWidth_medium() {
+    @Disabled("JDK-8091576") // medium value is not implemented.
+    @Test
+    public void borderStrokeWidth_medium() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-width: medium;");
@@ -1965,8 +2067,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576")
-    @Test public void borderStrokeWidth_thin_medium_thick() {
+    @Disabled("JDK-8091576")
+    @Test
+    public void borderStrokeWidth_thin_medium_thick() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-width: thin medium thick;");
@@ -1987,8 +2090,9 @@ private static String dump(BackgroundPosition position) {
 
     // TODO!! The initial width of a border is MEDIUM, NOT 0!
 
-    @Ignore("JDK-8091576") // -fx-border-top-left-radius not implemented.
-    @Test public void borderStrokeRadius_topLeft1() {
+    @Disabled("JDK-8091576") // -fx-border-top-left-radius not implemented.
+    @Test
+    public void borderStrokeRadius_topLeft1() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-top-left-radius: 5px;");
@@ -2005,8 +2109,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // -fx-border-top-left-radius not implemented.
-    @Test public void borderStrokeRadius_topLeft2() {
+    @Disabled("JDK-8091576") // -fx-border-top-left-radius not implemented.
+    @Test
+    public void borderStrokeRadius_topLeft2() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-top-left-radius: 5px, 10px;");
@@ -2032,8 +2137,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // -fx-border-top-left-radius not implemented.
-    @Test public void borderStrokeRadius_topLeft3() {
+    @Disabled("JDK-8091576") // -fx-border-top-left-radius not implemented.
+    @Test
+    public void borderStrokeRadius_topLeft3() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-top-left-radius: 5%;");
@@ -2059,8 +2165,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // -fx-border-top-left-radius not implemented.
-    @Test public void borderStrokeRadius_topLeft4() {
+    @Disabled("JDK-8091576") // -fx-border-top-left-radius not implemented.
+    @Test
+    public void borderStrokeRadius_topLeft4() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-top-left-radius: 5%, 10%;");
@@ -2086,8 +2193,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // -fx-border-top-left-radius not implemented.
-    @Test public void borderStrokeRadius_topLeft5() {
+    @Disabled("JDK-8091576") // -fx-border-top-left-radius not implemented.
+    @Test
+    public void borderStrokeRadius_topLeft5() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-top-left-radius: 5% 10px;");
@@ -2113,8 +2221,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // -fx-border-top-left-radius not implemented.
-    @Test public void borderStrokeRadius_topLeft6() {
+    @Disabled("JDK-8091576") // -fx-border-top-left-radius not implemented.
+    @Test
+    public void borderStrokeRadius_topLeft6() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-top-left-radius: 5px, 10%;");
@@ -2140,8 +2249,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // -fx-border-top-right-radius not implemented.
-    @Test public void borderStrokeRadius_topRight1() {
+    @Disabled("JDK-8091576") // -fx-border-top-right-radius not implemented.
+    @Test
+    public void borderStrokeRadius_topRight1() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-top-right-radius: 5px;");
@@ -2158,8 +2268,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // -fx-border-top-right-radius not implemented.
-    @Test public void borderStrokeRadius_topRight2() {
+    @Disabled("JDK-8091576") // -fx-border-top-right-radius not implemented.
+    @Test
+    public void borderStrokeRadius_topRight2() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-top-right-radius: 5px, 10px;");
@@ -2185,8 +2296,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // -fx-border-top-right-radius not implemented.
-    @Test public void borderStrokeRadius_topRight3() {
+    @Disabled("JDK-8091576") // -fx-border-top-right-radius not implemented.
+    @Test
+    public void borderStrokeRadius_topRight3() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-top-right-radius: 5%;");
@@ -2212,8 +2324,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // -fx-border-top-right-radius not implemented.
-    @Test public void borderStrokeRadius_topRight4() {
+    @Disabled("JDK-8091576") // -fx-border-top-right-radius not implemented.
+    @Test
+    public void borderStrokeRadius_topRight4() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-top-right-radius: 5%, 10%;");
@@ -2239,8 +2352,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // -fx-border-top-right-radius not implemented.
-    @Test public void borderStrokeRadius_topRight5() {
+    @Disabled("JDK-8091576") // -fx-border-top-right-radius not implemented.
+    @Test
+    public void borderStrokeRadius_topRight5() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-top-right-radius: 5% 10px;");
@@ -2266,8 +2380,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // -fx-border-top-right-radius not implemented.
-    @Test public void borderStrokeRadius_topRight6() {
+    @Disabled("JDK-8091576") // -fx-border-top-right-radius not implemented.
+    @Test
+    public void borderStrokeRadius_topRight6() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-top-right-radius: 5px, 10%;");
@@ -2293,8 +2408,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // -fx-border-bottom-right-radius not implemented.
-    @Test public void borderStrokeRadius_bottomRight1() {
+    @Disabled("JDK-8091576") // -fx-border-bottom-right-radius not implemented.
+    @Test
+    public void borderStrokeRadius_bottomRight1() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-bottom-right-radius: 5px;");
@@ -2311,8 +2427,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // -fx-border-bottom-right-radius not implemented.
-    @Test public void borderStrokeRadius_bottomRight2() {
+    @Disabled("JDK-8091576") // -fx-border-bottom-right-radius not implemented.
+    @Test
+    public void borderStrokeRadius_bottomRight2() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-bottom-right-radius: 5px, 10px;");
@@ -2338,8 +2455,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // -fx-border-bottom-right-radius not implemented.
-    @Test public void borderStrokeRadius_bottomRight3() {
+    @Disabled("JDK-8091576") // -fx-border-bottom-right-radius not implemented.
+    @Test
+    public void borderStrokeRadius_bottomRight3() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-bottom-right-radius: 5%;");
@@ -2365,8 +2483,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // -fx-border-bottom-right-radius not implemented.
-    @Test public void borderStrokeRadius_bottomRight4() {
+    @Disabled("JDK-8091576") // -fx-border-bottom-right-radius not implemented.
+    @Test
+    public void borderStrokeRadius_bottomRight4() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-bottom-right-radius: 5%, 10%;");
@@ -2392,8 +2511,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // -fx-border-bottom-right-radius not implemented.
-    @Test public void borderStrokeRadius_bottomRight5() {
+    @Disabled("JDK-8091576") // -fx-border-bottom-right-radius not implemented.
+    @Test
+    public void borderStrokeRadius_bottomRight5() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-bottom-right-radius: 5% 10px;");
@@ -2419,8 +2539,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // -fx-border-bottom-right-radius not implemented.
-    @Test public void borderStrokeRadius_bottomRight6() {
+    @Disabled("JDK-8091576") // -fx-border-bottom-right-radius not implemented.
+    @Test
+    public void borderStrokeRadius_bottomRight6() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-bottom-right-radius: 5px, 10%;");
@@ -2446,8 +2567,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // -fx-border-bottom-left-radius not implemented.
-    @Test public void borderStrokeRadius_bottomLeft1() {
+    @Disabled("JDK-8091576") // -fx-border-bottom-left-radius not implemented.
+    @Test
+    public void borderStrokeRadius_bottomLeft1() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-bottom-left-radius: 5px;");
@@ -2464,8 +2586,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // -fx-border-bottom-left-radius not implemented.
-    @Test public void borderStrokeRadius_bottomLeft2() {
+    @Disabled("JDK-8091576") // -fx-border-bottom-left-radius not implemented.
+    @Test
+    public void borderStrokeRadius_bottomLeft2() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-bottom-left-radius: 5px, 10px;");
@@ -2491,8 +2614,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // -fx-border-bottom-left-radius not implemented.
-    @Test public void borderStrokeRadius_bottomLeft3() {
+    @Disabled("JDK-8091576") // -fx-border-bottom-left-radius not implemented.
+    @Test
+    public void borderStrokeRadius_bottomLeft3() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-bottom-left-radius: 5%;");
@@ -2518,8 +2642,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // -fx-border-bottom-left-radius not implemented.
-    @Test public void borderStrokeRadius_bottomLeft4() {
+    @Disabled("JDK-8091576") // -fx-border-bottom-left-radius not implemented.
+    @Test
+    public void borderStrokeRadius_bottomLeft4() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-bottom-left-radius: 5%, 10%;");
@@ -2545,8 +2670,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // -fx-border-bottom-left-radius not implemented.
-    @Test public void borderStrokeRadius_bottomLeft5() {
+    @Disabled("JDK-8091576") // -fx-border-bottom-left-radius not implemented.
+    @Test
+    public void borderStrokeRadius_bottomLeft5() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-bottom-left-radius: 5% 10px;");
@@ -2572,8 +2698,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // -fx-border-bottom-left-radius not implemented.
-    @Test public void borderStrokeRadius_bottomLeft6() {
+    @Disabled("JDK-8091576") // -fx-border-bottom-left-radius not implemented.
+    @Test
+    public void borderStrokeRadius_bottomLeft6() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-bottom-left-radius: 5px, 10%;");
@@ -2599,8 +2726,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576")
-    @Test public void borderStrokeRadius_topLeft_topRight() {
+    @Disabled("JDK-8091576")
+    @Test
+    public void borderStrokeRadius_topLeft_topRight() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-top-left-radius: 5px 10%;" +
@@ -2627,7 +2755,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Test public void borderStrokeRadius1() {
+    @Test
+    public void borderStrokeRadius1() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-radius: 5px;");
@@ -2644,7 +2773,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Test public void borderStrokeRadius1_Percent() {
+    @Test
+    public void borderStrokeRadius1_Percent() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-radius: 5%;");
@@ -2661,7 +2791,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Test public void borderStrokeRadius2() {
+    @Test
+    public void borderStrokeRadius2() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-radius: 5px 10px;");
@@ -2678,7 +2809,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Test public void borderStrokeRadius2_Percent() {
+    @Test
+    public void borderStrokeRadius2_Percent() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-radius: 5% 10%;");
@@ -2695,7 +2827,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Test public void borderStrokeRadius3() {
+    @Test
+    public void borderStrokeRadius3() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-radius: 5px 10px 15px;");
@@ -2712,7 +2845,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Test public void borderStrokeRadius3_Percent() {
+    @Test
+    public void borderStrokeRadius3_Percent() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-radius: 5% 10% 15%;");
@@ -2729,7 +2863,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Test public void borderStrokeRadius4() {
+    @Test
+    public void borderStrokeRadius4() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-radius: 5px 10px 15px 20px;");
@@ -2746,7 +2881,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Test public void borderStrokeRadius4_Percent() {
+    @Test
+    public void borderStrokeRadius4_Percent() {
         region.setStyle(
                 "-fx-border-color: black;" +
                 "-fx-border-radius: 5% 10% 15% 20%;");
@@ -2767,7 +2903,8 @@ private static String dump(BackgroundPosition position) {
 
     // http://www.w3.org/TR/css3-background/#the-border-radius
     // Example 23 (except using px here instead of em)
-    @Test public void testBorderRadiusWithHorizontalAndVerticalRadii() {
+    @Test
+    public void testBorderRadiusWithHorizontalAndVerticalRadii() {
 
         region.setStyle("-fx-border-color: black; -fx-border-radius: 2px 1px 4px / 0.5px 3px;");
         processCSS();
@@ -2787,7 +2924,8 @@ private static String dump(BackgroundPosition position) {
 
 
 
-    @Test public void borderStrokeIsTransparent() {
+    @Test
+    public void borderStrokeIsTransparent() {
         region.setStyle(
                 "-fx-border-style: solid;" +
                 "-fx-border-color: transparent;");
@@ -2802,7 +2940,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Test public void borderStrokeIsSpecifiedOnly() {
+    @Test
+    public void borderStrokeIsSpecifiedOnly() {
         region.setStyle(
                 "-fx-border-style: solid;" +
                 "-fx-border-color: red;");
@@ -2817,7 +2956,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Test public void borderStroke2IsSpecifiedOnly() {
+    @Test
+    public void borderStroke2IsSpecifiedOnly() {
         region.setStyle(
                 "-fx-border-style: solid;" +
                 "-fx-border-color: red green;");
@@ -2835,7 +2975,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Test public void borderStroke3IsSpecifiedOnly() {
+    @Test
+    public void borderStroke3IsSpecifiedOnly() {
         region.setStyle(
                 "-fx-border-style: solid;" +
                 "-fx-border-color: red green blue;");
@@ -2853,7 +2994,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Test public void borderStroke4IsSpecifiedOnly() {
+    @Test
+    public void borderStroke4IsSpecifiedOnly() {
         region.setStyle(
                 "-fx-border-style: solid;" +
                 "-fx-border-color: red green blue yellow;");
@@ -2871,8 +3013,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576")
-    @Test public void borderStroke_top_IsSpecifiedOnly() {
+    @Disabled("JDK-8091576")
+    @Test
+    public void borderStroke_top_IsSpecifiedOnly() {
         region.setStyle(
                 "-fx-border-style: solid;" +
                 "-fx-border-top-color: purple;");
@@ -2891,8 +3034,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576")
-    @Test public void borderStroke_right_IsSpecifiedOnly() {
+    @Disabled("JDK-8091576")
+    @Test
+    public void borderStroke_right_IsSpecifiedOnly() {
         region.setStyle(
                 "-fx-border-style: solid;" +
                 "-fx-border-right-color: purple;");
@@ -2911,8 +3055,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // -fx-border-bottom-color is not implemented.
-    @Test public void borderStroke_bottom_IsSpecifiedOnly() {
+    @Disabled("JDK-8091576") // -fx-border-bottom-color is not implemented.
+    @Test
+    public void borderStroke_bottom_IsSpecifiedOnly() {
         region.setStyle(
                 "-fx-border-style: solid;" +
                 "-fx-border-bottom-color: purple;");
@@ -2931,8 +3076,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576") // -fx-border-left-color is not implemented.
-    @Test public void borderStroke_left_IsSpecifiedOnly() {
+    @Disabled("JDK-8091576") // -fx-border-left-color is not implemented.
+    @Test
+    public void borderStroke_left_IsSpecifiedOnly() {
         region.setStyle(
                 "-fx-border-style: solid;" +
                 "-fx-border-left-color: purple;");
@@ -2951,8 +3097,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576")
-    @Test public void borderStroke_top_right_IsSpecifiedOnly() {
+    @Disabled("JDK-8091576")
+    @Test
+    public void borderStroke_top_right_IsSpecifiedOnly() {
         region.setStyle(
                 "-fx-border-style: solid;" +
                 "-fx-border-top-color: red;" +
@@ -2972,8 +3119,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576")
-    @Test public void borderStroke_right_left_IsSpecifiedOnly() {
+    @Disabled("JDK-8091576")
+    @Test
+    public void borderStroke_right_left_IsSpecifiedOnly() {
         region.setStyle(
                 "-fx-border-style: solid;" +
                 "-fx-border-right-color: red;" +
@@ -2993,8 +3141,9 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Ignore("JDK-8091576")
-    @Test public void borderStroke_bottom_top_IsSpecifiedOnly() {
+    @Disabled("JDK-8091576")
+    @Test
+    public void borderStroke_bottom_top_IsSpecifiedOnly() {
         region.setStyle(
                 "-fx-border-style: solid;" +
                 "-fx-border-bottom-color: red;" +
@@ -3014,7 +3163,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Test public void borderRadiusIsSpecifiedOnly() {
+    @Test
+    public void borderRadiusIsSpecifiedOnly() {
         region.setStyle("-fx-border-radius: 1px;");
         processCSS();
 
@@ -3022,7 +3172,8 @@ private static String dump(BackgroundPosition position) {
         assertNull(region.getBorder());
     }
 
-    @Test public void borderWidthIsSpecifiedOnly() {
+    @Test
+    public void borderWidthIsSpecifiedOnly() {
         region.setStyle("-fx-border-width: 1;");
         processCSS();
 
@@ -3030,7 +3181,8 @@ private static String dump(BackgroundPosition position) {
         assertNull(region.getBorder());
     }
 
-    @Test public void testWithExcessBorderWidths() {
+    @Test
+    public void testWithExcessBorderWidths() {
         region.setStyle(
                 "-fx-border-style: solid;" +
                 "-fx-border-color: red;" +
@@ -3049,7 +3201,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, stroke);
     }
 
-    @Test public void testWithExcessBorderRadii() {
+    @Test
+    public void testWithExcessBorderRadii() {
         region.setStyle(
                 "-fx-border-style: solid;" +
                 "-fx-border-color: red;" +
@@ -3074,7 +3227,8 @@ private static String dump(BackgroundPosition position) {
     // the stroke borders (or at least, they can depend on them). As such I might not be
     // able to short-circuit the creation of stroke borders, even if they have no style.
 
-    @Test public void borderImageSourceIsNull() {
+    @Test
+    public void borderImageSourceIsNull() {
         region.setStyle("-fx-border-image-source: null;");
         processCSS();
 
@@ -3083,7 +3237,8 @@ private static String dump(BackgroundPosition position) {
         assertNull(region.getBorder());
     }
 
-    @Test public void borderImageSource() {
+    @Test
+    public void borderImageSource() {
         region.setStyle("-fx-border-image-source: url('test/javafx/scene/layout/center-btn.png')");
         processCSS();
 
@@ -3092,7 +3247,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(1, region.getBorder().getImages().size(), 0);
     }
 
-    @Test public void defaultBorderImageValues() {
+    @Test
+    public void defaultBorderImageValues() {
         region.setStyle("-fx-border-image-source: url('test/javafx/scene/layout/center-btn.png')");
         processCSS();
 
@@ -3109,7 +3265,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void borderImageSlice_1() {
+    @Test
+    public void borderImageSlice_1() {
         region.setStyle(
                 "-fx-border-image-source: url('test/javafx/scene/layout/center-btn.png');" +
                 "-fx-border-image-slice: 1;");
@@ -3128,7 +3285,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void borderImageSlice_1_2() {
+    @Test
+    public void borderImageSlice_1_2() {
         region.setStyle(
                 "-fx-border-image-source: url('test/javafx/scene/layout/center-btn.png');" +
                 "-fx-border-image-slice: 1 2;");
@@ -3147,7 +3305,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void borderImageSlice_1_2_3() {
+    @Test
+    public void borderImageSlice_1_2_3() {
         region.setStyle(
                 "-fx-border-image-source: url('test/javafx/scene/layout/center-btn.png');" +
                 "-fx-border-image-slice: 1 2 3;");
@@ -3166,7 +3325,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void borderImageSlice_1_2_3_4() {
+    @Test
+    public void borderImageSlice_1_2_3_4() {
         region.setStyle(
                 "-fx-border-image-source: url('test/javafx/scene/layout/center-btn.png');" +
                 "-fx-border-image-slice: 1 2 3 4;");
@@ -3185,7 +3345,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void borderImageSlice_1_fill() {
+    @Test
+    public void borderImageSlice_1_fill() {
         region.setStyle(
                 "-fx-border-image-source: url('test/javafx/scene/layout/center-btn.png');" +
                 "-fx-border-image-slice: 1 fill;");
@@ -3204,7 +3365,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void borderImageSlice_1_2_fill() {
+    @Test
+    public void borderImageSlice_1_2_fill() {
         region.setStyle(
                 "-fx-border-image-source: url('test/javafx/scene/layout/center-btn.png');" +
                 "-fx-border-image-slice: 1 2 fill;");
@@ -3223,7 +3385,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void borderImageSlice_1_2_3_fill() {
+    @Test
+    public void borderImageSlice_1_2_3_fill() {
         region.setStyle(
                 "-fx-border-image-source: url('test/javafx/scene/layout/center-btn.png');" +
                 "-fx-border-image-slice: 1 2 3 fill;");
@@ -3242,7 +3405,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void borderImageSlice_1_2_3_4_fill() {
+    @Test
+    public void borderImageSlice_1_2_3_4_fill() {
         region.setStyle(
                 "-fx-border-image-source: url('test/javafx/scene/layout/center-btn.png');" +
                 "-fx-border-image-slice: 1 2 3 4 fill;");
@@ -3261,7 +3425,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void borderImageWidth_1() {
+    @Test
+    public void borderImageWidth_1() {
         region.setStyle(
                 "-fx-border-image-source: url('test/javafx/scene/layout/center-btn.png');" +
                 "-fx-border-image-width: 1;");
@@ -3280,7 +3445,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void borderImageWidth_1_2() {
+    @Test
+    public void borderImageWidth_1_2() {
         region.setStyle(
                 "-fx-border-image-source: url('test/javafx/scene/layout/center-btn.png');" +
                 "-fx-border-image-width: 1 2;");
@@ -3299,7 +3465,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void borderImageWidth_1_2_3() {
+    @Test
+    public void borderImageWidth_1_2_3() {
         region.setStyle(
                 "-fx-border-image-source: url('test/javafx/scene/layout/center-btn.png');" +
                 "-fx-border-image-width: 1 2 3;");
@@ -3318,7 +3485,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void borderImageWidth_1_2_3_4() {
+    @Test
+    public void borderImageWidth_1_2_3_4() {
         region.setStyle(
                 "-fx-border-image-source: url('test/javafx/scene/layout/center-btn.png');" +
                 "-fx-border-image-width: 1 2 3 4;");
@@ -3337,7 +3505,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void borderImageWidth_1_2Percent() {
+    @Test
+    public void borderImageWidth_1_2Percent() {
         region.setStyle(
                 "-fx-border-image-source: url('test/javafx/scene/layout/center-btn.png');" +
                 "-fx-border-image-width: 1 2%;");
@@ -3356,7 +3525,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void borderImageWidth_1Percent_2Percent_3Percent_4Percent() {
+    @Test
+    public void borderImageWidth_1Percent_2Percent_3Percent_4Percent() {
         region.setStyle(
                 "-fx-border-image-source: url('test/javafx/scene/layout/center-btn.png');" +
                 "-fx-border-image-width: 1% 2% 3% 4%;");
@@ -3375,7 +3545,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void borderImageWidth_auto() {
+    @Test
+    public void borderImageWidth_auto() {
         region.setStyle(
                 "-fx-border-image-source: url('test/javafx/scene/layout/center-btn.png');" +
                 "-fx-border-image-width: auto;");
@@ -3396,7 +3567,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void borderImageWidth_1_auto() {
+    @Test
+    public void borderImageWidth_1_auto() {
         region.setStyle(
                 "-fx-border-image-source: url('test/javafx/scene/layout/center-btn.png');" +
                 "-fx-border-image-width: 1 auto;");
@@ -3416,7 +3588,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void borderImageWidth_1_2Percent_auto() {
+    @Test
+    public void borderImageWidth_1_2Percent_auto() {
         region.setStyle(
                 "-fx-border-image-source: url('test/javafx/scene/layout/center-btn.png');" +
                 "-fx-border-image-width: 1 2% auto;");
@@ -3436,7 +3609,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void borderImageOutset_1() {
+    @Test
+    public void borderImageOutset_1() {
         region.setStyle(
                 "-fx-border-image-source: url('test/javafx/scene/layout/center-btn.png');" +
                 "-fx-border-image-insets: 1;");
@@ -3455,7 +3629,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void borderImageOutset_1_2() {
+    @Test
+    public void borderImageOutset_1_2() {
         region.setStyle(
                 "-fx-border-image-source: url('test/javafx/scene/layout/center-btn.png');" +
                 "-fx-border-image-insets: 1 2;");
@@ -3474,7 +3649,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void borderImageOutset_1_2_3() {
+    @Test
+    public void borderImageOutset_1_2_3() {
         region.setStyle(
                 "-fx-border-image-source: url('test/javafx/scene/layout/center-btn.png');" +
                 "-fx-border-image-insets: 1 2 3;");
@@ -3493,7 +3669,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void borderImageOutset_1_2_3_4() {
+    @Test
+    public void borderImageOutset_1_2_3_4() {
         region.setStyle(
                 "-fx-border-image-source: url('test/javafx/scene/layout/center-btn.png');" +
                 "-fx-border-image-insets: 1 2 3 4;");
@@ -3512,7 +3689,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void borderImageRepeat_stretch() {
+    @Test
+    public void borderImageRepeat_stretch() {
         region.setStyle(
                 "-fx-border-image-source: url('test/javafx/scene/layout/center-btn.png');" +
                 "-fx-border-image-repeat: stretch;");
@@ -3531,7 +3709,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void borderImageRepeat_repeat() {
+    @Test
+    public void borderImageRepeat_repeat() {
         region.setStyle(
                 "-fx-border-image-source: url('test/javafx/scene/layout/center-btn.png');" +
                 "-fx-border-image-repeat: repeat;");
@@ -3550,7 +3729,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void borderImageRepeat_round() {
+    @Test
+    public void borderImageRepeat_round() {
         region.setStyle(
                 "-fx-border-image-source: url('test/javafx/scene/layout/center-btn.png');" +
                 "-fx-border-image-repeat: round;");
@@ -3569,7 +3749,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void borderImageRepeat_space() {
+    @Test
+    public void borderImageRepeat_space() {
         region.setStyle(
                 "-fx-border-image-source: url('test/javafx/scene/layout/center-btn.png');" +
                 "-fx-border-image-repeat: space;");
@@ -3588,7 +3769,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void borderImageRepeat_round_stretch() {
+    @Test
+    public void borderImageRepeat_round_stretch() {
         region.setStyle(
                 "-fx-border-image-source: url('test/javafx/scene/layout/center-btn.png');" +
                 "-fx-border-image-repeat: round stretch;");
@@ -3607,7 +3789,8 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Test public void borderImageRepeat_round_repeat() {
+    @Test
+    public void borderImageRepeat_round_repeat() {
         region.setStyle(
                 "-fx-border-image-source: url('test/javafx/scene/layout/center-btn.png');" +
                 "-fx-border-image-repeat: round repeat;");
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/RegionPickTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/RegionPickTest.java
index febe1f56f7b..a59902e0f4b 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/RegionPickTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/RegionPickTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,10 +36,11 @@
 import javafx.scene.layout.Region;
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Circle;
-import org.junit.Before;
-import org.junit.Test;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Tests for Region picking. By default, Region has pickOnBounds set to true, so picking
@@ -70,7 +71,8 @@ public class RegionPickTest {
 
     private Region region;
 
-    @Before public void setup() {
+    @BeforeEach
+    public void setup() {
         region = new Region();
         region.resizeRelocate(X, Y, WIDTH, HEIGHT);
         region.setPickOnBounds(false);
@@ -84,7 +86,8 @@ public class RegionPickTest {
      *                                                                        *
      *************************************************************************/
 
-    @Test public void pickingNormalRegion() {
+    @Test
+    public void pickingNormalRegion() {
         region.setPickOnBounds(true);
         assertFalse(region.contains(LEFT_OF, CENTER_Y));
         assertFalse(region.contains(CENTER_X, ABOVE));
@@ -100,7 +103,8 @@ public class RegionPickTest {
      *                                                                        *
      *************************************************************************/
 
-    @Test public void pickingEmptyRegionDoesNotWork() {
+    @Test
+    public void pickingEmptyRegionDoesNotWork() {
         assertFalse(region.contains(LEFT_OF, CENTER_Y));
         assertFalse(region.contains(CENTER_X, ABOVE));
         assertFalse(region.contains(RIGHT_OF, CENTER_Y));
@@ -115,7 +119,8 @@ public class RegionPickTest {
      *                                                                        *
      *************************************************************************/
 
-    @Test public void pickingRectangularFillWorks() {
+    @Test
+    public void pickingRectangularFillWorks() {
         region.setBackground(new Background(new BackgroundFill(Color.RED, CornerRadii.EMPTY, Insets.EMPTY)));
         assertFalse(region.contains(LEFT_OF, CENTER_Y));
         assertFalse(region.contains(CENTER_X, ABOVE));
@@ -124,7 +129,8 @@ public class RegionPickTest {
         assertTrue(region.contains(CENTER_X, CENTER_Y));
     }
 
-    @Test public void pickingRectangularFillWithInsetsWorks() {
+    @Test
+    public void pickingRectangularFillWithInsetsWorks() {
         // With insets of 10, we ought to not pick inside the region until we get to position 10
         region.setBackground(new Background(new BackgroundFill(Color.RED, CornerRadii.EMPTY, new Insets(10))));
         assertFalse(region.contains(X + 9, CENTER_Y));
@@ -138,7 +144,8 @@ public class RegionPickTest {
         assertTrue(region.contains(CENTER_X, CENTER_Y));
     }
 
-    @Test public void pickingRectangularFillWithUniformRadiusWorks() {
+    @Test
+    public void pickingRectangularFillWithUniformRadiusWorks() {
         region.setBackground(new Background(new BackgroundFill(Color.RED, new CornerRadii(10), Insets.EMPTY)));
         // Check points in the top-left corner area
         assertTrue(region.contains(X, Y + 10));
@@ -168,7 +175,8 @@ public class RegionPickTest {
         assertTrue(region.contains(CENTER_X, CENTER_Y));
     }
 
-    @Test public void pickingRectangularFillWithUniformRadiusWithInsetsWorks() {
+    @Test
+    public void pickingRectangularFillWithUniformRadiusWithInsetsWorks() {
         region.setBackground(new Background(new BackgroundFill(Color.RED, new CornerRadii(10), new Insets(10))));
         // Check points in the top-left corner area
         assertTrue(region.contains(X + 10, Y + 20));
@@ -199,7 +207,8 @@ public class RegionPickTest {
     }
 
     // test with really really large corner radius
-    @Test public void pickingRectangularFillWithUniformVERYLARGERadiusWorks() {
+    @Test
+    public void pickingRectangularFillWithUniformVERYLARGERadiusWorks() {
         region.setBackground(new Background(new BackgroundFill(Color.RED, new CornerRadii(10000000), Insets.EMPTY)));
         // This produces an effective radius of 50 due to my width/height being 100x100
         // Check points in the top-left corner area
@@ -230,7 +239,8 @@ public class RegionPickTest {
         assertTrue(region.contains(CENTER_X, CENTER_Y));
     }
 
-    @Test public void pickingRectangularFillWithIndependentRadiusWorks() {
+    @Test
+    public void pickingRectangularFillWithIndependentRadiusWorks() {
         region.setBackground(new Background(new BackgroundFill(Color.RED, new CornerRadii(1, 2, 3, 4, false),
                                                                Insets.EMPTY)));
         // Check points in the top-left corner area
@@ -261,7 +271,8 @@ public class RegionPickTest {
         assertTrue(region.contains(CENTER_X, CENTER_Y));
     }
 
-    @Test public void pickingRectangularFillWithIndependentRadiusWorks2() {
+    @Test
+    public void pickingRectangularFillWithIndependentRadiusWorks2() {
         region.setBackground(new Background(new BackgroundFill(Color.RED,
             new CornerRadii(1, 2, 3, 4, 5, 6, 7, 8, false, false, false, false, false, false, false, false),
             Insets.EMPTY)));
@@ -293,7 +304,8 @@ public class RegionPickTest {
         assertTrue(region.contains(CENTER_X, CENTER_Y));
     }
 
-    @Test public void pickingRectangularFillWithIndependentRadiusWithInsetsWorks() {
+    @Test
+    public void pickingRectangularFillWithIndependentRadiusWithInsetsWorks() {
         region.setBackground(new Background(new BackgroundFill(Color.RED,
             new CornerRadii(1, 2, 3, 4, 5, 6, 7, 8, false, false, false, false, false, false, false, false),
             new Insets(4, 3, 2, 1))));
@@ -334,7 +346,8 @@ public class RegionPickTest {
      *                                                                        *
      *************************************************************************/
 
-    @Test public void pickingRectangularBorderWorks() {
+    @Test
+    public void pickingRectangularBorderWorks() {
         region.setBorder(new Border(new BorderStroke(Color.GREEN, BorderStrokeStyle.SOLID, CornerRadii.EMPTY,
                                                      new BorderWidths(1))));
         assertFalse(region.contains(LEFT_OF, CENTER_Y));
@@ -345,7 +358,8 @@ public class RegionPickTest {
         assertFalse(region.contains(CENTER_X, CENTER_Y));
     }
 
-    @Test public void pickingRectangularBorderWithThickBorder() {
+    @Test
+    public void pickingRectangularBorderWithThickBorder() {
         region.setBorder(new Border(new BorderStroke(Color.GREEN, BorderStrokeStyle.SOLID, CornerRadii.EMPTY,
                                                      new BorderWidths(10))));
         assertFalse(region.contains(LEFT_OF, CENTER_Y));
@@ -359,7 +373,8 @@ public class RegionPickTest {
         assertFalse(region.contains(X+10, Y+10));
     }
 
-    @Test public void pickingRectangularBorderWithIndependentBorderWidths() {
+    @Test
+    public void pickingRectangularBorderWithIndependentBorderWidths() {
         region.setBorder(new Border(new BorderStroke(Color.GREEN, BorderStrokeStyle.SOLID, CornerRadii.EMPTY,
                                                      new BorderWidths(5, 10, 15, 20))));
         assertFalse(region.contains(LEFT_OF, CENTER_Y));
@@ -389,7 +404,8 @@ public class RegionPickTest {
         assertFalse(region.contains(X + 20, CENTER_Y));
     }
 
-    @Test public void pickingRectangularBorderWithIndependentPercentageBorderWidths() {
+    @Test
+    public void pickingRectangularBorderWithIndependentPercentageBorderWidths() {
         region.setBorder(new Border(new BorderStroke(Color.GREEN, BorderStrokeStyle.SOLID, CornerRadii.EMPTY,
                                                      new BorderWidths(.05, .10, .15, .20, true, true, true, true))));
         assertFalse(region.contains(LEFT_OF, CENTER_Y));
@@ -419,7 +435,8 @@ public class RegionPickTest {
         assertFalse(region.contains(X + 20, CENTER_Y));
     }
 
-    @Test public void pickingRectangularBorderWithIndependentBorderWidthsAndInsets() {
+    @Test
+    public void pickingRectangularBorderWithIndependentBorderWidthsAndInsets() {
         region.setBorder(new Border(new BorderStroke(Color.GREEN, BorderStrokeStyle.SOLID, CornerRadii.EMPTY,
                                                      new BorderWidths(5, 10, 15, 20), new Insets(1, 2, 3, 4))));
         // Top. Test first and last pixels, and one-past
@@ -447,7 +464,8 @@ public class RegionPickTest {
         assertFalse(region.contains(X+4 + 20, CENTER_Y));
     }
 
-    @Test public void pickingRectangularBorderWithIndependentRadiusWithInsetsWorks() {
+    @Test
+    public void pickingRectangularBorderWithIndependentRadiusWithInsetsWorks() {
         region.setBorder(new Border(new BorderStroke(Color.RED, BorderStrokeStyle.SOLID,
             new CornerRadii(1, 2, 3, 4, 5, 6, 7, 8, false, false, false, false, false, false, false, false),
             new BorderWidths(5, 10, 15, 20), new Insets(4, 3, 2, 1))));
@@ -480,7 +498,8 @@ public class RegionPickTest {
         // TODO Could stand to have more tests testing the inside hit edge
     }
 
-    @Test public void pickingRectangularBorderWithIndependentPercentageRadiusWithInsetsWorks() {
+    @Test
+    public void pickingRectangularBorderWithIndependentPercentageRadiusWithInsetsWorks() {
         region.setBorder(new Border(new BorderStroke(Color.RED, BorderStrokeStyle.SOLID,
             new CornerRadii(.01, .02, .03, .04, .05, .06, .07, .08, true, true, true, true, true, true, true, true),
             new BorderWidths(5, 10, 15, 20), new Insets(4, 3, 2, 1))));
@@ -530,7 +549,8 @@ private void setupRegionShapeWith(double finalShapeSize, double insets, double c
     }
 
 
-    @Test public void pickingSimpleShape() {
+    @Test
+    public void pickingSimpleShape() {
         region.setPickOnBounds(false);
         region.setScaleShape(false);
         region.setCenterShape(false);
@@ -552,7 +572,8 @@ private void setupRegionShapeWith(double finalShapeSize, double insets, double c
 
     }
 
-    @Test public void pickingCenteredShape() {
+    @Test
+    public void pickingCenteredShape() {
         region.setPickOnBounds(false);
         region.setScaleShape(false);
         region.setCenterShape(true);
@@ -575,7 +596,8 @@ private void setupRegionShapeWith(double finalShapeSize, double insets, double c
 
     }
 
-    @Test public void pickingScaledShape() {
+    @Test
+    public void pickingScaledShape() {
         region.setPickOnBounds(false);
         region.setScaleShape(true);
         region.setCenterShape(false);
@@ -607,7 +629,8 @@ private void setupRegionShapeWith(double finalShapeSize, double insets, double c
 
     }
 
-    @Test public void pickingScaledAndCenteredShape() {
+    @Test
+    public void pickingScaledAndCenteredShape() {
         region.setPickOnBounds(false);
         region.setScaleShape(true);
         region.setCenterShape(true);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/RegionTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/RegionTest.java
index 8ab4f85be0d..d4c66f78af6 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/RegionTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/RegionTest.java
@@ -57,25 +57,28 @@
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.Region;
 import javafx.scene.layout.RegionShim;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 import test.com.sun.javafx.pgstub.StubToolkit;
 
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
 /**
  *
  */
 public class RegionTest {
 
-    @Test public void testPaddingEmptyByDefault() {
+    @Test
+    public void testPaddingEmptyByDefault() {
         Region region = new Region();
 
         assertEquals(Insets.EMPTY, region.getPadding());
     }
 
-    @Test public void testPaddingCannotBeSetToNull() {
+    @Test
+    public void testPaddingCannotBeSetToNull() {
         Region region = new Region();
 
         try {
@@ -93,37 +96,45 @@ public class RegionTest {
         }
     }
 
-    @Test public void testInsetsEqualsPaddingByDefault() {
+    @Test
+    public void testInsetsEqualsPaddingByDefault() {
         Region region = new Region();
 
         assertEquals(region.getInsets(), region.getPadding());
     }
 
-    @Test public void testBoundedSizeReturnsPrefWhenPrefBetweenMinAndMax() {
+    @Test
+    public void testBoundedSizeReturnsPrefWhenPrefBetweenMinAndMax() {
         assertEquals(200, RegionShim.boundedSize(100, 200, 300), 0);
     }
 
-    @Test public void testBoundedSizeReturnsMinWhenMinGreaterThanPrefButLessThanMax() {
+    @Test
+    public void testBoundedSizeReturnsMinWhenMinGreaterThanPrefButLessThanMax() {
         assertEquals(200, RegionShim.boundedSize(200, 100, 300), 0);
     }
 
-    @Test public void testBoundedSizeReturnsMinWhenMinGreaterThanPrefAndMax() {
+    @Test
+    public void testBoundedSizeReturnsMinWhenMinGreaterThanPrefAndMax() {
         assertEquals(300, RegionShim.boundedSize(300, 100, 200), 0);
     }
 
-    @Test public void testBoundedSizeReturnsMaxWhenMaxLessThanPrefButGreaterThanMin() {
+    @Test
+    public void testBoundedSizeReturnsMaxWhenMaxLessThanPrefButGreaterThanMin() {
         assertEquals(200, RegionShim.boundedSize(100, 300, 200), 0);
     }
 
-    @Test public void testBoundedSizeReturnsMinWhenMaxLessThanPrefAndMin() {
+    @Test
+    public void testBoundedSizeReturnsMinWhenMaxLessThanPrefAndMin() {
         assertEquals(200, RegionShim.boundedSize(200, 300, 100), 0);
     }
 
-    @Test public void testBoundedSizeReturnsMinWhenMaxLessThanPrefAndMinAndPrefLessThanMin() {
+    @Test
+    public void testBoundedSizeReturnsMinWhenMaxLessThanPrefAndMinAndPrefLessThanMin() {
         assertEquals(300, RegionShim.boundedSize(300, 200, 100), 0);
     }
 
-    @Test public void testMinWidthOverride() {
+    @Test
+    public void testMinWidthOverride() {
         Region region = new MockRegion(10,20, 100,200, 500,600);
         assertEquals(10, region.minWidth(-1), 1e-100);
         region.setMinWidth(25.0);
@@ -131,7 +142,8 @@ public class RegionTest {
         assertEquals(25, region.minWidth(-1), 1e-100);
     }
 
-    @Test public void testMinWidthOverrideThenRestoreComputedSize() {
+    @Test
+    public void testMinWidthOverrideThenRestoreComputedSize() {
         Region region = new MockRegion(10,20, 100,200, 500,600);
         region.setMinWidth(75.0);
         region.setMinWidth(Region.USE_COMPUTED_SIZE); // reset
@@ -139,21 +151,24 @@ public class RegionTest {
         assertEquals(10, region.minWidth(-1), 1e-100);
     }
 
-    @Test public void testMinWidthNaNTreatedAsZero() {
+    @Test
+    public void testMinWidthNaNTreatedAsZero() {
         Region region = new Region();
         region.setMinWidth(Double.NaN);
         assertEquals(0, region.minWidth(-1), 0);
         assertEquals(0, region.minWidth(5), 0);
     }
 
-    @Test public void testMinWidthNegativeTreatedAsZero() {
+    @Test
+    public void testMinWidthNegativeTreatedAsZero() {
         Region region = new Region();
         region.setMinWidth(-10);
         assertEquals(0, region.minWidth(-1), 0);
         assertEquals(0, region.minWidth(5), 0);
     }
 
-    @Test public void testMinHeightOverride() {
+    @Test
+    public void testMinHeightOverride() {
         Region region = new MockRegion(10,20, 100,200, 500,600);
         assertEquals(20, region.minHeight(-1), 1e-100);
         region.setMinHeight(30.0);
@@ -161,7 +176,8 @@ public class RegionTest {
         assertEquals(30, region.minHeight(-1), 1e-100);
     }
 
-    @Test public void testMinHeightOverrideThenRestoreComputedSize() {
+    @Test
+    public void testMinHeightOverrideThenRestoreComputedSize() {
         Region region = new MockRegion(10,20, 100,200, 500,600);
         region.setMinHeight(75.0);
         region.setMinHeight(Region.USE_COMPUTED_SIZE); // reset
@@ -169,21 +185,24 @@ public class RegionTest {
         assertEquals(20, region.minHeight(-1), 1e-100);
     }
 
-    @Test public void testMinHeightNaNTreatedAsZero() {
+    @Test
+    public void testMinHeightNaNTreatedAsZero() {
         Region region = new Region();
         region.setMinHeight(Double.NaN);
         assertEquals(0, region.minHeight(-1), 0);
         assertEquals(0, region.minHeight(5), 0);
     }
 
-    @Test public void testMinHeightNegativeTreatedAsZero() {
+    @Test
+    public void testMinHeightNegativeTreatedAsZero() {
         Region region = new Region();
         region.setMinHeight(-10);
         assertEquals(0, region.minHeight(-1), 0);
         assertEquals(0, region.minHeight(5), 0);
     }
 
-    @Test public void testMinWidthOverrideSetToPref() {
+    @Test
+    public void testMinWidthOverrideSetToPref() {
         Region region = new MockRegion(10,20, 100,200, 500,600);
         assertEquals(10, region.minWidth(-1), 1e-100);
         region.setMinWidth(Region.USE_PREF_SIZE);
@@ -191,7 +210,8 @@ public class RegionTest {
         assertEquals(100, region.minWidth(-1), 1e-100);
     }
 
-    @Test public void testMinHeightOverrideSetToPref() {
+    @Test
+    public void testMinHeightOverrideSetToPref() {
         Region region = new MockRegion(10,20, 100,200, 500,600);
         assertEquals(20, region.minHeight(-1), 1e-100);
         region.setMinHeight(Region.USE_PREF_SIZE);
@@ -199,7 +219,8 @@ public class RegionTest {
         assertEquals(200, region.minHeight(-1), 1e-100);
     }
 
-    @Test public void testPrefWidthOverride() {
+    @Test
+    public void testPrefWidthOverride() {
         Region region = new MockRegion(10,20, 100,200, 500,600);
         assertEquals(100, region.prefWidth(-1), 1e-100);
         region.setPrefWidth(150.0);
@@ -207,7 +228,8 @@ public class RegionTest {
         assertEquals(150, region.prefWidth(-1), 1e-100);
     }
 
-    @Test public void testPrefWidthOverrideThenRestoreComputedSize() {
+    @Test
+    public void testPrefWidthOverrideThenRestoreComputedSize() {
         Region region = new MockRegion(10,20, 100,200, 500,600);
         region.setPrefWidth(150.0);
         region.setPrefWidth(Region.USE_COMPUTED_SIZE); // reset
@@ -215,21 +237,24 @@ public class RegionTest {
         assertEquals(100, region.prefWidth(-1), 1e-100);
     }
 
-    @Test public void testPrefWidthNaNTreatedAsZero() {
+    @Test
+    public void testPrefWidthNaNTreatedAsZero() {
         Region region = new Region();
         region.setPrefWidth(Double.NaN);
         assertEquals(0, region.prefWidth(-1), 0);
         assertEquals(0, region.prefWidth(5), 0);
     }
 
-    @Test public void testPrefWidthNegativeTreatedAsZero() {
+    @Test
+    public void testPrefWidthNegativeTreatedAsZero() {
         Region region = new Region();
         region.setPrefWidth(-10);
         assertEquals(0, region.prefWidth(-1), 0);
         assertEquals(0, region.prefWidth(5), 0);
     }
 
-    @Test public void testPrefHeightOverride() {
+    @Test
+    public void testPrefHeightOverride() {
         Region region = new MockRegion(10,20, 100,200, 500,600);
         assertEquals(200, region.prefHeight(-1), 1e-100);
         region.setPrefHeight(300.0);
@@ -237,7 +262,8 @@ public class RegionTest {
         assertEquals(300, region.prefHeight(-1), 1e-100);
     }
 
-    @Test public void testPrefHeightOverrideThenRestoreComputedSize() {
+    @Test
+    public void testPrefHeightOverrideThenRestoreComputedSize() {
         Region region = new MockRegion(10,20, 100,200, 500,600);
         region.setPrefHeight(250);
         region.setPrefHeight(Region.USE_COMPUTED_SIZE); // reset
@@ -245,21 +271,24 @@ public class RegionTest {
         assertEquals(200, region.prefHeight(-1), 1e-100);
     }
 
-    @Test public void testPrefHeightNaNTreatedAsZero() {
+    @Test
+    public void testPrefHeightNaNTreatedAsZero() {
         Region region = new Region();
         region.setPrefHeight(Double.NaN);
         assertEquals(0, region.prefHeight(-1), 0);
         assertEquals(0, region.prefHeight(5), 0);
     }
 
-    @Test public void testPrefHeightNegativeTreatedAsZero() {
+    @Test
+    public void testPrefHeightNegativeTreatedAsZero() {
         Region region = new Region();
         region.setPrefHeight(-10);
         assertEquals(0, region.prefHeight(-1), 0);
         assertEquals(0, region.prefHeight(5), 0);
     }
 
-    @Test public void testMaxWidthOverride() {
+    @Test
+    public void testMaxWidthOverride() {
         Region region = new MockRegion(10,20, 100,200, 500,600);
         assertEquals(500, region.maxWidth(-1), 1e-100);
         region.setMaxWidth(550);
@@ -267,7 +296,8 @@ public class RegionTest {
         assertEquals(550, region.maxWidth(-1), 1e-100);
     }
 
-    @Test public void testMaxWidthOverrideThenRestoreComputedSize() {
+    @Test
+    public void testMaxWidthOverrideThenRestoreComputedSize() {
         Region region = new MockRegion(10,20, 100,200, 500,600);
         region.setMaxWidth(1000);
         region.setMaxWidth(Region.USE_COMPUTED_SIZE); // reset
@@ -275,21 +305,24 @@ public class RegionTest {
         assertEquals(500, region.maxWidth(-1), 1e-100);
     }
 
-    @Test public void testMaxWidthNaNTreatedAsZero() {
+    @Test
+    public void testMaxWidthNaNTreatedAsZero() {
         Region region = new Region();
         region.setMaxWidth(Double.NaN);
         assertEquals(0, region.maxWidth(-1), 0);
         assertEquals(0, region.maxWidth(5), 0);
     }
 
-    @Test public void testMaxWidthNegativeTreatedAsZero() {
+    @Test
+    public void testMaxWidthNegativeTreatedAsZero() {
         Region region = new Region();
         region.setMaxWidth(-10);
         assertEquals(0, region.maxWidth(-1), 0);
         assertEquals(0, region.maxWidth(5), 0);
     }
 
-    @Test public void testMaxHeightOverride() {
+    @Test
+    public void testMaxHeightOverride() {
         Region region = new MockRegion(10,20, 100,200, 500,600);
         assertEquals(600, region.maxHeight(-1), 1e-100);
         region.setMaxHeight(650);
@@ -297,7 +330,8 @@ public class RegionTest {
         assertEquals(650, region.maxHeight(-1), 1e-100);
     }
 
-    @Test public void testMaxHeightOverrideThenRestoreComputedSize() {
+    @Test
+    public void testMaxHeightOverrideThenRestoreComputedSize() {
         Region region = new MockRegion(10,20, 100,200, 500,600);
         region.setMaxHeight(800);
         region.setMaxHeight(Region.USE_COMPUTED_SIZE); // reset
@@ -305,21 +339,24 @@ public class RegionTest {
         assertEquals(600, region.maxHeight(-1), 1e-100);
     }
 
-    @Test public void testMaxHeightNaNTreatedAsZero() {
+    @Test
+    public void testMaxHeightNaNTreatedAsZero() {
         Region region = new Region();
         region.setMaxHeight(Double.NaN);
         assertEquals(0, region.maxHeight(-1), 0);
         assertEquals(0, region.maxHeight(5), 0);
     }
 
-    @Test public void testMaxHeightNegativeTreatedAsZero() {
+    @Test
+    public void testMaxHeightNegativeTreatedAsZero() {
         Region region = new Region();
         region.setMaxHeight(-10);
         assertEquals(0, region.maxHeight(-1), 0);
         assertEquals(0, region.maxHeight(5), 0);
     }
 
-    @Test public void testMaxWidthOverrideSetToPref() {
+    @Test
+    public void testMaxWidthOverrideSetToPref() {
         Region region = new MockRegion(10,20, 100,200, 500,600);
         assertEquals(500, region.maxWidth(-1), 1e-100);
         region.setMaxWidth(Region.USE_PREF_SIZE);
@@ -327,7 +364,8 @@ public class RegionTest {
         assertEquals(100, region.maxWidth(-1), 1e-100);
     }
 
-    @Test public void testMaxHeightOverrideSetToPref() {
+    @Test
+    public void testMaxHeightOverrideSetToPref() {
         Region region = new MockRegion(10,20, 100,200, 500,600);
         assertEquals(600, region.maxHeight(-1), 1e-100);
         region.setMaxHeight(Region.USE_PREF_SIZE);
@@ -335,7 +373,8 @@ public class RegionTest {
         assertEquals(200, region.maxHeight(-1), 1e-100);
     }
 
-    @Test public void testPositionInAreaForResizableForResizableTopLeft() {
+    @Test
+    public void testPositionInAreaForResizableForResizableTopLeft() {
         Pane pane = new Pane(); // Region extension which makes children sequence public
 
         MockResizable child = new MockResizable(10,20, 30,40, 50,60);
@@ -350,7 +389,8 @@ public class RegionTest {
         assertEquals(10, child.getLayoutY(), 1e-100);
     }
 
-    @Test public void testPositionInAreaForResizableTopCenter() {
+    @Test
+    public void testPositionInAreaForResizableTopCenter() {
         Pane pane = new Pane(); // Region extension which makes children sequence public
 
         MockResizable child = new MockResizable(10,20, 30,40, 50,60);
@@ -365,7 +405,8 @@ public class RegionTest {
         assertEquals(10, child.getLayoutY(), 1e-100);
     }
 
-    @Test public void testPositionInAreaForResizableTopRight() {
+    @Test
+    public void testPositionInAreaForResizableTopRight() {
         Pane pane = new Pane(); // Region extension which makes children sequence public
 
         MockResizable child = new MockResizable(10,20, 30,40, 50,60);
@@ -380,7 +421,8 @@ public class RegionTest {
         assertEquals(10, child.getLayoutY(), 1e-100);
     }
 
-    @Test public void testPositionInAreaForResizableCenterLeft() {
+    @Test
+    public void testPositionInAreaForResizableCenterLeft() {
         Pane pane = new Pane(); // Region extension which makes children sequence public
 
         MockResizable child = new MockResizable(10,20, 30,40, 50,60);
@@ -396,7 +438,8 @@ public class RegionTest {
     }
 
 //    // See RT-19282
-//    @Test public void testPositionInAreaForNONResizableCenterLeft() {
+//    @Test
+//    public void testPositionInAreaForNONResizableCenterLeft() {
 //        Pane pane = new Pane(); // Region extension which makes children sequence public
 //
 //        Rectangle child = new Rectangle(50.4, 50.4);
@@ -409,7 +452,8 @@ public class RegionTest {
 //    }
 
 
-    @Test public void testPositionInAreaForResizableCenter() {
+    @Test
+    public void testPositionInAreaForResizableCenter() {
         Pane pane = new Pane(); // Region extension which makes children sequence public
 
         MockResizable child = new MockResizable(10,20, 30,40, 50,60);
@@ -425,7 +469,8 @@ public class RegionTest {
     }
 
 //    // See RT-19282
-//    @Test public void testPositionInAreaForNONResizableCenter() {
+//    @Test
+//    public void testPositionInAreaForNONResizableCenter() {
 //        Pane pane = new Pane(); // Region extension which makes children sequence public
 //
 //        Rectangle child = new Rectangle(50.4, 50.4);
@@ -437,7 +482,8 @@ public class RegionTest {
 //        assertEquals(34.8, child.getLayoutY(), .01);
 //    }
 
-    @Test public void testPositionInAreaForResizableCenterRight() {
+    @Test
+    public void testPositionInAreaForResizableCenterRight() {
         Pane pane = new Pane(); // Region extension which makes children sequence public
 
         MockResizable child = new MockResizable(10,20, 30,40, 50,60);
@@ -452,7 +498,8 @@ public class RegionTest {
         assertEquals(40, child.getLayoutY(), 1e-100);
     }
 
-    @Test public void testPositionInAreaForResizableBottomLeft() {
+    @Test
+    public void testPositionInAreaForResizableBottomLeft() {
         Pane pane = new Pane(); // Region extension which makes children sequence public
 
         MockResizable child = new MockResizable(10,20, 30,40, 50,60);
@@ -468,7 +515,8 @@ public class RegionTest {
     }
 
 //    // See RT-19282
-//    @Test public void testPositionInAreaForNONResizableBottomLeft() {
+//    @Test
+//    public void testPositionInAreaForNONResizableBottomLeft() {
 //        Pane pane = new Pane(); // Region extension which makes children sequence public
 //
 //        Rectangle child = new Rectangle(50.4, 50.4);
@@ -480,7 +528,8 @@ public class RegionTest {
 //        assertEquals(59.6, child.getLayoutY(), .01);
 //    }
 
-    @Test public void testPositionInAreaForResizableBottomCenter() {
+    @Test
+    public void testPositionInAreaForResizableBottomCenter() {
         Pane pane = new Pane(); // Region extension which makes children sequence public
 
         MockResizable child = new MockResizable(10,20, 30,40, 50,60);
@@ -496,7 +545,8 @@ public class RegionTest {
     }
 
 //    // See RT-19282
-//    @Test public void testPositionInAreaForNONResizableBottomCenter() {
+//    @Test
+//    public void testPositionInAreaForNONResizableBottomCenter() {
 //        Pane pane = new Pane(); // Region extension which makes children sequence public
 //
 //        Rectangle child = new Rectangle(50.4, 50.4);
@@ -508,7 +558,8 @@ public class RegionTest {
 //        assertEquals(59.6, child.getLayoutY(), .01);
 //    }
 
-    @Test public void testPositionInAreaForResizableBottomRight() {
+    @Test
+    public void testPositionInAreaForResizableBottomRight() {
         Pane pane = new Pane(); // Region extension which makes children sequence public
 
         MockResizable child = new MockResizable(10,20, 30,40, 50,60);
@@ -524,7 +575,8 @@ public class RegionTest {
     }
 
 //    // See RT-19282
-//    @Test public void testPositionInAreaForNONResizableBottomRight() {
+//    @Test
+//    public void testPositionInAreaForNONResizableBottomRight() {
 //        Pane pane = new Pane(); // Region extension which makes children sequence public
 //
 //        Rectangle child = new Rectangle(50.4, 50.4);
@@ -536,7 +588,8 @@ public class RegionTest {
 //        assertEquals(59.6, child.getLayoutY(), .01);
 //    }
 
-    @Test public void testPositionInAreaForResizableBaselineLeft() {
+    @Test
+    public void testPositionInAreaForResizableBaselineLeft() {
         Pane pane = new Pane(); // Region extension which makes children sequence public
 
         MockResizable child = new MockResizable(10,20, 30,40, 50,60); //baseline = 30
@@ -552,7 +605,8 @@ public class RegionTest {
     }
 
 //    // See RT-19282
-//    @Test public void testPositionInAreaForNONResizableBaselineLeft() {
+//    @Test
+//    public void testPositionInAreaForNONResizableBaselineLeft() {
 //        Pane pane = new Pane(); // Region extension which makes children sequence public
 //
 //        Rectangle child = new Rectangle(50.4, 50.4);
@@ -564,7 +618,8 @@ public class RegionTest {
 //        assertEquals(19.6, child.getLayoutY(), .01);
 //    }
 
-    @Test public void testPositionInAreaForResizableBaselineCenter() {
+    @Test
+    public void testPositionInAreaForResizableBaselineCenter() {
         Pane pane = new Pane(); // Region extension which makes children sequence public
 
         MockResizable child = new MockResizable(10,20, 30,40, 50,60); //baseline = 30
@@ -580,7 +635,8 @@ public class RegionTest {
     }
 
 //    // See RT-19282
-//    @Test public void testPositionInAreaForNONResizableBaselineCenter() {
+//    @Test
+//    public void testPositionInAreaForNONResizableBaselineCenter() {
 //        Pane pane = new Pane(); // Region extension which makes children sequence public
 //
 //        Rectangle child = new Rectangle(50.4, 50.4);
@@ -592,7 +648,8 @@ public class RegionTest {
 //        assertEquals(19.6, child.getLayoutY(), .01);
 //    }
 
-    @Test public void testPositionInAreaForResizableBaselineRight() {
+    @Test
+    public void testPositionInAreaForResizableBaselineRight() {
         Pane pane = new Pane(); // Region extension which makes children sequence public
 
         MockResizable child = new MockResizable(10,20, 30,40, 50,60); //baseline = 30
@@ -608,7 +665,8 @@ public class RegionTest {
     }
 
 //    // See RT-19282
-//    @Test public void testPositionInAreaForNONResizableBaselineRight() {
+//    @Test
+//    public void testPositionInAreaForNONResizableBaselineRight() {
 //        Pane pane = new Pane(); // Region extension which makes children sequence public
 //
 //        Rectangle child = new Rectangle(50.4, 50.4);
@@ -620,7 +678,8 @@ public class RegionTest {
 //        assertEquals(19.6, child.getLayoutY(), .01);
 //    }
 
-    @Test public void testLayoutInAreaWithLargerMax() {
+    @Test
+    public void testLayoutInAreaWithLargerMax() {
         Pane pane = new Pane(); // Region extension which makes children sequence public
 
         MockResizable child = new MockResizable(10,20, 30,40, 300,300);
@@ -635,7 +694,8 @@ public class RegionTest {
 
     }
 
-    @Test public void testLayoutInAreaWithSmallerMax() {
+    @Test
+    public void testLayoutInAreaWithSmallerMax() {
         Pane pane = new Pane(); // Region extension which makes children sequence public
 
         MockResizable child = new MockResizable(10,20, 30,40, 50,60);
@@ -650,7 +710,8 @@ public class RegionTest {
 
     }
 
-    @Test public void testLayoutInAreaWithLargerMin() {
+    @Test
+    public void testLayoutInAreaWithLargerMin() {
         Pane pane = new Pane(); // Region extension which makes children sequence public
 
         MockResizable child = new MockResizable(10,20, 30,40, 50,60);
@@ -665,7 +726,8 @@ public class RegionTest {
 
     }
 
-    @Test public void testLayoutInAreaWithSizeOverrides() {
+    @Test
+    public void testLayoutInAreaWithSizeOverrides() {
         Pane pane = new Pane(); // Region extension which makes children sequence public
 
         MockRegion child = new MockRegion(10,20, 30,40, 50,60);
@@ -683,7 +745,8 @@ public class RegionTest {
 
     }
 
-    @Test public void testLayoutInAreaWithMaxConstrainedToPref() {
+    @Test
+    public void testLayoutInAreaWithMaxConstrainedToPref() {
         Pane pane = new Pane(); // Region extension which makes children sequence public
 
         MockRegion child = new MockRegion(10,20, 30,40, 500,500);
@@ -701,7 +764,8 @@ public class RegionTest {
 
     }
 
-    @Test public void testLayoutInAreaHonorsMaxWidthOverPref() {
+    @Test
+    public void testLayoutInAreaHonorsMaxWidthOverPref() {
         Pane pane = new Pane(); // Region extension which makes children sequence public
 
         MockRegion child = new MockRegion(10,20, 200,300, 500,500);
@@ -717,7 +781,8 @@ public class RegionTest {
 
     }
 
-    @Test public void testLayoutInAreaHonorsMaxHeightOverPref() {
+    @Test
+    public void testLayoutInAreaHonorsMaxHeightOverPref() {
         Pane pane = new Pane(); // Region extension which makes children sequence public
 
         MockRegion child = new MockRegion(10,20, 200,300, 500,500);
@@ -733,7 +798,8 @@ public class RegionTest {
 
     }
 
-    @Test public void testLayoutInAreaHonorsMinWidthOverPref() {
+    @Test
+    public void testLayoutInAreaHonorsMinWidthOverPref() {
         Pane pane = new Pane(); // Region extension which makes children sequence public
 
         MockRegion child = new MockRegion(10,20, 200,300, 500,500);
@@ -748,7 +814,8 @@ public class RegionTest {
         assertEquals(10, child.getLayoutY(), 1e-100);
     }
 
-    @Test public void testLayoutInAreaHonorsMinHeightOverPref() {
+    @Test
+    public void testLayoutInAreaHonorsMinHeightOverPref() {
         Pane pane = new Pane(); // Region extension which makes children sequence public
 
         MockRegion child = new MockRegion(10,20, 200,300, 500,500);
@@ -763,7 +830,8 @@ public class RegionTest {
         assertEquals(-40, child.getLayoutY(), 1e-100);
     }
 
-    @Test public void testLayoutInAreaHonorsMinWidthOverMax() {
+    @Test
+    public void testLayoutInAreaHonorsMinWidthOverMax() {
         Pane pane = new Pane(); // Region extension which makes children sequence public
 
         MockRegion child = new MockRegion(10,20, 200,300, 500,500);
@@ -778,7 +846,8 @@ public class RegionTest {
         assertEquals(10, child.getLayoutY(), 1e-100);
     }
 
-    @Test public void testLayoutInAreaHonorsMinHeightOverMax() {
+    @Test
+    public void testLayoutInAreaHonorsMinHeightOverMax() {
         Pane pane = new Pane(); // Region extension which makes children sequence public
 
         MockRegion child = new MockRegion(10,20, 200,300, 500,500);
@@ -793,7 +862,8 @@ public class RegionTest {
         assertEquals(-140, child.getLayoutY(), 1e-100);
     }
 
-    @Test public void testLayoutInAreaHonorsAreaWidthOverPrefWithFillWidth() {
+    @Test
+    public void testLayoutInAreaHonorsAreaWidthOverPrefWithFillWidth() {
         Pane pane = new Pane(); // Region extension which makes children sequence public
 
         MockRegion child = new MockRegion(10,20, 200,300, 500,500);
@@ -807,7 +877,8 @@ public class RegionTest {
         assertEquals(10, child.getLayoutY(), 1e-100);
     }
 
-    @Test public void testLayoutInAreaHonorsAreaHeightOverPrefWithFillHeight() {
+    @Test
+    public void testLayoutInAreaHonorsAreaHeightOverPrefWithFillHeight() {
         Pane pane = new Pane(); // Region extension which makes children sequence public
 
         MockRegion child = new MockRegion(10,20, 200,300, 500,500);
@@ -821,7 +892,8 @@ public class RegionTest {
         assertEquals(10, child.getLayoutY(), 1e-100);
     }
 
-    @Test public void testLayoutInAreaHonorsAreaWidthOverPrefWithNOFill() {
+    @Test
+    public void testLayoutInAreaHonorsAreaWidthOverPrefWithNOFill() {
         Pane pane = new Pane(); // Region extension which makes children sequence public
 
         MockRegion child = new MockRegion(10,20, 200,300, 500,500);
@@ -835,7 +907,8 @@ public class RegionTest {
         assertEquals(60, child.getLayoutY(), 1e-100);
     }
 
-    @Test public void testLayoutInAreaHonorsAreaHeightOverPrefWithNOFill() {
+    @Test
+    public void testLayoutInAreaHonorsAreaHeightOverPrefWithNOFill() {
         Pane pane = new Pane(); // Region extension which makes children sequence public
 
         MockRegion child = new MockRegion(10,20, 200,300, 500,500);
@@ -849,7 +922,8 @@ public class RegionTest {
         assertEquals(10, child.getLayoutY(), 1e-100);
     }
 
-    @Test public void testLayoutInAreaWithBaselineOffset() {
+    @Test
+    public void testLayoutInAreaWithBaselineOffset() {
         Pane pane = new Pane(); // Region extension which makes children sequence public
 
         Region c1 = new MockBiased(Orientation.HORIZONTAL, 100, 100);
@@ -868,7 +942,8 @@ public class RegionTest {
         assertEquals(20, c3.getHeight(), 1e-100);
     }
 
-    @Test public void testComputeChildPrefAreaWidthHonorsMaxWidthOverPref() {
+    @Test
+    public void testComputeChildPrefAreaWidthHonorsMaxWidthOverPref() {
         Pane pane = new Pane(); // Region extension which makes children sequence public
 
         MockRegion child = new MockRegion(10,20, 200,300, 500,500);
@@ -878,7 +953,8 @@ public class RegionTest {
         assertEquals(100, RegionShim.computeChildPrefAreaWidth(pane, child, Insets.EMPTY), 1e-100);
     }
 
-    @Test public void testComputeChildPrefAreaHeightHonorsMaxWidthOverPref() {
+    @Test
+    public void testComputeChildPrefAreaHeightHonorsMaxWidthOverPref() {
         Pane pane = new Pane(); // Region extension which makes children sequence public
 
         MockRegion child = new MockRegion(10,20, 200,300, 500,500);
@@ -888,7 +964,8 @@ public class RegionTest {
         assertEquals(100, RegionShim.computeChildPrefAreaHeight(pane, child, Insets.EMPTY), 1e-100);
     }
 
-    @Test public void testComputeChildPrefAreaWidthHonorsMinWidthOverPref() {
+    @Test
+    public void testComputeChildPrefAreaWidthHonorsMinWidthOverPref() {
         Pane pane = new Pane(); // Region extension which makes children sequence public
 
         MockRegion child = new MockRegion(10,20, 200,300, 500,500);
@@ -898,7 +975,8 @@ public class RegionTest {
         assertEquals(400, RegionShim.computeChildPrefAreaWidth(pane, child, Insets.EMPTY), 1e-100);
     }
 
-    @Test public void testComputeChildPrefAreaHeightHonorsMinWidthOverPref() {
+    @Test
+    public void testComputeChildPrefAreaHeightHonorsMinWidthOverPref() {
         Pane pane = new Pane(); // Region extension which makes children sequence public
 
         MockRegion child = new MockRegion(10,20, 200,300, 500,500);
@@ -908,7 +986,8 @@ public class RegionTest {
         assertEquals(400, RegionShim.computeChildPrefAreaHeight(pane, child, Insets.EMPTY), 1e-100);
     }
 
-    @Test public void testComputeChildPrefAreaWidthHonorsMinWidthOverMax() {
+    @Test
+    public void testComputeChildPrefAreaWidthHonorsMinWidthOverMax() {
         Pane pane = new Pane(); // Region extension which makes children sequence public
 
         MockRegion child = new MockRegion(10,20, 200,300, 500,500);
@@ -918,7 +997,8 @@ public class RegionTest {
         assertEquals(600, RegionShim.computeChildPrefAreaWidth(pane, child, Insets.EMPTY), 1e-100);
     }
 
-    @Test public void testComputeChildPrefAreaHeightHonorsMinWidthOverMax() {
+    @Test
+    public void testComputeChildPrefAreaHeightHonorsMinWidthOverMax() {
         Pane pane = new Pane(); // Region extension which makes children sequence public
 
         MockRegion child = new MockRegion(10,20, 200,300, 500,500);
@@ -928,7 +1008,8 @@ public class RegionTest {
         assertEquals(600, RegionShim.computeChildPrefAreaHeight(pane, child, Insets.EMPTY), 1e-100);
     }
 
-    @Test public void testChildMinAreaWidth() {
+    @Test
+    public void testChildMinAreaWidth() {
         Pane pane = new Pane();
 
         Region c1 = new MockBiased(Orientation.HORIZONTAL, 100, 100);
@@ -947,7 +1028,8 @@ public class RegionTest {
 
     }
 
-    @Test public void testChildMinAreaHeight() {
+    @Test
+    public void testChildMinAreaHeight() {
         Pane pane = new Pane();
 
         Region c1 = new MockBiased(Orientation.HORIZONTAL, 100, 100);
@@ -965,7 +1047,8 @@ public class RegionTest {
         assertEquals(12, RegionShim.computeChildMinAreaHeight(pane, c3, -1, new Insets(1), 50), 1e-100);
     }
 
-    @Test public void testChildMaxAreaWidth() {
+    @Test
+    public void testChildMaxAreaWidth() {
         Pane pane = new Pane();
 
         Region c1 = new MockBiased(Orientation.HORIZONTAL, 100, 100);
@@ -983,7 +1066,8 @@ public class RegionTest {
         assertEquals(1002, RegionShim.computeChildMaxAreaWidth(pane,c3, -1, new Insets(1), 50, false), 1e-100);
     }
 
-    @Test public void testChildMaxAreaHeight() {
+    @Test
+    public void testChildMaxAreaHeight() {
         Pane pane = new Pane();
 
         Region c1 = new MockBiased(Orientation.HORIZONTAL, 100, 100);
@@ -1014,7 +1098,8 @@ public class RegionTest {
      *                                                                        *
      *************************************************************************/
 
-    @Test public void testBackgroundLoadedBackgroundImageHasListenerInstalled() {
+    @Test
+    public void testBackgroundLoadedBackgroundImageHasListenerInstalled() {
         final ImageForTesting image = new ImageForTesting("http://something.png", true);
         assertTrue(image.getProgress() < 1);
 
@@ -1027,7 +1112,8 @@ public class RegionTest {
         ((StubToolkit) Toolkit.getToolkit()).getImageLoaderFactory().getLastAsyncImageLoader().finish();
     }
 
-    @Test public void testBackgroundLoadedBackgroundImageStillLoadingButRemovedFromRegionHasListenerRemoved() {
+    @Test
+    public void testBackgroundLoadedBackgroundImageStillLoadingButRemovedFromRegionHasListenerRemoved() {
         final ImageForTesting image = new ImageForTesting("http://something.png", true);
         assertTrue(image.getProgress() < 1);
 
@@ -1041,7 +1127,8 @@ public class RegionTest {
         ((StubToolkit) Toolkit.getToolkit()).getImageLoaderFactory().getLastAsyncImageLoader().finish();
     }
 
-    @Test public void testBackgroundLoadedBackgroundImageWhichFinishesLoadingHasListenerRemoved() {
+    @Test
+    public void testBackgroundLoadedBackgroundImageWhichFinishesLoadingHasListenerRemoved() {
         final ImageForTesting image = new ImageForTesting("http://something.png", true);
         assertTrue(image.getProgress() < 1);
 
@@ -1056,7 +1143,8 @@ public class RegionTest {
         ((StubToolkit) Toolkit.getToolkit()).getImageLoaderFactory().getLastAsyncImageLoader().finish();
     }
 
-    @Test public void testBackgroundLoadedBackgroundImageWhichFinishesLoadingCausesRepaint() {
+    @Test
+    public void testBackgroundLoadedBackgroundImageWhichFinishesLoadingCausesRepaint() {
         final ImageForTesting image = new ImageForTesting("http://something.png", true);
         assertTrue(image.getProgress() < 1);
 
@@ -1073,7 +1161,8 @@ public class RegionTest {
         ((StubToolkit) Toolkit.getToolkit()).getImageLoaderFactory().getLastAsyncImageLoader().finish();
     }
 
-    @Test public void testBackgroundLoadedBorderImageHasListenerInstalled() {
+    @Test
+    public void testBackgroundLoadedBorderImageHasListenerInstalled() {
         final ImageForTesting image = new ImageForTesting("http://something.png", true);
         assertTrue(image.getProgress() < 1);
 
@@ -1086,7 +1175,8 @@ public class RegionTest {
         ((StubToolkit) Toolkit.getToolkit()).getImageLoaderFactory().getLastAsyncImageLoader().finish();
     }
 
-    @Test public void testBackgroundLoadedBorderImageStillLoadingButRemovedFromRegionHasListenerRemoved() {
+    @Test
+    public void testBackgroundLoadedBorderImageStillLoadingButRemovedFromRegionHasListenerRemoved() {
         final ImageForTesting image = new ImageForTesting("http://something.png", true);
         assertTrue(image.getProgress() < 1);
 
@@ -1100,7 +1190,8 @@ public class RegionTest {
         ((StubToolkit) Toolkit.getToolkit()).getImageLoaderFactory().getLastAsyncImageLoader().finish();
     }
 
-    @Test public void testBackgroundLoadedBorderImageWhichFinishesLoadingHasListenerRemoved() {
+    @Test
+    public void testBackgroundLoadedBorderImageWhichFinishesLoadingHasListenerRemoved() {
         final ImageForTesting image = new ImageForTesting("http://something.png", true);
         assertTrue(image.getProgress() < 1);
 
@@ -1115,7 +1206,8 @@ public class RegionTest {
         ((StubToolkit) Toolkit.getToolkit()).getImageLoaderFactory().getLastAsyncImageLoader().cancel();
     }
 
-    @Test public void testBackgroundLoadedBorderImageWhichFinishesLoadingCausesRepaint() {
+    @Test
+    public void testBackgroundLoadedBorderImageWhichFinishesLoadingCausesRepaint() {
         final ImageForTesting image = new ImageForTesting("http://something.png", true);
         assertTrue(image.getProgress() < 1);
 
@@ -1132,7 +1224,8 @@ public class RegionTest {
         ((StubToolkit) Toolkit.getToolkit()).getImageLoaderFactory().getLastAsyncImageLoader().cancel();
     }
 
-    @Test public void testAnimatedBackgroundImageHasListenerInstalled() {
+    @Test
+    public void testAnimatedBackgroundImageHasListenerInstalled() {
         final WritableImage image = new WritableImage(10, 10);
         ImageRegion r = new ImageRegion();
         final Background background = new Background(new BackgroundImage(image, null, null, null, null));
@@ -1140,7 +1233,8 @@ public class RegionTest {
         assertTrue(r.listenerAdded.get());
     }
 
-    @Test public void testAnimatedBackgroundImageRemovedFromRegionHasListenerRemoved() {
+    @Test
+    public void testAnimatedBackgroundImageRemovedFromRegionHasListenerRemoved() {
         final WritableImage image = new WritableImage(10, 10);
         ImageRegion r = new ImageRegion();
         final Background background = new Background(new BackgroundImage(image, null, null, null, null));
@@ -1149,7 +1243,8 @@ public class RegionTest {
         assertFalse(r.listenerAdded.get());
     }
 
-    @Test public void testAnimatedBackgroundImageCausesRepaintWhenAnimationChanges() {
+    @Test
+    public void testAnimatedBackgroundImageCausesRepaintWhenAnimationChanges() {
         final WritableImage image = new WritableImage(10, 10);
         ImageRegion r = new ImageRegion();
         final Background background = new Background(new BackgroundImage(image, null, null, null, null));
@@ -1160,7 +1255,8 @@ public class RegionTest {
         assertTrue(r.willBeRepainted());
     }
 
-    @Test public void testAnimatedBorderImageHasListenerInstalled() {
+    @Test
+    public void testAnimatedBorderImageHasListenerInstalled() {
         final WritableImage image = new WritableImage(10, 10);
         ImageRegion r = new ImageRegion();
         final Border border = new Border(new BorderImage(image, null, null, null, false, null, null));
@@ -1168,7 +1264,8 @@ public class RegionTest {
         assertTrue(r.listenerAdded.get());
     }
 
-    @Test public void testAnimatedBorderImageRemovedFromRegionHasListenerRemoved() {
+    @Test
+    public void testAnimatedBorderImageRemovedFromRegionHasListenerRemoved() {
         final WritableImage image = new WritableImage(10, 10);
         ImageRegion r = new ImageRegion();
         final Border border = new Border(new BorderImage(image, null, null, null, false, null, null));
@@ -1177,7 +1274,8 @@ public class RegionTest {
         assertFalse(r.listenerAdded.get());
     }
 
-    @Test public void testAnimatedBorderImageCausesRepaintWhenAnimationChanges() {
+    @Test
+    public void testAnimatedBorderImageCausesRepaintWhenAnimationChanges() {
         final WritableImage image = new WritableImage(10, 10);
         ImageRegion r = new ImageRegion();
         final Border border = new Border(new BorderImage(image, null, null, null, false, null, null));
@@ -1188,7 +1286,8 @@ public class RegionTest {
         assertTrue(r.willBeRepainted());
     }
 
-    @Test public void testBorderChangeUpdatesTheInsets() {
+    @Test
+    public void testBorderChangeUpdatesTheInsets() {
         Region r = new Region();
 
         r.setBorder(new Border(new BorderStroke(Color.BLACK, BorderStrokeStyle.SOLID, null, BorderWidths.DEFAULT, new Insets(10))));
@@ -1222,7 +1321,8 @@ public void clearDirty() {
     }
 
     // Test for RT-13820
-    @Test public void changingShapeElementsShouldResultInRender() {
+    @Test
+    public void changingShapeElementsShouldResultInRender() {
         Region r = new Region();
         r.setPrefWidth(640);
         r.setPrefHeight(480);
@@ -1335,7 +1435,7 @@ public void snappingASnappedValueGivesTheSameValueTest() {
                 double value = random.nextDouble() * Integer.MAX_VALUE;
                 double snappedValue = region.snapSizeX(value);
                 double snapOfSnappedValue = region.snapSizeX(snappedValue);
-                assertEquals(failMessage, snappedValue, snapOfSnappedValue, 0.0);
+                assertEquals(snappedValue, snapOfSnappedValue, 0.0, failMessage);
             }
         }
 
@@ -1345,7 +1445,7 @@ public void snappingASnappedValueGivesTheSameValueTest() {
                 double value = random.nextDouble() * Integer.MAX_VALUE;
                 double snappedValue = region.snapSizeY(value);
                 double snapOfSnappedValue = region.snapSizeY(snappedValue);
-                assertEquals(failMessage, snappedValue, snapOfSnappedValue, 0.0);
+                assertEquals(snappedValue, snapOfSnappedValue, 0.0, failMessage);
             }
         }
 
@@ -1357,7 +1457,7 @@ public void snappingASnappedValueGivesTheSameValueTest() {
                 double value = random.nextDouble() * Integer.MAX_VALUE;
                 double snappedValue = RegionShim.snapPortionX(region, value);
                 double snapOfSnappedValue = RegionShim.snapPortionX(region, snappedValue);
-                assertEquals(failMessage, snappedValue, snapOfSnappedValue, 0.0);
+                assertEquals(snappedValue, snapOfSnappedValue, 0.0, failMessage);
             }
         }
 
@@ -1367,7 +1467,7 @@ public void snappingASnappedValueGivesTheSameValueTest() {
                 double value = random.nextDouble() * Integer.MAX_VALUE;
                 double snappedValue = RegionShim.snapPortionY(region, value);
                 double snapOfSnappedValue = RegionShim.snapPortionY(region, snappedValue);
-                assertEquals(failMessage, snappedValue, snapOfSnappedValue, 0.0);
+                assertEquals(snappedValue, snapOfSnappedValue, 0.0, failMessage);
             }
         }
     }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/ResizabilityTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/ResizabilityTest.java
index 4decfef20b6..914727ddc5a 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/ResizabilityTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/ResizabilityTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,6 @@
 
 package test.javafx.scene.layout;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 import javafx.geometry.Insets;
 import javafx.scene.Group;
 import javafx.scene.Node;
@@ -38,7 +35,10 @@
 import javafx.scene.shape.Rectangle;
 import javafx.scene.text.Text;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 /**
  * Tests resizability apis of Node and key subclasses.
  *
@@ -47,79 +47,92 @@ public class ResizabilityTest {
 
     // test isResizable on key base classes
 
-    @Test public void testNodeNotResizable() {
+    @Test
+    public void testNodeNotResizable() {
         Node node = new MockNode();
         assertFalse(node.isResizable());
     }
 
-    @Test public void testShapeNotResizable() {
+    @Test
+    public void testShapeNotResizable() {
         Rectangle rect = new Rectangle();
         assertFalse(rect.isResizable());
     }
 
-    @Test public void testTextNotResizable() {
+    @Test
+    public void testTextNotResizable() {
         Text text = new Text();
         assertFalse(text.isResizable());
     }
 
 // consider making ImageView resizable!
-//    @Test public void testImageViewNotResizable() {
+//    @Test
+//    public void testImageViewNotResizable() {
 //        ImageView imageview = new ImageView();
 //        assertFalse(imageview.isResizable());
 //    }
 
-    @Test public void testParentNotResizable() {
+    @Test
+    public void testParentNotResizable() {
         Parent parent = new MockParent();
         assertFalse(parent.isResizable());
     }
 
-    @Test public void testGroupNotResizable() {
+    @Test
+    public void testGroupNotResizable() {
         Group group = new Group();
         assertFalse(group.isResizable());
     }
 
-    @Test public void testRegionResizable() {
+    @Test
+    public void testRegionResizable() {
         Region container = new Region();
         assertTrue(container.isResizable());
     }
 
     //test min, pref, max sizes on key base classes
 
-    @Test public void testShapeMinPrefMaxWidthEqualLayoutBounds() {
+    @Test
+    public void testShapeMinPrefMaxWidthEqualLayoutBounds() {
         Rectangle rect = new Rectangle(100,200);
         assertTrue(rect.getLayoutBounds().getWidth() == rect.minWidth(-1) &&
                    rect.getLayoutBounds().getWidth() == rect.prefWidth(-1) &&
                    rect.getLayoutBounds().getWidth() == rect.maxWidth(-1));
     }
 
-    @Test public void testShapeMinPrefMaxHeightEqualLayoutBounds() {
+    @Test
+    public void testShapeMinPrefMaxHeightEqualLayoutBounds() {
         Rectangle rect = new Rectangle(100,200);
         assertTrue(rect.getLayoutBounds().getHeight() == rect.minHeight(-1) &&
                    rect.getLayoutBounds().getHeight() == rect.prefHeight(-1) &&
                    rect.getLayoutBounds().getHeight() == rect.maxHeight(-1));
     }
 
-    @Test public void testTextMinPrefMaxWidthEqualLayoutBounds() {
+    @Test
+    public void testTextMinPrefMaxWidthEqualLayoutBounds() {
         Text text = new Text("something");
         assertTrue(text.getLayoutBounds().getWidth() == text.minWidth(-1) &&
                    text.getLayoutBounds().getWidth() == text.prefWidth(-1) &&
                    text.getLayoutBounds().getWidth() == text.maxWidth(-1));
     }
 
-    @Test public void testTextMinPrefMaxHeightEqualLayoutBounds() {
+    @Test
+    public void testTextMinPrefMaxHeightEqualLayoutBounds() {
         Text text = new Text("something");
         assertTrue(text.getLayoutBounds().getHeight() == text.minHeight(-1) &&
                    text.getLayoutBounds().getHeight() == text.prefHeight(-1) &&
                    text.getLayoutBounds().getHeight() == text.maxHeight(-1));
     }
 
-    @Test public void testParentMinPrefMaxWidthAreEqual() {
+    @Test
+    public void testParentMinPrefMaxWidthAreEqual() {
         Parent parent = new MockParent();
         assertTrue(parent.prefWidth(-1) == parent.minWidth(-1) &&
                    parent.prefWidth(-1) == parent.maxWidth(-1));
     }
 
-    @Test public void testParentMinPrefMaxHeightAreEqual() {
+    @Test
+    public void testParentMinPrefMaxHeightAreEqual() {
         Parent parent = new MockParent();
         assertTrue(parent.prefHeight(-1) == parent.minHeight(-1) &&
                    parent.prefHeight(-1) == parent.maxHeight(-1));
@@ -127,17 +140,20 @@ public class ResizabilityTest {
 
     // test that parent computes pref size based on chldren
 
-    @Test public void testParentPrefWidthQueriesChildPrefWidth() {
+    @Test
+    public void testParentPrefWidthQueriesChildPrefWidth() {
         Parent parent = new MockParent();
         assertEquals(110, parent.prefWidth(-1), 1e-100);
     }
 
-    @Test public void testParentPrefHeightQueriesChildPrefHeight() {
+    @Test
+    public void testParentPrefHeightQueriesChildPrefHeight() {
         Parent parent = new MockParent();
         assertEquals(220, parent.prefHeight(-1), 1e-100);
     }
 
-    @Test public void testPanePrefWidthQueriesChildPrefWidth() {
+    @Test
+    public void testPanePrefWidthQueriesChildPrefWidth() {
         Pane container = new Pane();
         Rectangle r = new Rectangle(-10,-20,100,200);
         ParentShim.getChildren(container).add(r);
@@ -146,7 +162,8 @@ public class ResizabilityTest {
         assertEquals(110, container.prefWidth(-1), 1e-100);
     }
 
-    @Test public void testPanePrefHeightQueriesChildPrefHeight() {
+    @Test
+    public void testPanePrefHeightQueriesChildPrefHeight() {
         Pane container = new Pane();
         Rectangle r = new Rectangle(-10,-20,100,200);
         ParentShim.getChildren(container).add(r);
@@ -155,7 +172,8 @@ public class ResizabilityTest {
         assertEquals(220, container.prefHeight(-1), 1e-100);
     }
 
-    @Test public void testPanePrefWidthIncludesPadding() {
+    @Test
+    public void testPanePrefWidthIncludesPadding() {
         Pane container = new Pane();
         container.setPadding(new Insets(10,20,30,40));
         Rectangle r = new Rectangle(-10,-20,100,200);
@@ -165,7 +183,8 @@ public class ResizabilityTest {
         assertEquals(170, container.prefWidth(-1), 1e-100);
     }
 
-    @Test public void testPanePrefHeightIncludesPadding() {
+    @Test
+    public void testPanePrefHeightIncludesPadding() {
         Pane container = new Pane();
         container.setPadding(new Insets(10,20,30,40));
         Rectangle r = new Rectangle(-10,-20,100,200);
@@ -177,7 +196,8 @@ public class ResizabilityTest {
 
     // test relocate, resize, resizeRelocate
 
-    @Test public void testRelocateNonResizable() {
+    @Test
+    public void testRelocateNonResizable() {
         Rectangle r = new Rectangle(10, 20, 100, 200);
         r.relocate(0,0);
 
@@ -185,7 +205,8 @@ public class ResizabilityTest {
         assertEquals(-20, r.getLayoutY(), 1e-100);
     }
 
-    @Test public void testRelocateResizable() {
+    @Test
+    public void testRelocateResizable() {
         MockResizable resizable = new MockResizable(100,200);
         resizable.relocate(50,50);
 
@@ -193,7 +214,8 @@ public class ResizabilityTest {
         assertEquals(50, resizable.getLayoutY(), 1e-100);
     }
 
-    @Test public void testResizeNonResizableIsNoOp() {
+    @Test
+    public void testResizeNonResizableIsNoOp() {
         Rectangle r = new Rectangle(10, 20, 100, 200);
         r.resize(400,400);
 
@@ -201,7 +223,8 @@ public class ResizabilityTest {
         assertEquals(200, r.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testResizeResizable() {
+    @Test
+    public void testResizeResizable() {
         MockResizable resizable = new MockResizable(100,200);
         resizable.resize(30,40);
 
@@ -209,7 +232,8 @@ public class ResizabilityTest {
         assertEquals(40, resizable.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testAutosize() {
+    @Test
+    public void testAutosize() {
         MockResizable resizable = new MockResizable(100,200);
         resizable.resize(30,40);
 
@@ -221,7 +245,8 @@ public class ResizabilityTest {
         assertEquals(200, resizable.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testResizeRelocateNonResizable() {
+    @Test
+    public void testResizeRelocateNonResizable() {
         Rectangle r = new Rectangle(10, 20, 100, 200);
         r.resizeRelocate(0, 0, 400,400);
 
@@ -231,7 +256,8 @@ public class ResizabilityTest {
         assertEquals(200, r.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testResizeRelocateResizable() {
+    @Test
+    public void testResizeRelocateResizable() {
         MockResizable resizable = new MockResizable(100,200);
         resizable.resizeRelocate(50,50,30,40);
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/StackPaneTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/StackPaneTest.java
index 62cb2f36456..55f38ebf125 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/StackPaneTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/StackPaneTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,6 @@
 
 package test.javafx.scene.layout;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
 import javafx.geometry.Insets;
 import javafx.geometry.Orientation;
 import javafx.geometry.Pos;
@@ -34,33 +32,39 @@
 import javafx.scene.layout.StackPane;
 import javafx.scene.shape.Rectangle;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 
 public class StackPaneTest {
     StackPane stack;
 
-    @Before public void setUp() {
+    @BeforeEach
+    public void setUp() {
         this.stack = new StackPane();
     }
 
-    @Test public void testStackPaneDefaults() {
+    @Test
+    public void testStackPaneDefaults() {
         assertEquals(Pos.CENTER, stack.getAlignment());
     }
 
-    @Test public void testStackPaneNulls() {
+    @Test
+    public void testStackPaneNulls() {
         stack.setAlignment(null);
 
         // this musn't throw NPE
         stack.autosize();
         stack.layout();
 
-        assertNull(null, stack.getAlignment());
-        assertNull(null, stack.alignmentProperty().get());
+        assertNull(stack.getAlignment());
+        assertNull(stack.alignmentProperty().get());
     }
 
-    @Test public void testSimpleStackPane() {
+    @Test
+    public void testSimpleStackPane() {
         MockResizable child1 = new MockResizable(100,200, 300,400, 500,600);
         Rectangle child2 = new Rectangle(100, 100);
         ParentShim.getChildren(stack).addAll(child1, child2);
@@ -93,7 +97,8 @@ public class StackPaneTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testStackPaneAlignmentTopLeft() {
+    @Test
+    public void testStackPaneAlignmentTopLeft() {
         MockResizable child1 = new MockResizable(100,200, 300,400, 500,600);
         Rectangle child2 = new Rectangle(100, 100);
         ParentShim.getChildren(stack).addAll(child1, child2);
@@ -111,7 +116,8 @@ public class StackPaneTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testStackPaneAlignmentTopCenter() {
+    @Test
+    public void testStackPaneAlignmentTopCenter() {
         MockResizable child1 = new MockResizable(100,200, 300,400, 500,600);
         Rectangle child2 = new Rectangle(100, 100);
         ParentShim.getChildren(stack).addAll(child1, child2);
@@ -129,7 +135,8 @@ public class StackPaneTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testStackPaneAlignmentTopRight() {
+    @Test
+    public void testStackPaneAlignmentTopRight() {
         MockResizable child1 = new MockResizable(100,200, 300,400, 500,600);
         Rectangle child2 = new Rectangle(100, 100);
         ParentShim.getChildren(stack).addAll(child1, child2);
@@ -147,7 +154,8 @@ public class StackPaneTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testStackPaneAlignmentCenterLeft() {
+    @Test
+    public void testStackPaneAlignmentCenterLeft() {
         MockResizable child1 = new MockResizable(100,200, 300,400, 500,600);
         Rectangle child2 = new Rectangle(100, 100);
         ParentShim.getChildren(stack).addAll(child1, child2);
@@ -165,7 +173,8 @@ public class StackPaneTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testStackPaneAlignmentCenter() {
+    @Test
+    public void testStackPaneAlignmentCenter() {
         MockResizable child1 = new MockResizable(100,200, 300,400, 500,600);
         Rectangle child2 = new Rectangle(100, 100);
         ParentShim.getChildren(stack).addAll(child1, child2);
@@ -183,7 +192,8 @@ public class StackPaneTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testStackPaneAlignmentCenterRight() {
+    @Test
+    public void testStackPaneAlignmentCenterRight() {
         MockResizable child1 = new MockResizable(100,200, 300,400, 500,600);
         Rectangle child2 = new Rectangle(100, 100);
         ParentShim.getChildren(stack).addAll(child1, child2);
@@ -201,7 +211,8 @@ public class StackPaneTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testStackPaneAlignmentBottomLeft() {
+    @Test
+    public void testStackPaneAlignmentBottomLeft() {
         MockResizable child1 = new MockResizable(100,200, 300,400, 500,600);
         Rectangle child2 = new Rectangle(100, 100);
         ParentShim.getChildren(stack).addAll(child1, child2);
@@ -219,7 +230,8 @@ public class StackPaneTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testStackPaneAlignmentBottomCenter() {
+    @Test
+    public void testStackPaneAlignmentBottomCenter() {
         MockResizable child1 = new MockResizable(100,200, 300,400, 500,600);
         Rectangle child2 = new Rectangle(100, 100);
         ParentShim.getChildren(stack).addAll(child1, child2);
@@ -237,7 +249,8 @@ public class StackPaneTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testStackPaneAlignmentBottomRight() {
+    @Test
+    public void testStackPaneAlignmentBottomRight() {
         MockResizable child1 = new MockResizable(100,200, 300,400, 500,600);
         Rectangle child2 = new Rectangle(100, 100);
         ParentShim.getChildren(stack).addAll(child1, child2);
@@ -255,7 +268,8 @@ public class StackPaneTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testStackPaneAlignmentBaselineLeft() {
+    @Test
+    public void testStackPaneAlignmentBaselineLeft() {
         MockResizable child1 = new MockResizable(300,300);
         Rectangle child2 = new Rectangle(100, 100);
         ParentShim.getChildren(stack).addAll(child1, child2);
@@ -273,7 +287,8 @@ public class StackPaneTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testStackPaneAlignmentBaselineCenter() {
+    @Test
+    public void testStackPaneAlignmentBaselineCenter() {
         MockResizable child1 = new MockResizable(300,300);
         Rectangle child2 = new Rectangle(100, 100);
         ParentShim.getChildren(stack).addAll(child1, child2);
@@ -291,7 +306,8 @@ public class StackPaneTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testStackPaneAlignmentBaselineRight() {
+    @Test
+    public void testStackPaneAlignmentBaselineRight() {
         MockResizable child1 = new MockResizable(300,300);
         Rectangle child2 = new Rectangle(100, 100);
         ParentShim.getChildren(stack).addAll(child1, child2);
@@ -309,7 +325,8 @@ public class StackPaneTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testStackPaneAlignmentBaselineLeftComputed() {
+    @Test
+    public void testStackPaneAlignmentBaselineLeftComputed() {
         MockResizable child1 = new MockResizable(300,300) {
             @Override public double getBaselineOffset() {
                 return BASELINE_OFFSET_SAME_AS_HEIGHT; // should be prefHeight
@@ -331,7 +348,8 @@ public class StackPaneTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testStackPaneAlignmentBaselineCenterComputed() {
+    @Test
+    public void testStackPaneAlignmentBaselineCenterComputed() {
         MockResizable child1 = new MockResizable(300,300) {
             @Override public double getBaselineOffset() {
                 return BASELINE_OFFSET_SAME_AS_HEIGHT; // should be prefHeight
@@ -353,7 +371,8 @@ public class StackPaneTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testStackPaneAlignmentBaselineRightComputed() {
+    @Test
+    public void testStackPaneAlignmentBaselineRightComputed() {
         MockResizable child1 = new MockResizable(300,300) {
             @Override public double getBaselineOffset() {
                 return BASELINE_OFFSET_SAME_AS_HEIGHT; // should be prefHeight
@@ -374,7 +393,8 @@ public class StackPaneTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testStackPaneContentBiasNullNoChildHasContentBias() {
+    @Test
+    public void testStackPaneContentBiasNullNoChildHasContentBias() {
         Rectangle r = new Rectangle(100,100);
         MockResizable child = new MockResizable(100,200);
         ParentShim.getChildren(stack).addAll(r, child);
@@ -382,7 +402,8 @@ public class StackPaneTest {
         assertNull(stack.getContentBias());
     }
 
-    @Test public void testStackPaneContentBiasHORIZONTALIfChildHORIZONTAL() {
+    @Test
+    public void testStackPaneContentBiasHORIZONTALIfChildHORIZONTAL() {
         Rectangle r = new Rectangle(100,100);
         MockBiased biased = new MockBiased(Orientation.HORIZONTAL, 100, 200);
         MockResizable child = new MockResizable(100,100);
@@ -394,7 +415,8 @@ public class StackPaneTest {
         assertEquals(100, stack.prefHeight(200), 0);
     }
 
-    @Test public void testStackPaneContentBiasVERTICALIfChildVERTICAL() {
+    @Test
+    public void testStackPaneContentBiasVERTICALIfChildVERTICAL() {
         Rectangle r = new Rectangle(100,100);
         MockBiased biased = new MockBiased(Orientation.VERTICAL, 100, 200);
         MockResizable child = new MockResizable(100,100);
@@ -406,7 +428,8 @@ public class StackPaneTest {
         assertEquals(200, stack.prefWidth(100), 0);
     }
 
-    @Test public void testStackPaneSetMarginConstraint() {
+    @Test
+    public void testStackPaneSetMarginConstraint() {
         MockResizable child1 = new MockResizable(100,200, 300,400, 500,600);
 
         assertNull(StackPane.getMargin(child1));
@@ -419,7 +442,8 @@ public class StackPaneTest {
         assertNull(StackPane.getMargin(child1));
     }
 
-    @Test public void testStackPaneMarginConstraint() {
+    @Test
+    public void testStackPaneMarginConstraint() {
         StackPane stack = new StackPane();
         MockResizable child1 = new MockResizable(100,200, 300,400, 500,600);
         Rectangle child2 = new Rectangle(100, 100);
@@ -455,7 +479,8 @@ public class StackPaneTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testStackPaneSetAlignmentConstraint() {
+    @Test
+    public void testStackPaneSetAlignmentConstraint() {
         MockResizable child1 = new MockResizable(100,200, 300,400, 500,600);
 
         assertNull(StackPane.getAlignment(child1));
@@ -467,7 +492,8 @@ public class StackPaneTest {
         assertNull(StackPane.getAlignment(child1));
     }
 
-    @Test public void testStackPaneAlignmentConstraint() {
+    @Test
+    public void testStackPaneAlignmentConstraint() {
         StackPane stack = new StackPane();
         MockResizable child1 = new MockResizable(100,200, 300,400, 500,600);
         Rectangle child2 = new Rectangle(100, 100);
@@ -503,7 +529,8 @@ public class StackPaneTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testStackPaneWithHorizontalBiasedChild() {
+    @Test
+    public void testStackPaneWithHorizontalBiasedChild() {
         StackPane stack = new StackPane();
 
         MockBiased biased = new MockBiased(Orientation.HORIZONTAL, 100,100);
@@ -528,7 +555,8 @@ public class StackPaneTest {
         assertEquals(50, biased.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testStackPaneWithVerticalBiasedChild() {
+    @Test
+    public void testStackPaneWithVerticalBiasedChild() {
         StackPane stack = new StackPane();
 
         MockBiased biased = new MockBiased(Orientation.VERTICAL, 100,100);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/TilePaneTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/TilePaneTest.java
index 44f69159095..aab984da8d3 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/TilePaneTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/TilePaneTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,8 +29,6 @@
 import javafx.css.CssMetaData;
 import javafx.css.CssParserShim;
 import javafx.css.StyleableProperty;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
 import javafx.geometry.Insets;
 import javafx.geometry.Orientation;
 import javafx.geometry.Pos;
@@ -41,10 +39,12 @@
 import javafx.scene.layout.TilePane;
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
-import org.junit.Assert;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
 
 
 public class TilePaneTest {
@@ -53,7 +53,8 @@ public class TilePaneTest {
     TilePane htilepane;
     TilePane vtilepane;
 
-    @Before public void setUp() {
+    @BeforeEach
+    public void setUp() {
         tilepane = new TilePane(); // 12 children
         for(int i = 0; i < 6; i++) {
             MockResizable child1 = new MockResizable(50,60, 100,200, 500,600);
@@ -77,35 +78,43 @@ public class TilePaneTest {
 
     }
 
-    @Test public void testOrientationDefaultsToHorizontal() {
+    @Test
+    public void testOrientationDefaultsToHorizontal() {
         assertEquals(Orientation.HORIZONTAL, tilepane.getOrientation());
     }
 
-    @Test public void testPrefColumnsDefault() {
+    @Test
+    public void testPrefColumnsDefault() {
         assertEquals(5, tilepane.getPrefColumns());
     }
 
-    @Test public void testPrefRowsDefault() {
+    @Test
+    public void testPrefRowsDefault() {
         assertEquals(5, vtilepane.getPrefColumns());
     }
 
-    @Test public void testPrefTileWidthDefaultsToUSE_COMPUTED_SIZE() {
+    @Test
+    public void testPrefTileWidthDefaultsToUSE_COMPUTED_SIZE() {
         assertEquals(Region.USE_COMPUTED_SIZE, tilepane.getPrefTileWidth(), 0);
     }
 
-    @Test public void testPrefTileHeightDefaultsToUSE_COMPUTED_SIZE() {
+    @Test
+    public void testPrefTileHeightDefaultsToUSE_COMPUTED_SIZE() {
         assertEquals(Region.USE_COMPUTED_SIZE, tilepane.getPrefTileHeight(), 0);
     }
 
-    @Test public void testAlignmentDefaultsToTopLeft() {
+    @Test
+    public void testAlignmentDefaultsToTopLeft() {
         assertEquals(Pos.TOP_LEFT, tilepane.getAlignment());
     }
 
-    @Test public void testTileAlignmentDefaultsToCenter() {
+    @Test
+    public void testTileAlignmentDefaultsToCenter() {
         assertEquals(Pos.CENTER, tilepane.getTileAlignment());
     }
 
-    @Test public void testTilePaneNulls() {
+    @Test
+    public void testTilePaneNulls() {
         tilepane.setAlignment(null);
         tilepane.setTileAlignment(null);
         tilepane.setOrientation(null);
@@ -114,60 +123,69 @@ public class TilePaneTest {
         tilepane.autosize();
         tilepane.layout();
 
-        assertNull(null, tilepane.getAlignment());
-        assertNull(null, tilepane.getTileAlignment());
-        assertNull(null, tilepane.getOrientation());
-        assertNull(null, tilepane.alignmentProperty().get());
-        assertNull(null, tilepane.tileAlignmentProperty().get());
-        assertNull(null, tilepane.orientationProperty().get());
+        assertNull(tilepane.getAlignment());
+        assertNull(tilepane.getTileAlignment());
+        assertNull(tilepane.getOrientation());
+        assertNull(tilepane.alignmentProperty().get());
+        assertNull(tilepane.tileAlignmentProperty().get());
+        assertNull(tilepane.orientationProperty().get());
     }
 
-    @Test public void testHorizontalTilePaneMinSize() {
+    @Test
+    public void testHorizontalTilePaneMinSize() {
         assertEquals(200, htilepane.minWidth(-1), 1e-100);
         assertEquals(2400, htilepane.minHeight(100), 1e-100);
     }
 
-    @Test public void testHorizontalTilePanePrefSize() {
+    @Test
+    public void testHorizontalTilePanePrefSize() {
         assertEquals(1000, htilepane.prefWidth(-1), 1e-100);
         assertEquals(600, htilepane.prefHeight(-1), 1e-100);
     }
 
-    @Test public void testVerticalTilePaneMinSize() {
+    @Test
+    public void testVerticalTilePaneMinSize() {
         assertEquals(300, vtilepane.minHeight(-1), 1e-100);
         assertEquals(1600, vtilepane.minWidth(300), 1e-100);
     }
 
-    @Test public void testVerticalTilePanePrefSize() {
+    @Test
+    public void testVerticalTilePanePrefSize() {
         assertEquals(1500, vtilepane.prefHeight(-1), 1e-100);
         assertEquals(400, vtilepane.prefWidth(-1), 1e-100);
     }
 
 
-    @Test public void testEmptyHorizontalTilePaneMinWidthIsZero() {
+    @Test
+    public void testEmptyHorizontalTilePaneMinWidthIsZero() {
         TilePane Tilepane = new TilePane();
 
         assertEquals(0, Tilepane.minWidth(-1), 0);
     }
 
-    @Test public void testEmptyHorizontalTilePaneMinHeightIsZero() {
+    @Test
+    public void testEmptyHorizontalTilePaneMinHeightIsZero() {
         TilePane Tilepane = new TilePane();
 
         assertEquals(0, Tilepane.minHeight(-1), 0);
     }
 
-    @Test public void testEmptyVerticalTilePaneMinWidthIsZero() {
+    @Test
+    public void testEmptyVerticalTilePaneMinWidthIsZero() {
         TilePane Tilepane = new TilePane(Orientation.VERTICAL);
 
         assertEquals(0, Tilepane.minWidth(-1), 0);
     }
 
-    @Test public void testEmptyVerticalTilePaneMinHeightIsZero() {
+    @Test
+    public void testEmptyVerticalTilePaneMinHeightIsZero() {
         TilePane Tilepane = new TilePane(Orientation.VERTICAL);
 
         assertEquals(0, Tilepane.minHeight(-1), 0);
     }
 
-    @Test public void testLayoutWithPrefSize() {
+    @Test
+    public void testLayoutWithPrefSize() {
         tilepane.autosize();
         tilepane.layout();
 
@@ -185,7 +203,8 @@ public class TilePaneTest {
         assertEquals(100, last.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testLayoutWithLargerThanPrefSize() {
+    @Test
+    public void testLayoutWithLargerThanPrefSize() {
         tilepane.resize(800,800);
         tilepane.layout();
 
@@ -202,7 +221,8 @@ public class TilePaneTest {
         assertEquals(100, last.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testHorizontalTilePaneAlignmentTopLeft() {
+    @Test
+    public void testHorizontalTilePaneAlignmentTopLeft() {
         htilepane.setAlignment(Pos.TOP_LEFT);
         htilepane.resize(700,1000);
         htilepane.layout();
@@ -221,7 +241,8 @@ public class TilePaneTest {
         assertEquals(100, last.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testHorizontalTilePaneAlignmentTopCenter() {
+    @Test
+    public void testHorizontalTilePaneAlignmentTopCenter() {
         htilepane.setAlignment(Pos.TOP_CENTER);
         htilepane.resize(700,1000);
         htilepane.layout();
@@ -240,7 +261,8 @@ public class TilePaneTest {
         assertEquals(100, last.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testHorizontalTilePaneAlignmentTopRight() {
+    @Test
+    public void testHorizontalTilePaneAlignmentTopRight() {
         htilepane.setAlignment(Pos.TOP_RIGHT);
         htilepane.resize(700,1000);
         htilepane.layout();
@@ -259,7 +281,8 @@ public class TilePaneTest {
         assertEquals(100, last.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testHorizontalTilePaneAlignmentCenterLeft() {
+    @Test
+    public void testHorizontalTilePaneAlignmentCenterLeft() {
         htilepane.setAlignment(Pos.CENTER_LEFT);
         htilepane.resize(700,1000);
         htilepane.layout();
@@ -278,7 +301,8 @@ public class TilePaneTest {
         assertEquals(100, last.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testHorizontalTilePaneAlignmentCenter() {
+    @Test
+    public void testHorizontalTilePaneAlignmentCenter() {
         htilepane.setAlignment(Pos.CENTER);
         htilepane.resize(700,1000);
         htilepane.layout();
@@ -297,7 +321,8 @@ public class TilePaneTest {
         assertEquals(100, last.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testHorizontalTilePaneAlignmentCenterRight() {
+    @Test
+    public void testHorizontalTilePaneAlignmentCenterRight() {
         htilepane.setAlignment(Pos.CENTER_RIGHT);
         htilepane.resize(700,1000);
         htilepane.layout();
@@ -316,7 +341,8 @@ public class TilePaneTest {
         assertEquals(100, last.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testHorizontalTilePaneAlignmentBottomLeft() {
+    @Test
+    public void testHorizontalTilePaneAlignmentBottomLeft() {
         htilepane.setAlignment(Pos.BOTTOM_LEFT);
         htilepane.resize(700,1000);
         htilepane.layout();
@@ -335,7 +361,8 @@ public class TilePaneTest {
         assertEquals(100, last.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testHorizontalTilePaneAlignmentBottomCenter() {
+    @Test
+    public void testHorizontalTilePaneAlignmentBottomCenter() {
         htilepane.setAlignment(Pos.BOTTOM_CENTER);
         htilepane.resize(700,1000);
         htilepane.layout();
@@ -354,7 +381,8 @@ public class TilePaneTest {
         assertEquals(100, last.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testHorizontalTilePaneAlignmentBottomRight() {
+    @Test
+    public void testHorizontalTilePaneAlignmentBottomRight() {
         htilepane.setAlignment(Pos.BOTTOM_RIGHT);
         htilepane.resize(700,1000);
         htilepane.layout();
@@ -373,7 +401,8 @@ public class TilePaneTest {
         assertEquals(100, last.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testVerticalTilePaneAlignmentTopLeft() {
+    @Test
+    public void testVerticalTilePaneAlignmentTopLeft() {
         vtilepane.setAlignment(Pos.TOP_LEFT);
         vtilepane.resize(700,1000);
         vtilepane.layout();
@@ -392,7 +421,8 @@ public class TilePaneTest {
         assertEquals(100, last.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testVerticalTilePaneAlignmentTopCenter() {
+    @Test
+    public void testVerticalTilePaneAlignmentTopCenter() {
         vtilepane.setAlignment(Pos.TOP_CENTER);
         vtilepane.resize(700,1000);
         vtilepane.layout();
@@ -411,7 +441,8 @@ public class TilePaneTest {
         assertEquals(100, last.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testVerticalTilePaneAlignmentTopRight() {
+    @Test
+    public void testVerticalTilePaneAlignmentTopRight() {
         vtilepane.setAlignment(Pos.TOP_RIGHT);
         vtilepane.resize(700,1000);
         vtilepane.layout();
@@ -430,7 +461,8 @@ public class TilePaneTest {
         assertEquals(100, last.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testVerticalTilePaneAlignmentCenterLeft() {
+    @Test
+    public void testVerticalTilePaneAlignmentCenterLeft() {
         vtilepane.setAlignment(Pos.CENTER_LEFT);
         vtilepane.resize(700,1000);
         vtilepane.layout();
@@ -449,7 +481,8 @@ public class TilePaneTest {
         assertEquals(100, last.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testVerticalTilePaneAlignmentCenter() {
+    @Test
+    public void testVerticalTilePaneAlignmentCenter() {
         vtilepane.setAlignment(Pos.CENTER);
         vtilepane.resize(700,1000);
         vtilepane.layout();
@@ -468,7 +501,8 @@ public class TilePaneTest {
         assertEquals(100, last.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testVerticalTilePaneAlignmentCenterRight() {
+    @Test
+    public void testVerticalTilePaneAlignmentCenterRight() {
         vtilepane.setAlignment(Pos.CENTER_RIGHT);
         vtilepane.resize(700,1000);
         vtilepane.layout();
@@ -487,7 +521,8 @@ public class TilePaneTest {
         assertEquals(100, last.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testVerticalTilePaneAlignmentBottomLeft() {
+    @Test
+    public void testVerticalTilePaneAlignmentBottomLeft() {
         vtilepane.setAlignment(Pos.BOTTOM_LEFT);
         vtilepane.resize(700,1000);
         vtilepane.layout();
@@ -506,7 +541,8 @@ public class TilePaneTest {
         assertEquals(100, last.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testVerticalTilePaneAlignmentBottomCenter() {
+    @Test
+    public void testVerticalTilePaneAlignmentBottomCenter() {
         vtilepane.setAlignment(Pos.BOTTOM_CENTER);
         vtilepane.resize(700,1000);
         vtilepane.layout();
@@ -525,7 +561,8 @@ public class TilePaneTest {
         assertEquals(100, last.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testVerticalTilePaneAlignmentBottomRight() {
+    @Test
+    public void testVerticalTilePaneAlignmentBottomRight() {
         vtilepane.setAlignment(Pos.BOTTOM_RIGHT);
         vtilepane.resize(700,1000);
         vtilepane.layout();
@@ -544,7 +581,8 @@ public class TilePaneTest {
         assertEquals(100, last.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testTileAlignmentTopLeft() {
+    @Test
+    public void testTileAlignmentTopLeft() {
         htilepane.setTileAlignment(Pos.TOP_LEFT);
         htilepane.resize(700,1000);
         htilepane.layout();
@@ -563,7 +601,8 @@ public class TilePaneTest {
         assertEquals(100, last.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testTileAlignmentTopCenter() {
+    @Test
+    public void testTileAlignmentTopCenter() {
         htilepane.setTileAlignment(Pos.TOP_CENTER);
         htilepane.resize(700,1000);
         htilepane.layout();
@@ -582,7 +621,8 @@ public class TilePaneTest {
         assertEquals(100, last.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testTileAlignmentTopRight() {
+    @Test
+    public void testTileAlignmentTopRight() {
         htilepane.setTileAlignment(Pos.TOP_RIGHT);
         htilepane.resize(700,1000);
         htilepane.layout();
@@ -601,7 +641,8 @@ public class TilePaneTest {
         assertEquals(100, last.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testTileAlignmentCenterLeft() {
+    @Test
+    public void testTileAlignmentCenterLeft() {
         htilepane.setTileAlignment(Pos.CENTER_LEFT);
         htilepane.resize(700,1000);
         htilepane.layout();
@@ -620,7 +661,8 @@ public class TilePaneTest {
         assertEquals(100, last.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testTileAlignmentCenter() {
+    @Test
+    public void testTileAlignmentCenter() {
         htilepane.setTileAlignment(Pos.CENTER);
         htilepane.resize(700,1000);
         htilepane.layout();
@@ -639,7 +681,8 @@ public class TilePaneTest {
         assertEquals(100, last.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testTileAlignmentCenterRight() {
+    @Test
+    public void testTileAlignmentCenterRight() {
         htilepane.setTileAlignment(Pos.CENTER_RIGHT);
         htilepane.resize(700,1000);
         htilepane.layout();
@@ -658,7 +701,8 @@ public class TilePaneTest {
         assertEquals(100, last.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testTileAlignmentBottomLeft() {
+    @Test
+    public void testTileAlignmentBottomLeft() {
         htilepane.setTileAlignment(Pos.BOTTOM_LEFT);
         htilepane.resize(700,1000);
         htilepane.layout();
@@ -677,7 +721,8 @@ public class TilePaneTest {
         assertEquals(100, last.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testTileAlignmentBottomCenter() {
+    @Test
+    public void testTileAlignmentBottomCenter() {
         htilepane.setTileAlignment(Pos.BOTTOM_CENTER);
         htilepane.resize(700,1000);
         htilepane.layout();
@@ -696,7 +741,8 @@ public class TilePaneTest {
         assertEquals(100, last.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testTileAlignmentBottomRight() {
+    @Test
+    public void testTileAlignmentBottomRight() {
         htilepane.setTileAlignment(Pos.BOTTOM_RIGHT);
         htilepane.resize(700,1000);
         htilepane.layout();
@@ -715,7 +761,8 @@ public class TilePaneTest {
         assertEquals(100, last.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testSetMarginConstraint() {
+    @Test
+    public void testSetMarginConstraint() {
         MockResizable child1 = new MockResizable(100,200, 300,400, 500,600);
 
         assertNull(TilePane.getMargin(child1));
@@ -728,7 +775,8 @@ public class TilePaneTest {
         assertNull(TilePane.getMargin(child1));
     }
 
-    @Test public void testMarginConstraint() {
+    @Test
+    public void testMarginConstraint() {
         TilePane tilepane = new TilePane();
 
         for(int i = 0; i < 6; i++) {
@@ -763,7 +811,8 @@ public class TilePaneTest {
 
     }
 
-    @Test public void testSetAlignmentConstraint() {
+    @Test
+    public void testSetAlignmentConstraint() {
         MockResizable child1 = new MockResizable(100,200, 300,400, 500,600);
 
         assertNull(TilePane.getAlignment(child1));
@@ -775,7 +824,8 @@ public class TilePaneTest {
         assertNull(TilePane.getAlignment(child1));
     }
 
-    @Test public void testHorizontalTilePaneAlignmentConstraint() {
+    @Test
+    public void testHorizontalTilePaneAlignmentConstraint() {
         TilePane tilepane = new TilePane();
 
         for(int i = 0; i < 6; i++) {
@@ -822,7 +872,8 @@ public class TilePaneTest {
         assertEquals(100, last.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testWithHorizontalBiasedChild() {
+    @Test
+    public void testWithHorizontalBiasedChild() {
         TilePane tilepane = new TilePane();
 
         MockBiased biased = new MockBiased(Orientation.HORIZONTAL, 100,100);
@@ -846,7 +897,8 @@ public class TilePaneTest {
 
     }
 
-    @Test public void testWithVerticalBiasedChild() {
+    @Test
+    public void testWithVerticalBiasedChild() {
         TilePane tilepane = new TilePane();
 
         MockBiased biased = new MockBiased(Orientation.VERTICAL, 100,100);
@@ -869,7 +921,8 @@ public class TilePaneTest {
         assertEquals(150, rect.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testHorizontalTilePaneWithFixedTileWidth() {
+    @Test
+    public void testHorizontalTilePaneWithFixedTileWidth() {
         TilePane tilepane = new TilePane();
         tilepane.setPrefColumns(3);
         tilepane.setPrefTileWidth(200);
@@ -906,7 +959,8 @@ public class TilePaneTest {
         assertEquals(100, last.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testHorizontalTilePaneWithFixedTileHeight() {
+    @Test
+    public void testHorizontalTilePaneWithFixedTileHeight() {
         TilePane tilepane = new TilePane();
         tilepane.setPrefColumns(3);
         tilepane.setPrefTileHeight(200);
@@ -944,7 +998,8 @@ public class TilePaneTest {
         assertEquals(100, last.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testHorizontalTilePaneWithPrefSize() {
+    @Test
+    public void testHorizontalTilePaneWithPrefSize() {
         TilePane tilepane = new TilePane(Orientation.HORIZONTAL);
         tilepane.setPrefSize(100,100);
 
@@ -974,7 +1029,8 @@ public class TilePaneTest {
         assertEquals(160, tilepane.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testVerticalTilePaneWithPrefSize() {
+    @Test
+    public void testVerticalTilePaneWithPrefSize() {
         TilePane tilepane = new TilePane(Orientation.VERTICAL);
         tilepane.setPrefSize(100,100);
 
@@ -1002,7 +1058,8 @@ public class TilePaneTest {
         assertEquals(100, tilepane.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testTilePaneWithBaselineAlignment() {
+    @Test
+    public void testTilePaneWithBaselineAlignment() {
         TilePane tilepane = new TilePane(Orientation.HORIZONTAL);
         tilepane.setPrefSize(100,100);
         tilepane.setTileAlignment(Pos.BASELINE_CENTER);
@@ -1023,7 +1080,8 @@ public class TilePaneTest {
         assertEquals(160, tilepane.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testCSSsetPrefTileWidthAndHeight_RT20388() {
+    @Test
+    public void testCSSsetPrefTileWidthAndHeight_RT20388() {
         Scene scene = new Scene(tilepane);
         Stage stage = new Stage();
         stage.setScene(scene);
@@ -1035,11 +1093,12 @@ public class TilePaneTest {
             ((StyleableProperty)tilepane.prefTileWidthProperty()).applyStyle(null, val);
             assertEquals(67.0, tilepane.getPrefTileWidth(), 0.00001);
         } catch (Exception e) {
-            Assert.fail(e.toString());
+            fail(e.toString());
         }
     }
 
-    @Test public void testCSSsetPrefRow_RT20437() {
+    @Test
+    public void testCSSsetPrefRow_RT20437() {
         Scene scene = new Scene(tilepane);
         Stage stage = new Stage();
         stage.setScene(scene);
@@ -1051,12 +1110,13 @@ public class TilePaneTest {
             ((StyleableProperty)tilepane.prefRowsProperty()).applyStyle(null, val);
             assertEquals(2, tilepane.getPrefRows(), 0.00001);
         } catch (Exception e) {
-            Assert.fail(e.toString());
+            fail(e.toString());
         }
     }
 
 
-    @Test public void testCSSsetPrefColumns_RT22929() {
+    @Test
+    public void testCSSsetPrefColumns_RT22929() {
         Scene scene = new Scene(tilepane);
         Stage stage = new Stage();
         stage.setScene(scene);
@@ -1069,7 +1129,7 @@ public class TilePaneTest {
             ((StyleableProperty)tilepane.prefColumnsProperty()).applyStyle(null,val);
             assertEquals(2, tilepane.getPrefColumns(), 0.00001);
         } catch (Exception e) {
-            Assert.fail(e.toString());
+            fail(e.toString());
         }
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/VBoxTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/VBoxTest.java
index 7e3bb291679..f479e21ce93 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/VBoxTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/VBoxTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,6 @@
 
 package test.javafx.scene.layout;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 import javafx.geometry.Insets;
 import javafx.geometry.Orientation;
 import javafx.geometry.Pos;
@@ -36,35 +33,42 @@
 import javafx.scene.layout.VBox;
 import javafx.scene.shape.Rectangle;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 
 public class VBoxTest {
     VBox vbox;
 
-    @Before public void setUp() {
+    @BeforeEach
+    public void setUp() {
         this.vbox = new VBox();
     }
 
-    @Test public void testVBoxDefaults() {
+    @Test
+    public void testVBoxDefaults() {
         assertEquals(0, vbox.getSpacing(), 1e-100);
         assertTrue(vbox.isFillWidth());
         assertEquals(Pos.TOP_LEFT, vbox.getAlignment());
     }
 
-    @Test public void testVBoxNulls() {
+    @Test
+    public void testVBoxNulls() {
         vbox.setAlignment(null);
 
         // this musn't throw NPE
         vbox.autosize();
         vbox.layout();
 
-        assertNull(null, vbox.getAlignment());
-        assertNull(null, vbox.alignmentProperty().get());
+        assertNull(vbox.getAlignment());
+        assertNull(vbox.alignmentProperty().get());
     }
 
-    @Test public void testSimpleVBox() {
+    @Test
+    public void testSimpleVBox() {
         MockResizable child1 = new MockResizable(100,200, 300,400, 500,600);
         Rectangle child2 = new Rectangle(100, 100);
         ParentShim.getChildren(vbox).addAll(child1, child2);
@@ -97,7 +101,8 @@ public class VBoxTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testVBoxSpacing() {
+    @Test
+    public void testVBoxSpacing() {
         vbox.setSpacing(10);
         MockResizable child1 = new MockResizable(100,200, 300,400, 500,600);
         Rectangle child2 = new Rectangle(100, 100);
@@ -131,7 +136,8 @@ public class VBoxTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testVBoxFillWidth() {
+    @Test
+    public void testVBoxFillWidth() {
         vbox.setFillWidth(false);
         vbox.setAlignment(Pos.TOP_CENTER);
         MockResizable child1 = new MockResizable(100,100, 200,300, 500,600);
@@ -166,7 +172,8 @@ public class VBoxTest {
         assertEquals(400, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testVBoxAlignmentTopLeft() {
+    @Test
+    public void testVBoxAlignmentTopLeft() {
         MockResizable child1 = new MockResizable(300,400);
         Rectangle child2 = new Rectangle(100, 100);
         ParentShim.getChildren(vbox).addAll(child1, child2);
@@ -184,7 +191,8 @@ public class VBoxTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testVBoxAlignmentTopCenter() {
+    @Test
+    public void testVBoxAlignmentTopCenter() {
         MockResizable child1 = new MockResizable(300,400);
         Rectangle child2 = new Rectangle(100, 100);
         ParentShim.getChildren(vbox).addAll(child1, child2);
@@ -202,7 +210,8 @@ public class VBoxTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testVBoxAlignmentTopRight() {
+    @Test
+    public void testVBoxAlignmentTopRight() {
         MockResizable child1 = new MockResizable(300,400);
         Rectangle child2 = new Rectangle(100, 100);
         ParentShim.getChildren(vbox).addAll(child1, child2);
@@ -220,7 +229,8 @@ public class VBoxTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testVBoxAlignmentCenterLeft() {
+    @Test
+    public void testVBoxAlignmentCenterLeft() {
         MockResizable child1 = new MockResizable(300,400);
         Rectangle child2 = new Rectangle(100, 100);
         ParentShim.getChildren(vbox).addAll(child1, child2);
@@ -238,7 +248,8 @@ public class VBoxTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testVBoxAlignmentCenter() {
+    @Test
+    public void testVBoxAlignmentCenter() {
         MockResizable child1 = new MockResizable(300,400);
         Rectangle child2 = new Rectangle(100, 100);
         ParentShim.getChildren(vbox).addAll(child1, child2);
@@ -256,7 +267,8 @@ public class VBoxTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testVBoxAlignmentCenterRight() {
+    @Test
+    public void testVBoxAlignmentCenterRight() {
         MockResizable child1 = new MockResizable(300,400);
         Rectangle child2 = new Rectangle(100, 100);
         ParentShim.getChildren(vbox).addAll(child1, child2);
@@ -274,7 +286,8 @@ public class VBoxTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testVBoxAlignmentBottomLeft() {
+    @Test
+    public void testVBoxAlignmentBottomLeft() {
         MockResizable child1 = new MockResizable(300,400);
         Rectangle child2 = new Rectangle(100, 100);
         ParentShim.getChildren(vbox).addAll(child1, child2);
@@ -292,7 +305,8 @@ public class VBoxTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testVBoxAlignmentBottomCenter() {
+    @Test
+    public void testVBoxAlignmentBottomCenter() {
         MockResizable child1 = new MockResizable(300,400);
         Rectangle child2 = new Rectangle(100, 100);
         ParentShim.getChildren(vbox).addAll(child1, child2);
@@ -310,7 +324,8 @@ public class VBoxTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testVBoxAlignmentBottomRight() {
+    @Test
+    public void testVBoxAlignmentBottomRight() {
         MockResizable child1 = new MockResizable(300,400);
         Rectangle child2 = new Rectangle(100, 100);
         ParentShim.getChildren(vbox).addAll(child1, child2);
@@ -328,7 +343,8 @@ public class VBoxTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testVBoxContentBiasNullNoChildHasContentBias() {
+    @Test
+    public void testVBoxContentBiasNullNoChildHasContentBias() {
         Rectangle r = new Rectangle(100,100);
         MockResizable child = new MockResizable(100,200);
         ParentShim.getChildren(vbox).addAll(r, child);
@@ -339,7 +355,8 @@ public class VBoxTest {
         assertEquals(300, vbox.prefHeight(200), 0);
     }
 
-    @Test public void testVBoxContentBiasHORIZONTALifChildHORIZONTAL() {
+    @Test
+    public void testVBoxContentBiasHORIZONTALifChildHORIZONTAL() {
         Rectangle r = new Rectangle(100,100);
         MockBiased biased = new MockBiased(Orientation.HORIZONTAL, 100, 200);
         MockResizable child = new MockResizable(100,100);
@@ -348,7 +365,8 @@ public class VBoxTest {
         assertEquals(Orientation.HORIZONTAL, vbox.getContentBias());
     }
 
-    @Test public void testVBoxWithHorizontalContentBiasAtPrefSize() {
+    @Test
+    public void testVBoxWithHorizontalContentBiasAtPrefSize() {
         Rectangle rect = new Rectangle(100,100);
         MockBiased biased = new MockBiased(Orientation.HORIZONTAL, 100, 200);
         MockResizable resizable = new MockResizable(100,100);
@@ -374,7 +392,8 @@ public class VBoxTest {
         assertEquals(100, resizable.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testVBoxWithHorizontalContentBiasWithHorizontalShrinking() {
+    @Test
+    public void testVBoxWithHorizontalContentBiasWithHorizontalShrinking() {
         Rectangle rect = new Rectangle(100,100);
         MockBiased biased = new MockBiased(Orientation.HORIZONTAL, 100, 200);
         MockResizable resizable = new MockResizable(100,100);
@@ -399,7 +418,8 @@ public class VBoxTest {
         assertEquals(100, resizable.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testVBoxWithHorizontalContentBiasWithHorizontalGrowing() {
+    @Test
+    public void testVBoxWithHorizontalContentBiasWithHorizontalGrowing() {
         Rectangle rect = new Rectangle(100,100);
         MockBiased biased = new MockBiased(Orientation.HORIZONTAL, 100, 200);
         MockResizable resizable = new MockResizable(100,100);
@@ -424,7 +444,8 @@ public class VBoxTest {
         assertEquals(100, resizable.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testVBoxContentBiasVERTICALIfChildVERTICAL() {
+    @Test
+    public void testVBoxContentBiasVERTICALIfChildVERTICAL() {
         Rectangle r = new Rectangle(100,100);
         MockBiased biased = new MockBiased(Orientation.VERTICAL, 100, 200);
         MockResizable child = new MockResizable(100,100);
@@ -433,7 +454,8 @@ public class VBoxTest {
         assertEquals(Orientation.VERTICAL, vbox.getContentBias());
     }
 
-    @Test public void testVBoxWithVerticalContentBiasAtPrefSize() {
+    @Test
+    public void testVBoxWithVerticalContentBiasAtPrefSize() {
         Rectangle rect = new Rectangle(100,100);
         MockBiased biased = new MockBiased(Orientation.VERTICAL, 100, 200);
         MockResizable resizable = new MockResizable(100,100);
@@ -459,7 +481,8 @@ public class VBoxTest {
         assertEquals(100, resizable.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testVBoxWithVerticalContentBiasWithVerticalShrinking() {
+    @Test
+    public void testVBoxWithVerticalContentBiasWithVerticalShrinking() {
         Rectangle rect = new Rectangle(100,100);
         MockBiased biased = new MockBiased(Orientation.VERTICAL, 100, 200);
         MockResizable resizable = new MockResizable(100,100);
@@ -484,7 +507,8 @@ public class VBoxTest {
         assertEquals(50, resizable.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testVBoxWithVerticalContentBiasWithVerticalGrowingFillWidthFalse() {
+    @Test
+    public void testVBoxWithVerticalContentBiasWithVerticalGrowingFillWidthFalse() {
         vbox.setFillWidth(false);
         Rectangle rect = new Rectangle(100,100);
         MockBiased biased = new MockBiased(Orientation.VERTICAL, 100, 200);
@@ -512,7 +536,8 @@ public class VBoxTest {
         assertEquals(100, resizable.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testVBoxWithVerticalContentBiasWithVerticalGrowingFillWidthTrue() {
+    @Test
+    public void testVBoxWithVerticalContentBiasWithVerticalGrowingFillWidthTrue() {
         vbox.setFillWidth(true);
         Rectangle rect = new Rectangle(100,100);
         MockBiased biased = new MockBiased(Orientation.VERTICAL, 100, 200);
@@ -540,7 +565,8 @@ public class VBoxTest {
         assertEquals(100, resizable.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testVBoxContentBiasHORIZONTALIfChildHORIZONTALAndFillWidthTrue() {
+    @Test
+    public void testVBoxContentBiasHORIZONTALIfChildHORIZONTALAndFillWidthTrue() {
         vbox.setFillWidth(true);
         Rectangle r = new Rectangle(100,100);
         MockBiased biased = new MockBiased(Orientation.HORIZONTAL, 100, 200);
@@ -555,7 +581,8 @@ public class VBoxTest {
 
 //    These test are no longer valid.  If a content bias is set getContentBias()
 //    should never return null.
-//    @Test public void testVBoxContentBiasNullIfChildHORIZONTALAndFillWidthFalse() {
+//    @Test
+//    public void testVBoxContentBiasNullIfChildHORIZONTALAndFillWidthFalse() {
 //        vbox.setFillWidth(false);
 //        Rectangle r = new Rectangle(100,100);
 //        MockBiased biased = new MockBiased(Orientation.HORIZONTAL, 100, 200);
@@ -568,7 +595,8 @@ public class VBoxTest {
 //        assertEquals(400, vbox.prefHeight(200), 0);
 //    }
 //
-//    @Test public void testVBoxContentBiasNullIfChildVERTICALAndFillWidthTrue() {
+//    @Test
+//    public void testVBoxContentBiasNullIfChildVERTICALAndFillWidthTrue() {
 //        vbox.setFillWidth(true);
 //        Rectangle r = new Rectangle(100,100);
 //        MockBiased biased = new MockBiased(Orientation.VERTICAL, 200, 100);
@@ -581,7 +609,8 @@ public class VBoxTest {
 //        assertEquals(200, vbox.prefWidth(200), 0);
 //    }
 //
-//    @Test public void testVBoxContentBiasNullIfChildVERTICALAndFillWidthFalse() {
+//    @Test
+//    public void testVBoxContentBiasNullIfChildVERTICALAndFillWidthFalse() {
 //        vbox.setFillWidth(false);
 //        Rectangle r = new Rectangle(100,100);
 //        MockBiased biased = new MockBiased(Orientation.VERTICAL, 200, 100);
@@ -594,7 +623,8 @@ public class VBoxTest {
 //        assertEquals(200, vbox.prefWidth(200), 0);
 //    }
 
-    @Test public void testVBoxSetMarginConstraint() {
+    @Test
+    public void testVBoxSetMarginConstraint() {
         MockResizable child1 = new MockResizable(100,200, 300,400, 500,600);
 
         assertNull(VBox.getMargin(child1));
@@ -607,7 +637,8 @@ public class VBoxTest {
         assertNull(VBox.getMargin(child1));
     }
 
-    @Test public void testVBoxMarginConstraint() {
+    @Test
+    public void testVBoxMarginConstraint() {
         VBox vbox = new VBox();
         MockResizable child1 = new MockResizable(100,200, 300,400, 500,600);
         Rectangle child2 = new Rectangle(100, 100);
@@ -643,7 +674,8 @@ public class VBoxTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testVBoxSetVgrowConstraint() {
+    @Test
+    public void testVBoxSetVgrowConstraint() {
         MockResizable child1 = new MockResizable(100,200, 300,400, 500,600);
 
         assertNull(VBox.getVgrow(child1));
@@ -655,7 +687,8 @@ public class VBoxTest {
         assertNull(VBox.getVgrow(child1));
     }
 
-    @Test public void testVBoxHgrowConstraint() {
+    @Test
+    public void testVBoxHgrowConstraint() {
         VBox vbox = new VBox();
         MockResizable child1 = new MockResizable(100,200, 300,400, 500,600);
         Rectangle child2 = new Rectangle(100, 100);
@@ -691,7 +724,8 @@ public class VBoxTest {
         assertEquals(100, child2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testVBoxWithHorizontalBiasedChild() {
+    @Test
+    public void testVBoxWithHorizontalBiasedChild() {
         VBox vbox = new VBox();
 
         MockBiased biased = new MockBiased(Orientation.HORIZONTAL, 100,100);
@@ -715,7 +749,8 @@ public class VBoxTest {
         assertEquals(200, biased2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testVBoxWithVerticalBiasedChild() {
+    @Test
+    public void testVBoxWithVerticalBiasedChild() {
         VBox vbox = new VBox();
 
         MockBiased biased = new MockBiased(Orientation.VERTICAL, 100,100);
@@ -742,7 +777,8 @@ public class VBoxTest {
         assertEquals(200, biased2.getLayoutBounds().getHeight(), 1e-100);
     }
 
-    @Test public void testMaxHeightHonoredWhenGrowing() {
+    @Test
+    public void testMaxHeightHonoredWhenGrowing() {
         MockRegion child = new MockRegion(10,10,100,100,300,300);
         MockRegion child2 = new MockRegion(10,10,100,100,200,200);
         VBox.setVgrow(child, Priority.ALWAYS);
@@ -758,7 +794,8 @@ public class VBoxTest {
         assertEquals(300, child2.getLayoutY(), 0);
     }
 
-    @Test public void testLayoutWhenChildrenAreRemoved_RT19406() {
+    @Test
+    public void testLayoutWhenChildrenAreRemoved_RT19406() {
         Rectangle child1 = new Rectangle(100,100);
         Rectangle child2 = new Rectangle(100, 100);
         ParentShim.getChildren(vbox).addAll(child1, child2);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/ColorTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/ColorTest.java
index 4af609274f5..5e72d6121ca 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/ColorTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/ColorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,11 +31,13 @@
 import java.util.ArrayList;
 import com.sun.javafx.util.Utils;
 import javafx.scene.paint.Color;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class ColorTest {
 
@@ -355,19 +357,25 @@ public void testWebPoundNotationWithAlphaAndOpacity() {
         assertEquals((128.0/255.0)/2.0, color.getOpacity(), 0.0001);
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testWebPoundNotationIllegalValue() {
-        Color.web("#aabbccddee");
+        assertThrows(IllegalArgumentException.class, () -> {
+            Color.web("#aabbccddee");
+        });
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testWebNullValue() {
-        Color.web(null);
+        assertThrows(NullPointerException.class, () -> {
+            Color.web(null);
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testWebEmptyColor() {
-        Color.web("", 0.5);
+        assertThrows(IllegalArgumentException.class, () -> {
+            Color.web("", 0.5);
+        });
     }
 
     @Test
@@ -387,9 +395,11 @@ public void testWebHexNotationWithAlpha() {
         assertEquals(128.0/255.0, color.getOpacity(), 0.0001);
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testWebHexNotationIllegalValue() {
-        Color.web("0xaabbccddee");
+        assertThrows(IllegalArgumentException.class, () -> {
+            Color.web("0xaabbccddee");
+        });
     }
 
     @Test
@@ -426,9 +436,11 @@ public void testWebNamedMixedCase() {
         assertTrue(expected.getOpacity() == color.getOpacity());
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testWebNamedWrongName() {
-        Color.web("foobar");
+        assertThrows(IllegalArgumentException.class, () -> {
+            Color.web("foobar");
+        });
     }
 
     @Test
@@ -653,114 +665,158 @@ public void testWebHslaRange() {
         assertEquals(c5, c6);
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testWebRgb2Param() {
-        Color.web("rgb(100, 100)");
+        assertThrows(IllegalArgumentException.class, () -> {
+            Color.web("rgb(100, 100)");
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testWebRgb1Param() {
-        Color.web("rgb(100)");
+        assertThrows(IllegalArgumentException.class, () -> {
+            Color.web("rgb(100)");
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testWebRgb0Param() {
-        Color.web("rgb()");
+        assertThrows(IllegalArgumentException.class, () -> {
+            Color.web("rgb()");
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testWebRgbNoParen() {
-        Color.web("rgb 100, 100, 100");
+        assertThrows(IllegalArgumentException.class, () -> {
+            Color.web("rgb 100, 100, 100");
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testWebRgbNoCloseParen() {
-        Color.web("rgb(100, 100, 100");
+        assertThrows(IllegalArgumentException.class, () -> {
+            Color.web("rgb(100, 100, 100");
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testWebRgba3Param() {
-        Color.web("rgba(100, 100, 100)");
+        assertThrows(IllegalArgumentException.class, () -> {
+            Color.web("rgba(100, 100, 100)");
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testWebRgba2Param() {
-        Color.web("rgba(100, 100)");
+        assertThrows(IllegalArgumentException.class, () -> {
+            Color.web("rgba(100, 100)");
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testWebRgba1Param() {
-        Color.web("rgba(100)");
+        assertThrows(IllegalArgumentException.class, () -> {
+            Color.web("rgba(100)");
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testWebRgba0Param() {
-        Color.web("rgba()");
+        assertThrows(IllegalArgumentException.class, () -> {
+            Color.web("rgba()");
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testWebRgbaNoParen() {
-        Color.web("rgba 100, 100, 100");
+        assertThrows(IllegalArgumentException.class, () -> {
+            Color.web("rgba 100, 100, 100");
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testWebRgbaNoCloseParen() {
-        Color.web("rgba(100, 100, 100, 0.5");
+        assertThrows(IllegalArgumentException.class, () -> {
+            Color.web("rgba(100, 100, 100, 0.5");
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testWebHsl2Param() {
-        Color.web("hsl(240, 50%)");
+        assertThrows(IllegalArgumentException.class, () -> {
+            Color.web("hsl(240, 50%)");
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testWebHsl1Param() {
-        Color.web("hsl(240)");
+        assertThrows(IllegalArgumentException.class, () -> {
+            Color.web("hsl(240)");
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testWebHsl0Param() {
-        Color.web("hsl()");
+        assertThrows(IllegalArgumentException.class, () -> {
+            Color.web("hsl()");
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testWebHslNoParen() {
-        Color.web("hsl 240, 50%, 50%");
+        assertThrows(IllegalArgumentException.class, () -> {
+            Color.web("hsl 240, 50%, 50%");
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testWebHslNoCloseParen() {
-        Color.web("hsl(240, 50%, 50%");
+        assertThrows(IllegalArgumentException.class, () -> {
+            Color.web("hsl(240, 50%, 50%");
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testWebHsla3Param() {
-        Color.web("hsla(240, 50%, 50%)");
+        assertThrows(IllegalArgumentException.class, () -> {
+            Color.web("hsla(240, 50%, 50%)");
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testWebHsla2Param() {
-        Color.web("hsla(240, 50%)");
+        assertThrows(IllegalArgumentException.class, () -> {
+            Color.web("hsla(240, 50%)");
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testWebHsla1Param() {
-        Color.web("hsla(240)");
+        assertThrows(IllegalArgumentException.class, () -> {
+            Color.web("hsla(240)");
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testWebHsla0Param() {
-        Color.web("hsla()");
+        assertThrows(IllegalArgumentException.class, () -> {
+            Color.web("hsla()");
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testWebHslaNoParen() {
-        Color.web("hsla 240, 50%, 50%, 0.5");
+        assertThrows(IllegalArgumentException.class, () -> {
+            Color.web("hsla 240, 50%, 50%, 0.5");
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testWebHslaNoCloseParen() {
-        Color.web("hsla(240, 50%, 50%, 0.5");
+        assertThrows(IllegalArgumentException.class, () -> {
+            Color.web("hsla(240, 50%, 50%, 0.5");
+        });
     }
 
     @Test
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/ImagePatternTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/ImagePatternTest.java
index e91d854587e..88553ea31b8 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/ImagePatternTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/ImagePatternTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,21 +25,21 @@
 
 package test.javafx.scene.paint;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
 import javafx.scene.image.Image;
 import javafx.scene.paint.ImagePattern;
 
-import org.junit.Test;
-
 import test.com.sun.javafx.pgstub.StubImageLoaderFactory;
 import test.com.sun.javafx.pgstub.StubPlatformImageInfo;
 import test.com.sun.javafx.pgstub.StubToolkit;
 import com.sun.javafx.tk.Toolkit;
 
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 public class ImagePatternTest {
 
     private Image createImage() {
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/LinearGradientTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/LinearGradientTest.java
index 1f64dcd03db..1933750c571 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/LinearGradientTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/LinearGradientTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,13 +34,15 @@
 import javafx.scene.paint.LinearGradient;
 import javafx.scene.paint.Stop;
 import javafx.scene.Scene;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class LinearGradientTest {
 
@@ -81,13 +83,15 @@ public void testGetStopsNullsRemoved() {
         assertEquals(normalizedTwoStops, gradient.getStops());
     }
 
-    @Test(expected=UnsupportedOperationException.class)
+    @Test
     public void testGetStopsCannotChangeGradient() {
-        LinearGradient gradient = new LinearGradient(0, 0, 1, 1, true,
-                CycleMethod.NO_CYCLE, twoStopsWithNulls);
+        assertThrows(UnsupportedOperationException.class, () -> {
+            LinearGradient gradient = new LinearGradient(0, 0, 1, 1, true,
+                    CycleMethod.NO_CYCLE, twoStopsWithNulls);
 
-        List<Stop> returned = gradient.getStops();
-        returned.set(0, stop2);
+            List<Stop> returned = gradient.getStops();
+            returned.set(0, stop2);
+        });
     }
 
     @SuppressWarnings("unlikely-arg-type")
@@ -187,14 +191,18 @@ public void testImpl_getPlatformPaint() {
         assertSame(paint, Toolkit.getPaintAccessor().getPlatformPaint(gradient));
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testValueOfNullValue() {
-        LinearGradient.valueOf(null);
+        assertThrows(NullPointerException.class, () -> {
+            LinearGradient.valueOf(null);
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testValueOfEmpty() {
-        LinearGradient.valueOf("");
+        assertThrows(IllegalArgumentException.class, () -> {
+            LinearGradient.valueOf("");
+        });
     }
 
     @Test
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/PhongMaterialTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/PhongMaterialTest.java
index 708a3b1d173..37074717a94 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/PhongMaterialTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/PhongMaterialTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,9 +27,10 @@
 
 import javafx.scene.image.Image;
 import javafx.scene.paint.PhongMaterial;
-import static org.junit.Assert.*;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class PhongMaterialTest {
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/RadialGradientTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/RadialGradientTest.java
index c95718cd13d..3ced9380127 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/RadialGradientTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/RadialGradientTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,13 +34,15 @@
 import javafx.scene.paint.RadialGradient;
 import javafx.scene.paint.Stop;
 import javafx.scene.Scene;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class RadialGradientTest {
 
@@ -82,13 +84,15 @@ public void testGetStopsNullsRemoved() {
         assertEquals(normalizedTwoStops, gradient.getStops());
     }
 
-    @Test(expected=UnsupportedOperationException.class)
+    @Test
     public void testGetStopsCannotChangeGradient() {
-        RadialGradient gradient = new RadialGradient(0, 0, 1, 1, 2, true,
-                CycleMethod.NO_CYCLE, twoStops);
+        assertThrows(UnsupportedOperationException.class, () -> {
+            RadialGradient gradient = new RadialGradient(0, 0, 1, 1, 2, true,
+                    CycleMethod.NO_CYCLE, twoStops);
 
-        List<Stop> returned = gradient.getStops();
-        returned.set(0, stop2);
+            List<Stop> returned = gradient.getStops();
+            returned.set(0, stop2);
+        });
     }
 
     @SuppressWarnings("unlikely-arg-type")
@@ -210,14 +214,18 @@ public void testBuilder() {
         assertEquals(1.0, gradient.getStops().get(1).getOffset(), 0);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testValueOfNullValue() {
-        RadialGradient.valueOf(null);
+        assertThrows(NullPointerException.class, () -> {
+            RadialGradient.valueOf(null);
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testValueOfEmpty() {
-        RadialGradient.valueOf("");
+        assertThrows(IllegalArgumentException.class, () -> {
+            RadialGradient.valueOf("");
+        });
     }
 
     @Test
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/StopListTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/StopListTest.java
index a5f2f068916..ccd67472184 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/StopListTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/StopListTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,6 @@
 
 package test.javafx.scene.paint;
 
-import static org.junit.Assert.assertEquals;
-
 import java.util.Arrays;
 import java.util.List;
 import javafx.scene.paint.Color;
@@ -35,7 +33,8 @@
 import javafx.scene.paint.RadialGradient;
 import javafx.scene.paint.Stop;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class StopListTest {
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/StopTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/StopTest.java
index b39db7757cc..c2c48e51945 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/StopTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/StopTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,12 +27,12 @@
 
 import javafx.scene.paint.Color;
 import javafx.scene.paint.Stop;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class StopTest {
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/ArcTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/ArcTest.java
index 0bdd43623e6..5fbee8d0f07 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/ArcTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/ArcTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,91 +31,108 @@
 import test.javafx.scene.NodeTest;
 import javafx.scene.shape.Arc;
 import javafx.scene.shape.ArcType;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
 import test.com.sun.javafx.scene.shape.StubArcHelper;
 
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
 public class ArcTest {
 
-    @Test public void testPropertyPropagation_visible() throws Exception {
+    @Test
+    public void testPropertyPropagation_visible() throws Exception {
         final Arc node = new StubArc();
         NodeTest.testBooleanPropertyPropagation(node, "visible", false, true);
     }
 
-    @Test public void testPropertyPropagation_centerX() throws Exception {
+    @Test
+    public void testPropertyPropagation_centerX() throws Exception {
         final Arc node = new StubArc();
         NodeTest.testDoublePropertyPropagation(node, "centerX", 100, 200);
     }
 
-    @Test public void testPropertyPropagation_centerY() throws Exception {
+    @Test
+    public void testPropertyPropagation_centerY() throws Exception {
         final Arc node = new StubArc();
         NodeTest.testDoublePropertyPropagation(node, "centerY", 100, 200);
     }
 
-    @Test public void testPropertyPropagation_radiusX() throws Exception {
+    @Test
+    public void testPropertyPropagation_radiusX() throws Exception {
         final Arc node = new StubArc();
         NodeTest.testDoublePropertyPropagation(node, "radiusX", 100, 200);
     }
 
-    @Test public void testPropertyPropagation_radiusY() throws Exception {
+    @Test
+    public void testPropertyPropagation_radiusY() throws Exception {
         final Arc node = new StubArc();
         NodeTest.testDoublePropertyPropagation(node, "radiusY", 100, 200);
     }
 
-    @Test public void testPropertyPropagation_startAngle() throws Exception {
+    @Test
+    public void testPropertyPropagation_startAngle() throws Exception {
         final Arc node = new StubArc();
         NodeTest.testDoublePropertyPropagation(node, "startAngle", "angleStart", 30, 60);
     }
 
-    @Test public void testPropertyPropagation_length() throws Exception {
+    @Test
+    public void testPropertyPropagation_length() throws Exception {
         final Arc node = new StubArc();
         NodeTest.testDoublePropertyPropagation(node, "length", "angleExtent", 30, 45);
     }
 
-    @Test public void testBoundPropertySync_length() throws Exception {
+    @Test
+    public void testBoundPropertySync_length() throws Exception {
         NodeTest.assertDoublePropertySynced(
                 new StubArc(10.0, 10.0, 100.0, 100.0, 0.0, 0.0),
                 "length", "angleExtent", 100.0);
     }
 
-    @Test public void testBoundProperySync_startAngle() throws Exception {
+    @Test
+    public void testBoundProperySync_startAngle() throws Exception {
         NodeTest.assertDoublePropertySynced(
                 new StubArc(10.0, 10.0, 100.0, 100.0, 0.0, 0.0),
                 "startAngle", "angleStart", 270.0);
     }
 
-    @Test public void testBoundPropertySync_radiusY() throws Exception {
+    @Test
+    public void testBoundPropertySync_radiusY() throws Exception {
         NodeTest.assertDoublePropertySynced(
                 new StubArc(10.0, 10.0, 100.0, 100.0, 0.0, 0.0),
                 "radiusY", "radiusY", 200.0);
     }
 
-    @Test public void testBoundPropertySync_radiusX() throws Exception {
+    @Test
+    public void testBoundPropertySync_radiusX() throws Exception {
         NodeTest.assertDoublePropertySynced(
                 new StubArc(10.0, 10.0, 100.0, 100.0, 0.0, 0.0),
                 "radiusX", "radiusX", 150.0);
     }
 
-    @Test public void testBoundPropertySync_centerY() throws Exception {
+    @Test
+    public void testBoundPropertySync_centerY() throws Exception {
         NodeTest.assertDoublePropertySynced(
                 new StubArc(10.0, 10.0, 100.0, 100.0, 0.0, 0.0),
                 "centerY", "centerY", 250.0);
     }
 
-    @Test public void testBoundPropertySync_centerX() throws Exception {
+    @Test
+    public void testBoundPropertySync_centerX() throws Exception {
         NodeTest.assertDoublePropertySynced(
                 new StubArc(10.0, 10.0, 100.0, 100.0, 0.0, 0.0),
                 "centerX", "centerX", 350.0);
     }
 
-    @Test public void toStringShouldReturnNonEmptyString() {
+    @Test
+    public void toStringShouldReturnNonEmptyString() {
         String s = new StubArc().toString();
         assertNotNull(s);
         assertFalse(s.isEmpty());
     }
 
-    @Test public void testNullType() {
+    @Test
+    public void testNullType() {
         // null type should not throw NPE
         Arc arc = new StubArc(10.0, 10.0, 100.0, 100.0, 0.0, 0.0);
         arc.setType(null);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/ArcToTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/ArcToTest.java
index 047633e15fc..10f13f5d5aa 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/ArcToTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/ArcToTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,57 +34,69 @@
 import javafx.scene.Group;
 import test.javafx.scene.NodeTest;
 import javafx.scene.Scene;
-import org.junit.Test;
 
 import java.lang.reflect.Method;
 import javafx.scene.shape.ArcTo;
 import javafx.scene.shape.MoveTo;
 import javafx.scene.shape.Path;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class ArcToTest {
 
-    @Test public void testSetGetX() throws Exception {
+    @Test
+    public void testSetGetX() throws Exception {
         TestUtils.testDoublePropertyGetterSetter(new ArcTo(), "x", 123.2, 0.0);
     }
 
-    @Test public void testSetGetY() throws Exception {
+    @Test
+    public void testSetGetY() throws Exception {
         TestUtils.testDoublePropertyGetterSetter(new ArcTo(), "y", 123.2, 0.0);
     }
 
-    @Test public void testSetGetRadiusX() throws Exception {
+    @Test
+    public void testSetGetRadiusX() throws Exception {
         TestUtils.testDoublePropertyGetterSetter(new ArcTo(), "radiusX", 123.2, 0.0);
     }
 
-    @Test public void testSetGetRadiusY() throws Exception {
+    @Test
+    public void testSetGetRadiusY() throws Exception {
         TestUtils.testDoublePropertyGetterSetter(new ArcTo(), "radiusY", 123.2, 0.0);
     }
 
 
-    @Test public void testSetGetXAxisRotation() throws Exception {
+    @Test
+    public void testSetGetXAxisRotation() throws Exception {
         TestUtils.testDoublePropertyGetterSetter(new ArcTo(), "xAxisRotation", 123.2, 0.0);
     }
 
-    @Test public void testSetGetLargeArcFlag() throws Exception {
+    @Test
+    public void testSetGetLargeArcFlag() throws Exception {
         TestUtils.testBooleanPropertyGetterSetter(new ArcTo(), "largeArcFlag");
     }
 
-    @Test public void testSetGetSweepFlag() throws Exception {
+    @Test
+    public void testSetGetSweepFlag() throws Exception {
         TestUtils.testBooleanPropertyGetterSetter(new ArcTo(), "sweepFlag");
     }
 
     //TODO test addTo
 
-    @Test public void testDoublePropertySynced_X() throws Exception {
+    @Test
+    public void testDoublePropertySynced_X() throws Exception {
         checkSyncedProperty("x", Coords.X, 200.0);
     }
 
-    @Test public void testDoublePropertySynced_Y() throws Exception {
+    @Test
+    public void testDoublePropertySynced_Y() throws Exception {
         checkSyncedProperty("y", Coords.Y, 200.0);
     }
 
-    @Test public void toStringShouldReturnNonEmptyString() {
+    @Test
+    public void toStringShouldReturnNonEmptyString() {
         String s = new ArcTo().toString();
         assertNotNull(s);
         assertFalse(s.isEmpty());
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/ArcTo_onInvalidate_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/ArcTo_onInvalidate_Test.java
index fae17921ded..6257b35707d 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/ArcTo_onInvalidate_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/ArcTo_onInvalidate_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,36 +25,25 @@
 
 package test.javafx.scene.shape;
 
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import java.util.stream.Stream;
 
 import com.sun.javafx.scene.DirtyBits;
 import javafx.scene.shape.ArcTo;
+
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.OnInvalidateMethodsTestBase;
 
-@RunWith(Parameterized.class)
 public class ArcTo_onInvalidate_Test extends OnInvalidateMethodsTestBase {
 
-    public ArcTo_onInvalidate_Test(Configuration config) {
-        super(config);
-    }
-
-    @Parameters
-    public static Collection<Object[]> data() {
-        Object[][] data = new Object[][] {
-            {new Configuration(ArcTo.class, "x", 100.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_CONTENTS})},
-            {new Configuration(ArcTo.class, "y", 100.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_CONTENTS})},
-            {new Configuration(ArcTo.class, "radiusX", 10.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_CONTENTS})},
-            {new Configuration(ArcTo.class, "radiusY", 122.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_CONTENTS})},
-            {new Configuration(ArcTo.class, "xAxisRotation", 45.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_CONTENTS})},
-            {new Configuration(ArcTo.class, "largeArcFlag", true, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_CONTENTS})},
-            {new Configuration(ArcTo.class, "sweepFlag", true, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_CONTENTS})}
-
-        };
-        return Arrays.asList(data);
+    public static Stream<Arguments> data() {
+        return Stream.of(
+            Arguments.of( new Configuration(ArcTo.class, "x", 100.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_CONTENTS}) ),
+            Arguments.of( new Configuration(ArcTo.class, "y", 100.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_CONTENTS}) ),
+            Arguments.of( new Configuration(ArcTo.class, "radiusX", 10.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_CONTENTS}) ),
+            Arguments.of( new Configuration(ArcTo.class, "radiusY", 122.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_CONTENTS}) ),
+            Arguments.of( new Configuration(ArcTo.class, "xAxisRotation", 45.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_CONTENTS}) ),
+            Arguments.of( new Configuration(ArcTo.class, "largeArcFlag", true, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_CONTENTS}) ),
+            Arguments.of( new Configuration(ArcTo.class, "sweepFlag", true, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_CONTENTS}) )
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/ArcTo_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/ArcTo_properties_Test.java
index 65971944884..6a517252852 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/ArcTo_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/ArcTo_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,23 +25,18 @@
 
 package test.javafx.scene.shape;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.scene.shape.ArcTo;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.PropertiesTestBase;
 
-@RunWith(Parameterized.class)
 public final class ArcTo_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
+
+    public static Stream<Arguments> data() {
         final ArcTo testArcTo = new ArcTo();
 
-        return Arrays.asList(new Object[] {
+        return Stream.of(
             config(testArcTo, "radiusX", 50.0, 150.0),
             config(testArcTo, "radiusY", 50.0, 150.0),
             // temporarily disabled, because there is ArcToBuilder.XAxisRotation
@@ -51,10 +46,6 @@ public static Collection data() {
             config(testArcTo, "sweepFlag", false, true),
             config(testArcTo, "x", 0.0, 100.0),
             config(testArcTo, "y", 0.0, 100.0)
-        });
-    }
-
-    public ArcTo_properties_Test(final Configuration configuration) {
-        super(configuration);
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Arc_onInvalidate_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Arc_onInvalidate_Test.java
index 6263610b843..933276b9d60 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Arc_onInvalidate_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Arc_onInvalidate_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,36 +25,26 @@
 
 package test.javafx.scene.shape;
 
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import java.util.stream.Stream;
 
 import com.sun.javafx.scene.DirtyBits;
 import javafx.scene.shape.Arc;
 import javafx.scene.shape.ArcType;
+
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.OnInvalidateMethodsTestBase;
 
-@RunWith(Parameterized.class)
 public class Arc_onInvalidate_Test extends OnInvalidateMethodsTestBase {
 
-    public Arc_onInvalidate_Test(Configuration configuration) {
-        super(configuration);
-    }
-
-    @Parameters
-    public static Collection<Object[]>data() {
-        Object[][] data = new Object[][] {
-            {new Configuration(Arc.class, "centerX", 222.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY})},
-            {new Configuration(Arc.class, "centerY", 111.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY})},
-            {new Configuration(Arc.class, "startAngle", 10.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY})},
-            {new Configuration(Arc.class, "length", 180.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY})},
-            {new Configuration(Arc.class, "radiusX", 123.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY})},
-            {new Configuration(Arc.class, "radiusY", 321.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY})},
-            {new Configuration(Arc.class, "type", ArcType.ROUND, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY})}
-        };
-        return Arrays.asList(data);
+    public static Stream<Arguments> data() {
+        return Stream.of(
+            Arguments.of( new Configuration(Arc.class, "centerX", 222.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY}) ),
+            Arguments.of( new Configuration(Arc.class, "centerY", 111.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY}) ),
+            Arguments.of( new Configuration(Arc.class, "startAngle", 10.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY}) ),
+            Arguments.of( new Configuration(Arc.class, "length", 180.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY}) ),
+            Arguments.of( new Configuration(Arc.class, "radiusX", 123.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY}) ),
+            Arguments.of( new Configuration(Arc.class, "radiusY", 321.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY}) ),
+            Arguments.of( new Configuration(Arc.class, "type", ArcType.ROUND, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY}) )
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Arc_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Arc_properties_Test.java
index 77a133f8cb3..040b0731d27 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Arc_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Arc_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,24 +25,19 @@
 
 package test.javafx.scene.shape;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.scene.shape.Arc;
 import javafx.scene.shape.ArcType;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.PropertiesTestBase;
 
-@RunWith(Parameterized.class)
 public final class Arc_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
+
+    public static Stream<Arguments> data() {
         final Arc testArc = new Arc();
 
-        return Arrays.asList(new Object[] {
+        return Stream.of(
             config(testArc, "centerX", 0.0, 100.0),
             config(testArc, "centerY", 0.0, 100.0),
             config(testArc, "radiusX", 50.0, 150.0),
@@ -50,10 +45,6 @@ public static Collection data() {
             config(testArc, "startAngle", 0.0, 50.0),
             config(testArc, "length", 40.0, 80.0),
             config(testArc, "type", ArcType.OPEN, ArcType.ROUND)
-        });
-    }
-
-    public Arc_properties_Test(final Configuration configuration) {
-        super(configuration);
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/BoundsTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/BoundsTest.java
index 468341bf708..d749269a392 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/BoundsTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/BoundsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,9 +33,9 @@
 import javafx.scene.shape.QuadCurveTo;
 import static test.com.sun.javafx.test.TestHelper.assertSimilar;
 import static test.com.sun.javafx.test.TestHelper.box;
-import static org.junit.Assert.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class BoundsTest {
 
@@ -64,7 +64,8 @@ public void testBoundsForArc() {
         assertEquals(arc.getBoundsInLocal(), arc.getBoundsInParent());
     }
 
-    public @Test void testBoundsForCircle() {
+    @Test
+    public void testBoundsForCircle() {
         Circle circle = new Circle(50);
 
         assertEquals(box(-50, -50, 100, 100), circle.getBoundsInLocal());
@@ -77,7 +78,8 @@ public void testBoundsForArc() {
         assertEquals(circle.getBoundsInLocal(), circle.getBoundsInParent());
     }
 
-    public @Test void testBoundsForCubicCurve() {
+    @Test
+    public void testBoundsForCubicCurve() {
         CubicCurve cubic = new CubicCurve();
         cubic.setStartX(0);
         cubic.setStartY(50);
@@ -92,7 +94,8 @@ public void testBoundsForArc() {
         assertEquals(cubic.getBoundsInLocal(), cubic.getBoundsInParent());
     }
 
-    public @Test void testBoundsForEllipse() {
+    @Test
+    public void testBoundsForEllipse() {
         Ellipse ellipse = new Ellipse(50, 100);
 
         assertEquals(box(-50, -100, 100, 200), ellipse.getBoundsInLocal());
@@ -105,7 +108,8 @@ public void testBoundsForArc() {
         assertEquals(ellipse.getBoundsInLocal(), ellipse.getBoundsInParent());
     }
 
-    public @Test void testBoundsForLine() {
+    @Test
+    public void testBoundsForLine() {
         Line line = new Line(-10, -10, 10, 10);
 
         assertSimilar(box(-11, -11, 22, 22), line.getBoundsInLocal());
@@ -114,7 +118,8 @@ public void testBoundsForArc() {
     }
     */
 
-    public @Test void testBoundsForPath() {
+    @Test
+    public void testBoundsForPath() {
         Path path = new Path();
         path.getElements().add(new MoveTo(10, 50));
         path.getElements().add(new HLineTo(70));
@@ -126,7 +131,8 @@ public void testBoundsForArc() {
         assertEquals(path.getBoundsInLocal(), path.getBoundsInParent());
     }
 /*
-    public @Test void testBoundsForPolygon() {
+    @Test
+    public void testBoundsForPolygon() {
         Polygon polygon = new Polygon(new double[] {0,0,20,10,10,20});
 
         assertEquals(box(0, 0, 20, 20), polygon.getBoundsInLocal());
@@ -139,7 +145,8 @@ public void testBoundsForArc() {
         assertEquals(polygon.getBoundsInLocal(), polygon.getBoundsInParent());
     }
 
-    public @Test void testBoundsForPolyline() {
+    @Test
+    public void testBoundsForPolyline() {
         Polyline polyline = new Polyline(new double[] {0,0,20,10,10,20});
 
         assertSimilar(box(-1, -1, 22, 22), polyline.getBoundsInLocal());
@@ -147,14 +154,16 @@ public void testBoundsForArc() {
         assertEquals(polyline.getBoundsInLocal(), polyline.getBoundsInParent());
     }
 
-    public @Test void testBoundsForQuadCurve() {
+    @Test
+    public void testBoundsForQuadCurve() {
         QuadCurve quad = new QuadCurve(0, 50, 25, 0, 50, 50);
 
         assertEquals(box(0, 25, 50, 25), quad.getBoundsInLocal());
         assertEquals(quad.getBoundsInLocal(), quad.getBoundsInParent());
     }
 
-    public @Test void testBoundsForRectangle() {
+    @Test
+    public void testBoundsForRectangle() {
         Rectangle rect = new Rectangle(100, 100);
 
         assertEquals(box(0, 0, 100, 100), rect.getBoundsInLocal());
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/BoxTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/BoxTest.java
index 1ee7f430032..37433801919 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/BoxTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/BoxTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,8 +28,10 @@
 import com.sun.javafx.scene.NodeHelper;
 import javafx.geometry.BoundingBox;
 import javafx.scene.shape.Box;
-import static org.junit.Assert.*;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class BoxTest {
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/CircleTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/CircleTest.java
index 3e6d8340559..2adb707426c 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/CircleTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/CircleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,50 +37,57 @@
 import javafx.scene.shape.Circle;
 import javafx.scene.transform.Rotate;
 import javafx.scene.transform.Scale;
-import org.junit.Test;
 
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static test.com.sun.javafx.test.TestHelper.assertSimilar;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
 
 
 public class CircleTest {
 
-    @Test public void testPropertyPropagation_visible() throws Exception {
+    @Test
+    public void testPropertyPropagation_visible() throws Exception {
         final Circle node = new StubCircle();
         NodeTest.testBooleanPropertyPropagation(node, "visible", false, true);
     }
 
-    @Test public void testPropertyPropagation_centerX() throws Exception {
+    @Test
+    public void testPropertyPropagation_centerX() throws Exception {
         final Circle node = new StubCircle();
         NodeTest.testDoublePropertyPropagation(node, "centerX", 100, 200);
     }
 
-    @Test public void testPropertyPropagation_centerY() throws Exception {
+    @Test
+    public void testPropertyPropagation_centerY() throws Exception {
         final Circle node = new StubCircle();
         NodeTest.testDoublePropertyPropagation(node, "centerY", 100, 200);
     }
 
-    @Test public void testPropertyPropagation_radius() throws Exception {
+    @Test
+    public void testPropertyPropagation_radius() throws Exception {
         final Circle node = new StubCircle();
         NodeTest.testDoublePropertyPropagation(node, "radius", 100, 200);
     }
 
-    @Test public void testBoundPropertySync_centerX() throws Exception {
+    @Test
+    public void testBoundPropertySync_centerX() throws Exception {
         NodeTest.assertDoublePropertySynced(
                 new StubCircle(100, 200, 50),
                 "centerX", "centerX",
                 350.0);
     }
 
-    @Test public void testBoundPropertySync_centerY() throws Exception {
+    @Test
+    public void testBoundPropertySync_centerY() throws Exception {
         NodeTest.assertDoublePropertySynced(
                 new StubCircle(100, 200, 50),
                 "centerY", "centerY",
                 250.0);
     }
 
-    @Test public void testBoundPropertySync_radius() throws Exception {
+    @Test
+    public void testBoundPropertySync_radius() throws Exception {
         NodeTest.assertDoublePropertySynced(
                 new StubCircle(100, 200, 50),
                 "radius", "radius",
@@ -127,7 +134,8 @@ public void testTransformedBounds_translate() {
     }
 
 
-    @Test public void testTransformedBounds_scale() {
+    @Test
+    public void testTransformedBounds_scale() {
         Circle c = new StubCircle(50, 100, 10, Color.RED);
         double scalePivotX = (c.getCenterX() + c.getRadius()) / 2;
         double scalePivotY = (c.getCenterY() + c.getRadius()) / 2;
@@ -138,7 +146,8 @@ public void testTransformedBounds_translate() {
                 2 * original.getWidth(), 1.5 * original.getHeight()), c.getBoundsInParent());
     }
 
-    @Test public void toStringShouldReturnNonEmptyString() {
+    @Test
+    public void toStringShouldReturnNonEmptyString() {
         String s = new StubCircle().toString();
         assertNotNull(s);
         assertFalse(s.isEmpty());
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Circle_onInvalidate_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Circle_onInvalidate_Test.java
index 8b6616894df..265657d7fa8 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Circle_onInvalidate_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Circle_onInvalidate_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,33 +25,23 @@
 
 package test.javafx.scene.shape;
 
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import java.util.stream.Stream;
 
 import com.sun.javafx.scene.DirtyBits;
 import javafx.scene.shape.Circle;
 import javafx.scene.shape.CubicCurve;
+
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.OnInvalidateMethodsTestBase;
 
-@RunWith(Parameterized.class)
 public class Circle_onInvalidate_Test extends OnInvalidateMethodsTestBase {
 
-    public Circle_onInvalidate_Test(Configuration config) {
-        super(config);
-    }
-
-    @Parameters
-    public static Collection<Object[]>data() {
-        Object[][] data = new Object[][] {
-            {new Configuration(Circle.class, "centerX", 255.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY})},
-            {new Configuration(Circle.class, "centerY", 552.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY})},
-            {new Configuration(Circle.class, "radius", 55.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY})},
-            {new Configuration(CubicCurve.class, "startX", 5.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY})}
-        };
-        return Arrays.asList(data);
+    public static Stream<Arguments> data() {
+        return Stream.of(
+            Arguments.of( new Configuration(Circle.class, "centerX", 255.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY}) ),
+            Arguments.of( new Configuration(Circle.class, "centerY", 552.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY}) ),
+            Arguments.of( new Configuration(Circle.class, "radius", 55.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY}) ),
+            Arguments.of( new Configuration(CubicCurve.class, "startX", 5.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY}) )
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Circle_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Circle_properties_Test.java
index 6e011d7dd69..8b16ac9786c 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Circle_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Circle_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,30 +25,21 @@
 
 package test.javafx.scene.shape;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.scene.shape.Circle;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.PropertiesTestBase;
 
-@RunWith(Parameterized.class)
 public final class Circle_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
+
+    public static Stream<Arguments> data() {
         final Circle testCircle = new Circle();
 
-        return Arrays.asList(new Object[] {
+        return Stream.of(
             config(testCircle, "centerX", 0.0, 100.0),
             config(testCircle, "centerY", 0.0, 100.0),
             config(testCircle, "radius", 50.0, 150.0)
-        });
-    }
-
-    public Circle_properties_Test(final Configuration configuration) {
-        super(configuration);
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/ClosePathTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/ClosePathTest.java
index 8c33d8aa883..3f10822fc2b 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/ClosePathTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/ClosePathTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,13 +28,16 @@
 import com.sun.javafx.sg.prism.NGPath;
 import javafx.scene.shape.ClosePath;
 import javafx.scene.shape.ClosePathShim;
-import org.junit.Test;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class ClosePathTest {
 
-    @Test public void testAddTo() throws Exception {
+    @Test
+    public void testAddTo() throws Exception {
         final StubPathImpl pgPath = new StubPathImpl();
         ClosePath closePath = new ClosePath();
         ClosePathShim.addTo(closePath, pgPath);
@@ -42,7 +45,8 @@ public class ClosePathTest {
 
     }
 
-    @Test public void toStringShouldReturnNonEmptyString() {
+    @Test
+    public void toStringShouldReturnNonEmptyString() {
         String s = new ClosePath().toString();
         assertNotNull(s);
         assertFalse(s.isEmpty());
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/CubicCurveTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/CubicCurveTest.java
index 25a21d98990..8c944a4032d 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/CubicCurveTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/CubicCurveTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,9 +30,11 @@
 import javafx.scene.Node;
 import test.javafx.scene.NodeTest;
 import javafx.scene.shape.CubicCurve;
-import org.junit.Test;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import test.com.sun.javafx.scene.shape.StubCubicCurveHelper;
 
 public class CubicCurveTest {
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/CubicCurveToTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/CubicCurveToTest.java
index 7cc5f839685..2943884b89f 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/CubicCurveToTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/CubicCurveToTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,65 +34,79 @@
 import javafx.scene.Group;
 import test.javafx.scene.NodeTest;
 import javafx.scene.Scene;
-import org.junit.Test;
 
 import java.lang.reflect.Method;
 import javafx.scene.shape.CubicCurveTo;
 import javafx.scene.shape.MoveTo;
 import javafx.scene.shape.Path;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 
 public class CubicCurveToTest {
 
-    @Test public void testSetGetX() throws Exception {
+    @Test
+    public void testSetGetX() throws Exception {
         TestUtils.testDoublePropertyGetterSetter(new CubicCurveTo(), "x", 123.2f, 0.0f);
     }
 
-    @Test public void testSetGetControlX1() throws Exception {
+    @Test
+    public void testSetGetControlX1() throws Exception {
         TestUtils.testDoublePropertyGetterSetter(new CubicCurveTo(), "controlX1", 123.2f, 0.0f);
     }
 
-    @Test public void testSetGetControlX2() throws Exception {
+    @Test
+    public void testSetGetControlX2() throws Exception {
         TestUtils.testDoublePropertyGetterSetter(new CubicCurveTo(), "controlX2", 123.2f, 0.0f);
     }
 
-    @Test public void testSetGetControlY1() throws Exception {
+    @Test
+    public void testSetGetControlY1() throws Exception {
         TestUtils.testDoublePropertyGetterSetter(new CubicCurveTo(), "controlY1", 123.2f, 0.0f);
     }
 
-    @Test public void testSetGetControlY2() throws Exception {
+    @Test
+    public void testSetGetControlY2() throws Exception {
         TestUtils.testDoublePropertyGetterSetter(new CubicCurveTo(), "controlY2", 123.2f, 0.0f);
     }
 
     //TODO testAddTo
 
-    @Test public void testDoublePropertySynced_X() throws Exception {
+    @Test
+    public void testDoublePropertySynced_X() throws Exception {
         checkSyncedProperty("x", Coords.X, 123.4);
     }
 
-   @Test public void testDoublePropertySynced_Y() throws Exception {
+   @Test
+   public void testDoublePropertySynced_Y() throws Exception {
         checkSyncedProperty("y", Coords.Y, 432.1);
     }
 
-   @Test public void testDoublePropertySynced_ControlX1() throws Exception {
+   @Test
+   public void testDoublePropertySynced_ControlX1() throws Exception {
         checkSyncedProperty("controlX1", Coords.CONTROL_X1, 11.1);
     }
 
-   @Test public void testDoublePropertySynced_ControlY1() throws Exception {
+   @Test
+   public void testDoublePropertySynced_ControlY1() throws Exception {
         checkSyncedProperty("controlY1", Coords.CONTROL_Y1, 22.2);
     }
 
-   @Test public void testDoublePropertySynced_ControlX2() throws Exception {
+   @Test
+   public void testDoublePropertySynced_ControlX2() throws Exception {
         checkSyncedProperty("controlX2", Coords.CONTROL_X2, 1.1);
     }
 
-   @Test public void testDoublePropertySynced_ControlY2() throws Exception {
+   @Test
+   public void testDoublePropertySynced_ControlY2() throws Exception {
         checkSyncedProperty("controlY2", Coords.CONTROL_Y2, 2.2);
     }
 
-    @Test public void toStringShouldReturnNonEmptyString() {
+    @Test
+    public void toStringShouldReturnNonEmptyString() {
         String s = new CubicCurveTo().toString();
         assertNotNull(s);
         assertFalse(s.isEmpty());
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/CubicCurveTo_onInvalidate_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/CubicCurveTo_onInvalidate_Test.java
index ec20bfdb191..0a027aaa1a8 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/CubicCurveTo_onInvalidate_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/CubicCurveTo_onInvalidate_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,35 +25,24 @@
 
 package test.javafx.scene.shape;
 
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import java.util.stream.Stream;
 
 import com.sun.javafx.scene.DirtyBits;
 import javafx.scene.shape.CubicCurveTo;
+
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.OnInvalidateMethodsTestBase;
 
-@RunWith(Parameterized.class)
 public class CubicCurveTo_onInvalidate_Test extends OnInvalidateMethodsTestBase {
 
-    public CubicCurveTo_onInvalidate_Test(Configuration config) {
-        super(config);
-    }
-
-    @Parameters
-    public static Collection<Object[]> data() {
-        Object[][] data = new Object[][] {
-            {new Configuration(CubicCurveTo.class, "x", 100.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_CONTENTS})},
-            {new Configuration(CubicCurveTo.class, "y", 100.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_CONTENTS})},
-            {new Configuration(CubicCurveTo.class, "controlX1", 10.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_CONTENTS})},
-            {new Configuration(CubicCurveTo.class, "controlY1", 122.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_CONTENTS})},
-            {new Configuration(CubicCurveTo.class, "controlX2", 45.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_CONTENTS})},
-            {new Configuration(CubicCurveTo.class, "controlY2", 55.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_CONTENTS})}
-
-        };
-        return Arrays.asList(data);
+    public static Stream<Arguments> data() {
+        return Stream.of(
+            Arguments.of( new Configuration(CubicCurveTo.class, "x", 100.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_CONTENTS}) ),
+            Arguments.of( new Configuration(CubicCurveTo.class, "y", 100.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_CONTENTS}) ),
+            Arguments.of( new Configuration(CubicCurveTo.class, "controlX1", 10.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_CONTENTS}) ),
+            Arguments.of( new Configuration(CubicCurveTo.class, "controlY1", 122.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_CONTENTS}) ),
+            Arguments.of( new Configuration(CubicCurveTo.class, "controlX2", 45.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_CONTENTS}) ),
+            Arguments.of( new Configuration(CubicCurveTo.class, "controlY2", 55.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_CONTENTS}) )
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/CubicCurveTo_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/CubicCurveTo_properties_Test.java
index 5969f56828b..2cd0fa3c3ed 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/CubicCurveTo_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/CubicCurveTo_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,33 +25,24 @@
 
 package test.javafx.scene.shape;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.scene.shape.CubicCurveTo;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.PropertiesTestBase;
 
-@RunWith(Parameterized.class)
 public final class CubicCurveTo_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
+
+    public static Stream<Arguments> data() {
         final CubicCurveTo testCubicCurveTo = new CubicCurveTo();
 
-        return Arrays.asList(new Object[] {
+        return Stream.of(
             config(testCubicCurveTo, "controlX1", 20.0, 120.0),
             config(testCubicCurveTo, "controlY1", 40.0, 140.0),
             config(testCubicCurveTo, "controlX2", 40.0, 140.0),
             config(testCubicCurveTo, "controlY2", 20.0, 120.0),
             config(testCubicCurveTo, "x", 0.0, 100.0),
             config(testCubicCurveTo, "y", 0.0, 100.0)
-        });
-    }
-
-    public CubicCurveTo_properties_Test(final Configuration configuration) {
-        super(configuration);
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/CubicCurve_onInvalidate_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/CubicCurve_onInvalidate_Test.java
index b47ca813618..b19476da9ee 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/CubicCurve_onInvalidate_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/CubicCurve_onInvalidate_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,36 +25,26 @@
 
 package test.javafx.scene.shape;
 
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import java.util.stream.Stream;
 
 import com.sun.javafx.scene.DirtyBits;
 import javafx.scene.shape.CubicCurve;
+
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.OnInvalidateMethodsTestBase;
 
-@RunWith(Parameterized.class)
 public class CubicCurve_onInvalidate_Test extends OnInvalidateMethodsTestBase {
 
-    public CubicCurve_onInvalidate_Test(Configuration configuration) {
-        super(configuration);
-    }
-
-    @Parameters
-    public static Collection<Object[]>data() {
-        Object[][] data = new Object[][] {
-            {new Configuration(CubicCurve.class, "startX", 5.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY})},
-            {new Configuration(CubicCurve.class, "startY", 5.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY})},
-            {new Configuration(CubicCurve.class, "controlX1", 15.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY})},
-            {new Configuration(CubicCurve.class, "controlY1", 77.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY})},
-            {new Configuration(CubicCurve.class, "controlX2", 33.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY})},
-            {new Configuration(CubicCurve.class, "controlY2", 44.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY})},
-            {new Configuration(CubicCurve.class, "endX", 777.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY})},
-            {new Configuration(CubicCurve.class, "endY", 555.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY})}
-        };
-        return Arrays.asList(data);
+    public static Stream<Arguments> data() {
+        return Stream.of(
+            Arguments.of( new Configuration(CubicCurve.class, "startX", 5.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY}) ),
+            Arguments.of( new Configuration(CubicCurve.class, "startY", 5.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY}) ),
+            Arguments.of( new Configuration(CubicCurve.class, "controlX1", 15.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY}) ),
+            Arguments.of( new Configuration(CubicCurve.class, "controlY1", 77.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY}) ),
+            Arguments.of( new Configuration(CubicCurve.class, "controlX2", 33.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY}) ),
+            Arguments.of( new Configuration(CubicCurve.class, "controlY2", 44.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY}) ),
+            Arguments.of( new Configuration(CubicCurve.class, "endX", 777.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY}) ),
+            Arguments.of( new Configuration(CubicCurve.class, "endY", 555.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY}) )
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/CubicCurve_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/CubicCurve_properties_Test.java
index c3782dc1a1f..56373bc545a 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/CubicCurve_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/CubicCurve_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,23 +25,18 @@
 
 package test.javafx.scene.shape;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.scene.shape.CubicCurve;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.PropertiesTestBase;
 
-@RunWith(Parameterized.class)
 public final class CubicCurve_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
+
+    public static Stream<Arguments> data() {
         final CubicCurve testCubicCurve = new CubicCurve();
 
-        return Arrays.asList(new Object[] {
+        return Stream.of(
             config(testCubicCurve, "startX", 0.0, 100.0),
             config(testCubicCurve, "startY", 0.0, 100.0),
             config(testCubicCurve, "controlX1", 20.0, 120.0),
@@ -50,10 +45,6 @@ public static Collection data() {
             config(testCubicCurve, "controlY2", 20.0, 120.0),
             config(testCubicCurve, "endX", 100.0, 200.0),
             config(testCubicCurve, "endY", 100.0, 200.0)
-        });
-    }
-
-    public CubicCurve_properties_Test(final Configuration configuration) {
-        super(configuration);
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/CylinderTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/CylinderTest.java
index 7b838b6ebaa..8601c0bdd03 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/CylinderTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/CylinderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,8 +28,10 @@
 import com.sun.javafx.scene.NodeHelper;
 import javafx.geometry.BoundingBox;
 import javafx.scene.shape.Cylinder;
-import static org.junit.Assert.*;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class CylinderTest {
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/EllipseTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/EllipseTest.java
index 65e8476c326..5f0c3aa9320 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/EllipseTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/EllipseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,60 +32,69 @@
 import javafx.scene.Node;
 import test.javafx.scene.NodeTest;
 import javafx.scene.shape.Ellipse;
-import org.junit.Test;
 
-import static test.com.sun.javafx.test.TestHelper.assertSimilar;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import test.com.sun.javafx.scene.shape.StubEllipseHelper;
+import static test.com.sun.javafx.test.TestHelper.assertSimilar;
 
 
 public class EllipseTest {
 
-    @Test public void testPropertyPropagation_visible() throws Exception {
+    @Test
+    public void testPropertyPropagation_visible() throws Exception {
         final Ellipse node = new StubEllipse();
         NodeTest.testBooleanPropertyPropagation(node, "visible", false, true);
     }
 
-    @Test public void testPropertyPropagation_centerX() throws Exception {
+    @Test
+    public void testPropertyPropagation_centerX() throws Exception {
         final Ellipse node = new StubEllipse();
         NodeTest.testDoublePropertyPropagation(node, "centerX", 100, 200);
     }
 
-    @Test public void testPropertyPropagation_centerY() throws Exception {
+    @Test
+    public void testPropertyPropagation_centerY() throws Exception {
         final Ellipse node = new StubEllipse();
         NodeTest.testDoublePropertyPropagation(node, "centerY", 100, 200);
     }
 
-    @Test public void testPropertyPropagation_radiusX() throws Exception {
+    @Test
+    public void testPropertyPropagation_radiusX() throws Exception {
         final Ellipse node = new StubEllipse();
         NodeTest.testDoublePropertyPropagation(node, "radiusX", 100, 200);
     }
 
-    @Test public void testPropertyPropagation_radiusY() throws Exception {
+    @Test
+    public void testPropertyPropagation_radiusY() throws Exception {
         final Ellipse node = new StubEllipse();
         NodeTest.testDoublePropertyPropagation(node, "radiusY", 100, 200);
     }
 
-    @Test public void testBoundPropertySync_radiusX() throws Exception {
+    @Test
+    public void testBoundPropertySync_radiusX() throws Exception {
         NodeTest.assertDoublePropertySynced(
                 new StubEllipse(300.0, 300.0, 100.0, 100.0),
                 "radiusX", "radiusX", 150.0);
     }
 
-    @Test public void testBoundPropertySync_radiusY() throws Exception {
+    @Test
+    public void testBoundPropertySync_radiusY() throws Exception {
         NodeTest.assertDoublePropertySynced(
                 new StubEllipse(300.0, 300.0, 100.0, 100.0),
                 "radiusY", "radiusY", 150.0);
     }
 
-    @Test public void testBoundPropertySync_centerX() throws Exception {
+    @Test
+    public void testBoundPropertySync_centerX() throws Exception {
         NodeTest.assertDoublePropertySynced(
                 new StubEllipse(300.0, 300.0, 100.0, 100.0),
                 "centerX", "centerX", 10.0);
     }
 
-    @Test public void testBoundPropertySync_centerY() throws Exception {
+    @Test
+    public void testBoundPropertySync_centerY() throws Exception {
         NodeTest.assertDoublePropertySynced(
                 new StubEllipse(300.0, 300.0, 100.0, 100.0),
                 "centerY", "centerY", 10.0);
@@ -100,7 +109,8 @@ public void testTransformedBounds_rotation() {
                 original.getHeight(), original.getWidth()), e.getBoundsInParent());
     }
 
-    @Test public void toStringShouldReturnNonEmptyString() {
+    @Test
+    public void toStringShouldReturnNonEmptyString() {
         String s = new StubEllipse().toString();
         assertNotNull(s);
         assertFalse(s.isEmpty());
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Ellipse_onInvalidate_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Ellipse_onInvalidate_Test.java
index 242a6fc8388..d575b1be580 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Ellipse_onInvalidate_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Ellipse_onInvalidate_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,32 +25,22 @@
 
 package test.javafx.scene.shape;
 
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import java.util.stream.Stream;
 
 import com.sun.javafx.scene.DirtyBits;
 import javafx.scene.shape.Ellipse;
+
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.OnInvalidateMethodsTestBase;
 
-@RunWith(Parameterized.class)
 public class Ellipse_onInvalidate_Test extends OnInvalidateMethodsTestBase {
 
-    public Ellipse_onInvalidate_Test(Configuration config) {
-        super(config);
-    }
-
-    @Parameters
-    public static Collection<Object[]>data() {
-        Object[][] data = new Object[][] {
-            {new Configuration(Ellipse.class, "centerX", 25.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY})},
-            {new Configuration(Ellipse.class, "centerY", 75.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY})},
-            {new Configuration(Ellipse.class, "radiusX", 5.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY})},
-            {new Configuration(Ellipse.class, "radiusY", 11.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY})}
-        };
-        return Arrays.asList(data);
+    public static Stream<Arguments> data() {
+        return Stream.of(
+            Arguments.of( new Configuration(Ellipse.class, "centerX", 25.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY}) ),
+            Arguments.of( new Configuration(Ellipse.class, "centerY", 75.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY}) ),
+            Arguments.of( new Configuration(Ellipse.class, "radiusX", 5.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY}) ),
+            Arguments.of( new Configuration(Ellipse.class, "radiusY", 11.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY}) )
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Ellipse_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Ellipse_properties_Test.java
index adb8df3be47..be1d4b40720 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Ellipse_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Ellipse_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,31 +25,22 @@
 
 package test.javafx.scene.shape;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.scene.shape.Ellipse;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.PropertiesTestBase;
 
-@RunWith(Parameterized.class)
 public final class Ellipse_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
+
+    public static Stream<Arguments> data() {
         final Ellipse testEllipse = new Ellipse();
 
-        return Arrays.asList(new Object[] {
+        return Stream.of(
             config(testEllipse, "centerX", 0.0, 100.0),
             config(testEllipse, "centerY", 0.0, 100.0),
             config(testEllipse, "radiusX", 50.0, 150.0),
             config(testEllipse, "radiusY", 50.0, 150.0)
-        });
-    }
-
-    public Ellipse_properties_Test(final Configuration configuration) {
-        super(configuration);
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/HLineToTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/HLineToTest.java
index 489cd31d1e3..29df37b7559 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/HLineToTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/HLineToTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,13 +38,16 @@
 import javafx.scene.shape.HLineTo;
 import javafx.scene.shape.MoveTo;
 import javafx.scene.shape.Path;
-import org.junit.Test;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class HLineToTest {
 
-     @Test public void testAddTo() throws Exception {
+    @Test
+    public void testAddTo() throws Exception {
         Path2D path = new Path2D();
         path.moveTo(0f, 0f);
         final HLineTo hLineTo = new HLineTo(1f);
@@ -53,7 +56,8 @@ public class HLineToTest {
         assertEquals(0.0, path.getCurrentPoint().y, 0.0001f);
     }
 
-    @Test public void testDoublePropertySynced_X() {
+    @Test
+    public void testDoublePropertySynced_X() {
         double expected = 123.4;
         HLineTo hlineTo = new HLineTo(100.0);
         DoubleProperty v = new SimpleDoubleProperty(100.0);
@@ -76,7 +80,8 @@ public class HLineToTest {
         assertEquals(expected, coords[0], 0.001);
     }
 
-    @Test public void toStringShouldReturnNonEmptyString() {
+    @Test
+    public void toStringShouldReturnNonEmptyString() {
         String s = new HLineTo().toString();
         assertNotNull(s);
         assertFalse(s.isEmpty());
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/HLineTo_onInvalidate_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/HLineTo_onInvalidate_Test.java
index a63a519a19f..86cf90d8ffe 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/HLineTo_onInvalidate_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/HLineTo_onInvalidate_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,29 +25,19 @@
 
 package test.javafx.scene.shape;
 
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import java.util.stream.Stream;
 
 import com.sun.javafx.scene.DirtyBits;
 import javafx.scene.shape.HLineTo;
+
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.OnInvalidateMethodsTestBase;
 
-@RunWith(Parameterized.class)
 public class HLineTo_onInvalidate_Test extends OnInvalidateMethodsTestBase {
 
-    public HLineTo_onInvalidate_Test(Configuration config) {
-        super(config);
-    }
-
-    @Parameters
-    public static Collection<Object[]> data() {
-        Object[][] data = new Object[][] {
-            {new Configuration(HLineTo.class, "x", 100.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_CONTENTS})}
-        };
-        return Arrays.asList(data);
+    public static Stream<Arguments> data() {
+        return Stream.of(
+            Arguments.of( new Configuration(HLineTo.class, "x", 100.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_CONTENTS}) )
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/HLineTo_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/HLineTo_properties_Test.java
index b1bb3f79cad..310da36af7e 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/HLineTo_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/HLineTo_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,28 +25,19 @@
 
 package test.javafx.scene.shape;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.scene.shape.HLineTo;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.PropertiesTestBase;
 
-@RunWith(Parameterized.class)
 public final class HLineTo_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
+
+    public static Stream<Arguments> data() {
         final HLineTo testHLineTo = new HLineTo();
 
-        return Arrays.asList(new Object[] {
+        return Stream.of(
             config(testHLineTo, "x", 50.0, 100.0)
-        });
-    }
-
-    public HLineTo_properties_Test(final Configuration configuration) {
-        super(configuration);
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/LineTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/LineTest.java
index 00c66ac61dc..871473c4c98 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/LineTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/LineTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,10 +30,10 @@
 import javafx.scene.Node;
 import test.javafx.scene.NodeTest;
 import javafx.scene.shape.Line;
-import org.junit.Test;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import test.com.sun.javafx.scene.shape.StubLineHelper;
 
 public class LineTest {
@@ -68,31 +68,36 @@ public void testPropertyPropagation_endY() throws Exception {
         NodeTest.testDoublePropertyPropagation(node, "endY", "y2", 100, 200);
     }
 
-    @Test public void testBoundPropertySync_startX() throws Exception {
+    @Test
+    public void testBoundPropertySync_startX() throws Exception {
         NodeTest.assertDoublePropertySynced(
                 new StubLine(0.0 ,0.0, 100.0, 100.0),
                 "startX", "x1", 10.0);
     }
 
-    @Test public void testBoundPropertySync_startY() throws Exception {
+    @Test
+    public void testBoundPropertySync_startY() throws Exception {
         NodeTest.assertDoublePropertySynced(
                 new StubLine(0.0 ,0.0, 100.0, 100.0),
                 "startY", "y1", 50.0);
     }
 
-    @Test public void testBoundPropertySync_endX() throws Exception {
+    @Test
+    public void testBoundPropertySync_endX() throws Exception {
         NodeTest.assertDoublePropertySynced(
                 new StubLine(0.0 ,0.0, 100.0, 100.0),
                 "endX", "x2", 200.0);
     }
 
-    @Test public void testBoundPropertySync_endY() throws Exception {
+    @Test
+    public void testBoundPropertySync_endY() throws Exception {
         NodeTest.assertDoublePropertySynced(
                 new StubLine(0.0 ,0.0, 100.0, 100.0),
                 "endY", "y2", 300.0);
     }
 
-    @Test public void toStringShouldReturnNonEmptyString() {
+    @Test
+    public void toStringShouldReturnNonEmptyString() {
         String s = new StubLine().toString();
         assertNotNull(s);
         assertFalse(s.isEmpty());
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/LineToTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/LineToTest.java
index c8bd430d52d..a6762bf2d64 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/LineToTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/LineToTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,17 +37,21 @@
 import javafx.scene.shape.LineTo;
 import javafx.scene.shape.MoveTo;
 import javafx.scene.shape.Path;
-import org.junit.Test;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class LineToTest {
 
-    @Test public void testAddTo() throws Exception {
+    @Test
+    public void testAddTo() throws Exception {
         //TODO
     }
 
-    @Test public void testDoublePropertySynced_X() {
+    @Test
+    public void testDoublePropertySynced_X() {
         double expected = 123.4;
         LineTo lineTo = new LineTo(100.0, 100.0);
         DoubleProperty v = new SimpleDoubleProperty(100.0);
@@ -70,7 +74,8 @@ public class LineToTest {
         assertEquals(expected, coords[0], 0.001);
     }
 
-    @Test public void testDoublePropertySynced_Y() {
+    @Test
+    public void testDoublePropertySynced_Y() {
         double expected = 432.1;
         LineTo lineTo = new LineTo(100.0, 200.0);
         DoubleProperty v = new SimpleDoubleProperty(200.0);
@@ -93,7 +98,8 @@ public class LineToTest {
         assertEquals(expected, coords[1], 0.001);
     }
 
-    @Test public void toStringShouldReturnNonEmptyString() {
+    @Test
+    public void toStringShouldReturnNonEmptyString() {
         String s = new LineTo().toString();
         assertNotNull(s);
         assertFalse(s.isEmpty());
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/LineTo_onInvalidate_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/LineTo_onInvalidate_Test.java
index 3b003901d65..4b2c8b905be 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/LineTo_onInvalidate_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/LineTo_onInvalidate_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,30 +25,20 @@
 
 package test.javafx.scene.shape;
 
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import java.util.stream.Stream;
 
 import com.sun.javafx.scene.DirtyBits;
 import javafx.scene.shape.LineTo;
+
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.OnInvalidateMethodsTestBase;
 
-@RunWith(Parameterized.class)
 public class LineTo_onInvalidate_Test extends OnInvalidateMethodsTestBase {
 
-    public LineTo_onInvalidate_Test(Configuration config) {
-        super(config);
-    }
-
-    @Parameters
-    public static Collection<Object[]> data() {
-        Object[][] data = new Object[][] {
-            {new Configuration(LineTo.class, "x", 123.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_CONTENTS})},
-            {new Configuration(LineTo.class, "y", 321.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_CONTENTS})}
-        };
-        return Arrays.asList(data);
+    public static Stream<Arguments> data() {
+        return Stream.of(
+            Arguments.of( new Configuration(LineTo.class, "x", 123.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_CONTENTS})),
+            Arguments.of( new Configuration(LineTo.class, "y", 321.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_CONTENTS}))
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/LineTo_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/LineTo_properties_Test.java
index 458f02497d8..b9f7b0995bb 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/LineTo_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/LineTo_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,29 +25,20 @@
 
 package test.javafx.scene.shape;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.scene.shape.LineTo;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.PropertiesTestBase;
 
-@RunWith(Parameterized.class)
 public final class LineTo_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
+
+    public static Stream<Arguments> data() {
         final LineTo testLineTo = new LineTo();
 
-        return Arrays.asList(new Object[] {
+        return Stream.of(
             config(testLineTo, "x", 50.0, 100.0),
             config(testLineTo, "y", 50.0, 100.0)
-        });
-    }
-
-    public LineTo_properties_Test(final Configuration configuration) {
-        super(configuration);
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Line_onInvalidate_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Line_onInvalidate_Test.java
index a3c7ef8a411..0276915d58a 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Line_onInvalidate_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Line_onInvalidate_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,32 +25,22 @@
 
 package test.javafx.scene.shape;
 
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import java.util.stream.Stream;
 
 import com.sun.javafx.scene.DirtyBits;
 import javafx.scene.shape.Line;
+
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.OnInvalidateMethodsTestBase;
 
-@RunWith(Parameterized.class)
 public class Line_onInvalidate_Test extends OnInvalidateMethodsTestBase {
 
-    public Line_onInvalidate_Test(Configuration config) {
-        super(config);
-    }
-
-    @Parameters
-    public static Collection<Object[]>data() {
-        Object[][] data = new Object[][] {
-            {new Configuration(Line.class, "startX", 10.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY})},
-            {new Configuration(Line.class, "startY", 11.0, new DirtyBits[]{DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY})},
-            {new Configuration(Line.class, "endX", 100.0, new DirtyBits[]{DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY})},
-            {new Configuration(Line.class, "endY", 10.0, new DirtyBits[]{DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY})}
-        };
-        return Arrays.asList(data);
+    public static Stream<Arguments> data() {
+        return Stream.of(
+            Arguments.of( new Configuration(Line.class, "startX", 10.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY}) ),
+            Arguments.of( new Configuration(Line.class, "startY", 11.0, new DirtyBits[]{DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY}) ),
+            Arguments.of( new Configuration(Line.class, "endX", 100.0, new DirtyBits[]{DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY}) ),
+            Arguments.of( new Configuration(Line.class, "endY", 10.0, new DirtyBits[]{DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY}) )
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Line_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Line_properties_Test.java
index d5a84ab21d6..817db0b51bd 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Line_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Line_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,31 +25,22 @@
 
 package test.javafx.scene.shape;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.scene.shape.Line;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.PropertiesTestBase;
 
-@RunWith(Parameterized.class)
 public final class Line_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
+
+    public static Stream<Arguments> data() {
         final Line testLine = new Line();
 
-        return Arrays.asList(new Object[] {
+        return Stream.of(
             config(testLine, "startX", 0.0, 100.0),
             config(testLine, "startY", 0.0, 100.0),
             config(testLine, "endX", 100.0, 0.0),
-            config(testLine, "endY", 100.0, 0.0),
-        });
-    }
-
-    public Line_properties_Test(final Configuration configuration) {
-        super(configuration);
+            config(testLine, "endY", 100.0, 0.0)
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/MoveToTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/MoveToTest.java
index 49e1323945f..4c1804b6d86 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/MoveToTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/MoveToTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,25 +36,31 @@
 import javafx.scene.Scene;
 import javafx.scene.shape.MoveTo;
 import javafx.scene.shape.Path;
-import org.junit.Test;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class MoveToTest {
 
-    @Test public void testAddTo() throws Exception {
+    @Test
+    public void testAddTo() throws Exception {
         //TODO
     }
 
-    @Test public void testSetGetX() throws Exception {
+    @Test
+    public void testSetGetX() throws Exception {
         TestUtils.testDoublePropertyGetterSetter(new MoveTo(), "x", 123.2, 0.0);
     }
 
-    @Test public void testSetGetY() throws Exception {
+    @Test
+    public void testSetGetY() throws Exception {
         TestUtils.testDoublePropertyGetterSetter(new MoveTo(), "y", 123.2, 0.0);
     }
 
-    @Test public void testDoubleBoundPropertySynced_X() {
+    @Test
+    public void testDoubleBoundPropertySynced_X() {
         double expected = 123.4;
         MoveTo moveTo = new MoveTo(10.0, 10.0);
         DoubleProperty v = new SimpleDoubleProperty(10.0);
@@ -75,7 +81,8 @@ public class MoveToTest {
         assertEquals(expected, coords[0], 0.001);
     }
 
-     @Test public void testDoubleBoundPropertySynced_Y() {
+     @Test
+     public void testDoubleBoundPropertySynced_Y() {
          double expected = 432.1;
         MoveTo moveTo = new MoveTo(10.0, 10.0);
         DoubleProperty v = new SimpleDoubleProperty(10.0);
@@ -96,7 +103,8 @@ public class MoveToTest {
         assertEquals(expected, coords[1], 0.001);
     }
 
-    @Test public void toStringShouldReturnNonEmptyString() {
+    @Test
+    public void toStringShouldReturnNonEmptyString() {
         String s = new MoveTo().toString();
         assertNotNull(s);
         assertFalse(s.isEmpty());
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/MoveTo_onInvalidate_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/MoveTo_onInvalidate_Test.java
index a2cb6ab5f02..afa7c511941 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/MoveTo_onInvalidate_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/MoveTo_onInvalidate_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,30 +25,20 @@
 
 package test.javafx.scene.shape;
 
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import java.util.stream.Stream;
 
 import com.sun.javafx.scene.DirtyBits;
 import javafx.scene.shape.MoveTo;
+
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.OnInvalidateMethodsTestBase;
 
-@RunWith(Parameterized.class)
 public class MoveTo_onInvalidate_Test extends OnInvalidateMethodsTestBase {
 
-    public MoveTo_onInvalidate_Test(Configuration config) {
-        super(config);
-    }
-
-    @Parameters
-    public static Collection<Object[]> data() {
-        Object[][] data = new Object[][] {
-            {new Configuration(MoveTo.class, "x", 123.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_CONTENTS})},
-            {new Configuration(MoveTo.class, "y", 321.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_CONTENTS})}
-        };
-        return Arrays.asList(data);
+    public static Stream<Arguments> data() {
+        return Stream.of(
+            Arguments.of( new Configuration(MoveTo.class, "x", 123.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_CONTENTS}) ),
+            Arguments.of( new Configuration(MoveTo.class, "y", 321.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_CONTENTS}) )
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/MoveTo_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/MoveTo_properties_Test.java
index 89f8563f0a4..247e66a28d0 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/MoveTo_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/MoveTo_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,29 +25,20 @@
 
 package test.javafx.scene.shape;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.scene.shape.MoveTo;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.PropertiesTestBase;
 
-@RunWith(Parameterized.class)
 public final class MoveTo_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
+
+    public static Stream<Arguments> data() {
         final MoveTo testMoveTo = new MoveTo();
 
-        return Arrays.asList(new Object[] {
+        return Stream.of(
             config(testMoveTo, "x", 50.0, 100.0),
             config(testMoveTo, "y", 50.0, 100.0)
-        });
-    }
-
-    public MoveTo_properties_Test(final Configuration configuration) {
-        super(configuration);
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/PathTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/PathTest.java
index 6f05ef1a210..259bc8f305f 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/PathTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/PathTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,6 @@
 import javafx.scene.Group;
 import test.javafx.scene.NodeTest;
 import javafx.scene.Scene;
-import org.junit.Test;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -45,12 +44,18 @@
 import javafx.scene.shape.Path;
 import javafx.scene.shape.PathElement;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 
 public class PathTest {
 
-    @Test public void testVarargConstructor() {
+    @Test
+    public void testVarargConstructor() {
         PathElement one = new MoveTo(10, 10);
         PathElement two = new LineTo(20, 20);
         PathElement three = new MoveTo(30, 30);
@@ -61,7 +66,8 @@ public class PathTest {
         assertSame(three, path.getElements().get(2));
     }
 
-    @Test public void testListConstructor() {
+    @Test
+    public void testListConstructor() {
         PathElement one = new MoveTo(10, 10);
         PathElement two = new LineTo(20, 20);
         PathElement three = new MoveTo(30, 30);
@@ -77,7 +83,8 @@ public class PathTest {
         assertSame(three, path.getElements().get(2));
     }
 
-    @Test public void testBoundPropertySync_FillRule() throws Exception {
+    @Test
+    public void testBoundPropertySync_FillRule() throws Exception {
         ObjectProperty<FillRule> v = new SimpleObjectProperty<>(FillRule.EVEN_ODD);
         Path path = new Path();
         path.fillRuleProperty().bind(v);
@@ -90,7 +97,8 @@ public class PathTest {
         assertEquals(geometry.getWindingRule(), FillRule.NON_ZERO.ordinal());
     }
 
-    @Test public void testFirstRelativeElement_PathIsEmpty() {
+    @Test
+    public void testFirstRelativeElement_PathIsEmpty() {
         Path path = new Path();
         final MoveTo moveTo = new MoveTo(10, 10);
         moveTo.setAbsolute(false);
@@ -101,7 +109,8 @@ public class PathTest {
         assertTrue(piterator.isDone());//path is empty
     }
 
-     @Test public void testFirstRelativeElement_BoundsAreEmpty() {
+     @Test
+     public void testFirstRelativeElement_BoundsAreEmpty() {
         Path path = new Path();
          final MoveTo moveTo = new MoveTo(10, 10);
          moveTo.setAbsolute(false);
@@ -110,7 +119,8 @@ public class PathTest {
         assertTrue(path.getBoundsInLocal().isEmpty() && path.getBoundsInParent().isEmpty());
     }
 
-    @Test public void testFirstElementIsNotMoveTo_PathIsEmpty() {
+    @Test
+    public void testFirstElementIsNotMoveTo_PathIsEmpty() {
         Path path = new Path();
         path.getElements().add(new LineTo(10, 10));
         path.getElements().add(new LineTo(100, 100));
@@ -119,14 +129,16 @@ public class PathTest {
         assertTrue(piterator.isDone());//path is empty
     }
 
-    @Test public void testFirstElementIsNotMoveTo_BoundsAreEmpty() {
+    @Test
+    public void testFirstElementIsNotMoveTo_BoundsAreEmpty() {
         Path path = new Path();
         path.getElements().add(new LineTo(10, 10));
         path.getElements().add(new LineTo(100, 100));
         assertTrue(path.getBoundsInLocal().isEmpty() && path.getBoundsInParent().isEmpty());
     }
 
-    @Test public void testFillRuleSync() {
+    @Test
+    public void testFillRuleSync() {
         Path path = new Path();
         path.getElements().add(new MoveTo(10, 10));
         path.getElements().add(new LineTo(100, 10));
@@ -143,13 +155,15 @@ public class PathTest {
         assertEquals(Path2D.WIND_NON_ZERO, geometry.getWindingRule());
     }
 
-    @Test public void toStringShouldReturnNonEmptyString() {
+    @Test
+    public void toStringShouldReturnNonEmptyString() {
         String s = new Path().toString();
         assertNotNull(s);
         assertFalse(s.isEmpty());
     }
 
-    @Test public void testPathElementIsAbsoluteAfterAbsoluteProperty() {
+    @Test
+    public void testPathElementIsAbsoluteAfterAbsoluteProperty() {
         PathElement element = new VLineTo();
         assertTrue(element.isAbsolute());
         assertTrue(element.absoluteProperty().getValue());
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Path_onInvalidate_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Path_onInvalidate_Test.java
index cef183d3d73..e68c51deecc 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Path_onInvalidate_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Path_onInvalidate_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,30 +25,20 @@
 
 package test.javafx.scene.shape;
 
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import java.util.stream.Stream;
 
 import com.sun.javafx.scene.DirtyBits;
 import javafx.scene.shape.FillRule;
 import javafx.scene.shape.Path;
+
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.OnInvalidateMethodsTestBase;
 
-@RunWith(Parameterized.class)
 public class Path_onInvalidate_Test extends OnInvalidateMethodsTestBase {
 
-    public Path_onInvalidate_Test(Configuration config) {
-        super(config);
-    }
-
-    @Parameters
-    public static Collection<Object[]>data() {
-        Object[][] data = new Object[][] {
-            {new Configuration(Path.class, "fillRule", FillRule.EVEN_ODD, new DirtyBits[]{DirtyBits.NODE_CONTENTS, DirtyBits.NODE_BOUNDS})}
-        };
-        return Arrays.asList(data);
+    public static Stream<Arguments> data() {
+        return Stream.of(
+            Arguments.of( new Configuration(Path.class, "fillRule", FillRule.EVEN_ODD, new DirtyBits[]{DirtyBits.NODE_CONTENTS, DirtyBits.NODE_BOUNDS}) )
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Path_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Path_properties_Test.java
index aa753017f38..f428311771e 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Path_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Path_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,29 +25,20 @@
 
 package test.javafx.scene.shape;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.scene.shape.FillRule;
 import javafx.scene.shape.Path;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.PropertiesTestBase;
 
-@RunWith(Parameterized.class)
 public final class Path_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
+
+    public static Stream<Arguments> data() {
         final Path testPath = new Path();
 
-        return Arrays.asList(new Object[] {
+        return Stream.of(
             config(testPath, "fillRule", FillRule.NON_ZERO, FillRule.EVEN_ODD)
-        });
-    }
-
-    public Path_properties_Test(final Configuration configuration) {
-        super(configuration);
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/PolygonTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/PolygonTest.java
index b8bd14dff83..3f3bbe12224 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/PolygonTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/PolygonTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,20 +35,25 @@
 import javafx.scene.Node;
 import test.javafx.scene.NodeTest;
 import javafx.scene.shape.Polygon;
-import org.junit.Test;
 
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static test.com.sun.javafx.test.TestHelper.assertBoundsEqual;
 import static test.com.sun.javafx.test.TestHelper.box;
-import static org.junit.Assert.*;
 
 public class PolygonTest {
-    @Test public void testPropertyPropagation_emptyPoints() {
+    @Test
+    public void testPropertyPropagation_emptyPoints() {
         final StubPolygon polygon = new StubPolygon();
         NodeTest.callSyncPGNode(polygon);
         assertPGPolygonPointsEquals(polygon, new double[0]);
     }
 
-    @Test public void testPropertyPropagation_pointsEvenLength() {
+    @Test
+    public void testPropertyPropagation_pointsEvenLength() {
         final double[] initialPoints = { 10, 20, 100, 200, 200, 100, 50, 10 };
 
         final StubPolygon polygon = new StubPolygon(initialPoints);
@@ -63,7 +68,8 @@ public class PolygonTest {
         assertPGPolygonPointsEquals(polygon, 10, 100, 200, 100, 50, 10);
     }
 
-    @Test public void testPropertyPropagation_pointsOddLength() {
+    @Test
+    public void testPropertyPropagation_pointsOddLength() {
         final double[] initialPoints = { 10, 20, 100, 200, 200 };
 
         final StubPolygon polygon = new StubPolygon(initialPoints);
@@ -78,17 +84,20 @@ public class PolygonTest {
         assertPGPolygonPointsEquals(polygon, 10, 20, 100, 200, 200, 100, 50);
     }
 
-    @Test public void testPropertyPropagation_visible() throws Exception {
+    @Test
+    public void testPropertyPropagation_visible() throws Exception {
         final StubPolygon polygon = new StubPolygon();
         NodeTest.testBooleanPropertyPropagation(polygon, "visible", false, true);
     }
 
-    @Test public void testBounds_emptyPoints() {
+    @Test
+    public void testBounds_emptyPoints() {
         final StubPolygon polygon = new StubPolygon();
         assertBoundsEqual(box(0, 0, -1, -1), polygon.getBoundsInLocal());
     }
 
-    @Test public void testBounds_evenPointsLength() {
+    @Test
+    public void testBounds_evenPointsLength() {
         final double[] initialPoints = { 100, 100, 200, 100, 200, 200 };
 
         final StubPolygon polygon = new StubPolygon(initialPoints);
@@ -101,7 +110,8 @@ public class PolygonTest {
         assertBoundsEqual(box(100, 100, 100, 200), polygon.getBoundsInLocal());
     }
 
-    @Test public void testBounds_oddPointsLength() {
+    @Test
+    public void testBounds_oddPointsLength() {
         final double[] initialPoints = {
             100, 100, 200, 100, 200, 200, 150, 300
         };
@@ -115,7 +125,8 @@ public class PolygonTest {
         assertBoundsEqual(box(100, 100, 100, 100), polygon.getBoundsInLocal());
     }
 
-    @Test public void testConfigShape() throws Exception {
+    @Test
+    public void testConfigShape() throws Exception {
         final StubPolygon polygon =
                 new StubPolygon(new double[] { 0, 0, 0, 1, 1, 1, 1, 0 });
         final Path2D path = (Path2D) ShapeHelper.configShape(polygon);
@@ -146,7 +157,8 @@ private static void assertPGPolygonPointsEquals(
         }
     }
 
-    @Test public void toStringShouldReturnNonEmptyString() {
+    @Test
+    public void toStringShouldReturnNonEmptyString() {
         String s = new Polygon().toString();
         assertNotNull(s);
         assertFalse(s.isEmpty());
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/PolylineTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/PolylineTest.java
index 3b182aa49a8..9379e75acfb 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/PolylineTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/PolylineTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,14 +33,20 @@
 import javafx.scene.Node;
 import test.javafx.scene.NodeTest;
 import javafx.scene.shape.Polyline;
-import org.junit.Test;
 
-import static test.com.sun.javafx.test.TestHelper.*;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static test.com.sun.javafx.test.TestHelper.box;
+import static test.com.sun.javafx.test.TestHelper.assertBoundsEqual;
+import static test.com.sun.javafx.test.TestHelper.assertSimilar;
 
 public final class PolylineTest {
 
-    @Test public void testVarargConstructor() {
+    @Test
+    public void testVarargConstructor() {
         final StubPolyline polyline = new StubPolyline(1, 2, 3, 4);
         assertEquals(4, polyline.getPoints().size());
         assertEquals(1, polyline.getPoints().get(0), 0.0001);
@@ -49,13 +55,15 @@ public final class PolylineTest {
         assertEquals(4, polyline.getPoints().get(3), 0.0001);
     }
 
-    @Test public void testPropertyPropagation_emptyPoints() {
+    @Test
+    public void testPropertyPropagation_emptyPoints() {
         final StubPolyline polyline = new StubPolyline();
         NodeTest.callSyncPGNode(polyline);
         assertPGPolylinePointsEquals(polyline, new double[0]);
     }
 
-    @Test public void testPropertyPropagation_pointsEvenLength() {
+    @Test
+    public void testPropertyPropagation_pointsEvenLength() {
         final double[] initialPoints = { 10, 20, 100, 200, 200, 100, 50, 10 };
 
         final StubPolyline polyline = new StubPolyline(initialPoints);
@@ -70,7 +78,8 @@ public final class PolylineTest {
         assertPGPolylinePointsEquals(polyline, 10, 100, 200, 100, 50, 10);
     }
 
-    @Test public void testPropertyPropagation_pointsOddLength() {
+    @Test
+    public void testPropertyPropagation_pointsOddLength() {
         final double[] initialPoints = { 10, 20, 100, 200, 200 };
 
         final StubPolyline polyline = new StubPolyline(initialPoints);
@@ -85,12 +94,14 @@ public final class PolylineTest {
         assertPGPolylinePointsEquals(polyline, 10, 20, 100, 200, 200, 100, 50);
     }
 
-    @Test public void testBounds_emptyPoints() {
+    @Test
+    public void testBounds_emptyPoints() {
         final StubPolyline polyline = new StubPolyline();
         assertBoundsEqual(box(0, 0, -1, -1), polyline.getBoundsInLocal());
     }
 
-    @Test public void testBounds_evenPointsLength() {
+    @Test
+    public void testBounds_evenPointsLength() {
         final double[] initialPoints = { 100, 100, 200, 100, 200, 200 };
 
         final StubPolyline polyline = new StubPolyline(initialPoints);
@@ -103,7 +114,8 @@ public final class PolylineTest {
         assertSimilar(box(100, 100, 100, 200), polyline.getBoundsInLocal());
     }
 
-    @Test public void testBounds_oddPointsLength() {
+    @Test
+    public void testBounds_oddPointsLength() {
         final double[] initialPoints = {
             100, 100, 200, 100, 200, 200, 200, 300
         };
@@ -140,7 +152,8 @@ private static void assertPGPolylinePointsEquals(
         }
     }
 
-    @Test public void toStringShouldReturnNonEmptyString() {
+    @Test
+    public void toStringShouldReturnNonEmptyString() {
         String s = new StubPolyline().toString();
         assertNotNull(s);
         assertFalse(s.isEmpty());
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/PredefinedMeshManagerTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/PredefinedMeshManagerTest.java
index 0aae47034f4..2685aa7218b 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/PredefinedMeshManagerTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/PredefinedMeshManagerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
 
 package test.javafx.scene.shape;
 
-import static org.junit.Assert.*;
 
 import javafx.scene.shape.Box;
 import javafx.scene.shape.Cylinder;
@@ -33,14 +32,15 @@
 import javafx.scene.shape.Shape3D;
 import javafx.scene.shape.Sphere;
 
-import org.junit.Before;
-import org.junit.Test;
-
 import com.sun.javafx.scene.NodeHelper;
 
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class PredefinedMeshManagerTest {
 
-    @Before
+    @BeforeEach
     public void clearCaches() {
         PredefinedMeshManagerShim.clearCaches();
     }
@@ -61,7 +61,7 @@ else if (shape instanceof Cylinder) {
             size = PredefinedMeshManagerShim.getCylinderCacheSize();
             name = "cylinder";
         }
-        assertEquals("Added a " + name + " - cache should contain " + correctSize + " mesh.", correctSize, size);
+        assertEquals(correctSize, size, "Added a " + name + " - cache should contain " + correctSize + " mesh.");
     }
 
     @Test
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/QuadCurveTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/QuadCurveTest.java
index 6b9018b54f4..ca829a840a3 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/QuadCurveTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/QuadCurveTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,79 +31,93 @@
 import javafx.scene.Node;
 import test.javafx.scene.NodeTest;
 import javafx.scene.shape.QuadCurve;
-import org.junit.Test;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 
 public class QuadCurveTest {
 
-    @Test public void testSetGetStartX() throws Exception {
+    @Test
+    public void testSetGetStartX() throws Exception {
         TestUtils.testDoublePropertyGetterSetter(new StubQuadCurve(), "startX", 123.2, 0.0);
     }
 
-    @Test public void testSetGetStartY() throws Exception {
+    @Test
+    public void testSetGetStartY() throws Exception {
         TestUtils.testDoublePropertyGetterSetter(new StubQuadCurve(), "startY", 123.2, 0.0);
     }
 
-    @Test public void testSetGetEndX() throws Exception {
+    @Test
+    public void testSetGetEndX() throws Exception {
         TestUtils.testDoublePropertyGetterSetter(new StubQuadCurve(), "endX", 123.2, 0.0);
     }
 
-    @Test public void testSetGetEndY() throws Exception {
+    @Test
+    public void testSetGetEndY() throws Exception {
         TestUtils.testDoublePropertyGetterSetter(new StubQuadCurve(), "endY", 123.2, 0.0);
     }
 
-    @Test public void testSetGetControlX() throws Exception {
+    @Test
+    public void testSetGetControlX() throws Exception {
         TestUtils.testDoublePropertyGetterSetter(new StubQuadCurve(), "controlX", 123.2, 0.0);
     }
 
-    @Test public void testSetGetControlY() throws Exception {
+    @Test
+    public void testSetGetControlY() throws Exception {
         TestUtils.testDoublePropertyGetterSetter(new StubQuadCurve(), "controlY", 123.2, 0.0);
     }
 
-    @Test public void testPropertyPropagation_visible() throws Exception {
+    @Test
+    public void testPropertyPropagation_visible() throws Exception {
         NodeTest.testBooleanPropertyPropagation(new StubQuadCurve(), "visible", false, true);
     }
 
-    @Test public void testBoundPropertySync_startX() throws Exception {
+    @Test
+    public void testBoundPropertySync_startX() throws Exception {
         NodeTest.assertDoublePropertySynced(
                 new StubQuadCurve(0.0 ,0.0, 10.0, 10.0, 100.0, 100.0),
                 "startX", "x1", 30.0);
     }
 
-    @Test public void testBoundPropertySync_startY() throws Exception {
+    @Test
+    public void testBoundPropertySync_startY() throws Exception {
         NodeTest.assertDoublePropertySynced(
                 new StubQuadCurve(0.0 ,0.0, 10.0, 10.0, 100.0, 100.0),
                 "startY", "y1", 30.0);
     }
 
-    @Test public void testBoundPropertySync_controlX() throws Exception {
+    @Test
+    public void testBoundPropertySync_controlX() throws Exception {
         NodeTest.assertDoublePropertySynced(
                 new StubQuadCurve(0.0 ,0.0, 10.0, 10.0, 100.0, 100.0),
                 "controlX", "ctrlX", 50.0);
     }
 
-    @Test public void testBoundPropertySync_controlY() throws Exception {
+    @Test
+    public void testBoundPropertySync_controlY() throws Exception {
         NodeTest.assertDoublePropertySynced(
                 new StubQuadCurve(0.0 ,0.0, 10.0, 10.0, 100.0, 100.0),
                 "controlY", "ctrlY", 50.0);
     }
 
-    @Test public void testBoundPropertySync_endX() throws Exception {
+    @Test
+    public void testBoundPropertySync_endX() throws Exception {
         NodeTest.assertDoublePropertySynced(
                 new StubQuadCurve(0.0 ,0.0, 10.0, 10.0, 100.0, 100.0),
                 "endX", "x2", 300.0);
     }
 
-    @Test public void testBoundPropertySync_endY() throws Exception {
+    @Test
+    public void testBoundPropertySync_endY() throws Exception {
         NodeTest.assertDoublePropertySynced(
                 new StubQuadCurve(0.0 ,0.0, 10.0, 10.0, 100.0, 100.0),
                 "endY", "y2", 50.0);
     }
 
-    @Test public void toStringShouldReturnNonEmptyString() {
+    @Test
+    public void toStringShouldReturnNonEmptyString() {
         String s = new StubQuadCurve().toString();
         assertNotNull(s);
         assertFalse(s.isEmpty());
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/QuadCurveToTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/QuadCurveToTest.java
index b755a878ac8..dec993b2152 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/QuadCurveToTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/QuadCurveToTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,46 +34,56 @@
 import javafx.scene.Group;
 import test.javafx.scene.NodeTest;
 import javafx.scene.Scene;
-import org.junit.Test;
 
 import java.lang.reflect.Method;
 import javafx.scene.shape.MoveTo;
 import javafx.scene.shape.Path;
 import javafx.scene.shape.QuadCurveTo;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class QuadCurveToTest {
 
-    @Test public void testSetGetX() throws Exception {
+    @Test
+    public void testSetGetX() throws Exception {
         TestUtils.testDoublePropertyGetterSetter(new QuadCurveTo(), "x", 123.2, 0.0);
     }
 
-    @Test public void testSetGetControlX() throws Exception {
+    @Test
+    public void testSetGetControlX() throws Exception {
         TestUtils.testDoublePropertyGetterSetter(new QuadCurveTo(), "controlX", 123.2, 0.0);
     }
 
-    @Test public void testSetGetControlY() throws Exception {
+    @Test
+    public void testSetGetControlY() throws Exception {
         TestUtils.testDoublePropertyGetterSetter(new QuadCurveTo(), "controlY", 123.2, 0.0);
     }
 
-   @Test public void testDoublePropertySynced_X() throws Exception {
+   @Test
+   public void testDoublePropertySynced_X() throws Exception {
         checkSyncedProperty("x", Coords.X, 123.4);
     }
 
-   @Test public void testDoublePropertySynced_Y() throws Exception {
+   @Test
+   public void testDoublePropertySynced_Y() throws Exception {
         checkSyncedProperty("y", Coords.Y, 432.1);
     }
 
-   @Test public void testDoublePropertySynced_ControlX() throws Exception {
+   @Test
+   public void testDoublePropertySynced_ControlX() throws Exception {
         checkSyncedProperty("controlX", Coords.CONTROL_X, 11.1);
     }
 
-   @Test public void testDoublePropertySynced_ControlY() throws Exception {
+   @Test
+   public void testDoublePropertySynced_ControlY() throws Exception {
         checkSyncedProperty("controlY", Coords.CONTROL_Y, 22.2);
     }
 
-    @Test public void toStringShouldReturnNonEmptyString() {
+    @Test
+    public void toStringShouldReturnNonEmptyString() {
         String s = new QuadCurveTo().toString();
         assertNotNull(s);
         assertFalse(s.isEmpty());
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/QuadCurveTo_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/QuadCurveTo_properties_Test.java
index 8638ee663c2..57851ab18de 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/QuadCurveTo_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/QuadCurveTo_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,31 +25,22 @@
 
 package test.javafx.scene.shape;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.scene.shape.QuadCurveTo;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.PropertiesTestBase;
 
-@RunWith(Parameterized.class)
 public final class QuadCurveTo_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
+
+    public static Stream<Arguments> data() {
         final QuadCurveTo testQuadCurveTo = new QuadCurveTo();
 
-        return Arrays.asList(new Object[] {
+        return Stream.of(
             config(testQuadCurveTo, "controlX", 80.0, 180.0),
             config(testQuadCurveTo, "controlY", 20.0, 120.0),
             config(testQuadCurveTo, "x", 100.0, 200.0),
             config(testQuadCurveTo, "y", 100.0, 200.0)
-        });
-    }
-
-    public QuadCurveTo_properties_Test(final Configuration configuration) {
-        super(configuration);
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/QuadCurve_onInvalidate_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/QuadCurve_onInvalidate_Test.java
index beacc6e9a11..04eb2980278 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/QuadCurve_onInvalidate_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/QuadCurve_onInvalidate_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,34 +25,24 @@
 
 package test.javafx.scene.shape;
 
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import java.util.stream.Stream;
 
 import com.sun.javafx.scene.DirtyBits;
 import javafx.scene.shape.QuadCurve;
+
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.OnInvalidateMethodsTestBase;
 
-@RunWith(Parameterized.class)
 public class QuadCurve_onInvalidate_Test extends OnInvalidateMethodsTestBase {
 
-    public QuadCurve_onInvalidate_Test(Configuration config) {
-        super(config);
-    }
-
-    @Parameters
-    public static Collection<Object[]>data() {
-        Object[][] data = new Object[][] {
-            {new Configuration(QuadCurve.class, "startX", 111.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY})},
-            {new Configuration(QuadCurve.class, "startY", 101.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY})},
-            {new Configuration(QuadCurve.class, "controlX", 121.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY})},
-            {new Configuration(QuadCurve.class, "controlY", 131.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY})},
-            {new Configuration(QuadCurve.class, "endX", 231.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY})},
-            {new Configuration(QuadCurve.class, "endY", 134.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY})},
-        };
-        return Arrays.asList(data);
+    public static Stream<Arguments> data() {
+        return Stream.of(
+            Arguments.of( new Configuration(QuadCurve.class, "startX", 111.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY}) ),
+            Arguments.of( new Configuration(QuadCurve.class, "startY", 101.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY}) ),
+            Arguments.of( new Configuration(QuadCurve.class, "controlX", 121.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY}) ),
+            Arguments.of( new Configuration(QuadCurve.class, "controlY", 131.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY}) ),
+            Arguments.of( new Configuration(QuadCurve.class, "endX", 231.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY}) ),
+            Arguments.of( new Configuration(QuadCurve.class, "endY", 134.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY}) )
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/QuadCurve_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/QuadCurve_properties_Test.java
index 8597c4ea3b4..17ffa04001b 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/QuadCurve_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/QuadCurve_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,33 +25,24 @@
 
 package test.javafx.scene.shape;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.scene.shape.QuadCurve;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.PropertiesTestBase;
 
-@RunWith(Parameterized.class)
 public final class QuadCurve_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
+
+    public static Stream<Arguments> data() {
         final QuadCurve testQuadCurve = new QuadCurve();
 
-        return Arrays.asList(new Object[] {
+        return Stream.of(
             config(testQuadCurve, "startX", 0.0, 100.0),
             config(testQuadCurve, "startY", 0.0, 100.0),
             config(testQuadCurve, "controlX", 80.0, 180.0),
             config(testQuadCurve, "controlY", 20.0, 120.0),
             config(testQuadCurve, "endX", 100.0, 200.0),
             config(testQuadCurve, "endY", 100.0, 200.0)
-        });
-    }
-
-    public QuadCurve_properties_Test(final Configuration configuration) {
-        super(configuration);
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/RectangleTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/RectangleTest.java
index 04a6d314c24..01b7a1bfc07 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/RectangleTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/RectangleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,79 +35,93 @@
 import test.javafx.scene.NodeTest;
 import javafx.scene.paint.Paint;
 import javafx.scene.shape.Rectangle;
-import org.junit.Test;
 
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static test.com.sun.javafx.test.TestHelper.assertSimilar;
-import static org.junit.Assert.*;
 
 public class RectangleTest {
 
-    @Test public void testPropertyPropagation_visible() throws Exception {
+    @Test
+    public void testPropertyPropagation_visible() throws Exception {
         final Rectangle node = new StubRectangle();
         NodeTest.testBooleanPropertyPropagation(node, "visible", false, true);
     }
 
-    @Test public void testPropertyPropagation_x() throws Exception {
+    @Test
+    public void testPropertyPropagation_x() throws Exception {
         final Rectangle node = new StubRectangle();
         NodeTest.testDoublePropertyPropagation(node, "x", 100, 200);
     }
 
-    @Test public void testPropertyPropagation_y() throws Exception {
+    @Test
+    public void testPropertyPropagation_y() throws Exception {
         final Rectangle node = new StubRectangle();
         NodeTest.testDoublePropertyPropagation(node, "y", 100, 200);
     }
 
-    @Test public void testPropertyPropagation_width() throws Exception {
+    @Test
+    public void testPropertyPropagation_width() throws Exception {
         final Rectangle node = new StubRectangle();
         NodeTest.testDoublePropertyPropagation(node, "width", 100, 200);
     }
 
-    @Test public void testPropertyPropagation_height() throws Exception {
+    @Test
+    public void testPropertyPropagation_height() throws Exception {
         final Rectangle node = new StubRectangle();
         NodeTest.testDoublePropertyPropagation(node, "height", 100, 200);
     }
 
-    @Test public void testPropertyPropagation_arcWidth() throws Exception {
+    @Test
+    public void testPropertyPropagation_arcWidth() throws Exception {
         final Rectangle node = new StubRectangle();
         NodeTest.testDoublePropertyPropagation(node, "arcWidth", 100, 200);
     }
 
-    @Test public void testPropertyPropagation_arcHeight() throws Exception {
+    @Test
+    public void testPropertyPropagation_arcHeight() throws Exception {
         final Rectangle node = new StubRectangle();
         NodeTest.testDoublePropertyPropagation(node, "arcHeight", 100, 200);
     }
 
-    @Test public void testBoundPropertySync_X() throws Exception {
+    @Test
+    public void testBoundPropertySync_X() throws Exception {
         NodeTest.assertDoublePropertySynced(
                 new StubRectangle(200.0, 100.0),
                 "x", "x", 10.0);
     }
 
-    @Test public void testBoundPropertySync_Y() throws Exception {
+    @Test
+    public void testBoundPropertySync_Y() throws Exception {
         NodeTest.assertDoublePropertySynced(
                 new StubRectangle(200.0, 100.0),
                 "y", "y", 20.0);
     }
 
-    @Test public void testBoundPropertySync_Width() throws Exception {
+    @Test
+    public void testBoundPropertySync_Width() throws Exception {
         NodeTest.assertDoublePropertySynced(
                 new StubRectangle(200.0, 100.0),
                 "width", "width", 300.0);
     }
 
-    @Test public void testBoundPropertySync_Height() throws Exception {
+    @Test
+    public void testBoundPropertySync_Height() throws Exception {
         NodeTest.assertDoublePropertySynced(
                 new StubRectangle(200.0, 100.0),
                 "height", "height", 200.0);
     }
 
-    @Test public void testBoundPropertySync_ArcWidth() throws Exception {
+    @Test
+    public void testBoundPropertySync_ArcWidth() throws Exception {
         NodeTest.assertDoublePropertySynced(
                 new StubRectangle(200.0, 100.0),
                 "arcWidth", "arcWidth", 10.0);
     }
 
-    @Test public void testBoundPropertySync_ArcHeight() throws Exception {
+    @Test
+    public void testBoundPropertySync_ArcHeight() throws Exception {
         NodeTest.assertDoublePropertySynced(
                 new StubRectangle(200.0, 100.0),
                 "arcHeight", "arcHeight", 30.0);
@@ -125,7 +139,8 @@ public void testTransformedBounds_rotation() {
                 original.getHeight(), original.getWidth()), r.getBoundsInParent());
     }
 
-    @Test public void toStringShouldReturnNonEmptyString() {
+    @Test
+    public void toStringShouldReturnNonEmptyString() {
         String s = new StubRectangle().toString();
         assertNotNull(s);
         assertFalse(s.isEmpty());
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Rectangle_cssMethods_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Rectangle_cssMethods_Test.java
index 456c010b501..50c85a61f86 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Rectangle_cssMethods_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Rectangle_cssMethods_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,33 +25,22 @@
 
 package test.javafx.scene.shape;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.scene.shape.Rectangle;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
 import test.com.sun.javafx.test.CssMethodsTestBase;
 
-@RunWith(Parameterized.class)
 public class Rectangle_cssMethods_Test extends CssMethodsTestBase {
     private static final Rectangle TEST_RECTANGLE = new Rectangle(100, 100);
 
-    @Parameters
-    public static Collection data() {
-        return Arrays.asList(new Object[] {
+    public static Stream<Configuration> data() {
+        return Stream.of(
             config(TEST_RECTANGLE, "arcWidth", 0.0,
                    "-fx-arc-width", 10.0),
             config(TEST_RECTANGLE, "arcHeight", 0.0,
                    "-fx-arc-height", 20.0),
             config(TEST_RECTANGLE, "translateX", 0.0,
                    "-fx-translate-x", 10.0)
-        });
-    }
-
-    public Rectangle_cssMethods_Test(final Configuration configuration) {
-        super(configuration);
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Rectangle_onInvalidate_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Rectangle_onInvalidate_Test.java
index e8cd986c864..61b4634a7bb 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Rectangle_onInvalidate_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Rectangle_onInvalidate_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,34 +25,24 @@
 
 package test.javafx.scene.shape;
 
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import java.util.stream.Stream;
 
 import com.sun.javafx.scene.DirtyBits;
 import javafx.scene.shape.Rectangle;
+
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.OnInvalidateMethodsTestBase;
 
-@RunWith(Parameterized.class)
 public class Rectangle_onInvalidate_Test extends OnInvalidateMethodsTestBase {
 
-    public Rectangle_onInvalidate_Test(Configuration configuration) {
-        super(configuration);
-    }
-
-    @Parameters
-    public static Collection<Object[]>data() {
-        Object[][] data = new Object[][] {
-            {new Configuration(Rectangle.class, "x", 100.0, new DirtyBits[] {DirtyBits.NODE_GEOMETRY, DirtyBits.NODE_BOUNDS})},
-            {new Configuration(Rectangle.class, "y", 100.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY})},
-            {new Configuration(Rectangle.class, "width", 123.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY})},
-            {new Configuration(Rectangle.class, "height", 123.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY})},
-            {new Configuration(Rectangle.class, "arcWidth", 11.0, new DirtyBits[] {DirtyBits.NODE_GEOMETRY})},
-            {new Configuration(Rectangle.class, "arcHeight", 22.0, new DirtyBits[] {DirtyBits.NODE_GEOMETRY})}
-        };
-        return Arrays.asList(data);
+    public static Stream<Arguments> data() {
+        return Stream.of(
+            Arguments.of( new Configuration(Rectangle.class, "x", 100.0, new DirtyBits[] {DirtyBits.NODE_GEOMETRY, DirtyBits.NODE_BOUNDS}) ),
+            Arguments.of( new Configuration(Rectangle.class, "y", 100.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY}) ),
+            Arguments.of( new Configuration(Rectangle.class, "width", 123.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY}) ),
+            Arguments.of( new Configuration(Rectangle.class, "height", 123.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY}) ),
+            Arguments.of( new Configuration(Rectangle.class, "arcWidth", 11.0, new DirtyBits[] {DirtyBits.NODE_GEOMETRY}) ),
+            Arguments.of( new Configuration(Rectangle.class, "arcHeight", 22.0, new DirtyBits[] {DirtyBits.NODE_GEOMETRY}) )
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Rectangle_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Rectangle_properties_Test.java
index a0a8f20b1a0..7d1aed560e4 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Rectangle_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Rectangle_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,23 +27,18 @@
 
 import static test.com.sun.javafx.test.TestHelper.box;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.scene.shape.Rectangle;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.PropertiesTestBase;
 
-@RunWith(Parameterized.class)
 public final class Rectangle_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
+
+    public static Stream<Arguments> data() {
         final Rectangle testRectangle = createTestRectangle();
 
-        return Arrays.asList(new Object[] {
+        return Stream.of(
             config(testRectangle, "x", 0.0, 100.0),
             config(testRectangle, "y", 0.0, 200.0),
             config(testRectangle, "width", 50.0, 200.0),
@@ -91,11 +86,7 @@ public static Collection data() {
                    "translateY", 0.0, 100.0,
                    "boundsInParent",
                    box(0, 0, 100, 100), box(0, 100, 100, 100))
-        });
-    }
-
-    public Rectangle_properties_Test(final Configuration configuration) {
-        super(configuration);
+        );
     }
 
     private static Rectangle createTestRectangle() {
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/SVGPathTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/SVGPathTest.java
index eb69d1f30d0..5ff2be47b88 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/SVGPathTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/SVGPathTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,13 +37,16 @@
 import test.javafx.scene.NodeTest;
 import javafx.scene.shape.FillRule;
 import javafx.scene.shape.SVGPath;
-import org.junit.Test;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class SVGPathTest {
 
-    @Test public void testBoundPropertySync_Content() throws Exception {
+    @Test
+    public void testBoundPropertySync_Content() throws Exception {
         StubSVGPath svgPath = new StubSVGPath();
         svgPath.setContent("M40,60 C42,48 44,30 25,32");
 
@@ -66,7 +69,8 @@ public void testDefaultValues() {
         assertEquals(FillRule.NON_ZERO, svgPath.fillRuleProperty().get());
     }
 
-    @Test public void testFillRuleSync() {
+    @Test
+    public void testFillRuleSync() {
         StubSVGPath svgPath = new StubSVGPath();
         svgPath.setContent("M40,60 C42,48 44,30 25,32");
         svgPath.setFillRule(FillRule.EVEN_ODD);
@@ -84,7 +88,8 @@ public void testDefaultValues() {
         assertEquals(Path2D.WIND_NON_ZERO, path.getWindingRule());
     }
 
-    @Test public void toStringShouldReturnNonEmptyString() {
+    @Test
+    public void toStringShouldReturnNonEmptyString() {
         String s = new StubSVGPath().toString();
         assertNotNull(s);
         assertFalse(s.isEmpty());
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/SVGPath_onInvalidate_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/SVGPath_onInvalidate_Test.java
index 5e42a84f70a..ff3284e4801 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/SVGPath_onInvalidate_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/SVGPath_onInvalidate_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,31 +25,21 @@
 
 package test.javafx.scene.shape;
 
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import java.util.stream.Stream;
 
 import com.sun.javafx.scene.DirtyBits;
 import javafx.scene.shape.FillRule;
 import javafx.scene.shape.SVGPath;
+
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.OnInvalidateMethodsTestBase;
 
-@RunWith(Parameterized.class)
 public class SVGPath_onInvalidate_Test extends OnInvalidateMethodsTestBase {
 
-    public SVGPath_onInvalidate_Test(Configuration config) {
-        super(config);
-    }
-
-    @Parameters
-    public static Collection<Object[]> data() {
-        Object[][] data = new Object[][] {
-            {new Configuration(SVGPath.class, "fillRule", FillRule.EVEN_ODD, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.SHAPE_FILLRULE})},
-            {new Configuration(SVGPath.class, "content", "cool", new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_CONTENTS})}
-        };
-        return Arrays.asList(data);
+    public static Stream<Arguments> data() {
+        return Stream.of(
+            Arguments.of( new Configuration(SVGPath.class, "fillRule", FillRule.EVEN_ODD, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.SHAPE_FILLRULE}) ),
+            Arguments.of( new Configuration(SVGPath.class, "content", "cool", new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_CONTENTS}) )
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/SVGPath_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/SVGPath_properties_Test.java
index 7fea0c22039..b635bdbcdc1 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/SVGPath_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/SVGPath_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,31 +25,22 @@
 
 package test.javafx.scene.shape;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.scene.shape.FillRule;
 import javafx.scene.shape.SVGPath;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.PropertiesTestBase;
 
-@RunWith(Parameterized.class)
 public final class SVGPath_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
+
+    public static Stream<Arguments> data() {
         final SVGPath testSvgPath = new SVGPath();
 
-        return Arrays.asList(new Object[] {
+        return Stream.of(
             config(testSvgPath, "fillRule",
                    FillRule.NON_ZERO, FillRule.EVEN_ODD),
             config(testSvgPath, "content", "", "M40,60 C42,48 44,30 25,32")
-        });
-    }
-
-    public SVGPath_properties_Test(final Configuration configuration) {
-        super(configuration);
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Shape3D_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Shape3D_properties_Test.java
index 618a52fa266..33ce116f98e 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Shape3D_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Shape3D_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,39 +24,28 @@
  */
 package test.javafx.scene.shape;
 
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-import test.com.sun.javafx.test.PropertiesTestBase;
+import java.util.stream.Stream;
 import javafx.scene.paint.PhongMaterial;
 import javafx.scene.shape.Box;
 import javafx.scene.shape.CullFace;
 import javafx.scene.shape.DrawMode;
 import javafx.scene.shape.Shape3D;
 
-@RunWith(Parameterized.class)
-public final class Shape3D_properties_Test extends PropertiesTestBase {
+import org.junit.jupiter.params.provider.Arguments;
+import test.com.sun.javafx.test.PropertiesTestBase;
 
-    @Parameters
-    public static Collection data() {
-        ArrayList array = new ArrayList();
+public final class Shape3D_properties_Test extends PropertiesTestBase {
 
+    public static Stream<Arguments> data() {
         // simple property tests
         Shape3D testShape = createTestBox();
         PhongMaterial DEFAULT_MATERIAL = new PhongMaterial();
 
-        array.add(config(testShape, "cullFace", CullFace.BACK, CullFace.FRONT));
-        array.add(config(testShape, "drawMode", DrawMode.FILL, DrawMode.LINE));
-        array.add(config(testShape, "material", DEFAULT_MATERIAL, null));
-
-        return array;
-    }
-
-    public Shape3D_properties_Test(final Configuration configuration) {
-        super(configuration);
+        return Stream.of(
+            config(testShape, "cullFace", CullFace.BACK, CullFace.FRONT),
+            config(testShape, "drawMode", DrawMode.FILL, DrawMode.LINE),
+            config(testShape, "material", DEFAULT_MATERIAL, null)
+        );
     }
 
     private static Box createTestBox() {
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/ShapeTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/ShapeTest.java
index 6b9376f5aba..0146fa97724 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/ShapeTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/ShapeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,8 +38,6 @@
 import test.javafx.scene.NodeTest;
 import javafx.scene.Scene;
 import javafx.scene.paint.Color;
-import org.junit.Assert;
-import org.junit.Test;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -49,61 +47,74 @@
 import javafx.scene.shape.StrokeLineJoin;
 import javafx.scene.shape.StrokeType;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class ShapeTest {
 
-    @Test public void testBoundPropertySync_StrokeType() throws Exception {
+    @Test
+    public void testBoundPropertySync_StrokeType() throws Exception {
         NodeTest.assertObjectProperty_AsStringSynced(
                 new StubShape(),
                 "strokeType", "strokeType", StrokeType.CENTERED);
     }
 
-    @Test public void testBoundPropertySync_StrokeLineCap() throws Exception {
+    @Test
+    public void testBoundPropertySync_StrokeLineCap() throws Exception {
         NodeTest.assertObjectProperty_AsStringSynced(
                 new StubShape(),
                 "strokeLineCap", "strokeLineCap", StrokeLineCap.SQUARE);
     }
 
-    @Test public void testBoundPropertySync_StrokeLineJoin() throws Exception {
+    @Test
+    public void testBoundPropertySync_StrokeLineJoin() throws Exception {
         NodeTest.assertObjectProperty_AsStringSynced(
                 new StubShape(),
                 "strokeLineJoin", "strokeLineJoin", StrokeLineJoin.MITER);
     }
 
-    @Test public void testBoundPropertySync_StrokeWidth() throws Exception {
+    @Test
+    public void testBoundPropertySync_StrokeWidth() throws Exception {
         NodeTest.assertDoublePropertySynced(
                 new StubShape(),
                 "strokeWidth", "strokeWidth", 2.0);
     }
 
-    @Test public void testBoundPropertySync_StrokeMiterLimit() throws Exception {
+    @Test
+    public void testBoundPropertySync_StrokeMiterLimit() throws Exception {
         NodeTest.assertDoublePropertySynced(
                 new StubShape(),
                 "strokeMiterLimit", "strokeMiterLimit", 3.0);
     }
 
-    @Test public void testBoundPropertySync_DashOffset() throws Exception {
+    @Test
+    public void testBoundPropertySync_DashOffset() throws Exception {
         NodeTest.assertDoublePropertySynced(
                 new StubShape(),
                 "strokeDashOffset", "strokeDashOffset", 15.0);
     }
 
-    @Test public void testBoundPropertySync_Stroke() throws Exception {
+    @Test
+    public void testBoundPropertySync_Stroke() throws Exception {
         final Shape shape = new StubShape();
         shape.setStroke(Color.RED);
         NodeTest.assertObjectProperty_AsStringSynced(
                 shape, "stroke", "stroke", Color.GREEN);
     }
 
-    @Test public void testBoundPropertySync_Fill() throws Exception {
+    @Test
+    public void testBoundPropertySync_Fill() throws Exception {
         final Shape shape = new StubShape();
         shape.setFill(Color.BLUE);
         NodeTest.assertObjectProperty_AsStringSynced(
                 shape, "fill", "fill", Color.RED);
     }
 
-    @Test public void testBoundPropertySync_Smooth() throws Exception {
+    @Test
+    public void testBoundPropertySync_Smooth() throws Exception {
         final Shape shape = new StubShape();
         shape.setSmooth(true);
         NodeTest.assertBooleanPropertySynced(
@@ -111,7 +122,8 @@ public class ShapeTest {
     }
 
     boolean listChangeCalled = false;
-    @Test public void testStrokeDashArray() {
+    @Test
+    public void testStrokeDashArray() {
         // there is no strokeDashArrayProperty or this test
         // would be in Shape_properties_Test
         final ObservableList<Double> expected =
@@ -126,7 +138,7 @@ public class ShapeTest {
         actual.addListener((ListChangeListener<Double>) c -> {
             listChangeCalled = true;
             assertTrue(c.next());
-            Assert.assertEquals(expected, c.getAddedSubList());
+            assertEquals(expected, c.getAddedSubList());
         });
 
         shape.getStrokeDashArray().addAll(expected);
@@ -136,7 +148,8 @@ public class ShapeTest {
         assertTrue(listChangeCalled);
     }
 
-    @Test public void testGetStrokeDashArrayViaCSSPropertyIsNotNull() {
+    @Test
+    public void testGetStrokeDashArrayViaCSSPropertyIsNotNull() {
         final Shape shape = new StubShape();
         Double[] actual = null;
         List<CssMetaData<? extends Styleable, ?>> styleables = shape.getCssMetaData();
@@ -150,7 +163,8 @@ public class ShapeTest {
         assertNotNull(actual);
     }
 
-    @Test public void testGetStrokeDashArrayViaCSSPropertyIsSame() {
+    @Test
+    public void testGetStrokeDashArrayViaCSSPropertyIsSame() {
         final Shape shape = new StubShape();
         shape.getStrokeDashArray().addAll(5d, 7d, 1d, 3d);
         Double[] actuals = null;
@@ -164,10 +178,11 @@ public class ShapeTest {
         }
 
         final Double[] expecteds = new Double[] {5d, 7d, 1d, 3d};
-        Assert.assertArrayEquals(expecteds, actuals);
+        assertArrayEquals(expecteds, actuals);
     }
 
-    @Test public void testSetStrokeDashArrayViaCSSPropertyIsSame() {
+    @Test
+    public void testSetStrokeDashArrayViaCSSPropertyIsSame() {
         final Shape shape = new StubShape();
         List<Double> actual = null;
         List<CssMetaData<? extends Styleable, ?>> styleables = shape.getCssMetaData();
@@ -186,7 +201,8 @@ public class ShapeTest {
     }
 
     // RT-18647: ClassCastException: [Ljava.lang.Double; cannot be cast to javafx.collections.ObservableList
-    @Test public void testRT_18647() {
+    @Test
+    public void testRT_18647() {
         final Scene scene = new Scene(new Group(), 500, 500);
 
         final Shape shape = new StubShape();
@@ -205,7 +221,8 @@ public class ShapeTest {
 
     boolean listenerCalled = false;
     // make sure shapeChangeListener doesn't hold reference to runnable.
-    @Test public void testShapeChangeListenerLeakTest() {
+    @Test
+    public void testShapeChangeListenerLeakTest() {
 
         Shape shape = new StubShape();
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Shape_cssMethods_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Shape_cssMethods_Test.java
index c155489aef8..d0a65193ddc 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Shape_cssMethods_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Shape_cssMethods_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,7 @@
 
 package test.javafx.scene.shape;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Rectangle;
@@ -34,19 +33,13 @@
 import javafx.scene.shape.StrokeLineJoin;
 import javafx.scene.shape.StrokeType;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
 import test.com.sun.javafx.test.CssMethodsTestBase;
 
-@RunWith(Parameterized.class)
 public class Shape_cssMethods_Test extends CssMethodsTestBase {
     private static final Rectangle TEST_SHAPE = new Rectangle(100, 100);
 
-    @Parameters
-    public static Collection data() {
-        return Arrays.asList(new Object[] {
+    public static Stream<Configuration> data() {
+        return Stream.of(
             config(TEST_SHAPE, "fill", null, "-fx-fill", Color.RED),
             config(TEST_SHAPE, "fill", null, "-fx-fill", null),
             config(TEST_SHAPE, "smooth", false, "-fx-smooth", true),
@@ -70,11 +63,7 @@ public static Collection data() {
 //                 new GenericObservableList<Double>(10.0, 5.0, 2.0)),
             config(TEST_SHAPE, "translateY", 0.0,
                    "-fx-translate-y", 10.0)
-        });
-    }
-
-    public Shape_cssMethods_Test(final Configuration configuration) {
-        super(configuration);
+        );
     }
 
     static {
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Shape_onInvalidate_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Shape_onInvalidate_Test.java
index 4c0912b4db3..e5718bd8200 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Shape_onInvalidate_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Shape_onInvalidate_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,40 +25,29 @@
 
 package test.javafx.scene.shape;
 
-import java.util.Arrays;
-import java.util.Collection;
-
+import java.util.stream.Stream;
 import javafx.scene.paint.Color;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
 import com.sun.javafx.scene.DirtyBits;
 import javafx.scene.shape.Line;
 import javafx.scene.shape.StrokeLineCap;
 import javafx.scene.shape.StrokeLineJoin;
+
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.OnInvalidateMethodsTestBase;
 
-@RunWith(Parameterized.class)
 public class Shape_onInvalidate_Test extends OnInvalidateMethodsTestBase {
 
-    public Shape_onInvalidate_Test(Configuration config) {
-        super(config);
-    }
-
-    @Parameters
-    public static Collection<Object[]> data() {
-        Object[][] data = new Object[][] {
-            {new Configuration(Line.class, "strokeWidth", 2.0, new DirtyBits[] {DirtyBits.SHAPE_STROKEATTRS})},
-            {new Configuration(Line.class, "strokeLineJoin", StrokeLineJoin.BEVEL, new DirtyBits[] {DirtyBits.SHAPE_STROKEATTRS})},
-            {new Configuration(Line.class, "strokeLineCap", StrokeLineCap.BUTT, new DirtyBits[] {DirtyBits.SHAPE_STROKEATTRS})},
-            {new Configuration(Line.class, "strokeMiterLimit", 4.0, new DirtyBits[] {DirtyBits.SHAPE_STROKEATTRS})},
-            {new Configuration(Line.class, "strokeDashOffset", 1.0, new DirtyBits[] {DirtyBits.SHAPE_STROKEATTRS})},
-            {new Configuration(Line.class, "fill", Color.RED, new DirtyBits[] {DirtyBits.SHAPE_FILL})},
-            {new Configuration(Line.class, "stroke", Color.RED, new DirtyBits[] {DirtyBits.SHAPE_STROKE})},
-            {new Configuration(Line.class, "smooth", false, new DirtyBits[] {DirtyBits.NODE_SMOOTH})}
-        };
-        return Arrays.asList(data);
+    public static Stream<Arguments> data() {
+        return Stream.of(
+            Arguments.of( new Configuration(Line.class, "strokeWidth", 2.0, new DirtyBits[] {DirtyBits.SHAPE_STROKEATTRS}) ),
+            Arguments.of( new Configuration(Line.class, "strokeLineJoin", StrokeLineJoin.BEVEL, new DirtyBits[] {DirtyBits.SHAPE_STROKEATTRS}) ),
+            Arguments.of( new Configuration(Line.class, "strokeLineCap", StrokeLineCap.BUTT, new DirtyBits[] {DirtyBits.SHAPE_STROKEATTRS}) ),
+            Arguments.of( new Configuration(Line.class, "strokeMiterLimit", 4.0, new DirtyBits[] {DirtyBits.SHAPE_STROKEATTRS}) ),
+            Arguments.of( new Configuration(Line.class, "strokeDashOffset", 1.0, new DirtyBits[] {DirtyBits.SHAPE_STROKEATTRS}) ),
+            Arguments.of( new Configuration(Line.class, "fill", Color.RED, new DirtyBits[] {DirtyBits.SHAPE_FILL}) ),
+            Arguments.of( new Configuration(Line.class, "stroke", Color.RED, new DirtyBits[] {DirtyBits.SHAPE_STROKE}) ),
+            Arguments.of( new Configuration(Line.class, "smooth", false, new DirtyBits[] {DirtyBits.NODE_SMOOTH}) )
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Shape_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Shape_properties_Test.java
index 2928f930c5f..1cd9ef18097 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Shape_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/Shape_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,16 +28,9 @@
 import static test.com.sun.javafx.test.TestHelper.box;
 
 import java.util.ArrayList;
-import java.util.Collection;
+import java.util.stream.Stream;
 
 import javafx.scene.paint.Color;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import test.com.sun.javafx.test.BBoxComparator;
-import test.com.sun.javafx.test.PropertiesTestBase;
 import javafx.scene.shape.Line;
 import javafx.scene.shape.Polygon;
 import javafx.scene.shape.Rectangle;
@@ -46,12 +39,14 @@
 import javafx.scene.shape.StrokeLineJoin;
 import javafx.scene.shape.StrokeType;
 
-@RunWith(Parameterized.class)
+import org.junit.jupiter.params.provider.Arguments;
+import test.com.sun.javafx.test.PropertiesTestBase;
+import test.com.sun.javafx.test.BBoxComparator;
+
 public final class Shape_properties_Test extends PropertiesTestBase {
 
-    @Parameters
-    public static Collection data() {
-        ArrayList array = new ArrayList();
+    public static Stream<Arguments> data() {
+        ArrayList<Arguments> array = new ArrayList<Arguments>();
 
         // simple property tests
         Shape testShape = createTestRectangle();
@@ -111,11 +106,7 @@ public static Collection data() {
                     box(195, 95, 10, 110),
                     new BBoxComparator(0.001)));
 
-        return array;
-    }
-
-    public Shape_properties_Test(final Configuration configuration) {
-        super(configuration);
+        return array.stream();
     }
 
     private static Rectangle createTestRectangle() {
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/SphereTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/SphereTest.java
index ff4323f303e..d7068b2dcb7 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/SphereTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/SphereTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,10 +28,10 @@
 import com.sun.javafx.scene.NodeHelper;
 import javafx.geometry.BoundingBox;
 import javafx.scene.shape.Sphere;
-import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class SphereTest {
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/TestUtils.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/TestUtils.java
index 9945d5a8600..9278b54a269 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/TestUtils.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/TestUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,10 @@
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Method;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public abstract class TestUtils {
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/TriangleMeshTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/TriangleMeshTest.java
index a11d6dbb8c1..02725459fdc 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/TriangleMeshTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/TriangleMeshTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,12 @@
 
 import java.util.Arrays;
 import javafx.scene.shape.TriangleMesh;
-import static org.junit.Assert.*;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class TriangleMeshTest {
 
@@ -70,80 +74,88 @@ public void testSetFaceSmoothingGroups_4args() {
      * Test faceSmoothingGroups with illegal value of setFaceSmoothingGroups
      * method, of class TriangleMesh.
      */
-    @Test (expected=ArrayIndexOutOfBoundsException.class)
+    @Test
     public void testSetFaceSmoothingGroups_4argsValueOutOfRange() {
-        int divX = 10;
-        int divY = 10;
-        TriangleMesh instance = buildTriangleMesh(divX, divY);
-        int[] faceSmoothingGroups = new int[divX * divY * 2];
-        Arrays.fill(faceSmoothingGroups, 1);
-        int[] setterArray = new int[]{2, 0, -1};
-        int index = 0;
-        int start = 0;
-        int length = setterArray.length;
-        instance.getFaceSmoothingGroups().set(index, setterArray, start, length); // expect IllegalArgumentException
-        // faceSmoothingGroups should not change
-        assertArrayEquals(faceSmoothingGroups, instance.getFaceSmoothingGroups().toArray(null));
+        assertThrows(ArrayIndexOutOfBoundsException.class, () -> {
+            int divX = 10;
+            int divY = 10;
+            TriangleMesh instance = buildTriangleMesh(divX, divY);
+            int[] faceSmoothingGroups = new int[divX * divY * 2];
+            Arrays.fill(faceSmoothingGroups, 1);
+            int[] setterArray = new int[]{2, 0, -1};
+            int index = 0;
+            int start = 0;
+            int length = setterArray.length;
+            instance.getFaceSmoothingGroups().set(index, setterArray, start, length); // expect IllegalArgumentException
+            // faceSmoothingGroups should not change
+            assertArrayEquals(faceSmoothingGroups, instance.getFaceSmoothingGroups().toArray(null));
+        });
     }
 
     /**
      * Test setFaceSmoothingGroups with illegal value of setFaceSmoothingGroups
      * method, of class TriangleMesh.
      */
-    @Test(expected = ArrayIndexOutOfBoundsException.class)
+    @Test
     public void testSetFaceSmoothingGroups_4argsIllegalArgument() {
-        int divX = 10;
-        int divY = 10;
-        TriangleMesh instance = buildTriangleMesh(divX, divY);
-        int[] faceSmoothingGroups = new int[divX * divY * 2];
-        Arrays.fill(faceSmoothingGroups, 1);
-        instance.getFaceSmoothingGroups().setAll(faceSmoothingGroups);
-        int[] setterArray = new int[]{2, 0, 1};
-        int index = 0;
-        int start = 0;
-        instance.getFaceSmoothingGroups().set(index, setterArray, start, -1); // expect IllegalArgumentException
-        // faceSmoothingGroups should not change
-        assertArrayEquals(faceSmoothingGroups, instance.getFaceSmoothingGroups().toArray(null));
+        assertThrows(ArrayIndexOutOfBoundsException.class, () -> {
+            int divX = 10;
+            int divY = 10;
+            TriangleMesh instance = buildTriangleMesh(divX, divY);
+            int[] faceSmoothingGroups = new int[divX * divY * 2];
+            Arrays.fill(faceSmoothingGroups, 1);
+            instance.getFaceSmoothingGroups().setAll(faceSmoothingGroups);
+            int[] setterArray = new int[]{2, 0, 1};
+            int index = 0;
+            int start = 0;
+            instance.getFaceSmoothingGroups().set(index, setterArray, start, -1); // expect IllegalArgumentException
+            // faceSmoothingGroups should not change
+            assertArrayEquals(faceSmoothingGroups, instance.getFaceSmoothingGroups().toArray(null));
+        });
     }
 
     /**
      * Test setFaceSmoothingGroups with illegal value of setFaceSmoothingGroups
      * method, of class TriangleMesh.
      */
-    @Test(expected = ArrayIndexOutOfBoundsException.class)
+    @Test
     public void testSetFaceSmoothingGroups_4argsIndexOutOfRange() {
-        int divX = 10;
-        int divY = 10;
-        TriangleMesh instance = buildTriangleMesh(divX, divY);
-        int[] faceSmoothingGroups = new int[divX * divY * 2];
-        Arrays.fill(faceSmoothingGroups, 1);
-        int[] setterArray = new int[]{2, 0, 1};
-        int start = 0;
-        int length = setterArray.length;
-        instance.getFaceSmoothingGroups().setAll(faceSmoothingGroups);
-        instance.getFaceSmoothingGroups().set(198, setterArray, start, length); // expect ArrayIndexOutOfBoundsException
-        // faceSmoothingGroups should not change
-        assertArrayEquals(faceSmoothingGroups, instance.getFaceSmoothingGroups().toArray(null));
+        assertThrows(ArrayIndexOutOfBoundsException.class, () -> {
+            int divX = 10;
+            int divY = 10;
+            TriangleMesh instance = buildTriangleMesh(divX, divY);
+            int[] faceSmoothingGroups = new int[divX * divY * 2];
+            Arrays.fill(faceSmoothingGroups, 1);
+            int[] setterArray = new int[]{2, 0, 1};
+            int start = 0;
+            int length = setterArray.length;
+            instance.getFaceSmoothingGroups().setAll(faceSmoothingGroups);
+            instance.getFaceSmoothingGroups().set(198, setterArray, start, length); // expect ArrayIndexOutOfBoundsException
+            // faceSmoothingGroups should not change
+            assertArrayEquals(faceSmoothingGroups, instance.getFaceSmoothingGroups().toArray(null));
+        });
     }
 
     /**
      * Test setFaceSmoothingGroups with illegal value of setFaceSmoothingGroups
      * method, of class TriangleMesh.
      */
-    @Test(expected = ArrayIndexOutOfBoundsException.class)
+    @Test
     public void testSetFaceSmoothingGroups_4argsStartOutOfRange() {
-        int divX = 10;
-        int divY = 10;
-        TriangleMesh instance = buildTriangleMesh(divX, divY);
-        int[] faceSmoothingGroups = new int[divX * divY * 2];
-        Arrays.fill(faceSmoothingGroups, 1);
-        int[] setterArray = new int[]{2, 0, 1};
-        int index = 0;
-        int length = setterArray.length;
-        instance.getFaceSmoothingGroups().setAll(faceSmoothingGroups);
-        instance.getFaceSmoothingGroups().set(index, setterArray, 2, length); // expect IllegalArgumentException
-        // faceSmoothingGroups should not change
-        assertArrayEquals(faceSmoothingGroups, instance.getFaceSmoothingGroups().toArray(null));
+        assertThrows(ArrayIndexOutOfBoundsException.class, () -> {
+            int divX = 10;
+            int divY = 10;
+            TriangleMesh instance = buildTriangleMesh(divX, divY);
+            int[] faceSmoothingGroups = new int[divX * divY * 2];
+            Arrays.fill(faceSmoothingGroups, 1);
+            int[] setterArray = new int[]{2, 0, 1};
+            int index = 0;
+            int length = setterArray.length;
+            instance.getFaceSmoothingGroups().setAll(faceSmoothingGroups);
+            instance.getFaceSmoothingGroups().set(index, setterArray, 2, length); // expect IllegalArgumentException
+            // faceSmoothingGroups should not change
+            assertArrayEquals(faceSmoothingGroups, instance.getFaceSmoothingGroups().toArray(null));
+        });
     }
 
     /**
@@ -179,55 +191,61 @@ public void testSetFaces_4args() {
      * Test setFaces with illegal value of setFaceSmoothingGroups method, of
      * class TriangleMesh.
      */
-    @Test(expected = ArrayIndexOutOfBoundsException.class)
+    @Test
     public void testSetFaces_4argsIllegalArgument() {
-        int divX = 10;
-        int divY = 10;
-        TriangleMesh instance = buildTriangleMesh(divX, divY); // 1200 faces
-        int faces[] = {0, 0, 2, 2, 1, 1,};
-        int[] expecteds = instance.getFaces().toArray(null);
-        int length = faces.length;
-        instance.getFaces().set(-1, faces, -1, length);
-        // faces should not change
-        assertArrayEquals(expecteds, instance.getFaces().toArray(null));
+        assertThrows(ArrayIndexOutOfBoundsException.class, () -> {
+            int divX = 10;
+            int divY = 10;
+            TriangleMesh instance = buildTriangleMesh(divX, divY); // 1200 faces
+            int faces[] = {0, 0, 2, 2, 1, 1,};
+            int[] expecteds = instance.getFaces().toArray(null);
+            int length = faces.length;
+            instance.getFaces().set(-1, faces, -1, length);
+            // faces should not change
+            assertArrayEquals(expecteds, instance.getFaces().toArray(null));
+        });
     }
 
     /**
      * Test setFaces with index argument out of range of setFaceSmoothingGroups
      * method, of class TriangleMesh.
      */
-    @Test(expected = ArrayIndexOutOfBoundsException.class)
+    @Test
     public void testSetFaces_4argsIndexOutOfRange() {
-        int divX = 10;
-        int divY = 10;
-        TriangleMesh instance = buildTriangleMesh(divX, divY); // 1200 faces
-        int faces[] = {0, 0, 2, 2, 1, 1,};
-        int[] expecteds = instance.getFaces().toArray(null);
-        int start = 0;
-        int length = faces.length;
-        instance.getFaces().set(1200, faces, start, length);
-        // faces should not change
-        assertArrayEquals(expecteds, instance.getFaces().toArray(null));
+        assertThrows(ArrayIndexOutOfBoundsException.class, () -> {
+            int divX = 10;
+            int divY = 10;
+            TriangleMesh instance = buildTriangleMesh(divX, divY); // 1200 faces
+            int faces[] = {0, 0, 2, 2, 1, 1,};
+            int[] expecteds = instance.getFaces().toArray(null);
+            int start = 0;
+            int length = faces.length;
+            instance.getFaces().set(1200, faces, start, length);
+            // faces should not change
+            assertArrayEquals(expecteds, instance.getFaces().toArray(null));
+        });
     }
 
     /**
      * Test setFaces with start argument out of range of setFaceSmoothingGroups
      * method, of class TriangleMesh.
      */
-    @Test(expected = ArrayIndexOutOfBoundsException.class)
+    @Test
     public void testSetFaces_4argsStartOutOfRange() {
-        int divX = 10;
-        int divY = 10;
-        TriangleMesh instance = buildTriangleMesh(divX, divY); // 1200 faces
-        int faces[] = {
-            0, 0, 2, 2, 1, 1,
-            2, 2, 3, 3, 1, 1,};
-        int[] expecteds = instance.getFaces().toArray(null);
-        int index = 6;
-        int length = faces.length;
-        instance.getFaces().set(index, faces, 1, length);
-        // faces should not change
-        assertArrayEquals(expecteds, instance.getFaces().toArray(null));
+        assertThrows(ArrayIndexOutOfBoundsException.class, () -> {
+            int divX = 10;
+            int divY = 10;
+            TriangleMesh instance = buildTriangleMesh(divX, divY); // 1200 faces
+            int faces[] = {
+                0, 0, 2, 2, 1, 1,
+                2, 2, 3, 3, 1, 1,};
+            int[] expecteds = instance.getFaces().toArray(null);
+            int index = 6;
+            int length = faces.length;
+            instance.getFaces().set(index, faces, 1, length);
+            // faces should not change
+            assertArrayEquals(expecteds, instance.getFaces().toArray(null));
+        });
     }
 
     /**
@@ -254,62 +272,68 @@ public void testsetTexCoords_4args() {
      * Test setTexCoords with illegal value of setTexCoordsmoothingGroups
      * method, of class TriangleMesh.
      */
-    @Test(expected = ArrayIndexOutOfBoundsException.class)
+    @Test
     public void testsetTexCoords_4argsIllegalArgument() {
-        int divX = 10;
-        int divY = 10;
-        TriangleMesh instance = buildTriangleMesh(divX, divY); // 242 texCoords
-        float texCoords[] = {0, 0,
-                             0, 1,
-                             1, 0,
-                             1, 1};
-        float[] expecteds = instance.getTexCoords().toArray(null);
-        int length = texCoords.length;
-        instance.getTexCoords().set(-1, texCoords, -1, length);
-        // texCoords should not change
-        assertArrayEquals(instance.getTexCoords().toArray(null), expecteds, 1e-3f);
+        assertThrows(ArrayIndexOutOfBoundsException.class, () -> {
+            int divX = 10;
+            int divY = 10;
+            TriangleMesh instance = buildTriangleMesh(divX, divY); // 242 texCoords
+            float texCoords[] = {0, 0,
+                                0, 1,
+                                1, 0,
+                                1, 1};
+            float[] expecteds = instance.getTexCoords().toArray(null);
+            int length = texCoords.length;
+            instance.getTexCoords().set(-1, texCoords, -1, length);
+            // texCoords should not change
+            assertArrayEquals(instance.getTexCoords().toArray(null), expecteds, 1e-3f);
+        });
     }
 
     /**
      * Test setTexCoords with index argument out of range of
      * setTexCoordsmoothingGroups method, of class TriangleMesh.
      */
-    @Test(expected = ArrayIndexOutOfBoundsException.class)
+    @Test
     public void testsetTexCoords_4argsIndexOutOfRange() {
-        int divX = 10;
-        int divY = 10;
-        TriangleMesh instance = buildTriangleMesh(divX, divY); // 242 texCoords
-        float texCoords[] = {0, 0,
-                             0, 1,
-                             1, 0,
-                             1, 1};
-        float[] expecteds = instance.getTexCoords().toArray(null);
-        int start = 0;
-        int length = texCoords.length;
-        instance.getTexCoords().set(240, texCoords, start, length);
-        // texCoords should not change
-        assertArrayEquals(instance.getTexCoords().toArray(null), expecteds, 1e-3f);
+        assertThrows(ArrayIndexOutOfBoundsException.class, () -> {
+            int divX = 10;
+            int divY = 10;
+            TriangleMesh instance = buildTriangleMesh(divX, divY); // 242 texCoords
+            float texCoords[] = {0, 0,
+                                0, 1,
+                                1, 0,
+                                1, 1};
+            float[] expecteds = instance.getTexCoords().toArray(null);
+            int start = 0;
+            int length = texCoords.length;
+            instance.getTexCoords().set(240, texCoords, start, length);
+            // texCoords should not change
+            assertArrayEquals(instance.getTexCoords().toArray(null), expecteds, 1e-3f);
+        });
     }
 
     /**
      * Test setTexCoords with start argument out of range of
      * setTexCoordsmoothingGroups method, of class TriangleMesh.
      */
-    @Test(expected = ArrayIndexOutOfBoundsException.class)
+    @Test
     public void testsetTexCoords_4argsStartOutOfRange() {
-        int divX = 10;
-        int divY = 10;
-        TriangleMesh instance = buildTriangleMesh(divX, divY); // 242 texCoords
-        float texCoords[] = {0, 0,
-                             0, 1,
-                             1, 0,
-                             1, 1};
-        float[] expecteds = instance.getTexCoords().toArray(null);
-        int index = 2;
-        int length = texCoords.length;
-        instance.getTexCoords().set(index, texCoords, 1, length);
-        // texCoords should not change
-        assertArrayEquals(instance.getTexCoords().toArray(null), expecteds, 1e-3f);
+        assertThrows(ArrayIndexOutOfBoundsException.class, () -> {
+            int divX = 10;
+            int divY = 10;
+            TriangleMesh instance = buildTriangleMesh(divX, divY); // 242 texCoords
+            float texCoords[] = {0, 0,
+                                0, 1,
+                                1, 0,
+                                1, 1};
+            float[] expecteds = instance.getTexCoords().toArray(null);
+            int index = 2;
+            int length = texCoords.length;
+            instance.getTexCoords().set(index, texCoords, 1, length);
+            // texCoords should not change
+            assertArrayEquals(instance.getTexCoords().toArray(null), expecteds, 1e-3f);
+        });
     }
 
     /**
@@ -341,77 +365,83 @@ public void testSetPoints_4args() {
      * Test setPoints with illegal value of setPointsmoothingGroups method, of
      * class TriangleMesh.
      */
-    @Test(expected = ArrayIndexOutOfBoundsException.class)
+    @Test
     public void testSetPoints_4argsIllegalArgument() {
-        int divX = 10;
-        int divY = 10;
-        TriangleMesh instance = buildTriangleMesh(divX, divY); // 121 points
-        float points[] = {
-            1, 1, 1,
-            1, 1, -1,
-            1, -1, 1,
-            1, -1, -1,
-            -1, 1, 1,
-            -1, 1, -1,
-            -1, -1, 1,
-            -1, -1, -1,};
-        float[] expecteds = instance.getPoints().toArray(null);
-        int length = points.length;
-        instance.getPoints().set(-1, points, -1, length);
-        // points should not change
-        assertArrayEquals(instance.getPoints().toArray(null), expecteds, 1e-3f);
+        assertThrows(ArrayIndexOutOfBoundsException.class, () -> {
+            int divX = 10;
+            int divY = 10;
+            TriangleMesh instance = buildTriangleMesh(divX, divY); // 121 points
+            float points[] = {
+                1, 1, 1,
+                1, 1, -1,
+                1, -1, 1,
+                1, -1, -1,
+                -1, 1, 1,
+                -1, 1, -1,
+                -1, -1, 1,
+                -1, -1, -1,};
+            float[] expecteds = instance.getPoints().toArray(null);
+            int length = points.length;
+            instance.getPoints().set(-1, points, -1, length);
+            // points should not change
+            assertArrayEquals(instance.getPoints().toArray(null), expecteds, 1e-3f);
+        });
     }
 
     /**
      * Test setPoints with index argument out of range of
      * setPointsmoothingGroups method, of class TriangleMesh.
      */
-    @Test(expected = ArrayIndexOutOfBoundsException.class)
+    @Test
     public void testSetPoints_4argsIndexOutOfRange() {
-        int divX = 10;
-        int divY = 10;
-        TriangleMesh instance = buildTriangleMesh(divX, divY); // 121 points
-        float points[] = {
-            1, 1, 1,
-            1, 1, -1,
-            1, -1, 1,
-            1, -1, -1,
-            -1, 1, 1,
-            -1, 1, -1,
-            -1, -1, 1,
-            -1, -1, -1,};
-        float[] expecteds = instance.getPoints().toArray(null);
-        int start = 0;
-        int length = points.length;
-        instance.getPoints().set(120 * 3, points, start, length);
-        // points should not change
-        assertArrayEquals(instance.getPoints().toArray(null), expecteds, 1e-3f);
+        assertThrows(ArrayIndexOutOfBoundsException.class, () -> {
+            int divX = 10;
+            int divY = 10;
+            TriangleMesh instance = buildTriangleMesh(divX, divY); // 121 points
+            float points[] = {
+                1, 1, 1,
+                1, 1, -1,
+                1, -1, 1,
+                1, -1, -1,
+                -1, 1, 1,
+                -1, 1, -1,
+                -1, -1, 1,
+                -1, -1, -1,};
+            float[] expecteds = instance.getPoints().toArray(null);
+            int start = 0;
+            int length = points.length;
+            instance.getPoints().set(120 * 3, points, start, length);
+            // points should not change
+            assertArrayEquals(instance.getPoints().toArray(null), expecteds, 1e-3f);
+        });
     }
 
     /**
      * Test setPoints with start argument out of range of
      * setPointsmoothingGroups method, of class TriangleMesh.
      */
-    @Test(expected = ArrayIndexOutOfBoundsException.class)
+    @Test
     public void testSetPoints_4argsStartOutOfRange() {
-        int divX = 10;
-        int divY = 10;
-        TriangleMesh instance = buildTriangleMesh(divX, divY); // 121 points
-        float points[] = {
-            1, 1, 1,
-            1, 1, -1,
-            1, -1, 1,
-            1, -1, -1,
-            -1, 1, 1,
-            -1, 1, -1,
-            -1, -1, 1,
-            -1, -1, -1,};
-        float[] expecteds = instance.getPoints().toArray(null);
-        int index = 3;
-        int length = points.length;
-        instance.getPoints().set(index, points, 1, length);
-        // points should not change
-        assertArrayEquals(instance.getPoints().toArray(null), expecteds, 1e-3f);
+        assertThrows(ArrayIndexOutOfBoundsException.class, () -> {
+            int divX = 10;
+            int divY = 10;
+            TriangleMesh instance = buildTriangleMesh(divX, divY); // 121 points
+            float points[] = {
+                1, 1, 1,
+                1, 1, -1,
+                1, -1, 1,
+                1, -1, -1,
+                -1, 1, 1,
+                -1, 1, -1,
+                -1, -1, 1,
+                -1, -1, -1,};
+            float[] expecteds = instance.getPoints().toArray(null);
+            int index = 3;
+            int length = points.length;
+            instance.getPoints().set(index, points, 1, length);
+            // points should not change
+            assertArrayEquals(instance.getPoints().toArray(null), expecteds, 1e-3f);
+        });
     }
 
     /**
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/VLineToTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/VLineToTest.java
index 71d29af0c8d..5616fdcae2b 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/VLineToTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/VLineToTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,14 +38,17 @@
 import javafx.scene.shape.MoveTo;
 import javafx.scene.shape.Path;
 import javafx.scene.shape.VLineTo;
-import org.junit.Test;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 
 public class VLineToTest {
 
-    @Test public void testAddTo() throws Exception {
+    @Test
+    public void testAddTo() throws Exception {
         Path2D path = new Path2D();
         path.moveTo(0f, 0f);
         final VLineTo vLineTo = new VLineTo(1f);
@@ -54,7 +57,8 @@ public class VLineToTest {
         assertEquals(1.0, path.getCurrentPoint().y, 0.0001f);
     }
 
-    @Test public void testDoublePropertySynced_Y() {
+    @Test
+    public void testDoublePropertySynced_Y() {
         double expected = 123.4;
         VLineTo vlineTo = new VLineTo(100.0);
         DoubleProperty v = new SimpleDoubleProperty(100.0);
@@ -77,7 +81,8 @@ public class VLineToTest {
         assertEquals(expected, coords[1], 0.001);
     }
 
-    @Test public void toStringShouldReturnNonEmptyString() {
+    @Test
+    public void toStringShouldReturnNonEmptyString() {
         String s = new VLineTo().toString();
         assertNotNull(s);
         assertFalse(s.isEmpty());
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/VLineTo_onInvalidate_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/VLineTo_onInvalidate_Test.java
index 11b1dc6284e..107695c8324 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/VLineTo_onInvalidate_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/VLineTo_onInvalidate_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,29 +25,19 @@
 
 package test.javafx.scene.shape;
 
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import java.util.stream.Stream;
 
 import com.sun.javafx.scene.DirtyBits;
 import javafx.scene.shape.VLineTo;
+
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.OnInvalidateMethodsTestBase;
 
-@RunWith(Parameterized.class)
 public class VLineTo_onInvalidate_Test extends OnInvalidateMethodsTestBase {
 
-    public VLineTo_onInvalidate_Test(Configuration config) {
-        super(config);
-    }
-
-    @Parameters
-    public static Collection<Object[]> data() {
-        Object[][] data = new Object[][] {
-            {new Configuration(VLineTo.class, "y", 100.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_CONTENTS})}
-        };
-        return Arrays.asList(data);
+    public static Stream<Arguments> data() {
+        return Stream.of(
+            Arguments.of( new Configuration(VLineTo.class, "y", 100.0, new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_CONTENTS}) )
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/VLineTo_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/VLineTo_properties_Test.java
index ef48d932165..d7a8143bcba 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/VLineTo_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/VLineTo_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,28 +25,19 @@
 
 package test.javafx.scene.shape;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import javafx.scene.shape.VLineTo;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.PropertiesTestBase;
 
-@RunWith(Parameterized.class)
 public final class VLineTo_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
+
+    public static Stream<Arguments> data() {
         final VLineTo testVLineTo = new VLineTo();
 
-        return Arrays.asList(new Object[] {
+        return Stream.of(
             config(testVLineTo, "y", 50.0, 100.0)
-        });
-    }
-
-    public VLineTo_properties_Test(final Configuration configuration) {
-        super(configuration);
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/text/FontPostureTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/text/FontPostureTest.java
index c78f23b37f1..be9566254dc 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/text/FontPostureTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/text/FontPostureTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,9 +26,9 @@
 package test.javafx.scene.text;
 
 import javafx.scene.text.FontPosture;
-import static junit.framework.Assert.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class FontPostureTest {
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/text/FontTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/text/FontTest.java
index d35f4b0c123..254ca72937b 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/text/FontTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/text/FontTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,18 +26,18 @@
 package test.javafx.scene.text;
 
 import com.sun.javafx.scene.text.FontHelper;
-import static test.com.sun.javafx.test.TestHelper.assertImmutableList;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNotSame;
-import static junit.framework.Assert.assertTrue;
 
 import java.util.List;
 import javafx.scene.text.Font;
 import javafx.scene.text.FontPosture;
 import javafx.scene.text.FontWeight;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static test.com.sun.javafx.test.TestHelper.assertImmutableList;
 
 public class FontTest {
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/text/FontWeightTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/text/FontWeightTest.java
index cb8a6ac3d2f..8d0645d03d9 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/text/FontWeightTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/text/FontWeightTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,9 +26,9 @@
 package test.javafx.scene.text;
 
 import javafx.scene.text.FontWeight;
-import static junit.framework.Assert.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class FontWeightTest {
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/text/TextFlowTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/text/TextFlowTest.java
index 1fbccef69d5..8f0824e6ff9 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/text/TextFlowTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/text/TextFlowTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,6 @@
 
 package test.javafx.scene.text;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 import javafx.scene.text.Text;
 import javafx.scene.text.TextFlow;
 import javafx.scene.layout.VBox;
@@ -36,11 +34,14 @@
 
 import com.sun.javafx.tk.Toolkit;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class TextFlowTest {
 
-    @Test public void testTabSize() {
+    @Test
+    public void testTabSize() {
         Toolkit tk = Toolkit.getToolkit();
 
         assertTrue(tk instanceof StubToolkit);  // Ensure it's StubToolkit
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/text/TextTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/text/TextTest.java
index 9efd6b875e4..14b3ec6d290 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/text/TextTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/text/TextTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,6 @@
 
 package test.javafx.scene.text;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assume.assumeTrue;
 import javafx.scene.text.Font;
 import javafx.scene.text.Text;
 import javafx.scene.layout.HBox;
@@ -39,11 +34,17 @@
 
 import com.sun.javafx.tk.Toolkit;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 public class TextTest {
 
-    @Test public void testCtors() {
+    @Test
+    public void testCtors() {
         Text t1 = new Text();
         assertEquals("", t1.getText());
         Text t2 = new Text("test content");
@@ -54,7 +55,8 @@ public class TextTest {
         assertEquals("2", t3.getText());
     }
 
-    @Test public void testSettingNullText() {
+    @Test
+    public void testSettingNullText() {
         Text t = new Text();
         t.setText(null);
         assertEquals("", t.getText());
@@ -69,13 +71,15 @@ public class TextTest {
         assertEquals("", t.getText());
     }
 
-    @Test public void testDefaultTextNotNull() {
+    @Test
+    public void testDefaultTextNotNull() {
         Text t = new Text();
         assertEquals("", t.getText());
         assertEquals("", t.textProperty().get());
     }
 
-    @Test public void testStoreFont() {
+    @Test
+    public void testStoreFont() {
         Text t = new Text();
         Font f = new Font(44);
         assertEquals(Font.getDefault(), t.getFont());
@@ -87,13 +91,15 @@ public class TextTest {
  // also not a given that the Font.getDefault() matches the default font
  // on a Text node anyway, as CSS defaults are applied to the Text node.
 /*
-    @Test public void testPropertyPropagation_font() throws Exception {
+    @Test
+    public void testPropertyPropagation_font() throws Exception {
         final Text node = new Text();
         NodeTest.testObjectPropertyPropagation(node, "font", Font.getDefault(), new Font(44));
     }
 */
 
-//     @Test public void testPropertyPropagation_textOrigin() throws Exception {
+//     @Test
+//     public void testPropertyPropagation_textOrigin() throws Exception {
 //         final Text node = new Text();
 //         NodeTest.testObjectPropertyPropagation(node, "textOrigin", "textOrigin",
 //                 VPos.BASELINE, VPos.TOP, new NodeTest.ObjectValueConvertor() {
@@ -104,7 +110,8 @@ public class TextTest {
 //                 });
 //     }
 
-//     @Test public void testPropertyPropagation_boundsType() throws Exception {
+//     @Test
+//     public void testPropertyPropagation_boundsType() throws Exception {
 //         final Text node = new Text();
 //         NodeTest.testObjectPropertyPropagation(node, "boundsType", "textBoundsType",
 //                 TextBoundsType.LOGICAL, TextBoundsType.VISUAL, new NodeTest.ObjectValueConvertor() {
@@ -115,7 +122,8 @@ public class TextTest {
 //                 });
 //     }
 
-//     @Test public void testPropertyPropagation_textAlignment() throws Exception {
+//     @Test
+//     public void testPropertyPropagation_textAlignment() throws Exception {
 //         final Text node = new Text();
 //         NodeTest.testObjectPropertyPropagation(node, "textAlignment", "textAlignment",
 //                 TextAlignment.LEFT, TextAlignment.CENTER, new NodeTest.ObjectValueConvertor() {
@@ -126,54 +134,64 @@ public class TextTest {
 //                 });
 //     }
 
-//     @Test public void testPropertyPropagation_visible() throws Exception {
+//     @Test
+//     public void testPropertyPropagation_visible() throws Exception {
 //         final Text node = new Text();
 //         NodeTest.testBooleanPropertyPropagation(node, "visible", false, true);
 //     }
 
-//     @Test public void testPropertyPropagation_text() throws Exception {
+//     @Test
+//     public void testPropertyPropagation_text() throws Exception {
 //         final Text node = new Text();
 //         NodeTest.testObjectPropertyPropagation(node, "text", "text", "Hello", "World");
 //     }
 
-//     @Test public void testPropertyPropagation_strikethrough() throws Exception {
+//     @Test
+//     public void testPropertyPropagation_strikethrough() throws Exception {
 //         final Text node = new Text();
 //         NodeTest.testBooleanPropertyPropagation(node, "strikethrough", false, true);
 //     }
 
-//     @Test public void testPropertyPropagation_underline() throws Exception {
+//     @Test
+//     public void testPropertyPropagation_underline() throws Exception {
 //         final Text node = new Text();
 //         NodeTest.testBooleanPropertyPropagation(node, "underline", false, true);
 //     }
 
-//     @Test public void testPropertyPropagation_x() throws Exception {
+//     @Test
+//     public void testPropertyPropagation_x() throws Exception {
 //         final Text node = new Text();
 //         NodeTest.testDoublePropertyPropagation(node, "x", 100, 200);
 //     }
 
-//     @Test public void testPropertyPropagation_y() throws Exception {
+//     @Test
+//     public void testPropertyPropagation_y() throws Exception {
 //         final Text node = new Text();
 //         NodeTest.testDoublePropertyPropagation(node, "y", 100, 200);
 //     }
 
-//     @Test public void testPropertyPropagation_wrappingWidth() throws Exception {
+//     @Test
+//     public void testPropertyPropagation_wrappingWidth() throws Exception {
 //         final Text node = new Text();
 //         NodeTest.testDoublePropertyPropagation(node, "wrappingWidth", 100, 200);
 //     }
 
-//     @Test public void testBoundPropertySync_X() throws Exception {
+//     @Test
+//     public void testBoundPropertySync_X() throws Exception {
 //         NodeTest.assertDoublePropertySynced(
 //                 new Text(1.0, 2.0, "The Text"),
 //                 "x", "x", 10.0);
 //     }
 
-//     @Test public void testBoundPropertySync_Y() throws Exception {
+//     @Test
+//     public void testBoundPropertySync_Y() throws Exception {
 //         NodeTest.assertDoublePropertySynced(
 //                 new Text(1.0, 2.0, "The Text"),
 //                 "y", "y", 20.0);
 //     }
 
-//     @Test public void testBoundPropertySync_Text() throws Exception {
+//     @Test
+//     public void testBoundPropertySync_Text() throws Exception {
 //         NodeTest.assertStringPropertySynced(
 //                 new Text(1.0, 2.0, "The Text"),
 //                 "text", "text", "The Changed Text");
@@ -185,7 +203,8 @@ public class TextTest {
 //     // and it sets null on the PGText node. StubFontLoader needs to be
 //     // replaced with the real font loader.
 // /*
-//     @Test public void testBoundPropertySync_Font() throws Exception {
+//     @Test
+//     public void testBoundPropertySync_Font() throws Exception {
 //         List<String> fontNames = Font.getFontNames();
 //         String fontName = fontNames.get(fontNames.size() - 1);
 //         NodeTest.assertObjectPropertySynced(
@@ -194,46 +213,53 @@ public class TextTest {
 //     }
 // */
 
-//     @Test public void testBoundPropertySync_BoundsType() throws Exception {
+//     @Test
+//     public void testBoundPropertySync_BoundsType() throws Exception {
 //         NodeTest.assertObjectPropertySynced(
 //                 new Text(1.0, 2.0, "The Text"),
 //                 "boundsType", "textBoundsType", TextBoundsType.VISUAL);
 //     }
 
 
-//     @Test public void testBoundPropertySync_WrappingWidth() throws Exception {
+//     @Test
+//     public void testBoundPropertySync_WrappingWidth() throws Exception {
 //         NodeTest.assertDoublePropertySynced(
 //                 new Text(1.0, 2.0, "The Text"),
 //                 "wrappingWidth", "wrappingWidth", 50);
 //     }
 
 
-//     @Test public void testBoundPropertySync_Underline() throws Exception {
+//     @Test
+//     public void testBoundPropertySync_Underline() throws Exception {
 //         NodeTest.assertBooleanPropertySynced(
 //                 new Text(1.0, 2.0, "The Text"),
 //                 "underline", "underline", true);
 //     }
 
-//     @Test public void testBoundPropertySync_Strikethrough() throws Exception {
+//     @Test
+//     public void testBoundPropertySync_Strikethrough() throws Exception {
 //         NodeTest.assertBooleanPropertySynced(
 //                 new Text(1.0, 2.0, "The Text"),
 //                 "strikethrough", "strikethrough", true);
 //     }
 
-//     @Test public void testBoundPropertySync_TextAlignment() throws Exception {
+//     @Test
+//     public void testBoundPropertySync_TextAlignment() throws Exception {
 //         NodeTest.assertObjectPropertySynced(
 //                 new Text(1.0, 2.0, "The Text"),
 //                 "textAlignment", "textAlignment", TextAlignment.RIGHT);
 //     }
 
-    @Test public void toStringShouldReturnNonEmptyString() {
+    @Test
+    public void toStringShouldReturnNonEmptyString() {
         String s = new Text().toString();
         assertNotNull(s);
         assertFalse(s.isEmpty());
     }
 
     // Test for JDK-8130738
-    @Test public void testTabSize() {
+    @Test
+    public void testTabSize() {
         // Test is unstable until JDK-8236728 is fixed
         assumeTrue(Boolean.getBoolean("unstable.test"));
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/text/Text_cssMethods_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/text/Text_cssMethods_Test.java
index 2df7fa54d52..a5457e6875f 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/text/Text_cssMethods_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/text/Text_cssMethods_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,7 @@
 
 package test.javafx.scene.text;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 
 import javafx.geometry.VPos;
 import javafx.scene.text.Font;
@@ -35,19 +34,13 @@
 import javafx.scene.text.Text;
 import javafx.scene.text.TextAlignment;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
 import test.com.sun.javafx.test.CssMethodsTestBase;
 
-@RunWith(Parameterized.class)
 public class Text_cssMethods_Test extends CssMethodsTestBase {
     private static final Text TEST_TEXT = new Text();
 
-    @Parameters
-    public static Collection data() {
-        return Arrays.asList(new Object[] {
+    public static Stream<Configuration> data() {
+        return Stream.of(
             config(TEST_TEXT, "font", Font.getDefault(),
                    "-fx-font", Font.font("Verdana", FontWeight.BOLD, 22)),
             config(TEST_TEXT, "underline", false, "-fx-underline", true),
@@ -61,10 +54,6 @@ public static Collection data() {
             config(TEST_TEXT, "fontSmoothingType", FontSmoothingType.LCD,
                 "-fx-font-smoothing-type", FontSmoothingType.GRAY),
             config(TEST_TEXT, "tabSize", 8, "-fx-tab-size", 4)
-        });
-    }
-
-    public Text_cssMethods_Test(final Configuration configuration) {
-        super(configuration);
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/text/Text_onInvalidate_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/text/Text_onInvalidate_Test.java
index 4ba5c1328f2..3ce0450745f 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/text/Text_onInvalidate_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/text/Text_onInvalidate_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,44 +25,34 @@
 
 package test.javafx.scene.text;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 
 import javafx.geometry.VPos;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
 import com.sun.javafx.scene.DirtyBits;
 import javafx.scene.text.Font;
 import javafx.scene.text.Text;
 import javafx.scene.text.TextAlignment;
 import javafx.scene.text.TextBoundsType;
+
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.OnInvalidateMethodsTestBase;
 
-@RunWith(Parameterized.class)
 public class Text_onInvalidate_Test extends OnInvalidateMethodsTestBase {
 
-    public Text_onInvalidate_Test(Configuration config) {
-        super(config);
-    }
-
-    @Parameters
-    public static Collection<Object[]> data() {
-        Object[][] data = new Object[][] {
-              //rich text aware
-              {new Configuration(Text.class, "text", "cool", new DirtyBits[] {DirtyBits.NODE_CONTENTS, DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY})},
-              {new Configuration(Text.class, "x", 123.0, new DirtyBits[] {DirtyBits.NODE_GEOMETRY})},
-              {new Configuration(Text.class, "y", 123.0, new DirtyBits[] {DirtyBits.NODE_GEOMETRY})},
-              {new Configuration(Text.class, "font", new Font(10) , new DirtyBits[] {DirtyBits.TEXT_FONT, DirtyBits.NODE_CONTENTS, DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY})},
-              {new Configuration(Text.class, "wrappingWidth", 5 , new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY})}, //note wrapping width sometimes can also cause DirtyBits.NODE_CONTENTS,
-              {new Configuration(Text.class, "underline", true , new DirtyBits[] {DirtyBits.TEXT_ATTRS})},
-              {new Configuration(Text.class, "strikethrough", true , new DirtyBits[] {DirtyBits.TEXT_ATTRS})},
-              {new Configuration(Text.class, "textAlignment", TextAlignment.RIGHT , new DirtyBits[] {DirtyBits.NODE_CONTENTS, DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY})},
-              {new Configuration(Text.class, "textOrigin", VPos.BOTTOM , new DirtyBits[] {DirtyBits.NODE_BOUNDS , DirtyBits.NODE_GEOMETRY})},
-              {new Configuration(Text.class, "boundsType", TextBoundsType.VISUAL , new DirtyBits[] {DirtyBits.NODE_BOUNDS , DirtyBits.NODE_GEOMETRY})}
-        };
-        return Arrays.asList(data);
+    public static Stream<Arguments> data() {
+        return Stream.of(
+            //rich text aware
+            Arguments.of( new Configuration(Text.class, "text", "cool", new DirtyBits[] {DirtyBits.NODE_CONTENTS, DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY}) ),
+            Arguments.of( new Configuration(Text.class, "x", 123.0, new DirtyBits[] {DirtyBits.NODE_GEOMETRY}) ),
+            Arguments.of( new Configuration(Text.class, "y", 123.0, new DirtyBits[] {DirtyBits.NODE_GEOMETRY}) ),
+            Arguments.of( new Configuration(Text.class, "font", new Font(10) , new DirtyBits[] {DirtyBits.TEXT_FONT, DirtyBits.NODE_CONTENTS, DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY}) ),
+            Arguments.of( new Configuration(Text.class, "wrappingWidth", 5 , new DirtyBits[] {DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY}) ), //note wrapping width sometimes can also cause DirtyBits.NODE_CONTENTS,
+            Arguments.of( new Configuration(Text.class, "underline", true , new DirtyBits[] {DirtyBits.TEXT_ATTRS}) ),
+            Arguments.of( new Configuration(Text.class, "strikethrough", true , new DirtyBits[] {DirtyBits.TEXT_ATTRS}) ),
+            Arguments.of( new Configuration(Text.class, "textAlignment", TextAlignment.RIGHT , new DirtyBits[] {DirtyBits.NODE_CONTENTS, DirtyBits.NODE_BOUNDS, DirtyBits.NODE_GEOMETRY}) ),
+            Arguments.of( new Configuration(Text.class, "textOrigin", VPos.BOTTOM , new DirtyBits[] {DirtyBits.NODE_BOUNDS , DirtyBits.NODE_GEOMETRY}) ),
+            Arguments.of( new Configuration(Text.class, "boundsType", TextBoundsType.VISUAL , new DirtyBits[] {DirtyBits.NODE_BOUNDS , DirtyBits.NODE_GEOMETRY}) )
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/AffineOperationsTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/AffineOperationsTest.java
index 6629ec58044..9e56236f79e 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/AffineOperationsTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/AffineOperationsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,13 +27,9 @@
 
 //import java.awt.geom.AffineTransform;
 //import com.sun.javafx.geom.transform.Affine3D;
-import java.util.Collection;
-import org.junit.runners.Parameterized.Parameters;
-import org.junit.runners.Parameterized;
-import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Stream;
 import javafx.geometry.Point3D;
-import org.junit.Test;
-import org.junit.runner.RunWith;
 import test.com.sun.javafx.test.TransformHelper;
 import javafx.geometry.Point2D;
 import javafx.scene.transform.Affine;
@@ -46,9 +42,16 @@
 import javafx.scene.transform.Transform;
 import javafx.scene.transform.TransformShim;
 import javafx.scene.transform.Translate;
-import static org.junit.Assert.*;
 
-@RunWith(Parameterized.class)
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 public class AffineOperationsTest {
 
     private static final Affine identity = new Affine();
@@ -147,48 +150,41 @@ public class AffineOperationsTest {
          0, 0, 0, 0,
          0, 0, 0, 0, 1, 0, 0, 0, 0 };
 
-    @Parameters
-    public static Collection getParams() {
-        return Arrays.asList(new Object[][] {
-            { identity },                   //  0
-            { translate },                  //  1
-            { scale },                      //  2
-            { sc_tr },                      //  3
-            { shear },                      //  4
-            { sh_tr },                      //  5
-            { sh_sc },                      //  6
-            { sh_sc_simple },               //  7
-            { sh_sc_tr },                   //  8
-            { a3d_tr },                     //  9
-            { a3d_sc },                     // 10
-            { a3d_sc_tr },                  // 11
-            { a3d_sc2_tr3 },                // 12
-            { a3d_sc3_tr2 },                // 13
-            { a3d_withShear },              // 14
-            { a3d_only3d },                 // 15
-            { a3d_translate_only },         // 16
-            { a3d_complex },                // 17
-            { a3d_complex_noninvertible },  // 18
-            { shearRotatesToIdentity1 },    // 19
-            { shearRotatesToIdentity2 },    // 20
-            { scaleRotatesToIdentity },     // 21
-            { scr_tr_rotatesToTr },         // 22
-            { translate_only },             // 23
-            { nonInv_translate },           // 24
-            { nonInv_scale },               // 25
-            { nonInv_shear },               // 26
-            { nonInv_sh_sc_tr },            // 27
-            { nonInv_sh_sc },               // 28
-            { nonInv_sh_tr },               // 29
-            { nonInv_sc_tr },               // 30
-            { zero },                       // 31
-        });
-    }
-
-    private Affine affine;
-
-    public AffineOperationsTest(Affine a) {
-        this.affine = a;
+    public static Stream<Arguments> getParams() {
+        return Stream.of(
+            Arguments.of( identity ),                   //  0
+            Arguments.of( translate ),                  //  1
+            Arguments.of( scale ),                      //  2
+            Arguments.of( sc_tr ),                      //  3
+            Arguments.of( shear ),                      //  4
+            Arguments.of( sh_tr ),                      //  5
+            Arguments.of( sh_sc ),                      //  6
+            Arguments.of( sh_sc_simple ),               //  7
+            Arguments.of( sh_sc_tr ),                   //  8
+            Arguments.of( a3d_tr ),                     //  9
+            Arguments.of( a3d_sc ),                     // 10
+            Arguments.of( a3d_sc_tr ),                  // 11
+            Arguments.of( a3d_sc2_tr3 ),                // 12
+            Arguments.of( a3d_sc3_tr2 ),                // 13
+            Arguments.of( a3d_withShear ),              // 14
+            Arguments.of( a3d_only3d ),                 // 15
+            Arguments.of( a3d_translate_only ),         // 16
+            Arguments.of( a3d_complex ),                // 17
+            Arguments.of( a3d_complex_noninvertible ),  // 18
+            Arguments.of( shearRotatesToIdentity1 ),    // 19
+            Arguments.of( shearRotatesToIdentity2 ),    // 20
+            Arguments.of( scaleRotatesToIdentity ),     // 21
+            Arguments.of( scr_tr_rotatesToTr ),         // 22
+            Arguments.of( translate_only ),             // 23
+            Arguments.of( nonInv_translate ),           // 24
+            Arguments.of( nonInv_scale ),               // 25
+            Arguments.of( nonInv_shear ),               // 26
+            Arguments.of( nonInv_sh_sc_tr ),            // 27
+            Arguments.of( nonInv_sh_sc ),               // 28
+            Arguments.of( nonInv_sh_tr ),               // 29
+            Arguments.of( nonInv_sc_tr ),               // 30
+            Arguments.of( zero )                       // 31
+        );
     }
 
     private int eventCounter;
@@ -245,8 +241,9 @@ private void testOperationIsAtomic(Affine a,
         assertFalse(AffineShim.atomicChangeRuns(a));
     }
 
-    @Test
-    public void SetToTransformShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void SetToTransformShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Shear sh = new Shear(12, 15);
 
@@ -256,8 +253,9 @@ public void SetToTransformShouldBeAtomic() {
         );
     }
 
-    @Test
-    public void SetToTransform2DShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void SetToTransform2DShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Shear sh = new Shear(12, 15);
 
@@ -267,15 +265,17 @@ public void SetToTransform2DShouldBeAtomic() {
         );
     }
 
-    @Test
-    public void testSetToIdentity() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testSetToIdentity(Affine affine) {
         final Affine a = affine.clone();
         a.setToIdentity();
         TransformHelper.assertMatrix(a, new Affine());
     }
 
-    @Test
-    public void SetToIdentityShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void SetToIdentityShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
 
         testOperationIsAtomic(a,
@@ -284,8 +284,9 @@ public void SetToIdentityShouldBeAtomic() {
         );
     }
 
-    @Test
-    public void testAppendTranslation2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendTranslation2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -299,8 +300,9 @@ public void testAppendTranslation2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void testAppendZeroTranslation2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendZeroTranslation2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -314,8 +316,9 @@ public void testAppendZeroTranslation2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void testAppendTranslation2DWhichEliminatesTranslation() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendTranslation2DWhichEliminatesTranslation(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -345,8 +348,9 @@ public void testAppendTranslation2DWhichEliminatesTranslation() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void testAppendTranslation3DWhichMakesTranslation2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendTranslation3DWhichMakesTranslation2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -367,16 +371,18 @@ public void testAppendTranslation3DWhichMakesTranslation2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void appendTranslation2DShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void appendTranslation2DShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(a, new Translate(8, 9));
 
         testOperationIsAtomic(a, () -> a.appendTranslation(8, 9), () -> assertAffineOk(res, a));
     }
 
-    @Test
-    public void testPrependTranslation2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependTranslation2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -386,8 +392,9 @@ public void testPrependTranslation2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void testPrependZeroTranslation() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependZeroTranslation(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -397,16 +404,18 @@ public void testPrependZeroTranslation() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void prependTranslation2DShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void prependTranslation2DShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(new Translate(8, 9), a);
 
         testOperationIsAtomic(a, () -> a.prependTranslation(8, 9), () -> assertAffineOk(res, a));
     }
 
-    @Test
-    public void testAppendTranslation3D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendTranslation3D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -416,16 +425,18 @@ public void testAppendTranslation3D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void appendTranslation3DShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void appendTranslation3DShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(a, new Translate(8, 9, 10));
 
         testOperationIsAtomic(a, () -> a.appendTranslation(8, 9, 10), () -> assertAffineOk(res, a));
     }
 
-    @Test
-    public void testPrependTranslation3D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependTranslation3D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -435,8 +446,9 @@ public void testPrependTranslation3D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void testPrependTranslation3DWhichMakesIt2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependTranslation3DWhichMakesIt2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -446,16 +458,18 @@ public void testPrependTranslation3DWhichMakesIt2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void prependTranslation3DShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void prependTranslation3DShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(new Translate(8, 9, 10), a);
 
         testOperationIsAtomic(a, () -> a.prependTranslation(8, 9, 10), () -> assertAffineOk(res, a));
     }
 
-    @Test
-    public void testAppendScale2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendScale2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -465,14 +479,18 @@ public void testAppendScale2D() {
         assertAffineOk(res, a);
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testAppendNullPivotedScale2D() {
-        Affine a = affine.clone();
-        a.appendScale(8, 9, null);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendNullPivotedScale2D(Affine affine) {
+        assertThrows(NullPointerException.class, () -> {
+            Affine a = affine.clone();
+            a.appendScale(8, 9, null);
+        });
     }
 
-    @Test
-    public void testAppendZeroPivotScale2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendZeroPivotScale2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -491,8 +509,9 @@ public void testAppendZeroPivotScale2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void testAppendZeroScale2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendZeroScale2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -511,8 +530,9 @@ public void testAppendZeroScale2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void testAppendNoScale2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendNoScale2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -522,8 +542,9 @@ public void testAppendNoScale2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void testAppendScale2DWhichMayEliminateScale() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendScale2DWhichMayEliminateScale(Affine affine) {
         Affine a = affine.clone();
 
         if (a.getMxx() == 0 || a.getMyy() == 0) {
@@ -540,8 +561,9 @@ public void testAppendScale2DWhichMayEliminateScale() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void testAppendScale3DWhichMakesIt2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendScale3DWhichMakesIt2D(Affine affine) {
         Affine a = affine.clone();
 
         if (a.getMzz() == 0.0) {
@@ -557,16 +579,18 @@ public void testAppendScale3DWhichMakesIt2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void appendScale2DShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void appendScale2DShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(a, new Scale(8, 9));
 
         testOperationIsAtomic(a, () -> a.appendScale(8, 9), () -> assertAffineOk(res, a));
     }
 
-    @Test
-    public void testPrependScale2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependScale2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -576,14 +600,18 @@ public void testPrependScale2D() {
         assertAffineOk(res, a);
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testPrependNullPivotedScale2D() {
-        Affine a = affine.clone();
-        a.appendScale(8, 9, null);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependNullPivotedScale2D(Affine affine) {
+        assertThrows(NullPointerException.class, () -> {
+            Affine a = affine.clone();
+            a.appendScale(8, 9, null);
+        });
     }
 
-    @Test
-    public void testPrependZeroPivotScale2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependZeroPivotScale2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -602,8 +630,9 @@ public void testPrependZeroPivotScale2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void testPrependZeroScale2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependZeroScale2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -622,8 +651,9 @@ public void testPrependZeroScale2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void testPrependHalfZeroScale2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependHalfZeroScale2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -633,8 +663,9 @@ public void testPrependHalfZeroScale2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void testPrependOtherHalfZeroScale2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependOtherHalfZeroScale2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -644,8 +675,9 @@ public void testPrependOtherHalfZeroScale2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void testPrependNoScale2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependNoScale2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -655,8 +687,9 @@ public void testPrependNoScale2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void testPrependOppositeScale2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependOppositeScale2D(Affine affine) {
         Affine a = affine.clone();
 
         final double sx = a.getMxx() == 0 ? 0 : 1 / a.getMxx();
@@ -677,8 +710,9 @@ public void testPrependOppositeScale2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void testPrependOppositeScale3D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependOppositeScale3D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -696,16 +730,18 @@ public void testPrependOppositeScale3D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void prependScale2DShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void prependScale2DShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(new Scale(8, 9), a);
 
         testOperationIsAtomic(a, () -> a.prependScale(8, 9), () -> assertAffineOk(res, a));
     }
 
-    @Test
-    public void testAppendPivotedScale2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendPivotedScale2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -715,8 +751,9 @@ public void testAppendPivotedScale2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void testAppendPointPivotedScale2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendPointPivotedScale2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -726,16 +763,18 @@ public void testAppendPointPivotedScale2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void appendPivotedScale2DShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void appendPivotedScale2DShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(a, new Scale(8, 9, 10, 11));
 
         testOperationIsAtomic(a, () -> a.appendScale(8, 9, 10, 11), () -> assertAffineOk(res, a));
     }
 
-    @Test
-    public void testPrependPivotedScale2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependPivotedScale2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -745,8 +784,9 @@ public void testPrependPivotedScale2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void testPrependPointPivotedScale2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependPointPivotedScale2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -756,16 +796,18 @@ public void testPrependPointPivotedScale2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void prependPivotedScale2DShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void prependPivotedScale2DShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(new Scale(8, 9, 10, 11), a);
 
         testOperationIsAtomic(a, () -> a.prependScale(8, 9, 10, 11), () -> assertAffineOk(res, a));
     }
 
-    @Test
-    public void testAppendScale3D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendScale3D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -775,14 +817,18 @@ public void testAppendScale3D() {
         assertAffineOk(res, a);
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testAppendNullPivotedScale3D() {
-        Affine a = affine.clone();
-        a.appendScale(8, 9, 10, null);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendNullPivotedScale3D(Affine affine) {
+        assertThrows(NullPointerException.class, () -> {
+            Affine a = affine.clone();
+            a.appendScale(8, 9, 10, null);
+        });
     }
 
-    @Test
-    public void testAppendOppositeScale2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendOppositeScale2D(Affine affine) {
         Affine a = affine.clone();
 
         final double sx = a.getMxx() == 0 ? 0 : 1 / a.getMxx();
@@ -803,8 +849,9 @@ public void testAppendOppositeScale2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void testAppendOppositeScale3D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendOppositeScale3D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -828,16 +875,18 @@ public void testAppendOppositeScale3D() {
 
     }
 
-    @Test
-    public void appendScale3DShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void appendScale3DShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(a, new Scale(8, 9, 10));
 
         testOperationIsAtomic(a, () -> a.appendScale(8, 9, 10), () -> assertAffineOk(res, a));
     }
 
-    @Test
-    public void testPrependScale3D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependScale3D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -847,14 +896,18 @@ public void testPrependScale3D() {
         assertAffineOk(res, a);
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testPrependNullPivotedScale3D() {
-        Affine a = affine.clone();
-        a.prependScale(8, 9, 10, null);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependNullPivotedScale3D(Affine affine) {
+        assertThrows(NullPointerException.class, () -> {
+            Affine a = affine.clone();
+            a.prependScale(8, 9, 10, null);
+        });
     }
 
-    @Test
-    public void testPrependScale3DWichMakesIt2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependScale3DWichMakesIt2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -871,16 +924,18 @@ public void testPrependScale3DWichMakesIt2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void prependScale3DShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void prependScale3DShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(new Scale(8, 9, 10), a);
 
         testOperationIsAtomic(a, () -> a.prependScale(8, 9, 10), () -> assertAffineOk(res, a));
     }
 
-    @Test
-    public void testAppendPivotedScale3D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendPivotedScale3D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -890,8 +945,9 @@ public void testAppendPivotedScale3D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void testAppendPointPivotedScale3D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendPointPivotedScale3D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -901,16 +957,18 @@ public void testAppendPointPivotedScale3D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void appendPivotedScale3DShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void appendPivotedScale3DShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(a, new Scale(8, 9, 10, 11, 12, 13));
 
         testOperationIsAtomic(a, () -> a.appendScale(8, 9, 10, 11, 12, 13), () -> assertAffineOk(res, a));
     }
 
-    @Test
-    public void testPrependPivotedScale3D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependPivotedScale3D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -920,8 +978,9 @@ public void testPrependPivotedScale3D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void testPrependPointPivotedScale3D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependPointPivotedScale3D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -931,16 +990,18 @@ public void testPrependPointPivotedScale3D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void prependPivotedScale3DShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void prependPivotedScale3DShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(new Scale(8, 9, 10, 11, 12, 13), a);
 
         testOperationIsAtomic(a, () -> a.prependScale(8, 9, 10, 11, 12, 13), () -> assertAffineOk(res, a));
     }
 
-    @Test
-    public void testAppendShear2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendShear2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -950,20 +1011,27 @@ public void testAppendShear2D() {
         assertAffineOk(res, a);
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testAppendNullPivotedShear2D() {
-        Affine a = affine.clone();
-        a.appendShear(8, 9, null);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendNullPivotedShear2D(Affine affine) {
+        assertThrows(NullPointerException.class, () -> {
+            Affine a = affine.clone();
+            a.appendShear(8, 9, null);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testPrependNullPivotedShear2D() {
-        Affine a = affine.clone();
-        a.prependShear(8, 9, null);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependNullPivotedShear2D(Affine affine) {
+        assertThrows(NullPointerException.class, () -> {
+            Affine a = affine.clone();
+            a.prependShear(8, 9, null);
+        });
     }
 
-    @Test
-    public void testAppendZeroPivotedShear2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendZeroPivotedShear2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -982,8 +1050,9 @@ public void testAppendZeroPivotedShear2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void testPrependZeroPivotedShear2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependZeroPivotedShear2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1002,8 +1071,9 @@ public void testPrependZeroPivotedShear2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void testAppendZeroShear2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendZeroShear2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1013,16 +1083,18 @@ public void testAppendZeroShear2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void appendShear2DShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void appendShear2DShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(a, new Shear(8, 9));
 
         testOperationIsAtomic(a, () -> a.appendShear(8, 9), () -> assertAffineOk(res, a));
     }
 
-    @Test
-    public void testPrependShear2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependShear2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1032,8 +1104,9 @@ public void testPrependShear2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void testPrependShearWhichMayEliminateTranslation() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependShearWhichMayEliminateTranslation(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1046,8 +1119,9 @@ public void testPrependShearWhichMayEliminateTranslation() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void testPrependZeroShear2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependZeroShear2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1057,16 +1131,18 @@ public void testPrependZeroShear2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void prependShear2DShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void prependShear2DShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(new Shear(8, 9), a);
 
         testOperationIsAtomic(a, () -> a.prependShear(8, 9), () -> assertAffineOk(res, a));
     }
 
-    @Test
-    public void testAppendPivotedShear2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendPivotedShear2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1076,8 +1152,9 @@ public void testAppendPivotedShear2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void testAppendPointPivotedShear2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendPointPivotedShear2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1087,16 +1164,18 @@ public void testAppendPointPivotedShear2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void appendPivotedShear2DShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void appendPivotedShear2DShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(a, new Shear(8, 9, 10, 11));
 
         testOperationIsAtomic(a, () -> a.appendShear(8, 9, 10, 11), () -> assertAffineOk(res, a));
     }
 
-    @Test
-    public void testPrependPivotedShear2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependPivotedShear2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1106,8 +1185,9 @@ public void testPrependPivotedShear2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void testPrependPointPivotedShear2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependPointPivotedShear2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1117,16 +1197,18 @@ public void testPrependPointPivotedShear2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void prependPivotedShear2DShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void prependPivotedShear2DShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(new Shear(8, 9, 10, 11), a);
 
         testOperationIsAtomic(a, () -> a.prependShear(8, 9, 10, 11), () -> assertAffineOk(res, a));
     }
 
-    @Test
-    public void testAppendRotation2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendRotation2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1136,16 +1218,18 @@ public void testAppendRotation2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void appendRotate2DShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void appendRotate2DShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(a, new Rotate(37));
 
         testOperationIsAtomic(a, () -> a.appendRotation(37), () -> assertAffineOk(res, a));
     }
 
-    @Test
-    public void testPrependRotation2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependRotation2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1155,16 +1239,18 @@ public void testPrependRotation2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void prependRotate2DShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void prependRotate2DShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(new Rotate(37), a);
 
         testOperationIsAtomic(a, () -> a.prependRotation(37), () -> assertAffineOk(res, a));
     }
 
-    @Test
-    public void testAppendRotation90() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendRotation90(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1174,16 +1260,18 @@ public void testAppendRotation90() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void appendRotate90ShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void appendRotate90ShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(a, new Rotate(90));
 
         testOperationIsAtomic(a, () -> a.appendRotation(90), () -> assertAffineOk(res, a));
     }
 
-    @Test
-    public void testPrependRotation90() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependRotation90(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1193,16 +1281,18 @@ public void testPrependRotation90() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void prependRotate90ShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void prependRotate90ShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(a, new Rotate(90));
 
         testOperationIsAtomic(a, () -> a.appendRotation(90), () -> assertAffineOk(res, a));
     }
 
-    @Test
-    public void testAppendRotation180() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendRotation180(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1212,16 +1302,18 @@ public void testAppendRotation180() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void appendRotate180ShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void appendRotate180ShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(a, new Rotate(180));
 
         testOperationIsAtomic(a, () -> a.appendRotation(180), () -> assertAffineOk(res, a));
     }
 
-    @Test
-    public void testPrependRotation180() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependRotation180(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1231,16 +1323,18 @@ public void testPrependRotation180() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void prependRotate180ShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void prependRotate180ShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(a, new Rotate(180));
 
         testOperationIsAtomic(a, () -> a.appendRotation(180), () -> assertAffineOk(res, a));
     }
 
-    @Test
-    public void testAppendRotation270() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendRotation270(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1250,16 +1344,18 @@ public void testAppendRotation270() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void appendRotate270ShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void appendRotate270ShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(a, new Rotate(270));
 
         testOperationIsAtomic(a, () -> a.appendRotation(270), () -> assertAffineOk(res, a));
     }
 
-    @Test
-    public void testPrependRotation270() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependRotation270(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1269,16 +1365,18 @@ public void testPrependRotation270() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void prependRotate270ShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void prependRotate270ShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(a, new Rotate(270));
 
         testOperationIsAtomic(a, () -> a.appendRotation(270), () -> assertAffineOk(res, a));
     }
 
-    @Test
-    public void testAppendRotationMinus450() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendRotationMinus450(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1288,8 +1386,9 @@ public void testAppendRotationMinus450() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void testPrependRotationMinus450() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependRotationMinus450(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1300,8 +1399,9 @@ public void testPrependRotationMinus450() {
     }
 
 
-    @Test
-    public void testAppendPivotedRotate2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendPivotedRotate2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1311,20 +1411,27 @@ public void testAppendPivotedRotate2D() {
         assertAffineOk(res, a);
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testAppendNullPivotedRotate2D() {
-        Affine a = affine.clone();
-        a.appendRotation(8, null);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendNullPivotedRotate2D(Affine affine) {
+        assertThrows(NullPointerException.class, () -> {
+            Affine a = affine.clone();
+            a.appendRotation(8, null);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testPrependNullPivotedRotate2D() {
-        Affine a = affine.clone();
-        a.prependRotation(8, null);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependNullPivotedRotate2D(Affine affine) {
+        assertThrows(NullPointerException.class, () -> {
+            Affine a = affine.clone();
+            a.prependRotation(8, null);
+        });
     }
 
-    @Test
-    public void testAppendZeroPivotedRotate2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendZeroPivotedRotate2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1343,8 +1450,9 @@ public void testAppendZeroPivotedRotate2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void testAppendPointPivotedRotate2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendPointPivotedRotate2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1354,16 +1462,18 @@ public void testAppendPointPivotedRotate2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void appendPivotedRotate2DShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void appendPivotedRotate2DShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(a, new Rotate(37, 10, 11));
 
         testOperationIsAtomic(a, () -> a.appendRotation(37, 10, 11), () -> assertAffineOk(res, a));
     }
 
-    @Test
-    public void testPrependPivotedRotate2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependPivotedRotate2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1373,8 +1483,9 @@ public void testPrependPivotedRotate2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void testPrependZeroPivotedRotate2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependZeroPivotedRotate2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1394,8 +1505,9 @@ public void testPrependZeroPivotedRotate2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void testPrependPointPivotedRotate2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependPointPivotedRotate2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1405,16 +1517,18 @@ public void testPrependPointPivotedRotate2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void prependPivotedRotate2DShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void prependPivotedRotate2DShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(new Rotate(37, 10, 11), a);
 
         testOperationIsAtomic(a, () -> a.prependRotation(37, 10, 11), () -> assertAffineOk(res, a));
     }
 
-    @Test
-    public void testAppendNoRotation() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendNoRotation(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1425,8 +1539,9 @@ public void testAppendNoRotation() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void testAppendRotation3D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendRotation3D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1437,44 +1552,63 @@ public void testAppendRotation3D() {
         assertAffineOk(res, a);
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testAppendNullAxisRotation3D() {
-        Affine a = affine.clone();
-        a.appendRotation(8, 100, 110, 120, null);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendNullAxisRotation3D(Affine affine) {
+        assertThrows(NullPointerException.class, () -> {
+            Affine a = affine.clone();
+            a.appendRotation(8, 100, 110, 120, null);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testPrependNullAxisRotation3D() {
-        Affine a = affine.clone();
-        a.prependRotation(8, 100, 110, 120, null);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependNullAxisRotation3D(Affine affine) {
+        assertThrows(NullPointerException.class, () -> {
+            Affine a = affine.clone();
+            a.prependRotation(8, 100, 110, 120, null);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testAppendNullAxisPointPivotRotation3D() {
-        Affine a = affine.clone();
-        a.appendRotation(8, new Point3D(100, 110, 120), null);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendNullAxisPointPivotRotation3D(Affine affine) {
+        assertThrows(NullPointerException.class, () -> {
+            Affine a = affine.clone();
+            a.appendRotation(8, new Point3D(100, 110, 120), null);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testPrependNullAxisPointPivotRotation3D() {
-        Affine a = affine.clone();
-        a.prependRotation(8, new Point3D(100, 110, 120), null);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependNullAxisPointPivotRotation3D(Affine affine) {
+        assertThrows(NullPointerException.class, () -> {
+            Affine a = affine.clone();
+            a.prependRotation(8, new Point3D(100, 110, 120), null);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testAppendNullPivotRotation3D() {
-        Affine a = affine.clone();
-        a.appendRotation(8, null, Rotate.Z_AXIS);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendNullPivotRotation3D(Affine affine) {
+        assertThrows(NullPointerException.class, () -> {
+            Affine a = affine.clone();
+            a.appendRotation(8, null, Rotate.Z_AXIS);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testPrependNullPivotRotation3D() {
-        Affine a = affine.clone();
-        a.prependRotation(8, null, Rotate.Z_AXIS);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependNullPivotRotation3D(Affine affine) {
+        assertThrows(NullPointerException.class, () -> {
+            Affine a = affine.clone();
+            a.prependRotation(8, null, Rotate.Z_AXIS);
+        });
     }
 
-    @Test
-    public void testAppendRotation3Dbeing2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendRotation3Dbeing2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1485,8 +1619,9 @@ public void testAppendRotation3Dbeing2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void testAppendRotation3DbeingUpsideDown2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendRotation3DbeingUpsideDown2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1497,8 +1632,9 @@ public void testAppendRotation3DbeingUpsideDown2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void testAppendRotationWithZeroAxis() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendRotationWithZeroAxis(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1507,8 +1643,9 @@ public void testAppendRotationWithZeroAxis() {
         assertAffineOk(affine, a);
     }
 
-    @Test
-    public void testAppendRotationWithAlmostZeroAxis() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendRotationWithAlmostZeroAxis(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1517,8 +1654,9 @@ public void testAppendRotationWithAlmostZeroAxis() {
         assertAffineOk(affine, a);
     }
 
-    @Test
-    public void testAppendPointedAxisRotation3D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendPointedAxisRotation3D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1529,8 +1667,9 @@ public void testAppendPointedAxisRotation3D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void testAppendPointedAxisPointedPivotRotation3D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendPointedAxisPointedPivotRotation3D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1541,8 +1680,9 @@ public void testAppendPointedAxisPointedPivotRotation3D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void appendRotate3DShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void appendRotate3DShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(a,
                 new Rotate(37, 8, 9, 10, new Point3D(12, 123, 521)));
@@ -1550,8 +1690,9 @@ public void appendRotate3DShouldBeAtomic() {
         testOperationIsAtomic(a, () -> a.appendRotation(37, 8, 9, 10, 12, 123, 521), () -> assertAffineOk(res, a));
     }
 
-    @Test
-    public void testPrependRotation3D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependRotation3D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1562,8 +1703,9 @@ public void testPrependRotation3D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void testPrependNoRotation() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependNoRotation(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1573,8 +1715,9 @@ public void testPrependNoRotation() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void testPrependRotation3Dbeing2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependRotation3Dbeing2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1585,8 +1728,9 @@ public void testPrependRotation3Dbeing2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void testPrependRotation3DbeingUpsideDown2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependRotation3DbeingUpsideDown2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1597,8 +1741,9 @@ public void testPrependRotation3DbeingUpsideDown2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void testPrependRotationWithZeroAxis() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependRotationWithZeroAxis(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1607,8 +1752,9 @@ public void testPrependRotationWithZeroAxis() {
         assertAffineOk(affine, a);
     }
 
-    @Test
-    public void testPrependRotationWithAlmostZeroAxis() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependRotationWithAlmostZeroAxis(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1617,8 +1763,9 @@ public void testPrependRotationWithAlmostZeroAxis() {
         assertAffineOk(affine, a);
     }
 
-    @Test
-    public void testPrependPointedAxisRotation3D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependPointedAxisRotation3D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1629,8 +1776,9 @@ public void testPrependPointedAxisRotation3D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void testPrependPointedAxisPointedPivotRotation3D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependPointedAxisPointedPivotRotation3D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1642,8 +1790,9 @@ public void testPrependPointedAxisPointedPivotRotation3D() {
     }
 
 
-    @Test
-    public void prependRotate3DShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void prependRotate3DShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(
                 new Rotate(37, 8, 9, 10, new Point3D(12, 123, 521)), a);
@@ -1651,8 +1800,9 @@ public void prependRotate3DShouldBeAtomic() {
         testOperationIsAtomic(a, () -> a.prependRotation(37, 8, 9, 10, 12, 123, 521), () -> assertAffineOk(res, a));
     }
 
-    @Test
-    public void testAppend2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppend2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1666,8 +1816,9 @@ public void testAppend2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void append2DShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void append2DShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(a,
                 new Affine(20, 22, 24,
@@ -1677,8 +1828,9 @@ public void append2DShouldBeAtomic() {
                  28, 30, 32), () -> assertAffineOk(res, a));
     }
 
-    @Test
-    public void testPrepend2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrepend2D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1692,8 +1844,9 @@ public void testPrepend2D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void prepend2DShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void prepend2DShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(
                 new Affine(20, 22, 24,
@@ -1703,8 +1856,9 @@ public void prepend2DShouldBeAtomic() {
                  28, 30, 32), () -> assertAffineOk(res, a));
     }
 
-    @Test
-    public void testAppend3D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppend3D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1720,8 +1874,9 @@ public void testAppend3D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void append3DShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void append3DShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(a,
                 new Affine(20, 22, 24, 26,
@@ -1733,8 +1888,9 @@ public void append3DShouldBeAtomic() {
                  36, 38, 40, 42), () -> assertAffineOk(res, a));
     }
 
-    @Test
-    public void testPrepend3D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrepend3D(Affine affine) {
         Affine a = affine.clone();
         assertStateOk(a);
 
@@ -1750,8 +1906,9 @@ public void testPrepend3D() {
         assertAffineOk(res, a);
     }
 
-    @Test
-    public void prepend3DShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void prepend3DShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(
                 new Affine(20, 22, 24, 26,
@@ -1763,11 +1920,13 @@ public void prepend3DShouldBeAtomic() {
                  36, 38, 40, 42), () -> assertAffineOk(res, a));
     }
 
-    @Test
-    public void testAppendTransform() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendTransform(Affine affine) {
         int counter = 0;
-        for (Object o : TransformOperationsTest.getParams()) {
-            Object[] arr = (Object[]) o;
+        List<Arguments> arguments = TransformOperationsTest.getParams().toList();
+        for (Arguments arg : arguments) {
+            Object[] arr = arg.get();
             Transform other = (Transform) arr[0];
 
             Affine a = affine.clone();
@@ -1779,14 +1938,18 @@ public void testAppendTransform() {
         }
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testAppendNullTransform() {
-        Affine a = affine.clone();
-        a.append((Transform) null);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendNullTransform(Affine affine) {
+        assertThrows(NullPointerException.class, () -> {
+            Affine a = affine.clone();
+            a.append((Transform) null);
+        });
     }
 
-    @Test
-    public void appendTransformShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void appendTransformShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(a,
                 new Affine(20, 22, 24, 26,
@@ -1799,11 +1962,13 @@ public void appendTransformShouldBeAtomic() {
                  36, 38, 40, 42)), () -> assertAffineOk(res, a));
     }
 
-    @Test
-    public void testPrependTransform() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependTransform(Affine affine) {
         int counter = 0;
-        for (Object o : TransformOperationsTest.getParams()) {
-            Object[] arr = (Object[]) o;
+        List<Arguments> arguments = TransformOperationsTest.getParams().toList();
+        for (Arguments arg : arguments) {
+            Object[] arr = arg.get();
             Transform other = (Transform) arr[0];
 
             Affine a = affine.clone();
@@ -1817,14 +1982,18 @@ public void testPrependTransform() {
         }
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testPrependNullTransform() {
-        Affine a = affine.clone();
-        a.prepend((Transform) null);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependNullTransform(Affine affine) {
+        assertThrows(NullPointerException.class, () -> {
+            Affine a = affine.clone();
+            a.prepend((Transform) null);
+        });
     }
 
-    @Test
-    public void prependTransformShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void prependTransformShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(
                 new Affine(20, 22, 24, 26,
@@ -1837,8 +2006,9 @@ public void prependTransformShouldBeAtomic() {
                  36, 38, 40, 42)), () -> assertAffineOk(res, a));
     }
 
-    @Test
-    public void testAppendArray() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendArray(Affine affine) {
 
         Affine a = affine.clone();
         a.append(array2d, MatrixType.MT_2D_2x3, 2);
@@ -1873,20 +2043,27 @@ public void testAppendArray() {
                    10, 11, 12, 13)));
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testAppendArrayNullMatrix() {
-        Affine a = new Affine();
-        a.append(new double[] { 1, 2, 3 }, null, 0);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendArrayNullMatrix(Affine affine) {
+        assertThrows(NullPointerException.class, () -> {
+            Affine a = new Affine();
+            a.append(new double[] { 1, 2, 3 }, null, 0);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testAppendArrayNullType() {
-        Affine a = new Affine();
-        a.append(null, MatrixType.MT_2D_2x3, 0);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendArrayNullType(Affine affine) {
+        assertThrows(NullPointerException.class, () -> {
+            Affine a = new Affine();
+            a.append(null, MatrixType.MT_2D_2x3, 0);
+        });
     }
 
-    @Test
-    public void appendArray2x3ShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void appendArray2x3ShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(a,
                 new Affine(2,  3,  0,  4,
@@ -1896,8 +2073,9 @@ public void appendArray2x3ShouldBeAtomic() {
         testOperationIsAtomic(a, () -> a.append(array2d, MatrixType.MT_2D_2x3, 2), () -> assertAffineOk(res, a));
     }
 
-    @Test
-    public void appendArray3x3ShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void appendArray3x3ShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(a,
                 new Affine(2,  3,  0,  4,
@@ -1907,8 +2085,9 @@ public void appendArray3x3ShouldBeAtomic() {
         testOperationIsAtomic(a, () -> a.append(array2d, MatrixType.MT_2D_3x3, 2), () -> assertAffineOk(res, a));
     }
 
-    @Test
-    public void appendArray3x4ShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void appendArray3x4ShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(a,
                 new Affine(2,  3,  4,  5,
@@ -1918,8 +2097,9 @@ public void appendArray3x4ShouldBeAtomic() {
         testOperationIsAtomic(a, () -> a.append(array3d, MatrixType.MT_3D_3x4, 2), () -> assertAffineOk(res, a));
     }
 
-    @Test
-    public void appendArray4x4ShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void appendArray4x4ShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(a,
                 new Affine(2,  3,  4,  5,
@@ -1929,129 +2109,163 @@ public void appendArray4x4ShouldBeAtomic() {
         testOperationIsAtomic(a, () -> a.append(array3d, MatrixType.MT_3D_4x4, 2), () -> assertAffineOk(res, a));
     }
 
-    @Test(expected=IndexOutOfBoundsException.class)
-    public void testAppendArray2x3ShortArray() {
-        Affine a = affine.clone();
-        try {
-            a.append(array2d, MatrixType.MT_2D_2x3, 6);
-        } catch(IndexOutOfBoundsException e) {
-            TransformHelper.assertMatrix(a, affine);
-            throw e;
-        }
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendArray2x3ShortArray(Affine affine) {
+        assertThrows(IndexOutOfBoundsException.class, () -> {
+            Affine a = affine.clone();
+            try {
+                a.append(array2d, MatrixType.MT_2D_2x3, 6);
+            } catch(IndexOutOfBoundsException e) {
+                TransformHelper.assertMatrix(a, affine);
+                throw e;
+            }
+        });
     }
 
-    @Test(expected=IndexOutOfBoundsException.class)
-    public void testAppendArray3x3ShortArray() {
-        Affine a = affine.clone();
-        try {
-            a.append(array2d, MatrixType.MT_2D_3x3, 4);
-        } catch(IndexOutOfBoundsException e) {
-            TransformHelper.assertMatrix(a, affine);
-            throw e;
-        }
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendArray3x3ShortArray(Affine affine) {
+        assertThrows(IndexOutOfBoundsException.class, () -> {
+            Affine a = affine.clone();
+            try {
+                a.append(array2d, MatrixType.MT_2D_3x3, 4);
+            } catch(IndexOutOfBoundsException e) {
+                TransformHelper.assertMatrix(a, affine);
+                throw e;
+            }
+        });
     }
 
-    @Test(expected=IndexOutOfBoundsException.class)
-    public void testAppendArray3x4ShortArray() {
-        Affine a = affine.clone();
-        try {
-            a.append(array3d, MatrixType.MT_3D_3x4, 7);
-        } catch(IndexOutOfBoundsException e) {
-            TransformHelper.assertMatrix(a, affine);
-            throw e;
-        }
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendArray3x4ShortArray(Affine affine) {
+        assertThrows(IndexOutOfBoundsException.class, () -> {
+            Affine a = affine.clone();
+            try {
+                a.append(array3d, MatrixType.MT_3D_3x4, 7);
+            } catch(IndexOutOfBoundsException e) {
+                TransformHelper.assertMatrix(a, affine);
+                throw e;
+            }
+        });
     }
 
-    @Test(expected=IndexOutOfBoundsException.class)
-    public void testAppendArray4x4ShortArray() {
-        Affine a = affine.clone();
-        try {
-            a.append(array3d, MatrixType.MT_3D_4x4, 4);
-        } catch(IndexOutOfBoundsException e) {
-            TransformHelper.assertMatrix(a, affine);
-            throw e;
-        }
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendArray4x4ShortArray(Affine affine) {
+        assertThrows(IndexOutOfBoundsException.class, () -> {
+            Affine a = affine.clone();
+            try {
+                a.append(array3d, MatrixType.MT_3D_4x4, 4);
+            } catch(IndexOutOfBoundsException e) {
+                TransformHelper.assertMatrix(a, affine);
+                throw e;
+            }
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testAppendArray3x3NotAffineX() {
-        Affine a = affine.clone();
-        try {
-            a.append(arrayZeros, MatrixType.MT_2D_3x3, 10);
-        } catch(IllegalArgumentException e) {
-            TransformHelper.assertMatrix(a, affine);
-            throw e;
-        }
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendArray3x3NotAffineX(Affine affine) {
+        assertThrows(IllegalArgumentException.class, () -> {
+            Affine a = affine.clone();
+            try {
+                a.append(arrayZeros, MatrixType.MT_2D_3x3, 10);
+            } catch(IllegalArgumentException e) {
+                TransformHelper.assertMatrix(a, affine);
+                throw e;
+            }
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testAppendArray3x3NotAffineY() {
-        Affine a = affine.clone();
-        try {
-            a.append(arrayZeros, MatrixType.MT_2D_3x3, 9);
-        } catch(IllegalArgumentException e) {
-            TransformHelper.assertMatrix(a, affine);
-            throw e;
-        }
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendArray3x3NotAffineY(Affine affine) {
+        assertThrows(IllegalArgumentException.class, () -> {
+            Affine a = affine.clone();
+            try {
+                a.append(arrayZeros, MatrixType.MT_2D_3x3, 9);
+            } catch(IllegalArgumentException e) {
+                TransformHelper.assertMatrix(a, affine);
+                throw e;
+            }
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testAppendArray3x3NotAffineT() {
-        Affine a = affine.clone();
-        try {
-            a.append(arrayZeros, MatrixType.MT_2D_3x3, 0);
-        } catch(IllegalArgumentException e) {
-            TransformHelper.assertMatrix(a, affine);
-            throw e;
-        }
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendArray3x3NotAffineT(Affine affine) {
+        assertThrows(IllegalArgumentException.class, () -> {
+            Affine a = affine.clone();
+            try {
+                a.append(arrayZeros, MatrixType.MT_2D_3x3, 0);
+            } catch(IllegalArgumentException e) {
+                TransformHelper.assertMatrix(a, affine);
+                throw e;
+            }
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testAppendArray4x4NotAffineX() {
-        Affine a = affine.clone();
-        try {
-            a.append(arrayZeros, MatrixType.MT_3D_4x4, 4);
-        } catch(IllegalArgumentException e) {
-            TransformHelper.assertMatrix(a, affine);
-            throw e;
-        }
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendArray4x4NotAffineX(Affine affine) {
+        assertThrows(IllegalArgumentException.class, () -> {
+            Affine a = affine.clone();
+            try {
+                a.append(arrayZeros, MatrixType.MT_3D_4x4, 4);
+            } catch(IllegalArgumentException e) {
+                TransformHelper.assertMatrix(a, affine);
+                throw e;
+            }
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testAppendArray4x4NotAffineY() {
-        Affine a = affine.clone();
-        try {
-            a.append(arrayZeros, MatrixType.MT_3D_4x4, 3);
-        } catch(IllegalArgumentException e) {
-            TransformHelper.assertMatrix(a, affine);
-            throw e;
-        }
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendArray4x4NotAffineY(Affine affine) {
+        assertThrows(IllegalArgumentException.class, () -> {
+            Affine a = affine.clone();
+            try {
+                a.append(arrayZeros, MatrixType.MT_3D_4x4, 3);
+            } catch(IllegalArgumentException e) {
+                TransformHelper.assertMatrix(a, affine);
+                throw e;
+            }
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testAppendArray4x4NotAffineZ() {
-        Affine a = affine.clone();
-        try {
-            a.append(arrayZeros, MatrixType.MT_3D_4x4, 2);
-        } catch(IllegalArgumentException e) {
-            TransformHelper.assertMatrix(a, affine);
-            throw e;
-        }
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendArray4x4NotAffineZ(Affine affine) {
+        assertThrows(IllegalArgumentException.class, () -> {
+            Affine a = affine.clone();
+            try {
+                a.append(arrayZeros, MatrixType.MT_3D_4x4, 2);
+            } catch(IllegalArgumentException e) {
+                TransformHelper.assertMatrix(a, affine);
+                throw e;
+            }
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testAppendArray4x4NotAffineT() {
-        Affine a = affine.clone();
-        try {
-            a.append(arrayZeros, MatrixType.MT_3D_4x4, 0);
-        } catch(IllegalArgumentException e) {
-            TransformHelper.assertMatrix(a, affine);
-            throw e;
-        }
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendArray4x4NotAffineT(Affine affine) {
+        assertThrows(IllegalArgumentException.class, () -> {
+            Affine a = affine.clone();
+            try {
+                a.append(arrayZeros, MatrixType.MT_3D_4x4, 0);
+            } catch(IllegalArgumentException e) {
+                TransformHelper.assertMatrix(a, affine);
+                throw e;
+            }
+        });
     }
 
-    @Test
-    public void testPrependArray() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependArray(Affine affine) {
 
         Affine a = affine.clone();
         a.prepend(array2d, MatrixType.MT_2D_2x3, 2);
@@ -2086,20 +2300,27 @@ public void testPrependArray() {
                    10, 11, 12, 13), affine));
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testPrependArrayNullMatrix() {
-        Affine a = new Affine();
-        a.prepend(new double[] { 1, 2, 3 }, null, 0);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependArrayNullMatrix(Affine affine) {
+        assertThrows(NullPointerException.class, () -> {
+            Affine a = new Affine();
+            a.prepend(new double[] { 1, 2, 3 }, null, 0);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testPrependArrayNullType() {
-        Affine a = new Affine();
-        a.prepend(null, MatrixType.MT_2D_2x3, 0);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependArrayNullType(Affine affine) {
+        assertThrows(NullPointerException.class, () -> {
+            Affine a = new Affine();
+            a.prepend(null, MatrixType.MT_2D_2x3, 0);
+        });
     }
 
-    @Test
-    public void prependArray2x3ShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void prependArray2x3ShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(
                 new Affine(2,  3,  0,  4,
@@ -2109,8 +2330,9 @@ public void prependArray2x3ShouldBeAtomic() {
         testOperationIsAtomic(a, () -> a.prepend(array2d, MatrixType.MT_2D_2x3, 2), () -> assertAffineOk(res, a));
     }
 
-    @Test
-    public void prependArray3x3ShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void prependArray3x3ShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(
                 new Affine(2,  3,  0,  4,
@@ -2120,8 +2342,9 @@ public void prependArray3x3ShouldBeAtomic() {
         testOperationIsAtomic(a, () -> a.prepend(array2d, MatrixType.MT_2D_3x3, 2), () -> assertAffineOk(res, a));
     }
 
-    @Test
-    public void prependArray3x4ShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void prependArray3x4ShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(
                 new Affine(2,  3,  4,  5,
@@ -2131,8 +2354,9 @@ public void prependArray3x4ShouldBeAtomic() {
         testOperationIsAtomic(a, () -> a.prepend(array3d, MatrixType.MT_3D_3x4, 2), () -> assertAffineOk(res, a));
     }
 
-    @Test
-    public void prependArray4x4ShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void prependArray4x4ShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
         final Transform res = TransformHelper.concatenate(
                 new Affine(2,  3,  4,  5,
@@ -2142,129 +2366,163 @@ public void prependArray4x4ShouldBeAtomic() {
         testOperationIsAtomic(a, () -> a.prepend(array3d, MatrixType.MT_3D_4x4, 2), () -> assertAffineOk(res, a));
     }
 
-    @Test(expected=IndexOutOfBoundsException.class)
-    public void testPrependArray2x3ShortArray() {
-        Affine a = affine.clone();
-        try {
-            a.prepend(array2d, MatrixType.MT_2D_2x3, 6);
-        } catch(IndexOutOfBoundsException e) {
-            TransformHelper.assertMatrix(a, affine);
-            throw e;
-        }
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependArray2x3ShortArray(Affine affine) {
+        assertThrows(IndexOutOfBoundsException.class, () -> {
+            Affine a = affine.clone();
+            try {
+                a.prepend(array2d, MatrixType.MT_2D_2x3, 6);
+            } catch(IndexOutOfBoundsException e) {
+                TransformHelper.assertMatrix(a, affine);
+                throw e;
+            }
+        });
     }
 
-    @Test(expected=IndexOutOfBoundsException.class)
-    public void testPrependdArray3x3ShortArray() {
-        Affine a = affine.clone();
-        try {
-            a.prepend(array2d, MatrixType.MT_2D_3x3, 4);
-        } catch(IndexOutOfBoundsException e) {
-            TransformHelper.assertMatrix(a, affine);
-            throw e;
-        }
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependdArray3x3ShortArray(Affine affine) {
+        assertThrows(IndexOutOfBoundsException.class, () -> {
+            Affine a = affine.clone();
+            try {
+                a.prepend(array2d, MatrixType.MT_2D_3x3, 4);
+            } catch(IndexOutOfBoundsException e) {
+                TransformHelper.assertMatrix(a, affine);
+                throw e;
+            }
+        });
     }
 
-    @Test(expected=IndexOutOfBoundsException.class)
-    public void testPrependArray3x4ShortArray() {
-        Affine a = affine.clone();
-        try {
-            a.prepend(array3d, MatrixType.MT_3D_3x4, 7);
-        } catch(IndexOutOfBoundsException e) {
-            TransformHelper.assertMatrix(a, affine);
-            throw e;
-        }
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependArray3x4ShortArray(Affine affine) {
+        assertThrows(IndexOutOfBoundsException.class, () -> {
+            Affine a = affine.clone();
+            try {
+                a.prepend(array3d, MatrixType.MT_3D_3x4, 7);
+            } catch(IndexOutOfBoundsException e) {
+                TransformHelper.assertMatrix(a, affine);
+                throw e;
+            }
+        });
     }
 
-    @Test(expected=IndexOutOfBoundsException.class)
-    public void testPrependArray4x4ShortArray() {
-        Affine a = affine.clone();
-        try {
-            a.prepend(array3d, MatrixType.MT_3D_4x4, 4);
-        } catch(IndexOutOfBoundsException e) {
-            TransformHelper.assertMatrix(a, affine);
-            throw e;
-        }
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testPrependArray4x4ShortArray(Affine affine) {
+        assertThrows(IndexOutOfBoundsException.class, () -> {
+            Affine a = affine.clone();
+            try {
+                a.prepend(array3d, MatrixType.MT_3D_4x4, 4);
+            } catch(IndexOutOfBoundsException e) {
+                TransformHelper.assertMatrix(a, affine);
+                throw e;
+            }
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
-    public void prestPrependArray3x3NotAffineX() {
-        Affine a = affine.clone();
-        try {
-            a.prepend(arrayZeros, MatrixType.MT_2D_3x3, 10);
-        } catch(IllegalArgumentException e) {
-            TransformHelper.assertMatrix(a, affine);
-            throw e;
-        }
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void prestPrependArray3x3NotAffineX(Affine affine) {
+        assertThrows(IllegalArgumentException.class, () -> {
+            Affine a = affine.clone();
+            try {
+                a.prepend(arrayZeros, MatrixType.MT_2D_3x3, 10);
+            } catch(IllegalArgumentException e) {
+                TransformHelper.assertMatrix(a, affine);
+                throw e;
+            }
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
-    public void prestPrependArray3x3NotAffineY() {
-        Affine a = affine.clone();
-        try {
-            a.prepend(arrayZeros, MatrixType.MT_2D_3x3, 9);
-        } catch(IllegalArgumentException e) {
-            TransformHelper.assertMatrix(a, affine);
-            throw e;
-        }
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void prestPrependArray3x3NotAffineY(Affine affine) {
+        assertThrows(IllegalArgumentException.class, () -> {
+            Affine a = affine.clone();
+            try {
+                a.prepend(arrayZeros, MatrixType.MT_2D_3x3, 9);
+            } catch(IllegalArgumentException e) {
+                TransformHelper.assertMatrix(a, affine);
+                throw e;
+            }
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
-    public void prestPrependArray3x3NotAffineT() {
-        Affine a = affine.clone();
-        try {
-            a.prepend(arrayZeros, MatrixType.MT_2D_3x3, 0);
-        } catch(IllegalArgumentException e) {
-            TransformHelper.assertMatrix(a, affine);
-            throw e;
-        }
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void prestPrependArray3x3NotAffineT(Affine affine) {
+        assertThrows(IllegalArgumentException.class, () -> {
+            Affine a = affine.clone();
+            try {
+                a.prepend(arrayZeros, MatrixType.MT_2D_3x3, 0);
+            } catch(IllegalArgumentException e) {
+                TransformHelper.assertMatrix(a, affine);
+                throw e;
+            }
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
-    public void prestPrependArray4x4NotAffineX() {
-        Affine a = affine.clone();
-        try {
-            a.prepend(arrayZeros, MatrixType.MT_3D_4x4, 4);
-        } catch(IllegalArgumentException e) {
-            TransformHelper.assertMatrix(a, affine);
-            throw e;
-        }
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void prestPrependArray4x4NotAffineX(Affine affine) {
+        assertThrows(IllegalArgumentException.class, () -> {
+            Affine a = affine.clone();
+            try {
+                a.prepend(arrayZeros, MatrixType.MT_3D_4x4, 4);
+            } catch(IllegalArgumentException e) {
+                TransformHelper.assertMatrix(a, affine);
+                throw e;
+            }
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
-    public void prestPrependArray4x4NotAffineY() {
-        Affine a = affine.clone();
-        try {
-            a.prepend(arrayZeros, MatrixType.MT_3D_4x4, 3);
-        } catch(IllegalArgumentException e) {
-            TransformHelper.assertMatrix(a, affine);
-            throw e;
-        }
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void prestPrependArray4x4NotAffineY(Affine affine) {
+        assertThrows(IllegalArgumentException.class, () -> {
+            Affine a = affine.clone();
+            try {
+                a.prepend(arrayZeros, MatrixType.MT_3D_4x4, 3);
+            } catch(IllegalArgumentException e) {
+                TransformHelper.assertMatrix(a, affine);
+                throw e;
+            }
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
-    public void prestPrependArray4x4NotAffineZ() {
-        Affine a = affine.clone();
-        try {
-            a.prepend(arrayZeros, MatrixType.MT_3D_4x4, 2);
-        } catch(IllegalArgumentException e) {
-            TransformHelper.assertMatrix(a, affine);
-            throw e;
-        }
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void prestPrependArray4x4NotAffineZ(Affine affine) {
+        assertThrows(IllegalArgumentException.class, () -> {
+            Affine a = affine.clone();
+            try {
+                a.prepend(arrayZeros, MatrixType.MT_3D_4x4, 2);
+            } catch(IllegalArgumentException e) {
+                TransformHelper.assertMatrix(a, affine);
+                throw e;
+            }
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
-    public void prestPrependArray4x4NotAffineT() {
-        Affine a = affine.clone();
-        try {
-            a.prepend(arrayZeros, MatrixType.MT_3D_4x4, 0);
-        } catch(IllegalArgumentException e) {
-            TransformHelper.assertMatrix(a, affine);
-            throw e;
-        }
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void prestPrependArray4x4NotAffineT(Affine affine) {
+        assertThrows(IllegalArgumentException.class, () -> {
+            Affine a = affine.clone();
+            try {
+                a.prepend(arrayZeros, MatrixType.MT_3D_4x4, 0);
+            } catch(IllegalArgumentException e) {
+                TransformHelper.assertMatrix(a, affine);
+                throw e;
+            }
+        });
     }
 
-    @Test
-    public void testInvert() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testInvert(Affine affine) {
         Affine a = affine.clone();
         Transform expected = null;
 
@@ -2294,8 +2552,9 @@ public void testInvert() {
         assertStateOk(a);
     }
 
-    @Test
-    public void invertShouldBeAtomic() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void invertShouldBeAtomic(Affine affine) {
         final Affine a = affine.clone();
 
         try {
@@ -2318,8 +2577,9 @@ public void invertShouldBeAtomic() {
 
     }
 
-    @Test
-    public void testAppendInverse() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAppendInverse(Affine affine) {
         final Affine a = affine.clone();
         final Affine i = affine.clone();
 
@@ -2362,8 +2622,9 @@ private void assertSetElement(Affine a, MatrixType type, int row, int col,
         }
     }
 
-    @Test
-    public void testSetElement() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testSetElement(Affine affine) {
         Affine a = affine.clone();
         boolean is2d = TransformShim.computeIs2D(affine);
 
@@ -2506,13 +2767,18 @@ public void testSetElement() {
                 affine.getTz() + 1000), a);
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testSetElementNullType() {
-        Affine a = affine.clone();
-        a.setElement(null, 0, 0, 0);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testSetElementNullType(Affine affine) {
+        assertThrows(NullPointerException.class, () -> {
+            Affine a = affine.clone();
+            a.setElement(null, 0, 0, 0);
+        });
     }
 
-    @Test public void nonInvertibleExceptionShoudCancelAtomicOperation() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void nonInvertibleExceptionShoudCancelAtomicOperation(Affine affine) {
         Affine a = affine.clone();
         try {
             a.invert();
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/AffineTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/AffineTest.java
index 7bdef43f34e..069630ac465 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/AffineTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/AffineTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,10 +29,6 @@
 import static test.javafx.scene.transform.TransformTest.assertTx;
 import javafx.scene.shape.Rectangle;
 
-import org.junit.Assert;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
 import test.com.sun.javafx.test.TransformHelper;
 import com.sun.javafx.geom.transform.Affine2D;
 import com.sun.javafx.geom.transform.Affine3D;
@@ -44,6 +40,13 @@
 import javafx.scene.transform.Rotate;
 import javafx.scene.transform.Transform;
 
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 public class AffineTest {
 
     private static final double[] array2d = new double[] {
@@ -73,9 +76,11 @@ public void testTransformConstructor() {
         TransformHelper.assertMatrix(a, r);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testTransformConstructorNull() {
-        Affine a = new Affine(null);
+        assertThrows(NullPointerException.class, () -> {
+            Affine a = new Affine(null);
+        });
     }
 
     @Test
@@ -128,69 +133,95 @@ public void testArrayConstructor() {
                10, 11, 12, 13);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testArrayConstructorNullMatrix() {
-        Affine a = new Affine(null, MatrixType.MT_2D_2x3, 6);
+        assertThrows(NullPointerException.class, () -> {
+            Affine a = new Affine(null, MatrixType.MT_2D_2x3, 6);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testArrayConstructorNullType() {
-        Affine a = new Affine(array2d, null, 6);
+        assertThrows(NullPointerException.class, () -> {
+            Affine a = new Affine(array2d, null, 6);
+        });
     }
 
-    @Test(expected=IndexOutOfBoundsException.class)
+    @Test
     public void testArrayConstructor2x3ShortArray() {
-        Affine a = new Affine(array2d, MatrixType.MT_2D_2x3, 6);
+        assertThrows(IndexOutOfBoundsException.class, () -> {
+            Affine a = new Affine(array2d, MatrixType.MT_2D_2x3, 6);
+        });
     }
 
-    @Test(expected=IndexOutOfBoundsException.class)
+    @Test
     public void testArrayConstructor3x3ShortArray() {
-        Affine a = new Affine(array2d, MatrixType.MT_2D_3x3, 4);
+        assertThrows(IndexOutOfBoundsException.class, () -> {
+            Affine a = new Affine(array2d, MatrixType.MT_2D_3x3, 4);
+        });
     }
 
-    @Test(expected=IndexOutOfBoundsException.class)
+    @Test
     public void testArrayConstructor3x4ShortArray() {
-        Affine a = new Affine(array3d, MatrixType.MT_3D_3x4, 7);
+        assertThrows(IndexOutOfBoundsException.class, () -> {
+            Affine a = new Affine(array3d, MatrixType.MT_3D_3x4, 7);
+        });
     }
 
-    @Test(expected=IndexOutOfBoundsException.class)
+    @Test
     public void testArrayConstructor4x4ShortArray() {
-        Affine a = new Affine(array3d, MatrixType.MT_3D_4x4, 4);
+        assertThrows(IndexOutOfBoundsException.class, () -> {
+            Affine a = new Affine(array3d, MatrixType.MT_3D_4x4, 4);
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testArrayConstructor3x3NotAffineX() {
-        Affine a = new Affine(arrayZeros, MatrixType.MT_2D_3x3, 10);
+        assertThrows(IllegalArgumentException.class, () -> {
+            Affine a = new Affine(arrayZeros, MatrixType.MT_2D_3x3, 10);
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testArrayConstructor3x3NotAffineY() {
-        Affine a = new Affine(arrayZeros, MatrixType.MT_2D_3x3, 9);
+        assertThrows(IllegalArgumentException.class, () -> {
+            Affine a = new Affine(arrayZeros, MatrixType.MT_2D_3x3, 9);
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testArrayConstructor3x3NotAffineT() {
-        Affine a = new Affine(arrayZeros, MatrixType.MT_2D_3x3, 0);
+        assertThrows(IllegalArgumentException.class, () -> {
+            Affine a = new Affine(arrayZeros, MatrixType.MT_2D_3x3, 0);
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testArrayConstructor4x4NotAffineX() {
-        Affine a = new Affine(arrayZeros, MatrixType.MT_3D_4x4, 4);
+        assertThrows(IllegalArgumentException.class, () -> {
+            Affine a = new Affine(arrayZeros, MatrixType.MT_3D_4x4, 4);
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testArrayConstructor4x4NotAffineY() {
-        Affine a = new Affine(arrayZeros, MatrixType.MT_3D_4x4, 3);
+        assertThrows(IllegalArgumentException.class, () -> {
+            Affine a = new Affine(arrayZeros, MatrixType.MT_3D_4x4, 3);
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testArrayConstructor4x4NotAffineZ() {
-        Affine a = new Affine(arrayZeros, MatrixType.MT_3D_4x4, 2);
+        assertThrows(IllegalArgumentException.class, () -> {
+            Affine a = new Affine(arrayZeros, MatrixType.MT_3D_4x4, 2);
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testArrayConstructor4x4NotAffineT() {
-        Affine a = new Affine(arrayZeros, MatrixType.MT_3D_4x4, 0);
+        assertThrows(IllegalArgumentException.class, () -> {
+            Affine a = new Affine(arrayZeros, MatrixType.MT_3D_4x4, 0);
+        });
     }
 
     @Test
@@ -202,10 +233,12 @@ public void testTransformSetToTransform() {
         TransformHelper.assertMatrix(a, r);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testTransformSetToTransformNull() {
-        Affine a = new Affine(1, 2, 3, 6, 7, 128);
-        a.setToTransform(null);
+        assertThrows(NullPointerException.class, () -> {
+            Affine a = new Affine(1, 2, 3, 6, 7, 128);
+            a.setToTransform(null);
+        });
     }
 
     @Test
@@ -264,170 +297,196 @@ public void testArraySetToTransform() {
                10, 11, 12, 13);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testArraySetToTransformNullMatrix() {
-        Affine a = new Affine();
-        a.setToTransform(new double[] { 1, 2, 3 }, null, 0);
+        assertThrows(NullPointerException.class, () -> {
+            Affine a = new Affine();
+            a.setToTransform(new double[] { 1, 2, 3 }, null, 0);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testArraySetToTransformNullType() {
-        Affine a = new Affine();
-        a.setToTransform(null, MatrixType.MT_2D_2x3, 0);
+        assertThrows(NullPointerException.class, () -> {
+            Affine a = new Affine();
+            a.setToTransform(null, MatrixType.MT_2D_2x3, 0);
+        });
     }
 
-    @Test(expected=IndexOutOfBoundsException.class)
+    @Test
     public void testArraySetToTransform2x3ShortArray() {
-        Affine a = new Affine(1, 2, 3, 6, 7, 128);
-        try {
-            a.setToTransform(array2d, MatrixType.MT_2D_2x3, 6);
-        } catch(IndexOutOfBoundsException e) {
-            TransformHelper.assertMatrix(a,
-                    1, 2, 0, 3,
-                    6, 7, 0, 128,
-                    0, 0, 1, 0);
-            throw e;
-        }
+        assertThrows(IndexOutOfBoundsException.class, () -> {
+            Affine a = new Affine(1, 2, 3, 6, 7, 128);
+            try {
+                a.setToTransform(array2d, MatrixType.MT_2D_2x3, 6);
+            } catch(IndexOutOfBoundsException e) {
+                TransformHelper.assertMatrix(a,
+                        1, 2, 0, 3,
+                        6, 7, 0, 128,
+                        0, 0, 1, 0);
+                throw e;
+            }
+        });
     }
 
-    @Test(expected=IndexOutOfBoundsException.class)
+    @Test
     public void testArraySetToTransform3x3ShortArray() {
-        Affine a = new Affine(1, 2, 3, 6, 7, 128);
-        try {
-            a.setToTransform(array2d, MatrixType.MT_2D_3x3, 4);
-        } catch(IndexOutOfBoundsException e) {
-            TransformHelper.assertMatrix(a,
-                    1, 2, 0, 3,
-                    6, 7, 0, 128,
-                    0, 0, 1, 0);
-            throw e;
-        }
+        assertThrows(IndexOutOfBoundsException.class, () -> {
+            Affine a = new Affine(1, 2, 3, 6, 7, 128);
+            try {
+                a.setToTransform(array2d, MatrixType.MT_2D_3x3, 4);
+            } catch(IndexOutOfBoundsException e) {
+                TransformHelper.assertMatrix(a,
+                        1, 2, 0, 3,
+                        6, 7, 0, 128,
+                        0, 0, 1, 0);
+                throw e;
+            }
+        });
     }
 
-    @Test(expected=IndexOutOfBoundsException.class)
+    @Test
     public void testArraySetToTransform3x4ShortArray() {
-        Affine a = new Affine(1, 2, 3, 6, 7, 128);
-        try {
-            a.setToTransform(array3d, MatrixType.MT_3D_3x4, 7);
-        } catch(IndexOutOfBoundsException e) {
-            TransformHelper.assertMatrix(a,
-                    1, 2, 0, 3,
-                    6, 7, 0, 128,
-                    0, 0, 1, 0);
-            throw e;
-        }
+        assertThrows(IndexOutOfBoundsException.class, () -> {
+            Affine a = new Affine(1, 2, 3, 6, 7, 128);
+            try {
+                a.setToTransform(array3d, MatrixType.MT_3D_3x4, 7);
+            } catch(IndexOutOfBoundsException e) {
+                TransformHelper.assertMatrix(a,
+                        1, 2, 0, 3,
+                        6, 7, 0, 128,
+                        0, 0, 1, 0);
+                throw e;
+            }
+        });
     }
 
-    @Test(expected=IndexOutOfBoundsException.class)
+    @Test
     public void testArraySetToTransform4x4ShortArray() {
-        Affine a = new Affine(1, 2, 3, 6, 7, 128);
-        try {
-            a.setToTransform(array3d, MatrixType.MT_3D_4x4, 4);
-        } catch(IndexOutOfBoundsException e) {
-            TransformHelper.assertMatrix(a,
-                    1, 2, 0, 3,
-                    6, 7, 0, 128,
-                    0, 0, 1, 0);
-            throw e;
-        }
+        assertThrows(IndexOutOfBoundsException.class, () -> {
+            Affine a = new Affine(1, 2, 3, 6, 7, 128);
+            try {
+                a.setToTransform(array3d, MatrixType.MT_3D_4x4, 4);
+            } catch(IndexOutOfBoundsException e) {
+                TransformHelper.assertMatrix(a,
+                        1, 2, 0, 3,
+                        6, 7, 0, 128,
+                        0, 0, 1, 0);
+                throw e;
+            }
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testArraySetToTransform3x3NotAffineX() {
-        Affine a = new Affine(1, 2, 3, 6, 7, 128);
-        try {
-            a.setToTransform(arrayZeros, MatrixType.MT_2D_3x3, 10);
-        } catch(IllegalArgumentException e) {
-            TransformHelper.assertMatrix(a,
-                    1, 2, 0, 3,
-                    6, 7, 0, 128,
-                    0, 0, 1, 0);
-            throw e;
-        }
+        assertThrows(IllegalArgumentException.class, () -> {
+            Affine a = new Affine(1, 2, 3, 6, 7, 128);
+            try {
+                a.setToTransform(arrayZeros, MatrixType.MT_2D_3x3, 10);
+            } catch(IllegalArgumentException e) {
+                TransformHelper.assertMatrix(a,
+                        1, 2, 0, 3,
+                        6, 7, 0, 128,
+                        0, 0, 1, 0);
+                throw e;
+            }
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testArraySetToTransform3x3NotAffineY() {
-        Affine a = new Affine(1, 2, 3, 6, 7, 128);
-        try {
-            a.setToTransform(arrayZeros, MatrixType.MT_2D_3x3, 9);
-        } catch(IllegalArgumentException e) {
-            TransformHelper.assertMatrix(a,
-                    1, 2, 0, 3,
-                    6, 7, 0, 128,
-                    0, 0, 1, 0);
-            throw e;
-        }
+        assertThrows(IllegalArgumentException.class, () -> {
+            Affine a = new Affine(1, 2, 3, 6, 7, 128);
+            try {
+                a.setToTransform(arrayZeros, MatrixType.MT_2D_3x3, 9);
+            } catch(IllegalArgumentException e) {
+                TransformHelper.assertMatrix(a,
+                        1, 2, 0, 3,
+                        6, 7, 0, 128,
+                        0, 0, 1, 0);
+                throw e;
+            }
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testArraySetToTransform3x3NotAffineT() {
-        Affine a = new Affine(1, 2, 3, 6, 7, 128);
-        try {
-            a.setToTransform(arrayZeros, MatrixType.MT_2D_3x3, 0);
-        } catch(IllegalArgumentException e) {
-            TransformHelper.assertMatrix(a,
-                    1, 2, 0, 3,
-                    6, 7, 0, 128,
-                    0, 0, 1, 0);
-            throw e;
-        }
+        assertThrows(IllegalArgumentException.class, () -> {
+            Affine a = new Affine(1, 2, 3, 6, 7, 128);
+            try {
+                a.setToTransform(arrayZeros, MatrixType.MT_2D_3x3, 0);
+            } catch(IllegalArgumentException e) {
+                TransformHelper.assertMatrix(a,
+                        1, 2, 0, 3,
+                        6, 7, 0, 128,
+                        0, 0, 1, 0);
+                throw e;
+            }
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testArraySetToTransform4x4NotAffineX() {
-        Affine a = new Affine(1, 2, 3, 6, 7, 128);
-        try {
-            a.setToTransform(arrayZeros, MatrixType.MT_3D_4x4, 4);
-        } catch(IllegalArgumentException e) {
-            TransformHelper.assertMatrix(a,
-                    1, 2, 0, 3,
-                    6, 7, 0, 128,
-                    0, 0, 1, 0);
-            throw e;
-        }
+        assertThrows(IllegalArgumentException.class, () -> {
+            Affine a = new Affine(1, 2, 3, 6, 7, 128);
+            try {
+                a.setToTransform(arrayZeros, MatrixType.MT_3D_4x4, 4);
+            } catch(IllegalArgumentException e) {
+                TransformHelper.assertMatrix(a,
+                        1, 2, 0, 3,
+                        6, 7, 0, 128,
+                        0, 0, 1, 0);
+                throw e;
+            }
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testArraySetToTransform4x4NotAffineY() {
-        Affine a = new Affine(1, 2, 3, 6, 7, 128);
-        try {
-            a.setToTransform(arrayZeros, MatrixType.MT_3D_4x4, 3);
-        } catch(IllegalArgumentException e) {
-            TransformHelper.assertMatrix(a,
-                    1, 2, 0, 3,
-                    6, 7, 0, 128,
-                    0, 0, 1, 0);
-            throw e;
-        }
+        assertThrows(IllegalArgumentException.class, () -> {
+            Affine a = new Affine(1, 2, 3, 6, 7, 128);
+            try {
+                a.setToTransform(arrayZeros, MatrixType.MT_3D_4x4, 3);
+            } catch(IllegalArgumentException e) {
+                TransformHelper.assertMatrix(a,
+                        1, 2, 0, 3,
+                        6, 7, 0, 128,
+                        0, 0, 1, 0);
+                throw e;
+            }
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testArraySetToTransform4x4NotAffineZ() {
-        Affine a = new Affine(1, 2, 3, 6, 7, 128);
-        try {
-            a.setToTransform(arrayZeros, MatrixType.MT_3D_4x4, 2);
-        } catch(IllegalArgumentException e) {
-            TransformHelper.assertMatrix(a,
-                    1, 2, 0, 3,
-                    6, 7, 0, 128,
-                    0, 0, 1, 0);
-            throw e;
-        }
+        assertThrows(IllegalArgumentException.class, () -> {
+            Affine a = new Affine(1, 2, 3, 6, 7, 128);
+            try {
+                a.setToTransform(arrayZeros, MatrixType.MT_3D_4x4, 2);
+            } catch(IllegalArgumentException e) {
+                TransformHelper.assertMatrix(a,
+                        1, 2, 0, 3,
+                        6, 7, 0, 128,
+                        0, 0, 1, 0);
+                throw e;
+            }
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testArraySetToTransform4x4NotAffineT() {
-        Affine a = new Affine(1, 2, 3, 6, 7, 128);
-        try {
-            a.setToTransform(arrayZeros, MatrixType.MT_3D_4x4, 0);
-        } catch(IllegalArgumentException e) {
-            TransformHelper.assertMatrix(a,
-                    1, 2, 0, 3,
-                    6, 7, 0, 128,
-                    0, 0, 1, 0);
-            throw e;
-        }
+        assertThrows(IllegalArgumentException.class, () -> {
+            Affine a = new Affine(1, 2, 3, 6, 7, 128);
+            try {
+                a.setToTransform(arrayZeros, MatrixType.MT_3D_4x4, 0);
+            } catch(IllegalArgumentException e) {
+                TransformHelper.assertMatrix(a,
+                        1, 2, 0, 3,
+                        6, 7, 0, 128,
+                        0, 0, 1, 0);
+                throw e;
+            }
+        });
     }
 
     private int listenerCounter;
@@ -574,15 +633,15 @@ public void testAffine() {
             setTx(55);
             setTy(66);
         }};
-        Assert.assertEquals(1.0f, trans.getMzz(), 1e-50);
+        assertEquals(1.0f, trans.getMzz(), 1e-50);
 
         final Rectangle n = new Rectangle();
         n.getTransforms().add(trans);
 
         final Affine2D affine2D = new Affine2D(11, 22, 33, 44, 55, 66);
-        Assert.assertEquals(1, affine2D.getMzz(), 1e-50);
+        assertEquals(1, affine2D.getMzz(), 1e-50);
         final Affine3D affine3D = new Affine3D(affine2D);
-        Assert.assertEquals(1, affine3D.getMzz(), 1e-50);
+        assertEquals(1, affine3D.getMzz(), 1e-50);
         assertTx(n, affine3D);
 
         trans.setMxx(10);
@@ -604,7 +663,8 @@ public void testAffine() {
         assertTx(n, new Affine2D(10, 21, 32, 43, 54, 65));
     }
 
-    @Test public void testGetters() {
+    @Test
+    public void testGetters() {
         final Affine trans = new Affine(
                 0.5,  2,  3,  4,
                 5,  6,  7,  8,
@@ -633,7 +693,8 @@ public void testAffine() {
                  4,  3,  2, 1);
     }
 
-    @Test public void testConstructingIdentityTransform() {
+    @Test
+    public void testConstructingIdentityTransform() {
         final Affine trans = new Affine(
                 1, 0, 0, 0,
                 0, 1, 0, 0,
@@ -663,7 +724,8 @@ public void testAffine() {
                  4,  3,  2, 1);
     }
 
-    @Test public void testSettingTransform() {
+    @Test
+    public void testSettingTransform() {
         final Affine trans = new Affine(
                 1,  2,  3,  4,
                 5,  6,  7,  8,
@@ -705,7 +767,8 @@ public void testCopying() {
         assertEquals(3.0, copy.getMxz(), 0.0001);
     }
 
-    @Test public void testToString() {
+    @Test
+    public void testToString() {
         final Affine trans = new Affine(
                 1,  2,  3,  4,
                 5,  6,  7,  8,
@@ -717,7 +780,8 @@ public void testCopying() {
         assertFalse(s.isEmpty());
     }
 
-    @Test public void testBoundPropertySynced() throws Exception {
+    @Test
+    public void testBoundPropertySynced() throws Exception {
 
         TransformTest.checkDoublePropertySynced(createTransform(), "mxx" , 2.0);
         TransformTest.checkDoublePropertySynced(createTransform(), "myx" , 2.0);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/Affine_onInvalidate_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/Affine_onInvalidate_Test.java
index 7bb1753dd54..7f0e057b313 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/Affine_onInvalidate_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/Affine_onInvalidate_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,38 +25,28 @@
 
 package test.javafx.scene.transform;
 
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import java.util.stream.Stream;
 
 import com.sun.javafx.scene.DirtyBits;
 import javafx.scene.transform.Affine;
+
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.OnInvalidateMethodsTestBase;
 
-@RunWith(Parameterized.class)
 public class Affine_onInvalidate_Test extends OnInvalidateMethodsTestBase {
 
-    public Affine_onInvalidate_Test(Configuration config) {
-        super(config);
-    }
-
-    @Parameters
-    public static Collection<Object[]> data() {
-        Object[][] data = new Object[][] {
-            {new Configuration(Affine.class, "mxx", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
-            {new Configuration(Affine.class, "mxy", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
-            {new Configuration(Affine.class, "mxz", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
-            {new Configuration(Affine.class, "myx", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
-            {new Configuration(Affine.class, "myz", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
-            {new Configuration(Affine.class, "mzx", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
-            {new Configuration(Affine.class, "mzy", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
-            {new Configuration(Affine.class, "tx", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
-            {new Configuration(Affine.class, "ty", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
-            {new Configuration(Affine.class, "tz", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })}
-        };
-        return Arrays.asList(data);
+    public static Stream<Arguments> data() {
+        return Stream.of(
+            Arguments.of( new Configuration(Affine.class, "mxx", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS }) ),
+            Arguments.of( new Configuration(Affine.class, "mxy", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS }) ),
+            Arguments.of( new Configuration(Affine.class, "mxz", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS }) ),
+            Arguments.of( new Configuration(Affine.class, "myx", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS }) ),
+            Arguments.of( new Configuration(Affine.class, "myz", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS }) ),
+            Arguments.of( new Configuration(Affine.class, "mzx", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS }) ),
+            Arguments.of( new Configuration(Affine.class, "mzy", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS }) ),
+            Arguments.of( new Configuration(Affine.class, "tx", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS }) ),
+            Arguments.of( new Configuration(Affine.class, "ty", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS }) ),
+            Arguments.of( new Configuration(Affine.class, "tz", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS }) )
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/MatrixTypeTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/MatrixTypeTest.java
index c899b0484a8..65d024991d0 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/MatrixTypeTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/MatrixTypeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,11 @@
 package test.javafx.scene.transform;
 
 import javafx.scene.transform.MatrixType;
-import org.junit.Test;
-import static org.junit.Assert.*;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class MatrixTypeTest {
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/RotateTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/RotateTest.java
index c99badb40b8..2451e47f412 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/RotateTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/RotateTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,15 +37,16 @@
 import javafx.scene.Scene;
 import javafx.scene.shape.Rectangle;
 import test.javafx.scene.shape.RectangleTest;
-import org.junit.Test;
 
 import java.lang.reflect.Method;
 
 import javafx.scene.transform.Rotate;
 import javafx.scene.transform.Transform;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static test.javafx.scene.transform.TransformTest.assertTx;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
 
 public class RotateTest {
 
@@ -116,7 +117,8 @@ public void testRotate() {
                 );
     }
 
-    @Test public void testRotateAxisCtor() {
+    @Test
+    public void testRotateAxisCtor() {
         final Rotate trans = new Rotate(11, new Point3D(22, 33, 44));
         final Rectangle n = new Rectangle();
         n.getTransforms().add(trans);
@@ -126,7 +128,8 @@ public void testRotate() {
         assertTx(n, expT);
     }
 
-    @Test public void testRotate3DPivotCtor() {
+    @Test
+    public void testRotate3DPivotCtor() {
         final Rotate trans = new Rotate(11, 22, 33, 44);
         final Rectangle n = new Rectangle();
         n.getTransforms().add(trans);
@@ -138,7 +141,8 @@ public void testRotate() {
         assertTx(n, expT);
     }
 
-   @Test public void testRotate3DPivotAxisCtor() {
+   @Test
+   public void testRotate3DPivotAxisCtor() {
         final Rotate trans = new Rotate(11, 22, 33, 44, new Point3D(55, 66, 77));
         final Rectangle n = new Rectangle();
         n.getTransforms().add(trans);
@@ -150,23 +154,28 @@ public void testRotate() {
         assertTx(n, expT);
     }
 
-    @Test public void testBoundPropertySynced_Angle() throws Exception {
+    @Test
+    public void testBoundPropertySynced_Angle() throws Exception {
         TransformTest.checkDoublePropertySynced(new Rotate(300, 300, 0), "angle", 30.0);
     }
 
-    @Test public void testBoundPropertySynced_PivotX() throws Exception {
+    @Test
+    public void testBoundPropertySynced_PivotX() throws Exception {
         TransformTest.checkDoublePropertySynced(new Rotate(300, 300, 0), "pivotX", 200.0);
     }
 
-    @Test public void testBoundPropertySynced_PivotY() throws Exception {
+    @Test
+    public void testBoundPropertySynced_PivotY() throws Exception {
         TransformTest.checkDoublePropertySynced(new Rotate(300, 300, 0), "pivotY", 200.0);
     }
 
-    @Test public void testBoundPropertySynced_PivotZ() throws Exception {
+    @Test
+    public void testBoundPropertySynced_PivotZ() throws Exception {
         TransformTest.checkDoublePropertySynced(new Rotate(300, 300, 0), "pivotZ", 20.0);
     }
 
-    @Test public void testBoundPropertySynced_Axis() throws Exception {
+    @Test
+    public void testBoundPropertySynced_Axis() throws Exception {
         checkObjectPropertySynced("axis", new Point3D(1, 0, 0));
     }
 
@@ -214,7 +223,8 @@ public void testCopying() {
                 );
     }
 
-    @Test public void testToString() {
+    @Test
+    public void testToString() {
         final Rotate trans = new Rotate(40);
 
         String s = trans.toString();
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/Rotate_onInvalidate_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/Rotate_onInvalidate_Test.java
index 1ac614a4fe7..0398b7d51fe 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/Rotate_onInvalidate_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/Rotate_onInvalidate_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,32 +25,22 @@
 
 package test.javafx.scene.transform;
 
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import java.util.stream.Stream;
 
 import com.sun.javafx.scene.DirtyBits;
 import javafx.scene.transform.Rotate;
+
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.OnInvalidateMethodsTestBase;
 
-@RunWith(Parameterized.class)
 public class Rotate_onInvalidate_Test extends OnInvalidateMethodsTestBase {
 
-    public Rotate_onInvalidate_Test(Configuration config) {
-        super(config);
-    }
-
-    @Parameters
-    public static Collection<Object[]> data() {
-        Object[][] data = new Object[][] {
-            {new Configuration(Rotate.class, "pivotX", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
-            {new Configuration(Rotate.class, "pivotY", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
-            {new Configuration(Rotate.class, "pivotZ", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
-            {new Configuration(Rotate.class, "angle", 20.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })}
-        };
-        return Arrays.asList(data);
+    public static Stream<Arguments> data() {
+        return Stream.of(
+            Arguments.of( new Configuration(Rotate.class, "pivotX", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS }) ),
+            Arguments.of( new Configuration(Rotate.class, "pivotY", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS }) ),
+            Arguments.of( new Configuration(Rotate.class, "pivotZ", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS }) ),
+            Arguments.of( new Configuration(Rotate.class, "angle", 20.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS }) )
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/ScaleTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/ScaleTest.java
index ad51368b790..e32361138c6 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/ScaleTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/ScaleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,10 +28,6 @@
 import static test.javafx.scene.transform.TransformTest.assertTx;
 import javafx.scene.shape.Rectangle;
 
-import org.junit.Assert;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
 import test.com.sun.javafx.test.TransformHelper;
 import com.sun.javafx.geom.transform.Affine2D;
 import com.sun.javafx.geom.transform.Affine3D;
@@ -39,6 +35,11 @@
 import javafx.scene.transform.Scale;
 import javafx.scene.transform.Transform;
 
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 public class ScaleTest {
 
     @Test
@@ -58,7 +59,7 @@ public void testScale() {
 
 
         trans.setX(34);
-        Assert.assertEquals(34, trans.getX(), 1e-100);
+        assertEquals(34, trans.getX(), 1e-100);
         assertTx(n, BaseTransform.getScaleInstance(34, 52));
         TransformHelper.assertMatrix(trans,
                 34,  0, 0, 0,
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/Scale_onInvalidate_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/Scale_onInvalidate_Test.java
index ca9d746b073..1d8b2ce4c41 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/Scale_onInvalidate_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/Scale_onInvalidate_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,34 +25,24 @@
 
 package test.javafx.scene.transform;
 
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import java.util.stream.Stream;
 
 import com.sun.javafx.scene.DirtyBits;
 import javafx.scene.transform.Scale;
+
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.OnInvalidateMethodsTestBase;
 
-@RunWith(Parameterized.class)
 public class Scale_onInvalidate_Test extends OnInvalidateMethodsTestBase {
 
-    public Scale_onInvalidate_Test(Configuration config) {
-        super(config);
-    }
-
-    @Parameters
-    public static Collection<Object[]> data() {
-        Object[][] data = new Object[][] {
-            {new Configuration(Scale.class, "pivotX", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
-            {new Configuration(Scale.class, "pivotY", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
-            {new Configuration(Scale.class, "pivotZ", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
-            {new Configuration(Scale.class, "x", 20.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
-            {new Configuration(Scale.class, "y", 20.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
-            {new Configuration(Scale.class, "z", 20.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })}
-        };
-        return Arrays.asList(data);
+    public static Stream<Arguments> data() {
+        return Stream.of(
+            Arguments.of( new Configuration(Scale.class, "pivotX", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS }) ),
+            Arguments.of( new Configuration(Scale.class, "pivotY", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS }) ),
+            Arguments.of( new Configuration(Scale.class, "pivotZ", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS }) ),
+            Arguments.of( new Configuration(Scale.class, "x", 20.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS }) ),
+            Arguments.of( new Configuration(Scale.class, "y", 20.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS }) ),
+            Arguments.of( new Configuration(Scale.class, "z", 20.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS }) )
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/ShearTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/ShearTest.java
index 0c75bc4eab0..083a26c2bbc 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/ShearTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/ShearTest.java
@@ -28,14 +28,15 @@
 import static test.javafx.scene.transform.TransformTest.assertTx;
 import javafx.scene.shape.Rectangle;
 
-import org.junit.Test;
-import static org.junit.Assert.*;
-
 import test.com.sun.javafx.test.TransformHelper;
 import com.sun.javafx.geom.transform.Affine2D;
 import javafx.scene.transform.Shear;
 import javafx.scene.transform.Transform;
 
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 public class ShearTest {
 
     @Test
@@ -118,7 +119,8 @@ public void testCopying() {
                  0,  0, 1,      0);
     }
 
-    @Test public void testToString() {
+    @Test
+    public void testToString() {
         final Shear trans = new Shear(8, 15);
 
         String s = trans.toString();
@@ -127,19 +129,23 @@ public void testCopying() {
         assertFalse(s.isEmpty());
     }
 
-    @Test public void testBoundPropertySynced_X() throws Exception {
+    @Test
+    public void testBoundPropertySynced_X() throws Exception {
         TransformTest.checkDoublePropertySynced(new Shear(3, 3, 0, 0), "x", 123.0);
     }
 
-    @Test public void testBoundPropertySynced_Y() throws Exception {
+    @Test
+    public void testBoundPropertySynced_Y() throws Exception {
         TransformTest.checkDoublePropertySynced(new Shear(3, 3, 0, 0), "y", 112.0);
     }
 
-    @Test public void testBoundPropertySynced_PivotX() throws Exception {
+    @Test
+    public void testBoundPropertySynced_PivotX() throws Exception {
         TransformTest.checkDoublePropertySynced(new Shear(3, 3, 0, 0), "pivotX", 22.0);
     }
 
-    @Test public void testBoundPropertySynced_PivotY() throws Exception {
+    @Test
+    public void testBoundPropertySynced_PivotY() throws Exception {
         TransformTest.checkDoublePropertySynced(new Shear(3, 3, 0, 0), "pivotY", 33.0);
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/Shear_onInvalidate_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/Shear_onInvalidate_Test.java
index b24f2b4ec29..d50c793051a 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/Shear_onInvalidate_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/Shear_onInvalidate_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,32 +25,22 @@
 
 package test.javafx.scene.transform;
 
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import java.util.stream.Stream;
 
 import com.sun.javafx.scene.DirtyBits;
 import javafx.scene.transform.Shear;
+
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.OnInvalidateMethodsTestBase;
 
-@RunWith(Parameterized.class)
 public class Shear_onInvalidate_Test extends OnInvalidateMethodsTestBase {
 
-    public Shear_onInvalidate_Test(Configuration config) {
-        super(config);
-    }
-
-    @Parameters
-    public static Collection<Object[]> data() {
-        Object[][] data = new Object[][] {
-            {new Configuration(Shear.class, "pivotX", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
-            {new Configuration(Shear.class, "pivotY", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
-            {new Configuration(Shear.class, "x", 20.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
-            {new Configuration(Shear.class, "y", 20.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })}
-        };
-        return Arrays.asList(data);
+    public static Stream<Arguments> data() {
+        return Stream.of(
+            Arguments.of( new Configuration(Shear.class, "pivotX", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS }) ),
+            Arguments.of( new Configuration(Shear.class, "pivotY", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS }) ),
+            Arguments.of( new Configuration(Shear.class, "x", 20.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS }) ),
+            Arguments.of( new Configuration(Shear.class, "y", 20.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS }) )
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/TransformChangedEventTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/TransformChangedEventTest.java
index a356e775e92..bbbd5c61077 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/TransformChangedEventTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/TransformChangedEventTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,9 +29,9 @@
 import javafx.event.Event;
 import javafx.event.EventTarget;
 import javafx.scene.transform.TransformChangedEvent;
-import org.junit.Test;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 public class TransformChangedEventTest {
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/TransformDeriveTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/TransformDeriveTest.java
index 6470950ae51..ae5fc0879c8 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/TransformDeriveTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/TransformDeriveTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,8 +30,7 @@
 import com.sun.javafx.geom.transform.BaseTransform;
 import com.sun.javafx.geom.transform.Identity;
 import com.sun.javafx.geom.transform.Translate2D;
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 import test.com.sun.javafx.test.TransformHelper;
 import javafx.geometry.Point3D;
 import javafx.scene.transform.Affine;
@@ -40,14 +39,12 @@
 import javafx.scene.transform.Shear;
 import javafx.scene.transform.Transform;
 import javafx.scene.transform.Translate;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
-@RunWith(Parameterized.class)
 public class TransformDeriveTest {
 
     private static final Identity identity = new Identity();
@@ -93,126 +90,118 @@ public class TransformDeriveTest {
     private static final Affine affine_affine3d = new Affine();
     static { affine_affine3d.appendRotation(45, 10, 20, 30, 1, 1, 1); }
 
-    @Parameters
-    public static Collection getParams() {
-        return Arrays.asList(new Object[][] {
-            { identity, translate_identity, Identity.class },           //  0
-            { identity, translate_translate2d, Translate2D.class },
-            { identity, translate_translate3d, Affine3D.class },
-            { identity, scale_identity, Identity.class },
-            { identity, scale_pivotedidentity, Identity.class },
-            { identity, scale_scale2d, Affine2D.class },
-            { identity, scale_pivotedscale2d, Affine2D.class },
-            { identity, scale_scale3d, Affine3D.class },
-            { identity, scale_pivotedscale3d, Affine3D.class },
-            { identity, rotate_identity, Identity.class },
-            { identity, rotate_pivotedidentity, Identity.class },       // 10
-            { identity, rotate_rotate2d, Affine2D.class },
-            { identity, rotate_negative2d, Affine2D.class },
-            { identity, rotate_pivotedrotate2d, Affine2D.class },
-            { identity, rotate_rotate3d, Affine3D.class },
-            { identity, rotate_pivotedrotate3d, Affine3D.class },
-            { identity, shear_identity, Identity.class },
-            { identity, shear_shear, Affine2D.class },
-            { identity, affine_identity, Identity.class },
-            { identity, affine_translate2d, Translate2D.class },
-            { identity, affine_translate3d, Affine3D.class },           // 20
-            { identity, affine_scale2d, Affine2D.class },
-            { identity, affine_scale3d, Affine3D.class },
-            { identity, affine_affine2d, Affine2D.class },
-            { identity, affine_affine3d, Affine3D.class },
-
-            { translate2d, translate_identity, Translate2D.class },
-            { translate2d, translate_translate2d, Translate2D.class },
-            { translate2d, translate_translate3d, Affine3D.class },
-            { translate2d, scale_identity, Translate2D.class },
-            { translate2d, scale_pivotedidentity, Translate2D.class },
-            { translate2d, scale_scale2d, Affine2D.class },             // 30
-            { translate2d, scale_pivotedscale2d, Affine2D.class },
-            { translate2d, scale_scale3d, Affine3D.class },
-            { translate2d, scale_pivotedscale3d, Affine3D.class },
-            { translate2d, rotate_identity, Translate2D.class },
-            { translate2d, rotate_pivotedidentity, Translate2D.class },
-            { translate2d, rotate_rotate2d, Affine2D.class },
-            { translate2d, rotate_negative2d, Affine2D.class },
-            { translate2d, rotate_pivotedrotate2d, Affine2D.class },
-            { translate2d, rotate_rotate3d, Affine3D.class },
-            { translate2d, rotate_pivotedrotate3d, Affine3D.class },    // 40
-            { translate2d, shear_identity, Translate2D.class },
-            { translate2d, shear_shear, Affine2D.class },
-            { translate2d, affine_identity, Translate2D.class },
-            { translate2d, affine_translate2d, Translate2D.class },
-            { translate2d, affine_translate3d, Affine3D.class },
-            { translate2d, affine_scale2d, Affine2D.class },
-            { translate2d, affine_scale3d, Affine3D.class },
-            { translate2d, affine_affine2d, Affine2D.class },
-            { translate2d, affine_affine3d, Affine3D.class },
-
-            { affine2d, translate_identity, Affine2D.class },           // 50
-            { affine2d, translate_translate2d, Affine2D.class },
-            { affine2d, translate_translate3d, Affine3D.class },
-            { affine2d, scale_identity, Affine2D.class },
-            { affine2d, scale_pivotedidentity, Affine2D.class },
-            { affine2d, scale_scale2d, Affine2D.class },
-            { affine2d, scale_pivotedscale2d, Affine2D.class },
-            { affine2d, scale_scale3d, Affine3D.class },
-            { affine2d, scale_pivotedscale3d, Affine3D.class },
-            { affine2d, rotate_identity, Affine2D.class },
-            { affine2d, rotate_pivotedidentity, Affine2D.class },       // 60
-            { affine2d, rotate_rotate2d, Affine2D.class },
-            { affine2d, rotate_negative2d, Affine2D.class },
-            { affine2d, rotate_pivotedrotate2d, Affine2D.class },
-            { affine2d, rotate_rotate3d, Affine3D.class },
-            { affine2d, rotate_pivotedrotate3d, Affine3D.class },
-            { affine2d, shear_identity, Affine2D.class },
-            { affine2d, shear_shear, Affine2D.class },
-            { affine2d, affine_identity, Affine2D.class },
-            { affine2d, affine_translate2d, Affine2D.class },
-            { affine2d, affine_translate3d, Affine3D.class },           // 70
-            { affine2d, affine_scale2d, Affine2D.class },
-            { affine2d, affine_scale3d, Affine3D.class },
-            { affine2d, affine_affine2d, Affine2D.class },
-            { affine2d, affine_affine3d, Affine3D.class },
-
-            { affine3d, translate_identity, Affine3D.class },
-            { affine3d, translate_translate2d, Affine3D.class },
-            { affine3d, translate_translate3d, Affine3D.class },
-            { affine3d, scale_identity, Affine3D.class },
-            { affine3d, scale_pivotedidentity, Affine3D.class },
-            { affine3d, scale_scale2d, Affine3D.class },                // 80
-            { affine3d, scale_pivotedscale2d, Affine3D.class },
-            { affine3d, scale_scale3d, Affine3D.class },
-            { affine3d, scale_pivotedscale3d, Affine3D.class },
-            { affine3d, rotate_identity, Affine3D.class },
-            { affine3d, rotate_pivotedidentity, Affine3D.class },
-            { affine3d, rotate_rotate2d, Affine3D.class },
-            { affine3d, rotate_negative2d, Affine3D.class },
-            { affine3d, rotate_pivotedrotate2d, Affine3D.class },
-            { affine3d, rotate_rotate3d, Affine3D.class },
-            { affine3d, rotate_pivotedrotate3d, Affine3D.class },       // 90
-            { affine3d, shear_identity, Affine3D.class },
-            { affine3d, shear_shear, Affine3D.class },
-            { affine3d, affine_identity, Affine3D.class },
-            { affine3d, affine_translate2d, Affine3D.class },
-            { affine3d, affine_translate3d, Affine3D.class },
-            { affine3d, affine_scale2d, Affine3D.class },
-            { affine3d, affine_scale3d, Affine3D.class },
-            { affine3d, affine_affine2d, Affine3D.class },
-            { affine3d, affine_affine3d, Affine3D.class },              // 99
-        });
+    public static Stream<Arguments> getParams() {
+        return Stream.of(
+            Arguments.of( identity, translate_identity, Identity.class ),           //  0
+            Arguments.of( identity, translate_translate2d, Translate2D.class ),
+            Arguments.of( identity, translate_translate3d, Affine3D.class ),
+            Arguments.of( identity, scale_identity, Identity.class ),
+            Arguments.of( identity, scale_pivotedidentity, Identity.class ),
+            Arguments.of( identity, scale_scale2d, Affine2D.class ),
+            Arguments.of( identity, scale_pivotedscale2d, Affine2D.class ),
+            Arguments.of( identity, scale_scale3d, Affine3D.class ),
+            Arguments.of( identity, scale_pivotedscale3d, Affine3D.class ),
+            Arguments.of( identity, rotate_identity, Identity.class ),
+            Arguments.of( identity, rotate_pivotedidentity, Identity.class ),       // 10
+            Arguments.of( identity, rotate_rotate2d, Affine2D.class ),
+            Arguments.of( identity, rotate_negative2d, Affine2D.class ),
+            Arguments.of( identity, rotate_pivotedrotate2d, Affine2D.class ),
+            Arguments.of( identity, rotate_rotate3d, Affine3D.class ),
+            Arguments.of( identity, rotate_pivotedrotate3d, Affine3D.class ),
+            Arguments.of( identity, shear_identity, Identity.class ),
+            Arguments.of( identity, shear_shear, Affine2D.class ),
+            Arguments.of( identity, affine_identity, Identity.class ),
+            Arguments.of( identity, affine_translate2d, Translate2D.class ),
+            Arguments.of( identity, affine_translate3d, Affine3D.class ),           // 20
+            Arguments.of( identity, affine_scale2d, Affine2D.class ),
+            Arguments.of( identity, affine_scale3d, Affine3D.class ),
+            Arguments.of( identity, affine_affine2d, Affine2D.class ),
+            Arguments.of( identity, affine_affine3d, Affine3D.class ),
+
+            Arguments.of( translate2d, translate_identity, Translate2D.class ),
+            Arguments.of( translate2d, translate_translate2d, Translate2D.class ),
+            Arguments.of( translate2d, translate_translate3d, Affine3D.class ),
+            Arguments.of( translate2d, scale_identity, Translate2D.class ),
+            Arguments.of( translate2d, scale_pivotedidentity, Translate2D.class ),
+            Arguments.of( translate2d, scale_scale2d, Affine2D.class ),             // 30
+            Arguments.of( translate2d, scale_pivotedscale2d, Affine2D.class ),
+            Arguments.of( translate2d, scale_scale3d, Affine3D.class ),
+            Arguments.of( translate2d, scale_pivotedscale3d, Affine3D.class ),
+            Arguments.of( translate2d, rotate_identity, Translate2D.class ),
+            Arguments.of( translate2d, rotate_pivotedidentity, Translate2D.class ),
+            Arguments.of( translate2d, rotate_rotate2d, Affine2D.class ),
+            Arguments.of( translate2d, rotate_negative2d, Affine2D.class ),
+            Arguments.of( translate2d, rotate_pivotedrotate2d, Affine2D.class ),
+            Arguments.of( translate2d, rotate_rotate3d, Affine3D.class ),
+            Arguments.of( translate2d, rotate_pivotedrotate3d, Affine3D.class ),    // 40
+            Arguments.of( translate2d, shear_identity, Translate2D.class ),
+            Arguments.of( translate2d, shear_shear, Affine2D.class ),
+            Arguments.of( translate2d, affine_identity, Translate2D.class ),
+            Arguments.of( translate2d, affine_translate2d, Translate2D.class ),
+            Arguments.of( translate2d, affine_translate3d, Affine3D.class ),
+            Arguments.of( translate2d, affine_scale2d, Affine2D.class ),
+            Arguments.of( translate2d, affine_scale3d, Affine3D.class ),
+            Arguments.of( translate2d, affine_affine2d, Affine2D.class ),
+            Arguments.of( translate2d, affine_affine3d, Affine3D.class ),
+
+            Arguments.of( affine2d, translate_identity, Affine2D.class ),           // 50
+            Arguments.of( affine2d, translate_translate2d, Affine2D.class ),
+            Arguments.of( affine2d, translate_translate3d, Affine3D.class ),
+            Arguments.of( affine2d, scale_identity, Affine2D.class ),
+            Arguments.of( affine2d, scale_pivotedidentity, Affine2D.class ),
+            Arguments.of( affine2d, scale_scale2d, Affine2D.class ),
+            Arguments.of( affine2d, scale_pivotedscale2d, Affine2D.class ),
+            Arguments.of( affine2d, scale_scale3d, Affine3D.class ),
+            Arguments.of( affine2d, scale_pivotedscale3d, Affine3D.class ),
+            Arguments.of( affine2d, rotate_identity, Affine2D.class ),
+            Arguments.of( affine2d, rotate_pivotedidentity, Affine2D.class ),       // 60
+            Arguments.of( affine2d, rotate_rotate2d, Affine2D.class ),
+            Arguments.of( affine2d, rotate_negative2d, Affine2D.class ),
+            Arguments.of( affine2d, rotate_pivotedrotate2d, Affine2D.class ),
+            Arguments.of( affine2d, rotate_rotate3d, Affine3D.class ),
+            Arguments.of( affine2d, rotate_pivotedrotate3d, Affine3D.class ),
+            Arguments.of( affine2d, shear_identity, Affine2D.class ),
+            Arguments.of( affine2d, shear_shear, Affine2D.class ),
+            Arguments.of( affine2d, affine_identity, Affine2D.class ),
+            Arguments.of( affine2d, affine_translate2d, Affine2D.class ),
+            Arguments.of( affine2d, affine_translate3d, Affine3D.class ),           // 70
+            Arguments.of( affine2d, affine_scale2d, Affine2D.class ),
+            Arguments.of( affine2d, affine_scale3d, Affine3D.class ),
+            Arguments.of( affine2d, affine_affine2d, Affine2D.class ),
+            Arguments.of( affine2d, affine_affine3d, Affine3D.class ),
+
+            Arguments.of( affine3d, translate_identity, Affine3D.class ),
+            Arguments.of( affine3d, translate_translate2d, Affine3D.class ),
+            Arguments.of( affine3d, translate_translate3d, Affine3D.class ),
+            Arguments.of( affine3d, scale_identity, Affine3D.class ),
+            Arguments.of( affine3d, scale_pivotedidentity, Affine3D.class ),
+            Arguments.of( affine3d, scale_scale2d, Affine3D.class ),                // 80
+            Arguments.of( affine3d, scale_pivotedscale2d, Affine3D.class ),
+            Arguments.of( affine3d, scale_scale3d, Affine3D.class ),
+            Arguments.of( affine3d, scale_pivotedscale3d, Affine3D.class ),
+            Arguments.of( affine3d, rotate_identity, Affine3D.class ),
+            Arguments.of( affine3d, rotate_pivotedidentity, Affine3D.class ),
+            Arguments.of( affine3d, rotate_rotate2d, Affine3D.class ),
+            Arguments.of( affine3d, rotate_negative2d, Affine3D.class ),
+            Arguments.of( affine3d, rotate_pivotedrotate2d, Affine3D.class ),
+            Arguments.of( affine3d, rotate_rotate3d, Affine3D.class ),
+            Arguments.of( affine3d, rotate_pivotedrotate3d, Affine3D.class ),       // 90
+            Arguments.of( affine3d, shear_identity, Affine3D.class ),
+            Arguments.of( affine3d, shear_shear, Affine3D.class ),
+            Arguments.of( affine3d, affine_identity, Affine3D.class ),
+            Arguments.of( affine3d, affine_translate2d, Affine3D.class ),
+            Arguments.of( affine3d, affine_translate3d, Affine3D.class ),
+            Arguments.of( affine3d, affine_scale2d, Affine3D.class ),
+            Arguments.of( affine3d, affine_scale3d, Affine3D.class ),
+            Arguments.of( affine3d, affine_affine2d, Affine3D.class ),
+            Arguments.of( affine3d, affine_affine3d, Affine3D.class )              // 99
+        );
     }
 
-    private BaseTransform from;
-    private Transform deriver;
-    private Class deriveType;
-
-    public TransformDeriveTest(BaseTransform from, Transform deriver, Class deriveType) {
-        this.from = from.copy();
-        this.deriver = deriver;
-        this.deriveType = deriveType;
-    }
-
-    @Test public void testDerive() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testDerive(BaseTransform f, Transform deriver, Class deriveType) {
+        BaseTransform from = f.copy();
         Transform conc = TransformHelper.concatenate(from, deriver);
 
         BaseTransform res = com.sun.javafx.scene.transform.TransformHelper.derive(deriver, from);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/TransformOperationsTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/TransformOperationsTest.java
index 3f4234bcfc5..c4f23b62399 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/TransformOperationsTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/TransformOperationsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,8 @@
 
 package test.javafx.scene.transform;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.List;
+import java.util.stream.Stream;
 import javafx.beans.InvalidationListener;
 import javafx.beans.value.ChangeListener;
 import javafx.event.EventHandler;
@@ -46,14 +46,19 @@
 import javafx.scene.transform.TransformShim;
 import javafx.scene.transform.Translate;
 import test.com.sun.javafx.test.TransformHelper;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
-@RunWith(Parameterized.class)
 public class TransformOperationsTest {
     private static final Affine affine_identity = new Affine();
     private static final Affine affine_translate_only = new Affine(0, 0, 2,
@@ -286,146 +291,19 @@ public class TransformOperationsTest {
     private boolean listenerCalled;
     private int eventCounter;
 
-    //BEWARE: used also in AffineOperationsTest
-    @Parameters
-    public static Collection getParams() {
-        return Arrays.asList(new Object[][] {
-            { affine_identity, true, Affine.class },            //  0
-            { affine_translate, true, Affine.class },           //  1
-            { affine_translate_only, true, Affine.class },      //  2
-            { affine_scale, true, Affine.class },               //  3
-            { affine_sc_tr, true, Affine.class },               //  4
-            { affine_shear, true, Affine.class },               //  5
-            { affine_sh_tr, true, Affine.class },               //  6
-            { affine_sh_sc_simple, true, Affine.class },        //  7
-            { affine_sh_sc, true, Affine.class },               //  8
-            { affine_sh_sc_tr, true, Affine.class },            //  9
-            { affine_3d_tr, false, Affine.class },              // 10
-            { affine_3d_sc, false, Affine.class },              // 11
-            { affine_3d_sc_tr, false, Affine.class },           // 12
-            { affine_3d_sc2_tr3, false, Affine.class },         // 13
-            { affine_3d_sc3_tr2, false, Affine.class },         // 14
-            { affine_3d_withShear, false, Affine.class },       // 15
-            { affine_3d_only3d, false, Affine.class },          // 16
-            { affine_3d_translate_only, false, null },          // 17
-            { affine_3d_complex, false, Affine.class },         // 18
-            { affine_3d_complex_noninvertible, false, null },   // 19
-            { affine_empty, false, null },                      // 20
-            { affine_emptyZ, false, null },                     // 21
-            { affine_emptyXY, true, null },                     // 22
-            { affine_nonInv_translate_x, true, null },          // 23
-            { affine_nonInv_translate_y, true, null },          // 24
-            { affine_nonInv_translate_z, false, null },         // 25
-            { affine_nonInv_scale_x, true, null },              // 26
-            { affine_nonInv_scale_y, true, null },              // 27
-            { affine_nonInv_scale_xy, false, null },            // 28
-            { affine_nonInv_scale_z, false, null },             // 29
-            { affine_nonInv_shear_x, true, null },              // 30
-            { affine_nonInv_shear_y, true, null },              // 31
-            { affine_nonInv_sh_tr_x, true, null },              // 32
-            { affine_nonInv_sh_tr_y, true, null },              // 33
-            { affine_nonInv_sh_sc_tr, true, null },             // 34
-            { affine_nonInv_sh_sc, true, null },                // 35
-            { affine_nonInv_sh_tr, true, null },                // 36
-            { affine_nonInv_sc_tr, true, null },                // 37
-            { affine_nonInv_sc_tr_x, true, null },              // 38
-            { affine_nonInv_sc_tr_y, true, null },              // 39
-            { translate2d, true, Translate.class },             // 40
-            { translate3d, false, Translate.class },            // 41
-            { translate3d_only, false, Translate.class },       // 42
-            { noTranslate, true, Translate.class },             // 43
-            { scale2d, true, Scale.class },                     // 44
-            { scale2d_x, true, Scale.class },                   // 45
-            { scale2d_y, true, Scale.class },                   // 46
-            { scale3d, false, Scale.class },                    // 47
-            { scale3dOnly, false, Scale.class },                // 48
-            { scale2dNoPivot, true, Scale.class },              // 49
-            { scale2dUslessPivots, true, Scale.class },         // 50
-            { scale3dNoPivot, false, Scale.class },             // 51
-            { scale2dPivot3d, true, Scale.class },              // 52
-            { noScale, true, Scale.class },                     // 53
-            { nonInvertible2dScale, true, null },               // 54
-            { nonInvertible3dScale, false, null },              // 55
-            { shear, true, Affine.class },                      // 56
-            { shearX, true, Shear.class },                      // 57
-            { shearY, true, Shear.class },                      // 58
-            { shearNoPivot, true, Affine.class },               // 59
-            { noShear, true, Shear.class },                     // 60
-            { simpleRotate3d, false, Rotate.class},             // 61
-            { rotate2d, true, Rotate.class },                   // 62
-            { rotate3d, false, Rotate.class },                  // 63
-            { rotate3d2d, true, Rotate.class },                 // 64
-            { rotate3dUpsideDown2d, true, Rotate.class },       // 65
-            { rotateZeroAxis, true, Rotate.class },             // 66
-            { rotate2dNoPivot, true, Rotate.class },            // 67
-            { rotate3dNoPivot, false, Rotate.class },           // 68
-            { rotate2dPivot3d, true, Rotate.class },            // 69
-            { noRotate, true, Rotate.class },                   // 70
-            { immutable_identity, true, Affine.class },         // 71
-            { immutable_translate, true, Affine.class },        // 72
-            { immutable_translate_only, true, Affine.class },   // 73
-            { immutable_scale, true, Affine.class },            // 74
-            { immutable_sc_tr, true, Affine.class },            // 75
-            { immutable_shear, true, Affine.class },            // 76
-            { immutable_sh_tr, true, Affine.class },            // 77
-            { immutable_sh_sc_simple, true, Affine.class },     // 78
-            { immutable_sh_sc, true, Affine.class },            // 79
-            { immutable_sh_sc_tr, true, Affine.class },         // 80
-            { immutable_3d_tr, false, Affine.class },           // 81
-            { immutable_3d_sc, false, Affine.class },           // 82
-            { immutable_3d_sc_tr, false, Affine.class },        // 83
-            { immutable_3d_sc2_tr3, false, Affine.class },      // 84
-            { immutable_3d_sc3_tr2, false, Affine.class },      // 85
-            { immutable_3d_withShear, false, Affine.class },    // 86
-            { immutable_3d_only3d, false, Affine.class },       // 87
-            { immutable_3d_translate_only, false, null },       // 88
-            { immutable_3d_complex, false, Affine.class },      // 89
-            { immutable_3d_complex_noninvertible, false, null },// 90
-            { immutable_empty, false, null },                   // 91
-            { immutable_emptyZ, false, null },                  // 92
-            { immutable_emptyXY, true, null },                  // 93
-            { immutable_nonInv_translate_x, true, null },       // 94
-            { immutable_nonInv_translate_y, true, null },       // 95
-            { immutable_nonInv_translate_z, false, null },      // 96
-            { immutable_nonInv_scale_x, true, null },           // 97
-            { immutable_nonInv_scale_y, true, null },           // 98
-            { immutable_nonInv_scale_xy, false, null },         // 99
-            { immutable_nonInv_scale_z, false, null },          //100
-            { immutable_nonInv_shear_x, true, null },           //101
-            { immutable_nonInv_shear_y, true, null },           //102
-            { immutable_nonInv_sh_tr_x, true, null },           //103
-            { immutable_nonInv_sh_tr_y, true, null },           //104
-            { immutable_nonInv_sh_sc_tr, true, null },          //105
-            { immutable_nonInv_sh_sc, true, null },             //106
-            { immutable_nonInv_sh_tr, true, null },             //107
-            { immutable_nonInv_sc_tr, true, null },             //108
-            { immutable_nonInv_sc_tr_x, true, null },           //109
-            { immutable_nonInv_sc_tr_y, true, null },           //110
-            { raw_arbitrary, false, Affine.class },             //111
-            { raw_arbitrary_nonInvertible, false, null },       //112
-            { raw_empty, false, null },                         //113
-            { raw_emptyZ, false, null },                        //114
-            { raw_emptyXY, true, null },                        //115
-        });
-    }
-
-    private Transform t;
-    private Transform it;
-    private boolean is2d, isIdentity;
-    private boolean isInvertible;
-    private Class inverseType;
-
-    public TransformOperationsTest(Transform t, boolean twoDee, Class inverseType) {
-        this.t = t;
-        this.is2d = twoDee;
-        this.isIdentity =
-               (t.getMxx() == 1 && t.getMxy() == 0 && t.getMxz() == 0 && t.getTx() == 0
-             && t.getMyx() == 0 && t.getMyy() == 1 && t.getMyz() == 0 && t.getTy() == 0
-             && t.getMzx() == 0 && t.getMzy() == 0 && t.getMzz() == 1 && t.getTz() == 0);
-
-        this.it = null;
-        this.inverseType = inverseType;
-        this.isInvertible = (TransformHelper.determinant(t) != 0);
+    // converts to test parameters:
+    //    Transform t,
+    //    Transform it,
+    //    boolean is2d,
+    //    boolean isIdentity,
+    //    boolean isInvertible,
+    //    Class<?> inverseType
+    private static Arguments prepareArgs(Transform t, boolean is2d, Class<?> inverseType) {
+        boolean isIdentity = (t.getMxx() == 1 && t.getMxy() == 0 && t.getMxz() == 0 && t.getTx() == 0
+                              && t.getMyx() == 0 && t.getMyy() == 1 && t.getMyz() == 0 && t.getTy() == 0
+                              && t.getMzx() == 0 && t.getMzy() == 0 && t.getMzz() == 1 && t.getTz() == 0);
+        boolean isInvertible = (TransformHelper.determinant(t) != 0);
+        Transform it = null;
         if (isInvertible) {
             try {
                 it = TransformHelper.invert(t);
@@ -437,10 +315,147 @@ public TransformOperationsTest(Transform t, boolean twoDee, Class inverseType) {
             // to avoid non-null checks everywhere
             it = new Affine();
         }
+
+        return Arguments.of(
+            t,
+            it,
+            is2d,
+            isIdentity,
+            isInvertible,
+            inverseType
+        );
     }
 
-    @Test
-    public void testClone() {
+    //BEWARE: used also in AffineOperationsTest
+    public static Stream<Arguments> getParams() {
+        return Stream.of(
+            prepareArgs( affine_identity, true, Affine.class ),            //  0
+            prepareArgs( affine_translate, true, Affine.class ),           //  1
+            prepareArgs( affine_translate_only, true, Affine.class ),      //  2
+            prepareArgs( affine_scale, true, Affine.class ),               //  3
+            prepareArgs( affine_sc_tr, true, Affine.class ),               //  4
+            prepareArgs( affine_shear, true, Affine.class ),               //  5
+            prepareArgs( affine_sh_tr, true, Affine.class ),               //  6
+            prepareArgs( affine_sh_sc_simple, true, Affine.class ),        //  7
+            prepareArgs( affine_sh_sc, true, Affine.class ),               //  8
+            prepareArgs( affine_sh_sc_tr, true, Affine.class ),            //  9
+            prepareArgs( affine_3d_tr, false, Affine.class ),              // 10
+            prepareArgs( affine_3d_sc, false, Affine.class ),              // 11
+            prepareArgs( affine_3d_sc_tr, false, Affine.class ),           // 12
+            prepareArgs( affine_3d_sc2_tr3, false, Affine.class ),         // 13
+            prepareArgs( affine_3d_sc3_tr2, false, Affine.class ),         // 14
+            prepareArgs( affine_3d_withShear, false, Affine.class ),       // 15
+            prepareArgs( affine_3d_only3d, false, Affine.class ),          // 16
+            prepareArgs( affine_3d_translate_only, false, null ),          // 17
+            prepareArgs( affine_3d_complex, false, Affine.class ),         // 18
+            prepareArgs( affine_3d_complex_noninvertible, false, null ),   // 19
+            prepareArgs( affine_empty, false, null ),                      // 20
+            prepareArgs( affine_emptyZ, false, null ),                     // 21
+            prepareArgs( affine_emptyXY, true, null ),                     // 22
+            prepareArgs( affine_nonInv_translate_x, true, null ),          // 23
+            prepareArgs( affine_nonInv_translate_y, true, null ),          // 24
+            prepareArgs( affine_nonInv_translate_z, false, null ),         // 25
+            prepareArgs( affine_nonInv_scale_x, true, null ),              // 26
+            prepareArgs( affine_nonInv_scale_y, true, null ),              // 27
+            prepareArgs( affine_nonInv_scale_xy, false, null ),            // 28
+            prepareArgs( affine_nonInv_scale_z, false, null ),             // 29
+            prepareArgs( affine_nonInv_shear_x, true, null ),              // 30
+            prepareArgs( affine_nonInv_shear_y, true, null ),              // 31
+            prepareArgs( affine_nonInv_sh_tr_x, true, null ),              // 32
+            prepareArgs( affine_nonInv_sh_tr_y, true, null ),              // 33
+            prepareArgs( affine_nonInv_sh_sc_tr, true, null ),             // 34
+            prepareArgs( affine_nonInv_sh_sc, true, null ),                // 35
+            prepareArgs( affine_nonInv_sh_tr, true, null ),                // 36
+            prepareArgs( affine_nonInv_sc_tr, true, null ),                // 37
+            prepareArgs( affine_nonInv_sc_tr_x, true, null ),              // 38
+            prepareArgs( affine_nonInv_sc_tr_y, true, null ),              // 39
+            prepareArgs( translate2d, true, Translate.class ),             // 40
+            prepareArgs( translate3d, false, Translate.class ),            // 41
+            prepareArgs( translate3d_only, false, Translate.class ),       // 42
+            prepareArgs( noTranslate, true, Translate.class ),             // 43
+            prepareArgs( scale2d, true, Scale.class ),                     // 44
+            prepareArgs( scale2d_x, true, Scale.class ),                   // 45
+            prepareArgs( scale2d_y, true, Scale.class ),                   // 46
+            prepareArgs( scale3d, false, Scale.class ),                    // 47
+            prepareArgs( scale3dOnly, false, Scale.class ),                // 48
+            prepareArgs( scale2dNoPivot, true, Scale.class ),              // 49
+            prepareArgs( scale2dUslessPivots, true, Scale.class ),         // 50
+            prepareArgs( scale3dNoPivot, false, Scale.class ),             // 51
+            prepareArgs( scale2dPivot3d, true, Scale.class ),              // 52
+            prepareArgs( noScale, true, Scale.class ),                     // 53
+            prepareArgs( nonInvertible2dScale, true, null ),               // 54
+            prepareArgs( nonInvertible3dScale, false, null ),              // 55
+            prepareArgs( shear, true, Affine.class ),                      // 56
+            prepareArgs( shearX, true, Shear.class ),                      // 57
+            prepareArgs( shearY, true, Shear.class ),                      // 58
+            prepareArgs( shearNoPivot, true, Affine.class ),               // 59
+            prepareArgs( noShear, true, Shear.class ),                     // 60
+            prepareArgs( simpleRotate3d, false, Rotate.class ),            // 61
+            prepareArgs( rotate2d, true, Rotate.class ),                   // 62
+            prepareArgs( rotate3d, false, Rotate.class ),                  // 63
+            prepareArgs( rotate3d2d, true, Rotate.class ),                 // 64
+            prepareArgs( rotate3dUpsideDown2d, true, Rotate.class ),       // 65
+            prepareArgs( rotateZeroAxis, true, Rotate.class ),             // 66
+            prepareArgs( rotate2dNoPivot, true, Rotate.class ),            // 67
+            prepareArgs( rotate3dNoPivot, false, Rotate.class ),           // 68
+            prepareArgs( rotate2dPivot3d, true, Rotate.class ),            // 69
+            prepareArgs( noRotate, true, Rotate.class ),                   // 70
+            prepareArgs( immutable_identity, true, Affine.class ),         // 71
+            prepareArgs( immutable_translate, true, Affine.class ),        // 72
+            prepareArgs( immutable_translate_only, true, Affine.class ),   // 73
+            prepareArgs( immutable_scale, true, Affine.class ),            // 74
+            prepareArgs( immutable_sc_tr, true, Affine.class ),            // 75
+            prepareArgs( immutable_shear, true, Affine.class ),            // 76
+            prepareArgs( immutable_sh_tr, true, Affine.class ),            // 77
+            prepareArgs( immutable_sh_sc_simple, true, Affine.class ),     // 78
+            prepareArgs( immutable_sh_sc, true, Affine.class ),            // 79
+            prepareArgs( immutable_sh_sc_tr, true, Affine.class ),         // 80
+            prepareArgs( immutable_3d_tr, false, Affine.class ),           // 81
+            prepareArgs( immutable_3d_sc, false, Affine.class ),           // 82
+            prepareArgs( immutable_3d_sc_tr, false, Affine.class ),        // 83
+            prepareArgs( immutable_3d_sc2_tr3, false, Affine.class ),      // 84
+            prepareArgs( immutable_3d_sc3_tr2, false, Affine.class ),      // 85
+            prepareArgs( immutable_3d_withShear, false, Affine.class ),    // 86
+            prepareArgs( immutable_3d_only3d, false, Affine.class ),       // 87
+            prepareArgs( immutable_3d_translate_only, false, null ),       // 88
+            prepareArgs( immutable_3d_complex, false, Affine.class ),      // 89
+            prepareArgs( immutable_3d_complex_noninvertible, false, null ),// 90
+            prepareArgs( immutable_empty, false, null ),                   // 91
+            prepareArgs( immutable_emptyZ, false, null ),                  // 92
+            prepareArgs( immutable_emptyXY, true, null ),                  // 93
+            prepareArgs( immutable_nonInv_translate_x, true, null ),       // 94
+            prepareArgs( immutable_nonInv_translate_y, true, null ),       // 95
+            prepareArgs( immutable_nonInv_translate_z, false, null ),      // 96
+            prepareArgs( immutable_nonInv_scale_x, true, null ),           // 97
+            prepareArgs( immutable_nonInv_scale_y, true, null ),           // 98
+            prepareArgs( immutable_nonInv_scale_xy, false, null ),         // 99
+            prepareArgs( immutable_nonInv_scale_z, false, null ),          //100
+            prepareArgs( immutable_nonInv_shear_x, true, null ),           //101
+            prepareArgs( immutable_nonInv_shear_y, true, null ),           //102
+            prepareArgs( immutable_nonInv_sh_tr_x, true, null ),           //103
+            prepareArgs( immutable_nonInv_sh_tr_y, true, null ),           //104
+            prepareArgs( immutable_nonInv_sh_sc_tr, true, null ),          //105
+            prepareArgs( immutable_nonInv_sh_sc, true, null ),             //106
+            prepareArgs( immutable_nonInv_sh_tr, true, null ),             //107
+            prepareArgs( immutable_nonInv_sc_tr, true, null ),             //108
+            prepareArgs( immutable_nonInv_sc_tr_x, true, null ),           //109
+            prepareArgs( immutable_nonInv_sc_tr_y, true, null ),           //110
+            prepareArgs( raw_arbitrary, false, Affine.class ),             //111
+            prepareArgs( raw_arbitrary_nonInvertible, false, null ),       //112
+            prepareArgs( raw_empty, false, null ),                         //113
+            prepareArgs( raw_emptyZ, false, null ),                        //114
+            prepareArgs( raw_emptyXY, true, null )                        //115
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testClone(Transform t,
+                          Transform it,
+                          boolean is2d,
+                          boolean isIdentity,
+                          boolean isInvertible,
+                          Class<?> inverseType) {
         final double mxx = t.getMxx();
         final double mxy = t.getMxy();
         final double mxz = t.getMxz();
@@ -471,9 +486,9 @@ public void testClone() {
                 mxx, mxy, mxz, tx, myx, myy, myz, ty, mzx, mzy, mzz, tz);
     }
 
-    private Class getExpectedConcatenationClass(Transform t1, Transform t2) {
-        Class c1 = t1.getClass();
-        Class c2 = t2.getClass();
+    private Class<?> getExpectedConcatenationClass(Transform t1, Transform t2) {
+        Class<?> c1 = t1.getClass();
+        Class<?> c2 = t2.getClass();
 
         if (c1 == Translate.class && c2 == Translate.class) {
             return Translate.class;
@@ -526,11 +541,18 @@ private Class getExpectedConcatenationClass(Transform t1, Transform t2) {
         return Affine.class;
     }
 
-    @Test
-    public void testCreateConcatenation() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testCreateConcatenation(Transform t,
+                                        Transform it,
+                                        boolean is2d,
+                                        boolean isIdentity,
+                                        boolean isInvertible,
+                                        Class<?> inverseType) {
         int counter = 0;
-        for (Object o : TransformOperationsTest.getParams()) {
-            Object[] arr = (Object[]) o;
+        List<Arguments> argumentsStream = TransformOperationsTest.getParams().toList();
+        for (Arguments a : argumentsStream) {
+            Object[] arr = a.get();
             Transform other = (Transform) arr[0];
 
             Transform res = TransformHelper.concatenate(t, other);
@@ -538,20 +560,34 @@ public void testCreateConcatenation() {
 
             TransformHelper.assertMatrix("Concatenating with #" + counter,
                     conc, res);
-            assertSame("Concatenating with #" + counter,
-                    getExpectedConcatenationClass(t, other),
-                    conc.getClass());
+            assertSame(getExpectedConcatenationClass(t, other),
+                       conc.getClass(),
+                       "Concatenating with #" + counter);
             counter++;
         }
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testCreateConcatenationNullTransform() {
-        t.createConcatenation(null);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testCreateConcatenationNullTransform(Transform t,
+                                                     Transform it,
+                                                     boolean is2d,
+                                                     boolean isIdentity,
+                                                     boolean isInvertible,
+                                                     Class<?> inverseType) {
+        assertThrows(NullPointerException.class, () -> {
+            t.createConcatenation(null);
+        });
     }
 
-    @Test
-    public void testCreateInverse() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testCreateInverse(Transform t,
+                                  Transform it,
+                                  boolean is2d,
+                                  boolean isIdentity,
+                                  boolean isInvertible,
+                                  Class<?> inverseType) {
         Transform res = null;
         try {
             res = t.createInverse();
@@ -574,8 +610,14 @@ public void testCreateInverse() {
         TransformHelper.assertMatrix(res, it);
     }
 
-    @Test
-    public void createInverseShouldUpdateCache() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void createInverseShouldUpdateCache(Transform t,
+                                               Transform it,
+                                               boolean is2d,
+                                               boolean isIdentity,
+                                               boolean isInvertible,
+                                               Class<?> inverseType) {
         Transform ct = t.clone();
         Transform res = null;
         boolean canInvert = isInvertible;
@@ -652,8 +694,14 @@ public void createInverseShouldUpdateCache() {
         TransformHelper.assertMatrix(res, inv);
     }
 
-    @Test
-    public void testTransformPoint3d() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testTransformPoint3d(Transform t,
+                                     Transform it,
+                                     boolean is2d,
+                                     boolean isIdentity,
+                                     boolean isInvertible,
+                                     Class<?> inverseType) {
         Point3D p = new Point3D(12, -18, 30);
         Point3D expected = new Point3D(
             t.getMxx() * 12 - t.getMxy() * 18 + t.getMxz() * 30 + t.getTx(),
@@ -672,13 +720,27 @@ public void testTransformPoint3d() {
         assertEquals(expected.getZ(), result.getZ(), 0.00001);
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testTransformNullPoint3D() {
-        t.transform((Point3D) null);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testTransformNullPoint3D(Transform t,
+                                         Transform it,
+                                         boolean is2d,
+                                         boolean isIdentity,
+                                         boolean isInvertible,
+                                         Class<?> inverseType) {
+        assertThrows(NullPointerException.class, () -> {
+            t.transform((Point3D) null);
+        });
     }
 
-    @Test
-    public void testTransformPoint2d() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testTransformPoint2d(Transform t,
+                                     Transform it,
+                                     boolean is2d,
+                                     boolean isIdentity,
+                                     boolean isInvertible,
+                                     Class<?> inverseType) {
 
         Point2D p = new Point2D(12, -18);
         Point2D expected = new Point2D(
@@ -712,13 +774,27 @@ public void testTransformPoint2d() {
         }
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testTransformNullPoint2D() {
-        t.transform((Point2D) null);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testTransformNullPoint2D(Transform t,
+                                         Transform it,
+                                         boolean is2d,
+                                         boolean isIdentity,
+                                         boolean isInvertible,
+                                         Class<?> inverseType) {
+        assertThrows(NullPointerException.class, () -> {
+            t.transform((Point2D) null);
+        });
     }
 
-    @Test
-    public void testDeltaTransformPoint3d() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testDeltaTransformPoint3d(Transform t,
+                                          Transform it,
+                                          boolean is2d,
+                                          boolean isIdentity,
+                                          boolean isInvertible,
+                                          Class<?> inverseType) {
         Point3D p = new Point3D(12, -18, 30);
         Point3D expected = new Point3D(
             t.getMxx() * 12 - t.getMxy() * 18 + t.getMxz() * 30,
@@ -737,13 +813,27 @@ public void testDeltaTransformPoint3d() {
         assertEquals(expected.getZ(), result.getZ(), 0.00001);
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testDeltaTransformNullPoint3D() {
-        t.deltaTransform((Point3D) null);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testDeltaTransformNullPoint3D(Transform t,
+                                              Transform it,
+                                              boolean is2d,
+                                              boolean isIdentity,
+                                              boolean isInvertible,
+                                              Class<?> inverseType) {
+        assertThrows(NullPointerException.class, () -> {
+            t.deltaTransform((Point3D) null);
+        });
     }
 
-    @Test
-    public void testDeltaTransformPoint2d() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testDeltaTransformPoint2d(Transform t,
+                                          Transform it,
+                                          boolean is2d,
+                                          boolean isIdentity,
+                                          boolean isInvertible,
+                                          Class<?> inverseType) {
 
         Point2D p = new Point2D(12, -18);
         Point2D expected = new Point2D(
@@ -777,13 +867,27 @@ public void testDeltaTransformPoint2d() {
         }
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testDeltaTransformNullPoint2D() {
-        t.deltaTransform((Point2D) null);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testDeltaTransformNullPoint2D(Transform t,
+                                              Transform it,
+                                              boolean is2d,
+                                              boolean isIdentity,
+                                              boolean isInvertible,
+                                              Class<?> inverseType) {
+        assertThrows(NullPointerException.class, () -> {
+            t.deltaTransform((Point2D) null);
+        });
     }
 
-    @Test
-    public void testTransformBounds() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testTransformBounds(Transform t,
+                                    Transform it,
+                                    boolean is2d,
+                                    boolean isIdentity,
+                                    boolean isInvertible,
+                                    Class<?> inverseType) {
         Bounds result = t.transform(new BoundingBox(10, 11, 12, 13, 14, 15));
 
         Point3D[] points = new Point3D[] {
@@ -820,13 +924,27 @@ public void testTransformBounds() {
         assertEquals(expected2.getZ(), result.getMaxZ(), 0.00001);
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testTransformNullBounds() {
-        t.transform((Bounds) null);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testTransformNullBounds(Transform t,
+                                        Transform it,
+                                        boolean is2d,
+                                        boolean isIdentity,
+                                        boolean isInvertible,
+                                        Class<?> inverseType) {
+        assertThrows(NullPointerException.class, () -> {
+            t.transform((Bounds) null);
+        });
     }
 
-    @Test
-    public void testTransform2DPoints() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testTransform2DPoints(Transform t,
+                                      Transform it,
+                                      boolean is2d,
+                                      boolean isIdentity,
+                                      boolean isInvertible,
+                                      Class<?> inverseType) {
         double[] srcPts = new double[] { 0, 1, 2, 3, 4, 5, 6 };
         double[] dstPts = new double[] { 1, 2, 3, 4, 5, 6 };
 
@@ -857,23 +975,53 @@ public void testTransform2DPoints() {
         }
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testTransform2DPointsBothPtsNull() {
-        t.transform2DPoints(null, 2, null, 0, 0);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testTransform2DPointsBothPtsNull(Transform t,
+                                                 Transform it,
+                                                 boolean is2d,
+                                                 boolean isIdentity,
+                                                 boolean isInvertible,
+                                                 Class<?> inverseType) {
+        assertThrows(NullPointerException.class, () -> {
+            t.transform2DPoints(null, 2, null, 0, 0);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testTransform2DPointsSrcPtsNull() {
-        t.transform2DPoints(null, 2, new double[] { 1, 2 }, 0, 0);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testTransform2DPointsSrcPtsNull(Transform t,
+                                                Transform it,
+                                                boolean is2d,
+                                                boolean isIdentity,
+                                                boolean isInvertible,
+                                                Class<?> inverseType) {
+        assertThrows(NullPointerException.class, () -> {
+            t.transform2DPoints(null, 2, new double[] { 1, 2 }, 0, 0);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testTransform2DPointsDstPtsNull() {
-        t.transform2DPoints(new double[] { 1, 2, 3, 4 }, 2, null, 0, 0);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testTransform2DPointsDstPtsNull(Transform t,
+                                                Transform it,
+                                                boolean is2d,
+                                                boolean isIdentity,
+                                                boolean isInvertible,
+                                                Class<?> inverseType) {
+        assertThrows(NullPointerException.class, () -> {
+            t.transform2DPoints(new double[] { 1, 2, 3, 4 }, 2, null, 0, 0);
+        });
     }
 
-    @Test
-    public void testTransform2DPointsWithOverlap() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testTransform2DPointsWithOverlap(Transform t,
+                                                 Transform it,
+                                                 boolean is2d,
+                                                 boolean isIdentity,
+                                                 boolean isInvertible,
+                                                 Class<?> inverseType) {
         double[] srcPts = new double[] { 0, 1, 2, 3, 4, 5, 6, 7, 8 };
 
         Point2D expected1 = new Point2D(
@@ -906,36 +1054,58 @@ public void testTransform2DPointsWithOverlap() {
         }
     }
 
-    @Test(expected=IndexOutOfBoundsException.class)
-    public void testTransform2DPointsSrcOut() {
-        double[] srcPts = new double[] { 0, 1, 2, 3, 4, 5, 6, 7 };
-        double[] dstPts = new double[] { 1, 2, 3, 4, 5, 6 };
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testTransform2DPointsSrcOut(Transform t,
+                                            Transform it,
+                                            boolean is2d,
+                                            boolean isIdentity,
+                                            boolean isInvertible,
+                                            Class<?> inverseType) {
+        assertThrows(IndexOutOfBoundsException.class, () -> {
+            double[] srcPts = new double[] { 0, 1, 2, 3, 4, 5, 6, 7 };
+            double[] dstPts = new double[] { 1, 2, 3, 4, 5, 6 };
 
-        try {
-            t.transform2DPoints(srcPts, 3, dstPts, 0, 3);
-        } catch (IllegalStateException e) {
-            if (!is2d) {
-                throw new IndexOutOfBoundsException("expected result");
+            try {
+                t.transform2DPoints(srcPts, 3, dstPts, 0, 3);
+            } catch (IllegalStateException e) {
+                if (!is2d) {
+                    throw new IndexOutOfBoundsException("expected result");
+                }
             }
-        }
+        });
     }
 
-    @Test(expected=IndexOutOfBoundsException.class)
-    public void testTransform2DPointsDstOut() {
-        double[] srcPts = new double[] { 0, 1, 2, 3, 4, 5, 6, 7 };
-        double[] dstPts = new double[] { 1 };
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testTransform2DPointsDstOut(Transform t,
+                                            Transform it,
+                                            boolean is2d,
+                                            boolean isIdentity,
+                                            boolean isInvertible,
+                                            Class<?> inverseType) {
+        assertThrows(IndexOutOfBoundsException.class, () -> {
+            double[] srcPts = new double[] { 0, 1, 2, 3, 4, 5, 6, 7 };
+            double[] dstPts = new double[] { 1 };
 
-        try {
-            t.transform2DPoints(srcPts, 1, dstPts, 0, 2);
-        } catch (IllegalStateException e) {
-            if (!is2d) {
-                throw new IndexOutOfBoundsException("expected result");
+            try {
+                t.transform2DPoints(srcPts, 1, dstPts, 0, 2);
+            } catch (IllegalStateException e) {
+                if (!is2d) {
+                    throw new IndexOutOfBoundsException("expected result");
+                }
             }
-        }
+        });
     }
 
-    @Test
-    public void testTransform3DPoints() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testTransform3DPoints(Transform t,
+                                      Transform it,
+                                      boolean is2d,
+                                      boolean isIdentity,
+                                      boolean isInvertible,
+                                      Class<?> inverseType) {
         double[] srcPts = new double[] { 0, 1, 2, 3, 4, 5, 6, 7, 8 };
         double[] dstPts = new double[] { 1, 2, 3, 4, 5, 6, 7, 8 };
 
@@ -961,23 +1131,53 @@ public void testTransform3DPoints() {
         assertEquals(8, dstPts[7], 0.00001);
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testTransform3DPointsBothPtsNull() {
-        t.transform3DPoints(null, 2, null, 0, 0);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testTransform3DPointsBothPtsNull(Transform t,
+                                                 Transform it,
+                                                 boolean is2d,
+                                                 boolean isIdentity,
+                                                 boolean isInvertible,
+                                                 Class<?> inverseType) {
+        assertThrows(NullPointerException.class, () -> {
+            t.transform3DPoints(null, 2, null, 0, 0);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testTransform3DPointsSrcPtsNull() {
-        t.transform3DPoints(null, 2, new double[] { 1, 2, 3 }, 0, 0);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testTransform3DPointsSrcPtsNull(Transform t,
+                                                Transform it,
+                                                boolean is2d,
+                                                boolean isIdentity,
+                                                boolean isInvertible,
+                                                Class<?> inverseType) {
+        assertThrows(NullPointerException.class, () -> {
+            t.transform3DPoints(null, 2, new double[] { 1, 2, 3 }, 0, 0);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testTransform3DPointsDstPtsNull() {
-        t.transform3DPoints(new double[] { 1, 2, 3, 4 }, 2, null, 0, 0);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testTransform3DPointsDstPtsNull(Transform t,
+                                                Transform it,
+                                                boolean is2d,
+                                                boolean isIdentity,
+                                                boolean isInvertible,
+                                                Class<?> inverseType) {
+        assertThrows(NullPointerException.class, () -> {
+            t.transform3DPoints(new double[] { 1, 2, 3, 4 }, 2, null, 0, 0);
+        });
     }
 
-    @Test
-    public void testTransform3DPointsWithOverlap() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testTransform3DPointsWithOverlap(Transform t,
+                                                 Transform it,
+                                                 boolean is2d,
+                                                 boolean isIdentity,
+                                                 boolean isInvertible,
+                                                 Class<?> inverseType) {
         double[] srcPts = new double[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
 
         Point3D expected1 = new Point3D(
@@ -1004,24 +1204,46 @@ public void testTransform3DPointsWithOverlap() {
         assertEquals(9, srcPts[9], 0.00001);
     }
 
-    @Test(expected=IndexOutOfBoundsException.class)
-    public void testTransform3DPointsSrcOut() {
-        double[] srcPts = new double[] { 0, 1, 2, 3, 4, 5, 6, 7 };
-        double[] dstPts = new double[] { 1, 2, 3, 4, 5, 6 };
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testTransform3DPointsSrcOut(Transform t,
+                                            Transform it,
+                                            boolean is2d,
+                                            boolean isIdentity,
+                                            boolean isInvertible,
+                                            Class<?> inverseType) {
+        assertThrows(IndexOutOfBoundsException.class, () -> {
+            double[] srcPts = new double[] { 0, 1, 2, 3, 4, 5, 6, 7 };
+            double[] dstPts = new double[] { 1, 2, 3, 4, 5, 6 };
 
-        t.transform3DPoints(srcPts, 6, dstPts, 0, 1);
+            t.transform3DPoints(srcPts, 6, dstPts, 0, 1);
+        });
     }
 
-    @Test(expected=IndexOutOfBoundsException.class)
-    public void testTransform3DPointsDstOut() {
-        double[] srcPts = new double[] { 0, 1, 2, 3, 4, 5, 6, 7 };
-        double[] dstPts = new double[] { 1 };
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testTransform3DPointsDstOut(Transform t,
+                          Transform it,
+                          boolean is2d,
+                          boolean isIdentity,
+                          boolean isInvertible,
+                          Class<?> inverseType) {
+        assertThrows(IndexOutOfBoundsException.class, () -> {
+            double[] srcPts = new double[] { 0, 1, 2, 3, 4, 5, 6, 7 };
+            double[] dstPts = new double[] { 1 };
 
-        t.transform3DPoints(srcPts, 1, dstPts, 0, 1);
+            t.transform3DPoints(srcPts, 1, dstPts, 0, 1);
+        });
     }
 
-    @Test
-    public void testInverseTransformPoint3d() throws Exception {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testInverseTransformPoint3d(Transform t,
+                                            Transform it,
+                                            boolean is2d,
+                                            boolean isIdentity,
+                                            boolean isInvertible,
+                                            Class<?> inverseType) throws Exception {
         Point3D p = new Point3D(12, -18, 30);
 
         Point3D expected = new Point3D(
@@ -1058,14 +1280,27 @@ public void testInverseTransformPoint3d() throws Exception {
         }
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testInverseTransformNullPoint3D()
-            throws NonInvertibleTransformException {
-        t.inverseTransform((Point3D) null);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testInverseTransformNullPoint3D(Transform t,
+                                                Transform it,
+                                                boolean is2d,
+                                                boolean isIdentity,
+                                                boolean isInvertible,
+                                                Class<?> inverseType) throws NonInvertibleTransformException {
+        assertThrows(NullPointerException.class, () -> {
+            t.inverseTransform((Point3D) null);
+        });
     }
 
-    @Test
-    public void testInverseTransformPoint2d() throws Exception {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testInverseTransformPoint2d(Transform t,
+                                            Transform it,
+                                            boolean is2d,
+                                            boolean isIdentity,
+                                            boolean isInvertible,
+                                            Class<?> inverseType) throws Exception {
 
         Point2D p = new Point2D(12, -18);
         Point2D expected = new Point2D(
@@ -1113,14 +1348,27 @@ public void testInverseTransformPoint2d() throws Exception {
         }
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testInverseTransformNullPoint2D()
-            throws NonInvertibleTransformException {
-        t.inverseTransform((Point2D) null);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testInverseTransformNullPoint2D(Transform t,
+                                                Transform it,
+                                                boolean is2d,
+                                                boolean isIdentity,
+                                                boolean isInvertible,
+                                                Class<?> inverseType) throws NonInvertibleTransformException {
+        assertThrows(NullPointerException.class, () -> {
+            t.inverseTransform((Point2D) null);
+        });
     }
 
-    @Test
-    public void testInverseDeltaTransformPoint3d() throws Exception {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testInverseDeltaTransformPoint3d(Transform t,
+                                                 Transform it,
+                                                 boolean is2d,
+                                                 boolean isIdentity,
+                                                 boolean isInvertible,
+                                                 Class<?> inverseType) throws Exception {
         Point3D p = new Point3D(12, -18, 30);
         Point3D expected = new Point3D(
             it.getMxx() * 12 - it.getMxy() * 18 + it.getMxz() * 30,
@@ -1156,14 +1404,27 @@ public void testInverseDeltaTransformPoint3d() throws Exception {
         }
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testInverseDeltaTransformNullPoint3D()
-            throws NonInvertibleTransformException {
-        t.inverseDeltaTransform((Point3D) null);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testInverseDeltaTransformNullPoint3D(Transform t,
+                                                     Transform it,
+                                                     boolean is2d,
+                                                     boolean isIdentity,
+                                                     boolean isInvertible,
+                                                     Class<?> inverseType) throws NonInvertibleTransformException {
+        assertThrows(NullPointerException.class, () -> {
+            t.inverseDeltaTransform((Point3D) null);
+        });
     }
 
-    @Test
-    public void testInverseDeltaTransformPoint2d() throws Exception {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testInverseDeltaTransformPoint2d(Transform t,
+                                                 Transform it,
+                                                 boolean is2d,
+                                                 boolean isIdentity,
+                                                 boolean isInvertible,
+                                                 Class<?> inverseType) throws Exception {
 
         Point2D p = new Point2D(12, -18);
         Point2D expected = new Point2D(
@@ -1211,14 +1472,28 @@ public void testInverseDeltaTransformPoint2d() throws Exception {
         }
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testInverseDeltaTransformNullPoint2D()
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testInverseDeltaTransformNullPoint2D(Transform t,
+                                                     Transform it,
+                                                     boolean is2d,
+                                                     boolean isIdentity,
+                                                     boolean isInvertible,
+                                                     Class<?> inverseType)
             throws NonInvertibleTransformException {
-        t.inverseDeltaTransform((Point2D) null);
+        assertThrows(NullPointerException.class, () -> {
+            t.inverseDeltaTransform((Point2D) null);
+        });
     }
 
-    @Test
-    public void testInverseTransformBounds() throws Exception {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testInverseTransformBounds(Transform t,
+                                           Transform it,
+                                           boolean is2d,
+                                           boolean isIdentity,
+                                           boolean isInvertible,
+                                           Class<?> inverseType) throws Exception {
         Bounds result = null;
         try {
             result = t.inverseTransform(new BoundingBox(10, 11, 12, 13, 14, 15));
@@ -1267,14 +1542,27 @@ public void testInverseTransformBounds() throws Exception {
         }
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testInverseTransformNullBounds()
-            throws NonInvertibleTransformException {
-        t.inverseTransform((Bounds) null);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testInverseTransformNullBounds(Transform t,
+                                               Transform it,
+                                               boolean is2d,
+                                               boolean isIdentity,
+                                               boolean isInvertible,
+                                               Class<?> inverseType) throws NonInvertibleTransformException {
+        assertThrows(NullPointerException.class, () -> {
+            t.inverseTransform((Bounds) null);
+        });
     }
 
-    @Test
-    public void testInverseTransform2DPoints() throws Exception {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testInverseTransform2DPoints(Transform t,
+                                             Transform it,
+                                             boolean is2d,
+                                             boolean isIdentity,
+                                             boolean isInvertible,
+                                             Class<?> inverseType) throws Exception {
         double[] srcPts = new double[] { 0, 1, 2, 3, 4, 5, 6 };
         double[] dstPts = new double[] { 1, 2, 3, 4, 5, 6 };
 
@@ -1312,26 +1600,53 @@ public void testInverseTransform2DPoints() throws Exception {
         }
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testInverseTransform2DPointsBothPtsNull()
-            throws NonInvertibleTransformException {
-        t.inverseTransform2DPoints(null, 2, null, 0, 0);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testInverseTransform2DPointsBothPtsNull(Transform t,
+                                                        Transform it,
+                                                        boolean is2d,
+                                                        boolean isIdentity,
+                                                        boolean isInvertible,
+                                                        Class<?> inverseType) throws NonInvertibleTransformException {
+        assertThrows(NullPointerException.class, () -> {
+            t.inverseTransform2DPoints(null, 2, null, 0, 0);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testInverseTransform2DPointsSrcPtsNull()
-            throws NonInvertibleTransformException {
-        t.inverseTransform2DPoints(null, 2, new double[] { 1, 2, 3 }, 0, 0);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testInverseTransform2DPointsSrcPtsNull(Transform t,
+                                                       Transform it,
+                                                       boolean is2d,
+                                                       boolean isIdentity,
+                                                       boolean isInvertible,
+                                                       Class<?> inverseType) throws NonInvertibleTransformException {
+        assertThrows(NullPointerException.class, () -> {
+            t.inverseTransform2DPoints(null, 2, new double[] { 1, 2, 3 }, 0, 0);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testInverseTransform2DPointsDstPtsNull()
-            throws NonInvertibleTransformException {
-        t.inverseTransform2DPoints(new double[] { 1, 2, 3, 4 }, 2, null, 0, 0);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testInverseTransform2DPointsDstPtsNull(Transform t,
+                                                       Transform it,
+                                                       boolean is2d,
+                                                       boolean isIdentity,
+                                                       boolean isInvertible,
+                                                       Class<?> inverseType) throws NonInvertibleTransformException {
+        assertThrows(NullPointerException.class, () -> {
+            t.inverseTransform2DPoints(new double[] { 1, 2, 3, 4 }, 2, null, 0, 0);
+        });
     }
 
-    @Test
-    public void testInverseTransform2DPointsWithOverlap() throws Exception {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testInverseTransform2DPointsWithOverlap(Transform t,
+                                                        Transform it,
+                                                        boolean is2d,
+                                                        boolean isIdentity,
+                                                        boolean isInvertible,
+                                                        Class<?> inverseType) throws Exception {
         double[] srcPts = new double[] { 0, 1, 2, 3, 4, 5, 6, 7, 8 };
 
         Point2D expected1 = new Point2D(
@@ -1370,44 +1685,66 @@ public void testInverseTransform2DPointsWithOverlap() throws Exception {
         }
     }
 
-    @Test(expected=IndexOutOfBoundsException.class)
-    public void testInverseTransform2DPointsSrcOut() throws Exception {
-        double[] srcPts = new double[] { 0, 1, 2, 3, 4, 5, 6, 7 };
-        double[] dstPts = new double[] { 1, 2, 3, 4, 5, 6 };
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testInverseTransform2DPointsSrcOut(Transform t,
+                                                   Transform it,
+                                                   boolean is2d,
+                                                   boolean isIdentity,
+                                                   boolean isInvertible,
+                                                   Class<?> inverseType) throws Exception {
+        assertThrows(IndexOutOfBoundsException.class, () -> {
+            double[] srcPts = new double[] { 0, 1, 2, 3, 4, 5, 6, 7 };
+            double[] dstPts = new double[] { 1, 2, 3, 4, 5, 6 };
 
-        try {
-            t.inverseTransform2DPoints(srcPts, 3, dstPts, 0, 3);
-        } catch (IllegalStateException e) {
-            if (!is2d) {
-                throw new IndexOutOfBoundsException("expected result");
-            }
-        } catch (NonInvertibleTransformException e) {
-            if (!isInvertible) {
-                throw new IndexOutOfBoundsException("expected result");
+            try {
+                t.inverseTransform2DPoints(srcPts, 3, dstPts, 0, 3);
+            } catch (IllegalStateException e) {
+                if (!is2d) {
+                    throw new IndexOutOfBoundsException("expected result");
+                }
+            } catch (NonInvertibleTransformException e) {
+                if (!isInvertible) {
+                    throw new IndexOutOfBoundsException("expected result");
+                }
             }
-        }
+        });
     }
 
-    @Test(expected=IndexOutOfBoundsException.class)
-    public void testInverseTransform2DPointsDstOut() throws Exception {
-        double[] srcPts = new double[] { 0, 1, 2, 3, 4, 5, 6, 7 };
-        double[] dstPts = new double[] { 1 };
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testInverseTransform2DPointsDstOut(Transform t,
+                                                   Transform it,
+                                                   boolean is2d,
+                                                   boolean isIdentity,
+                                                   boolean isInvertible,
+                                                   Class<?> inverseType) throws Exception {
+        assertThrows(IndexOutOfBoundsException.class, () -> {
+            double[] srcPts = new double[] { 0, 1, 2, 3, 4, 5, 6, 7 };
+            double[] dstPts = new double[] { 1 };
 
-        try {
-            t.inverseTransform2DPoints(srcPts, 1, dstPts, 0, 2);
-        } catch (IllegalStateException e) {
-            if (!is2d) {
-                throw new IndexOutOfBoundsException("expected result");
-            }
-        } catch (NonInvertibleTransformException e) {
-            if (!isInvertible) {
-                throw new IndexOutOfBoundsException("expected result");
+            try {
+                t.inverseTransform2DPoints(srcPts, 1, dstPts, 0, 2);
+            } catch (IllegalStateException e) {
+                if (!is2d) {
+                    throw new IndexOutOfBoundsException("expected result");
+                }
+            } catch (NonInvertibleTransformException e) {
+                if (!isInvertible) {
+                    throw new IndexOutOfBoundsException("expected result");
+                }
             }
-        }
+        });
     }
 
-    @Test
-    public void testInverseTransform3DPoints() throws Exception {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testInverseTransform3DPoints(Transform t,
+                                             Transform it,
+                                             boolean is2d,
+                                             boolean isIdentity,
+                                             boolean isInvertible,
+                                             Class<?> inverseType) throws Exception {
         double[] srcPts = new double[] { 0, 1, 2, 3, 4, 5, 6, 7, 8 };
         double[] dstPts = new double[] { 1, 2, 3, 4, 5, 6, 7, 8 };
 
@@ -1442,26 +1779,53 @@ public void testInverseTransform3DPoints() throws Exception {
         }
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testInverseTransform3DPointsBothPtsNull()
-            throws NonInvertibleTransformException {
-        t.inverseTransform3DPoints(null, 2, null, 0, 0);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testInverseTransform3DPointsBothPtsNull(Transform t,
+                                                        Transform it,
+                                                        boolean is2d,
+                                                        boolean isIdentity,
+                                                        boolean isInvertible,
+                                                        Class<?> inverseType) throws NonInvertibleTransformException {
+        assertThrows(NullPointerException.class, () -> {
+            t.inverseTransform3DPoints(null, 2, null, 0, 0);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testInverseTransform3DPointsSrcPtsNull()
-            throws NonInvertibleTransformException {
-        t.inverseTransform3DPoints(null, 2, new double[] { 1, 2, 3 }, 0, 0);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testInverseTransform3DPointsSrcPtsNull(Transform t,
+                                                       Transform it,
+                                                       boolean is2d,
+                                                       boolean isIdentity,
+                                                       boolean isInvertible,
+                                                       Class<?> inverseType) throws NonInvertibleTransformException {
+        assertThrows(NullPointerException.class, () -> {
+            t.inverseTransform3DPoints(null, 2, new double[] { 1, 2, 3 }, 0, 0);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testInverseTransform3DPointsDstPtsNull()
-            throws NonInvertibleTransformException {
-        t.inverseTransform3DPoints(new double[] { 1, 2, 3, 4 }, 2, null, 0, 0);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testInverseTransform3DPointsDstPtsNull(Transform t,
+                                                       Transform it,
+                                                       boolean is2d,
+                                                       boolean isIdentity,
+                                                       boolean isInvertible,
+                                                       Class<?> inverseType) throws NonInvertibleTransformException {
+        assertThrows(NullPointerException.class, () -> {
+            t.inverseTransform3DPoints(new double[] { 1, 2, 3, 4 }, 2, null, 0, 0);
+        });
     }
 
-    @Test
-    public void testInverseTransform3DPointsWithOverlap() throws Exception {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testInverseTransform3DPointsWithOverlap(Transform t,
+                          Transform it,
+                          boolean is2d,
+                          boolean isIdentity,
+                          boolean isInvertible,
+                          Class<?> inverseType) throws Exception {
         double[] srcPts = new double[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
 
         Point3D expected1 = new Point3D(
@@ -1497,41 +1861,69 @@ public void testInverseTransform3DPointsWithOverlap() throws Exception {
         }
     }
 
-    @Test(expected=IndexOutOfBoundsException.class)
-    public void testInverseTransform3DPointsSrcOut() throws Exception {
-        double[] srcPts = new double[] { 0, 1, 2, 3, 4, 5, 6, 7 };
-        double[] dstPts = new double[] { 1, 2, 3, 4, 5, 6 };
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testInverseTransform3DPointsSrcOut(Transform t,
+                                                   Transform it,
+                                                   boolean is2d,
+                                                   boolean isIdentity,
+                                                   boolean isInvertible,
+                                                   Class<?> inverseType) throws Exception {
+        assertThrows(IndexOutOfBoundsException.class, () -> {
+            double[] srcPts = new double[] { 0, 1, 2, 3, 4, 5, 6, 7 };
+            double[] dstPts = new double[] { 1, 2, 3, 4, 5, 6 };
 
-        try {
-            t.inverseTransform3DPoints(srcPts, 6, dstPts, 0, 1);
-        } catch (NonInvertibleTransformException e) {
-            if (!isInvertible) {
-                throw new IndexOutOfBoundsException("expected result");
+            try {
+                t.inverseTransform3DPoints(srcPts, 6, dstPts, 0, 1);
+            } catch (NonInvertibleTransformException e) {
+                if (!isInvertible) {
+                    throw new IndexOutOfBoundsException("expected result");
+                }
             }
-        }
+        });
     }
 
-    @Test(expected=IndexOutOfBoundsException.class)
-    public void testInverseTransform3DPointsDstOut() throws Exception {
-        double[] srcPts = new double[] { 0, 1, 2, 3, 4, 5, 6, 7 };
-        double[] dstPts = new double[] { 1 };
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testInverseTransform3DPointsDstOut(Transform t,
+                                                   Transform it,
+                                                   boolean is2d,
+                                                   boolean isIdentity,
+                                                   boolean isInvertible,
+                                                   Class<?> inverseType) throws Exception {
+        assertThrows(IndexOutOfBoundsException.class, () -> {
+            double[] srcPts = new double[] { 0, 1, 2, 3, 4, 5, 6, 7 };
+            double[] dstPts = new double[] { 1 };
 
-        try {
-            t.inverseTransform3DPoints(srcPts, 1, dstPts, 0, 1);
-        } catch (NonInvertibleTransformException e) {
-            if (!isInvertible) {
-                throw new IndexOutOfBoundsException("expected result");
+            try {
+                t.inverseTransform3DPoints(srcPts, 1, dstPts, 0, 1);
+            } catch (NonInvertibleTransformException e) {
+                if (!isInvertible) {
+                    throw new IndexOutOfBoundsException("expected result");
+                }
             }
-        }
+        });
     }
 
-    @Test
-    public void testDeterminant() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testDeterminant(Transform t,
+                                Transform it,
+                                boolean is2d,
+                                boolean isIdentity,
+                                boolean isInvertible,
+                                Class<?> inverseType) {
         assertEquals(TransformHelper.determinant(t), t.determinant(), 0.00001);
     }
 
-    @Test
-    public void testIsType2D() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testIsType2D(Transform t,
+                             Transform it,
+                             boolean is2d,
+                             boolean isIdentity,
+                             boolean isInvertible,
+                             Class<?> inverseType) {
         Transform clone = t.clone();
 
         if (is2d) {
@@ -1547,16 +1939,28 @@ public void testIsType2D() {
         }
     }
 
-    @Test
-    public void testType2DProperty() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testType2DProperty(Transform t,
+                                   Transform it,
+                                   boolean is2d,
+                                   boolean isIdentity,
+                                   boolean isInvertible,
+                                   Class<?> inverseType) {
         Transform clone = t.clone();
 
         assertEquals("type2D", clone.type2DProperty().getName());
         assertSame(clone, clone.type2DProperty().getBean());
     }
 
-    @Test
-    public void testType2DPropertyGetter() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testType2DPropertyGetter(Transform t,
+                                         Transform it,
+                                         boolean is2d,
+                                         boolean isIdentity,
+                                         boolean isInvertible,
+                                         Class<?> inverseType) {
         Transform clone = t.clone();
 
         if (is2d) {
@@ -1576,8 +1980,14 @@ public void testType2DPropertyGetter() {
         }
     }
 
-    @Test
-    public void testType2DPropertyInvalidation() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testType2DPropertyInvalidation(Transform t,
+                                               Transform it,
+                                               boolean is2d,
+                                               boolean isIdentity,
+                                               boolean isInvertible,
+                                               Class<?> inverseType) {
         final Transform clone = t.clone();
 
         InvalidationListener l =
@@ -1616,8 +2026,14 @@ public void testType2DPropertyInvalidation() {
         }
     }
 
-    @Test
-    public void testType2DPropertyChange() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testType2DPropertyChange(Transform t,
+                                         Transform it,
+                                         boolean is2d,
+                                         boolean isIdentity,
+                                         boolean isInvertible,
+                                         Class<?> inverseType) {
         final Transform clone = t.clone();
 
         ChangeListener<Boolean> l =
@@ -1674,8 +2090,14 @@ public void testType2DPropertyChange() {
         }
     }
 
-    @Test
-    public void testIsIdentity() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testIsIdentity(Transform t,
+                          Transform it,
+                          boolean is2d,
+                          boolean isIdentity,
+                          boolean isInvertible,
+                          Class<?> inverseType) {
         Transform clone = t.clone();
 
         if (isIdentity) {
@@ -1691,16 +2113,28 @@ public void testIsIdentity() {
         }
     }
 
-    @Test
-    public void testIdentityProperty() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testIdentityProperty(Transform t,
+                          Transform it,
+                          boolean is2d,
+                          boolean isIdentity,
+                          boolean isInvertible,
+                          Class<?> inverseType) {
         Transform clone = t.clone();
 
         assertEquals("identity", clone.identityProperty().getName());
         assertSame(clone, clone.identityProperty().getBean());
     }
 
-    @Test
-    public void testIdentityPropertyGetter() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testIdentityPropertyGetter(Transform t,
+                          Transform it,
+                          boolean is2d,
+                          boolean isIdentity,
+                          boolean isInvertible,
+                          Class<?> inverseType) {
         Transform clone = t.clone();
 
         if (isIdentity) {
@@ -1720,8 +2154,14 @@ public void testIdentityPropertyGetter() {
         }
     }
 
-    @Test
-    public void testIdentityPropertyInvalidation() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testIdentityPropertyInvalidation(Transform t,
+                          Transform it,
+                          boolean is2d,
+                          boolean isIdentity,
+                          boolean isInvertible,
+                          Class<?> inverseType) {
         final Transform clone = t.clone();
 
         InvalidationListener l =
@@ -1765,8 +2205,14 @@ public void testIdentityPropertyInvalidation() {
         }
     }
 
-    @Test
-    public void testIdentityPropertyChange() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testIdentityPropertyChange(Transform t,
+                          Transform it,
+                          boolean is2d,
+                          boolean isIdentity,
+                          boolean isInvertible,
+                          Class<?> inverseType) {
         final Transform clone = t.clone();
 
         ChangeListener<Boolean> l =
@@ -1818,8 +2264,14 @@ public void testIdentityPropertyChange() {
         }
     }
 
-    @Test
-    public void testSimilarTo() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testSimilarTo(Transform t,
+                          Transform it,
+                          boolean is2d,
+                          boolean isIdentity,
+                          boolean isInvertible,
+                          Class<?> inverseType) {
         Transform clone = t.clone();
 
         assertTrue(t.similarTo(clone, new BoundingBox(-10000, -10000, 10000, 10000), 1e-10));
@@ -1846,17 +2298,33 @@ public void testSimilarTo() {
         }
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testSimilarToNullTransform() {
-        t.similarTo(null, new BoundingBox(0, 0, 0, 1, 1, 1), 0);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testSimilarToNullTransform(Transform t,
+                          Transform it,
+                          boolean is2d,
+                          boolean isIdentity,
+                          boolean isInvertible,
+                          Class<?> inverseType) {
+        assertThrows(NullPointerException.class, () -> {
+            t.similarTo(null, new BoundingBox(0, 0, 0, 1, 1, 1), 0);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testSimilarToNullRange() {
-        t.similarTo(t, null, 0);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testSimilarToNullRange(Transform t,
+                          Transform it,
+                          boolean is2d,
+                          boolean isIdentity,
+                          boolean isInvertible,
+                          Class<?> inverseType) {
+        assertThrows(NullPointerException.class, () -> {
+            t.similarTo(t, null, 0);
+        });
     }
 
-    private void assertGetElement(MatrixType type, int row, int col,
+    private void assertGetElement(Transform t, MatrixType type, int row, int col,
             double expected, boolean iae, boolean iob) {
         double res = Double.MIN_VALUE;
 
@@ -1884,72 +2352,86 @@ private void assertGetElement(MatrixType type, int row, int col,
         assertEquals(expected, res, 1e-100);
     }
 
-    @Test
-    public void testGetElement() {
-        assertGetElement(MatrixType.MT_2D_2x3, 0, 0, t.getMxx(), !is2d, false);
-        assertGetElement(MatrixType.MT_2D_2x3, 0, 1, t.getMxy(), !is2d, false);
-        assertGetElement(MatrixType.MT_2D_2x3, 0, 2, t.getTx(), !is2d, false);
-        assertGetElement(MatrixType.MT_2D_2x3, 1, 0, t.getMyx(), !is2d, false);
-        assertGetElement(MatrixType.MT_2D_2x3, 1, 1, t.getMyy(), !is2d, false);
-        assertGetElement(MatrixType.MT_2D_2x3, 1, 2, t.getTy(), !is2d, false);
-        assertGetElement(MatrixType.MT_2D_2x3, -1, 0, 0, !is2d, true);
-        assertGetElement(MatrixType.MT_2D_2x3, 2, 1, 0, !is2d, true);
-        assertGetElement(MatrixType.MT_2D_2x3, 1, 3, 0, !is2d, true);
-        assertGetElement(MatrixType.MT_2D_2x3, 1, -1, 0, !is2d, true);
-        assertGetElement(MatrixType.MT_2D_3x3, 0, 0, t.getMxx(), !is2d, false);
-        assertGetElement(MatrixType.MT_2D_3x3, 0, 1, t.getMxy(), !is2d, false);
-        assertGetElement(MatrixType.MT_2D_3x3, 0, 2, t.getTx(), !is2d, false);
-        assertGetElement(MatrixType.MT_2D_3x3, 1, 0, t.getMyx(), !is2d, false);
-        assertGetElement(MatrixType.MT_2D_3x3, 1, 1, t.getMyy(), !is2d, false);
-        assertGetElement(MatrixType.MT_2D_3x3, 1, 2, t.getTy(), !is2d, false);
-        assertGetElement(MatrixType.MT_2D_3x3, 2, 0, 0, !is2d, false);
-        assertGetElement(MatrixType.MT_2D_3x3, 2, 1, 0, !is2d, false);
-        assertGetElement(MatrixType.MT_2D_3x3, 2, 2, 1, !is2d, false);
-        assertGetElement(MatrixType.MT_2D_3x3, -1, 0, 0, !is2d, true);
-        assertGetElement(MatrixType.MT_2D_3x3, 3, 1, 0, !is2d, true);
-        assertGetElement(MatrixType.MT_2D_3x3, 1, 3, 0, !is2d, true);
-        assertGetElement(MatrixType.MT_2D_3x3, 1, -1, 0, !is2d, true);
-        assertGetElement(MatrixType.MT_3D_3x4, 0, 0, t.getMxx(), false, false);
-        assertGetElement(MatrixType.MT_3D_3x4, 0, 1, t.getMxy(), false, false);
-        assertGetElement(MatrixType.MT_3D_3x4, 0, 2, t.getMxz(), false, false);
-        assertGetElement(MatrixType.MT_3D_3x4, 0, 3, t.getTx(), false, false);
-        assertGetElement(MatrixType.MT_3D_3x4, 1, 0, t.getMyx(), false, false);
-        assertGetElement(MatrixType.MT_3D_3x4, 1, 1, t.getMyy(), false, false);
-        assertGetElement(MatrixType.MT_3D_3x4, 1, 2, t.getMyz(), false, false);
-        assertGetElement(MatrixType.MT_3D_3x4, 1, 3, t.getTy(), false, false);
-        assertGetElement(MatrixType.MT_3D_3x4, 2, 0, t.getMzx(), false, false);
-        assertGetElement(MatrixType.MT_3D_3x4, 2, 1, t.getMzy(), false, false);
-        assertGetElement(MatrixType.MT_3D_3x4, 2, 2, t.getMzz(), false, false);
-        assertGetElement(MatrixType.MT_3D_3x4, 2, 3, t.getTz(), false, false);
-        assertGetElement(MatrixType.MT_3D_3x4, -1, 0, 0, false, true);
-        assertGetElement(MatrixType.MT_3D_3x4, 3, 1, 0, false, true);
-        assertGetElement(MatrixType.MT_3D_3x4, 1, 4, 0, false, true);
-        assertGetElement(MatrixType.MT_3D_3x4, 1, -1, 0, false, true);
-        assertGetElement(MatrixType.MT_3D_4x4, 0, 0, t.getMxx(), false, false);
-        assertGetElement(MatrixType.MT_3D_4x4, 0, 1, t.getMxy(), false, false);
-        assertGetElement(MatrixType.MT_3D_4x4, 0, 2, t.getMxz(), false, false);
-        assertGetElement(MatrixType.MT_3D_4x4, 0, 3, t.getTx(), false, false);
-        assertGetElement(MatrixType.MT_3D_4x4, 1, 0, t.getMyx(), false, false);
-        assertGetElement(MatrixType.MT_3D_4x4, 1, 1, t.getMyy(), false, false);
-        assertGetElement(MatrixType.MT_3D_4x4, 1, 2, t.getMyz(), false, false);
-        assertGetElement(MatrixType.MT_3D_4x4, 1, 3, t.getTy(), false, false);
-        assertGetElement(MatrixType.MT_3D_4x4, 2, 0, t.getMzx(), false, false);
-        assertGetElement(MatrixType.MT_3D_4x4, 2, 1, t.getMzy(), false, false);
-        assertGetElement(MatrixType.MT_3D_4x4, 2, 2, t.getMzz(), false, false);
-        assertGetElement(MatrixType.MT_3D_4x4, 2, 3, t.getTz(), false, false);
-        assertGetElement(MatrixType.MT_3D_4x4, 3, 0, 0, false, false);
-        assertGetElement(MatrixType.MT_3D_4x4, 3, 1, 0, false, false);
-        assertGetElement(MatrixType.MT_3D_4x4, 3, 2, 0, false, false);
-        assertGetElement(MatrixType.MT_3D_4x4, 3, 3, 1, false, false);
-        assertGetElement(MatrixType.MT_3D_4x4, -1, 0, 0, false, true);
-        assertGetElement(MatrixType.MT_3D_4x4, 4, 1, 0, false, true);
-        assertGetElement(MatrixType.MT_3D_4x4, 1, 4, 0, false, true);
-        assertGetElement(MatrixType.MT_3D_4x4, 1, -1, 0, false, true);
-    }
-
-    @Test(expected=NullPointerException.class)
-    public void testGetElementNullType() {
-        t.getElement(null, 0, 0);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testGetElement(Transform t,
+                               Transform it,
+                               boolean is2d,
+                               boolean isIdentity,
+                               boolean isInvertible,
+                               Class<?> inverseType) {
+        assertGetElement(t, MatrixType.MT_2D_2x3, 0, 0, t.getMxx(), !is2d, false);
+        assertGetElement(t, MatrixType.MT_2D_2x3, 0, 1, t.getMxy(), !is2d, false);
+        assertGetElement(t, MatrixType.MT_2D_2x3, 0, 2, t.getTx(), !is2d, false);
+        assertGetElement(t, MatrixType.MT_2D_2x3, 1, 0, t.getMyx(), !is2d, false);
+        assertGetElement(t, MatrixType.MT_2D_2x3, 1, 1, t.getMyy(), !is2d, false);
+        assertGetElement(t, MatrixType.MT_2D_2x3, 1, 2, t.getTy(), !is2d, false);
+        assertGetElement(t, MatrixType.MT_2D_2x3, -1, 0, 0, !is2d, true);
+        assertGetElement(t, MatrixType.MT_2D_2x3, 2, 1, 0, !is2d, true);
+        assertGetElement(t, MatrixType.MT_2D_2x3, 1, 3, 0, !is2d, true);
+        assertGetElement(t, MatrixType.MT_2D_2x3, 1, -1, 0, !is2d, true);
+        assertGetElement(t, MatrixType.MT_2D_3x3, 0, 0, t.getMxx(), !is2d, false);
+        assertGetElement(t, MatrixType.MT_2D_3x3, 0, 1, t.getMxy(), !is2d, false);
+        assertGetElement(t, MatrixType.MT_2D_3x3, 0, 2, t.getTx(), !is2d, false);
+        assertGetElement(t, MatrixType.MT_2D_3x3, 1, 0, t.getMyx(), !is2d, false);
+        assertGetElement(t, MatrixType.MT_2D_3x3, 1, 1, t.getMyy(), !is2d, false);
+        assertGetElement(t, MatrixType.MT_2D_3x3, 1, 2, t.getTy(), !is2d, false);
+        assertGetElement(t, MatrixType.MT_2D_3x3, 2, 0, 0, !is2d, false);
+        assertGetElement(t, MatrixType.MT_2D_3x3, 2, 1, 0, !is2d, false);
+        assertGetElement(t, MatrixType.MT_2D_3x3, 2, 2, 1, !is2d, false);
+        assertGetElement(t, MatrixType.MT_2D_3x3, -1, 0, 0, !is2d, true);
+        assertGetElement(t, MatrixType.MT_2D_3x3, 3, 1, 0, !is2d, true);
+        assertGetElement(t, MatrixType.MT_2D_3x3, 1, 3, 0, !is2d, true);
+        assertGetElement(t, MatrixType.MT_2D_3x3, 1, -1, 0, !is2d, true);
+        assertGetElement(t, MatrixType.MT_3D_3x4, 0, 0, t.getMxx(), false, false);
+        assertGetElement(t, MatrixType.MT_3D_3x4, 0, 1, t.getMxy(), false, false);
+        assertGetElement(t, MatrixType.MT_3D_3x4, 0, 2, t.getMxz(), false, false);
+        assertGetElement(t, MatrixType.MT_3D_3x4, 0, 3, t.getTx(), false, false);
+        assertGetElement(t, MatrixType.MT_3D_3x4, 1, 0, t.getMyx(), false, false);
+        assertGetElement(t, MatrixType.MT_3D_3x4, 1, 1, t.getMyy(), false, false);
+        assertGetElement(t, MatrixType.MT_3D_3x4, 1, 2, t.getMyz(), false, false);
+        assertGetElement(t, MatrixType.MT_3D_3x4, 1, 3, t.getTy(), false, false);
+        assertGetElement(t, MatrixType.MT_3D_3x4, 2, 0, t.getMzx(), false, false);
+        assertGetElement(t, MatrixType.MT_3D_3x4, 2, 1, t.getMzy(), false, false);
+        assertGetElement(t, MatrixType.MT_3D_3x4, 2, 2, t.getMzz(), false, false);
+        assertGetElement(t, MatrixType.MT_3D_3x4, 2, 3, t.getTz(), false, false);
+        assertGetElement(t, MatrixType.MT_3D_3x4, -1, 0, 0, false, true);
+        assertGetElement(t, MatrixType.MT_3D_3x4, 3, 1, 0, false, true);
+        assertGetElement(t, MatrixType.MT_3D_3x4, 1, 4, 0, false, true);
+        assertGetElement(t, MatrixType.MT_3D_3x4, 1, -1, 0, false, true);
+        assertGetElement(t, MatrixType.MT_3D_4x4, 0, 0, t.getMxx(), false, false);
+        assertGetElement(t, MatrixType.MT_3D_4x4, 0, 1, t.getMxy(), false, false);
+        assertGetElement(t, MatrixType.MT_3D_4x4, 0, 2, t.getMxz(), false, false);
+        assertGetElement(t, MatrixType.MT_3D_4x4, 0, 3, t.getTx(), false, false);
+        assertGetElement(t, MatrixType.MT_3D_4x4, 1, 0, t.getMyx(), false, false);
+        assertGetElement(t, MatrixType.MT_3D_4x4, 1, 1, t.getMyy(), false, false);
+        assertGetElement(t, MatrixType.MT_3D_4x4, 1, 2, t.getMyz(), false, false);
+        assertGetElement(t, MatrixType.MT_3D_4x4, 1, 3, t.getTy(), false, false);
+        assertGetElement(t, MatrixType.MT_3D_4x4, 2, 0, t.getMzx(), false, false);
+        assertGetElement(t, MatrixType.MT_3D_4x4, 2, 1, t.getMzy(), false, false);
+        assertGetElement(t, MatrixType.MT_3D_4x4, 2, 2, t.getMzz(), false, false);
+        assertGetElement(t, MatrixType.MT_3D_4x4, 2, 3, t.getTz(), false, false);
+        assertGetElement(t, MatrixType.MT_3D_4x4, 3, 0, 0, false, false);
+        assertGetElement(t, MatrixType.MT_3D_4x4, 3, 1, 0, false, false);
+        assertGetElement(t, MatrixType.MT_3D_4x4, 3, 2, 0, false, false);
+        assertGetElement(t, MatrixType.MT_3D_4x4, 3, 3, 1, false, false);
+        assertGetElement(t, MatrixType.MT_3D_4x4, -1, 0, 0, false, true);
+        assertGetElement(t, MatrixType.MT_3D_4x4, 4, 1, 0, false, true);
+        assertGetElement(t, MatrixType.MT_3D_4x4, 1, 4, 0, false, true);
+        assertGetElement(t, MatrixType.MT_3D_4x4, 1, -1, 0, false, true);
+    }
+
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testGetElementNullType(Transform t,
+                                       Transform it,
+                                       boolean is2d,
+                                       boolean isIdentity,
+                                       boolean isInvertible,
+                                       Class<?> inverseType) {
+        assertThrows(NullPointerException.class, () -> {
+            t.getElement(null, 0, 0);
+        });
     }
 
     private void assertArray(MatrixType type, double[] a, Transform t) {
@@ -1990,7 +2472,7 @@ private void assertArray(MatrixType type, double[] a, Transform t) {
         }
     }
 
-    private void assertToArray2D(MatrixType type, double[] tmp,
+    private void assertToArray2D(Transform t, boolean is2d, MatrixType type, double[] tmp,
             boolean shouldPass, boolean shouldUse) {
         double[] a = null;
         try {
@@ -2017,7 +2499,7 @@ private void assertToArray2D(MatrixType type, double[] tmp,
         }
     }
 
-    private void assertToArray3D(MatrixType type, double[] tmp,
+    private void assertToArray3D(Transform t, MatrixType type, double[] tmp,
             boolean shouldPass, boolean shouldUse) {
         double[] a = null;
 
@@ -2034,38 +2516,60 @@ private void assertToArray3D(MatrixType type, double[] tmp,
         assertArray(type, a, t);
     }
 
-    @Test
-    public void testToArray() {
-
-        assertToArray2D(MatrixType.MT_2D_2x3, null, false, false);
-        assertToArray2D(MatrixType.MT_2D_2x3, null, true, false);
-        assertToArray2D(MatrixType.MT_2D_2x3, new double[4], true, false);
-        assertToArray2D(MatrixType.MT_2D_2x3, new double[6], true, true);
-
-        assertToArray2D(MatrixType.MT_2D_3x3, null, false, false);
-        assertToArray2D(MatrixType.MT_2D_3x3, null, true, false);
-        assertToArray2D(MatrixType.MT_2D_3x3, new double[8], true, false);
-        assertToArray2D(MatrixType.MT_2D_3x3, new double[9], true, true);
-
-        assertToArray3D(MatrixType.MT_3D_3x4, null, false, false);
-        assertToArray3D(MatrixType.MT_3D_3x4, null, true, false);
-        assertToArray3D(MatrixType.MT_3D_3x4, new double[11], true, false);
-        assertToArray3D(MatrixType.MT_3D_3x4, new double[12], true, true);
-
-        assertToArray3D(MatrixType.MT_3D_4x4, null, false, false);
-        assertToArray3D(MatrixType.MT_3D_4x4, null, true, false);
-        assertToArray3D(MatrixType.MT_3D_4x4, new double[15], true, false);
-        assertToArray3D(MatrixType.MT_3D_4x4, new double[16], true, true);
-    }
-
-    @Test(expected=NullPointerException.class)
-    public void testToArrayNullType1() {
-        t.toArray(null);
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testToArray(Transform t,
+                            Transform it,
+                            boolean is2d,
+                            boolean isIdentity,
+                            boolean isInvertible,
+                            Class<?> inverseType) {
+
+        assertToArray2D(t, is2d, MatrixType.MT_2D_2x3, null, false, false);
+        assertToArray2D(t, is2d, MatrixType.MT_2D_2x3, null, true, false);
+        assertToArray2D(t, is2d, MatrixType.MT_2D_2x3, new double[4], true, false);
+        assertToArray2D(t, is2d, MatrixType.MT_2D_2x3, new double[6], true, true);
+
+        assertToArray2D(t, is2d, MatrixType.MT_2D_3x3, null, false, false);
+        assertToArray2D(t, is2d, MatrixType.MT_2D_3x3, null, true, false);
+        assertToArray2D(t, is2d, MatrixType.MT_2D_3x3, new double[8], true, false);
+        assertToArray2D(t, is2d, MatrixType.MT_2D_3x3, new double[9], true, true);
+
+        assertToArray3D(t, MatrixType.MT_3D_3x4, null, false, false);
+        assertToArray3D(t, MatrixType.MT_3D_3x4, null, true, false);
+        assertToArray3D(t, MatrixType.MT_3D_3x4, new double[11], true, false);
+        assertToArray3D(t, MatrixType.MT_3D_3x4, new double[12], true, true);
+
+        assertToArray3D(t, MatrixType.MT_3D_4x4, null, false, false);
+        assertToArray3D(t, MatrixType.MT_3D_4x4, null, true, false);
+        assertToArray3D(t, MatrixType.MT_3D_4x4, new double[15], true, false);
+        assertToArray3D(t, MatrixType.MT_3D_4x4, new double[16], true, true);
+    }
+
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testToArrayNullType1(Transform t,
+                                     Transform it,
+                                     boolean is2d,
+                                     boolean isIdentity,
+                                     boolean isInvertible,
+                                     Class<?> inverseType) {
+        assertThrows(NullPointerException.class, () -> {
+            t.toArray(null);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
-    public void testToArrayNullType2() {
-        t.toArray(null, new double[] {});
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testToArrayNullType2(Transform t,
+                                     Transform it,
+                                     boolean is2d,
+                                     boolean isIdentity,
+                                     boolean isInvertible,
+                                     Class<?> inverseType) {
+        assertThrows(NullPointerException.class, () -> {
+            t.toArray(null, new double[] {});
+        });
     }
 
     private void assertRow(MatrixType type, int row, double[] a, Transform t) {
@@ -2126,7 +2630,7 @@ private void assertRow(MatrixType type, int row, double[] a, Transform t) {
         fail("Should have thrown IOB");
     }
 
-    private void assertRow2D(MatrixType type, int row, double[] tmp,
+    private void assertRow2D(Transform t, boolean is2d, MatrixType type, int row, double[] tmp,
             boolean shouldPass, boolean shouldUse, boolean iob) {
         double[] a = null;
         try {
@@ -2159,7 +2663,7 @@ private void assertRow2D(MatrixType type, int row, double[] tmp,
         }
     }
 
-    private void assertRow3D(MatrixType type, int row, double[] tmp,
+    private void assertRow3D(Transform t, MatrixType type, int row, double[] tmp,
             boolean shouldPass, boolean shouldUse, boolean iob) {
         double[] a = null;
         try {
@@ -2185,77 +2689,99 @@ private void assertRow3D(MatrixType type, int row, double[] tmp,
         }
     }
 
-    @Test
-    public void testRow() {
-        assertRow2D(MatrixType.MT_2D_2x3, 0, null, false, false, false);
-        assertRow2D(MatrixType.MT_2D_2x3, 0, null, true, false, false);
-        assertRow2D(MatrixType.MT_2D_2x3, 0, new double[2], true, false, false);
-        assertRow2D(MatrixType.MT_2D_2x3, 0, new double[3], true, true, false);
-        assertRow2D(MatrixType.MT_2D_2x3, 1, null, false, false, false);
-        assertRow2D(MatrixType.MT_2D_2x3, 1, null, true, false, false);
-        assertRow2D(MatrixType.MT_2D_2x3, 1, new double[2], true, false, false);
-        assertRow2D(MatrixType.MT_2D_2x3, 1, new double[3], true, true, false);
-        assertRow2D(MatrixType.MT_2D_2x3, -1, null, true, false, true);
-        assertRow2D(MatrixType.MT_2D_2x3, 2, null, false, false, true);
-
-        assertRow2D(MatrixType.MT_2D_3x3, 0, null, false, false, false);
-        assertRow2D(MatrixType.MT_2D_3x3, 0, null, true, false, false);
-        assertRow2D(MatrixType.MT_2D_3x3, 0, new double[2], true, false, false);
-        assertRow2D(MatrixType.MT_2D_3x3, 0, new double[3], true, true, false);
-        assertRow2D(MatrixType.MT_2D_3x3, 1, null, false, false, false);
-        assertRow2D(MatrixType.MT_2D_3x3, 1, null, true, false, false);
-        assertRow2D(MatrixType.MT_2D_3x3, 1, new double[2], true, false, false);
-        assertRow2D(MatrixType.MT_2D_3x3, 1, new double[3], true, true, false);
-        assertRow2D(MatrixType.MT_2D_3x3, 2, null, false, false, false);
-        assertRow2D(MatrixType.MT_2D_3x3, 2, null, true, false, false);
-        assertRow2D(MatrixType.MT_2D_3x3, 2, new double[2], true, false, false);
-        assertRow2D(MatrixType.MT_2D_3x3, 2, new double[3], true, true, false);
-        assertRow2D(MatrixType.MT_2D_3x3, -1, null, true, false, true);
-        assertRow2D(MatrixType.MT_2D_3x3, 3, null, false, false, true);
-
-        assertRow3D(MatrixType.MT_3D_3x4, 0, null, false, false, false);
-        assertRow3D(MatrixType.MT_3D_3x4, 0, null, true, false, false);
-        assertRow3D(MatrixType.MT_3D_3x4, 0, new double[3], true, false, false);
-        assertRow3D(MatrixType.MT_3D_3x4, 0, new double[4], true, true, false);
-        assertRow3D(MatrixType.MT_3D_3x4, 1, null, false, false, false);
-        assertRow3D(MatrixType.MT_3D_3x4, 1, null, true, false, false);
-        assertRow3D(MatrixType.MT_3D_3x4, 1, new double[3], true, false, false);
-        assertRow3D(MatrixType.MT_3D_3x4, 1, new double[4], true, true, false);
-        assertRow3D(MatrixType.MT_3D_3x4, 2, null, false, false, false);
-        assertRow3D(MatrixType.MT_3D_3x4, 2, null, true, false, false);
-        assertRow3D(MatrixType.MT_3D_3x4, 2, new double[3], true, false, false);
-        assertRow3D(MatrixType.MT_3D_3x4, 2, new double[4], true, true, false);
-        assertRow3D(MatrixType.MT_3D_3x4, -1, null, true, false, true);
-        assertRow3D(MatrixType.MT_3D_3x4, 3, null, false, false, true);
-
-        assertRow3D(MatrixType.MT_3D_4x4, 0, null, false, false, false);
-        assertRow3D(MatrixType.MT_3D_4x4, 0, null, true, false, false);
-        assertRow3D(MatrixType.MT_3D_4x4, 0, new double[3], true, false, false);
-        assertRow3D(MatrixType.MT_3D_4x4, 0, new double[4], true, true, false);
-        assertRow3D(MatrixType.MT_3D_4x4, 1, null, false, false, false);
-        assertRow3D(MatrixType.MT_3D_4x4, 1, null, true, false, false);
-        assertRow3D(MatrixType.MT_3D_4x4, 1, new double[3], true, false, false);
-        assertRow3D(MatrixType.MT_3D_4x4, 1, new double[4], true, true, false);
-        assertRow3D(MatrixType.MT_3D_4x4, 2, null, false, false, false);
-        assertRow3D(MatrixType.MT_3D_4x4, 2, null, true, false, false);
-        assertRow3D(MatrixType.MT_3D_4x4, 2, new double[3], true, false, false);
-        assertRow3D(MatrixType.MT_3D_4x4, 2, new double[4], true, true, false);
-        assertRow3D(MatrixType.MT_3D_4x4, 3, null, false, false, false);
-        assertRow3D(MatrixType.MT_3D_4x4, 3, null, true, false, false);
-        assertRow3D(MatrixType.MT_3D_4x4, 3, new double[3], true, false, false);
-        assertRow3D(MatrixType.MT_3D_4x4, 3, new double[4], true, true, false);
-        assertRow3D(MatrixType.MT_3D_4x4, -1, null, true, false, true);
-        assertRow3D(MatrixType.MT_3D_4x4, 4, null, false, false, true);
-    }
-
-    @Test(expected=NullPointerException.class)
-    public void testRowNullType1() {
-        t.row(null, 0);
-    }
-
-    @Test(expected=NullPointerException.class)
-    public void testRowNullType2() {
-        t.row(null, 0, new double[] {});
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testRow(Transform t,
+                          Transform it,
+                          boolean is2d,
+                          boolean isIdentity,
+                          boolean isInvertible,
+                          Class<?> inverseType) {
+        assertRow2D(t, is2d, MatrixType.MT_2D_2x3, 0, null, false, false, false);
+        assertRow2D(t, is2d, MatrixType.MT_2D_2x3, 0, null, true, false, false);
+        assertRow2D(t, is2d, MatrixType.MT_2D_2x3, 0, new double[2], true, false, false);
+        assertRow2D(t, is2d, MatrixType.MT_2D_2x3, 0, new double[3], true, true, false);
+        assertRow2D(t, is2d, MatrixType.MT_2D_2x3, 1, null, false, false, false);
+        assertRow2D(t, is2d, MatrixType.MT_2D_2x3, 1, null, true, false, false);
+        assertRow2D(t, is2d, MatrixType.MT_2D_2x3, 1, new double[2], true, false, false);
+        assertRow2D(t, is2d, MatrixType.MT_2D_2x3, 1, new double[3], true, true, false);
+        assertRow2D(t, is2d, MatrixType.MT_2D_2x3, -1, null, true, false, true);
+        assertRow2D(t, is2d, MatrixType.MT_2D_2x3, 2, null, false, false, true);
+
+        assertRow2D(t, is2d, MatrixType.MT_2D_3x3, 0, null, false, false, false);
+        assertRow2D(t, is2d, MatrixType.MT_2D_3x3, 0, null, true, false, false);
+        assertRow2D(t, is2d, MatrixType.MT_2D_3x3, 0, new double[2], true, false, false);
+        assertRow2D(t, is2d, MatrixType.MT_2D_3x3, 0, new double[3], true, true, false);
+        assertRow2D(t, is2d, MatrixType.MT_2D_3x3, 1, null, false, false, false);
+        assertRow2D(t, is2d, MatrixType.MT_2D_3x3, 1, null, true, false, false);
+        assertRow2D(t, is2d, MatrixType.MT_2D_3x3, 1, new double[2], true, false, false);
+        assertRow2D(t, is2d, MatrixType.MT_2D_3x3, 1, new double[3], true, true, false);
+        assertRow2D(t, is2d, MatrixType.MT_2D_3x3, 2, null, false, false, false);
+        assertRow2D(t, is2d, MatrixType.MT_2D_3x3, 2, null, true, false, false);
+        assertRow2D(t, is2d, MatrixType.MT_2D_3x3, 2, new double[2], true, false, false);
+        assertRow2D(t, is2d, MatrixType.MT_2D_3x3, 2, new double[3], true, true, false);
+        assertRow2D(t, is2d, MatrixType.MT_2D_3x3, -1, null, true, false, true);
+        assertRow2D(t, is2d, MatrixType.MT_2D_3x3, 3, null, false, false, true);
+
+        assertRow3D(t, MatrixType.MT_3D_3x4, 0, null, false, false, false);
+        assertRow3D(t, MatrixType.MT_3D_3x4, 0, null, true, false, false);
+        assertRow3D(t, MatrixType.MT_3D_3x4, 0, new double[3], true, false, false);
+        assertRow3D(t, MatrixType.MT_3D_3x4, 0, new double[4], true, true, false);
+        assertRow3D(t, MatrixType.MT_3D_3x4, 1, null, false, false, false);
+        assertRow3D(t, MatrixType.MT_3D_3x4, 1, null, true, false, false);
+        assertRow3D(t, MatrixType.MT_3D_3x4, 1, new double[3], true, false, false);
+        assertRow3D(t, MatrixType.MT_3D_3x4, 1, new double[4], true, true, false);
+        assertRow3D(t, MatrixType.MT_3D_3x4, 2, null, false, false, false);
+        assertRow3D(t, MatrixType.MT_3D_3x4, 2, null, true, false, false);
+        assertRow3D(t, MatrixType.MT_3D_3x4, 2, new double[3], true, false, false);
+        assertRow3D(t, MatrixType.MT_3D_3x4, 2, new double[4], true, true, false);
+        assertRow3D(t, MatrixType.MT_3D_3x4, -1, null, true, false, true);
+        assertRow3D(t, MatrixType.MT_3D_3x4, 3, null, false, false, true);
+
+        assertRow3D(t, MatrixType.MT_3D_4x4, 0, null, false, false, false);
+        assertRow3D(t, MatrixType.MT_3D_4x4, 0, null, true, false, false);
+        assertRow3D(t, MatrixType.MT_3D_4x4, 0, new double[3], true, false, false);
+        assertRow3D(t, MatrixType.MT_3D_4x4, 0, new double[4], true, true, false);
+        assertRow3D(t, MatrixType.MT_3D_4x4, 1, null, false, false, false);
+        assertRow3D(t, MatrixType.MT_3D_4x4, 1, null, true, false, false);
+        assertRow3D(t, MatrixType.MT_3D_4x4, 1, new double[3], true, false, false);
+        assertRow3D(t, MatrixType.MT_3D_4x4, 1, new double[4], true, true, false);
+        assertRow3D(t, MatrixType.MT_3D_4x4, 2, null, false, false, false);
+        assertRow3D(t, MatrixType.MT_3D_4x4, 2, null, true, false, false);
+        assertRow3D(t, MatrixType.MT_3D_4x4, 2, new double[3], true, false, false);
+        assertRow3D(t, MatrixType.MT_3D_4x4, 2, new double[4], true, true, false);
+        assertRow3D(t, MatrixType.MT_3D_4x4, 3, null, false, false, false);
+        assertRow3D(t, MatrixType.MT_3D_4x4, 3, null, true, false, false);
+        assertRow3D(t, MatrixType.MT_3D_4x4, 3, new double[3], true, false, false);
+        assertRow3D(t, MatrixType.MT_3D_4x4, 3, new double[4], true, true, false);
+        assertRow3D(t, MatrixType.MT_3D_4x4, -1, null, true, false, true);
+        assertRow3D(t, MatrixType.MT_3D_4x4, 4, null, false, false, true);
+    }
+
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testRowNullType1(Transform t,
+                                 Transform it,
+                                 boolean is2d,
+                                 boolean isIdentity,
+                                 boolean isInvertible,
+                                 Class<?> inverseType) {
+        assertThrows(NullPointerException.class, () -> {
+            t.row(null, 0);
+        });
+    }
+
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testRowNullType2(Transform t,
+                                 Transform it,
+                                 boolean is2d,
+                                 boolean isIdentity,
+                                 boolean isInvertible,
+                                 Class<?> inverseType) {
+        assertThrows(NullPointerException.class, () -> {
+            t.row(null, 0, new double[] {});
+        });
     }
 
     private void assertCol(MatrixType type, int col, double[] a, Transform t) {
@@ -2348,7 +2874,7 @@ private void assertCol(MatrixType type, int col, double[] a, Transform t) {
         fail("Should have thrown IOB");
     }
 
-    private void assertCol2D(MatrixType type, int col, double[] tmp,
+    private void assertCol2D(Transform t, boolean is2d, MatrixType type, int col, double[] tmp,
             boolean shouldPass, boolean shouldUse, boolean iob) {
         double[] a = null;
         try {
@@ -2381,7 +2907,7 @@ private void assertCol2D(MatrixType type, int col, double[] tmp,
         }
     }
 
-    private void assertCol3D(MatrixType type, int col, double[] tmp,
+    private void assertCol3D(Transform t, MatrixType type, int col, double[] tmp,
             boolean shouldPass, boolean shouldUse, boolean iob) {
         double[] a = null;
         try {
@@ -2407,89 +2933,117 @@ private void assertCol3D(MatrixType type, int col, double[] tmp,
         }
     }
 
-    @Test
-    public void testColumn() {
-        assertCol2D(MatrixType.MT_2D_2x3, 0, null, false, false, false);
-        assertCol2D(MatrixType.MT_2D_2x3, 0, null, true, false, false);
-        assertCol2D(MatrixType.MT_2D_2x3, 0, new double[1], true, false, false);
-        assertCol2D(MatrixType.MT_2D_2x3, 0, new double[2], true, true, false);
-        assertCol2D(MatrixType.MT_2D_2x3, 1, null, false, false, false);
-        assertCol2D(MatrixType.MT_2D_2x3, 1, null, true, false, false);
-        assertCol2D(MatrixType.MT_2D_2x3, 1, new double[1], true, false, false);
-        assertCol2D(MatrixType.MT_2D_2x3, 1, new double[2], true, true, false);
-        assertCol2D(MatrixType.MT_2D_2x3, 2, null, false, false, false);
-        assertCol2D(MatrixType.MT_2D_2x3, 2, null, true, false, false);
-        assertCol2D(MatrixType.MT_2D_2x3, 2, new double[1], true, false, false);
-        assertCol2D(MatrixType.MT_2D_2x3, 2, new double[2], true, true, false);
-        assertCol2D(MatrixType.MT_2D_2x3, -1, null, true, false, true);
-        assertCol2D(MatrixType.MT_2D_2x3, 3, null, false, false, true);
-
-        assertCol2D(MatrixType.MT_2D_3x3, 0, null, false, false, false);
-        assertCol2D(MatrixType.MT_2D_3x3, 0, null, true, false, false);
-        assertCol2D(MatrixType.MT_2D_3x3, 0, new double[2], true, false, false);
-        assertCol2D(MatrixType.MT_2D_3x3, 0, new double[3], true, true, false);
-        assertCol2D(MatrixType.MT_2D_3x3, 1, null, false, false, false);
-        assertCol2D(MatrixType.MT_2D_3x3, 1, null, true, false, false);
-        assertCol2D(MatrixType.MT_2D_3x3, 1, new double[2], true, false, false);
-        assertCol2D(MatrixType.MT_2D_3x3, 1, new double[3], true, true, false);
-        assertCol2D(MatrixType.MT_2D_3x3, 2, null, false, false, false);
-        assertCol2D(MatrixType.MT_2D_3x3, 2, null, true, false, false);
-        assertCol2D(MatrixType.MT_2D_3x3, 2, new double[2], true, false, false);
-        assertCol2D(MatrixType.MT_2D_3x3, 2, new double[3], true, true, false);
-        assertCol2D(MatrixType.MT_2D_3x3, -1, null, true, false, true);
-        assertCol2D(MatrixType.MT_2D_3x3, 3, null, false, false, true);
-
-        assertCol3D(MatrixType.MT_3D_3x4, 0, null, false, false, false);
-        assertCol3D(MatrixType.MT_3D_3x4, 0, null, true, false, false);
-        assertCol3D(MatrixType.MT_3D_3x4, 0, new double[2], true, false, false);
-        assertCol3D(MatrixType.MT_3D_3x4, 0, new double[3], true, true, false);
-        assertCol3D(MatrixType.MT_3D_3x4, 1, null, false, false, false);
-        assertCol3D(MatrixType.MT_3D_3x4, 1, null, true, false, false);
-        assertCol3D(MatrixType.MT_3D_3x4, 1, new double[2], true, false, false);
-        assertCol3D(MatrixType.MT_3D_3x4, 1, new double[3], true, true, false);
-        assertCol3D(MatrixType.MT_3D_3x4, 2, null, false, false, false);
-        assertCol3D(MatrixType.MT_3D_3x4, 2, null, true, false, false);
-        assertCol3D(MatrixType.MT_3D_3x4, 2, new double[2], true, false, false);
-        assertCol3D(MatrixType.MT_3D_3x4, 2, new double[3], true, true, false);
-        assertCol3D(MatrixType.MT_3D_3x4, 3, null, false, false, false);
-        assertCol3D(MatrixType.MT_3D_3x4, 3, null, true, false, false);
-        assertCol3D(MatrixType.MT_3D_3x4, 3, new double[2], true, false, false);
-        assertCol3D(MatrixType.MT_3D_3x4, 3, new double[3], true, true, false);
-        assertCol3D(MatrixType.MT_3D_3x4, -1, null, true, false, true);
-        assertCol3D(MatrixType.MT_3D_3x4, 4, null, false, false, true);
-
-        assertCol3D(MatrixType.MT_3D_4x4, 0, null, false, false, false);
-        assertCol3D(MatrixType.MT_3D_4x4, 0, null, true, false, false);
-        assertCol3D(MatrixType.MT_3D_4x4, 0, new double[3], true, false, false);
-        assertCol3D(MatrixType.MT_3D_4x4, 0, new double[4], true, true, false);
-        assertCol3D(MatrixType.MT_3D_4x4, 1, null, false, false, false);
-        assertCol3D(MatrixType.MT_3D_4x4, 1, null, true, false, false);
-        assertCol3D(MatrixType.MT_3D_4x4, 1, new double[3], true, false, false);
-        assertCol3D(MatrixType.MT_3D_4x4, 1, new double[4], true, true, false);
-        assertCol3D(MatrixType.MT_3D_4x4, 2, null, false, false, false);
-        assertCol3D(MatrixType.MT_3D_4x4, 2, null, true, false, false);
-        assertCol3D(MatrixType.MT_3D_4x4, 2, new double[3], true, false, false);
-        assertCol3D(MatrixType.MT_3D_4x4, 2, new double[4], true, true, false);
-        assertCol3D(MatrixType.MT_3D_4x4, 3, null, false, false, false);
-        assertCol3D(MatrixType.MT_3D_4x4, 3, null, true, false, false);
-        assertCol3D(MatrixType.MT_3D_4x4, 3, new double[3], true, false, false);
-        assertCol3D(MatrixType.MT_3D_4x4, 3, new double[4], true, true, false);
-        assertCol3D(MatrixType.MT_3D_4x4, -1, null, true, false, true);
-        assertCol3D(MatrixType.MT_3D_4x4, 4, null, false, false, true);
-    }
-
-    @Test(expected=NullPointerException.class)
-    public void testColumnNullType1() {
-        t.column(null, 0);
-    }
-
-    @Test(expected=NullPointerException.class)
-    public void testColumnNullType2() {
-        t.column(null, 0, new double[] {});
-    }
-
-    @Test
-    public void testSetOnTransformChanged() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testColumn(Transform t,
+                           Transform it,
+                           boolean is2d,
+                           boolean isIdentity,
+                           boolean isInvertible,
+                           Class<?> inverseType) {
+        assertCol2D(t, is2d, MatrixType.MT_2D_2x3, 0, null, false, false, false);
+        assertCol2D(t, is2d, MatrixType.MT_2D_2x3, 0, null, true, false, false);
+        assertCol2D(t, is2d, MatrixType.MT_2D_2x3, 0, new double[1], true, false, false);
+        assertCol2D(t, is2d, MatrixType.MT_2D_2x3, 0, new double[2], true, true, false);
+        assertCol2D(t, is2d, MatrixType.MT_2D_2x3, 1, null, false, false, false);
+        assertCol2D(t, is2d, MatrixType.MT_2D_2x3, 1, null, true, false, false);
+        assertCol2D(t, is2d, MatrixType.MT_2D_2x3, 1, new double[1], true, false, false);
+        assertCol2D(t, is2d, MatrixType.MT_2D_2x3, 1, new double[2], true, true, false);
+        assertCol2D(t, is2d, MatrixType.MT_2D_2x3, 2, null, false, false, false);
+        assertCol2D(t, is2d, MatrixType.MT_2D_2x3, 2, null, true, false, false);
+        assertCol2D(t, is2d, MatrixType.MT_2D_2x3, 2, new double[1], true, false, false);
+        assertCol2D(t, is2d, MatrixType.MT_2D_2x3, 2, new double[2], true, true, false);
+        assertCol2D(t, is2d, MatrixType.MT_2D_2x3, -1, null, true, false, true);
+        assertCol2D(t, is2d, MatrixType.MT_2D_2x3, 3, null, false, false, true);
+
+        assertCol2D(t, is2d, MatrixType.MT_2D_3x3, 0, null, false, false, false);
+        assertCol2D(t, is2d, MatrixType.MT_2D_3x3, 0, null, true, false, false);
+        assertCol2D(t, is2d, MatrixType.MT_2D_3x3, 0, new double[2], true, false, false);
+        assertCol2D(t, is2d, MatrixType.MT_2D_3x3, 0, new double[3], true, true, false);
+        assertCol2D(t, is2d, MatrixType.MT_2D_3x3, 1, null, false, false, false);
+        assertCol2D(t, is2d, MatrixType.MT_2D_3x3, 1, null, true, false, false);
+        assertCol2D(t, is2d, MatrixType.MT_2D_3x3, 1, new double[2], true, false, false);
+        assertCol2D(t, is2d, MatrixType.MT_2D_3x3, 1, new double[3], true, true, false);
+        assertCol2D(t, is2d, MatrixType.MT_2D_3x3, 2, null, false, false, false);
+        assertCol2D(t, is2d, MatrixType.MT_2D_3x3, 2, null, true, false, false);
+        assertCol2D(t, is2d, MatrixType.MT_2D_3x3, 2, new double[2], true, false, false);
+        assertCol2D(t, is2d, MatrixType.MT_2D_3x3, 2, new double[3], true, true, false);
+        assertCol2D(t, is2d, MatrixType.MT_2D_3x3, -1, null, true, false, true);
+        assertCol2D(t, is2d, MatrixType.MT_2D_3x3, 3, null, false, false, true);
+
+        assertCol3D(t, MatrixType.MT_3D_3x4, 0, null, false, false, false);
+        assertCol3D(t, MatrixType.MT_3D_3x4, 0, null, true, false, false);
+        assertCol3D(t, MatrixType.MT_3D_3x4, 0, new double[2], true, false, false);
+        assertCol3D(t, MatrixType.MT_3D_3x4, 0, new double[3], true, true, false);
+        assertCol3D(t, MatrixType.MT_3D_3x4, 1, null, false, false, false);
+        assertCol3D(t, MatrixType.MT_3D_3x4, 1, null, true, false, false);
+        assertCol3D(t, MatrixType.MT_3D_3x4, 1, new double[2], true, false, false);
+        assertCol3D(t, MatrixType.MT_3D_3x4, 1, new double[3], true, true, false);
+        assertCol3D(t, MatrixType.MT_3D_3x4, 2, null, false, false, false);
+        assertCol3D(t, MatrixType.MT_3D_3x4, 2, null, true, false, false);
+        assertCol3D(t, MatrixType.MT_3D_3x4, 2, new double[2], true, false, false);
+        assertCol3D(t, MatrixType.MT_3D_3x4, 2, new double[3], true, true, false);
+        assertCol3D(t, MatrixType.MT_3D_3x4, 3, null, false, false, false);
+        assertCol3D(t, MatrixType.MT_3D_3x4, 3, null, true, false, false);
+        assertCol3D(t, MatrixType.MT_3D_3x4, 3, new double[2], true, false, false);
+        assertCol3D(t, MatrixType.MT_3D_3x4, 3, new double[3], true, true, false);
+        assertCol3D(t, MatrixType.MT_3D_3x4, -1, null, true, false, true);
+        assertCol3D(t, MatrixType.MT_3D_3x4, 4, null, false, false, true);
+
+        assertCol3D(t, MatrixType.MT_3D_4x4, 0, null, false, false, false);
+        assertCol3D(t, MatrixType.MT_3D_4x4, 0, null, true, false, false);
+        assertCol3D(t, MatrixType.MT_3D_4x4, 0, new double[3], true, false, false);
+        assertCol3D(t, MatrixType.MT_3D_4x4, 0, new double[4], true, true, false);
+        assertCol3D(t, MatrixType.MT_3D_4x4, 1, null, false, false, false);
+        assertCol3D(t, MatrixType.MT_3D_4x4, 1, null, true, false, false);
+        assertCol3D(t, MatrixType.MT_3D_4x4, 1, new double[3], true, false, false);
+        assertCol3D(t, MatrixType.MT_3D_4x4, 1, new double[4], true, true, false);
+        assertCol3D(t, MatrixType.MT_3D_4x4, 2, null, false, false, false);
+        assertCol3D(t, MatrixType.MT_3D_4x4, 2, null, true, false, false);
+        assertCol3D(t, MatrixType.MT_3D_4x4, 2, new double[3], true, false, false);
+        assertCol3D(t, MatrixType.MT_3D_4x4, 2, new double[4], true, true, false);
+        assertCol3D(t, MatrixType.MT_3D_4x4, 3, null, false, false, false);
+        assertCol3D(t, MatrixType.MT_3D_4x4, 3, null, true, false, false);
+        assertCol3D(t, MatrixType.MT_3D_4x4, 3, new double[3], true, false, false);
+        assertCol3D(t, MatrixType.MT_3D_4x4, 3, new double[4], true, true, false);
+        assertCol3D(t, MatrixType.MT_3D_4x4, -1, null, true, false, true);
+        assertCol3D(t, MatrixType.MT_3D_4x4, 4, null, false, false, true);
+    }
+
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testColumnNullType1(Transform t,
+                          Transform it,
+                          boolean is2d,
+                          boolean isIdentity,
+                          boolean isInvertible,
+                          Class<?> inverseType) {
+        assertThrows(NullPointerException.class, () -> {
+            t.column(null, 0);
+        });
+    }
+
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testColumnNullType2(Transform t,
+                          Transform it,
+                          boolean is2d,
+                          boolean isIdentity,
+                          boolean isInvertible,
+                          Class<?> inverseType) {
+        assertThrows(NullPointerException.class, () -> {
+            t.column(null, 0, new double[] {});
+        });
+    }
+
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testSetOnTransformChanged(Transform t,
+                          Transform it,
+                          boolean is2d,
+                          boolean isIdentity,
+                          boolean isInvertible,
+                          Class<?> inverseType) {
         Transform clone = t.clone();
 
         EventHandler<TransformChangedEvent> ontc =
@@ -2523,8 +3077,14 @@ public void testSetOnTransformChanged() {
         }
     }
 
-    @Test
-    public void testAddRemoveEventHandler() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAddRemoveEventHandler(Transform t,
+                          Transform it,
+                          boolean is2d,
+                          boolean isIdentity,
+                          boolean isInvertible,
+                          Class<?> inverseType) {
         Transform clone = t.clone();
 
         EventHandler<TransformChangedEvent> counting =
@@ -2565,8 +3125,14 @@ public void testAddRemoveEventHandler() {
         }
     }
 
-    @Test
-    public void testAddRemoveEventFilter() {
+    @ParameterizedTest
+    @MethodSource("getParams")
+    public void testAddRemoveEventFilter(Transform t,
+                          Transform it,
+                          boolean is2d,
+                          boolean isIdentity,
+                          boolean isInvertible,
+                          Class<?> inverseType) {
         Transform clone = t.clone();
 
         EventHandler<TransformChangedEvent> counting =
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/TransformTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/TransformTest.java
index 62b74e32c65..9859121e13e 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/TransformTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/TransformTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,8 +41,6 @@
 import javafx.scene.Scene;
 import javafx.scene.shape.Rectangle;
 import test.javafx.scene.shape.RectangleTest;
-import org.junit.Assert;
-import org.junit.Test;
 
 import java.lang.reflect.Method;
 import javafx.scene.transform.Affine;
@@ -51,13 +49,15 @@
 import javafx.scene.transform.Transform;
 import javafx.scene.transform.TransformShim;
 
-import static org.junit.Assert.*;
-
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class TransformTest {
 
     public static void assertTx(Node n, BaseTransform trans) {
-        Assert.assertEquals(trans, NodeHelper.getLeafTransform(n));
+        assertEquals(trans, NodeHelper.getLeafTransform(n));
     }
 
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/Transform_properties_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/Transform_properties_Test.java
index b9ef99e3c5b..713d4f948b7 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/Transform_properties_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/Transform_properties_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,14 +25,7 @@
 
 package test.javafx.scene.transform;
 
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import test.com.sun.javafx.test.PropertiesTestBase;
+import java.util.stream.Stream;
 import javafx.geometry.Point3D;
 import javafx.scene.transform.Affine;
 import javafx.scene.transform.Rotate;
@@ -40,10 +33,12 @@
 import javafx.scene.transform.Shear;
 import javafx.scene.transform.Translate;
 
-@RunWith(Parameterized.class)
+import org.junit.jupiter.params.provider.Arguments;
+import test.com.sun.javafx.test.PropertiesTestBase;
+
 public class Transform_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
+
+    public static Stream<Arguments> data() {
         final Affine a = new Affine(
                 1,  2,  3,  4,
                 5,  6,  7,  8,
@@ -54,7 +49,7 @@ public static Collection data() {
         final Translate t = new Translate();
         final Scale c = new Scale();
 
-        return Arrays.asList(new Object[] {
+        return Stream.of(
             config(a, "mxx", 10.0, 20.0),
             config(a, "mxy", 10.0, 20.0),
             config(a, "mxz", 10.0, 20.0),
@@ -84,11 +79,7 @@ public static Collection data() {
             config(c, "z", 10.0, 20.0),
             config(c, "pivotX", 10.0, 20.0),
             config(c, "pivotY", 10.0, 20.0),
-            config(c, "pivotZ", 10.0, 20.0),
-        });
-    }
-
-    public Transform_properties_Test(final Configuration configuration) {
-        super(configuration);
+            config(c, "pivotZ", 10.0, 20.0)
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/TranslateTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/TranslateTest.java
index c8ca52e37da..0d2c658890a 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/TranslateTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/TranslateTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,15 +28,15 @@
 import static test.javafx.scene.transform.TransformTest.assertTx;
 import javafx.scene.shape.Rectangle;
 
-import org.junit.Assert;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
 import test.com.sun.javafx.test.TransformHelper;
 import com.sun.javafx.geom.transform.BaseTransform;
 import javafx.scene.transform.Transform;
 import javafx.scene.transform.Translate;
 
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class TranslateTest {
 
@@ -56,7 +56,7 @@ public void testTranslate() {
                 0, 0, 1,  0);
 
         trans.setX(34);
-        Assert.assertEquals(34, trans.getX(), 1e-100);
+        assertEquals(34, trans.getX(), 1e-100);
         assertTx(n, BaseTransform.getTranslateInstance(34, 52));
         TransformHelper.assertMatrix(trans,
                 1, 0, 0, 34,
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/Translate_onInvalidate_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/Translate_onInvalidate_Test.java
index a2f720974e4..2881b7c22e0 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/Translate_onInvalidate_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/transform/Translate_onInvalidate_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,31 +25,21 @@
 
 package test.javafx.scene.transform;
 
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import java.util.stream.Stream;
 
 import com.sun.javafx.scene.DirtyBits;
 import javafx.scene.transform.Translate;
+
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.OnInvalidateMethodsTestBase;
 
-@RunWith(Parameterized.class)
 public class Translate_onInvalidate_Test extends OnInvalidateMethodsTestBase {
 
-    public Translate_onInvalidate_Test(Configuration config) {
-        super(config);
-    }
-
-    @Parameters
-    public static Collection<Object[]> data() {
-        Object[][] data = new Object[][] {
-            {new Configuration(Translate.class, "x", 20.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
-            {new Configuration(Translate.class, "y", 20.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
-            {new Configuration(Translate.class, "z", 20.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })}
-        };
-        return Arrays.asList(data);
+    public static Stream<Arguments> data() {
+        return Stream.of(
+            Arguments.of( new Configuration(Translate.class, "x", 20.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS }) ),
+            Arguments.of( new Configuration(Translate.class, "y", 20.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS }) ),
+            Arguments.of( new Configuration(Translate.class, "z", 20.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS }) )
+        );
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/stage/CommonDialogsTest.java b/modules/javafx.graphics/src/test/java/test/javafx/stage/CommonDialogsTest.java
index d188c71391e..bfee018ad43 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/stage/CommonDialogsTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/stage/CommonDialogsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,16 +36,19 @@
 import javafx.stage.DirectoryChooser;
 import javafx.stage.FileChooser;
 import javafx.stage.FileChooser.ExtensionFilter;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+
 
 public final class CommonDialogsTest {
     private StubToolkit toolkit;
     private StubCommonDialogs stubDialogs;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         toolkit = (StubToolkit) Toolkit.getToolkit();
         stubDialogs = new StubCommonDialogs();
@@ -53,7 +56,7 @@ public void setUp() {
         toolkit.setCommonDialogsSupport(stubDialogs);
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         toolkit.setCommonDialogsSupport(null);
     }
@@ -73,19 +76,19 @@ public void testFileChooser_showOpenDialog() {
         fileChooser.getExtensionFilters().addAll(txtFiles, jpgFiles);
         fileChooser.setSelectedExtensionFilter(txtFiles);
 
-        Assert.assertEquals(
+        assertEquals(
                 null, fileChooser.showOpenDialog(null));
-        Assert.assertEquals(FileChooserType.OPEN,
+        assertEquals(FileChooserType.OPEN,
                             stubDialogs.getFileChooserType());
-        Assert.assertEquals(null, stubDialogs.getOwnerWindow());
-        Assert.assertEquals("Open Single", stubDialogs.getTitle());
-        Assert.assertEquals(initialDirectory,
+        assertEquals(null, stubDialogs.getOwnerWindow());
+        assertEquals("Open Single", stubDialogs.getTitle());
+        assertEquals(initialDirectory,
                             stubDialogs.getInitialDirectory());
-        Assert.assertEquals("open.txt", stubDialogs.getInitialFileName());
-        Assert.assertArrayEquals(
+        assertEquals("open.txt", stubDialogs.getInitialFileName());
+        assertArrayEquals(
                 new Object[] { txtFiles, jpgFiles },
                 stubDialogs.getExtensionFilters().toArray());
-        Assert.assertEquals(txtFiles, stubDialogs.getSelectedExtensionFilter());
+        assertEquals(txtFiles, stubDialogs.getSelectedExtensionFilter());
     }
 
     @Test
@@ -97,18 +100,18 @@ public void testFileChooser_showOpenMultipleDialog() {
         fileChooser.setTitle("Open Multiple");
         fileChooser.getExtensionFilters().addAll(allFiles);
 
-        Assert.assertEquals(
+        assertEquals(
                 null, fileChooser.showOpenMultipleDialog(null));
-        Assert.assertEquals(FileChooserType.OPEN_MULTIPLE,
+        assertEquals(FileChooserType.OPEN_MULTIPLE,
                             stubDialogs.getFileChooserType());
-        Assert.assertEquals(null, stubDialogs.getOwnerWindow());
-        Assert.assertEquals("Open Multiple", stubDialogs.getTitle());
-        Assert.assertEquals(null, stubDialogs.getInitialDirectory());
-        Assert.assertEquals(null, stubDialogs.getInitialFileName());
-        Assert.assertArrayEquals(
+        assertEquals(null, stubDialogs.getOwnerWindow());
+        assertEquals("Open Multiple", stubDialogs.getTitle());
+        assertEquals(null, stubDialogs.getInitialDirectory());
+        assertEquals(null, stubDialogs.getInitialFileName());
+        assertArrayEquals(
                 new Object[] { allFiles },
                 stubDialogs.getExtensionFilters().toArray());
-        Assert.assertEquals(null, stubDialogs.getSelectedExtensionFilter());
+        assertEquals(null, stubDialogs.getSelectedExtensionFilter());
     }
 
     @Test
@@ -120,17 +123,17 @@ public void testFileChooser_showSaveDialog() {
         fileChooser.setInitialDirectory(initialDirectory);
         fileChooser.setInitialFileName("save.txt");
 
-        Assert.assertEquals(
+        assertEquals(
                 null, fileChooser.showSaveDialog(null));
-        Assert.assertEquals(FileChooserType.SAVE,
+        assertEquals(FileChooserType.SAVE,
                             stubDialogs.getFileChooserType());
-        Assert.assertEquals(null, stubDialogs.getOwnerWindow());
-        Assert.assertEquals("Save", stubDialogs.getTitle());
-        Assert.assertEquals(initialDirectory,
+        assertEquals(null, stubDialogs.getOwnerWindow());
+        assertEquals("Save", stubDialogs.getTitle());
+        assertEquals(initialDirectory,
                             stubDialogs.getInitialDirectory());
-        Assert.assertEquals("save.txt", stubDialogs.getInitialFileName());
-        Assert.assertEquals(0, stubDialogs.getExtensionFilters().size());
-        Assert.assertEquals(null, stubDialogs.getSelectedExtensionFilter());
+        assertEquals("save.txt", stubDialogs.getInitialFileName());
+        assertEquals(0, stubDialogs.getExtensionFilters().size());
+        assertEquals(null, stubDialogs.getSelectedExtensionFilter());
     }
 
     @Test
@@ -141,11 +144,11 @@ public void testDirectoryChooser_showDialog() {
         directoryChooser.setTitle("Open");
         directoryChooser.setInitialDirectory(initialDirectory);
 
-        Assert.assertEquals(
+        assertEquals(
                 null, directoryChooser.showDialog(null));
-        Assert.assertEquals(null, stubDialogs.getOwnerWindow());
-        Assert.assertEquals("Open", stubDialogs.getTitle());
-        Assert.assertEquals(initialDirectory,
+        assertEquals(null, stubDialogs.getOwnerWindow());
+        assertEquals("Open", stubDialogs.getTitle());
+        assertEquals(initialDirectory,
                             stubDialogs.getInitialDirectory());
     }
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/stage/PopupTest.java b/modules/javafx.graphics/src/test/java/test/javafx/stage/PopupTest.java
index bc05288e0ec..a3203876e1a 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/stage/PopupTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/stage/PopupTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,11 +47,6 @@
 import javafx.scene.input.KeyEvent;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.shape.Rectangle;
-import junit.framework.Assert;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 import javafx.scene.Node;
@@ -62,7 +57,14 @@
 import javafx.stage.Stage;
 import javafx.stage.Window;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import test.com.sun.javafx.stage.PopupRootHelper;
 
 public class PopupTest {
@@ -72,7 +74,7 @@ public class PopupTest {
     private Scene scene;
     private boolean done = false;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         stage = new Stage();
         scene = new Scene(new Group(), 500, 500);
@@ -82,7 +84,7 @@ public void setUp() {
         toolkit = (StubToolkit) Toolkit.getToolkit();
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         stage.hide();
         toolkit.resetScreens();
@@ -451,7 +453,7 @@ public void testOnAutohide() {
         assertTrue(done);
     }
 
-    @Ignore("JDK-8234161")
+    @Disabled("JDK-8234161")
     @Test
     public void testPeerListener() {
         Popup p = new Popup();
@@ -698,50 +700,62 @@ public void testConsumeAutoHidingEventsProperty() {
         }
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testShowWithNullOwner() {
-        final Popup popup = new Popup();
-        popup.show(null);
+        assertThrows(NullPointerException.class, () -> {
+            final Popup popup = new Popup();
+            popup.show(null);
+        });
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test
     public void testShowXYWithNullOwner() {
-        final Popup popup = new Popup();
-        popup.show((Window) null, 10, 10);
+        assertThrows(NullPointerException.class, () -> {
+            final Popup popup = new Popup();
+            popup.show((Window) null, 10, 10);
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testShowWithOwnerThatWouldCreateCycle1() {
-        final Popup popup = new Popup();
-        popup.show(popup);
+        assertThrows(IllegalArgumentException.class, () -> {
+            final Popup popup = new Popup();
+            popup.show(popup);
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testShowWithOwnerThatWouldCreateCycle2() {
-        final Popup popup1 = new Popup();
-        final Popup popup2 = new Popup();
-
-        popup1.show(stage);
-        popup2.show(popup1);
-        popup1.hide();
-        popup1.show(popup2);
+        assertThrows(IllegalArgumentException.class, () -> {
+            final Popup popup1 = new Popup();
+            final Popup popup2 = new Popup();
+
+            popup1.show(stage);
+            popup2.show(popup1);
+            popup1.hide();
+            popup1.show(popup2);
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testShowXYWithOwnerThatWouldCreateCycle1() {
-        final Popup popup = new Popup();
-        popup.show(popup, 10, 20);
+        assertThrows(IllegalArgumentException.class, () -> {
+            final Popup popup = new Popup();
+            popup.show(popup, 10, 20);
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test
     public void testShowXYWithOwnerThatWouldCreateCycle2() {
-        final Popup popup1 = new Popup();
-        final Popup popup2 = new Popup();
-
-        popup1.show(stage);
-        popup2.show(popup1);
-        popup1.hide();
-        popup1.show(popup2, 10, 20);
+        assertThrows(IllegalArgumentException.class, () -> {
+            final Popup popup1 = new Popup();
+            final Popup popup2 = new Popup();
+
+            popup1.show(stage);
+            popup2.show(popup1);
+            popup1.hide();
+            popup1.show(popup2, 10, 20);
+        });
     }
 
     @Test
@@ -766,13 +780,13 @@ public void testPopupRootStyle() {
         final Popup popup = new Popup();
 
         final Parent oldRoot = popup.getScene().getRoot();
-        Assert.assertTrue(oldRoot.getStyleClass().contains("popup"));
+        assertTrue(oldRoot.getStyleClass().contains("popup"));
 
         final Group newRoot = new Group(new Rectangle(0, 0, 200, 300));
         popup.getScene().setRoot(newRoot);
 
-        Assert.assertTrue(newRoot.getStyleClass().contains("popup"));
-        Assert.assertFalse(oldRoot.getStyleClass().contains("popup"));
+        assertTrue(newRoot.getStyleClass().contains("popup"));
+        assertFalse(oldRoot.getStyleClass().contains("popup"));
 
         System.out.println(javafx.scene.shape.Sphere.class.getResource("Sphere.class"));
     }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/stage/Popup_parentWindow_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/stage/Popup_parentWindow_Test.java
index 8350e54dc2c..195f6590aca 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/stage/Popup_parentWindow_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/stage/Popup_parentWindow_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,28 +26,22 @@
 package test.javafx.stage;
 
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
+import java.util.stream.Stream;
 import javafx.stage.Popup;
 
-import org.junit.Ignore;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.params.provider.Arguments;
 import test.com.sun.javafx.test.PropertiesTestBase;
 import test.com.sun.javafx.test.objects.TestGroup;
 import test.com.sun.javafx.test.objects.TestNode;
 import test.com.sun.javafx.test.objects.TestScene;
 import test.com.sun.javafx.test.objects.TestStage;
 
-@Ignore("JDK-8234153") // test needs to be rewritten.
-@RunWith(Parameterized.class)
+@Disabled("JDK-8234153") // test needs to be rewritten.
 public final class Popup_parentWindow_Test extends PropertiesTestBase {
 
-    @Parameters
-    public static Collection<Object> data() {
-        final List<Object> configurations = new ArrayList<>();
+    public static Stream<Arguments> data() {
+        ArrayList<Arguments> configurations = new ArrayList<>();
 
         TestObjects to;
 
@@ -109,12 +103,7 @@ public static Collection<Object> data() {
 //        extcfg.setAllowMultipleNotifications(true);
 //        configurations.add(new Object[] { extcfg });
 
-        return configurations;
-    }
-
-    public Popup_parentWindow_Test(final Configuration configuration) {
-        super(configuration);
-
+        return configurations.stream();
     }
 
     private static final class TestObjects {
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/stage/ScreenTest.java b/modules/javafx.graphics/src/test/java/test/javafx/stage/ScreenTest.java
index 50eac060cd8..1564b2dd398 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/stage/ScreenTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/stage/ScreenTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,12 +27,16 @@
 
 import java.util.List;
 import javafx.stage.Screen;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public final class ScreenTest {
-    @Test(expected = UnsupportedOperationException.class)
+    @Test
     public void testGetScreensAreUnmodifiable() {
-        final List<Screen> screens = Screen.getScreens();
-        screens.clear();
+        assertThrows(UnsupportedOperationException.class, () -> {
+            final List<Screen> screens = Screen.getScreens();
+            screens.clear();
+        });
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/stage/StageMutabilityTest.java b/modules/javafx.graphics/src/test/java/test/javafx/stage/StageMutabilityTest.java
index 6f0f8d05ab1..cd19c11864b 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/stage/StageMutabilityTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/stage/StageMutabilityTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,11 +30,11 @@
 import javafx.stage.Stage;
 import javafx.stage.StageShim;
 import javafx.stage.StageStyle;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Test those attributes on Stage that should be immutable after Stage is visible.
@@ -47,7 +47,8 @@ public class StageMutabilityTest {
     /**
      * Tests the default value of style for a Stage
      */
-    @Test public void testStyleDefault() {
+    @Test
+    public void testStyleDefault() {
         Stage stage = new Stage();
         assertEquals(StageStyle.DECORATED, stage.getStyle());
     }
@@ -55,7 +56,8 @@ public class StageMutabilityTest {
     /**
      * Tests setting the value of style for a Stage
      */
-    @Test public void testStyleSet() {
+    @Test
+    public void testStyleSet() {
         Stage stage = new Stage();
         assertEquals(StageStyle.DECORATED, stage.getStyle());
         stage.initStyle(StageStyle.UNDECORATED);
@@ -71,7 +73,8 @@ public class StageMutabilityTest {
     /**
      * Tests setting the value of style for a primary Stage
      */
-    @Test public void testStyleSetPrimary() {
+    @Test
+    public void testStyleSetPrimary() {
         Stage stage = new Stage();
         assertFalse(StageShim.isPrimary(stage));
         StageHelper.setPrimary(stage, true);
@@ -90,7 +93,8 @@ public class StageMutabilityTest {
     /**
      * Tests initializing the value of style for a Stage in the constructor
      */
-    @Test public void testStyleConstructor() {
+    @Test
+    public void testStyleConstructor() {
         Stage stage = new Stage(StageStyle.UNDECORATED);
         assertEquals(StageStyle.UNDECORATED, stage.getStyle());
         stage.initStyle(StageStyle.DECORATED);
@@ -100,7 +104,8 @@ public class StageMutabilityTest {
     /**
      * Tests that setting the value of style on a visible Stage throws an exception
      */
-    @Test public void testStyleSetWhileVisible() {
+    @Test
+    public void testStyleSetWhileVisible() {
         Stage stage = new Stage();
         assertEquals(StageStyle.DECORATED, stage.getStyle());
         stage.show();
@@ -117,7 +122,8 @@ public class StageMutabilityTest {
      * Tests that setting the value of style on a Stage after it is
      * set visible throws an exception even if it is subsequently set non-visible
      */
-    @Test public void testStyleSetAfterVisible() {
+    @Test
+    public void testStyleSetAfterVisible() {
         Stage stage = new Stage(StageStyle.TRANSPARENT);
         assertEquals(StageStyle.TRANSPARENT, stage.getStyle());
         stage.initStyle(StageStyle.UNDECORATED);
@@ -138,7 +144,8 @@ public class StageMutabilityTest {
     /**
      * Tests the default value of modality for a Stage
      */
-    @Test public void testModalityDefault() {
+    @Test
+    public void testModalityDefault() {
         Stage stage = new Stage();
         assertEquals(Modality.NONE, stage.getModality());
     }
@@ -146,7 +153,8 @@ public class StageMutabilityTest {
     /**
      * Tests setting the value of modality for a Stage
      */
-    @Test public void testModalitySet() {
+    @Test
+    public void testModalitySet() {
         Stage stage = new Stage();
         assertEquals(Modality.NONE, stage.getModality());
         stage.initModality(Modality.WINDOW_MODAL);
@@ -160,7 +168,8 @@ public class StageMutabilityTest {
     /**
      * Tests setting the value of modality for a primary Stage
      */
-    @Test public void testModalitySetPrimary() {
+    @Test
+    public void testModalitySetPrimary() {
         Stage stage = new Stage();
         assertFalse(StageShim.isPrimary(stage));
         StageHelper.setPrimary(stage, true);
@@ -179,7 +188,8 @@ public class StageMutabilityTest {
 //    /**
 //     * Tests that setting the value of style on a visible Stage throws an exception
 //     */
-//    @Test public void testStyleSetWhileVisible() {
+//    @Test
+//    public void testStyleSetWhileVisible() {
 //        Stage stage = new Stage();
 //        assertEquals(StageStyle.DECORATED, stage.getStyle());
 //        stage.show();
@@ -196,7 +206,8 @@ public class StageMutabilityTest {
 //     * Tests that setting the value of style on a Stage after it is
 //     * set visible throws an exception even if it is subsequently set non-visible
 //     */
-//    @Test public void testStyleSetAfterVisible() {
+//    @Test
+//    public void testStyleSetAfterVisible() {
 //        Stage stage = new Stage(StageStyle.TRANSPARENT);
 //        assertEquals(StageStyle.TRANSPARENT, stage.getStyle());
 //        stage.initStyle(StageStyle.UNDECORATED);
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/stage/StageTest.java b/modules/javafx.graphics/src/test/java/test/javafx/stage/StageTest.java
index b9bc748dfb7..1607ec557dd 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/stage/StageTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/stage/StageTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,12 +35,13 @@
 import test.com.sun.javafx.pgstub.StubToolkit.ScreenConfiguration;
 import com.sun.javafx.tk.Toolkit;
 import javafx.stage.Stage;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class StageTest {
 
@@ -50,7 +51,7 @@ public class StageTest {
 
     private int initialNumTimesSetSizeAndLocation;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         toolkit = (StubToolkit) Toolkit.getToolkit();
         s = new Stage();
@@ -59,7 +60,7 @@ public void setUp() {
         initialNumTimesSetSizeAndLocation = peer.numTimesSetSizeAndLocation;
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         s.hide();
     }
@@ -72,7 +73,8 @@ private void pulse() {
      * Simple test which checks whether changing the x/y position of the Stage
      * ends up invoking the appropriate methods on the TKStage interface.
      */
-    public @Test void testMovingStage() {
+    @Test
+    public void testMovingStage() {
         s.setX(100);
         pulse();
         assertEquals(100f, peer.x);
@@ -84,7 +86,8 @@ private void pulse() {
      * Simple test which checks whether changing the w/h size of the Stage
      * ends up invoking the appropriate methods on the TKStage interface.
      */
-    public @Test void testResizingStage() {
+    @Test
+    public void testResizingStage() {
         s.setWidth(100);
         s.setHeight(100);
         pulse();
@@ -98,7 +101,8 @@ private void pulse() {
      * Simple test which checks whether changing the w/h size and x/y position of the Stage
      * ends up invoking the appropriate methods on the TKStage interface.
      */
-    public @Test void testMovingAndResizingStage() {
+    @Test
+    public void testMovingAndResizingStage() {
         s.setX(101);
         s.setY(102);
         s.setWidth(103);
@@ -116,7 +120,8 @@ private void pulse() {
      * Simple test which checks whether changing the minimum w/h of the Stage
      * resize the window if necessary
      */
-    public @Test void testResizingTooSmallStage() {
+    @Test
+    public void testResizingTooSmallStage() {
         s.setWidth(60);
         s.setHeight(70);
         s.setMinWidth(150);
@@ -130,7 +135,8 @@ private void pulse() {
      * Simple test which checks whether changing the maximum w/h of the Stage
      * resize the window if necessary
      */
-    public @Test void testResizingTooBigStage() {
+    @Test
+    public void testResizingTooBigStage() {
         s.setWidth(100);
         s.setHeight(100);
         s.setMaxWidth(60);
@@ -144,7 +150,8 @@ private void pulse() {
      * Test to make sure that when we initialize, the Stage doesn't notify
      * the peer of size and location more than once.
      */
-    public @Test void testSizeAndLocationChangedOverTime() {
+    @Test
+    public void testSizeAndLocationChangedOverTime() {
         pulse();
         assertTrue((peer.numTimesSetSizeAndLocation - initialNumTimesSetSizeAndLocation) <= 1);
         initialNumTimesSetSizeAndLocation = peer.numTimesSetSizeAndLocation;
@@ -466,49 +473,49 @@ public void testAddAndSetNullIcon() {
             s.getIcons().add(null);
             throw new Exception();
         } catch (Exception e) {
-            assertTrue(failMessage, e instanceof NullPointerException);
+            assertTrue(e instanceof NullPointerException, failMessage);
         }
         try {
             s.getIcons().add(0, null);
             throw new Exception();
         } catch (Exception e) {
-            assertTrue(failMessage, e instanceof NullPointerException);
+            assertTrue(e instanceof NullPointerException, failMessage);
         }
         try {
             s.getIcons().addAll(null, null);
             throw new Exception();
         } catch (Exception e) {
-            assertTrue(failMessage, e instanceof NullPointerException);
+            assertTrue(e instanceof NullPointerException, failMessage);
         }
         try {
             s.getIcons().addAll(imageList);
             throw new Exception();
         } catch (Exception e) {
-            assertTrue(failMessage, e instanceof NullPointerException);
+            assertTrue(e instanceof NullPointerException, failMessage);
         }
         try {
             s.getIcons().addAll(0, imageList);
             throw new Exception();
         } catch (Exception e) {
-            assertTrue(failMessage, e instanceof NullPointerException);
+            assertTrue(e instanceof NullPointerException, failMessage);
         }
         try {
             s.getIcons().set(0, null);
             throw new Exception();
         } catch (Exception e) {
-            assertTrue(failMessage, e instanceof NullPointerException);
+            assertTrue(e instanceof NullPointerException, failMessage);
         }
         try {
             s.getIcons().setAll(imageList);
             throw new Exception();
         } catch (Exception e) {
-            assertTrue(failMessage, e instanceof NullPointerException);
+            assertTrue(e instanceof NullPointerException, failMessage);
         }
         try {
             s.getIcons().setAll(null, null);
             throw new Exception();
         } catch (Exception e) {
-            assertTrue(failMessage, e instanceof NullPointerException);
+            assertTrue(e instanceof NullPointerException, failMessage);
         }
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/stage/WindowEventTest.java b/modules/javafx.graphics/src/test/java/test/javafx/stage/WindowEventTest.java
index 3b02a0c0c3a..5925a8559bb 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/stage/WindowEventTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/stage/WindowEventTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,13 +28,15 @@
 import javafx.stage.Window;
 import javafx.stage.WindowEvent;
 import javafx.stage.WindowShim;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertSame;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 public class WindowEventTest {
 
-    @Test public void testConstructor() {
+    @Test
+    public void testConstructor() {
         Window w = new WindowShim();
         WindowEvent e = new WindowEvent(w, WindowEvent.WINDOW_HIDING);
         assertSame(WindowEvent.WINDOW_HIDING, e.getEventType());
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/stage/WindowTest.java b/modules/javafx.graphics/src/test/java/test/javafx/stage/WindowTest.java
index 0bd1d519756..c6e56406faa 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/stage/WindowTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/stage/WindowTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,9 +26,6 @@
 package test.javafx.stage;
 
 import com.sun.javafx.stage.WindowHelper;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.assertNotNull;
 
 import javafx.beans.InvalidationListener;
 import javafx.beans.property.DoubleProperty;
@@ -36,9 +33,6 @@
 import javafx.collections.ObservableList;
 import javafx.scene.Scene;
 import javafx.scene.layout.Region;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
 import test.com.sun.javafx.pgstub.StubStage;
 import test.com.sun.javafx.pgstub.StubToolkit;
 import com.sun.javafx.tk.TKStage;
@@ -48,17 +42,25 @@
 
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 public final class WindowTest {
     private StubToolkit toolkit;
     private Stage testWindow;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         toolkit = (StubToolkit) Toolkit.getToolkit();
         testWindow = new Stage();
     }
 
-    @After
+    @AfterEach
     public void afterTest() {
         testWindow.hide();
         testWindow = null;
@@ -82,7 +84,8 @@ public void testOpacityBind() {
         assertEquals(1.0f, peer.opacity);
     }
 
-    @Test public void testProperties() {
+    @Test
+    public void testProperties() {
         javafx.collections.ObservableMap<Object, Object> properties = testWindow.getProperties();
 
         /* If we ask for it, we should get it.
@@ -111,7 +114,8 @@ private static StubStage getPeer(final Window window) {
         return (StubStage) unkPeer;
     }
 
-    @Test public void testGetWindowsIsObservable() {
+    @Test
+    public void testGetWindowsIsObservable() {
         ObservableList<Window> windows = Window.getWindows();
 
         final int initialWindowCount = windows.size();
@@ -138,28 +142,34 @@ private static StubStage getPeer(final Window window) {
         windows.removeListener(listener);
     }
 
-    @Test(expected = UnsupportedOperationException.class)
+    @Test
     public void testGetWindowsIsUnmodifiable_add() {
-        Stage anotherTestWindow = new Stage();
-        Window.getWindows().add(anotherTestWindow);
+        assertThrows(UnsupportedOperationException.class, () -> {
+            Stage anotherTestWindow = new Stage();
+            Window.getWindows().add(anotherTestWindow);
+        });
     }
 
-    @Test(expected = UnsupportedOperationException.class)
+    @Test
     public void testGetWindowsIsUnmodifiable_removeShowingWindow() {
-        testWindow.show();
-        Window.getWindows().remove(testWindow);
+        assertThrows(UnsupportedOperationException.class, () -> {
+            testWindow.show();
+            Window.getWindows().remove(testWindow);
+        });
     }
 
     // There is no UOE here because the window being removed is not in the list of windows,
     // so no modification of the windows list occurs.
-    @Test public void testGetWindowsIsUnmodifiable_removeNonShowingWindow_emptyList() {
+    @Test
+    public void testGetWindowsIsUnmodifiable_removeNonShowingWindow_emptyList() {
         Stage anotherTestWindow = new Stage();
         Window.getWindows().remove(anotherTestWindow);
     }
 
     // There is no UOE here because the window being removed is not in the list of windows,
     // so no modification of the windows list occurs.
-    @Test public void testGetWindowsIsUnmodifiable_removeNonShowingWindow_nonEmptyList() {
+    @Test
+    public void testGetWindowsIsUnmodifiable_removeNonShowingWindow_nonEmptyList() {
         ObservableList<Window> windows = Window.getWindows();
 
         final int initialWindowCount = windows.size();
diff --git a/modules/javafx.graphics/src/test/java/test/rt_5300/rt_5300Test.java b/modules/javafx.graphics/src/test/java/test/rt_5300/rt_5300Test.java
index bbd62178faf..f4b45234a08 100644
--- a/modules/javafx.graphics/src/test/java/test/rt_5300/rt_5300Test.java
+++ b/modules/javafx.graphics/src/test/java/test/rt_5300/rt_5300Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,15 +30,18 @@
 import com.sun.prism.Image;
 import com.sun.prism.PixelFormat;
 import java.nio.ByteBuffer;
-import org.junit.Test;
-import org.junit.Assert;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class rt_5300Test {
 
     public rt_5300Test() {
     }
 
-    @Test()
+    @Test
     public void RT5346() {
         int num_bands = 4;
         byte[] bytes = new byte[32 * 32 * num_bands];
@@ -58,10 +61,11 @@ public void RT5346() {
             //throw exception System.out.println("Exception Caught: " + e.toString() );
         }
 
-        Assert.assertTrue(assertImageIcon(image));
+        assertTrue(assertImageIcon(image));
     }
 
-    @Test(timeout=5000)
+    @Test
+    @Timeout(value=5000, unit=TimeUnit.MILLISECONDS)
     public void testArcs() {
         test(10f, null);
         test(10f, new float[] {2f, 2f});
diff --git a/modules/javafx.graphics/src/test/java/test/rt_6334/rt_6334Test.java b/modules/javafx.graphics/src/test/java/test/rt_6334/rt_6334Test.java
index 8b7f45ceff5..31752394c4f 100644
--- a/modules/javafx.graphics/src/test/java/test/rt_6334/rt_6334Test.java
+++ b/modules/javafx.graphics/src/test/java/test/rt_6334/rt_6334Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,11 @@
 import com.sun.javafx.geom.QuadCurve2D;
 import com.sun.javafx.geom.Shape;
 import com.sun.prism.BasicStroke;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+
+import java.util.concurrent.TimeUnit;
 
 public class rt_6334Test {
     static int numcoords[] = { 2, 2, 4, 6, 0 };
@@ -71,7 +75,8 @@ public static void testPath(Shape orig, float thickness) {
         }
     }
 
-    @Test(timeout=1000)
+    @Test
+    @Timeout(value=1000, unit=TimeUnit.MILLISECONDS)
     public void test_6334() {
         Path2D p = new Path2D();
         p.moveTo(304.51f, 179.78f);
@@ -88,19 +93,21 @@ static float rndCoord() {
         return rndFlt() * 2f + 300f;
     }
 
-    @Test(timeout=5000)
+    @Test
+    @Timeout(value=5000, unit=TimeUnit.MILLISECONDS)
     public void testLines() {
         Line2D l = new Line2D();
         for (int i = 0; i < 50000; i++) {
             l.setLine(rndCoord(), rndCoord(),
-                      rndCoord(), rndCoord());
+                    rndCoord(), rndCoord());
             testPath(l, 1f);
             testPath(l, rndFlt() * 10f);
             testPath(l, 20f);
         }
     }
 
-    @Test(timeout=5000)
+    @Test
+    @Timeout(value=5000, unit=TimeUnit.MILLISECONDS)
     public void testQuads() {
         QuadCurve2D qc = new QuadCurve2D();
         for (int i = 0; i < 50000; i++) {
@@ -113,7 +120,8 @@ public void testQuads() {
         }
     }
 
-    @Test(timeout=5000)
+    @Test
+    @Timeout(value=5000, unit=TimeUnit.MILLISECONDS)
     public void testCubics() {
         CubicCurve2D cc = new CubicCurve2D();
         for (int i = 0; i < 50000; i++) {
diff --git a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/SymbolTest.java b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/SymbolTest.java
index 4f8c48cf08d..cb6a14b3a73 100644
--- a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/SymbolTest.java
+++ b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/SymbolTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,9 @@
 
 import java.io.File;
 import com.sun.scenario.effect.compiler.JSLC.JSLCInfo;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /**
  */
@@ -47,17 +49,19 @@ static void compile(String s) throws Exception {
         JSLC.compile(jslcinfo, s, Long.MAX_VALUE);
     }
 
-    @Test(expected = RuntimeException.class)
-    public void specialVarUsedOutsideOfMain() throws Exception {
-        String s =
-            "param sampler img;\n" +
-            "float myfunc(float val) {\n" +
-            "    return pos0.x;\n" +
-            "}\n" +
-            "void main() {\n" +
-            "    float foo = pos0.y;\n" +
-            "    float funcres = myfunc(1.5);\n" +
-            "}\n";
-        compile(s);
+    @Test
+    public void specialVarUsedOutsideOfMain() {
+        assertThrows(RuntimeException.class, () -> {
+            String s =
+                "param sampler img;\n" +
+                "float myfunc(float val) {\n" +
+                "    return pos0.x;\n" +
+                "}\n" +
+                "void main() {\n" +
+                "    float foo = pos0.y;\n" +
+                "    float funcres = myfunc(1.5);\n" +
+                "}\n";
+            compile(s);
+        });
     }
 }
diff --git a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/lexer/BoolTest.java b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/lexer/BoolTest.java
index 6d115e349c6..1ac8b222d95 100644
--- a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/lexer/BoolTest.java
+++ b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/lexer/BoolTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,21 +26,23 @@
 package com.sun.scenario.effect.compiler.lexer;
 
 import com.sun.scenario.effect.compiler.JSLLexer;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
 
 public class BoolTest extends LexerBase {
 
     @Test
-    public void trueLit() throws Exception {
+    public void trueLit() {
         assertRecognized("true");
     }
 
     @Test
-    public void falseLit() throws Exception {
+    public void falseLit() {
         assertRecognized("false");
     }
 
-    public void notABool() throws Exception {
+    @Test
+    public void notABool() {
         assertNotRecognized("629");
     }
 
diff --git a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/lexer/CommentTest.java b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/lexer/CommentTest.java
index 031acf5dbe4..ae62130dbb1 100644
--- a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/lexer/CommentTest.java
+++ b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/lexer/CommentTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,22 +26,23 @@
 package com.sun.scenario.effect.compiler.lexer;
 
 import com.sun.scenario.effect.compiler.JSLLexer;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
 
 public class CommentTest extends LexerBase {
 
     @Test
-    public void comment() throws Exception {
+    public void comment() {
         assertRecognized("/* ignored */");
     }
 
     @Test
-    public void multilineComment() throws Exception {
+    public void multilineComment() {
         assertRecognized("/* ignored \n * line 2 */");
     }
 
     @Test
-    public void notAComment() throws Exception {
+    public void notAComment() {
         assertNotRecognized("ignored");
     }
 
diff --git a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/lexer/FloatTest.java b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/lexer/FloatTest.java
index fb95f20684c..c09faf322e8 100644
--- a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/lexer/FloatTest.java
+++ b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/lexer/FloatTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,24 +26,25 @@
 package com.sun.scenario.effect.compiler.lexer;
 
 import com.sun.scenario.effect.compiler.JSLLexer;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
 
 public class FloatTest extends LexerBase {
 
     @Test
-    public void uptoOneMillion() throws Exception {
+    public void uptoOneMillion() {
         for (float i = 0f; i < 1e6; i += 1.723f) {
             assertRecognized(String.valueOf(i));
         }
     }
 
     @Test
-    public void noLeadingZero() throws Exception {
+    public void noLeadingZero() {
         assertRecognized(".1234567890");
     }
 
     @Test
-    public void badDigits() throws Exception {
+    public void badDigits() {
         assertNotRecognized("0110", "0");
     }
 
diff --git a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/lexer/IdentifierTest.java b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/lexer/IdentifierTest.java
index b343c48aed0..7d81b5df0fc 100644
--- a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/lexer/IdentifierTest.java
+++ b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/lexer/IdentifierTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,38 +27,42 @@
 
 import com.sun.scenario.effect.compiler.JSLLexer;
 import org.antlr.v4.runtime.misc.ParseCancellationException;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class IdentifierTest extends LexerBase {
 
     @Test
-    public void basic() throws Exception {
+    public void basic() {
         assertRecognized("foo");
     }
 
     @Test
-    public void mixedCase() throws Exception {
+    public void mixedCase() {
         assertRecognized("aAbBCCdd");
     }
 
     @Test
-    public void lettersAndDigits() throws Exception {
+    public void lettersAndDigits() {
         assertRecognized("aA29");
     }
 
     @Test
-    public void lettersAndDigitsAndSymbols() throws Exception {
+    public void lettersAndDigitsAndSymbols() {
         assertRecognized("$aA___29");
     }
 
     @Test
-    public void notAnId1() throws Exception {
+    public void notAnId1() {
         assertNotRecognized("6foo", "6");
     }
 
-    @Test(expected = ParseCancellationException.class)
-    public void notAnId2() throws Exception {
-        assertRecognized("###");
+    @Test
+    public void notAnId2() {
+        assertThrows(ParseCancellationException.class, () -> {
+            assertRecognized("###");
+        });
     }
 
     @Override
diff --git a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/lexer/IntegerTest.java b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/lexer/IntegerTest.java
index a59c274271a..ca7875205ee 100644
--- a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/lexer/IntegerTest.java
+++ b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/lexer/IntegerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,19 +26,20 @@
 package com.sun.scenario.effect.compiler.lexer;
 
 import com.sun.scenario.effect.compiler.JSLLexer;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
 
 public class IntegerTest extends LexerBase {
 
     @Test
-    public void uptoOneMillion() throws Exception {
+    public void uptoOneMillion() {
         for (int i = 0; i < 1e6; ++i) {
             assertRecognized(String.valueOf(i));
         }
     }
 
     @Test
-    public void badDigits() throws Exception {
+    public void badDigits() {
         recognize("H128376");
     }
 
diff --git a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/lexer/LexerBase.java b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/lexer/LexerBase.java
index 8d37fde86ae..0000946a19f 100644
--- a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/lexer/LexerBase.java
+++ b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/lexer/LexerBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,15 +38,16 @@
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public abstract class LexerBase {
 
-    protected void assertRecognized(char ch) throws Exception {
+    protected void assertRecognized(char ch) {
         assertRecognized(String.valueOf(ch));
     }
 
-    protected void assertRecognized(String text) throws Exception {
+    protected void assertRecognized(String text) {
         Token token = recognize(text);
         assertEquals(text, token.getText());
 
@@ -55,15 +56,15 @@ protected void assertRecognized(String text) throws Exception {
         }
     }
 
-    protected void assertNotRecognized(char ch) throws Exception {
+    protected void assertNotRecognized(char ch) {
         assertNotRecognized(String.valueOf(ch));
     }
 
-    protected void assertNotRecognized(String text) throws Exception {
+    protected void assertNotRecognized(String text) {
         assertNotRecognized(text, text);
     }
 
-    protected void assertNotRecognized(String text, String shouldLex) throws Exception {
+    protected void assertNotRecognized(String text, String shouldLex) {
         Token token = recognize(text);
         assertEquals(shouldLex, token.getText());
 
@@ -72,7 +73,7 @@ protected void assertNotRecognized(String text, String shouldLex) throws Excepti
         }
     }
 
-    protected Token recognize(String text) throws Exception {
+    protected Token recognize(String text) {
         JSLLexer lexer = lexerOver(text);
         return lexer.nextToken();
     }
diff --git a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/lexer/LineCommentTest.java b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/lexer/LineCommentTest.java
index 7a062b0d350..aee56e15ba3 100644
--- a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/lexer/LineCommentTest.java
+++ b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/lexer/LineCommentTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,17 +26,18 @@
 package com.sun.scenario.effect.compiler.lexer;
 
 import com.sun.scenario.effect.compiler.JSLLexer;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
 
 public class LineCommentTest extends LexerBase {
 
     @Test
-    public void comment() throws Exception {
+    public void comment() {
         assertRecognized("// ignored\n");
     }
 
     @Test
-    public void notAComment() throws Exception {
+    public void notAComment() {
         assertNotRecognized("ignored");
     }
 
diff --git a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/lexer/TypeTest.java b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/lexer/TypeTest.java
index e3b3b34b6a9..0ecb9c1c2f8 100644
--- a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/lexer/TypeTest.java
+++ b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/lexer/TypeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,77 +26,78 @@
 package com.sun.scenario.effect.compiler.lexer;
 
 import com.sun.scenario.effect.compiler.JSLLexer;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
 
 public class TypeTest extends LexerBase {
 
     @Test
-    public void floatScalar() throws Exception {
+    public void floatScalar() {
         assertRecognized("float");
     }
 
     @Test
-    public void floatVec2() throws Exception {
+    public void floatVec2() {
         assertRecognized("float2");
     }
 
     @Test
-    public void floatVec3() throws Exception {
+    public void floatVec3() {
         assertRecognized("float3");
     }
 
     @Test
-    public void floatVec4() throws Exception {
+    public void floatVec4() {
         assertRecognized("float4");
     }
 
     @Test
-    public void intScalar() throws Exception {
+    public void intScalar() {
         assertRecognized("int");
     }
 
     @Test
-    public void intVec2() throws Exception {
+    public void intVec2() {
         assertRecognized("int2");
     }
 
     @Test
-    public void intVec3() throws Exception {
+    public void intVec3() {
         assertRecognized("int3");
     }
 
     @Test
-    public void intVec4() throws Exception {
+    public void intVec4() {
         assertRecognized("int4");
     }
 
     @Test
-    public void boolScalar() throws Exception {
+    public void boolScalar() {
         assertRecognized("bool");
     }
 
     @Test
-    public void boolVec2() throws Exception {
+    public void boolVec2() {
         assertRecognized("bool2");
     }
 
     @Test
-    public void boolVec3() throws Exception {
+    public void boolVec3() {
         assertRecognized("bool3");
     }
 
     @Test
-    public void boolVec4() throws Exception {
+    public void boolVec4() {
         assertRecognized("bool4");
     }
 
     @Test
-    public void sampler() throws Exception {
+    public void sampler() {
         assertRecognized("sampler");
     }
 
     @Test
-    public void notAType() throws Exception {
+    public void notAType() {
         assertNotRecognized("double");
     }
 
diff --git a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/lexer/WhitespaceTest.java b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/lexer/WhitespaceTest.java
index 8d8cb62599a..6a511f6a046 100644
--- a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/lexer/WhitespaceTest.java
+++ b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/lexer/WhitespaceTest.java
@@ -26,32 +26,33 @@
 package com.sun.scenario.effect.compiler.lexer;
 
 import com.sun.scenario.effect.compiler.JSLLexer;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
 
 public class WhitespaceTest extends LexerBase {
 
     @Test
-    public void tab() throws Exception {
+    public void tab() {
         assertRecognized('\t');
     }
 
     @Test
-    public void space() throws Exception {
+    public void space() {
         assertRecognized(' ');
     }
 
     @Test
-    public void newLine() throws Exception {
+    public void newLine() {
         assertRecognized('\n');
     }
 
     @Test
-    public void carriageReturn() throws Exception {
+    public void carriageReturn() {
         assertRecognized('\r');
     }
 
     @Test
-    public void nonSpace() throws Exception {
+    public void nonSpace() {
         assertNotRecognized('4');
     }
 
diff --git a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/AddExprTest.java b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/AddExprTest.java
index 60ec5932096..39007ed94f3 100644
--- a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/AddExprTest.java
+++ b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/AddExprTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,15 +29,17 @@
 import com.sun.scenario.effect.compiler.model.BinaryOpType;
 import com.sun.scenario.effect.compiler.tree.BinaryExpr;
 import com.sun.scenario.effect.compiler.tree.JSLVisitor;
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class AddExprTest extends MultExprTest {
 
     private String mult;
 
-    @Before
+    @BeforeEach
     @Override
     public void setUp() {
         super.setUp();
@@ -45,29 +47,31 @@ public void setUp() {
     }
 
     @Test
-    public void oneAddition() throws Exception {
+    public void oneAddition() {
         BinaryExpr tree = parseTreeFor(mult + " + " + mult);
         assertEquals(BinaryOpType.ADD, tree.getOp());
     }
 
     @Test
-    public void oneSubtraction() throws Exception {
+    public void oneSubtraction() {
         BinaryExpr tree = parseTreeFor(mult + "   - " + mult);
         assertEquals(BinaryOpType.SUB, tree.getOp());
     }
 
     @Test
-    public void additiveCombination() throws Exception {
+    public void additiveCombination() {
         BinaryExpr tree = parseTreeFor(mult + " + " + mult + '-' + mult + '-' + mult + "   +" + mult);
         assertEquals(BinaryOpType.ADD, tree.getOp());
     }
 
-    @Test(expected = ClassCastException.class)
-    public void notAnAdditiveExpression() throws Exception {
-        parseTreeFor(mult + "!" + mult);
+    @Test
+    public void notAnAdditiveExpression() {
+        assertThrows(ClassCastException.class, () -> {
+            parseTreeFor(mult + "!" + mult);
+        });
     }
 
-    private BinaryExpr parseTreeFor(String text) throws Exception {
+    private BinaryExpr parseTreeFor(String text) {
         JSLParser parser = parserOver(text);
         JSLVisitor visitor = new JSLVisitor();
         return (BinaryExpr) visitor.visit(parser.additive_expression());
diff --git a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/AssignmentExprTest.java b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/AssignmentExprTest.java
index 53664e0a76f..120f1faed59 100644
--- a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/AssignmentExprTest.java
+++ b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/AssignmentExprTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,16 +35,17 @@
 import com.sun.scenario.effect.compiler.tree.VariableExpr;
 import com.sun.scenario.effect.compiler.tree.VectorCtorExpr;
 import org.antlr.v4.runtime.misc.ParseCancellationException;
-import org.junit.Test;
 
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class AssignmentExprTest extends ParserBase {
 
     @Test
-    public void userVar() throws Exception {
+    public void userVar() {
         BinaryExpr tree = parseTreeFor("foo = 32.0");
         assertEquals(Type.FLOAT, tree.getResultType());
         assertEquals(BinaryOpType.EQ, tree.getOp());
@@ -57,13 +58,15 @@ public void userVar() throws Exception {
         assertEquals(32.0f, val);
     }
 
-    @Test(expected = RuntimeException.class)
-    public void userROVar() throws Exception {
-        BinaryExpr tree = parseTreeFor("readonly = 32.0");
+    @Test
+    public void userROVar() {
+        assertThrows(RuntimeException.class, () -> {
+            BinaryExpr tree = parseTreeFor("readonly = 32.0");
+        });
     }
 
     @Test
-    public void coreVar() throws Exception {
+    public void coreVar() {
         BinaryExpr tree = parseTreeFor("color = float4(1.0)");
         assertEquals(Type.FLOAT4, tree.getResultType());
         assertEquals(BinaryOpType.EQ, tree.getOp());
@@ -84,7 +87,7 @@ public void coreVar() throws Exception {
     }
 
     @Test
-    public void coreVarField() throws Exception {
+    public void coreVarField() {
         BinaryExpr tree = parseTreeFor("color.r = 3.0");
         assertEquals(Type.FLOAT, tree.getResultType());
         assertEquals(BinaryOpType.EQ, tree.getOp());
@@ -99,22 +102,28 @@ public void coreVarField() throws Exception {
         assertEquals(3.0f, val);
     }
 
-    @Test(expected = RuntimeException.class)
-    public void coreROVar() throws Exception {
-        parseTreeFor("pos0 = float2(1.0)");
+    @Test
+    public void coreROVar() {
+        assertThrows(RuntimeException.class, () -> {
+            parseTreeFor("pos0 = float2(1.0)");
+        });
     }
 
-    @Test(expected = RuntimeException.class)
-    public void coreROVarField() throws Exception {
-        parseTreeFor("pos0.x = 1.0");
+    @Test
+    public void coreROVarField() {
+        assertThrows(RuntimeException.class, () -> {
+            parseTreeFor("pos0.x = 1.0");
+        });
     }
 
-    @Test(expected = ParseCancellationException.class)
-    public void notAnAssignment() throws Exception {
-        parseTreeFor("const foo");
+    @Test
+    public void notAnAssignment() {
+        assertThrows(ParseCancellationException.class, () -> {
+            parseTreeFor("const foo");
+        });
     }
 
-    private BinaryExpr parseTreeFor(String text) throws Exception {
+    private BinaryExpr parseTreeFor(String text) {
         JSLParser parser = parserOver(text);
         JSLVisitor visitor = new JSLVisitor();
         SymbolTable st = visitor.getSymbolTable();
diff --git a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/EqualityExprTest.java b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/EqualityExprTest.java
index e9b6fd38f44..2932a896f84 100644
--- a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/EqualityExprTest.java
+++ b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/EqualityExprTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,14 +34,15 @@
 import com.sun.scenario.effect.compiler.tree.LiteralExpr;
 import com.sun.scenario.effect.compiler.tree.VariableExpr;
 import org.antlr.v4.runtime.misc.ParseCancellationException;
-import org.junit.Test;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class EqualityExprTest extends ParserBase {
 
     @Test
-    public void oneEq() throws Exception {
+    public void oneEq() {
         BinaryExpr tree = parseTreeFor("foo == 3");
         assertEquals(tree.getOp(), BinaryOpType.EQEQ);
         assertEquals(Type.INT, tree.getLeft().getResultType());
@@ -55,7 +56,7 @@ public void oneEq() throws Exception {
     }
 
     @Test
-    public void oneNotEq() throws Exception {
+    public void oneNotEq() {
         BinaryExpr tree = parseTreeFor("foo != 3");
         assertEquals(tree.getOp(), BinaryOpType.NEQ);
         assertEquals(Type.INT, tree.getLeft().getResultType());
@@ -68,12 +69,14 @@ public void oneNotEq() throws Exception {
         assertEquals(3, val);
     }
 
-    @Test(expected = ParseCancellationException.class)
-    public void notAnEqualityExpression() throws Exception {
-        parseTreeFor("foo @ 3");
+    @Test
+    public void notAnEqualityExpression() {
+        assertThrows(ParseCancellationException.class, () -> {
+            parseTreeFor("foo @ 3");
+        });
     }
 
-    private BinaryExpr parseTreeFor(String text) throws Exception {
+    private BinaryExpr parseTreeFor(String text) {
         JSLParser parser = parserOver(text);
         JSLVisitor visitor = new JSLVisitor();
         visitor.getSymbolTable().declareVariable("foo", Type.INT, null);
diff --git a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/ExternalDeclarationTest.java b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/ExternalDeclarationTest.java
index b01619fffa1..a987b88d4b7 100644
--- a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/ExternalDeclarationTest.java
+++ b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/ExternalDeclarationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,14 +37,18 @@
 import com.sun.scenario.effect.compiler.tree.JSLVisitor;
 import com.sun.scenario.effect.compiler.tree.VarDecl;
 import org.antlr.v4.runtime.misc.ParseCancellationException;
-import org.junit.Test;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class ExternalDeclarationTest extends ParserBase {
 
     @Test
-    public void declaration() throws Exception {
+    public void declaration() {
         ExtDecl tree = parseTreeFor("param float4 foo;").get(0);
         assertTrue(tree instanceof VarDecl);
         VarDecl d = (VarDecl)tree;
@@ -57,7 +61,7 @@ public void declaration() throws Exception {
     }
 
     @Test
-    public void multiDeclaration() throws Exception {
+    public void multiDeclaration() {
         List<ExtDecl> decls = parseTreeFor("param float4 foo, bar;");
         assertEquals(decls.size(), 2);
         ExtDecl tree;
@@ -82,7 +86,7 @@ public void multiDeclaration() throws Exception {
     }
 
     @Test
-    public void funcDefNoParam() throws Exception {
+    public void funcDefNoParam() {
         ExtDecl tree = parseTreeFor("void test() { int i = 3; }").get(0);
         assertTrue(tree instanceof FuncDef);
         FuncDef d = (FuncDef)tree;
@@ -97,7 +101,7 @@ public void funcDefNoParam() throws Exception {
     }
 
     @Test
-    public void funcDefOneParam() throws Exception {
+    public void funcDefOneParam() {
         ExtDecl tree = parseTreeFor("void test(float3 foo) { int i = 3; }").get(0);
         assertTrue(tree instanceof FuncDef);
         FuncDef d = (FuncDef)tree;
@@ -112,7 +116,7 @@ public void funcDefOneParam() throws Exception {
     }
 
     @Test
-    public void funcDefTwoParam() throws Exception {
+    public void funcDefTwoParam() {
         ExtDecl tree = parseTreeFor("void test(float3 foo, float3 bar) { int i = 3; }").get(0);
         assertTrue(tree instanceof FuncDef);
         FuncDef d = (FuncDef)tree;
@@ -126,12 +130,14 @@ public void funcDefTwoParam() throws Exception {
         assertNotNull(d.getStmt());
     }
 
-    @Test(expected = ParseCancellationException.class)
-    public void notAnExtDecl() throws Exception {
-        parseTreeFor("foo = 4");
+    @Test
+    public void notAnExtDecl() {
+        assertThrows(ParseCancellationException.class, () -> {
+            parseTreeFor("foo = 4");
+        });
     }
 
-    private List<ExtDecl> parseTreeFor(String text) throws Exception {
+    private List<ExtDecl> parseTreeFor(String text) {
         JSLParser parser = parserOver(text);
         JSLVisitor visitor = new JSLVisitor();
         return visitor.visitExternal_declaration(parser.external_declaration()).getDecls();
diff --git a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/FieldSelectTest.java b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/FieldSelectTest.java
index bee326ce592..9b7a4a29a3d 100644
--- a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/FieldSelectTest.java
+++ b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/FieldSelectTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,112 +27,119 @@
 
 import com.sun.scenario.effect.compiler.JSLParser;
 import com.sun.scenario.effect.compiler.tree.JSLVisitor;
-import junit.framework.Assert;
-import junit.framework.AssertionFailedError;
 import org.antlr.v4.runtime.misc.ParseCancellationException;
-import org.junit.Test;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class FieldSelectTest extends ParserBase {
 
     @Test
-    public void rgba() throws Exception {
+    public void rgba() {
         String tree = parseTreeFor(".rgba");
         assertEquals(tree, ".rgba");
     }
 
     @Test
-    public void rgb() throws Exception {
+    public void rgb() {
         String tree = parseTreeFor(".rgb");
         assertEquals(tree, ".rgb");
     }
 
     @Test
-    public void rg() throws Exception {
+    public void rg() {
         String tree = parseTreeFor(".rg");
         assertEquals(tree, ".rg");
     }
 
     @Test
-    public void r() throws Exception {
+    public void r() {
         String tree = parseTreeFor(".r");
         assertEquals(tree, ".r");
     }
 
     @Test
-    public void aaaa() throws Exception {
+    public void aaaa() {
         String tree = parseTreeFor(".aaaa");
         assertEquals(tree, ".aaaa");
     }
 
     @Test
-    public void abgr() throws Exception {
+    public void abgr() {
         String tree = parseTreeFor(".abgr");
         assertEquals(tree, ".abgr");
     }
 
     @Test
-    public void xyzw() throws Exception {
+    public void xyzw() {
         String tree = parseTreeFor(".xyzw");
         assertEquals(tree, ".xyzw");
     }
 
     @Test
-    public void xyz() throws Exception {
+    public void xyz() {
         String tree = parseTreeFor(".xyz");
         assertEquals(tree, ".xyz");
     }
 
     @Test
-    public void xy() throws Exception {
+    public void xy() {
         String tree = parseTreeFor(".xy");
         assertEquals(tree, ".xy");
     }
 
     @Test
-    public void x() throws Exception {
+    public void x() {
         String tree = parseTreeFor(".x");
         assertEquals(tree, ".x");
     }
 
     @Test
-    public void zzz() throws Exception {
+    public void zzz() {
         String tree = parseTreeFor(".zzz");
         assertEquals(tree, ".zzz");
     }
 
     @Test
-    public void wzyz() throws Exception {
+    public void wzyz() {
         String tree = parseTreeFor(".wzyx");
         assertEquals(tree, ".wzyx");
     }
 
-    @Test(expected = ParseCancellationException.class)
-    public void notAFieldSelection1() throws Exception {
-        parseTreeFor("qpz");
+    @Test
+    public void notAFieldSelection1() {
+        assertThrows(ParseCancellationException.class, () -> {
+            parseTreeFor("qpz");
+        });
     }
 
-    @Test(expected = AssertionFailedError.class)
-    public void notAFieldSelection2() throws Exception {
-        parseTreeFor(".xqpz", true);
+    @Test
+    public void notAFieldSelection2() {
+        assertThrows(AssertionFailedError.class, () -> {
+            parseTreeFor(".xqpz", true);
+        });
     }
 
-    @Test(expected = AssertionFailedError.class)
-    public void tooManyVals() throws Exception {
-        parseTreeFor(".xyzwx", true);
+    @Test
+    public void tooManyVals() {
+        assertThrows(AssertionFailedError.class, () -> {
+            parseTreeFor(".xyzwx", true);
+        });
     }
 
-    @Test(expected = AssertionFailedError.class)
-    public void mixedVals() throws Exception {
-        parseTreeFor(".xyba", true);
+    @Test
+    public void mixedVals() {
+        assertThrows(AssertionFailedError.class, () -> {
+            parseTreeFor(".xyba", true);
+        });
     }
 
-    private String parseTreeFor(String text) throws Exception {
+    private String parseTreeFor(String text) {
         return parseTreeFor(text, false);
     }
 
-    private String parseTreeFor(String text, boolean expectEx) throws Exception {
+    private String parseTreeFor(String text, boolean expectEx) {
         JSLParser parser = parserOver(text);
         JSLVisitor visitor = new JSLVisitor();
         String ret = visitor.visitField_selection(parser.field_selection()).getString();
diff --git a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/FullySpecifiedTypeTest.java b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/FullySpecifiedTypeTest.java
index 720ab02f295..7f905da3782 100644
--- a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/FullySpecifiedTypeTest.java
+++ b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/FullySpecifiedTypeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,32 +31,36 @@
 import com.sun.scenario.effect.compiler.model.Type;
 import com.sun.scenario.effect.compiler.tree.JSLVisitor;
 import org.antlr.v4.runtime.misc.ParseCancellationException;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class FullySpecifiedTypeTest extends ParserBase {
 
     @Test
-    public void unqualified() throws Exception {
+    public void unqualified() {
         JSLVisitor.FullySpecifiedTypeExpr ret = parseTreeFor("float");
         assertNull(ret.getQual());
         assertEquals(Type.FLOAT, ret.getType());
     }
 
     @Test
-    public void qualified() throws Exception {
+    public void qualified() {
         JSLVisitor.FullySpecifiedTypeExpr ret = parseTreeFor("param bool3");
         assertEquals(Qualifier.PARAM, ret.getQual());
         assertEquals(Type.BOOL3, ret.getType());
     }
 
-    @Test(expected = ParseCancellationException.class)
-    public void notAFullySpecifiedType() throws Exception {
-        parseTreeFor("double");
+    @Test
+    public void notAFullySpecifiedType() {
+        assertThrows(ParseCancellationException.class, () -> {
+            parseTreeFor("double");
+        });
     }
 
-    private fully_specified_type_return parseTreeFor(String text) throws Exception {
+    private fully_specified_type_return parseTreeFor(String text) {
         JSLParser parser = parserOver(text);
         JSLVisitor visitor = new JSLVisitor();
         return (JSLVisitor.FullySpecifiedTypeExpr) visitor.visit(parser.fully_specified_type());
diff --git a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/IterationStatementTest.java b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/IterationStatementTest.java
index aa36df2d5b0..23188306f45 100644
--- a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/IterationStatementTest.java
+++ b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/IterationStatementTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,14 +35,16 @@
 import com.sun.scenario.effect.compiler.tree.Stmt;
 import com.sun.scenario.effect.compiler.tree.WhileStmt;
 import org.antlr.v4.runtime.misc.ParseCancellationException;
-import org.junit.Test;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class IterationStatementTest extends ParserBase {
 
     @Test
-    public void whileStmt() throws Exception {
+    public void whileStmt() {
         Stmt tree = parseTreeFor("while (i >= 3) j += 4;");
         assertTrue(tree instanceof WhileStmt);
         WhileStmt s = (WhileStmt)tree;
@@ -51,7 +53,7 @@ public void whileStmt() throws Exception {
     }
 
     @Test
-    public void doWhileStmt() throws Exception {
+    public void doWhileStmt() {
         Stmt tree = parseTreeFor("do j += 4; while (i >= 3);");
         assertTrue(tree instanceof DoWhileStmt);
         DoWhileStmt s = (DoWhileStmt)tree;
@@ -60,7 +62,7 @@ public void doWhileStmt() throws Exception {
     }
 
     @Test
-    public void forStmt() throws Exception {
+    public void forStmt() {
         Stmt tree = parseTreeFor("for (i = 0; i < 5; i += 2) j += 4;");
         assertTrue(tree instanceof ForStmt);
         ForStmt s = (ForStmt)tree;
@@ -71,7 +73,7 @@ public void forStmt() throws Exception {
     }
 
     @Test
-    public void forStmtNoCondition() throws Exception {
+    public void forStmtNoCondition() {
         Stmt tree = parseTreeFor("for (i = 0; ; i += 2) j += 4;");
         assertTrue(tree instanceof ForStmt);
         ForStmt s = (ForStmt)tree;
@@ -82,7 +84,7 @@ public void forStmtNoCondition() throws Exception {
     }
 
     @Test
-    public void forStmtNoIncrement() throws Exception {
+    public void forStmtNoIncrement() {
         Stmt tree = parseTreeFor("for (i = 0; i < 5; ) j += 4;");
         assertTrue(tree instanceof ForStmt);
         ForStmt s = (ForStmt)tree;
@@ -93,7 +95,7 @@ public void forStmtNoIncrement() throws Exception {
     }
 
     @Test
-    public void forStmtNoConditionOrIncrement() throws Exception {
+    public void forStmtNoConditionOrIncrement() {
         Stmt tree = parseTreeFor("for (i = 0; ; ) j += 4;");
         assertTrue(tree instanceof ForStmt);
         ForStmt s = (ForStmt)tree;
@@ -103,12 +105,14 @@ public void forStmtNoConditionOrIncrement() throws Exception {
         assertTrue(s.getStmt() instanceof ExprStmt);
     }
 
-    @Test(expected = ParseCancellationException.class)
-    public void notAnIterationStmt() throws Exception {
-        parseTreeFor("return;");
+    @Test
+    public void notAnIterationStmt() {
+        assertThrows(ParseCancellationException.class, () -> {
+            parseTreeFor("return;");
+        });
     }
 
-    private Stmt parseTreeFor(String text) throws Exception {
+    private Stmt parseTreeFor(String text) {
         JSLParser parser = parserOver(text);
         JSLVisitor visitor = new JSLVisitor();
         visitor.getSymbolTable().declareVariable("i", Type.INT, null);
diff --git a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/JumpStatementTest.java b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/JumpStatementTest.java
index 7e368101917..9116bdccc52 100644
--- a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/JumpStatementTest.java
+++ b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/JumpStatementTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,40 +34,42 @@
 import com.sun.scenario.effect.compiler.tree.ReturnStmt;
 import com.sun.scenario.effect.compiler.tree.Stmt;
 import org.antlr.v4.runtime.misc.ParseCancellationException;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class JumpStatementTest extends ParserBase {
 
     @Test
-    public void cont() throws Exception {
+    public void cont() {
         Stmt tree = parseTreeFor("continue;");
         assertTrue(tree instanceof ContinueStmt);
     }
 
     @Test
-    public void brk() throws Exception {
+    public void brk() {
         Stmt tree = parseTreeFor(" break ; ");
         assertTrue(tree instanceof BreakStmt);
     }
 
     @Test
-    public void discard() throws Exception {
+    public void discard() {
         Stmt tree = parseTreeFor("discard;");
         assertTrue(tree instanceof DiscardStmt);
     }
 
     @Test
-    public void returnEmpty() throws Exception {
+    public void returnEmpty() {
         Stmt tree = parseTreeFor("return;");
         assertTrue(tree instanceof ReturnStmt);
         assertNull(((ReturnStmt)tree).getExpr());
     }
 
     @Test
-    public void returnExpr() throws Exception {
+    public void returnExpr() {
         Stmt tree = parseTreeFor("return 3;");
         assertTrue(tree instanceof ReturnStmt);
         ReturnStmt ret = (ReturnStmt)tree;
@@ -76,12 +78,14 @@ public void returnExpr() throws Exception {
         assertEquals(lit.getValue(), Integer.valueOf(3));
     }
 
-    @Test(expected = ParseCancellationException.class)
-    public void notAJump() throws Exception {
-        parseTreeFor("float;");
+    @Test
+    public void notAJump() {
+        assertThrows(ParseCancellationException.class, () -> {
+            parseTreeFor("float;");
+        });
     }
 
-    private Stmt parseTreeFor(String text) throws Exception {
+    private Stmt parseTreeFor(String text) {
         JSLParser parser = parserOver(text);
         JSLVisitor visitor = new JSLVisitor();
         return visitor.visitJump_statement(parser.jump_statement());
diff --git a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/MultExprTest.java b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/MultExprTest.java
index 14be21e4c8c..9b0e38edfca 100644
--- a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/MultExprTest.java
+++ b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/MultExprTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,15 +30,17 @@
 import com.sun.scenario.effect.compiler.tree.BinaryExpr;
 import com.sun.scenario.effect.compiler.tree.JSLVisitor;
 import org.antlr.runtime.RecognitionException;
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class MultExprTest extends UnaryExprTest {
 
     private String unary;
 
-    @Before
+    @BeforeEach
     @Override
     public void setUp() {
         super.setUp();
@@ -46,29 +48,31 @@ public void setUp() {
     }
 
     @Test
-    public void oneMultiplication() throws Exception {
+    public void oneMultiplication() {
         BinaryExpr tree = parseTreeFor(unary + " * " + unary);
         assertEquals(tree.getOp(), BinaryOpType.MUL);
     }
 
     @Test
-    public void oneDivision() throws Exception {
+    public void oneDivision() {
         BinaryExpr tree = parseTreeFor(unary + "   / " + unary);
         assertEquals(tree.getOp(), BinaryOpType.DIV);
     }
 
     @Test
-    public void expressionCombination() throws Exception {
+    public void expressionCombination() {
         BinaryExpr tree = parseTreeFor(unary + " * " + unary + '/' + unary + '/' + unary + "   *" + unary);
         assertEquals(tree.getOp(), BinaryOpType.MUL);
     }
 
-    @Test(expected = ClassCastException.class)
-    public void notAMultiplicativeExpression() throws Exception {
-        parseTreeFor("3 + 3");
+    @Test
+    public void notAMultiplicativeExpression() {
+        assertThrows(ClassCastException.class, () -> {
+            parseTreeFor("3 + 3");
+        });
     }
 
-    private BinaryExpr parseTreeFor(String text) throws Exception {
+    private BinaryExpr parseTreeFor(String text) {
         JSLParser parser = parserOver(text);
         JSLVisitor visitor = new JSLVisitor();
         return (BinaryExpr) visitor.visit(parser.multiplicative_expression());
diff --git a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/PrimaryExprTest.java b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/PrimaryExprTest.java
index 1b2318c00c5..75220a23aa5 100644
--- a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/PrimaryExprTest.java
+++ b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/PrimaryExprTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,11 +32,13 @@
 import com.sun.scenario.effect.compiler.tree.LiteralExpr;
 import com.sun.scenario.effect.compiler.tree.VariableExpr;
 import org.antlr.v4.runtime.misc.ParseCancellationException;
-import org.junit.Before;
-import org.junit.Test;
 import static com.sun.scenario.effect.compiler.parser.Expressions.SIMPLE_EXPRESSION;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class PrimaryExprTest extends ParserBase {
 
@@ -48,51 +50,53 @@ public void setUp() {
     }
 
     @Test
-    public void variable() throws Exception {
+    public void variable() {
         Expr tree = parseTreeFor("foo");
         assertTrue(tree instanceof VariableExpr);
         assertEquals(((VariableExpr)tree).getVariable().getName(), "foo");
     }
 
     @Test
-    public void intLiteral() throws Exception {
+    public void intLiteral() {
         Expr tree = parseTreeFor("123");
         assertTrue(tree instanceof LiteralExpr);
         assertEquals(((LiteralExpr)tree).getValue(), Integer.valueOf(123));
     }
 
     @Test
-    public void floatLiteral() throws Exception {
+    public void floatLiteral() {
         Expr tree = parseTreeFor("1.234");
         assertTrue(tree instanceof LiteralExpr);
         assertEquals(((LiteralExpr)tree).getValue(), Float.valueOf(1.234f));
     }
 
     @Test
-    public void boolLiteralT() throws Exception {
+    public void boolLiteralT() {
         Expr tree = parseTreeFor("true");
         assertTrue(tree instanceof LiteralExpr);
         assertEquals(((LiteralExpr)tree).getValue(), Boolean.TRUE);
     }
 
     @Test
-    public void boolLiteralF() throws Exception {
+    public void boolLiteralF() {
         Expr tree = parseTreeFor("false");
         assertTrue(tree instanceof LiteralExpr);
         assertEquals(((LiteralExpr)tree).getValue(), Boolean.FALSE);
     }
 
     @Test
-    public void bracketted() throws Exception {
+    public void bracketted() {
         Expr tree = parseTreeFor("(" + primary + ")");
     }
 
-    @Test(expected = ParseCancellationException.class)
-    public void notAPrimaryExpression() throws Exception {
-        parseTreeFor("!(@&#");
+    @Test
+    public void notAPrimaryExpression() {
+        assertThrows(ParseCancellationException.class, () -> {
+            parseTreeFor("!(@&#");
+        });
     }
 
-    private Expr parseTreeFor(String text) throws Exception {
+    private Expr parseTreeFor(String text) {
         JSLParser parser = parserOver(text);
         JSLVisitor visitor = new JSLVisitor();
         visitor.getSymbolTable().declareVariable("foo", Type.INT, null);
diff --git a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/RelationalExprTest.java b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/RelationalExprTest.java
index e9446aa46d9..8a519911400 100644
--- a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/RelationalExprTest.java
+++ b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/RelationalExprTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,42 +31,45 @@
 import com.sun.scenario.effect.compiler.tree.BinaryExpr;
 import com.sun.scenario.effect.compiler.tree.JSLVisitor;
 import org.antlr.v4.runtime.misc.ParseCancellationException;
-import org.junit.Test;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class RelationalExprTest extends ParserBase {
 
     @Test
-    public void oneLtEq() throws Exception {
+    public void oneLtEq() {
         BinaryExpr tree = parseTreeFor("foo <= 3");
         assertEquals(tree.getOp(), BinaryOpType.LTEQ);
     }
 
     @Test
-    public void oneGtEq() throws Exception {
+    public void oneGtEq() {
         BinaryExpr tree = parseTreeFor("foo >= 3");
         assertEquals(tree.getOp(), BinaryOpType.GTEQ);
     }
 
     @Test
-    public void oneLt() throws Exception {
+    public void oneLt() {
         BinaryExpr tree = parseTreeFor("foo < 3");
         assertEquals(tree.getOp(), BinaryOpType.LT);
     }
 
     @Test
-    public void oneGt() throws Exception {
+    public void oneGt() {
         BinaryExpr tree = parseTreeFor("foo > 3");
         assertEquals(tree.getOp(), BinaryOpType.GT);
     }
 
-    @Test(expected = ParseCancellationException.class)
-    public void notARelationalExpression() throws Exception {
-        parseTreeFor("foo @ 3");
+    @Test
+    public void notARelationalExpression() {
+        assertThrows(ParseCancellationException.class, () -> {
+            parseTreeFor("foo @ 3");
+        });
     }
 
-    private BinaryExpr parseTreeFor(String text) throws Exception {
+    private BinaryExpr parseTreeFor(String text) {
         JSLParser parser = parserOver(text);
         JSLVisitor visitor = new JSLVisitor();
         visitor.getSymbolTable().declareVariable("foo", Type.INT, null);
diff --git a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/SelectionStatementTest.java b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/SelectionStatementTest.java
index 3f0226febc0..267974e3fb9 100644
--- a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/SelectionStatementTest.java
+++ b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/SelectionStatementTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,14 +33,16 @@
 import com.sun.scenario.effect.compiler.tree.SelectStmt;
 import com.sun.scenario.effect.compiler.tree.Stmt;
 import org.antlr.v4.runtime.misc.ParseCancellationException;
-import org.junit.Test;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class SelectionStatementTest extends ParserBase {
 
     @Test
-    public void ifOnly() throws Exception {
+    public void ifOnly() {
         Stmt tree = parseTreeFor("if (foo >= 3) foo += 12;");
         assertTrue(tree instanceof SelectStmt);
         SelectStmt s = (SelectStmt)tree;
@@ -50,7 +52,7 @@ public void ifOnly() throws Exception {
     }
 
     @Test
-    public void ifAndElse() throws Exception {
+    public void ifAndElse() {
         Stmt tree = parseTreeFor("if (true) foo+=5; else --foo;");
         assertTrue(tree instanceof SelectStmt);
         SelectStmt s = (SelectStmt)tree;
@@ -59,12 +61,14 @@ public void ifAndElse() throws Exception {
         assertTrue(s.getElseStmt() instanceof ExprStmt);
     }
 
-    @Test(expected = ParseCancellationException.class)
-    public void notASelect() throws Exception {
-        parseTreeFor("then (so) { bobs yer uncle }");
+    @Test
+    public void notASelect() {
+        assertThrows(ParseCancellationException.class, () -> {
+            parseTreeFor("then (so) { bobs yer uncle }");
+        });
     }
 
-    private Stmt parseTreeFor(String text) throws Exception {
+    private Stmt parseTreeFor(String text) {
         JSLParser parser = parserOver(text);
         JSLVisitor visitor = new JSLVisitor();
         visitor.getSymbolTable().declareVariable("foo", Type.INT, null);
diff --git a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/UnaryExprTest.java b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/UnaryExprTest.java
index a64d5238fc8..097e1ce6531 100644
--- a/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/UnaryExprTest.java
+++ b/modules/javafx.graphics/src/test/jslc/com/sun/scenario/effect/compiler/parser/UnaryExprTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,15 +33,17 @@
 import com.sun.scenario.effect.compiler.tree.UnaryExpr;
 import com.sun.scenario.effect.compiler.tree.VariableExpr;
 import org.antlr.v4.runtime.misc.ParseCancellationException;
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class UnaryExprTest extends PrimaryExprTest {
 
     private String primary;
 
-    @Before
+    @BeforeEach
     @Override
     public void setUp() {
         super.setUp();
@@ -49,60 +51,62 @@ public void setUp() {
     }
 
     @Test
-    public void negated() throws Exception {
+    public void negated() {
         UnaryExpr tree = parseTreeFor("!true");
         assertEquals(tree.getOp(), UnaryOpType.NOT);
         assertEquals(((LiteralExpr)tree.getExpr()).getValue(), Boolean.TRUE);
     }
 
     @Test
-    public void positive() throws Exception {
+    public void positive() {
         UnaryExpr tree = parseTreeFor("+72.4");
         assertEquals(tree.getOp(), UnaryOpType.PLUS);
         assertEquals(((LiteralExpr)tree.getExpr()).getValue(), Float.valueOf(72.4f));
     }
 
     @Test
-    public void negative() throws Exception {
+    public void negative() {
         UnaryExpr tree = parseTreeFor("-72.4");
         assertEquals(tree.getOp(), UnaryOpType.MINUS);
         assertEquals(((LiteralExpr)tree.getExpr()).getValue(), Float.valueOf(72.4f));
     }
 
     @Test
-    public void preIncrement() throws Exception {
+    public void preIncrement() {
         UnaryExpr tree = parseTreeFor("++foo");
         assertEquals(tree.getOp(), UnaryOpType.INC);
         assertEquals(((VariableExpr)tree.getExpr()).getVariable().getName(), "foo");
     }
 
     @Test
-    public void preDecrement() throws Exception {
+    public void preDecrement() {
         UnaryExpr tree = parseTreeFor("--foo");
         assertEquals(tree.getOp(), UnaryOpType.DEC);
         assertEquals(((VariableExpr)tree.getExpr()).getVariable().getName(), "foo");
     }
 
     @Test
-    public void postIncrement() throws Exception {
+    public void postIncrement() {
         UnaryExpr tree = parseTreeFor("foo++");
         assertEquals(tree.getOp(), UnaryOpType.INC);
         assertEquals(((VariableExpr)tree.getExpr()).getVariable().getName(), "foo");
     }
 
     @Test
-    public void postDecrement() throws Exception {
+    public void postDecrement() {
         UnaryExpr tree = parseTreeFor("foo--");
         assertEquals(tree.getOp(), UnaryOpType.DEC);
         assertEquals(((VariableExpr)tree.getExpr()).getVariable().getName(), "foo");
     }
 
-    @Test(expected = ParseCancellationException.class)
-    public void notAUnaryExpression() throws Exception {
-        parseTreeFor("^" + primary);
+    @Test
+    public void notAUnaryExpression() {
+        assertThrows(ParseCancellationException.class, () -> {
+            parseTreeFor("^" + primary);
+        });
     }
 
-    private UnaryExpr parseTreeFor(String text) throws Exception {
+    private UnaryExpr parseTreeFor(String text) {
         JSLParser parser = parserOver(text);
         JSLVisitor visitor = new JSLVisitor();
         visitor.getSymbolTable().declareVariable("foo", Type.INT, null);

From 21601f8ff108d2829d057d5e85e05843f4ccb5e3 Mon Sep 17 00:00:00 2001
From: Andy Goryachev <angorya@openjdk.org>
Date: Tue, 24 Sep 2024 14:24:50 +0000
Subject: [PATCH 50/75] 8339510: [TestBug] Convert system tests to JUnit 5

Reviewed-by: kcr, lkostyra
---
 .../glass/ui/DefaultExceptionHandlerTest.java |  15 +-
 .../sun/glass/ui/ExceptionHandlerTest.java    |  15 +-
 .../sun/glass/ui/gtk/Gtk2RemovalCommon.java   |   7 +-
 .../sun/glass/ui/mac/MacPasteboardTest.java   |  42 +-
 .../sun/glass/ui/monocle/EPDSettingsTest.java |  70 +--
 .../sun/glass/ui/monocle/FramebufferTest.java |   5 +-
 .../glass/ui/monocle/FramebufferY8Test.java   |  26 +-
 .../com/sun/glass/ui/monocle/IntSetTest.java  |  77 ++--
 .../headless/HeadlessGeometry1Test.java       |  20 +-
 .../headless/HeadlessGeometry2Test.java       |  20 +-
 .../application/ConcurrentStartupTest.java    |  18 +-
 .../javafx/application/HostServicesTest.java  |  22 +-
 .../application/InitializeJavaFXBase.java     |   8 +-
 .../InitializeJavaFXLaunch1Test.java          |  13 +-
 .../InitializeJavaFXLaunch2Test.java          |  13 +-
 .../InitializeJavaFXLaunchBase.java           |   8 +-
 .../InitializeJavaFXStartup1Test.java         |  13 +-
 .../InitializeJavaFXStartup2Test.java         |  14 +-
 .../application/ListenerError1Test.java       |   4 +-
 .../application/ListenerError2Test.java       |   4 +-
 .../application/ListenerException1Test.java   |   4 +-
 .../application/ListenerException2Test.java   |   4 +-
 .../javafx/application/ListenerExitTest.java  |   4 +-
 .../javafx/application/ListenerIdle1Test.java |   4 +-
 .../javafx/application/ListenerIdle2Test.java |   4 +-
 .../application/ListenerTestCommon.java       |  37 +-
 .../sun/javafx/application/NullCCLTest.java   |  34 +-
 .../javafx/application/PlatformExit1Test.java |   9 +-
 .../javafx/application/PlatformExit2Test.java |   9 +-
 .../javafx/application/PlatformExit3Test.java |   9 +-
 .../javafx/application/PlatformExit4Test.java |   9 +-
 .../application/PlatformExitCommon.java       |  13 +-
 .../application/PlatformExitSimpleTest.java   |   9 +-
 .../application/PlatformStartupCommon.java    |  22 +-
 .../PlatformStartupExplicitTest.java          |   4 +-
 .../PlatformStartupImplicitTest.java          |   4 +-
 .../PlatformStartupMemoryLeakTest.java        |   8 +-
 .../sun/javafx/application/RunLaterTest.java  |  18 +-
 .../application/SceneGraphHTMLEditorTest.java |  23 +-
 .../application/SceneGraphThread1Test.java    |   4 +-
 .../application/SceneGraphThread2Test.java    |   4 +-
 .../application/SceneGraphThread3Test.java    |   4 +-
 .../application/SceneGraphThread4Test.java    |   4 +-
 .../application/SceneGraphThreadCommon.java   |  21 +-
 .../javafx/application/SingleExitCommon.java  |  27 +-
 .../application/SingleExitExplicit1Test.java  |   4 +-
 .../application/SingleExitExplicit2Test.java  |   4 +-
 .../SingleExitExplicitError1Test.java         |   4 +-
 .../SingleExitExplicitError2Test.java         |   4 +-
 .../SingleExitExplicitException1Test.java     |   4 +-
 .../SingleExitExplicitException2Test.java     |   4 +-
 .../SingleExitImplicitErrorTest.java          |   4 +-
 .../SingleExitImplicitExceptionTest.java      |   4 +-
 .../application/SingleExitImplicitTest.java   |   4 +-
 .../SingleNoShowExplicit1Test.java            |   4 +-
 .../SingleNoShowExplicit2Test.java            |   4 +-
 .../SingleNoShowExplicitError1Test.java       |   4 +-
 .../SingleNoShowExplicitError2Test.java       |   4 +-
 .../SingleNoShowExplicitException1Test.java   |   4 +-
 .../SingleNoShowExplicitException2Test.java   |   4 +-
 .../SingleNoShowImplicitErrorTest.java        |   4 +-
 .../SingleNoShowImplicitExceptionTest.java    |   4 +-
 .../application/SingleNoShowImplicitTest.java |   4 +-
 .../javafx/application/StaticStartupTest.java |  17 +-
 .../javafx/application/SwingExitCommon.java   |  25 +-
 .../application/SwingExitExplicit1Test.java   |   4 +-
 .../application/SwingExitExplicit2Test.java   |   2 +-
 .../application/SwingExitImplicitTest.java    |   4 +-
 .../sun/javafx/application/SwingNoExit.java   |  40 +-
 .../javafx/application/TaskbarApp1Test.java   |   4 +-
 .../javafx/application/TaskbarApp2Test.java   |   4 +-
 .../javafx/application/TaskbarApp3Test.java   |   4 +-
 .../javafx/application/TaskbarApp4Test.java   |   4 +-
 .../javafx/application/TaskbarApp5Test.java   |   4 +-
 .../javafx/application/TaskbarAppCommon.java  |  24 +-
 .../StylesheetWithSecurityManagerTest.java    |   6 +-
 .../sun/javafx/font/freetype/PangoTest.java   |  22 +-
 .../sun/javafx/iio/LoadCorruptJPEGTest.java   |  20 +-
 .../sun/javafx/image/impl/ImageRaceTest.java  |  12 +-
 .../com/sun/javafx/sg/prism/RT36296Test.java  |  23 +-
 .../com/sun/javafx/text/TextHitInfoTest.java  |   9 +-
 .../com/sun/javafx/text/TextLayoutTest.java   |  16 +-
 .../javafx/tk/quantum/CloseWindowTest.java    |  13 +-
 .../javafx/tk/quantum/SystemMenuBarTest.java  |  44 +-
 .../tk/quantum/ViewPainterLeakTest.java       |  15 +-
 .../quantum/WindowSceneInitDisposeTest.java   |  13 +-
 .../test/com/sun/marlin/ClipShapeTest.java    |  34 +-
 .../test/com/sun/marlin/DashedRectTest.java   |  26 +-
 .../com/sun/marlin/HugePolygonClipTest.java   |  24 +-
 .../java/test/com/sun/marlin/QPathTest.java   |  27 +-
 .../test/com/sun/marlin/ScaleClipTest.java    |  28 +-
 .../java/test/com/sun/marlin/ScaleX0Test.java |  19 +-
 .../impl/PNTMeshVertexBufferLengthTest.java   |  42 +-
 .../com/sun/prism/impl/ps/ShapeCacheTest.java |  18 +-
 .../sun/webkit/LocalStorageAccessTest.java    |  20 +-
 .../test/com/sun/webkit/MainThreadTest.java   |  13 +-
 .../VirtualFlowMemoryLeakTest.java            |  19 +-
 .../ImageCacheLeakTest.java                   |   9 +-
 .../embed/swing/FXImageConversionTest.java    |  12 +-
 .../swing/JFXPanelEmbeddedWindowTest.java     |  20 +-
 .../test/javafx/embed/swing/JFXPanelTest.java |  40 +-
 .../javafx/embed/swing/SwingFXUtilsTest.java  |  22 +-
 .../swing/SwingNodeContentMemoryLeakTest.java |  12 +-
 .../swing/SwingNodeDnDMemoryLeakTest.java     |  22 +-
 .../embed/swing/SwingNodeMemoryLeakTest.java  |  12 +-
 .../embed/swing/SwingNodeScaleTest.java       |  22 +-
 .../test/javafx/scene/CssStyleHelperTest.java |  29 +-
 .../scene/ImageCursorGetBestSizeTest.java     |  22 +-
 .../scene/InitialNodesMemoryLeakTest.java     |  13 +-
 .../test/javafx/scene/NewSceneSizeTest.java   |  25 +-
 .../javafx/scene/NodeTreeShowingTest.java     |  18 +-
 .../javafx/scene/QuadraticCssTimeTest.java    |  18 +-
 .../javafx/scene/RestoreSceneSizeTest.java    |  29 +-
 .../java/test/javafx/scene/Snapshot1Test.java | 157 +++----
 .../java/test/javafx/scene/Snapshot2Test.java | 411 ++++++++++--------
 .../test/javafx/scene/SnapshotCommon.java     |  46 +-
 .../javafx/scene/StyleMemoryLeakTest.java     |  20 +-
 .../test/javafx/scene/UIRenderDialogTest.java |  29 +-
 .../test/javafx/scene/UIRenderSceneTest.java  |  24 +-
 .../javafx/scene/UIRenderSnapToPixelTest.java |  29 +-
 .../control/AccordionTitlePaneLeakTest.java   |  10 +-
 .../control/MenuButtonSkinBaseNPETest.java    |  19 +-
 .../control/ProgressIndicatorLeakTest.java    |  25 +-
 .../scene/control/TabPaneHeaderLeakTest.java  |  13 +-
 ...artExceptionOnAddingRemovedSeriesTest.java |  56 +--
 .../image/WritableImageFromBufferTest.java    |  23 +-
 .../javafx/scene/input/ClipboardTest.java     |  23 +-
 .../lighting3D/DirectionalLightTest.java      |  22 +-
 .../javafx/scene/lighting3D/LightingTest.java |   7 +-
 .../lighting3D/PointLightAttenuationTest.java |  30 +-
 .../lighting3D/SpotLightAttenuationTest.java  |  26 +-
 .../scene/shape/ShapeViewOrderLeakTest.java   |  13 +-
 .../MeshManagerCacheLeakTest.java             |  20 +-
 .../javafx/scene/text/ArabicWrappingTest.java |  33 +-
 .../javafx/scene/text/TextFlowNodeTest.java   |  24 +-
 .../test/javafx/scene/text/TextNodeTest.java  |  50 ++-
 .../test/javafx/scene/web/CSSFilterTest.java  |  32 +-
 .../test/javafx/scene/web/CanvasTest.java     |  40 +-
 .../test/javafx/scene/web/HTMLEditorTest.java |  67 ++-
 .../test/javafx/scene/web/PageFillTest.java   |  29 +-
 .../java/test/javafx/scene/web/SVGTest.java   |  34 +-
 .../javafx/scene/web/StraightLineTest.java    |  22 +-
 .../javafx/scene/web/WebIObserverTest.java    |  36 +-
 .../test/javafx/scene/web/WebPageTest.java    |  31 +-
 .../javafx/stage/ChildStageLocationTest.java  |  28 +-
 .../stage/DeiconifiedWithChildTest.java       |  25 +-
 .../stage/FocusedWindowMonocleTest.java       |  12 +-
 .../javafx/stage/FocusedWindowNativeTest.java |  12 +-
 .../javafx/stage/FocusedWindowTestBase.java   |  13 +-
 .../test/javafx/stage/InitialSizeTest.java    |  21 +-
 .../stage/MakeResizableAndResizeTest.java     |  21 +-
 .../javafx/stage/MaximizeUndecorated.java     |  14 +-
 .../javafx/stage/MultipleScreensTest.java     |  48 +-
 .../NestedEventLoopPlatformExitTest.java      |  17 +-
 .../javafx/stage/NestedEventLoopTest.java     |  71 +--
 .../stage/RestoreStagePositionTest.java       |  39 +-
 .../java/test/javafx/stage/ScreenTest.java    |  26 +-
 .../test/javafx/stage/ShowAndWaitTest.java    | 239 +++++-----
 .../javafx/stage/StageAtTopPositionTest.java  |  27 +-
 .../test/launchertest/JarLauncherTest.java    |  26 +-
 .../test/launchertest/MainLauncherTest.java   | 187 ++++----
 .../test/launchertest/ModuleLauncherTest.java | 112 ++---
 .../test/launchertest/PlatformExitTest.java   |  27 +-
 .../java/test/launchertest/TestAppDaemon.java |   5 +-
 .../test/memoryleak/JSCallbackMemoryTest.java |  91 ++--
 .../java/test/renderlock/RenderLock1Test.java |   6 +-
 .../test/renderlock/RenderLockCommon.java     |  27 +-
 .../glass/ui/monocle/CreateDeviceTest.java    |  17 +-
 .../sun/glass/ui/monocle/DoubleClickTest.java |  26 +-
 .../sun/glass/ui/monocle/DragAndDropTest.java |  21 +-
 .../monocle/DragTouchInAndOutAWindowTest.java |  83 ++--
 .../sun/glass/ui/monocle/FuzzyTapTest.java    |  59 +--
 .../ui/monocle/InputDevicePropertyTest.java   |  51 +--
 .../sun/glass/ui/monocle/ModalDialogTest.java |  22 +-
 .../ui/monocle/MonocleApplicationTest.java    |  12 +-
 .../sun/glass/ui/monocle/MouseLagTest.java    |  29 +-
 .../sun/glass/ui/monocle/MultiTouch2Test.java |  50 ++-
 .../sun/glass/ui/monocle/MultiTouch3Test.java |  20 +-
 .../ui/monocle/ParameterizedTestBase.java     |  61 ++-
 .../sun/glass/ui/monocle/RapidTapTest.java    |  47 +-
 .../com/sun/glass/ui/monocle/RobotTest.java   |  26 +-
 .../com/sun/glass/ui/monocle/RotateTest.java  | 158 ++++---
 .../com/sun/glass/ui/monocle/ScrollTest.java  | 111 +++--
 .../sun/glass/ui/monocle/ScrollTestBase.java  |  74 ++--
 .../glass/ui/monocle/ScrollThresholdTest.java |  37 +-
 .../sun/glass/ui/monocle/SimpleMouseTest.java |  43 +-
 .../monocle/SingleTouchNonFullScreenTest.java |  77 ++--
 .../sun/glass/ui/monocle/SingleTouchTest.java | 143 +++---
 .../sun/glass/ui/monocle/SwipeSimpleTest.java | 132 +++---
 .../com/sun/glass/ui/monocle/SwipeTest.java   |  65 +--
 .../sun/glass/ui/monocle/TestApplication.java |  27 +-
 .../sun/glass/ui/monocle/TouchButtonTest.java |  74 ++--
 .../ui/monocle/TouchEventLookaheadTest.java   |  29 +-
 .../glass/ui/monocle/TouchExceptionTest.java  |  19 +-
 .../sun/glass/ui/monocle/TouchLagTest.java    |  27 +-
 .../glass/ui/monocle/TouchPipelineTest.java   |  15 +-
 .../sun/glass/ui/monocle/TouchTestBase.java   |   8 +-
 .../sun/glass/ui/monocle/USKeyboardTest.java  |  20 +-
 .../com/sun/glass/ui/monocle/ZoomTest.java    |  69 +--
 .../input/devices/DellP2714TDevice.java       |  11 +-
 .../devices/EGalaxMultiTouchDeviceBase.java   |  13 +-
 .../devices/EGalaxSingleTouchDeviceBase.java  |   6 +-
 .../devices/SamsungLMS700KF07004Device.java   |   6 +-
 .../input/devices/SingleTouchDevice2.java     |   6 +-
 .../input/devices/TestTouchDevices.java       |   7 +-
 .../devices/TouchRevolutionFusionDevice.java  |  11 +-
 .../com/sun/prism/NGNodeDirtyFlagTest.java    |   2 +-
 .../helloworld/CustomSecurityManagerTest.java |  44 +-
 .../test/robot/helloworld/RectangleTest.java  |  15 +-
 .../javafx/application/KeyLockedTest.java     |  44 +-
 .../javafx/embed/swing/JFXPanelHiDPITest.java |  21 +-
 .../embed/swing/JFXPanelScaledTest.java       |  21 +-
 .../javafx/embed/swing/JFXPanelTest.java      |  36 +-
 .../embed/swing/NonFocusableJFXPanelTest.java |  25 +-
 .../robot/javafx/embed/swing/RT23603Test.java |  31 +-
 .../robot/javafx/embed/swing/RT30650Test.java |  13 +-
 .../robot/javafx/embed/swing/RT32570Test.java |  19 +-
 .../javafx/embed/swing/SwingNodeBase.java     |  24 +-
 .../embed/swing/SwingNodeJDialogTest.java     |  27 +-
 .../swing/SwingNodePlatformExitCrashTest.java |  14 +-
 .../javafx/scene/AfterModalClosedTest.java    |  23 +-
 ...oiceBoxScrollUpOnCollectionChangeTest.java |  34 +-
 .../robot/javafx/scene/ColorPickerTest.java   |  32 +-
 .../test/robot/javafx/scene/ComboBoxTest.java |  43 +-
 .../javafx/scene/ContextMenuNPETest.java      |  31 +-
 .../robot/javafx/scene/DatePickerTest.java    |  39 +-
 .../DatePickerUpdateOnAlertCloseTest.java     |  33 +-
 .../robot/javafx/scene/JDK8183100Test.java    |  23 +-
 .../scene/MouseLocationOnScreenTest.java      |  27 +-
 .../javafx/scene/PixelBufferDrawTest.java     |  34 +-
 .../test/robot/javafx/scene/RobotTest.java    | 198 +++------
 .../test/robot/javafx/scene/SRGBTest.java     |  21 +-
 .../javafx/scene/SceneChangeEventsTest.java   |  23 +-
 .../javafx/scene/SliderTooltipNPETest.java    |  16 +-
 .../scene/TabContextMenuCloseButtonTest.java  |  25 +-
 .../javafx/scene/TabPaneDragPolicyTest.java   |  80 ++--
 .../javafx/scene/TabPaneReorderTest.java      |  27 +-
 .../javafx/scene/TextCharacterIndexTest.java  | 113 +++--
 ...xtFlowSurrogatePairInsertionIndexTest.java |  58 +--
 .../TextSurrogatePairInsertionIndexTest.java  |  20 +-
 .../scene/canvas/ImageSmoothingDrawTest.java  |  27 +-
 .../dialog/DialogRepeatedShowHideTest.java    |  26 +-
 .../dialog/DialogWithOwnerSizingTest.java     |  24 +-
 .../robot/javafx/scene/layout/LayoutTest.java |  19 +-
 .../layout/RegionBackgroundFillUITest.java    | 120 ++---
 .../layout/RegionBackgroundImageUITest.java   | 141 +++---
 .../scene/layout/RegionBorderImageUITest.java |   9 +-
 .../layout/RegionBorderStrokeUITest.java      |   2 +-
 .../scene/layout/RegionShapeUITest.java       |   2 +-
 .../javafx/scene/layout/RegionUITestBase.java |   2 +
 .../tableview/TableViewClickOnTroughTest.java |  16 +-
 ...TableViewResizeColumnToFitContentTest.java |  17 +-
 ...TableViewResizeColumnToFitContentTest.java |  17 +-
 .../javafx/stage/CheckWindowOrderTest.java    |  22 +-
 .../robot/javafx/stage/DualWindowTest.java    |  38 +-
 .../FocusParentWindowOnChildCloseTest.java    |  22 +-
 .../test/robot/javafx/stage/IconifyTest.java  |  33 +-
 .../javafx/stage/SetSceneScalingTest.java     |  28 +-
 .../javafx/stage/StageAttributesTest.java     |  12 +-
 ...StageFocusWithApplicationModalityTest.java |  18 +-
 .../robot/javafx/web/PointerEventTest.java    |  29 +-
 .../test/robot/javafx/web/TooltipFXTest.java  |  17 +-
 .../test/robot/painttest/ImagePaintTest.java  |  12 +-
 .../test/robot/scenegraph/JDK8130122Test.java |   7 +-
 .../test/robot/scenegraph/ViewOrderTest.java  |  11 +-
 .../test/robot/test3d/AABalanceFlipTest.java  |  16 +-
 .../test/robot/test3d/MeshCompareTest.java    |  51 +--
 .../test/robot/test3d/NearAndFarClipTest.java |  16 +-
 .../test3d/PointLightIlluminationTest.java    |  31 +-
 .../java/test/robot/test3d/RT35019Test.java   |  14 +-
 .../test/robot/test3d/Snapshot3DTest.java     |  62 ++-
 .../test3d/TriangleMeshPNTValidationTest.java |  22 +-
 .../test3d/TriangleMeshValidationTest.java    |  40 +-
 .../robot/testharness/VisualTestBase.java     |  38 +-
 .../java/test/sandbox/SandboxAppTest.java     |  57 +--
 .../test/shutdowntest/ShutdownHookTest.java   |  23 +-
 .../system/src/test/java/test/util/Util.java  |  33 +-
 277 files changed, 4035 insertions(+), 4184 deletions(-)

diff --git a/tests/system/src/test/java/test/com/sun/glass/ui/DefaultExceptionHandlerTest.java b/tests/system/src/test/java/test/com/sun/glass/ui/DefaultExceptionHandlerTest.java
index 3c53f97bc24..80d031807e7 100644
--- a/tests/system/src/test/java/test/com/sun/glass/ui/DefaultExceptionHandlerTest.java
+++ b/tests/system/src/test/java/test/com/sun/glass/ui/DefaultExceptionHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,15 +27,12 @@
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.stage.Stage;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 public class DefaultExceptionHandlerTest {
@@ -57,7 +54,7 @@ public TestException(String msg) {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setup() throws Exception {
         Thread.setDefaultUncaughtExceptionHandler((t, e) -> {
             exception = e;
@@ -68,7 +65,7 @@ public static void setup() throws Exception {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardownOnce() {
         Util.shutdown();
     }
diff --git a/tests/system/src/test/java/test/com/sun/glass/ui/ExceptionHandlerTest.java b/tests/system/src/test/java/test/com/sun/glass/ui/ExceptionHandlerTest.java
index 4e5117c5c5e..e9470514bec 100644
--- a/tests/system/src/test/java/test/com/sun/glass/ui/ExceptionHandlerTest.java
+++ b/tests/system/src/test/java/test/com/sun/glass/ui/ExceptionHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,15 +27,12 @@
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.stage.Stage;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 public class ExceptionHandlerTest {
@@ -62,12 +59,12 @@ public TestException(String msg) {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setup() throws Exception {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void shutdown() {
         Util.shutdown();
     }
diff --git a/tests/system/src/test/java/test/com/sun/glass/ui/gtk/Gtk2RemovalCommon.java b/tests/system/src/test/java/test/com/sun/glass/ui/gtk/Gtk2RemovalCommon.java
index 4595a68a865..d71e7c37393 100644
--- a/tests/system/src/test/java/test/com/sun/glass/ui/gtk/Gtk2RemovalCommon.java
+++ b/tests/system/src/test/java/test/com/sun/glass/ui/gtk/Gtk2RemovalCommon.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,14 +25,13 @@
 
 package test.com.sun.glass.ui.gtk;
 
-import com.sun.javafx.PlatformUtil;
+import static org.junit.jupiter.api.Assertions.fail;
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import javafx.application.Platform;
-
-import static org.junit.Assert.fail;
+import com.sun.javafx.PlatformUtil;
 
 public class Gtk2RemovalCommon {
 
diff --git a/tests/system/src/test/java/test/com/sun/glass/ui/mac/MacPasteboardTest.java b/tests/system/src/test/java/test/com/sun/glass/ui/mac/MacPasteboardTest.java
index 76c9fd35dde..87543f039bb 100644
--- a/tests/system/src/test/java/test/com/sun/glass/ui/mac/MacPasteboardTest.java
+++ b/tests/system/src/test/java/test/com/sun/glass/ui/mac/MacPasteboardTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,24 +25,22 @@
 
 package test.com.sun.glass.ui.mac;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import static test.util.Util.runAndWait;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+import javafx.application.Platform;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import com.sun.glass.ui.Clipboard;
 import com.sun.glass.ui.Pixels;
 import com.sun.glass.ui.mac.MacPasteboardShim;
 import com.sun.javafx.PlatformUtil;
-import javafx.application.Platform;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.CountDownLatch;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
-import static test.util.Util.runAndWait;
 
 public class MacPasteboardTest {
 
@@ -50,7 +48,7 @@ public class MacPasteboardTest {
 
     private static MacPasteboardShim macPasteboardShim;
 
-    @BeforeClass
+    @BeforeAll
     public static void setup() throws Exception {
         if (PlatformUtil.isMac()) {
             Platform.startup(() -> {
@@ -60,7 +58,7 @@ public static void setup() throws Exception {
         }
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardown() {
         if (PlatformUtil.isMac()) {
             Platform.exit();
@@ -74,11 +72,11 @@ public void testValidLocalImageURLMacPasteboard() throws Exception {
         runAndWait(() -> {
             macPasteboardShim.pushMacPasteboard(new HashMap<>(Map.of(Clipboard.URI_TYPE, localImage)));
             Object content = macPasteboardShim.popMacPasteboard(Clipboard.RAW_IMAGE_TYPE);
-            assertTrue("The content was not a raw image", content instanceof Pixels);
+            assertTrue(content instanceof Pixels, "The content was not a raw image");
 
             Pixels pixels = (Pixels) content;
-            assertEquals("The raw image width", 64, pixels.getWidth());
-            assertEquals("The raw image height", 64, pixels.getHeight());
+            assertEquals(64, pixels.getWidth(), "The raw image width");
+            assertEquals(64, pixels.getHeight(), "The raw image height");
         });
     }
 
@@ -90,7 +88,7 @@ public void testDataBase64ImageMacPasteboard() {
         runAndWait(() -> {
             macPasteboardShim.pushMacPasteboard(new HashMap<>(Map.of(Clipboard.URI_TYPE, encodedImage)));
             Object content = macPasteboardShim.popMacPasteboard(Clipboard.RAW_IMAGE_TYPE);
-            assertNull("The content was not null", content);
+            assertNull(content, "The content was not null");
         });
     }
 
@@ -101,7 +99,7 @@ public void testNotAnImageURLMacPasteboard() {
         runAndWait(() -> {
             macPasteboardShim.pushMacPasteboard(new HashMap<>(Map.of(Clipboard.URI_TYPE, invalidImage)));
             Object content = macPasteboardShim.popMacPasteboard(Clipboard.RAW_IMAGE_TYPE);
-            assertNull("The content was not null", content);
+            assertNull(content, "The content was not null");
         });
     }
 }
diff --git a/tests/system/src/test/java/test/com/sun/glass/ui/monocle/EPDSettingsTest.java b/tests/system/src/test/java/test/com/sun/glass/ui/monocle/EPDSettingsTest.java
index b153d34dfde..eadc2b59c9a 100644
--- a/tests/system/src/test/java/test/com/sun/glass/ui/monocle/EPDSettingsTest.java
+++ b/tests/system/src/test/java/test/com/sun/glass/ui/monocle/EPDSettingsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,10 +24,10 @@
  */
 package test.com.sun.glass.ui.monocle;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import com.sun.glass.ui.monocle.EPDSettingsShim;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
 
 /**
  * Provides test cases for the {@code EPDSettings} class.
@@ -52,7 +52,7 @@ public class EPDSettingsTest {
      * Removes all of the EPD system properties. This method runs before each of
      * the test cases.
      */
-    @Before
+    @BeforeEach
     public void initialize() {
         System.clearProperty(BITS_PER_PIXEL);
         System.clearProperty(ROTATE);
@@ -72,20 +72,20 @@ public void initialize() {
     public void testBitsPerPixel() {
         System.setProperty(BITS_PER_PIXEL, "8");
         settings = EPDSettingsShim.newInstance();
-        Assert.assertEquals(8, settings.bitsPerPixel);
+        assertEquals(8, settings.bitsPerPixel);
 
         System.setProperty(BITS_PER_PIXEL, "16");
         settings = EPDSettingsShim.newInstance();
-        Assert.assertEquals(16, settings.bitsPerPixel);
+        assertEquals(16, settings.bitsPerPixel);
 
         System.setProperty(BITS_PER_PIXEL, "32");
         settings = EPDSettingsShim.newInstance();
-        Assert.assertEquals(32, settings.bitsPerPixel);
+        assertEquals(32, settings.bitsPerPixel);
 
         System.err.println(String.format(VERIFY_ERROR, BITS_PER_PIXEL, 64));
         System.setProperty(BITS_PER_PIXEL, "64");
         settings = EPDSettingsShim.newInstance();
-        Assert.assertEquals(32, settings.bitsPerPixel);
+        assertEquals(32, settings.bitsPerPixel);
     }
 
     /**
@@ -95,24 +95,24 @@ public void testBitsPerPixel() {
     public void testRotate() {
         System.setProperty(ROTATE, "0");
         settings = EPDSettingsShim.newInstance();
-        Assert.assertEquals(0, settings.rotate);
+        assertEquals(0, settings.rotate);
 
         System.setProperty(ROTATE, "1");
         settings = EPDSettingsShim.newInstance();
-        Assert.assertEquals(1, settings.rotate);
+        assertEquals(1, settings.rotate);
 
         System.setProperty(ROTATE, "2");
         settings = EPDSettingsShim.newInstance();
-        Assert.assertEquals(2, settings.rotate);
+        assertEquals(2, settings.rotate);
 
         System.setProperty(ROTATE, "3");
         settings = EPDSettingsShim.newInstance();
-        Assert.assertEquals(3, settings.rotate);
+        assertEquals(3, settings.rotate);
 
         System.err.println(String.format(VERIFY_ERROR, ROTATE, 4));
         System.setProperty(ROTATE, "4");
         settings = EPDSettingsShim.newInstance();
-        Assert.assertEquals(0, settings.rotate);
+        assertEquals(0, settings.rotate);
     }
 
     /**
@@ -124,21 +124,21 @@ public void testRotate() {
     public void testY8Inverted() {
         System.setProperty(Y8_INVERTED, "false");
         settings = EPDSettingsShim.newInstance();
-        Assert.assertEquals(0, settings.grayscale);
+        assertEquals(0, settings.grayscale);
 
         System.setProperty(Y8_INVERTED, "true");
         settings = EPDSettingsShim.newInstance();
-        Assert.assertEquals(0, settings.grayscale);
+        assertEquals(0, settings.grayscale);
 
         System.setProperty(BITS_PER_PIXEL, "8");
 
         System.setProperty(Y8_INVERTED, "false");
         settings = EPDSettingsShim.newInstance();
-        Assert.assertEquals(0x1, settings.grayscale);
+        assertEquals(0x1, settings.grayscale);
 
         System.setProperty(Y8_INVERTED, "true");
         settings = EPDSettingsShim.newInstance();
-        Assert.assertEquals(0x2, settings.grayscale);
+        assertEquals(0x2, settings.grayscale);
     }
 
     /**
@@ -149,11 +149,11 @@ public void testY8Inverted() {
     public void testNoWait() {
         System.setProperty(NO_WAIT, "false");
         settings = EPDSettingsShim.newInstance();
-        Assert.assertEquals(false, settings.noWait);
+        assertEquals(false, settings.noWait);
 
         System.setProperty(NO_WAIT, "true");
         settings = EPDSettingsShim.newInstance();
-        Assert.assertEquals(true, settings.noWait);
+        assertEquals(true, settings.noWait);
     }
 
     /**
@@ -163,28 +163,28 @@ public void testNoWait() {
     public void testWaveformMode() {
         System.setProperty(WAVEFORM_MODE, "1");
         settings = EPDSettingsShim.newInstance();
-        Assert.assertEquals(1, settings.waveformMode);
+        assertEquals(1, settings.waveformMode);
 
         System.setProperty(WAVEFORM_MODE, "2");
         settings = EPDSettingsShim.newInstance();
-        Assert.assertEquals(2, settings.waveformMode);
+        assertEquals(2, settings.waveformMode);
 
         System.setProperty(WAVEFORM_MODE, "3");
         settings = EPDSettingsShim.newInstance();
-        Assert.assertEquals(3, settings.waveformMode);
+        assertEquals(3, settings.waveformMode);
 
         System.setProperty(WAVEFORM_MODE, "4");
         settings = EPDSettingsShim.newInstance();
-        Assert.assertEquals(4, settings.waveformMode);
+        assertEquals(4, settings.waveformMode);
 
         System.err.println(String.format(VERIFY_ERROR, WAVEFORM_MODE, 5));
         System.setProperty(WAVEFORM_MODE, "5");
         settings = EPDSettingsShim.newInstance();
-        Assert.assertEquals(257, settings.waveformMode);
+        assertEquals(257, settings.waveformMode);
 
         System.setProperty(WAVEFORM_MODE, "257");
         settings = EPDSettingsShim.newInstance();
-        Assert.assertEquals(257, settings.waveformMode);
+        assertEquals(257, settings.waveformMode);
     }
 
     /**
@@ -195,11 +195,11 @@ public void testWaveformMode() {
     public void testFlagEnableInversion() {
         System.setProperty(FLAG_ENABLE_INVERSION, "false");
         settings = EPDSettingsShim.newInstance();
-        Assert.assertEquals(0, settings.flags);
+        assertEquals(0, settings.flags);
 
         System.setProperty(FLAG_ENABLE_INVERSION, "true");
         settings = EPDSettingsShim.newInstance();
-        Assert.assertEquals(0x01, settings.flags);
+        assertEquals(0x01, settings.flags);
     }
 
     /**
@@ -210,11 +210,11 @@ public void testFlagEnableInversion() {
     public void testFlagForceMonochrome() {
         System.setProperty(FLAG_FORCE_MONOCHROME, "false");
         settings = EPDSettingsShim.newInstance();
-        Assert.assertEquals(0, settings.flags);
+        assertEquals(0, settings.flags);
 
         System.setProperty(FLAG_FORCE_MONOCHROME, "true");
         settings = EPDSettingsShim.newInstance();
-        Assert.assertEquals(0x02, settings.flags);
+        assertEquals(0x02, settings.flags);
     }
 
     /**
@@ -225,11 +225,11 @@ public void testFlagForceMonochrome() {
     public void testFlagUseDitheringY1() {
         System.setProperty(FLAG_USE_DITHERING_Y1, "false");
         settings = EPDSettingsShim.newInstance();
-        Assert.assertEquals(0, settings.flags);
+        assertEquals(0, settings.flags);
 
         System.setProperty(FLAG_USE_DITHERING_Y1, "true");
         settings = EPDSettingsShim.newInstance();
-        Assert.assertEquals(0x2000, settings.flags);
+        assertEquals(0x2000, settings.flags);
     }
 
     /**
@@ -240,11 +240,11 @@ public void testFlagUseDitheringY1() {
     public void testFlagUseDitheringY4() {
         System.setProperty(FLAG_USE_DITHERING_Y4, "false");
         settings = EPDSettingsShim.newInstance();
-        Assert.assertEquals(0, settings.flags);
+        assertEquals(0, settings.flags);
 
         System.setProperty(FLAG_USE_DITHERING_Y4, "true");
         settings = EPDSettingsShim.newInstance();
-        Assert.assertEquals(0x4000, settings.flags);
+        assertEquals(0x4000, settings.flags);
     }
 
     /**
@@ -257,6 +257,6 @@ public void testAllFlags() {
         System.setProperty(FLAG_USE_DITHERING_Y1, "true");
         System.setProperty(FLAG_USE_DITHERING_Y4, "true");
         settings = EPDSettingsShim.newInstance();
-        Assert.assertEquals(0x01 | 0x02 | 0x2000 | 0x4000, settings.flags);
+        assertEquals(0x01 | 0x02 | 0x2000 | 0x4000, settings.flags);
     }
 }
diff --git a/tests/system/src/test/java/test/com/sun/glass/ui/monocle/FramebufferTest.java b/tests/system/src/test/java/test/com/sun/glass/ui/monocle/FramebufferTest.java
index a583e04c696..1faa9fcd2e2 100644
--- a/tests/system/src/test/java/test/com/sun/glass/ui/monocle/FramebufferTest.java
+++ b/tests/system/src/test/java/test/com/sun/glass/ui/monocle/FramebufferTest.java
@@ -25,10 +25,9 @@
 
 package test.com.sun.glass.ui.monocle;
 
-import com.sun.glass.ui.monocle.FramebufferShim;
-import org.junit.Test;
-
 import java.nio.ByteBuffer;
+import org.junit.jupiter.api.Test;
+import com.sun.glass.ui.monocle.FramebufferShim;
 
 public class FramebufferTest {
 
diff --git a/tests/system/src/test/java/test/com/sun/glass/ui/monocle/FramebufferY8Test.java b/tests/system/src/test/java/test/com/sun/glass/ui/monocle/FramebufferY8Test.java
index cbd92901ad0..84e74dc2e49 100644
--- a/tests/system/src/test/java/test/com/sun/glass/ui/monocle/FramebufferY8Test.java
+++ b/tests/system/src/test/java/test/com/sun/glass/ui/monocle/FramebufferY8Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,8 +24,6 @@
  */
 package test.com.sun.glass.ui.monocle;
 
-import com.sun.glass.ui.monocle.FramebufferY8Shim;
-import com.sun.glass.ui.monocle.FramebufferY8SuperShim;
 import java.awt.image.BufferedImage;
 import java.awt.image.DataBufferByte;
 import java.io.ByteArrayOutputStream;
@@ -37,10 +35,12 @@
 import java.nio.channels.Channels;
 import java.util.stream.IntStream;
 import javax.imageio.ImageIO;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import com.sun.glass.ui.monocle.FramebufferY8Shim;
+import com.sun.glass.ui.monocle.FramebufferY8SuperShim;
 
 /**
  * Provides test cases for the {@code FramebufferY8} class.
@@ -74,7 +74,7 @@ public class FramebufferY8Test {
      * {@code Framebuffer} and {@code FramebufferY8} constructors through their
      * shim subclasses. This method runs only once before all of the test cases.
      */
-    @BeforeClass
+    @BeforeAll
     public static void onlyOnce() {
         bb = ByteBuffer.allocate(WIDTH * HEIGHT * Integer.BYTES);
         bb.order(ByteOrder.nativeOrder());
@@ -125,9 +125,9 @@ private void copyTest(int bitsPerPixel) {
         ByteBuffer oldBuffer = copyOld(bitsPerPixel);
         ByteBuffer newBuffer = copyNew(bitsPerPixel);
         if (oldBuffer.hasArray() && newBuffer.hasArray()) {
-            Assert.assertArrayEquals(oldBuffer.array(), newBuffer.array());
+            Assertions.assertArrayEquals(oldBuffer.array(), newBuffer.array());
         } else {
-            Assert.assertEquals(oldBuffer, newBuffer);
+            Assertions.assertEquals(oldBuffer, newBuffer);
         }
     }
 
@@ -177,7 +177,7 @@ private ByteArrayOutputStream writeNew(int bitsPerPixel) throws IOException {
     private void writeTest(int bitsPerPixel) throws IOException {
         ByteArrayOutputStream oldStream = writeOld(bitsPerPixel);
         ByteArrayOutputStream newStream = writeNew(bitsPerPixel);
-        Assert.assertArrayEquals(oldStream.toByteArray(), newStream.toByteArray());
+        Assertions.assertArrayEquals(oldStream.toByteArray(), newStream.toByteArray());
     }
 
     /**
@@ -353,7 +353,7 @@ public void timeWriteTo16() throws IOException {
     /**
      * Saves the source test image to a file in PNG format.
      */
-    @Ignore("Saves the source ARGB32 buffer as a PNG image")
+    @Disabled("Saves the source ARGB32 buffer as a PNG image")
     @Test
     public void saveImage() {
         var image = new BufferedImage(WIDTH, HEIGHT, BufferedImage.TYPE_INT_RGB);
@@ -374,7 +374,7 @@ public void saveImage() {
      * format with the method {@code FramebufferY8.copyToBuffer} and saves the
      * resulting image as a PNG file.
      */
-    @Ignore("Saves the target Y8 buffer as a PNG image")
+    @Disabled("Saves the target Y8 buffer as a PNG image")
     @Test
     public void saveImageY8() {
         int bitsPerPixel = Byte.SIZE;
diff --git a/tests/system/src/test/java/test/com/sun/glass/ui/monocle/IntSetTest.java b/tests/system/src/test/java/test/com/sun/glass/ui/monocle/IntSetTest.java
index d53a586fcf4..538e5ec294c 100644
--- a/tests/system/src/test/java/test/com/sun/glass/ui/monocle/IntSetTest.java
+++ b/tests/system/src/test/java/test/com/sun/glass/ui/monocle/IntSetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,40 +25,30 @@
 
 package test.com.sun.glass.ui.monocle;
 
-import com.sun.glass.ui.monocle.IntSetShim;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
-
-@RunWith(Parameterized.class)
-public class IntSetTest {
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import com.sun.glass.ui.monocle.IntSetShim;
 
-    private Integer[] array;
+public final class IntSetTest {
 
-    @Parameterized.Parameters
-    public static Collection<Object[]> data() {
-        Integer[][] sets = {
-                { 1 },
-                { 1, 2 },
-                { 1, 2, 3},
-                { 1, 1 },
-                { 1, 1, 1 },
-                { 1, 1, 2 },
-        };
-        return Arrays.asList(sets).stream()
-                .map(d -> new Object[] { d })
-                .collect(Collectors.toList());
-    }
+    // junit5 parameterized test gets confused by Integer[]
+    private static record Parameter(Integer[] array) { }
 
-    public IntSetTest(Integer[] array) {
-        this.array = array;
+    private static Collection<Parameter> parameters() {
+        return List.of(
+            new Parameter(new Integer[] { 1 }),
+            new Parameter(new Integer[] { 1, 2 }),
+            new Parameter(new Integer[] { 1, 2, 3 }),
+            new Parameter(new Integer[] { 1, 1 }),
+            new Parameter(new Integer[] { 1, 1, 1 }),
+            new Parameter(new Integer[] { 1, 1, 2 })
+        );
     }
 
     private int[] getIntSetAsArray(IntSetShim s) {
@@ -75,14 +65,16 @@ private int[] getHashSetAsArray(Set<Integer> set) {
     }
 
     private void assertSet(Set<Integer> expected, IntSetShim actual) {
-        Assert.assertArrayEquals(
-                "Expected: " + expected + ", found " + actual,
+        Assertions.assertArrayEquals(
                 getHashSetAsArray(expected),
-                getIntSetAsArray(actual));
+                getIntSetAsArray(actual),
+                "Expected: " + expected + ", found " + actual);
     }
 
-    @Test
-    public void testAddInOrderRemoveInOrder() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testAddInOrderRemoveInOrder(Parameter p) {
+        Integer[] array = p.array;
         IntSetShim set = new IntSetShim();
         Set<Integer> hashSet = new HashSet<>();
         assertSet(hashSet, set);
@@ -98,8 +90,10 @@ public void testAddInOrderRemoveInOrder() {
         }
     }
 
-    @Test
-    public void testAddInOrderRemoveInReverse() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testAddInOrderRemoveInReverse(Parameter p) {
+        Integer[] array = p.array;
         IntSetShim set = new IntSetShim();
         Set<Integer> hashSet = new HashSet<>();
         assertSet(hashSet, set);
@@ -115,8 +109,10 @@ public void testAddInOrderRemoveInReverse() {
         }
     }
 
-    @Test
-    public void testAddInReverseRemoveInOrder() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testAddInReverseRemoveInOrder(Parameter p) {
+        Integer[] array = p.array;
         IntSetShim set = new IntSetShim();
         Set<Integer> hashSet = new HashSet<>();
         assertSet(hashSet, set);
@@ -132,8 +128,10 @@ public void testAddInReverseRemoveInOrder() {
         }
     }
 
-    @Test
-    public void testAddInReverseRemoveInReverse() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testAddInReverseRemoveInReverse(Parameter p) {
+        Integer[] array = p.array;
         IntSetShim set = new IntSetShim();
         Set<Integer> hashSet = new HashSet<>();
         assertSet(hashSet, set);
@@ -148,5 +146,4 @@ public void testAddInReverseRemoveInReverse() {
             assertSet(hashSet, set);
         }
     }
-
 }
diff --git a/tests/system/src/test/java/test/com/sun/glass/ui/monocle/headless/HeadlessGeometry1Test.java b/tests/system/src/test/java/test/com/sun/glass/ui/monocle/headless/HeadlessGeometry1Test.java
index 0017f26c220..dc92e2c49c2 100644
--- a/tests/system/src/test/java/test/com/sun/glass/ui/monocle/headless/HeadlessGeometry1Test.java
+++ b/tests/system/src/test/java/test/com/sun/glass/ui/monocle/headless/HeadlessGeometry1Test.java
@@ -28,10 +28,10 @@
 import java.util.concurrent.CountDownLatch;
 import javafx.application.Application;
 import javafx.stage.Stage;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import com.sun.glass.ui.Screen;
 import test.util.Util;
 
@@ -53,7 +53,7 @@ public void start(Stage t) {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setup() throws Exception {
         System.setProperty("glass.platform", "Monocle");
         System.setProperty("monocle.platform", "Headless");
@@ -61,18 +61,18 @@ public static void setup() throws Exception {
         System.setProperty("headless.geometry", "150x250");
 
         Util.launch(startupLatch, TestApp.class);
-        Assert.assertEquals(0, startupLatch.getCount());
+        Assertions.assertEquals(0, startupLatch.getCount());
     }
 
-    @AfterClass
+    @AfterAll
     public static void shutdown() {
         Util.shutdown();
     }
 
     @Test
     public void setScreenBounds() throws Exception {
-        Assert.assertEquals(150, width);
-        Assert.assertEquals(250, height);
-        Assert.assertEquals(32, depth);
+        Assertions.assertEquals(150, width);
+        Assertions.assertEquals(250, height);
+        Assertions.assertEquals(32, depth);
     }
 }
diff --git a/tests/system/src/test/java/test/com/sun/glass/ui/monocle/headless/HeadlessGeometry2Test.java b/tests/system/src/test/java/test/com/sun/glass/ui/monocle/headless/HeadlessGeometry2Test.java
index 5899cd6bfd9..2ea49a11300 100644
--- a/tests/system/src/test/java/test/com/sun/glass/ui/monocle/headless/HeadlessGeometry2Test.java
+++ b/tests/system/src/test/java/test/com/sun/glass/ui/monocle/headless/HeadlessGeometry2Test.java
@@ -28,10 +28,10 @@
 import java.util.concurrent.CountDownLatch;
 import javafx.application.Application;
 import javafx.stage.Stage;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import com.sun.glass.ui.Screen;
 import test.util.Util;
 
@@ -53,7 +53,7 @@ public void start(Stage t) {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setup() throws Exception {
         System.setProperty("glass.platform", "Monocle");
         System.setProperty("monocle.platform", "Headless");
@@ -61,18 +61,18 @@ public static void setup() throws Exception {
         System.setProperty("headless.geometry", "150x250-16");
 
         Util.launch(startupLatch, TestApp.class);
-        Assert.assertEquals(0, startupLatch.getCount());
+        Assertions.assertEquals(0, startupLatch.getCount());
     }
 
-    @AfterClass
+    @AfterAll
     public static void shutdown() {
         Util.shutdown();
     }
 
     @Test
     public void setScreenBounds() throws Exception {
-        Assert.assertEquals(150, width);
-        Assert.assertEquals(250, height);
-        Assert.assertEquals(16, depth);
+        Assertions.assertEquals(150, width);
+        Assertions.assertEquals(250, height);
+        Assertions.assertEquals(16, depth);
     }
 }
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/ConcurrentStartupTest.java b/tests/system/src/test/java/test/com/sun/javafx/application/ConcurrentStartupTest.java
index 0cb45b579d7..115614e5920 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/ConcurrentStartupTest.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/ConcurrentStartupTest.java
@@ -25,20 +25,22 @@
 
 package test.com.sun.javafx.application;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import javafx.application.Platform;
-import org.junit.AfterClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 public class ConcurrentStartupTest {
     CountDownLatch startupLatch;
     CountDownLatch mainLatch;
     volatile Throwable error = null;
 
-    @Test (timeout=15000)
+    @Test
+    @Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
     public void testStartupReturnBeforeRunnableComplete() throws Exception {
         startupLatch = new CountDownLatch(2);
         mainLatch = new CountDownLatch(1);
@@ -48,7 +50,7 @@ public void testStartupReturnBeforeRunnableComplete() throws Exception {
                     error = new AssertionError("Timeout waiting for main latch");
                 }
                 try {
-                    assertEquals("Runnable executed out of order", 2, startupLatch.getCount());
+                    assertEquals(2, startupLatch.getCount(), "Runnable executed out of order");
                 } catch (Throwable err) {
                     error = err;
                 }
@@ -59,7 +61,7 @@ public void testStartupReturnBeforeRunnableComplete() throws Exception {
         });
         Platform.runLater(() -> {
             try {
-                assertEquals("Runnable executed out of order", 1, startupLatch.getCount());
+                assertEquals(1, startupLatch.getCount(), "Runnable executed out of order");
             } catch (Throwable err) {
                 error = err;
             }
@@ -76,7 +78,7 @@ public void testStartupReturnBeforeRunnableComplete() throws Exception {
         }
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardown() {
         Platform.exit();
     }
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/HostServicesTest.java b/tests/system/src/test/java/test/com/sun/javafx/application/HostServicesTest.java
index c66bc243280..a8f91f15cb4 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/HostServicesTest.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/HostServicesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,21 +25,17 @@
 
 package test.com.sun.javafx.application;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.lang.reflect.Method;
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.Application;
 import javafx.application.HostServices;
 import javafx.application.Platform;
 import javafx.stage.Stage;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 /**
@@ -65,12 +61,12 @@ public void start(Stage primaryStage) throws Exception {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setupOnce() {
         Util.launch(launchLatch, MyApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardownOnce() {
         Util.shutdown();
     }
@@ -111,6 +107,6 @@ public void testWebContext() {
         } catch (NoSuchMethodException ex) {
             nsme = true;
         }
-        assertTrue("Did not get the expected NoSuchMethodException", nsme);
+        assertTrue(nsme, "Did not get the expected NoSuchMethodException");
     }
 }
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/InitializeJavaFXBase.java b/tests/system/src/test/java/test/com/sun/javafx/application/InitializeJavaFXBase.java
index 4379ef31d67..ecd9db66725 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/InitializeJavaFXBase.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/InitializeJavaFXBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
 
 import javafx.application.Application;
 import javafx.stage.Stage;
-import junit.framework.Assert;
+import org.junit.jupiter.api.Assertions;
 import test.util.Util;
 
 public class InitializeJavaFXBase {
@@ -42,7 +42,7 @@ public void doTestInitializeThenLaunchInFX() throws Exception {
         Util.runAndWait(() ->{
             try {
                 Application.launch(TestApp.class);
-                Assert.fail("Error: No Exception was thrown - expected IllegalStateException");
+                Assertions.fail("Error: No Exception was thrown - expected IllegalStateException");
             } catch (IllegalStateException e) {
                 // This Exception is what we expect!
             }
@@ -52,7 +52,7 @@ public void doTestInitializeThenLaunchInFX() throws Exception {
     public void doTestInitializeThenSecondLaunch() throws Exception {
         try {
             Application.launch(TestApp.class);
-            Assert.fail("Error: No Exception was thrown - expected IllegalStateException");
+            Assertions.fail("Error: No Exception was thrown - expected IllegalStateException");
         } catch (IllegalStateException e) {
             // This Exception is what we expect!
         }
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/InitializeJavaFXLaunch1Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/InitializeJavaFXLaunch1Test.java
index 4863b8ee953..345b0dd40ed 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/InitializeJavaFXLaunch1Test.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/InitializeJavaFXLaunch1Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,17 +25,20 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.BeforeClass;
-import org.junit.Test;
+import java.util.concurrent.TimeUnit;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 public class InitializeJavaFXLaunch1Test extends InitializeJavaFXLaunchBase {
 
-    @BeforeClass
+    @BeforeAll
     public static void initialize() throws Exception {
         InitializeJavaFXLaunchBase.initializeApplicationLaunch();
     }
 
-    @Test (timeout = 15000)
+    @Test
+    @Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
     public void testLaunchThenLaunchInFX() throws Exception {
         doTestInitializeThenLaunchInFX();
     }
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/InitializeJavaFXLaunch2Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/InitializeJavaFXLaunch2Test.java
index ca4ab59c7e1..f86d04f6905 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/InitializeJavaFXLaunch2Test.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/InitializeJavaFXLaunch2Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,17 +25,20 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.BeforeClass;
-import org.junit.Test;
+import java.util.concurrent.TimeUnit;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 public class InitializeJavaFXLaunch2Test extends InitializeJavaFXLaunchBase {
 
-    @BeforeClass
+    @BeforeAll
     public static void initialize() throws Exception {
         InitializeJavaFXLaunchBase.initializeApplicationLaunch();
     }
 
-    @Test (timeout = 15000)
+    @Test
+    @Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
     public void testLaunchThenLaunch() throws Exception {
         doTestInitializeThenSecondLaunch();
     }
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/InitializeJavaFXLaunchBase.java b/tests/system/src/test/java/test/com/sun/javafx/application/InitializeJavaFXLaunchBase.java
index 7f544f26f0b..e9b3754bd6a 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/InitializeJavaFXLaunchBase.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/InitializeJavaFXLaunchBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,11 @@
 
 package test.com.sun.javafx.application;
 
-import javafx.application.Application;
-import javafx.stage.Stage;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-import static org.junit.Assert.assertTrue;
+import javafx.application.Application;
+import javafx.stage.Stage;
 
 public class InitializeJavaFXLaunchBase extends InitializeJavaFXBase {
     public static final CountDownLatch appLatch = new CountDownLatch(1);
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/InitializeJavaFXStartup1Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/InitializeJavaFXStartup1Test.java
index 5267eedcaf8..13c5add7067 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/InitializeJavaFXStartup1Test.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/InitializeJavaFXStartup1Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,17 +25,20 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.BeforeClass;
-import org.junit.Test;
+import java.util.concurrent.TimeUnit;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 public class InitializeJavaFXStartup1Test extends InitializeJavaFXStartupBase {
 
-    @BeforeClass
+    @BeforeAll
     public static void initialize() throws Exception {
         InitializeJavaFXStartupBase.initializeStartup();
     }
 
-    @Test (timeout = 15000)
+    @Test
+    @Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
     public void testStartupThenLaunchInFX() throws Exception {
         doTestInitializeThenLaunchInFX();
     }
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/InitializeJavaFXStartup2Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/InitializeJavaFXStartup2Test.java
index ada0c4c1604..6552d7212a9 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/InitializeJavaFXStartup2Test.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/InitializeJavaFXStartup2Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,19 +25,21 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.BeforeClass;
-import org.junit.Test;
+import java.util.concurrent.TimeUnit;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 public class InitializeJavaFXStartup2Test extends InitializeJavaFXStartupBase {
 
-    @BeforeClass
+    @BeforeAll
     public static void initialize() throws Exception {
         InitializeJavaFXStartupBase.initializeStartup();
     }
 
-    @Test (timeout = 15000)
+    @Test
+    @Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
     public void testStartupThenLaunch() throws Exception {
-
         // The first call to Application.launch should work
         InitializeJavaFXLaunchBase.initializeApplicationLaunch();
 
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/ListenerError1Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/ListenerError1Test.java
index 0d90ee3a4e0..edd68cfd737 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/ListenerError1Test.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/ListenerError1Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test program for Platform finishListener
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/ListenerError2Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/ListenerError2Test.java
index 9aadb903b7b..aaa8765789b 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/ListenerError2Test.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/ListenerError2Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test program for Platform finishListener
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/ListenerException1Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/ListenerException1Test.java
index 635fb5e6a55..05c447ac2d3 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/ListenerException1Test.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/ListenerException1Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test program for Platform finishListener
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/ListenerException2Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/ListenerException2Test.java
index 28f28b0a286..c27ff5937da 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/ListenerException2Test.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/ListenerException2Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test program for Platform finishListener
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/ListenerExitTest.java b/tests/system/src/test/java/test/com/sun/javafx/application/ListenerExitTest.java
index 27d347fc6ab..5e3728cf0f3 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/ListenerExitTest.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/ListenerExitTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test program for Platform finishListener
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/ListenerIdle1Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/ListenerIdle1Test.java
index b26ef065be7..f08cdd297cc 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/ListenerIdle1Test.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/ListenerIdle1Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test program for Platform finishListener
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/ListenerIdle2Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/ListenerIdle2Test.java
index 2173d44053c..022d94daea6 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/ListenerIdle2Test.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/ListenerIdle2Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test program for Platform finishListener
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/ListenerTestCommon.java b/tests/system/src/test/java/test/com/sun/javafx/application/ListenerTestCommon.java
index ad4aebf3820..cfb91ebeddc 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/ListenerTestCommon.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/ListenerTestCommon.java
@@ -25,8 +25,12 @@
 
 package test.com.sun.javafx.application;
 
-import com.sun.javafx.application.PlatformImpl;
-import com.sun.javafx.application.PlatformImplShim;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static test.util.Util.TIMEOUT;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -35,12 +39,10 @@
 import javafx.scene.Scene;
 import javafx.scene.paint.Color;
 import javafx.stage.Stage;
-import junit.framework.AssertionFailedError;
+import com.sun.javafx.application.PlatformImpl;
+import com.sun.javafx.application.PlatformImplShim;
 import test.util.Util;
 
-import static org.junit.Assert.*;
-import static test.util.Util.TIMEOUT;
-
 /**
  * Test program for Platform finishListener
  * Each of the tests must be run in a separate JVM which is why each
@@ -84,12 +86,10 @@ private void setup() {
 
         try {
             if (!launchLatch.await(TIMEOUT, TimeUnit.MILLISECONDS)) {
-                throw new AssertionFailedError("Timeout waiting for Platform to start");
+                fail("Timeout waiting for Platform to start");
             }
         } catch (InterruptedException ex) {
-            AssertionFailedError err = new AssertionFailedError("Unexpected exception");
-            err.initCause(ex);
-            throw err;
+            fail(ex);
         }
         exitLatch = PlatformImplShim.test_getPlatformExitLatch();
         assertEquals(1, exitLatch.getCount());
@@ -143,12 +143,10 @@ public void doTestExit() {
         Platform.exit();
         try {
             if (!exitNotification.await(TIMEOUT, TimeUnit.MILLISECONDS)) {
-                throw new AssertionFailedError("Timeout waiting for exit notification");
+                fail("Timeout waiting for exit notification");
             }
         } catch (InterruptedException ex) {
-            AssertionFailedError err = new AssertionFailedError("Unexpected exception");
-            err.initCause(ex);
-            throw err;
+            fail(ex);
         }
         assertEquals(0, exitNotification.getCount());
 
@@ -203,11 +201,11 @@ public void doTestIdleImplicit(final boolean implicit,
 
         try {
             if (!rDone.await(TIMEOUT, TimeUnit.MILLISECONDS)) {
-                throw new AssertionFailedError("Timeout waiting for runLater, throwableType = "
+                fail("Timeout waiting for runLater, throwableType = "
                         + throwableType);
             }
         } catch (InterruptedException ex) {
-            throw new AssertionFailedError("Unexpected exception waiting for runLater, throwableType = "
+            fail("Unexpected exception waiting for runLater, throwableType = "
                         + throwableType);
         }
 
@@ -215,12 +213,10 @@ public void doTestIdleImplicit(final boolean implicit,
 
         try {
             if (!idleNotification.await(TIMEOUT, TimeUnit.MILLISECONDS)) {
-                throw new AssertionFailedError("Timeout waiting for exit notification");
+                fail("Timeout waiting for exit notification");
             }
         } catch (InterruptedException ex) {
-            AssertionFailedError err = new AssertionFailedError("Unexpected exception");
-            err.initCause(ex);
-            throw err;
+            fail(ex);
         }
         assertEquals(0, idleNotification.getCount());
         assertEquals(implicit, implicitExit.get());
@@ -232,5 +228,4 @@ public void doTestIdleImplicit(final boolean implicit,
         PlatformImpl.removeListener(listener);
         listener = null;
     }
-
 }
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/NullCCLTest.java b/tests/system/src/test/java/test/com/sun/javafx/application/NullCCLTest.java
index 4e3662d8d7a..4842a4b3b54 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/NullCCLTest.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/NullCCLTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,12 @@
 
 package test.com.sun.javafx.application;
 
-import com.sun.javafx.application.PlatformImpl;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static test.util.Util.TIMEOUT;
 import java.io.InputStream;
 import java.net.URL;
 import java.net.URLConnection;
@@ -44,16 +49,13 @@
 import javafx.scene.web.WebEngine;
 import javafx.scene.web.WebView;
 import javafx.stage.Stage;
-import junit.framework.AssertionFailedError;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.application.PlatformImpl;
 import test.util.Util;
 
-import static org.junit.Assert.*;
-import static test.util.Util.TIMEOUT;
-
 /**
  * Unit tests for Platform runLater.
  */
@@ -62,7 +64,7 @@ public class NullCCLTest {
     // Used to launch the application before running any test
     private static final CountDownLatch launchLatch = new CountDownLatch(1);
 
-    @BeforeClass
+    @BeforeAll
     public static void setupOnce() {
         // Create a new thread so we can set the CCL to null without affecting JUnit
         new Thread(() -> {
@@ -76,12 +78,10 @@ public static void setupOnce() {
 
         try {
             if (!launchLatch.await(TIMEOUT, TimeUnit.MILLISECONDS)) {
-                throw new AssertionFailedError("Timeout waiting for Application to launch");
+                fail("Timeout waiting for Application to launch");
             }
         } catch (InterruptedException ex) {
-            AssertionFailedError err = new AssertionFailedError("Unexpected exception");
-            err.initCause(ex);
-            throw err;
+            fail(ex);
         }
 
         Util.runAndWait(() -> {
@@ -90,14 +90,14 @@ public static void setupOnce() {
         });
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardownOnce() {
         Platform.exit();
     }
 
     private Stage stage;
 
-    @After
+    @AfterEach
     public void cleanup() {
         Thread.setDefaultUncaughtExceptionHandler(null);
         if (stage != null) {
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/PlatformExit1Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/PlatformExit1Test.java
index 298b76c1401..adc3b0662eb 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/PlatformExit1Test.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/PlatformExit1Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,14 +25,17 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import java.util.concurrent.TimeUnit;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 /**
  * Test calling Platform.exit() once after starting the FX runtime
  */
 public class PlatformExit1Test extends PlatformExitCommon {
 
-    @Test (timeout = 15000)
+    @Test
+    @Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
     public void testPlatformExit() {
         doTestPlatformExit(false);
     }
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/PlatformExit2Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/PlatformExit2Test.java
index 80c93333127..b056e59acc8 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/PlatformExit2Test.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/PlatformExit2Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,14 +25,17 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import java.util.concurrent.TimeUnit;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 /**
  * Test calling Platform.exit() twice after starting the FX runtime
  */
 public class PlatformExit2Test extends PlatformExitCommon {
 
-    @Test (timeout = 15000)
+    @Test
+    @Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
     public void testPlatformExitTwice() {
         doTestPlatformExit(true);
     }
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/PlatformExit3Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/PlatformExit3Test.java
index 09ee7f446ae..2152e27b421 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/PlatformExit3Test.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/PlatformExit3Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,9 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import java.util.concurrent.TimeUnit;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 /**
  * Test calling Platform.exit() on FX Application Thread after starting the FX
@@ -33,7 +35,8 @@
  */
 public class PlatformExit3Test extends PlatformExitCommon {
 
-    @Test (timeout = 15000)
+    @Test
+    @Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
     public void testPlatformExitOnAppThread() {
         doTestPlatformExitOnAppThread(false);
     }
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/PlatformExit4Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/PlatformExit4Test.java
index c5033c706f2..5e4a9ff9e0d 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/PlatformExit4Test.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/PlatformExit4Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,9 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import java.util.concurrent.TimeUnit;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 /**
  * Test calling Platform.exit() on FX Application Thread after starting the FX
@@ -33,7 +35,8 @@
  */
 public class PlatformExit4Test extends PlatformExitCommon {
 
-    @Test (timeout = 15000)
+    @Test
+    @Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
     public void testPlatformExitOnAppThreadTwice() {
         doTestPlatformExitOnAppThread(true);
     }
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/PlatformExitCommon.java b/tests/system/src/test/java/test/com/sun/javafx/application/PlatformExitCommon.java
index a3346e30d49..1362b11211d 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/PlatformExitCommon.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/PlatformExitCommon.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,16 +25,11 @@
 
 package test.com.sun.javafx.application;
 
-import static org.junit.Assert.assertEquals;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.Platform;
-
-import org.junit.BeforeClass;
-
+import org.junit.jupiter.api.BeforeAll;
 import com.sun.javafx.application.PlatformImplShim;
-
 import test.util.Util;
 
 /**
@@ -49,7 +44,7 @@ public class PlatformExitCommon {
     // Short delay to allow runtime thread to execute
     private static final int DELAY = 200;
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() throws Exception {
         Util.startup(startupLatch, startupLatch::countDown);
     }
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/PlatformExitSimpleTest.java b/tests/system/src/test/java/test/com/sun/javafx/application/PlatformExitSimpleTest.java
index e68c42b5fd3..45a8b627ea5 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/PlatformExitSimpleTest.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/PlatformExitSimpleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,10 @@
 
 package test.com.sun.javafx.application;
 
+import java.util.concurrent.TimeUnit;
 import javafx.application.Platform;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 /**
  * Test calling Platform.exit() without starting the FX runtime.
@@ -34,7 +36,8 @@
  */
 public class PlatformExitSimpleTest {
 
-    @Test (timeout = 5000)
+    @Test
+    @Timeout(value=5000, unit=TimeUnit.MILLISECONDS)
     public void testPlatformExit() {
         Platform.exit();
     }
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/PlatformStartupCommon.java b/tests/system/src/test/java/test/com/sun/javafx/application/PlatformStartupCommon.java
index bf80935095e..93c503dd15d 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/PlatformStartupCommon.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/PlatformStartupCommon.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,11 @@
 
 package test.com.sun.javafx.application;
 
-import com.sun.javafx.application.PlatformImplShim;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static test.util.Util.TIMEOUT;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -34,12 +38,9 @@
 import javafx.scene.Scene;
 import javafx.scene.paint.Color;
 import javafx.stage.Stage;
-import junit.framework.AssertionFailedError;
+import com.sun.javafx.application.PlatformImplShim;
 import test.util.Util;
 
-import static org.junit.Assert.*;
-import static test.util.Util.TIMEOUT;
-
 /**
  * Test program for Platform startup.
  * Each of the tests must be run in a separate JVM which is why each
@@ -90,7 +91,7 @@ private void doTestCommon(final boolean implicitExit) {
 
         try {
             if (!startupLatch.await(TIMEOUT, TimeUnit.MILLISECONDS)) {
-                throw new AssertionFailedError("Timeout waiting for Toolkit to start");
+                fail("Timeout waiting for Toolkit to start");
             }
 
             final CountDownLatch rDone = new CountDownLatch(1);
@@ -103,7 +104,7 @@ private void doTestCommon(final boolean implicitExit) {
                 }
             });
             if (!rDone.await(TIMEOUT, TimeUnit.MILLISECONDS)) {
-                throw new AssertionFailedError("Timeout waiting for runLater with Exception");
+                fail("Timeout waiting for runLater with Exception");
             }
 
             // Create and show main stage
@@ -143,14 +144,14 @@ private void doTestCommon(final boolean implicitExit) {
                 Platform.exit();
 
                 if (!exitLatch.await(TIMEOUT, TimeUnit.MILLISECONDS)) {
-                    throw new AssertionFailedError("Timeout waiting for Platform to exit");
+                    fail("Timeout waiting for Platform to exit");
                 }
             }
         } catch (InterruptedException ex) {
             if (testError[0] != null) {
                 Util.throwError(testError[0]);
             } else {
-                fail("Unexpected exception: " + ex);
+                fail(ex);
             }
         }
     }
@@ -164,5 +165,4 @@ protected void doTestStartupExplicitExit() {
     protected void doTestStartupImplicitExit() {
         doTestCommon(true);
     }
-
 }
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/PlatformStartupExplicitTest.java b/tests/system/src/test/java/test/com/sun/javafx/application/PlatformStartupExplicitTest.java
index dd758f79228..1569f58b216 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/PlatformStartupExplicitTest.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/PlatformStartupExplicitTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test for Platform exit behavior when implicitExit is set to false
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/PlatformStartupImplicitTest.java b/tests/system/src/test/java/test/com/sun/javafx/application/PlatformStartupImplicitTest.java
index b040010f132..c981a0e3ee3 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/PlatformStartupImplicitTest.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/PlatformStartupImplicitTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test for Platform exit behavior when implicitExit is set to true
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/PlatformStartupMemoryLeakTest.java b/tests/system/src/test/java/test/com/sun/javafx/application/PlatformStartupMemoryLeakTest.java
index f3daf3b75df..acfb476e214 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/PlatformStartupMemoryLeakTest.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/PlatformStartupMemoryLeakTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,8 @@
 package test.com.sun.javafx.application;
 
 import javafx.application.Platform;
-import org.junit.Test;
-import org.junit.AfterClass;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
 import test.util.memory.JMemoryBuddy;
 
 public class PlatformStartupMemoryLeakTest {
@@ -47,7 +47,7 @@ public void run() {
         });
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDown() {
         Platform.exit();
     }
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/RunLaterTest.java b/tests/system/src/test/java/test/com/sun/javafx/application/RunLaterTest.java
index c495d1cf0fe..ff3b9497a90 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/RunLaterTest.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/RunLaterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,19 +25,15 @@
 
 package test.com.sun.javafx.application;
 
-import static org.junit.Assert.assertEquals;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.stage.Stage;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 /**
@@ -58,12 +54,12 @@ public static class MyApp extends Application {
     }
 
 
-    @BeforeClass
+    @BeforeAll
     public static void setupOnce() {
         Util.launch(launchLatch, MyApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardownOnce() {
         Util.shutdown();
     }
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/SceneGraphHTMLEditorTest.java b/tests/system/src/test/java/test/com/sun/javafx/application/SceneGraphHTMLEditorTest.java
index 75cff94b08d..db0a04dd586 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/SceneGraphHTMLEditorTest.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/SceneGraphHTMLEditorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,8 @@
 
 package test.com.sun.javafx.application;
 
-import com.sun.javafx.application.PlatformImpl;
+import static org.junit.jupiter.api.Assertions.fail;
+import static test.util.Util.TIMEOUT;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
@@ -36,15 +37,13 @@
 import javafx.scene.layout.StackPane;
 import javafx.scene.web.HTMLEditor;
 import javafx.stage.Stage;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.application.PlatformImpl;
 import test.util.Util;
 
-import static org.junit.Assert.*;
-import static test.util.Util.TIMEOUT;
-
 /**
  * Unit tests for HTMLEditor SceneGraph.
  */
@@ -53,7 +52,7 @@ public class SceneGraphHTMLEditorTest {
     private static final CountDownLatch launchLatch = new CountDownLatch(1);
     private Stage stage;
 
-    @BeforeClass
+    @BeforeAll
     public static void setupOnce() throws Exception {
         Platform.setImplicitExit(false);
         PlatformImpl.startup(() -> {
@@ -65,12 +64,12 @@ public static void setupOnce() throws Exception {
         }
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardownOnce() {
         Platform.exit();
     }
 
-    @After
+    @AfterEach
     public void cleanup() {
         Thread.setDefaultUncaughtExceptionHandler(null);
         if (stage != null) {
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/SceneGraphThread1Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/SceneGraphThread1Test.java
index 8262f5c7d68..9b8353c5d56 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/SceneGraphThread1Test.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/SceneGraphThread1Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test shape construction on a background thread
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/SceneGraphThread2Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/SceneGraphThread2Test.java
index 5743d9f111f..c87b2fe2fac 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/SceneGraphThread2Test.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/SceneGraphThread2Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test Scene construction on a background thread
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/SceneGraphThread3Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/SceneGraphThread3Test.java
index e4ff52bf62b..07d8b60ff75 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/SceneGraphThread3Test.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/SceneGraphThread3Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test ContextMenu construction on a background thread
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/SceneGraphThread4Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/SceneGraphThread4Test.java
index 240211ac8f3..ef24427f0a8 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/SceneGraphThread4Test.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/SceneGraphThread4Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test Tooltip construction on a background thread
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/SceneGraphThreadCommon.java b/tests/system/src/test/java/test/com/sun/javafx/application/SceneGraphThreadCommon.java
index 94e470c5fab..551944e5ae3 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/SceneGraphThreadCommon.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/SceneGraphThreadCommon.java
@@ -25,9 +25,10 @@
 
 package test.com.sun.javafx.application;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 import static test.util.Util.TIMEOUT;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CountDownLatch;
@@ -46,7 +47,6 @@
 import javafx.scene.shape.Circle;
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
-import junit.framework.AssertionFailedError;
 import test.util.Util;
 
 /**
@@ -121,7 +121,7 @@ private void doTest(Callable<Node> callable) {
 
         try {
             if (!launchLatch.await(TIMEOUT, TimeUnit.MILLISECONDS)) {
-                throw new AssertionFailedError("Timeout waiting for Application to launch");
+                fail("Timeout waiting for Application to launch");
             }
         } catch (InterruptedException ex) {
             Throwable t = launchErr.get();
@@ -143,18 +143,11 @@ else if (t instanceof Error) {
         Platform.exit();
         try {
             if (!doneLatch.await(TIMEOUT, TimeUnit.MILLISECONDS)) {
-                throw new AssertionFailedError("Timeout waiting for Application to finish");
+                fail("Timeout waiting for Application to finish");
             }
         } catch (InterruptedException ex) {
             Throwable t = launchErr.get();
-            if (t instanceof RuntimeException) {
-                throw (RuntimeException)t;
-            }
-            else if (t instanceof Error) {
-                throw (Error)t;
-            } else {
-                throw new RuntimeException(t);
-            }
+            fail(t);
         }
     }
 
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitCommon.java b/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitCommon.java
index 712d7a6d896..10d7b37a797 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitCommon.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitCommon.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,11 @@
 
 package test.com.sun.javafx.application;
 
-import com.sun.javafx.application.PlatformImplShim;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static test.util.Util.TIMEOUT;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import javafx.application.Application;
@@ -34,12 +38,9 @@
 import javafx.scene.Scene;
 import javafx.scene.paint.Color;
 import javafx.stage.Stage;
-import junit.framework.AssertionFailedError;
+import com.sun.javafx.application.PlatformImplShim;
 import test.util.Util;
 
-import static org.junit.Assert.*;
-import static test.util.Util.TIMEOUT;
-
 /**
  * Test program for Platform implicit exit behavior using the primary stage.
  * Each of the tests must be run in a separate JVM which is why each
@@ -127,7 +128,7 @@ public static class MyApp extends Application {
                 assertEquals(0, stopped.getCount());
             } else {
                 stopped.countDown();
-                throw new AssertionFailedError("Unexpected call to stop method");
+                fail("Unexpected call to stop method");
             }
         }
     }
@@ -165,11 +166,11 @@ private void doTestCommon(boolean implicitExit,
 
         try {
             if (!initialized.await(TIMEOUT, TimeUnit.MILLISECONDS)) {
-                throw new AssertionFailedError("Timeout waiting for Application to launch and initialize");
+                fail("Timeout waiting for Application to launch and initialize");
             }
 
             if (!started.await(TIMEOUT, TimeUnit.MILLISECONDS)) {
-                throw new AssertionFailedError("Timeout waiting for Application to start");
+                fail("Timeout waiting for Application to start");
             }
 
             final CountDownLatch rDone = new CountDownLatch(1);
@@ -186,7 +187,7 @@ private void doTestCommon(boolean implicitExit,
             });
 
             if (!rDone.await(TIMEOUT, TimeUnit.MILLISECONDS)) {
-                throw new AssertionFailedError("Timeout waiting for runLater, throwableType = "
+                fail("Timeout waiting for runLater, throwableType = "
                         + throwableType);
             }
 
@@ -217,15 +218,15 @@ private void doTestCommon(boolean implicitExit,
             }
 
             if (!stopped.await(TIMEOUT, TimeUnit.MILLISECONDS)) {
-                throw new AssertionFailedError("Timeout waiting for Application to stop");
+                fail("Timeout waiting for Application to stop");
             }
 
             if (!exitLatch.await(TIMEOUT, TimeUnit.MILLISECONDS)) {
-                throw new AssertionFailedError("Timeout waiting for Platform to exit");
+                fail("Timeout waiting for Platform to exit");
             }
 
             if (!latch.await(TIMEOUT, TimeUnit.MILLISECONDS)) {
-                throw new AssertionFailedError("Timeout waiting for launch to return");
+                fail("Timeout waiting for launch to return");
             }
         } catch (InterruptedException ex) {
             Util.throwError(testError[0]);
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicit1Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicit1Test.java
index c884771eea3..6df9c4242c7 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicit1Test.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicit1Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test for Platform exit behavior when implicitExit is set to false
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicit2Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicit2Test.java
index 6868d797ce2..3496120c003 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicit2Test.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicit2Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test for (default) implicit Platform exit behavior
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicitError1Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicitError1Test.java
index 7ab021c195c..28cf25386a7 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicitError1Test.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicitError1Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test for Platform exit behavior when implicitExit is set to false
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicitError2Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicitError2Test.java
index 9c9874f1261..346a871757a 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicitError2Test.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicitError2Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test for (default) implicit Platform exit behavior
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicitException1Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicitException1Test.java
index e84c4dcba6c..392c03279c5 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicitException1Test.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicitException1Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test for Platform exit behavior when implicitExit is set to false
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicitException2Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicitException2Test.java
index 8868e80b066..f0cac40c614 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicitException2Test.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicitException2Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test for (default) implicit Platform exit behavior
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitImplicitErrorTest.java b/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitImplicitErrorTest.java
index 4e5894fdc2d..6c7256d4efb 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitImplicitErrorTest.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitImplicitErrorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test for (default) implicit Platform exit behavior
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitImplicitExceptionTest.java b/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitImplicitExceptionTest.java
index f158a818668..38be1360178 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitImplicitExceptionTest.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitImplicitExceptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test for (default) implicit Platform exit behavior
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitImplicitTest.java b/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitImplicitTest.java
index a22ae41d063..46433e276e6 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitImplicitTest.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitImplicitTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test for (default) implicit Platform exit behavior
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicit1Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicit1Test.java
index a122aa1d5eb..2f5af53502a 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicit1Test.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicit1Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test Platform exit behavior when no Stage is shown and implicitExit is false
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicit2Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicit2Test.java
index ef12a8bd34a..13f4a107b75 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicit2Test.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicit2Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test Platform exit behavior when no Stage is shown and implicitExit is false
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicitError1Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicitError1Test.java
index f5eaeff1381..cbd8159b074 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicitError1Test.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicitError1Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test Platform exit behavior when no Stage is shown and implicitExit is false
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicitError2Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicitError2Test.java
index 3eaa33fb968..3cc4d22eaf6 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicitError2Test.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicitError2Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test Platform exit behavior when no Stage is shown and implicitExit is false
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicitException1Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicitException1Test.java
index 162e73eb250..e744a330c47 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicitException1Test.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicitException1Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test Platform exit behavior when no Stage is shown and implicitExit is false
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicitException2Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicitException2Test.java
index d3d72f9c44d..b6c0117f01a 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicitException2Test.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicitException2Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test Platform exit behavior when no Stage is shown and implicitExit is false
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowImplicitErrorTest.java b/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowImplicitErrorTest.java
index 757f15a9beb..e682f399384 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowImplicitErrorTest.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowImplicitErrorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test for (default) implicit Platform exit behavior when no Stage is shown
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowImplicitExceptionTest.java b/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowImplicitExceptionTest.java
index b32f9395e63..0ee07c948c1 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowImplicitExceptionTest.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowImplicitExceptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test for (default) implicit Platform exit behavior when no Stage is shown
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowImplicitTest.java b/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowImplicitTest.java
index b9269b7f42d..2c2830788fb 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowImplicitTest.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowImplicitTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test for (default) implicit Platform exit behavior when no Stage is shown
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/StaticStartupTest.java b/tests/system/src/test/java/test/com/sun/javafx/application/StaticStartupTest.java
index 47052d4a84f..773c5a35b3f 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/StaticStartupTest.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/StaticStartupTest.java
@@ -25,16 +25,19 @@
 
 package test.com.sun.javafx.application;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 import javafx.application.Platform;
-import org.junit.AfterClass;
-import org.junit.Test;
-import junit.framework.AssertionFailedError;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 public class StaticStartupTest {
 
-    @Test (timeout=15000)
+    @Test
+    @Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
     public void testStartupFromClinit() throws Exception {
         Thread thr = new Thread(() -> {
             try {
@@ -48,7 +51,7 @@ public void testStartupFromClinit() throws Exception {
         StaticClass.doSomething();
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardown() {
         Platform.exit();
     }
@@ -70,7 +73,7 @@ static void doSomething() {
             try {
                 assertEquals(staticLatch.getCount(), 0);
             } catch (Throwable th) {
-                throw new AssertionFailedError ("Static latch couldn't be read");
+                fail("Static latch couldn't be read");
             }
         });
     }
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/SwingExitCommon.java b/tests/system/src/test/java/test/com/sun/javafx/application/SwingExitCommon.java
index 8c00f975efd..7a10277e14a 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/SwingExitCommon.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/SwingExitCommon.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,25 +25,26 @@
 
 package test.com.sun.javafx.application;
 
-import com.sun.javafx.application.PlatformImplShim;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static test.util.Util.TIMEOUT;
 import java.awt.BorderLayout;
-import javax.swing.SwingUtilities;
 import java.awt.Dimension;
 import java.lang.reflect.InvocationTargetException;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
+import javax.swing.JFrame;
+import javax.swing.SwingUtilities;
 import javafx.application.Platform;
 import javafx.embed.swing.JFXPanel;
 import javafx.scene.Group;
 import javafx.scene.Scene;
 import javafx.scene.paint.Color;
-import javax.swing.JFrame;
-import junit.framework.AssertionFailedError;
+import com.sun.javafx.application.PlatformImplShim;
 import test.util.Util;
 
-import static org.junit.Assert.*;
-import static test.util.Util.TIMEOUT;
-
 /**
  * Test program for Platform implicit exit behavior using an embedded JFXPanel.
  * Each of the tests must be run in a separate JVM which is why each
@@ -118,7 +119,7 @@ private void doTestCommon(boolean implicitExit,
 
         try {
             if (!initialized.await(TIMEOUT, TimeUnit.MILLISECONDS)) {
-                throw new AssertionFailedError("Timeout waiting for JFXPanel to launch and initialize");
+                fail("Timeout waiting for JFXPanel to launch and initialize");
             }
 
             Thread.sleep(SLEEP_TIME);
@@ -129,9 +130,7 @@ private void doTestCommon(boolean implicitExit,
                 });
             }
             catch (InvocationTargetException ex) {
-                AssertionFailedError err = new AssertionFailedError("Exception while disposing JFrame");
-                err.initCause(ex.getCause());
-                throw err;
+                fail(ex);
             }
 
             final CountDownLatch exitLatch = PlatformImplShim.test_getPlatformExitLatch();
@@ -151,7 +150,7 @@ private void doTestCommon(boolean implicitExit,
             }
 
             if (!exitLatch.await(TIMEOUT, TimeUnit.MILLISECONDS)) {
-                throw new AssertionFailedError("Timeout waiting for Platform to exit");
+                fail("Timeout waiting for Platform to exit");
             }
         } catch (InterruptedException ex) {
             Util.throwError(testError[0]);
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/SwingExitExplicit1Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/SwingExitExplicit1Test.java
index e97ee7741eb..994c78b7bd0 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/SwingExitExplicit1Test.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/SwingExitExplicit1Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test for Platform exit behavior when implicitExit is set to false
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/SwingExitExplicit2Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/SwingExitExplicit2Test.java
index 1ca4968d095..d67220bc51b 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/SwingExitExplicit2Test.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/SwingExitExplicit2Test.java
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test for (default) implicit Platform exit behavior
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/SwingExitImplicitTest.java b/tests/system/src/test/java/test/com/sun/javafx/application/SwingExitImplicitTest.java
index 1a00981b286..20607379ebb 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/SwingExitImplicitTest.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/SwingExitImplicitTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test for (default) implicit Platform exit behavior
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/SwingNoExit.java b/tests/system/src/test/java/test/com/sun/javafx/application/SwingNoExit.java
index 128caaafab8..1d7e8227657 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/SwingNoExit.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/SwingNoExit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,26 +25,24 @@
 
 package test.com.sun.javafx.application;
 
-import com.sun.javafx.application.PlatformImplShim;
-import javafx.application.Platform;
-import javafx.embed.swing.JFXPanel;
-import javafx.scene.Group;
-import javafx.scene.Scene;
-import javafx.scene.paint.Color;
-import junit.framework.AssertionFailedError;
-import test.util.Util;
-
-import javax.swing.JFrame;
-import javax.swing.SwingUtilities;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.lang.reflect.InvocationTargetException;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
-
-import org.junit.Test;
-import org.junit.Assert;
+import javax.swing.JFrame;
+import javax.swing.SwingUtilities;
+import javafx.application.Platform;
+import javafx.embed.swing.JFXPanel;
+import javafx.scene.Group;
+import javafx.scene.Scene;
+import javafx.scene.paint.Color;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.application.PlatformImplShim;
+import test.util.Util;
 
 /**
  * Test program for Platform.exit() behavior with an embedded JFXPanel.
@@ -96,7 +94,7 @@ public void doTestImplicitExit() throws Throwable {
             }
         });
         if (!initLatch.await(Util.TIMEOUT, TimeUnit.MILLISECONDS)) {
-            throw new AssertionFailedError("Timeout waiting for JFXPanel to launch and initialize");
+            fail("Timeout waiting for JFXPanel to launch and initialize");
         }
         Throwable t = error.get();
         if (t != null) {
@@ -109,14 +107,13 @@ public void doTestImplicitExit() throws Throwable {
             runAndWait.countDown();
         });
         if (!runAndWait.await(Util.TIMEOUT, TimeUnit.MILLISECONDS)) {
-            throw new AssertionFailedError("Timeout waiting for Platform.exit()");
+            fail("Timeout waiting for Platform.exit()");
         }
 
         final CountDownLatch exitLatch = PlatformImplShim.test_getPlatformExitLatch();
         Thread.sleep(SLEEP_TIME);
         // Platform.exit() should not cause FX to exit, while JFXPanel is alive
-        Assert.assertEquals("Platform.exit() caused FX to exit, while JFXPanel is alive",
-                            1, exitLatch.getCount());
+        assertEquals(1, exitLatch.getCount(), "Platform.exit() caused FX to exit, while JFXPanel is alive");
 
         try {
             SwingUtilities.invokeAndWait(() -> {
@@ -125,12 +122,11 @@ public void doTestImplicitExit() throws Throwable {
             });
         }
         catch (InvocationTargetException ex) {
-            throw new AssertionFailedError("Exception while disposing JFrame");
+            fail(ex);
         }
 
         Thread.sleep(SLEEP_TIME);
         // JFXPanel is gone, implicit exit is false, so FX should have exited now
-        Assert.assertEquals("FX is not exited, when the last JFXPanel is disposed",
-                            0, exitLatch.getCount());
+       assertEquals(0, exitLatch.getCount(), "FX is not exited, when the last JFXPanel is disposed");
     }
 }
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/TaskbarApp1Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/TaskbarApp1Test.java
index 407919062b5..21797a5d6b8 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/TaskbarApp1Test.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/TaskbarApp1Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test program for Platform finishListener
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/TaskbarApp2Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/TaskbarApp2Test.java
index b67b93d3d69..e21c4594fea 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/TaskbarApp2Test.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/TaskbarApp2Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test program for Platform finishListener
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/TaskbarApp3Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/TaskbarApp3Test.java
index c4ff7734dcd..2fd07dd42b7 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/TaskbarApp3Test.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/TaskbarApp3Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test program for Platform finishListener
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/TaskbarApp4Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/TaskbarApp4Test.java
index 1b1c708d732..161f0689891 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/TaskbarApp4Test.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/TaskbarApp4Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test program for Platform finishListener
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/TaskbarApp5Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/TaskbarApp5Test.java
index 9b5f0245c03..9114250a520 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/TaskbarApp5Test.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/TaskbarApp5Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package test.com.sun.javafx.application;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test program for Platform finishListener
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/TaskbarAppCommon.java b/tests/system/src/test/java/test/com/sun/javafx/application/TaskbarAppCommon.java
index d916ad00d60..868b5d12013 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/TaskbarAppCommon.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/TaskbarAppCommon.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,16 +25,18 @@
 
 package test.com.sun.javafx.application;
 
-import com.sun.javafx.application.PlatformImpl;
-import com.sun.javafx.application.PlatformImplShim;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static test.util.Util.TIMEOUT;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import javafx.application.Platform;
-import junit.framework.AssertionFailedError;
-
-import static org.junit.Assert.*;
-import static test.util.Util.TIMEOUT;
-
+import com.sun.javafx.application.PlatformImpl;
+import com.sun.javafx.application.PlatformImplShim;
 
 /**
  * Test program for PlatformImpl
@@ -55,12 +57,10 @@ private void startup() {
 
         try {
             if (!launchLatch.await(TIMEOUT, TimeUnit.MILLISECONDS)) {
-                throw new AssertionFailedError("Timeout waiting for Platform to start");
+                fail("Timeout waiting for Platform to start");
             }
         } catch (InterruptedException ex) {
-            AssertionFailedError err = new AssertionFailedError("Unexpected exception");
-            err.initCause(ex);
-            throw err;
+            fail(ex);
         }
         assertEquals(0, launchLatch.getCount());
         final CountDownLatch exitLatch = PlatformImplShim.test_getPlatformExitLatch();
diff --git a/tests/system/src/test/java/test/com/sun/javafx/css/StylesheetWithSecurityManagerTest.java b/tests/system/src/test/java/test/com/sun/javafx/css/StylesheetWithSecurityManagerTest.java
index de691aca2b1..be919d61492 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/css/StylesheetWithSecurityManagerTest.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/css/StylesheetWithSecurityManagerTest.java
@@ -25,8 +25,8 @@
 
 package test.com.sun.javafx.css;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import java.security.Permission;
 import java.util.List;
 import javafx.collections.FXCollections;
@@ -40,7 +40,7 @@
 import javafx.css.Styleable;
 import javafx.css.Stylesheet;
 import javafx.scene.paint.Color;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import com.sun.javafx.css.StyleManager;
 
 public class StylesheetWithSecurityManagerTest {
diff --git a/tests/system/src/test/java/test/com/sun/javafx/font/freetype/PangoTest.java b/tests/system/src/test/java/test/com/sun/javafx/font/freetype/PangoTest.java
index 02c8fc776e5..3123da42ad7 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/font/freetype/PangoTest.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/font/freetype/PangoTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,13 +25,11 @@
 
 package test.com.sun.javafx.font.freetype;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static test.util.Util.TIMEOUT;
-
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Scene;
@@ -40,11 +38,9 @@
 import javafx.scene.text.Text;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 /**
@@ -81,13 +77,13 @@ public void start(Stage primaryStage) throws Exception {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setupOnce() throws Exception {
         Util.launch(launchLatch, MyApp.class);
         assertEquals(0, launchLatch.getCount());
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardownOnce() {
         Util.shutdown();
     }
@@ -100,7 +96,7 @@ private void addTextToPane(Text text) throws Exception {
             });
             pane.getChildren().add(text);
         });
-        assertTrue("Timeout waiting for runLater", rDone.await(TIMEOUT, TimeUnit.MILLISECONDS));
+        assertTrue(rDone.await(TIMEOUT, TimeUnit.MILLISECONDS), "Timeout waiting for runLater");
     }
 
     @Test
diff --git a/tests/system/src/test/java/test/com/sun/javafx/iio/LoadCorruptJPEGTest.java b/tests/system/src/test/java/test/com/sun/javafx/iio/LoadCorruptJPEGTest.java
index 508e5d11d5c..1f316e23ee7 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/iio/LoadCorruptJPEGTest.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/iio/LoadCorruptJPEGTest.java
@@ -24,13 +24,11 @@
  */
 package test.com.sun.javafx.iio;
 
-import static org.junit.Assert.fail;
-
+import static org.junit.jupiter.api.Assertions.fail;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.net.URL;
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Scene;
@@ -38,12 +36,10 @@
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.HBox;
 import javafx.stage.Stage;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 public class LoadCorruptJPEGTest {
@@ -84,17 +80,17 @@ public void start(Stage primaryStage) {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() throws Exception {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void exit() {
         Util.shutdown();
     }
 
-    @After
+    @AfterEach
     public void resetTest() {
         Util.runAndWait(() -> {
             root.getChildren().clear();
diff --git a/tests/system/src/test/java/test/com/sun/javafx/image/impl/ImageRaceTest.java b/tests/system/src/test/java/test/com/sun/javafx/image/impl/ImageRaceTest.java
index de49d59258a..f7fe3fa4fcf 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/image/impl/ImageRaceTest.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/image/impl/ImageRaceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,11 @@
 
 package test.com.sun.javafx.image.impl;
 
+import static org.junit.jupiter.api.Assertions.fail;
+import static test.util.Util.TIMEOUT;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.jupiter.api.Test;
 import com.sun.javafx.image.impl.ByteArgb;
 import com.sun.javafx.image.impl.ByteBgr;
 import com.sun.javafx.image.impl.ByteBgra;
@@ -36,11 +41,6 @@
 import com.sun.javafx.image.impl.ByteRgba;
 import com.sun.javafx.image.impl.IntArgb;
 import com.sun.javafx.image.impl.IntArgbPre;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.Test;
-import static org.junit.Assert.fail;
-import static test.util.Util.TIMEOUT;
 
 public class ImageRaceTest {
     static boolean verbose;
diff --git a/tests/system/src/test/java/test/com/sun/javafx/sg/prism/RT36296Test.java b/tests/system/src/test/java/test/com/sun/javafx/sg/prism/RT36296Test.java
index 24c8d051484..3f935469599 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/sg/prism/RT36296Test.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/sg/prism/RT36296Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,12 +24,11 @@
 
 package test.com.sun.javafx.sg.prism;
 
-import static org.junit.Assert.assertEquals;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.geometry.Rectangle2D;
@@ -39,11 +38,10 @@
 import javafx.scene.control.Label;
 import javafx.scene.image.WritableImage;
 import javafx.stage.Stage;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import test.util.Util;
 
 public class RT36296Test {
@@ -67,18 +65,19 @@ public static class MyApp extends Application {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setupOnce() {
         Util.launch(launchLatch, MyApp.class);
         assertEquals(0, launchLatch.getCount());
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardownOnce() {
         Util.shutdown();
     }
 
-    @Test(timeout = 15000)
+    @Test
+    @Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
     public void TestBug() {
         Label label = new Label();
         label.setStyle(" -fx-border-style:dashed; -fx-border-width:0; ");
diff --git a/tests/system/src/test/java/test/com/sun/javafx/text/TextHitInfoTest.java b/tests/system/src/test/java/test/com/sun/javafx/text/TextHitInfoTest.java
index 6ab2aae3426..b0435dfa60b 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/text/TextHitInfoTest.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/text/TextHitInfoTest.java
@@ -25,11 +25,10 @@
 
 package test.com.sun.javafx.text;
 
-import static org.junit.Assume.assumeTrue;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import javafx.scene.text.Font;
 import org.junit.jupiter.api.Test;
-
 import com.sun.javafx.font.PGFont;
 import com.sun.javafx.geom.RectBounds;
 import com.sun.javafx.scene.text.FontHelper;
@@ -37,8 +36,6 @@
 import com.sun.javafx.scene.text.TextSpan;
 import com.sun.javafx.text.PrismTextLayout;
 
-import javafx.scene.text.Font;
-
 public class TextHitInfoTest {
     private final PrismTextLayout layout = new PrismTextLayout();
     private final PGFont arialFont = (PGFont) FontHelper.getNativeFont(Font.font("Arial", 12));
@@ -186,6 +183,6 @@ void getHitInfoTest() {
     }
 
     private void assumeArialFontAvailable() {
-        assumeTrue("Arial font missing", arialFont.getName().equals("Arial"));
+        assumeTrue(arialFont.getName().equals("Arial"), "Arial font missing");
     }
 }
diff --git a/tests/system/src/test/java/test/com/sun/javafx/text/TextLayoutTest.java b/tests/system/src/test/java/test/com/sun/javafx/text/TextLayoutTest.java
index bd3f90118d1..50be840995f 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/text/TextLayoutTest.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/text/TextLayoutTest.java
@@ -25,18 +25,16 @@
 
 package test.com.sun.javafx.text;
 
-import static org.junit.Assume.assumeTrue;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import java.util.Arrays;
 import java.util.List;
-
+import javafx.scene.text.Font;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
-
 import com.sun.javafx.PlatformUtil;
 import com.sun.javafx.font.CharToGlyphMapper;
 import com.sun.javafx.font.PGFont;
@@ -49,8 +47,6 @@
 import com.sun.javafx.text.PrismTextLayout;
 import com.sun.javafx.text.TextRun;
 
-import javafx.scene.text.Font;
-
 public class TextLayoutTest {
     private static final String J = "\u3041";  // Japanese not complex
     private static final String D = "\u0907";  // Devanagari complex
@@ -587,18 +583,18 @@ void caseTest(Case c) {
     }
 
     private void assumeArialFontAvailable() {
-        assumeTrue("Arial font missing", arialFont.getName().equals("Arial"));
+        assumeTrue(arialFont.getName().equals("Arial"), "Arial font missing");
     }
 
     private void assumeTahomaFontAvailable() {
-        assumeTrue("Tahoma font missing", arialFont.getName().equals("Tahoma"));
+        assumeTrue(arialFont.getName().equals("Tahoma"), "Tahoma font missing");
     }
 
     private static void assumeMac() {
-        assumeTrue("Platform is not Mac", PlatformUtil.isMac());
+        assumeTrue(PlatformUtil.isMac(), "Platform is not Mac");
     }
 
     private static void assumeWindows() {
-        assumeTrue("Platform is not Windows", PlatformUtil.isWindows());
+        assumeTrue(PlatformUtil.isWindows(), "Platform is not Windows");
     }
 }
diff --git a/tests/system/src/test/java/test/com/sun/javafx/tk/quantum/CloseWindowTest.java b/tests/system/src/test/java/test/com/sun/javafx/tk/quantum/CloseWindowTest.java
index c3bd4e01439..c95545f6a6a 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/tk/quantum/CloseWindowTest.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/tk/quantum/CloseWindowTest.java
@@ -26,18 +26,15 @@
 package test.com.sun.javafx.tk.quantum;
 
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Group;
 import javafx.scene.Scene;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 public class CloseWindowTest {
@@ -67,12 +64,12 @@ public void start(Stage t) {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setup() throws Exception {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void shutdown() {
         Util.shutdown();
     }
diff --git a/tests/system/src/test/java/test/com/sun/javafx/tk/quantum/SystemMenuBarTest.java b/tests/system/src/test/java/test/com/sun/javafx/tk/quantum/SystemMenuBarTest.java
index ac1ce26702a..033c5a46bfe 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/tk/quantum/SystemMenuBarTest.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/tk/quantum/SystemMenuBarTest.java
@@ -25,43 +25,39 @@
 
 package test.com.sun.javafx.tk.quantum;
 
-import com.sun.javafx.menu.MenuBase;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import test.util.Util;
-import test.util.memory.JMemoryBuddy;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import com.sun.javafx.tk.quantum.GlassSystemMenuShim;
-import com.sun.javafx.scene.control.GlobalMenuAdapter;
-import java.util.List;
-import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 import javafx.application.Platform;
+import javafx.scene.Scene;
 import javafx.scene.control.Menu;
 import javafx.scene.control.MenuBar;
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.SeparatorMenuItem;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.VBox;
-import javafx.scene.Scene;
 import javafx.stage.Stage;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.menu.MenuBase;
+import com.sun.javafx.scene.control.GlobalMenuAdapter;
+import com.sun.javafx.tk.quantum.GlassSystemMenuShim;
+import test.util.Util;
+import test.util.memory.JMemoryBuddy;
 
 public class SystemMenuBarTest {
-    @BeforeClass
+    @BeforeAll
     public static void initFX() throws Exception {
         CountDownLatch startupLatch = new CountDownLatch(1);
         Platform.setImplicitExit(false);
@@ -71,7 +67,7 @@ public static void initFX() throws Exception {
         });
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardownOnce() {
         Util.shutdown();
     }
@@ -215,7 +211,7 @@ public void createAndRefocusMenuBarStage() {
         stage.show();
         final ArrayList<WeakReference<MenuBase>> uncollectedMenus = new ArrayList<>();
         GlassSystemMenuShim gsmh = new GlassSystemMenuShim();
-        assumeTrue("SystemMenu only supported on MacOS", gsmh.isSupported());
+        assumeTrue(gsmh.isSupported(), "SystemMenu only supported on MacOS");
         Menu m1 = new Menu("Menu");
 
         MenuBase menuBase = GlobalMenuAdapter.adapt(m1);
@@ -232,7 +228,7 @@ public void createAndRefocusMenuBarStage() {
             for (WeakReference<com.sun.glass.ui.Menu> wr : u2) {
                 if (!JMemoryBuddy.checkCollectable(wr)) {
                     strongCount++;
-                    assertTrue("Too many references", strongCount < 2);
+                    assertTrue(strongCount < 2, "Too many references");
                 }
             }
             assertEquals(1, strongCount, "Exactly one reference should be reachable");
diff --git a/tests/system/src/test/java/test/com/sun/javafx/tk/quantum/ViewPainterLeakTest.java b/tests/system/src/test/java/test/com/sun/javafx/tk/quantum/ViewPainterLeakTest.java
index 70321671839..bb912edf975 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/tk/quantum/ViewPainterLeakTest.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/tk/quantum/ViewPainterLeakTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
 
 import java.lang.ref.WeakReference;
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Scene;
@@ -37,11 +36,9 @@
 import javafx.scene.text.TextFlow;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 import test.util.memory.JMemoryBuddy;
 
@@ -81,12 +78,12 @@ public void start(Stage stage) {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setupOnce() throws Exception {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardown() {
         Util.shutdown();
     }
diff --git a/tests/system/src/test/java/test/com/sun/javafx/tk/quantum/WindowSceneInitDisposeTest.java b/tests/system/src/test/java/test/com/sun/javafx/tk/quantum/WindowSceneInitDisposeTest.java
index de8283b6a35..cc34cb1c5a0 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/tk/quantum/WindowSceneInitDisposeTest.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/tk/quantum/WindowSceneInitDisposeTest.java
@@ -26,17 +26,14 @@
 package test.com.sun.javafx.tk.quantum;
 
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Group;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 public class WindowSceneInitDisposeTest {
@@ -66,12 +63,12 @@ public void start(Stage t) {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setup() throws Exception {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void shutdown() {
         Util.shutdown();
     }
diff --git a/tests/system/src/test/java/test/com/sun/marlin/ClipShapeTest.java b/tests/system/src/test/java/test/com/sun/marlin/ClipShapeTest.java
index a6ac6beb67e..c417a9da8c1 100644
--- a/tests/system/src/test/java/test/com/sun/marlin/ClipShapeTest.java
+++ b/tests/system/src/test/java/test/com/sun/marlin/ClipShapeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,8 +24,8 @@
  */
 package test.com.sun.marlin;
 
-import static org.junit.Assert.assertEquals;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import java.awt.BasicStroke;
 import java.awt.Shape;
 import java.awt.geom.CubicCurve2D;
@@ -41,18 +41,17 @@
 import java.util.Locale;
 import java.util.Random;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Handler;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
-
 import javax.imageio.IIOImage;
 import javax.imageio.ImageIO;
 import javax.imageio.ImageWriteParam;
 import javax.imageio.ImageWriter;
 import javax.imageio.stream.ImageOutputStream;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.collections.ObservableList;
@@ -77,12 +76,10 @@
 import javafx.scene.shape.StrokeLineJoin;
 import javafx.scene.text.Text;
 import javafx.stage.Stage;
-
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import test.util.Util;
 
 /**
@@ -972,14 +969,14 @@ static void subdivide(final Path2D p2d, final int type, final double[] in) {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setupOnce() throws Exception {
         Util.launch(launchLatch, MyApp.class);
 
         assertEquals(0, launchLatch.getCount());
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardownOnce() {
         Util.shutdown();
     }
@@ -993,19 +990,22 @@ private void checkMarlin() {
         }
     }
 
-    @Test(timeout = 600000)
+    @Test
+    @Timeout(value=600000, unit=TimeUnit.MILLISECONDS)
     public void TestPoly() throws InterruptedException {
         test(new String[]{"-poly"});
         test(new String[]{"-poly", "-doDash"});
     }
 
-    @Test(timeout = 900000)
+    @Test
+    @Timeout(value=900000, unit=TimeUnit.MILLISECONDS)
     public void TestQuad() throws InterruptedException {
         test(new String[]{"-quad"});
         test(new String[]{"-quad", "-doDash"});
     }
 
-    @Test(timeout = 900000)
+    @Test
+    @Timeout(value=900000, unit=TimeUnit.MILLISECONDS)
     public void TestCubic() throws InterruptedException {
         test(new String[]{"-cubic"});
         test(new String[]{"-cubic", "-doDash"});
@@ -1015,7 +1015,7 @@ private void test(String[] args) {
         initArgs(args);
         runTests();
         checkMarlin();
-        Assert.assertFalse("Detected a problem.", doChecksFailed);
+        assertFalse(doChecksFailed, "Detected a problem.");
     }
 
     private static void dumpShape(final Shape shape) {
diff --git a/tests/system/src/test/java/test/com/sun/marlin/DashedRectTest.java b/tests/system/src/test/java/test/com/sun/marlin/DashedRectTest.java
index 19314fe19ef..cb9a22b1619 100644
--- a/tests/system/src/test/java/test/com/sun/marlin/DashedRectTest.java
+++ b/tests/system/src/test/java/test/com/sun/marlin/DashedRectTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,11 +24,10 @@
  */
 package test.com.sun.marlin;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 import java.util.concurrent.CountDownLatch;
-
+import java.util.concurrent.TimeUnit;
 import javafx.application.Application;
 import javafx.collections.ObservableList;
 import javafx.geometry.Rectangle2D;
@@ -44,11 +43,10 @@
 import javafx.scene.shape.Path;
 import javafx.scene.shape.VLineTo;
 import javafx.stage.Stage;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import test.util.Util;
 
 /**
@@ -100,20 +98,20 @@ public void start(Stage primaryStage) throws Exception {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setupOnce() throws Exception {
         Util.launch(launchLatch, MyApp.class);
         assertEquals(0, launchLatch.getCount());
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardownOnce() {
         Util.shutdown();
     }
 
-    @Test(timeout = 10000)
+    @Test
+    @Timeout(value=10000, unit=TimeUnit.MILLISECONDS)
     public void TestDashedPath() throws InterruptedException {
-
         final int size = MAX * 2;
 
         Util.runAndWait(() -> {
diff --git a/tests/system/src/test/java/test/com/sun/marlin/HugePolygonClipTest.java b/tests/system/src/test/java/test/com/sun/marlin/HugePolygonClipTest.java
index a18f67b7bb9..0210543da03 100644
--- a/tests/system/src/test/java/test/com/sun/marlin/HugePolygonClipTest.java
+++ b/tests/system/src/test/java/test/com/sun/marlin/HugePolygonClipTest.java
@@ -24,9 +24,8 @@
  */
 package test.com.sun.marlin;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -34,13 +33,12 @@
 import java.util.Iterator;
 import java.util.Locale;
 import java.util.concurrent.CountDownLatch;
-
+import java.util.concurrent.TimeUnit;
 import javax.imageio.IIOImage;
 import javax.imageio.ImageIO;
 import javax.imageio.ImageWriteParam;
 import javax.imageio.ImageWriter;
 import javax.imageio.stream.ImageOutputStream;
-
 import javafx.application.Application;
 import javafx.embed.swing.SwingFXUtils;
 import javafx.geometry.Rectangle2D;
@@ -54,11 +52,10 @@
 import javafx.scene.transform.Translate;
 import javafx.stage.Screen;
 import javafx.stage.Stage;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import test.util.Util;
 
 /**
@@ -126,18 +123,19 @@ public void start(Stage primaryStage) throws Exception {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setupOnce() throws Exception {
         Util.launch(launchLatch, MyApp.class);
         assertEquals(0, launchLatch.getCount());
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardownOnce() {
         Util.shutdown();
     }
 
-    @Test(timeout = 10000)
+    @Test
+    @Timeout(value=10000, unit=TimeUnit.MILLISECONDS)
     public void TestHugePolygonCoords() throws InterruptedException {
         Util.runAndWait(() -> {
 
diff --git a/tests/system/src/test/java/test/com/sun/marlin/QPathTest.java b/tests/system/src/test/java/test/com/sun/marlin/QPathTest.java
index f79b0f6a560..2538086c925 100644
--- a/tests/system/src/test/java/test/com/sun/marlin/QPathTest.java
+++ b/tests/system/src/test/java/test/com/sun/marlin/QPathTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,15 +25,15 @@
 
 package test.com.sun.marlin;
 
-import static org.junit.Assert.assertEquals;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import java.util.Locale;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 import java.util.logging.Handler;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
-
 import javafx.animation.KeyFrame;
 import javafx.animation.KeyValue;
 import javafx.animation.Timeline;
@@ -48,12 +48,10 @@
 import javafx.scene.shape.SVGPath;
 import javafx.stage.Stage;
 import javafx.util.Duration;
-
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import test.util.Util;
 
 /**
@@ -137,18 +135,19 @@ public void start(Stage primaryStage) throws Exception {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setupOnce() throws Exception {
         Util.launch(launchLatch, MyApp.class);
         assertEquals(0, launchLatch.getCount());
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardownOnce() {
         Util.shutdown();
     }
 
-    @Test(timeout = 15000)
+    @Test
+    @Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
     public void TestBug() {
         Platform.runLater(() -> {
             SVGPath path = new SVGPath();
@@ -202,7 +201,7 @@ public void TestBug() {
         } catch (InterruptedException ie) {
             Logger.getLogger(QPathTest.class.getName()).log(Level.SEVERE, "interrupted", ie);
         }
-        Assert.assertFalse("DoChecks detected a problem.", doChecksFailed);
+        assertFalse(doChecksFailed, "DoChecks detected a problem.");
     }
 
     static String readPath() {
diff --git a/tests/system/src/test/java/test/com/sun/marlin/ScaleClipTest.java b/tests/system/src/test/java/test/com/sun/marlin/ScaleClipTest.java
index 076593261c3..63d7d2a96d9 100644
--- a/tests/system/src/test/java/test/com/sun/marlin/ScaleClipTest.java
+++ b/tests/system/src/test/java/test/com/sun/marlin/ScaleClipTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,13 +24,12 @@
  */
 package test.com.sun.marlin;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 import java.awt.Color;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
-
 import javafx.application.Application;
 import javafx.geometry.Rectangle2D;
 import javafx.scene.Group;
@@ -45,11 +44,10 @@
 import javafx.scene.shape.StrokeLineJoin;
 import javafx.scene.transform.Transform;
 import javafx.stage.Stage;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import test.util.Util;
 
 /**
@@ -98,7 +96,7 @@ public void start(Stage primaryStage) throws Exception {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setupOnce() throws Exception {
         Util.launch(launchLatch, MyApp.class);
         assertEquals(0, launchLatch.getCount());
@@ -106,12 +104,13 @@ public static void setupOnce() throws Exception {
         System.out.println("ScaleClipTest: size = " + SIZE);
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardownOnce() {
         Util.shutdown();
     }
 
-    @Test(timeout = 10000)
+    @Test
+    @Timeout(value=10000, unit=TimeUnit.MILLISECONDS)
     public void TestNegativeScaleClipPath() throws InterruptedException {
         final AtomicBoolean fail = new AtomicBoolean();
 
@@ -133,7 +132,8 @@ public void TestNegativeScaleClipPath() throws InterruptedException {
         }
     }
 
-    @Test(timeout = 10000)
+    @Test
+    @Timeout(value=10000, unit=TimeUnit.MILLISECONDS)
     public void TestMarginScaleClipPath() throws InterruptedException {
         final AtomicBoolean fail = new AtomicBoolean();
 
diff --git a/tests/system/src/test/java/test/com/sun/marlin/ScaleX0Test.java b/tests/system/src/test/java/test/com/sun/marlin/ScaleX0Test.java
index 47f7484b6a4..f8b7ee2cd69 100644
--- a/tests/system/src/test/java/test/com/sun/marlin/ScaleX0Test.java
+++ b/tests/system/src/test/java/test/com/sun/marlin/ScaleX0Test.java
@@ -24,6 +24,7 @@
  */
 package test.com.sun.marlin;
 
+import static org.junit.jupiter.api.Assertions.fail;
 import static test.util.Util.TIMEOUT;
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
@@ -31,6 +32,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Locale;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javafx.application.Platform;
@@ -46,10 +48,10 @@
 import javafx.scene.shape.Circle;
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import test.util.Util;
 
 /**
@@ -74,7 +76,7 @@ public class ScaleX0Test {
         System.setProperty("prism.marlin.log", "true");
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setupOnce() throws Exception {
         defaultErrorStream = System.err;
         // Capture stderr:
@@ -86,13 +88,14 @@ public static void setupOnce() throws Exception {
         });
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardownOnce() {
         System.setErr(defaultErrorStream);
         Util.shutdown();
     }
 
-    @Test(timeout = 15000)
+    @Test
+    @Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
     public void testMarlinAIOOBEwhenScaleXIs0() {
         Scene scene = createScene();
 
@@ -126,7 +129,7 @@ public void testMarlinAIOOBEwhenScaleXIs0() {
         }
 
         if (stdErr.contains("ArrayIndexOutOfBoundsException")) {
-            Assert.fail("ArrayIndexOutOfBoundsException thrown !");
+            fail("ArrayIndexOutOfBoundsException thrown !");
         }
     }
 
diff --git a/tests/system/src/test/java/test/com/sun/prism/impl/PNTMeshVertexBufferLengthTest.java b/tests/system/src/test/java/test/com/sun/prism/impl/PNTMeshVertexBufferLengthTest.java
index 0412f24c0b5..9378eb373f4 100644
--- a/tests/system/src/test/java/test/com/sun/prism/impl/PNTMeshVertexBufferLengthTest.java
+++ b/tests/system/src/test/java/test/com/sun/prism/impl/PNTMeshVertexBufferLengthTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,13 +25,12 @@
 
 package test.com.sun.prism.impl;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import java.util.concurrent.CountDownLatch;
-
+import java.util.concurrent.TimeUnit;
 import javafx.application.Application;
 import javafx.application.ConditionalFeature;
 import javafx.application.Platform;
@@ -44,23 +43,22 @@
 import javafx.scene.shape.VertexFormat;
 import javafx.scene.transform.Rotate;
 import javafx.stage.Stage;
-
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import com.sun.javafx.sg.prism.NGTriangleMesh;
 import com.sun.javafx.sg.prism.NGTriangleMeshShim;
 import com.sun.prism.impl.BaseMesh;
 import com.sun.prism.impl.BaseMeshShim;
-
 import test.util.Util;
 
 /**
  * @test @bug 8178804
  * @summary Excessive memory consumption in TriangleMesh/MeshView
  */
+@Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
 public class PNTMeshVertexBufferLengthTest {
 
     // Sleep time showing/hiding window in milliseconds
@@ -260,24 +258,24 @@ public void start(Stage primaryStage) throws Exception {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setupOnce() {
         Util.launch(launchLatch, MyApp.class);
         assertEquals(0, launchLatch.getCount());
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardownOnce() {
         Util.shutdown();
     }
 
-    @Before
+    @BeforeEach
     public void setupEach() {
         assumeTrue(Platform.isSupported(ConditionalFeature.SCENE3D));
     }
 
     // ========================== TEST CASES ==========================
-    @Test(timeout = 15000)
+    @Test
     public void testMeshWithZeroDiv() throws InterruptedException {
         Util.runAndWait(() -> {
             Scene scene = myApp.primaryStage.getScene();
@@ -294,7 +292,7 @@ public void testMeshWithZeroDiv() throws InterruptedException {
         assertTrue(BaseMeshShim.test_isVertexBufferNull(baseMesh));
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testMeshWithOneDiv() throws InterruptedException {
         Util.runAndWait(() -> {
             Scene scene = myApp.primaryStage.getScene();
@@ -313,7 +311,7 @@ public void testMeshWithOneDiv() throws InterruptedException {
         assertEquals(10 * VERTEX_SIZE, BaseMeshShim.test_getVertexBufferLength(baseMesh));
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testMeshWithTwoDiv() throws InterruptedException {
         Util.runAndWait(() -> {
             Scene scene = myApp.primaryStage.getScene();
@@ -332,7 +330,7 @@ public void testMeshWithTwoDiv() throws InterruptedException {
         assertEquals(27 * VERTEX_SIZE, BaseMeshShim.test_getVertexBufferLength(baseMesh));
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testMeshWithThreeDiv() throws InterruptedException {
         Util.runAndWait(() -> {
             Scene scene = myApp.primaryStage.getScene();
@@ -352,7 +350,7 @@ public void testMeshWithThreeDiv() throws InterruptedException {
         assertEquals(325 * VERTEX_SIZE, BaseMeshShim.test_getVertexBufferLength(baseMesh));
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testMeshWithFiveDiv() throws InterruptedException {
         Util.runAndWait(() -> {
             Scene scene = myApp.primaryStage.getScene();
diff --git a/tests/system/src/test/java/test/com/sun/prism/impl/ps/ShapeCacheTest.java b/tests/system/src/test/java/test/com/sun/prism/impl/ps/ShapeCacheTest.java
index 688d5b3ed76..dd93eb839d9 100644
--- a/tests/system/src/test/java/test/com/sun/prism/impl/ps/ShapeCacheTest.java
+++ b/tests/system/src/test/java/test/com/sun/prism/impl/ps/ShapeCacheTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,8 @@
 
 package test.com.sun.prism.impl.ps;
 
-import static org.junit.Assert.assertEquals;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.geometry.Rectangle2D;
@@ -45,11 +43,9 @@
 import javafx.scene.shape.Path;
 import javafx.scene.transform.Affine;
 import javafx.stage.Stage;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 /**
@@ -88,13 +84,13 @@ public void start(Stage primaryStage) throws Exception {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setupOnce() {
         Util.launch(launchLatch, MyApp.class);
         assertEquals(0, launchLatch.getCount());
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardownOnce() {
         Util.shutdown();
     }
diff --git a/tests/system/src/test/java/test/com/sun/webkit/LocalStorageAccessTest.java b/tests/system/src/test/java/test/com/sun/webkit/LocalStorageAccessTest.java
index f79e971424e..46855b48114 100644
--- a/tests/system/src/test/java/test/com/sun/webkit/LocalStorageAccessTest.java
+++ b/tests/system/src/test/java/test/com/sun/webkit/LocalStorageAccessTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,22 +25,24 @@
 
 package test.com.sun.webkit;
 
-import com.sun.javafx.PlatformUtil;
-
-import java.io.File;
 import static java.util.Arrays.asList;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import java.io.File;
 import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assume.assumeTrue;
-import org.junit.Test;
+import java.util.concurrent.TimeUnit;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+import com.sun.javafx.PlatformUtil;
 
 /**
  * @test
  * @bug 8264990
  * @summary Check if access to local storage works without causing a segfault
  */
+@Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
 public class LocalStorageAccessTest {
-    @Test (timeout = 15000)
+    @Test
     public void testMainThreadDoesNotSegfault() throws Exception {
         if (PlatformUtil.isWindows()) {
             assumeTrue(Boolean.getBoolean("unstable.test")); // JDK-8265661
@@ -78,6 +80,6 @@ public void testMainThreadDoesNotSegfault() throws Exception {
         Process process = builder.start();
         int retVal = process.waitFor();
 
-        assertEquals("Process did not exit cleanly", 0, retVal);
+        assertEquals(0, retVal, "Process did not exit cleanly");
     }
 }
diff --git a/tests/system/src/test/java/test/com/sun/webkit/MainThreadTest.java b/tests/system/src/test/java/test/com/sun/webkit/MainThreadTest.java
index 401064cf3b2..fb7b068081c 100644
--- a/tests/system/src/test/java/test/com/sun/webkit/MainThreadTest.java
+++ b/tests/system/src/test/java/test/com/sun/webkit/MainThreadTest.java
@@ -25,19 +25,22 @@
 
 package test.com.sun.webkit;
 
-import java.io.File;
 import static java.util.Arrays.asList;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.io.File;
 import java.util.List;
-import static org.junit.Assert.assertEquals;
-import org.junit.Test;
+import java.util.concurrent.TimeUnit;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 /**
  * @test
  * @bug 8242361
  * @summary Check if webkit main thread <-> java integration works correctly
  */
+@Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
 public class MainThreadTest {
-    @Test (timeout = 15000)
+    @Test
     public void testMainThreadDoesNotSegfault() throws Exception {
         // This is an indirect test of the webkit main thread <-> java
         // integration. It was observed, that using a data-url caused the
@@ -71,6 +74,6 @@ public void testMainThreadDoesNotSegfault() throws Exception {
         Process process = builder.start();
         int retVal = process.waitFor();
 
-        assertEquals("Process did not exit cleanly", 0, retVal);
+        assertEquals(0, retVal, "Process did not exit cleanly");
     }
 }
diff --git a/tests/system/src/test/java/test/javafx/accessibility/virtualflow/VirtualFlowMemoryLeakTest.java b/tests/system/src/test/java/test/javafx/accessibility/virtualflow/VirtualFlowMemoryLeakTest.java
index 22aa2f753a2..e4ef16ffa74 100644
--- a/tests/system/src/test/java/test/javafx/accessibility/virtualflow/VirtualFlowMemoryLeakTest.java
+++ b/tests/system/src/test/java/test/javafx/accessibility/virtualflow/VirtualFlowMemoryLeakTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,13 +26,11 @@
 package test.javafx.accessibility.virtualflow;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static org.junit.Assume.assumeTrue;
-
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import java.lang.ref.WeakReference;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.beans.property.ReadOnlyObjectProperty;
@@ -46,13 +44,10 @@
 import javafx.scene.control.TableView;
 import javafx.scene.control.TableView.TableViewSelectionModel;
 import javafx.stage.Stage;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import com.sun.javafx.PlatformUtil;
-
 import test.util.Util;
 import test.util.memory.JMemoryBuddy;
 
@@ -139,12 +134,12 @@ private static TableView<Item> createTableView() {
         return tableView;
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardown() {
         Util.shutdown();
     }
diff --git a/tests/system/src/test/java/test/javafx/css/imagecacheleaktest/ImageCacheLeakTest.java b/tests/system/src/test/java/test/javafx/css/imagecacheleaktest/ImageCacheLeakTest.java
index 9ecc18acadd..7408ea8ce16 100644
--- a/tests/system/src/test/java/test/javafx/css/imagecacheleaktest/ImageCacheLeakTest.java
+++ b/tests/system/src/test/java/test/javafx/css/imagecacheleaktest/ImageCacheLeakTest.java
@@ -25,24 +25,27 @@
 
 package test.javafx.css.imagecacheleaktest;
 
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
 import static test.javafx.css.imagecacheleaktest.Constants.ERROR_IMAGE_VIEW;
 import static test.javafx.css.imagecacheleaktest.Constants.ERROR_INCORRECT_GC;
 import static test.javafx.css.imagecacheleaktest.Constants.ERROR_LEAK;
 import static test.javafx.css.imagecacheleaktest.Constants.ERROR_NONE;
 import java.util.ArrayList;
-import org.junit.Test;
+import java.util.concurrent.TimeUnit;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 /**
  * Unit test for verifying leak in CSS styles ImageCache.
  */
+@Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
 public class ImageCacheLeakTest {
 
     private static final String className = ImageCacheLeakTest.class.getName();
     private static final String pkgName = className.substring(0, className.lastIndexOf("."));
     private final String testAppName = pkgName + "." + "ImageCacheLeakApp";
 
-    @Test (timeout = 15000)
+    @Test
     public void testImageCacheLeak() throws Exception {
 
         String[] jvmArgs = new String[1];
diff --git a/tests/system/src/test/java/test/javafx/embed/swing/FXImageConversionTest.java b/tests/system/src/test/java/test/javafx/embed/swing/FXImageConversionTest.java
index 6a2932343bb..2e1cd23b4f8 100644
--- a/tests/system/src/test/java/test/javafx/embed/swing/FXImageConversionTest.java
+++ b/tests/system/src/test/java/test/javafx/embed/swing/FXImageConversionTest.java
@@ -24,13 +24,13 @@
  */
 package test.javafx.embed.swing;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 import java.awt.image.BufferedImage;
 import javafx.embed.swing.SwingFXUtils;
 import javafx.scene.image.PixelWriter;
 import javafx.scene.image.WritableImage;
-import org.junit.Test;
-import junit.framework.Assert;
+import org.junit.jupiter.api.Test;
 
 public class FXImageConversionTest {
 
@@ -52,7 +52,7 @@ public class FXImageConversionTest {
 
             assertTrue(bf.getType() == BufferedImage.TYPE_INT_RGB);
         } catch (ClassCastException cex) {
-            Assert.fail("FX image conversion wrong cast " + cex);
+            fail("FX image conversion wrong cast " + cex);
         }
     }
 
@@ -71,7 +71,7 @@ public class FXImageConversionTest {
 
             assertTrue(bf.getType() == BufferedImage.TYPE_INT_ARGB_PRE);
         } catch (ClassCastException cex) {
-            Assert.fail("FX image conversion wrong cast " + cex);
+            fail("FX image conversion wrong cast " + cex);
         }
     }
 
@@ -90,7 +90,7 @@ public class FXImageConversionTest {
 
             assertTrue(bf.getType() == BufferedImage.TYPE_INT_ARGB_PRE);
         } catch (ClassCastException cex) {
-            Assert.fail("FX image conversion wrong cast " + cex);
+            fail("FX image conversion wrong cast " + cex);
         }
     }
 }
diff --git a/tests/system/src/test/java/test/javafx/embed/swing/JFXPanelEmbeddedWindowTest.java b/tests/system/src/test/java/test/javafx/embed/swing/JFXPanelEmbeddedWindowTest.java
index 90f46c30daf..4a015f11b6a 100644
--- a/tests/system/src/test/java/test/javafx/embed/swing/JFXPanelEmbeddedWindowTest.java
+++ b/tests/system/src/test/java/test/javafx/embed/swing/JFXPanelEmbeddedWindowTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,24 +24,24 @@
  */
 package test.javafx.embed.swing;
 
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import javax.swing.JFrame;
+import javax.swing.SwingUtilities;
 import javafx.application.Platform;
 import javafx.embed.swing.JFXPanel;
 import javafx.scene.Scene;
 import javafx.scene.layout.VBox;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import javax.swing.*;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class JFXPanelEmbeddedWindowTest {
     private static JFrame frame;
     private static JFXPanel jfxPanel;
     private static Throwable th;
 
-    @BeforeClass
+    @BeforeAll
     public static void init() throws Exception {
         CountDownLatch initLatch = new CountDownLatch(1);
         SwingUtilities.invokeLater(() -> {
@@ -90,7 +90,7 @@ public void testShowThenRemove() throws Throwable {
         }
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardown() throws Exception {
         if (frame != null) {
             SwingUtilities.invokeLater(frame::dispose);
diff --git a/tests/system/src/test/java/test/javafx/embed/swing/JFXPanelTest.java b/tests/system/src/test/java/test/javafx/embed/swing/JFXPanelTest.java
index 9fb9cbcae2b..f0b9249172d 100644
--- a/tests/system/src/test/java/test/javafx/embed/swing/JFXPanelTest.java
+++ b/tests/system/src/test/java/test/javafx/embed/swing/JFXPanelTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,24 +28,20 @@
 import java.awt.event.MouseEvent;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-
 import javax.swing.JFrame;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.embed.swing.JFXPanel;
 import javafx.scene.Group;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 public class JFXPanelTest {
@@ -60,25 +56,25 @@ public static class MyApp extends Application {
         @Override
         public void start(Stage primaryStage) throws Exception {
             Platform.setImplicitExit(false);
-            Assert.assertTrue(Platform.isFxApplicationThread());
-            Assert.assertNotNull(primaryStage);
+            Assertions.assertTrue(Platform.isFxApplicationThread());
+            Assertions.assertNotNull(primaryStage);
 
             launchLatch.countDown();
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void doSetupOnce() throws Exception {
         Util.launch(launchLatch, MyApp.class);
-        Assert.assertEquals(0, launchLatch.getCount());
+        Assertions.assertEquals(0, launchLatch.getCount());
     }
 
-    @AfterClass
+    @AfterAll
     public static void doTeardownOnce() {
         Util.shutdown();
     }
 
-    @After
+    @AfterEach
     public void doCleanup() {
         if (jframe != null) {
             SwingUtilities.invokeLater(() -> jframe.dispose());
@@ -132,11 +128,11 @@ public void testNoDoubleClickOnFirstClick() throws Exception {
             });
         });
 
-        Assert.assertTrue(firstPressedEventLatch.await(5000, TimeUnit.MILLISECONDS));
+        Assertions.assertTrue(firstPressedEventLatch.await(5000, TimeUnit.MILLISECONDS));
 
         Thread.sleep(500); // there should be no pressed event after the initial one. Let's wait for 0.5s and check again.
 
-        Assert.assertEquals(1, pressedEventCounter[0]);
+        Assertions.assertEquals(1, pressedEventCounter[0]);
     }
 
     @Test
@@ -154,7 +150,7 @@ public void testClickOnEmptyJFXPanel() throws Exception {
             firstPressedEventLatch.countDown();
         });
 
-        Assert.assertTrue(firstPressedEventLatch.await(5000, TimeUnit.MILLISECONDS));
+        Assertions.assertTrue(firstPressedEventLatch.await(5000, TimeUnit.MILLISECONDS));
     }
 
     @Test
@@ -179,8 +175,7 @@ public void setSceneOnFXThread() throws Exception {
             });
         });
 
-        Assert.assertTrue("Timeout waiting for setScene to complete",
-                completionLatch.await(5000, TimeUnit.MILLISECONDS));
+        Assertions.assertTrue(completionLatch.await(5000, TimeUnit.MILLISECONDS), "Timeout waiting for setScene to complete");
     }
 
     @Test
@@ -207,7 +202,6 @@ public void setSceneOnSwingThread() throws Exception {
             });
         });
 
-        Assert.assertTrue("Timeout waiting for setScene to complete",
-                completionLatch.await(5000, TimeUnit.MILLISECONDS));
+        Assertions.assertTrue(completionLatch.await(5000, TimeUnit.MILLISECONDS), "Timeout waiting for setScene to complete");
     }
 }
diff --git a/tests/system/src/test/java/test/javafx/embed/swing/SwingFXUtilsTest.java b/tests/system/src/test/java/test/javafx/embed/swing/SwingFXUtilsTest.java
index c65ca87b0e0..ba8adbcd057 100644
--- a/tests/system/src/test/java/test/javafx/embed/swing/SwingFXUtilsTest.java
+++ b/tests/system/src/test/java/test/javafx/embed/swing/SwingFXUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,13 +25,11 @@
 
 package test.javafx.embed.swing;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.awt.image.BufferedImage;
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.embed.swing.SwingFXUtils;
@@ -39,11 +37,9 @@
 import javafx.scene.image.PixelFormat;
 import javafx.scene.image.PixelReader;
 import javafx.stage.Stage;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 public class SwingFXUtilsTest {
@@ -65,13 +61,13 @@ public void start(Stage primaryStage) throws Exception {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void doSetupOnce() {
         Util.launch(launchLatch, MyApp.class);
         assertEquals(0, launchLatch.getCount());
     }
 
-    @AfterClass
+    @AfterAll
     public static void doTeardownOnce() {
         Util.shutdown();
     }
diff --git a/tests/system/src/test/java/test/javafx/embed/swing/SwingNodeContentMemoryLeakTest.java b/tests/system/src/test/java/test/javafx/embed/swing/SwingNodeContentMemoryLeakTest.java
index e6dbce85f80..6c31a8b4ea4 100644
--- a/tests/system/src/test/java/test/javafx/embed/swing/SwingNodeContentMemoryLeakTest.java
+++ b/tests/system/src/test/java/test/javafx/embed/swing/SwingNodeContentMemoryLeakTest.java
@@ -25,7 +25,7 @@
 
 package test.javafx.embed.swing;
 
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import java.lang.ref.WeakReference;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Collection;
@@ -38,9 +38,9 @@
 import javafx.scene.Scene;
 import javafx.scene.layout.Pane;
 import javafx.stage.Stage;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 public class SwingNodeContentMemoryLeakTest {
@@ -55,12 +55,12 @@ public class SwingNodeContentMemoryLeakTest {
     private SwingNode node;
     private long panelCount;
 
-    @BeforeClass
+    @BeforeAll
     public static void setupOnce() {
         Util.launch(launchLatch, 50, MyApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardownOnce() {
         Util.shutdown();
     }
diff --git a/tests/system/src/test/java/test/javafx/embed/swing/SwingNodeDnDMemoryLeakTest.java b/tests/system/src/test/java/test/javafx/embed/swing/SwingNodeDnDMemoryLeakTest.java
index 20bd2fd4088..d65e2722be7 100644
--- a/tests/system/src/test/java/test/javafx/embed/swing/SwingNodeDnDMemoryLeakTest.java
+++ b/tests/system/src/test/java/test/javafx/embed/swing/SwingNodeDnDMemoryLeakTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,28 +25,22 @@
 
 package test.javafx.embed.swing;
 
-import static org.junit.Assert.assertEquals;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import java.awt.dnd.DropTarget;
 import java.lang.ref.WeakReference;
+import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.concurrent.CountDownLatch;
-
 import javax.swing.JLabel;
 import javax.swing.SwingUtilities;
-
-import java.lang.reflect.InvocationTargetException;
-
 import javafx.application.Application;
 import javafx.embed.swing.SwingNode;
 import javafx.scene.Scene;
 import javafx.scene.layout.BorderPane;
 import javafx.stage.Stage;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 import test.util.memory.JMemoryBuddy;
 
@@ -57,12 +51,12 @@ public class SwingNodeDnDMemoryLeakTest {
     ArrayList<WeakReference<SwingNode>> weakRefArrSN =
                                       new ArrayList(TOTAL_SWINGNODE);
 
-    @BeforeClass
+    @BeforeAll
     public static void setupOnce() throws Exception {
         Util.launch(launchLatch, MyApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardownOnce() {
         Util.shutdown();
     }
diff --git a/tests/system/src/test/java/test/javafx/embed/swing/SwingNodeMemoryLeakTest.java b/tests/system/src/test/java/test/javafx/embed/swing/SwingNodeMemoryLeakTest.java
index 5a9d9c1c65f..a7d252dc3e9 100644
--- a/tests/system/src/test/java/test/javafx/embed/swing/SwingNodeMemoryLeakTest.java
+++ b/tests/system/src/test/java/test/javafx/embed/swing/SwingNodeMemoryLeakTest.java
@@ -25,7 +25,7 @@
 
 package test.javafx.embed.swing;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import java.lang.ref.WeakReference;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
@@ -37,9 +37,9 @@
 import javafx.scene.Scene;
 import javafx.scene.layout.BorderPane;
 import javafx.stage.Stage;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 import test.util.memory.JMemoryBuddy;
 
@@ -53,12 +53,12 @@ public class SwingNodeMemoryLeakTest {
     ArrayList<WeakReference<JLabel>> weakRefArrJL =
                                       new ArrayList(TOTAL_SWINGNODE);
 
-    @BeforeClass
+    @BeforeAll
     public static void setupOnce() {
         Util.launch(launchLatch, 50, MyApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardownOnce() {
         Util.shutdown();
     }
diff --git a/tests/system/src/test/java/test/javafx/embed/swing/SwingNodeScaleTest.java b/tests/system/src/test/java/test/javafx/embed/swing/SwingNodeScaleTest.java
index 1b2db216191..49c8d2cddb7 100644
--- a/tests/system/src/test/java/test/javafx/embed/swing/SwingNodeScaleTest.java
+++ b/tests/system/src/test/java/test/javafx/embed/swing/SwingNodeScaleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,24 +31,20 @@
 import java.awt.event.FocusAdapter;
 import java.awt.event.FocusEvent;
 import java.util.concurrent.CountDownLatch;
-
 import javax.swing.JButton;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.embed.swing.SwingNode;
 import javafx.scene.Scene;
 import javafx.scene.layout.StackPane;
 import javafx.stage.Stage;
-
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 public class SwingNodeScaleTest {
@@ -57,7 +53,7 @@ public class SwingNodeScaleTest {
     static Rectangle result;
     static JButton b;
 
-    @BeforeClass
+    @BeforeAll
     public static void setupOnce() {
         System.setProperty("glass.win.uiScale", "2");
         System.setProperty("glass.gtk.uiScale", "2");
@@ -67,7 +63,7 @@ public static void setupOnce() {
         Util.launch(launchLatch, 50, MyApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardownOnce() {
         Util.shutdown();
     }
@@ -76,8 +72,8 @@ public static void teardownOnce() {
     public void testScale() throws Exception {
         SwingUtilities.invokeAndWait(() -> result = b.getBounds());
         System.out.println(result);
-        Assert.assertEquals(2 * request.width, 2 * result.x + result.width);
-        Assert.assertEquals(2 * request.height, 2 * result.y + result.height);
+        Assertions.assertEquals(2 * request.width, 2 * result.x + result.width);
+        Assertions.assertEquals(2 * request.height, 2 * result.y + result.height);
     }
 
     public static class MyApp extends Application {
diff --git a/tests/system/src/test/java/test/javafx/scene/CssStyleHelperTest.java b/tests/system/src/test/java/test/javafx/scene/CssStyleHelperTest.java
index 29697b76335..af322339d81 100644
--- a/tests/system/src/test/java/test/javafx/scene/CssStyleHelperTest.java
+++ b/tests/system/src/test/java/test/javafx/scene/CssStyleHelperTest.java
@@ -25,11 +25,9 @@
 
 package test.javafx.scene;
 
-import static org.junit.Assert.assertTrue;
-
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Scene;
@@ -38,12 +36,10 @@
 import javafx.scene.control.Label;
 import javafx.scene.layout.StackPane;
 import javafx.stage.Stage;
-
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 public class CssStyleHelperTest {
@@ -77,12 +73,12 @@ public void start(Stage primaryStage) throws Exception {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() throws Exception {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardownOnce() {
         Util.shutdown();
     }
@@ -90,18 +86,17 @@ public static void teardownOnce() {
     @Test
     public void testCssIsCorrectlyAppliedToLabelOnStageHideAndShow() throws Exception {
         // sanity
-        Assert.assertNull("Label1 should have no background", label1.getBackground());
-        Assert.assertNull("Label2 should have no background", label2.getBackground());
+        Assertions.assertNull(label1.getBackground(), "Label1 should have no background");
+        Assertions.assertNull(label2.getBackground(), "Label2 should have no background");
 
         startupLatch = new CountDownLatch(1);
         Util.runAndWait(() -> {
             stage.hide();
             stage.show();
         });
-        assertTrue("Timeout waiting for Stage to show after hide",
-                   startupLatch.await(15, TimeUnit.SECONDS));
+        assertTrue(startupLatch.await(15, TimeUnit.SECONDS), "Timeout waiting for Stage to show after hide");
 
-        Assert.assertNull("Label1 should have no background", label1.getBackground());
-        Assert.assertNull("Label2 should have no background", label2.getBackground());
+        Assertions.assertNull(label1.getBackground(), "Label1 should have no background");
+        Assertions.assertNull(label2.getBackground(), "Label2 should have no background");
     }
 }
diff --git a/tests/system/src/test/java/test/javafx/scene/ImageCursorGetBestSizeTest.java b/tests/system/src/test/java/test/javafx/scene/ImageCursorGetBestSizeTest.java
index 8b3c81e1190..60a429dd02f 100644
--- a/tests/system/src/test/java/test/javafx/scene/ImageCursorGetBestSizeTest.java
+++ b/tests/system/src/test/java/test/javafx/scene/ImageCursorGetBestSizeTest.java
@@ -26,7 +26,7 @@
 package test.javafx.scene;
 
 import java.util.concurrent.CountDownLatch;
-
+import java.util.concurrent.TimeUnit;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Group;
@@ -34,14 +34,14 @@
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
-
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import test.util.Util;
 
+@Timeout(value=20000, unit=TimeUnit.MILLISECONDS)
 public class ImageCursorGetBestSizeTest {
     static CountDownLatch startupLatch = new CountDownLatch(1);
     static Stage stage;
@@ -62,20 +62,20 @@ public void start(Stage primaryStage) throws Exception {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardown() {
         Util.shutdown();
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void testImageCursorGetBestSize() throws Exception {
         Util.runAndWait(() -> {
-            Assert.assertNotNull(ImageCursor.getBestSize(10, 20));
+            Assertions.assertNotNull(ImageCursor.getBestSize(10, 20));
         });
     }
 }
diff --git a/tests/system/src/test/java/test/javafx/scene/InitialNodesMemoryLeakTest.java b/tests/system/src/test/java/test/javafx/scene/InitialNodesMemoryLeakTest.java
index b5da2cf279a..bb010af4dba 100644
--- a/tests/system/src/test/java/test/javafx/scene/InitialNodesMemoryLeakTest.java
+++ b/tests/system/src/test/java/test/javafx/scene/InitialNodesMemoryLeakTest.java
@@ -27,18 +27,15 @@
 
 import java.lang.ref.WeakReference;
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Group;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 import test.util.memory.JMemoryBuddy;
 
@@ -69,12 +66,12 @@ public void start(Stage primaryStage) throws Exception {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardownOnce() {
         Util.shutdown();
     }
diff --git a/tests/system/src/test/java/test/javafx/scene/NewSceneSizeTest.java b/tests/system/src/test/java/test/javafx/scene/NewSceneSizeTest.java
index 463eede3c25..081fe215614 100644
--- a/tests/system/src/test/java/test/javafx/scene/NewSceneSizeTest.java
+++ b/tests/system/src/test/java/test/javafx/scene/NewSceneSizeTest.java
@@ -26,7 +26,6 @@
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;
@@ -34,12 +33,10 @@
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import junit.framework.Assert;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 public class NewSceneSizeTest {
@@ -76,12 +73,12 @@ public void start(Stage primaryStage) throws Exception {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardown() {
         Util.shutdown();
     }
@@ -109,8 +106,8 @@ public void run() {
                     stage.setScene(scene);
                     w[fI] = (Math.ceil((300 - fI) * scaleX)) / scaleX;
                     h[fI] = (Math.ceil((200 - fI) * scaleY)) / scaleY;
-                    Assert.assertTrue(w[fI] > 1);
-                    Assert.assertTrue(h[fI] > 1);
+                    Assertions.assertTrue(w[fI] > 1);
+                    Assertions.assertTrue(h[fI] > 1);
                     stage.widthProperty().addListener(listenerW = (v, o, n) -> {
                         if (Math.abs((Double) n - w[fI]) < 0.1) {
                             stage.widthProperty().removeListener(listenerW);
@@ -130,10 +127,8 @@ public void run() {
         latch.await(5, TimeUnit.SECONDS);
         Thread.sleep(200);
         for (int i = 0; i < nTries; i++) {
-            Assert.assertEquals("Wrong scene " + i + " width", w[i],
-                                    childStage[i].getScene().getWidth(), 0.1);
-            Assert.assertEquals("Wrong scene " + i + " height", h[i],
-                                    childStage[i].getScene().getHeight(), 0.1);
+            Assertions.assertEquals(w[i], childStage[i].getScene().getWidth(), 0.1, "Wrong scene " + i + " width");
+            Assertions.assertEquals(h[i], childStage[i].getScene().getHeight(), 0.1, "Wrong scene " + i + " height");
         }
     }
 }
diff --git a/tests/system/src/test/java/test/javafx/scene/NodeTreeShowingTest.java b/tests/system/src/test/java/test/javafx/scene/NodeTreeShowingTest.java
index aa8e98a4255..bbbcbc57b43 100644
--- a/tests/system/src/test/java/test/javafx/scene/NodeTreeShowingTest.java
+++ b/tests/system/src/test/java/test/javafx/scene/NodeTreeShowingTest.java
@@ -25,12 +25,10 @@
 
 package test.javafx.scene;
 
-import static org.junit.Assert.assertTrue;
-
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.Random;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicLong;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Scene;
@@ -38,11 +36,9 @@
 import javafx.scene.layout.StackPane;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 /**
@@ -86,12 +82,12 @@ public void start(Stage primaryStage) throws Exception {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() throws Exception {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardownOnce() {
         Util.shutdown();
     }
@@ -160,6 +156,6 @@ public void testAddRemovalSpeedInHugeScene() throws Exception {
 
         // NOTE : 800 mSec is not a benchmark value
         // It is good enough to catch the regression in performance, if any
-        assertTrue("Time to add/remove " + loopCount + " nodes in a large Scene is more than 800 mSec (" + bestMillis.get() + ")", bestMillis.get() <= 800);
+        assertTrue(bestMillis.get() <= 800, "Time to add/remove " + loopCount + " nodes in a large Scene is more than 800 mSec (" + bestMillis.get() + ")");
     }
 }
diff --git a/tests/system/src/test/java/test/javafx/scene/QuadraticCssTimeTest.java b/tests/system/src/test/java/test/javafx/scene/QuadraticCssTimeTest.java
index 51fc6eb2314..a3ff031c81c 100644
--- a/tests/system/src/test/java/test/javafx/scene/QuadraticCssTimeTest.java
+++ b/tests/system/src/test/java/test/javafx/scene/QuadraticCssTimeTest.java
@@ -25,10 +25,8 @@
 
 package test.javafx.scene;
 
-import static org.junit.Assert.assertTrue;
-
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.geometry.Insets;
@@ -38,11 +36,9 @@
 import javafx.scene.text.Text;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 /**
@@ -81,12 +77,12 @@ public void start(Stage primaryStage) throws Exception {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() throws Exception {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardownOnce() {
         Util.shutdown();
     }
@@ -113,7 +109,7 @@ public void testTimeForAdding500NodesToScene() throws Exception {
 
             // NOTE : 800 mSec is not a benchmark value
             // It is good enough to catch the regression in performance, if any
-            assertTrue("Time to add 500 Nodes is more than 800 mSec", (endTime - startTime) < 800);
+            assertTrue((endTime - startTime) < 800, "Time to add 500 Nodes is more than 800 mSec");
         });
     }
 }
diff --git a/tests/system/src/test/java/test/javafx/scene/RestoreSceneSizeTest.java b/tests/system/src/test/java/test/javafx/scene/RestoreSceneSizeTest.java
index ffa0a478b8b..baf08b2c71a 100644
--- a/tests/system/src/test/java/test/javafx/scene/RestoreSceneSizeTest.java
+++ b/tests/system/src/test/java/test/javafx/scene/RestoreSceneSizeTest.java
@@ -24,11 +24,9 @@
  */
 package test.javafx.scene;
 
-import static org.junit.Assume.assumeTrue;
-
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;
@@ -36,14 +34,11 @@
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
-
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import com.sun.javafx.PlatformUtil;
-
 import test.util.Util;
 
 public class RestoreSceneSizeTest {
@@ -83,12 +78,12 @@ public void start(Stage primaryStage) throws Exception {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardown() {
         Util.shutdown();
     }
@@ -101,8 +96,8 @@ public void testUnfullscreenSize() throws Exception {
         Thread.sleep(200);
         final double w = (Math.ceil(WIDTH * scaleX)) / scaleX;
         final double h = (Math.ceil(HEIGHT * scaleY)) / scaleY;
-        Assert.assertTrue(stage.isShowing());
-        Assert.assertTrue(stage.isFullScreen());
+        Assertions.assertTrue(stage.isShowing());
+        Assertions.assertTrue(stage.isFullScreen());
 
         CountDownLatch latch = new CountDownLatch(2);
         ChangeListener<Number> listenerW = (observable, oldValue, newValue) -> {
@@ -120,11 +115,11 @@ public void testUnfullscreenSize() throws Exception {
         Platform.runLater(() -> stage.setFullScreen(false));
         latch.await(5, TimeUnit.SECONDS);
         Thread.sleep(200);
-        Assert.assertFalse(stage.isFullScreen());
+        Assertions.assertFalse(stage.isFullScreen());
         stage.getScene().widthProperty().removeListener(listenerW);
         stage.getScene().heightProperty().removeListener(listenerH);
 
-        Assert.assertEquals("Scene got wrong width", w, stage.getScene().getWidth(), 0.1);
-        Assert.assertEquals("Scene got wrong height", h, stage.getScene().getHeight(), 0.1);
+        Assertions.assertEquals(w, stage.getScene().getWidth(), 0.1, "Scene got wrong width");
+        Assertions.assertEquals(h, stage.getScene().getHeight(), 0.1, "Scene got wrong height");
     }
 }
diff --git a/tests/system/src/test/java/test/javafx/scene/Snapshot1Test.java b/tests/system/src/test/java/test/javafx/scene/Snapshot1Test.java
index 70e220a8998..6be48638626 100644
--- a/tests/system/src/test/java/test/javafx/scene/Snapshot1Test.java
+++ b/tests/system/src/test/java/test/javafx/scene/Snapshot1Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,28 +25,31 @@
 
 package test.javafx.scene;
 
-import java.util.concurrent.TimeUnit;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static test.util.Util.TIMEOUT;
 import java.util.concurrent.CountDownLatch;
-import javafx.scene.paint.Color;
+import java.util.concurrent.TimeUnit;
 import javafx.application.Platform;
 import javafx.scene.Group;
 import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.SnapshotResult;
 import javafx.scene.image.WritableImage;
+import javafx.scene.paint.Color;
 import javafx.scene.shape.Rectangle;
 import javafx.util.Callback;
-import junit.framework.AssertionFailedError;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
-import static org.junit.Assert.*;
-import static test.util.Util.TIMEOUT;
-
 /**
  * Tests for snapshot.
  */
@@ -58,12 +61,12 @@ public class Snapshot1Test extends SnapshotCommon {
     // Short timeout used to ensure that bad callback is not called
     static final int SHORT_TIMEOUT = 1000;
 
-    @BeforeClass
+    @BeforeAll
     public static void setupOnce() {
         doSetupOnce();
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardownOnce() {
         doTeardownOnce();
     }
@@ -72,14 +75,14 @@ public static void teardownOnce() {
     private Scene tmpScene = null;
     private Node tmpNode = null;
 
-    @Before
+    @BeforeEach
     public void setupEach() {
         assertNotNull(myApp);
         assertNotNull(myApp.primaryStage);
         assertTrue(myApp.primaryStage.isShowing());
     }
 
-    @After
+    @AfterEach
     public void teardownEach() {
     }
 
@@ -110,54 +113,62 @@ public void testConstructGraphOffThreadOk() {
 
     // Verify that we cannot call snapshot on a thread other than
     // the FX Application thread
-    @Test (expected=IllegalStateException.class)
+    @Test
     public void testSnapshotSceneImmediateWrongThread() {
-        assertFalse(Platform.isFxApplicationThread());
+        assertThrows(IllegalStateException.class, () -> {
+            assertFalse(Platform.isFxApplicationThread());
 
-        Util.runAndWait(() -> tmpScene = new Scene(new Group(), 200, 100));
+            Util.runAndWait(() -> tmpScene = new Scene(new Group(), 200, 100));
 
-        // Should throw IllegalStateException
-        tmpScene.snapshot(null);
+            // Should throw IllegalStateException
+            tmpScene.snapshot(null);
+        });
     }
 
     // Verify that we cannot call snapshot on a thread other than
     // the FX Application thread
-    @Test (expected=IllegalStateException.class)
+    @Test
     public void testSnapshotSceneDeferredWrongThread() {
-        assertFalse(Platform.isFxApplicationThread());
+        assertThrows(IllegalStateException.class, () -> {
+            assertFalse(Platform.isFxApplicationThread());
 
-        Util.runAndWait(() -> tmpScene = new Scene(new Group(), 200, 100));
+            Util.runAndWait(() -> tmpScene = new Scene(new Group(), 200, 100));
 
-        // Should throw IllegalStateException
-        tmpScene.snapshot(p -> {
-            throw new AssertionFailedError("Should never get here");
-        }, null);
+            // Should throw IllegalStateException
+            tmpScene.snapshot(p -> {
+                throw new AssertionError("Should never get here");
+            }, null);
+        });
     }
 
     // Verify that we cannot call snapshot on a thread other than
     // the FX Application thread
-    @Test (expected=IllegalStateException.class)
+    @Test
     public void testSnapshotNodeImmediateWrongThread() {
-        assertFalse(Platform.isFxApplicationThread());
+        assertThrows(IllegalStateException.class, () -> {
+            assertFalse(Platform.isFxApplicationThread());
 
-        tmpNode = new Rectangle(10, 10);
+            tmpNode = new Rectangle(10, 10);
 
-        // Should throw IllegalStateException
-        tmpNode.snapshot(null, null);
+            // Should throw IllegalStateException
+            tmpNode.snapshot(null, null);
+        });
     }
 
     // Verify that we cannot call snapshot on a thread other than
     // the FX Application thread
-    @Test (expected=IllegalStateException.class)
+    @Test
     public void testSnapshotNodeDeferredWrongThread() {
-        assertFalse(Platform.isFxApplicationThread());
+        assertThrows(IllegalStateException.class, () -> {
+            assertFalse(Platform.isFxApplicationThread());
 
-        tmpNode = new Rectangle(10, 10);
+            tmpNode = new Rectangle(10, 10);
 
-        // Should throw IllegalStateException
-        tmpNode.snapshot(p -> {
-            throw new AssertionFailedError("Should never get here");
-        }, null, null);
+            // Should throw IllegalStateException
+            tmpNode.snapshot(p -> {
+                throw new AssertionError("Should never get here");
+            }, null, null);
+        });
     }
 
     // Test immediate snapshot
@@ -192,12 +203,10 @@ public void testSceneCallback() {
 
         try {
             if (!latch.await(TIMEOUT, TimeUnit.MILLISECONDS)) {
-                throw new AssertionFailedError("Timeout waiting for snapshot callback");
+                fail("Timeout waiting for snapshot callback");
             }
         } catch (InterruptedException ex) {
-            AssertionFailedError err = new AssertionFailedError("Unexpected exception");
-            err.initCause(ex);
-            throw err;
+            fail(ex);
         }
 
         assertEquals(0, latch.getCount());
@@ -232,12 +241,10 @@ public void testBadSceneCallback1() {
 
         try {
             if (!latch.await(TIMEOUT, TimeUnit.MILLISECONDS)) {
-                throw new AssertionFailedError("Timeout waiting for snapshot callback");
+                fail("Timeout waiting for snapshot callback");
             }
         } catch (InterruptedException ex) {
-            AssertionFailedError err = new AssertionFailedError("Unexpected exception");
-            err.initCause(ex);
-            throw err;
+            fail(ex);
         }
 
         assertEquals(0, latch.getCount());
@@ -255,7 +262,7 @@ public void testBadSceneCallback2() {
             Callback cb = (Callback<String, Integer>) param -> {
                 // Should not get here
                 latch.countDown();
-                throw new AssertionFailedError("Should never get here");
+                throw new AssertionError("Should never get here");
             };
 
             tmpScene.snapshot(cb, null);
@@ -266,23 +273,23 @@ public void testBadSceneCallback2() {
 
         try {
             if (latch.await(SHORT_TIMEOUT, TimeUnit.MILLISECONDS)) {
-                throw new AssertionFailedError("Snapshot callback unexpectedly called");
+                fail("Snapshot callback unexpectedly called");
             }
         } catch (InterruptedException ex) {
-            AssertionFailedError err = new AssertionFailedError("Unexpected exception");
-            err.initCause(ex);
-            throw err;
+            fail(ex);
         }
 
         assertEquals(1, latch.getCount());
     }
 
     // Test deferred snapshot with null callback (should throw NPE)
-    @Test (expected=NullPointerException.class)
+    @Test
     public void testNullSceneCallback() {
-        Util.runAndWait(() -> {
-            tmpScene = new Scene(new Group(), 200, 100);
-            tmpScene.snapshot(null, null);
+        assertThrows(NullPointerException.class, () -> {
+            Util.runAndWait(() -> {
+                tmpScene = new Scene(new Group(), 200, 100);
+                tmpScene.snapshot(null, null);
+            });
         });
     }
 
@@ -318,12 +325,10 @@ public void testNodeCallback() {
 
         try {
             if (!latch.await(TIMEOUT, TimeUnit.MILLISECONDS)) {
-                throw new AssertionFailedError("Timeout waiting for snapshot callback");
+                fail("Timeout waiting for snapshot callback");
             }
         } catch (InterruptedException ex) {
-            AssertionFailedError err = new AssertionFailedError("Unexpected exception");
-            err.initCause(ex);
-            throw err;
+            fail(ex);
         }
 
         assertEquals(0, latch.getCount());
@@ -358,12 +363,10 @@ public void testBadNodeCallback1() {
 
         try {
             if (!latch.await(TIMEOUT, TimeUnit.MILLISECONDS)) {
-                throw new AssertionFailedError("Timeout waiting for snapshot callback");
+                fail("Timeout waiting for snapshot callback");
             }
         } catch (InterruptedException ex) {
-            AssertionFailedError err = new AssertionFailedError("Unexpected exception");
-            err.initCause(ex);
-            throw err;
+            fail(ex);
         }
 
         assertEquals(0, latch.getCount());
@@ -381,7 +384,7 @@ public void testBadNodeCallback2() {
             Callback cb = (Callback<String, Integer>) param -> {
                 // Should not get here
                 latch.countDown();
-                throw new AssertionFailedError("Should never get here");
+                throw new AssertionError("Should never get here");
             };
 
             tmpNode.snapshot(cb, null, null);
@@ -392,31 +395,33 @@ public void testBadNodeCallback2() {
 
         try {
             if (latch.await(SHORT_TIMEOUT, TimeUnit.MILLISECONDS)) {
-                throw new AssertionFailedError("Snapshot callback unexpectedly called");
+                fail("Snapshot callback unexpectedly called");
             }
         } catch (InterruptedException ex) {
-            AssertionFailedError err = new AssertionFailedError("Unexpected exception");
-            err.initCause(ex);
-            throw err;
+            fail(ex);
         }
 
         assertEquals(1, latch.getCount());
     }
 
     // Test deferred snapshot with null callback (should throw NPE)
-    @Test (expected=NullPointerException.class)
+    @Test
     public void testNullNodeCallback() {
-        Util.runAndWait(() -> {
-            tmpNode = new Rectangle(10, 10);
-            tmpNode.snapshot(null, null, null);
+        assertThrows(NullPointerException.class, () -> {
+            Util.runAndWait(() -> {
+                tmpNode = new Rectangle(10, 10);
+                tmpNode.snapshot(null, null, null);
+            });
         });
     }
 
     // TODO: the following will be covered by ImageOps unit tests, so can be removed
 
-    @Test (expected=IllegalArgumentException.class)
+    @Test
     public void testCreateImageZero() {
-        WritableImage wimg = new WritableImage(0, 0);
+        assertThrows(IllegalArgumentException.class, () -> {
+            WritableImage wimg = new WritableImage(0, 0);
+        });
     }
 
     @Test
diff --git a/tests/system/src/test/java/test/javafx/scene/Snapshot2Test.java b/tests/system/src/test/java/test/javafx/scene/Snapshot2Test.java
index e5a55518f51..d1aed89dffd 100644
--- a/tests/system/src/test/java/test/javafx/scene/Snapshot2Test.java
+++ b/tests/system/src/test/java/test/javafx/scene/Snapshot2Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,12 @@
 
 package test.javafx.scene;
 
-import java.util.ArrayList;
-import java.util.Collection;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.stream.Stream;
 import javafx.animation.Interpolator;
 import javafx.geometry.Rectangle2D;
 import javafx.scene.Group;
@@ -42,77 +45,56 @@
 import javafx.scene.shape.Rectangle;
 import javafx.scene.transform.Transform;
 import javafx.util.Callback;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import test.util.Util;
 
-import static org.junit.Assert.*;
-
 /**
  * Test program for showAndWait functionality.
  */
-@RunWith(Parameterized.class)
-public class Snapshot2Test extends SnapshotCommon {
+public final class Snapshot2Test extends SnapshotCommon {
 
-    @BeforeClass
+    @BeforeAll
     public static void setupOnce() {
         doSetupOnce();
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardownOnce() {
         doTeardownOnce();
     }
 
-    // Flag indicating snapshot should be taken on a live scene, that is a
-    // scene attached to the primary stage
-    private final boolean live;
-
-    // Flag indicating to use an existing image
-    private final boolean useImage;
-
     // Temporary stage, scene, and node used for testing
     private TestStage tmpStage = null;
     private Scene tmpScene = null;
     private Node tmpNode = null;
 
-    private static Collection params = null;
-
-    private static final Object[] pLive = { Boolean.FALSE, Boolean.TRUE };
-    private static final Object[] pUseImage = { Boolean.FALSE, Boolean.TRUE };
-
-    @Parameters
-    public static Collection getParams() {
-        if (params == null) {
-            params = new ArrayList();
-            for (Object o0 : pLive) {
-                for (Object o1 : pUseImage) {
-                    params.add(new Object[] { o0, o1 });
-                }
-            }
-        }
-        return params;
-    }
-
-    public Snapshot2Test(Boolean live, Boolean useImage) {
-        this.live = live;
-        this.useImage = useImage;
-    }
-
-    @Before
-    public void setupEach() {
+    private static Stream<Arguments> parameters() {
+        return Stream.of(
+            Arguments.of(false, false),
+            Arguments.of(false, true),
+            Arguments.of(true, false),
+            Arguments.of(true, true)
+        );
+    }
+
+    // @BeforeEach
+    // junit5 does not support parameterized class-level tests yet
+    /**
+     * @param live Flag indicating snapshot should be taken on a live scene, that is a scene attached to the primary stage
+     * @param useImage Flag indicating to use an existing image
+     */
+    public void setupEach(boolean live, boolean useImage) {
         assertNotNull(myApp);
         assertNotNull(myApp.primaryStage);
         assertTrue(myApp.primaryStage.isShowing());
     }
 
-    @After
+    @AfterEach
     public void teardownEach() {
         Util.runAndWait(() -> {
             if (tmpStage != null && tmpStage.isShowing()) {
@@ -123,7 +105,7 @@ public void teardownEach() {
 
     // ========================== TEST CASES ==========================
 
-    private void setupEmptyScene() {
+    private void setupEmptyScene(boolean live) {
         Util.runAndWait(() -> {
             Group root = new Group();
             tmpScene = new Scene(root);
@@ -138,9 +120,11 @@ private void setupEmptyScene() {
     }
 
     // Verify a snapshot of an empty scene / root node
-    @Test
-    public void testSnapshotEmptySceneImm() {
-        setupEmptyScene();
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSnapshotEmptySceneImm(boolean live, boolean useImage) {
+        setupEach(live, useImage);
+        setupEmptyScene(live);
 
         final WritableImage img = useImage ? new WritableImage(1, 1) : null;
         Util.runAndWait(() -> {
@@ -155,9 +139,11 @@ public void testSnapshotEmptySceneImm() {
         });
     }
 
-    @Test
-    public void testSnapshotEmptySceneDefer() {
-        setupEmptyScene();
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSnapshotEmptySceneDefer(boolean live, boolean useImage) {
+        setupEach(live, useImage);
+        setupEmptyScene(live);
         final WritableImage img = useImage ? new WritableImage(1, 1) : null;
         runDeferredSnapshotWait(tmpScene, result -> {
             assertSame(tmpScene, result.getSource());
@@ -174,8 +160,8 @@ public void testSnapshotEmptySceneDefer() {
         }, img);
     }
 
-    private void doTestSnapshotEmptyNodeImm(final SnapshotParameters snapshotParams) {
-        setupEmptyScene();
+    private void doTestSnapshotEmptyNodeImm(boolean live, boolean useImage, final SnapshotParameters snapshotParams) {
+        setupEmptyScene(live);
         final WritableImage img = useImage ? new WritableImage(1, 1) : null;
         Util.runAndWait(() -> {
             WritableImage wimg = tmpScene.getRoot().snapshot(snapshotParams, img);
@@ -189,18 +175,22 @@ private void doTestSnapshotEmptyNodeImm(final SnapshotParameters snapshotParams)
         });
     }
 
-    @Test
-    public void testSnapshotEmptyNodeImmNoParams() {
-        doTestSnapshotEmptyNodeDefer(null);
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSnapshotEmptyNodeImmNoParams(boolean live, boolean useImage) {
+        setupEach(live, useImage);
+        doTestSnapshotEmptyNodeDefer(live, useImage, null);
     }
 
-    @Test
-    public void testSnapshotEmptyNodeImm() {
-        doTestSnapshotEmptyNodeDefer(new SnapshotParameters());
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSnapshotEmptyNodeImm(boolean live, boolean useImage) {
+        setupEach(live, useImage);
+        doTestSnapshotEmptyNodeDefer(live, useImage, new SnapshotParameters());
     }
 
-    private void doTestSnapshotEmptyNodeDefer(final SnapshotParameters snapshotParams) {
-        setupEmptyScene();
+    private void doTestSnapshotEmptyNodeDefer(boolean live, boolean useImage, final SnapshotParameters snapshotParams) {
+        setupEmptyScene(live);
         final WritableImage img = useImage ? new WritableImage(1, 1) : null;
         runDeferredSnapshotWait(tmpScene.getRoot(), result -> {
             assertSame(tmpScene.getRoot(), result.getSource());
@@ -217,14 +207,18 @@ private void doTestSnapshotEmptyNodeDefer(final SnapshotParameters snapshotParam
         }, snapshotParams, img);
     }
 
-    @Test
-    public void testSnapshotEmptyNodeDeferNoParams() {
-        doTestSnapshotEmptyNodeImm(null);
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSnapshotEmptyNodeDeferNoParams(boolean live, boolean useImage) {
+        setupEach(live, useImage);
+        doTestSnapshotEmptyNodeImm(live, useImage, null);
     }
 
-    @Test
-    public void testSnapshotEmptyNodeDefer() {
-        doTestSnapshotEmptyNodeImm(new SnapshotParameters());
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSnapshotEmptyNodeDefer(boolean live, boolean useImage) {
+        setupEach(live, useImage);
+        doTestSnapshotEmptyNodeImm(live, useImage, new SnapshotParameters());
     }
 
     private static final int SCENE_W = 200;
@@ -232,7 +226,7 @@ public void testSnapshotEmptyNodeDefer() {
     private static final int NODE_W = SCENE_W - 2*10;
     private static final int NODE_H = SCENE_H - 2*5;
 
-    private void setupSimpleScene() {
+    private void setupSimpleScene(boolean live) {
         Util.runAndWait(() -> {
             tmpNode = new Rectangle(10, 5, NODE_W, NODE_H);
             Group root = new Group();
@@ -248,7 +242,7 @@ private void setupSimpleScene() {
         });
     }
 
-    private void setupImageScene(int width, int height) {
+    private void setupImageScene(boolean live, int width, int height) {
         Util.runAndWait(() -> {
             WritableImage image = new WritableImage(width, height);
             // Initialize image with a bilinear gradient
@@ -288,9 +282,11 @@ private void setupImageScene(int width, int height) {
 
     // Test snapshot of a simple scene
 
-    @Test
-    public void testSnapshotSimpleSceneImm() {
-        setupSimpleScene();
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSnapshotSimpleSceneImm(boolean live, boolean useImage) {
+        setupEach(live, useImage);
+        setupSimpleScene(live);
 
         final WritableImage img = useImage ? new WritableImage(SCENE_W, SCENE_H) : null;
         Util.runAndWait(() -> {
@@ -305,9 +301,11 @@ public void testSnapshotSimpleSceneImm() {
         });
     }
 
-    @Test
-    public void testSnapshotSimpleSceneDefer() {
-        setupSimpleScene();
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSnapshotSimpleSceneDefer(boolean live, boolean useImage) {
+        setupEach(live, useImage);
+        setupSimpleScene(live);
 
         final WritableImage img = useImage ? new WritableImage(SCENE_W, SCENE_H) : null;
         runDeferredSnapshotWait(tmpScene, result -> {
@@ -325,9 +323,11 @@ public void testSnapshotSimpleSceneDefer() {
         }, img);
     }
 
-    @Test
-    public void testSnapshotSimpleNodeImm() {
-        setupSimpleScene();
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSnapshotSimpleNodeImm(boolean live, boolean useImage) {
+        setupEach(live, useImage);
+        setupSimpleScene(live);
         final SnapshotParameters snapshotParams = new SnapshotParameters();
         final WritableImage img = useImage ? new WritableImage(NODE_W, NODE_H) : null;
         Util.runAndWait(() -> {
@@ -342,9 +342,11 @@ public void testSnapshotSimpleNodeImm() {
         });
     }
 
-    @Test
-    public void testSnapshotSimpleNodeDefer() {
-        setupSimpleScene();
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSnapshotSimpleNodeDefer(boolean live, boolean useImage) {
+        setupEach(live, useImage);
+        setupSimpleScene(live);
         final SnapshotParameters snapshotParams = new SnapshotParameters();
         final WritableImage img = useImage ? new WritableImage(NODE_W, NODE_H) : null;
         runDeferredSnapshotWait(tmpScene.getRoot(), result -> {
@@ -364,8 +366,8 @@ public void testSnapshotSimpleNodeDefer() {
 
     // Test tiled snapshots
 
-    private void doTestTiledSnapshotImm(int w, int h) {
-        setupImageScene(w, h);
+    private void doTestTiledSnapshotImm(boolean live, boolean useImage, int w, int h) {
+        setupImageScene(live, w, h);
         Image original = ((ImageView) tmpNode).getImage();
         assertNotNull(original);
         WritableImage buffer = useImage ? new WritableImage(w, h) : null;
@@ -379,8 +381,8 @@ private void doTestTiledSnapshotImm(int w, int h) {
         });
     }
 
-    private void doTestTiledSnapshotDefer(int w, int h) {
-        setupImageScene(w, h);
+    private void doTestTiledSnapshotDefer(boolean live, boolean useImage, int w, int h) {
+        setupImageScene(live, w, h);
         Image original = ((ImageView) tmpNode).getImage();
         assertNotNull(original);
         WritableImage buffer = useImage ? new WritableImage(w, h) : null;
@@ -423,90 +425,122 @@ private boolean comparePixels(Image imageA, Image imageB) {
         return true;
     }
 
-    @Test
-    public void testSnapshot2x1TilesSameSizeImm() {
-        doTestTiledSnapshotImm(4100, 10);
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSnapshot2x1TilesSameSizeImm(boolean live, boolean useImage) {
+        setupEach(live, useImage);
+        doTestTiledSnapshotImm(live, useImage, 4100, 10);
     }
 
-    @Test
-    public void testSnapshot2x1TilesDifferentSizeImm() {
-        doTestTiledSnapshotImm(4099, 10);
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSnapshot2x1TilesDifferentSizeImm(boolean live, boolean useImage) {
+        setupEach(live, useImage);
+        doTestTiledSnapshotImm(live, useImage, 4099, 10);
     }
 
-    @Test
-    public void testSnapshot1x2TilesSameSizeImm() {
-        doTestTiledSnapshotImm(10, 4100);
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSnapshot1x2TilesSameSizeImm(boolean live, boolean useImage) {
+        setupEach(live, useImage);
+        doTestTiledSnapshotImm(live, useImage, 10, 4100);
     }
 
-    @Test
-    public void testSnapshot1x2TilesDifferentSizeImm() {
-        doTestTiledSnapshotImm(10, 4099);
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSnapshot1x2TilesDifferentSizeImm(boolean live, boolean useImage) {
+        setupEach(live, useImage);
+        doTestTiledSnapshotImm(live, useImage, 10, 4099);
     }
 
-    @Test
-    public void testSnapshot2x2TilesSameSizeImm() {
-        doTestTiledSnapshotImm(4100, 4100);
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSnapshot2x2TilesSameSizeImm(boolean live, boolean useImage) {
+        setupEach(live, useImage);
+        doTestTiledSnapshotImm(live, useImage, 4100, 4100);
     }
 
-    @Test
-    public void testSnapshot2x2TilesDifferentSizeImm() {
-        doTestTiledSnapshotImm(4099, 4099);
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSnapshot2x2TilesDifferentSizeImm(boolean live, boolean useImage) {
+        setupEach(live, useImage);
+        doTestTiledSnapshotImm(live, useImage, 4099, 4099);
     }
 
-    @Test
-    public void testSnapshot2x2TilesSameHeightImm() {
-        doTestTiledSnapshotImm(4099, 4100);
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSnapshot2x2TilesSameHeightImm(boolean live, boolean useImage) {
+        setupEach(live, useImage);
+        doTestTiledSnapshotImm(live, useImage, 4099, 4100);
     }
 
-    @Test
-    public void testSnapshot2x2TilesSameWidthImm() {
-        doTestTiledSnapshotImm(4100, 4099);
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSnapshot2x2TilesSameWidthImm(boolean live, boolean useImage) {
+        setupEach(live, useImage);
+        doTestTiledSnapshotImm(live, useImage, 4100, 4099);
     }
 
-    @Test
-    public void testSnapshot2x1TilesSameSizeDefer() {
-        doTestTiledSnapshotDefer(4100, 10);
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSnapshot2x1TilesSameSizeDefer(boolean live, boolean useImage) {
+        setupEach(live, useImage);
+        doTestTiledSnapshotDefer(live, useImage, 4100, 10);
     }
 
-    @Test
-    public void testSnapshot2x1TilesDifferentSizeDefer() {
-        doTestTiledSnapshotDefer(4099, 10);
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSnapshot2x1TilesDifferentSizeDefer(boolean live, boolean useImage) {
+        setupEach(live, useImage);
+        doTestTiledSnapshotDefer(live, useImage, 4099, 10);
     }
 
-    @Test
-    public void testSnapshot1x2TilesSameSizeDefer() {
-        doTestTiledSnapshotDefer(10, 4100);
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSnapshot1x2TilesSameSizeDefer(boolean live, boolean useImage) {
+        setupEach(live, useImage);
+        doTestTiledSnapshotDefer(live, useImage, 10, 4100);
     }
 
-    @Test
-    public void testSnapshot1x2TilesDifferentSizeDefer() {
-        doTestTiledSnapshotDefer(10, 4099);
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSnapshot1x2TilesDifferentSizeDefer(boolean live, boolean useImage) {
+        setupEach(live, useImage);
+        doTestTiledSnapshotDefer(live, useImage, 10, 4099);
     }
 
-    @Test
-    public void testSnapshot2x2TilesSameSizeDefer() {
-        doTestTiledSnapshotDefer(4100, 4100);
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSnapshot2x2TilesSameSizeDefer(boolean live, boolean useImage) {
+        setupEach(live, useImage);
+        doTestTiledSnapshotDefer(live, useImage, 4100, 4100);
     }
 
-    @Test
-    public void testSnapshot2x2TilesDifferentSizeDefer() {
-        doTestTiledSnapshotDefer(4099, 4099);
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSnapshot2x2TilesDifferentSizeDefer(boolean live, boolean useImage) {
+        setupEach(live, useImage);
+        doTestTiledSnapshotDefer(live, useImage, 4099, 4099);
     }
 
-    @Test
-    public void testSnapshot2x2TilesSameHeightDefer() {
-        doTestTiledSnapshotDefer(4099, 4100);
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSnapshot2x2TilesSameHeightDefer(boolean live, boolean useImage) {
+        setupEach(live, useImage);
+        doTestTiledSnapshotDefer(live, useImage, 4099, 4100);
     }
 
-    @Test
-    public void testSnapshot2x2TilesSameWidthDefer() {
-        doTestTiledSnapshotDefer(4100, 4099);
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSnapshot2x2TilesSameWidthDefer(boolean live, boolean useImage) {
+        setupEach(live, useImage);
+        doTestTiledSnapshotDefer(live, useImage, 4100, 4099);
     }
 
     // Test node snapshot with a scale transform
 
-    private void doTestSnapshotScaleNodeImm(int xScale, int yScale) {
-        setupSimpleScene();
+    private void doTestSnapshotScaleNodeImm(boolean live, boolean useImage, int xScale, int yScale) {
+        setupSimpleScene(live);
         final SnapshotParameters snapshotParams = new SnapshotParameters();
         snapshotParams.setTransform(Transform.scale(xScale, yScale));
         final int WIDTH = NODE_W * xScale;
@@ -524,8 +558,8 @@ private void doTestSnapshotScaleNodeImm(int xScale, int yScale) {
         });
     }
 
-    private void doTestSnapshotScaleNodeDefer(int xScale, int yScale) {
-        setupSimpleScene();
+    private void doTestSnapshotScaleNodeDefer(boolean live, boolean useImage, int xScale, int yScale) {
+        setupSimpleScene(live);
         final SnapshotParameters snapshotParams = new SnapshotParameters();
         snapshotParams.setTransform(Transform.scale(xScale, yScale));
         final int WIDTH = NODE_W * xScale;
@@ -546,41 +580,55 @@ private void doTestSnapshotScaleNodeDefer(int xScale, int yScale) {
         }, snapshotParams, img);
     }
 
-    @Test
-    public void testSnapshotScaleNodeImm() {
-        doTestSnapshotScaleNodeImm(3, 3);
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSnapshotScaleNodeImm(boolean live, boolean useImage) {
+        setupEach(live, useImage);
+        doTestSnapshotScaleNodeImm(live, useImage, 3, 3);
     }
 
-    @Test
-    public void testSnapshotScaleNodeDefer() {
-        doTestSnapshotScaleNodeDefer(3, 3);
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSnapshotScaleNodeDefer(boolean live, boolean useImage) {
+        setupEach(live, useImage);
+        doTestSnapshotScaleNodeDefer(live, useImage, 3, 3);
     }
 
-    @Test
-    public void testSnapshotBigXScaleNodeImm() {
-        doTestSnapshotScaleNodeImm(100, 1);
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSnapshotBigXScaleNodeImm(boolean live, boolean useImage) {
+        setupEach(live, useImage);
+        doTestSnapshotScaleNodeImm(live, useImage, 100, 1);
     }
 
-    @Test
-    public void testSnapshotBigXScaleNodeDefer() {
-        doTestSnapshotScaleNodeDefer(100, 1);
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSnapshotBigXScaleNodeDefer(boolean live, boolean useImage) {
+        setupEach(live, useImage);
+        doTestSnapshotScaleNodeDefer(live, useImage, 100, 1);
     }
 
-    @Test
-    public void testSnapshotBigYScaleNodeImm() {
-        doTestSnapshotScaleNodeImm(1, 200);
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSnapshotBigYScaleNodeImm(boolean live, boolean useImage) {
+        setupEach(live, useImage);
+        doTestSnapshotScaleNodeImm(live, useImage, 1, 200);
     }
 
-    @Test
-    public void testSnapshotBigYScaleNodeDefer() {
-        doTestSnapshotScaleNodeDefer(1, 200);
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSnapshotBigYScaleNodeDefer(boolean live, boolean useImage) {
+        setupEach(live, useImage);
+        doTestSnapshotScaleNodeDefer(live, useImage, 1, 200);
     }
 
     // Test node snapshot with a 90 degree rotate transform
 
-    @Test
-    public void testSnapshotRotateNodeImm() {
-        setupSimpleScene();
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSnapshotRotateNodeImm(boolean live, boolean useImage) {
+        setupEach(live, useImage);
+        setupSimpleScene(live);
         final SnapshotParameters snapshotParams = new SnapshotParameters();
         // Rotate by 90 degrees, which will swap width and height
         snapshotParams.setTransform(Transform.rotate(90, 0, 0));
@@ -599,9 +647,11 @@ public void testSnapshotRotateNodeImm() {
         });
     }
 
-    @Test
-    public void testSnapshotRotateNodeDefer() {
-        setupSimpleScene();
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSnapshotRotateNodeDefer(boolean live, boolean useImage) {
+        setupEach(live, useImage);
+        setupSimpleScene(live);
         final SnapshotParameters snapshotParams = new SnapshotParameters();
         // Rotate by 90 degrees, which will swap width and height
         snapshotParams.setTransform(Transform.rotate(90, 0, 0));
@@ -629,9 +679,11 @@ public void testSnapshotRotateNodeDefer() {
     private static final int VP_WIDTH = 160;
     private static final int VP_HEIGHT = 100;
 
-    @Test
-    public void testSnapshotViewportNodeImm() {
-        setupSimpleScene();
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSnapshotViewportNodeImm(boolean live, boolean useImage) {
+        setupEach(live, useImage);
+        setupSimpleScene(live);
         final SnapshotParameters snapshotParams = new SnapshotParameters();
         snapshotParams.setViewport(new Rectangle2D(VP_X, VP_Y, VP_WIDTH, VP_HEIGHT));
         final WritableImage img = useImage ? new WritableImage(NODE_W, NODE_H) : null;
@@ -649,9 +701,11 @@ public void testSnapshotViewportNodeImm() {
         });
     }
 
-    @Test
-    public void testSnapshotViewportNodeDefer() {
-        setupSimpleScene();
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSnapshotViewportNodeDefer(boolean live, boolean useImage) {
+        setupEach(live, useImage);
+        setupSimpleScene(live);
         final SnapshotParameters snapshotParams = new SnapshotParameters();
         snapshotParams.setViewport(new Rectangle2D(VP_X, VP_Y, VP_WIDTH, VP_HEIGHT));
         final WritableImage img = useImage ? new WritableImage(NODE_W, NODE_H) : null;
@@ -679,9 +733,11 @@ public void testSnapshotViewportNodeDefer() {
     private static final int NEW_WIDTH = 70;
     private static final int NEW_HEIGHT = 35;
 
-    @Test
-    public void testSnapshotUpdateNodeDefer() {
-        setupSimpleScene();
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSnapshotUpdateNodeDefer(boolean live, boolean useImage) {
+        setupEach(live, useImage);
+        setupSimpleScene(live);
         final SnapshotParameters snapshotParams = new SnapshotParameters();
         final WritableImage img = useImage ? new WritableImage(NODE_W, NODE_H) : null;
         final int WIDTH = useImage ? NODE_W : NEW_WIDTH;
@@ -708,5 +764,4 @@ public void testSnapshotUpdateNodeDefer() {
 
         runDeferredSnapshotWait(tmpScene.getRoot(), cb, snapshotParams, img, runAfter);
     }
-
 }
diff --git a/tests/system/src/test/java/test/javafx/scene/SnapshotCommon.java b/tests/system/src/test/java/test/javafx/scene/SnapshotCommon.java
index bdc3b03d5f0..de1c9338a40 100644
--- a/tests/system/src/test/java/test/javafx/scene/SnapshotCommon.java
+++ b/tests/system/src/test/java/test/javafx/scene/SnapshotCommon.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,14 +25,13 @@
 
 package test.javafx.scene;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 import static test.util.Util.TIMEOUT;
-
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Group;
@@ -45,8 +44,6 @@
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import javafx.util.Callback;
-
-import junit.framework.AssertionFailedError;
 import test.util.Util;
 
 /**
@@ -146,24 +143,14 @@ protected void runDeferredSnapshotWait(final Node node,
 
         try {
             if (!latch.await(TIMEOUT, TimeUnit.MILLISECONDS)) {
-                throw new AssertionFailedError("Timeout waiting for snapshot callback");
+                fail("Timeout waiting for snapshot callback");
             }
         } catch (InterruptedException ex) {
-            AssertionFailedError err = new AssertionFailedError("Unexpected exception");
-            err.initCause(ex);
-            throw err;
+            fail(ex);
         }
 
         if (testError[0] != null) {
-            if (testError[0] instanceof Error) {
-                throw (Error)testError[0];
-            } else if (testError[0] instanceof RuntimeException) {
-                throw (RuntimeException)testError[0];
-            } else {
-                AssertionFailedError err = new AssertionFailedError("Unknown execution exception");
-                err.initCause(testError[0].getCause());
-                throw err;
-            }
+            fail(testError[0]);
         }
     }
 
@@ -198,25 +185,14 @@ protected void runDeferredSnapshotWait(final Scene scene,
 
         try {
             if (!latch.await(TIMEOUT, TimeUnit.MILLISECONDS)) {
-                throw new AssertionFailedError("Timeout waiting for snapshot callback");
+                fail("Timeout waiting for snapshot callback");
             }
         } catch (InterruptedException ex) {
-            AssertionFailedError err = new AssertionFailedError("Unexpected exception");
-            err.initCause(ex);
-            throw err;
+            fail(ex);
         }
 
         if (testError[0] != null) {
-            if (testError[0] instanceof Error) {
-                throw (Error)testError[0];
-            } else if (testError[0] instanceof RuntimeException) {
-                throw (RuntimeException)testError[0];
-            } else {
-                AssertionFailedError err = new AssertionFailedError("Unknown execution exception");
-                err.initCause(testError[0].getCause());
-                throw err;
-            }
+            fail(testError[0]);
         }
     }
-
 }
diff --git a/tests/system/src/test/java/test/javafx/scene/StyleMemoryLeakTest.java b/tests/system/src/test/java/test/javafx/scene/StyleMemoryLeakTest.java
index 0ecd483d68e..c3b7bf60edc 100644
--- a/tests/system/src/test/java/test/javafx/scene/StyleMemoryLeakTest.java
+++ b/tests/system/src/test/java/test/javafx/scene/StyleMemoryLeakTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,29 +25,25 @@
 
 package test.javafx.scene;
 
-import static org.junit.Assert.assertTrue;
-
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
-
 import javafx.application.Platform;
 import javafx.scene.Group;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.stage.Stage;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 import test.util.memory.JMemoryBuddy;
 
 
 public class StyleMemoryLeakTest {
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() throws Exception {
         CountDownLatch startupLatch = new CountDownLatch(1);
         Platform.setImplicitExit(false);
@@ -57,7 +53,7 @@ public static void initFX() throws Exception {
         });
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardownOnce() {
         Util.shutdown();
     }
@@ -81,7 +77,7 @@ public void testRootNodeMemoryLeak() throws Exception {
             });
 
             try {
-                assertTrue("Timeout waiting test stage", showingLatch.await(15, TimeUnit.SECONDS));
+                assertTrue(showingLatch.await(15, TimeUnit.SECONDS), "Timeout waiting test stage");
             } catch (InterruptedException e) {
                 throw new RuntimeException(e);
             }
diff --git a/tests/system/src/test/java/test/javafx/scene/UIRenderDialogTest.java b/tests/system/src/test/java/test/javafx/scene/UIRenderDialogTest.java
index 2444b719a90..d869b3619cb 100644
--- a/tests/system/src/test/java/test/javafx/scene/UIRenderDialogTest.java
+++ b/tests/system/src/test/java/test/javafx/scene/UIRenderDialogTest.java
@@ -24,11 +24,9 @@
  */
 package test.javafx.scene;
 
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
-
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.geometry.Insets;
@@ -44,14 +42,11 @@
 import javafx.scene.text.Text;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import com.sun.javafx.PlatformUtil;
-
-import junit.framework.Assert;
 import test.util.Util;
 
 public class UIRenderDialogTest {
@@ -95,7 +90,7 @@ public void start(Stage primaryStage) throws Exception {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setupOnce() throws Exception {
         System.setProperty("glass.win.uiScale", String.valueOf(scale));
         System.setProperty("glass.gtk.uiScale", String.valueOf(scale));
@@ -103,7 +98,7 @@ public static void setupOnce() throws Exception {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardown() {
         Platform.runLater(() -> {
             if (alert != null) {
@@ -117,15 +112,13 @@ public static void teardown() {
     public void testCheckBoxTextInDialogDoesNotHaveEllipsis() {
         assumeTrue(PlatformUtil.isLinux() || PlatformUtil.isWindows());
 
-        Assert.assertEquals("Wrong render scale", scale,
-                stage.getRenderScaleY(), 0.0001);
-
-        Assert.assertNotNull(alert);
+        Assertions.assertEquals(scale, stage.getRenderScaleY(), 0.0001, "Wrong render scale");
+        Assertions.assertNotNull(alert);
         assertTrue(alert.isShowing());
 
         for (Node node : ((HBox) alert.getDialogPane().getContent()).getChildrenUnmodifiable()) {
             CheckBox box = (CheckBox) node;
-            Assert.assertEquals("Wrong text", "Check", ((Text) box.lookup(".text")).getText());
+            Assertions.assertEquals("Check", ((Text) box.lookup(".text")).getText(), "Wrong text");
         }
     }
 }
diff --git a/tests/system/src/test/java/test/javafx/scene/UIRenderSceneTest.java b/tests/system/src/test/java/test/javafx/scene/UIRenderSceneTest.java
index 10878aaafd0..9c630b82409 100644
--- a/tests/system/src/test/java/test/javafx/scene/UIRenderSceneTest.java
+++ b/tests/system/src/test/java/test/javafx/scene/UIRenderSceneTest.java
@@ -24,10 +24,8 @@
  */
 package test.javafx.scene;
 
-import static org.junit.Assume.assumeTrue;
-
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.geometry.Insets;
@@ -39,14 +37,11 @@
 import javafx.scene.text.Text;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
-
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import com.sun.javafx.PlatformUtil;
-
 import test.util.Util;
 
 public class UIRenderSceneTest {
@@ -75,7 +70,7 @@ public void start(Stage primaryStage) throws Exception {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setupOnce() throws Exception {
         System.setProperty("glass.win.uiScale", String.valueOf(scale));
         System.setProperty("glass.gtk.uiScale", String.valueOf(scale));
@@ -83,7 +78,7 @@ public static void setupOnce() throws Exception {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardown() {
         Util.shutdown();
     }
@@ -92,12 +87,11 @@ public static void teardown() {
     public void testCheckBoxTextDoesNotHaveEllipsis() {
         assumeTrue(PlatformUtil.isLinux() || PlatformUtil.isWindows());
 
-        Assert.assertEquals("Wrong render scale", scale,
-                stage.getRenderScaleY(), 0.0001);
+        Assertions.assertEquals(scale, stage.getRenderScaleY(), 0.0001, "Wrong render scale");
 
         for (Node node : stage.getScene().getRoot().getChildrenUnmodifiable()) {
             CheckBox box = (CheckBox) node;
-            Assert.assertEquals("Wrong text", "Check", ((Text) box.lookup(".text")).getText());
+            Assertions.assertEquals("Check", ((Text) box.lookup(".text")).getText(), "Wrong text");
         }
     }
 }
diff --git a/tests/system/src/test/java/test/javafx/scene/UIRenderSnapToPixelTest.java b/tests/system/src/test/java/test/javafx/scene/UIRenderSnapToPixelTest.java
index b6e99c69313..13b07c80946 100644
--- a/tests/system/src/test/java/test/javafx/scene/UIRenderSnapToPixelTest.java
+++ b/tests/system/src/test/java/test/javafx/scene/UIRenderSnapToPixelTest.java
@@ -24,10 +24,9 @@
  */
 package test.javafx.scene;
 
-import static org.junit.Assume.assumeTrue;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Node;
@@ -37,14 +36,10 @@
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import com.sun.javafx.PlatformUtil;
-
-import junit.framework.Assert;
 import test.util.Util;
 
 public class UIRenderSnapToPixelTest {
@@ -53,7 +48,7 @@ public class UIRenderSnapToPixelTest {
     private static volatile Stage stage;
     private static final double epsilon = 0.00001;
 
-    @BeforeClass
+    @BeforeAll
     public static void setupOnce() throws Exception {
         System.setProperty("glass.win.uiScale", String.valueOf(scale));
         System.setProperty("glass.gtk.uiScale", String.valueOf(scale));
@@ -61,7 +56,7 @@ public static void setupOnce() throws Exception {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardown() {
         Util.shutdown();
     }
@@ -70,15 +65,15 @@ public static void teardown() {
     public void testScrollPaneSnapChildrenToPixels() {
         assumeTrue(PlatformUtil.isLinux() || PlatformUtil.isWindows());
 
-        Assert.assertEquals("Wrong render scale", scale, stage.getRenderScaleY(), 0.0001);
+        assertEquals(scale, stage.getRenderScaleY(), 0.0001, "Wrong render scale");
 
         for (Node node : stage.getScene().getRoot().getChildrenUnmodifiable()) {
             if (node instanceof ScrollPane) {
                 var sp = (ScrollPane) node;
-                Assert.assertEquals("Top inset not snapped to pixel", 0, ((sp.snappedTopInset() * scale) + epsilon) % 1, 0.0001);
-                Assert.assertEquals("Bottom inset not snapped to pixel", 0, ((sp.snappedBottomInset() * scale) + epsilon) % 1, 0.0001);
-                Assert.assertEquals("Left inset not snapped to pixel", 0, ((sp.snappedLeftInset() * scale) + epsilon) % 1, 0.0001);
-                Assert.assertEquals("Right inset not snapped to pixel", 0, ((sp.snappedRightInset() * scale) + epsilon) % 1, 0.0001);
+                assertEquals(0, ((sp.snappedTopInset() * scale) + epsilon) % 1, 0.0001, "Top inset not snapped to pixel");
+                assertEquals(0, ((sp.snappedBottomInset() * scale) + epsilon) % 1, 0.0001, "Bottom inset not snapped to pixel");
+                assertEquals(0, ((sp.snappedLeftInset() * scale) + epsilon) % 1, 0.0001, "Left inset not snapped to pixel");
+                assertEquals(0, ((sp.snappedRightInset() * scale) + epsilon) % 1, 0.0001, "Right inset not snapped to pixel");
             }
         }
     }
diff --git a/tests/system/src/test/java/test/javafx/scene/control/AccordionTitlePaneLeakTest.java b/tests/system/src/test/java/test/javafx/scene/control/AccordionTitlePaneLeakTest.java
index e3f228331cc..40518fff899 100644
--- a/tests/system/src/test/java/test/javafx/scene/control/AccordionTitlePaneLeakTest.java
+++ b/tests/system/src/test/java/test/javafx/scene/control/AccordionTitlePaneLeakTest.java
@@ -34,9 +34,9 @@
 import javafx.scene.control.TitledPane;
 import javafx.scene.layout.StackPane;
 import javafx.stage.Stage;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 import test.util.memory.JMemoryBuddy;
 
@@ -63,13 +63,13 @@ public void start(Stage primaryStage) throws Exception {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() throws Exception {
         startupLatch = new CountDownLatch(1);
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardownOnce() {
         Util.shutdown();
     }
diff --git a/tests/system/src/test/java/test/javafx/scene/control/MenuButtonSkinBaseNPETest.java b/tests/system/src/test/java/test/javafx/scene/control/MenuButtonSkinBaseNPETest.java
index 7583c158283..2f32a8033ce 100644
--- a/tests/system/src/test/java/test/javafx/scene/control/MenuButtonSkinBaseNPETest.java
+++ b/tests/system/src/test/java/test/javafx/scene/control/MenuButtonSkinBaseNPETest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.Application;
 import javafx.scene.Scene;
 import javafx.scene.control.Menu;
@@ -36,12 +35,10 @@
 import javafx.scene.control.MenuItem;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
-
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 public class MenuButtonSkinBaseNPETest {
@@ -73,7 +70,7 @@ public void testMenuButtonNPE() throws Exception {
         });
         Thread.sleep(100);
         System.setErr(defaultErrorStream);
-        Assert.assertEquals("No error should be thrown", "", out.toString());
+        Assertions.assertEquals("", out.toString(), "No error should be thrown");
     }
 
     public static class TestApp extends Application {
@@ -90,12 +87,12 @@ public void start(Stage primaryStage) throws Exception {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() throws Exception {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDown() {
         Util.shutdown();
     }
diff --git a/tests/system/src/test/java/test/javafx/scene/control/ProgressIndicatorLeakTest.java b/tests/system/src/test/java/test/javafx/scene/control/ProgressIndicatorLeakTest.java
index e58a53d1e26..399cbe89f02 100644
--- a/tests/system/src/test/java/test/javafx/scene/control/ProgressIndicatorLeakTest.java
+++ b/tests/system/src/test/java/test/javafx/scene/control/ProgressIndicatorLeakTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,9 @@
 
 package test.javafx.scene.control;
 
-import static org.junit.Assert.assertTrue;
-
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
-
 import javafx.application.Platform;
 import javafx.scene.Group;
 import javafx.scene.Node;
@@ -38,25 +35,23 @@
 import javafx.scene.control.ProgressIndicator;
 import javafx.scene.control.skin.ProgressIndicatorSkin;
 import javafx.stage.Stage;
-
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 import test.util.memory.JMemoryBuddy;
 
 public class ProgressIndicatorLeakTest {
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() throws Exception {
         CountDownLatch startupLatch = new CountDownLatch(1);
         Platform.setImplicitExit(false);
         Util.startup(startupLatch, startupLatch::countDown);
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardownOnce() {
         Util.shutdown();
     }
@@ -72,7 +67,7 @@ public void leakDeterminationIndicator() throws Exception {
                 Scene scene = new Scene(indicator);
                 stage.setScene(scene);
                 indicator.setProgress(1.0);
-                Assert.assertEquals("size is wrong", 1, indicator.getChildrenUnmodifiable().size());
+                Assertions.assertEquals(1, indicator.getChildrenUnmodifiable().size(), "size is wrong");
                 Node detIndicator = indicator.getChildrenUnmodifiable().get(0);
                 indicator.setProgress(-1.0);
                 indicator.setProgress(1.0);
@@ -83,7 +78,7 @@ public void leakDeterminationIndicator() throws Exception {
                 stage.show();
             });
             try {
-                Assert.assertTrue("Timeout waiting for setOnShown", showingLatch.await(15, TimeUnit.SECONDS));
+                Assertions.assertTrue(showingLatch.await(15, TimeUnit.SECONDS), "Timeout waiting for setOnShown");
             } catch (InterruptedException e) {
                 throw new RuntimeException(e);
             }
@@ -109,7 +104,7 @@ public void stageLeakWhenTreeNotShowing() throws Exception {
             });
 
             try {
-                assertTrue("Timeout waiting test stage", showingLatch.await(15, TimeUnit.SECONDS));
+                Assertions.assertTrue(showingLatch.await(15, TimeUnit.SECONDS), "Timeout waiting test stage");
             } catch (InterruptedException e) {
                 throw new RuntimeException(e);
             }
diff --git a/tests/system/src/test/java/test/javafx/scene/control/TabPaneHeaderLeakTest.java b/tests/system/src/test/java/test/javafx/scene/control/TabPaneHeaderLeakTest.java
index b0b45f784b5..6650f38429b 100644
--- a/tests/system/src/test/java/test/javafx/scene/control/TabPaneHeaderLeakTest.java
+++ b/tests/system/src/test/java/test/javafx/scene/control/TabPaneHeaderLeakTest.java
@@ -27,7 +27,6 @@
 
 import java.lang.ref.WeakReference;
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Scene;
@@ -36,11 +35,9 @@
 import javafx.scene.control.TextField;
 import javafx.scene.layout.StackPane;
 import javafx.stage.Stage;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 import test.util.memory.JMemoryBuddy;
 
@@ -76,12 +73,12 @@ public void start(Stage primaryStage) throws Exception {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() throws Exception {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardownOnce() {
         Util.shutdown();
     }
diff --git a/tests/system/src/test/java/test/javafx/scene/control/XYChartExceptionOnAddingRemovedSeriesTest.java b/tests/system/src/test/java/test/javafx/scene/control/XYChartExceptionOnAddingRemovedSeriesTest.java
index 8fe345552c0..508a3767191 100644
--- a/tests/system/src/test/java/test/javafx/scene/control/XYChartExceptionOnAddingRemovedSeriesTest.java
+++ b/tests/system/src/test/java/test/javafx/scene/control/XYChartExceptionOnAddingRemovedSeriesTest.java
@@ -42,12 +42,12 @@
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 public class XYChartExceptionOnAddingRemovedSeriesTest {
@@ -87,13 +87,13 @@ public class XYChartExceptionOnAddingRemovedSeriesTest {
     public void testLineChartExceptionOnAddingRemovedSeries() throws Throwable {
         Util.waitForLatch(startupLatch, 5, "Timeout waiting for stage to layout.");
 
-        Assert.assertEquals(1, lineChart.getData().size());
+        Assertions.assertEquals(1, lineChart.getData().size());
 
         lineSeriesLatch.countDown();
         addRemovedSeriesLineChart();
         Util.waitForLatch(lineSeriesLatch, 5, "Timeout waiting for series to be added.");
 
-        Assert.assertEquals(1, lineChart.getData().size());
+        Assertions.assertEquals(1, lineChart.getData().size());
     }
 
     private void addRemovedSeriesLineChart() {
@@ -101,7 +101,7 @@ private void addRemovedSeriesLineChart() {
             vBox.getChildren().clear();
             vBox.getChildren().add(lineChart);
             Series<Number, Number> removedSeries = lineChart.getData().remove(0);
-            Assert.assertEquals(0, lineChart.getData().size());
+            Assertions.assertEquals(0, lineChart.getData().size());
             lineChart.getData().add(removedSeries);
 
         });
@@ -109,13 +109,13 @@ private void addRemovedSeriesLineChart() {
 
     @Test
     public void testAreaChartExceptionOnAddingRemovedSeries() throws Throwable {
-        Assert.assertEquals(1, areaChart.getData().size());
+        Assertions.assertEquals(1, areaChart.getData().size());
 
         areaChartLatch.countDown();
         addRemovedSeriesAreaChart();
         Util.waitForLatch(areaChartLatch, 5, "Timeout waiting for series to be added.");
 
-        Assert.assertEquals(1, areaChart.getData().size());
+        Assertions.assertEquals(1, areaChart.getData().size());
     }
 
     private void addRemovedSeriesAreaChart() {
@@ -123,20 +123,20 @@ private void addRemovedSeriesAreaChart() {
             vBox.getChildren().clear();
             vBox.getChildren().add(areaChart);
             Series<Number, Number> removedSeries = areaChart.getData().remove(0);
-            Assert.assertEquals(0, areaChart.getData().size());
+            Assertions.assertEquals(0, areaChart.getData().size());
             areaChart.getData().add(removedSeries);
         });
     }
 
     @Test
     public void testBubbleChartExceptionOnAddingRemovedSeries() throws Throwable {
-        Assert.assertEquals(1, bubbleChart.getData().size());
+        Assertions.assertEquals(1, bubbleChart.getData().size());
 
         bubbleChartLatch.countDown();
         addRemovedSeriesBubbleChart();
         Util.waitForLatch(bubbleChartLatch, 5, "Timeout waiting for series to be added.");
 
-        Assert.assertEquals(1, bubbleChart.getData().size());
+        Assertions.assertEquals(1, bubbleChart.getData().size());
     }
 
     private void addRemovedSeriesBubbleChart() {
@@ -144,20 +144,20 @@ private void addRemovedSeriesBubbleChart() {
             vBox.getChildren().clear();
             vBox.getChildren().add(bubbleChart);
             Series<Number, Number> removedSeries = bubbleChart.getData().remove(0);
-            Assert.assertEquals(0, bubbleChart.getData().size());
+            Assertions.assertEquals(0, bubbleChart.getData().size());
             bubbleChart.getData().add(removedSeries);
         });
     }
 
     @Test
     public void testScatterChartExceptionOnAddingRemovedSeries() throws Throwable {
-        Assert.assertEquals(1, scatterChart.getData().size());
+        Assertions.assertEquals(1, scatterChart.getData().size());
 
         scatterChartLatch.countDown();
         addRemovedSeriesScatterChart();
         Util.waitForLatch(scatterChartLatch, 5, "Timeout waiting for series to be added.");
 
-        Assert.assertEquals(1, scatterChart.getData().size());
+        Assertions.assertEquals(1, scatterChart.getData().size());
     }
 
     private void addRemovedSeriesScatterChart() {
@@ -165,20 +165,20 @@ private void addRemovedSeriesScatterChart() {
             vBox.getChildren().clear();
             vBox.getChildren().add(scatterChart);
             Series<Number, Number> removedSeries = scatterChart.getData().remove(0);
-            Assert.assertEquals(0, scatterChart.getData().size());
+            Assertions.assertEquals(0, scatterChart.getData().size());
             scatterChart.getData().add(removedSeries);
         });
     }
 
     @Test
     public void testStackedAreaChartExceptionOnAddingRemovedSeries() throws Throwable {
-        Assert.assertEquals(1, stackedAreaChart.getData().size());
+        Assertions.assertEquals(1, stackedAreaChart.getData().size());
 
         stackedAreaChartLatch.countDown();
         addRemovedSeriesStackedAreaChart();
         Util.waitForLatch(stackedAreaChartLatch, 5, "Timeout waiting for series to be added.");
 
-        Assert.assertEquals(1, stackedAreaChart.getData().size());
+        Assertions.assertEquals(1, stackedAreaChart.getData().size());
     }
 
     private void addRemovedSeriesStackedAreaChart() {
@@ -186,20 +186,20 @@ private void addRemovedSeriesStackedAreaChart() {
             vBox.getChildren().clear();
             vBox.getChildren().add(stackedAreaChart);
             Series<Number, Number> removedSeries = stackedAreaChart.getData().remove(0);
-            Assert.assertEquals(0, stackedAreaChart.getData().size());
+            Assertions.assertEquals(0, stackedAreaChart.getData().size());
             stackedAreaChart.getData().add(removedSeries);
         });
     }
 
     @Test
     public void testStackedBarChartExceptionOnAddingRemovedSeries() throws Throwable {
-        Assert.assertEquals(1, stackedBarChart.getData().size());
+        Assertions.assertEquals(1, stackedBarChart.getData().size());
 
         stackedBarChartLatch.countDown();
         addRemovedSeriesStackedBarChart();
         Util.waitForLatch(stackedBarChartLatch, 5, "Timeout waiting for series to be added.");
 
-        Assert.assertEquals(1, stackedBarChart.getData().size());
+        Assertions.assertEquals(1, stackedBarChart.getData().size());
     }
 
     private void addRemovedSeriesStackedBarChart() {
@@ -207,22 +207,22 @@ private void addRemovedSeriesStackedBarChart() {
             vBox.getChildren().clear();
             vBox.getChildren().add(stackedBarChart);
             Series<String, Number> removedSeries = stackedBarChart.getData().remove(0);
-            Assert.assertEquals(0, stackedBarChart.getData().size());
+            Assertions.assertEquals(0, stackedBarChart.getData().size());
             stackedBarChart.getData().add(removedSeries);
         });
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() throws Exception {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void exit() {
         Util.shutdown();
     }
 
-    @Before
+    @BeforeEach
     public void setup() {
         Util.runAndWait(() -> {
             Thread.currentThread().setUncaughtExceptionHandler((thread, throwable) -> {
@@ -235,7 +235,7 @@ public void setup() {
         });
     }
 
-    @After
+    @AfterEach
     public void cleanup() {
         Util.runAndWait(() -> {
             Thread.currentThread().setUncaughtExceptionHandler(null);
diff --git a/tests/system/src/test/java/test/javafx/scene/image/WritableImageFromBufferTest.java b/tests/system/src/test/java/test/javafx/scene/image/WritableImageFromBufferTest.java
index 63aa8193b56..653e8002b76 100644
--- a/tests/system/src/test/java/test/javafx/scene/image/WritableImageFromBufferTest.java
+++ b/tests/system/src/test/java/test/javafx/scene/image/WritableImageFromBufferTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,6 @@
 import java.io.PrintStream;
 import java.nio.IntBuffer;
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.Application;
 import javafx.geometry.Rectangle2D;
 import javafx.scene.Scene;
@@ -45,13 +44,11 @@
 import javafx.scene.layout.StackPane;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
-
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 /**
@@ -83,7 +80,7 @@ public void start(Stage primaryStage) throws Exception {
         }
     }
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         BufferedImage awtImage = new BufferedImage(IMG_WIDTH, IMG_HEIGHT, BufferedImage.TYPE_INT_ARGB_PRE);
         g2d = (Graphics2D) awtImage.getGraphics();
@@ -121,7 +118,7 @@ public void test() throws InterruptedException {
         Thread.sleep(100);
 
         System.setErr(defaultErrorStream);
-        Assert.assertEquals("No error should be thrown", "", out.toString());
+        Assertions.assertEquals("", out.toString(), "No error should be thrown");
     }
 
     private void requestFullUpdate() {
@@ -150,12 +147,12 @@ private void requestPartialUpdate() {
         });
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() throws Exception {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDown() {
         Util.shutdown();
     }
diff --git a/tests/system/src/test/java/test/javafx/scene/input/ClipboardTest.java b/tests/system/src/test/java/test/javafx/scene/input/ClipboardTest.java
index 45ae1729471..85826094282 100644
--- a/tests/system/src/test/java/test/javafx/scene/input/ClipboardTest.java
+++ b/tests/system/src/test/java/test/javafx/scene/input/ClipboardTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,27 +24,22 @@
  */
 package test.javafx.scene.input;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assume.assumeTrue;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import java.awt.Toolkit;
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.StringSelection;
 import java.awt.datatransfer.Transferable;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
-
 import javafx.scene.input.Clipboard;
 import javafx.scene.input.ClipboardContent;
 import javafx.scene.input.DataFormat;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import com.sun.javafx.PlatformUtil;
-
 import sun.awt.datatransfer.ClipboardTransferable;
 import sun.awt.datatransfer.SunClipboard;
 import test.util.Util;
@@ -68,7 +63,7 @@ public static void main(String[] args) throws Exception {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() {
         Util.startup(startupLatch, () -> {
             clipboard = Clipboard.getSystemClipboard();
@@ -76,7 +71,7 @@ public static void initFX() {
         });
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardown() {
         Util.shutdown();
     }
diff --git a/tests/system/src/test/java/test/javafx/scene/lighting3D/DirectionalLightTest.java b/tests/system/src/test/java/test/javafx/scene/lighting3D/DirectionalLightTest.java
index a207f9ecf4f..70cb3cda410 100644
--- a/tests/system/src/test/java/test/javafx/scene/lighting3D/DirectionalLightTest.java
+++ b/tests/system/src/test/java/test/javafx/scene/lighting3D/DirectionalLightTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,21 +25,17 @@
 
 package test.javafx.scene.lighting3D;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assume.assumeTrue;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.ConditionalFeature;
 import javafx.application.Platform;
 import javafx.geometry.Point3D;
 import javafx.scene.DirectionalLight;
 import javafx.scene.paint.Color;
-
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 public class DirectionalLightTest extends LightingTest {
@@ -52,7 +48,7 @@ public static void main(String[] args) throws Exception {
         initFX();
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() throws Exception {
         startupLatch = new CountDownLatch(1);
         LightingTest.light = LIGHT;
@@ -60,7 +56,7 @@ public static void initFX() throws Exception {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @Before
+    @BeforeEach
     public void setupEach() {
         assumeTrue(Platform.isSupported(ConditionalFeature.SCENE3D));
     }
@@ -71,7 +67,7 @@ public void testDirectionalLight() {
             for (Point3D direction : DIRECTIONS) {
                 LIGHT.setDirection(direction);
                 double sampledBlue = snapshot().getPixelReader().getColor(0, 0).getBlue();
-                assertEquals(FAIL_MESSAGE, dotProduct(direction), sampledBlue, DELTA);
+                assertEquals(dotProduct(direction), sampledBlue, DELTA, FAIL_MESSAGE);
             }
         });
     }
diff --git a/tests/system/src/test/java/test/javafx/scene/lighting3D/LightingTest.java b/tests/system/src/test/java/test/javafx/scene/lighting3D/LightingTest.java
index 23d85cd3e72..a72b65d7546 100644
--- a/tests/system/src/test/java/test/javafx/scene/lighting3D/LightingTest.java
+++ b/tests/system/src/test/java/test/javafx/scene/lighting3D/LightingTest.java
@@ -26,7 +26,6 @@
 package test.javafx.scene.lighting3D;
 
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Group;
@@ -36,9 +35,7 @@
 import javafx.scene.shape.Box;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
-
-import org.junit.AfterClass;
-
+import org.junit.jupiter.api.AfterAll;
 import test.util.Util;
 
 // Since there appears to be a bug in snapshot with subscene, we are taking a snapshot of the scene and not
@@ -93,7 +90,7 @@ protected double calculateLambertTerm(double x) {
         return Math.cos(Math.atan(x/LIGHT_DIST));
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardown() {
         Util.shutdown();
     }
diff --git a/tests/system/src/test/java/test/javafx/scene/lighting3D/PointLightAttenuationTest.java b/tests/system/src/test/java/test/javafx/scene/lighting3D/PointLightAttenuationTest.java
index c872f1c7492..0b8959a88f6 100644
--- a/tests/system/src/test/java/test/javafx/scene/lighting3D/PointLightAttenuationTest.java
+++ b/tests/system/src/test/java/test/javafx/scene/lighting3D/PointLightAttenuationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,20 +25,16 @@
 
 package test.javafx.scene.lighting3D;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assume.assumeTrue;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.ConditionalFeature;
 import javafx.application.Platform;
 import javafx.scene.PointLight;
 import javafx.scene.paint.Color;
-
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 public class PointLightAttenuationTest extends LightingTest {
@@ -55,7 +51,7 @@ public static void main(String[] args) throws Exception {
         initFX();
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() throws Exception {
         startupLatch = new CountDownLatch(1);
         LightingTest.light = LIGHT;
@@ -63,7 +59,7 @@ public static void initFX() throws Exception {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @Before
+    @BeforeEach
     public void setupEach() {
         assumeTrue(Platform.isSupported(ConditionalFeature.SCENE3D));
         LIGHT.setLinearAttenuation(0);
@@ -78,7 +74,7 @@ public void testLambert() {
             var snapshot = snapshot();
             for (int x : LAMBERT_SAMPLE_DISTS) {
                 double sampledBlue = snapshot.getPixelReader().getColor(x, 0).getBlue();
-                assertEquals(FAIL_MESSAGE + " for " + x, calculateLambertTerm(x), sampledBlue, DELTA);
+                assertEquals(calculateLambertTerm(x), sampledBlue, DELTA, FAIL_MESSAGE + " for " + x);
             }
         });
     }
@@ -104,11 +100,11 @@ private void doAttenuationTest(double diagDist, double lambertCenter, double lam
 
         var attn = calculateAttenuationFactor(LIGHT_DIST);
         var sampledBlue = snapshot.getPixelReader().getColor(0, 0).getBlue();
-        assertEquals(FAIL_MESSAGE, lambertCenter * attn, sampledBlue, DELTA);
+        assertEquals(lambertCenter * attn, sampledBlue, DELTA, FAIL_MESSAGE);
 
         attn = calculateAttenuationFactor(diagDist);
         sampledBlue = snapshot.getPixelReader().getColor(ATTN_SAMPLE_DIST, 0).getBlue();
-        assertEquals(FAIL_MESSAGE, lambertSample * attn, sampledBlue, DELTA);
+        assertEquals(lambertSample * attn, sampledBlue, DELTA, FAIL_MESSAGE);
     }
 
     @Test
@@ -119,10 +115,10 @@ public void testRange() {
             var snapshot = snapshot();
 
             double sampledBlue = snapshot.getPixelReader().getColor(0, 0).getBlue();
-            assertEquals(FAIL_MESSAGE + ", should be in range", 1, sampledBlue, DELTA);
+            assertEquals(1, sampledBlue, DELTA, FAIL_MESSAGE + ", should be in range");
 
             sampledBlue = snapshot.getPixelReader().getColor(ATTN_SAMPLE_DIST, 0).getBlue();
-            assertEquals(FAIL_MESSAGE + ", should be out of range", 0, sampledBlue, DELTA);
+            assertEquals(0, sampledBlue, DELTA, FAIL_MESSAGE + ", should be out of range");
         });
     }
 
diff --git a/tests/system/src/test/java/test/javafx/scene/lighting3D/SpotLightAttenuationTest.java b/tests/system/src/test/java/test/javafx/scene/lighting3D/SpotLightAttenuationTest.java
index c4045f3d10e..31bc4250f51 100644
--- a/tests/system/src/test/java/test/javafx/scene/lighting3D/SpotLightAttenuationTest.java
+++ b/tests/system/src/test/java/test/javafx/scene/lighting3D/SpotLightAttenuationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,20 +25,16 @@
 
 package test.javafx.scene.lighting3D;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assume.assumeTrue;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.ConditionalFeature;
 import javafx.application.Platform;
 import javafx.scene.SpotLight;
 import javafx.scene.paint.Color;
-
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 public class SpotLightAttenuationTest extends LightingTest {
@@ -58,7 +54,7 @@ public static void main(String[] args) throws Exception {
         initFX();
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() throws Exception {
         startupLatch = new CountDownLatch(1);
         LightingTest.light = LIGHT;
@@ -66,7 +62,7 @@ public static void initFX() throws Exception {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @Before
+    @BeforeEach
     public void setupEach() {
         assumeTrue(Platform.isSupported(ConditionalFeature.SCENE3D));
     }
@@ -83,17 +79,17 @@ public void testSpotlightAttenuation() {
                 int innerX = angleToDist(INSIDE_ANGLE_SAMPLE);
                 double spotFactor = 1;
                 double sampledBlue = snapshot.getPixelReader().getColor(innerX, 0).getBlue();
-                assertEquals(FAIL_MESSAGE, calculateLambertTerm(innerX) * spotFactor, sampledBlue, DELTA);
+                assertEquals(calculateLambertTerm(innerX) * spotFactor, sampledBlue, DELTA, FAIL_MESSAGE);
 
                 int middleX = angleToDist(MIDDLE_ANGLE_SAMPLE);
                 spotFactor = calculateSpotlightFactor(MIDDLE_ANGLE_SAMPLE);
                 sampledBlue = snapshot.getPixelReader().getColor(middleX, 0).getBlue();
-                assertEquals(FAIL_MESSAGE, calculateLambertTerm(middleX) * spotFactor, sampledBlue, DELTA);
+                assertEquals(calculateLambertTerm(middleX) * spotFactor, sampledBlue, DELTA, FAIL_MESSAGE);
 
                 int outerX = angleToDist(OUTSIDE_ANGLE_SAMPLE);
                 spotFactor = 0;
                 sampledBlue = snapshot.getPixelReader().getColor(outerX, 0).getBlue();
-                assertEquals(FAIL_MESSAGE, calculateLambertTerm(outerX) * spotFactor, sampledBlue, DELTA);
+                assertEquals(calculateLambertTerm(outerX) * spotFactor, sampledBlue, DELTA, FAIL_MESSAGE);
             }
         });
     }
diff --git a/tests/system/src/test/java/test/javafx/scene/shape/ShapeViewOrderLeakTest.java b/tests/system/src/test/java/test/javafx/scene/shape/ShapeViewOrderLeakTest.java
index b42c8955020..da27baf2982 100644
--- a/tests/system/src/test/java/test/javafx/scene/shape/ShapeViewOrderLeakTest.java
+++ b/tests/system/src/test/java/test/javafx/scene/shape/ShapeViewOrderLeakTest.java
@@ -27,7 +27,6 @@
 
 import java.lang.ref.WeakReference;
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Group;
@@ -37,11 +36,9 @@
 import javafx.scene.shape.Rectangle;
 import javafx.scene.shape.Shape;
 import javafx.stage.Stage;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 import test.util.memory.JMemoryBuddy;
 
@@ -77,12 +74,12 @@ public void start(Stage primaryStage) throws Exception {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() throws Exception {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardownOnce() {
         Util.shutdown();
     }
diff --git a/tests/system/src/test/java/test/javafx/scene/shape/meshmanagercacheleaktest/MeshManagerCacheLeakTest.java b/tests/system/src/test/java/test/javafx/scene/shape/meshmanagercacheleaktest/MeshManagerCacheLeakTest.java
index 4af26c859d6..2d3db09eeea 100644
--- a/tests/system/src/test/java/test/javafx/scene/shape/meshmanagercacheleaktest/MeshManagerCacheLeakTest.java
+++ b/tests/system/src/test/java/test/javafx/scene/shape/meshmanagercacheleaktest/MeshManagerCacheLeakTest.java
@@ -25,16 +25,17 @@
 
 package test.javafx.scene.shape.meshmanagercacheleaktest;
 
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import static test.javafx.scene.shape.meshmanagercacheleaktest.Constants.ERROR_LAUNCH;
 import static test.javafx.scene.shape.meshmanagercacheleaktest.Constants.ERROR_NONE;
 import static test.javafx.scene.shape.meshmanagercacheleaktest.Constants.ERROR_OOM;
 import java.util.ArrayList;
 import javafx.application.ConditionalFeature;
 import javafx.application.Platform;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 /**
  * Unit test for verifying leak with cache of TriangleMesh in PredefinedMeshManager.
@@ -45,23 +46,26 @@ public class MeshManagerCacheLeakTest {
     private final String pkgName = className.substring(0, className.lastIndexOf("."));
     private final String testAppName = pkgName + "." + "MeshManagerCacheLeakApp";
 
-    @Before
+    @BeforeEach
     public void setUp() {
         assumeTrue(Platform.isSupported(ConditionalFeature.SCENE3D));
         assumeTrue(Boolean.getBoolean("unstable.test")); // JDK-8201763
     }
 
-    @Test (timeout = 15000)
+    @Test
+    @Timeout(value=15)
     public void testSphereCacheLeakTest() throws Exception {
         testMeshManagerCacheLeak("Sphere", "10");
     }
 
-    @Test (timeout = 15000)
+    @Test
+    @Timeout(value=15)
     public void testCylinderCacheLeakTest() throws Exception {
         testMeshManagerCacheLeak("Cylinder", "25");
     }
 
-    @Test (timeout = 20000)
+    @Test
+    @Timeout(value=20)
     public void testBoxCacheLeakTest() throws Exception {
         testMeshManagerCacheLeak("Box", "350");
     }
diff --git a/tests/system/src/test/java/test/javafx/scene/text/ArabicWrappingTest.java b/tests/system/src/test/java/test/javafx/scene/text/ArabicWrappingTest.java
index 5dce5d28a9e..85ec4024ee8 100644
--- a/tests/system/src/test/java/test/javafx/scene/text/ArabicWrappingTest.java
+++ b/tests/system/src/test/java/test/javafx/scene/text/ArabicWrappingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,24 +25,25 @@
 
 package test.javafx.scene.text;
 
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.TimeUnit;
+import javafx.application.Application;
 import javafx.application.Platform;
-import javafx.stage.Stage;
 import javafx.scene.Scene;
 import javafx.scene.layout.HBox;
 import javafx.scene.text.Font;
 import javafx.scene.text.Text;
-import javafx.application.Application;
-
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.util.Timer;
-import java.util.TimerTask;
+import javafx.stage.Stage;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
+@Timeout(value=120000, unit=TimeUnit.MILLISECONDS)
 public class ArabicWrappingTest extends Application {
 
     static PrintStream systemErr = System.err;
@@ -75,7 +76,7 @@ String getExceptionString() {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() {
         systemErrFilter = new SystemErrFilter(System.err);
         System.setErr(systemErrFilter);
@@ -84,7 +85,7 @@ public static void initFX() {
         }).start();
     }
 
-    @AfterClass
+    @AfterAll
     public static void exitTest() {
         Platform.exit();
     }
@@ -100,7 +101,7 @@ public static void exitTest() {
      * the @BeforeClass annotated method.
      * In other words, this is fine here.
      */
-    @Test(timeout=120000)
+    @Test
     public void testWrapping() {
 
        while (!ArabicWrappingTest.testDone) {
diff --git a/tests/system/src/test/java/test/javafx/scene/text/TextFlowNodeTest.java b/tests/system/src/test/java/test/javafx/scene/text/TextFlowNodeTest.java
index 15ffeda66c6..5e39c226bdf 100644
--- a/tests/system/src/test/java/test/javafx/scene/text/TextFlowNodeTest.java
+++ b/tests/system/src/test/java/test/javafx/scene/text/TextFlowNodeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,16 +32,16 @@
 import javafx.scene.text.Font;
 import javafx.scene.text.Text;
 import javafx.scene.text.TextFlow;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 /**
  * Tests TextFlow Node
  */
 public class TextFlowNodeTest {
-    @BeforeClass
+    @BeforeAll
     public static void initFX() {
         CountDownLatch startupLatch = new CountDownLatch(1);
         Util.startup(startupLatch, startupLatch::countDown);
@@ -56,29 +56,29 @@ public void testUnderlineShape() {
 
         // underline 0,0 must be empty
         PathElement[] p = f.underlineShape(0, 0);
-        Assert.assertNotNull(p);
-        Assert.assertEquals(0, p.length);
+        Assertions.assertNotNull(p);
+        Assertions.assertEquals(0, p.length);
 
         // underline 1,0 .. 1,len must increase monotonically
         int len = t1.getText().length() + t2.getText().length();
         double w = 0.0;
         for (int i = 1; i < len; i++) {
             p = f.underlineShape(0, i);
-            Assert.assertNotNull(p);
+            Assertions.assertNotNull(p);
 
             // width must increase
             Bounds b = new Path(p).getBoundsInLocal();
-            Assert.assertTrue(b.getWidth() > w);
+            Assertions.assertTrue(b.getWidth() > w);
             w = b.getWidth();
 
             // test height greater than zero
-            Assert.assertTrue(b.getHeight() > 0.0);
+            Assertions.assertTrue(b.getHeight() > 0.0);
         }
 
         // 0,1000 same as 0,len
         Bounds b1 = new Path(f.underlineShape(0, len)).getBoundsInLocal();
         Bounds b2 = new Path(f.underlineShape(0, 1000)).getBoundsInLocal();
-        Assert.assertEquals(b1, b2);
-        Assert.assertTrue(b1.getHeight() > 0.0);
+        Assertions.assertEquals(b1, b2);
+        Assertions.assertTrue(b1.getHeight() > 0.0);
     }
 }
diff --git a/tests/system/src/test/java/test/javafx/scene/text/TextNodeTest.java b/tests/system/src/test/java/test/javafx/scene/text/TextNodeTest.java
index daf65108e5e..8967871bb2b 100644
--- a/tests/system/src/test/java/test/javafx/scene/text/TextNodeTest.java
+++ b/tests/system/src/test/java/test/javafx/scene/text/TextNodeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,10 @@
 
 package test.javafx.scene.text;
 
-import com.sun.javafx.application.PlatformImpl;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import javafx.geometry.Bounds;
@@ -35,14 +38,13 @@
 import javafx.scene.shape.PathElement;
 import javafx.scene.text.Font;
 import javafx.scene.text.Text;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.application.PlatformImpl;
 
 public class TextNodeTest {
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() {
         final CountDownLatch startupLatch = new CountDownLatch(1);
         PlatformImpl.startup(() -> {
@@ -130,13 +132,13 @@ public void assertCaretEquals(PathElement[] caretShape,
         float avgChar = (float)bounds.getWidth();
         PathElement[] empty = {};
 
-        assertEquals(empty, text.getCaretShape()); //initially empty
+        assertArrayEquals(empty, text.getCaretShape()); //initially empty
 
         text.setCaretPosition(0);
         assertCaretEquals(text.getCaretShape(), 0, 0, 0, lineHeight);
 
         text.setCaretPosition(-1);
-        assertEquals(empty, text.getCaretShape()); //empty after -1
+        assertArrayEquals(empty, text.getCaretShape()); //empty after -1
 
         //set back
         text.setCaretPosition(0);
@@ -144,7 +146,7 @@ public void assertCaretEquals(PathElement[] caretShape,
 
         text.setCaretBias(false);
         text.setText("abc");
-        assertEquals(empty, text.getCaretShape()); //empty after setText
+        assertArrayEquals(empty, text.getCaretShape()); //empty after setText
         assertEquals(-1, text.getCaretPosition());
         assertEquals(true, text.caretBiasProperty().get());
 
@@ -180,10 +182,10 @@ public void assertCaretEquals(PathElement[] caretShape,
         //test out of bounds
         text.setCaretPosition(4);
         text.setCaretBias(true);
-        assertEquals(empty, text.getCaretShape());
+        assertArrayEquals(empty, text.getCaretShape());
         text.setCaretPosition(4);
         text.setCaretBias(false);
-        assertEquals(empty, text.getCaretShape());
+        assertArrayEquals(empty, text.getCaretShape());
 
         //test empty text
         text.setText("");
@@ -205,24 +207,24 @@ public void assertCaretEquals(PathElement[] caretShape,
         float avgChar = (float)bounds.getWidth();
         PathElement[] empty = {};
 
-        assertEquals(empty, text.getSelectionShape()); //initially null
+        assertArrayEquals(empty, text.getSelectionShape()); //initially null
 
         text.setSelectionStart(0);
-        assertEquals(empty, text.getSelectionShape()); //set start, but not end
+        assertArrayEquals(empty, text.getSelectionShape()); //set start, but not end
 
         text.setSelectionStart(0);
         text.setSelectionEnd(1);
         assertBoundsEquals(text.getSelectionShape(), 0, 0, avgChar, lineHeight);
 
         text.setSelectionStart(-1);
-        assertEquals(empty, text.getSelectionShape());; //no start
+        assertArrayEquals(empty, text.getSelectionShape());; //no start
 
         text.setSelectionStart(0);
         text.setSelectionEnd(1);
         assertBoundsEquals(text.getSelectionShape(), 0, 0, avgChar, lineHeight);
 
         text.setSelectionEnd(-1);
-        assertEquals(empty, text.getSelectionShape()); //no end
+        assertArrayEquals(empty, text.getSelectionShape()); //no end
 
         text.setSelectionStart(0);
         text.setSelectionEnd(1);
@@ -230,7 +232,7 @@ public void assertCaretEquals(PathElement[] caretShape,
 
         text.setSelectionStart(1);
         text.setSelectionEnd(0);
-        assertEquals(empty, text.getSelectionShape()); //end > start
+        assertArrayEquals(empty, text.getSelectionShape()); //end > start
 
         text.setSelectionStart(0);
         text.setSelectionEnd(1);
@@ -238,7 +240,7 @@ public void assertCaretEquals(PathElement[] caretShape,
 
         text.setSelectionStart(0);
         text.setSelectionEnd(0);
-        assertEquals(empty, text.getSelectionShape()); //end == start
+        assertArrayEquals(empty, text.getSelectionShape()); //end == start
 
         text.setSelectionStart(0);
         text.setSelectionEnd(1);
@@ -246,7 +248,7 @@ public void assertCaretEquals(PathElement[] caretShape,
 
         text.setSelectionStart(0);
         text.setSelectionEnd(3);
-        assertEquals(empty, text.getSelectionShape()); //end > length
+        assertArrayEquals(empty, text.getSelectionShape()); //end > length
 
         text.setSelectionStart(0);
         text.setSelectionEnd(1);
@@ -254,16 +256,16 @@ public void assertCaretEquals(PathElement[] caretShape,
 
         text.setSelectionStart(3);
         text.setSelectionEnd(5);
-        assertEquals(empty, text.getSelectionShape()); //start > length
+        assertArrayEquals(empty, text.getSelectionShape()); //start > length
 
         text.setText("abc");
-        assertEquals(empty, text.getSelectionShape()); //setText resets
+        assertArrayEquals(empty, text.getSelectionShape()); //setText resets
         assertEquals(-1, text.getSelectionStart());
         assertEquals(-1, text.getSelectionEnd());
 
         text.setSelectionStart(0);
         text.setSelectionEnd(0);
-        assertEquals(empty, text.getSelectionShape());
+        assertArrayEquals(empty, text.getSelectionShape());
         text.setSelectionStart(0);
         text.setSelectionEnd(1);
         assertBoundsEquals(text.getSelectionShape(), 0, 0, avgChar, lineHeight);
@@ -275,7 +277,7 @@ public void assertCaretEquals(PathElement[] caretShape,
         assertBoundsEquals(text.getSelectionShape(), 0, 0, 3*avgChar, lineHeight);
         text.setSelectionStart(0);
         text.setSelectionEnd(4);
-        assertEquals(empty, text.getSelectionShape());
+        assertArrayEquals(empty, text.getSelectionShape());
         text.setSelectionStart(1);
         text.setSelectionEnd(2);
         assertBoundsEquals(text.getSelectionShape(), avgChar, 0, avgChar, lineHeight);
@@ -287,7 +289,7 @@ public void assertCaretEquals(PathElement[] caretShape,
         assertBoundsEquals(text.getSelectionShape(), 2*avgChar, 0, avgChar, lineHeight);
         text.setSelectionStart(3);
         text.setSelectionEnd(3);
-        assertEquals(empty, text.getSelectionShape());
+        assertArrayEquals(empty, text.getSelectionShape());
     }
 
 }
diff --git a/tests/system/src/test/java/test/javafx/scene/web/CSSFilterTest.java b/tests/system/src/test/java/test/javafx/scene/web/CSSFilterTest.java
index 47d3816f469..fd5c5b54a99 100644
--- a/tests/system/src/test/java/test/javafx/scene/web/CSSFilterTest.java
+++ b/tests/system/src/test/java/test/javafx/scene/web/CSSFilterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,12 +26,10 @@
 package test.javafx.scene.web;
 
 import static javafx.concurrent.Worker.State.SUCCEEDED;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Scene;
@@ -40,13 +38,11 @@
 import javafx.scene.paint.Color;
 import javafx.scene.web.WebView;
 import javafx.stage.Stage;
-
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 public class CSSFilterTest {
@@ -103,17 +99,17 @@ protected boolean testColorEquals(Color expected, Color actual, double delta) {
         return (deltaRed <= delta && deltaGreen <= delta && deltaBlue <= delta && deltaOpacity <= delta);
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setupOnce() {
         Util.launch(launchLatch, CSSFilterTestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDownOnce() {
         Util.shutdown();
     }
 
-    @Before
+    @BeforeEach
     public void setupTestObjects() {
         Platform.runLater(() -> {
             webView = new WebView();
@@ -122,7 +118,7 @@ public void setupTestObjects() {
         });
     }
 
-    @Ignore("JDK-8269067")
+    @Disabled("JDK-8269067")
     @Test public void testCSSFilterRendering() {
         final CountDownLatch webViewStateLatch = new CountDownLatch(1);
 
@@ -146,7 +142,7 @@ public void setupTestObjects() {
             webView.getEngine().load(urlString);
         });
 
-        assertTrue("Timeout when waiting for focus change ", Util.await(webViewStateLatch));
+        assertTrue(Util.await(webViewStateLatch), "Timeout when waiting for focus change ");
         Util.sleep(1000);
 
         Util.runAndWait(() -> {
diff --git a/tests/system/src/test/java/test/javafx/scene/web/CanvasTest.java b/tests/system/src/test/java/test/javafx/scene/web/CanvasTest.java
index b3b9cb1f8c4..3fe107b3127 100644
--- a/tests/system/src/test/java/test/javafx/scene/web/CanvasTest.java
+++ b/tests/system/src/test/java/test/javafx/scene/web/CanvasTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,23 +26,19 @@
 package test.javafx.scene.web;
 
 import static javafx.concurrent.Worker.State.SUCCEEDED;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Scene;
 import javafx.scene.web.WebView;
 import javafx.stage.Stage;
-
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 public class CanvasTest {
@@ -69,19 +65,19 @@ public void start(Stage primaryStage) throws Exception {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setupOnce() {
         Util.launch(launchLatch, CanvasTestApp.class);
 
-        assertTrue("Timeout waiting for FX runtime to start", Util.await(launchLatch));
+        assertTrue(Util.await(launchLatch), "Timeout waiting for FX runtime to start");
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDownOnce() {
         Util.shutdown();
     }
 
-    @Before
+    @BeforeEach
     public void setupTestObjects() {
         Platform.runLater(() -> {
             webView = new WebView();
@@ -125,14 +121,16 @@ public void testCanvasRect() throws Exception {
             });
         });
 
-        assertTrue("Timeout when waiting for focus change ", Util.await(webViewStateLatch));
+        assertTrue(Util.await(webViewStateLatch), "Timeout when waiting for focus change ");
 
         Util.runAndWait(() -> {
             int redColor = 255;
-            assertEquals("Rect top-left corner", redColor, (int) webView.getEngine().executeScript(
-                "document.getElementById('canvas').getContext('2d').getImageData(1, 1, 1, 1).data[0]"));
-            assertEquals("Rect bottom-right corner", redColor, (int) webView.getEngine().executeScript(
-                "document.getElementById('canvas').getContext('2d').getImageData(99, 99, 1, 1).data[0]"));
+            assertEquals(redColor, (int) webView.getEngine().executeScript(
+                "document.getElementById('canvas').getContext('2d').getImageData(1, 1, 1, 1).data[0]"),
+                "Rect top-left corner");
+            assertEquals(redColor, (int) webView.getEngine().executeScript(
+                "document.getElementById('canvas').getContext('2d').getImageData(99, 99, 1, 1).data[0]"),
+                "Rect bottom-right corner");
         });
     }
 }
diff --git a/tests/system/src/test/java/test/javafx/scene/web/HTMLEditorTest.java b/tests/system/src/test/java/test/javafx/scene/web/HTMLEditorTest.java
index 64f9a3b98d7..abb2ebc689e 100644
--- a/tests/system/src/test/java/test/javafx/scene/web/HTMLEditorTest.java
+++ b/tests/system/src/test/java/test/javafx/scene/web/HTMLEditorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,13 +26,11 @@
 package test.javafx.scene.web;
 
 import static javafx.concurrent.Worker.State.SUCCEEDED;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicReference;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.event.Event;
@@ -45,15 +43,12 @@
 import javafx.scene.web.HTMLEditor;
 import javafx.scene.web.WebView;
 import javafx.stage.Stage;
-
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import com.sun.javafx.PlatformUtil;
-
 import test.com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
 import test.com.sun.javafx.scene.control.infrastructure.KeyModifier;
 import test.util.Util;
@@ -94,17 +89,17 @@ public void start(Stage primaryStage) throws Exception {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setupOnce() {
         Util.launch(launchLatch, HTMLEditorTestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDownOnce() {
         Util.shutdown();
     }
 
-    @Before
+    @BeforeEach
     public void setupTestObjects() {
         Platform.runLater(() -> {
             htmlEditor = new HTMLEditor();
@@ -128,7 +123,8 @@ public void setupTestObjects() {
     // Currently ignoring this test case due to regression (JDK-8200418).
     // The newly cloned issue (JDK-8202542) needs to be fixed before
     // re-enabling this test case.
-    @Test @Ignore("JDK-8202542")
+    @Test
+    @Disabled("JDK-8202542")
     public void checkFocusChange() throws Exception {
         final CountDownLatch editorStateLatch = new CountDownLatch(1);
         final AtomicReference<String> result = new AtomicReference<>();
@@ -169,8 +165,8 @@ public void checkFocusChange() throws Exception {
 
         });
 
-        assertTrue("Timeout when waiting for focus change ", Util.await(editorStateLatch));
-        assertEquals("Focus Change with design mode enabled ", "red", result.get());
+        assertTrue(Util.await(editorStateLatch), "Timeout when waiting for focus change ");
+        assertEquals("red", result.get(), "Focus Change with design mode enabled ");
     }
 
     /**
@@ -219,7 +215,7 @@ public void checkStyleWithCSS() throws Exception {
 
         });
 
-        assertTrue("Timeout when waiting for focus change ", Util.await(editorStateLatch));
+        assertTrue(Util.await(editorStateLatch), "Timeout when waiting for focus change ");
 
         Util.runAndWait(() -> {
             webView.getEngine().executeScript("document.body.focus();");
@@ -302,9 +298,9 @@ public void checkStyleProperty() throws Exception {
 
         });
 
-        assertTrue("Timeout when waiting for focus change ", Util.await(editorStateLatch));
+        assertTrue(Util.await(editorStateLatch), "Timeout when waiting for focus change ");
         assertNotNull("result must have a valid reference ", result.get());
-        assertEquals("document.body.style.fontWeight must be bold ", "bold", result.get());
+        assertEquals("bold", result.get(), "document.body.style.fontWeight must be bold ");
     }
 
     /**
@@ -335,11 +331,13 @@ public void selectFontFamilyWithSpace() {
                     for (Node comboBox : htmlEditor.lookupAll(".font-menu-button")) {
                         // 0 - Format, 1 - Font Family, 2 - Font Size
                         if (i == 1) {
-                            assertTrue("fontFamilyComboBox must be ComboBox",
-                                comboBox instanceof ComboBox);
+                            assertTrue(
+                                comboBox instanceof ComboBox,
+                                "fontFamilyComboBox must be ComboBox");
                             fontFamilyComboBox = (ComboBox<String>) comboBox;
-                            assertNotNull("fontFamilyComboBox must not be null",
-                                fontFamilyComboBox);
+                            assertNotNull(
+                                fontFamilyComboBox,
+                                "fontFamilyComboBox must not be null");
                         }
                         i++;
                     }
@@ -352,10 +350,9 @@ public void selectFontFamilyWithSpace() {
             });
         });
 
-        assertTrue("Timeout when waiting for focus change ", Util.await(editorStateLatch));
-        assertNotNull("result must have a valid reference ", result.get());
-        assertTrue("font-family must be 'WebKit Layout Test 2' ", result.get().
-            contains("font-family: &quot;WebKit Layout Tests 2&quot;"));
+        assertTrue(Util.await(editorStateLatch), "Timeout when waiting for focus change ");
+        assertNotNull(result.get(), "result must have a valid reference ");
+        assertTrue(result.get().contains("font-family: &quot;WebKit Layout Tests 2&quot;"), "font-family must be 'WebKit Layout Test 2' ");
     }
 
     /**
@@ -395,7 +392,7 @@ public void checkFontSizeOnSelectAll_ctrl_A() throws Exception {
             });
         });
 
-        assertTrue("Timeout while waiting for test html text setup", Util.await(editorStateLatch));
+        assertTrue(Util.await(editorStateLatch), "Timeout while waiting for test html text setup");
 
         String expectedHtmlText = htmlEditor.getHtmlText();
 
@@ -409,7 +406,7 @@ public void checkFontSizeOnSelectAll_ctrl_A() throws Exception {
 
         String actualHtmlText = htmlEditor.getHtmlText();
 
-        assertEquals("Expected and Actual HTML text does not match. ", expectedHtmlText, actualHtmlText);
+        assertEquals(expectedHtmlText, actualHtmlText, "Expected and Actual HTML text does not match. ");
     }
 
 
@@ -445,7 +442,7 @@ public void checkFontSizeOnSelectAll_Shift_LeftArrowKey() throws Exception {
             });
         });
 
-        assertTrue("Timeout while waiting for test html text setup", Util.await(editorStateLatch));
+        assertTrue(Util.await(editorStateLatch), "Timeout while waiting for test html text setup");
 
         String expectedHtmlText = htmlEditor.getHtmlText();
 
@@ -459,6 +456,6 @@ public void checkFontSizeOnSelectAll_Shift_LeftArrowKey() throws Exception {
 
         String actualHtmlText = htmlEditor.getHtmlText();
 
-        assertEquals("Expected and Actual HTML text does not match. ", expectedHtmlText, actualHtmlText);
+        assertEquals(expectedHtmlText, actualHtmlText, "Expected and Actual HTML text does not match. ");
     }
 }
diff --git a/tests/system/src/test/java/test/javafx/scene/web/PageFillTest.java b/tests/system/src/test/java/test/javafx/scene/web/PageFillTest.java
index 163806dadc1..7bdda8c9749 100644
--- a/tests/system/src/test/java/test/javafx/scene/web/PageFillTest.java
+++ b/tests/system/src/test/java/test/javafx/scene/web/PageFillTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,12 +26,10 @@
 package test.javafx.scene.web;
 
 import static javafx.concurrent.Worker.State.SUCCEEDED;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Scene;
@@ -41,15 +39,12 @@
 import javafx.scene.web.WebEngineShim;
 import javafx.scene.web.WebView;
 import javafx.stage.Stage;
-
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import com.sun.webkit.WebPage;
 import com.sun.webkit.WebPageShim;
-
 import test.util.Util;
 
 public class PageFillTest {
@@ -106,17 +101,17 @@ protected boolean testColorEquals(Color expected, Color actual, double delta) {
         return (deltaRed <= delta && deltaGreen <= delta && deltaBlue <= delta && deltaOpacity <= delta);
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setupOnce() {
         Util.launch(launchLatch, PageFillTestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDownOnce() {
         Util.shutdown();
     }
 
-    @Before
+    @BeforeEach
     public void setupTestObjects() {
         Platform.runLater(() -> {
             webView = new WebView();
@@ -156,7 +151,7 @@ public void setupTestObjects() {
             webView.getEngine().loadContent(content);
         });
 
-        assertTrue("Timeout when waiting for focus change ", Util.await(webViewStateLatch));
+        assertTrue(Util.await(webViewStateLatch), "Timeout when waiting for focus change ");
         Util.sleep(1000);
 
         Util.runAndWait(() -> {
diff --git a/tests/system/src/test/java/test/javafx/scene/web/SVGTest.java b/tests/system/src/test/java/test/javafx/scene/web/SVGTest.java
index 6cb6c38acea..7b716f043d6 100644
--- a/tests/system/src/test/java/test/javafx/scene/web/SVGTest.java
+++ b/tests/system/src/test/java/test/javafx/scene/web/SVGTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,12 +26,10 @@
 package test.javafx.scene.web;
 
 import static javafx.concurrent.Worker.State.SUCCEEDED;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Scene;
@@ -40,12 +38,10 @@
 import javafx.scene.paint.Color;
 import javafx.scene.web.WebView;
 import javafx.stage.Stage;
-
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 public class SVGTest {
@@ -72,17 +68,17 @@ public void start(Stage primaryStage) throws Exception {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setupOnce() {
         Util.launch(launchLatch, SVGTestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDownOnce() {
         Util.shutdown();
     }
 
-    @Before
+    @BeforeEach
     public void setupTestObjects() {
         Platform.runLater(() -> {
             webView = new WebView();
@@ -131,7 +127,7 @@ public void setupTestObjects() {
             webView.getEngine().loadContent(htmlSVGContent);
         });
 
-        assertTrue("Timeout when waiting for focus change ", Util.await(webViewStateLatch));
+        assertTrue(Util.await(webViewStateLatch), "Timeout when waiting for focus change ");
         Util.sleep(1000);
 
         Util.runAndWait(() -> {
@@ -139,9 +135,9 @@ public void setupTestObjects() {
             PixelReader pr = snapshot.getPixelReader();
 
             Color redColor = Color.color(1, 0, 0);
-            assertEquals("Color should be opaque red:", redColor, pr.getColor(0, 0));
-            assertEquals("Color should be opaque red:", redColor, pr.getColor(30, 30));
-            assertEquals("Color should be opaque red:", redColor, pr.getColor(49, 49));
+            assertEquals(redColor, pr.getColor(0, 0), "Color should be opaque red:");
+            assertEquals(redColor, pr.getColor(30, 30), "Color should be opaque red:");
+            assertEquals(redColor, pr.getColor(49, 49), "Color should be opaque red:");
         });
     }
 }
diff --git a/tests/system/src/test/java/test/javafx/scene/web/StraightLineTest.java b/tests/system/src/test/java/test/javafx/scene/web/StraightLineTest.java
index eabb82e204d..6d13d02bf3c 100644
--- a/tests/system/src/test/java/test/javafx/scene/web/StraightLineTest.java
+++ b/tests/system/src/test/java/test/javafx/scene/web/StraightLineTest.java
@@ -26,9 +26,9 @@
 package test.javafx.scene.web;
 
 import static javafx.concurrent.Worker.State.SUCCEEDED;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.concurrent.CountDownLatch;
 import javafx.application.Application;
 import javafx.application.Platform;
@@ -38,10 +38,10 @@
 import javafx.scene.paint.Color;
 import javafx.scene.web.WebView;
 import javafx.stage.Stage;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 public class StraightLineTest {
@@ -79,17 +79,17 @@ private static String colorToString(Color c) {
         return "rgba(" + r + "," + g + "," + b + "," + a + ")";
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setupOnce() {
         Util.launch(launchLatch, StraightLineTestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDownOnce() {
         Util.shutdown();
     }
 
-    @Before
+    @BeforeEach
     public void setupTestObjects() {
         Platform.runLater(() -> {
             webView = new WebView();
@@ -145,7 +145,7 @@ public void setupTestObjects() {
                     "</html>");
         });
 
-        assertTrue("Timeout when waiting for focus change ", Util.await(webViewStateLatch));
+        assertTrue(Util.await(webViewStateLatch), "Timeout when waiting for focus change ");
         //introduce sleep , so that web contents would be loaded , then take snapshot for testing
         Util.sleep(1000);
 
diff --git a/tests/system/src/test/java/test/javafx/scene/web/WebIObserverTest.java b/tests/system/src/test/java/test/javafx/scene/web/WebIObserverTest.java
index 01c4d8730b8..bd9307a41c1 100644
--- a/tests/system/src/test/java/test/javafx/scene/web/WebIObserverTest.java
+++ b/tests/system/src/test/java/test/javafx/scene/web/WebIObserverTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,24 +26,20 @@
 package test.javafx.scene.web;
 
 import static javafx.concurrent.Worker.State.SUCCEEDED;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.net.URL;
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Scene;
 import javafx.scene.web.WebView;
 import javafx.stage.Stage;
-
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 public class WebIObserverTest {
@@ -69,17 +65,17 @@ public void start(Stage primaryStage) throws Exception {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setupOnce() {
         Util.launch(launchLatch, WebIObserverTestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDownOnce() {
         Util.shutdown();
     }
 
-    @Before
+    @BeforeEach
     public void setupTestObjects() {
         Platform.runLater(() -> {
             webView = new WebView();
@@ -91,7 +87,7 @@ public void setupTestObjects() {
     @Test public void testIO() {
         final CountDownLatch webViewStateLatch = new CountDownLatch(1);
         URL resource = WebIObserverTest.class.getResource("testIObserver.html");
-        assertNotNull("Resource was null", resource);
+        assertNotNull(resource, "Resource was null");
 
         Util.runAndWait(() -> {
             assertNotNull(webView);
@@ -105,22 +101,22 @@ public void setupTestObjects() {
             webView.getEngine().load(resource.toExternalForm());
         });
 
-        assertTrue("Timeout waiting for succeeded state", Util.await(webViewStateLatch));
+        assertTrue(Util.await(webViewStateLatch), "Timeout waiting for succeeded state");
         Util.sleep(500);
 
         Util.runAndWait(() ->
-                assertEquals("Unknown intersection ratio", "?", getIntersectionRatio()));
+                assertEquals("?", getIntersectionRatio(), "Unknown intersection ratio"));
 
         Util.runAndWait(() -> webView.getEngine().executeScript("testIO()"));
         Util.sleep(100);
 
         Util.runAndWait(() ->
-                assertEquals("Intersection ratio", "0.5", getIntersectionRatio()));
+                assertEquals("0.5", getIntersectionRatio(), "Intersection ratio"));
     }
 
     private String getIntersectionRatio() {
         Object object = webView.getEngine().executeScript("document.querySelector('#output pre').innerText");
-        assertNotNull("InnerText was null", object);
+        assertNotNull(object, "InnerText was null");
         return String.valueOf(object);
     }
 }
diff --git a/tests/system/src/test/java/test/javafx/scene/web/WebPageTest.java b/tests/system/src/test/java/test/javafx/scene/web/WebPageTest.java
index 680bf02d2dc..28cd2bee376 100644
--- a/tests/system/src/test/java/test/javafx/scene/web/WebPageTest.java
+++ b/tests/system/src/test/java/test/javafx/scene/web/WebPageTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,27 +26,22 @@
 package test.javafx.scene.web;
 
 import static javafx.concurrent.Worker.State.SUCCEEDED;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Scene;
 import javafx.scene.web.WebEngineShim;
 import javafx.scene.web.WebView;
 import javafx.stage.Stage;
-
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import com.sun.webkit.WebPage;
 import com.sun.webkit.WebPageShim;
-
 import test.util.Util;
 
 public class WebPageTest {
@@ -73,17 +68,17 @@ public void start(Stage primaryStage) throws Exception {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setupOnce() {
         Util.launch(launchLatch, WebPageTestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDownOnce() {
         Util.shutdown();
     }
 
-    @Before
+    @BeforeEach
     public void setupTestObjects() {
         Platform.runLater(() -> {
             webView = new WebView();
@@ -131,7 +126,7 @@ public void setupTestObjects() {
             webView.getEngine().loadContent(htmlContent);
         });
 
-        assertTrue("Timeout when waiting for focus change ", Util.await(webViewStateLatch));
+        assertTrue(Util.await(webViewStateLatch), "Timeout when waiting for focus change ");
         Util.sleep(1000);
 
         Util.runAndWait(() -> {
@@ -143,7 +138,7 @@ public void setupTestObjects() {
         Util.sleep(500);
 
         Util.runAndWait(() -> {
-            assertEquals("WebPage should display pass: ", "Pass", webView.getEngine().executeScript("document.getElementById('test').innerHTML"));
+            assertEquals("Pass", webView.getEngine().executeScript("document.getElementById('test').innerHTML"), "WebPage should display pass: ");
         });
     }
 }
diff --git a/tests/system/src/test/java/test/javafx/stage/ChildStageLocationTest.java b/tests/system/src/test/java/test/javafx/stage/ChildStageLocationTest.java
index 51f618de8dd..1344a618791 100644
--- a/tests/system/src/test/java/test/javafx/stage/ChildStageLocationTest.java
+++ b/tests/system/src/test/java/test/javafx/stage/ChildStageLocationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,10 @@
 
 package test.javafx.stage;
 
-import static org.junit.Assume.assumeTrue;
-
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;
@@ -41,12 +39,10 @@
 import javafx.stage.Screen;
 import javafx.stage.Stage;
 import javafx.stage.Window;
-
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 public class ChildStageLocationTest {
@@ -63,12 +59,12 @@ public static void main(String[] args) throws Exception {
         teardown();
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() throws Exception {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardown() {
         Util.shutdown();
     }
@@ -81,15 +77,15 @@ public void testLocation() {
         double minX = bounds.getMinX() + (bounds.getWidth() - window.getWidth())/2 - 50;
         double minY = bounds.getMinY() + (bounds.getHeight() - window.getHeight())/3 - 100;
         System.out.println("Primary stage location: " + stage.getX() + " " + stage.getY());
-        Assert.assertTrue("Primary stage X location should be >" + minX, stage.getX() > minX);
-        Assert.assertTrue("Primary stage Y location should be >" + minY, stage.getY() > minY);
+        Assertions.assertTrue(stage.getX() > minX, "Primary stage X location should be >" + minX);
+        Assertions.assertTrue(stage.getY() > minY, "Primary stage Y location should be >" + minY);
 
         window = childStage.getScene().getWindow();
         minX = bounds.getMinX() + (bounds.getWidth() - window.getWidth())/2 - 50;
         minY = bounds.getMinY() + (bounds.getHeight() - window.getHeight())/3 - 100;
         System.out.println("Child stage location: " + childStage.getX() + " " + childStage.getY());
-        Assert.assertTrue("Child stage X location should be >" + minX, childStage.getX() > minX);
-        Assert.assertTrue("Child stage Y location should be >" + minY, childStage.getY() > minY);
+        Assertions.assertTrue(childStage.getX() > minX, "Child stage X location should be >" + minX);
+        Assertions.assertTrue(childStage.getY() > minY, "Child stage Y location should be >" + minY);
     }
 
     public static class TestApp extends Application implements ChangeListener {
diff --git a/tests/system/src/test/java/test/javafx/stage/DeiconifiedWithChildTest.java b/tests/system/src/test/java/test/javafx/stage/DeiconifiedWithChildTest.java
index a57e19de2aa..43c020686d6 100644
--- a/tests/system/src/test/java/test/javafx/stage/DeiconifiedWithChildTest.java
+++ b/tests/system/src/test/java/test/javafx/stage/DeiconifiedWithChildTest.java
@@ -25,19 +25,16 @@
 package test.javafx.stage;
 
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Scene;
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
-
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 public class DeiconifiedWithChildTest {
@@ -71,12 +68,12 @@ public void start(Stage primaryStage) throws Exception {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardown() {
         Util.shutdown();
     }
@@ -84,9 +81,9 @@ public static void teardown() {
     @Test
     public void testDeiconifiedPosition() throws Exception {
         Thread.sleep(200);
-        Assert.assertTrue(stage.isShowing());
-        Assert.assertTrue(childStage.isShowing());
-        Assert.assertFalse(stage.isIconified());
+        Assertions.assertTrue(stage.isShowing());
+        Assertions.assertTrue(childStage.isShowing());
+        Assertions.assertFalse(stage.isIconified());
 
         double x = childStage.getX();
         double y = childStage.getY();
@@ -95,7 +92,7 @@ public void testDeiconifiedPosition() throws Exception {
         Thread.sleep(200);
         Platform.runLater(() -> stage.setIconified(false));
         Thread.sleep(200);
-        Assert.assertEquals("Child window was moved", x, childStage.getX(), 0.1);
-        Assert.assertEquals("Child window was moved", y, childStage.getY(), 0.1);
+        Assertions.assertEquals(x, childStage.getX(), 0.1, "Child window was moved");
+        Assertions.assertEquals(y, childStage.getY(), 0.1, "Child window was moved");
     }
 }
diff --git a/tests/system/src/test/java/test/javafx/stage/FocusedWindowMonocleTest.java b/tests/system/src/test/java/test/javafx/stage/FocusedWindowMonocleTest.java
index 558cbd5b17f..7991619a300 100644
--- a/tests/system/src/test/java/test/javafx/stage/FocusedWindowMonocleTest.java
+++ b/tests/system/src/test/java/test/javafx/stage/FocusedWindowMonocleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,9 +26,9 @@
 package test.javafx.stage;
 
 import javafx.application.Platform;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class FocusedWindowMonocleTest extends FocusedWindowTestBase {
 
@@ -38,7 +38,7 @@ public class FocusedWindowMonocleTest extends FocusedWindowTestBase {
         System.setProperty("prism.order","sw");
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() throws Exception {
         initFXBase();
     }
@@ -48,7 +48,7 @@ public void testClosedFocusedStageLeak() throws Exception {
         testClosedFocusedStageLeakBase();
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardownOnce() {
         Platform.runLater(() -> {
             Platform.exit();
diff --git a/tests/system/src/test/java/test/javafx/stage/FocusedWindowNativeTest.java b/tests/system/src/test/java/test/javafx/stage/FocusedWindowNativeTest.java
index 37165f64a3d..15425e3b9ee 100644
--- a/tests/system/src/test/java/test/javafx/stage/FocusedWindowNativeTest.java
+++ b/tests/system/src/test/java/test/javafx/stage/FocusedWindowNativeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,13 +26,13 @@
 package test.javafx.stage;
 
 import javafx.application.Platform;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class FocusedWindowNativeTest extends FocusedWindowTestBase {
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() throws Exception {
         initFXBase();
     }
@@ -42,7 +42,7 @@ public void testClosedFocusedStageLeak() throws Exception {
         testClosedFocusedStageLeakBase();
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardownOnce() {
         Platform.runLater(() -> {
             Platform.exit();
diff --git a/tests/system/src/test/java/test/javafx/stage/FocusedWindowTestBase.java b/tests/system/src/test/java/test/javafx/stage/FocusedWindowTestBase.java
index a0846bcb23b..1851295dbd0 100644
--- a/tests/system/src/test/java/test/javafx/stage/FocusedWindowTestBase.java
+++ b/tests/system/src/test/java/test/javafx/stage/FocusedWindowTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,14 +28,11 @@
 import java.lang.ref.WeakReference;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-
 import javafx.application.Platform;
 import javafx.scene.Scene;
 import javafx.scene.control.TextField;
 import javafx.stage.Stage;
-
-import org.junit.Assert;
-
+import org.junit.jupiter.api.Assertions;
 import test.util.Util;
 import test.util.memory.JMemoryBuddy;
 
@@ -64,16 +61,14 @@ public void testClosedFocusedStageLeakBase() throws Exception {
             });
             closedFocusedStage.show();
         });
-        Assert.assertTrue("Timeout waiting for closedFocusedStage to show`",
-                latch.await(15, TimeUnit.MILLISECONDS));
+        Assertions.assertTrue(latch.await(15, TimeUnit.MILLISECONDS), "Timeout waiting for closedFocusedStage to show`");
 
         CountDownLatch hideLatch = new CountDownLatch(1);
         closedFocusedStage.setOnHidden(a -> {
             hideLatch.countDown();
         });
         Util.runAndWait(() -> closedFocusedStage.close());
-        Assert.assertTrue("Timeout waiting for closedFocusedStage to hide`",
-                hideLatch.await(15, TimeUnit.MILLISECONDS));
+        Assertions.assertTrue(hideLatch.await(15, TimeUnit.MILLISECONDS), "Timeout waiting for closedFocusedStage to hide`");
 
         closedFocusedStage.requestFocus();
         closedFocusedStage = null;
diff --git a/tests/system/src/test/java/test/javafx/stage/InitialSizeTest.java b/tests/system/src/test/java/test/javafx/stage/InitialSizeTest.java
index 4381dd60a57..314222e0add 100644
--- a/tests/system/src/test/java/test/javafx/stage/InitialSizeTest.java
+++ b/tests/system/src/test/java/test/javafx/stage/InitialSizeTest.java
@@ -25,19 +25,16 @@
 package test.javafx.stage;
 
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Group;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
-
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 public class InitialSizeTest {
@@ -58,12 +55,12 @@ public void start(Stage primaryStage) throws Exception {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardown() {
         Util.shutdown();
     }
@@ -71,8 +68,8 @@ public static void teardown() {
     @Test
     public void testInitialSize() throws Exception {
         Util.sleep(200);
-        Assert.assertTrue(stage.isShowing());
-        Assert.assertEquals("Stage height", INIT_SIZE, stage.getHeight(), .1d);
-        Assert.assertEquals("Stage width", INIT_SIZE, stage.getWidth(), .1d);
+        Assertions.assertTrue(stage.isShowing());
+        Assertions.assertEquals(INIT_SIZE, stage.getHeight(), .1d, "Stage height");
+        Assertions.assertEquals(INIT_SIZE, stage.getWidth(), .1d, "Stage width");
     }
 }
diff --git a/tests/system/src/test/java/test/javafx/stage/MakeResizableAndResizeTest.java b/tests/system/src/test/java/test/javafx/stage/MakeResizableAndResizeTest.java
index 9f55caae4df..9d6487f6676 100644
--- a/tests/system/src/test/java/test/javafx/stage/MakeResizableAndResizeTest.java
+++ b/tests/system/src/test/java/test/javafx/stage/MakeResizableAndResizeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;
@@ -42,12 +41,10 @@
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Priority;
 import javafx.stage.Stage;
-
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 public class MakeResizableAndResizeTest {
@@ -65,20 +62,20 @@ public static void main(String[] args) {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void shutdown() {
         Util.shutdown();
     }
 
     @Test
     public void testSize() {
-        Assert.assertTrue("Wrong window width", alert.getWidth() >= alert.getDialogPane().getWidth());
-        Assert.assertTrue("Wrong window height", alert.getHeight() >= alert.getDialogPane().getHeight());
+        Assertions.assertTrue(alert.getWidth() >= alert.getDialogPane().getWidth(), "Wrong window width");
+        Assertions.assertTrue(alert.getHeight() >= alert.getDialogPane().getHeight(), "Wrong window height");
     }
 
     public static class TestApp extends Application implements ChangeListener {
diff --git a/tests/system/src/test/java/test/javafx/stage/MaximizeUndecorated.java b/tests/system/src/test/java/test/javafx/stage/MaximizeUndecorated.java
index ff8818bd6af..dc389361153 100644
--- a/tests/system/src/test/java/test/javafx/stage/MaximizeUndecorated.java
+++ b/tests/system/src/test/java/test/javafx/stage/MaximizeUndecorated.java
@@ -32,10 +32,10 @@
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import javafx.stage.WindowEvent;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 public class MaximizeUndecorated {
@@ -58,12 +58,12 @@ public void start(Stage primaryStage) throws Exception {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardown() {
         Util.shutdown();
     }
@@ -73,6 +73,6 @@ public void testMaximize() throws Exception {
         Util.sleep(200);
 
         boolean movedToTopCorner = stage.getY() != POS && stage.getX() != POS;
-        Assert.assertTrue("Stage has moved to desktop top corner", movedToTopCorner);
+        Assertions.assertTrue(movedToTopCorner, "Stage has moved to desktop top corner");
     }
 }
diff --git a/tests/system/src/test/java/test/javafx/stage/MultipleScreensTest.java b/tests/system/src/test/java/test/javafx/stage/MultipleScreensTest.java
index 6d20591a6f4..7fd1a2aba53 100644
--- a/tests/system/src/test/java/test/javafx/stage/MultipleScreensTest.java
+++ b/tests/system/src/test/java/test/javafx/stage/MultipleScreensTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,10 @@
 
 package test.javafx.stage;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assume.assumeTrue;
-
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import java.util.concurrent.CountDownLatch;
-
+import java.util.concurrent.TimeUnit;
 import javafx.application.Platform;
 import javafx.collections.ObservableList;
 import javafx.geometry.Rectangle2D;
@@ -38,15 +37,15 @@
 import javafx.stage.Screen;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import test.util.Util;
 
+@Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
 public class MultipleScreensTest {
     static CountDownLatch startupLatch = new CountDownLatch(1);
     static ObservableList<Screen> screens;
@@ -55,16 +54,16 @@ public class MultipleScreensTest {
 
     Stage stage;
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() throws Exception {
         Platform.setImplicitExit(false);
         Util.startup(startupLatch, startupLatch::countDown);
 
         // Get primary screen and list of all screens, skip tests if there is only one
         primaryScreen = Screen.getPrimary();
-        assertNotNull("Primary screen is null", primaryScreen);
+        assertNotNull(primaryScreen, "Primary screen is null");
         screens = Screen.getScreens();
-        assertNotNull("List of screens is null", screens);
+        assertNotNull(screens, "List of screens is null");
         assumeTrue(screens.size() > 1);
 
         // Get a screen other than the primary screen
@@ -72,20 +71,20 @@ public static void initFX() throws Exception {
                 .filter(s -> !primaryScreen.equals(s))
                 .findFirst()
                 .orElseThrow();
-        assertNotNull("Secondary screen is null", otherScreen);
+        assertNotNull(otherScreen, "Secondary screen is null");
     }
 
-    @AfterClass
+    @AfterAll
     public static void exitFX() {
         Util.shutdown();
     }
 
-    @Before
+    @BeforeEach
     public void initTest() {
         Util.runAndWait(() -> stage = new Stage());
     }
 
-    @After
+    @AfterEach
     public void cleanupTest() {
         if (stage != null) {
             Platform.runLater(stage::hide);
@@ -96,7 +95,7 @@ public void cleanupTest() {
      * Test all four combinations of [primary,secondary]Screen x [with/without]Scene
      */
     private void createAndShowStage(Screen screen, boolean hasScene) throws Exception {
-        assertNotNull("Stage is null", stage);
+        assertNotNull(stage, "Stage is null");
 
         final CountDownLatch shownLatch = new CountDownLatch(1);
 
@@ -119,24 +118,23 @@ private void createAndShowStage(Screen screen, boolean hasScene) throws Exceptio
         Util.waitForLatch(shownLatch, 5, "Stage failed to show");
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void showStageNoScenePrimaryScreen() throws Exception {
         createAndShowStage(primaryScreen, false);
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void showStageNoSceneOtherScreen() throws Exception {
         createAndShowStage(otherScreen, false);
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void showStageScenePrimaryScreen() throws Exception {
         createAndShowStage(primaryScreen, true);
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void showStageSceneOtherScreen() throws Exception {
         createAndShowStage(otherScreen, true);
     }
-
 }
diff --git a/tests/system/src/test/java/test/javafx/stage/NestedEventLoopPlatformExitTest.java b/tests/system/src/test/java/test/javafx/stage/NestedEventLoopPlatformExitTest.java
index a9d2af0af36..21df59f07fc 100644
--- a/tests/system/src/test/java/test/javafx/stage/NestedEventLoopPlatformExitTest.java
+++ b/tests/system/src/test/java/test/javafx/stage/NestedEventLoopPlatformExitTest.java
@@ -26,17 +26,20 @@
 package test.javafx.stage;
 
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Group;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import test.util.Util;
 
+@Timeout(value=20000, unit=TimeUnit.MILLISECONDS)
 public class NestedEventLoopPlatformExitTest {
 
     // Used to launch the application before running any test
@@ -57,23 +60,23 @@ public static class TestApp extends Application {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() throws InterruptedException {
         Util.launch(launchLatch, TestApp.class);
     }
 
     // Verify that Platform.exit can be called while the NestedEventLoop is
     // running
-    @Test(timeout = 20000)
+    @Test
     public void testPlatformExitWithNestedEventLoop() {
         Util.runAndWait(
             () -> {
                 final long nestedLoopEventKey = 1024L;
-                Assert.assertFalse(Platform.isNestedLoopRunning());
+                Assertions.assertFalse(Platform.isNestedLoopRunning());
                 Platform.enterNestedEventLoop(nestedLoopEventKey);
             },
             () -> {
-                Assert.assertTrue(Platform.isNestedLoopRunning());
+                Assertions.assertTrue(Platform.isNestedLoopRunning());
                 Platform.exit();
             }
         );
diff --git a/tests/system/src/test/java/test/javafx/stage/NestedEventLoopTest.java b/tests/system/src/test/java/test/javafx/stage/NestedEventLoopTest.java
index 8a7076f9b14..3a846c40453 100644
--- a/tests/system/src/test/java/test/javafx/stage/NestedEventLoopTest.java
+++ b/tests/system/src/test/java/test/javafx/stage/NestedEventLoopTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,25 +25,22 @@
 
 package test.javafx.stage;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Group;
 import javafx.scene.Scene;
 import javafx.scene.paint.Color;
 import javafx.stage.Stage;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 /**
@@ -82,22 +79,24 @@ public static class MyApp extends Application {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setupOnce() {
         Util.launch(launchLatch, MyApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardownOnce() {
         Util.shutdown();
     }
 
     // Verify that we cannot enter a nested event loop on a thread other than
     // the FX Application thread
-    @Test (expected=IllegalStateException.class)
+    @Test
     public void testMustRunOnAppThread() {
-        assertFalse(Platform.isFxApplicationThread());
-        Platform.enterNestedEventLoop(new Object());
+        assertThrows(IllegalStateException.class, () -> {
+            assertFalse(Platform.isFxApplicationThread());
+            Platform.enterNestedEventLoop(new Object());
+        });
     }
 
     // Verify that we can enter and exit a nested event loop
@@ -124,42 +123,50 @@ public void testMustRunOnAppThread() {
     }
 
     // Verify that we cannot enter a nested event loop with the same key twice
-    @Test (expected=IllegalArgumentException.class)
+    @Test
     public void testUniqueKeyRequired() {
-        final Object key = new Object();
-        Util.runAndWait(
-                () -> Platform.enterNestedEventLoop(key),
-                () -> Platform.enterNestedEventLoop(key),
-                () -> Platform.exitNestedEventLoop(key, null)
-        );
+        assertThrows(IllegalArgumentException.class, () -> {
+            final Object key = new Object();
+            Util.runAndWait(
+                    () -> Platform.enterNestedEventLoop(key),
+                    () -> Platform.enterNestedEventLoop(key),
+                    () -> Platform.exitNestedEventLoop(key, null)
+            );
+        });
     }
 
     // Verify that we cannot enter a nested event loop with a null key
-    @Test (expected=NullPointerException.class)
+    @Test
     public void testNonNullKeyRequired() {
-        Util.runAndWait(
+        assertThrows(NullPointerException.class, () -> {
+            Util.runAndWait(
                 () -> Platform.enterNestedEventLoop(null)
-        );
+            );
+        });
     }
 
     // Verify that we cannot exit a nested event loop with a null key
-    @Test (expected=NullPointerException.class)
+    @Test
     public void testNonNullExitKeyRequired() {
-        Util.runAndWait(
+        assertThrows(NullPointerException.class, () -> {
+            Util.runAndWait(
                 () -> Platform.enterNestedEventLoop("validKey"),
                 () -> Platform.exitNestedEventLoop(null, null),
                 () -> Platform.exitNestedEventLoop("validKey", null)
-        );
+            );
+        });
     }
 
     // Verify that we cannot exit a nested event loop with a key that has not been used
-    @Test (expected=IllegalArgumentException.class)
+    @Test
     public void testExitLoopKeyHasBeenRegistered() {
-        Util.runAndWait(
+        assertThrows(IllegalArgumentException.class, () -> {
+            Util.runAndWait(
                 () -> Platform.enterNestedEventLoop("validKey"),
                 () -> Platform.exitNestedEventLoop("invalidKey", null),
                 () -> Platform.exitNestedEventLoop("validKey", null)
-        );
+            );
+        });
     }
 
     // Verify that we can enter and exit multiple nested event loops, in the order they are started
diff --git a/tests/system/src/test/java/test/javafx/stage/RestoreStagePositionTest.java b/tests/system/src/test/java/test/javafx/stage/RestoreStagePositionTest.java
index 10a3406840e..6995c5ed879 100644
--- a/tests/system/src/test/java/test/javafx/stage/RestoreStagePositionTest.java
+++ b/tests/system/src/test/java/test/javafx/stage/RestoreStagePositionTest.java
@@ -24,11 +24,9 @@
  */
 package test.javafx.stage;
 
-import static org.junit.Assume.assumeTrue;
-
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;
@@ -36,14 +34,11 @@
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
-
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import com.sun.javafx.PlatformUtil;
-
 import test.util.Util;
 
 public class RestoreStagePositionTest {
@@ -77,12 +72,12 @@ public void start(Stage primaryStage) throws Exception {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardown() {
         Util.shutdown();
     }
@@ -93,15 +88,15 @@ public void testUfullscreenPosition() throws Exception {
         assumeTrue(!PlatformUtil.isMac());
 
         Thread.sleep(200);
-        Assert.assertTrue(stage.isShowing());
-        Assert.assertFalse(stage.isFullScreen());
+        Assertions.assertTrue(stage.isShowing());
+        Assertions.assertFalse(stage.isFullScreen());
 
         double x = stage.getX();
         double y = stage.getY();
 
         Platform.runLater(() -> stage.setFullScreen(true));
         Thread.sleep(400);
-        Assert.assertTrue(stage.isFullScreen());
+        Assertions.assertTrue(stage.isFullScreen());
         CountDownLatch latch = new CountDownLatch(2);
 
         ChangeListener<Number> listenerX = (observable, oldValue, newValue) -> {
@@ -121,8 +116,8 @@ public void testUfullscreenPosition() throws Exception {
         stage.xProperty().removeListener(listenerX);
         stage.xProperty().removeListener(listenerY);
 
-        Assert.assertEquals("Window was moved", x, stage.getX(), 0.1);
-        Assert.assertEquals("Window was moved", y, stage.getY(), 0.1);
+        Assertions.assertEquals(x, stage.getX(), 0.1, "Window was moved");
+        Assertions.assertEquals(y, stage.getY(), 0.1, "Window was moved");
     }
 
     @Test
@@ -131,15 +126,15 @@ public void testDemaximizedPosition() throws Exception {
         assumeTrue(!PlatformUtil.isMac());
 
         Thread.sleep(200);
-        Assert.assertTrue(stage.isShowing());
-        Assert.assertFalse(stage.isMaximized());
+        Assertions.assertTrue(stage.isShowing());
+        Assertions.assertFalse(stage.isMaximized());
 
         double x = stage.getX();
         double y = stage.getY();
 
         Platform.runLater(() -> stage.setMaximized(true));
         Thread.sleep(200);
-        Assert.assertTrue(stage.isMaximized());
+        Assertions.assertTrue(stage.isMaximized());
         CountDownLatch latch = new CountDownLatch(2);
 
         ChangeListener<Number> listenerX = (observable, oldValue, newValue) -> {
@@ -159,7 +154,7 @@ public void testDemaximizedPosition() throws Exception {
         stage.xProperty().removeListener(listenerX);
         stage.xProperty().removeListener(listenerY);
 
-        Assert.assertEquals("Window was moved", x, stage.getX(), 0.1);
-        Assert.assertEquals("Window was moved", y, stage.getY(), 0.1);
+        Assertions.assertEquals(x, stage.getX(), 0.1, "Window was moved");
+        Assertions.assertEquals(y, stage.getY(), 0.1, "Window was moved");
     }
 }
diff --git a/tests/system/src/test/java/test/javafx/stage/ScreenTest.java b/tests/system/src/test/java/test/javafx/stage/ScreenTest.java
index 431939d02b6..5f46f20cb49 100644
--- a/tests/system/src/test/java/test/javafx/stage/ScreenTest.java
+++ b/tests/system/src/test/java/test/javafx/stage/ScreenTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,21 +25,17 @@
 
 package test.javafx.stage;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assume.assumeTrue;
-
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.Platform;
 import javafx.collections.ListChangeListener.Change;
 import javafx.collections.ObservableList;
 import javafx.stage.Screen;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 public class ScreenTest {
@@ -55,7 +51,7 @@ public class ScreenTest {
      * do get one on Mac, but this isn't guaranteed behavior, so this
      * test might or might not be effective.
      */
-    @BeforeClass
+    @BeforeAll
     public static void initFX() throws Exception {
         Platform.setImplicitExit(false);
         Util.startup(startupLatch, () -> {
@@ -72,7 +68,7 @@ public static void initFX() throws Exception {
         });
     }
 
-    @AfterClass
+    @AfterAll
     public static void exitFX() {
         Util.shutdown();
     }
@@ -80,7 +76,7 @@ public static void exitFX() {
     @Test
     public void testScreensNotEmpty() {
         assertNotNull(screens);
-        assertFalse("Screens list is empty", screens.size() == 0);
+        assertFalse(screens.size() == 0, "Screens list is empty");
     }
 
     @Test
@@ -95,6 +91,6 @@ public void testScreensNotEmptyInListener() {
             System.err.println("Skipping test: Screens listener not called");
         }
         assumeTrue(screensListenerCalled);
-        assertFalse("Screens list is empty in listener", screensSizeIsZero);
+        assertFalse(screensSizeIsZero, "Screens list is empty in listener");
     }
 }
diff --git a/tests/system/src/test/java/test/javafx/stage/ShowAndWaitTest.java b/tests/system/src/test/java/test/javafx/stage/ShowAndWaitTest.java
index f0794ec01b8..d0b286a316e 100644
--- a/tests/system/src/test/java/test/javafx/stage/ShowAndWaitTest.java
+++ b/tests/system/src/test/java/test/javafx/stage/ShowAndWaitTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,22 +25,20 @@
 
 package test.javafx.stage;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 import static test.util.Util.TIMEOUT;
-
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
+import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
-
 import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
 import javafx.application.Application;
@@ -56,24 +54,19 @@
 import javafx.stage.StageShim;
 import javafx.stage.Window;
 import javafx.util.Duration;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import junit.framework.AssertionFailedError;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import test.util.Util;
 
 /**
  * Test program for showAndWait functionality.
  */
-@RunWith(Parameterized.class)
-public class ShowAndWaitTest {
+public final class ShowAndWaitTest {
 
     // Maximum number of stages
     private static final int MAX_STAGES = 10;
@@ -130,19 +123,16 @@ private TestStage(Modality modality, Window owner) {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setupOnce() {
         Util.launch(launchLatch, MyApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardownOnce() {
         Util.shutdown();
     }
 
-    // Modality of the secondary stage(s) for a particular tests
-    final Modality modality;
-
     // Set of stages being tested so that they can be hidden at the
     // end of of a failing test
     private HashSet<Stage> stages = new HashSet<Stage>();
@@ -151,26 +141,22 @@ public static void teardownOnce() {
     private Stage tmpStage1 = null;
     private Stage tmpStage2 = null;
 
-    @Parameters
-    public static Collection getParams() {
-        return Arrays.asList(new Object[][] {
-            { Modality.NONE },
-            { Modality.WINDOW_MODAL },
-            { Modality.APPLICATION_MODAL },
-        });
-    }
-
-    public ShowAndWaitTest(Modality modality) {
-        this.modality = modality;
+    // Modality of the secondary stage(s) for a particular tests
+    private static Collection<Modality> parameters() {
+        return List.of(
+            Modality.NONE,
+            Modality.WINDOW_MODAL,
+            Modality.APPLICATION_MODAL
+        );
     }
 
-    @Before
+    @BeforeEach
     public void setupEach() {
         assertNotNull(myApp);
         assertNotNull(myApp.primaryStage);
     }
 
-    @After
+    @AfterEach
     public void teardownEach() {
         for (final Stage stage : stages) {
             if (stage.isShowing()) {
@@ -195,14 +181,15 @@ public void teardownEach() {
     //
     // Consider moving to the setupOnce method.
     private static boolean test1Run = false;
-    public void ensureTest1() {
+    public void ensureTest1(Modality modality) {
         if (!test1Run) {
-            test1();
+            test1(modality);
         }
     }
 
-    @Test
-    public void test1() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void test1(Modality modality) {
         if (test1Run) {
             return;
         }
@@ -215,11 +202,9 @@ public void test1() {
             assertFalse(myApp.primaryStage.isShowing());
 
             // Verify that we cannot call showAndWait on the primaryStage
-            try {
+            assertThrows(IllegalStateException.class, () -> {
                 myApp.primaryStage.showAndWait();
-                throw new AssertionFailedError("Expected IllegalStateException was not thrown");
-            } catch (IllegalStateException ex) {
-            }
+            });
 
             myApp.primaryStage.show();
         });
@@ -227,60 +212,70 @@ public void test1() {
 
     // Verify that we cannot construct a stage on a thread other than
     // the FX Application thread
-    @Test (expected=IllegalStateException.class)
-    public void testConstructWrongThread() {
-        ensureTest1();
-        assertFalse(Platform.isFxApplicationThread());
-
-        // The following should throw IllegalStateException
-        tmpStage1 = new TestStage(modality);
-        stages.add(tmpStage1);
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testConstructWrongThread(Modality modality) {
+        assertThrows(IllegalStateException.class, () -> {
+            ensureTest1(modality);
+            assertFalse(Platform.isFxApplicationThread());
+
+            // The following should throw IllegalStateException
+            tmpStage1 = new TestStage(modality);
+            stages.add(tmpStage1);
+        });
     }
 
 
     // Verify that we cannot call showAndWait on a thread other than
     // the FX Application thread
-    @Test (expected=IllegalStateException.class)
-    public void testShowWaitWrongThread() {
-        ensureTest1();
-        assertFalse(Platform.isFxApplicationThread());
-        Util.runAndWait(() -> {
-            tmpStage1 = new TestStage(modality);
-            stages.add(tmpStage1);
-            assertFalse(StageShim.isPrimary(tmpStage1));
-            assertFalse(tmpStage1.isShowing());
-        });
-        assertNotNull(tmpStage1);
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testShowWaitWrongThread(Modality modality) {
+        assertThrows(IllegalStateException.class, () -> {
+            ensureTest1(modality);
+            assertFalse(Platform.isFxApplicationThread());
+            Util.runAndWait(() -> {
+                tmpStage1 = new TestStage(modality);
+                stages.add(tmpStage1);
+                assertFalse(StageShim.isPrimary(tmpStage1));
+                assertFalse(tmpStage1.isShowing());
+            });
+            assertNotNull(tmpStage1);
 
-        // The following should throw IllegalStateException
-        tmpStage1.showAndWait();
+            // The following should throw IllegalStateException
+            tmpStage1.showAndWait();
+        });
     }
 
     // Verify that we cannot call showAndWait on a visible stage
-    @Test (expected=IllegalStateException.class)
-    public void testVisibleThrow() {
-        ensureTest1();
-        Util.runAndWait(() -> {
-            tmpStage1 = new TestStage(modality);
-            stages.add(tmpStage1);
-            assertFalse(StageShim.isPrimary(tmpStage1));
-            assertFalse(tmpStage1.isShowing());
-            tmpStage1.show();
-            assertTrue(tmpStage1.isShowing());
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testVisibleThrow(Modality modality) {
+        assertThrows(IllegalStateException.class, () -> {
+            ensureTest1(modality);
+            Util.runAndWait(() -> {
+                tmpStage1 = new TestStage(modality);
+                stages.add(tmpStage1);
+                assertFalse(StageShim.isPrimary(tmpStage1));
+                assertFalse(tmpStage1.isShowing());
+                tmpStage1.show();
+                assertTrue(tmpStage1.isShowing());
 
-            try {
-                // The following should throw IllegalStateException
-                tmpStage1.showAndWait();
-            } finally {
-                tmpStage1.hide();
-            }
+                try {
+                    // The following should throw IllegalStateException
+                    tmpStage1.showAndWait();
+                } finally {
+                    tmpStage1.hide();
+                }
+            });
         });
     }
 
     // Verify that show returns right away; hide the stage after 500 msec
-    @Test
-    public void testNotBlocking() {
-        ensureTest1();
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testNotBlocking(Modality modality) {
+        ensureTest1(modality);
 
         final AtomicBoolean stageShowReturned = new AtomicBoolean(false);
         final AtomicBoolean hideActionReached = new AtomicBoolean(false);
@@ -313,9 +308,10 @@ public void testNotBlocking() {
     // Verify that the nested event loop exits immediately after
     // the event handler that calls hide returns, before running
     // the next Runnable.
-    @Test
-    public void testSingle() {
-        ensureTest1();
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSingle(Modality modality) {
+        ensureTest1(modality);
 
         final AtomicBoolean stage1ShowReturned = new AtomicBoolean(false);
         final AtomicBoolean hide1EventReached = new AtomicBoolean(false);
@@ -357,9 +353,10 @@ public void testSingle() {
     // the event handler that calls hide returns, before running
     // the next Runnable (called from rShow1 after showAndWait returns).
 
-    @Test
-    public void testSingle_Chained() {
-        ensureTest1();
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSingle_Chained(Modality modality) {
+        ensureTest1(modality);
 
         final AtomicBoolean stage1ShowReturned = new AtomicBoolean(false);
         final AtomicBoolean hide1EventReached = new AtomicBoolean(false);
@@ -397,9 +394,10 @@ public void testSingle_Chained() {
 
     // Verify two nested event loops, with the stages being hidden in the
     // reverse order that they are shown
-    @Test
-    public void testTwoNested() {
-        ensureTest1();
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testTwoNested(Modality modality) {
+        ensureTest1(modality);
 
         final AtomicBoolean stage1ShowReturned = new AtomicBoolean(false);
         final AtomicBoolean hide1EventReached = new AtomicBoolean(false);
@@ -462,9 +460,10 @@ public void testTwoNested() {
 
     // Verify two nested event loops, with the stages being hidden in the
     // same order that they are shown
-    @Test
-    public void testTwoInterleaved() {
-        ensureTest1();
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testTwoInterleaved(Modality modality) {
+        ensureTest1(modality);
 
         final AtomicBoolean stage1ShowReturned = new AtomicBoolean(false);
         final AtomicBoolean hide1EventReached = new AtomicBoolean(false);
@@ -527,9 +526,10 @@ public void testTwoInterleaved() {
 
     // Verify multiple nested event loops, with the stages being hidden in the
     // reverse order that they are shown
-    @Test
-    public void testMultipleNested() {
-        ensureTest1();
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testMultipleNested(Modality modality) {
+        ensureTest1(modality);
 
         final int N = MAX_STAGES;
         final Stage[] tmpStage = new Stage[N];
@@ -592,9 +592,10 @@ public void testMultipleNested() {
 
     // Verify multiple nested event loops, with the stages being hidden in the
     // reverse order that they are shown
-    @Test
-    public void testMultipleInterleaved() {
-        ensureTest1();
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testMultipleInterleaved(Modality modality) {
+        ensureTest1(modality);
 
         final int N = MAX_STAGES;
         final Stage[] tmpStage = new Stage[N];
@@ -657,9 +658,10 @@ public void testMultipleInterleaved() {
 
     // Verify that Stage.showAndWait throws an exception if called from an
     // animation timeline.
-    @Test
-    public void testTimeline() throws Throwable {
-        ensureTest1();
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testTimeline(Modality modality) throws Throwable {
+        ensureTest1(modality);
 
         final CountDownLatch animationDone = new CountDownLatch(1);
         final AtomicReference<Throwable> error = new AtomicReference<>(null);
@@ -703,9 +705,10 @@ public void testTimeline() throws Throwable {
 
     // Verify that Alert.showAndWait throws an exception if called from an
     // animation timeline.
-    @Test
-    public void testTimelineDialog() throws Throwable {
-        ensureTest1();
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testTimelineDialog(Modality modality) throws Throwable {
+        ensureTest1(modality);
 
         final CountDownLatch animationDone = new CountDownLatch(1);
         final AtomicReference<Throwable> error = new AtomicReference<>(null);
@@ -751,11 +754,12 @@ public void testTimelineDialog() throws Throwable {
 
     // Verify that printing throws an exception if called from an
     // animation timeline.
-    @Test
-    public void testTimelinePrint() throws Throwable {
-        assumeNotNull(PrinterJob.createPrinterJob());
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testTimelinePrint(Modality modality) throws Throwable {
+        Assumptions.assumeTrue(PrinterJob.createPrinterJob() != null);
 
-        ensureTest1();
+        ensureTest1(modality);
 
         final CountDownLatch animationDone = new CountDownLatch(1);
         final AtomicReference<Throwable> error = new AtomicReference<>(null);
@@ -803,5 +807,4 @@ public void testTimelinePrint() throws Throwable {
             throw t;
         }
     }
-
 }
diff --git a/tests/system/src/test/java/test/javafx/stage/StageAtTopPositionTest.java b/tests/system/src/test/java/test/javafx/stage/StageAtTopPositionTest.java
index 41591737a6f..d0360d54c53 100644
--- a/tests/system/src/test/java/test/javafx/stage/StageAtTopPositionTest.java
+++ b/tests/system/src/test/java/test/javafx/stage/StageAtTopPositionTest.java
@@ -25,11 +25,9 @@
 
 package test.javafx.stage;
 
-import static org.junit.Assume.assumeTrue;
-
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;
@@ -38,14 +36,11 @@
 import javafx.stage.Screen;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
-
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import com.sun.javafx.PlatformUtil;
-
 import test.util.Util;
 
 public class StageAtTopPositionTest {
@@ -78,12 +73,12 @@ public void start(Stage primaryStage) throws Exception {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardown() {
         Util.shutdown();
     }
@@ -94,8 +89,8 @@ public void testMoveToTopPosition() throws Exception {
         assumeTrue(PlatformUtil.isMac());
 
         Thread.sleep(200);
-        Assert.assertTrue(stage.isShowing());
-        Assert.assertFalse(stage.isFullScreen());
+        Assertions.assertTrue(stage.isShowing());
+        Assertions.assertFalse(stage.isFullScreen());
 
         final double minY = Screen.getPrimary().getVisualBounds().getMinY(); // Mac's system menubar height
 
@@ -110,13 +105,13 @@ public void testMoveToTopPosition() throws Exception {
         // move once to y=0, gets moved to yMin
         Platform.runLater(() -> stage.setY(0));
         Thread.sleep(200);
-        Assert.assertEquals("Window was moved once", minY, stage.getY(), 0.1);
+        Assertions.assertEquals(minY, stage.getY(), 0.1, "Window was moved once");
 
         // move again to y=0, remains at yMin
         Platform.runLater(() -> stage.setY(0));
         latch.await(5, TimeUnit.SECONDS);
         stage.xProperty().removeListener(listenerY);
 
-        Assert.assertEquals("Window was moved twice", minY, stage.getY(), 0.1);
+        Assertions.assertEquals(minY, stage.getY(), 0.1, "Window was moved twice");
     }
 }
diff --git a/tests/system/src/test/java/test/launchertest/JarLauncherTest.java b/tests/system/src/test/java/test/launchertest/JarLauncherTest.java
index 152b06507ae..0fdf4255351 100644
--- a/tests/system/src/test/java/test/launchertest/JarLauncherTest.java
+++ b/tests/system/src/test/java/test/launchertest/JarLauncherTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,22 +25,25 @@
 
 package test.launchertest;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+import static test.launchertest.Constants.ERROR_NONE;
+import static test.launchertest.Constants.ERROR_UNEXPECTED_EXCEPTION;
 import java.util.ArrayList;
-import junit.framework.AssertionFailedError;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-import static test.launchertest.Constants.*;
+import java.util.concurrent.TimeUnit;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 /**
  * Unit test for legacy FX .jar support in Java 8 (and later) launcher
  */
+@Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
 public class JarLauncherTest {
 
     private final String testAppName = System.getProperty("launchertest.testapp1.jar");
     private final int testExitCode = ERROR_NONE;
 
-    @Test (timeout = 15000)
+    @Test
     public void testJarLauncher() throws Exception {
         assertNotNull(testAppName);
         final ArrayList<String> cmd =
@@ -60,24 +63,23 @@ public void testJarLauncher() throws Exception {
             case 0:// SUCCESS
             case ERROR_NONE:
                 if (retVal != testExitCode) {
-                    throw new AssertionFailedError(testAppName
+                    fail(testAppName
                             + ": Unexpected 'success' exit; expected:"
                             + testExitCode + " was:" + retVal);
                 }
                 return;
 
             case 1:
-                throw new AssertionFailedError(testAppName
+                fail(testAppName
                         + ": unable to launch java application");
 
             case ERROR_UNEXPECTED_EXCEPTION:
-                throw new AssertionFailedError(testAppName
+                fail(testAppName
                 + ": unexpected exception");
 
             default:
-                throw new AssertionFailedError(testAppName
+                fail(testAppName
                         + ": Unexpected error exit: " + retVal);
         }
     }
-
 }
diff --git a/tests/system/src/test/java/test/launchertest/MainLauncherTest.java b/tests/system/src/test/java/test/launchertest/MainLauncherTest.java
index eb6d2db1629..b51319387f6 100644
--- a/tests/system/src/test/java/test/launchertest/MainLauncherTest.java
+++ b/tests/system/src/test/java/test/launchertest/MainLauncherTest.java
@@ -25,34 +25,32 @@
 
 package test.launchertest;
 
-import com.sun.javafx.PlatformUtil;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import static test.launchertest.Constants.*;
 import java.util.ArrayList;
 import java.util.Collection;
-import junit.framework.AssertionFailedError;
-import org.junit.runners.Parameterized.Parameters;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.Test;
-
-import static test.launchertest.Constants.*;
-import static org.junit.Assume.*;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import com.sun.javafx.PlatformUtil;
 
 /**
  * Unit test for FX support in Java 8 launcher
  */
-@RunWith(Parameterized.class)
-public class MainLauncherTest {
+@Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
+public final class MainLauncherTest {
 
     private static final String className = MainLauncherTest.class.getName();
     private static final String pkgName = className.substring(0, className.lastIndexOf("."));
 
-    private static Collection params = null;
-
     public static class TestData {
-        final String appName;
-        final String pldrName;
+        final String testAppName;
+        final String testPldrName;
         final boolean headless;
-        final int exitCode;
+        final int testExitCode;
 
         public TestData(String appName) {
             this(appName, 0);
@@ -71,80 +69,60 @@ public TestData(String appName, boolean headless, int exitCode) {
         }
 
         public TestData(String appName, String pldrName, boolean headless, int exitCode) {
-            this.appName = pkgName + "." + appName;
-            this.pldrName = pldrName == null ? null : pkgName + "." +  pldrName;
+            this.testAppName = pkgName + "." + appName;
+            this.testPldrName = pldrName == null ? null : pkgName + "." +  pldrName;
             this.headless = headless;
-            this.exitCode = exitCode;
+            this.testExitCode = exitCode;
         }
     }
 
-    private static final TestData[] testData = {
-        new TestData("TestApp"),
-        new TestData("TestAppNoMain"),
-        new TestData("TestNotApplication"),
-        new TestData("TestStartupApp1", ERROR_NONE),
-        new TestData("TestStartupApp2", ERROR_NONE),
-        new TestData("TestStartupAppNoMain", ERROR_NONE),
-        new TestData("TestStartupJFXPanel", ERROR_NONE),
-        new TestData("TestStartupNotApplication", ERROR_NONE),
-        new TestData("TestAppThreadCheck", ERROR_NONE),
-        new TestData("TestAppNoMainThreadCheck", ERROR_NONE),
-        new TestData("TestNotApplicationThreadCheck", ERROR_NONE),
-        new TestData("TestAppThreadCheck", "TestPreloader", ERROR_NONE),
-        new TestData("TestAppNoMainThreadCheck", "TestPreloader", ERROR_NONE),
-        new TestData("TestAppCCL", ERROR_NONE),
-        new TestData("TestAppCCL1", ERROR_NONE),
-        new TestData("TestAppCCL2", ERROR_NONE),
-        new TestData("TestAppNoMainCCL", ERROR_NONE),
-        new TestData("TestAppNoMainCCL2", ERROR_NONE),
-        new TestData("TestAppNoMainCCL3", ERROR_NONE),
-        new TestData("TestNotApplicationCCL", ERROR_NONE),
-        new TestData("TestHeadlessApp", true, ERROR_NONE),
-        new TestData("TestAWTAppDaemon", ERROR_NONE),
-        new TestData("TestAppDaemon", ERROR_NONE),
-        new TestData("TestAppPlatformExitAWT", ERROR_NONE),
+    private static Collection<TestData> parameters() {
+        return List.of(
+            new TestData("TestApp"),
+            new TestData("TestAppNoMain"),
+            new TestData("TestNotApplication"),
+            new TestData("TestStartupApp1", ERROR_NONE),
+            new TestData("TestStartupApp2", ERROR_NONE),
+            new TestData("TestStartupAppNoMain", ERROR_NONE),
+            new TestData("TestStartupJFXPanel", ERROR_NONE),
+            new TestData("TestStartupNotApplication", ERROR_NONE),
+            new TestData("TestAppThreadCheck", ERROR_NONE),
+            new TestData("TestAppNoMainThreadCheck", ERROR_NONE),
+            new TestData("TestNotApplicationThreadCheck", ERROR_NONE),
+            new TestData("TestAppThreadCheck", "TestPreloader", ERROR_NONE),
+            new TestData("TestAppNoMainThreadCheck", "TestPreloader", ERROR_NONE),
+            new TestData("TestAppCCL", ERROR_NONE),
+            new TestData("TestAppCCL1", ERROR_NONE),
+            new TestData("TestAppCCL2", ERROR_NONE),
+            new TestData("TestAppNoMainCCL", ERROR_NONE),
+            new TestData("TestAppNoMainCCL2", ERROR_NONE),
+            new TestData("TestAppNoMainCCL3", ERROR_NONE),
+            new TestData("TestNotApplicationCCL", ERROR_NONE),
+            new TestData("TestHeadlessApp", true, ERROR_NONE),
+            new TestData("TestAWTAppDaemon", ERROR_NONE),
+            new TestData("TestAppDaemon", ERROR_NONE),
+            new TestData("TestAppPlatformExitAWT", ERROR_NONE)
+        );
     };
 
-    @Parameters
-    public static Collection getParams() {
-        if (params == null) {
-            params = new ArrayList();
-            for (TestData data : testData) {
-                params.add(new TestData[] { data });
-            }
-        }
-        return params;
-    }
-
-    private final String testAppName;
-    private final String testPldrName;
-    private final boolean headless;
-    private final int testExitCode;
-
-    public MainLauncherTest(TestData testData) {
-        this.testAppName = testData.appName;
-        this.testPldrName = testData.pldrName;
-        this.headless = testData.headless;
-        this.testExitCode = testData.exitCode;
-    }
-
-    @Test (timeout = 15000)
-    public void testMainLauncher() throws Exception {
-        if (headless) {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testMainLauncher(TestData d) throws Exception {
+        if (d.headless) {
             // Headless tests currently only run on Linux
             assumeTrue(PlatformUtil.isLinux());
         }
 
         final ArrayList<String> cmd =
                 test.util.Util.createApplicationLaunchCommand(
-                        testAppName,
-                        testPldrName,
+                        d.testAppName,
+                        d.testPldrName,
                         null
                         );
 
         final ProcessBuilder builder = new ProcessBuilder(cmd);
 
-        if (headless) {
+        if (d.headless) {
             // Set DISPLAY variable to empty to run in headless mode on Linux
             builder.environment().put("DISPLAY", "");
         }
@@ -155,106 +133,105 @@ public void testMainLauncher() throws Exception {
         switch (retVal) {
             case 0:// SUCCESS
             case ERROR_NONE:
-                if (retVal != testExitCode) {
-                    throw new AssertionFailedError(testAppName
+                if (retVal != d.testExitCode) {
+                    fail(d.testAppName
                             + ": Unexpected 'success' exit; expected:"
-                            + testExitCode + " was:" + retVal);
+                            + d.testExitCode + " was:" + retVal);
                 }
                 return;
             case 1:
-                throw new AssertionFailedError(testAppName
+                fail(d.testAppName
                         + ": unable to launch java application");
             case ERROR_TOOLKIT_NOT_RUNNING:
-                throw new AssertionFailedError(testAppName
+                fail(d.testAppName
                         + ": Toolkit not running prior to loading application class");
             case ERROR_TOOLKIT_IS_RUNNING:
-                throw new AssertionFailedError(testAppName
+                fail(d.testAppName
                         + ": Toolkit is running but should not be");
 
             case ERROR_INIT_BEFORE_MAIN:
-                throw new AssertionFailedError(testAppName
+                fail(d.testAppName
                         + ": main method not called before init");
             case ERROR_START_BEFORE_MAIN:
-                throw new AssertionFailedError(testAppName
+                fail(d.testAppName
                         + ": main method not called before start");
             case ERROR_STOP_BEFORE_MAIN:
-                throw new AssertionFailedError(testAppName
+                fail(d.testAppName
                         + ": main method not called before stop");
 
             case ERROR_START_BEFORE_INIT:
-                throw new AssertionFailedError(testAppName
+                fail(d.testAppName
                         + ": init method not called before start");
             case ERROR_STOP_BEFORE_INIT:
-                throw new AssertionFailedError(testAppName
+                fail(d.testAppName
                         + ": init method not called before stop");
 
             case ERROR_STOP_BEFORE_START:
-                throw new AssertionFailedError(testAppName
+                fail(d.testAppName
                         + ": start method not called before stop");
 
             case ERROR_CLASS_INIT_WRONG_THREAD:
-                throw new AssertionFailedError(testAppName
+                fail(d.testAppName
                         + ": class initialization called on wrong thread");
             case ERROR_MAIN_WRONG_THREAD:
-                throw new AssertionFailedError(testAppName
+                fail(d.testAppName
                         + ": main called on wrong thread");
             case ERROR_CONSTRUCTOR_WRONG_THREAD:
-                throw new AssertionFailedError(testAppName
+                fail(d.testAppName
                         + ": constructor called on wrong thread");
             case ERROR_INIT_WRONG_THREAD:
-                throw new AssertionFailedError(testAppName
+                fail(d.testAppName
                         + ": init called on wrong thread");
             case ERROR_START_WRONG_THREAD:
-                throw new AssertionFailedError(testAppName
+                fail(d.testAppName
                         + ": start called on wrong thread");
             case ERROR_STOP_WRONG_THREAD:
-                throw new AssertionFailedError(testAppName
+                fail(d.testAppName
                         + ": stop called on wrong thread");
 
             case ERROR_PRELOADER_CLASS_INIT_WRONG_THREAD:
-                throw new AssertionFailedError(testAppName
+                fail(d.testAppName
                         + ": preloader class initialization called on wrong thread");
             case ERROR_PRELOADER_CONSTRUCTOR_WRONG_THREAD:
-                throw new AssertionFailedError(testAppName
+                fail(d.testAppName
                         + ": preloader constructor called on wrong thread");
             case ERROR_PRELOADER_INIT_WRONG_THREAD:
-                throw new AssertionFailedError(testAppName
+                fail(d.testAppName
                         + ": preloader init called on wrong thread");
             case ERROR_PRELOADER_START_WRONG_THREAD:
-                throw new AssertionFailedError(testAppName
+                fail(d.testAppName
                         + ": preloader start called on wrong thread");
             case ERROR_PRELOADER_STOP_WRONG_THREAD:
-                throw new AssertionFailedError(testAppName
+                fail(d.testAppName
                         + ": preloader stop called on wrong thread");
 
             case ERROR_CONSTRUCTOR_WRONG_CCL:
-                throw new AssertionFailedError(testAppName
+                fail(d.testAppName
                         + ": constructor has wrong CCL");
             case ERROR_START_WRONG_CCL:
-                throw new AssertionFailedError(testAppName
+                fail(d.testAppName
                         + ": start has wrong CCL");
             case ERROR_LAUNCH_SUCCEEDED:
-                throw new AssertionFailedError(testAppName
+                fail(d.testAppName
                 + ": Application.launch unexpectedly succeeded");
             case ERROR_STARTUP_SUCCEEDED:
-                throw new AssertionFailedError(testAppName
+                fail(d.testAppName
                 + ": Plataform.startup unexpectedly succeeded");
             case ERROR_STARTUP_FAILED:
-                throw new AssertionFailedError(testAppName
+                fail(d.testAppName
                 + ": Plataform.startup failed");
 
             case ERROR_ASSERTION_FAILURE:
-                throw new AssertionFailedError(testAppName
+                fail(d.testAppName
                 + ": Assertion failure in test application");
 
             case ERROR_UNEXPECTED_EXCEPTION:
-                throw new AssertionFailedError(testAppName
+                fail(d.testAppName
                 + ": unexpected exception");
 
             default:
-                throw new AssertionFailedError(testAppName
+                fail(d.testAppName
                         + ": Unexpected error exit: " + retVal);
         }
     }
-
 }
diff --git a/tests/system/src/test/java/test/launchertest/ModuleLauncherTest.java b/tests/system/src/test/java/test/launchertest/ModuleLauncherTest.java
index 10c14eb6d4b..fe6fe7f268e 100644
--- a/tests/system/src/test/java/test/launchertest/ModuleLauncherTest.java
+++ b/tests/system/src/test/java/test/launchertest/ModuleLauncherTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,17 +25,23 @@
 
 package test.launchertest;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+import static test.launchertest.Constants.ERROR_ASSERTION_FAILURE;
+import static test.launchertest.Constants.ERROR_NONE;
+import static test.launchertest.Constants.ERROR_TOOLKIT_IS_RUNNING;
+import static test.launchertest.Constants.ERROR_TOOLKIT_NOT_RUNNING;
+import static test.launchertest.Constants.ERROR_UNEXPECTED_EXCEPTION;
 import java.io.File;
 import java.util.ArrayList;
-import junit.framework.AssertionFailedError;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-import static test.launchertest.Constants.*;
+import java.util.concurrent.TimeUnit;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 /**
  * Unit test for launching modular FX applications
  */
+@Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
 public class ModuleLauncherTest {
 
     private static final String modulePath2 = System.getProperty("launchertest.testapp2.module.path");
@@ -80,228 +86,228 @@ private void doTestLaunchModule(String appModulePath, String testAppName) throws
             case 0:// SUCCESS
             case ERROR_NONE:
                 if (retVal != testExitCode) {
-                    throw new AssertionFailedError(testAppName
+                    fail(testAppName
                             + ": Unexpected 'success' exit; expected:"
                             + testExitCode + " was:" + retVal);
                 }
                 return;
 
             case 1:
-                throw new AssertionFailedError(testAppName
+                fail(testAppName
                         + ": unable to launch java application");
 
             case ERROR_TOOLKIT_NOT_RUNNING:
-                throw new AssertionFailedError(testAppName
+                fail(testAppName
                         + ": Toolkit not running prior to loading application class");
             case ERROR_TOOLKIT_IS_RUNNING:
-                throw new AssertionFailedError(testAppName
+                fail(testAppName
                         + ": Toolkit is running but should not be");
 
             case ERROR_ASSERTION_FAILURE:
-                throw new AssertionFailedError(testAppName
+                fail(testAppName
                 + ": Assertion failure in test application");
 
             case ERROR_UNEXPECTED_EXCEPTION:
-                throw new AssertionFailedError(testAppName
+                fail(testAppName
                 + ": unexpected exception");
 
             default:
-                throw new AssertionFailedError(testAppName
+                fail(testAppName
                         + ": Unexpected error exit: " + retVal);
         }
     }
 
-
-    @Test (timeout = 15000)
+    @Test
     public void testLaunchModule() throws Exception {
         doTestLaunchModule(modulePath2, "testapp.TestApp");
     }
 
-    @Test (timeout = 15000)
+    @Test
     public void testLaunchModuleNoMain() throws Exception {
         doTestLaunchModule(modulePath2, "testapp.TestAppNoMain");
     }
 
-    @Test (timeout = 15000)
+    @Test
     public void testLaunchModuleNotApplication() throws Exception {
         doTestLaunchModule(modulePath2, "testapp.TestNotApplication");
     }
 
-    @Test (timeout = 15000)
+    @Test
     public void testModuleTableViewUnexported() throws Exception {
         doTestLaunchModule(modulePath3, "myapp3.AppTableViewUnexported");
     }
 
-    @Test (timeout = 15000)
+    @Test
     public void testModuleTableViewExported() throws Exception {
         doTestLaunchModule(modulePath3, "myapp3.AppTableViewExported");
     }
 
-    @Test (timeout = 15000)
+    @Test
     public void testModuleTableViewQualExported() throws Exception {
         doTestLaunchModule(modulePath3, "myapp3.AppTableViewQualExported");
     }
 
-    @Test (timeout = 15000)
+    @Test
     public void testModuleTableViewOpened() throws Exception {
         doTestLaunchModule(modulePath3, "myapp3.AppTableViewOpened");
     }
 
-    @Test (timeout = 15000)
+    @Test
     public void testModuleTableViewQualOpened() throws Exception {
         doTestLaunchModule(modulePath3, "myapp3.AppTableViewQualOpened");
     }
 
-    @Test (timeout = 15000)
+    @Test
     public void testModuleTreeTableViewUnexported() throws Exception {
         doTestLaunchModule(modulePath3, "myapp3.AppTreeTableViewUnexported");
     }
 
-    @Test (timeout = 15000)
+    @Test
     public void testModuleTreeTableViewExported() throws Exception {
         doTestLaunchModule(modulePath3, "myapp3.AppTreeTableViewExported");
     }
 
-    @Test (timeout = 15000)
+    @Test
     public void testModuleTreeTableViewQualExported() throws Exception {
         doTestLaunchModule(modulePath3, "myapp3.AppTreeTableViewQualExported");
     }
 
-    @Test (timeout = 15000)
+    @Test
     public void testModuleTreeTableViewOpened() throws Exception {
         doTestLaunchModule(modulePath3, "myapp3.AppTreeTableViewOpened");
     }
 
-    @Test (timeout = 15000)
+    @Test
     public void testModuleTreeTableViewQualOpened() throws Exception {
         doTestLaunchModule(modulePath3, "myapp3.AppTreeTableViewQualOpened");
     }
 
-    @Test (timeout = 15000)
+    @Test
     public void testModuleBeansUnexported() throws Exception {
         doTestLaunchModule(modulePath4, "myapp4.AppBeansUnexported");
     }
 
-    @Test (timeout = 15000)
+    @Test
     public void testModuleBeansExported() throws Exception {
         doTestLaunchModule(modulePath4, "myapp4.AppBeansExported");
     }
 
-    @Test (timeout = 15000)
+    @Test
     public void testModuleBeansQualExported() throws Exception {
         doTestLaunchModule(modulePath4, "myapp4.AppBeansQualExported");
     }
 
-    @Test (timeout = 15000)
+    @Test
     public void testModuleBeansOpened() throws Exception {
         doTestLaunchModule(modulePath4, "myapp4.AppBeansOpened");
     }
 
-    @Test (timeout = 15000)
+    @Test
     public void testModuleBeansQualOpened() throws Exception {
         doTestLaunchModule(modulePath4, "myapp4.AppBeansQualOpened");
     }
 
-    @Test (timeout = 15000)
+    @Test
     public void testModuleBindingsUnexported() throws Exception {
         doTestLaunchModule(modulePath4, "myapp4.AppBindingsUnexported");
     }
 
-    @Test (timeout = 15000)
+    @Test
     public void testModuleBindingsExported() throws Exception {
         doTestLaunchModule(modulePath4, "myapp4.AppBindingsExported");
     }
 
-    @Test (timeout = 15000)
+    @Test
     public void testModuleBindingsQualExported() throws Exception {
         doTestLaunchModule(modulePath4, "myapp4.AppBindingsQualExported");
     }
 
-    @Test (timeout = 15000)
+    @Test
     public void testModuleBindingsOpened() throws Exception {
         doTestLaunchModule(modulePath4, "myapp4.AppBindingsOpened");
     }
 
-    @Test (timeout = 15000)
+    @Test
     public void testModuleBindingsQualOpened() throws Exception {
         doTestLaunchModule(modulePath4, "myapp4.AppBindingsQualOpened");
     }
 
-    @Test (timeout = 15000)
+    @Test
     public void testModuleJSCallbackUnexported() throws Exception {
         doTestLaunchModule(modulePath5, "myapp5.AppJSCallbackUnexported");
     }
 
-    @Test (timeout = 15000)
+    @Test
     public void testModuleJSCallbackExported() throws Exception {
         doTestLaunchModule(modulePath5, "myapp5.AppJSCallbackExported");
     }
 
-    @Test (timeout = 15000)
+    @Test
     public void testModuleJSCallbackQualExported() throws Exception {
         doTestLaunchModule(modulePath5, "myapp5.AppJSCallbackQualExported");
     }
 
-    @Test (timeout = 15000)
+    @Test
     public void testModuleJSCallbackOpened() throws Exception {
         doTestLaunchModule(modulePath5, "myapp5.AppJSCallbackOpened");
     }
 
-    @Test (timeout = 15000)
+    @Test
     public void testModuleJSCallbackQualOpened() throws Exception {
         doTestLaunchModule(modulePath5, "myapp5.AppJSCallbackQualOpened");
     }
 
-    @Test (timeout = 15000)
+    @Test
     public void testModuleFXMLUnexported() throws Exception {
         doTestLaunchModule(modulePath6, "myapp6.AppFXMLUnexported");
     }
 
-    @Test (timeout = 15000)
+    @Test
     public void testModuleFXMLExported() throws Exception {
         doTestLaunchModule(modulePath6, "myapp6.AppFXMLExported");
     }
 
-    @Test (timeout = 15000)
+    @Test
     public void testModuleFXMLQualExported() throws Exception {
         doTestLaunchModule(modulePath6, "myapp6.AppFXMLQualExported");
     }
 
-    @Test (timeout = 15000)
+    @Test
     public void testModuleFXMLOpened() throws Exception {
         doTestLaunchModule(modulePath6, "myapp6.AppFXMLOpened");
     }
 
-    @Test (timeout = 15000)
+    @Test
     public void testModuleFXMLQualOpened() throws Exception {
         doTestLaunchModule(modulePath6, "myapp6.AppFXMLQualOpened");
     }
 
-    @Test (timeout = 15000)
+    @Test
     public void testFXMLScriptDeployment() throws Exception {
         doTestLaunchModule(modulePathScript1, "myapp1.FXMLScriptDeployment");
     }
 
-    @Test (timeout = 15000)
+    @Test
     public void testFXMLScriptDeployment2Compile_On() throws Exception {
         doTestLaunchModule(modulePathScript2, "myapp2.FXMLScriptDeployment2Compile_On");
     }
 
-    @Test (timeout = 15000)
+    @Test
     public void testFXMLScriptDeployment2Compile_Off() throws Exception {
         doTestLaunchModule(modulePathScript2, "myapp2.FXMLScriptDeployment2Compile_Off");
     }
 
-    @Test (timeout = 15000)
+    @Test
     public void testFXMLScriptDeployment2Compile_On_Off() throws Exception {
         doTestLaunchModule(modulePathScript2, "myapp2.FXMLScriptDeployment2Compile_On_Off");
     }
 
-    @Test (timeout = 15000)
+    @Test
     public void testFXMLScriptDeployment2Compile_Off_On() throws Exception {
         doTestLaunchModule(modulePathScript2, "myapp2.FXMLScriptDeployment2Compile_Off_On");
     }
-    @Test (timeout = 15000)
+
+    @Test
     public void testFXMLScriptDeployment2Compile_Fail_Compilation() throws Exception {
         doTestLaunchModule(modulePathScript2, "myapp2.FXMLScriptDeployment2Compile_Fail_Compilation");
     }
diff --git a/tests/system/src/test/java/test/launchertest/PlatformExitTest.java b/tests/system/src/test/java/test/launchertest/PlatformExitTest.java
index 586d534eca5..2c79d1d1d9b 100644
--- a/tests/system/src/test/java/test/launchertest/PlatformExitTest.java
+++ b/tests/system/src/test/java/test/launchertest/PlatformExitTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,26 +25,30 @@
 
 package test.launchertest;
 
+import static org.junit.jupiter.api.Assertions.fail;
+import static test.launchertest.Constants.ERROR_NONE;
+import static test.launchertest.Constants.ERROR_TIMEOUT;
+import static test.launchertest.Constants.ERROR_UNEXPECTED_EXCEPTION;
 import java.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
-import junit.framework.AssertionFailedError;
-import org.junit.Test;
+import java.util.concurrent.TimeUnit;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import test.util.Util;
 
-import static test.launchertest.Constants.*;
-
 /**
  * Unit test for Platform.exit
  */
+@Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
 public class PlatformExitTest {
 
     private static final String className = PlatformExitTest.class.getName();
     private static final String pkgName = className.substring(0, className.lastIndexOf("."));
     private static final String testAppName = pkgName + "." + "PlatformExitApp";
 
-    @Test (timeout = 15000)
+    @Test
     public void testPlatformExit() throws Exception {
 
         final ArrayList<String> cmd =
@@ -63,19 +67,19 @@ public void testPlatformExit() throws Exception {
                 break;
 
             case 1:
-                throw new AssertionFailedError(testAppName
+                fail(testAppName
                         + ": unable to launch java application");
 
             case ERROR_TIMEOUT:
-                throw new AssertionFailedError(testAppName
+                fail(testAppName
                         + ": application timeout");
 
             case ERROR_UNEXPECTED_EXCEPTION:
-                throw new AssertionFailedError(testAppName
+                fail(testAppName
                         + ": unexpected exception");
 
             default:
-                throw new AssertionFailedError(testAppName
+                fail(testAppName
                         + ": Unexpected error exit: " + retVal);
         }
 
@@ -88,8 +92,7 @@ public void testPlatformExit() throws Exception {
         }
         if (stringBuilder.indexOf("Java has been detached") >= 0) {
             System.err.println(stringBuilder);
-            throw new AssertionFailedError(testAppName + ": tried to use JNI after Java was detached");
+            fail(testAppName + ": tried to use JNI after Java was detached");
         }
     }
-
 }
diff --git a/tests/system/src/test/java/test/launchertest/TestAppDaemon.java b/tests/system/src/test/java/test/launchertest/TestAppDaemon.java
index 1b487bdbe18..4c0e40a9891 100644
--- a/tests/system/src/test/java/test/launchertest/TestAppDaemon.java
+++ b/tests/system/src/test/java/test/launchertest/TestAppDaemon.java
@@ -25,13 +25,10 @@
 
 package test.launchertest;
 
+import static test.launchertest.Constants.ERROR_NONE;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.stage.Stage;
-import javax.swing.JDialog;
-import javax.swing.SwingUtilities;
-
-import static test.launchertest.Constants.*;
 
 /**
  * Test application launcher with daemon threads to verify that the
diff --git a/tests/system/src/test/java/test/memoryleak/JSCallbackMemoryTest.java b/tests/system/src/test/java/test/memoryleak/JSCallbackMemoryTest.java
index 8890a1289ef..5dd577b219a 100644
--- a/tests/system/src/test/java/test/memoryleak/JSCallbackMemoryTest.java
+++ b/tests/system/src/test/java/test/memoryleak/JSCallbackMemoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,33 +25,32 @@
 
 package test.memoryleak;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 import java.lang.ref.WeakReference;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
-
+import java.util.concurrent.TimeUnit;
 import javafx.application.Platform;
 import javafx.concurrent.Worker;
 import javafx.scene.Scene;
 import javafx.scene.paint.Color;
 import javafx.scene.web.WebView;
 import javafx.stage.Stage;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import junit.framework.AssertionFailedError;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import netscape.javascript.JSObject;
 import test.util.Util;
 
+@Timeout(value=20000, unit=TimeUnit.MILLISECONDS)
 public class JSCallbackMemoryTest {
 
     private static final String html = "<!DOCTYPE html>" +
@@ -185,7 +184,7 @@ public void releaseObj() {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void doSetupOnce() throws Exception {
 
         Platform.setImplicitExit(false);
@@ -208,12 +207,12 @@ public static void doSetupOnce() throws Exception {
         });
     }
 
-    @AfterClass
+    @AfterAll
     public static void doTeardownOnce() {
         Util.shutdown();
     }
 
-    @After
+    @AfterEach
     public void doTeardown() {
         Util.runAndWait(() -> {
             if (stages != null) {
@@ -252,16 +251,15 @@ private void checkEncounteredException() {
             } else if (encounteredException instanceof RuntimeException) {
                 throw (RuntimeException) encounteredException;
             } else {
-                AssertionFailedError err = new AssertionFailedError("Unknown execution exception");
-                err.initCause(encounteredException.getCause());
-                throw err;
+                fail(encounteredException);
             }
         }
     }
 
     // ========================== TEST CASES ==========================
 
-    @Test(timeout = 20000) public void testJsCallbackLeak() throws Exception {
+    @Test
+    public void testJsCallbackLeak() throws Exception {
         final CountDownLatch latch = new CountDownLatch(NUM_STAGES);
 
         Util.runAndWait(() -> {
@@ -304,7 +302,7 @@ private void checkEncounteredException() {
         try {
             latch.await();
         } catch (InterruptedException ex) {
-            throw new AssertionFailedError("Unexpected exception: " + ex);
+            fail(ex);
         }
 
         checkEncounteredException();
@@ -328,10 +326,11 @@ private void checkEncounteredException() {
             Util.sleep(SLEEP_TIME);
         }
 
-        assertTrue("All Stages are null", isAllStagesNull());
+        assertTrue(isAllStagesNull(), "All Stages are null");
     }
 
-    @Test(timeout = 20000) public void testJsCallbackFunction() throws Exception {
+    @Test
+    public void testJsCallbackFunction() throws Exception {
         final CountDownLatch latch = new CountDownLatch(NUM_STAGES);
 
         Util.runAndWait(() -> {
@@ -374,7 +373,7 @@ private void checkEncounteredException() {
         try {
             latch.await();
         } catch (InterruptedException ex) {
-            throw new AssertionFailedError("Unexpected exception: " + ex);
+            fail(ex);
         }
 
         checkEncounteredException();
@@ -389,10 +388,11 @@ private void checkEncounteredException() {
             Util.sleep(SLEEP_TIME);
         }
 
-        assertTrue("All Button Callback return true", isAllCallbackStatusTrue());
+        assertTrue(isAllCallbackStatusTrue(), "All Button Callback return true");
     }
 
-    @Test(timeout = 20000) public void testJsCallbackReleaseFunction() throws Exception {
+    @Test
+    public void testJsCallbackReleaseFunction() throws Exception {
         final CountDownLatch latch = new CountDownLatch(NUM_STAGES);
 
         Util.runAndWait(() -> {
@@ -443,7 +443,7 @@ private void checkEncounteredException() {
         try {
             latch.await();
         } catch (InterruptedException ex) {
-            throw new AssertionFailedError("Unexpected exception: " + ex);
+            fail(ex);
         }
 
         checkEncounteredException();
@@ -461,7 +461,8 @@ private void checkEncounteredException() {
         assertFalse(unexpectedCallback);
     }
 
-    @Test(timeout = 20000) public void testJsCallbackConsoleFunction() throws Exception {
+    @Test
+    public void testJsCallbackConsoleFunction() throws Exception {
         final CountDownLatch latch = new CountDownLatch(NUM_STAGES);
 
         Util.runAndWait(() -> {
@@ -506,7 +507,7 @@ private void checkEncounteredException() {
         try {
             latch.await();
         } catch (InterruptedException ex) {
-            throw new AssertionFailedError("Unexpected exception: " + ex);
+            fail(ex);
         }
 
         checkEncounteredException();
@@ -514,7 +515,8 @@ private void checkEncounteredException() {
         System.gc();
     }
 
-    @Test(timeout = 20000) public void testJsCallbackStrongRefPrimitiveArrayFunction() throws Exception {
+    @Test
+    public void testJsCallbackStrongRefPrimitiveArrayFunction() throws Exception {
         final CountDownLatch latch = new CountDownLatch(NUM_STAGES);
 
         Util.runAndWait(() -> {
@@ -559,7 +561,7 @@ private void checkEncounteredException() {
         try {
             latch.await();
         } catch (InterruptedException ex) {
-            throw new AssertionFailedError("Unexpected exception: " + ex);
+            fail(ex);
         }
 
         checkEncounteredException();
@@ -574,10 +576,11 @@ private void checkEncounteredException() {
             Util.sleep(GCWAIT_TIME);
         }
 
-        assertTrue("All Button Callback return true", isAllCallbackStatusTrue());
+        assertTrue(isAllCallbackStatusTrue(), "All Button Callback return true");
     }
 
-    @Test(timeout = 20000) public void testJsCallbackLocalPrimitiveArrayFunctionWithGC() throws Exception {
+    @Test
+    public void testJsCallbackLocalPrimitiveArrayFunctionWithGC() throws Exception {
         final CountDownLatch latch1 = new CountDownLatch(NUM_STAGES);
         final CountDownLatch latch2 = new CountDownLatch(1);
 
@@ -624,7 +627,7 @@ private void checkEncounteredException() {
         try {
             latch1.await();
         } catch (InterruptedException ex) {
-            throw new AssertionFailedError("Unexpected exception: " + ex);
+            fail(ex);
         }
 
         checkEncounteredException();
@@ -644,13 +647,14 @@ private void checkEncounteredException() {
         try {
             latch2.await();
         } catch (InterruptedException ex) {
-            throw new AssertionFailedError("Unexpected exception: " + ex);
+            fail(ex);
         }
 
         assertFalse(unexpectedCallback);
     }
 
-    @Test(timeout = 20000) public void testJsCallbackStrongRefObjectArrayFunction() throws Exception {
+    @Test
+    public void testJsCallbackStrongRefObjectArrayFunction() throws Exception {
         final CountDownLatch latch = new CountDownLatch(NUM_STAGES);
 
         Util.runAndWait(() -> {
@@ -695,7 +699,7 @@ private void checkEncounteredException() {
         try {
             latch.await();
         } catch (InterruptedException ex) {
-            throw new AssertionFailedError("Unexpected exception: " + ex);
+            fail(ex);
         }
 
         checkEncounteredException();
@@ -710,11 +714,12 @@ private void checkEncounteredException() {
             Util.sleep(GCWAIT_TIME);
         }
 
-        assertTrue("All Button Callback return true", isAllCallbackStatusTrue());
+        assertTrue(isAllCallbackStatusTrue(), "All Button Callback return true");
 
     }
 
-    @Test(timeout = 20000) public void testJsCallbackLocalObjectArrayFunctionWithGC() throws Exception {
+    @Test
+    public void testJsCallbackLocalObjectArrayFunctionWithGC() throws Exception {
         final CountDownLatch latch1 = new CountDownLatch(NUM_STAGES);
         final CountDownLatch latch2 = new CountDownLatch(1);
 
@@ -760,7 +765,7 @@ private void checkEncounteredException() {
         try {
             latch1.await();
         } catch (InterruptedException ex) {
-            throw new AssertionFailedError("Unexpected exception: " + ex);
+            fail(ex);
         }
 
         checkEncounteredException();
@@ -780,7 +785,7 @@ private void checkEncounteredException() {
         try {
             latch2.await();
         } catch (InterruptedException ex) {
-            throw new AssertionFailedError("Unexpected exception: " + ex);
+            fail(ex);
         }
 
         assertFalse(unexpectedCallback);
diff --git a/tests/system/src/test/java/test/renderlock/RenderLock1Test.java b/tests/system/src/test/java/test/renderlock/RenderLock1Test.java
index e607bc12e95..269526a4b49 100644
--- a/tests/system/src/test/java/test/renderlock/RenderLock1Test.java
+++ b/tests/system/src/test/java/test/renderlock/RenderLock1Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,8 @@
 
 package test.renderlock;
 
-import static org.junit.Assume.assumeTrue;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import org.junit.jupiter.api.Test;
 
 public class RenderLock1Test extends RenderLockCommon {
     @Test
diff --git a/tests/system/src/test/java/test/renderlock/RenderLockCommon.java b/tests/system/src/test/java/test/renderlock/RenderLockCommon.java
index 9306a9b85c9..8783f7c3c6d 100644
--- a/tests/system/src/test/java/test/renderlock/RenderLockCommon.java
+++ b/tests/system/src/test/java/test/renderlock/RenderLockCommon.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,18 +25,16 @@
 
 package test.renderlock;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import static test.util.Util.TIMEOUT;
-
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
-
 import javafx.animation.FillTransition;
 import javafx.animation.Timeline;
 import javafx.application.Application;
@@ -51,12 +49,9 @@
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
 import javafx.util.Duration;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
 import com.sun.javafx.PlatformUtil;
-
 import test.util.Util;
 
 /**
@@ -108,7 +103,7 @@ public static class MyApp extends Application {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void doSetupOnce() throws Exception {
         // These tests are only valid on Windows and Mac.
         // On Linux the closing of the window does not trigger a
@@ -119,7 +114,7 @@ public static void doSetupOnce() throws Exception {
         assertEquals(0, launchLatch.getCount());
     }
 
-    @AfterClass
+    @AfterAll
     public static void doTeardownOnce() {
         // see doSetupOnce() assumeTrue condition
         if (myApp != null) {
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/CreateDeviceTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/CreateDeviceTest.java
index 6093865153a..ae92be3849d 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/CreateDeviceTest.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/CreateDeviceTest.java
@@ -27,22 +27,24 @@
 
 import javafx.geometry.Rectangle2D;
 import javafx.stage.Screen;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import com.sun.glass.ui.monocle.TestLogShim;
 
 public class CreateDeviceTest {
 
     private UInput ui;
 
-    @Before public void initDevice() {
+    @BeforeEach
+    public void initDevice() {
         TestLogShim.reset();
         ui = new UInput();
     }
 
-    @After public void destroyDevice() throws InterruptedException {
+    @AfterEach
+    public void destroyDevice() throws InterruptedException {
         ui.waitForQuiet();
         try {
             ui.processLine("DESTROY");
@@ -84,8 +86,7 @@ public void testCreateKeyDevice() throws Exception {
         ui.processLine("EV_SYN");
         TestLogShim.waitForLog("Key typed: A", 3000);
         // make sure only two key typed events were received
-        Assert.assertEquals("Expected two typed events", 2,
-                             TestLogShim.getLog().stream().filter(s -> s.startsWith("Key typed")).count());
+        Assertions.assertEquals(2, TestLogShim.getLog().stream().filter(s -> s.startsWith("Key typed")).count(), "Expected two typed events");
     }
 
     @Test
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/DoubleClickTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/DoubleClickTest.java
index 3cde452f4da..fc476911569 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/DoubleClickTest.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/DoubleClickTest.java
@@ -26,27 +26,24 @@
 package test.robot.com.sun.glass.ui.monocle;
 
 import java.util.Collection;
-import org.junit.Test;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import com.sun.glass.ui.monocle.TestLogShim;
 import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice;
 import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevices;
 
-public class DoubleClickTest extends ParameterizedTestBase {
+public final class DoubleClickTest extends ParameterizedTestBase {
 
-    public DoubleClickTest(TestTouchDevice device) {
-        super(device);
-    }
-
-    @Parameterized.Parameters
-    public static Collection<Object[]> data() {
+    private static Collection<TestTouchDevice> parameters() {
         return TestTouchDevices.getTouchDeviceParameters(1);
     }
 
     /** Test that double taps in the same area generate synthesized
      * multi-click mouse events. */
-    @Test
-    public void testDoubleClick1() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testDoubleClick1(TestTouchDevice device) throws Exception {
+        createDevice(device, null);
         int x = (int) Math.round(width / 2.0);
         int y = (int) Math.round(height / 2.0);
         TestApplication.getStage().getScene().setOnMouseClicked((e) -> TestLogShim.format("Mouse clicked: %d, %d: clickCount %d",
@@ -65,8 +62,10 @@ public void testDoubleClick1() throws Exception {
         TestLogShim.waitForLog("Mouse clicked: " + x + ", " + y + ": clickCount 2", 3000l);
     }
 
-    @Test
-    public void testDoubleClick2() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testDoubleClick2(TestTouchDevice device) throws Exception {
+        createDevice(device, null);
         int x1 = (int) Math.round(width / 2.0);
         int y1 = (int) Math.round(height / 2.0);
         int x2 = x1 + device.getTapRadius();
@@ -87,5 +86,4 @@ public void testDoubleClick2() throws Exception {
         TestLogShim.waitForLog("Mouse clicked: " + x1 + ", " + y1 + ": clickCount 1", 3000l);
         TestLogShim.waitForLog("Mouse clicked: " + x2 + ", " + y2 + ": clickCount 2", 3000l);
     }
-
 }
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/DragAndDropTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/DragAndDropTest.java
index 2d9201d9a23..340692c0a94 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/DragAndDropTest.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/DragAndDropTest.java
@@ -32,27 +32,23 @@
 import javafx.scene.input.InputEvent;
 import javafx.scene.input.TransferMode;
 import javafx.scene.shape.Rectangle;
-import org.junit.Test;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import com.sun.glass.ui.monocle.TestLogShim;
 import test.com.sun.glass.ui.monocle.TestRunnable;
 import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice;
 import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevices;
 
-public class DragAndDropTest extends ParameterizedTestBase {
+public final class DragAndDropTest extends ParameterizedTestBase {
 
-    public DragAndDropTest(TestTouchDevice device) {
-        super(device);
-    }
-
-
-    @Parameterized.Parameters
-    public static Collection<Object[]> data() {
+    private static Collection<TestTouchDevice> parameters() {
         return TestTouchDevices.getTouchDeviceParameters(1);
     }
 
-    @Test
-    public void testDragOneNodeToAnother() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testDragOneNodeToAnother(TestTouchDevice device) throws Exception {
+        createDevice(device, null);
         TestRunnable.invokeAndWait(() -> {
             Node n1 = new Rectangle(10, 10, 10, 10);
             Node n2 = new Rectangle(210, 10, 10, 10);
@@ -94,5 +90,4 @@ public void testDragOneNodeToAnother() throws Exception {
             TestRunnable.invokeAndWait(() -> TestApplication.getRootGroup().getChildren().clear());
         }
     }
-
 }
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/DragTouchInAndOutAWindowTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/DragTouchInAndOutAWindowTest.java
index a931d5ca75b..327e7efa048 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/DragTouchInAndOutAWindowTest.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/DragTouchInAndOutAWindowTest.java
@@ -28,12 +28,11 @@
 import java.util.Collection;
 import javafx.geometry.Rectangle2D;
 import javafx.stage.Stage;
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import com.sun.glass.ui.monocle.TestLogShim;
 import test.com.sun.glass.ui.monocle.TestRunnable;
 import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice;
@@ -47,20 +46,17 @@
  * causing exceptions to be thrown.
  *
  */
-public class DragTouchInAndOutAWindowTest extends ParameterizedTestBase {
+public final class DragTouchInAndOutAWindowTest extends ParameterizedTestBase {
 
-    public DragTouchInAndOutAWindowTest(TestTouchDevice device) {
-        super(device);
-    }
-
-    @Parameterized.Parameters
-    public static Collection<Object[]> data() {
+    private static Collection<TestTouchDevice> parameters() {
         return TestTouchDevices.getTouchDeviceParameters(1);
     }
 
 
-    @Before
-    public void setUpScreen() throws Exception {
+    // @BeforeEach
+    // junit5 does not support parameterized class-level tests yet
+    private void setUpScreen(TestTouchDevice device) throws Exception {
+        createDevice(device, null);
         TestApplication.showInMiddleOfScreen();
         TestApplication.addTouchListeners();
         int p = device.addPoint(0, 0);
@@ -78,8 +74,10 @@ public void setUpScreen() throws Exception {
      * Test update for RT-34191 - make sure no touch event received if drag
      * started outside the window
      */
-    @Test
-    public void singleTouch_dragPointIntoTheWindow() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void singleTouch_dragPointIntoTheWindow(TestTouchDevice device) throws Exception {
+        setUpScreen(device);
         Stage stage = TestApplication.getStage();
         int windowRightEnd = (int)(stage.getX() + stage.getWidth());
         int windowMiddleHeight = (int)(stage.getY() + (stage.getHeight() / 2));
@@ -103,12 +101,11 @@ public void singleTouch_dragPointIntoTheWindow() throws Exception {
         //check that tested window didn't recive any notifications
 
         //wait for results and make sure no event received
-        Assert.assertEquals(0, TestLogShim.countLogContaining("TouchPoint: PRESSED"));
-        Assert.assertEquals(0, TestLogShim.countLogContaining("TouchPoint: MOVED"));
-        Assert.assertEquals(0, TestLogShim.countLogContaining("TouchPoint: RELEASED"));
+        Assertions.assertEquals(0, TestLogShim.countLogContaining("TouchPoint: PRESSED"));
+        Assertions.assertEquals(0, TestLogShim.countLogContaining("TouchPoint: MOVED"));
+        Assertions.assertEquals(0, TestLogShim.countLogContaining("TouchPoint: RELEASED"));
     }
 
-    @Test
     /**
      * This test is also related to RT-33687 - Lens:some touch events are been
      * dropped in native causing exceptions to be thrown.
@@ -116,7 +113,10 @@ public void singleTouch_dragPointIntoTheWindow() throws Exception {
      * no notifications were sent, especially releases.
      *
      */
-    public void singleTouch_dragPointoutsideAwindow() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void singleTouch_dragPointoutsideAwindow(TestTouchDevice device) throws Exception {
+        setUpScreen(device);
         Stage stage = TestApplication.getStage();
         int windowMiddleWidth = (int)(stage.getX() + stage.getWidth() / 2);
         int windowMiddleHeight = (int)(stage.getY() + (stage.getHeight() / 2));
@@ -139,14 +139,16 @@ public void singleTouch_dragPointoutsideAwindow() throws Exception {
         TestLogShim.waitForLogContaining("TouchPoint: RELEASED", 3000);
     }
 
-     @Test
     /**
      * Combining the two test cases above, start a touch sequence inside a
      * window, drag the 'finger' out and in again and see that we gat the
      * events.
      *
      */
-    public void singleTouch_dragPointInandOutAwindow() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void singleTouch_dragPointInandOutAwindow(TestTouchDevice device) throws Exception {
+        setUpScreen(device);
         Stage stage = TestApplication.getStage();
         int windowMiddleWidth = (int)(stage.getX() + stage.getWidth() / 2);
         int windowMiddleHeight = (int)(stage.getY() + (stage.getHeight() / 2));
@@ -178,15 +180,17 @@ public void singleTouch_dragPointInandOutAwindow() throws Exception {
         TestLogShim.waitForLogContaining("TouchPoint: RELEASED", 3000);
     }
 
-     @Test
     /**
      * Same test as above, but for multi touch.
      * Test should pass in either single touch mode or multi touch mode
      * Main point is to see that no exception is been thrown
      *
      */
-    public void multiTouch_dragPointInandOutAwindow() throws Exception {
-        Assume.assumeTrue(device.getPointCount() >= 2);
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void multiTouch_dragPointInandOutAwindow(TestTouchDevice device) throws Exception {
+        Assumptions.assumeTrue(device.getPointCount() >= 2);
+        setUpScreen(device);
         Stage stage = TestApplication.getStage();
         int windowMiddleWidth = (int)(stage.getX() + stage.getWidth() / 2);
         int windowMiddleHeight = (int)(stage.getY() + (stage.getHeight() / 2));
@@ -220,19 +224,22 @@ public void multiTouch_dragPointInandOutAwindow() throws Exception {
         device.sync();
 
         //wait for results and make sure no event received
-        Assert.assertEquals(0, TestLogShim.countLogContaining("TouchPoint: PRESSED"));
-        Assert.assertEquals(0, TestLogShim.countLogContaining("TouchPoint: MOVED"));
-        Assert.assertEquals(0, TestLogShim.countLogContaining("TouchPoint: RELEASED"));
+        Assertions.assertEquals(0, TestLogShim.countLogContaining("TouchPoint: PRESSED"));
+        Assertions.assertEquals(0, TestLogShim.countLogContaining("TouchPoint: MOVED"));
+        Assertions.assertEquals(0, TestLogShim.countLogContaining("TouchPoint: RELEASED"));
     }
-    @Ignore("RT-38482")
-    @Test
+
     /**
      * Drag two touch points simultaneously from outside the window (from the
      * right side) to the window's center.
      * No "move", "press" or "release" events should be sent.
      */
-    public void multiTouch_dragTwoPointsIntoTheWindow() throws Exception {
-        Assume.assumeTrue(device.getPointCount() >= 2);
+    @Disabled("RT-38482")
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void multiTouch_dragTwoPointsIntoTheWindow(TestTouchDevice device) throws Exception {
+        Assumptions.assumeTrue(device.getPointCount() >= 2);
+        setUpScreen(device);
         Stage stage = TestApplication.getStage();
         double[] bounds = {0.0, 0.0, 0.0, 0.0};
         TestRunnable.invokeAndWait(() -> {
@@ -254,7 +261,7 @@ public void multiTouch_dragTwoPointsIntoTheWindow() throws Exception {
         int y1 = windowMiddleY;
         int x2 = windowRightEnd + distance * 2;
         int y2 = y1;
-        Assert.assertTrue(x1 < width && x2 < width);
+        Assertions.assertTrue(x1 < width && x2 < width);
         //press two fingers
         int p1 = device.addPoint(x1, y1);
         int p2 = device.addPoint(x2, y2);
@@ -284,10 +291,10 @@ public void multiTouch_dragTwoPointsIntoTheWindow() throws Exception {
         TestLogShim.waitForLogContaining("TouchPoint: RELEASED %d, %d", x3, y3);
 
         //Verify press/release events were received only once
-        Assert.assertEquals(1, TestLogShim.countLogContaining("TouchPoint: PRESSED"));
-        Assert.assertEquals(1, TestLogShim.countLogContaining("TouchPoint: RELEASED"));
+        Assertions.assertEquals(1, TestLogShim.countLogContaining("TouchPoint: PRESSED"));
+        Assertions.assertEquals(1, TestLogShim.countLogContaining("TouchPoint: RELEASED"));
 
         //make sure no move event was received
-        Assert.assertEquals(0, TestLogShim.countLogContaining("TouchPoint: MOVED"));
+        Assertions.assertEquals(0, TestLogShim.countLogContaining("TouchPoint: MOVED"));
     }
 }
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/FuzzyTapTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/FuzzyTapTest.java
index a9022e1c5cf..1d78d53885f 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/FuzzyTapTest.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/FuzzyTapTest.java
@@ -26,27 +26,24 @@
 package test.robot.com.sun.glass.ui.monocle;
 
 import java.util.Collection;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import com.sun.glass.ui.monocle.TestLogShim;
 import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice;
 import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevices;
 
-public class FuzzyTapTest extends ParameterizedTestBase {
+public final class FuzzyTapTest extends ParameterizedTestBase {
 
-    public FuzzyTapTest(TestTouchDevice device) {
-        super(device);
-    }
-
-    @Parameterized.Parameters
-    public static Collection<Object[]> data() {
+    private static Collection<TestTouchDevice> parameters() {
         return TestTouchDevices.getTouchDeviceParameters(1);
     }
 
     /** Touch down, touch up at a slightly different location*/
-    @Test
-    public void tap1() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void tap1(TestTouchDevice device) throws Exception {
+        createDevice(device, null);
         final int x = (int) width / 2;
         final int y = (int) height / 2;
         final int tapRadius = device.getTapRadius();
@@ -59,13 +56,15 @@ public void tap1() throws Exception {
         TestLogShim.waitForLog("Mouse pressed: " + x + ", " + y, 3000);
         TestLogShim.waitForLog("Mouse clicked: " + x + ", " + y, 3000);
         TestLogShim.waitForLog("Mouse released: " + x + ", " + y, 3000);
-        Assert.assertEquals(0, TestLogShim.countLogContaining("Mouse dragged:"));
-        Assert.assertEquals(0, TestLogShim.countLogContaining("Touch moved:"));
+        Assertions.assertEquals(0, TestLogShim.countLogContaining("Mouse dragged:"));
+        Assertions.assertEquals(0, TestLogShim.countLogContaining("Touch moved:"));
     }
 
     /** Touch down, small move, touch up */
-    @Test
-    public void tap1a() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void tap1a(TestTouchDevice device) throws Exception {
+        createDevice(device, null);
         final int x = (int) width / 2;
         final int y = (int) height / 2;
         final int tapRadius = device.getTapRadius();
@@ -79,13 +78,15 @@ public void tap1a() throws Exception {
         device.sync();
         TestLogShim.waitForLog("Mouse clicked: " + x + ", " + y, 3000);
         TestLogShim.waitForLog("Mouse released: " + x + ", " + y, 3000);
-        Assert.assertEquals(0, TestLogShim.countLogContaining("Mouse dragged:"));
-        Assert.assertEquals(0, TestLogShim.countLogContaining("Touch moved:"));
+        Assertions.assertEquals(0, TestLogShim.countLogContaining("Mouse dragged:"));
+        Assertions.assertEquals(0, TestLogShim.countLogContaining("Touch moved:"));
     }
 
     /** Touch down, touch up outside the tap radius */
-    @Test
-    public void tap2() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void tap2(TestTouchDevice device) throws Exception {
+        createDevice(device, null);
         final int x = (int) width / 2;
         final int y = (int) height / 2;
         final int tapRadius = device.getTapRadius();
@@ -100,12 +101,14 @@ public void tap2() throws Exception {
         TestLogShim.waitForLog("Mouse clicked: " + x + ", " + y, 3000);
         TestLogShim.waitForLog("Touch pressed: " + x + ", " + y, 3000);
         TestLogShim.waitForLog("Touch released: " + x + ", " + y, 3000);
-        Assert.assertEquals(1, TestLogShim.countLogContaining("Mouse clicked:"));
+        Assertions.assertEquals(1, TestLogShim.countLogContaining("Mouse clicked:"));
     }
 
     /** Touch down, move outside touch radius, touch up */
-    @Test
-    public void tap2a() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void tap2a(TestTouchDevice device) throws Exception {
+        createDevice(device, null);
         final int x = (int) width / 2;
         final int y = (int) height / 2;
         final int tapRadius = device.getTapRadius();
@@ -124,12 +127,14 @@ public void tap2a() throws Exception {
         TestLogShim.waitForLog("Touch pressed: " + x + ", " + y, 3000);
         TestLogShim.waitForLog("Touch moved: " + x1 + ", " + y1, 3000);
         TestLogShim.waitForLog("Touch released: " + x1 + ", " + y1, 3000);
-        Assert.assertEquals(1, TestLogShim.countLogContaining("Mouse clicked: " + x1 + ", " + y1));
+        Assertions.assertEquals(1, TestLogShim.countLogContaining("Mouse clicked: " + x1 + ", " + y1));
     }
 
     /** Touch down, drift outside touch radius, touch up */
-    @Test
-    public void tap3b() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void tap3b(TestTouchDevice device) throws Exception {
+        createDevice(device, null);
         final int x = (int) width / 2;
         final int y = (int) height / 2;
         final int tapRadius = device.getTapRadius();
@@ -159,6 +164,6 @@ public void tap3b() throws Exception {
         TestLogShim.waitForLog("Touch pressed: " + x + ", " + y, 3000);
         TestLogShim.waitForLog("Touch moved: " + x2 + ", " + y2, 3000);
         TestLogShim.waitForLog("Touch released: " + x2 + ", " + y2, 3000);
-        Assert.assertEquals(1, TestLogShim.countLogContaining("Mouse clicked: " + x2 + ", " + y2));
+        Assertions.assertEquals(1, TestLogShim.countLogContaining("Mouse clicked: " + x2 + ", " + y2));
     }
 }
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/InputDevicePropertyTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/InputDevicePropertyTest.java
index 764ff9ddd81..6e671283529 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/InputDevicePropertyTest.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/InputDevicePropertyTest.java
@@ -28,47 +28,48 @@
 import java.util.Collection;
 import javafx.application.ConditionalFeature;
 import javafx.application.Platform;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runners.Parameterized;
-import junit.framework.Assert;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import test.com.sun.glass.ui.monocle.TestRunnable;
 import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice;
 import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevices;
 
-public class InputDevicePropertyTest  extends ParameterizedTestBase {
+public final class InputDevicePropertyTest extends ParameterizedTestBase {
 
-    public InputDevicePropertyTest(TestTouchDevice device) {
-        super(device);
-    }
-
-    @Parameterized.Parameters
-    public static Collection<Object[]> data() {
+    private static Collection<TestTouchDevice> parameters() {
         return TestTouchDevices.getTouchDeviceParameters(1);
     }
 
-    @Before
-    public void checkPlatform() throws Exception {
-        Assume.assumeTrue(TestApplication.isMonocle() || TestApplication.isLens());
+    // @BeforeEach
+    // junit5 does not support parameterized class-level tests yet
+    public void checkPlatform(TestTouchDevice device) throws Exception {
+        createDevice(device, null);
+        Assumptions.assumeTrue(TestApplication.isMonocle() || TestApplication.isLens());
     }
 
-    @Test
-    public void testTouch() throws Exception {
-        TestRunnable.invokeAndWait(() -> Assert.assertTrue(Platform.isSupported(ConditionalFeature.INPUT_TOUCH)));
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testTouch(TestTouchDevice device) throws Exception {
+        checkPlatform(device);
+        TestRunnable.invokeAndWait(() -> Assertions.assertTrue(Platform.isSupported(ConditionalFeature.INPUT_TOUCH)));
     }
 
-    @Test
-    public void testMultiTouch() throws Exception {
-        TestRunnable.invokeAndWait(() -> Assert.assertEquals(device.getPointCount() > 1,
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testMultiTouch(TestTouchDevice device) throws Exception {
+        checkPlatform(device);
+        TestRunnable.invokeAndWait(() -> Assertions.assertEquals(device.getPointCount() > 1,
                             Platform.isSupported(
                                     ConditionalFeature.INPUT_MULTITOUCH)));
     }
 
-    @Test
-    public void testPointer() throws Exception {
-        TestRunnable.invokeAndWait(() -> Assert.assertFalse(
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testPointer(TestTouchDevice device) throws Exception {
+        checkPlatform(device);
+        TestRunnable.invokeAndWait(() -> Assertions.assertFalse(
                 Platform.isSupported(ConditionalFeature.INPUT_POINTER)));
     }
-
 }
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ModalDialogTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ModalDialogTest.java
index 1ee35bb60cc..dcddd2160b4 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ModalDialogTest.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ModalDialogTest.java
@@ -32,23 +32,19 @@
 import javafx.scene.robot.Robot;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestName;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
 import com.sun.glass.ui.monocle.TestLogShim;
-import junit.framework.AssertionFailedError;
-
 
 public class ModalDialogTest {
 
-    @Rule
-    public TestName name = new TestName();
-
-    @Before
-    public void setUpScreen() throws Exception {
+    @BeforeEach
+    public void setUpScreen(TestInfo t) throws Exception {
         TestLogShim.reset();
-        TestLogShim.log(name.getMethodName());
+        // get test name from the junit5
+        TestLogShim.log(t.getDisplayName());
         TestApplication.showFullScreenScene();
     }
 
@@ -84,7 +80,7 @@ public void test1() throws Exception {
         });
         TestLogShim.waitForLog("Clicked at 100, 100");
         if (TestLogShim.countLog("Clicked at 300, 400") != 0) {
-            throw new AssertionFailedError("Disabled window should not receive mouse events!");
+            Assertions.fail("Disabled window should not receive mouse events!");
         }
     }
 }
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/MonocleApplicationTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/MonocleApplicationTest.java
index 3dd94161511..bf2c569c414 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/MonocleApplicationTest.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/MonocleApplicationTest.java
@@ -24,9 +24,9 @@
  */
 package test.robot.com.sun.glass.ui.monocle;
 
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.Test;
 import com.sun.glass.events.KeyEvent;
 import com.sun.glass.ui.monocle.MonocleApplicationShim;
 import test.com.sun.glass.ui.monocle.TestRunnable;
@@ -134,15 +134,13 @@ public class MonocleApplicationTest {
     @Test
     public void testCharToKeyCode() throws Exception {
         TestApplication.getStage();
-        Assume.assumeTrue(TestApplication.isMonocle());
+        Assumptions.assumeTrue(TestApplication.isMonocle());
         TestRunnable.invokeAndWait(() -> {
             for (int i = 0; i < TEST_CASES.length; i++) {
                 char ch = (char) TEST_CASES[i][0];
                 int expectedCode = TEST_CASES[i][1];
                 int code = MonocleApplicationShim._getKeyCodeForChar(ch, KeyEvent.VK_UNDEFINED);
-                Assert.assertEquals("Code for character "
-                                    + ((int) ch) + " ('" + ch + "')",
-                                    expectedCode, code);
+                Assertions.assertEquals(expectedCode, code, "Code for character " + ((int) ch) + " ('" + ch + "')");
             }
         });
     }
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/MouseLagTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/MouseLagTest.java
index 45290691b0e..75cb6f8ef0e 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/MouseLagTest.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/MouseLagTest.java
@@ -25,22 +25,22 @@
 
 package test.robot.com.sun.glass.ui.monocle;
 
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestName;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
 import com.sun.glass.ui.monocle.TestLogShim;
 
 public class MouseLagTest {
 
     private UInput ui;
-    @Rule public TestName name = new TestName();
 
-    @Before public void setUpScreen() throws Exception {
+    @BeforeEach
+    public void setUpScreen(TestInfo t) throws Exception {
         TestLogShim.reset();
-        TestLogShim.log(name.getMethodName());
+        // get test name from the junit5
+        TestLogShim.log(t.getDisplayName());
         TestApplication.showFullScreenScene();
         TestApplication.addMouseListeners();
         TestApplication.movePointerTo(300, 300);
@@ -60,7 +60,8 @@ public void initDevice() throws Exception {
         ui.processLine("CREATE");
     }
 
-    @After public void destroyDevice() throws Exception {
+    @AfterEach
+    public void destroyDevice() throws Exception {
         if (ui != null) {
             try {
                 ui.processLine("DESTROY");
@@ -102,13 +103,11 @@ public void testMouseLag() throws Exception {
 
         long t = System.currentTimeMillis() - startTime;
         // Make sure events could be sent in the required time
-        Assert.assertTrue("Took " + t + "ms to send 3000 events, of which "
-                          + TestLogShim.countLogContaining("moved")
-                          + " were received",
-                          t < 6000l * TestApplication.getTimeScale());
+        Assertions.assertTrue(
+            t < 6000l * TestApplication.getTimeScale(),
+            "Took " + t + "ms to send 3000 events, of which " + TestLogShim.countLogContaining("moved") + " were received");
         TestLogShim.log("Sent 3000 events in " + t + "ms");
         // Make sure events could be delivered in the required time
         TestLogShim.waitForLog("Mouse moved: 300, 310", 6000l - t);
     }
-
 }
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/MultiTouch2Test.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/MultiTouch2Test.java
index 189f50da05c..ff50b400ea8 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/MultiTouch2Test.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/MultiTouch2Test.java
@@ -26,26 +26,23 @@
 package test.robot.com.sun.glass.ui.monocle;
 
 import java.util.Collection;
-import org.junit.Test;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import com.sun.glass.ui.monocle.TestLogShim;
 import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice;
 import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevices;
 
 /** Multitouch tests with two points */
-public class MultiTouch2Test extends ParameterizedTestBase {
+public final class MultiTouch2Test extends ParameterizedTestBase {
 
-    public MultiTouch2Test(TestTouchDevice device) {
-        super(device);
-    }
-
-    @Parameterized.Parameters
-    public static Collection<Object[]> data() {
+    private static Collection<TestTouchDevice> parameters() {
         return TestTouchDevices.getTouchDeviceParameters(2);
     }
 
-    @Test
-    public void twoFingerTap() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void twoFingerTap(TestTouchDevice device) throws Exception {
+        createDevice(device, null);
         final int x1 = (int) Math.round(width * 0.5f);
         final int y1 = (int) Math.round(height * 0.5f);
         final int x2 = (int) Math.round(width * 0.75f);
@@ -71,8 +68,10 @@ public void twoFingerTap() throws Exception {
     /**
      * Touch down two fingers, release first, release second
      */
-    @Test
-    public void pressTwoFingersReleaseOne() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void pressTwoFingersReleaseOne(TestTouchDevice device) throws Exception {
+        createDevice(device, null);
         final int x1 = (int) Math.round(width / 8.0);
         final int y1 = (int) Math.round(height / 8.0);
         final int x2 = (int) Math.round(width / 5.0);
@@ -113,9 +112,10 @@ public void pressTwoFingersReleaseOne() throws Exception {
         TestLogShim.waitForLogContaining("TouchPoint: RELEASED " + x3 + ", " + y3, 3000l);
     }
 
-    @Test
-//    @Ignore("RT-35546")
-    public void twoFingerDrag() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void twoFingerDrag(TestTouchDevice device) throws Exception {
+        createDevice(device, null);
         final int x1 = (int) Math.round(width * 0.5f);
         final int y1 = (int) Math.round(height * 0.5f);
         final int x2 = (int) Math.round(width * 0.75f);
@@ -180,8 +180,10 @@ public void twoFingerDrag() throws Exception {
      * Touch down two fingers, release both,
      * touch down two fingers again and release them
      */
-    @Test
-    public void pressReleasePressTest() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void pressReleasePressTest(TestTouchDevice device) throws Exception {
+        createDevice(device, null);
         int x1 = (int) Math.round(width / 2);
         int y1 = (int) Math.round(height * 0.3);
         int x2 = (int) Math.round(width / 2);
@@ -226,8 +228,10 @@ public void pressReleasePressTest() throws Exception {
         TestLogShim.waitForLogContaining("TouchPoint: RELEASED %d, %d", x2, y2);
     }
 
-    @Test
-    public void twoFingerDragSingleFingerTap() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void twoFingerDragSingleFingerTap(TestTouchDevice device) throws Exception {
+        createDevice(device, null);
         final int x1 = (int) Math.round(width * 0.5f);
         final int y1 = (int) Math.round(height * 0.5f);
         final int x2 = (int) Math.round(width * 0.75f);
@@ -274,8 +278,10 @@ public void twoFingerDragSingleFingerTap() throws Exception {
         TestLogShim.waitForLogContaining("TouchPoint: RELEASED %d, %d", x1, y1 + dy);
     }
 
-    @Test
-    public void twoFingersPressDragOne() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void twoFingersPressDragOne(TestTouchDevice device) throws Exception {
+        createDevice(device, null);
         int delta = device.getTapRadius() + 1;
         TestLogShim.reset();
         int x1 = (int) Math.round(width * 0.2);
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/MultiTouch3Test.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/MultiTouch3Test.java
index 32977b344cd..5babf486f64 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/MultiTouch3Test.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/MultiTouch3Test.java
@@ -26,26 +26,19 @@
 package test.robot.com.sun.glass.ui.monocle;
 
 import java.util.Collection;
-import org.junit.Test;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import com.sun.glass.ui.monocle.TestLogShim;
 import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice;
 import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevices;
 
 /** Multitouch tests with three points */
-public class MultiTouch3Test extends ParameterizedTestBase {
+public final class MultiTouch3Test extends ParameterizedTestBase {
 
-    public MultiTouch3Test(TestTouchDevice device) {
-        super(device);
-    }
-
-    @Parameterized.Parameters
-    public static Collection<Object[]> data() {
+    private static Collection<TestTouchDevice> parameters() {
         return TestTouchDevices.getTouchDeviceParameters(3);
     }
 
-    @Test
-//    @Ignore("RT-35546")
     /** This test follows the sequence described in touch event documentation:
      * 1. Touch the screen with two fingers
      * 2. Move both fingers
@@ -53,7 +46,10 @@ public static Collection<Object[]> data() {
      * 4. Move all fingers
      * 5. Remove all fingers
      */
-    public void touchSequence() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void touchSequence(TestTouchDevice device) throws Exception {
+        createDevice(device, null);
         final int x1 = (int) Math.round(width * 0.5f);
         final int y1 = (int) Math.round(height * 0.5f);
         final int x2 = (int) Math.round(width * 0.75f);
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ParameterizedTestBase.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ParameterizedTestBase.java
index 06c413d83d9..bc03819c668 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ParameterizedTestBase.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ParameterizedTestBase.java
@@ -27,27 +27,23 @@
 
 import javafx.application.Platform;
 import javafx.geometry.Rectangle2D;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.internal.AssumptionViolatedException;
-import org.junit.rules.TestName;
-import org.junit.rules.TestWatchman;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.model.FrameworkMethod;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInfo;
 import com.sun.glass.ui.monocle.TestLogShim;
 import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice;
 
-@RunWith(Parameterized.class)
 public abstract class ParameterizedTestBase {
 
-    protected final TestTouchDevice device;
-    protected final Rectangle2D stageBounds;
+    protected TestTouchDevice device;
+    private String testName;
     private Throwable exception;
     protected double width;
     protected double height;
 
+    /**
+     * There seems to be no need to handle assumptions this way in junit5.
+     *
     @Rule
     public TestWatchman monitor = new TestWatchman() {
         @Override
@@ -61,23 +57,20 @@ public void failed(Throwable e, FrameworkMethod method) {
             }
         }
     };
+    */
 
-    @Rule public TestName name = new TestName();
-
-
-    public ParameterizedTestBase(TestTouchDevice device, Rectangle2D stageBounds) {
-        this.device = device;
-        this.stageBounds = stageBounds;
-    }
-
-    public ParameterizedTestBase(TestTouchDevice device) {
-        this(device, null);
+    // gets test name from the junit5 system
+    @BeforeEach
+    void getTestName(TestInfo t) {
+        testName = t.getDisplayName();
     }
 
-    @Before
-    public void createDevice() throws Exception {
+    // @BeforeEach
+    // junit5 does not support parameterized class-level tests yet
+    protected void createDevice(TestTouchDevice device, Rectangle2D stageBounds) throws Exception {
+        this.device = device;
         TestApplication.showScene(stageBounds);
-        TestLogShim.log("Starting " + name.getMethodName() + "[" + device + "]");
+        TestLogShim.log("Starting " + testName + "[" + device + "]");
         Rectangle2D r = TestApplication.getScreenBounds();
         width = r.getWidth();
         height = r.getHeight();
@@ -92,18 +85,20 @@ public void createDevice() throws Exception {
                         (t, e) -> exception = e));
     }
 
-    @After
+    @AfterEach
     public void destroyDevice() throws Throwable {
         if (device != null) {
             device.destroy();
         }
-        TestApplication.waitForNextPulse();
-        if (exception != null) {
-            RuntimeException rte = new RuntimeException("Uncaught exception");
-            rte.setStackTrace(new StackTraceElement[0]);
-            rte.initCause(exception);
-            throw rte;
+        // junit5: ignored tests do not initialize the toolkit
+        if (device != null) {
+            TestApplication.waitForNextPulse();
+            if (exception != null) {
+                RuntimeException rte = new RuntimeException("Uncaught exception");
+                rte.setStackTrace(new StackTraceElement[0]);
+                rte.initCause(exception);
+                throw rte;
+            }
         }
     }
-
 }
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/RapidTapTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/RapidTapTest.java
index 114855b00f0..a1f605509df 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/RapidTapTest.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/RapidTapTest.java
@@ -29,28 +29,25 @@
 import java.util.concurrent.CountDownLatch;
 import javafx.animation.AnimationTimer;
 import javafx.application.Platform;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import com.sun.glass.ui.monocle.TestLogShim;
 import test.com.sun.glass.ui.monocle.TestRunnable;
 import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice;
 import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevices;
 
-public class RapidTapTest extends ParameterizedTestBase {
+public final class RapidTapTest extends ParameterizedTestBase {
 
-    public RapidTapTest(TestTouchDevice device) {
-        super(device);
-    }
-
-    @Parameterized.Parameters
-    public static Collection<Object[]> data() {
+    private static Collection<TestTouchDevice> parameters() {
         return TestTouchDevices.getTouchDeviceParameters(1);
     }
 
     /** 20 quick taps */
-    @Test
-    public void tapTwentyTimes() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void tapTwentyTimes(TestTouchDevice device) throws Exception {
+        createDevice(device, null);
         for (int i = 0; i < 20; i++) {
             int p = device.addPoint(width / 2, height / 2);
             device.sync();
@@ -60,22 +57,24 @@ public void tapTwentyTimes() throws Exception {
             device.sync();
         }
         TestRunnable.invokeAndWaitUntilSuccess(() -> {
-            Assert.assertEquals(20, TestLogShim.countLogContaining(
+            Assertions.assertEquals(20, TestLogShim.countLogContaining(
                     "TouchPoint: PRESSED"));
-            Assert.assertEquals(20, TestLogShim.countLogContaining(
+            Assertions.assertEquals(20, TestLogShim.countLogContaining(
                     "TouchPoint: RELEASED"));
-            Assert.assertEquals(20,
+            Assertions.assertEquals(20,
                                 TestLogShim.countLogContaining("Mouse pressed"));
-            Assert.assertEquals(20,
+            Assertions.assertEquals(20,
                                 TestLogShim.countLogContaining("Mouse released"));
-            Assert.assertEquals(20,
+            Assertions.assertEquals(20,
                                 TestLogShim.countLogContaining("Mouse clicked"));
         }, 3000);
     }
 
     /** 20 quick taps while the application thread is busy */
-    @Test
-    public void tapTwentyTimesUnderStress() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void tapTwentyTimesUnderStress(TestTouchDevice device) throws Exception {
+        createDevice(device, null);
         final CountDownLatch latch = new CountDownLatch(1);
         // throttle the application thread
         final AnimationTimer a = new AnimationTimer() {
@@ -100,11 +99,11 @@ public void handle(long now) {
                 device.sync();
             }
             TestRunnable.invokeAndWaitUntilSuccess(() -> {
-                Assert.assertEquals(20, TestLogShim.countLogContaining("TouchPoint: PRESSED"));
-                Assert.assertEquals(20, TestLogShim.countLogContaining("TouchPoint: RELEASED"));
-                Assert.assertEquals(20, TestLogShim.countLogContaining("Mouse pressed"));
-                Assert.assertEquals(20, TestLogShim.countLogContaining("Mouse released"));
-                Assert.assertEquals(20, TestLogShim.countLogContaining("Mouse clicked"));
+                Assertions.assertEquals(20, TestLogShim.countLogContaining("TouchPoint: PRESSED"));
+                Assertions.assertEquals(20, TestLogShim.countLogContaining("TouchPoint: RELEASED"));
+                Assertions.assertEquals(20, TestLogShim.countLogContaining("Mouse pressed"));
+                Assertions.assertEquals(20, TestLogShim.countLogContaining("Mouse released"));
+                Assertions.assertEquals(20, TestLogShim.countLogContaining("Mouse clicked"));
             }, 10000);
         } finally {
             Platform.runLater(a::stop);
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/RobotTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/RobotTest.java
index b665f5c8dc9..a79bf940556 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/RobotTest.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/RobotTest.java
@@ -25,8 +25,8 @@
 
 package test.robot.com.sun.glass.ui.monocle;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
@@ -37,10 +37,9 @@
 import javafx.scene.input.MouseButton;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.robot.Robot;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestName;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
 import com.sun.glass.ui.monocle.TestLogShim;
 
 /**
@@ -49,25 +48,24 @@
  */
 public class RobotTest {
 
-    @Rule public TestName name = new TestName();
-
-    @Before
-    public void setUpScreen() throws Exception {
+    @BeforeEach
+    public void setUpScreen(TestInfo t) throws Exception {
         TestLogShim.reset();
-        TestLogShim.log(name.getMethodName());
+        // get test name from the junit5
+        TestLogShim.log(t.getDisplayName());
         TestApplication.showFullScreenScene();
     }
 
     @Test
     public void clickKeyModifierTest() throws Exception {
         runWithKeyPress(KeyCode.CONTROL, MouseButton.PRIMARY, "Clicked at 300, 400 with modifier 'CTRL'", evt -> {
-            assertTrue("Ctrl should be down",evt.isControlDown());
+            assertTrue(evt.isControlDown(), "Ctrl should be down");
         });
         runWithKeyPress(KeyCode.SHIFT, MouseButton.PRIMARY, "Clicked at 300, 400 with modifier 'SHIFT'", evt -> {
-            assertTrue("Shift should be down",evt.isShiftDown());
+            assertTrue(evt.isShiftDown(), "Shift should be down");
         });
         runWithKeyPress(KeyCode.ALT, MouseButton.PRIMARY, "Clicked at 300, 400 with modifier 'ALT'", evt -> {
-            assertTrue("Alt should be down",evt.isAltDown());
+            assertTrue(evt.isAltDown(), "Alt should be down");
         });
     }
 
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/RotateTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/RotateTest.java
index cb2ae5ff74b..9c2b58e3569 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/RotateTest.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/RotateTest.java
@@ -26,13 +26,12 @@
 package test.robot.com.sun.glass.ui.monocle;
 
 import java.util.Collection;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import com.sun.glass.ui.monocle.TestLogShim;
 import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice;
 import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevices;
@@ -42,7 +41,7 @@
  * By default rotation starting form 0 degrees position - on Axis Y,
  * but it can be sent from any other location on the object
  *  */
-public class RotateTest extends ParameterizedTestBase {
+public final class RotateTest extends ParameterizedTestBase {
 
     private int newX1;
     private int newY1;
@@ -53,27 +52,25 @@ public class RotateTest extends ParameterizedTestBase {
     private int p1;
     private int p2;
 
-    public RotateTest(TestTouchDevice device) {
-        super(device);
-    }
-
-    @Parameterized.Parameters
-    public static Collection<Object[]> data() {
+    private static Collection<TestTouchDevice> parameters() {
         return TestTouchDevices.getTouchDeviceParameters(2);
     }
 
-    @Before
-    public void init() {
+    // @BeforeEach
+    // junit5 does not support parameterized class-level tests yet
+    public void init(TestTouchDevice device) throws Exception {
+        createDevice(device, null);
         //Rotate tests should be run only on platforms that support current feature
-        Assume.assumeTrue(Boolean.getBoolean("com.sun.javafx.gestures.rotate"));
+        Assumptions.assumeTrue(Boolean.getBoolean("com.sun.javafx.gestures.rotate"));
+
         centerX = (int) Math.round(width * 0.5);
         centerY = (int) Math.round(height * 0.5);
         radius = (int) Math.round(height * 0.45);
     }
 
-    @After
+    @AfterEach
     public void releaseAll() throws Exception {
-        if (device.getPressedPoints() == 2) {
+        if ((device != null) && (device.getPressedPoints() == 2)) {
             TestLogShim.reset();
             device.removePoint(p1);
             device.removePoint(p2);
@@ -125,7 +122,7 @@ private void Rotate(int startAngle, int radius, int x2, int y2, int angleStep,
 
         updateNewTouchPoint((angleStep + startAngle), radius, x2, y2);
 
-        Assume.assumeTrue(getDistance(previousX, previousY, newX1, newY1 )
+        Assumptions.assumeTrue(getDistance(previousX, previousY, newX1, newY1 )
                 > device.getTapRadius());
 
         //start the rotation
@@ -142,8 +139,8 @@ private void Rotate(int startAngle, int radius, int x2, int y2, int angleStep,
                 + ", total angle: " + totalAngle
                 + ", inertia value: false");
         } else {
-            Assert.assertEquals(0, TestLogShim.countLogContaining("Rotation started"));
-            Assert.assertEquals(0, TestLogShim.countLogContaining("Rotation, angle"));
+            Assertions.assertEquals(0, TestLogShim.countLogContaining("Rotation started"));
+            Assertions.assertEquals(0, TestLogShim.countLogContaining("Rotation, angle"));
         }
         boolean passedTheThreshold =false;
         if (numOfIterations >= 2) {
@@ -191,12 +188,12 @@ private void Rotate(int startAngle, int radius, int x2, int y2, int angleStep,
         if (Math.abs(totalAngle) >= getRotateThreshold()) {
             TestLogShim.waitForLogContaining("Rotation finished, angle: " + ZERO_ANGLE
                     + ", total angle: " + totalAngle + ", inertia value: false");
-            Assert.assertEquals(1, TestLogShim.countLogContaining("Rotation "
+            Assertions.assertEquals(1, TestLogShim.countLogContaining("Rotation "
                     + "finished, " + "angle: " + ZERO_ANGLE
                     + ", total angle: " + totalAngle
                     + ", inertia value: false"));
         } else {
-            Assert.assertEquals(0, TestLogShim.countLogContaining("Rotation finished, "
+            Assertions.assertEquals(0, TestLogShim.countLogContaining("Rotation finished, "
                     + "angle: " + ZERO_ANGLE + ", total angle: " + totalAngle
                     + ", inertia value: false"));
         }
@@ -228,8 +225,10 @@ private void Rotate(int angleStep, int numOfIterations) throws Exception {
      * Tap two fingers, drag a little bit upper finger right in order move,
      * but not enough for rotation.
      */
-    @Test
-    public void testSmallStepRightNoRotateSent() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSmallStepRightNoRotateSent(TestTouchDevice device) throws Exception {
+        init(device);
         Rotate(4, 1);
     }
 
@@ -237,33 +236,41 @@ public void testSmallStepRightNoRotateSent() throws Exception {
      * Tap two fingers, drag a little bit upper finger right in order move,
      * but not enough for rotation, then make 2 more small moves
      */
-    @Test
-    public void testRotateRightByFewSmallSteps() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testRotateRightByFewSmallSteps(TestTouchDevice device) throws Exception {
+        init(device);
         Rotate(4, 5);
     }
 
     /**
      * Tap two fingers, drag upper finger right in order to rotate
      */
-    @Test
-    public void testRotateRight() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testRotateRight(TestTouchDevice device) throws Exception {
+        init(device);
         Rotate(15, 6);
     }
 
     /**
      * Tap two fingers, rotate the object right (by 3 steps, 50 degrees each)
      */
-    @Test
-    public void testRotateRightBigSteps() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testRotateRightBigSteps(TestTouchDevice device) throws Exception {
+        init(device);
         Rotate(50, 3);
     }
 
     /**
      * Tap two fingers, rotate the object right by only 1 very big step - 80 degrees
      */
-    @Test
-    @Ignore //RT-36616
-    public void testRotateRightOneBigStep() throws Exception {
+    @Disabled //RT-36616
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testRotateRightOneBigStep(TestTouchDevice device) throws Exception {
+        init(device);
         Rotate(80, 1);
     }
 
@@ -271,8 +278,10 @@ public void testRotateRightOneBigStep() throws Exception {
      * Tap two fingers, drag a little bit upper finger left in order move,
      * but not enough for rotation.
      */
-    @Test
-    public void testSmallStepLeftNoRotateSent() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSmallStepLeftNoRotateSent(TestTouchDevice device) throws Exception {
+        init(device);
         Rotate(-4, 1);
     }
 
@@ -280,98 +289,121 @@ public void testSmallStepLeftNoRotateSent() throws Exception {
      * Tap two fingers, drag a little bit upper finger left in order move,
      * but not enough for rotation, then make 9 more small moves
      */
-    @Test
-    public void testRotateLeftByFewSmallSteps() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testRotateLeftByFewSmallSteps(TestTouchDevice device) throws Exception {
+        init(device);
         Rotate(-4, 10);
     }
 
     /**
      * Tap two fingers, drag upper finger left in order to rotate
      */
-    @Test
-    public void testRotateLeft() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testRotateLeft(TestTouchDevice device) throws Exception {
+        init(device);
         Rotate(-10, 4);
     }
 
     /**
      * Tap two fingers, rotate the object left (by 5 steps, 40 degrees each)
      */
-    @Test
-    public void testRotateLeftBigSteps() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testRotateLeftBigSteps(TestTouchDevice device) throws Exception {
+        init(device);
         Rotate(-40, 5);
     }
 
     /**
      * Tap two fingers, rotate the object left by only 1 very big step - 70 degrees
      */
-    @Test
-    @Ignore //RT-36616
-    public void testRotateLeftOneBigStep() throws Exception {
+    @Disabled //RT-36616
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testRotateLeftOneBigStep(TestTouchDevice device) throws Exception {
+        init(device);
         Rotate(-70, 1);
     }
 
     /**
      * Tap two fingers in 45 degrees, rotate the object right
      */
-    @Test
-    public void testRotateRightFrom45Degrees() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testRotateRightFrom45Degrees(TestTouchDevice device) throws Exception {
+        init(device);
         Rotate(45, 20, 3);
     }
 
     /**
      * Tap two fingers in 45 degrees, rotate the object left
      */
-    @Test
-    public void testRotateLeftFrom45Degrees() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testRotateLeftFrom45Degrees(TestTouchDevice device) throws Exception {
+        init(device);
         Rotate(45, -20, 3);
     }
 
     /**
      * Tap two fingers in -45 degrees, rotate the object right
      */
-    @Test
-    public void testRotateRightFromMinus45Degrees() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testRotateRightFromMinus45Degrees(TestTouchDevice device) throws Exception {
+        init(device);
         Rotate(-45, 20, 3);
     }
 
     /**
      * Tap two fingers in -45 degrees, rotate the object left
      */
-    @Test
-    public void testRotateLeftFromMinus45Degrees() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testRotateLeftFromMinus45Degrees(TestTouchDevice device) throws Exception {
+        init(device);
         Rotate(-45, -20, 3);
     }
 
     /**
      * Tap two fingers in 140 degrees, rotate the object right
      */
-    @Test
-    public void testRotateRightFrom140Degrees() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testRotateRightFrom140Degrees(TestTouchDevice device) throws Exception {
+        init(device);
         Rotate(140, 20, 3);
     }
 
     /**
      * Tap two fingers in 140 degrees, rotate the object left
      */
-    @Test
-    public void testRotateLeftFrom140Degrees() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testRotateLeftFrom140Degrees(TestTouchDevice device) throws Exception {
+        init(device);
         Rotate(140, -20, 3);
     }
 
     /**
      * Tap two fingers in -140 degrees, rotate the object right
      */
-    @Test
-    public void testRotateRightFromMinus140Degrees() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testRotateRightFromMinus140Degrees(TestTouchDevice device) throws Exception {
+        init(device);
         Rotate(-140, 20, 3);
     }
 
     /**
      * Tap two fingers in -140 degrees, rotate the object left
      */
-    @Test
-    public void testRotateLeftFromMinus140Degrees() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testRotateLeftFromMinus140Degrees(TestTouchDevice device) throws Exception {
+        init(device);
         Rotate(-140, -20, 3);
     }
-
 }
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ScrollTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ScrollTest.java
index 11832d5e72c..96c9b5b5225 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ScrollTest.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ScrollTest.java
@@ -25,9 +25,10 @@
 
 package test.robot.com.sun.glass.ui.monocle;
 
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import com.sun.glass.ui.monocle.TestLogShim;
 import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice;
 
@@ -36,10 +37,6 @@
  *  */
 public class ScrollTest extends ScrollTestBase {
 
-    public ScrollTest(TestTouchDevice device) {
-        super(device);
-    }
-
     private int getDelta() throws Exception {
         int max = Math.max(getScrollThreshold(), device.getTapRadius());
         return Math.max(max, 30) + 1;
@@ -48,8 +45,10 @@ private int getDelta() throws Exception {
     /**
      * Tap one finger, drag it up few times in order to scroll
      */
-    @Test
-    public void testScrollUp() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testScrollUp(TestTouchDevice device) throws Exception {
+        init(device);
         pressFirstFinger();
         moveOneFinger(0, -getDelta(), 3, true);
         releaseFirstFinger();
@@ -58,8 +57,10 @@ public void testScrollUp() throws Exception {
     /**
      * Tap one finger, drag it to the right few times in order to scroll
      */
-    @Test
-    public void testScrollRight() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testScrollRight(TestTouchDevice device) throws Exception {
+        init(device);
         pressFirstFinger();
         moveOneFinger(getDelta(), 0, 2, true);
         releaseFirstFinger();
@@ -68,8 +69,10 @@ public void testScrollRight() throws Exception {
     /**
      * Tap one finger, drag it down few times in order to scroll
      */
-    @Test
-    public void testScrollDown() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testScrollDown(TestTouchDevice device) throws Exception {
+        init(device);
         pressFirstFinger();
         moveOneFinger(0, getDelta(), 5, true);
         releaseFirstFinger();
@@ -78,8 +81,10 @@ public void testScrollDown() throws Exception {
     /**
      * Tap one finger, drag it to the left few times in order to scroll
      */
-    @Test
-    public void testScrollLeft() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testScrollLeft(TestTouchDevice device) throws Exception {
+        init(device);
         pressFirstFinger();
         moveOneFinger(-getDelta() * 2, 0, 4, true);
         releaseFirstFinger();
@@ -88,8 +93,10 @@ public void testScrollLeft() throws Exception {
     /**
      * Tap one finger, drag it up & right few times in order to scroll
      */
-    @Test
-    public void testScrollUpAndRight() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testScrollUpAndRight(TestTouchDevice device) throws Exception {
+        init(device);
         pressFirstFinger();
         moveOneFinger(getDelta(), -getDelta(), 3, true);
         releaseFirstFinger();
@@ -98,8 +105,10 @@ public void testScrollUpAndRight() throws Exception {
     /**
      * Tap one finger, drag it down & right few times in order to scroll
      */
-    @Test
-    public void testScrollDownAndRight() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testScrollDownAndRight(TestTouchDevice device) throws Exception {
+        init(device);
         pressFirstFinger();
         moveOneFinger(getDelta(), getDelta(), 2, true);
         releaseFirstFinger();
@@ -108,8 +117,10 @@ public void testScrollDownAndRight() throws Exception {
     /**
      * Tap one finger, drag it left & down few times in order to scroll
      */
-    @Test
-    public void testScrollDownAndLeft() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testScrollDownAndLeft(TestTouchDevice device) throws Exception {
+        init(device);
         pressFirstFinger();
         moveOneFinger(-getDelta(), getDelta(), 5, true);
         releaseFirstFinger();
@@ -118,8 +129,10 @@ public void testScrollDownAndLeft() throws Exception {
     /**
      * Tap one finger, drag it left & up few times in order to scroll
      */
-    @Test
-    public void testScrollUpAndLeft() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testScrollUpAndLeft(TestTouchDevice device) throws Exception {
+        init(device);
         pressFirstFinger();
         moveOneFinger(-getDelta(), -getDelta() * 2, 4, true);
         releaseFirstFinger();
@@ -128,9 +141,11 @@ public void testScrollUpAndLeft() throws Exception {
     /**
      * Tap two fingers, scroll up
      */
-    @Test
-    public void testTwoFingersScrollUp() throws Exception {
-        Assume.assumeTrue(device.getPointCount() >= 2);
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testTwoFingersScrollUp(TestTouchDevice device) throws Exception {
+        Assumptions.assumeTrue(device.getPointCount() >= 2);
+        init(device);
         pressFirstFinger();
         pressSecondFinger();
         moveTwoFingers(0, -getDelta(), 3, true, false);
@@ -140,9 +155,11 @@ public void testTwoFingersScrollUp() throws Exception {
     /**
      * Tap two fingers, scroll up, scroll down
      */
-    @Test
-    public void testTwoFingersScrollTwice() throws Exception {
-        Assume.assumeTrue(device.getPointCount() >= 2);
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testTwoFingersScrollTwice(TestTouchDevice device) throws Exception {
+        Assumptions.assumeTrue(device.getPointCount() >= 2);
+        init(device);
         pressFirstFinger();
         pressSecondFinger();
         moveTwoFingers(0, -getDelta(), 1, true, false);
@@ -153,9 +170,11 @@ public void testTwoFingersScrollTwice() throws Exception {
     /**
      * Tap one finger, scroll down, add second finger, continue scrolling down
      */
-    @Test
-    public void testTwoFingersScroll1() throws Exception {
-        Assume.assumeTrue(device.getPointCount() >= 2);
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testTwoFingersScroll1(TestTouchDevice device) throws Exception {
+        Assumptions.assumeTrue(device.getPointCount() >= 2);
+        init(device);
         pressFirstFinger();
         moveOneFinger(0, getDelta(), 2, true);
         pressSecondFinger();
@@ -167,10 +186,11 @@ public void testTwoFingersScroll1() throws Exception {
     /**
      * Tap two fingers, scroll down, release one finger, continue scrolling down
      */
-    @Test
-    public void testTwoFingersScroll2()
-            throws Exception {
-        Assume.assumeTrue(device.getPointCount() >= 2);
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testTwoFingersScroll2(TestTouchDevice device) throws Exception {
+        Assumptions.assumeTrue(device.getPointCount() >= 2);
+        init(device);
         pressFirstFinger();
         pressSecondFinger();
         moveTwoFingers(0, getDelta(), 1, true, false);
@@ -184,10 +204,11 @@ public void testTwoFingersScroll2()
      * add second finger, continue scrolling down,
      * remove second finger, continue scrolling down.
      */
-    @Test
-    public void testTwoFingersScroll3()
-            throws Exception {
-        Assume.assumeTrue(device.getPointCount() >= 2);
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testTwoFingersScroll3(TestTouchDevice device) throws Exception {
+        Assumptions.assumeTrue(device.getPointCount() >= 2);
+        init(device);
         pressFirstFinger();
         moveOneFinger(0, getDelta(), 2, true);
         pressSecondFinger();
@@ -201,13 +222,15 @@ public void testTwoFingersScroll3()
      * Tap two fingers, scroll them down asymmetrically: first finger's location
      * changed by delta, second finger's location changed by (delta * 2)
      */
-    @Test
-    public void testTwoFingersAsymmetricScroll() throws Exception {
-        Assume.assumeTrue(device.getPointCount() >= 2);
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testTwoFingersAsymmetricScroll(TestTouchDevice device) throws Exception {
+        Assumptions.assumeTrue(device.getPointCount() >= 2);
+        init(device);
         int deltaY1 = getDelta() + 1;
         int deltaY2 = deltaY1 * 2;
         int numOfIterations = 4;
-        Assert.assertTrue(paramsValid(0, deltaY1, numOfIterations,
+        Assertions.assertTrue(paramsValid(0, deltaY1, numOfIterations,
                 point1X, point1Y) &&
                 paramsValid(0, deltaY2, numOfIterations,
                         point2X, point2Y));
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ScrollTestBase.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ScrollTestBase.java
index 0283267e624..88bef3430c2 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ScrollTestBase.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ScrollTestBase.java
@@ -26,11 +26,9 @@
 package test.robot.com.sun.glass.ui.monocle;
 
 import java.util.Collection;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Assumptions;
 import com.sun.glass.ui.monocle.TestLogShim;
 import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice;
 import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevices;
@@ -49,32 +47,34 @@ public abstract class ScrollTestBase extends ParameterizedTestBase {
     protected int totalDeltaX = 0;
     protected int totalDeltaY = 0;
 
-    public ScrollTestBase(TestTouchDevice device) {
-        super(device);
-    }
-
-    @Parameterized.Parameters
-    public static Collection<Object[]> data() {
+    public static Collection<TestTouchDevice> parameters() {
         return TestTouchDevices.getTouchDeviceParameters(1);
     }
 
-    @Before
-    public void init() {
-        Assume.assumeTrue(TestApplication.isMonocle());
+    // @BeforeEach
+    // junit5 does not support parameterized class-level tests yet
+    public void init(TestTouchDevice device) throws Exception {
+        createDevice(device, null);
+
+        Assumptions.assumeTrue(TestApplication.isMonocle());
         //Scroll tests should be running only on platforms that support current feature
-        Assume.assumeTrue(Boolean.getBoolean("com.sun.javafx.gestures.scroll"));
+        Assumptions.assumeTrue(Boolean.getBoolean("com.sun.javafx.gestures.scroll"));
+
         point1X = (int) Math.round(width * 0.5);
         point1Y = (int) Math.round(height * 0.5);
         point2X = point1X + 40;
         point2Y = point1Y;
     }
 
-    @After
+    @AfterEach
     public void releaseAll() throws Exception {
-        if (device.getPressedPoints() == 1) {
-            releaseFirstFinger();
-        } else if (device.getPressedPoints() == 2){
-            releaseAllFingers();
+        // junit5: device can be null in ignored/assumed cases
+        if (device != null) {
+            if (device.getPressedPoints() == 1) {
+                releaseFirstFinger();
+            } else if (device.getPressedPoints() == 2) {
+                releaseAllFingers();
+            }
         }
     }
 
@@ -99,7 +99,7 @@ protected boolean paramsValid(int dX, int dY, int num, int x, int y) {
     }
 
     protected void pressFirstFinger() throws Exception {
-        Assert.assertEquals(0, device.getPressedPoints());
+        Assertions.assertEquals(0, device.getPressedPoints());
         TestLogShim.reset();
         p1 = device.addPoint(point1X, point1Y);
         device.sync();
@@ -107,7 +107,7 @@ protected void pressFirstFinger() throws Exception {
     }
 
     protected void pressSecondFinger() throws Exception {
-        Assert.assertEquals(1, device.getPressedPoints());
+        Assertions.assertEquals(1, device.getPressedPoints());
         TestLogShim.reset();
         point2X = point1X + 40;
         point2Y = point1Y;
@@ -127,8 +127,8 @@ protected void pressSecondFinger() throws Exception {
     protected void moveOneFinger(int deltaX, int deltaY, int numOfIterations,
                                boolean firstMove) throws Exception {
         TestLogShim.reset();
-        Assert.assertEquals(1, device.getPressedPoints());
-        Assert.assertTrue(paramsValid(deltaX, deltaY, numOfIterations,
+        Assertions.assertEquals(1, device.getPressedPoints());
+        Assertions.assertTrue(paramsValid(deltaX, deltaY, numOfIterations,
                 point1X, point1Y));
         point1X += deltaX;
         point1Y += deltaY;
@@ -154,8 +154,8 @@ protected void moveOneFinger(int deltaX, int deltaY, int numOfIterations,
                         + ", touch points: " + 1
                         + ", inertia value: false");
             } else {
-                Assert.assertEquals(0, TestLogShim.countLogContaining("Scroll started"));
-                Assert.assertEquals(0, TestLogShim.countLogContaining("Scroll, DeltaX:"));
+                Assertions.assertEquals(0, TestLogShim.countLogContaining("Scroll started"));
+                Assertions.assertEquals(0, TestLogShim.countLogContaining("Scroll, DeltaX:"));
             }
         } else {
             totalDeltaX += deltaX;
@@ -217,8 +217,8 @@ protected void moveTwoFingers(int deltaX, int deltaY, int numOfIterations,
                                 boolean firstMove, boolean fingersChanged)
                                 throws Exception {
         TestLogShim.reset();
-        Assert.assertEquals(2, device.getPressedPoints());
-        Assert.assertTrue(paramsValid(deltaX, deltaY, numOfIterations,
+        Assertions.assertEquals(2, device.getPressedPoints());
+        Assertions.assertTrue(paramsValid(deltaX, deltaY, numOfIterations,
                 point1X, point1Y) && paramsValid(deltaX, deltaY, numOfIterations,
                 point2X, point2Y));
         point1X += deltaX;
@@ -249,9 +249,9 @@ protected void moveTwoFingers(int deltaX, int deltaY, int numOfIterations,
                         + ", touch points: " + 2
                         + ", inertia value: false");
             } else {
-                Assert.assertEquals(0, TestLogShim.countLogContaining("Scroll " +
+                Assertions.assertEquals(0, TestLogShim.countLogContaining("Scroll " +
                         "started"));
-                Assert.assertEquals(0, TestLogShim.countLogContaining("Scroll, DeltaX:"));
+                Assertions.assertEquals(0, TestLogShim.countLogContaining("Scroll, DeltaX:"));
             }
         } else {
             if (fingersChanged) {
@@ -317,7 +317,7 @@ protected void moveTwoFingers(int deltaX, int deltaY, int numOfIterations,
      * The method releases one finger that is currently pressing on the screen
      */
     protected void releaseFirstFinger() throws Exception {
-        Assert.assertEquals(1, device.getPressedPoints());
+        Assertions.assertEquals(1, device.getPressedPoints());
         String expectedLog;
         TestLogShim.reset();
         device.removePoint(p1);
@@ -339,7 +339,7 @@ protected void releaseFirstFinger() throws Exception {
         }
         totalDeltaX = 0;
         totalDeltaY = 0;
-        Assert.assertEquals(expectedValue, TestLogShim.countLogContaining(expectedLog));
+        Assertions.assertEquals(expectedValue, TestLogShim.countLogContaining(expectedLog));
         if (TestLogShim.countLogContaining("Scroll finished") > 0) {
             TestLogShim.waitForLogContainingSubstrings("Scroll", "inertia value: true");
         }
@@ -350,7 +350,7 @@ protected void releaseFirstFinger() throws Exception {
      * pressing on the screen
      */
     protected void releaseSecondFinger() throws Exception {
-        Assert.assertEquals(2, device.getPressedPoints());
+        Assertions.assertEquals(2, device.getPressedPoints());
         String expectedLog;
         TestLogShim.reset();
         device.removePoint(p2);
@@ -372,14 +372,14 @@ protected void releaseSecondFinger() throws Exception {
         }
         totalDeltaX = 0;
         totalDeltaY = 0;
-        Assert.assertEquals(expectedValue, TestLogShim.countLogContaining(expectedLog));
+        Assertions.assertEquals(expectedValue, TestLogShim.countLogContaining(expectedLog));
     }
 
     /**
      * The method releases two fingers that are currently pressing on the screen
      */
     protected void releaseAllFingers() throws Exception {
-        Assert.assertEquals(2, device.getPressedPoints());
+        Assertions.assertEquals(2, device.getPressedPoints());
         String expectedLog;
         TestLogShim.reset();
         device.removePoint(p1);
@@ -402,14 +402,14 @@ protected void releaseAllFingers() throws Exception {
         }
         totalDeltaX = 0;
         totalDeltaY = 0;
-        Assert.assertEquals(expectedValue, TestLogShim.countLogContaining(expectedLog));
+        Assertions.assertEquals(expectedValue, TestLogShim.countLogContaining(expectedLog));
         if (TestLogShim.countLogContaining("Scroll finished") > 0) {
             TestLogShim.waitForLogContainingSubstrings("Scroll", "inertia value: true");
         }
     }
 
     protected void tapToStopInertia() throws Exception {
-        Assert.assertEquals(0, device.getPressedPoints());
+        Assertions.assertEquals(0, device.getPressedPoints());
         TestLogShim.reset();
         int p = device.addPoint(point1X, point1Y);
         device.sync();
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ScrollThresholdTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ScrollThresholdTest.java
index a78b4701274..c07af60af52 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ScrollThresholdTest.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ScrollThresholdTest.java
@@ -25,10 +25,10 @@
 
 package test.robot.com.sun.glass.ui.monocle;
 
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice;
 
 /**
@@ -38,32 +38,31 @@ public class ScrollThresholdTest extends ScrollTestBase {
 
     private int delta;
 
-    public ScrollThresholdTest(TestTouchDevice device) {
-        super(device);
-    }
-
-    @BeforeClass
+    @BeforeAll
     public static void beforeInit() {
         int threshold =
                 Integer.getInteger("com.sun.javafx.gestures.scroll.threshold", 10);
-        Assume.assumeTrue(threshold > 1);
+        Assumptions.assumeTrue(threshold > 1);
         System.setProperty("monocle.input.touchRadius",
                 Integer.toString(threshold - 2));
     }
 
-    @Before
+    // @BeforeEach
+    // junit5 does not support parameterized class-level tests yet
     @Override
-    public void init() {
-        super.init();
-        Assume.assumeTrue(device.getTapRadius() < getScrollThreshold());
+    public void init(TestTouchDevice device) throws Exception {
+        super.init(device);
+        Assumptions.assumeTrue(device.getTapRadius() < getScrollThreshold());
         delta = getScrollThreshold() - 1;
     }
 
     /**
      * Tap one finger, drag it less then threshold, scroll shouldn't happen
      */
-    @Test
-    public void testMoveUpCheckThreshold() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testMoveUpCheckThreshold(TestTouchDevice device) throws Exception {
+        init(device);
         pressFirstFinger();
         moveOneFinger(0, -delta , 1, true);
         releaseFirstFinger();
@@ -74,8 +73,10 @@ public void testMoveUpCheckThreshold() throws Exception {
      * Tap one finger, drag it less then threshold - scroll shouldn't happen,
      * drag it again (pass the threshold) - verify scrolling
      */
-    @Test
-    public void testMoveDownCheckThreshold() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testMoveDownCheckThreshold(TestTouchDevice device) throws Exception {
+        init(device);
         pressFirstFinger();
         moveOneFinger(0, delta , 3, true);
         releaseFirstFinger();
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/SimpleMouseTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/SimpleMouseTest.java
index 9f9e1f2906c..fe018c185fb 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/SimpleMouseTest.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/SimpleMouseTest.java
@@ -27,24 +27,24 @@
 
 import javafx.geometry.Rectangle2D;
 import javafx.stage.Screen;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestName;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
 import com.sun.glass.ui.monocle.TestLogShim;
 import test.com.sun.glass.ui.monocle.TestRunnable;
 
 public class SimpleMouseTest {
 
     private UInput ui;
-    @Rule public TestName name = new TestName();
 
-    @Before public void setUpScreen() throws Exception {
+    @BeforeEach
+    public void setUpScreen(TestInfo t) throws Exception {
         TestLogShim.reset();
-        TestLogShim.log(name.getMethodName());
+        // get test name from the junit5
+        TestLogShim.log(t.getDisplayName());
         TestApplication.showFullScreenScene();
         TestApplication.addMouseListeners();
         TestApplication.movePointerTo(300, 300);
@@ -65,7 +65,8 @@ public void initDevice() throws Exception {
         ui.processLine("CREATE");
     }
 
-    @After public void destroyDevice() throws Exception {
+    @AfterEach
+    public void destroyDevice() throws Exception {
         if (ui != null) {
             ui.waitForQuiet();
             try {
@@ -132,7 +133,7 @@ public void testWheelSequence() throws Exception {
         new TestRunnable() {
             @Override
             public void test() {
-                Assert.assertEquals(3, TestLogShim.countLogContaining("Scroll: 1"));
+                Assertions.assertEquals(3, TestLogShim.countLogContaining("Scroll: 1"));
             }
         }.invokeAndWaitUntilSuccess(3000l);
         TestLogShim.reset();
@@ -146,7 +147,7 @@ public void test() {
         new TestRunnable() {
             @Override
             public void test() {
-                Assert.assertEquals(3, TestLogShim.countLogContaining("Scroll: -1"));
+                Assertions.assertEquals(3, TestLogShim.countLogContaining("Scroll: -1"));
             }
         }.invokeAndWaitUntilSuccess(3000l);
     }
@@ -175,7 +176,7 @@ public void testClickRight() throws Exception {
 
     @Test
     public void testDragLookahead() throws Exception {
-        Assume.assumeTrue(TestApplication.isMonocle());
+        Assumptions.assumeTrue(TestApplication.isMonocle());
         TestApplication.showFullScreenScene();
         TestApplication.addMouseListeners();
         TestLogShim.reset();
@@ -221,12 +222,12 @@ public void testDragLookahead() throws Exception {
         TestLogShim.waitForLog("Mouse released: %d, %d", x3, y3);
         TestLogShim.waitForLog("Mouse dragged: %d, %d", x3, y3);
         // Check that moves in between were filtered
-        Assert.assertTrue(TestLogShim.countLogContaining("Mouse dragged") <= (x2 - x1) / 10);
+        Assertions.assertTrue(TestLogShim.countLogContaining("Mouse dragged") <= (x2 - x1) / 10);
     }
 
     @Test
     public void testMoveLookahead() throws Exception {
-        Assume.assumeTrue(TestApplication.isMonocle());
+        Assumptions.assumeTrue(TestApplication.isMonocle());
         TestApplication.showFullScreenScene();
         TestApplication.addMouseListeners();
         TestLogShim.reset();
@@ -265,11 +266,11 @@ public void testMoveLookahead() throws Exception {
         // Check that the final point reported is correct
         TestLogShim.waitForLog("Mouse moved: %d, %d", x3, y3);
         // Check that moves in between were filtered
-        Assert.assertTrue(TestLogShim.countLogContaining("Mouse moved") <= (x2 - x1) / 10);
+        Assertions.assertTrue(TestLogShim.countLogContaining("Mouse moved") <= (x2 - x1) / 10);
         // Check that we didn't get any other events
-        Assert.assertEquals(0, TestLogShim.countLogContaining("Mouse pressed"));
-        Assert.assertEquals(0, TestLogShim.countLogContaining("Mouse released"));
-        Assert.assertEquals(0, TestLogShim.countLogContaining("Mouse clicked"));
+        Assertions.assertEquals(0, TestLogShim.countLogContaining("Mouse pressed"));
+        Assertions.assertEquals(0, TestLogShim.countLogContaining("Mouse released"));
+        Assertions.assertEquals(0, TestLogShim.countLogContaining("Mouse clicked"));
     }
 
     @Test
@@ -317,7 +318,7 @@ public void testGrab1() throws Exception {
     public void testGrab2() throws Exception {
         TestApplication.showInMiddleOfScreen();
         TestApplication.addMouseListeners();
-        Assume.assumeTrue(TestApplication.isMonocle());
+        Assumptions.assumeTrue(TestApplication.isMonocle());
         Rectangle2D r = TestApplication.getScreenBounds();
         final int width = (int) r.getWidth();
         final int height = (int) r.getHeight();
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/SingleTouchNonFullScreenTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/SingleTouchNonFullScreenTest.java
index 7c741b7809a..b6ce256bbc3 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/SingleTouchNonFullScreenTest.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/SingleTouchNonFullScreenTest.java
@@ -30,15 +30,15 @@
 import java.util.List;
 import javafx.geometry.Rectangle2D;
 import javafx.scene.input.TouchEvent;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import com.sun.glass.ui.monocle.TestLogShim;
 import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice;
 import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevices;
 
-public class SingleTouchNonFullScreenTest extends ParameterizedTestBase {
+public final class SingleTouchNonFullScreenTest extends ParameterizedTestBase {
 
     private static final TestCase[] TEST_CASES = {
             new TestCase(200, 100, 400, 300, 200, 100, 599, 399),
@@ -72,27 +72,24 @@ public String toString() {
         }
     }
 
-    public SingleTouchNonFullScreenTest(TestTouchDevice device, TestCase testCase)
-    {
-        super(device, testCase.stageBounds);
-        this.testCase = testCase;
-        TestLogShim.format("Starting test with %s, %s", device, testCase);
-    }
-
-    @Parameterized.Parameters
-    public static Collection<Object[]> data() {
-        List<Object[]> params = new ArrayList<>();
+    private static Collection<Arguments> parameters() {
+        List<Arguments> params = new ArrayList<>();
         List<TestTouchDevice> devices = TestTouchDevices.getTouchDevices();
         for (TestTouchDevice device : devices) {
             for (TestCase testCase : TEST_CASES) {
-                params.add(new Object[]{device, testCase});
+                params.add(Arguments.of(device, testCase));
             }
         }
         return params;
     }
 
-    @Before
-    public void addListener() throws Exception {
+    // @BeforeEach
+    // junit5 does not support parameterized class-level tests yet
+    public void init(TestTouchDevice device, TestCase testCase) throws Exception {
+        this.testCase = testCase;
+        createDevice(device, testCase.stageBounds);
+        TestLogShim.format("Starting test with %s, %s", device, testCase);
+
         TestApplication.getStage().getScene().addEventHandler(
                 TouchEvent.TOUCH_PRESSED,
                 e -> TestLogShim.format("Touch pressed [relative]: %.0f, %.0f",
@@ -117,13 +114,15 @@ public void addListener() throws Exception {
     /**
      * Touch down and up
      */
-    @Test
-    public void tap() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void tap(TestTouchDevice device, TestCase testCase) throws Exception {
+        init(device, testCase);
         final int x1 = testCase.x1;
         final int y1 = testCase.y1;
 
-        final int relX1 = x1 - (int) stageBounds.getMinX();
-        final int relY1 = y1 - (int) stageBounds.getMinY();
+        final int relX1 = x1 - (int) testCase.stageBounds.getMinX();
+        final int relY1 = y1 - (int) testCase.stageBounds.getMinY();
         // tap
         int p = device.addPoint(x1, y1);
         device.sync();
@@ -139,25 +138,29 @@ public void tap() throws Exception {
         TestLogShim.waitForLog("Touch released: %d, %d", x1, y1);
 
         // Check that the touch event has one touch point.
-        Assert.assertEquals("Expected only one touch point", 0,
-                            TestLogShim.getLog().stream()
-                            .filter(s -> s.startsWith("Touch points count"))
-                            .filter(s -> !s.startsWith("Touch points count: [1]")).count());
+        Assertions.assertEquals(
+            0,
+            TestLogShim.getLog().stream()
+                .filter(s -> s.startsWith("Touch points count"))
+                .filter(s -> !s.startsWith("Touch points count: [1]")).count(),
+            "Expected only one touch point");
     }
 
     /**
      * Touch down, drag, touch up
      */
-    @Test
-    public void tapAndDrag() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void tapAndDrag(TestTouchDevice device, TestCase testCase) throws Exception {
+        init(device, testCase);
         final int x1 = testCase.x1;
         final int y1 = testCase.y1;
         final int x2 = testCase.x2;
         final int y2 = testCase.y2;
-        final int relX1 = x1 - (int) stageBounds.getMinX();
-        final int relY1 = y1 - (int) stageBounds.getMinY();
-        final int relX2 = x2 - (int) stageBounds.getMinX();
-        final int relY2 = y2 - (int) stageBounds.getMinY();
+        final int relX1 = x1 - (int) testCase.stageBounds.getMinX();
+        final int relY1 = y1 - (int) testCase.stageBounds.getMinY();
+        final int relX2 = x2 - (int) testCase.stageBounds.getMinX();
+        final int relY2 = y2 - (int) testCase.stageBounds.getMinY();
         // tap
         int p = device.addPoint(x1, y1);
         device.sync();
@@ -178,9 +181,11 @@ public void tapAndDrag() throws Exception {
         TestLogShim.waitForLog("Touch released [relative]: %d, %d", relX2, relY2);
         TestLogShim.waitForLog("Touch released: %d, %d", x2, y2);
         // Check that the touch event has one touch point.
-        Assert.assertEquals("Expected only one touch point", 0,
-                            TestLogShim.getLog().stream()
-                            .filter(s -> s.startsWith("Touch points count"))
-                            .filter(s -> !s.startsWith("Touch points count: [1]")).count());
+        Assertions.assertEquals(
+            0,
+            TestLogShim.getLog().stream()
+                .filter(s -> s.startsWith("Touch points count"))
+                .filter(s -> !s.startsWith("Touch points count: [1]")).count(),
+                "Expected only one touch point");
     }
 }
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/SingleTouchTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/SingleTouchTest.java
index a1e22f1b2b3..28ca9ff9d63 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/SingleTouchTest.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/SingleTouchTest.java
@@ -29,32 +29,29 @@
 import javafx.scene.Group;
 import javafx.scene.Scene;
 import javafx.scene.shape.Rectangle;
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import com.sun.glass.ui.monocle.TestLogShim;
 import test.com.sun.glass.ui.monocle.TestRunnable;
 import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice;
 import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevices;
 
-public class SingleTouchTest extends ParameterizedTestBase {
+public final class SingleTouchTest extends ParameterizedTestBase {
 
-    public SingleTouchTest(TestTouchDevice device) {
-        super(device);
-    }
-
-    @Parameterized.Parameters
-    public static Collection<Object[]> data() {
+    private static Collection<TestTouchDevice> parameters() {
         return TestTouchDevices.getTouchDeviceParameters(1);
     }
 
     /**
      * Touch down and up
      */
-    @Test
-    public void tap() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void tap(TestTouchDevice device) throws Exception {
+        createDevice(device, null);
         final int x = (int) Math.round(width * 0.5);
         final int y = (int) Math.round(height * 0.5);
         // tap
@@ -70,17 +67,21 @@ public void tap() throws Exception {
         TestLogShim.waitForLog("Touch released: %d, %d", x, y);
 
         // Check that the touch event has one touch point.
-        Assert.assertEquals("Expected only one touch point", 0,
-                            TestLogShim.getLog().stream()
-                            .filter(s -> s.startsWith("Touch points count"))
-                            .filter(s -> !s.startsWith("Touch points count: [1]")).count());
+        Assertions.assertEquals(
+            0,
+            TestLogShim.getLog().stream()
+                .filter(s -> s.startsWith("Touch points count"))
+                .filter(s -> !s.startsWith("Touch points count: [1]")).count(),
+            "Expected only one touch point");
     }
 
     /**
      * Touch down, send repeat events in the same location, touch up
      */
-    @Test
-    public void tapHoldRelease() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void tapHoldRelease(TestTouchDevice device) throws Exception {
+        createDevice(device, null);
         final int x = (int) Math.round(width * 0.5);
         final int y = (int) Math.round(height * 0.5);
         // tap
@@ -100,20 +101,24 @@ public void tapHoldRelease() throws Exception {
         TestLogShim.waitForLog("Touch released: %d, %d", x, y);
         // We don't have anything sensible to do with repeat events in the
         // same location, so make sure they are filtered out.
-        Assert.assertEquals(0, TestLogShim.countLogContaining("Mouse pressed:"));
-        Assert.assertEquals(0, TestLogShim.countLogContaining("Touch pressed:"));
+        Assertions.assertEquals(0, TestLogShim.countLogContaining("Mouse pressed:"));
+        Assertions.assertEquals(0, TestLogShim.countLogContaining("Touch pressed:"));
         // Check that the touch event has one touch point.
-        Assert.assertEquals("Expected only one touch point", 0,
-                            TestLogShim.getLog().stream()
-                            .filter(s -> s.startsWith("Touch points count"))
-                            .filter(s -> !s.startsWith("Touch points count: [1]")).count());
+        Assertions.assertEquals(
+            0,
+            TestLogShim.getLog().stream()
+                .filter(s -> s.startsWith("Touch points count"))
+                .filter(s -> !s.startsWith("Touch points count: [1]")).count(),
+            "Expected only one touch point");
     }
 
     /**
      * Touch down, drag, touch up
      */
-    @Test
-    public void tapAndDrag1() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void tapAndDrag1(TestTouchDevice device) throws Exception {
+        createDevice(device, null);
         final int x1 = (int) Math.round(width * 0.5);
         final int y1 = (int) Math.round(height * 0.5);
         final int x2 = (int) Math.round(width * 0.75);
@@ -135,17 +140,21 @@ public void tapAndDrag1() throws Exception {
         TestLogShim.waitForLog("Touch moved: %d, %d", x2, y2);
         TestLogShim.waitForLog("Touch released: %d, %d", x2, y2);
         // Check that the touch event has one touch point.
-        Assert.assertEquals("Expected only one touch point", 0,
-                            TestLogShim.getLog().stream()
-                            .filter(s -> s.startsWith("Touch points count"))
-                            .filter(s -> !s.startsWith("Touch points count: [1]")).count());
+        Assertions.assertEquals(
+            0,
+            TestLogShim.getLog().stream()
+                .filter(s -> s.startsWith("Touch points count"))
+                .filter(s -> !s.startsWith("Touch points count: [1]")).count(),
+            "Expected only one touch point");
     }
 
     /**
      * Touch down, drag, touch up, with no change in Y coordinate
      */
-    @Test
-    public void tapAndDrag2() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void tapAndDrag2(TestTouchDevice device) throws Exception {
+        createDevice(device, null);
         final int x1 = (int) Math.round(width * 0.5);
         final int y1 = (int) Math.round(height * 0.5);
         final int x2 = (int) Math.round(width * 0.75);
@@ -166,17 +175,21 @@ public void tapAndDrag2() throws Exception {
         TestLogShim.waitForLog("Touch moved: %d, %d", x2, y1);
         TestLogShim.waitForLog("Touch released: %d, %d", x2, y1);
         // Check that the touch event has one touch point.
-        Assert.assertEquals("Expected only one touch point", 0,
-                            TestLogShim.getLog().stream()
-                            .filter(s -> s.startsWith("Touch points count"))
-                            .filter(s -> !s.startsWith("Touch points count: [1]")).count());
+        Assertions.assertEquals(
+            0,
+            TestLogShim.getLog().stream()
+                .filter(s -> s.startsWith("Touch points count"))
+                .filter(s -> !s.startsWith("Touch points count: [1]")).count(),
+            "Expected only one touch point");
     }
 
     /**
      * Touch down, drag, touch up, no change in X coordinate
      */
-    @Test
-    public void tapAndDrag3() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void tapAndDrag3(TestTouchDevice device) throws Exception {
+        createDevice(device, null);
         final int x1 = (int) Math.round(width * 0.5);
         final int y1 = (int) Math.round(height * 0.5);
         final int y2 = (int) Math.round(height * 0.75);
@@ -197,18 +210,22 @@ public void tapAndDrag3() throws Exception {
         TestLogShim.waitForLog("Touch moved: %d, %d", x1, y2);
         TestLogShim.waitForLog("Touch released: %d, %d", x1, y2);
         // Check that the touch event has one touch point.
-        Assert.assertEquals("Expected only one touch point", 0,
-                            TestLogShim.getLog().stream()
-                            .filter(s -> s.startsWith("Touch points count"))
-                            .filter(s -> !s.startsWith("Touch points count: [1]")).count());
+        Assertions.assertEquals(
+            0,
+            TestLogShim.getLog().stream()
+                .filter(s -> s.startsWith("Touch points count"))
+                .filter(s -> !s.startsWith("Touch points count: [1]")).count(),
+            "Expected only one touch point");
     }
 
     /**
      * Touch down, small drag, release. The drag should be filtered out.
      */
-    @Test
-    public void tapWithTinyDrag() throws Exception {
-        Assume.assumeTrue(device.getTapRadius() > 1);
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void tapWithTinyDrag(TestTouchDevice device) throws Exception {
+        Assumptions.assumeTrue(device.getTapRadius() > 1);
+        createDevice(device, null);
         final int x1 = (int) Math.round(width * 0.5);
         final int y1 = (int) Math.round(height * 0.5);
         final int x2 = x1 + 1;
@@ -227,21 +244,25 @@ public void tapWithTinyDrag() throws Exception {
         TestLogShim.waitForLog("Mouse clicked: %d, %d", x1, y1);
         TestLogShim.waitForLog("Touch pressed: %d, %d", x1, y1);
         TestLogShim.waitForLog("Touch released: %d, %d", x1, y1);
-        Assert.assertEquals(0l, TestLogShim.countLogContaining("Mouse dragged"));
-        Assert.assertEquals(0l, TestLogShim.countLogContaining("Touch moved"));
+        Assertions.assertEquals(0l, TestLogShim.countLogContaining("Mouse dragged"));
+        Assertions.assertEquals(0l, TestLogShim.countLogContaining("Touch moved"));
         // Check that the touch event has one touch point.
-        Assert.assertEquals("Expected only one touch point", 0,
-                            TestLogShim.getLog().stream()
-                            .filter(s -> s.startsWith("Touch points count"))
-                            .filter(s -> !s.startsWith("Touch points count: [1]")).count());
+        Assertions.assertEquals(
+            0,
+            TestLogShim.getLog().stream()
+                .filter(s -> s.startsWith("Touch points count"))
+                .filter(s -> !s.startsWith("Touch points count: [1]")).count(),
+            "Expected only one touch point");
     }
 
     /**
      * Touch down, drag, release, tap again
      */
-    @Test
-    public void tapDragReleaseTapAgain() throws Exception {
-        Assume.assumeTrue(device.getTapRadius() < width * 0.2);
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void tapDragReleaseTapAgain(TestTouchDevice device) throws Exception {
+        createDevice(device, null);
+        Assumptions.assumeTrue(device.getTapRadius() < width * 0.2);
         final int x1 = (int) Math.round(width * 0.5);
         final int y1 = (int) Math.round(height * 0.5);
         final int x2 = (int) Math.round(width * 0.7);
@@ -277,9 +298,11 @@ public void tapDragReleaseTapAgain() throws Exception {
     /**
      * Touch down, change scene, release finger.
      */
-    @Ignore("RT-37283")
-    @Test
-    public void testChangeSceneDuringTap() throws Exception {
+    @Disabled("RT-37283")
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testChangeSceneDuringTap(TestTouchDevice device) throws Exception {
+        createDevice(device, null);
         final int x1 = (int) Math.round(width * 0.3);
         final int y1 = (int) Math.round(height * 0.3);
         int p1 = device.addPoint(x1, y1);
@@ -295,6 +318,6 @@ public void testChangeSceneDuringTap() throws Exception {
         });
         device.removePoint(p1);
         device.sync();
-        Assert.assertEquals(1, TestLogShim.countLogContaining("Mouse clicked: " + x1 +", " + y1));
+        Assertions.assertEquals(1, TestLogShim.countLogContaining("Mouse clicked: " + x1 +", " + y1));
     }
 }
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/SwipeSimpleTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/SwipeSimpleTest.java
index 1917df9bed3..bd9567645b2 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/SwipeSimpleTest.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/SwipeSimpleTest.java
@@ -27,16 +27,15 @@
 
 import java.util.Collection;
 import javafx.scene.input.GestureEvent;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import com.sun.glass.ui.monocle.TestLogShim;
 import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice;
 import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevices;
 
-public class SwipeSimpleTest extends ParameterizedTestBase {
+public final class SwipeSimpleTest extends ParameterizedTestBase {
 
     private final int SWIPE_THRESHOLD = 10;
     int startPointX;
@@ -46,12 +45,7 @@ public class SwipeSimpleTest extends ParameterizedTestBase {
         System.setProperty("com.sun.javafx.isEmbedded", "true");
     }
 
-    public SwipeSimpleTest(TestTouchDevice device) {
-        super(device);
-    }
-
-    @Parameterized.Parameters
-    public static Collection<Object[]> data() {
+    private static Collection<TestTouchDevice> parameters() {
         return TestTouchDevices.getTouchDeviceParameters(1);
     }
 
@@ -60,13 +54,15 @@ private int getDelta() throws Exception {
         return max + 1;
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void beforeInit() {
         System.setProperty("com.sun.javafx.gestures.swipe.maxduration", "1200");
     }
 
-    @Before
-    public void addListener() throws Exception {
+    // @BeforeEach
+    // junit5 does not support parameterized class-level tests yet
+    public void init(TestTouchDevice device) throws Exception {
+        createDevice(device, null);
         TestApplication.getStage().getScene().addEventHandler(
                 GestureEvent.ANY,
                 e -> TestLogShim.format("%s at %.0f, %.0f",
@@ -78,7 +74,7 @@ public void addListener() throws Exception {
     }
 
     private void swipe(Point[] points, String expectedSwipe) throws Exception {
-        Assert.assertTrue(points.length > 1);
+        Assertions.assertTrue(points.length > 1);
         int x = points[0].getX();
         int y = points[0].getY();
         TestLogShim.reset();
@@ -98,124 +94,158 @@ private void swipe(Point[] points, String expectedSwipe) throws Exception {
         if (expectedSwipe != null) {
             TestLogShim.waitForLogContaining(expectedSwipe);
         } else {
-            Assert.assertEquals(0, TestLogShim.countLogContaining("SWIPE"));
+            Assertions.assertEquals(0, TestLogShim.countLogContaining("SWIPE"));
         }
     }
 
-    @Test
-    public void testSwipeRight1() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSwipeRight1(TestTouchDevice device) throws Exception {
+        init(device);
         Point[] path = {new Point(startPointX, startPointY),
                 new Point(startPointX + getDelta(), startPointY)};
         swipe(path, "SWIPE_RIGHT");
     }
 
-    @Test
-    public void testSwipeRight2() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSwipeRight2(TestTouchDevice device) throws Exception {
+        init(device);
         Point[] path = {new Point(startPointX, startPointY), new Point(65,
                 getDelta(), startPointX, startPointY)};
         swipe(path, "SWIPE_RIGHT");
     }
 
-    @Test
-    public void testSwipeRight3() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSwipeRight3(TestTouchDevice device) throws Exception {
+        init(device);
         Point[] path = {new Point(startPointX, startPointY), new Point(80,
                 getDelta(), startPointX, startPointY)};
         swipe(path, "SWIPE_RIGHT");
     }
 
-    @Test
-    public void testSwipeRight4() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSwipeRight4(TestTouchDevice device) throws Exception {
+        init(device);
         Point[] path = {new Point(startPointX, startPointY), new Point(115,
                 getDelta(), startPointX, startPointY)};
         swipe(path, "SWIPE_RIGHT");
     }
 
-    @Test
-    public void testSwipeLeft1() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSwipeLeft1(TestTouchDevice device) throws Exception {
+        init(device);
         Point[] path = {new Point(startPointX, startPointY),
                 new Point(startPointX - getDelta(), startPointY)};
         swipe(path, "SWIPE_LEFT");
     }
 
-    @Test
-    public void testSwipeLeft2() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSwipeLeft2(TestTouchDevice device) throws Exception {
+        init(device);
         Point[] path = {new Point(startPointX, startPointY), new Point(-65,
                 getDelta(), startPointX, startPointY)};
         swipe(path, "SWIPE_LEFT");
     }
 
-    @Test
-    public void testSwipeLeft3() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSwipeLeft3(TestTouchDevice device) throws Exception {
+        init(device);
         Point[] path = {new Point(startPointX, startPointY), new Point(-80,
                 getDelta(), startPointX, startPointY)};
         swipe(path, "SWIPE_LEFT");
     }
 
-    @Test
-    public void testSwipeLeft4() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSwipeLeft4(TestTouchDevice device) throws Exception {
+        init(device);
         Point[] path = {new Point(startPointX, startPointY), new Point(-115,
                 getDelta(), startPointX, startPointY)};
         swipe(path, "SWIPE_LEFT");
     }
 
-    @Test
-    public void testSwipeUp1() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSwipeUp1(TestTouchDevice device) throws Exception {
+        init(device);
         Point[] path = {new Point(startPointX, startPointY),
                 new Point(startPointX, startPointY - getDelta())};
         swipe(path, "SWIPE_UP");
     }
 
-    @Test
-    public void testSwipeUp2() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSwipeUp2(TestTouchDevice device) throws Exception {
+        init(device);
         Point[] path = {new Point(startPointX, startPointY), new Point(25,
                 getDelta(), startPointX, startPointY)};
         swipe(path, "SWIPE_UP");
     }
 
-    @Test
-    public void testSwipeUp3() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSwipeUp3(TestTouchDevice device) throws Exception {
+        init(device);
         Point[] path = {new Point(startPointX, startPointY), new Point(-25,
                 getDelta(), startPointX, startPointY)};
         swipe(path, "SWIPE_UP");
     }
 
-    @Test
-    public void testSwipeDown1() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSwipeDown1(TestTouchDevice device) throws Exception {
+        init(device);
         Point[] path = {new Point(startPointX, startPointY),
                 new Point(startPointX, startPointY + getDelta())};
         swipe(path, "SWIPE_DOWN");
     }
 
-    @Test
-    public void testSwipeDown2() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSwipeDown2(TestTouchDevice device) throws Exception {
+        init(device);
         Point[] path = {new Point(startPointX, startPointY), new Point(155,
                 getDelta(), startPointX, startPointY)};
         swipe(path, "SWIPE_DOWN");
     }
 
-    @Test
-    public void testSwipeDown3() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSwipeDown3(TestTouchDevice device) throws Exception {
+        init(device);
         Point[] path = {new Point(startPointX, startPointY), new Point(-155,
                 getDelta(), startPointX, startPointY)};
         swipe(path, "SWIPE_DOWN");
     }
 
-    @Test
-    public void testNoSwipeUp() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testNoSwipeUp(TestTouchDevice device) throws Exception {
+        init(device);
         Point[] path = {new Point(startPointX, startPointY), new Point(31,
                 getDelta(), startPointX, startPointY)};
         swipe(path, null);
     }
 
-    @Test
-    public void testNoSwipeRight() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testNoSwipeRight(TestTouchDevice device) throws Exception {
+        init(device);
         Point[] path = {new Point(startPointX, startPointY), new Point(59,
                 getDelta(), startPointX, startPointY)};
         swipe(path, null);
     }
 
-    @Test
-    public void testSwipeUp4Points() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSwipeUp4Points(TestTouchDevice device) throws Exception {
+        init(device);
         int delta = getDelta();
         Point p1 = new Point(startPointX, startPointY);
         Point p2 = new Point(45, delta, p1);
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/SwipeTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/SwipeTest.java
index 3dfd50e66a8..cd57e9acbeb 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/SwipeTest.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/SwipeTest.java
@@ -32,19 +32,19 @@
 import java.util.TimerTask;
 import java.util.concurrent.CountDownLatch;
 import javafx.scene.input.GestureEvent;
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import com.sun.glass.ui.monocle.TestLogShim;
 import com.sun.javafx.PlatformUtil;
 import test.com.sun.glass.ui.monocle.TestRunnable;
 import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice;
 import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevices;
 
-public class SwipeTest extends ParameterizedTestBase {
+public final class SwipeTest extends ParameterizedTestBase {
 
     static {
         System.setProperty("com.sun.javafx.isEmbedded", "true");
@@ -117,32 +117,29 @@ public String toString() {
         }
     }
 
-    public SwipeTest(TestTouchDevice device, SwipeTestCase testCase) throws Exception {
-        super(device);
-        this.testCase = testCase;
-        TestLogShim.format("Starting test with %s, %s", device, testCase);
-        TestApplication.getStage();
-        TestRunnable.invokeAndWait(() -> {
-            Assume.assumeTrue(
-                    TestApplication.isMonocle() || TestApplication.isLens());
-            Assume.assumeTrue(PlatformUtil.isEmbedded());
-        });
-    }
-
-    @Parameterized.Parameters
-    public static Collection<Object[]> data() {
-        List<Object[]> params = new ArrayList<>();
+    private static Collection<Arguments> parameters() {
+        List<Arguments> params = new ArrayList<>();
         List<TestTouchDevice> devices = TestTouchDevices.getTouchDevices();
         for (TestTouchDevice device : devices) {
             for (SwipeTestCase testCase : TEST_CASES) {
-                params.add(new Object[] { device, testCase });
+                params.add(Arguments.of(device, testCase));
             }
         }
         return params;
     }
 
-    @Before
-    public void addListener() throws Exception {
+    // @BeforeEach
+    // junit5 does not support parameterized class-level tests yet
+    public void init(TestTouchDevice device, SwipeTestCase testCase) throws Exception {
+        createDevice(device, null);
+
+        TestLogShim.format("Starting test with %s, %s", device, testCase);
+        TestApplication.getStage();
+        TestRunnable.invokeAndWait(() -> {
+            Assumptions.assumeTrue(TestApplication.isMonocle() || TestApplication.isLens());
+            Assumptions.assumeTrue(PlatformUtil.isEmbedded());
+        });
+
         TestApplication.getStage().getScene().addEventHandler(
                 GestureEvent.ANY,
                 e -> TestLogShim.format("%s at %.0f, %.0f",
@@ -165,7 +162,9 @@ public void addListener() throws Exception {
      * @param amplitude of the sine wave, in pixels
      * @param wavelength of the sine wave, in pixels
      */
-    private CountDownLatch generatePoints(int p,
+    private CountDownLatch generatePoints(
+                                TestTouchDevice device,
+                                int p,
                                 int x1, int y1,
                                 double length,
                                 double theta,
@@ -213,16 +212,18 @@ public void run() {
         return latch;
     }
 
-    @Test
-    @Ignore("RT-37709")
-    public void testSwipe() throws Exception {
+    @Disabled("RT-37709")
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSwipe(TestTouchDevice device, SwipeTestCase testCase) throws Exception {
+        init(device, testCase);
         final int x = (int) Math.round(width * 0.5);
         final int y = (int) Math.round(height * 0.5);
         // tap
         int p = device.addPoint(x, y);
         device.sync();
         // swipe
-        generatePoints(p, x, y,
+        generatePoints(device, p, x, y,
                        testCase.length,
                        testCase.theta,
                        testCase.time,
@@ -238,10 +239,10 @@ public void testSwipe() throws Exception {
         TestLogShim.waitForLogContaining("Touch pressed");
         TestLogShim.waitForLogContaining("Touch released");
         if (testCase.expectedSwipe == null) {
-            Assert.assertEquals(0, TestLogShim.countLogContaining("SWIPE"));
+            Assertions.assertEquals(0, TestLogShim.countLogContaining("SWIPE"));
         } else {
             TestLogShim.waitForLogContaining(testCase.expectedSwipe);
-            Assert.assertEquals(1, TestLogShim.countLogContaining("SWIPE"));
+            Assertions.assertEquals(1, TestLogShim.countLogContaining("SWIPE"));
         }
     }
 
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TestApplication.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TestApplication.java
index 9883bd00585..567e5c85c58 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TestApplication.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TestApplication.java
@@ -25,8 +25,12 @@
 
 package test.robot.com.sun.glass.ui.monocle;
 
-import com.sun.glass.ui.monocle.TestLogShim;
-import com.sun.glass.ui.monocle.TouchInputShim;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
 import javafx.animation.AnimationTimer;
 import javafx.application.Application;
 import javafx.application.Platform;
@@ -42,14 +46,9 @@
 import javafx.stage.Screen;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
-import org.junit.Assert;
-
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Consumer;
+import org.junit.jupiter.api.Assertions;
+import com.sun.glass.ui.monocle.TestLogShim;
+import com.sun.glass.ui.monocle.TouchInputShim;
 import test.com.sun.glass.ui.monocle.TestRunnable;
 
 public class TestApplication extends Application {
@@ -202,7 +201,7 @@ public void handle(long now) {
         try {
             frameCounter.await();
         } catch (InterruptedException ex) {
-            Assert.fail("Unexpected exception: " + ex);
+            Assertions.fail(ex);
         }
     }
 
@@ -359,15 +358,15 @@ public static void movePointerTo(final int targetX, final int targetY) throws Ex
         ui.processLine("EV_KEY BTN_TOUCH 0");
         ui.processLine("EV_SYN");
         try {
-            Assert.assertTrue(released.tryAcquire(3, TimeUnit.SECONDS));
+            Assertions.assertTrue(released.tryAcquire(3, TimeUnit.SECONDS));
             TestRunnable.invokeAndWait(() -> {
                 Robot robot = new Robot();
                 TestLogShim.log("x = " + robot.getMouseX());
                 TestLogShim.log("y = " + robot.getMouseY());
                 TestLogShim.log("targetX = " + targetX);
                 TestLogShim.log("targetY = " + targetY);
-                Assert.assertEquals(targetX, (int) robot.getMouseX());
-                Assert.assertEquals(targetY, (int) robot.getMouseY());
+                Assertions.assertEquals(targetX, (int) robot.getMouseX());
+                Assertions.assertEquals(targetY, (int) robot.getMouseY());
             });
             frameWait(1);
         } finally {
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchButtonTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchButtonTest.java
index e4cf07d8be9..f500aefbb82 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchButtonTest.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchButtonTest.java
@@ -33,27 +33,21 @@
 import javafx.scene.Node;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.shape.Rectangle;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import com.sun.glass.ui.monocle.TestLogShim;
 import test.com.sun.glass.ui.monocle.TestRunnable;
 import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice;
 import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevices;
 
-public class TouchButtonTest extends ParameterizedTestBase {
+public final class TouchButtonTest extends ParameterizedTestBase {
 
     private Node button1;
     private Node button2;
     private Node button3;
 
-    public TouchButtonTest(TestTouchDevice device) {
-        super(device);
-    }
-
-    @Parameterized.Parameters
-    public static Collection<Object[]> data() {
+    private static Collection<TestTouchDevice> parameters() {
         return TestTouchDevices.getTouchDeviceParameters(1);
     }
 
@@ -75,8 +69,11 @@ public Node createButton(String text, int x, int y, boolean setListeners) {
         return button;
     }
 
-    @Before
-    public void createButtons() throws Exception {
+    // @BeforeEach
+    // junit5 does not support parameterized class-level tests yet
+    public void init(TestTouchDevice device) throws Exception {
+        this.device = device;
+        createDevice(device, null);
         TestRunnable.invokeAndWait(() -> {
             int X = (int) width / 2;
             int Y = (int) height / 2;
@@ -98,16 +95,20 @@ public void createButtons() throws Exception {
      * Tests
      */
 
-    @Test
-    public void tapOnButton() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void tapOnButton(TestTouchDevice device) throws Exception {
+        init(device);
         Point2D clickAt = tapInsideButton(button1);
         waitForFocusGainOn("button1");
         waitForMouseEnteredAt(clickAt);
         waitForMouseClickAt(clickAt);
     }
 
-    @Test
-    public void tapOn2Buttons() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void tapOn2Buttons(TestTouchDevice device) throws Exception {
+        init(device);
         Point2D clickAt = tapInsideButton(button1);
         waitForFocusGainOn("button1");
         waitForMouseEnteredAt(clickAt);
@@ -120,8 +121,10 @@ public void tapOn2Buttons() throws Exception {
         waitForMouseClickAt(clickAt);
     }
 
-    @Test
-    public void tapOutAndInButton() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void tapOutAndInButton(TestTouchDevice device) throws Exception {
+        init(device);
         tapOutSideButton();
         TestLogShim.reset();
         Point2D clickAt = tapInsideButton(button1);
@@ -129,8 +132,10 @@ public void tapOutAndInButton() throws Exception {
         waitForFocusGainOn("button1");
     }
 
-    @Test
-    public void tapOutInAndOutButton() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void tapOutInAndOutButton(TestTouchDevice device) throws Exception {
+        init(device);
         tapOutSideButton();
         TestLogShim.reset();
         Point2D clickAt = tapInsideButton(button1);
@@ -142,8 +147,10 @@ public void tapOutInAndOutButton() throws Exception {
         waitForFocusLostOn("button1");
     }
 
-    @Test
-    public void tapInAndOutLoop() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void tapInAndOutLoop(TestTouchDevice device) throws Exception {
+        init(device);
         tapOutSideButton();
         TestLogShim.reset();
         for (int i = 0 ; i < 2 ; i++) {
@@ -176,8 +183,10 @@ public void tapInAndOutLoop() throws Exception {
      * RT-34625 - we should get a click when tapping on a control, dragging the
      * finger and release the finger inside the control
      */
-    @Test
-    public void tapAndDrag() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void tapAndDrag(TestTouchDevice device) throws Exception {
+        init(device);
         Bounds buttonBounds = getButtonBounds(button2);
 
         //start at right most x and center y
@@ -213,9 +222,11 @@ public void tapAndDrag() throws Exception {
      * This test should fail and throw RuntimeException
      *
      */
-    @Ignore("RT-34625")
-    @Test
-    public void tapAndDrag_fail() throws Exception {
+    @Disabled("RT-34625")
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void tapAndDrag_fail(TestTouchDevice device) throws Exception {
+        init(device);
         Bounds buttonBounds = getButtonBounds(button2);
 
         //start at right most x and center y
@@ -240,8 +251,10 @@ public void tapAndDrag_fail() throws Exception {
         TestLogShim.waitForLogContaining("MOUSE_CLICKED:", 3000l);
     }
 
-    @Test
-    public void tapping_oneButtonOnScreen () throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void tapping_oneButtonOnScreen(TestTouchDevice device) throws Exception {
+        init(device);
         AtomicReference<Node> buttonRef = new AtomicReference<>();
         TestRunnable.invokeAndWait(() -> {
             Node button4 = createButton("button4", 0, 0, true);
@@ -327,5 +340,4 @@ public void waitForFocusGainOn(String id) throws Exception{
     public void waitForFocusLostOn(String id) throws Exception{
         waitForFocus(id, false);
     }
-
 }
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchEventLookaheadTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchEventLookaheadTest.java
index f8d1d87edd7..8afe61aebc5 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchEventLookaheadTest.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchEventLookaheadTest.java
@@ -28,30 +28,27 @@
 import java.util.Collection;
 import javafx.geometry.Rectangle2D;
 import javafx.stage.Screen;
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Test;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import com.sun.glass.ui.monocle.TestLogShim;
 import test.com.sun.glass.ui.monocle.TestRunnable;
 import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice;
 import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevices;
 
-public class TouchEventLookaheadTest extends ParameterizedTestBase {
+public final class TouchEventLookaheadTest extends ParameterizedTestBase {
 
-    public TouchEventLookaheadTest(TestTouchDevice device) {
-        super(device);
-    }
-
-    @Parameterized.Parameters
-    public static Collection<Object[]> data() {
+    private static Collection<TestTouchDevice> parameters() {
         return TestTouchDevices.getTouchDeviceParameters(1);
     }
 
     /** Merge together similar moves */
-    @Test
-    public void mergeMoves() throws Exception {
-        Assume.assumeTrue(TestApplication.isMonocle());
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void mergeMoves(TestTouchDevice device) throws Exception {
+        createDevice(device, null);
+        Assumptions.assumeTrue(TestApplication.isMonocle());
         TestApplication.showFullScreenScene();
         TestApplication.addMouseListeners();
         TestApplication.addTouchListeners();
@@ -92,7 +89,7 @@ public void mergeMoves() throws Exception {
         // Check that moves in between were filtered
         TestLogShim.waitForLog("Mouse dragged: " + x3 + ", " + y3, 3000);
         TestLogShim.waitForLog("Touch moved: " + x3 + ", " + y3, 3000);
-        Assert.assertTrue(TestLogShim.countLogContaining("Mouse dragged") <= 3);
-        Assert.assertTrue(TestLogShim.countLogContaining("Touch moved") <= 3);
+        Assertions.assertTrue(TestLogShim.countLogContaining("Mouse dragged") <= 3);
+        Assertions.assertTrue(TestLogShim.countLogContaining("Touch moved") <= 3);
     }
 }
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchExceptionTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchExceptionTest.java
index 112fe28f1f1..0865415c16b 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchExceptionTest.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchExceptionTest.java
@@ -28,26 +28,23 @@
 import java.util.Collection;
 import javafx.application.Platform;
 import javafx.scene.input.InputEvent;
-import org.junit.Test;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import com.sun.glass.ui.monocle.TestLogShim;
 import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice;
 import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevices;
 
-public class TouchExceptionTest extends ParameterizedTestBase {
+public final class TouchExceptionTest extends ParameterizedTestBase {
 
-    public TouchExceptionTest(TestTouchDevice device) {
-        super(device);
-    }
-
-    @Parameterized.Parameters
-    public static Collection<Object[]> data() {
+    private static Collection<TestTouchDevice> parameters() {
         return TestTouchDevices.getTouchDeviceParameters(1);
     }
 
     /** Throw an exception in an event handler */
-    @Test
-    public void testRuntimeException() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testRuntimeException(TestTouchDevice device) throws Exception {
+        createDevice(device, null);
         Platform.runLater(
                 () -> Thread.currentThread()
                         .setUncaughtExceptionHandler((t, e) -> TestLogShim.log(e.toString()))
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchLagTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchLagTest.java
index 73dbb6619d5..4921865dc48 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchLagTest.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchLagTest.java
@@ -27,22 +27,22 @@
 
 import javafx.geometry.Rectangle2D;
 import javafx.stage.Screen;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestName;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
 import com.sun.glass.ui.monocle.TestLogShim;
 
 public class TouchLagTest {
 
     private UInput ui;
-    @Rule public TestName name = new TestName();
 
-    @Before public void setUpScreen() throws Exception {
+    @BeforeEach
+    public void setUpScreen(TestInfo t) throws Exception {
         TestLogShim.reset();
-        TestLogShim.log(name.getMethodName());
+        // get test name from the junit5
+        TestLogShim.log(t.getDisplayName());
         TestApplication.showFullScreenScene();
         TestApplication.addTouchListeners();
         TestApplication.addMouseListeners();
@@ -82,7 +82,8 @@ public void initDevice() throws Exception {
         ui.processLine("CREATE");
     }
 
-    @After public void destroyDevice() throws Exception {
+    @AfterEach
+    public void destroyDevice() throws Exception {
         if (ui != null) {
             ui.waitForQuiet();
             try {
@@ -145,8 +146,7 @@ public void testTouchLag() throws Exception {
         }
         long t = System.currentTimeMillis() - startTime;
         // Make sure events could be sent in the required time
-        Assert.assertTrue("Took " + t + "ms to send 3000 events",
-                          t < (long) (3000l * TestApplication.getTimeScale()));
+        Assertions.assertTrue(t < (long) (3000l * TestApplication.getTimeScale()), "Took " + t + "ms to send 3000 events");
         TestLogShim.log("Sent 3000 events in " + t + "ms");
         // move to 400, 410
         ui.writeValue(b, xs[0], 400);
@@ -224,8 +224,7 @@ public void testMultitouchLag() throws Exception {
         }
         long t = System.currentTimeMillis() - startTime;
         // Make sure events could be sent in the required time
-        Assert.assertTrue("Took " + t + "ms to send 3000 events",
-                          t < (long) (3000l * TestApplication.getTimeScale()));
+        Assertions.assertTrue(t < (long) (3000l * TestApplication.getTimeScale()), "Took " + t + "ms to send 3000 events");
         TestLogShim.log("Sent 3000 events in " + t + "ms");
         // move to (400, 410), (350, 360);
         ui.writeValue(b, baseX, 400);
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchPipelineTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchPipelineTest.java
index 2474d0216b3..2ca23b4de3e 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchPipelineTest.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchPipelineTest.java
@@ -27,10 +27,10 @@
 
 import javafx.geometry.Rectangle2D;
 import javafx.stage.Screen;
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import com.sun.glass.ui.monocle.TestLogShim;
 import com.sun.glass.ui.monocle.TouchFilterShim.FlushingFilter;
 import com.sun.glass.ui.monocle.TouchFilterShim.LoggingFilter;
@@ -43,9 +43,9 @@
  */
 public class TouchPipelineTest extends TouchTestBase {
 
-    @Before
+    @BeforeEach
     public void createDevice() throws Exception {
-        Assume.assumeTrue(TestApplication.isMonocle());
+        Assumptions.assumeTrue(TestApplication.isMonocle());
         ui = new UInput();
         TestApplication.showFullScreenScene();
         TestApplication.addMouseListeners();
@@ -96,11 +96,10 @@ public void testFilters() throws Exception {
         TestLogShim.waitForLog("Touch moved: 313, 95");
         TestLogShim.waitForLog("Touch moved: 213, 95");
         // This one should have been filtered out
-        Assert.assertEquals(0, TestLogShim.countLog("Touch Pressed: 208, 195"));
+        Assertions.assertEquals(0, TestLogShim.countLog("Touch Pressed: 208, 195"));
         ui.processLine("EV_KEY BTN_TOUCH 0");
         ui.processLine("EV_SYN");
         TestLogShim.waitForLog("Touch released: 213, 95");
     }
-
 }
 
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchTestBase.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchTestBase.java
index 748c5811b92..bb2f7a61f28 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchTestBase.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchTestBase.java
@@ -29,8 +29,8 @@
 import java.io.PrintStream;
 import javafx.geometry.Rectangle2D;
 import javafx.stage.Screen;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import test.com.sun.glass.ui.monocle.TestRunnable;
 
 public class TouchTestBase {
@@ -78,7 +78,7 @@ protected void setAbsScale(int absXMax, int absYMax) {
         this.absYMax = (double) absYMax;
     }
 
-    @Before
+    @BeforeEach
     public void initDevice() throws Exception {
         TestApplication.getStage();
         ui = new UInput();
@@ -87,7 +87,7 @@ public void initDevice() throws Exception {
         TestRunnable.invokeAndWait(() -> screen = Screen.getPrimary().getBounds());
     }
 
-    @After
+    @AfterEach
     public void destroyDevice() throws InterruptedException {
         try {
             ui.waitForQuiet();
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/USKeyboardTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/USKeyboardTest.java
index ebb52ed2c44..a1b6cb90c6f 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/USKeyboardTest.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/USKeyboardTest.java
@@ -25,10 +25,10 @@
 
 package test.robot.com.sun.glass.ui.monocle;
 
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import com.sun.glass.ui.monocle.TestLogShim;
 
 
@@ -43,13 +43,13 @@ public class USKeyboardTest {
     private Character [] signsShift;
     private String [] signsKeyNames;
 
-    @Before
+    @BeforeEach
     public void initDevice() {
         TestLogShim.reset();
         ui = new UInput();
     }
 
-    @After
+    @AfterEach
     public void destroyDevice() throws InterruptedException {
         ui.waitForQuiet();
         try {
@@ -236,7 +236,7 @@ public void testBackspace() throws Exception {
         ui.processLine("EV_KEY KEY_BACKSPACE 0");
         ui.processLine("EV_SYN");
         TestLogShim.waitForLog("Key released: BACK_SPACE");
-        Assert.assertEquals(0l, TestLogShim.countLogContaining("Key typed"));
+        Assertions.assertEquals(0l, TestLogShim.countLogContaining("Key typed"));
 
         TestLogShim.reset();
         ui.processLine("EV_KEY KEY_LEFTSHIFT 1");
@@ -249,7 +249,7 @@ public void testBackspace() throws Exception {
         ui.processLine("EV_KEY KEY_LEFTSHIFT 0");
         ui.processLine("EV_SYN");
         TestLogShim.waitForLog("Key released: BACK_SPACE");
-        Assert.assertEquals(0l, TestLogShim.countLogContaining("Key typed"));
+        Assertions.assertEquals(0l, TestLogShim.countLogContaining("Key typed"));
 
         TestLogShim.reset();
         ui.processLine("EV_KEY KEY_CAPSLOCK 1");
@@ -266,7 +266,7 @@ public void testBackspace() throws Exception {
         ui.processLine("EV_KEY KEY_CAPSLOCK 0");
         ui.processLine("EV_SYN");
         TestLogShim.waitForLog("Key released: BACK_SPACE");
-        Assert.assertEquals(0l, TestLogShim.countLogContaining("Key typed"));
+        Assertions.assertEquals(0l, TestLogShim.countLogContaining("Key typed"));
 
         TestLogShim.reset();
         ui.processLine("EV_KEY KEY_CAPSLOCK 1");
@@ -287,6 +287,6 @@ public void testBackspace() throws Exception {
         ui.processLine("EV_KEY KEY_CAPSLOCK 0");
         ui.processLine("EV_SYN");
         TestLogShim.waitForLog("Key released: BACK_SPACE");
-        Assert.assertEquals(0l, TestLogShim.countLogContaining("Key typed"));
+        Assertions.assertEquals(0l, TestLogShim.countLogContaining("Key typed"));
     }
 }
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ZoomTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ZoomTest.java
index 98e11279d31..86b644b4e3f 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ZoomTest.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ZoomTest.java
@@ -26,36 +26,33 @@
 package test.robot.com.sun.glass.ui.monocle;
 
 import java.util.Collection;
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import com.sun.glass.ui.monocle.TestLogShim;
 import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice;
 import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevices;
 
 /** Zoom tests with two touch points */
-public class ZoomTest extends ParameterizedTestBase {
+public final class ZoomTest extends ParameterizedTestBase {
 
-    public ZoomTest(TestTouchDevice device) {
-        super(device);
-    }
-
-    @Parameterized.Parameters
-    public static Collection<Object[]> data() {
+    private static Collection<TestTouchDevice> parameters() {
         return TestTouchDevices.getTouchDeviceParameters(2);
     }
 
-    @Before
-    public void verifyZoomEnabled() {
-        Assume.assumeTrue(Boolean.getBoolean("com.sun.javafx.gestures.zoom"));
+    // @BeforeEach
+    // junit5 does not support parameterized class-level tests yet
+    public void init(TestTouchDevice device) throws Exception {
+        createDevice(device, null);
+        // verify zoom enabled
+        Assumptions.assumeTrue(Boolean.getBoolean("com.sun.javafx.gestures.zoom"));
     }
 
     private void tapToStopInertia() throws Exception {
         int point1X = (int) Math.round(width * 0.1);
         int point1Y = (int) Math.round(height * 0.3);
-        Assert.assertEquals(0, device.getPressedPoints());
+        Assertions.assertEquals(0, device.getPressedPoints());
         TestLogShim.reset();
         int p = device.addPoint(point1X, point1Y);
         device.sync();
@@ -69,8 +66,10 @@ private void tapToStopInertia() throws Exception {
      * drag upper finger up in order move but not enough for zooming,
      * drag again to zoom in (make it twice bigger)
      */
-    @Test
-    public void testZoomInSmallStepBigStep() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testZoomInSmallStepBigStep(TestTouchDevice device) throws Exception {
+        init(device);
         int x1 = (int) Math.round(width / 2);
         int y1 = (int) Math.round(height * 0.3);
         int x2 = (int) Math.round(width / 2);
@@ -84,7 +83,7 @@ public void testZoomInSmallStepBigStep() throws Exception {
         } else {
             threshold = 0.1;
         }
-        Assume.assumeTrue(((y2 - y1) * threshold) > smallStep);
+        Assumptions.assumeTrue(((y2 - y1) * threshold) > smallStep);
 
         TestLogShim.reset();
         //tap two fingers
@@ -105,7 +104,7 @@ public void testZoomInSmallStepBigStep() throws Exception {
 
         TestLogShim.waitForLogContaining("TouchPoint: MOVED %d, %d", x1, newy1);
         TestLogShim.waitForLogContaining("TouchPoint: STATIONARY %d, %d", x2, y2);
-        Assert.assertEquals(0, TestLogShim.countLogContaining("Zoom started"));
+        Assertions.assertEquals(0, TestLogShim.countLogContaining("Zoom started"));
 
         //drag upper finger up and lower down in order to zoom in
         newy1 = y1 - step;
@@ -156,7 +155,7 @@ public void testZoomInSmallStepBigStep() throws Exception {
         TestLogShim.waitForLogContaining("TouchPoint: RELEASED %d, %d", x2, newy2);
         TestLogShim.waitForLog("Mouse released: %d, %d", x2, newy2);
         TestLogShim.waitForLog("Mouse clicked: %d, %d", x2, newy2);
-        Assert.assertEquals(1, TestLogShim.countLogContaining("Mouse clicked: "
+        Assertions.assertEquals(1, TestLogShim.countLogContaining("Mouse clicked: "
                 + x2 +", " + newy2));
         tapToStopInertia();
     }
@@ -164,8 +163,10 @@ public void testZoomInSmallStepBigStep() throws Exception {
     /**
      * Touch down two fingers, zoom in (make it twice bigger)
      */
-    @Test
-    public void testZoomIn() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testZoomIn(TestTouchDevice device) throws Exception {
+        init(device);
         int x1 = (int) Math.round(width / 2);
         int y1 = (int) Math.round(height * 0.3);
         int x2 = (int) Math.round(width / 2);
@@ -235,7 +236,7 @@ public void testZoomIn() throws Exception {
                 x2, newy2);
         TestLogShim.waitForLog("Mouse released: %d, %d", x2, newy2);
         TestLogShim.waitForLog("Mouse clicked: %d, %d", x2, newy2);
-        Assert.assertEquals(1, TestLogShim.countLogContaining("Mouse clicked: "
+        Assertions.assertEquals(1, TestLogShim.countLogContaining("Mouse clicked: "
                 + x2 +", " + newy2));
         tapToStopInertia();
     }
@@ -243,8 +244,10 @@ public void testZoomIn() throws Exception {
     /**
      * Touch down two fingers, zoom out (make it quarter of original size)
      */
-    @Test
-    public void testZoomOut() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testZoomOut(TestTouchDevice device) throws Exception {
+        init(device);
         int x1 = (int) Math.round(width / 2);
         int y1 = (int) Math.round(height * 0.1);
         int x2 = (int) Math.round(width / 2);
@@ -333,7 +336,7 @@ public void testZoomOut() throws Exception {
                 x2, newy2);
         TestLogShim.waitForLog("Mouse released: %d, %d", x2, newy2);
         TestLogShim.waitForLog("Mouse clicked: %d, %d", x2, newy2);
-        Assert.assertEquals(1, TestLogShim.countLogContaining("Mouse clicked: "
+        Assertions.assertEquals(1, TestLogShim.countLogContaining("Mouse clicked: "
                 + x2 +", " + newy2));
         tapToStopInertia();
     }
@@ -343,8 +346,10 @@ public void testZoomOut() throws Exception {
      * drag upper finger down in order move but not enough for zooming,
      * drag again to zoom out (quarter of original size)
      */
-    @Test
-    public void testZoomOutSmallStepBigStep() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testZoomOutSmallStepBigStep(TestTouchDevice device) throws Exception {
+        init(device);
         int x1 = (int) Math.round(width / 2);
         int y1 = (int) Math.round(height * 0.1);
         int x2 = (int) Math.round(width / 2);
@@ -358,7 +363,7 @@ public void testZoomOutSmallStepBigStep() throws Exception {
         } else {
             threshold = 0.1;
         }
-        Assume.assumeTrue(((y2 - y1) * threshold) > smallStep);
+        Assumptions.assumeTrue(((y2 - y1) * threshold) > smallStep);
         double factor0 = 1.0;
 
         TestLogShim.reset();
@@ -381,7 +386,7 @@ public void testZoomOutSmallStepBigStep() throws Exception {
 
         TestLogShim.waitForLogContaining("TouchPoint: MOVED %d, %d", x1, newy1);
         TestLogShim.waitForLogContaining("TouchPoint: STATIONARY %d, %d", x2, y2);
-        Assert.assertEquals(0, TestLogShim.countLogContaining("Zoom started"));
+        Assertions.assertEquals(0, TestLogShim.countLogContaining("Zoom started"));
 
         //drag upper finger up and lower down in order to zoom in
         TestLogShim.reset();
@@ -451,7 +456,7 @@ public void testZoomOutSmallStepBigStep() throws Exception {
                 x2, newy2);
         TestLogShim.waitForLog("Mouse released: %d, %d", x2, newy2);
         TestLogShim.waitForLog("Mouse clicked: %d, %d", x2, newy2);
-        Assert.assertEquals(1, TestLogShim.countLogContaining("Mouse clicked: "
+        Assertions.assertEquals(1, TestLogShim.countLogContaining("Mouse clicked: "
                 + x2 +", " + newy2));
         tapToStopInertia();
     }
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/DellP2714TDevice.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/DellP2714TDevice.java
index e866ca49e9f..6e7abd185a8 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/DellP2714TDevice.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/DellP2714TDevice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,11 @@
 
 package test.robot.com.sun.glass.ui.monocle.input.devices;
 
-import test.robot.com.sun.glass.ui.monocle.TestApplication;
-import test.robot.com.sun.glass.ui.monocle.UInput;
-import org.junit.Assume;
-
 import java.util.HashMap;
 import java.util.Map;
+import org.junit.jupiter.api.Assumptions;
+import test.robot.com.sun.glass.ui.monocle.TestApplication;
+import test.robot.com.sun.glass.ui.monocle.UInput;
 
 /**
  * Dell P2714 touch screen monitor.
@@ -61,7 +60,7 @@ public DellP2714TDevice() {
 
     @Override
     public void create() {
-        Assume.assumeTrue(TestApplication.isMonocle());
+        Assumptions.assumeTrue(TestApplication.isMonocle());
         ui = new UInput();
         ui.processLine("OPEN");
         ui.processLine("EVBIT EV_SYN");
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDeviceBase.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDeviceBase.java
index 0bb4d9a2f01..2ad456a528c 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDeviceBase.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDeviceBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,13 +25,12 @@
 
 package test.robot.com.sun.glass.ui.monocle.input.devices;
 
-import test.robot.com.sun.glass.ui.monocle.TestApplication;
-import com.sun.glass.ui.monocle.TestLogShim;
-import test.robot.com.sun.glass.ui.monocle.UInput;
-import org.junit.Assume;
-
 import java.util.HashSet;
 import java.util.Set;
+import org.junit.jupiter.api.Assumptions;
+import com.sun.glass.ui.monocle.TestLogShim;
+import test.robot.com.sun.glass.ui.monocle.TestApplication;
+import test.robot.com.sun.glass.ui.monocle.UInput;
 
 /** The touch screen used in the Freescale i.MX6Q Sabre Device Platform,
  * extrapolated to five touch points. There is some guesswork here as to
@@ -76,7 +75,7 @@ public EGalaxMultiTouchDeviceBase(boolean resendStationaryPoints,
     @Override
     public void create() {
         // this device fails multitouch tests on Lens
-        Assume.assumeTrue(TestApplication.isMonocle());
+        Assumptions.assumeTrue(TestApplication.isMonocle());
         ui = new UInput();
         ui.processLine("OPEN");
         ui.processLine("EVBIT EV_SYN");
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/EGalaxSingleTouchDeviceBase.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/EGalaxSingleTouchDeviceBase.java
index 483c7526267..889c975e041 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/EGalaxSingleTouchDeviceBase.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/EGalaxSingleTouchDeviceBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,9 @@
 
 package test.robot.com.sun.glass.ui.monocle.input.devices;
 
+import org.junit.jupiter.api.Assumptions;
 import test.robot.com.sun.glass.ui.monocle.TestApplication;
 import test.robot.com.sun.glass.ui.monocle.UInput;
-import org.junit.Assume;
 
 /**
  * EGalaxSingleTouchDeviceBase sends ABS_X and ABS_Y events. It uses BTN_TOUCH to notify
@@ -43,7 +43,7 @@ public EGalaxSingleTouchDeviceBase() {
 
     @Override
     public void create() {
-        Assume.assumeTrue(TestApplication.isMonocle());
+        Assumptions.assumeTrue(TestApplication.isMonocle());
         ui = new UInput();
         ui.processLine("OPEN");
         ui.processLine("EVBIT EV_SYN");
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/SamsungLMS700KF07004Device.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/SamsungLMS700KF07004Device.java
index 265587c5707..dd6ddd43be9 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/SamsungLMS700KF07004Device.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/SamsungLMS700KF07004Device.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,9 @@
 
 package test.robot.com.sun.glass.ui.monocle.input.devices;
 
+import org.junit.jupiter.api.Assumptions;
 import test.robot.com.sun.glass.ui.monocle.TestApplication;
 import test.robot.com.sun.glass.ui.monocle.UInput;
-import org.junit.Assume;
 
 /**
  * SamsungLMS700KF07004Device sends ABS_X and ABS_Y events. It uses BTN_TOUCH to notify
@@ -43,7 +43,7 @@ public SamsungLMS700KF07004Device() {
 
     @Override
     public void create() {
-        Assume.assumeTrue(TestApplication.isMonocle());
+        Assumptions.assumeTrue(TestApplication.isMonocle());
         ui = new UInput();
         ui.processLine("OPEN");
         ui.processLine("EVBIT EV_SYN");
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/SingleTouchDevice2.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/SingleTouchDevice2.java
index 27a0c117641..123d9971366 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/SingleTouchDevice2.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/SingleTouchDevice2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,9 @@
 
 package test.robot.com.sun.glass.ui.monocle.input.devices;
 
+import org.junit.jupiter.api.Assumptions;
 import test.robot.com.sun.glass.ui.monocle.TestApplication;
 import test.robot.com.sun.glass.ui.monocle.UInput;
-import org.junit.Assume;
 
 /**
  * SingleTouchDevice2 sends ABS_X and ABS_Y events. It uses BTN_TOUCH to notify
@@ -42,7 +42,7 @@ public SingleTouchDevice2() {
 
     @Override
     public void create() {
-        Assume.assumeTrue(TestApplication.isMonocle());
+        Assumptions.assumeTrue(TestApplication.isMonocle());
         ui = new UInput();
         ui.processLine("OPEN");
         ui.processLine("EVBIT EV_SYN");
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/TestTouchDevices.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/TestTouchDevices.java
index 307a704e1b6..bd4c685403e 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/TestTouchDevices.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/TestTouchDevices.java
@@ -75,12 +75,9 @@ public static List<TestTouchDevice> getTouchDevices(int minPoints) {
                 .collect(Collectors.toList());
     }
 
-    public static Collection<Object[]> getTouchDeviceParameters(int minPoints) {
-        Collection c = getTouchDevices().stream()
+    public static Collection<TestTouchDevice> getTouchDeviceParameters(int minPoints) {
+        return getTouchDevices().stream()
                 .filter(d -> d.points.length >= minPoints)
-                .map(d -> new Object[] { d })
                 .collect(Collectors.toList());
-        return c;
     }
-
 }
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/TouchRevolutionFusionDevice.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/TouchRevolutionFusionDevice.java
index ccec75997bf..8c46c0c1fa3 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/TouchRevolutionFusionDevice.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/TouchRevolutionFusionDevice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,11 @@
 
 package test.robot.com.sun.glass.ui.monocle.input.devices;
 
-import test.robot.com.sun.glass.ui.monocle.TestApplication;
-import test.robot.com.sun.glass.ui.monocle.UInput;
-import org.junit.Assume;
-
 import java.util.HashMap;
 import java.util.Map;
+import org.junit.jupiter.api.Assumptions;
+import test.robot.com.sun.glass.ui.monocle.TestApplication;
+import test.robot.com.sun.glass.ui.monocle.UInput;
 
 /**
  * TouchRevolutionFusionDevice sends ABS_X, ABS_Y, ABS_MT_POSITION_X and
@@ -50,7 +49,7 @@ public TouchRevolutionFusionDevice() {
 
     @Override
     public void create() {
-        Assume.assumeTrue(TestApplication.isMonocle());
+        Assumptions.assumeTrue(TestApplication.isMonocle());
         ui = new UInput();
         ui.processLine("OPEN");
         ui.processLine("EVBIT EV_SYN");
diff --git a/tests/system/src/test/java/test/robot/com/sun/prism/NGNodeDirtyFlagTest.java b/tests/system/src/test/java/test/robot/com/sun/prism/NGNodeDirtyFlagTest.java
index 7eec58dd945..a0abae33d24 100644
--- a/tests/system/src/test/java/test/robot/com/sun/prism/NGNodeDirtyFlagTest.java
+++ b/tests/system/src/test/java/test/robot/com/sun/prism/NGNodeDirtyFlagTest.java
@@ -42,7 +42,7 @@
 import javafx.scene.shape.Circle;
 import javafx.scene.shape.Line;
 import javafx.stage.Stage;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import test.robot.testharness.VisualTestBase;
 import test.util.Util;
 
diff --git a/tests/system/src/test/java/test/robot/helloworld/CustomSecurityManagerTest.java b/tests/system/src/test/java/test/robot/helloworld/CustomSecurityManagerTest.java
index b5fe00355f6..778efe6f9ac 100644
--- a/tests/system/src/test/java/test/robot/helloworld/CustomSecurityManagerTest.java
+++ b/tests/system/src/test/java/test/robot/helloworld/CustomSecurityManagerTest.java
@@ -25,14 +25,15 @@
 
 package test.robot.helloworld;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import java.awt.AWTPermission;
 import java.security.AllPermission;
 import java.security.Permission;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 import javafx.geometry.Rectangle2D;
 import javafx.scene.Group;
@@ -43,14 +44,16 @@
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import javafx.util.FXPermission;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import com.sun.javafx.PlatformUtil;
 import test.robot.testharness.VisualTestBase;
 
 /**
  * Basic visual tests using glass Robot to sample pixels.
  */
+@Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
 public class CustomSecurityManagerTest extends VisualTestBase {
 
     private Stage testStage1;
@@ -96,7 +99,7 @@ static class MySecurityManager extends SecurityManager {
     }
 
     @SuppressWarnings("removal")
-    @After
+    @AfterEach
     public void cleanup() {
         System.setSecurityManager(null);
     }
@@ -233,64 +236,63 @@ private void doTestRobotCommon(SecurityManager sm, boolean expectedCreateRobot)
         }
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testOnTopNoSecurityManager() {
         doTestOnTopCommon(null, true);
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testOnTopPermissiveSecurityManager() {
         doTestOnTopCommon(new MySecurityManager(true), true);
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testOnTopRestrictiveSecurityManager() {
         doTestOnTopCommon(new MySecurityManager(false), false);
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testFullScreenInitNoSecurityManager() {
         doTestFullScreenCommon(null, true, true);
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testFullScreenInitPermissiveSecurityManager() {
         doTestFullScreenCommon(new MySecurityManager(true), true, true);
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testFullScreenInitRestrictiveSecurityManager() {
         doTestFullScreenCommon(new MySecurityManager(false), true, false);
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testFullScreenAfterNoSecurityManager() {
         doTestFullScreenCommon(null, false, true);
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testFullScreenAfterPermissiveSecurityManager() {
         doTestFullScreenCommon(new MySecurityManager(true), false, true);
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testFullScreenAfterRestrictiveSecurityManager() {
         doTestFullScreenCommon(new MySecurityManager(false), false, false);
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testRobotNoSecurityManager() {
         doTestRobotCommon(null, true);
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testRobotPermissiveSecurityManager() {
         doTestRobotCommon(new MySecurityManager(true), true);
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testRobotRestrictiveSecurityManager() {
         doTestRobotCommon(new MySecurityManager(false), false);
     }
-
 }
diff --git a/tests/system/src/test/java/test/robot/helloworld/RectangleTest.java b/tests/system/src/test/java/test/robot/helloworld/RectangleTest.java
index 19164d19b18..2c74dbd5171 100644
--- a/tests/system/src/test/java/test/robot/helloworld/RectangleTest.java
+++ b/tests/system/src/test/java/test/robot/helloworld/RectangleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,17 +25,20 @@
 
 package test.robot.helloworld;
 
+import java.util.concurrent.TimeUnit;
 import javafx.scene.Group;
 import javafx.scene.Scene;
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import test.robot.testharness.VisualTestBase;
 
 /**
  * Basic visual tests using glass Robot to sample pixels.
  */
+@Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
 public class RectangleTest extends VisualTestBase {
 
     private Stage testStage;
@@ -43,7 +46,7 @@ public class RectangleTest extends VisualTestBase {
 
     private static final double TOLERANCE = 0.07;
 
-    @Test(timeout = 15000)
+    @Test
     public void testSceneDefaultFill() {
         final int WIDTH = 400;
         final int HEIGHT = 300;
@@ -61,7 +64,7 @@ public void testSceneDefaultFill() {
         });
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testSceneFillColor() {
         final int WIDTH = 400;
         final int HEIGHT = 300;
@@ -80,7 +83,7 @@ public void testSceneFillColor() {
         });
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testFillRect() {
         final int WIDTH = 400;
         final int HEIGHT = 300;
@@ -112,7 +115,7 @@ public void testFillRect() {
         });
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testAddFillRect() {
         final int WIDTH = 400;
         final int HEIGHT = 300;
diff --git a/tests/system/src/test/java/test/robot/javafx/application/KeyLockedTest.java b/tests/system/src/test/java/test/robot/javafx/application/KeyLockedTest.java
index 9f95f1a9f9c..3a344fc1541 100644
--- a/tests/system/src/test/java/test/robot/javafx/application/KeyLockedTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/application/KeyLockedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,25 +25,21 @@
 
 package test.robot.javafx.application;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
-
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import java.util.Optional;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
-
 import javafx.application.Platform;
 import javafx.scene.input.KeyCode;
 import javafx.scene.robot.Robot;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import com.sun.javafx.PlatformUtil;
-
 import test.util.Util;
 
 /**
@@ -55,7 +51,7 @@ public class KeyLockedTest {
     private static final CountDownLatch startupLatch = new CountDownLatch(1);
     private static Robot robot;
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() throws Exception {
         Platform.setImplicitExit(false);
         Util.startup(startupLatch, startupLatch::countDown);
@@ -65,7 +61,7 @@ public static void initFX() throws Exception {
         }
     }
 
-    @AfterClass
+    @AfterAll
     public static void cleanupFX() {
         if (robot != null) {
             // Disable caps lock if it is set
@@ -82,17 +78,21 @@ public static void cleanupFX() {
         Util.shutdown();
     }
 
-    @Test(expected = IllegalStateException.class)
+    @Test
     public void testCallOnTestThread() {
-        // This should throw an exception
-        Optional<Boolean> capsLockState = Platform.isKeyLocked(KeyCode.CAPS);
+        assertThrows(IllegalStateException.class, () -> {
+            // This should throw an exception
+            Optional<Boolean> capsLockState = Platform.isKeyLocked(KeyCode.CAPS);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testIllegalKeyCode() {
-        Util.runAndWait(() -> {
-            // This should throw an exception
-            Optional<Boolean> capsLockState = Platform.isKeyLocked(KeyCode.A);
+        assertThrows(IllegalArgumentException.class, () -> {
+            Util.runAndWait(() -> {
+                // This should throw an exception
+                Optional<Boolean> capsLockState = Platform.isKeyLocked(KeyCode.A);
+            });
         });
     }
 
diff --git a/tests/system/src/test/java/test/robot/javafx/embed/swing/JFXPanelHiDPITest.java b/tests/system/src/test/java/test/robot/javafx/embed/swing/JFXPanelHiDPITest.java
index 94328785b3c..e875c988e91 100644
--- a/tests/system/src/test/java/test/robot/javafx/embed/swing/JFXPanelHiDPITest.java
+++ b/tests/system/src/test/java/test/robot/javafx/embed/swing/JFXPanelHiDPITest.java
@@ -25,10 +25,10 @@
 
 package test.robot.javafx.embed.swing;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import static test.util.Util.TIMEOUT;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
@@ -48,9 +48,9 @@
 import javafx.scene.layout.StackPane;
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Rectangle;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import com.sun.javafx.PlatformUtil;
 import test.util.Util;
 
@@ -69,7 +69,7 @@ public class JFXPanelHiDPITest {
     private static final int PANEL_WIDTH = 500;
     private static final int PANEL_HEIGHT = 400;
 
-    @BeforeClass
+    @BeforeAll
     public static void setupOnce() throws Exception {
         assumeTrue(PlatformUtil.isWindows());
         System.setProperty("sun.java2d.uiScale.enabled", "true");
@@ -80,8 +80,7 @@ public static void setupOnce() throws Exception {
         // Start the Application
         SwingUtilities.invokeAndWait(() -> myApp = new MyApp());
 
-        assertTrue("Timeout waiting for Application to launch",
-                launchLatch.await(5 * TIMEOUT, TimeUnit.MILLISECONDS));
+        assertTrue(launchLatch.await(5 * TIMEOUT, TimeUnit.MILLISECONDS), "Timeout waiting for Application to launch");
     }
 
     @Test
@@ -100,7 +99,7 @@ public void testScale() throws Exception {
         }
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardownOnce() {
         if (myApp != null) {
             SwingUtilities.invokeLater(myApp::dispose);
diff --git a/tests/system/src/test/java/test/robot/javafx/embed/swing/JFXPanelScaledTest.java b/tests/system/src/test/java/test/robot/javafx/embed/swing/JFXPanelScaledTest.java
index 235aa7ed6b0..0ae541f8456 100644
--- a/tests/system/src/test/java/test/robot/javafx/embed/swing/JFXPanelScaledTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/embed/swing/JFXPanelScaledTest.java
@@ -25,10 +25,10 @@
 
 package test.robot.javafx.embed.swing;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import static test.util.Util.TIMEOUT;
 import java.awt.Color;
 import java.awt.Dimension;
@@ -43,9 +43,9 @@
 import javafx.embed.swing.JFXPanelShim;
 import javafx.scene.Scene;
 import javafx.scene.layout.Region;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import com.sun.javafx.PlatformUtil;
 
 public class JFXPanelScaledTest {
@@ -61,7 +61,7 @@ public class JFXPanelScaledTest {
 
     final static int TARGET_SCALED_SIZE = (int) Math.ceil(TARGET_BASE_SIZE *1.25);
 
-    @BeforeClass
+    @BeforeAll
     public static void setupOnce() throws Exception {
         assumeTrue(PlatformUtil.isWindows());
 
@@ -75,11 +75,10 @@ public static void setupOnce() throws Exception {
         SwingUtilities.invokeLater(() -> {
             myApp = new MyApp();
         });
-        assertTrue("Timeout waiting for Application to launch",
-                launchLatch.await(5 * TIMEOUT, TimeUnit.MILLISECONDS));
+        assertTrue(launchLatch.await(5 * TIMEOUT, TimeUnit.MILLISECONDS), "Timeout waiting for Application to launch");
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardownOnce() {
         if (myApp != null) {
             SwingUtilities.invokeLater(myApp::dispose);
diff --git a/tests/system/src/test/java/test/robot/javafx/embed/swing/JFXPanelTest.java b/tests/system/src/test/java/test/robot/javafx/embed/swing/JFXPanelTest.java
index a51260ad1ea..753457070c8 100644
--- a/tests/system/src/test/java/test/robot/javafx/embed/swing/JFXPanelTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/embed/swing/JFXPanelTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,33 +24,31 @@
  */
 package test.robot.javafx.embed.swing;
 
-import com.sun.javafx.PlatformUtil;
-import org.junit.Assume;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.AfterClass;
-import org.junit.Test;
-
-import javafx.embed.swing.JFXPanel;
-
-import javax.swing.JFrame;
-import javax.swing.JMenuBar;
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-import javax.swing.SwingUtilities;
 import java.awt.Robot;
 import java.awt.event.InputEvent;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
+import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.SwingUtilities;
+import javafx.embed.swing.JFXPanel;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.PlatformUtil;
 
 public class JFXPanelTest {
     private static Robot robot;
     private static JFrame frame;
     private static volatile boolean stop;
 
-    @BeforeClass
+    @BeforeAll
     public static void init() throws Exception {
-        Assume.assumeTrue(PlatformUtil.isMac());
+        Assumptions.assumeTrue(PlatformUtil.isMac());
         System.setProperty("apple.laf.useScreenMenuBar", "true");
         robot = new Robot();
         robot.waitForIdle();
@@ -91,10 +89,10 @@ public void testJFXPanelNew() throws Exception {
             endLatch.countDown();
         });
         endLatch.await(5, TimeUnit.SECONDS);
-        Assert.assertTrue("It seems FX initialization is deadlocked", stop);
+        Assertions.assertTrue(stop, "It seems FX initialization is deadlocked");
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardown() throws Exception {
         stop = true;
         if (frame != null) {
diff --git a/tests/system/src/test/java/test/robot/javafx/embed/swing/NonFocusableJFXPanelTest.java b/tests/system/src/test/java/test/robot/javafx/embed/swing/NonFocusableJFXPanelTest.java
index db3d35dd033..7c61b7b4c8a 100644
--- a/tests/system/src/test/java/test/robot/javafx/embed/swing/NonFocusableJFXPanelTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/embed/swing/NonFocusableJFXPanelTest.java
@@ -37,10 +37,10 @@
 import javafx.embed.swing.JFXPanel;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 public class NonFocusableJFXPanelTest {
@@ -50,7 +50,7 @@ public class NonFocusableJFXPanelTest {
     private static final int WIDTH = 600;
     private static final int HEIGHT = 200;
 
-    @BeforeClass
+    @BeforeAll
     public static void init() throws Exception {
         robot = new Robot();
         robot.setAutoDelay(100);
@@ -69,14 +69,13 @@ public void testJFXPanelFocus() throws Exception {
             robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
             robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
         }
-        Assert.assertFalse("Extra MouseEvent generated", clickCount > 5);
+        Assertions.assertFalse(clickCount > 5, "Extra MouseEvent generated");
     }
 
     private void waitForLatch(CountDownLatch latch, long ms) throws Exception {
-        Assert.assertTrue(String.format(
-            "unexpected error: waiting timeout %d ms elapsed for",
-            ms),
-            latch.await(ms, TimeUnit.MILLISECONDS));
+        Assertions.assertTrue(
+            latch.await(ms, TimeUnit.MILLISECONDS),
+            String.format("unexpected error: waiting timeout %d ms elapsed for", ms));
     }
 
     public void initAndShowGUI() {
@@ -108,14 +107,14 @@ public void initAndShowGUI() {
         try {
             waitForLatch(latch, 5000);
         } catch (Exception e) {
-            Assert.fail("Exception while waiting for latch");
+            Assertions.fail("Exception while waiting for latch");
         }
     }
 
 
-    @AfterClass
+    @AfterAll
     public static void teardown() throws Exception {
-        Assert.assertNotNull(frame);
+        Assertions.assertNotNull(frame);
         SwingUtilities.invokeLater(frame::dispose);
     }
 }
diff --git a/tests/system/src/test/java/test/robot/javafx/embed/swing/RT23603Test.java b/tests/system/src/test/java/test/robot/javafx/embed/swing/RT23603Test.java
index cfa3710aa21..25e6a9f5244 100644
--- a/tests/system/src/test/java/test/robot/javafx/embed/swing/RT23603Test.java
+++ b/tests/system/src/test/java/test/robot/javafx/embed/swing/RT23603Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,34 +25,29 @@
 
 package test.robot.javafx.embed.swing;
 
-import javafx.application.Platform;
-import javafx.scene.Scene;
-import javafx.scene.layout.Region;
-
 import java.awt.AWTException;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Point;
 import java.awt.Robot;
-
-import javax.swing.JFrame;
-import javax.swing.SwingUtilities;
-
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-
+import javax.swing.JFrame;
+import javax.swing.SwingUtilities;
 import javafx.animation.AnimationTimer;
+import javafx.application.Platform;
 import javafx.embed.swing.JFXPanel;
-import junit.framework.Assert;
-
-import org.junit.Test;
-import org.junit.Ignore;
+import javafx.scene.Scene;
+import javafx.scene.layout.Region;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 /**
  * RT-23603: WebView does not display in JFXPanel on initialization
  */
-@Ignore("RT-29515")
+@Disabled("RT-29515")
 public class RT23603Test {
     volatile JFrame frame;
     final CountDownLatch l1 = new CountDownLatch(2);
@@ -91,11 +86,11 @@ public void test() {
         try {
             r = new Robot();
         } catch (AWTException ex) {
-            Assert.fail("unexpected error: couldn't create java.awt.Robot: " + ex);
+            Assertions.fail(ex);
         }
         Point pt = frame.getLocationOnScreen();
         Color color = r.getPixelColor(pt.x + 100, pt.y + 100);
-        Assert.assertEquals(color, Color.GREEN);
+        Assertions.assertEquals(color, Color.GREEN);
     }
 
     private void waitForLatch(CountDownLatch latch, long ms) {
@@ -104,7 +99,7 @@ private void waitForLatch(CountDownLatch latch, long ms) {
         } catch (InterruptedException e) {
         }
         if (latch.getCount() > 0) {
-            Assert.fail("unexpected error: waiting timeout " + ms + "ms elapsed for " + latch);
+            Assertions.fail("unexpected error: waiting timeout " + ms + "ms elapsed for " + latch);
         }
     }
 
diff --git a/tests/system/src/test/java/test/robot/javafx/embed/swing/RT30650Test.java b/tests/system/src/test/java/test/robot/javafx/embed/swing/RT30650Test.java
index 4564ae1726d..5855d801ee3 100644
--- a/tests/system/src/test/java/test/robot/javafx/embed/swing/RT30650Test.java
+++ b/tests/system/src/test/java/test/robot/javafx/embed/swing/RT30650Test.java
@@ -25,19 +25,22 @@
 
 package test.robot.javafx.embed.swing;
 
-import static org.junit.Assume.assumeTrue;
-import org.junit.Test;
-import junit.framework.Assert;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import java.util.concurrent.TimeUnit;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 /**
  * RT-30650: SwingNode is not Resizable
  */
+@Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
 public class RT30650Test {
 
-    @Test(timeout = 15000)
+    @Test
     public void test() {
         assumeTrue(Boolean.getBoolean("unstable.test")); // JDK-8196606
-        Assert.assertTrue(RT30650GUI.test());
+        Assertions.assertTrue(RT30650GUI.test());
 
         System.out.println("Passed.");
     }
diff --git a/tests/system/src/test/java/test/robot/javafx/embed/swing/RT32570Test.java b/tests/system/src/test/java/test/robot/javafx/embed/swing/RT32570Test.java
index 100f053cf5d..da4825a4612 100644
--- a/tests/system/src/test/java/test/robot/javafx/embed/swing/RT32570Test.java
+++ b/tests/system/src/test/java/test/robot/javafx/embed/swing/RT32570Test.java
@@ -26,17 +26,19 @@
 package test.robot.javafx.embed.swing;
 
 import java.awt.Dimension;
+import java.util.concurrent.TimeUnit;
+import javax.swing.JLabel;
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
+import javax.swing.SwingUtilities;
 import javafx.embed.swing.SwingNode;
 import javafx.scene.Group;
 import javafx.scene.Scene;
 import javafx.scene.paint.Color;
 import javafx.stage.Stage;
-import javax.swing.JLabel;
-import javax.swing.JMenuItem;
-import javax.swing.JPopupMenu;
-import javax.swing.SwingUtilities;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import test.robot.testharness.VisualTestBase;
 
 /**
@@ -45,6 +47,7 @@
  *
  * https://javafx-jira.kenai.com/browse/RT-32570
  */
+@Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
 public class RT32570Test extends VisualTestBase {
 
     private static final double TOLERANCE = 0.07;
@@ -58,8 +61,8 @@ public class RT32570Test extends VisualTestBase {
 
     private volatile boolean popped;
 
-    @Ignore("JDK-8153542")
-    @Test(timeout = 15000)
+    @Disabled("JDK-8153542")
+    @Test
     public void test() throws Exception {
         runAndWait(() -> {
             swingNode = new SwingNode();
diff --git a/tests/system/src/test/java/test/robot/javafx/embed/swing/SwingNodeBase.java b/tests/system/src/test/java/test/robot/javafx/embed/swing/SwingNodeBase.java
index c49e810f5a7..6759968a715 100644
--- a/tests/system/src/test/java/test/robot/javafx/embed/swing/SwingNodeBase.java
+++ b/tests/system/src/test/java/test/robot/javafx/embed/swing/SwingNodeBase.java
@@ -31,23 +31,19 @@
 import java.awt.event.InputEvent;
 import java.lang.reflect.InvocationTargetException;
 import java.util.concurrent.CountDownLatch;
-
 import javax.swing.JDialog;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.embed.swing.SwingNode;
 import javafx.scene.Scene;
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
-
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
 import test.util.Util;
 
 public class SwingNodeBase {
@@ -64,7 +60,7 @@ public class SwingNodeBase {
     // Singleton Application instance
     static MyApp myApp;
 
-    @BeforeClass
+    @BeforeAll
     public static void setupOnce() throws AWTException, InvocationTargetException, InterruptedException {
         robot = new Robot();
         robot.setAutoDelay(100);
@@ -80,7 +76,7 @@ public static void setupOnce() throws AWTException, InvocationTargetException, I
         paintLatch.countDown();
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardownOnce() {
         Util.shutdown();
     }
@@ -208,11 +204,13 @@ public void testAbove(boolean above) {
         }
 
         if (above) {
-            Assert.assertEquals("JDialog is not above JavaFX stage",
-                    java.awt.Color.BLUE, robot.getPixelColor(checkLoc, checkLoc));
+            Assertions.assertEquals(
+                java.awt.Color.BLUE, robot.getPixelColor(checkLoc, checkLoc),
+                "JDialog is not above JavaFX stage");
         } else {
-            Assert.assertFalse("JDialog is above JavaFX stage",
-                    java.awt.Color.BLUE.equals(robot.getPixelColor(checkLoc, checkLoc)));
+            Assertions.assertFalse(
+                java.awt.Color.BLUE.equals(robot.getPixelColor(checkLoc, checkLoc)),
+                "JDialog is above JavaFX stage");
         }
     }
 }
diff --git a/tests/system/src/test/java/test/robot/javafx/embed/swing/SwingNodeJDialogTest.java b/tests/system/src/test/java/test/robot/javafx/embed/swing/SwingNodeJDialogTest.java
index f4e001e090b..1015e63a6f5 100644
--- a/tests/system/src/test/java/test/robot/javafx/embed/swing/SwingNodeJDialogTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/embed/swing/SwingNodeJDialogTest.java
@@ -25,18 +25,19 @@
 
 package test.robot.javafx.embed.swing;
 
-import org.junit.Test;
-import test.util.Util;
-
-import javax.swing.SwingUtilities;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import java.lang.reflect.InvocationTargetException;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import javax.swing.SwingUtilities;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+import test.util.Util;
 
-import static org.junit.Assume.assumeTrue;
-
+@Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
 public class SwingNodeJDialogTest extends SwingNodeBase {
 
-    @Test(timeout = 15000)
+    @Test
     public void testJDialogAbove() throws InterruptedException, InvocationTargetException {
         assumeTrue(!Util.isOnWayland()); // JDK-8335470
         myApp.createStageAndDialog();
@@ -47,7 +48,7 @@ public void testJDialogAbove() throws InterruptedException, InvocationTargetExce
         myApp.closeStageAndDialog();
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testNodeRemovalAfterShow() throws InterruptedException, InvocationTargetException {
         assumeTrue(!Util.isOnWayland()); // JDK-8335470
         myApp.createStageAndDialog();
@@ -62,7 +63,7 @@ public void testNodeRemovalAfterShow() throws InterruptedException, InvocationTa
         myApp.attachSwingNode();
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testNodeRemovalBeforeShow() throws InterruptedException, InvocationTargetException {
         assumeTrue(!Util.isOnWayland()); // JDK-8335470
         myApp.createStageAndDialog();
@@ -75,7 +76,7 @@ public void testNodeRemovalBeforeShow() throws InterruptedException, InvocationT
         myApp.attachSwingNode();
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testStageCloseAfterShow() throws InvocationTargetException, InterruptedException {
         assumeTrue(!Util.isOnWayland()); // JDK-8335470
         myApp.createStageAndDialog();
@@ -85,7 +86,7 @@ public void testStageCloseAfterShow() throws InvocationTargetException, Interrup
         myApp.disposeDialog();
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testStageCloseBeforeShow() throws InvocationTargetException, InterruptedException {
         assumeTrue(!Util.isOnWayland()); // JDK-8335470
         myApp.createStageAndDialog();
@@ -96,7 +97,7 @@ public void testStageCloseBeforeShow() throws InvocationTargetException, Interru
     }
 
 
-    @Test(timeout = 15000)
+    @Test
     public void testNodeRemovalBeforeShowHoldEDT() throws InterruptedException, InvocationTargetException {
         assumeTrue(!Util.isOnWayland()); // JDK-8335470
         myApp.createAndShowStage();
@@ -114,7 +115,7 @@ public void testNodeRemovalBeforeShowHoldEDT() throws InterruptedException, Invo
         myApp.attachSwingNode();
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testStageCloseBeforeShowHoldEDT() throws InvocationTargetException, InterruptedException {
         assumeTrue(!Util.isOnWayland()); // JDK-8335470
         myApp.createAndShowStage();
diff --git a/tests/system/src/test/java/test/robot/javafx/embed/swing/SwingNodePlatformExitCrashTest.java b/tests/system/src/test/java/test/robot/javafx/embed/swing/SwingNodePlatformExitCrashTest.java
index 0efb7964101..78023de5210 100644
--- a/tests/system/src/test/java/test/robot/javafx/embed/swing/SwingNodePlatformExitCrashTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/embed/swing/SwingNodePlatformExitCrashTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,18 +25,18 @@
 
 package test.robot.javafx.embed.swing;
 
-import javafx.application.Platform;
-import org.junit.Ignore;
-import org.junit.Test;
-import test.util.Util;
-import javax.swing.SwingUtilities;
 import java.lang.reflect.InvocationTargetException;
 import java.util.concurrent.CountDownLatch;
+import javax.swing.SwingUtilities;
+import javafx.application.Platform;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import test.util.Util;
 
 public class SwingNodePlatformExitCrashTest extends SwingNodeBase {
 
     @Test
-    @Ignore("JDK-8190329")
+    @Disabled("JDK-8190329")
     public void testPlatformExitBeforeShowHoldEDT() throws InvocationTargetException, InterruptedException {
         myApp.createAndShowStage();
         CountDownLatch latch = new CountDownLatch(1);
diff --git a/tests/system/src/test/java/test/robot/javafx/scene/AfterModalClosedTest.java b/tests/system/src/test/java/test/robot/javafx/scene/AfterModalClosedTest.java
index cbd630ebd45..5612de9cd36 100644
--- a/tests/system/src/test/java/test/robot/javafx/scene/AfterModalClosedTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/scene/AfterModalClosedTest.java
@@ -24,11 +24,9 @@
  */
 package test.robot.javafx.scene;
 
-import static org.junit.Assume.assumeTrue;
-
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Scene;
@@ -38,14 +36,11 @@
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
-
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import com.sun.javafx.PlatformUtil;
-
 import test.util.Util;
 
 public class AfterModalClosedTest {
@@ -80,12 +75,12 @@ public void start(Stage primaryStage) throws Exception {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() throws InterruptedException {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardown() {
         Util.shutdown();
     }
@@ -93,7 +88,7 @@ public static void teardown() {
     @Test
     public void testResizability() throws Exception {
         assumeTrue(Boolean.getBoolean("unstable.test")); // JDK-8176776
-        Assert.assertTrue(stage.isResizable());
+        Assertions.assertTrue(stage.isResizable());
         CountDownLatch resizeLatch = new CountDownLatch(2);
         Platform.runLater(() -> {
             stage.widthProperty().addListener((ov, o, n) -> {
@@ -121,6 +116,6 @@ public void testResizability() throws Exception {
             robot.mouseRelease(MouseButton.PRIMARY);
         });
         resizeLatch.await(5, TimeUnit.SECONDS);
-        Assert.assertTrue("Window is not resized", w && h);
+        Assertions.assertTrue(w && h, "Window is not resized");
     }
 }
diff --git a/tests/system/src/test/java/test/robot/javafx/scene/ChoiceBoxScrollUpOnCollectionChangeTest.java b/tests/system/src/test/java/test/robot/javafx/scene/ChoiceBoxScrollUpOnCollectionChangeTest.java
index 54bc00f1566..5cae66b063c 100644
--- a/tests/system/src/test/java/test/robot/javafx/scene/ChoiceBoxScrollUpOnCollectionChangeTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/scene/ChoiceBoxScrollUpOnCollectionChangeTest.java
@@ -26,30 +26,26 @@
 package test.robot.javafx.scene;
 
 import java.util.concurrent.CountDownLatch;
-
-import com.sun.javafx.scene.control.ContextMenuContentShim;
-
 import javafx.application.Application;
+import javafx.application.Platform;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
+import javafx.scene.Scene;
 import javafx.scene.control.ChoiceBox;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.skin.ChoiceBoxSkin;
 import javafx.scene.control.skin.ChoiceBoxSkinNodesShim;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.MouseButton;
-import javafx.application.Platform;
 import javafx.scene.robot.Robot;
-import javafx.scene.Scene;
 import javafx.stage.Screen;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
-
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import com.sun.javafx.scene.control.ContextMenuContentShim;
 import test.util.Util;
 
 /*
@@ -128,31 +124,31 @@ public void testChoiceBoxScrollOnCollectionChange() throws Exception {
 
         Thread.sleep(400); // Small delay to avoid test failure due to slow UI loading.
 
-        Assert.assertFalse(ContextMenuContentShim.isContextMenuUpArrowVisible(popup));
-        Assert.assertTrue(ContextMenuContentShim.isContextMenuDownArrowVisible(popup));
+        Assertions.assertFalse(ContextMenuContentShim.isContextMenuUpArrowVisible(popup));
+        Assertions.assertTrue(ContextMenuContentShim.isContextMenuDownArrowVisible(popup));
 
         double rowHeight = ContextMenuContentShim.getContextMenuRowHeight(popup);
         double screenHeight = Screen.getPrimary().getVisualBounds().getHeight();
         scrollChoiceBox((int) Math.ceil(screenHeight / rowHeight));
 
         Util.waitForLatch(choiceBoxHiddenLatch, 5, "Timeout waiting for choicebox to be hidden.");
-        Assert.assertTrue(ContextMenuContentShim.isContextMenuUpArrowVisible(popup));
-        Assert.assertTrue(ContextMenuContentShim.isContextMenuDownArrowVisible(popup));
+        Assertions.assertTrue(ContextMenuContentShim.isContextMenuUpArrowVisible(popup));
+        Assertions.assertTrue(ContextMenuContentShim.isContextMenuDownArrowVisible(popup));
 
         addChoiceBoxItems(2);
         choiceBoxDisplayLatch = new CountDownLatch(1);
         showChoiceBox();
 
-        Assert.assertFalse(ContextMenuContentShim.isContextMenuUpArrowVisible(popup));
-        Assert.assertFalse(ContextMenuContentShim.isContextMenuDownArrowVisible(popup));
+        Assertions.assertFalse(ContextMenuContentShim.isContextMenuUpArrowVisible(popup));
+        Assertions.assertFalse(ContextMenuContentShim.isContextMenuDownArrowVisible(popup));
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() throws Exception {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void exit() {
         Util.shutdown();
     }
diff --git a/tests/system/src/test/java/test/robot/javafx/scene/ColorPickerTest.java b/tests/system/src/test/java/test/robot/javafx/scene/ColorPickerTest.java
index 00561197d45..eb1b32be459 100644
--- a/tests/system/src/test/java/test/robot/javafx/scene/ColorPickerTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/scene/ColorPickerTest.java
@@ -35,12 +35,12 @@
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import javafx.stage.WindowEvent;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 public class ColorPickerTest {
@@ -108,24 +108,24 @@ public void testColorPickerSceneChange() throws Exception {
         Util.waitForLatch(onShownLatch, 10, "Failed to show color palette.");
         Thread.sleep(400); // ColorPicker takes some time to display the color palette.
         // 2.
-        Assert.assertEquals("ColorPicker palette should be shown once.", 1, onShownCount);
+        Assertions.assertEquals(1, onShownCount, "ColorPicker palette should be shown once.");
 
         // 2.1
         clickColorPickerPalette(5);
-        Assert.assertEquals("ColorPicker palette should be clicked once.", 1, onActionCount);
+        Assertions.assertEquals(1, onActionCount, "ColorPicker palette should be clicked once.");
 
         // 3.
         showColorPickerPalette();
         // 4.
-        Assert.assertEquals("ColorPicker palette should have been shown two times.", 2, onShownCount);
+        Assertions.assertEquals(2, onShownCount, "ColorPicker palette should have been shown two times.");
 
         // 4.1
         clickColorPickerPalette(6);
-        Assert.assertEquals("ColorPicker palette have been clicked two times.", 2, onActionCount);
+        Assertions.assertEquals(2, onActionCount, "ColorPicker palette have been clicked two times.");
 
         // 5.
         showColorPickerPalette();
-        Assert.assertEquals("ColorPicker palette should have been shown three times.", 3, onShownCount);
+        Assertions.assertEquals(3, onShownCount, "ColorPicker palette should have been shown three times.");
 
         // 6.
         Util.runAndWait(() -> {
@@ -136,10 +136,10 @@ public void testColorPickerSceneChange() throws Exception {
 
         // 7.
         clickColorPickerPalette(5);
-        Assert.assertEquals("ColorPicker palette should have been clicked three times.", 3, onActionCount);
+        Assertions.assertEquals(3, onActionCount, "ColorPicker palette should have been clicked three times.");
     }
 
-    @After
+    @AfterEach
     public void resetUI() {
         Platform.runLater(() -> {
             colorPicker.setOnShown(null);
@@ -148,7 +148,7 @@ public void resetUI() {
         });
     }
 
-    @Before
+    @BeforeEach
     public void setupUI() {
         Platform.runLater(() -> {
             colorPicker = new ColorPicker();
@@ -164,12 +164,12 @@ public void setupUI() {
         });
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() throws Exception {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void exit() {
         Util.shutdown();
     }
diff --git a/tests/system/src/test/java/test/robot/javafx/scene/ComboBoxTest.java b/tests/system/src/test/java/test/robot/javafx/scene/ComboBoxTest.java
index 7dddf2700ad..f62cd4d7a5a 100644
--- a/tests/system/src/test/java/test/robot/javafx/scene/ComboBoxTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/scene/ComboBoxTest.java
@@ -25,7 +25,6 @@
 package test.robot.javafx.scene;
 
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;
@@ -37,14 +36,12 @@
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import javafx.stage.WindowEvent;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 public class ComboBoxTest {
@@ -110,10 +107,12 @@ public void testComboBoxSceneChange1() throws Exception {
 
             Util.waitForLatch(selectedLatch, 10, "Failed to select " + i + "th choice.");
         }
-        Assert.assertEquals("ComboBox popup list should have been displayed " +
-            (ITEM_COUNT + 1) + " times.", (ITEM_COUNT + 1), onShownCount);
-        Assert.assertEquals("ComboBox choice should have been selected " +
-            ITEM_COUNT + " times.", ITEM_COUNT, onSelectedCount);
+        Assertions.assertEquals(
+            (ITEM_COUNT + 1), onShownCount,
+            "ComboBox popup list should have been displayed " + (ITEM_COUNT + 1) + " times.");
+        Assertions.assertEquals(
+            ITEM_COUNT, onSelectedCount,
+            "ComboBox choice should have been selected " + ITEM_COUNT + " times.");
     }
 
     // This test is for verifying a specific behavior.
@@ -153,20 +152,22 @@ public void testComboBoxSceneChange2() throws Exception {
 
             Util.waitForLatch(selectedLatch, 10, "Failed to select " + i + "th choice.");
         }
-        Assert.assertEquals("ComboBox popup list should be displayed " +
-            ITEM_COUNT + " times.", ITEM_COUNT, onShownCount);
-        Assert.assertEquals("ComboBox choice should have been selected " +
-            ITEM_COUNT + " times.", ITEM_COUNT, onSelectedCount);
+        Assertions.assertEquals(
+            ITEM_COUNT, onShownCount,
+            "ComboBox popup list should be displayed " + ITEM_COUNT + " times.");
+        Assertions.assertEquals(
+            ITEM_COUNT, onSelectedCount,
+            "ComboBox choice should have been selected " + ITEM_COUNT + " times.");
     }
 
-    @After
+    @AfterEach
     public void resetUI() {
         Util.runAndWait(() -> {
             root.getChildren().clear();
         });
     }
 
-    @Before
+    @BeforeEach
     public void setupUI() {
         Util.runAndWait(() -> {
             comboBox = new ComboBox();
@@ -179,12 +180,12 @@ public void setupUI() {
         });
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() throws Exception {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void exit() {
         Util.shutdown();
     }
diff --git a/tests/system/src/test/java/test/robot/javafx/scene/ContextMenuNPETest.java b/tests/system/src/test/java/test/robot/javafx/scene/ContextMenuNPETest.java
index d9b90530c11..78cdfb33d08 100644
--- a/tests/system/src/test/java/test/robot/javafx/scene/ContextMenuNPETest.java
+++ b/tests/system/src/test/java/test/robot/javafx/scene/ContextMenuNPETest.java
@@ -25,34 +25,29 @@
 
 package test.robot.javafx.scene;
 
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.scene.control.MenuButton;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.MouseButton;
-import javafx.scene.Parent;
 import javafx.scene.robot.Robot;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import javafx.stage.WindowEvent;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import com.sun.javafx.PlatformUtil;
-
 import test.util.Util;
 
-import static org.junit.Assume.assumeTrue;
-
 /*
  * Test for verifying context menu NPE error
  *
@@ -123,10 +118,10 @@ public void testContextMenuNPE() throws Throwable {
             throw exception;
         }
 
-        Assert.assertEquals(0, onHiddenLatch.getCount());
+        Assertions.assertEquals(0, onHiddenLatch.getCount());
     }
 
-    @After
+    @AfterEach
     public void resetUI() {
         Platform.runLater(() -> {
             menuButton.setOnShown(null);
@@ -134,7 +129,7 @@ public void resetUI() {
         });
     }
 
-    @Before
+    @BeforeEach
     public void setupUI() {
         Platform.runLater(() -> {
             menuButton.setOnShown(e -> {
@@ -146,12 +141,12 @@ public void setupUI() {
         });
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() throws Exception {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void exit() {
         Util.shutdown();
     }
diff --git a/tests/system/src/test/java/test/robot/javafx/scene/DatePickerTest.java b/tests/system/src/test/java/test/robot/javafx/scene/DatePickerTest.java
index a39815674d8..dec773d09c5 100644
--- a/tests/system/src/test/java/test/robot/javafx/scene/DatePickerTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/scene/DatePickerTest.java
@@ -24,10 +24,8 @@
  */
 package test.robot.javafx.scene;
 
-import static org.junit.Assume.assumeTrue;
-
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Scene;
@@ -38,16 +36,13 @@
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import javafx.stage.WindowEvent;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import com.sun.javafx.PlatformUtil;
-
 import test.util.Util;
 
 public class DatePickerTest {
@@ -117,24 +112,24 @@ public void testDatePickerSceneChange() throws Exception {
         Util.waitForLatch(onShownLatch, 10, "Failed to show calendar popup.");
         Thread.sleep(400); // DatePicker takes some time to display the calendar popup.
         // 2.
-        Assert.assertEquals("DatePicker calendar popup should be shown once.", 1, onShownCount);
+        Assertions.assertEquals(1, onShownCount, "DatePicker calendar popup should be shown once.");
 
         // 2.1
         clickDatePickerCalendarPopup(5);
-        Assert.assertEquals("DatePicker calendar popup should be clicked once.", 1, onActionCount);
+        Assertions.assertEquals(1, onActionCount, "DatePicker calendar popup should be clicked once.");
 
         // 3.
         showDatePickerCalendarPopup();
         // 4.
-        Assert.assertEquals("DatePicker calendar popup should have been shown two times.", 2, onShownCount);
+        Assertions.assertEquals(2, onShownCount, "DatePicker calendar popup should have been shown two times.");
 
         // 4.1
         clickDatePickerCalendarPopup(6);
-        Assert.assertEquals("DatePicker calendar popup have been clicked two times.", 2, onActionCount);
+        Assertions.assertEquals(2, onActionCount, "DatePicker calendar popup have been clicked two times.");
 
         // 5.
         showDatePickerCalendarPopup();
-        Assert.assertEquals("DatePicker calendar popup should have been shown three times.", 3, onShownCount);
+        Assertions.assertEquals(3, onShownCount, "DatePicker calendar popup should have been shown three times.");
 
         // 6.
         Util.runAndWait(() -> {
@@ -145,10 +140,10 @@ public void testDatePickerSceneChange() throws Exception {
 
         // 7.
         clickDatePickerCalendarPopup(5);
-        Assert.assertEquals("DatePicker calendar popup should have been clicked three times.", 3, onActionCount);
+        Assertions.assertEquals(3, onActionCount, "DatePicker calendar popup should have been clicked three times.");
     }
 
-    @After
+    @AfterEach
     public void resetUI() {
         Platform.runLater(() -> {
             datePicker.setOnShown(null);
@@ -157,7 +152,7 @@ public void resetUI() {
         });
     }
 
-    @Before
+    @BeforeEach
     public void setupUI() {
         Platform.runLater(() -> {
             datePicker = new DatePicker();
@@ -173,12 +168,12 @@ public void setupUI() {
         });
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() throws Exception {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void exit() {
         Util.shutdown();
     }
diff --git a/tests/system/src/test/java/test/robot/javafx/scene/DatePickerUpdateOnAlertCloseTest.java b/tests/system/src/test/java/test/robot/javafx/scene/DatePickerUpdateOnAlertCloseTest.java
index 74a7dc719a2..50ce2e15abd 100644
--- a/tests/system/src/test/java/test/robot/javafx/scene/DatePickerUpdateOnAlertCloseTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/scene/DatePickerUpdateOnAlertCloseTest.java
@@ -25,29 +25,26 @@
 
 package test.robot.javafx.scene;
 
-import java.util.concurrent.CountDownLatch;
 import java.time.LocalDate;
-
+import java.util.concurrent.CountDownLatch;
 import javafx.application.Application;
+import javafx.application.Platform;
+import javafx.scene.Scene;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.Button;
 import javafx.scene.control.DatePicker;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.MouseButton;
-import javafx.application.Platform;
 import javafx.scene.robot.Robot;
-import javafx.scene.Scene;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 /*
@@ -146,7 +143,7 @@ public void testDatePickerUpdateOnAlertCloseUsingMouse() throws Exception {
         LocalDate newDate = datePicker.getValue();
 
         Thread.sleep(400); // Wait for date to be selected.
-        Assert.assertNotEquals(oldDate, newDate);
+        Assertions.assertNotEquals(oldDate, newDate);
     }
 
     @Test
@@ -158,10 +155,10 @@ public void testDatePickerUpdateOnAlertCloseUsingKeyboard() throws Exception {
         selectNextDate();
 
         Thread.sleep(400); // Wait for date to be selected.
-        Assert.assertFalse(LocalDate.now().isEqual(datePicker.getValue()));
+        Assertions.assertFalse(LocalDate.now().isEqual(datePicker.getValue()));
     }
 
-    @After
+    @AfterEach
     public void resetUI() {
         Util.runAndWait(() -> {
             datePicker.setOnShown(null);
@@ -172,7 +169,7 @@ public void resetUI() {
         });
     }
 
-    @Before
+    @BeforeEach
     public void setupUI() {
         Util.runAndWait(() -> {
             datePicker = new DatePicker(LocalDate.now());
@@ -201,12 +198,12 @@ public void setupUI() {
         });
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() throws Exception {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void exit() {
         Util.shutdown();
     }
diff --git a/tests/system/src/test/java/test/robot/javafx/scene/JDK8183100Test.java b/tests/system/src/test/java/test/robot/javafx/scene/JDK8183100Test.java
index e28d9752c86..0857f6cc662 100644
--- a/tests/system/src/test/java/test/robot/javafx/scene/JDK8183100Test.java
+++ b/tests/system/src/test/java/test/robot/javafx/scene/JDK8183100Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,10 @@
 
 package test.robot.javafx.scene;
 
-import test.com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
-import test.com.sun.javafx.scene.control.infrastructure.KeyModifier;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
 import javafx.application.Platform;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
@@ -34,23 +36,24 @@
 import javafx.scene.control.ToggleGroup;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyCodeCombination;
+import javafx.scene.layout.HBox;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.Priority;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.VBox;
 import javafx.scene.layout.StackPane;
+import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
 import javafx.stage.Stage;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+import test.com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
+import test.com.sun.javafx.scene.control.infrastructure.KeyModifier;
 import test.robot.testharness.VisualTestBase;
-import static org.junit.Assert.assertEquals;
 
 /**
  * A visual styling regression has been fixed under JDK8183100.
  * This test validates it.
  */
+@Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
 public class JDK8183100Test extends VisualTestBase {
 
     private Stage testStage;
@@ -78,7 +81,7 @@ void fillWithFreshYellowPane() {
         }
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void stackPaneColorTest() {
         final int WIDTH = 200;
         final int HEIGHT = 100;
diff --git a/tests/system/src/test/java/test/robot/javafx/scene/MouseLocationOnScreenTest.java b/tests/system/src/test/java/test/robot/javafx/scene/MouseLocationOnScreenTest.java
index 622cabbdb2e..9253286f180 100644
--- a/tests/system/src/test/java/test/robot/javafx/scene/MouseLocationOnScreenTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/scene/MouseLocationOnScreenTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,21 +26,20 @@
 package test.robot.javafx.scene;
 
 import java.util.concurrent.CountDownLatch;
-
+import java.util.concurrent.TimeUnit;
 import javafx.application.Application;
 import javafx.geometry.Rectangle2D;
 import javafx.scene.robot.Robot;
 import javafx.stage.Screen;
 import javafx.stage.Stage;
-
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import test.util.Util;
 
-
+@Timeout(value=120000, unit=TimeUnit.MILLISECONDS)
 public class MouseLocationOnScreenTest {
     static CountDownLatch startupLatch = new CountDownLatch(1);
     static Robot robot;
@@ -55,17 +54,17 @@ public void start(Stage primaryStage) throws Exception {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardown() {
         Util.shutdown();
     }
 
-    @Test(timeout = 120000)
+    @Test
     public void testMouseLocation() throws Exception {
 
         Screen screen = Screen.getPrimary();
@@ -119,8 +118,8 @@ public void testMouseLocation() throws Exception {
      * returned by robot are same
      */
     static void validate(Robot robot, int x, int y) {
-        Assert.assertEquals(x, (int) robot.getMouseX());
-        Assert.assertEquals(y, (int) robot.getMouseY());
+        Assertions.assertEquals(x, (int) robot.getMouseX());
+        Assertions.assertEquals(y, (int) robot.getMouseY());
     }
 
     private static void edge(Robot robot, int x1, int y1, int x2, int y2) {
diff --git a/tests/system/src/test/java/test/robot/javafx/scene/PixelBufferDrawTest.java b/tests/system/src/test/java/test/robot/javafx/scene/PixelBufferDrawTest.java
index 79afbf4469d..6bd5a982e6c 100644
--- a/tests/system/src/test/java/test/robot/javafx/scene/PixelBufferDrawTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/scene/PixelBufferDrawTest.java
@@ -25,14 +25,12 @@
 
 package test.robot.javafx.scene;
 
-import static org.junit.Assert.fail;
-
+import static org.junit.jupiter.api.Assertions.fail;
 import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.IntBuffer;
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.geometry.Rectangle2D;
@@ -48,14 +46,12 @@
 import javafx.stage.StageStyle;
 import javafx.stage.WindowEvent;
 import javafx.util.Callback;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 /*
@@ -187,10 +183,10 @@ private ImageView createImageViewPB(PixelBuffer<? extends Buffer> pixelBuffer) {
 
     private void compareColor(Color exp, Color act) {
         final double COMPARE_DELTA = 0.01;
-        Assert.assertEquals(exp.getRed(), act.getRed(), COMPARE_DELTA);
-        Assert.assertEquals(exp.getBlue(), act.getBlue(), COMPARE_DELTA);
-        Assert.assertEquals(exp.getGreen(), act.getGreen(), COMPARE_DELTA);
-        Assert.assertEquals(exp.getOpacity(), act.getOpacity(), COMPARE_DELTA);
+        Assertions.assertEquals(exp.getRed(), act.getRed(), COMPARE_DELTA);
+        Assertions.assertEquals(exp.getBlue(), act.getBlue(), COMPARE_DELTA);
+        Assertions.assertEquals(exp.getGreen(), act.getGreen(), COMPARE_DELTA);
+        Assertions.assertEquals(exp.getOpacity(), act.getOpacity(), COMPARE_DELTA);
     }
 
     private void verifyColor(Color color1, Color color2) {
@@ -286,22 +282,22 @@ public void start(Stage primaryStage) {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() throws Exception {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void exit() {
         Util.shutdown();
     }
 
-    @Before
+    @BeforeEach
     public void before() {
         Util.parkCursor(robot);
     }
 
-    @After
+    @AfterEach
     public void cleanupTest() {
         Util.runAndWait(() -> {
             root = new HBox(1);
diff --git a/tests/system/src/test/java/test/robot/javafx/scene/RobotTest.java b/tests/system/src/test/java/test/robot/javafx/scene/RobotTest.java
index 99f6466cb5d..abc4c17245c 100644
--- a/tests/system/src/test/java/test/robot/javafx/scene/RobotTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/scene/RobotTest.java
@@ -25,12 +25,10 @@
 package test.robot.javafx.scene;
 
 import static javafx.scene.paint.Color.MAGENTA;
-
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicReference;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
@@ -56,19 +54,15 @@
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import javafx.stage.WindowEvent;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import com.sun.javafx.PlatformUtil;
-
-import junit.framework.AssertionFailedError;
 import test.util.Util;
 
 /**
@@ -140,7 +134,7 @@ private enum KeyAction {
         TYPED
     }
 
-    @Before
+    @BeforeEach
     public void before() {
         Util.parkCursor(robot);
     }
@@ -196,51 +190,38 @@ private static void testKeyboard(KeyAction keyAction) {
         });
         Util.waitForLatch(keyActionLatch, 5, "Timeout while waiting for textField.onKey" +
                 capFirst(keyAction.name()) + "().");
-        Assert.assertEquals("letter 'a' should be " + keyAction.name().toLowerCase() +
-                " by Robot", "a", textField.getText());
+        Assertions.assertEquals(
+            "a", textField.getText(),
+            "letter 'a' should be " + keyAction.name().toLowerCase() + " by Robot");
     }
 
     @Test
     public void testKeyPressThrowsISEOnWrongThread() {
-        try {
+        Assertions.assertThrows(IllegalStateException.class, () -> {
             robot.keyPress(KeyCode.A);
-        } catch (IllegalStateException e) {
-            return;
-        }
-        Assert.fail("Expected IllegalStateException");
+        });
     }
 
     @Test
     public void testKeyPressThrowsNPEForNullArgument() {
-        Util.runAndWait(() -> {
-            try {
-                robot.keyPress(null);
-            } catch (NullPointerException e) {
-                return;
-            }
-            Assert.fail("Expected NullPointerException");
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            robot.keyPress(null);
         });
     }
 
     @Test
     public void testKeyReleaseThrowsISEOnWrongThread() {
-        try {
+        Assertions.assertThrows(IllegalStateException.class, () -> {
             robot.keyRelease(KeyCode.A);
-        } catch (IllegalStateException e) {
-            return;
-        }
-        Assert.fail("Expected IllegalStateException");
+        });
     }
 
     @Test
     public void testKeyReleaseThrowsNPEForNullArgument() {
         Util.runAndWait(() -> {
-            try {
+            Assertions.assertThrows(NullPointerException.class, () -> {
                 robot.keyRelease(null);
-            } catch (NullPointerException e) {
-                return;
-            }
-            Assert.fail("Expected NullPointerException");
+            });
         });
     }
 
@@ -275,29 +256,23 @@ private static void testMouseMove(int x, int y, boolean primitiveArg) {
             }
             mousePosition.set(robot.getMousePosition());
         });
-        Assert.assertEquals(x, (int) mousePosition.get().getX());
-        Assert.assertEquals(y, (int) mousePosition.get().getY());
+        Assertions.assertEquals(x, (int) mousePosition.get().getX());
+        Assertions.assertEquals(y, (int) mousePosition.get().getY());
     }
 
     @Test
     public void testMouseMoveThrowsISEOnWrongThread() {
-        try {
+        Assertions.assertThrows(IllegalStateException.class, () -> {
             robot.mouseMove(0, 0);
-        } catch (IllegalStateException e) {
-            return;
-        }
-        Assert.fail("Expected IllegalStateException");
+        });
     }
 
     @Test
     public void testMouseMoveThrowsNPEForNullArgument() {
         Util.runAndWait(() -> {
-            try {
+            Assertions.assertThrows(NullPointerException.class, () -> {
                 robot.mouseMove(null);
-            } catch (NullPointerException e) {
-                return;
-            }
-            Assert.fail("Expected NullPointerException");
+            });
         });
     }
 
@@ -426,106 +401,89 @@ private static void testMouseAction(MouseAction mouseAction, MouseButton mouseBu
         });
         Util.waitForLatch(onClickLatch, 5, "Timeout while waiting for button.onMouse" +
                 capFirst(mouseAction.name()) + "().");
-        Assert.assertEquals(mouseButton + " mouse button should be " + mouseAction.name().toLowerCase() + " by Robot",
-                expectedText, button.getText());
+        Assertions.assertEquals(
+            expectedText, button.getText(),
+            mouseButton + " mouse button should be " + mouseAction.name().toLowerCase() + " by Robot");
     }
 
     @Test
     public void testMousePressThrowsISEOnWrongThread() {
-        try {
+        Assertions.assertThrows(IllegalStateException.class, () -> {
             robot.mousePress(MouseButton.PRIMARY);
-        } catch (IllegalStateException e) {
-            return;
-        }
-        Assert.fail("Expected IllegalStateException");
+        });
     }
 
     @Test
     public void testMousePressThrowsNPEForNullArgument() {
         Util.runAndWait(() -> {
-            try {
+            Assertions.assertThrows(NullPointerException.class, () -> {
                 robot.mousePress((MouseButton[])null);
-            } catch (NullPointerException e) {
-                return;
-            }
-            Assert.fail("Expected NullPointerException");
+            });
         });
     }
 
     @Test
     public void testMouseReleaseThrowsISEOnWrongThread() {
-        try {
+        Assertions.assertThrows(IllegalStateException.class, () -> {
             robot.mouseRelease(MouseButton.PRIMARY);
-        } catch (IllegalStateException e) {
-            return;
-        }
-        Assert.fail("Expected IllegalStateException");
+        });
     }
 
     @Test
     public void testMouseReleaseThrowsNPEForNullArgument() {
         Util.runAndWait(() -> {
-            try {
+            Assertions.assertThrows(NullPointerException.class, () -> {
                 robot.mouseRelease((MouseButton[])null);
-            } catch (NullPointerException e) {
-                return;
-            }
-            Assert.fail("Expected NullPointerException");
+            });
         });
     }
 
     @Test
     public void testMouseClickThrowsISEOnWrongThread() {
-        try {
+        Assertions.assertThrows(IllegalStateException.class, () -> {
             robot.mouseClick(MouseButton.PRIMARY);
-        } catch (IllegalStateException e) {
-            return;
-        }
-        Assert.fail("Expected IllegalStateException");
+        });
     }
 
     @Test
     public void testMouseClickThrowsNPEForNullArgument() {
         Util.runAndWait(() -> {
-            try {
+            Assertions.assertThrows(NullPointerException.class, () -> {
                 robot.mouseClick((MouseButton[])null);
-            } catch (NullPointerException e) {
-                return;
-            }
-            Assert.fail("Expected NullPointerException");
+            });
         });
     }
 
     @Test
-    @Ignore("Flaky - see JDK-8215376")
+    @Disabled("Flaky - see JDK-8215376")
     public void testMouseDragPrimary() {
         testMouseDrag(MouseButton.PRIMARY);
     }
 
     @Test
-    @Ignore("Flaky - see JDK-8215376")
+    @Disabled("Flaky - see JDK-8215376")
     public void testMouseDragSecondary() {
         testMouseDrag(MouseButton.SECONDARY);
     }
 
     @Test
-    @Ignore("Flaky - see JDK-8215376")
+    @Disabled("Flaky - see JDK-8215376")
     public void testMouseDragMiddle() {
-        Assume.assumeTrue(!PlatformUtil.isMac() ); // See JDK-8215376
+        Assumptions.assumeTrue(!PlatformUtil.isMac() ); // See JDK-8215376
         testMouseDrag(MouseButton.MIDDLE);
     }
 
     @Test
-    @Ignore("Flaky - see JDK-8215376")
+    @Disabled("Flaky - see JDK-8215376")
     public void testMouseDragForward() {
-        Assume.assumeTrue(!PlatformUtil.isMac()); // See JDK-8215376
+        Assumptions.assumeTrue(!PlatformUtil.isMac()); // See JDK-8215376
         testMouseDrag(MouseButton.FORWARD);
     }
 
     @Test
-    @Ignore("Flaky - see JDK-8215376")
+    @Disabled("Flaky - see JDK-8215376")
     public void testMouseDragBack() {
-        Assume.assumeTrue(!PlatformUtil.isMac()); // See JDK-8215376
+        Assumptions.assumeTrue(!PlatformUtil.isMac()); // See JDK-8215376
         testMouseDrag(MouseButton.BACK);
     }
 
@@ -574,7 +532,7 @@ public void testMouseWheelNegativeAmount() {
     }
 
     private static void testMouseWheel(int amount) {
-        Assume.assumeTrue(!PlatformUtil.isMac()); // See JDK-8214580
+        Assumptions.assumeTrue(!PlatformUtil.isMac()); // See JDK-8214580
         CountDownLatch onScrollLatch = new CountDownLatch(1);
         CountDownLatch setSceneLatch = new CountDownLatch(1);
         Button button = new Button("Scroll me");
@@ -618,18 +576,16 @@ private static void testMouseWheel(int amount) {
             robot.mouseWheel(amount);
         });
         Util.waitForLatch(onScrollLatch, 5, "Timeout while waiting for button.onScroll().");
-        Assert.assertEquals("mouse wheel should be scrolled " + amount + " vertical units by Robot",
-                "Scrolled " + amount, button.getText());
+        Assertions.assertEquals(
+            "Scrolled " + amount, button.getText(),
+            "mouse wheel should be scrolled " + amount + " vertical units by Robot");
     }
 
     @Test
     public void testMouseWheelThrowsISEOnWrongThread() {
-        try {
+        Assertions.assertThrows(IllegalStateException.class, () -> {
             robot.mouseWheel(1);
-        } catch (IllegalStateException e) {
-            return;
-        }
-        Assert.fail("Expected IllegalStateException");
+        });
     }
 
     @Test
@@ -703,23 +659,17 @@ public void testPixelCaptureAverage() throws Exception {
 
     @Test
     public void testPixelCaptureThrowsISEOnWrongThread() {
-        try {
+        Assertions.assertThrows(IllegalStateException.class, () -> {
             robot.getPixelColor(20, 20);
-        } catch (IllegalStateException e) {
-            return;
-        }
-        Assert.fail("Expected IllegalStateException");
+        });
     }
 
     @Test
     public void testPixelCaptureThrowsNPEForNullArgument() {
         Util.runAndWait(() -> {
-            try {
+            Assertions.assertThrows(NullPointerException.class, () -> {
                 robot.getPixelColor(null);
-            } catch (NullPointerException e) {
-                return;
-            }
-            Assert.fail("Expected NullPointerException");
+            });
         });
     }
 
@@ -763,8 +713,8 @@ public void testScreenCapture() throws Exception {
         int shouldBeMaxY = (int) Math.ceil((stageY + HEIGHT) * screenScaleY);
         int shouldBeWidth = shouldBeMaxX - shouldBeMinX;
         int shouldBeHeight = shouldBeMaxY - shouldBeMinY;
-        Assert.assertEquals((double) shouldBeWidth, screenCaptureNotScaledToFit.get().getWidth(), 0.0001);
-        Assert.assertEquals((double) shouldBeHeight, screenCaptureNotScaledToFit.get().getHeight(), 0.0001);
+        Assertions.assertEquals((double) shouldBeWidth, screenCaptureNotScaledToFit.get().getWidth(), 0.0001);
+        Assertions.assertEquals((double) shouldBeHeight, screenCaptureNotScaledToFit.get().getHeight(), 0.0001);
 
         // To verify the color we're going to skip the "1-pixel outside border" of the capture. On HiDPI systems
         // (especially on Windows) stage's position might have fractional element, which will mean the capture will
@@ -776,8 +726,8 @@ public void testScreenCapture() throws Exception {
         }
 
         // Should have been shrunk to fit the requested size, but still contain the same thing (all magenta pixels).
-        Assert.assertEquals((double) WIDTH, screenCaptureScaledToFit.get().getWidth(), 0.0001);
-        Assert.assertEquals((double) HEIGHT, screenCaptureScaledToFit.get().getHeight(), 0.0001);
+        Assertions.assertEquals((double) WIDTH, screenCaptureScaledToFit.get().getWidth(), 0.0001);
+        Assertions.assertEquals((double) HEIGHT, screenCaptureScaledToFit.get().getHeight(), 0.0001);
         // Because of scaling, similar estimate has to be done like above.
         for (int x = 1; x < WIDTH - 1; x++) {
             for (int y = 1; y < HEIGHT - 1; y++) {
@@ -788,23 +738,17 @@ public void testScreenCapture() throws Exception {
 
     @Test
     public void testScreenCaptureThrowsISEOnWrongThread() {
-        try {
+        Assertions.assertThrows(IllegalStateException.class, () -> {
             robot.getScreenCapture(null, 0, 0, 10, 10);
-        } catch (IllegalStateException e) {
-            return;
-        }
-        Assert.fail("Expected IllegalStateException");
+        });
     }
 
     @Test
     public void testScreenCaptureThrowsNPEForNullArgument() {
         Util.runAndWait(() -> {
-            try {
+            Assertions.assertThrows(NullPointerException.class, () -> {
                 robot.getScreenCapture(null, null);
-            } catch (NullPointerException e) {
-                return;
-            }
-            Assert.fail("Expected NullPointerException");
+            });
         });
     }
 
@@ -821,17 +765,17 @@ public void start(Stage primaryStage) {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void exit() {
         Util.shutdown();
     }
 
-    @After
+    @AfterEach
     public void cleanup() {
         Util.runAndWait(() -> {
             if (!pressedButtons.isEmpty()) {
@@ -844,7 +788,7 @@ public void cleanup() {
 
     private static void assertColorEquals(Color expected, Color actual, double delta) {
         if (!testColorEquals(expected, actual, delta)) {
-            throw new AssertionFailedError("expected: " + colorToString(expected)
+            Assertions.fail("expected: " + colorToString(expected)
                     + " but was: " + colorToString(actual));
         }
     }
diff --git a/tests/system/src/test/java/test/robot/javafx/scene/SRGBTest.java b/tests/system/src/test/java/test/robot/javafx/scene/SRGBTest.java
index 7cef9f3c6d2..26b837f478b 100644
--- a/tests/system/src/test/java/test/robot/javafx/scene/SRGBTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/scene/SRGBTest.java
@@ -25,6 +25,11 @@
 
 package test.robot.javafx.scene;
 
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import java.awt.GraphicsEnvironment;
+import java.awt.color.ColorSpace;
+import java.util.concurrent.atomic.AtomicReference;
+import javax.swing.SwingUtilities;
 import javafx.geometry.Bounds;
 import javafx.geometry.Point2D;
 import javafx.geometry.Rectangle2D;
@@ -37,20 +42,11 @@
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Screen;
 import javafx.stage.Stage;
-
-import java.awt.color.ColorSpace;
-import java.awt.GraphicsEnvironment;
-import javax.swing.SwingUtilities;
-
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import com.sun.glass.ui.Application;
 import com.sun.glass.ui.Window;
 import com.sun.javafx.PlatformUtil;
-
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.junit.Test;
-import static org.junit.Assume.assumeTrue;
-
 import test.robot.testharness.VisualTestBase;
 import test.util.Util;
 
@@ -217,7 +213,8 @@ public void screenCaptureTest() {
     // colors but they might both be working in the wrong space. We use an
     // AWT Robot to verify that they are working in sRGB.
     // Timeout for potential hang on XWayland, see JDK-8335468.
-    @Test(timeout = 15000)
+    @Test
+    @Timeout(value=15)
     public void sRGBPixelTest() throws Exception {
         assumeTrue(!Util.isOnWayland()); // JDK-8335470
         Rectangle swatch = prepareStage();
diff --git a/tests/system/src/test/java/test/robot/javafx/scene/SceneChangeEventsTest.java b/tests/system/src/test/java/test/robot/javafx/scene/SceneChangeEventsTest.java
index 44706422487..6bb678730c5 100644
--- a/tests/system/src/test/java/test/robot/javafx/scene/SceneChangeEventsTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/scene/SceneChangeEventsTest.java
@@ -25,7 +25,7 @@
 
 package test.robot.javafx.scene;
 
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import java.util.concurrent.CountDownLatch;
 import javafx.application.Application;
 import javafx.application.Platform;
@@ -37,10 +37,10 @@
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import javafx.stage.WindowEvent;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import com.sun.javafx.PlatformUtil;
 import test.util.Util;
 
@@ -102,12 +102,9 @@ public void testSceneChange() {
         });
         Util.waitForLatch(onActionLatch, 5, "Timeout while waiting for button.onAction().");
 
-        Assert.assertTrue("MOUSE_EXITED should be received when scene is " +
-            " changed.", mouseExited);
-        Assert.assertTrue("scene.windowProperty() listener should be received" +
-            "on scene change.", windowChanged);
-        Assert.assertTrue("MOUSE_EXITED should have been received before " +
-            "scene.windowProperty().", mouseWindowEventOrder);
+        Assertions.assertTrue(mouseExited, "MOUSE_EXITED should be received when scene is changed.");
+        Assertions.assertTrue(windowChanged, "scene.windowProperty() listener should be received on scene change.");
+        Assertions.assertTrue(mouseWindowEventOrder, "MOUSE_EXITED should have been received before scene.windowProperty().");
     }
 
     public static class TestApp extends Application {
@@ -123,13 +120,13 @@ public void start(Stage primaryStage) {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() {
         assumeTrue(!PlatformUtil.isMac()); // See JDK-8300094
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void exit() {
         if (stage != null) {
             Util.shutdown();
diff --git a/tests/system/src/test/java/test/robot/javafx/scene/SliderTooltipNPETest.java b/tests/system/src/test/java/test/robot/javafx/scene/SliderTooltipNPETest.java
index 4cbec35d34e..1e7be4672b1 100644
--- a/tests/system/src/test/java/test/robot/javafx/scene/SliderTooltipNPETest.java
+++ b/tests/system/src/test/java/test/robot/javafx/scene/SliderTooltipNPETest.java
@@ -35,10 +35,10 @@
 import javafx.scene.robot.Robot;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 /*
@@ -70,13 +70,13 @@ public class SliderTooltipNPETest {
 
     @Test
     public void testSliderTooltipNPE() throws Throwable {
-        Assert.assertTrue(slider.getTooltip().getConsumeAutoHidingEvents());
+        Assertions.assertTrue(slider.getTooltip().getConsumeAutoHidingEvents());
         dragSliderAfterTooltipDisplayed(DRAG_DISTANCE);
         if (exception != null) {
             exception.printStackTrace();
             throw exception;
         }
-        Assert.assertTrue(slider.getTooltip().getConsumeAutoHidingEvents());
+        Assertions.assertTrue(slider.getTooltip().getConsumeAutoHidingEvents());
     }
 
     private void dragSliderAfterTooltipDisplayed(int dragDistance) throws Exception {
@@ -157,12 +157,12 @@ public void start(Stage primaryStage) {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void exit() {
         Util.shutdown();
     }
diff --git a/tests/system/src/test/java/test/robot/javafx/scene/TabContextMenuCloseButtonTest.java b/tests/system/src/test/java/test/robot/javafx/scene/TabContextMenuCloseButtonTest.java
index 186e48254ea..44cd399ef49 100644
--- a/tests/system/src/test/java/test/robot/javafx/scene/TabContextMenuCloseButtonTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/scene/TabContextMenuCloseButtonTest.java
@@ -25,7 +25,6 @@
 package test.robot.javafx.scene;
 
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Scene;
@@ -38,14 +37,12 @@
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import javafx.stage.WindowEvent;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 public class TabContextMenuCloseButtonTest {
@@ -80,7 +77,7 @@ public void testCloseButton() {
                 robot.mouseRelease(mouseButtons[ic]);
             });
             Util.sleep(1000); // Wait for tabPane to layout
-            Assert.assertEquals(expectedTabCount[i], tabPane.getTabs().size());
+            Assertions.assertEquals(expectedTabCount[i], tabPane.getTabs().size());
         }
     }
 
@@ -104,7 +101,7 @@ public void testContextMenu() {
         Util.waitForLatch(cmlatch, 5, "Timeout waiting for ContextMenu to be shown.");
     }
 
-    @After
+    @AfterEach
     public void resetUI() {
         Util.runAndWait(() -> {
             tabPane.getTabs().remove(0, tabPane.getTabs().size());
@@ -112,7 +109,7 @@ public void resetUI() {
         });
     }
 
-    @Before
+    @BeforeEach
     public void setupUI() {
         Util.runAndWait(() -> {
             for (int i = 0; i < NUM_TABS; ++i) {
@@ -121,12 +118,12 @@ public void setupUI() {
         });
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void exit() {
         Util.shutdown();
     }
diff --git a/tests/system/src/test/java/test/robot/javafx/scene/TabPaneDragPolicyTest.java b/tests/system/src/test/java/test/robot/javafx/scene/TabPaneDragPolicyTest.java
index 774a425c46f..5b9e01c478d 100644
--- a/tests/system/src/test/java/test/robot/javafx/scene/TabPaneDragPolicyTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/scene/TabPaneDragPolicyTest.java
@@ -24,8 +24,8 @@
  */
 package test.robot.javafx.scene;
 
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import java.util.concurrent.CountDownLatch;
 import javafx.application.Application;
 import javafx.application.Platform;
@@ -39,12 +39,12 @@
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import javafx.stage.WindowEvent;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import com.sun.javafx.PlatformUtil;
 import test.util.Util;
 
@@ -144,9 +144,10 @@ public void testReorderTop() {
         testReorder(DX, DY, 1, 0, false);
         tabPane.getTabs().removeListener(reorderListener);
         selectedTab = (Tab)tabPane.getSelectionModel().getSelectedItem();
-        Assert.assertEquals("Expected " + expectedTab.getText() + " to be "
-            + "first tab after reordering.", expectedTab.getText(), selectedTab.getText());
-        Assert.assertTrue("Incorrect permutation change received", listenerTestResult);
+        Assertions.assertEquals(
+            expectedTab.getText(), selectedTab.getText(),
+            "Expected " + expectedTab.getText() + " to be first tab after reordering.");
+        Assertions.assertTrue(listenerTestResult, "Incorrect permutation change received");
     }
 
     @Test
@@ -159,9 +160,10 @@ public void testReorderBottom() {
         testReorder(DX, SCENE_HEIGHT - DY, 1, 0, false);
         tabPane.getTabs().removeListener(reorderListener);
         selectedTab = (Tab)tabPane.getSelectionModel().getSelectedItem();
-        Assert.assertEquals("Expected " + expectedTab.getText() + " to be "
-            + "first tab after reordering.", expectedTab.getText(), selectedTab.getText());
-        Assert.assertTrue("Incorrect permutation change received", listenerTestResult);
+        Assertions.assertEquals(
+            expectedTab.getText(), selectedTab.getText(),
+            "Expected " + expectedTab.getText() + " to be first tab after reordering.");
+        Assertions.assertTrue(listenerTestResult, "Incorrect permutation change received");
     }
 
     @Test
@@ -174,9 +176,10 @@ public void testReorderLeft() {
         testReorder(DX, DY, 0, 1, false);
         tabPane.getTabs().removeListener(reorderListener);
         selectedTab = (Tab)tabPane.getSelectionModel().getSelectedItem();
-        Assert.assertEquals("Expected " + expectedTab.getText() + " to be "
-            + "first tab after reordering.", expectedTab.getText(), selectedTab.getText());
-        Assert.assertTrue("Incorrect permutation change received", listenerTestResult);
+        Assertions.assertEquals(
+            expectedTab.getText(), selectedTab.getText(),
+            "Expected " + expectedTab.getText() + " to be first tab after reordering.");
+        Assertions.assertTrue(listenerTestResult, "Incorrect permutation change received");
     }
 
     @Test
@@ -189,9 +192,10 @@ public void testReorderRight() {
         testReorder(SCENE_WIDTH - DX, DY, 0, 1, false);
         tabPane.getTabs().removeListener(reorderListener);
         selectedTab = (Tab)tabPane.getSelectionModel().getSelectedItem();
-        Assert.assertEquals("Expected " + expectedTab.getText() + " to be "
-            + "first tab after reordering.", expectedTab.getText(), selectedTab.getText());
-        Assert.assertTrue("Incorrect permutation change received", listenerTestResult);
+        Assertions.assertEquals(
+            expectedTab.getText(), selectedTab.getText(),
+            "Expected " + expectedTab.getText() + " to be first tab after reordering.");
+        Assertions.assertTrue(listenerTestResult, "Incorrect permutation change received");
     }
 
     @Test
@@ -203,9 +207,10 @@ public void testFixedTop() {
         testReorder(DX, DY, 1, 0, true);
         tabPane.getTabs().removeListener(fixedListener);
         selectedTab = (Tab)tabPane.getSelectionModel().getSelectedItem();
-        Assert.assertEquals("Expected " + expectedTab.getText() + " to remain "
-            + "first tab.", expectedTab.getText(), selectedTab.getText());
-        Assert.assertTrue("Change event should not be received", listenerTestResult);
+        Assertions.assertEquals(
+            expectedTab.getText(), selectedTab.getText(),
+            "Expected " + expectedTab.getText() + " to remain first tab.");
+        Assertions.assertTrue(listenerTestResult, "Change event should not be received");
     }
 
     @Test
@@ -217,9 +222,10 @@ public void testFixedBottom() {
         testReorder(DX, SCENE_HEIGHT - DY, 1, 0, true);
         tabPane.getTabs().removeListener(fixedListener);
         selectedTab = (Tab)tabPane.getSelectionModel().getSelectedItem();
-        Assert.assertEquals("Expected " + expectedTab.getText() + " to remain "
-            + "first tab.", expectedTab.getText(), selectedTab.getText());
-        Assert.assertTrue("Change event should not be received", listenerTestResult);
+        Assertions.assertEquals(
+            expectedTab.getText(), selectedTab.getText(),
+            "Expected " + expectedTab.getText() + " to remain first tab.");
+        Assertions.assertTrue(listenerTestResult, "Change event should not be received");
     }
 
     @Test
@@ -231,9 +237,10 @@ public void testFixedLeft() {
         testReorder(DX, DY, 0, 1, true);
         tabPane.getTabs().removeListener(fixedListener);
         selectedTab = (Tab)tabPane.getSelectionModel().getSelectedItem();
-        Assert.assertEquals("Expected " + expectedTab.getText() + " to remain "
-            + "first tab.", expectedTab.getText(), selectedTab.getText());
-        Assert.assertTrue("Change event should not be received", listenerTestResult);
+        Assertions.assertEquals(
+            expectedTab.getText(), selectedTab.getText(),
+            "Expected " + expectedTab.getText() + " to remain first tab.");
+        Assertions.assertTrue(listenerTestResult, "Change event should not be received");
     }
 
     @Test
@@ -245,9 +252,10 @@ public void testFixedRight() {
         testReorder(SCENE_WIDTH - DX, DY, 0, 1, true);
         tabPane.getTabs().removeListener(fixedListener);
         selectedTab = (Tab)tabPane.getSelectionModel().getSelectedItem();
-        Assert.assertEquals("Expected " + expectedTab.getText() + " to remain "
-            + "first tab.", expectedTab.getText(), selectedTab.getText());
-        Assert.assertTrue("Change event should not be received", listenerTestResult);
+        Assertions.assertEquals(
+            expectedTab.getText(), selectedTab.getText(),
+            "Expected " + expectedTab.getText() + " to remain first tab.");
+        Assertions.assertTrue(listenerTestResult, "Change event should not be received");
     }
 
     public void testReorder(int dX, int dY, int xIncr, int yIncr, boolean isFixed) {
@@ -340,17 +348,17 @@ public void start(Stage primaryStage) {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void exit() {
         Util.shutdown();
     }
 
-    @Before
+    @BeforeEach
     public void setupTest() {
         changeListenerLatch = new CountDownLatch(1);
         latches = new CountDownLatch[4];
@@ -374,7 +382,7 @@ public void setupTest() {
         Util.waitForLatch(latch, 5, "Timeout waiting for setupTest().");
     }
 
-    @After
+    @AfterEach
     public void resetTest() {
         expectedTab = null;
         selectedTab = null;
diff --git a/tests/system/src/test/java/test/robot/javafx/scene/TabPaneReorderTest.java b/tests/system/src/test/java/test/robot/javafx/scene/TabPaneReorderTest.java
index 73c417afd98..989f9e33c59 100644
--- a/tests/system/src/test/java/test/robot/javafx/scene/TabPaneReorderTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/scene/TabPaneReorderTest.java
@@ -25,7 +25,6 @@
 package test.robot.javafx.scene;
 
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
@@ -40,14 +39,12 @@
 import javafx.scene.robot.Robot;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 /*
@@ -181,8 +178,8 @@ private void testReorder(int dX, int dY, boolean isDragInXDir) {
         tabPane.getSelectionModel().selectedItemProperty().
                 removeListener(selectionChangeListener);
 
-        Assert.assertFalse("Tabs should not be reordered.", isTabListReorderd);
-        Assert.assertEquals(tabOrder, currentTabOrder);
+        Assertions.assertFalse(isTabListReorderd, "Tabs should not be reordered.");
+        Assertions.assertEquals(tabOrder, currentTabOrder);
     }
 
     public static class TestApp extends Application {
@@ -202,17 +199,17 @@ public void start(Stage primaryStage) {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() throws Exception {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void exit() {
         Util.shutdown();
     }
 
-    @Before
+    @BeforeEach
     public void setupTest() {
         CountDownLatch tabPaneLayoutLatch = new CountDownLatch(2);
         Util.runAndWait(() -> {
@@ -238,7 +235,7 @@ public void setupTest() {
         Util.waitForLatch(tabPaneLayoutLatch, 5, "Timeout waiting for TabPane layout.");
     }
 
-    @After
+    @AfterEach
     public void resetTest() {
         isTabListReorderd = false;
         Util.runAndWait(() -> {
diff --git a/tests/system/src/test/java/test/robot/javafx/scene/TextCharacterIndexTest.java b/tests/system/src/test/java/test/robot/javafx/scene/TextCharacterIndexTest.java
index 2e151add98e..7355d3114b2 100644
--- a/tests/system/src/test/java/test/robot/javafx/scene/TextCharacterIndexTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/scene/TextCharacterIndexTest.java
@@ -30,9 +30,12 @@
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.geometry.Point2D;
+import javafx.geometry.Point3D;
+import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.input.MouseButton;
 import javafx.scene.input.MouseEvent;
+import javafx.scene.input.PickResult;
 import javafx.scene.robot.Robot;
 import javafx.scene.text.Font;
 import javafx.scene.text.HitInfo;
@@ -41,18 +44,14 @@
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import javafx.stage.Window;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
-import javafx.scene.input.PickResult;
-import javafx.scene.Node;
-import javafx.geometry.Point3D;
-
 /*
  * Test for verifying character index of Text nodes embedded in TextFlow.
  *
@@ -273,11 +272,11 @@ public void testTwoTextNodesCharIndexEmbeddedInTextFlow() throws Exception {
         while (x < (WIDTH - X_LEADING_OFFSET)) {
             moveMouseOverTextFlow(x, Y_OFFSET);
             if (isLeading) {
-                Assert.assertEquals(charIndex, insertionIndex);
+                Assertions.assertEquals(charIndex, insertionIndex);
             } else {
-                Assert.assertEquals(charIndex, insertionIndex - 1);
+                Assertions.assertEquals(charIndex, insertionIndex - 1);
             }
-            Assert.assertTrue(charIndex < Math.max(textOneLength, textTwoLength));
+            Assertions.assertTrue(charIndex < Math.max(textOneLength, textTwoLength));
             x += step();
         }
     }
@@ -294,13 +293,13 @@ public void testTextAndEmojiCharIndexEmbeddedInTextFlow() throws Exception {
         while (x < (WIDTH - X_LEADING_OFFSET)) {
             moveMouseOverTextFlow(x, Y_OFFSET);
             if (isLeading) {
-                Assert.assertEquals(charIndex, insertionIndex);
+                Assertions.assertEquals(charIndex, insertionIndex);
             } else if (isSurrogatePair) {
-                Assert.assertEquals(charIndex, insertionIndex - 2);
+                Assertions.assertEquals(charIndex, insertionIndex - 2);
             } else {
-                Assert.assertEquals(charIndex, insertionIndex - 1);
+                Assertions.assertEquals(charIndex, insertionIndex - 1);
             }
-            Assert.assertTrue(charIndex < Math.max(textOneLength, textTwoLength));
+            Assertions.assertTrue(charIndex < Math.max(textOneLength, textTwoLength));
             x += step();
         }
     }
@@ -317,13 +316,13 @@ public void testEmojiAndTextCharIndexEmbeddedInTextFlow() throws Exception {
         while (x < (WIDTH - X_LEADING_OFFSET)) {
             moveMouseOverTextFlow(x, Y_OFFSET);
             if (isLeading) {
-                Assert.assertEquals(charIndex, insertionIndex);
+                Assertions.assertEquals(charIndex, insertionIndex);
             } else if (isSurrogatePair) {
-                Assert.assertEquals(charIndex, insertionIndex - 2);
+                Assertions.assertEquals(charIndex, insertionIndex - 2);
             } else {
-                Assert.assertEquals(charIndex, insertionIndex - 1);
+                Assertions.assertEquals(charIndex, insertionIndex - 1);
             }
-            Assert.assertTrue(charIndex < Math.max(textOneLength, textTwoLength));
+            Assertions.assertTrue(charIndex < Math.max(textOneLength, textTwoLength));
             x += step();
         }
     }
@@ -340,14 +339,14 @@ public void testTwoEmojiNodesCharIndexEmbeddedInTextFlow() throws Exception {
         while (x < (WIDTH - X_LEADING_OFFSET)) {
             moveMouseOverTextFlow(x, Y_OFFSET);
             if (isLeading) {
-                Assert.assertEquals(charIndex, insertionIndex);
+                Assertions.assertEquals(charIndex, insertionIndex);
             } else if (isSurrogatePair) {
-                Assert.assertEquals(charIndex, insertionIndex - 2);
+                Assertions.assertEquals(charIndex, insertionIndex - 2);
             }
             else {
-                Assert.assertEquals(charIndex, insertionIndex - 1);
+                Assertions.assertEquals(charIndex, insertionIndex - 1);
             }
-            Assert.assertTrue(charIndex < Math.max(textOneLength, textTwoLength));
+            Assertions.assertTrue(charIndex < Math.max(textOneLength, textTwoLength));
             x += step();
         }
     }
@@ -365,13 +364,13 @@ public void testWrappedTextNodesCharIndexEmbeddedInTextFlow() throws Exception {
             while (x < (WIDTH - X_LEADING_OFFSET)) {
                 moveMouseOverTextFlow(x, (Y_OFFSET + (Y_OFFSET * (y * 2))));
                 if (isLeading) {
-                    Assert.assertEquals(charIndex, insertionIndex);
+                    Assertions.assertEquals(charIndex, insertionIndex);
                 } else if (isSurrogatePair) {
-                    Assert.assertEquals(charIndex, insertionIndex - 2);
+                    Assertions.assertEquals(charIndex, insertionIndex - 2);
                 } else {
-                    Assert.assertEquals(charIndex, insertionIndex - 1);
+                    Assertions.assertEquals(charIndex, insertionIndex - 1);
                 }
-                Assert.assertTrue(charIndex < Math.max(textOneLength, textTwoLength));
+                Assertions.assertTrue(charIndex < Math.max(textOneLength, textTwoLength));
                 x += step();
             }
         }
@@ -390,13 +389,13 @@ public void testMultiLineTextNodesCharIndexEmbeddedInTextFlow() throws Exception
             while (x < (WIDTH - X_LEADING_OFFSET)) {
                 moveMouseOverTextFlow(x, (Y_OFFSET + (Y_OFFSET * (y * 2))));
                 if (isLeading) {
-                    Assert.assertEquals(charIndex, insertionIndex);
+                    Assertions.assertEquals(charIndex, insertionIndex);
                 } else if (isSurrogatePair) {
-                    Assert.assertEquals(charIndex, insertionIndex - 2);
+                    Assertions.assertEquals(charIndex, insertionIndex - 2);
                 } else {
-                    Assert.assertEquals(charIndex, insertionIndex - 1);
+                    Assertions.assertEquals(charIndex, insertionIndex - 1);
                 }
-                Assert.assertTrue(charIndex < Math.max(textOneLength, textTwoLength));
+                Assertions.assertTrue(charIndex < Math.max(textOneLength, textTwoLength));
                 x += step();
             }
         }
@@ -415,13 +414,13 @@ public void testMultiLineEmojisCharIndexEmbeddedInTextFlow() throws Exception {
             while (x < (WIDTH - X_LEADING_OFFSET)) {
                 moveMouseOverTextFlow(x, (Y_OFFSET + (Y_OFFSET * (y * 2))));
                 if (isLeading) {
-                    Assert.assertEquals(charIndex, insertionIndex);
+                    Assertions.assertEquals(charIndex, insertionIndex);
                 } else if (isSurrogatePair) {
-                    Assert.assertEquals(charIndex, insertionIndex - 2);
+                    Assertions.assertEquals(charIndex, insertionIndex - 2);
                 } else {
-                    Assert.assertEquals(charIndex, insertionIndex - 1);
+                    Assertions.assertEquals(charIndex, insertionIndex - 1);
                 }
-                Assert.assertTrue(charIndex < Math.max(textOneLength, textTwoLength));
+                Assertions.assertTrue(charIndex < Math.max(textOneLength, textTwoLength));
                 x += step();
             }
         }
@@ -440,13 +439,13 @@ public void testMultiTextNodesMultiLineRepeatedTextEmbeddedInTextFlow() throws E
             while (x < (WIDTH - X_LEADING_OFFSET)) {
                 moveMouseOverTextFlow(x, (Y_OFFSET + (Y_OFFSET * (y * 2))));
                 if (isLeading) {
-                    Assert.assertEquals(charIndex, insertionIndex);
+                    Assertions.assertEquals(charIndex, insertionIndex);
                 } else if (isSurrogatePair) {
-                    Assert.assertEquals(charIndex, insertionIndex - 2);
+                    Assertions.assertEquals(charIndex, insertionIndex - 2);
                 } else {
-                    Assert.assertEquals(charIndex, insertionIndex - 1);
+                    Assertions.assertEquals(charIndex, insertionIndex - 1);
                 }
-                Assert.assertTrue(charIndex < Math.max(textOneLength, textTwoLength));
+                Assertions.assertTrue(charIndex < Math.max(textOneLength, textTwoLength));
                 x += step();
             }
         }
@@ -464,13 +463,13 @@ public void testMultiTextNodesAlternativelyRepeatedTextEmbeddedInTextFlow() thro
             while (x < (WIDTH - X_LEADING_OFFSET)) {
                 moveMouseOverTextFlow(x, Y_OFFSET);
                 if (isLeading) {
-                    Assert.assertEquals(charIndex, insertionIndex);
+                    Assertions.assertEquals(charIndex, insertionIndex);
                 } else if (isSurrogatePair) {
-                    Assert.assertEquals(charIndex, insertionIndex - 2);
+                    Assertions.assertEquals(charIndex, insertionIndex - 2);
                 } else {
-                    Assert.assertEquals(charIndex, insertionIndex - 1);
+                    Assertions.assertEquals(charIndex, insertionIndex - 1);
                 }
-                Assert.assertTrue(charIndex < Math.max(textOneLength, textTwoLength));
+                Assertions.assertTrue(charIndex < Math.max(textOneLength, textTwoLength));
                 x += step();
             }
     }
@@ -488,13 +487,13 @@ public void testMultiTextNodesMultiLineRepeatedTEmojiEmbeddedInTextFlow() throws
             while (x < (WIDTH - X_LEADING_OFFSET)) {
                 moveMouseOverTextFlow(x, (Y_OFFSET + (Y_OFFSET * (y * 2))));
                 if (isLeading) {
-                    Assert.assertEquals(charIndex, insertionIndex);
+                    Assertions.assertEquals(charIndex, insertionIndex);
                 } else if (isSurrogatePair) {
-                    Assert.assertEquals(charIndex, insertionIndex - 2);
+                    Assertions.assertEquals(charIndex, insertionIndex - 2);
                 } else {
-                    Assert.assertEquals(charIndex, insertionIndex - 1);
+                    Assertions.assertEquals(charIndex, insertionIndex - 1);
                 }
-                Assert.assertTrue(charIndex < Math.max(textOneLength, textTwoLength));
+                Assertions.assertTrue(charIndex < Math.max(textOneLength, textTwoLength));
                 x += step();
             }
         }
@@ -514,13 +513,13 @@ public void testMultiTextNodesAlternativelyRepeatedEmojisEmbeddedInTextFlow() th
             while (x < (WIDTH - X_LEADING_OFFSET)) {
                 moveMouseOverTextFlow(x, (Y_OFFSET + (Y_OFFSET * (y * 2))));
                 if (isLeading) {
-                    Assert.assertEquals(charIndex, insertionIndex);
+                    Assertions.assertEquals(charIndex, insertionIndex);
                 } else if (isSurrogatePair) {
-                    Assert.assertEquals(charIndex, insertionIndex - 2);
+                    Assertions.assertEquals(charIndex, insertionIndex - 2);
                 } else {
-                    Assert.assertEquals(charIndex, insertionIndex - 1);
+                    Assertions.assertEquals(charIndex, insertionIndex - 1);
                 }
-                Assert.assertTrue(charIndex < Math.max(textThreeLength, Math.max(textOneLength, textTwoLength)));
+                Assertions.assertTrue(charIndex < Math.max(textThreeLength, Math.max(textOneLength, textTwoLength)));
                 x += step();
             }
         }
@@ -550,21 +549,21 @@ private double step() {
         return 1.0 + random.nextDouble() * 8.0;
     }
 
-    @After
+    @AfterEach
     public void resetUI() {
         Platform.runLater(() -> {
             textFlow.removeEventHandler(MouseEvent.MOUSE_PRESSED, this::handleMouseEvent);
         });
     }
 
-    @Before
+    @BeforeEach
     public void setupUI() {
         Platform.runLater(() -> {
             textFlow.addEventHandler(MouseEvent.MOUSE_PRESSED, this::handleMouseEvent);
         });
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() {
         long seed = new Random().nextLong();
         System.out.println("seed=" + seed);
@@ -573,7 +572,7 @@ public static void initFX() {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void exit() {
         Util.shutdown();
     }
diff --git a/tests/system/src/test/java/test/robot/javafx/scene/TextFlowSurrogatePairInsertionIndexTest.java b/tests/system/src/test/java/test/robot/javafx/scene/TextFlowSurrogatePairInsertionIndexTest.java
index 0d6ceb26c99..1e8025c0ffd 100644
--- a/tests/system/src/test/java/test/robot/javafx/scene/TextFlowSurrogatePairInsertionIndexTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/scene/TextFlowSurrogatePairInsertionIndexTest.java
@@ -40,12 +40,12 @@
 import javafx.scene.text.TextFlow;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 /*
@@ -189,12 +189,12 @@ public void testTextFlowInsertionIndexUsingTwoEmojis() throws Exception {
         Util.waitForIdle(scene);
 
         moveMouseOverTextFlow(X_LEADING_OFFSET, Y_OFFSET);
-        Assert.assertTrue(isLeading);
-        Assert.assertEquals(charIndex, insertionIndex);
+        Assertions.assertTrue(isLeading);
+        Assertions.assertEquals(charIndex, insertionIndex);
 
         moveMouseOverTextFlow(X_TRAILING_OFFSET, Y_OFFSET);
-        Assert.assertFalse(isLeading);
-        Assert.assertEquals(charIndex, insertionIndex - 2);
+        Assertions.assertFalse(isLeading);
+        Assertions.assertEquals(charIndex, insertionIndex - 2);
     }
 
     @Test
@@ -207,9 +207,9 @@ public void testTextFlowInsertionIndexUsingMultipleEmojis() throws Exception {
         while (charIndex < textLength - 2) {
             moveMouseOverTextFlow(x, Y_OFFSET);
             if (isLeading) {
-                Assert.assertEquals(charIndex, insertionIndex);
+                Assertions.assertEquals(charIndex, insertionIndex);
             } else {
-                Assert.assertEquals(charIndex, insertionIndex - 2);
+                Assertions.assertEquals(charIndex, insertionIndex - 2);
             }
             x += step();
         }
@@ -225,11 +225,11 @@ public void testTextFlowInsertionIndexUsingTextAndEmojis() throws Exception {
         while (charIndex < textLength - 2) {
             moveMouseOverTextFlow(x, Y_OFFSET);
             if (isLeading) {
-                Assert.assertEquals(charIndex, insertionIndex);
+                Assertions.assertEquals(charIndex, insertionIndex);
             } else if (!isLeading && charIndex < 5) {
-                Assert.assertEquals(charIndex, insertionIndex - 1);
+                Assertions.assertEquals(charIndex, insertionIndex - 1);
             } else {
-                Assert.assertEquals(charIndex, insertionIndex - 2);
+                Assertions.assertEquals(charIndex, insertionIndex - 2);
             }
             x += step();
         }
@@ -246,11 +246,11 @@ public void testTextFlowInsertionIndexUsingEmbeddedTextNodes() throws Exception
         while (charIndex < textLength - 2) {
             moveMouseOverTextFlow(x, Y_OFFSET);
             if (isLeading) {
-                Assert.assertEquals(charIndex, insertionIndex);
+                Assertions.assertEquals(charIndex, insertionIndex);
             } else if (isSurrogatePair) {
-                Assert.assertEquals(charIndex, insertionIndex - 2);
+                Assertions.assertEquals(charIndex, insertionIndex - 2);
             } else {
-                Assert.assertEquals(charIndex, insertionIndex - 1);
+                Assertions.assertEquals(charIndex, insertionIndex - 1);
             }
             x += step();
         }
@@ -265,9 +265,9 @@ public void testTextFlowInsertionIndexWhenMouseMovedOutsideText() throws Excepti
         while (x < (HEIGHT - Y_OFFSET)) {
             moveMouseOverTextFlow(X_LEADING_OFFSET, (Y_OFFSET + x));
             if (isLeading) {
-                Assert.assertEquals(charIndex, insertionIndex);
+                Assertions.assertEquals(charIndex, insertionIndex);
             } else {
-                Assert.assertEquals(charIndex, insertionIndex - 1);
+                Assertions.assertEquals(charIndex, insertionIndex - 1);
             }
             x += step();
         }
@@ -282,11 +282,11 @@ public void testTextFlowInsertionIndexUsingWrappedText() throws Exception {
             for (double x = 0.0; x < (WIDTH - X_LEADING_OFFSET); x += step()) {
                 moveMouseOverTextFlow(x, (Y_OFFSET + (Y_OFFSET * (y * 2))));
                 if (isLeading) {
-                    Assert.assertEquals(charIndex, insertionIndex);
+                    Assertions.assertEquals(charIndex, insertionIndex);
                 } else if (isSurrogatePair) {
-                    Assert.assertEquals(charIndex, insertionIndex - 2);
+                    Assertions.assertEquals(charIndex, insertionIndex - 2);
                 } else {
-                    Assert.assertEquals(charIndex, insertionIndex - 1);
+                    Assertions.assertEquals(charIndex, insertionIndex - 1);
                 }
             }
         }
@@ -308,30 +308,30 @@ private void handleMouseEvent(MouseEvent event) {
             isSurrogatePair = Character.isSurrogate(c);
         }
 
-        Assert.assertTrue(insertionIndex >= 0);
+        Assertions.assertTrue(insertionIndex >= 0);
         String s = hitInfo.toString();
-        Assert.assertTrue(s != null);
+        Assertions.assertTrue(s != null);
     }
 
     private double step() {
         return 1.0 + random.nextDouble() * 8.0;
     }
 
-    @After
+    @AfterEach
     public void resetUI() {
         Platform.runLater(() -> {
             textFlow.removeEventHandler(MouseEvent.MOUSE_PRESSED, this::handleMouseEvent);
         });
     }
 
-    @Before
+    @BeforeEach
     public void setupUI() {
         Platform.runLater(() -> {
             textFlow.addEventHandler(MouseEvent.MOUSE_PRESSED, this::handleMouseEvent);
         });
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() {
         long seed = new Random().nextLong();
         // if any test fails, we can use the seed found in the log to reproduce exact sequence of events
@@ -341,7 +341,7 @@ public static void initFX() {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void exit() {
         Util.shutdown();
     }
diff --git a/tests/system/src/test/java/test/robot/javafx/scene/TextSurrogatePairInsertionIndexTest.java b/tests/system/src/test/java/test/robot/javafx/scene/TextSurrogatePairInsertionIndexTest.java
index 7c4b78f7e29..832ff687c28 100644
--- a/tests/system/src/test/java/test/robot/javafx/scene/TextSurrogatePairInsertionIndexTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/scene/TextSurrogatePairInsertionIndexTest.java
@@ -38,10 +38,10 @@
 import javafx.scene.text.Text;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 /*
@@ -78,8 +78,8 @@ public void testHitInfo() {
 
         Util.runAndWait(() -> {
             Bounds b = control.getLayoutBounds();
-            Assert.assertTrue(b.getWidth() > 10);
-            Assert.assertTrue(b.getHeight() > 10);
+            Assertions.assertTrue(b.getWidth() > 10);
+            Assertions.assertTrue(b.getHeight() > 10);
 
             int max = 1_000_000;
             for (int i = 0; i < max; i++) {
@@ -87,14 +87,14 @@ public void testHitInfo() {
                 double y = random.nextDouble() * b.getHeight();
                 HitInfo h = control.hitTest(new Point2D(x, y));
 
-                Assert.assertTrue(h.getInsertionIndex() >= 0);
+                Assertions.assertTrue(h.getInsertionIndex() >= 0);
                 String s = h.toString();
-                Assert.assertTrue(s != null);
+                Assertions.assertTrue(s != null);
             }
         });
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() {
         long seed = new Random().nextLong();
         // if any test fails, we can use the seed found in the log to reproduce exact sequence of events
@@ -104,7 +104,7 @@ public static void initFX() {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void exit() {
         Util.shutdown();
     }
diff --git a/tests/system/src/test/java/test/robot/javafx/scene/canvas/ImageSmoothingDrawTest.java b/tests/system/src/test/java/test/robot/javafx/scene/canvas/ImageSmoothingDrawTest.java
index 1dedcf94c50..2706e839354 100644
--- a/tests/system/src/test/java/test/robot/javafx/scene/canvas/ImageSmoothingDrawTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/scene/canvas/ImageSmoothingDrawTest.java
@@ -27,7 +27,6 @@
 import java.io.FileInputStream;
 import java.net.URL;
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Scene;
@@ -40,13 +39,11 @@
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import javafx.stage.WindowEvent;
-
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 // 1. An image, half white half black sized 10 X 10 is used in test.
@@ -85,8 +82,8 @@ public void testImageSmoothingEnabled() {
         imageCanvas.setImageSmoothing(true);
         Util.sleep(1000); // Wait for image to be drawn
         getPixelColors();
-        Assert.assertEquals(Color.WHITE, whitePixelColor);
-        Assert.assertFalse(whitePixelColor.equals(lastWhitePixelColor));
+        Assertions.assertEquals(Color.WHITE, whitePixelColor);
+        Assertions.assertFalse(whitePixelColor.equals(lastWhitePixelColor));
     }
 
     // 6. When image smoothing is disabled, filtering is NOT applied
@@ -99,21 +96,21 @@ public void testImageSmoothingDisabled() {
         imageCanvas.setImageSmoothing(false);
         Util.sleep(1000); // Wait for image to be drawn
         getPixelColors();
-        Assert.assertEquals(Color.WHITE, whitePixelColor);
-        Assert.assertEquals(whitePixelColor, lastWhitePixelColor);
+        Assertions.assertEquals(Color.WHITE, whitePixelColor);
+        Assertions.assertEquals(whitePixelColor, lastWhitePixelColor);
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void exit() {
         Util.shutdown();
     }
 
-    @Before
+    @BeforeEach
     public void before() {
         Util.parkCursor(robot);
     }
diff --git a/tests/system/src/test/java/test/robot/javafx/scene/dialog/DialogRepeatedShowHideTest.java b/tests/system/src/test/java/test/robot/javafx/scene/dialog/DialogRepeatedShowHideTest.java
index 300e7fef5dc..011cc65b972 100644
--- a/tests/system/src/test/java/test/robot/javafx/scene/dialog/DialogRepeatedShowHideTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/scene/dialog/DialogRepeatedShowHideTest.java
@@ -26,7 +26,7 @@
 package test.robot.javafx.scene.dialog;
 
 import java.util.concurrent.CountDownLatch;
-
+import java.util.concurrent.TimeUnit;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Scene;
@@ -39,15 +39,15 @@
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import javafx.stage.WindowEvent;
-
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import test.util.Util;
 
 //see JDK8193502
+@Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
 public class DialogRepeatedShowHideTest {
     static final double DIALOG_WIDTH = 300.0d;
     static final double DIALOG_HEIGHT = DIALOG_WIDTH;
@@ -60,16 +60,14 @@ public class DialogRepeatedShowHideTest {
     static CountDownLatch dialogShownLatch;
     static CountDownLatch dialogHideLatch;
 
-    @Test(timeout = 15000)
+    @Test
     public void dialogSizeOnReShownTest() throws Exception {
         Thread.sleep(400);
         clickButton();
         hide();
         clickButton();
-        Assert.assertEquals("Dialog width should remain the same", DIALOG_WIDTH, dialog.getDialogPane().getWidth(),
-                0.0);
-        Assert.assertEquals("Dialog height should remain the same", DIALOG_HEIGHT, dialog.getDialogPane().getHeight(),
-                0.0);
+        Assertions.assertEquals(DIALOG_WIDTH, dialog.getDialogPane().getWidth(), 0.0, "Dialog width should remain the same");
+        Assertions.assertEquals(DIALOG_HEIGHT, dialog.getDialogPane().getHeight(), 0.0, "Dialog height should remain the same");
         hide();
     }
 
@@ -88,12 +86,12 @@ private void hide() throws Exception {
         Util.waitForLatch(dialogHideLatch, 10, "Failed to hide Dialog");
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() throws Exception {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void exit() {
         Util.shutdown();
     }
diff --git a/tests/system/src/test/java/test/robot/javafx/scene/dialog/DialogWithOwnerSizingTest.java b/tests/system/src/test/java/test/robot/javafx/scene/dialog/DialogWithOwnerSizingTest.java
index dc217bf7259..f233890f66b 100644
--- a/tests/system/src/test/java/test/robot/javafx/scene/dialog/DialogWithOwnerSizingTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/scene/dialog/DialogWithOwnerSizingTest.java
@@ -26,7 +26,7 @@
 package test.robot.javafx.scene.dialog;
 
 import java.util.concurrent.CountDownLatch;
-
+import java.util.concurrent.TimeUnit;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Scene;
@@ -38,15 +38,15 @@
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import javafx.stage.WindowEvent;
-
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import test.util.Util;
 
 //see JDK-8193502
+@Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
 public class DialogWithOwnerSizingTest {
     static Robot robot;
     static Button button;
@@ -58,15 +58,15 @@ public class DialogWithOwnerSizingTest {
     static CountDownLatch dialogShownLatch;
     static CountDownLatch dialogHideLatch;
 
-    @Test(timeout = 15000)
+    @Test
     public void dialogWithOwnerSizingTest() throws Exception {
         Thread.sleep(500);
         clickButton();
         Thread.sleep(500);
 
         try {
-            Assert.assertEquals(dialog2.getDialogPane().getWidth(), dialog.getDialogPane().getWidth(), 2.0);
-            Assert.assertEquals(dialog2.getDialogPane().getHeight(), dialog.getDialogPane().getHeight(), 2.0);
+            Assertions.assertEquals(dialog2.getDialogPane().getWidth(), dialog.getDialogPane().getWidth(), 2.0);
+            Assertions.assertEquals(dialog2.getDialogPane().getHeight(), dialog.getDialogPane().getHeight(), 2.0);
         } finally {
             hide();
         }
@@ -88,12 +88,12 @@ private void hide() throws Exception {
         Util.waitForLatch(dialogHideLatch, 10, "Failed to hide Dialog");
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() throws Exception {
         Util.launch(startupLatch, SizingTestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void exit() {
         Util.shutdown();
     }
diff --git a/tests/system/src/test/java/test/robot/javafx/scene/layout/LayoutTest.java b/tests/system/src/test/java/test/robot/javafx/scene/layout/LayoutTest.java
index b8b00206941..df1bc189c65 100644
--- a/tests/system/src/test/java/test/robot/javafx/scene/layout/LayoutTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/scene/layout/LayoutTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,9 @@
  */
 package test.robot.javafx.scene.layout;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.concurrent.TimeUnit;
 import javafx.geometry.BoundingBox;
 import javafx.scene.Scene;
 import javafx.scene.control.Label;
@@ -33,14 +36,14 @@
 import javafx.scene.layout.VBox;
 import javafx.scene.shape.Ellipse;
 import javafx.stage.Stage;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import test.robot.testharness.VisualTestBase;
 
 /**
  * Test requestLayout call and layout bounds update of node in the scene graph.
  */
+@Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
 public class LayoutTest extends VisualTestBase {
 
     private static class CustomPane extends Pane {
@@ -72,7 +75,7 @@ public int getLayoutCallCounter() {
     private Stage testStage;
     private Scene testScene;
 
-    @Test(timeout = 15000)
+    @Test
     public void testRequestLayout() {
     final Label l1 = new Label("1 2");
     final Ellipse e1 = new Ellipse(20, 30);
@@ -152,7 +155,7 @@ public void testRequestLayout() {
 
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testStackPane() {
     final Label l1 = new Label("1 2");
     final Ellipse e1 = new Ellipse(20, 30);
@@ -223,7 +226,7 @@ public void testStackPane() {
 
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testVBox() {
     final Label l1 = new Label("1 2");
     final Ellipse e1 = new Ellipse(20, 30);
@@ -294,7 +297,7 @@ public void testVBox() {
 
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testHBox() {
     final Label l1 = new Label("1 2");
     final Ellipse e1 = new Ellipse(20, 30);
diff --git a/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionBackgroundFillUITest.java b/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionBackgroundFillUITest.java
index 15c1485e523..9abc8934eef 100644
--- a/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionBackgroundFillUITest.java
+++ b/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionBackgroundFillUITest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,15 +24,17 @@
 
 package test.robot.javafx.scene.layout;
 
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import java.util.concurrent.TimeUnit;
 import javafx.scene.layout.BackgroundFill;
 import javafx.scene.paint.Color;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import static org.junit.Assume.assumeTrue;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 /**
  */
+@Timeout(value=20000, unit=TimeUnit.MILLISECONDS)
 public class RegionBackgroundFillUITest extends RegionUITestBase {
 
     /**************************************************************************
@@ -47,13 +49,13 @@ public class RegionBackgroundFillUITest extends RegionUITestBase {
         + " to verify that negative value is not accepted for -fx-background-radius."
         + " A 'No radii value may be < 0' warning message is expected.";
 
-    @Test(timeout = 20000)
+    @Test
     public void basicFill() {
         setStyle("-fx-background-color: red;");
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void translucentFill() {
         setStyle("-fx-background-color: rgba(255, 0, 0, .2);");
         // multiply through the alpha
@@ -61,7 +63,7 @@ public void translucentFill() {
                 region.getBackground().getFills().get(0), Color.rgb(255, 204, 204), SCENE_FILL);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void basicFill_Insets1() {
         setStyle(
                 "-fx-background-color: red;" +
@@ -69,7 +71,7 @@ public void basicFill_Insets1() {
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void basicFill_Insets2() {
         setStyle(
                 "-fx-background-color: red;" +
@@ -77,7 +79,7 @@ public void basicFill_Insets2() {
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void basicFill_Insets3() {
         setStyle(
                 "-fx-background-color: red;" +
@@ -85,7 +87,7 @@ public void basicFill_Insets3() {
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void basicFill_Insets4() {
         setStyle(
                 "-fx-background-color: red;" +
@@ -93,7 +95,7 @@ public void basicFill_Insets4() {
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void basicFill_NegativeInsets1() {
         setStyle(
                 "-fx-background-color: red;" +
@@ -101,7 +103,7 @@ public void basicFill_NegativeInsets1() {
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void basicFill_NegativeInsets2() {
         setStyle(
                 "-fx-background-color: red;" +
@@ -109,7 +111,7 @@ public void basicFill_NegativeInsets2() {
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void basicFill_NegativeInsets3() {
         setStyle(
                 "-fx-background-color: red;" +
@@ -117,7 +119,7 @@ public void basicFill_NegativeInsets3() {
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void basicFill_NegativeInsets4() {
         setStyle(
                 "-fx-background-color: red;" +
@@ -125,7 +127,7 @@ public void basicFill_NegativeInsets4() {
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void basicFill_MixedInsets() {
         setStyle(
                 "-fx-background-color: red;" +
@@ -133,7 +135,7 @@ public void basicFill_MixedInsets() {
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void basicFill_Radius1() {
         assumeTrue(checkIntegralUIScale());
         setStyle(
@@ -142,7 +144,7 @@ public void basicFill_Radius1() {
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void basicFill_Radius2() {
         assumeTrue(checkIntegralUIScale());
         setStyle(
@@ -151,7 +153,7 @@ public void basicFill_Radius2() {
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void basicFill_Radius3() {
         assumeTrue(checkIntegralUIScale());
         setStyle(
@@ -160,7 +162,7 @@ public void basicFill_Radius3() {
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void basicFill_Radius4() {
         assumeTrue(checkIntegralUIScale());
         setStyle(
@@ -183,7 +185,7 @@ public void basicFill_Radius4() {
 //                "-fx-background-radius: 10 20 30 40 50 60 70 80");
 //    }
 
-    @Test(timeout = 20000)
+    @Test
     public void basicFill_RadiusAndInsets() {
         assumeTrue(checkIntegralUIScale());
         setStyle(
@@ -194,7 +196,7 @@ public void basicFill_RadiusAndInsets() {
     }
 
     // NOTE: A negative radius from CSS is treated as 0.
-    @Test(timeout = 20000)
+    @Test
     public void basicFill_NegativeRadius1() {
         System.err.println(EXPECTED_WARNING);
         setStyle(
@@ -204,7 +206,7 @@ public void basicFill_NegativeRadius1() {
     }
 
     // NOTE: A negative radius from CSS is treated as 0.
-    @Test(timeout = 20000)
+    @Test
     public void basicFill_NegativeRadius2() {
         System.err.println(EXPECTED_WARNING);
         setStyle(
@@ -214,7 +216,7 @@ public void basicFill_NegativeRadius2() {
     }
 
     // NOTE: A negative radius from CSS is treated as 0.
-    @Test(timeout = 20000)
+    @Test
     public void basicFill_NegativeRadius3() {
         System.err.println(EXPECTED_WARNING);
         setStyle(
@@ -224,7 +226,7 @@ public void basicFill_NegativeRadius3() {
     }
 
     // NOTE: A negative radius from CSS is treated as 0.
-    @Test(timeout = 20000)
+    @Test
     public void basicFill_NegativeRadius4() {
         System.err.println(EXPECTED_WARNING);
         setStyle(
@@ -243,13 +245,13 @@ public void basicFill_NegativeRadius4() {
     // I actually could predict the color under a point, rather than just asserting it isn't
     // the Scene's fill.
 
-    @Test(timeout = 20000)
+    @Test
     public void imageFill() {
         setStyle("-fx-background-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');");
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void imageFill_MixedInsets() {
         setStyle(
                 "-fx-background-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -257,7 +259,7 @@ public void imageFill_MixedInsets() {
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void imageFill_Radius4() {
         setStyle(
                 "-fx-background-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -265,7 +267,7 @@ public void imageFill_Radius4() {
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void imageFill_MissingImage() {
         setStyle(
                 "-fx-background-color: repeating-image-pattern('test/robot/javafx/scene/layout/missing.png');" +
@@ -273,43 +275,43 @@ public void imageFill_MissingImage() {
         assertColorEquals(SCENE_FILL, WIDTH / 2, HEIGHT / 2, TOLERANCE);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void imageFill_Stretched() {
         setStyle("-fx-background-color: image-pattern('test/robot/javafx/scene/layout/test20x20.png');");
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void imageFill_Stretched2() {
         setStyle("-fx-background-color: image-pattern('test/robot/javafx/scene/layout/test20x20.png', 0, 0, 1, 1);");
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void imageFill_Stretched3() {
         setStyle("-fx-background-color: image-pattern('test/robot/javafx/scene/layout/test20x20.png', 0, 0, 1, 1, true);");
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void imageFill_Tiled() {
         setStyle("-fx-background-color: image-pattern('test/robot/javafx/scene/layout/test20x20.png', 0, 0, 40, 40, false);");
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void linearFill() {
         setStyle("-fx-background-color: linear-gradient(to bottom, red 0%, blue 100%);");
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void linearFill2() {
         setStyle("-fx-background-color: linear-gradient(to right, red 0%, blue 100%);");
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void linearFill_MixedInsets() {
         setStyle(
                 "-fx-background-color: linear-gradient(to bottom, red 0%, blue 100%);" +
@@ -317,7 +319,7 @@ public void linearFill_MixedInsets() {
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void linearFill_Radius4() {
         setStyle(
                 "-fx-background-color: linear-gradient(to bottom, red 0%, blue 100%);" +
@@ -333,7 +335,7 @@ public void linearFill_Radius4() {
      *                                                                        *
      *************************************************************************/
 
-    @Test(timeout = 20000)
+    @Test
     public void testScenario1() {
         assumeTrue(checkIntegralUIScale());
         setStyle(
@@ -344,7 +346,7 @@ public void testScenario1() {
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void testScenario2() {
         assumeTrue(checkIntegralUIScale());
         setStyle(
@@ -380,7 +382,7 @@ public void testScenario2() {
         checkRegionCornersAndBoundariesOfBackgroundFill(grey, Color.BLUE);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void testScenario3() {
         assumeTrue(checkIntegralUIScale());
         setStyle(
@@ -416,7 +418,7 @@ public void testScenario3() {
         checkRegionCornersAndBoundariesOfBackgroundFill(grey, Color.BLUE);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void testScenario4() {
         assumeTrue(checkIntegralUIScale());
         setStyle(
@@ -452,7 +454,7 @@ public void testScenario4() {
 //        checkRegionCornersAndBoundariesOfBackgroundFill(image, Color.BLUE);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void testScenario5() {
         assumeTrue(checkIntegralUIScale());
         setStyle(
@@ -488,7 +490,7 @@ public void testScenario5() {
 //        checkRegionCornersAndBoundariesOfBackgroundFill(blue, Color.BLUE, null);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void testExample1() {
         setStyle(
                 "-fx-background-color: red, green, blue;" +
@@ -504,7 +506,7 @@ public void testExample1() {
      *                                                                        *
      *************************************************************************/
 
-    @Test(timeout = 20000)
+    @Test
     public void testOnePixelTopInset() {
         assumeTrue(checkIntegralUIScale());
         setStyle(
@@ -533,7 +535,7 @@ public void testOnePixelTopInset() {
         checkRegionBottomLeftCorner(yellow, Color.YELLOW, SCENE_FILL, 0, .2);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void testOnePixelRightInset() {
         assumeTrue(checkIntegralUIScale());
         setStyle(
@@ -562,7 +564,7 @@ public void testOnePixelRightInset() {
         checkRegionBottomLeftCorner(yellow, Color.YELLOW, SCENE_FILL, 0, .2);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void testOnePixelBottomInset() {
         assumeTrue(checkIntegralUIScale());
         setStyle(
@@ -591,7 +593,7 @@ public void testOnePixelBottomInset() {
         checkRegionBottomLeftCorner(yellow, Color.YELLOW, SCENE_FILL, 0, .2);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void testOnePixelLeftInset() {
         assumeTrue(checkIntegralUIScale());
         setStyle(
@@ -620,8 +622,8 @@ public void testOnePixelLeftInset() {
         checkRegionBottomLeftCorner(yellow, Color.YELLOW, SCENE_FILL, 0, .2);
     }
 
-    @Ignore("RT-33446")
-    @Test(timeout = 20000)
+    @Disabled("RT-33446")
+    @Test
     public void testHalfPixelTopInset() {
         setStyle(
                 "-fx-background-color: red, yellow;" +
@@ -650,8 +652,8 @@ public void testHalfPixelTopInset() {
         checkRegionBottomLeftCorner(yellow, Color.YELLOW, SCENE_FILL, 0, .2);
     }
 
-    @Ignore("RT-33446")
-    @Test(timeout = 20000)
+    @Disabled("RT-33446")
+    @Test
     public void testHalfPixelRightInset() {
         setStyle(
                 "-fx-background-color: red, yellow;" +
@@ -680,8 +682,8 @@ public void testHalfPixelRightInset() {
         checkRegionBottomLeftCorner(yellow, Color.YELLOW, SCENE_FILL, 0, .2);
     }
 
-    @Ignore("RT-33446")
-    @Test(timeout = 20000)
+    @Disabled("RT-33446")
+    @Test
     public void testHalfPixelBottomInset() {
         setStyle(
                 "-fx-background-color: red, yellow;" +
@@ -710,8 +712,8 @@ public void testHalfPixelBottomInset() {
         checkRegionBottomLeftCorner(yellow, blended, SCENE_FILL, 0, .2);
     }
 
-    @Ignore("RT-33446")
-    @Test(timeout = 20000)
+    @Disabled("RT-33446")
+    @Test
     public void testHalfPixelLeftInset() {
         setStyle(
                 "-fx-background-color: red, yellow;" +
@@ -740,8 +742,8 @@ public void testHalfPixelLeftInset() {
         checkRegionBottomLeftCorner(yellow, blended, SCENE_FILL, 0, .2);
     }
 
-    @Ignore("RT-33446")
-    @Test(timeout = 20000)
+    @Disabled("RT-33446")
+    @Test
     public void testHalfPixelTopLeftInset() {
         setStyle(
                 "-fx-background-color: red, yellow;" +
@@ -774,7 +776,7 @@ public void testHalfPixelTopLeftInset() {
         checkRegionBottomLeftCorner(yellow, blended, SCENE_FILL, 0, .2);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void testNoInsets() {
         setStyle(
                 "-fx-background-color: red, yellow;" +
@@ -786,7 +788,7 @@ public void testNoInsets() {
         checkRegionCornersAndBoundariesOfBackgroundFill(yellow, SCENE_FILL);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void testYellowOnRed() {
         setStyle(
                 "-fx-background-color: red, yellow;" +
diff --git a/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionBackgroundImageUITest.java b/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionBackgroundImageUITest.java
index 442b6c28080..675fba3e0b8 100644
--- a/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionBackgroundImageUITest.java
+++ b/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionBackgroundImageUITest.java
@@ -24,11 +24,13 @@
 
 package test.robot.javafx.scene.layout;
 
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import java.util.concurrent.TimeUnit;
 import javafx.geometry.Bounds;
 import javafx.scene.paint.Color;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 /**************************************************************************
  *                                                                        *
@@ -36,9 +38,10 @@
  * to align naturally with the edge of the test region.                   *
  *                                                                        *
  *************************************************************************/
+@Timeout(value=20000, unit=TimeUnit.MILLISECONDS)
 public class RegionBackgroundImageUITest extends RegionUITestBase {
 
-    @Test(timeout = 20000)
+    @Test
     public void alignedImage() {
         assumeTrue(checkIntegralUIScale());
         setStyle("-fx-background-color: black;" +
@@ -47,7 +50,7 @@ public void alignedImage() {
         checkCompletelyFilled(20);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void alignedImage_RepeatX() {
         assumeTrue(checkIntegralUIScale());
         setStyle("-fx-background-color: black;" +
@@ -57,7 +60,7 @@ public void alignedImage_RepeatX() {
         checkHorizontalStripAlongTop(20, LEFT);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void alignedImage_RepeatY() {
         assumeTrue(checkIntegralUIScale());
         setStyle("-fx-background-color: black;" +
@@ -67,7 +70,7 @@ public void alignedImage_RepeatY() {
         checkVerticalStripAlongLeft(20, TOP);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void alignedImage_Space() {
         assumeTrue(checkIntegralUIScale());
         setStyle("-fx-background-color: black;" +
@@ -77,7 +80,7 @@ public void alignedImage_Space() {
         checkCompletelyFilled(20);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void alignedImage_Round() {
         assumeTrue(checkIntegralUIScale());
         setStyle("-fx-background-color: black;" +
@@ -87,7 +90,7 @@ public void alignedImage_Round() {
         checkCompletelyFilled(20);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void alignedImage_RoundSpace() {
         assumeTrue(checkIntegralUIScale());
         setStyle("-fx-background-color: black;" +
@@ -97,7 +100,7 @@ public void alignedImage_RoundSpace() {
         checkCompletelyFilled(20);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void alignedImage_PositionCenter() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -107,7 +110,7 @@ public void alignedImage_PositionCenter() {
         checkNonRepeating(20, WIDTH / 2, HEIGHT / 2, true);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void alignedImage_PositionCenterFiftyPercent() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -117,7 +120,7 @@ public void alignedImage_PositionCenterFiftyPercent() {
         checkNonRepeating(20, WIDTH / 2, HEIGHT / 2, true);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void alignedImage_PositionCenterLeft() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -130,7 +133,7 @@ public void alignedImage_PositionCenterLeft() {
         assertColorEquals(SCENE_FILL, centerX - 11, HEIGHT / 2, TOLERANCE);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void alignedImage_PositionCenterRight() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -143,7 +146,7 @@ public void alignedImage_PositionCenterRight() {
         assertColorEquals(SCENE_FILL, centerX + 10, HEIGHT / 2, TOLERANCE);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void alignedImage_PositionCenterTop() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -156,7 +159,7 @@ public void alignedImage_PositionCenterTop() {
         assertColorEquals(SCENE_FILL, WIDTH / 2, centerY - 11, TOLERANCE);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void alignedImage_PositionCenterBottom() {
         assumeTrue(checkIntegralUIScale());
         setStyle("-fx-background-color: black;" +
@@ -170,7 +173,7 @@ public void alignedImage_PositionCenterBottom() {
         assertColorEquals(SCENE_FILL, WIDTH / 2, centerY + 10, TOLERANCE);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void alignedImage_PositionBottomRight() {
         assumeTrue(checkIntegralUIScale());
         setStyle("-fx-background-color: black;" +
@@ -187,7 +190,7 @@ public void alignedImage_PositionBottomRight() {
         assertColorEquals(SCENE_FILL, centerX, centerY + 10, TOLERANCE);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void alignedImage_PositionCenterRepeatX() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -197,7 +200,7 @@ public void alignedImage_PositionCenterRepeatX() {
         checkHorizontalStripAlongCenter(20, CENTER);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void alignedImage_PositionCenterFiftyPercentRepeatX() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -207,7 +210,7 @@ public void alignedImage_PositionCenterFiftyPercentRepeatX() {
         checkHorizontalStripAlongCenter(20, CENTER);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void alignedImage_PositionCenterLeftRepeatX() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -217,7 +220,7 @@ public void alignedImage_PositionCenterLeftRepeatX() {
         checkHorizontalStripAlongCenter(20, LEFT);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void alignedImage_PositionCenterRightRepeatX() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -226,7 +229,7 @@ public void alignedImage_PositionCenterRightRepeatX() {
         checkHorizontalStripAlongCenter(20, LEFT);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void alignedImage_PositionCenterTopRepeatX() {
         assumeTrue(checkIntegralUIScale());
         setStyle("-fx-background-color: black;" +
@@ -237,7 +240,7 @@ public void alignedImage_PositionCenterTopRepeatX() {
         checkHorizontalStripAlongTop(20, CENTER);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void alignedImage_PositionCenterBottomRepeatX() {
         assumeTrue(checkIntegralUIScale());
         setStyle("-fx-background-color: black;" +
@@ -248,7 +251,7 @@ public void alignedImage_PositionCenterBottomRepeatX() {
         checkHorizontalStripAlongBottom(20, CENTER);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void alignedImage_PositionBottomRightRepeatX() {
         assumeTrue(checkIntegralUIScale());
         setStyle("-fx-background-color: black;" +
@@ -259,7 +262,7 @@ public void alignedImage_PositionBottomRightRepeatX() {
         checkHorizontalStripAlongBottom(20, LEFT);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void alignedImage_PositionCenterRepeatY() {
         assumeTrue(checkIntegralUIScale());
         setStyle("-fx-background-color: black;" +
@@ -270,7 +273,7 @@ public void alignedImage_PositionCenterRepeatY() {
         checkVerticalStripAlongCenter(20, CENTER);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void alignedImage_PositionCenterFiftyPercentRepeatY() {
         assumeTrue(checkIntegralUIScale());
         setStyle("-fx-background-color: black;" +
@@ -281,7 +284,7 @@ public void alignedImage_PositionCenterFiftyPercentRepeatY() {
         checkVerticalStripAlongCenter(20, CENTER);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void alignedImage_PositionCenterLeftRepeatY() {
         assumeTrue(checkIntegralUIScale());
         setStyle("-fx-background-color: black;" +
@@ -292,7 +295,7 @@ public void alignedImage_PositionCenterLeftRepeatY() {
         checkVerticalStripAlongLeft(20, CENTER);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void alignedImage_PositionCenterRightRepeatY() {
         assumeTrue(checkIntegralUIScale());
         setStyle("-fx-background-color: black;" +
@@ -303,7 +306,7 @@ public void alignedImage_PositionCenterRightRepeatY() {
         checkVerticalStripAlongRight(20, CENTER);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void alignedImage_PositionCenterTopRepeatY() {
         assumeTrue(checkIntegralUIScale());
         setStyle("-fx-background-color: black;" +
@@ -314,7 +317,7 @@ public void alignedImage_PositionCenterTopRepeatY() {
         checkVerticalStripAlongCenter(20, TOP);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void alignedImage_PositionCenterBottomRepeatY() {
         assumeTrue(checkIntegralUIScale());
         setStyle("-fx-background-color: black;" +
@@ -325,7 +328,7 @@ public void alignedImage_PositionCenterBottomRepeatY() {
         checkVerticalStripAlongCenter(20, TOP);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void alignedImage_PositionBottomRightRepeatY() {
         assumeTrue(checkIntegralUIScale());
         setStyle("-fx-background-color: black;" +
@@ -336,7 +339,7 @@ public void alignedImage_PositionBottomRightRepeatY() {
         checkVerticalStripAlongRight(20, TOP);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void alignedImage_Position25PercentLeft() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -349,7 +352,7 @@ public void alignedImage_Position25PercentLeft() {
                 (REGION_TOP +  (int) (.5 * REGION_HEIGHT)), true);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void alignedImage_Position25PercentRight() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -365,7 +368,7 @@ public void alignedImage_Position25PercentRight() {
     // TODO should do from the top & bottom
 
     // TODO should test that cover causes other properties to be ignored
-    @Test(timeout = 20000)
+    @Test
     public void alignedImage_Cover() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -376,7 +379,7 @@ public void alignedImage_Cover() {
     }
 
     // TODO should test that contain causes other properties to be ignored
-    @Test(timeout = 20000)
+    @Test
     public void alignedImage_Contain() {
         assumeTrue(checkIntegralUIScale());
         setStyle("-fx-background-color: black;" +
@@ -388,7 +391,7 @@ public void alignedImage_Contain() {
         checkNonRepeating(200, REGION_LEFT + 300, REGION_TOP + 100, false);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void alignedImage_ContainNoRepeat() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -398,7 +401,7 @@ public void alignedImage_ContainNoRepeat() {
         checkNonRepeating(200, REGION_LEFT + 100, REGION_TOP + 100, true);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void unalignedImage() {
         assumeTrue(checkIntegralUIScale());
         setStyle("-fx-background-color: black;" +
@@ -406,7 +409,7 @@ public void unalignedImage() {
         checkCompletelyFilled(48);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void unalignedImage_RepeatX() {
         assumeTrue(checkIntegralUIScale());
         setStyle("-fx-background-color: black;" +
@@ -416,7 +419,7 @@ public void unalignedImage_RepeatX() {
         checkHorizontalStripAlongTop(48, LEFT);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void unalignedImage_RepeatY() {
         assumeTrue(checkIntegralUIScale());
         setStyle("-fx-background-color: black;" +
@@ -426,8 +429,8 @@ public void unalignedImage_RepeatY() {
         checkVerticalStripAlongLeft(48, TOP);
     }
 
-    @Ignore("RT-33411: Doesn't work at present because of Prism bug where the gaps between rows are inconsistent")
-    @Test(timeout = 20000)
+    @Disabled("RT-33411: Doesn't work at present because of Prism bug where the gaps between rows are inconsistent")
+    @Test
     public void unalignedImage_Space() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -436,7 +439,7 @@ public void unalignedImage_Space() {
         checkEvenlyFilled(48);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void unalignedImage_Round() {
         assumeTrue(checkIntegralUIScale());
         setStyle("-fx-background-color: black;" +
@@ -446,8 +449,8 @@ public void unalignedImage_Round() {
         checkCompletelyFilled(50); // rounded up from 48 to 50
     }
 
-    @Ignore("RT-33411: Doesn't work at present because of Prism bug where the gaps between rows are inconsistent")
-    @Test(timeout = 20000)
+    @Disabled("RT-33411: Doesn't work at present because of Prism bug where the gaps between rows are inconsistent")
+    @Test
     public void unalignedImage_RoundSpace() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -457,7 +460,7 @@ public void unalignedImage_RoundSpace() {
         // even in one dimension and spaced in the other
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void unalignedImage_PositionCenter() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -466,7 +469,7 @@ public void unalignedImage_PositionCenter() {
         checkNonRepeating(48, WIDTH / 2, HEIGHT / 2, true);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void unalignedImage_PositionCenterFiftyPercent() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -475,7 +478,7 @@ public void unalignedImage_PositionCenterFiftyPercent() {
         checkNonRepeating(48, WIDTH / 2, HEIGHT / 2, true);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void unalignedImage_PositionCenterLeft() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -484,7 +487,7 @@ public void unalignedImage_PositionCenterLeft() {
         checkNonRepeating(48, REGION_LEFT + 24, HEIGHT / 2, true);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void unalignedImage_PositionCenterRight() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -493,7 +496,7 @@ public void unalignedImage_PositionCenterRight() {
         checkNonRepeating(48, REGION_RIGHT - 24, HEIGHT / 2, true);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void unalignedImage_PositionCenterTop() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -502,7 +505,7 @@ public void unalignedImage_PositionCenterTop() {
         checkNonRepeating(48, WIDTH / 2, REGION_TOP + 24, true);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void unalignedImage_PositionCenterBottom() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -511,7 +514,7 @@ public void unalignedImage_PositionCenterBottom() {
         checkNonRepeating(48, WIDTH / 2, REGION_BOTTOM - 24, true);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void unalignedImage_PositionBottomRight() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -520,7 +523,7 @@ public void unalignedImage_PositionBottomRight() {
         checkNonRepeating(48, REGION_RIGHT - 24, REGION_BOTTOM - 24, true);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void unalignedImage_PositionCenterRepeatX() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -530,7 +533,7 @@ public void unalignedImage_PositionCenterRepeatX() {
         checkHorizontalStripAlongCenter(48, CENTER);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void unalignedImage_PositionCenterFiftyPercentRepeatX() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -540,7 +543,7 @@ public void unalignedImage_PositionCenterFiftyPercentRepeatX() {
         checkHorizontalStripAlongCenter(48, CENTER);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void unalignedImage_PositionCenterLeftRepeatX() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -550,7 +553,7 @@ public void unalignedImage_PositionCenterLeftRepeatX() {
         checkHorizontalStripAlongCenter(48, LEFT);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void unalignedImage_PositionCenterRightRepeatX() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -560,7 +563,7 @@ public void unalignedImage_PositionCenterRightRepeatX() {
         checkHorizontalStripAlongCenter(48, RIGHT);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void unalignedImage_PositionCenterTopRepeatX() {
         assumeTrue(checkIntegralUIScale());
         setStyle("-fx-background-color: black;" +
@@ -571,7 +574,7 @@ public void unalignedImage_PositionCenterTopRepeatX() {
         checkHorizontalStripAlongTop(48, CENTER);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void unalignedImage_PositionCenterBottomRepeatX() {
         assumeTrue(checkIntegralUIScale());
         setStyle("-fx-background-color: black;" +
@@ -582,7 +585,7 @@ public void unalignedImage_PositionCenterBottomRepeatX() {
         checkHorizontalStripAlongBottom(48, CENTER);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void unalignedImage_PositionBottomRightRepeatX() {
         assumeTrue(checkIntegralUIScale());
         setStyle("-fx-background-color: black;" +
@@ -593,7 +596,7 @@ public void unalignedImage_PositionBottomRightRepeatX() {
         checkHorizontalStripAlongBottom(48, RIGHT);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void unalignedImage_PositionCenterRepeatY() {
         assumeTrue(checkIntegralUIScale());
         setStyle("-fx-background-color: black;" +
@@ -604,7 +607,7 @@ public void unalignedImage_PositionCenterRepeatY() {
         checkVerticalStripAlongCenter(48, CENTER);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void unalignedImage_PositionCenterFiftyPercentRepeatY() {
         assumeTrue(checkIntegralUIScale());
         setStyle("-fx-background-color: black;" +
@@ -615,7 +618,7 @@ public void unalignedImage_PositionCenterFiftyPercentRepeatY() {
         checkVerticalStripAlongCenter(48, CENTER);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void unalignedImage_PositionCenterLeftRepeatY() {
         assumeTrue(checkIntegralUIScale());
         setStyle("-fx-background-color: black;" +
@@ -626,7 +629,7 @@ public void unalignedImage_PositionCenterLeftRepeatY() {
         checkVerticalStripAlongLeft(48, CENTER);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void unalignedImage_PositionCenterRightRepeatY() {
         assumeTrue(checkIntegralUIScale());
         setStyle("-fx-background-color: black;" +
@@ -637,7 +640,7 @@ public void unalignedImage_PositionCenterRightRepeatY() {
         checkVerticalStripAlongRight(48, CENTER);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void unalignedImage_PositionCenterTopRepeatY() {
         assumeTrue(checkIntegralUIScale());
         setStyle("-fx-background-color: black;" +
@@ -648,7 +651,7 @@ public void unalignedImage_PositionCenterTopRepeatY() {
         checkVerticalStripAlongCenter(48, TOP);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void unalignedImage_PositionCenterBottomRepeatY() {
         assumeTrue(checkIntegralUIScale());
         setStyle("-fx-background-color: black;" +
@@ -659,7 +662,7 @@ public void unalignedImage_PositionCenterBottomRepeatY() {
         checkVerticalStripAlongCenter(48, BOTTOM);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void unalignedImage_PositionBottomRightRepeatY() {
         assumeTrue(checkIntegralUIScale());
         setStyle("-fx-background-color: black;" +
@@ -670,7 +673,7 @@ public void unalignedImage_PositionBottomRightRepeatY() {
         checkVerticalStripAlongRight(48, BOTTOM);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void unalignedImage_Position25PercentLeft() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -683,7 +686,7 @@ public void unalignedImage_Position25PercentLeft() {
                 (REGION_TOP +  (int) (.5 * REGION_HEIGHT)), true);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void unalignedImage_Position25PercentRight() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -700,7 +703,7 @@ public void unalignedImage_Position25PercentRight() {
 
     // TODO should test that cover causes other properties to be ignored
 
-    @Test(timeout = 20000)
+    @Test
     public void unalignedImage_Cover() {
         assumeTrue(checkIntegralUIScale());
         setStyle("-fx-background-color: black;" +
@@ -712,7 +715,7 @@ public void unalignedImage_Cover() {
     }
 
     // TODO should test that contain causes other properties to be ignored
-    @Test(timeout = 20000)
+    @Test
     public void unalignedImage_Contain() {
         assumeTrue(checkIntegralUIScale());
         setStyle("-fx-background-color: black;" +
@@ -724,7 +727,7 @@ public void unalignedImage_Contain() {
         checkNonRepeating(200, REGION_LEFT + 300, REGION_TOP + 100, false);
     }
 
-    @Test(timeout = 20000)
+    @Test
     public void unalignedImage_ContainNoRepeat() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
diff --git a/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionBorderImageUITest.java b/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionBorderImageUITest.java
index 600e7ee86a5..d22974e650f 100644
--- a/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionBorderImageUITest.java
+++ b/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionBorderImageUITest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,10 +24,13 @@
 
 package test.robot.javafx.scene.layout;
 
-import org.junit.Test;
+import java.util.concurrent.TimeUnit;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 /**
  */
+@Timeout(value=20000, unit=TimeUnit.MILLISECONDS)
 public class RegionBorderImageUITest extends RegionUITestBase {
     @Test public void dummy() {
 
@@ -65,7 +68,7 @@ public class RegionBorderImageUITest extends RegionUITestBase {
 //        System.out.println("WHAT");
 //    }
 //
-    @Test(timeout = 20000)
+    @Test
     public void test4() {
         setStyle(
                 "-fx-border-image-source: url('test/robot/javafx/scene/layout/border-stretch.png');" +
diff --git a/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionBorderStrokeUITest.java b/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionBorderStrokeUITest.java
index 576883e3e50..f98c3bf91fb 100644
--- a/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionBorderStrokeUITest.java
+++ b/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionBorderStrokeUITest.java
@@ -24,7 +24,7 @@
 
 package test.robot.javafx.scene.layout;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  */
diff --git a/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionShapeUITest.java b/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionShapeUITest.java
index 3786a8ed342..5f4d268f8bd 100644
--- a/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionShapeUITest.java
+++ b/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionShapeUITest.java
@@ -24,7 +24,7 @@
 
 package test.robot.javafx.scene.layout;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  */
diff --git a/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionUITestBase.java b/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionUITestBase.java
index 6385b932284..26eb239ee26 100644
--- a/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionUITestBase.java
+++ b/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionUITestBase.java
@@ -41,6 +41,7 @@
 import javafx.scene.paint.Paint;
 import javafx.stage.Stage;
 import javafx.stage.Window;
+import org.junit.jupiter.api.BeforeEach;
 import test.robot.testharness.VisualTestBase;
 
 /**
@@ -62,6 +63,7 @@ public abstract class RegionUITestBase extends VisualTestBase {
     protected Region region;
     private volatile WritableImage screenCapture;
 
+    @BeforeEach
     @Override
     public void doSetup() {
         super.doSetup();
diff --git a/tests/system/src/test/java/test/robot/javafx/scene/tableview/TableViewClickOnTroughTest.java b/tests/system/src/test/java/test/robot/javafx/scene/tableview/TableViewClickOnTroughTest.java
index 78dd93b0d2a..e5f9279cb0c 100644
--- a/tests/system/src/test/java/test/robot/javafx/scene/tableview/TableViewClickOnTroughTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/scene/tableview/TableViewClickOnTroughTest.java
@@ -25,7 +25,7 @@
 
 package test.robot.javafx.scene.tableview;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import java.util.concurrent.CountDownLatch;
 import javafx.application.Application;
 import javafx.application.Platform;
@@ -46,10 +46,10 @@
 import javafx.stage.StageStyle;
 import javafx.stage.WindowEvent;
 import javafx.util.Callback;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 /*
@@ -97,15 +97,15 @@ public void moveTroughTest() {
         });
         Util.sleep(1000); // Delay for table moving Scrollbar
         double newPosition = verticalBar.getValue();
-        Assert.assertNotEquals(oldPosition, newPosition, 0.1);
+        Assertions.assertNotEquals(oldPosition, newPosition, 0.1);
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void exit() {
         Util.shutdown();
     }
diff --git a/tests/system/src/test/java/test/robot/javafx/scene/tableview/TableViewResizeColumnToFitContentTest.java b/tests/system/src/test/java/test/robot/javafx/scene/tableview/TableViewResizeColumnToFitContentTest.java
index 7d2b5775732..2143b76dd34 100644
--- a/tests/system/src/test/java/test/robot/javafx/scene/tableview/TableViewResizeColumnToFitContentTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/scene/tableview/TableViewResizeColumnToFitContentTest.java
@@ -37,10 +37,10 @@
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import javafx.stage.WindowEvent;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 /*
@@ -87,8 +87,7 @@ public void resizeColumnToFitContentTest() {
         Util.waitForLatch(latch, 5, "Timeout while waiting for mouse double click");
         Util.waitForIdle(scene);
 
-        Assert.assertTrue("resizeColumnToFitContent failed",
-            (wid1 != table.getColumns().get(1).getWidth()));
+        Assertions.assertTrue((wid1 != table.getColumns().get(1).getWidth()), "resizeColumnToFitContent failed");
 
         wid1 = table.getColumns().get(1).getWidth();
         wid2 = table.getColumns().get(2).getWidth();
@@ -100,15 +99,15 @@ public void resizeColumnToFitContentTest() {
             ", diff=" + Math.abs(colsWidthBeforeResize - colsWidthAfterResize) +
             ", tolerance=" + tolerance +
             ", tol+eps=" + (tolerance + EPSILON);
-        Assert.assertEquals(message, colsWidthBeforeResize, colsWidthAfterResize, tolerance + EPSILON);
+        Assertions.assertEquals(colsWidthBeforeResize, colsWidthAfterResize, tolerance + EPSILON, message);
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void exit() {
         Util.shutdown();
     }
diff --git a/tests/system/src/test/java/test/robot/javafx/scene/treetableview/TreeTableViewResizeColumnToFitContentTest.java b/tests/system/src/test/java/test/robot/javafx/scene/treetableview/TreeTableViewResizeColumnToFitContentTest.java
index fe85bed26d3..40823d3f42b 100644
--- a/tests/system/src/test/java/test/robot/javafx/scene/treetableview/TreeTableViewResizeColumnToFitContentTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/scene/treetableview/TreeTableViewResizeColumnToFitContentTest.java
@@ -38,10 +38,10 @@
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import javafx.stage.WindowEvent;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 /*
@@ -88,8 +88,7 @@ public void resizeColumnToFitContentTest() {
         Util.waitForLatch(latch, 5, "Timeout while waiting for mouse double click");
         Util.waitForIdle(scene);
 
-        Assert.assertTrue("resizeColumnToFitContent failed",
-                (wid1 != treeTableView.getColumns().get(1).getWidth()));
+        Assertions.assertTrue((wid1 != treeTableView.getColumns().get(1).getWidth()), "resizeColumnToFitContent failed");
 
         wid1 = treeTableView.getColumns().get(1).getWidth();
         wid2 = treeTableView.getColumns().get(2).getWidth();
@@ -101,15 +100,15 @@ public void resizeColumnToFitContentTest() {
             ", diff=" + Math.abs(colsWidthBeforeResize - colsWidthAfterResize) +
             ", tolerance=" + tolerance +
             ", tol+eps=" + (tolerance + EPSILON);
-        Assert.assertEquals(message, colsWidthBeforeResize, colsWidthAfterResize, tolerance + EPSILON);
+        Assertions.assertEquals(colsWidthBeforeResize, colsWidthAfterResize, tolerance + EPSILON, message);
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void exit() {
         Util.shutdown();
     }
diff --git a/tests/system/src/test/java/test/robot/javafx/stage/CheckWindowOrderTest.java b/tests/system/src/test/java/test/robot/javafx/stage/CheckWindowOrderTest.java
index a8039bc0eb4..441701c78ce 100644
--- a/tests/system/src/test/java/test/robot/javafx/stage/CheckWindowOrderTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/stage/CheckWindowOrderTest.java
@@ -26,7 +26,7 @@
 package test.robot.javafx.stage;
 
 import java.util.concurrent.CountDownLatch;
-
+import java.util.concurrent.TimeUnit;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Scene;
@@ -34,15 +34,15 @@
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 import javafx.stage.Window;
-
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import test.util.Util;
 
 // See JDK8220272
+@Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
 public class CheckWindowOrderTest {
     static Scene scene;
     static Stage stage;
@@ -51,18 +51,18 @@ public class CheckWindowOrderTest {
     static Stage lastWindow;
     static CountDownLatch startupLatch = new CountDownLatch(4);
 
-    @Test(timeout = 15000)
+    @Test
     public void topWindowShouldBeTheLast() throws Exception {
         Thread.sleep(400);
-        Assert.assertTrue("Last Window Should be Focused", lastWindow.isFocused());
+        Assertions.assertTrue(lastWindow.isFocused(), "Last Window Should be Focused");
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() throws Exception {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void exit() {
         Util.shutdown();
     }
diff --git a/tests/system/src/test/java/test/robot/javafx/stage/DualWindowTest.java b/tests/system/src/test/java/test/robot/javafx/stage/DualWindowTest.java
index 017664ea11c..ee3806aa4cc 100644
--- a/tests/system/src/test/java/test/robot/javafx/stage/DualWindowTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/stage/DualWindowTest.java
@@ -25,14 +25,8 @@
 
 package test.robot.javafx.stage;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
-
-
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Scene;
@@ -42,14 +36,13 @@
 import javafx.scene.robot.Robot;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import com.sun.javafx.PlatformUtil;
-
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
 import test.util.Util;
 
 public class DualWindowTest {
@@ -115,18 +108,18 @@ public void start(Stage stage1) {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setupOnce() throws Exception {
         startupLatch = new CountDownLatch(2);
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardown() {
         Util.shutdown();
     }
 
-    @Before
+    @BeforeEach
     public void setup() {
         Util.runAndWait(() -> robot = new Robot());
     }
@@ -149,22 +142,21 @@ void clickButton(TestButton button) throws Exception {
         mouseClick(button.getScene(),
                    button.getLayoutX() + button.getWidth() / 2,
                    button.getLayoutY() + button.getHeight() / 2);
-        assertTrue(button.getText() + " action not fired",
-                   button.latch.await(5, TimeUnit.SECONDS));
+        Assertions.assertTrue(button.latch.await(5, TimeUnit.SECONDS), button.getText() + " action not fired");
     }
 
     @Test
     public void testTwoStages() throws Exception {
         if (PlatformUtil.isLinux()) {
-            assumeTrue(Boolean.getBoolean("unstable.test")); // JDK-8321624
+            Assumptions.assumeTrue(Boolean.getBoolean("unstable.test")); // JDK-8321624
         }
 
         Util.sleep(1000);
         Util.runAndWait(() -> {
-            assertEquals(STAGE1_X, stage1.getX(), 1.0);
-            assertEquals(STAGE1_Y, stage1.getY(), 1.0);
-            assertEquals(STAGE2_X, stage2.getX(), 1.0);
-            assertEquals(STAGE2_Y, stage2.getY(), 1.0);
+            Assertions.assertEquals(STAGE1_X, stage1.getX(), 1.0);
+            Assertions.assertEquals(STAGE1_Y, stage1.getY(), 1.0);
+            Assertions.assertEquals(STAGE2_X, stage2.getX(), 1.0);
+            Assertions.assertEquals(STAGE2_Y, stage2.getY(), 1.0);
         });
         clickButton(button1);
         clickButton(button2);
diff --git a/tests/system/src/test/java/test/robot/javafx/stage/FocusParentWindowOnChildCloseTest.java b/tests/system/src/test/java/test/robot/javafx/stage/FocusParentWindowOnChildCloseTest.java
index 50456343c7d..4877568772c 100644
--- a/tests/system/src/test/java/test/robot/javafx/stage/FocusParentWindowOnChildCloseTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/stage/FocusParentWindowOnChildCloseTest.java
@@ -26,7 +26,7 @@
 package test.robot.javafx.stage;
 
 import java.util.concurrent.CountDownLatch;
-
+import java.util.concurrent.TimeUnit;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Scene;
@@ -38,15 +38,15 @@
 import javafx.scene.robot.Robot;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
-
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import test.util.Util;
 
 // See JDK-8210973
+@Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
 public class FocusParentWindowOnChildCloseTest {
     static Robot robot;
     static Button button;
@@ -58,12 +58,12 @@ public class FocusParentWindowOnChildCloseTest {
     static CountDownLatch alertShownLatch;
     static CountDownLatch alertCloseLatch;
 
-    @Test(timeout = 15000)
+    @Test
     public void focusRightParentOnChildWindowClose() throws Exception {
         Thread.sleep(400);
         clickButton();
         fireOkInAlert();
-        Assert.assertTrue("Stage 1 should be focused", stage.isFocused());
+        Assertions.assertTrue(stage.isFocused(), "Stage 1 should be focused");
     }
 
     private void clickButton() throws Exception {
@@ -74,12 +74,12 @@ private void clickButton() throws Exception {
         Util.waitForLatch(alertShownLatch, 10, "Failed to show Alert");
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() throws Exception {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void exit() {
         Util.shutdown();
     }
diff --git a/tests/system/src/test/java/test/robot/javafx/stage/IconifyTest.java b/tests/system/src/test/java/test/robot/javafx/stage/IconifyTest.java
index 85c0df23f89..5e0c8932b80 100644
--- a/tests/system/src/test/java/test/robot/javafx/stage/IconifyTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/stage/IconifyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
 
 package test.robot.javafx.stage;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import static test.util.Util.TIMEOUT;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import javafx.application.Platform;
@@ -33,18 +37,16 @@
 import javafx.scene.paint.Color;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
-import org.junit.Test;
-import test.robot.testharness.VisualTestBase;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import com.sun.javafx.PlatformUtil;
-
-import static org.junit.Assume.assumeTrue;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
-import static test.util.Util.TIMEOUT;
+import test.robot.testharness.VisualTestBase;
 
 /**
  * Test ability to programmatically iconify UNDECORATED and TRANSPARENT stages
  */
+@Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
 public class IconifyTest extends VisualTestBase {
 
     private static final int WIDTH = 300;
@@ -74,8 +76,7 @@ public void canIconifyStage(StageStyle stageStyle, boolean resizable) throws Exc
             bottomStage.show();
         });
 
-        assertTrue("Timeout waiting for bottom stage to be shown",
-            bottomShownLatch.await(TIMEOUT, TimeUnit.MILLISECONDS));
+        Assertions.assertTrue(bottomShownLatch.await(TIMEOUT, TimeUnit.MILLISECONDS), "Timeout waiting for bottom stage to be shown");
 
         runAndWait(() -> {
             // Top stage, will be inconified
@@ -91,8 +92,7 @@ public void canIconifyStage(StageStyle stageStyle, boolean resizable) throws Exc
             topStage.show();
         });
 
-        assertTrue("Timeout waiting for top stage to be shown",
-            topShownLatch.await(TIMEOUT, TimeUnit.MILLISECONDS));
+        Assertions.assertTrue(topShownLatch.await(TIMEOUT, TimeUnit.MILLISECONDS), "Timeout waiting for top stage to be shown");
 
         sleep(1000);
         runAndWait(() -> {
@@ -124,25 +124,24 @@ public void canIconifyStage(StageStyle stageStyle, boolean resizable) throws Exc
         });
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void canIconifyDecoratedStage() throws Exception {
         assumeTrue(!PlatformUtil.isLinux()); // Skip due to JDK-8316891
         canIconifyStage(StageStyle.DECORATED, true);
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void canIconifyUndecoratedStage() throws Exception {
         canIconifyStage(StageStyle.UNDECORATED, true);
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void canIconifyTransparentStage() throws Exception {
         canIconifyStage(StageStyle.TRANSPARENT, true);
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void canIconifyNonResizableStage() throws Exception {
         canIconifyStage(StageStyle.DECORATED, false);
     }
-
 }
diff --git a/tests/system/src/test/java/test/robot/javafx/stage/SetSceneScalingTest.java b/tests/system/src/test/java/test/robot/javafx/stage/SetSceneScalingTest.java
index 44502332baa..83b433c76cc 100644
--- a/tests/system/src/test/java/test/robot/javafx/stage/SetSceneScalingTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/stage/SetSceneScalingTest.java
@@ -36,11 +36,11 @@
 import javafx.scene.robot.Robot;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import test.util.Util;
 
 public class SetSceneScalingTest {
@@ -83,8 +83,8 @@ protected Scene createTestScene() {
         public void runTest() throws Exception {
             start();
 
-            Assert.assertNotNull(stage);
-            Assert.assertNotNull(button);
+            Assertions.assertNotNull(stage);
+            Assertions.assertNotNull(button);
 
             test();
         }
@@ -112,7 +112,7 @@ public class TestSetSceneShowApp extends TestApp {
         @Override
         protected void test() throws Exception {
             Platform.runLater(() -> testButtonClick());
-            Assert.assertTrue(buttonLatch.await(3, TimeUnit.SECONDS));
+            Assertions.assertTrue(buttonLatch.await(3, TimeUnit.SECONDS));
         }
 
         @Override
@@ -126,7 +126,7 @@ public class TestShowSetSceneApp extends TestApp {
         @Override
         protected void test() throws Exception {
             Platform.runLater(() -> testButtonClick());
-            Assert.assertTrue(buttonLatch.await(3, TimeUnit.SECONDS));
+            Assertions.assertTrue(buttonLatch.await(3, TimeUnit.SECONDS));
         }
 
         @Override
@@ -141,7 +141,7 @@ public class TestSecondSetSceneApp extends TestApp {
         protected void test() throws Exception {
             // Test that everything is okay for start
             Platform.runLater(() -> testButtonClick());
-            Assert.assertTrue(buttonLatch.await(3, TimeUnit.SECONDS));
+            Assertions.assertTrue(buttonLatch.await(3, TimeUnit.SECONDS));
 
             // Recreate scene and set it
             Util.runAndWait(() -> stage.setScene(createTestScene()));
@@ -149,7 +149,7 @@ protected void test() throws Exception {
             // retest - if DPI scaling is mishandled the button should
             // NOT be where it was (and thus, the test fails)
             Platform.runLater(() -> testButtonClick());
-            Assert.assertTrue(buttonLatch.await(3, TimeUnit.SECONDS));
+            Assertions.assertTrue(buttonLatch.await(3, TimeUnit.SECONDS));
         }
 
         @Override
@@ -160,7 +160,7 @@ public void sceneShowSetup() {
     }
 
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() {
         Platform.setImplicitExit(false);
         Util.startup(startupLatch, startupLatch::countDown);
@@ -168,14 +168,14 @@ public static void initFX() {
         Util.runAndWait(() -> robot = new Robot());
     }
 
-    @After
+    @AfterEach
     public void cleanupTest() {
         if (app != null) {
             Platform.runLater(() -> app.hideStage());
         }
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardownFX() {
         Util.shutdown();
     }
diff --git a/tests/system/src/test/java/test/robot/javafx/stage/StageAttributesTest.java b/tests/system/src/test/java/test/robot/javafx/stage/StageAttributesTest.java
index afe58802247..e7c77f2b12d 100644
--- a/tests/system/src/test/java/test/robot/javafx/stage/StageAttributesTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/stage/StageAttributesTest.java
@@ -25,8 +25,8 @@
 
 package test.robot.javafx.stage;
 
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import static test.util.Util.TIMEOUT;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -36,7 +36,7 @@
 import javafx.scene.paint.Color;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import com.sun.javafx.PlatformUtil;
 import test.robot.testharness.VisualTestBase;
 
@@ -71,8 +71,7 @@ private void setupStages(boolean overlayed, boolean topShown) throws Interrupted
             bottomStage.show();
         });
 
-        assertTrue("Timeout waiting for bottom stage to be shown",
-            bottomShownLatch.await(TIMEOUT, TimeUnit.MILLISECONDS));
+        assertTrue(bottomShownLatch.await(TIMEOUT, TimeUnit.MILLISECONDS), "Timeout waiting for bottom stage to be shown");
 
         runAndWait(() -> {
             // Top stage, will be inconified
@@ -95,8 +94,7 @@ private void setupStages(boolean overlayed, boolean topShown) throws Interrupted
         });
 
         if (topShown) {
-            assertTrue("Timeout waiting for top stage to be shown",
-                topShownLatch.await(TIMEOUT, TimeUnit.MILLISECONDS));
+            assertTrue(topShownLatch.await(TIMEOUT, TimeUnit.MILLISECONDS), "Timeout waiting for top stage to be shown");
         }
 
         sleep(1000);
diff --git a/tests/system/src/test/java/test/robot/javafx/stage/WrongStageFocusWithApplicationModalityTest.java b/tests/system/src/test/java/test/robot/javafx/stage/WrongStageFocusWithApplicationModalityTest.java
index 7e9b84887bf..ba32769b1ac 100644
--- a/tests/system/src/test/java/test/robot/javafx/stage/WrongStageFocusWithApplicationModalityTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/stage/WrongStageFocusWithApplicationModalityTest.java
@@ -26,7 +26,7 @@
 package test.robot.javafx.stage;
 
 import java.util.concurrent.CountDownLatch;
-
+import java.util.concurrent.TimeUnit;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Scene;
@@ -36,13 +36,13 @@
 import javafx.scene.layout.BorderPane;
 import javafx.scene.robot.Robot;
 import javafx.stage.Stage;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import test.util.Util;
 
+@Timeout(value=25000, unit=TimeUnit.MILLISECONDS)
 public class WrongStageFocusWithApplicationModalityTest {
     private static Robot robot;
     private static Stage stage;
@@ -50,17 +50,17 @@ public class WrongStageFocusWithApplicationModalityTest {
     private static CountDownLatch startupLatch = new CountDownLatch(4);
     private static CountDownLatch alertCloseLatch = new CountDownLatch(3);
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() throws Exception {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void exit() {
         Util.shutdown();
     }
 
-    @Test(timeout = 25000)
+    @Test
     public void testWindowFocusByClosingAlerts() throws Exception {
         Thread.sleep(3000);
         mouseClick();
diff --git a/tests/system/src/test/java/test/robot/javafx/web/PointerEventTest.java b/tests/system/src/test/java/test/robot/javafx/web/PointerEventTest.java
index 9d879987496..bc28cc4231e 100644
--- a/tests/system/src/test/java/test/robot/javafx/web/PointerEventTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/web/PointerEventTest.java
@@ -24,13 +24,9 @@
 
 package test.robot.javafx.web;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assume.assumeTrue;
-
-import com.sun.javafx.PlatformUtil;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.Application;
 import javafx.concurrent.Worker;
 import javafx.scene.Scene;
@@ -41,15 +37,14 @@
 import javafx.scene.web.WebEngine;
 import javafx.scene.web.WebView;
 import javafx.stage.Stage;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-
+import com.sun.javafx.PlatformUtil;
 import test.util.Util;
 
 /*
@@ -183,22 +178,22 @@ public void testLeftMiddleRightButtonDrag() {
         assertEquals((LEFT_BUTTON_DRAG | MIDDLE_BUTTON_DRAG | RIGHT_BUTTON_DRAG), result);
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void exit() {
         Util.shutdown();
     }
 
-    @Before
+    @BeforeEach
     public void skipOnLinux() {
         assumeTrue(!PlatformUtil.isLinux()); // JDK-8304923
     }
 
-    @After
+    @AfterEach
     public void resetTest() {
         Util.runAndWait(() -> {
             robot.mouseRelease(MouseButton.PRIMARY, MouseButton.MIDDLE, MouseButton.SECONDARY);
diff --git a/tests/system/src/test/java/test/robot/javafx/web/TooltipFXTest.java b/tests/system/src/test/java/test/robot/javafx/web/TooltipFXTest.java
index 43018c02d7a..89d1fe74c3d 100644
--- a/tests/system/src/test/java/test/robot/javafx/web/TooltipFXTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/web/TooltipFXTest.java
@@ -25,7 +25,7 @@
 
 package test.robot.javafx.web;
 
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
 import static test.util.Util.TIMEOUT;
 import java.lang.ref.WeakReference;
 import java.util.concurrent.CountDownLatch;
@@ -40,9 +40,10 @@
 import javafx.scene.robot.Robot;
 import javafx.scene.web.WebView;
 import javafx.stage.Stage;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import test.util.Util;
 import test.util.memory.JMemoryBuddy;
 
@@ -94,18 +95,20 @@ public void start(Stage primaryStage) throws Exception {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void initFX() {
         Util.launch(startupLatch, TestApp.class);
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardown() {
         Util.shutdown();
     }
 
 // ========================== TEST CASE ==========================
-    @Test(timeout = 20000) public void testTooltipLeak() throws Exception {
+    @Test
+    @Timeout(value=20)
+    public void testTooltipLeak() throws Exception {
         final CountDownLatch latch = new CountDownLatch(1);
 
         Util.runAndWait(() -> {
diff --git a/tests/system/src/test/java/test/robot/painttest/ImagePaintTest.java b/tests/system/src/test/java/test/robot/painttest/ImagePaintTest.java
index 516465baea6..38117d7e670 100644
--- a/tests/system/src/test/java/test/robot/painttest/ImagePaintTest.java
+++ b/tests/system/src/test/java/test/robot/painttest/ImagePaintTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 
 package test.robot.painttest;
 
+import java.util.concurrent.TimeUnit;
 import javafx.scene.Group;
 import javafx.scene.Scene;
 import javafx.scene.image.Image;
@@ -34,12 +35,14 @@
 import javafx.scene.paint.ImagePattern;
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import test.robot.testharness.VisualTestBase;
 
 /**
  * ImagePaint tests
  */
+@Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
 public class ImagePaintTest extends VisualTestBase {
 
     private Stage testStage;
@@ -112,14 +115,13 @@ public void doTestImagePaint(final boolean useSeparateImage) {
         });
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testSeparateImagePaint() {
         doTestImagePaint(true);
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testSameImagePaint() {
         doTestImagePaint(false);
     }
-
 }
diff --git a/tests/system/src/test/java/test/robot/scenegraph/JDK8130122Test.java b/tests/system/src/test/java/test/robot/scenegraph/JDK8130122Test.java
index 05dac1d65f5..2bf33cbe69c 100644
--- a/tests/system/src/test/java/test/robot/scenegraph/JDK8130122Test.java
+++ b/tests/system/src/test/java/test/robot/scenegraph/JDK8130122Test.java
@@ -25,6 +25,7 @@
 
 package test.robot.scenegraph;
 
+import java.util.concurrent.TimeUnit;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.geometry.Orientation;
@@ -37,12 +38,14 @@
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import test.robot.testharness.VisualTestBase;
 
 /**
  * Test bounds update of invisible node in the scene graph.
  */
+@Timeout(value=20000, unit=TimeUnit.MILLISECONDS)
 public class JDK8130122Test extends VisualTestBase {
 
     private Stage testStage;
@@ -50,7 +53,7 @@ public class JDK8130122Test extends VisualTestBase {
 
     private static final double TOLERANCE = 0.07;
 
-    @Test(timeout = 20000)
+    @Test
     public void testEmptyShapes() {
         final int WIDTH = 800;
         final int HEIGHT = 400;
diff --git a/tests/system/src/test/java/test/robot/scenegraph/ViewOrderTest.java b/tests/system/src/test/java/test/robot/scenegraph/ViewOrderTest.java
index 642c67d8b71..f619f74caae 100644
--- a/tests/system/src/test/java/test/robot/scenegraph/ViewOrderTest.java
+++ b/tests/system/src/test/java/test/robot/scenegraph/ViewOrderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 
 package test.robot.scenegraph;
 
+import java.util.concurrent.TimeUnit;
 import javafx.scene.Group;
 import javafx.scene.Scene;
 import javafx.scene.layout.HBox;
@@ -32,12 +33,14 @@
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import test.robot.testharness.VisualTestBase;
 
 /**
  * Test view order of Node in the scene graph.
  */
+@Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
 public class ViewOrderTest extends VisualTestBase {
 
     private Stage testStage;
@@ -45,7 +48,7 @@ public class ViewOrderTest extends VisualTestBase {
 
     private static final double TOLERANCE = 0.07;
 
-    @Test(timeout = 15000)
+    @Test
     public void testViewOrder() {
         final int WIDTH = 300;
         final int HEIGHT = 300;
@@ -103,7 +106,7 @@ public void testViewOrder() {
         });
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testViewOrderHBox() {
         final int WIDTH = 500;
         final int HEIGHT = 200;
diff --git a/tests/system/src/test/java/test/robot/test3d/AABalanceFlipTest.java b/tests/system/src/test/java/test/robot/test3d/AABalanceFlipTest.java
index b47ebd3a5c0..680744569dd 100644
--- a/tests/system/src/test/java/test/robot/test3d/AABalanceFlipTest.java
+++ b/tests/system/src/test/java/test/robot/test3d/AABalanceFlipTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,8 @@
  */
 package test.robot.test3d;
 
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import java.util.concurrent.TimeUnit;
 import javafx.application.ConditionalFeature;
 import javafx.application.Platform;
 import javafx.scene.AmbientLight;
@@ -40,12 +42,12 @@
 import javafx.scene.shape.MeshView;
 import javafx.scene.shape.TriangleMesh;
 import javafx.stage.Stage;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import test.robot.testharness.VisualTestBase;
 
-import static org.junit.Assume.assumeTrue;
-
+@Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
 public class AABalanceFlipTest extends VisualTestBase {
 
     private Stage testStage;
@@ -55,12 +57,12 @@ public class AABalanceFlipTest extends VisualTestBase {
 
     WritableImage selfIllumMap;
 
-    @Before
+    @BeforeEach
     public void setupEach() {
         assumeTrue(Platform.isSupported(ConditionalFeature.SCENE3D));
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testAABalanceFlip() {
         final int WIDTH = 600;
         final int HEIGHT = 600;
diff --git a/tests/system/src/test/java/test/robot/test3d/MeshCompareTest.java b/tests/system/src/test/java/test/robot/test3d/MeshCompareTest.java
index 358f4552a2d..984c7e9898a 100644
--- a/tests/system/src/test/java/test/robot/test3d/MeshCompareTest.java
+++ b/tests/system/src/test/java/test/robot/test3d/MeshCompareTest.java
@@ -25,9 +25,9 @@
 
 package test.robot.test3d;
 
-import static org.junit.Assume.assumeTrue;
-import java.util.ArrayList;
-import java.util.Collection;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
 import javafx.application.ConditionalFeature;
 import javafx.application.Platform;
 import javafx.scene.AmbientLight;
@@ -42,32 +42,21 @@
 import javafx.scene.shape.TriangleMesh;
 import javafx.scene.shape.VertexFormat;
 import javafx.stage.Stage;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import com.sun.javafx.geom.Vec3f;
 import test.robot.testharness.VisualTestBase;
 
 /**
  * 3D Snapshot validation tests.
  */
-@RunWith(Parameterized.class)
-public class MeshCompareTest extends VisualTestBase {
+@Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
+public final class MeshCompareTest extends VisualTestBase {
 
-    private static Collection params = null;
-
-    private static final Object[] pNumLights = { 0, 1, 2, 3 };
-
-    @Parameterized.Parameters
-    public static Collection getParams() {
-        if (params == null) {
-            params = new ArrayList();
-            for (Object o1 : pNumLights) {
-                params.add(new Object[]{o1});
-            }
-        }
-        return params;
+    public static List<Integer> parameters() {
+        return List.of(0, 1, 2, 3);
     }
 
     private static final double TOLERANCE = 0.07;
@@ -86,12 +75,6 @@ public static Collection getParams() {
     private WritableImage wImage;
     private MeshView shape;
 
-    private int numLights;
-
-    public MeshCompareTest(int numLights) {
-        this.numLights = numLights;
-    }
-
     private TriangleMesh createICOSphere(float scale) {
         final int pointSize = 3; // x, y, z
         final int texCoordSize = 2; // u, v
@@ -239,7 +222,7 @@ private TriangleMesh createPNTICOSphere(float scale) {
         return triangleMesh;
     }
 
-    private Scene buildScene() {
+    private Scene buildScene(int numLights) {
         Group root = new Group();
 
         PhongMaterial material = new PhongMaterial();
@@ -289,7 +272,7 @@ private void compareColors(Scene scene, WritableImage wImage, int x, int y) {
         assertColorEquals(exColor, sColor, TOLERANCE);
     }
 
-    @Before
+    @BeforeEach
     public void setupEach() {
         assumeTrue(Platform.isSupported(ConditionalFeature.SCENE3D));
     }
@@ -298,14 +281,15 @@ public void setupEach() {
     // Tests
     // -------------------------------------------------------------
 
-    @Test(timeout = 15000)
-    public void testSnapshot3D() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSnapshot3D(int numLights) {
 
         runAndWait(() -> {
             testStage = getStage();
             testStage.setTitle("Mesh VertexFormat Compare Test");
 
-            testScene = buildScene();
+            testScene = buildScene(numLights);
 
             // Take snapshot
             wImage = testScene.snapshot(null);
@@ -322,5 +306,4 @@ public void testSnapshot3D() {
             compareColors(testScene, wImage, SAMPLE_X3, SAMPLE_Y3);
         });
     }
-
 }
diff --git a/tests/system/src/test/java/test/robot/test3d/NearAndFarClipTest.java b/tests/system/src/test/java/test/robot/test3d/NearAndFarClipTest.java
index ff084721559..c3738e637c7 100644
--- a/tests/system/src/test/java/test/robot/test3d/NearAndFarClipTest.java
+++ b/tests/system/src/test/java/test/robot/test3d/NearAndFarClipTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
 
 package test.robot.test3d;
 
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import java.util.concurrent.TimeUnit;
 import javafx.application.ConditionalFeature;
 import javafx.application.Platform;
 import javafx.scene.Group;
@@ -33,15 +35,15 @@
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import test.robot.testharness.VisualTestBase;
 
-import static org.junit.Assume.assumeTrue;
-
 /**
  * Basic visual near and far clipping tests using glass Robot to sample pixels.
  */
+@Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
 public class NearAndFarClipTest extends VisualTestBase {
 
     private Stage testStage;
@@ -50,12 +52,12 @@ public class NearAndFarClipTest extends VisualTestBase {
     private static final double TOLERANCE = 0.07;
     private static final double OFFSET_PERCENT = 0.01; // 1 percent tolerance
 
-    @Before
+    @BeforeEach
     public void setupEach() {
         assumeTrue(Platform.isSupported(ConditionalFeature.SCENE3D));
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testNearAndFarClips() {
         final int WIDTH = 500;
         final int HEIGHT = 500;
diff --git a/tests/system/src/test/java/test/robot/test3d/PointLightIlluminationTest.java b/tests/system/src/test/java/test/robot/test3d/PointLightIlluminationTest.java
index b28c78506f1..f5293979f7b 100644
--- a/tests/system/src/test/java/test/robot/test3d/PointLightIlluminationTest.java
+++ b/tests/system/src/test/java/test/robot/test3d/PointLightIlluminationTest.java
@@ -25,13 +25,8 @@
 
 package test.robot.test3d;
 
-import static org.junit.Assume.assumeTrue;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.sun.javafx.PlatformUtil;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import java.util.concurrent.TimeUnit;
 import javafx.application.ConditionalFeature;
 import javafx.application.Platform;
 import javafx.scene.Group;
@@ -43,6 +38,11 @@
 import javafx.scene.paint.PhongMaterial;
 import javafx.scene.shape.Sphere;
 import javafx.stage.Stage;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+import com.sun.javafx.PlatformUtil;
 import test.robot.testharness.VisualTestBase;
 
 /**
@@ -54,6 +54,7 @@
  * the pixel scale factor, but it simply creates a test scene containing a sphere and a perspective
  * camera. Some pixels of the scene will be tested if they have got the expected color and brightness.
  */
+@Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
 public class PointLightIlluminationTest extends VisualTestBase {
 
     private static final int    SCENE_WIDTH_HEIGHT = 100;
@@ -70,7 +71,7 @@ public class PointLightIlluminationTest extends VisualTestBase {
     // Used to skip failing tests until JDK-8318985 is fixed
     private boolean isMacAarch64MacOS14;
 
-    @Before
+    @BeforeEach
     public void setupEach() {
         assumeTrue(Platform.isSupported(ConditionalFeature.SCENE3D));
         // JDK-8318985
@@ -91,7 +92,7 @@ public void setupEach() {
         }
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void sceneBackgroundColorShouldBeBlue() {
         runAndWait(() -> {
             assertColorEquals(
@@ -101,7 +102,7 @@ public void sceneBackgroundColorShouldBeBlue() {
         });
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void sphereUpperLeftPixelColorShouldBeDarkRed() {
         assumeTrue(!isMacAarch64MacOS14); // JDK-8318985
         runAndWait(() -> {
@@ -110,7 +111,7 @@ public void sphereUpperLeftPixelColorShouldBeDarkRed() {
         });
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void sphereUpperRightPixelColorShouldBeDarkRed() {
         assumeTrue(!isMacAarch64MacOS14); // JDK-8318985
         runAndWait(() -> {
@@ -119,7 +120,7 @@ public void sphereUpperRightPixelColorShouldBeDarkRed() {
         });
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void sphereLowerRightPixelColorShouldBeDarkRed() {
         assumeTrue(!isMacAarch64MacOS14); // JDK-8318985
         runAndWait(() -> {
@@ -128,7 +129,7 @@ public void sphereLowerRightPixelColorShouldBeDarkRed() {
         });
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void sphereLowerLeftPixelColorShouldBeDarkRed() {
         assumeTrue(!isMacAarch64MacOS14); // JDK-8318985
         runAndWait(() -> {
@@ -137,7 +138,7 @@ public void sphereLowerLeftPixelColorShouldBeDarkRed() {
         });
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void sphereCenterPixelColorShouldBeRed() {
         runAndWait(() -> {
             Color color = getColor(testScene, SCENE_WIDTH_HEIGHT / 2, SCENE_WIDTH_HEIGHT / 2);
@@ -151,7 +152,7 @@ public void sphereCenterPixelColorShouldBeRed() {
      * scene can be used for all the illumination tests by this class.
      */
     @Override
-    @After
+    @AfterEach
     public void doTeardown() {
     }
 
diff --git a/tests/system/src/test/java/test/robot/test3d/RT35019Test.java b/tests/system/src/test/java/test/robot/test3d/RT35019Test.java
index dbc728721ef..546e53e3e1c 100644
--- a/tests/system/src/test/java/test/robot/test3d/RT35019Test.java
+++ b/tests/system/src/test/java/test/robot/test3d/RT35019Test.java
@@ -25,6 +25,8 @@
 
 package test.robot.test3d;
 
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import java.util.concurrent.TimeUnit;
 import javafx.application.ConditionalFeature;
 import javafx.application.Platform;
 import javafx.scene.Group;
@@ -35,16 +37,16 @@
 import javafx.scene.text.Text;
 import javafx.scene.transform.Rotate;
 import javafx.stage.Stage;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import test.robot.testharness.VisualTestBase;
 
-import static org.junit.Assume.assumeTrue;
-
 /**
  * Test 2D shapes rendered with a 3D transform where some of the shapes
  * have empty bounds.
  */
+@Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
 public class RT35019Test extends VisualTestBase {
 
     private Stage testStage;
@@ -52,12 +54,12 @@ public class RT35019Test extends VisualTestBase {
 
     private static final double TOLERANCE = 0.07;
 
-    @Before
+    @BeforeEach
     public void setupEach() {
         assumeTrue(Platform.isSupported(ConditionalFeature.SCENE3D));
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testEmptyShapes() {
         final int WIDTH = 400;
         final int HEIGHT = 300;
diff --git a/tests/system/src/test/java/test/robot/test3d/Snapshot3DTest.java b/tests/system/src/test/java/test/robot/test3d/Snapshot3DTest.java
index b5c247f36c8..2e2d644abad 100644
--- a/tests/system/src/test/java/test/robot/test3d/Snapshot3DTest.java
+++ b/tests/system/src/test/java/test/robot/test3d/Snapshot3DTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,10 @@
 
 package test.robot.test3d;
 
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import java.util.ArrayList;
-import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
 import javafx.application.ConditionalFeature;
 import javafx.application.Platform;
 import javafx.scene.AmbientLight;
@@ -41,33 +43,27 @@
 import javafx.scene.shape.Shape3D;
 import javafx.scene.shape.Sphere;
 import javafx.stage.Stage;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import test.robot.testharness.VisualTestBase;
 
-import static org.junit.Assume.assumeTrue;
-
 /**
  * 3D Snapshot validation tests.
  */
-@RunWith(Parameterized.class)
-public class Snapshot3DTest extends VisualTestBase {
-
-    private static Collection params = null;
+@Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
+public final class Snapshot3DTest extends VisualTestBase {
 
     private static final Object[] pUseSphere = { Boolean.FALSE, Boolean.TRUE };
     private static final Object[] pNumLights = { 0, 1, 2, 3 };
 
-    @Parameterized.Parameters
-    public static Collection getParams() {
-        if (params == null) {
-            params = new ArrayList();
-            for (Object o0 : pUseSphere) {
-                for (Object o1 : pNumLights) {
-                    params.add(new Object[] { o0, o1 });
-                }
+    private static List<Arguments> parameters() {
+        List<Arguments> params = new ArrayList();
+        for (Object o0 : pUseSphere) {
+            for (Object o1 : pNumLights) {
+                params.add(Arguments.of(o0, o1));
             }
         }
         return params;
@@ -88,15 +84,15 @@ public static Collection getParams() {
     private Scene testScene;
     private WritableImage wImage;
 
-    private boolean createSphere;
-    private int numLights;
+//    private boolean createSphere;
+//    private int numLights;
+//
+//    public Snapshot3DTest(boolean createSphere, int numLights) {
+//        this.createSphere = createSphere;
+//        this.numLights = numLights;
+//    }
 
-    public Snapshot3DTest(boolean createSphere, int numLights) {
-        this.createSphere = createSphere;
-        this.numLights = numLights;
-    }
-
-    private Scene buildScene() {
+    private Scene buildScene(boolean createSphere, int numLights) {
         Group root = new Group();
 
         PhongMaterial material = new PhongMaterial();
@@ -150,7 +146,7 @@ private void compareColors(Scene scene, WritableImage wImage, int x, int y) {
         assertColorEquals(exColor, sColor, TOLERANCE);
     }
 
-    @Before
+    @BeforeEach
     public void setupEach() {
         assumeTrue(Platform.isSupported(ConditionalFeature.SCENE3D));
     }
@@ -159,14 +155,15 @@ public void setupEach() {
     // Tests
     // -------------------------------------------------------------
 
-    @Test(timeout = 15000)
-    public void testSnapshot3D() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    public void testSnapshot3D(boolean createSphere, int numLights) {
 
         runAndWait(() -> {
             testStage = getStage();
             testStage.setTitle("Snapshot 3D Test");
 
-            testScene = buildScene();
+            testScene = buildScene(createSphere, numLights);
 
             // Take snapshot
             wImage = testScene.snapshot(null);
@@ -182,5 +179,4 @@ public void testSnapshot3D() {
             compareColors(testScene, wImage, SAMPLE_X3, SAMPLE_Y3);
         });
     }
-
 }
diff --git a/tests/system/src/test/java/test/robot/test3d/TriangleMeshPNTValidationTest.java b/tests/system/src/test/java/test/robot/test3d/TriangleMeshPNTValidationTest.java
index 1d353486ae3..7b72b6ca1e2 100644
--- a/tests/system/src/test/java/test/robot/test3d/TriangleMeshPNTValidationTest.java
+++ b/tests/system/src/test/java/test/robot/test3d/TriangleMeshPNTValidationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,8 @@
  */
 package test.robot.test3d;
 
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import java.util.concurrent.TimeUnit;
 import javafx.application.ConditionalFeature;
 import javafx.application.Platform;
 import javafx.scene.Group;
@@ -35,15 +37,15 @@
 import javafx.scene.shape.TriangleMesh;
 import javafx.scene.shape.VertexFormat;
 import javafx.stage.Stage;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import test.robot.testharness.VisualTestBase;
 
-import static org.junit.Assume.assumeTrue;
-
 /**
  * Basic TriangleMesh validation tests.
  */
+@Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
 public class TriangleMeshPNTValidationTest extends VisualTestBase {
 
     private Stage testStage;
@@ -58,12 +60,12 @@ public class TriangleMeshPNTValidationTest extends VisualTestBase {
     private static final int HEIGHT = 800;
     private Color bgColor = Color.rgb(10, 10, 40);
 
-    @Before
+    @BeforeEach
     public void setupEach() {
         assumeTrue(Platform.isSupported(ConditionalFeature.SCENE3D));
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testInvalidNormalsLength() {
         runAndWait(() -> {
             testStage = getStage();
@@ -88,7 +90,7 @@ public void testInvalidNormalsLength() {
         });
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testNormalsLengthChange() {
         runAndWait(() -> {
             testStage = getStage();
@@ -121,7 +123,7 @@ public void testNormalsLengthChange() {
         });
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testDegeneratedMeshUpdateNormals() {
         runAndWait(() -> {
             testStage = getStage();
@@ -156,7 +158,7 @@ public void testDegeneratedMeshUpdateNormals() {
         });
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testDegeneratedMeshUpdatePoints() {
         runAndWait(() -> {
             testStage = getStage();
diff --git a/tests/system/src/test/java/test/robot/test3d/TriangleMeshValidationTest.java b/tests/system/src/test/java/test/robot/test3d/TriangleMeshValidationTest.java
index a451ffb6541..f2ed0832d92 100644
--- a/tests/system/src/test/java/test/robot/test3d/TriangleMeshValidationTest.java
+++ b/tests/system/src/test/java/test/robot/test3d/TriangleMeshValidationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
 
 package test.robot.test3d;
 
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import java.util.concurrent.TimeUnit;
 import javafx.application.ConditionalFeature;
 import javafx.application.Platform;
 import javafx.scene.AmbientLight;
@@ -36,15 +38,15 @@
 import javafx.scene.shape.MeshView;
 import javafx.scene.shape.TriangleMesh;
 import javafx.stage.Stage;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import test.robot.testharness.VisualTestBase;
 
-import static org.junit.Assume.assumeTrue;
-
 /**
  * Basic TriangleMesh validation tests.
  */
+@Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
 public class TriangleMeshValidationTest extends VisualTestBase {
 
     private Stage testStage;
@@ -59,12 +61,12 @@ public class TriangleMeshValidationTest extends VisualTestBase {
     private static final int HEIGHT = 800;
     private Color bgColor = Color.rgb(10, 10, 40);
 
-    @Before
+    @BeforeEach
     public void setupEach() {
         assumeTrue(Platform.isSupported(ConditionalFeature.SCENE3D));
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testEmptyMesh() {
         runAndWait(() -> {
             testStage = getStage();
@@ -87,7 +89,7 @@ public void testEmptyMesh() {
         });
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testInvalidPointsLength() {
         runAndWait(() -> {
             testStage = getStage();
@@ -119,7 +121,7 @@ public void testInvalidPointsLength() {
         });
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testInvalidTexCoordLength() {
         runAndWait(() -> {
             testStage = getStage();
@@ -147,7 +149,7 @@ public void testInvalidTexCoordLength() {
         });
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testInvalidFacesLength() {
         runAndWait(() -> {
             testStage = getStage();
@@ -183,7 +185,7 @@ public void testInvalidFacesLength() {
         });
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testInvalidFacesIndex() {
         runAndWait(() -> {
             testStage = getStage();
@@ -218,7 +220,7 @@ public void testInvalidFacesIndex() {
         });
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testInvalidFaceSmoothingGroupsLength() {
         runAndWait(() -> {
             testStage = getStage();
@@ -243,7 +245,7 @@ public void testInvalidFaceSmoothingGroupsLength() {
         });
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testPointsLengthChange() {
         runAndWait(() -> {
             testStage = getStage();
@@ -276,7 +278,7 @@ public void testPointsLengthChange() {
         });
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testTexCoordsLengthChange() {
         runAndWait(() -> {
             testStage = getStage();
@@ -309,7 +311,7 @@ public void testTexCoordsLengthChange() {
         });
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testFaceLengthChange() {
         runAndWait(() -> {
             testStage = getStage();
@@ -353,7 +355,7 @@ public void testFaceLengthChange() {
         });
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testResetFaceSmoothingGroup() {
         runAndWait(() -> {
             testStage = getStage();
@@ -384,7 +386,7 @@ public void testResetFaceSmoothingGroup() {
         });
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testUpdateMesh() {
         runAndWait(() -> {
             testStage = getStage();
@@ -431,7 +433,7 @@ public void testUpdateMesh() {
         });
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testDegeneratedMeshUpdateFaces() {
         runAndWait(() -> {
             testStage = getStage();
@@ -471,7 +473,7 @@ public void testDegeneratedMeshUpdateFaces() {
         });
     }
 
-    @Test(timeout = 15000)
+    @Test
     public void testDegeneratedMeshUpdatePoints() {
         runAndWait(() -> {
             testStage = getStage();
diff --git a/tests/system/src/test/java/test/robot/testharness/VisualTestBase.java b/tests/system/src/test/java/test/robot/testharness/VisualTestBase.java
index 40173aeb404..d3214562d0a 100644
--- a/tests/system/src/test/java/test/robot/testharness/VisualTestBase.java
+++ b/tests/system/src/test/java/test/robot/testharness/VisualTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,14 +24,13 @@
  */
 package test.robot.testharness;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
-
 import javafx.animation.AnimationTimer;
 import javafx.application.Application;
 import javafx.application.Platform;
@@ -40,13 +39,10 @@
 import javafx.scene.robot.Robot;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-
-import junit.framework.AssertionFailedError;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
 import test.util.Util;
 
 /**
@@ -87,24 +83,24 @@ public void start(Stage primaryStage) throws Exception {
         }
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void doSetupOnce() {
         Util.launch(launchLatch, MyApp.class);
         assertEquals(0, launchLatch.getCount());
     }
 
-    @AfterClass
+    @AfterAll
     public static void doTeardownOnce() {
         Util.shutdown();
     }
 
-    @Before
+    @BeforeEach
     public void doSetup() {
         runAndWait(() -> robot = new Robot());
         Util.parkCursor(robot);
     }
 
-    @After
+    @AfterEach
     public void doTeardown() {
         runAndWait(() -> {
             if (!stages.isEmpty()) {
@@ -143,7 +139,7 @@ protected void sleep(long millis) {
         try {
             Thread.sleep(millis);
         } catch (InterruptedException ex) {
-            throw new AssertionFailedError("Unexpected exception: " + ex);
+            fail(ex);
         }
     }
 
@@ -169,7 +165,7 @@ private static String colorToString(Color c) {
 
     protected void assertColorEquals(Color expected, Color actual, double delta) {
         if (!testColorEquals(expected, actual, delta)) {
-            throw new AssertionFailedError("expected:" + colorToString(expected)
+            fail("expected:" + colorToString(expected)
                     + " but was:" + colorToString(actual));
         }
     }
@@ -188,7 +184,7 @@ protected void assertColorDoesNotEqual(Color notExpected, Color actual, double d
         double deltaBlue = Math.abs(notExpected.getBlue() - actual.getBlue());
         double deltaOpacity = Math.abs(notExpected.getOpacity() - actual.getOpacity());
         if (deltaRed < delta && deltaGreen < delta && deltaBlue < delta && deltaOpacity < delta) {
-            throw new AssertionFailedError("not expected:" + colorToString(notExpected)
+            fail("not expected:" + colorToString(notExpected)
                     + " but was:" + colorToString(actual));
         }
     }
@@ -209,7 +205,7 @@ private void frameWait(int n) {
         try {
             frameCounter.await();
         } catch (InterruptedException ex) {
-            throw new AssertionFailedError("Unexpected exception: " + ex);
+            fail("Unexpected exception: " + ex);
         } finally {
             runAndWait(() -> {
                 if (timer != null) {
diff --git a/tests/system/src/test/java/test/sandbox/SandboxAppTest.java b/tests/system/src/test/java/test/sandbox/SandboxAppTest.java
index 9b532c2f1ca..c4b2cdb1df2 100644
--- a/tests/system/src/test/java/test/sandbox/SandboxAppTest.java
+++ b/tests/system/src/test/java/test/sandbox/SandboxAppTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,21 +25,27 @@
 
 package test.sandbox;
 
-import com.sun.javafx.PlatformUtil;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import static test.sandbox.Constants.ERROR_NONE;
+import static test.sandbox.Constants.ERROR_NO_SECURITY_EXCEPTION;
+import static test.sandbox.Constants.ERROR_SECURITY_EXCEPTION;
+import static test.sandbox.Constants.ERROR_TIMEOUT;
+import static test.sandbox.Constants.ERROR_UNEXPECTED_EXCEPTION;
 import java.util.ArrayList;
-import junit.framework.AssertionFailedError;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.Ignore;
-
-import static org.junit.Assert.*;
-import static org.junit.Assume.*;
-import static test.sandbox.Constants.*;
+import java.util.concurrent.TimeUnit;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+import com.sun.javafx.PlatformUtil;
 
 /**
  * Unit test for running JavaFX apps in a sandbox with a restrictive
  * security manager.
  */
+@Timeout(value=25000, unit=TimeUnit.MILLISECONDS)
 public class SandboxAppTest {
 
     private static final String className = SandboxAppTest.class.getName();
@@ -76,34 +82,33 @@ private void runSandboxedApp(String appName, int exitCode, String policy) throws
         switch (retVal) {
             case 0:
             case ERROR_NONE:
-                assertEquals(testAppName + ": Unexpected 'success' exit code;",
-                        exitCode, retVal);
+                assertEquals(exitCode, retVal, testAppName + ": Unexpected 'success' exit code;");
                 break;
 
             case 1:
-                throw new AssertionFailedError(testAppName
+                fail(testAppName
                         + ": unable to launch java application");
 
             case ERROR_TIMEOUT:
-                throw new AssertionFailedError(testAppName
+                fail(testAppName
                         + ": Application timeout");
             case ERROR_SECURITY_EXCEPTION:
-                throw new AssertionFailedError(testAppName
+                fail(testAppName
                         + ": Application failed with a security exception");
             case ERROR_NO_SECURITY_EXCEPTION:
-                throw new AssertionFailedError(testAppName
+                fail(testAppName
                         + ": Application did not get expected security exception");
             case ERROR_UNEXPECTED_EXCEPTION:
-                throw new AssertionFailedError(testAppName
+                fail(testAppName
                         + ": Application failed with unexpected exception");
 
            default:
-                throw new AssertionFailedError(testAppName
+               fail(testAppName
                         + ": Unexpected error exit: " + retVal);
         }
     }
 
-    @Before
+    @BeforeEach
     public void setupEach() {
         if (PlatformUtil.isWindows()) {
             assumeTrue(Boolean.getBoolean("unstable.test")); // JDK-8255486
@@ -112,29 +117,29 @@ public void setupEach() {
 
     // TEST CASES
 
-    @Test (timeout = 25000)
+    @Test
     public void testFXApp() throws Exception {
         runSandboxedApp("FXApp");
     }
 
-    @Test (timeout = 25000)
+    @Test
     public void testFXNonApp() throws Exception {
         runSandboxedApp("FXNonApp");
     }
 
-    @Ignore("JDK-8202451")
-    @Test (timeout = 25000)
+    @Disabled("JDK-8202451")
+    @Test
     public void testJFXPanelApp() throws Exception {
         runSandboxedApp("JFXPanelApp");
     }
 
-    @Ignore("JDK-8202451")
-    @Test (timeout = 25000)
+    @Disabled("JDK-8202451")
+    @Test
     public void testJFXPanelImplicitExitApp() throws Exception {
         runSandboxedApp("JFXPanelImplicitExitApp", 0);
     }
 
-    @Test (timeout = 25000)
+    @Test
     public void testFXWebApp() throws Exception {
         runSandboxedApp("FXWebApp", ERROR_NONE, "empty.policy");
     }
diff --git a/tests/system/src/test/java/test/shutdowntest/ShutdownHookTest.java b/tests/system/src/test/java/test/shutdowntest/ShutdownHookTest.java
index dcadb1056f2..ab1bc3f3489 100644
--- a/tests/system/src/test/java/test/shutdowntest/ShutdownHookTest.java
+++ b/tests/system/src/test/java/test/shutdowntest/ShutdownHookTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,18 +25,27 @@
 
 package test.shutdowntest;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+import static test.shutdowntest.Constants.ERROR_NONE;
+import static test.shutdowntest.Constants.ERROR_SOCKET;
+import static test.shutdowntest.Constants.SOCKET_HANDSHAKE;
+import static test.shutdowntest.Constants.STATUS_ILLEGAL_STATE;
+import static test.shutdowntest.Constants.STATUS_OK;
+import static test.shutdowntest.Constants.STATUS_RUNNABLE_EXECUTED;
+import static test.shutdowntest.Constants.STATUS_UNEXPECTED_EXCEPTION;
 import java.io.InputStream;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.ArrayList;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-import static test.shutdowntest.Constants.*;
+import java.util.concurrent.TimeUnit;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 /**
  * Unit test for calling Platform runLater from a ShutdownHook.
  */
+@Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
 public class ShutdownHookTest {
 
     private static final String className = ShutdownHookTest.class.getName();
@@ -44,7 +53,7 @@ public class ShutdownHookTest {
 
     private final String testAppName = pkgName + "." + "ShutdownHookApp";
 
-    @Test (timeout = 15000)
+    @Test
     public void testShutdownHook() throws Exception {
         // Initilaize the socket
         final ServerSocket service = new ServerSocket(0);
@@ -71,7 +80,7 @@ public void testShutdownHook() throws Exception {
 
         // Read the "handshake" token
         int handshake = in.read();
-        assertEquals("Socket handshake failed,", SOCKET_HANDSHAKE, handshake);
+        assertEquals(SOCKET_HANDSHAKE, handshake, "Socket handshake failed,");
 
         // Read the status code from the shutdown hook
         int status = in.read();
diff --git a/tests/system/src/test/java/test/util/Util.java b/tests/system/src/test/java/test/util/Util.java
index 41448e8dfa4..27b9ff951af 100644
--- a/tests/system/src/test/java/test/util/Util.java
+++ b/tests/system/src/test/java/test/util/Util.java
@@ -25,6 +25,7 @@
 
 package test.util;
 
+import static org.junit.jupiter.api.Assertions.fail;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
@@ -46,8 +47,7 @@
 import javafx.scene.robot.Robot;
 import javafx.stage.Screen;
 import javafx.stage.Window;
-import org.junit.Assert;
-import junit.framework.AssertionFailedError;
+import org.junit.jupiter.api.Assertions;
 import com.sun.javafx.PlatformUtil;
 
 /**
@@ -70,13 +70,10 @@ public static void throwError(Throwable testError) {
             } else if (testError instanceof RuntimeException) {
                 throw (RuntimeException)testError;
             } else {
-                AssertionFailedError err = new AssertionFailedError("Unknown exception");
-                err.initCause(testError.getCause());
-                throw err;
+                fail(testError);
             }
         } else {
-            AssertionFailedError err = new AssertionFailedError("Unexpected exception");
-            throw err;
+            fail("Unexpected exception");
         }
     }
 
@@ -117,9 +114,7 @@ private static Future submit(final Runnable r, final CountDownLatch delayLatch)
                     return false;
                 }
             } catch (InterruptedException ex) {
-                AssertionFailedError err = new AssertionFailedError("Unexpected exception");
-                err.initCause(ex);
-                throw err;
+                fail(ex);
             }
 
             if (testError[0] != null) {
@@ -128,9 +123,7 @@ private static Future submit(final Runnable r, final CountDownLatch delayLatch)
                 } else if (testError[0] instanceof RuntimeException) {
                     throw (RuntimeException)testError[0];
                 } else {
-                    AssertionFailedError err = new AssertionFailedError("Unknown execution exception");
-                    err.initCause(testError[0].getCause());
-                    throw err;
+                    fail(testError[0].getCause());
                 }
             }
 
@@ -170,7 +163,7 @@ public static void runAndWait(boolean delay, Runnable... runnables) {
         }
 
         if (!futures.isEmpty()) {
-            throw new AssertionFailedError("Exceeded timeout limit of " + TIMEOUT + " msec");
+            fail("Exceeded timeout limit of " + TIMEOUT + " msec");
         }
     }
 
@@ -349,9 +342,9 @@ public static <T extends Application> void launch (
 
         String msg = "Failed to launch FX application " + applicationClass + " within " + timeoutSeconds + " sec.";
         try {
-            Assert.assertTrue(msg, startupLatch.await(timeoutSeconds, TimeUnit.SECONDS));
+            Assertions.assertTrue(startupLatch.await(timeoutSeconds, TimeUnit.SECONDS), msg);
         } catch (InterruptedException e) {
-            throw new AssertionError(e);
+            fail(e);
         }
     }
 
@@ -368,9 +361,9 @@ public static void startup(CountDownLatch startupLatch, Runnable r) {
         Platform.startup(r);
         try {
             String msg = "Timeout waiting for FX runtime to start";
-            Assert.assertTrue(msg, startupLatch.await(STARTUP_TIMEOUT, TimeUnit.SECONDS));
+            Assertions.assertTrue(startupLatch.await(STARTUP_TIMEOUT, TimeUnit.SECONDS), msg);
         } catch (InterruptedException e) {
-            throw new AssertionError(e);
+            fail(e);
         }
     }
 
@@ -393,9 +386,9 @@ public static void shutdown() {
      */
     public static void waitForLatch(CountDownLatch latch, int seconds, String msg) {
         try {
-            Assert.assertTrue("Timeout: " + msg, latch.await(seconds, TimeUnit.SECONDS));
+            Assertions.assertTrue(latch.await(seconds, TimeUnit.SECONDS), "Timeout: " + msg);
         } catch (InterruptedException e) {
-            throw new AssertionError(e);
+            fail(e);
         }
     }
 

From 29004352006e4d1d01401d658d22a35ae2648de5 Mon Sep 17 00:00:00 2001
From: Kevin Rushforth <kcr@openjdk.org>
Date: Tue, 24 Sep 2024 17:00:31 +0000
Subject: [PATCH 51/75] 8328629: JUnit test without a timeout value can hang
 indefinitely

Reviewed-by: angorya, arapte, mhanl
---
 build.gradle                                         |  7 +++++++
 .../java/test/javafx/scene/control/AlertTest.java    |  3 ++-
 .../java/test/javafx/scene/control/ListViewTest.java |  2 +-
 .../javafx/scene/control/ProgressIndicatorTest.java  |  3 ++-
 .../scene/control/SelectionFocusModelMemoryTest.java |  3 ++-
 .../test/javafx/scene/control/ToggleButtonTest.java  |  2 ++
 .../scene/control/skin/ProgressBarSkinTest.java      |  3 ++-
 .../scene/control/skin/ScrollPaneSkinTest.java       |  7 +++++--
 .../com/sun/javafx/util/WeakReferenceQueueTest.java  |  7 ++++++-
 .../test/java/test/javafx/scene/web/HistoryTest.java | 12 ++++++++++--
 .../test/java/test/javafx/scene/web/TestBase.java    |  6 +++++-
 .../test/com/sun/glass/ui/monocle/LensUInput.java    |  8 ++++++--
 .../sun/javafx/application/StaticStartupTest.java    |  4 +++-
 .../com/sun/javafx/image/impl/ImageRaceTest.java     | 12 +++++++++---
 .../test/com/sun/javafx/sg/prism/RT36296Test.java    |  2 ++
 .../com/sun/javafx/tk/quantum/SystemMenuBarTest.java |  2 +-
 .../src/test/java/test/com/sun/marlin/QPathTest.java |  2 ++
 .../test/java/test/com/sun/marlin/ScaleX0Test.java   |  1 +
 .../embed/swing/JFXPanelEmbeddedWindowTest.java      |  3 ++-
 .../embed/swing/SwingNodeContentMemoryLeakTest.java  |  3 ++-
 .../test/javafx/scene/text/ArabicWrappingTest.java   |  2 ++
 .../com/sun/glass/ui/monocle/MonocleUInput.java      |  3 ++-
 .../com/sun/glass/ui/monocle/TestApplication.java    |  3 ++-
 .../test/robot/javafx/embed/swing/JFXPanelTest.java  |  3 ++-
 .../test/robot/javafx/embed/swing/RT23603Test.java   |  2 ++
 .../test/robot/javafx/embed/swing/RT32570Test.java   |  7 ++++++-
 .../control/behavior/BehaviorRobotTestBase.java      | 12 ------------
 .../system/src/test/java/test/sandbox/app/Util.java  |  1 +
 tests/system/src/test/java/test/util/Util.java       |  4 +++-
 29 files changed, 92 insertions(+), 37 deletions(-)

diff --git a/build.gradle b/build.gradle
index 91880b241c9..8f8e76f2202 100644
--- a/build.gradle
+++ b/build.gradle
@@ -537,6 +537,11 @@ ext.IS_SWT_TEST = Boolean.parseBoolean(SWT_TEST);
 defineProperty("UNSTABLE_TEST", "false")
 ext.IS_UNSTABLE_TEST = Boolean.parseBoolean(UNSTABLE_TEST);
 
+// Default timeout values to use in JUnit for tests and lifecycle methods
+// that don't specify one
+defineProperty("JUNIT_TEST_TIMEOUT", "120s")
+defineProperty("JUNIT_LIFECYCLE_TIMEOUT", "20s")
+
 // Toggle diagnostic output from the Gradle workaround and the Sandbox test apps.
 defineProperty("WORKER_DEBUG", "false")
 ext.IS_WORKER_DEBUG = Boolean.parseBoolean(WORKER_DEBUG);
@@ -2184,6 +2189,8 @@ allprojects {
         }
 
         systemProperty 'unstable.test', IS_UNSTABLE_TEST
+        systemProperty 'junit.jupiter.execution.timeout.test.method.default', JUNIT_TEST_TIMEOUT
+        systemProperty 'junit.jupiter.execution.timeout.lifecycle.method.default', JUNIT_LIFECYCLE_TIMEOUT
     }
 
     compileTestJava {
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/AlertTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/AlertTest.java
index 4a29cf7c4b5..8b2fcae5512 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/AlertTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/AlertTest.java
@@ -27,6 +27,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 import java.util.Locale;
 import javafx.application.Platform;
 import javafx.scene.control.Alert;
@@ -94,7 +95,7 @@ private void showAndHideDialog(Dialog<?> dialog, boolean normalClose) {
                         Platform.runLater(() -> getStage(dialog).close());
                     }
                 } catch (InterruptedException e) {
-                    e.printStackTrace();
+                    fail(e);
                 }
             }).start();
 
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ListViewTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ListViewTest.java
index 0f8d276c018..7ea596a0da0 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ListViewTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ListViewTest.java
@@ -504,7 +504,7 @@ public void cleanup() {
         try {
             Thread.sleep(100);
         } catch (InterruptedException ex) {
-            ex.printStackTrace();
+            fail(ex);
         }
 
         // the list is totally changing (it is being cleared), so we should
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ProgressIndicatorTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ProgressIndicatorTest.java
index 8fab27a28e6..c0b5eb38adb 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ProgressIndicatorTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ProgressIndicatorTest.java
@@ -27,6 +27,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import javafx.geometry.Pos;
@@ -211,7 +212,7 @@ private void attemptGC(int n) {
             try {
                 Thread.sleep(500);
             } catch (InterruptedException e) {
-               System.err.println("InterruptedException occurred during Thread.sleep()");
+                fail(e);
             }
         }
     }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/SelectionFocusModelMemoryTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/SelectionFocusModelMemoryTest.java
index 7d6cd66f93d..f4ba3dd48b7 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/SelectionFocusModelMemoryTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/SelectionFocusModelMemoryTest.java
@@ -26,6 +26,7 @@
 package test.javafx.scene.control;
 
 import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
 import java.lang.ref.WeakReference;
 import java.util.Collection;
 import java.util.List;
@@ -242,7 +243,7 @@ private void attemptGC(WeakReference<?> weakRef, int n) {
             try {
                 Thread.sleep(500);
             } catch (InterruptedException e) {
-               System.err.println("InterruptedException occurred during Thread.sleep()");
+                fail(e);
             }
         }
     }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ToggleButtonTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ToggleButtonTest.java
index 41d6f725e92..7a2f61d4c64 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ToggleButtonTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ToggleButtonTest.java
@@ -30,6 +30,7 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertPseudoClassDoesNotExist;
 import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertPseudoClassExists;
 import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
@@ -246,6 +247,7 @@ public void setup() {
             Thread.sleep(2000);
         } catch (InterruptedException ex) {
             PlatformLogger.getLogger(ToggleButtonTest.class.getName()).severe(null, ex);
+            fail(ex);
         }
         assertTrue(flag[0], "fire() doesnt emit ActionEvent!");
     }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ProgressBarSkinTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ProgressBarSkinTest.java
index f47e39108bc..3ffc4c76c36 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ProgressBarSkinTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ProgressBarSkinTest.java
@@ -28,6 +28,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 import java.lang.ref.WeakReference;
 import javafx.beans.value.ObservableValue;
 import javafx.scene.Scene;
@@ -125,7 +126,7 @@ private void attemptGC(int n) {
             try {
                 Thread.sleep(500);
             } catch (InterruptedException e) {
-               System.err.println("InterruptedException occurred during Thread.sleep()");
+                fail(e);
             }
         }
     }
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ScrollPaneSkinTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ScrollPaneSkinTest.java
index 81d2bbf9ffe..6e4dea763fd 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ScrollPaneSkinTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ScrollPaneSkinTest.java
@@ -27,6 +27,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import javafx.beans.value.ObservableValue;
@@ -192,8 +193,9 @@ public void growW() {
         while (continueTest == false && count < 10) {
             try {
                 Thread.sleep(100);
+            } catch (InterruptedException e) {
+                fail(e);
             }
-            catch (Exception e) {}
             count++;
         }
 
@@ -241,8 +243,9 @@ public void growW() {
         while (continueTest == false && count < 10) {
             try {
                 Thread.sleep(100);
+            } catch (InterruptedException e) {
+                fail(e);
             }
-            catch (Exception e) {}
             count++;
         }
 
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/util/WeakReferenceQueueTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/util/WeakReferenceQueueTest.java
index 039fdb34cfe..2cbff2b952f 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/util/WeakReferenceQueueTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/util/WeakReferenceQueueTest.java
@@ -34,6 +34,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class WeakReferenceQueueTest {
     @Test
@@ -203,7 +204,11 @@ private void tryGCReallyHard() {
         }
 
         // finally, give the VM some idle time to perform gc
-        try { Thread.sleep(100); } catch (InterruptedException e) {}
+        try {
+            Thread.sleep(100);
+        } catch (InterruptedException e) {
+            fail(e);
+        }
 
         // hope that worked!
     }
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/HistoryTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/HistoryTest.java
index 90969f52be5..0dec9b60d2a 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/HistoryTest.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/HistoryTest.java
@@ -115,7 +115,11 @@ public void changed(ObservableValue<? extends String> observable, String oldValu
         //
         history.getEntries().get(history.getCurrentIndex() - 1).lastVisitedDateProperty().addListener(newDateListener());
 
-        try { Thread.sleep(150); } catch (Exception e) {} // ensure the next date doesn't fit into the same millisecond
+        try {
+            Thread.sleep(150); // ensure the next date doesn't fit into the same millisecond
+        } catch (InterruptedException e) {
+            fail(e);
+        }
 
         history.currentIndexProperty().addListener(new ChangeListener<Number>() {
             @Override
@@ -237,7 +241,11 @@ public void changed(ObservableValue<? extends java.lang.Number> observable, Numb
 
         history.getEntries().get(history.getCurrentIndex()).lastVisitedDateProperty().addListener(newDateListener());
 
-        try { Thread.sleep(150); } catch (Exception e) {} // ensure the next date doesn't fit into the same millisecond
+        try {
+            Thread.sleep(150); // ensure the next date doesn't fit into the same millisecond
+        } catch (InterruptedException e) {
+            fail(e);
+        }
 
         reload();
 
diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/TestBase.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/TestBase.java
index 755cd35f40a..3556a6acaaf 100644
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/TestBase.java
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/TestBase.java
@@ -25,6 +25,8 @@
 
 package test.javafx.scene.web;
 
+import static org.junit.jupiter.api.Assertions.fail;
+
 import java.awt.Color;
 import java.io.File;
 import java.util.concurrent.Callable;
@@ -63,7 +65,9 @@ public static void setupOnce() {
 
         try {
             startupLatch.await();
-        } catch (InterruptedException ex) {}
+        } catch (InterruptedException ex) {
+            fail(ex);
+        }
     }
 
     public TestBase() {
diff --git a/tests/system/src/test/java/test/com/sun/glass/ui/monocle/LensUInput.java b/tests/system/src/test/java/test/com/sun/glass/ui/monocle/LensUInput.java
index 23ae8f38520..449da791220 100644
--- a/tests/system/src/test/java/test/com/sun/glass/ui/monocle/LensUInput.java
+++ b/tests/system/src/test/java/test/com/sun/glass/ui/monocle/LensUInput.java
@@ -25,6 +25,8 @@
 
 package test.com.sun.glass.ui.monocle;
 
+import static org.junit.jupiter.api.Assertions.fail;
+
 import com.sun.glass.ui.monocle.LinuxInputShim;
 import com.sun.glass.ui.monocle.LinuxSystemShim;
 import javafx.animation.AnimationTimer;
@@ -232,7 +234,9 @@ private long openPipe(String path) throws IOException {
                 if (LinuxSystemShim.errno() == LinuxSystemShim.ENXIO) { // no reader on pipe
                     try {
                         Thread.sleep(100l);
-                    } catch (InterruptedException e) { }
+                    } catch (InterruptedException e) {
+                        fail(e);
+                    }
                 } else {
                     break;
                 }
@@ -266,7 +270,7 @@ public void write(ByteBuffer buffer) throws IOException {
                     try {
                         Thread.sleep(1);
                     } catch (InterruptedException e) {
-                        e.printStackTrace();
+                        fail(e);
                     }
                 } else {
                     throw new IOException(LinuxSystemShim.getErrorMessage());
diff --git a/tests/system/src/test/java/test/com/sun/javafx/application/StaticStartupTest.java b/tests/system/src/test/java/test/com/sun/javafx/application/StaticStartupTest.java
index 773c5a35b3f..bd8fdd25cda 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/application/StaticStartupTest.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/application/StaticStartupTest.java
@@ -42,7 +42,9 @@ public void testStartupFromClinit() throws Exception {
         Thread thr = new Thread(() -> {
             try {
                 Thread.sleep(20000);
-            } catch (InterruptedException ex) {}
+            } catch (InterruptedException ex) {
+                // OK to not rethrow; the exit 1 signals an error
+            }
             System.err.println("Test timeout exceeded -- calling System.exit");
             System.exit(1);
         });
diff --git a/tests/system/src/test/java/test/com/sun/javafx/image/impl/ImageRaceTest.java b/tests/system/src/test/java/test/com/sun/javafx/image/impl/ImageRaceTest.java
index f7fe3fa4fcf..38a1484a1f7 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/image/impl/ImageRaceTest.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/image/impl/ImageRaceTest.java
@@ -69,7 +69,9 @@ public void run() {
             while (!ready) {
                 try {
                     sleep(1);
-                } catch (InterruptedException ex) {}
+                } catch (InterruptedException ex) {
+                    fail(ex);
+                }
             }
             init.get();
             if (verbose) System.err.println(getName()+" done");
@@ -83,7 +85,9 @@ void forkAndJoinInitializers() {
             while (!i.isRunning() && System.currentTimeMillis() < limit) {
                 try {
                     Thread.sleep(1);
-                } catch (InterruptedException ex) {}
+                } catch (InterruptedException ex) {
+                    fail(ex);
+                }
             }
             if (!i.isRunning()) {
                 throw new RuntimeException("Initializer "+i+" never started");
@@ -93,7 +97,9 @@ void forkAndJoinInitializers() {
         if (verbose) System.err.println("\n[main] signal the threads to proceed\n");
         try {
             Thread.sleep(100);
-        } catch (InterruptedException ex) {}
+        } catch (InterruptedException ex) {
+            fail(ex);
+        }
         ready = true;
 
         limit = System.currentTimeMillis() + TIMEOUT;
diff --git a/tests/system/src/test/java/test/com/sun/javafx/sg/prism/RT36296Test.java b/tests/system/src/test/java/test/com/sun/javafx/sg/prism/RT36296Test.java
index 3f935469599..1caf6278e4e 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/sg/prism/RT36296Test.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/sg/prism/RT36296Test.java
@@ -25,6 +25,7 @@
 package test.com.sun.javafx.sg.prism;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
@@ -93,6 +94,7 @@ public void TestBug() {
             latch.await();
         } catch (InterruptedException ex) {
             Logger.getLogger(RT36296Test.class.getName()).log(Level.SEVERE, null, ex);
+            fail(ex);
         }
     }
 
diff --git a/tests/system/src/test/java/test/com/sun/javafx/tk/quantum/SystemMenuBarTest.java b/tests/system/src/test/java/test/com/sun/javafx/tk/quantum/SystemMenuBarTest.java
index 033c5a46bfe..12e6668534b 100644
--- a/tests/system/src/test/java/test/com/sun/javafx/tk/quantum/SystemMenuBarTest.java
+++ b/tests/system/src/test/java/test/com/sun/javafx/tk/quantum/SystemMenuBarTest.java
@@ -159,7 +159,7 @@ private void createMenuBarWithItemsStage() {
                     try {
                         Thread.sleep(20);
                     } catch (Exception e) {
-                        e.printStackTrace();
+                        fail(e);
                     }
                     Platform.runLater(() -> {
                         menu.getItems().clear();
diff --git a/tests/system/src/test/java/test/com/sun/marlin/QPathTest.java b/tests/system/src/test/java/test/com/sun/marlin/QPathTest.java
index 2538086c925..9e8059881bb 100644
--- a/tests/system/src/test/java/test/com/sun/marlin/QPathTest.java
+++ b/tests/system/src/test/java/test/com/sun/marlin/QPathTest.java
@@ -27,6 +27,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.fail;
 import java.util.Locale;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -200,6 +201,7 @@ public void TestBug() {
             latch.await();
         } catch (InterruptedException ie) {
             Logger.getLogger(QPathTest.class.getName()).log(Level.SEVERE, "interrupted", ie);
+            fail(ie);
         }
         assertFalse(doChecksFailed, "DoChecks detected a problem.");
     }
diff --git a/tests/system/src/test/java/test/com/sun/marlin/ScaleX0Test.java b/tests/system/src/test/java/test/com/sun/marlin/ScaleX0Test.java
index f8b7ee2cd69..e599d7068df 100644
--- a/tests/system/src/test/java/test/com/sun/marlin/ScaleX0Test.java
+++ b/tests/system/src/test/java/test/com/sun/marlin/ScaleX0Test.java
@@ -113,6 +113,7 @@ public void testMarlinAIOOBEwhenScaleXIs0() {
             Thread.sleep(500L);
         } catch (InterruptedException ie) {
             Logger.getLogger(ScaleX0Test.class.getName()).log(Level.SEVERE, "interrupted", ie);
+            fail(ie);
         }
 
         // Restore stderr:
diff --git a/tests/system/src/test/java/test/javafx/embed/swing/JFXPanelEmbeddedWindowTest.java b/tests/system/src/test/java/test/javafx/embed/swing/JFXPanelEmbeddedWindowTest.java
index 4a015f11b6a..4086d86b98f 100644
--- a/tests/system/src/test/java/test/javafx/embed/swing/JFXPanelEmbeddedWindowTest.java
+++ b/tests/system/src/test/java/test/javafx/embed/swing/JFXPanelEmbeddedWindowTest.java
@@ -24,6 +24,7 @@
  */
 package test.javafx.embed.swing;
 
+import static org.junit.jupiter.api.Assertions.fail;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import javax.swing.JFrame;
@@ -80,7 +81,7 @@ public void testShowThenRemove() throws Throwable {
             try {
                 innerLatch.await(5, TimeUnit.SECONDS);
             } catch (InterruptedException e) {
-                e.printStackTrace();
+                fail(e);
             }
             SwingUtilities.invokeLater(() -> outerLatch.countDown());
         });
diff --git a/tests/system/src/test/java/test/javafx/embed/swing/SwingNodeContentMemoryLeakTest.java b/tests/system/src/test/java/test/javafx/embed/swing/SwingNodeContentMemoryLeakTest.java
index 6c31a8b4ea4..ec8fd8e362f 100644
--- a/tests/system/src/test/java/test/javafx/embed/swing/SwingNodeContentMemoryLeakTest.java
+++ b/tests/system/src/test/java/test/javafx/embed/swing/SwingNodeContentMemoryLeakTest.java
@@ -26,6 +26,7 @@
 package test.javafx.embed.swing;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.fail;
 import java.lang.ref.WeakReference;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Collection;
@@ -85,7 +86,7 @@ public void testSwingNodeContentMemoryLeak() throws InterruptedException,
                 try {
                     Thread.sleep(100);
                 } catch (InterruptedException e) {
-                    e.printStackTrace();
+                    fail(e);
                 }
 
                 SwingUtilities.invokeLater(() -> {
diff --git a/tests/system/src/test/java/test/javafx/scene/text/ArabicWrappingTest.java b/tests/system/src/test/java/test/javafx/scene/text/ArabicWrappingTest.java
index 85ec4024ee8..6a0de251a12 100644
--- a/tests/system/src/test/java/test/javafx/scene/text/ArabicWrappingTest.java
+++ b/tests/system/src/test/java/test/javafx/scene/text/ArabicWrappingTest.java
@@ -26,6 +26,7 @@
 package test.javafx.scene.text;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 import java.io.OutputStream;
 import java.io.PrintStream;
 import java.util.Timer;
@@ -108,6 +109,7 @@ public void testWrapping() {
            try {
                Thread.sleep(2000);
            } catch (Exception e) {
+               fail(e);
            }
        }
 
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/MonocleUInput.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/MonocleUInput.java
index f0256f4e5c6..45b2f6ddcf3 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/MonocleUInput.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/MonocleUInput.java
@@ -25,6 +25,7 @@
 
 package test.robot.com.sun.glass.ui.monocle;
 
+import static org.junit.jupiter.api.Assertions.fail;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.Pipe;
@@ -97,7 +98,7 @@ protected void destroyDevice() {
                 try {
                     latch.await();
                 } catch (InterruptedException e) {
-                    e.printStackTrace();
+                    fail(e);
                 }
             }
             device = null;
diff --git a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TestApplication.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TestApplication.java
index 567e5c85c58..c8661da2394 100644
--- a/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TestApplication.java
+++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TestApplication.java
@@ -25,6 +25,7 @@
 
 package test.robot.com.sun.glass.ui.monocle;
 
+import static org.junit.jupiter.api.Assertions.fail;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Semaphore;
@@ -404,7 +405,7 @@ private static void fetchScreenBounds() {
             try {
                 latch.await();
             } catch (InterruptedException e) {
-                e.printStackTrace();
+                fail(e);
             }
         }
     }
diff --git a/tests/system/src/test/java/test/robot/javafx/embed/swing/JFXPanelTest.java b/tests/system/src/test/java/test/robot/javafx/embed/swing/JFXPanelTest.java
index 753457070c8..f6b643e3e94 100644
--- a/tests/system/src/test/java/test/robot/javafx/embed/swing/JFXPanelTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/embed/swing/JFXPanelTest.java
@@ -24,6 +24,7 @@
  */
 package test.robot.javafx.embed.swing;
 
+import static org.junit.jupiter.api.Assertions.fail;
 import java.awt.Robot;
 import java.awt.event.InputEvent;
 import java.util.concurrent.CountDownLatch;
@@ -73,7 +74,7 @@ public void testJFXPanelNew() throws Exception {
             try {
                 beginLatch.await();
             } catch (Exception e) {
-                e.printStackTrace();
+                fail(e);
             }
             while (!stop) {
                 robot.mouseMove(300, 10);
diff --git a/tests/system/src/test/java/test/robot/javafx/embed/swing/RT23603Test.java b/tests/system/src/test/java/test/robot/javafx/embed/swing/RT23603Test.java
index 25e6a9f5244..99042798751 100644
--- a/tests/system/src/test/java/test/robot/javafx/embed/swing/RT23603Test.java
+++ b/tests/system/src/test/java/test/robot/javafx/embed/swing/RT23603Test.java
@@ -25,6 +25,7 @@
 
 package test.robot.javafx.embed.swing;
 
+import static org.junit.jupiter.api.Assertions.fail;
 import java.awt.AWTException;
 import java.awt.Color;
 import java.awt.Dimension;
@@ -97,6 +98,7 @@ private void waitForLatch(CountDownLatch latch, long ms) {
         try {
             latch.await(ms, TimeUnit.MILLISECONDS);
         } catch (InterruptedException e) {
+            fail(e);
         }
         if (latch.getCount() > 0) {
             Assertions.fail("unexpected error: waiting timeout " + ms + "ms elapsed for " + latch);
diff --git a/tests/system/src/test/java/test/robot/javafx/embed/swing/RT32570Test.java b/tests/system/src/test/java/test/robot/javafx/embed/swing/RT32570Test.java
index da4825a4612..11b15122ece 100644
--- a/tests/system/src/test/java/test/robot/javafx/embed/swing/RT32570Test.java
+++ b/tests/system/src/test/java/test/robot/javafx/embed/swing/RT32570Test.java
@@ -25,6 +25,7 @@
 
 package test.robot.javafx.embed.swing;
 
+import static org.junit.jupiter.api.Assertions.fail;
 import java.awt.Dimension;
 import java.util.concurrent.TimeUnit;
 import javax.swing.JLabel;
@@ -103,7 +104,11 @@ public void test() throws Exception {
                 Color color = getColor(testScene, WIDTH / 2, HEIGHT / 2);
                 popped = !testColorEquals(Color.GREEN, color, TOLERANCE);
             });
-            try { Thread.sleep(100); } catch(Exception e) {}
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException e) {
+                fail(e);
+            }
         }
 
         // Verify the popup content is painted:
diff --git a/tests/system/src/test/java/test/robot/javafx/scene/control/behavior/BehaviorRobotTestBase.java b/tests/system/src/test/java/test/robot/javafx/scene/control/behavior/BehaviorRobotTestBase.java
index 334c5385895..2976bbd5b5a 100644
--- a/tests/system/src/test/java/test/robot/javafx/scene/control/behavior/BehaviorRobotTestBase.java
+++ b/tests/system/src/test/java/test/robot/javafx/scene/control/behavior/BehaviorRobotTestBase.java
@@ -319,18 +319,6 @@ protected Runnable shift(KeyCode k) {
         return key(k, KeyModifier.SHIFT);
     }
 
-    /**
-     * Convenience alias for Thread.sleep() that does not throw an exception.
-     * @param ms the timout in milliseconds
-     */
-    protected void sleep(int ms) {
-        try {
-            Thread.sleep(1);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-    }
-
     /**
      * Adds a logging event filter to the control under test which prints all KeyEvent's to stdout,
      * for the duration of a single test case.
diff --git a/tests/system/src/test/java/test/sandbox/app/Util.java b/tests/system/src/test/java/test/sandbox/app/Util.java
index 1aefd690c4b..cb9bca59b0f 100644
--- a/tests/system/src/test/java/test/sandbox/app/Util.java
+++ b/tests/system/src/test/java/test/sandbox/app/Util.java
@@ -92,6 +92,7 @@ public static void setupTimeoutThread() {
             try {
                 Thread.sleep(TIMEOUT);
             } catch (InterruptedException ex) {
+                System.exit(ERROR_UNEXPECTED_EXCEPTION);
             }
             System.exit(ERROR_TIMEOUT);
         });
diff --git a/tests/system/src/test/java/test/util/Util.java b/tests/system/src/test/java/test/util/Util.java
index 27b9ff951af..f06929af684 100644
--- a/tests/system/src/test/java/test/util/Util.java
+++ b/tests/system/src/test/java/test/util/Util.java
@@ -80,7 +80,9 @@ public static void throwError(Throwable testError) {
     public static void sleep(long msec) {
         try {
             Thread.sleep(msec);
-        } catch (InterruptedException ex) {}
+        } catch (InterruptedException ex) {
+            fail(ex);
+        }
     }
 
     public static boolean await(final CountDownLatch latch) {

From 0dd0c794c3b08f816e7618026d5c90deaf952046 Mon Sep 17 00:00:00 2001
From: Kevin Rushforth <kcr@openjdk.org>
Date: Thu, 26 Sep 2024 13:33:16 +0000
Subject: [PATCH 52/75] 8340954: Add SECURITY.md file

Reviewed-by: angorya, mhanl
---
 SECURITY.md | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 SECURITY.md

diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 00000000000..bb344c7d669
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,3 @@
+# JavaFX Vulnerabilities
+
+Please follow the process outlined in the [OpenJDK Vulnerability Policy](https://openjdk.org/groups/vulnerability/report) to disclose vulnerabilities in JavaFX.

From ecab6b6b0eab288eff1e13173a79a2fa4f4aca80 Mon Sep 17 00:00:00 2001
From: Martin Fox <mfox@openjdk.org>
Date: Thu, 26 Sep 2024 19:52:05 +0000
Subject: [PATCH 53/75] 8340980: Cannot build on Windows ARM

Reviewed-by: sykora, kcr
---
 buildSrc/genVSproperties.bat | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/genVSproperties.bat b/buildSrc/genVSproperties.bat
index 161350e069b..77b77ac9980 100644
--- a/buildSrc/genVSproperties.bat
+++ b/buildSrc/genVSproperties.bat
@@ -23,7 +23,7 @@ REM questions.
 
 setlocal ENABLEDELAYEDEXPANSION
 
-REM Windows bat file that runs vcvars64.bat for Visual Studio
+REM Windows bat file that runs vcvarsall.bat for Visual Studio
 REM and echoes out a property file with the values of the environment
 REM variables we want, e.g. PATH, INCLUDE, LIB, and LIBPATH.
 
@@ -68,7 +68,7 @@ if not "%VSCOMNTOOLS%"=="" (
 if "%VSTOOLSDIR%"=="" exit
 if not exist "%VSTOOLSDIR%" exit
 
-call "%VSTOOLSDIR%\vcvars64.bat" > NUL
+call "%VSTOOLSDIR%\vcvarsall.bat" %VCARCH% > NUL
 
 REM Set legacy MSVCDIR variable in case some Makefiles still need it
 if "%MSVCDIR%"=="" set MSVCDIR=%VCINSTALLDIR%

From 7870a226a21826e3979e314c0218d351b3cfb82f Mon Sep 17 00:00:00 2001
From: Ambarish Rapte <arapte@openjdk.org>
Date: Fri, 27 Sep 2024 05:47:02 +0000
Subject: [PATCH 54/75] 8297072: Provide gradle option to test a previously
 built SDK

Reviewed-by: kcr, lkostyra
---
 build.gradle | 81 +++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 71 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8f8e76f2202..c144e494c13 100644
--- a/build.gradle
+++ b/build.gradle
@@ -734,6 +734,24 @@ def buildSdkForTest = Boolean.parseBoolean(BUILD_SDK_FOR_TEST)
 defineProperty("TEST_ONLY", "false")
 ext.IS_TEST_ONLY = Boolean.parseBoolean(TEST_ONLY) || !buildSdkForTest
 
+ext.IS_TEST_SDK = false
+if (hasProperty("TEST_SDK_PATH")) {
+    if (!IS_TEST_ONLY) {
+        fail("TEST_ONLY must be set to true when using an external TEST_SDK_PATH for running tests: include -PTEST_ONLY=true")
+    }
+    def sdkShimsPath = file("${TEST_SDK_PATH}")
+    def sdkPath = file("${TEST_SDK_PATH}/sdk")
+    def shimsPath = file("${TEST_SDK_PATH}/shims")
+    if (!sdkShimsPath.exists() || !sdkShimsPath.isDirectory() ||
+             !sdkPath.exists() || !sdkPath.isDirectory() ||
+           !shimsPath.exists() || !shimsPath.isDirectory()) {
+        fail("The provided TEST_SDK_PATH=${TEST_SDK_PATH} is invalid")
+    }
+    ext.IS_TEST_SDK = true
+} else {
+    defineProperty("TEST_SDK_PATH", "${rootProject.buildDir}")
+}
+
 // Make sure JDK_HOME/bin/java exists
 if (!file(JAVA).exists()) throw new Exception("Missing or incorrect path to 'java': '$JAVA'. Perhaps bad JDK_HOME? $JDK_HOME")
 if (!file(JAVAC).exists()) throw new Exception("Missing or incorrect path to 'javac': '$JAVAC'. Perhaps bad JDK_HOME? $JDK_HOME")
@@ -987,7 +1005,7 @@ List<String> computeLibraryPath(boolean working) {
     } else {
         def platformPrefix = ""
         def standaloneSdkDirName = "${platformPrefix}sdk"
-        def standaloneSdkDir = "${rootProject.buildDir}/${standaloneSdkDirName}"
+        def standaloneSdkDir = "${TEST_SDK_PATH}/${standaloneSdkDirName}"
         def modulesLibName = IS_WINDOWS ? "bin" : "lib"
         def modulesLibsDir = "${standaloneSdkDir}/${modulesLibName}"
         lp << cygpath("${modulesLibsDir}")
@@ -1024,9 +1042,9 @@ List<String> computePatchModuleArgs(List<String> deps, boolean test, boolean inc
                 String moduleName = proj.ext.moduleName
                 File dir;
                 if (test && proj.sourceSets.hasProperty('shims')) {
-                    dir = file("${rootProject.buildDir}/shims/${moduleName}")
+                    dir = file("${TEST_SDK_PATH}/shims/${moduleName}")
                 } else {
-                    dir = file("${rootProject.buildDir}/sdk/lib/${moduleName}.jar")
+                    dir = file("${TEST_SDK_PATH}/sdk/lib/${moduleName}.jar")
                 }
                 if (mp == null) {
                     mp = dir.path
@@ -1988,6 +2006,9 @@ task createTestArgfiles {
     // an empty task we can add to as needed
 }
 
+task createRunArgFiles {
+    // an empty task we can add to as needed
+}
 
 /*****************************************************************************
 *        Project definitions (dependencies, etc)                             *
@@ -2290,6 +2311,13 @@ project(":base") {
     addMavenPublication(project, [])
 
     addValidateSourceSets(project, sourceSets)
+
+    test {
+        if (IS_TEST_SDK) {
+            logger.info "Skipping VersionInfoTest when TEST_SDK_PATH is set."
+            exclude("test/com/sun/javafx/runtime/VersionInfoTest*");
+        }
+    }
 }
 
 // The graphics module is needed for any graphical JavaFX application. It requires
@@ -2701,7 +2729,7 @@ project(":graphics") {
     processResources.dependsOn processDecoraShaders, processPrismShaders
 
     test {
-        def cssDir = file("$buildDir/classes/java/main/${moduleName}/javafx")
+        def cssDir = file("${TEST_SDK_PATH}/shims/${moduleName}/javafx")
         jvmArgs enableNativeGraphics
         jvmArgs "-Djavafx.toolkit=test.com.sun.javafx.pgstub.StubToolkit",
             "-DCSS_META_DATA_TEST_DIR=$cssDir"
@@ -2790,7 +2818,7 @@ project(":controls") {
     }
 
     test {
-        def cssDir = file("$buildDir/classes/java/main/${moduleName}/javafx")
+        def cssDir = file("${TEST_SDK_PATH}/shims/${moduleName}/javafx")
         jvmArgs enableNativeGraphics
         jvmArgs "-Djavafx.toolkit=test.com.sun.javafx.pgstub.StubToolkit",
             "-DCSS_META_DATA_TEST_DIR=$cssDir"
@@ -2941,6 +2969,10 @@ project(":swt") {
             "--add-exports=javafx.graphics/com.sun.javafx.tk=ALL-UNNAMED",
             ])
 
+    compileTestJava {
+        if (IS_TEST_SDK) enabled = false
+    }
+
     test {
         //enabled = IS_FULL_TEST && IS_SWT_TEST
         enabled = false // FIXME: JIGSAW -- support this with modules
@@ -4498,7 +4530,7 @@ task sdk() {
         gradle.taskGraph.whenReady { taskGraph ->
             taskGraph.allTasks.each { task ->
                 if (!isTestTask(task) && !task.name.equals("verifyJava") &&
-                    !task.name.equals("validateSourceSets")) {
+                    !task.name.equals("validateSourceSets") && !task.name.contains("buildRunArgs")) {
                     task.enabled = false
                 }
             }
@@ -5062,7 +5094,7 @@ compileTargets { t ->
     // ============================================================
 
     def standaloneSdkDirName = "${platformPrefix}sdk"
-    def standaloneSdkDir = "${rootProject.buildDir}/${standaloneSdkDirName}"
+    def standaloneSdkDir = "${TEST_SDK_PATH}/${standaloneSdkDirName}"
     def standaloneLibDir = "${standaloneSdkDir}/lib"
     def libDest=targetProperties.libDest
     def standaloneNativeDir = "${standaloneSdkDir}/${libDest}"
@@ -5220,6 +5252,7 @@ compileTargets { t ->
             }
         }
     }
+    createRunArgFiles.dependsOn(buildRunArgsTask)
     buildModules.dependsOn(buildRunArgsTask)
 
     def isWindows = IS_WINDOWS && t.name == "win";
@@ -5657,6 +5690,34 @@ compileTargets { t ->
     }
     jdkZip.dependsOn(zipTask)
 
+    def buildSdkDir = "${rootProject.buildDir}/sdk"
+    def buildShimsDir = "${rootProject.buildDir}/shims"
+    def sdkShimZipTask = project.task("sdkShimsZip$t.capital", type: Zip, group: "Build",
+            dependsOn: [shims] ) {
+
+        def sdkShimsBundle = "${platformPrefix}javafx-sdk-shims.zip"
+
+        doFirst() {
+            file("${rootProject.buildDir}/${sdkShimsBundle}").delete()
+        }
+
+        if (IS_WINDOWS && IS_USE_CYGWIN) {
+            dirPermissions { unix(0755) }
+            filePermissions { unix(0755) }
+        }
+
+        archiveFileName = sdkShimsBundle
+        destinationDirectory = file("${rootProject.buildDir}")
+        includeEmptyDirs = false
+        from ("${buildSdkDir}") {
+            into "sdk"
+        }
+        from ("${buildShimsDir}") {
+            into "shims"
+        }
+    }
+    jdkZip.dependsOn(sdkShimZipTask)
+
     Task testArgFiles = task("createTestArgfiles${t.capital}") {
 
         File testRunArgsFile = new File(rootProject.buildDir, TESTRUNARGSFILE)
@@ -5731,9 +5792,9 @@ compileTargets { t ->
                         modnames << project.ext.moduleName
                         File dir;
                         if (project.sourceSets.hasProperty('shims')) {
-                           dir = new File(rootProject.buildDir, "shims/${project.ext.moduleName}")
+                           dir = new File(TEST_SDK_PATH, "shims/${project.ext.moduleName}")
                         } else {
-                           dir = new File(rootProject.buildDir, "sdk/lib/${project.ext.moduleName}.jar")
+                           dir = new File(TEST_SDK_PATH, "sdk/lib/${project.ext.moduleName}.jar")
                         }
 
                         def dstModuleDir = cygpath(dir.path)
@@ -5744,7 +5805,7 @@ compileTargets { t ->
                         "    permission java.security.AllPermission;\n" +
                         "};\n"
 
-                        dir = new File(rootProject.buildDir, "sdk/lib/${project.ext.moduleName}.jar")
+                        dir = new File(TEST_SDK_PATH, "sdk/lib/${project.ext.moduleName}.jar")
                         themod = dir.toURI()
                         runJavaPolicyFile <<  "grant codeBase \"${themod}\" {\n" +
                         "    permission java.security.AllPermission;\n" +

From 5428f267887ea4098f6c2a87335de7ed9bf5c656 Mon Sep 17 00:00:00 2001
From: Martin Fox <mfox@openjdk.org>
Date: Sat, 28 Sep 2024 13:00:13 +0000
Subject: [PATCH 55/75] 8340982: [win] Dead key followed by Space generates two
 characters instead of one

Reviewed-by: angorya, jhendrikx
---
 .../src/main/native-glass/win/ViewContainer.cpp       | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/modules/javafx.graphics/src/main/native-glass/win/ViewContainer.cpp b/modules/javafx.graphics/src/main/native-glass/win/ViewContainer.cpp
index 2805cb57730..a20eb9e34b4 100644
--- a/modules/javafx.graphics/src/main/native-glass/win/ViewContainer.cpp
+++ b/modules/javafx.graphics/src/main/native-glass/win/ViewContainer.cpp
@@ -669,9 +669,14 @@ void ViewContainer::HandleViewTypedEvent(HWND hwnd, UINT msg, WPARAM wParam, LPA
             wChar = (jchar)out[0];
 
             if (res == 3) {
-                // The character cannot be accented, so we send a TYPED event
-                // for the dead key itself first.
-                SendViewTypedEvent(1, (jchar)m_deadKeyWParam);
+                // The character cannot be accented. If it's a Space
+                // we send out the dead key only. Otherwise we send
+                // out the dead key followed by the character.
+                if (wChar == 0x20) {
+                    wChar = m_deadKeyWParam;
+                } else {
+                    SendViewTypedEvent(1, (jchar)m_deadKeyWParam);
+                }
             }
         } else {
             // Folding failed. Use the untranslated original character then

From 01e9e7eadb21aabc801d4764ed5bd5e3de8d451b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Strau=C3=9F?= <mstrauss@openjdk.org>
Date: Tue, 1 Oct 2024 19:31:14 +0000
Subject: [PATCH 56/75] 8332895: Support interpolation for backgrounds and
 borders 8226911: Interpolatable's contract should be reexamined

Reviewed-by: angorya, jhendrikx, nlisker, kcr
---
 build.gradle                                  |   1 +
 .../com/sun/javafx/UnmodifiableArrayList.java |  64 ++-
 modules/javafx.base/src/test/addExports       |   1 +
 .../sun/javafx/UnmodifiableArrayListTest.java |  80 +++
 .../test/java/test/util/ReflectionUtils.java  |  64 +++
 modules/javafx.graphics/.classpath            |   2 +-
 .../sun/javafx/css/SubPropertyConverter.java  |  59 ++
 .../sun/javafx/css/TransitionMediator.java    |  48 +-
 .../com/sun/javafx/css/TransitionTimer.java   | 141 +++--
 .../java/com/sun/javafx/scene/NodeHelper.java |  26 +-
 .../layout/region/BorderImageSlices.java      |  38 +-
 .../javafx/scene/layout/region/Margins.java   |  53 +-
 .../sun/javafx/util/InterpolationUtils.java   | 412 ++++++++++++++
 .../java/javafx/animation/AnimationTimer.java |  10 -
 .../java/javafx/animation/Interpolatable.java |  65 ++-
 .../javafx/css/StyleableBooleanProperty.java  |  65 ++-
 .../javafx/css/StyleableDoubleProperty.java   |  66 ++-
 .../javafx/css/StyleableFloatProperty.java    |  66 ++-
 .../javafx/css/StyleableIntegerProperty.java  |  67 ++-
 .../javafx/css/StyleableLongProperty.java     |  69 ++-
 .../javafx/css/StyleableObjectProperty.java   | 507 ++++++++++++++++--
 .../javafx/css/StyleableStringProperty.java   |  83 ++-
 .../main/java/javafx/css/TransitionEvent.java |  41 ++
 .../src/main/java/javafx/geometry/Insets.java |  48 +-
 .../main/java/javafx/geometry/Point2D.java    |  10 +-
 .../main/java/javafx/geometry/Point3D.java    |  12 +-
 .../src/main/java/javafx/scene/Node.java      | 235 ++++++--
 .../java/javafx/scene/layout/Background.java  | 147 +++--
 .../scene/layout/BackgroundConverter.java     |  83 ++-
 .../javafx/scene/layout/BackgroundFill.java   |  58 +-
 .../javafx/scene/layout/BackgroundImage.java  |  82 ++-
 .../scene/layout/BackgroundPosition.java      | 107 +++-
 .../javafx/scene/layout/BackgroundSize.java   |  95 +++-
 .../main/java/javafx/scene/layout/Border.java | 206 ++++---
 .../javafx/scene/layout/BorderConverter.java  | 138 ++++-
 .../java/javafx/scene/layout/BorderImage.java |  88 ++-
 .../javafx/scene/layout/BorderStroke.java     |  99 +++-
 .../javafx/scene/layout/BorderWidths.java     | 137 ++++-
 .../java/javafx/scene/layout/CornerRadii.java | 238 +++++++-
 .../main/java/javafx/scene/paint/Color.java   |  38 +-
 .../java/javafx/scene/paint/ImagePattern.java |  95 +++-
 .../javafx/scene/paint/LinearGradient.java    | 140 ++++-
 .../main/java/javafx/scene/paint/Paint.java   |  16 +-
 .../javafx/scene/paint/RadialGradient.java    | 152 +++++-
 .../main/java/javafx/scene/paint/Stop.java    | 139 ++++-
 .../src/shims/java/javafx/scene/NodeShim.java |   3 +-
 .../javafx/scene/layout/BackgroundShim.java   |  14 +-
 .../java/javafx/scene/layout/BorderShim.java} |  29 +-
 .../java/javafx/scene/paint/StopShim.java     |  37 ++
 modules/javafx.graphics/src/test/addExports   |   1 +
 .../sun/javafx/css/TransitionTimerTest.java   |  44 +-
 .../layout/region/BorderImageSlicesTest.java  | 107 ++++
 .../scene/layout/region/MarginsTest.java      | 121 +++++
 .../javafx/util/InterpolationUtilsTest.java   | 225 ++++++++
 .../StyleableProperty_transition_Test.java    | 349 ++++++++++--
 .../java/test/javafx/geometry/InsetsTest.java |  41 +-
 .../javafx/scene/Node_transition_Test.java    |  10 +-
 .../scene/layout/BackgroundConverterTest.java | 102 ++++
 .../scene/layout/BackgroundFillTest.java      | 129 ++++-
 .../scene/layout/BackgroundImageTest.java     |  61 ++-
 .../scene/layout/BackgroundPositionTest.java  | 106 +++-
 .../scene/layout/BackgroundSizeTest.java      | 118 +++-
 .../javafx/scene/layout/BackgroundTest.java   |  98 +++-
 .../scene/layout/BorderConverterTest.java     | 107 ++++
 .../javafx/scene/layout/BorderImageTest.java  |  83 +++
 .../javafx/scene/layout/BorderStrokeTest.java |  43 ++
 .../test/javafx/scene/layout/BorderTest.java  |  82 ++-
 .../javafx/scene/layout/BorderWidthsTest.java | 105 +++-
 .../javafx/scene/layout/CornerRadiiTest.java  | 172 ++++++
 .../test/javafx/scene/paint/ColorTest.java    |  47 +-
 .../javafx/scene/paint/ImagePatternTest.java  |  57 +-
 .../scene/paint/LinearGradientTest.java       |  98 +++-
 .../scene/paint/RadialGradientTest.java       |  98 +++-
 .../test/javafx/scene/paint/StopListTest.java | 149 ++++-
 .../test/javafx/scene/paint/StopTest.java     |  52 +-
 tests/manual/graphics/CssTransitionsTest.java |  73 ++-
 76 files changed, 6316 insertions(+), 836 deletions(-)
 create mode 100644 modules/javafx.base/src/test/java/test/com/sun/javafx/UnmodifiableArrayListTest.java
 create mode 100644 modules/javafx.base/src/test/java/test/util/ReflectionUtils.java
 create mode 100644 modules/javafx.graphics/src/main/java/com/sun/javafx/css/SubPropertyConverter.java
 create mode 100644 modules/javafx.graphics/src/main/java/com/sun/javafx/util/InterpolationUtils.java
 rename modules/javafx.graphics/src/{main/java/com/sun/javafx/animation/AnimationTimerHelper.java => shims/java/javafx/scene/layout/BorderShim.java} (64%)
 create mode 100644 modules/javafx.graphics/src/shims/java/javafx/scene/paint/StopShim.java
 create mode 100644 modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/layout/region/BorderImageSlicesTest.java
 create mode 100644 modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/layout/region/MarginsTest.java
 create mode 100644 modules/javafx.graphics/src/test/java/test/com/sun/javafx/util/InterpolationUtilsTest.java
 create mode 100644 modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundConverterTest.java
 create mode 100644 modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderConverterTest.java
 create mode 100644 modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderImageTest.java

diff --git a/build.gradle b/build.gradle
index c144e494c13..3020d823788 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4448,6 +4448,7 @@ task javadoc(type: Javadoc, dependsOn: createMSPfile) {
     options.tags("apiNote:a:API Note:")
     options.tags("implSpec:a:Implementation Requirements:")
     options.tags("implNote:a:Implementation Note:")
+    options.tags("interpolationType:a:Interpolation Type:")
     options.tags("param")
     options.tags("return")
     options.tags("throws")
diff --git a/modules/javafx.base/src/main/java/com/sun/javafx/UnmodifiableArrayList.java b/modules/javafx.base/src/main/java/com/sun/javafx/UnmodifiableArrayList.java
index 07f144c6b70..6ddbbe9115b 100644
--- a/modules/javafx.base/src/main/java/com/sun/javafx/UnmodifiableArrayList.java
+++ b/modules/javafx.base/src/main/java/com/sun/javafx/UnmodifiableArrayList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
 package com.sun.javafx;
 
 import java.util.AbstractList;
+import java.util.List;
+import java.util.Objects;
 import java.util.RandomAccess;
 
 /**
@@ -60,4 +62,64 @@ public UnmodifiableArrayList(T[] elements, int size) {
     @Override public int size() {
         return size;
     }
+
+    /**
+     * Converts the specified list into an unmodifiable list that does not contain {@code null} values.
+     * The returned list is a copy of, and not a wrapper around the specified list.
+     *
+     * @param <T> the type of elements in the list
+     * @param list the list, not {@code null}
+     * @return an unmodifiable list that does not contain null values
+     */
+    public static <T> UnmodifiableArrayList<T> copyOfNullFiltered(List<T> list) {
+        Objects.requireNonNull(list, "list cannot be null");
+
+        int numNonNullValues = 0;
+
+        @SuppressWarnings("unchecked")
+        T[] newValues = (T[])new Object[list.size()];
+
+        if (list instanceof RandomAccess) {
+            // Prevents the iterator allocation for random-access lists.
+            for (int i = 0, max = list.size(); i < max; ++i) {
+                T value = list.get(i);
+                if (value != null) {
+                    newValues[numNonNullValues++] = value;
+                }
+            }
+        } else {
+            for (T value : list) {
+                if (value != null) {
+                    newValues[numNonNullValues++] = value;
+                }
+            }
+        }
+
+        return new UnmodifiableArrayList<>(newValues, numNonNullValues);
+    }
+
+    /**
+     * Converts the specified array into an unmodifiable list that does not contain {@code null} values.
+     * The returned list is a copy of, and not a wrapper around the specified array.
+     *
+     * @param <T> the type of elements in the array
+     * @param elements the array, not {@code null}
+     * @return an unmodifiable list that does not contain null values
+     */
+    public static <T> UnmodifiableArrayList<T> copyOfNullFiltered(T[] elements) {
+        Objects.requireNonNull(elements, "elements cannot be null");
+
+        int numNonNullValues = 0;
+
+        @SuppressWarnings("unchecked")
+        T[] newValues = (T[])new Object[elements.length];
+
+        for (int i = 0; i < elements.length; ++i) {
+            if (elements[i] != null) {
+                newValues[numNonNullValues++] = elements[i];
+            }
+        }
+
+        return new UnmodifiableArrayList<>(newValues, numNonNullValues);
+    }
 }
diff --git a/modules/javafx.base/src/test/addExports b/modules/javafx.base/src/test/addExports
index 10a99f00490..38ce524f45b 100644
--- a/modules/javafx.base/src/test/addExports
+++ b/modules/javafx.base/src/test/addExports
@@ -1,4 +1,5 @@
 #
+--add-exports javafx.base/com.sun.javafx=ALL-UNNAMED
 --add-exports javafx.base/com.sun.javafx.binding=ALL-UNNAMED
 --add-exports javafx.base/com.sun.javafx.collections=ALL-UNNAMED
 --add-exports javafx.base/com.sun.javafx.event=ALL-UNNAMED
diff --git a/modules/javafx.base/src/test/java/test/com/sun/javafx/UnmodifiableArrayListTest.java b/modules/javafx.base/src/test/java/test/com/sun/javafx/UnmodifiableArrayListTest.java
new file mode 100644
index 00000000000..57f24896f20
--- /dev/null
+++ b/modules/javafx.base/src/test/java/test/com/sun/javafx/UnmodifiableArrayListTest.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+
+package test.com.sun.javafx;
+
+import com.sun.javafx.UnmodifiableArrayList;
+import org.junit.jupiter.api.Test;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class UnmodifiableArrayListTest {
+
+    @Test
+    void testCopyOfNullFilteredList_nullList() {
+        assertThrows(NullPointerException.class, () -> UnmodifiableArrayList.copyOfNullFiltered((List<?>)null));
+    }
+
+    @Test
+    void testCopyOfNullFilteredList_nullArray() {
+        assertThrows(NullPointerException.class, () -> UnmodifiableArrayList.copyOfNullFiltered((Object[])null));
+    }
+
+    @Test
+    void testCopyOfNullFilteredList_randomAccess() {
+        var list = new ArrayList<String>();
+        list.add("a");
+        list.add(null);
+        list.add("b");
+        list.add(null);
+
+        assertEquals(List.of("a", "b"), UnmodifiableArrayList.copyOfNullFiltered(list));
+    }
+
+    @Test
+    void testCopyOfNullFilteredList_nonRandomAccess() {
+        var list = new LinkedList<String>();
+        list.add("a");
+        list.add(null);
+        list.add("b");
+        list.add(null);
+
+        assertEquals(List.of("a", "b"), UnmodifiableArrayList.copyOfNullFiltered(list));
+    }
+
+    @Test
+    void testCopyOfNullFilteredArray() {
+        var list = new String[4];
+        list[0] = "a";
+        list[1] = null;
+        list[2] = "b";
+        list[3] = null;
+
+        assertEquals(List.of("a", "b"), UnmodifiableArrayList.copyOfNullFiltered(list));
+    }
+}
diff --git a/modules/javafx.base/src/test/java/test/util/ReflectionUtils.java b/modules/javafx.base/src/test/java/test/util/ReflectionUtils.java
new file mode 100644
index 00000000000..0e4793c5983
--- /dev/null
+++ b/modules/javafx.base/src/test/java/test/util/ReflectionUtils.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+
+package test.util;
+
+import java.lang.reflect.Field;
+import java.util.function.Function;
+
+public final class ReflectionUtils {
+
+    /**
+     * Returns the value of a potentially private field of the specified object.
+     * The field can be declared on any of the object's inherited classes.
+     */
+    public static Object getFieldValue(Object object, String fieldName) {
+        Function<Class<?>, Field> getField = cls -> {
+            try {
+                var field = cls.getDeclaredField(fieldName);
+                field.setAccessible(true);
+                return field;
+            } catch (NoSuchFieldException e) {
+                return null;
+            }
+        };
+
+        Class<?> cls = object.getClass();
+        while (cls != null) {
+            Field field = getField.apply(cls);
+            if (field != null) {
+                try {
+                    return field.get(object);
+                } catch (IllegalAccessException e) {
+                    throw new AssertionError(e);
+                }
+            }
+
+            cls = cls.getSuperclass();
+        }
+
+        throw new AssertionError("Field not found: " + fieldName);
+    }
+}
diff --git a/modules/javafx.graphics/.classpath b/modules/javafx.graphics/.classpath
index 880339866a5..ddad9753af3 100644
--- a/modules/javafx.graphics/.classpath
+++ b/modules/javafx.graphics/.classpath
@@ -30,7 +30,7 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/base">
 		<attributes>
 			<attribute name="module" value="true"/>
-			<attribute name="add-exports" value="javafx.base/com.sun.javafx.property=javafx.graphics:javafx.base/test.javafx.collections=javafx.graphics:javafx.base/test.util.memory=javafx.graphics"/>
+			<attribute name="add-exports" value="javafx.base/com.sun.javafx.property=javafx.graphics:javafx.base/test.javafx.collections=javafx.graphics:javafx.base/test.util.memory=javafx.graphics:javafx.base/test.util=javafx.graphics"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5">
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/css/SubPropertyConverter.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/SubPropertyConverter.java
new file mode 100644
index 00000000000..6914be14919
--- /dev/null
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/SubPropertyConverter.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+
+package com.sun.javafx.css;
+
+import javafx.css.CssMetaData;
+import javafx.css.Styleable;
+import java.util.Map;
+
+/**
+ * Defines the {@code convert} and {@code convertBack} operations that enable object
+ * decomposition and reconstruction. Note that the following invariant must always be
+ * satisfied: {@code convert(convertBack(value)).equals(value)}
+ *
+ * @param <T> the target type
+ */
+public interface SubPropertyConverter<T> {
+
+    /**
+     * Converts a map of CSS values to the target type.
+     *
+     * @param values the constituent values
+     * @throws NullPointerException if {@code values} is {@code null}
+     * @return the converted object
+     */
+    T convert(Map<CssMetaData<? extends Styleable, ?>, Object> values);
+
+    /**
+     * Converts an object back to a map of its constituent values (deconstruction).
+     * The returned map can be passed into {@link #convert(Map)} to reconstruct the object.
+     *
+     * @param value the object
+     * @throws NullPointerException if {@code value} is {@code null}
+     * @return a {@code Map} of the constituent values
+     */
+    Map<CssMetaData<? extends Styleable, ?>, Object> convertBack(T value);
+}
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/css/TransitionMediator.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/TransitionMediator.java
index df0a4a92d2e..3f41288f74d 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/javafx/css/TransitionMediator.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/TransitionMediator.java
@@ -32,42 +32,33 @@
  */
 public abstract class TransitionMediator {
 
-    private TransitionTimer timer;
+    private TransitionTimer.CancellationToken cancellationToken;
 
     /**
      * Starts the transition timer with the specified transition definition.
      *
      * @param definition the transition definition
+     * @param targetPropertyName the name of the targeted CSS property
+     * @param nanoNow the current time in nanoseconds
      */
-    public final void run(TransitionDefinition definition) {
+    public final void run(TransitionDefinition definition, String targetPropertyName, long nanoNow) {
         // Might return 'null' if the transition duration is zero or the target node is not showing.
-        timer = TransitionTimer.run(this, definition);
+        cancellationToken = TransitionTimer.run(this, definition, targetPropertyName, nanoNow);
 
         // If no timer was started, we complete the transition immediately.
-        if (timer == null) {
+        if (cancellationToken == null) {
             onUpdate(1);
             onStop();
         }
     }
 
     /**
-     * Cancels the transition timer.
-     *
-     * @param forceStop if {@code true}, the transition timer is stopped unconditionally
-     * @return {@code true} if the timer was cancelled, {@code false} otherwise
-     * @see TransitionTimer#cancel(boolean)
-     */
-    public final boolean cancel(boolean forceStop) {
-        return timer == null || timer.cancel(forceStop);
-    }
-
-    /**
-     * Gets the running {@code TransitionTimer}.
-     *
-     * @return the {@code TransitionTimer}, or {@code null} if no timer is running
+     * Cancels the transition timer if it is currently running.
      */
-    public final TransitionTimer getTimer() {
-        return timer;
+    public final void cancel() {
+        if (cancellationToken != null) {
+            cancellationToken.cancel();
+        }
     }
 
     /**
@@ -90,4 +81,21 @@ public final TransitionTimer getTimer() {
      * Derived classes should implement this method to clear any references to this mediator.
      */
     public abstract void onStop();
+
+    /**
+     * Derived classes must implement the following protocol:
+     * <ol>
+     *     <li>If the reversing-adjusted start value of the existing transition is equal
+     *         to the end value of this transition:
+     *         Set the reversing-adjusted start value of this transition to the end value
+     *         of the existing transition and return {@code true}.
+     *     <li>Otherwise, return {@code false}.
+     * </ol>
+     * Refer to <a href="https://www.w3.org/TR/css-transitions-1/#starting">Starting of transitions</a>
+     * for more information about the reversing-adjusted start value.
+     *
+     * @param existingMediator the mediator of the existing transition
+     * @return {@code true} if the reversing-adjusted start value was updated, {@code false} otherwise
+     */
+    public abstract boolean updateReversingAdjustedStartValue(TransitionMediator existingMediator);
 }
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/css/TransitionTimer.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/TransitionTimer.java
index c0214288296..87f73a155e6 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/javafx/css/TransitionTimer.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/TransitionTimer.java
@@ -25,7 +25,6 @@
 
 package com.sun.javafx.css;
 
-import com.sun.javafx.animation.AnimationTimerHelper;
 import com.sun.javafx.animation.InterpolatorHelper;
 import com.sun.javafx.scene.NodeHelper;
 import com.sun.javafx.util.Utils;
@@ -44,24 +43,34 @@
  */
 public final class TransitionTimer extends AnimationTimer {
 
+    /**
+     * A token that can be used to cancel a running timer.
+     */
+    public interface CancellationToken {
+        void cancel();
+    }
+
     private final Node targetNode;
+    private final String targetPropertyName;
     private final Interpolator interpolator;
     private final TransitionMediator mediator;
     private double reversingShorteningFactor;
     private long startTime, endTime, delay, duration; // in nanoseconds
     private long currentTime; // in nanoseconds
-    private boolean updating;
     private boolean started;
 
-    private TransitionTimer(TransitionMediator mediator, TransitionDefinition definition) {
-        long now = AnimationTimerHelper.getPrimaryTimer(this).nanos();
+    private TransitionTimer(TransitionMediator mediator,
+                            TransitionDefinition definition,
+                            String targetPropertyName,
+                            long nanoNow) {
         this.delay = millisToNanos(definition.delay().toMillis());
         this.duration = millisToNanos(definition.duration().toMillis());
         this.targetNode = (Node)((Property<?>)mediator.getStyleableProperty()).getBean();
+        this.targetPropertyName = targetPropertyName;
         this.interpolator = definition.interpolator();
         this.mediator = mediator;
-        this.currentTime = now;
-        this.startTime = now + delay;
+        this.currentTime = nanoNow;
+        this.startTime = nanoNow + delay;
         this.endTime = startTime + duration;
         this.reversingShorteningFactor = 1;
     }
@@ -74,9 +83,14 @@ private TransitionTimer(TransitionMediator mediator, TransitionDefinition defini
      *
      * @param mediator the {@code TransitionMediator} for the targeted property
      * @param definition the {@code TransitionDefinition} used to initialize the {@code timer}
-     * @return the {@code timer} instance if the timer was started, {@code null} otherwise
+     * @param targetPropertyName the name of the CSS property targeted by the transition
+     * @param nanoNow the current time in nanoseconds
+     * @return a {@code CancellationToken} if the timer was started, {@code null} otherwise
      */
-    public static TransitionTimer run(TransitionMediator mediator, TransitionDefinition definition) {
+    public static CancellationToken run(TransitionMediator mediator,
+                                        TransitionDefinition definition,
+                                        String targetPropertyName,
+                                        long nanoNow) {
         // The transition timer is only started if the targeted node is showing, i.e. if it is part
         // of the scene graph and the node is visible.
         if (!(mediator.getStyleableProperty() instanceof Property<?> property)
@@ -89,56 +103,43 @@ public static TransitionTimer run(TransitionMediator mediator, TransitionDefinit
         long duration = millisToNanos(definition.duration().toMillis());
         long combinedDuration = Math.max(duration, 0) + delay;
 
-        var existingTimer = (TransitionTimer)NodeHelper.findTransitionTimer(node, property);
+        var existingTimer = NodeHelper.findTransitionTimer(node, targetPropertyName);
         if (existingTimer != null) {
-            // If we already have a timer for the styleable property, the new timer is a reversing
-            // timer that needs to be adjusted by the reversing shortening algorithm.
             if (combinedDuration > 0) {
-                var newTimer = new TransitionTimer(mediator, definition);
-                newTimer.adjustReversingTimings(existingTimer);
-                existingTimer.stop(TransitionEvent.CANCEL);
+                var newTimer = new TransitionTimer(mediator, definition, targetPropertyName, nanoNow);
+
+                // If we already have a timer for the styleable property, the new timer might be a reversing
+                // timer that needs to be adjusted by the reversing shortening algorithm.
+                if (mediator.updateReversingAdjustedStartValue(existingTimer.getMediator())) {
+                    newTimer.adjustReversingTimings(existingTimer);
+                }
+
+                existingTimer.interrupt();
                 newTimer.start();
-                return newTimer;
+                return newTimer::stop;
             }
 
-            existingTimer.stop(TransitionEvent.CANCEL);
+            existingTimer.stop();
             return null;
         }
 
         // We only need a timer if the combined duration is non-zero.
         if (combinedDuration > 0) {
-            var timer = new TransitionTimer(mediator, definition);
+            var timer = new TransitionTimer(mediator, definition, targetPropertyName, nanoNow);
             timer.start();
-            return timer;
+            return timer::stop;
         }
 
         return null;
     }
 
     /**
-     * Cancels this timer if it is currently running. If {@code forceStop} is {@code false}, the timer
-     * will only be stopped if this method was not called from the timer's {@link #update(double)} method;
-     * i.e. a timer will not stop itself while trying to set the new value of a styleable property.
-     *
-     * @param forceStop if {@code true}, the timer is stopped unconditionally
-     * @return {@code true} if the timer was cancelled, {@code false} otherwise
-     */
-    public boolean cancel(boolean forceStop) {
-        if (forceStop || !pollUpdating()) {
-            stop(TransitionEvent.CANCEL);
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns the property targeted by this timer.
+     * Returns the {@code TransitionMediator} associated with this timer.
      *
-     * @return the property
+     * @return the {@code TransitionMediator}
      */
-    public Property<?> getTargetProperty() {
-        return (Property<?>)mediator.getStyleableProperty();
+    public TransitionMediator getMediator() {
+        return mediator;
     }
 
     /**
@@ -166,7 +167,7 @@ public void handle(long now) {
             }
 
             if (progress == 1) {
-                stop(TransitionEvent.END);
+                stopTimer(TransitionEvent.END);
             }
         }
     }
@@ -177,39 +178,49 @@ public void handle(long now) {
     @Override
     public void start() {
         super.start();
-        NodeHelper.addTransitionTimer(targetNode, this);
+        NodeHelper.addTransitionTimer(targetNode, targetPropertyName, this);
         fireTransitionEvent(TransitionEvent.RUN);
     }
 
     /**
-     * This method is unused, calling it will throw {@link UnsupportedOperationException}.
+     * Stops this timer without updating the property to the target value.
+     * This happens when the value of the styleable property is changed by the user, or when a
+     * running timer is cancelled by a transition with zero duration.
      */
     @Override
     public void stop() {
-        throw new UnsupportedOperationException();
+        stopTimer(TransitionEvent.CANCEL);
     }
 
     /**
-     * Stops the running transition and fires the specified event.
-     * This happens when the value of a CSS property targeted by a transition is changed by the user,
-     * when the transition is interrupted by another transition, or when it ends normally.
-     *
-     * @param eventType the event type that is fired after the timer is stopped
+     * Skips the rest of a running transition and updates the property to the target value.
+     * This happens when the targeted node is removed from the scene graph or becomes invisible.
      */
-    public void stop(EventType<TransitionEvent> eventType) {
+    public void complete() {
+        update(1);
+        stopTimer(TransitionEvent.CANCEL);
+    }
+
+    /**
+     * Stops this timer without invoking {@link TransitionMediator#onStop()}.
+     * This form of completion only happens when a timer is interrupted by a reversing timer.
+     */
+    private void interrupt() {
         super.stop();
-        mediator.onStop();
-        NodeHelper.removeTransitionTimer(targetNode, this);
-        fireTransitionEvent(eventType);
+        NodeHelper.removeTransitionTimer(targetNode, targetPropertyName);
+        fireTransitionEvent(TransitionEvent.CANCEL);
     }
 
     /**
-     * Skips the rest of a running transition and updates the property to the target value.
-     * This happens when the targeted node is removed from the scene graph or becomes invisible.
+     * Stops the running timer and fires the specified event.
+     *
+     * @param eventType the event type that is fired after the timer is stopped
      */
-    public void complete() {
-        update(1);
-        stop(TransitionEvent.CANCEL);
+    private void stopTimer(EventType<TransitionEvent> eventType) {
+        super.stop();
+        mediator.onStop();
+        NodeHelper.removeTransitionTimer(targetNode, targetPropertyName);
+        fireTransitionEvent(eventType);
     }
 
     /**
@@ -221,28 +232,13 @@ public void complete() {
      */
     private void update(double progress) {
         try {
-            updating = true;
             mediator.onUpdate(InterpolatorHelper.curve(interpolator, progress));
         } catch (Throwable ex) {
             Thread currentThread = Thread.currentThread();
             currentThread.getUncaughtExceptionHandler().uncaughtException(currentThread, ex);
-        } finally {
-            updating = false;
         }
     }
 
-    /**
-     * Polls whether the timer is currently updating the value of the property.
-     * After this method is called, the {@link #updating} flag is {@code false}.
-     *
-     * @return {@code true} if the timer is currently updating the property, {@code false} otherwise
-     */
-    private boolean pollUpdating() {
-        boolean updating = this.updating;
-        this.updating = false;
-        return updating;
-    }
-
     /**
      * Gets the progress of this timer along the input progress axis.
      *
@@ -319,6 +315,7 @@ private void fireTransitionEvent(EventType<TransitionEvent> eventType) {
                 new TransitionEvent(
                     eventType,
                     mediator.getStyleableProperty(),
+                    targetPropertyName,
                     Duration.millis(nanosToMillis(elapsedTime))));
         } catch (Throwable ex) {
             Thread currentThread = Thread.currentThread();
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/NodeHelper.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/NodeHelper.java
index c2744055534..41b1fd62244 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/NodeHelper.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/NodeHelper.java
@@ -40,7 +40,6 @@
 import java.util.Map;
 import javafx.beans.binding.BooleanExpression;
 import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.Property;
 import javafx.css.CssMetaData;
 import javafx.css.Style;
 import javafx.css.Styleable;
@@ -323,16 +322,21 @@ public static TransitionDefinition findTransitionDefinition(Node node, CssMetaDa
         return nodeAccessor.findTransitionDefinition(node, metadata);
     }
 
-    public static void addTransitionTimer(Node node, TransitionTimer timer) {
-        nodeAccessor.addTransitionTimer(node, timer);
+    public static Map<CssMetaData<? extends Styleable, ?>, TransitionDefinition> findTransitionDefinitions(
+            Node node, CssMetaData<? extends Styleable, ?> metadata) {
+        return nodeAccessor.findTransitionDefinitions(node, metadata);
     }
 
-    public static void removeTransitionTimer(Node node, TransitionTimer timer) {
-        nodeAccessor.removeTransitionTimer(node, timer);
+    public static void addTransitionTimer(Node node, String propertyName, TransitionTimer timer) {
+        nodeAccessor.addTransitionTimer(node, propertyName, timer);
     }
 
-    public static TransitionTimer findTransitionTimer(Node node, Property<?> property) {
-        return nodeAccessor.findTransitionTimer(node, property);
+    public static void removeTransitionTimer(Node node, String propertyName) {
+        nodeAccessor.removeTransitionTimer(node, propertyName);
+    }
+
+    public static TransitionTimer findTransitionTimer(Node node, String propertyName) {
+        return nodeAccessor.findTransitionTimer(node, propertyName);
     }
 
     public static void setNodeAccessor(final NodeAccessor newAccessor) {
@@ -397,9 +401,11 @@ Map<StyleableProperty<?>,List<Style>> findStyles(Node node,
         void requestFocusVisible(Node node);
         StyleableProperty<TransitionDefinition[]> getTransitionProperty(Node node);
         TransitionDefinition findTransitionDefinition(Node node, CssMetaData<? extends Styleable, ?> metadata);
-        void addTransitionTimer(Node node, TransitionTimer timer);
-        void removeTransitionTimer(Node node, TransitionTimer timer);
-        TransitionTimer findTransitionTimer(Node node, Property<?> property);
+        Map<CssMetaData<? extends Styleable, ?>, TransitionDefinition> findTransitionDefinitions(
+                Node node, CssMetaData<? extends Styleable, ?> metadata);
+        void addTransitionTimer(Node node, String propertyName, TransitionTimer timer);
+        void removeTransitionTimer(Node node, String propertyName);
+        TransitionTimer findTransitionTimer(Node node, String propertyName);
     }
 
 }
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/layout/region/BorderImageSlices.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/layout/region/BorderImageSlices.java
index e79491c580b..6ac13231123 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/layout/region/BorderImageSlices.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/layout/region/BorderImageSlices.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,15 @@
 
 package com.sun.javafx.scene.layout.region;
 
+import com.sun.javafx.util.InterpolationUtils;
+import javafx.animation.Interpolatable;
 import javafx.scene.layout.BorderWidths;
+import java.util.Objects;
 
 /**
  * A helper class during the conversion process.
  */
-public class BorderImageSlices {
+public final class BorderImageSlices implements Interpolatable<BorderImageSlices> {
 
     /**
      * Using EMPTY results in no border-image being drawn since the slices are zero. You probably
@@ -51,4 +54,35 @@ public BorderImageSlices(BorderWidths widths, boolean filled) {
         this.widths = widths;
         this.filled = filled;
     }
+
+    @Override
+    public BorderImageSlices interpolate(BorderImageSlices endValue, double t) {
+        Objects.requireNonNull(endValue, "endValue cannot be null");
+
+        if (t <= 0 || equals(endValue)) {
+            return this;
+        }
+
+        if (t >= 1) {
+            return endValue;
+        }
+
+        return new BorderImageSlices(
+            widths.interpolate(endValue.widths, t),
+            InterpolationUtils.interpolateDiscrete(filled, endValue.filled, t));
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof BorderImageSlices that)) return false;
+        return filled == that.filled && Objects.equals(widths, that.widths);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = Objects.hashCode(widths);
+        result = 31 * result + Boolean.hashCode(filled);
+        return result;
+    }
 }
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/layout/region/Margins.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/layout/region/Margins.java
index ebaf725fcac..e3c81147681 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/layout/region/Margins.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/layout/region/Margins.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,21 +25,23 @@
 
 package com.sun.javafx.scene.layout.region;
 
+import com.sun.javafx.util.InterpolationUtils;
+import javafx.animation.Interpolatable;
 import javafx.scene.text.Font;
-
 import javafx.css.Size;
 import javafx.css.SizeUnits;
 import javafx.css.ParsedValue;
 import javafx.css.StyleConverter;
 import com.sun.javafx.logging.PlatformLogger;
 import com.sun.javafx.logging.PlatformLogger.Level;
+import java.util.Objects;
 
 /**
  * Similar to Insets but with flag denoting values are proportional.
  * If proportional is true, then the values represent fractions or percentages
  * and are in the range 0..1, although this is not enforced.
  */
-public class Margins {
+public final class Margins implements Interpolatable<Margins> {
 
     // lazy, thread-safe instantiation
     private static class Holder {
@@ -70,6 +72,51 @@ public Margins(double top, double right, double bottom, double left, boolean pro
         this.proportional = proportional;
     }
 
+    @Override
+    public Margins interpolate(Margins endValue, double t) {
+        Objects.requireNonNull(endValue, "endValue cannot be null");
+
+        if (t <= 0 || equals(endValue)) {
+            return this;
+        }
+
+        if (t >= 1) {
+            return endValue;
+        }
+
+        if (proportional != endValue.proportional) {
+            return InterpolationUtils.interpolateDiscrete(this, endValue, t);
+        }
+
+        return new Margins(
+            InterpolationUtils.interpolate(top, endValue.top, t),
+            InterpolationUtils.interpolate(right, endValue.right, t),
+            InterpolationUtils.interpolate(bottom, endValue.bottom, t),
+            InterpolationUtils.interpolate(left, endValue.left, t),
+            proportional);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof Margins margins)) return false;
+        return Double.compare(top, margins.top) == 0
+            && Double.compare(right, margins.right) == 0
+            && Double.compare(bottom, margins.bottom) == 0
+            && Double.compare(left, margins.left) == 0
+            && proportional == margins.proportional;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = Double.hashCode(top);
+        result = 31 * result + Double.hashCode(right);
+        result = 31 * result + Double.hashCode(bottom);
+        result = 31 * result + Double.hashCode(left);
+        result = 31 * result + Boolean.hashCode(proportional);
+        return result;
+    }
+
     @Override
     public String toString() {
         return "top: "+top+"\nright: "+right+"\nbottom: "+bottom+"\nleft: "+left;
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/util/InterpolationUtils.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/util/InterpolationUtils.java
new file mode 100644
index 00000000000..dd50c7c44f3
--- /dev/null
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/util/InterpolationUtils.java
@@ -0,0 +1,412 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+
+package com.sun.javafx.util;
+
+import com.sun.javafx.UnmodifiableArrayList;
+import javafx.animation.Interpolatable;
+import javafx.scene.paint.Color;
+import javafx.scene.paint.ImagePattern;
+import javafx.scene.paint.LinearGradient;
+import javafx.scene.paint.Paint;
+import javafx.scene.paint.RadialGradient;
+import javafx.scene.paint.Stop;
+import java.lang.reflect.Array;
+import java.util.List;
+import java.util.Objects;
+
+public final class InterpolationUtils {
+
+    private InterpolationUtils() {}
+
+    /**
+     * Utility function that interpolates between two double values.
+     */
+    public static double interpolate(double from, double to, double t) {
+        return from + t * (to - from);
+    }
+
+    /**
+     * Utility function that interpolates between two discrete values, returning {@code from}
+     * when {@code t < 0.5}, and {@code to} otherwise.
+     */
+    public static <T> T interpolateDiscrete(T from, T to, double t) {
+        return t < 0.5 ? from : to;
+    }
+
+    /**
+     * Utility function that interpolates between two discrete values, returning {@code from}
+     * when {@code t < 0.5}, and {@code to} otherwise.
+     */
+    public static double interpolateDiscrete(double from, double to, double t) {
+        return t < 0.5 ? from : to;
+    }
+
+    /**
+     * Computes an intermediate list that consists of the pairwise interpolation between two lists,
+     * using the following rules:
+     * <ol>
+     *     <li>The size of the returned list corresponds to the size of the second list.
+     *     <li>If the first list has fewer elements than the second list, the missing elements are copied
+     *         from the second list.
+     *     <li>If the first list has more elements than the second list, the excess elements are discarded.
+     *     <li>If the intermediate list is shallow-equal to the first list passed into the method (i.e. its
+     *         elements are references to the same objects), the existing list is returned.
+     *     <li>If a new list is returned, it is unmodifiable.
+     * </ol>
+     * This method preferably returns existing list instances (i.e. the {@code firstList} or
+     * {@code secondList} arguments) as an indication to the caller that the result is shallow-equal
+     * to either of the input arguments. Callers might depend on this behavior to optimize their own
+     * object allocation strategy by quickly detecting whether anything has changed at all.
+     *
+     * @param firstList the first list, not {@code null}
+     * @param secondList the second list, not {@code null}
+     * @return the intermediate list
+     */
+    public static <T extends Interpolatable<T>> List<T> interpolateListsPairwise(
+            List<T> firstList, List<T> secondList, double t) {
+        Objects.requireNonNull(firstList, "firstList");
+        Objects.requireNonNull(secondList, "secondList");
+
+        if (secondList.isEmpty()) {
+            return firstList.isEmpty() ? firstList : secondList;
+        }
+
+        int listSize = firstList.size();
+
+        // For small equisized lists (up to 8 elements), we use an optimization to prevent the allocation
+        // of a new array in case the intermediate list would be equal to the existing list.
+        if (listSize <= 8 && listSize == secondList.size()) {
+            return interpolateEquisizedListsPairwise(firstList, secondList, t);
+        }
+
+        @SuppressWarnings("unchecked")
+        T[] newArray = (T[])new Interpolatable[secondList.size()];
+        boolean equal = firstList.size() == secondList.size();
+
+        for (int i = 0, firstListSize = firstList.size(); i < newArray.length; ++i) {
+            if (firstListSize > i) {
+                newArray[i] = firstList.get(i).interpolate(secondList.get(i), t);
+                equal &= newArray[i] == firstList.get(i);
+            } else {
+                newArray[i] = secondList.get(i);
+            }
+        }
+
+        return equal ? firstList : new UnmodifiableArrayList<>(newArray, newArray.length);
+    }
+
+    /**
+     * Computes an intermediate list that consists of the pairwise interpolation between two lists
+     * of equal size, each containing up to 8 elements.
+     * <p>
+     * This method is an optimization: it does not allocate memory when the intermediate list is
+     * shallow-equal to the list that is passed into this method, i.e. its elements are references
+     * to the same objects. The existing list is returned in this case.
+     */
+    private static <T extends Interpolatable<T>> List<T> interpolateEquisizedListsPairwise(
+            List<T> firstList, List<T> secondList, double t) {
+        int listSize = firstList.size();
+        if (listSize > 8 || listSize != secondList.size()) {
+            throw new AssertionError();
+        }
+
+        T item0 = null, item1 = null, item2 = null, item3 = null, item4 = null, item5 = null, item6 = null, item7 = null;
+        boolean same = true;
+
+        switch (listSize) { // fall-through intended
+            case 8: item7 = firstList.get(7).interpolate(secondList.get(7), t);
+                    same &= item7 == firstList.get(7);
+            case 7: item6 = firstList.get(6).interpolate(secondList.get(6), t);
+                    same &= item6 == firstList.get(6);
+            case 6: item5 = firstList.get(5).interpolate(secondList.get(5), t);
+                    same &= item5 == firstList.get(5);
+            case 5: item4 = firstList.get(4).interpolate(secondList.get(4), t);
+                    same &= item4 == firstList.get(4);
+            case 4: item3 = firstList.get(3).interpolate(secondList.get(3), t);
+                    same &= item3 == firstList.get(3);
+            case 3: item2 = firstList.get(2).interpolate(secondList.get(2), t);
+                    same &= item2 == firstList.get(2);
+            case 2: item1 = firstList.get(1).interpolate(secondList.get(1), t);
+                    same &= item1 == firstList.get(1);
+            case 1: item0 = firstList.get(0).interpolate(secondList.get(0), t);
+                    same &= item0 == firstList.get(0);
+        }
+
+        if (same) {
+            return firstList;
+        }
+
+        @SuppressWarnings("unchecked")
+        T[] newArray = (T[])new Interpolatable[listSize];
+
+        switch (listSize) { // fall-through intended
+            case 8: newArray[7] = item7;
+            case 7: newArray[6] = item6;
+            case 6: newArray[5] = item5;
+            case 5: newArray[4] = item4;
+            case 4: newArray[3] = item3;
+            case 3: newArray[2] = item2;
+            case 2: newArray[1] = item1;
+            case 1: newArray[0] = item0;
+        }
+
+        return new UnmodifiableArrayList<>(newArray, listSize);
+    }
+
+    /**
+     * Computes an intermediate array series that consists of the pairwise interpolation between two
+     * array series, using the same rules as described in {@link #interpolateArraysPairwise}.
+     * <p>
+     * This method preferably returns existing array instances (i.e. the {@code firstArraySeries} or
+     * {@code secondArraySeries} arguments) as an indication to the caller that the result is shallow-equal
+     * to either of the input arguments. Callers might depend on this behavior to optimize their own
+     * object allocation strategy by quickly detecting whether anything has changed at all.
+     *
+     * @param firstArraySeries the first array series, not {@code null}
+     * @param secondArraySeries the second array series, not {@code null}
+     * @return the intermediate array series
+     */
+    public static <T extends Interpolatable<T>> T[][] interpolateArraySeriesPairwise(
+            T[][] firstArraySeries, T[][] secondArraySeries, double t) {
+        Objects.requireNonNull(firstArraySeries, "firstArraySeries");
+        Objects.requireNonNull(secondArraySeries, "secondArraySeries");
+
+        if (secondArraySeries.length == 0) {
+            return firstArraySeries.length == 0 ? firstArraySeries : secondArraySeries;
+        }
+
+        Class<?> arrayType = firstArraySeries.getClass().componentType();
+
+        @SuppressWarnings("unchecked")
+        T[][] newArray = (T[][]) Array.newInstance(arrayType, secondArraySeries.length);
+        boolean equal = firstArraySeries.length == secondArraySeries.length;
+
+        for (int i = 0, firstListSize = firstArraySeries.length; i < newArray.length; ++i) {
+            if (firstListSize > i) {
+                newArray[i] = interpolateArraysPairwise(firstArraySeries[i], secondArraySeries[i], t);
+                equal &= newArray[i] == firstArraySeries[i];
+            } else {
+                newArray[i] = secondArraySeries[i];
+            }
+        }
+
+        return equal ? firstArraySeries : newArray;
+    }
+
+    /**
+     * Computes an intermediate array that consists of the pairwise interpolation between two arrays,
+     * using the following rules:
+     * <ol>
+     *     <li>The size of the returned array corresponds to the size of the second array.
+     *     <li>If the first array has fewer elements than the second array, the missing elements are copied
+     *         from the second array.
+     *     <li>If the first array has more elements than the second array, the excess elements are discarded.
+     *     <li>If the intermediate array is shallow-equal to the first array passed into the method (i.e. its
+     *         elements are references to the same objects), the existing array is returned.
+     * </ol>
+     * This method preferably returns existing array instances (i.e. the {@code firstArray} or
+     * {@code secondArray} arguments) as an indication to the caller that the result is shallow-equal
+     * to either of the input arguments. Callers might depend on this behavior to optimize their own
+     * object allocation strategy by quickly detecting whether anything has changed at all.
+     *
+     * @param firstArray the first array, not {@code null}
+     * @param secondArray the second array, not {@code null}
+     * @return the intermediate list
+     */
+    public static <T extends Interpolatable<T>> T[] interpolateArraysPairwise(
+            T[] firstArray, T[] secondArray, double t) {
+        Objects.requireNonNull(firstArray, "firstArray");
+        Objects.requireNonNull(secondArray, "secondArray");
+
+        if (secondArray.length == 0) {
+            return firstArray.length == 0 ? firstArray : secondArray;
+        }
+
+        int arraySize = firstArray.length;
+
+        // For small equisized arrays (up to 8 elements), we use an optimization to prevent the allocation
+        // of a new array in case the intermediate array would be equal to the existing array.
+        if (arraySize <= 8 && arraySize == secondArray.length) {
+            return interpolateEquisizedArraysPairwise(firstArray, secondArray, t);
+        }
+
+        Class<?> componentType = firstArray.getClass().componentType();
+
+        @SuppressWarnings("unchecked")
+        T[] newArray = (T[])Array.newInstance(componentType, secondArray.length);
+        boolean equal = firstArray.length == secondArray.length;
+
+        for (int i = 0; i < newArray.length; ++i) {
+            if (arraySize > i) {
+                newArray[i] = firstArray[i].interpolate(secondArray[i], t);
+                equal &= newArray[i] == firstArray[i];
+            } else {
+                newArray[i] = secondArray[i];
+            }
+        }
+
+        return equal ? firstArray : newArray;
+    }
+
+    /**
+     * Computes an intermediate array that consists of the pairwise interpolation between two arrays
+     * of equal size, each containing up to 8 elements.
+     * <p>
+     * This method is an optimization: it does not allocate memory when the intermediate array is
+     * shallow-equal to the array that is passed into this method, i.e. its elements are references
+     * to the same objects. The existing array is returned in this case.
+     */
+    private static <T extends Interpolatable<T>> T[] interpolateEquisizedArraysPairwise(
+            T[] firstArray, T[] secondArray, double t) {
+        int arraySize = firstArray.length;
+        if (arraySize > 8 || arraySize != secondArray.length) {
+            throw new AssertionError();
+        }
+
+        T item0 = null, item1 = null, item2 = null, item3 = null, item4 = null, item5 = null, item6 = null, item7 = null;
+        boolean same = true;
+
+        switch (arraySize) { // fall-through intended
+            case 8: item7 = firstArray[7].interpolate(secondArray[7], t);
+                    same &= item7 == firstArray[7];
+            case 7: item6 = firstArray[6].interpolate(secondArray[6], t);
+                    same &= item6 == firstArray[6];
+            case 6: item5 = firstArray[5].interpolate(secondArray[5], t);
+                    same &= item5 == firstArray[5];
+            case 5: item4 = firstArray[4].interpolate(secondArray[4], t);
+                    same &= item4 == firstArray[4];
+            case 4: item3 = firstArray[3].interpolate(secondArray[3], t);
+                    same &= item3 == firstArray[3];
+            case 3: item2 = firstArray[2].interpolate(secondArray[2], t);
+                    same &= item2 == firstArray[2];
+            case 2: item1 = firstArray[1].interpolate(secondArray[1], t);
+                    same &= item1 == firstArray[1];
+            case 1: item0 = firstArray[0].interpolate(secondArray[0], t);
+                    same &= item0 == firstArray[0];
+        }
+
+        if (same) {
+            return firstArray;
+        }
+
+        Class<?> componentType = firstArray.getClass().componentType();
+
+        @SuppressWarnings("unchecked")
+        T[] newArray = (T[])Array.newInstance(componentType, arraySize);
+
+        switch (arraySize) { // fall-through intended
+            case 8: newArray[7] = item7;
+            case 7: newArray[6] = item6;
+            case 6: newArray[5] = item5;
+            case 5: newArray[4] = item4;
+            case 4: newArray[3] = item3;
+            case 3: newArray[2] = item2;
+            case 2: newArray[1] = item1;
+            case 1: newArray[0] = item0;
+        }
+
+        return newArray;
+    }
+
+    /**
+     * Interpolates between potentially different types of paint.
+     * <p>
+     * In addition to homogeneous interpolations between paints of the same type, the following
+     * heterogeneous interpolations are supported:
+     * <ul>
+     *     <li>Color ↔ LinearGradient
+     *     <li>Color ↔ RadialGradient
+     * </ul>
+     * If a paint is not interpolatable, {@code startValue} is returned for {@code t < 0.5},
+     * and {@code endValue} is returned otherwise.
+     */
+    public static Paint interpolatePaint(Paint startValue, Paint endValue, double t) {
+        if (startValue instanceof Color start) {
+            if (endValue instanceof Color end) {
+                return start.interpolate(end, t);
+            }
+
+            if (endValue instanceof LinearGradient end) {
+                return newSolidGradient(end, start).interpolate(end, t);
+            }
+
+            if (endValue instanceof RadialGradient end) {
+                return newSolidGradient(end, start).interpolate(end, t);
+            }
+        }
+
+        if (startValue instanceof LinearGradient start) {
+            if (endValue instanceof LinearGradient end) {
+                return start.interpolate(end, t);
+            }
+
+            if (endValue instanceof Color end) {
+                return start.interpolate(newSolidGradient(start, end), t);
+            }
+        }
+
+        if (startValue instanceof RadialGradient start) {
+            if (endValue instanceof RadialGradient end) {
+                return start.interpolate(end, t);
+            }
+
+            if (endValue instanceof Color end) {
+                return start.interpolate(newSolidGradient(start, end), t);
+            }
+        }
+
+        if (startValue instanceof ImagePattern start && endValue instanceof ImagePattern end) {
+            return start.interpolate(end, t);
+        }
+
+        return t < 0.5 ? startValue : endValue;
+    }
+
+    /**
+     * Creates a new linear gradient that consists of two stops with the same color.
+     */
+    public static LinearGradient newSolidGradient(LinearGradient source, Color color) {
+        return new LinearGradient(
+                source.getStartX(), source.getStartY(),
+                source.getEndX(), source.getEndY(),
+                source.isProportional(),
+                source.getCycleMethod(),
+                List.of(new Stop(0, color), new Stop(1, color)));
+    }
+
+    /**
+     * Creates a new radial gradient that consists of two stops with the same color.
+     */
+    public static RadialGradient newSolidGradient(RadialGradient source, Color color) {
+        return new RadialGradient(
+                source.getFocusAngle(), source.getFocusDistance(),
+                source.getCenterX(), source.getCenterY(),
+                source.getRadius(),
+                source.isProportional(),
+                source.getCycleMethod(),
+                List.of(new Stop(0, color), new Stop(1, color)));
+    }
+}
diff --git a/modules/javafx.graphics/src/main/java/javafx/animation/AnimationTimer.java b/modules/javafx.graphics/src/main/java/javafx/animation/AnimationTimer.java
index fbfe886c61a..f174a0ff26a 100644
--- a/modules/javafx.graphics/src/main/java/javafx/animation/AnimationTimer.java
+++ b/modules/javafx.graphics/src/main/java/javafx/animation/AnimationTimer.java
@@ -25,7 +25,6 @@
 
 package javafx.animation;
 
-import com.sun.javafx.animation.AnimationTimerHelper;
 import com.sun.javafx.tk.Toolkit;
 import com.sun.javafx.util.Utils;
 import com.sun.scenario.animation.AbstractPrimaryTimer;
@@ -50,15 +49,6 @@
  */
 public abstract class AnimationTimer {
 
-    static {
-        AnimationTimerHelper.setAccessor(new AnimationTimerHelper.Accessor() {
-            @Override
-            public AbstractPrimaryTimer getPrimaryTimer(AnimationTimer timer) {
-                return timer.timer;
-            }
-        });
-    }
-
     private class AnimationTimerReceiver implements TimerReceiver {
         @SuppressWarnings("removal")
         @Override public void handle(final long now) {
diff --git a/modules/javafx.graphics/src/main/java/javafx/animation/Interpolatable.java b/modules/javafx.graphics/src/main/java/javafx/animation/Interpolatable.java
index cbfbc84a2ad..036cec26a78 100644
--- a/modules/javafx.graphics/src/main/java/javafx/animation/Interpolatable.java
+++ b/modules/javafx.graphics/src/main/java/javafx/animation/Interpolatable.java
@@ -26,9 +26,41 @@
 package javafx.animation;
 
 /**
- * A value that can be interpolated. It defines single
- * {@link #interpolate(Object, double)} method, which returns interpolated value
- * of given fraction.
+ * A value that can be interpolated. It defines a single {@link #interpolate(Object, double)}
+ * method, which returns an intermediate value between the value of this {@code Interpolatable}
+ * and the specified target value.
+ * <p>
+ * Component values can be interpolated in different ways, depending on the semantics of the component type:
+ * <table class="striped">
+ *     <caption><b>Interpolation types</b></caption>
+ *     <tbody>
+ *         <tr><td style="vertical-align: top"><a id="default" style="white-space: nowrap">default</a></td>
+ *             <td>Component types that implement {@code Interpolatable} are interpolated by calling the
+ *                 {@link #interpolate(Object, double)} method.</td>
+ *         </tr>
+ *         <tr><td style="vertical-align: top"><a id="linear" style="white-space: nowrap">linear</a></td>
+ *             <td>Two components are combined by linear interpolation such that {@code t = 0} produces
+ *                 the start value, {@code t = 1} produces the end value, and {@code 0 < t < 1} produces
+ *                 {@code (1 - t) * start + t * end}. This interpolation type is usually applicable for
+ *                 numeric components.</td>
+ *         </tr>
+ *         <tr><td style="vertical-align: top"><a id="discrete" style="white-space: nowrap">discrete</a></td>
+ *             <td>If two components cannot be meaningfully combined, the intermediate component value
+ *                 is equal to the start value for {@code t < 0.5} and equal to the end value for
+ *                 {@code t >= 0.5}.</td>
+ *         </tr>
+ *         <tr><td style="vertical-align: top"><a id="pairwise" style="white-space: nowrap">pairwise</a></td>
+ *             <td>Two lists are combined by pairwise interpolation. Paired list elements are interpolated
+ *                 with rules as described in this table (substituting "component" for "element").
+ *                 If the start list has fewer elements than the target list, the missing elements are copied
+ *                 from the target list. If the start list has more elements than the target list, the excess
+ *                 elements are discarded.
+ *             </td>
+ *         </tr>
+ *     </tbody>
+ * </table>
+ * Some component types are interpolated in specific ways not covered here.
+ * Refer to their respective documentation for more information.
  *
  * @param <T> the interpolatable value type
  * @since JavaFX 2.0
@@ -37,15 +69,24 @@
 public interface Interpolatable<T> {
 
     /**
-     * The function calculates an interpolated value along the fraction
-     * {@code t} between {@code 0.0} and {@code 1.0}. When {@code t} = 1.0,
-     * {@code endVal} is returned.
+     * Returns an intermediate value between the value of this {@code Interpolatable} and the specified
+     * {@code endValue} using the linear interpolation factor {@code t}, ranging from 0 (inclusive)
+     * to 1 (inclusive).
+     * <p>
+     * The returned value might not be a new instance; the implementation might also return one of the
+     * two existing instances if the intermediate value would be equal to one of the existing values.
+     * However, this is an optimization and applications should not assume any particular identity
+     * of the returned value.
      *
-     * @param endValue
-     *            target value
-     * @param t
-     *            fraction between {@code 0.0} and {@code 1.0}
-     * @return interpolated value
+     * @implSpec An implementation is not required to reject interpolation factors less than 0 or larger
+     *           than 1, but this specification gives no meaning to values returned outside of this range.
+     *           For example, an implementation might clamp the interpolation factor to [0..1], or it might
+     *           continue the linear interpolation outside of this range.
+     *
+     * @param endValue the target value
+     * @param t the interpolation factor
+     * @throws NullPointerException if {@code endValue} is {@code null}
+     * @return the intermediate value
      */
-    public T interpolate(T endValue, double t);
+    T interpolate(T endValue, double t);
 }
diff --git a/modules/javafx.graphics/src/main/java/javafx/css/StyleableBooleanProperty.java b/modules/javafx.graphics/src/main/java/javafx/css/StyleableBooleanProperty.java
index 3f28bac26a6..899ea6724fa 100644
--- a/modules/javafx.graphics/src/main/java/javafx/css/StyleableBooleanProperty.java
+++ b/modules/javafx.graphics/src/main/java/javafx/css/StyleableBooleanProperty.java
@@ -28,6 +28,7 @@
 import com.sun.javafx.css.TransitionMediator;
 import com.sun.javafx.css.TransitionDefinition;
 import com.sun.javafx.scene.NodeHelper;
+import com.sun.javafx.tk.Toolkit;
 import javafx.beans.property.BooleanPropertyBase;
 import javafx.beans.value.ObservableValue;
 import javafx.scene.Node;
@@ -76,13 +77,13 @@ public void applyStyle(StyleOrigin origin, Boolean v) {
 
         if (transition == null) {
             set(newValue);
-        } else if (mediator == null || mediator.newValue != newValue) {
+        } else if (mediator == null || mediator.endValue != newValue) {
             // We only start a new transition if the new target value is different from the target
             // value of the existing transition. This scenario can sometimes happen when a CSS value
             // is redundantly applied, which would cause unexpected animations if we allowed the new
             // transition to interrupt the existing transition.
             mediator = new TransitionMediatorImpl(get(), newValue);
-            mediator.run(transition);
+            mediator.run(transition, getCssMetaData().getProperty(), Toolkit.getToolkit().getPrimaryTimer().nanos());
         }
 
         this.origin = origin;
@@ -92,59 +93,67 @@ public void applyStyle(StyleOrigin origin, Boolean v) {
     @Override
     public void bind(ObservableValue<? extends Boolean> observable) {
         super.bind(observable);
-        origin = StyleOrigin.USER;
-
-        // Calling the 'bind' method always cancels a transition timer.
-        if (mediator != null) {
-            mediator.cancel(true);
-        }
+        onUserChange();
     }
 
     /** {@inheritDoc} */
     @Override
     public void set(boolean v) {
         super.set(v);
-
-        if (mediator == null || mediator.cancel(false)) {
-            origin = StyleOrigin.USER;
-        }
+        onUserChange();
     }
 
     /** {@inheritDoc} */
     @Override
     public StyleOrigin getStyleOrigin() { return origin; }
 
-    private StyleOrigin origin = null;
-    private TransitionMediatorImpl mediator = null;
+    private void onUserChange() {
+        origin = StyleOrigin.USER;
 
-    private class TransitionMediatorImpl extends TransitionMediator {
-        private final boolean oldValue;
-        private final boolean newValue;
+        if (mediator != null) {
+            mediator.cancel();
+        }
+    }
+
+    private StyleOrigin origin;
+    private TransitionMediatorImpl mediator;
 
-        public TransitionMediatorImpl(boolean oldValue, boolean newValue) {
-            this.oldValue = oldValue;
-            this.newValue = newValue;
+    private class TransitionMediatorImpl extends TransitionMediator {
+        private final boolean startValue;
+        private final boolean endValue;
+        private boolean reversingAdjustedStartValue;
+
+        public TransitionMediatorImpl(boolean startValue, boolean endValue) {
+            this.startValue = startValue;
+            this.endValue = endValue;
+            this.reversingAdjustedStartValue = startValue;
         }
 
         @Override
         public void onUpdate(double progress) {
-            set(progress > 0 ? newValue : oldValue);
+            StyleableBooleanProperty.super.set(progress < 0.5 ? startValue : endValue);
         }
 
         @Override
         public void onStop() {
-            // When the transition is cancelled or completed, we clear the reference to this mediator.
-            // However, when this mediator was cancelled by a reversing transition, the 'mediator' field
-            // refers to the reversing mediator, and not to this mediator. We need to be careful to only
-            // clear references to this mediator.
-            if (mediator == this) {
-                mediator = null;
-            }
+            mediator = null;
         }
 
         @Override
         public StyleableProperty<?> getStyleableProperty() {
             return StyleableBooleanProperty.this;
         }
+
+        @Override
+        public boolean updateReversingAdjustedStartValue(TransitionMediator existingMediator) {
+            var mediator = (TransitionMediatorImpl)existingMediator;
+
+            if (mediator.reversingAdjustedStartValue == endValue) {
+                reversingAdjustedStartValue = mediator.endValue;
+                return true;
+            }
+
+            return false;
+        }
     }
 }
diff --git a/modules/javafx.graphics/src/main/java/javafx/css/StyleableDoubleProperty.java b/modules/javafx.graphics/src/main/java/javafx/css/StyleableDoubleProperty.java
index 5cbe343e150..7efd036b873 100644
--- a/modules/javafx.graphics/src/main/java/javafx/css/StyleableDoubleProperty.java
+++ b/modules/javafx.graphics/src/main/java/javafx/css/StyleableDoubleProperty.java
@@ -28,6 +28,7 @@
 import com.sun.javafx.css.TransitionMediator;
 import com.sun.javafx.css.TransitionDefinition;
 import com.sun.javafx.scene.NodeHelper;
+import com.sun.javafx.tk.Toolkit;
 import javafx.beans.property.DoublePropertyBase;
 import javafx.beans.value.ObservableValue;
 import javafx.scene.Node;
@@ -78,13 +79,13 @@ public void applyStyle(StyleOrigin origin, Number v) {
 
         if (transition == null) {
             set(newValue);
-        } else if (mediator == null || mediator.newValue != newValue) {
+        } else if (mediator == null || mediator.endValue != newValue) {
             // We only start a new transition if the new target value is different from the target
             // value of the existing transition. This scenario can sometimes happen when a CSS value
             // is redundantly applied, which would cause unexpected animations if we allowed the new
             // transition to interrupt the existing transition.
             mediator = new TransitionMediatorImpl(get(), newValue);
-            mediator.run(transition);
+            mediator.run(transition, getCssMetaData().getProperty(), Toolkit.getToolkit().getPrimaryTimer().nanos());
         }
 
         this.origin = origin;
@@ -94,59 +95,68 @@ public void applyStyle(StyleOrigin origin, Number v) {
     @Override
     public void bind(ObservableValue<? extends Number> observable) {
         super.bind(observable);
-        origin = StyleOrigin.USER;
-
-        // Calling the 'bind' method always cancels a transition timer.
-        if (mediator != null) {
-            mediator.cancel(true);
-        }
+        onUserChange();
     }
 
     /** {@inheritDoc} */
     @Override
     public void set(double v) {
         super.set(v);
-
-        if (mediator == null || mediator.cancel(false)) {
-            origin = StyleOrigin.USER;
-        }
+        onUserChange();
     }
 
     /** {@inheritDoc} */
     @Override
     public StyleOrigin getStyleOrigin() { return origin; }
 
-    private StyleOrigin origin = null;
-    private TransitionMediatorImpl mediator = null;
+    private void onUserChange() {
+        origin = StyleOrigin.USER;
 
-    private class TransitionMediatorImpl extends TransitionMediator {
-        private final double oldValue;
-        private final double newValue;
+        if (mediator != null) {
+            mediator.cancel();
+        }
+    }
+
+    private StyleOrigin origin;
+    private TransitionMediatorImpl mediator;
 
-        public TransitionMediatorImpl(double oldValue, double newValue) {
-            this.oldValue = oldValue;
-            this.newValue = newValue;
+    private class TransitionMediatorImpl extends TransitionMediator {
+        private final double startValue;
+        private final double endValue;
+        private double reversingAdjustedStartValue;
+
+        public TransitionMediatorImpl(double startValue, double endValue) {
+            this.startValue = startValue;
+            this.endValue = endValue;
+            this.reversingAdjustedStartValue = startValue;
         }
 
         @Override
         public void onUpdate(double progress) {
-            set(progress < 1 ? oldValue + (newValue - oldValue) * progress : newValue);
+            StyleableDoubleProperty.super.set(
+                progress < 1 ? startValue + (endValue - startValue) * progress : endValue);
         }
 
         @Override
         public void onStop() {
-            // When the transition is cancelled or completed, we clear the reference to this mediator.
-            // However, when this mediator was cancelled by a reversing transition, the 'mediator' field
-            // refers to the reversing mediator, and not to this mediator. We need to be careful to only
-            // clear references to this mediator.
-            if (mediator == this) {
-                mediator = null;
-            }
+            mediator = null;
         }
 
         @Override
         public StyleableProperty<?> getStyleableProperty() {
             return StyleableDoubleProperty.this;
         }
+
+        @Override
+        public boolean updateReversingAdjustedStartValue(TransitionMediator existingMediator) {
+            var mediator = (TransitionMediatorImpl)existingMediator;
+
+            if (mediator.reversingAdjustedStartValue == endValue) {
+                reversingAdjustedStartValue = mediator.endValue;
+                return true;
+            }
+
+            return false;
+        }
     }
 }
diff --git a/modules/javafx.graphics/src/main/java/javafx/css/StyleableFloatProperty.java b/modules/javafx.graphics/src/main/java/javafx/css/StyleableFloatProperty.java
index 73b1f70b0ea..a8f829ae9fb 100644
--- a/modules/javafx.graphics/src/main/java/javafx/css/StyleableFloatProperty.java
+++ b/modules/javafx.graphics/src/main/java/javafx/css/StyleableFloatProperty.java
@@ -28,6 +28,7 @@
 import com.sun.javafx.css.TransitionMediator;
 import com.sun.javafx.css.TransitionDefinition;
 import com.sun.javafx.scene.NodeHelper;
+import com.sun.javafx.tk.Toolkit;
 import javafx.beans.property.FloatPropertyBase;
 import javafx.beans.value.ObservableValue;
 import javafx.scene.Node;
@@ -76,13 +77,13 @@ public void applyStyle(StyleOrigin origin, Number v) {
 
         if (transition == null) {
             set(newValue);
-        } else if (mediator == null || mediator.newValue != newValue) {
+        } else if (mediator == null || mediator.endValue != newValue) {
             // We only start a new transition if the new target value is different from the target
             // value of the existing transition. This scenario can sometimes happen when a CSS value
             // is redundantly applied, which would cause unexpected animations if we allowed the new
             // transition to interrupt the existing transition.
             mediator = new TransitionMediatorImpl(get(), newValue);
-            mediator.run(transition);
+            mediator.run(transition, getCssMetaData().getProperty(), Toolkit.getToolkit().getPrimaryTimer().nanos());
         }
 
         this.origin = origin;
@@ -92,59 +93,68 @@ public void applyStyle(StyleOrigin origin, Number v) {
     @Override
     public void bind(ObservableValue<? extends Number> observable) {
         super.bind(observable);
-        origin = StyleOrigin.USER;
-
-        // Calling the 'bind' method always cancels a transition timer.
-        if (mediator != null) {
-            mediator.cancel(true);
-        }
+        onUserChange();
     }
 
     /** {@inheritDoc} */
     @Override
     public void set(float v) {
         super.set(v);
-
-        if (mediator == null || mediator.cancel(false)) {
-            origin = StyleOrigin.USER;
-        }
+        onUserChange();
     }
 
     /** {@inheritDoc} */
     @Override
     public StyleOrigin getStyleOrigin() { return origin; }
 
-    private StyleOrigin origin = null;
-    private TransitionMediatorImpl mediator = null;
+    private void onUserChange() {
+        origin = StyleOrigin.USER;
 
-    private class TransitionMediatorImpl extends TransitionMediator {
-        private final float oldValue;
-        private final float newValue;
+        if (mediator != null) {
+            mediator.cancel();
+        }
+    }
+
+    private StyleOrigin origin;
+    private TransitionMediatorImpl mediator;
 
-        public TransitionMediatorImpl(float oldValue, float newValue) {
-            this.oldValue = oldValue;
-            this.newValue = newValue;
+    private class TransitionMediatorImpl extends TransitionMediator {
+        private final float startValue;
+        private final float endValue;
+        private float reversingAdjustedStartValue;
+
+        public TransitionMediatorImpl(float startValue, float endValue) {
+            this.startValue = startValue;
+            this.endValue = endValue;
+            this.reversingAdjustedStartValue = startValue;
         }
 
         @Override
         public void onUpdate(double progress) {
-            set(progress < 1 ? oldValue + (newValue - oldValue) * (float)progress : newValue);
+            StyleableFloatProperty.super.set(
+                progress < 1 ? startValue + (endValue - startValue) * (float)progress : endValue);
         }
 
         @Override
         public void onStop() {
-            // When the transition is cancelled or completed, we clear the reference to this mediator.
-            // However, when this mediator was cancelled by a reversing transition, the 'mediator' field
-            // refers to the reversing mediator, and not to this mediator. We need to be careful to only
-            // clear references to this mediator.
-            if (mediator == this) {
-                mediator = null;
-            }
+            mediator = null;
         }
 
         @Override
         public StyleableProperty<?> getStyleableProperty() {
             return StyleableFloatProperty.this;
         }
+
+        @Override
+        public boolean updateReversingAdjustedStartValue(TransitionMediator existingMediator) {
+            var mediator = (TransitionMediatorImpl)existingMediator;
+
+            if (mediator.reversingAdjustedStartValue == endValue) {
+                reversingAdjustedStartValue = mediator.endValue;
+                return true;
+            }
+
+            return false;
+        }
     }
 }
diff --git a/modules/javafx.graphics/src/main/java/javafx/css/StyleableIntegerProperty.java b/modules/javafx.graphics/src/main/java/javafx/css/StyleableIntegerProperty.java
index 1d05a90f240..ca932d8a6bf 100644
--- a/modules/javafx.graphics/src/main/java/javafx/css/StyleableIntegerProperty.java
+++ b/modules/javafx.graphics/src/main/java/javafx/css/StyleableIntegerProperty.java
@@ -28,6 +28,7 @@
 import com.sun.javafx.css.TransitionMediator;
 import com.sun.javafx.css.TransitionDefinition;
 import com.sun.javafx.scene.NodeHelper;
+import com.sun.javafx.tk.Toolkit;
 import javafx.beans.property.IntegerPropertyBase;
 import javafx.beans.value.ObservableValue;
 import javafx.scene.Node;
@@ -76,13 +77,13 @@ public void applyStyle(StyleOrigin origin, Number v) {
 
         if (transition == null) {
             set(newValue);
-        } else if (mediator == null || mediator.newValue != newValue) {
+        } else if (mediator == null || mediator.endValue != newValue) {
             // We only start a new transition if the new target value is different from the target
             // value of the existing transition. This scenario can sometimes happen when a CSS value
             // is redundantly applied, which would cause unexpected animations if we allowed the new
             // transition to interrupt the existing transition.
             mediator = new TransitionMediatorImpl(get(), newValue);
-            mediator.run(transition);
+            mediator.run(transition, getCssMetaData().getProperty(), Toolkit.getToolkit().getPrimaryTimer().nanos());
         }
 
         this.origin = origin;
@@ -92,59 +93,69 @@ public void applyStyle(StyleOrigin origin, Number v) {
     @Override
     public void bind(ObservableValue<? extends Number> observable) {
         super.bind(observable);
-        origin = StyleOrigin.USER;
-
-        // Calling the 'bind' method always cancels a transition timer.
-        if (mediator != null) {
-            mediator.cancel(true);
-        }
+        onUserChange();
     }
 
     /** {@inheritDoc} */
     @Override
     public void set(int v) {
         super.set(v);
-
-        if (mediator == null || mediator.cancel(false)) {
-            origin = StyleOrigin.USER;
-        }
+        onUserChange();
     }
 
     /** {@inheritDoc} */
     @Override
     public StyleOrigin getStyleOrigin() { return origin; }
 
-    private StyleOrigin origin = null;
-    private TransitionMediatorImpl mediator = null;
+    private void onUserChange() {
+        origin = StyleOrigin.USER;
 
-    private final class TransitionMediatorImpl extends TransitionMediator {
-        private final int oldValue;
-        private final int newValue;
+        if (mediator != null) {
+            mediator.cancel();
+        }
+    }
+
+    private StyleOrigin origin;
+    private TransitionMediatorImpl mediator;
 
-        public TransitionMediatorImpl(int oldValue, int newValue) {
-            this.oldValue = oldValue;
-            this.newValue = newValue;
+    private final class TransitionMediatorImpl extends TransitionMediator {
+        private final int startValue;
+        private final int endValue;
+        private int reversingAdjustedStartValue;
+
+        public TransitionMediatorImpl(int startValue, int endValue) {
+            this.startValue = startValue;
+            this.endValue = endValue;
+            this.reversingAdjustedStartValue = startValue;
         }
 
         @Override
         public void onUpdate(double progress) {
-            set(progress < 1 ? oldValue + (int)((newValue - oldValue) * progress) : newValue);
+            // Integers are interpolated in real number space and rounded to the nearest integer.
+            StyleableIntegerProperty.super.set(
+                progress < 1 ? (int)Math.round(startValue + (endValue - startValue) * progress) : endValue);
         }
 
         @Override
         public void onStop() {
-            // When the transition is cancelled or completed, we clear the reference to this mediator.
-            // However, when this mediator was cancelled by a reversing transition, the 'mediator' field
-            // refers to the reversing mediator, and not to this mediator. We need to be careful to only
-            // clear references to this mediator.
-            if (mediator == this) {
-                mediator = null;
-            }
+            mediator = null;
         }
 
         @Override
         public StyleableProperty<?> getStyleableProperty() {
             return StyleableIntegerProperty.this;
         }
+
+        @Override
+        public boolean updateReversingAdjustedStartValue(TransitionMediator existingMediator) {
+            var mediator = (TransitionMediatorImpl)existingMediator;
+
+            if (mediator.reversingAdjustedStartValue == endValue) {
+                reversingAdjustedStartValue = mediator.endValue;
+                return true;
+            }
+
+            return false;
+        }
     }
 }
diff --git a/modules/javafx.graphics/src/main/java/javafx/css/StyleableLongProperty.java b/modules/javafx.graphics/src/main/java/javafx/css/StyleableLongProperty.java
index e1a60f9a31d..18b09fa332f 100644
--- a/modules/javafx.graphics/src/main/java/javafx/css/StyleableLongProperty.java
+++ b/modules/javafx.graphics/src/main/java/javafx/css/StyleableLongProperty.java
@@ -28,6 +28,8 @@
 import com.sun.javafx.css.TransitionMediator;
 import com.sun.javafx.css.TransitionDefinition;
 import com.sun.javafx.scene.NodeHelper;
+import com.sun.javafx.tk.Toolkit;
+import com.sun.javafx.util.Utils;
 import javafx.beans.property.LongPropertyBase;
 import javafx.beans.value.ObservableValue;
 import javafx.scene.Node;
@@ -78,13 +80,13 @@ public void applyStyle(StyleOrigin origin, Number v) {
 
         if (transition == null) {
             set(newValue);
-        } else if (mediator == null || mediator.newValue != newValue) {
+        } else if (mediator == null || mediator.endValue != newValue) {
             // We only start a new transition if the new target value is different from the target
             // value of the existing transition. This scenario can sometimes happen when a CSS value
             // is redundantly applied, which would cause unexpected animations if we allowed the new
             // transition to interrupt the existing transition.
             mediator = new TransitionMediatorImpl(get(), newValue);
-            mediator.run(transition);
+            mediator.run(transition, getCssMetaData().getProperty(), Toolkit.getToolkit().getPrimaryTimer().nanos());
         }
 
         this.origin = origin;
@@ -94,59 +96,70 @@ public void applyStyle(StyleOrigin origin, Number v) {
     @Override
     public void bind(ObservableValue<? extends Number> observable) {
         super.bind(observable);
-        origin = StyleOrigin.USER;
-
-        // Calling the 'bind' method always cancels a transition timer.
-        if (mediator != null) {
-            mediator.cancel(true);
-        }
+        onUserChange();
     }
 
     /** {@inheritDoc} */
     @Override
     public void set(long v) {
         super.set(v);
-
-        if (mediator == null || mediator.cancel(false)) {
-            origin = StyleOrigin.USER;
-        }
+        onUserChange();
     }
 
     /** {@inheritDoc} */
     @Override
     public StyleOrigin getStyleOrigin() { return origin; }
 
-    private StyleOrigin origin = null;
-    private TransitionMediatorImpl mediator = null;
+    private void onUserChange() {
+        origin = StyleOrigin.USER;
 
-    private final class TransitionMediatorImpl extends TransitionMediator {
-        private final long oldValue;
-        private final long newValue;
+        if (mediator != null) {
+            mediator.cancel();
+        }
+    }
+
+    private StyleOrigin origin;
+    private TransitionMediatorImpl mediator;
 
-        public TransitionMediatorImpl(long oldValue, long newValue) {
-            this.oldValue = oldValue;
-            this.newValue = newValue;
+    private final class TransitionMediatorImpl extends TransitionMediator {
+        private final long startValue;
+        private final long endValue;
+        private long reversingAdjustedStartValue;
+
+        public TransitionMediatorImpl(long startValue, long endValue) {
+            this.startValue = startValue;
+            this.endValue = endValue;
+            this.reversingAdjustedStartValue = startValue;
         }
 
         @Override
         public void onUpdate(double progress) {
-            set(progress < 1 ? oldValue + (long)((newValue - oldValue) * progress) : newValue);
+            // Longs are interpolated in real number space and rounded to the nearest long.
+            long diff = endValue - startValue;
+            long result = startValue + Math.round(progress * diff);
+            StyleableLongProperty.super.set(progress < 1 ? Utils.clamp(startValue, result, endValue) : endValue);
         }
 
         @Override
         public void onStop() {
-            // When the transition is cancelled or completed, we clear the reference to this mediator.
-            // However, when this mediator was cancelled by a reversing transition, the 'mediator' field
-            // refers to the reversing mediator, and not to this mediator. We need to be careful to only
-            // clear references to this mediator.
-            if (mediator == this) {
-                mediator = null;
-            }
+            mediator = null;
         }
 
         @Override
         public StyleableProperty<?> getStyleableProperty() {
             return StyleableLongProperty.this;
         }
+
+        @Override
+        public boolean updateReversingAdjustedStartValue(TransitionMediator existingMediator) {
+            var mediator = (TransitionMediatorImpl)existingMediator;
+
+            if (mediator.reversingAdjustedStartValue == endValue) {
+                reversingAdjustedStartValue = mediator.endValue;
+                return true;
+            }
+
+            return false;
+        }
     }
 }
diff --git a/modules/javafx.graphics/src/main/java/javafx/css/StyleableObjectProperty.java b/modules/javafx.graphics/src/main/java/javafx/css/StyleableObjectProperty.java
index 7fa1230c61a..1f6e44538cf 100644
--- a/modules/javafx.graphics/src/main/java/javafx/css/StyleableObjectProperty.java
+++ b/modules/javafx.graphics/src/main/java/javafx/css/StyleableObjectProperty.java
@@ -27,11 +27,18 @@
 
 import com.sun.javafx.css.TransitionMediator;
 import com.sun.javafx.css.TransitionDefinition;
+import com.sun.javafx.css.SubPropertyConverter;
 import com.sun.javafx.scene.NodeHelper;
+import com.sun.javafx.tk.Toolkit;
+import com.sun.javafx.util.InterpolationUtils;
 import javafx.animation.Interpolatable;
 import javafx.beans.property.ObjectPropertyBase;
 import javafx.beans.value.ObservableValue;
 import javafx.scene.Node;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
 /**
@@ -71,103 +78,489 @@ public StyleableObjectProperty(T initialValue) {
 
     /** {@inheritDoc} */
     @Override
+    @SuppressWarnings({"unchecked", "rawtypes"})
     public void applyStyle(StyleOrigin origin, T newValue) {
-        T oldValue;
-
-        if (newValue == null) {
-            set(null);
-        } else if (!(newValue instanceof Interpolatable<?>)
-                   || ((oldValue = get()) == null)
-                   || !(newValue.getClass().isInstance(oldValue))) {
-            // Consider a case where T := Paint. Now 'oldValue' could be a Color instance, while 'newValue' could
-            // be a LinearGradient instance. Both types implement Interpolatable, but with different type arguments.
-            // We detect this case by checking whether 'newValue' is an instance of 'oldValue' (so that
-            // oldValue.interpolate(newValue, t) succeeds), and skipping the transition when the test fails.
+        CssMetaData<? extends Styleable, T> metadata = getCssMetaData();
+        StyleConverter<?, T> converter = metadata.getConverter();
+        T oldValue = get();
+
+        if (oldValue != null && newValue != null && converter instanceof SubPropertyConverter c) {
+            applyComponents(oldValue, newValue, metadata, c);
+        } else {
+            applyValue(oldValue, newValue, metadata);
+        }
+
+        this.origin = origin;
+    }
+
+    /**
+     * Sets the value of the property, and potentially starts a transition.
+     * This method is used for values that don't support component-wise transitions, and for cases
+     * where one of the values is {@code null} and we fall back to a discrete transition.
+     *
+     * @param oldValue the old value
+     * @param newValue the new value
+     * @param metadata the CSS metadata of the value
+     */
+    private void applyValue(T oldValue, T newValue, CssMetaData<? extends Styleable, T> metadata) {
+        // If this.origin == null, we're setting the value for the first time.
+        // No transition should be started in this case.
+        TransitionDefinition transition =
+            this.origin != null && getBean() instanceof Node node ?
+            NodeHelper.findTransitionDefinition(node, metadata) : null;
+
+        // We only start a new transition if the new target value is different from the target
+        // value of the existing transition. This scenario can sometimes happen when a CSS value
+        // is redundantly applied, which would cause unexpected animations if we allowed the new
+        // transition to interrupt the existing transition.
+        if (transition == null) {
             set(newValue);
+        } else if (controller == null || !Objects.equals(newValue, controller.getTargetValue())) {
+            TransitionControllerBase controller;
+
+            // 'oldValue' and 'newValue' could be objects that both implement Interpolatable, but with
+            // different type arguments. We detect this case by checking whether 'newValue' is an instance
+            // of 'oldValue' (so that oldValue.interpolate(newValue, t) succeeds), and only applying the
+            // transition when the test succeeds.
+            if (oldValue instanceof Interpolatable<?>
+                    && newValue instanceof Interpolatable<?>
+                    && newValue.getClass().isInstance(oldValue)) {
+                controller = new InterpolatableTransitionController(oldValue, newValue);
+            } else {
+                controller = new DiscreteTransitionController(oldValue, newValue);
+            }
+
+            this.controller = controller; // needs to be set before calling run()
+            controller.run(transition, metadata.getProperty(), Toolkit.getToolkit().getPrimaryTimer().nanos());
+        }
+    }
+
+    /**
+     * Sets the value of the property, and potentially starts a transition.
+     * This method is used for values that support component-wise transitions.
+     *
+     * @param newValue the new value
+     * @param metadata the CSS metadata of the value
+     * @param converter the style converter of the value
+     */
+    private void applyComponents(T oldValue, T newValue,
+                                 CssMetaData<? extends Styleable, T> metadata,
+                                 SubPropertyConverter<T> converter) {
+        // If this.origin == null, we're setting the value for the first time.
+        // No transition should be started in this case.
+        Map<CssMetaData<? extends Styleable, ?>, TransitionDefinition> transitions =
+            this.origin != null && getBean() instanceof Node node ?
+            NodeHelper.findTransitionDefinitions(node, metadata) : null;
+
+        List<CssMetaData<? extends Styleable, ?>> subMetadata = metadata.getSubProperties();
+
+        if (transitions == null || transitions.isEmpty() || subMetadata == null || subMetadata.isEmpty()) {
+            set(newValue);
+        } else if (controller == null || !Objects.equals(newValue, controller.getTargetValue())) {
+            var oldCssValues = converter.convertBack(oldValue);
+            var newCssValues = converter.convertBack(newValue);
+            var controller = new AggregatingTransitionController(newValue);
+
+            for (int i = 0, max = subMetadata.size(); i < max; ++i) {
+                processComponent(controller, subMetadata.get(i), transitions, oldCssValues, newCssValues);
+            }
+
+            this.controller = controller; // needs to be set before calling run()
+            controller.run();
+        }
+    }
+
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    private void processComponent(AggregatingTransitionController controller,
+                                  CssMetaData<? extends Styleable, ?> metadata,
+                                  Map<CssMetaData<? extends Styleable, ?>, TransitionDefinition> transitions,
+                                  Map<CssMetaData<? extends Styleable, ?>, Object> oldCssValues,
+                                  Map<CssMetaData<? extends Styleable, ?>, Object> newCssValues) {
+        Object oldCssValue = oldCssValues.get(metadata);
+        Object newCssValue = newCssValues.get(metadata);
+
+        // If the old and new CSS value is equal, we don't need to bother checking for a specified
+        // transition, as it would not be noticeable anyway. Note that we're using deepEquals, as
+        // the value might be an array of CSS values.
+        if (Objects.deepEquals(oldCssValue, newCssValue)) {
+            controller.addValue(metadata, oldCssValue);
         } else {
-            // If this.origin == null, we're setting the value for the first time.
-            // No transition should be started in this case.
-            TransitionDefinition transition = this.origin != null && getBean() instanceof Node node ?
-                NodeHelper.findTransitionDefinition(node, getCssMetaData()) : null;
-
-            if (transition == null) {
-                set(newValue);
-            } else if (mediator == null || !Objects.equals(mediator.newValue, newValue)) {
-                // We only start a new transition if the new target value is different from the target
-                // value of the existing transition. This scenario can sometimes happen when a CSS value
-                // is redundantly applied, which would cause unexpected animations if we allowed the new
-                // transition to interrupt the existing transition.
-                mediator = new TransitionMediatorImpl(oldValue, newValue);
-                mediator.run(transition);
+            // The following code accounts for pre-existing transition mediators that can occur when more
+            // than two states are involved. Consider the following scenario:
+            //
+            //     .button {
+            //       -fx-border-color: red;
+            //       -fx-border-width: 5;
+            //       transition: all 4s;
+            //     }
+            //
+            //     .button:hover {
+            //       -fx-border-color: green;
+            //     }
+            //
+            //     .button:pressed {
+            //       -fx-border-color: blue;
+            //       -fx-border-width: 20;
+            //     }
+            //
+            // Now assume the following interactions:
+            //   1. Move the cursor over the button (:hover)
+            //   2. Press the mouse button (:hover:pressed)
+            //   3. Release the mouse button (:hover)
+            //   4. Move the cursor away from the button.
+            //
+            // When the mouse button is released (step 3), the -fx-border-width sub-property transitions
+            // from 20 (the current value) to 5 (the target value). Then, when the cursor is moved away
+            // from the button while the -fx-border-width transition is still running, we need to preserve
+            // the running transition by adding its mediator to the newly created transition controller
+            // that manages the hover->base transition. In this way, the new transition controller will
+            // continue to aggregate the effects of the pre-existing transition.
+            //
+            var transition = transitions.get(metadata);
+            var existingTimer = NodeHelper.findTransitionTimer((Node)getBean(), metadata.getProperty());
+            var existingMediator = existingTimer != null && existingTimer.getMediator()
+                instanceof StyleableObjectProperty.ComponentTransitionMediator m ? m : null;
+
+            if (existingMediator != null) {
+                if (transition == null) {
+                    existingMediator.cancel();
+                    controller.addValue(metadata, newCssValue);
+                } else if (Objects.deepEquals(newCssValue, existingMediator.endValue)) {
+                    controller.addExistingMediator(existingMediator);
+                } else {
+                    controller.addMediator(oldCssValue, newCssValue, metadata, transition);
+                }
+            } else if (transition != null) {
+                controller.addMediator(oldCssValue, newCssValue, metadata, transition);
+            } else {
+                controller.addValue(metadata, newCssValue);
             }
         }
 
-        this.origin = origin;
+        List<CssMetaData<? extends Styleable, ?>> subMetadata = metadata.getSubProperties();
+        if (subMetadata != null) {
+            for (int i = 0, max = subMetadata.size(); i < max; ++i) {
+                processComponent(controller, subMetadata.get(i), transitions, oldCssValues, newCssValues);
+            }
+        }
     }
 
     /** {@inheritDoc} */
     @Override
     public void bind(ObservableValue<? extends T> observable) {
         super.bind(observable);
-        origin = StyleOrigin.USER;
-
-        // Calling the 'bind' method always cancels a transition timer.
-        if (mediator != null) {
-            mediator.cancel(true);
-        }
+        onUserChange();
     }
 
     /** {@inheritDoc} */
     @Override
     public void set(T v) {
         super.set(v);
-
-        // Calling the 'set' method cancels the transition timer, but not if the 'set' method was
-        // directly called by the timer itself (i.e. a timer will not accidentally cancel itself).
-        // Note that indirect cancellation is still possible: a timer may fire a transition event,
-        // which could cause user code to be executed that invokes this 'set' method. In that case,
-        // the call will cancel the timer.
-        if (mediator == null || mediator.cancel(false)) {
-            origin = StyleOrigin.USER;
-        }
+        onUserChange();
     }
 
     /** {@inheritDoc} */
     @Override
     public StyleOrigin getStyleOrigin() { return origin; }
 
-    private StyleOrigin origin = null;
-    private TransitionMediatorImpl mediator = null;
+    private void onUserChange() {
+        origin = StyleOrigin.USER;
 
-    private final class TransitionMediatorImpl extends TransitionMediator {
-        private final T oldValue;
-        private final T newValue;
+        if (controller != null) {
+            controller.cancel();
+        }
+    }
 
-        TransitionMediatorImpl(T oldValue, T newValue) {
-            this.oldValue = oldValue;
-            this.newValue = newValue;
+    private StyleOrigin origin;
+    private TransitionController<T> controller;
+
+    /**
+     * Common interface for transition controllers:
+     * <ol>
+     *     <li>{@link DiscreteTransitionController}
+     *     <li>{@link InterpolatableTransitionController}
+     *     <li>{@link AggregatingTransitionController}
+     * </ol>
+     *
+     * @param <T> the property value type
+     */
+    private interface TransitionController<T> {
+        T getTargetValue();
+        void cancel();
+    }
+
+    /**
+     * Base class for transition controllers that don't support component-wise transitions.
+     */
+    private abstract class TransitionControllerBase extends TransitionMediator implements TransitionController<T> {
+        final T startValue;
+        final T endValue;
+        private T reversingAdjustedStartValue;
+
+        TransitionControllerBase(T startValue, T endValue) {
+            this.startValue = startValue;
+            this.endValue = endValue;
+            this.reversingAdjustedStartValue = startValue;
+        }
+
+        @Override
+        public void onStop() {
+            controller = null;
+        }
+
+        @Override
+        public StyleableProperty<?> getStyleableProperty() {
+            return StyleableObjectProperty.this;
+        }
+
+        @Override
+        public T getTargetValue() {
+            return endValue;
         }
 
         @Override
         @SuppressWarnings("unchecked")
+        public boolean updateReversingAdjustedStartValue(TransitionMediator existingMediator) {
+            var mediator = (TransitionControllerBase)existingMediator;
+
+            if (Objects.deepEquals(mediator.reversingAdjustedStartValue, endValue)) {
+                reversingAdjustedStartValue = mediator.endValue;
+                return true;
+            }
+
+            return false;
+        }
+    }
+
+    /**
+     * Controller for transitions of non-interpolatable values using discrete interpolation.
+     */
+    private final class DiscreteTransitionController extends TransitionControllerBase {
+        DiscreteTransitionController(T startValue, T endValue) {
+            super(startValue, endValue);
+        }
+
+        @Override
         public void onUpdate(double progress) {
-            set(progress < 1 ? ((Interpolatable<T>)oldValue).interpolate(newValue, progress) : newValue);
+            StyleableObjectProperty.super.set(progress < 0.5 ? startValue : endValue);
+        }
+    }
+
+    /**
+     * Controller for transitions of {@link Interpolatable} values.
+     */
+    private final class InterpolatableTransitionController extends TransitionControllerBase {
+        InterpolatableTransitionController(T startValue, T endValue) {
+            super(startValue, endValue);
         }
 
         @Override
-        public void onStop() {
-            // When the transition is cancelled or completed, we clear the reference to this mediator.
-            // However, when this mediator was cancelled by a reversing transition, the 'mediator' field
-            // refers to the reversing mediator, and not to this mediator. We need to be careful to only
-            // clear references to this mediator.
-            if (mediator == this) {
-                mediator = null;
+        @SuppressWarnings("unchecked")
+        public void onUpdate(double progress) {
+            StyleableObjectProperty.super.set(
+                progress < 1 ? ((Interpolatable<T>)startValue).interpolate(endValue, progress) : endValue);
+        }
+    }
+
+    /**
+     * Controller for component-wise transitions that aggregates the effects of its component transitions.
+     * <p>
+     * For each animation frame, this controller waits until all its component mediators have updated
+     * their current value, and then converts the collected component values into a new object of type
+     * {@code T} using the {@link StyleConverter} of this {@link StyleableObjectProperty}.
+     */
+    private final class AggregatingTransitionController implements TransitionController<T> {
+        private final T newValue;
+        private final Map<CssMetaData<? extends Styleable, ?>, Object> cssValues;
+        private final List<ComponentTransitionMediator<?>> mediators = new ArrayList<>(5);
+        private int remainingValues;
+
+        AggregatingTransitionController(T newValue) {
+            this.newValue = newValue;
+            this.cssValues = new HashMap<>();
+        }
+
+        @Override
+        public T getTargetValue() {
+            return newValue;
+        }
+
+        @Override
+        public void cancel() {
+            // Cancelling a mediator removes it from the 'mediators' list, so we need
+            // to make a copy of the list before we iterate on it.
+            for (var mediator : List.copyOf(mediators)) {
+                mediator.cancel();
+            }
+        }
+
+        /**
+         * Starts all transition timers managed by this controller.
+         */
+        public void run() {
+            remainingValues = mediators.size();
+            long nanoNow = Toolkit.getToolkit().getPrimaryTimer().nanos();
+
+            // Starting a transition may result in instant cancellation (if the combined duration
+            // is zero), which would instantly remove the mediator from the list. This is why we
+            // need to make a copy of the 'mediators' list before we iterate on it.
+            for (var mediator : List.copyOf(mediators)) {
+                mediator.run(nanoNow);
+            }
+        }
+
+        /**
+         * Adds a component value to the value cache.
+         *
+         * @param metadata the {@code CssMetaData} of the component
+         * @param value the new value
+         */
+        public void addValue(CssMetaData<? extends Styleable, ?> metadata, Object value) {
+            cssValues.put(metadata, value);
+        }
+
+        /**
+         * Adds a new component transition mediator to this controller.
+         *
+         * @param oldValue the old component value
+         * @param newValue the new component value
+         * @param metadata the component metadata
+         * @param transition the transition definition
+         * @param <U> the component value type
+         */
+        public <U> void addMediator(U oldValue, U newValue,
+                                    CssMetaData<? extends Styleable, ?> metadata,
+                                    TransitionDefinition transition) {
+            mediators.add(new ComponentTransitionMediator<>(oldValue, newValue, this, metadata, transition));
+        }
+
+        /**
+         * Adds an existing component transition mediator to this controller.
+         * After calling this method, the existing mediator will be associated with this controller.
+         *
+         * @param mediator the existing component transition mediator
+         * @param <U> the component value type
+         */
+        public <U> void addExistingMediator(ComponentTransitionMediator<U> mediator) {
+            mediator.associatedController = this;
+            mediators.add(mediator);
+        }
+
+        /**
+         * This method is called when a component transition mediator updates its current value.
+         * When all component values have been collected, they are converted to an object of type
+         * {@code T} using the {@link StyleConverter} of this {@link StyleableObjectProperty}.
+         *
+         * @param metadata the {@code CssMetaData} of the component
+         * @param value the new value
+         */
+        public void onUpdate(CssMetaData<? extends Styleable, ?> metadata, Object value) {
+            cssValues.put(metadata, value);
+
+            if (--remainingValues == 0) {
+                remainingValues = mediators.size();
+                StyleableObjectProperty.super.set(getCssMetaData().getConverter().convert(cssValues));
             }
         }
 
+        /**
+         * This method is called when a component transition mediator is stopped.
+         *
+         * @param mediator the component transition mediator
+         */
+        public void onStop(ComponentTransitionMediator<?> mediator) {
+            for (int i = 0, max = mediators.size(); i < max; ++i) {
+                if (mediators.get(i) == mediator) {
+                    mediators.remove(i);
+                    break;
+                }
+            }
+
+            if (mediators.isEmpty()) {
+                StyleableObjectProperty.this.controller = null;
+            }
+        }
+    }
+
+    /**
+     * Transition mediator for CSS sub-properties.
+     * <p>
+     * This transition mediator does not interact with the {@link StyleableObjectProperty} directly,
+     * but instead feeds its effects into the associated {@link AggregatingTransitionController}.
+     *
+     * @param <U> the type of the sub-property
+     */
+    private final class ComponentTransitionMediator<U> extends TransitionMediator {
+        private final U startValue;
+        private final U endValue;
+        private final CssMetaData<? extends Styleable, ?> metadata;
+        private final TransitionDefinition definition;
+        private AggregatingTransitionController associatedController;
+        private U reversingAdjustedStartValue;
+        private boolean running;
+
+        ComponentTransitionMediator(U startValue, U endValue,
+                                    AggregatingTransitionController associatedController,
+                                    CssMetaData<? extends Styleable, ?> metadata,
+                                    TransitionDefinition definition) {
+            this.startValue = startValue;
+            this.endValue = endValue;
+            this.reversingAdjustedStartValue = startValue;
+            this.associatedController = associatedController;
+            this.metadata = metadata;
+            this.definition = definition;
+        }
+
         @Override
         public StyleableProperty<?> getStyleableProperty() {
             return StyleableObjectProperty.this;
         }
+
+        public void run(long now) {
+            if (!running) {
+                running = true;
+                run(definition, metadata.getProperty(), now);
+            }
+        }
+
+        @Override
+        @SuppressWarnings({"unchecked", "rawtypes"})
+        public void onUpdate(double progress) {
+            Object value;
+
+            if (progress < 1) {
+                if (startValue instanceof Interpolatable[][] ov && endValue instanceof Interpolatable[][] nv) {
+                    value = InterpolationUtils.interpolateArraySeriesPairwise(ov, nv, progress);
+                } else if (startValue instanceof Interpolatable[] ov && endValue instanceof Interpolatable[] nv) {
+                    value = InterpolationUtils.interpolateArraysPairwise(ov, nv, progress);
+                } else if (startValue instanceof Interpolatable && endValue instanceof Interpolatable) {
+                    value = ((Interpolatable<U>)startValue).interpolate(endValue, progress);
+                } else {
+                    value = InterpolationUtils.interpolateDiscrete(startValue, endValue, progress);
+                }
+            } else {
+                value = endValue;
+            }
+
+            associatedController.onUpdate(metadata, value);
+        }
+
+        @Override
+        public void onStop() {
+            associatedController.onStop(this);
+        }
+
+        @Override
+        @SuppressWarnings("unchecked")
+        public boolean updateReversingAdjustedStartValue(TransitionMediator existingMediator) {
+            var mediator = (ComponentTransitionMediator<U>)existingMediator;
+
+            if (Objects.deepEquals(mediator.reversingAdjustedStartValue, endValue)) {
+                reversingAdjustedStartValue = mediator.endValue;
+                return true;
+            }
+
+            return false;
+        }
     }
 }
diff --git a/modules/javafx.graphics/src/main/java/javafx/css/StyleableStringProperty.java b/modules/javafx.graphics/src/main/java/javafx/css/StyleableStringProperty.java
index e3f69908d72..afaebdd83e7 100644
--- a/modules/javafx.graphics/src/main/java/javafx/css/StyleableStringProperty.java
+++ b/modules/javafx.graphics/src/main/java/javafx/css/StyleableStringProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,14 @@
 
 package javafx.css;
 
+import com.sun.javafx.css.TransitionDefinition;
+import com.sun.javafx.css.TransitionMediator;
+import com.sun.javafx.scene.NodeHelper;
+import com.sun.javafx.tk.Toolkit;
 import javafx.beans.property.StringPropertyBase;
 import javafx.beans.value.ObservableValue;
+import javafx.scene.Node;
+import java.util.Objects;
 
 /**
  * This class extends {@code StringPropertyBase} and provides a partial
@@ -64,9 +70,24 @@ public StyleableStringProperty(String initialValue) {
 
     /** {@inheritDoc} */
     @Override
-    public void applyStyle(StyleOrigin origin, String v) {
-        // call set here in case the set method is overriden
-        set(v);
+    public void applyStyle(StyleOrigin origin, String newValue) {
+        // If this.origin == null, we're setting the value for the first time.
+        // No transition should be started in this case.
+        TransitionDefinition transition =
+            this.origin != null && getBean() instanceof Node node ?
+            NodeHelper.findTransitionDefinition(node, getCssMetaData()) : null;
+
+        if (transition == null) {
+            set(newValue);
+        } else if (mediator == null || !Objects.equals(newValue, mediator.endValue)) {
+            // We only start a new transition if the new target value is different from the target
+            // value of the existing transition. This scenario can sometimes happen when a CSS value
+            // is redundantly applied, which would cause unexpected animations if we allowed the new
+            // transition to interrupt the existing transition.
+            mediator = new TransitionMediatorImpl(get(), newValue); // needs to be set before calling run()
+            mediator.run(transition, getCssMetaData().getProperty(), Toolkit.getToolkit().getPrimaryTimer().nanos());
+        }
+
         this.origin = origin;
     }
 
@@ -74,21 +95,67 @@ public void applyStyle(StyleOrigin origin, String v) {
     @Override
     public void bind(ObservableValue<? extends String> observable) {
         super.bind(observable);
-        origin = StyleOrigin.USER;
+        onUserChange();
     }
 
     /** {@inheritDoc} */
     @Override
     public void set(String v) {
         super.set(v);
-        origin = StyleOrigin.USER;
+        onUserChange();
     }
 
-
     /** {@inheritDoc} */
     @Override
     public StyleOrigin getStyleOrigin() { return origin; }
 
-    private StyleOrigin origin = null;
+    private void onUserChange() {
+        origin = StyleOrigin.USER;
+
+        if (mediator != null) {
+            mediator.cancel();
+        }
+    }
+
+    private StyleOrigin origin;
+    private TransitionMediatorImpl mediator;
 
+    private final class TransitionMediatorImpl extends TransitionMediator {
+        final String startValue;
+        final String endValue;
+        private String reversingAdjustedStartValue;
+
+        TransitionMediatorImpl(String startValue, String endValue) {
+            this.startValue = startValue;
+            this.endValue = endValue;
+            this.reversingAdjustedStartValue = startValue;
+        }
+
+        @Override
+        public void onUpdate(double progress) {
+            StyleableStringProperty.super.set(progress < 0.5 ? startValue : endValue);
+        }
+
+        @Override
+        public void onStop() {
+            mediator = null;
+        }
+
+        @Override
+        public StyleableProperty<?> getStyleableProperty() {
+            return StyleableStringProperty.this;
+        }
+
+        @Override
+        public boolean updateReversingAdjustedStartValue(TransitionMediator existingMediator) {
+            var mediator = (TransitionMediatorImpl)existingMediator;
+
+            if (Objects.equals(mediator.reversingAdjustedStartValue, endValue)) {
+                reversingAdjustedStartValue = mediator.endValue;
+                return true;
+            }
+
+            return false;
+        }
+    }
 }
diff --git a/modules/javafx.graphics/src/main/java/javafx/css/TransitionEvent.java b/modules/javafx.graphics/src/main/java/javafx/css/TransitionEvent.java
index 7914f358cd9..0e01dd0d0db 100644
--- a/modules/javafx.graphics/src/main/java/javafx/css/TransitionEvent.java
+++ b/modules/javafx.graphics/src/main/java/javafx/css/TransitionEvent.java
@@ -29,6 +29,7 @@
 import javafx.event.Event;
 import javafx.event.EventType;
 import javafx.scene.Node;
+import javafx.scene.layout.Region;
 import javafx.util.Duration;
 import java.util.Objects;
 
@@ -83,6 +84,11 @@ public final class TransitionEvent extends Event {
      */
     private final StyleableProperty<?> property;
 
+    /**
+     * The name of the CSS property or sub-property that is targeted by the transition.
+     */
+    private final String propertyName;
+
     /**
      * The time that has elapsed since the transition has entered its active period,
      * not including the time spent in the delay phase.
@@ -96,12 +102,32 @@ public final class TransitionEvent extends Event {
      * @param property the {@code StyleableProperty} that is targeted by the transition
      * @param elapsedTime the time that has elapsed since the transition has entered its active period
      * @throws NullPointerException if {@code eventType}, {@code property} or {@code elapsedTime} is {@code null}
+     * @deprecated use {@link #TransitionEvent(EventType, StyleableProperty, String, Duration)} instead
+     */
+    @Deprecated(since = "24", forRemoval = true)
+    public TransitionEvent(EventType<? extends Event> eventType,
+                           StyleableProperty<?> property,
+                           Duration elapsedTime) {
+        this(eventType, property, property.getCssMetaData().getProperty(), elapsedTime);
+    }
+
+    /**
+     * Creates a new instance of the {@code TransitionEvent} class.
+     *
+     * @param eventType the event type
+     * @param property the {@code StyleableProperty} that is targeted by the transition
+     * @param propertyName the name of the targeted CSS property or sub-property
+     * @param elapsedTime the time that has elapsed since the transition has entered its active period
+     * @throws NullPointerException if any of the arguments is {@code null}
+     * @since 24
      */
     public TransitionEvent(EventType<? extends Event> eventType,
                            StyleableProperty<?> property,
+                           String propertyName,
                            Duration elapsedTime) {
         super(Objects.requireNonNull(eventType, "eventType cannot be null"));
         this.property = Objects.requireNonNull(property, "property cannot be null");
+        this.propertyName = Objects.requireNonNull(propertyName, "propertyName cannot be null");
         this.elapsedTime = Objects.requireNonNull(elapsedTime, "elapsedTime cannot be null");
     }
 
@@ -114,6 +140,21 @@ public StyleableProperty<?> getProperty() {
         return property;
     }
 
+    /**
+     * Gets the name of the CSS property or sub-property that is targeted by the transition.
+     * <p>
+     * The name of the CSS property under transition can be a long-hand property name, which is different
+     * from the name returned by {@link CssMetaData#getProperty()} of the {@code StyleableProperty} that
+     * is targeted by the transition. For example, if a transition targets {@link Region#borderProperty()},
+     * the name of the CSS property might be {@code -fx-border-color}, {@code -fx-border-radius}, etc.
+     *
+     * @return the CSS property or sub-property name
+     * @since 24
+     */
+    public String getPropertyName() {
+        return propertyName;
+    }
+
     /**
      * Gets the time that has elapsed since the transition has entered its active period,
      * not including the time spent in the delay phase.
diff --git a/modules/javafx.graphics/src/main/java/javafx/geometry/Insets.java b/modules/javafx.graphics/src/main/java/javafx/geometry/Insets.java
index c2b5b5467f5..232a48773bc 100644
--- a/modules/javafx.graphics/src/main/java/javafx/geometry/Insets.java
+++ b/modules/javafx.graphics/src/main/java/javafx/geometry/Insets.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,42 +25,53 @@
 
  package javafx.geometry;
 
+ import com.sun.javafx.util.InterpolationUtils;
+ import javafx.animation.Interpolatable;
  import javafx.beans.NamedArg;
+ import java.util.Objects;
 
 /**
  * A set of inside offsets for the 4 side of a rectangular area
  * @since JavaFX 2.0
  */
-public class Insets {
+public class Insets implements Interpolatable<Insets> {
     /**
      * Empty insets. An {@code Insets} instance with all offsets equal to zero.
      */
     public static final Insets EMPTY = new Insets(0, 0, 0, 0);
 
     /**
-     * The inset on the top side
+     * The inset on the top side.
+     *
      * @return the inset on the top side
+     * @interpolationType <a href="../animation/Interpolatable.html#linear">linear</a>
      */
     public final double getTop() { return top; }
     private double top;
 
     /**
-     * The inset on the right side
+     * The inset on the right side.
+     *
      * @return the inset on the right side
+     * @interpolationType <a href="../animation/Interpolatable.html#linear">linear</a>
      */
     public final double getRight() { return right; }
     private double right;
 
     /**
-     * The inset on the bottom side
+     * The inset on the bottom side.
+     *
      * @return the inset on the bottom side
+     * @interpolationType <a href="../animation/Interpolatable.html#linear">linear</a>
      */
     public final double getBottom() { return bottom; }
     private double bottom;
 
     /**
-     * The inset on the left side
+     * The inset on the left side.
+     *
      * @return the inset on the left side
+     * @interpolationType <a href="../animation/Interpolatable.html#linear">linear</a>
      */
     public final double getLeft() { return left; }
     private double left;
@@ -99,6 +110,31 @@ public Insets(@NamedArg("topRightBottomLeft") double topRightBottomLeft) {
         this.left = topRightBottomLeft;
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @throws NullPointerException {@inheritDoc}
+     * @since 24
+     */
+    @Override
+    public Insets interpolate(Insets endValue, double t) {
+        Objects.requireNonNull(endValue, "endValue cannot be null");
+
+        if (t <= 0 || equals(endValue)) {
+            return this;
+        }
+
+        if (t >= 1) {
+            return endValue;
+        }
+
+        return new Insets(
+            InterpolationUtils.interpolate(top, endValue.top, t),
+            InterpolationUtils.interpolate(right, endValue.right, t),
+            InterpolationUtils.interpolate(bottom, endValue.bottom, t),
+            InterpolationUtils.interpolate(left, endValue.left, t));
+    }
+
     /**
      * Indicates whether some other object is "equal to" this one.
      *
diff --git a/modules/javafx.graphics/src/main/java/javafx/geometry/Point2D.java b/modules/javafx.graphics/src/main/java/javafx/geometry/Point2D.java
index 6437f625fde..25e71b581fa 100644
--- a/modules/javafx.graphics/src/main/java/javafx/geometry/Point2D.java
+++ b/modules/javafx.graphics/src/main/java/javafx/geometry/Point2D.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
 
 import javafx.animation.Interpolatable;
 import javafx.beans.NamedArg;
+import java.util.Objects;
 
 
 // PENDING_DOC_REVIEW of this whole class
@@ -51,7 +52,9 @@ public class Point2D implements Interpolatable<Point2D> {
 
     /**
      * The x coordinate.
+     *
      * @return the x coordinate
+     * @interpolationType <a href="../animation/Interpolatable.html#linear">linear</a>
      */
     public final double getX() {
         return x;
@@ -66,7 +69,9 @@ public final double getX() {
 
     /**
      * The y coordinate.
+     *
      * @return the y coordinate
+     * @interpolationType <a href="../animation/Interpolatable.html#linear">linear</a>
      */
     public final double getY() {
         return y;
@@ -358,10 +363,13 @@ public Point3D crossProduct(Point2D vector) {
     /**
      * {@inheritDoc}
      *
+     * @throws NullPointerException {@inheritDoc}
      * @since 13
      */
     @Override
     public Point2D interpolate(Point2D endValue, double t) {
+        Objects.requireNonNull(endValue, "endValue cannot be null");
+
         if (t <= 0.0) return this;
         if (t >= 1.0) return endValue;
         return new Point2D(
diff --git a/modules/javafx.graphics/src/main/java/javafx/geometry/Point3D.java b/modules/javafx.graphics/src/main/java/javafx/geometry/Point3D.java
index 1d0ba7a809b..37dae731bdf 100644
--- a/modules/javafx.graphics/src/main/java/javafx/geometry/Point3D.java
+++ b/modules/javafx.graphics/src/main/java/javafx/geometry/Point3D.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
 
 import javafx.animation.Interpolatable;
 import javafx.beans.NamedArg;
+import java.util.Objects;
 
 
 // PENDING_DOC_REVIEW of this whole class
@@ -52,7 +53,9 @@ public class Point3D implements Interpolatable<Point3D> {
 
     /**
      * The x coordinate.
+     *
      * @return the x coordinate
+     * @interpolationType <a href="../animation/Interpolatable.html#linear">linear</a>
      */
     public final double getX() {
         return x;
@@ -67,7 +70,9 @@ public final double getX() {
 
     /**
      * The y coordinate.
+     *
      * @return the y coordinate
+     * @interpolationType <a href="../animation/Interpolatable.html#linear">linear</a>
      */
     public final double getY() {
         return y;
@@ -82,7 +87,9 @@ public final double getY() {
 
     /**
      * The z coordinate.
+     *
      * @return the z coordinate
+     * @interpolationType <a href="../animation/Interpolatable.html#linear">linear</a>
      */
     public final double getZ() {
         return z;
@@ -396,10 +403,13 @@ public Point3D crossProduct(Point3D vector) {
     /**
      * {@inheritDoc}
      *
+     * @throws NullPointerException {@inheritDoc}
      * @since 13
      */
     @Override
     public Point3D interpolate(Point3D endValue, double t) {
+        Objects.requireNonNull(endValue, "endValue cannot be null");
+
         if (t <= 0.0) return this;
         if (t >= 1.0) return endValue;
         return new Point3D(
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/Node.java b/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
index fe3f55b1460..00064b6a6fe 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
@@ -634,32 +634,42 @@ public void requestFocusVisible(Node node) {
 
             @Override
             public StyleableProperty<TransitionDefinition[]> getTransitionProperty(Node node) {
-                if (node.transitions == null) {
-                    node.transitions = node.new TransitionDefinitionCollection();
+                var definitions = node.miscProperties != null ? node.miscProperties.transitionDefinitions : null;
+                if (definitions == null) {
+                    definitions = new TransitionDefinitionCollection();
+                    node.getMiscProperties().transitionDefinitions = definitions;
                 }
 
-                return node.transitions;
+                return definitions;
             }
 
             @Override
             public TransitionDefinition findTransitionDefinition(
                     Node node, CssMetaData<? extends Styleable, ?> metadata) {
-                return node.transitions == null ? null : node.transitions.find(metadata);
+                var definitions = node.miscProperties != null ? node.miscProperties.transitionDefinitions : null;
+                return definitions == null ? null : definitions.find(metadata);
             }
 
             @Override
-            public void addTransitionTimer(Node node, TransitionTimer timer) {
-                node.addTransitionTimer(timer);
+            public Map<CssMetaData<? extends Styleable, ?>, TransitionDefinition> findTransitionDefinitions(
+                    Node node, CssMetaData<? extends Styleable, ?> metadata) {
+                var definitions = node.miscProperties != null ? node.miscProperties.transitionDefinitions : null;
+                return definitions == null ? null : definitions.findAll(metadata);
+            }
+
+            @Override
+            public void addTransitionTimer(Node node, String propertyName, TransitionTimer timer) {
+                node.addTransitionTimer(propertyName, timer);
             }
 
             @Override
-            public void removeTransitionTimer(Node node, TransitionTimer timer) {
-                node.removeTransitionTimer(timer);
+            public void removeTransitionTimer(Node node, String propertyName) {
+                node.removeTransitionTimer(propertyName);
             }
 
             @Override
-            public TransitionTimer findTransitionTimer(Node node, Property<?> property) {
-                return node.findTransitionTimer(property);
+            public TransitionTimer findTransitionTimer(Node node, String propertyName) {
+                return node.findTransitionTimer(propertyName);
             }
         });
     }
@@ -6784,6 +6794,8 @@ private final class MiscProperties {
         private ObjectProperty<InputMethodRequests> inputMethodRequests;
         private BooleanProperty mouseTransparent;
         private DoubleProperty viewOrder;
+        private TransitionTimerCollection transitionTimers;
+        private TransitionDefinitionCollection transitionDefinitions;
 
         public double getViewOrder() {
             return (viewOrder == null) ? DEFAULT_VIEW_ORDER : viewOrder.get();
@@ -8970,7 +8982,67 @@ public final void fireEvent(Event event) {
      *                                                                         *
      **************************************************************************/
 
-    private List<TransitionTimer> transitionTimers;
+    /**
+     * The list of running transition timers for this node, implemented as a mapping of
+     * CSS property names to {@link TransitionTimer} instances.
+     */
+    private static class TransitionTimerCollection extends HashMap<String, TransitionTimer> {
+        TransitionTimerCollection() {
+            super(4);
+        }
+
+        /**
+         * Returns all transition timers for the specified {@code StyleableProperty},
+         * including all of its sub-properties.
+         *
+         * @param property the {@code StyleableProperty}
+         * @return a mapping of CSS property names to {@code TransitionTimer} instances
+         */
+        public Map<String, TransitionTimer> getAll(StyleableProperty<?> property) {
+            if (isEmpty()) {
+                return Map.of();
+            }
+
+            var result = collectTransitionTimers(property, null);
+            return result != null ? result : Map.of();
+        }
+
+        /**
+         * Finds all transition timers for the specified {@code StyleableProperty}, including all
+         * of its sub-properties. This method does not allocate a new {@code Map} for the common
+         * case where no transitions are found.
+         *
+         * @param property the {@code StyleableProperty}
+         * @param result this argument is an implementation detail, callers must specify {@code null}
+         * @return a mapping of CSS property names to {@code TransitionTimer} instances
+         */
+        private Map<String, TransitionTimer> collectTransitionTimers(
+                StyleableProperty<?> property, Map<String, TransitionTimer> result) {
+            CssMetaData<? extends Styleable, ?> metadata = property.getCssMetaData();
+            String propertyName = metadata.getProperty();
+            TransitionTimer timer = get(propertyName);
+            if (timer != null) {
+                if (result == null) {
+                    // We expect the number of concurrent transitions for any given node to be
+                    // quite small in most cases, six mappings should be enough.
+                    result = HashMap.newHashMap(6);
+                }
+
+                result.put(propertyName, timer);
+            }
+
+            List<CssMetaData<? extends Styleable, ?>> subMetadata = metadata.getSubProperties();
+            if (subMetadata == null) {
+                return result;
+            }
+
+            for (int i = 0, max = subMetadata.size(); i < max; ++i) {
+                result = collectTransitionTimers(property, result);
+            }
+
+            return result;
+        }
+    }
 
     /**
      * Called by animatable {@link StyleableProperty} implementations in order to register
@@ -8979,12 +9051,14 @@ public final void fireEvent(Event event) {
      *
      * @param timer the transition timer
      */
-    private void addTransitionTimer(TransitionTimer timer) {
+    private void addTransitionTimer(String propertyName, TransitionTimer timer) {
+        var transitionTimers = miscProperties != null ? miscProperties.transitionTimers : null;
         if (transitionTimers == null) {
-            transitionTimers = new ArrayList<>(4);
+            transitionTimers = new TransitionTimerCollection();
+            getMiscProperties().transitionTimers = transitionTimers;
         }
 
-        transitionTimers.add(timer);
+        transitionTimers.put(propertyName, timer);
     }
 
     /**
@@ -8994,35 +9068,39 @@ private void addTransitionTimer(TransitionTimer timer) {
      *
      * @param timer the transition timer
      */
-    private void removeTransitionTimer(TransitionTimer timer) {
+    private void removeTransitionTimer(String propertyName) {
+        var transitionTimers = miscProperties != null ? miscProperties.transitionTimers : null;
         if (transitionTimers != null) {
-            transitionTimers.remove(timer);
+            transitionTimers.remove(propertyName);
+
+            if (transitionTimers.isEmpty()) {
+                miscProperties.transitionTimers = null;
+            }
         }
     }
 
     /**
-     * Finds the transition timer that targets the specified {@code property}.
+     * Finds the transition timer that targets the specified {@code propertyName}.
      *
-     * @param property the targeted property
+     * @param propertyName the CSS name of the targeted property
      * @return the transition timer, or {@code null} if the property is not
      *         targeted by a transition timer
      */
-    private TransitionTimer findTransitionTimer(Property<?> property) {
-        if (transitionTimers == null) {
-            return null;
-        }
-
-        for (int i = 0, max = transitionTimers.size(); i < max; ++i) {
-            TransitionTimer timer = transitionTimers.get(i);
-
-            // We use an identity comparison here because we're looking for the exact property
-            // instance that was targeted by the transition timer on this node.
-            if (timer.getTargetProperty() == property) {
-                return timer;
-            }
-        }
+    private TransitionTimer findTransitionTimer(String propertyName) {
+        var transitionTimers = miscProperties != null ? miscProperties.transitionTimers : null;
+        return transitionTimers != null ? transitionTimers.get(propertyName) : null;
+    }
 
-        return null;
+    /**
+     * Finds all transition timers that target the specified {@code property}.
+     *
+     * @param property the targeted property
+     * @return a mapping of property names to transition timers, or an empty map if the
+     *         property is not targeted by any transition timers
+     */
+    private Map<String, TransitionTimer> findTransitionTimers(StyleableProperty<?> property) {
+        var transitionTimers = miscProperties != null ? miscProperties.transitionTimers : null;
+        return transitionTimers != null ? transitionTimers.getAll(property) : Map.of();
     }
 
     /**
@@ -9031,20 +9109,21 @@ private TransitionTimer findTransitionTimer(Property<?> property) {
      */
     // package-private for testing
     void completeTransitionTimers() {
+        var transitionTimers = miscProperties != null ? miscProperties.transitionTimers : null;
         if (transitionTimers == null || transitionTimers.isEmpty()) {
             return;
         }
 
-        // Make a copy of the list, because completing the timers causes them to be removed
-        // from the list, which would result in a ConcurrentModificationException.
-        for (TransitionTimer timer : List.copyOf(transitionTimers)) {
+        // Make a copy of the timers, because completing the timers causes them to be removed
+        // from the map, which would result in a ConcurrentModificationException.
+        for (TransitionTimer timer : List.copyOf(transitionTimers.values())) {
             timer.complete();
         }
     }
 
     // package-private for testing
-    List<TransitionTimer> getTransitionTimers() {
-        return transitionTimers;
+    Map<String, TransitionTimer> getTransitionTimers() {
+        return miscProperties != null ? miscProperties.transitionTimers : null;
     }
 
     /**
@@ -9055,20 +9134,21 @@ List<TransitionTimer> getTransitionTimers() {
      * the CSS subsystem when a property value is changed. Explicit property changes, such as
      * by calling {@link Property#setValue(Object)}, do not trigger an animated transition.
      */
-    private class TransitionDefinitionCollection
+    private static class TransitionDefinitionCollection
             extends ArrayList<TransitionDefinition>
             implements StyleableProperty<TransitionDefinition[]> {
         private StyleOrigin origin;
 
         /**
          * Returns the transition for the property referenced by the specified CSS metadata,
-         * or {@code null} if no transition was found.
+         * or {@code null} if no transition was found. This method does not account for
+         * sub-properties of the specified property.
          *
          * @param metadata the CSS metadata of the property
          * @return the {@code TransitionDefinition} specified for the property referenced by the
          *         CSS metadata, {@code null} otherwise
          */
-        TransitionDefinition find(CssMetaData<? extends Styleable, ?> metadata) {
+        public TransitionDefinition find(CssMetaData<? extends Styleable, ?> metadata) {
             int size = size();
             if (size == 0) {
                 return null;
@@ -9087,22 +9167,69 @@ TransitionDefinition find(CssMetaData<? extends Styleable, ?> metadata) {
                 }
             }
 
+            return null;
+        }
+
+        /**
+         * Returns all transitions for the property referenced by the specified CSS metadata,
+         * including all of its sub-properties.
+         *
+         * @param metadata the CSS metadata of the property
+         * @return a mapping of CSS metadata instances to {@code TransitionDefinition} instances
+         */
+        public Map<CssMetaData<? extends Styleable, ?>, TransitionDefinition> findAll(
+                CssMetaData<? extends Styleable, ?> metadata) {
+            if (isEmpty()) {
+                return Map.of();
+            }
+
+            var result = collectTransitions(metadata, null);
+            return result != null ? result : Map.of();
+        }
+
+        /**
+         * Finds all transition definitions for the property referenced by the specified CSS metadata,
+         * including all of its sub-properties. This method does not allocate a new {@code Map} for the
+         * common case where no transitions are found.
+         *
+         * @param metadata the CSS metadata of the property
+         * @param result this argument is an implementation detail, callers must specify {@code null}
+         * @return a mapping of CSS metadata instances to {@code TransitionDefinition} instances
+         */
+        private Map<CssMetaData<? extends Styleable, ?>, TransitionDefinition> collectTransitions(
+                CssMetaData<? extends Styleable, ?> metadata,
+                Map<CssMetaData<? extends Styleable, ?>, TransitionDefinition> result) {
+            // We look for a matching transition in reverse, since multiple transitions might be specified
+            // for the same property. In this case, the last transition takes precedence.
+            for (int max = size(), i = max - 1; i >= 0; --i) {
+                TransitionDefinition transition = get(i);
+
+                boolean selected = TransitionDefinitionConverter.PROPERTY_ALL.equals(transition.propertyName())
+                        || metadata.getProperty().equals(transition.propertyName());
+
+                if (selected) {
+                    if (result == null) {
+                        // We expect the number of concurrent transitions for any given node to be
+                        // quite small in most cases, six mappings should be enough.
+                        result = HashMap.newHashMap(6);
+                    }
+
+                    result.put(metadata, transition);
+                    break;
+                }
+            }
+
             List<CssMetaData<? extends Styleable, ?>> subMetadata = metadata.getSubProperties();
             if (subMetadata == null) {
-                return null;
+                return result;
             }
 
-            // We also need to search for matching sub-properties, since a transition might be defined
-            // for a sub-property (for example, '-fx-background-color') but must be applied to the base
-            // property (-fx-background).
+            // We also need to search for transitions defined on all sub-properties of the current property.
             for (int i = 0, max = subMetadata.size(); i < max; ++i) {
-                TransitionDefinition transition = find(subMetadata.get(i));
-                if (transition != null) {
-                    return transition;
-                }
+                result = collectTransitions(subMetadata.get(i), result);
             }
 
-            return null;
+            return result;
         }
 
         @Override
@@ -9134,15 +9261,9 @@ public CssMetaData<? extends Styleable, TransitionDefinition[]> getCssMetaData()
         }
     }
 
-    private TransitionDefinitionCollection transitions;
-
     // package-private for testing
     List<TransitionDefinition> getTransitionDefinitions() {
-        if (transitions == null) {
-            transitions = new TransitionDefinitionCollection();
-        }
-
-        return transitions;
+        return miscProperties != null ? miscProperties.transitionDefinitions : null;
     }
 
 
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/layout/Background.java b/modules/javafx.graphics/src/main/java/javafx/scene/layout/Background.java
index 7b36cd0c7cd..3d0de802cb1 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/layout/Background.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/layout/Background.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 
 package javafx.scene.layout;
 
+import javafx.animation.Interpolatable;
 import javafx.beans.NamedArg;
 import javafx.css.CssMetaData;
 import javafx.css.Styleable;
@@ -36,6 +37,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import com.sun.javafx.UnmodifiableArrayList;
 import com.sun.javafx.css.SubCssMetaData;
 import javafx.css.converter.InsetsConverter;
@@ -47,6 +49,7 @@
 import com.sun.javafx.scene.layout.region.RepeatStruct;
 import com.sun.javafx.scene.layout.region.RepeatStructConverter;
 import com.sun.javafx.tk.Toolkit;
+import com.sun.javafx.util.InterpolationUtils;
 
 /**
  * The Background of a {@link Region}. A Background is an immutable object which
@@ -70,7 +73,7 @@
  * @since JavaFX 8.0
  */
 @SuppressWarnings("unchecked")
-public final class Background {
+public final class Background implements Interpolatable<Background> {
     static final CssMetaData<Node,Paint[]> BACKGROUND_COLOR =
             new SubCssMetaData<>("-fx-background-color",
                     PaintConverter.SequenceConverter.getInstance(),
@@ -136,7 +139,9 @@ public final class Background {
      * The list of BackgroundFills which together define the filled portion
      * of this Background. This List is unmodifiable and immutable. It
      * will never be null. The elements of this list will also never be null.
+     *
      * @return the list of BackgroundFills
+     * @interpolationType <a href="../../animation/Interpolatable.html#pairwise">pairwise</a>
      */
     public final List<BackgroundFill> getFills() { return fills; }
     final List<BackgroundFill> fills;
@@ -145,7 +150,9 @@ public final class Background {
      * The list of BackgroundImages which together define the image portion
      * of this Background. This List is unmodifiable and immutable. It
      * will never be null. The elements of this list will also never be null.
+     *
      * @return the list of BackgroundImages
+     * @interpolationType <a href="../../animation/Interpolatable.html#pairwise">pairwise</a>
      */
     public final List<BackgroundImage> getImages() { return images; }
     final List<BackgroundImage> images;
@@ -157,7 +164,9 @@ public final class Background {
      * the distance from the edge of the Region outward. Any BackgroundImages
      * which would extend beyond the outsets will be clipped. Only the
      * BackgroundFills contribute to the outsets.
+     *
      * @return the outsets
+     * @interpolationType the intermediate value is derived from {@link #getFills() fills}
      */
     public final Insets getOutsets() { return outsets; }
     final Insets outsets;
@@ -244,9 +253,9 @@ public Background(final @NamedArg("fills") List<BackgroundFill> fills, final @Na
         // to be auto-generated, because otherwise the types of the fills and images
         // properties didn't match the types of the array based constructor parameters.
         // So a Builder will use this constructor, while the CSS engine uses the
-        // array based constructor (for speed).
-        this(fills == null ? null : fills.toArray(new BackgroundFill[fills.size()]),
-             images == null ? null : images.toArray(new BackgroundImage[images.size()]));
+        // array based constructor.
+        this(fills != null ? UnmodifiableArrayList.copyOfNullFiltered(fills) : List.of(),
+             images != null ? UnmodifiableArrayList.copyOfNullFiltered(images) : List.of(), 0);
     }
 
     /**
@@ -264,49 +273,56 @@ public Background(final @NamedArg("fills") List<BackgroundFill> fills, final @Na
      *                  final List of images. A null array becomes an empty List.
      */
     public Background(final @NamedArg("fills") BackgroundFill[] fills, final @NamedArg("images") BackgroundImage[] images) {
+        this(fills != null ? UnmodifiableArrayList.copyOfNullFiltered(fills) : List.of(),
+             images != null ? UnmodifiableArrayList.copyOfNullFiltered(images) : List.of(), 0);
+    }
+
+    /**
+     * Creates a new Background with the specified fills and images.
+     * This constructor requires that both lists do not contain null values, and that the lists
+     * are immutable. The purpose of this constructor is to prevent an unnecessary array creation
+     * when the caller already knows that the specified lists satisfy the non-null precondition
+     * and preserve the immutability invariant.
+     *
+     * @param fills the fills, not {@code null}
+     * @param images the images, not {@code null}
+     */
+    private Background(List<BackgroundFill> fills, List<BackgroundImage> images, int ignored) {
+        Objects.requireNonNull(fills, "fills cannot be null");
+        Objects.requireNonNull(images, "images cannot be null");
+
         // The cumulative insets
         double outerTop = 0, outerRight = 0, outerBottom = 0, outerLeft = 0;
         boolean hasPercentOpaqueInsets = false;
         boolean hasPercentFillRadii = false;
         boolean opaqueFill = false;
 
-        // If the fills is empty or null then we know we can just use the shared
-        // immutable empty list from Collections.
-        if (fills == null || fills.length == 0) {
-            this.fills = Collections.emptyList();
-        } else {
-            // We need to iterate over all of the supplied elements in the fills array.
-            // Each null element is ignored. Each non-null element is inspected to
-            // see if it contributes to the outsets.
-            final BackgroundFill[] noNulls = new BackgroundFill[fills.length];
-            int size = 0;
-            for (int i=0; i<fills.length; i++) {
-                final BackgroundFill fill = fills[i];
-                if (fill != null) {
-                    noNulls[size++] = fill;
-                    final Insets fillInsets = fill.getInsets();
-                    final double fillTop = fillInsets.getTop();
-                    final double fillRight = fillInsets.getRight();
-                    final double fillBottom = fillInsets.getBottom();
-                    final double fillLeft = fillInsets.getLeft();
-                    outerTop = outerTop <= fillTop ? outerTop : fillTop; // min
-                    outerRight = outerRight <= fillRight ? outerRight : fillRight; // min
-                    outerBottom = outerBottom <= fillBottom ? outerBottom : fillBottom; // min
-                    outerLeft = outerLeft <= fillLeft ? outerLeft : fillLeft; // min
-
-                    // The common case is to NOT have percent based radii
-                    final boolean b = fill.getRadii().hasPercentBasedRadii;
-                    hasPercentFillRadii |= b;
-                    if (fill.fill.isOpaque()) {
-                        opaqueFill = true;
-                        if (b) {
-                            hasPercentOpaqueInsets = true;
-                        }
-                    }
+        // We need to iterate over all of the supplied elements in the fills list.
+        // Each element is inspected to see if it contributes to the outsets.
+        for (int i = 0, max = fills.size(); i < max; i++) {
+            final BackgroundFill fill = fills.get(i);
+            final Insets fillInsets = fill.getInsets();
+            final double fillTop = fillInsets.getTop();
+            final double fillRight = fillInsets.getRight();
+            final double fillBottom = fillInsets.getBottom();
+            final double fillLeft = fillInsets.getLeft();
+            outerTop = outerTop <= fillTop ? outerTop : fillTop; // min
+            outerRight = outerRight <= fillRight ? outerRight : fillRight; // min
+            outerBottom = outerBottom <= fillBottom ? outerBottom : fillBottom; // min
+            outerLeft = outerLeft <= fillLeft ? outerLeft : fillLeft; // min
+
+            // The common case is to NOT have percent based radii
+            final boolean b = fill.getRadii().hasPercentBasedRadii;
+            hasPercentFillRadii |= b;
+            if (fill.fill.isOpaque()) {
+                opaqueFill = true;
+                if (b) {
+                    hasPercentOpaqueInsets = true;
                 }
             }
-            this.fills = new UnmodifiableArrayList<>(noNulls, size);
         }
+
+        this.fills = fills;
         hasPercentageBasedFills = hasPercentFillRadii;
 
         // This ensures that we either have outsets of 0, if all the insets were positive,
@@ -317,19 +333,7 @@ public Background(final @NamedArg("fills") BackgroundFill[] fills, final @NamedA
                 Math.max(0, -outerBottom),
                 Math.max(0, -outerLeft));
 
-        // An null or empty images array results in an empty list
-        if (images == null || images.length == 0) {
-            this.images = Collections.emptyList();
-        } else {
-            // Filter out any  null values and create an immutable array list
-            final BackgroundImage[] noNulls = new BackgroundImage[images.length];
-            int size = 0;
-            for (int i=0; i<images.length; i++) {
-                final BackgroundImage image = images[i];
-                if (image != null) noNulls[size++] = image;
-            }
-            this.images = new UnmodifiableArrayList<>(noNulls, size);
-        }
+        this.images = images;
 
         hasOpaqueFill = opaqueFill;
         if (hasPercentOpaqueInsets) {
@@ -635,6 +639,45 @@ private void computeOpaqueInsets(double width, double height, boolean firstTime,
         trbl[3] = opaqueRegionLeft;
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @throws NullPointerException {@inheritDoc}
+     * @since 24
+     */
+    @Override
+    public Background interpolate(Background endValue, double t) {
+        Objects.requireNonNull(endValue, "endValue cannot be null");
+
+        if (t <= 0) {
+            return this;
+        }
+
+        if (t >= 1) {
+            return endValue;
+        }
+
+        // interpolateListsPairwise() is implemented such that it returns existing list instances
+        // (i.e. the 'this.fills' or 'endValue.fills' arguments) as an indication that the result
+        // is shallow-equal to either of the input arguments. This allows us to very quickly detect
+        // if we can return 'this' or 'endValue' without allocating a new Background instance.
+        List<BackgroundFill> newFills = fills == endValue.fills ?
+            fills : InterpolationUtils.interpolateListsPairwise(fills, endValue.fills, t);
+
+        List<BackgroundImage> newImages = images == endValue.images ?
+            images : InterpolationUtils.interpolateListsPairwise(images, endValue.images, t);
+
+        if (newFills == fills && newImages == images) {
+            return this;
+        }
+
+        if (newFills == endValue.fills && newImages == endValue.images) {
+            return endValue;
+        }
+
+        return new Background(newFills, newImages, 0);
+    }
+
     /**
      * {@inheritDoc}
      */
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/layout/BackgroundConverter.java b/modules/javafx.graphics/src/main/java/javafx/scene/layout/BackgroundConverter.java
index 9c23e491c5c..6c3cd78aad3 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/layout/BackgroundConverter.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/layout/BackgroundConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,9 @@
 package javafx.scene.layout;
 
 import com.sun.javafx.css.StyleManager;
+import com.sun.javafx.css.SubPropertyConverter;
 import com.sun.javafx.scene.layout.region.RepeatStruct;
+import java.util.List;
 import java.util.Map;
 import javafx.css.CssMetaData;
 import javafx.css.ParsedValue;
@@ -39,15 +41,22 @@
 /**
  * Converts the CSS for -fx-background items into a Background.
  */
-class BackgroundConverter extends StyleConverter<ParsedValue[], Background> {
+class BackgroundConverter extends StyleConverter<ParsedValue[], Background>
+                          implements SubPropertyConverter<Background> {
 
     static final StyleConverter<ParsedValue[], Background> INSTANCE = new BackgroundConverter();
 
-    @Override public Background convert(Map<CssMetaData<? extends Styleable, ?>,Object> convertedValues) {
+    /**
+     * {@inheritDoc}
+     *
+     * @throws NullPointerException if {@code convertedValues} is {@code null}
+     */
+    @Override
+    public Background convert(Map<CssMetaData<? extends Styleable, ?>,Object> convertedValues) {
         final Paint[] fills = (Paint[]) convertedValues.get(Background.BACKGROUND_COLOR);
-        final String[] imageUrls = (String[]) convertedValues.get(Background.BACKGROUND_IMAGE);
+        final Object[] images = (Object[]) convertedValues.get(Background.BACKGROUND_IMAGE);
         final boolean hasFills = fills != null && fills.length > 0;
-        final boolean hasImages = imageUrls != null && imageUrls.length > 0;
+        final boolean hasImages = images != null && images.length > 0;
 
         // If there are neither background fills nor images, then there is nothing for us to construct.
         if (!hasFills && !hasImages) return null;
@@ -76,7 +85,7 @@ class BackgroundConverter extends StyleConverter<ParsedValue[], Background> {
         BackgroundImage[] backgroundImages = null;
         if (hasImages) {
             // TODO convert image urls into image objects!
-            backgroundImages = new BackgroundImage[imageUrls.length];
+            backgroundImages = new BackgroundImage[images.length];
 
             Object tmp = convertedValues.get(Background.BACKGROUND_REPEAT);
             final RepeatStruct[] repeats = tmp == null ? new RepeatStruct[0] : (RepeatStruct[]) tmp;
@@ -90,11 +99,22 @@ class BackgroundConverter extends StyleConverter<ParsedValue[], Background> {
             final int lastRepeatIndex = repeats.length - 1;
             final int lastPositionIndex = positions.length - 1;
             final int lastSizeIndex = sizes.length - 1;
-            for (int i = 0; i < imageUrls.length; i++) {
+            for (int i = 0; i < images.length; i++) {
                 // RT-21335: skip background and border images whose image url is null
-                if (imageUrls[i] == null) continue;
+                if (images[i] == null) continue;
+
+                final Image image;
+
+                // The images are either URLs (when they come from CSS) or the actual Image
+                // instances (when they come from the convertBack operation).
+                if (images[i] instanceof String url) {
+                    image = StyleManager.getInstance().getCachedImage(url);
+                } else if (images[i] instanceof Image img) {
+                    image = img;
+                } else {
+                    throw new IllegalArgumentException("Unexpected type: " + images[i].getClass().getName());
+                }
 
-                final Image image = StyleManager.getInstance().getCachedImage(imageUrls[i]);
                 if (image == null) continue;
 
                 final RepeatStruct repeat = (repeats.length > 0) ?
@@ -114,4 +134,49 @@ class BackgroundConverter extends StyleConverter<ParsedValue[], Background> {
         // and return it.
         return new Background(backgroundFills, backgroundImages);
     }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @throws NullPointerException if {@code value} is {@code null}
+     */
+    @Override
+    public Map<CssMetaData<? extends Styleable, ?>, Object> convertBack(Background value) {
+        List<BackgroundFill> fills = value.getFills();
+        int fillsCount = fills.size();
+        Paint[] backgroundColor = new Paint[fillsCount];
+        CornerRadii[] backgroundRadius = new CornerRadii[fillsCount];
+        Insets[] backgroundInsets = new Insets[fillsCount];
+
+        for (int i = 0; i < fillsCount; ++i) {
+            BackgroundFill fill = fills.get(i);
+            backgroundColor[i] = fill.getFill();
+            backgroundRadius[i] = fill.getRadii();
+            backgroundInsets[i] = fill.getInsets();
+        }
+
+        List<BackgroundImage> backgroundImages = value.getImages();
+        int imageCount = backgroundImages.size();
+        Image[] images = new Image[imageCount];
+        BackgroundPosition[] backgroundPosition = new BackgroundPosition[imageCount];
+        RepeatStruct[] backgroundRepeat = new RepeatStruct[imageCount];
+        BackgroundSize[] backgroundSize = new BackgroundSize[imageCount];
+
+        for (int i = 0; i < imageCount; ++i) {
+            BackgroundImage image = backgroundImages.get(i);
+            images[i] = image.getImage();
+            backgroundPosition[i] = image.getPosition();
+            backgroundRepeat[i] = new RepeatStruct(image.getRepeatX(), image.getRepeatY());
+            backgroundSize[i] = image.getSize();
+        }
+
+        return Map.of(
+            Background.BACKGROUND_COLOR, backgroundColor,
+            Background.BACKGROUND_IMAGE, images,
+            Background.BACKGROUND_INSETS, backgroundInsets,
+            Background.BACKGROUND_POSITION, backgroundPosition,
+            Background.BACKGROUND_RADIUS, backgroundRadius,
+            Background.BACKGROUND_REPEAT, backgroundRepeat,
+            Background.BACKGROUND_SIZE, backgroundSize);
+    }
 }
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/layout/BackgroundFill.java b/modules/javafx.graphics/src/main/java/javafx/scene/layout/BackgroundFill.java
index b61db099566..e4cd7a3d0f4 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/layout/BackgroundFill.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/layout/BackgroundFill.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,13 @@
 
 package javafx.scene.layout;
 
+import com.sun.javafx.util.InterpolationUtils;
+import javafx.animation.Interpolatable;
 import javafx.beans.NamedArg;
 import javafx.geometry.Insets;
 import javafx.scene.paint.Color;
 import javafx.scene.paint.Paint;
+import java.util.Objects;
 
 /**
  * The fill and associated properties that direct how to fill the background of a
@@ -41,11 +44,13 @@
  * When applied to a Region with a defined shape, the corner radii are ignored.
  * @since JavaFX 8.0
  */
-public final class BackgroundFill {
+public final class BackgroundFill implements Interpolatable<BackgroundFill> {
     /**
      * The Paint to use for filling the background of the {@link Region}.
      * This value will never be null.
+     *
      * @return the Paint to use for filling the background of the {@link Region}
+     * @interpolationType see {@link Paint}
      */
     public final Paint getFill() { return fill; }
     final Paint fill;
@@ -55,7 +60,9 @@ public final class BackgroundFill {
      * BackgroundFill. Each corner can therefore be independently
      * specified. This will never be null. The radii values will
      * never be negative.
+     *
      * @return the Radii to use for representing the four radii of the BackgroundFill
+     * @interpolationType <a href="../../animation/Interpolatable.html#default">default</a>
      */
     public final CornerRadii getRadii() { return radii; }
     final CornerRadii radii;
@@ -66,7 +73,9 @@ public final class BackgroundFill {
      * The insets will never be null, but the values may be negative
      * in order to position the border beyond the natural bounds
      * (that is, (0, 0, width, height)) of the Region.
+     *
      * @return the Insets to use for this fill
+     * @interpolationType <a href="../../animation/Interpolatable.html#default">default</a>
      */
     public final Insets getInsets() { return insets; }
     final Insets insets;
@@ -103,6 +112,51 @@ public BackgroundFill(@NamedArg("fill") Paint fill, @NamedArg("radii") CornerRad
         hash = result;
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @throws NullPointerException {@inheritDoc}
+     * @since 24
+     */
+    @Override
+    public BackgroundFill interpolate(BackgroundFill endValue, double t) {
+        Objects.requireNonNull(endValue, "endValue cannot be null");
+
+        // We don't check equals(endValue) here to prevent unnecessary equality checks,
+        // and only check for equality with 'this' or 'endValue' after interpolation.
+        if (t <= 0) {
+            return this;
+        }
+
+        if (t >= 1) {
+            return endValue;
+        }
+
+        // CornerRadii, Insets and Paint are implemented such that interpolate() always returns the
+        // existing instance if the intermediate value is equal to the start value or the end value,
+        // which allows us to use an identity comparison in place of a value comparison to determine
+        // equality.
+        CornerRadii newRadii = radii.interpolate(endValue.radii, t);
+        Insets newInsets = insets.interpolate(endValue.insets, t);
+        Paint newFill = InterpolationUtils.interpolatePaint(fill, endValue.fill, t);
+
+        if (isSame(newFill, newRadii, newInsets)) {
+            return this;
+        }
+
+        if (endValue.isSame(newFill, newRadii, newInsets)) {
+            return endValue;
+        }
+
+        return new BackgroundFill(newFill, newRadii, newInsets);
+    }
+
+    private boolean isSame(Paint fill, CornerRadii radii, Insets insets) {
+        return this.fill == fill
+            && this.radii == radii
+            && this.insets == insets;
+    }
+
     /**
      * {@inheritDoc}
      */
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/layout/BackgroundImage.java b/modules/javafx.graphics/src/main/java/javafx/scene/layout/BackgroundImage.java
index 46c045b15f3..b06755925a0 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/layout/BackgroundImage.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/layout/BackgroundImage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,10 @@
 
 package javafx.scene.layout;
 
+import javafx.animation.Interpolatable;
 import javafx.beans.NamedArg;
 import javafx.scene.image.Image;
+import java.util.Objects;
 
 /**
  * Defines properties describing how to render an image as the background to
@@ -43,7 +45,7 @@
  * cache, and can safely be reused among multiple Regions.
  * @since JavaFX 8.0
  */
-public final class BackgroundImage {
+public final class BackgroundImage implements Interpolatable<BackgroundImage> {
 
     // TODO we need to attach a listener to the Image such that when the image loads
     // we cause the Region to repaint (probably the Region itself needs to handle this).
@@ -52,7 +54,9 @@ public final class BackgroundImage {
      * The image to be used. This will never be null. If this
      * image fails to load, then the entire BackgroundImage will
      * be skipped at rendering time.
+     *
      * @return the image to be used
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final Image getImage() { return image; }
     final Image image;
@@ -61,8 +65,10 @@ public final class BackgroundImage {
      * Indicates in what manner (if at all) the background image
      * is to be repeated along the x-axis of the region. This
      * will never be null.
+     *
      * @return the BackgroundRepeat that indicates if the background image
-     * is to be repeated along the x-axis of the region
+     *         is to be repeated along the x-axis of the region
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final BackgroundRepeat getRepeatX() { return repeatX; }
     final BackgroundRepeat repeatX;
@@ -71,8 +77,10 @@ public final class BackgroundImage {
      * Indicates in what manner (if at all) the background image
      * is to be repeated along the y-axis of the region. This will
      * never be null.
+     *
      * @return the BackgroundRepeat that indicates if the background image
-     * is to be repeated along the y-axis of the region
+     *         is to be repeated along the y-axis of the region
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final BackgroundRepeat getRepeatY() { return repeatY; }
     final BackgroundRepeat repeatY;
@@ -80,14 +88,18 @@ public final class BackgroundImage {
     /**
      * The position of this BackgroundImage relative to the Region. Note that any
      * position outside the background area of the region will be clipped.
+     *
      * @return the position of this BackgroundImage relative to the Region
+     * @interpolationType <a href="../../animation/Interpolatable.html#default">default</a>
      */
     public final BackgroundPosition getPosition() { return position; }
     final BackgroundPosition position;
 
     /**
      * The size of this image relative to the Region.
+     *
      * @return the size of this image relative to the Region
+     * @interpolationType <a href="../../animation/Interpolatable.html#default">default</a>
      */
     public final BackgroundSize getSize() { return size; }
     final BackgroundSize size;
@@ -138,6 +150,68 @@ public BackgroundImage(
         hash = result;
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @throws NullPointerException {@inheritDoc}
+     * @since 24
+     */
+    @Override
+    public BackgroundImage interpolate(BackgroundImage endValue, double t) {
+        Objects.requireNonNull(endValue, "endValue cannot be null");
+
+        // We don't check equals(endValue) here to prevent unnecessary equality checks,
+        // and only check for equality with 'this' or 'endValue' after interpolation.
+        if (t <= 0) {
+            return this;
+        }
+
+        if (t >= 1) {
+            return endValue;
+        }
+
+        // BackgroundPosition and BackgroundSize are implemented such that interpolate() always returns
+        // the existing instance if the intermediate value is equal to the start value or the end value,
+        // which allows us to use an identity comparison in place of a value comparison to determine
+        // equality.
+        BackgroundPosition newPosition = this.position.interpolate(endValue.position, t);
+        BackgroundSize newSize = this.size.interpolate(endValue.size, t);
+        BackgroundRepeat newRepeatX, newRepeatY;
+        Image newImage;
+
+        if (t < 0.5) {
+            newRepeatX = this.repeatX;
+            newRepeatY = this.repeatY;
+            newImage = this.image;
+        } else {
+            newRepeatX = endValue.repeatX;
+            newRepeatY = endValue.repeatY;
+            newImage = endValue.image;
+        }
+
+        if (isSame(newImage, newRepeatX, newRepeatY, newPosition, newSize)) {
+            return this;
+        }
+
+        if (endValue.isSame(newImage, newRepeatX, newRepeatY, newPosition, newSize)) {
+            return endValue;
+        }
+
+        return new BackgroundImage(newImage, newRepeatX, newRepeatY, newPosition, newSize);
+    }
+
+    private boolean isSame(Image image,
+                           BackgroundRepeat repeatX,
+                           BackgroundRepeat repeatY,
+                           BackgroundPosition position,
+                           BackgroundSize size) {
+        return this.image == image
+            && this.repeatX == repeatX
+            && this.repeatY == repeatY
+            && this.position == position
+            && this.size == size;
+    }
+
     /**
      * {@inheritDoc}
      */
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/layout/BackgroundPosition.java b/modules/javafx.graphics/src/main/java/javafx/scene/layout/BackgroundPosition.java
index c0847f13081..b19839de0ae 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/layout/BackgroundPosition.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/layout/BackgroundPosition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,11 @@
 
 package javafx.scene.layout;
 
+import com.sun.javafx.util.InterpolationUtils;
+import javafx.animation.Interpolatable;
 import javafx.beans.NamedArg;
 import javafx.geometry.Side;
+import java.util.Objects;
 
 /**
  * Represents the position of a {@link BackgroundImage} within the
@@ -49,7 +52,7 @@
  * the Region's right edge.
  * @since JavaFX 8.0
  */
-public class BackgroundPosition {
+public class BackgroundPosition implements Interpolatable<BackgroundPosition> {
     /**
      * The default BackgroundPosition for any BackgroundImage. The default
      * is to have no insets and to be defined as 0% and 0%. That is, the
@@ -68,8 +71,9 @@ public class BackgroundPosition {
     /**
      * The side along the horizontal axis to which the BackgroundImage is
      * anchored. This will only be LEFT or RIGHT and never null.
-     * @return the Side along the horizontal axis to which the BackgroundImage is
-     * anchored
+     *
+     * @return the Side along the horizontal axis to which the BackgroundImage is anchored
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final Side getHorizontalSide() { return horizontalSide; }
     final Side horizontalSide;
@@ -77,8 +81,8 @@ public class BackgroundPosition {
     /**
      * The side along the vertical axis to which the BackgroundImage is
      * anchored. This will only be TOP or BOTTOM and never null.
-     * @return the Side along the vertical axis to which the BackgroundImage is
-     * anchored
+     * @return the Side along the vertical axis to which the BackgroundImage is anchored
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final Side getVerticalSide() { return verticalSide; }
     final Side verticalSide;
@@ -90,7 +94,12 @@ public class BackgroundPosition {
      * is either a literal or a percentage, depending on the
      * {@link #isHorizontalAsPercentage() horizontalAsPercentage} property.
      * Negative values are acceptable.
+     *
      * @return the horizontal position of the BackgroundImage
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a> if one
+     *                    value is absolute and the other is a {@link #isHorizontalAsPercentage() percentage},
+     *                    or if the background is anchored at different {@link #getHorizontalSide() sides};
+     *                    otherwise <a href="../../animation/Interpolatable.html#linear">linear</a>
      */
     public final double getHorizontalPosition() { return horizontalPosition; }
     final double horizontalPosition;
@@ -101,7 +110,12 @@ public class BackgroundPosition {
      * property. This value is either a literal or a percentage, depending on the
      * {@link #isVerticalAsPercentage() verticalAsPercentage} property. Negative
      * values are acceptable.
+     *
      * @return the vertical position of the BackgroundImage
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a> if one
+     *                    value is absolute and the other is a {@link #isVerticalAsPercentage() percentage},
+     *                    or if the background is anchored at different {@link #getVerticalSide() sides};
+     *                    otherwise <a href="../../animation/Interpolatable.html#linear">linear</a>
      */
     public final double getVerticalPosition() { return verticalPosition; }
     final double verticalPosition;
@@ -109,7 +123,9 @@ public class BackgroundPosition {
     /**
      * Specifies whether the {@link #getHorizontalPosition() horizontalPosition} should
      * be interpreted as a literal number or as a percentage.
+     *
      * @return true if horizontalPosition should be interpreted as a percentage
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final boolean isHorizontalAsPercentage() { return horizontalAsPercentage; }
     final boolean horizontalAsPercentage;
@@ -117,7 +133,9 @@ public class BackgroundPosition {
     /**
      * Specifies whether the {@link #getVerticalPosition() verticalPosition} should
      * be interpreted as a literal number or as a percentage.
+     *
      * @return true if verticalPosition should be interpreted as a percentage
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final boolean isVerticalAsPercentage() { return verticalAsPercentage; }
     final boolean verticalAsPercentage;
@@ -175,6 +193,83 @@ public BackgroundPosition(@NamedArg("horizontalSide") Side horizontalSide, @Name
         hash = result;
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @throws NullPointerException {@inheritDoc}
+     * @since 24
+     */
+    @Override
+    public BackgroundPosition interpolate(BackgroundPosition endValue, double t) {
+        Objects.requireNonNull(endValue, "endValue cannot be null");
+
+        if (t <= 0) {
+            return this;
+        }
+
+        if (t >= 1) {
+            return endValue;
+        }
+
+        double newHorizontalPosition, newVerticalPosition;
+        boolean newHorizontalAsPercentage, newVerticalAsPercentage;
+        Side newHorizontalSide, newVerticalSide;
+
+        if (this.horizontalSide == endValue.horizontalSide
+                && this.horizontalAsPercentage == endValue.horizontalAsPercentage) {
+            newHorizontalPosition = InterpolationUtils.interpolate(this.horizontalPosition, endValue.horizontalPosition, t);
+            newHorizontalAsPercentage = this.horizontalAsPercentage;
+            newHorizontalSide = this.horizontalSide;
+        } else if (t < 0.5) {
+            newHorizontalPosition = this.horizontalPosition;
+            newHorizontalAsPercentage = this.horizontalAsPercentage;
+            newHorizontalSide = this.horizontalSide;
+        } else {
+            newHorizontalPosition = endValue.horizontalPosition;
+            newHorizontalAsPercentage = endValue.horizontalAsPercentage;
+            newHorizontalSide = endValue.horizontalSide;
+        }
+
+        if (this.verticalSide == endValue.verticalSide
+                && this.verticalAsPercentage == endValue.verticalAsPercentage) {
+            newVerticalPosition = InterpolationUtils.interpolate(this.verticalPosition, endValue.verticalPosition, t);
+            newVerticalAsPercentage = this.verticalAsPercentage;
+            newVerticalSide = this.verticalSide;
+        } else if (t < 0.5) {
+            newVerticalPosition = this.verticalPosition;
+            newVerticalAsPercentage = this.verticalAsPercentage;
+            newVerticalSide = this.verticalSide;
+        } else {
+            newVerticalPosition = endValue.verticalPosition;
+            newVerticalAsPercentage = endValue.verticalAsPercentage;
+            newVerticalSide = endValue.verticalSide;
+        }
+
+        if (isSame(newHorizontalSide, newHorizontalPosition, newHorizontalAsPercentage,
+                   newVerticalSide, newVerticalPosition, newVerticalAsPercentage)) {
+            return this;
+        }
+
+        if (endValue.isSame(newHorizontalSide, newHorizontalPosition, newHorizontalAsPercentage,
+                            newVerticalSide, newVerticalPosition, newVerticalAsPercentage)) {
+            return endValue;
+        }
+
+        return new BackgroundPosition(
+            newHorizontalSide, newHorizontalPosition, newHorizontalAsPercentage,
+            newVerticalSide, newVerticalPosition, newVerticalAsPercentage);
+    }
+
+    private boolean isSame(Side horizontalSide, double horizontalPosition, boolean horizontalAsPercentage,
+                           Side verticalSide, double verticalPosition, boolean verticalAsPercentage) {
+        return this.horizontalSide == horizontalSide
+            && this.horizontalPosition == horizontalPosition
+            && this.horizontalAsPercentage == horizontalAsPercentage
+            && this.verticalSide == verticalSide
+            && this.verticalPosition == verticalPosition
+            && this.verticalAsPercentage == verticalAsPercentage;
+    }
+
     /**
      * {@inheritDoc}
      */
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/layout/BackgroundSize.java b/modules/javafx.graphics/src/main/java/javafx/scene/layout/BackgroundSize.java
index 6a13817fae8..a1e9e526484 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/layout/BackgroundSize.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/layout/BackgroundSize.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,10 @@
 
 package javafx.scene.layout;
 
+import com.sun.javafx.util.InterpolationUtils;
+import javafx.animation.Interpolatable;
 import javafx.beans.NamedArg;
+import java.util.Objects;
 
 
 /**
@@ -54,7 +57,7 @@
  * so as to use the image's intrinsic size, or if it cannot be determined, 100%.
  * @since JavaFX 8.0
  */
-public final class BackgroundSize {
+public final class BackgroundSize implements Interpolatable<BackgroundSize> {
     /**
      * From the CSS Specification:
      * <blockquote>
@@ -82,8 +85,14 @@ public final class BackgroundSize {
      * render. If set to AUTO, then {@code widthAsPercentage} is ignored. This value has
      * no meaning if either {@code contain} or {@code cover} are specified. This value
      * cannot be negative, except when set to the value of AUTO.
+     *
      * @return the width of the area within the Region where the associated
-     * BackgroundImage should render
+     *         BackgroundImage should render
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
+     *                    if {@link #isCover() cover} or {@link #isContain() contain} is set, if one value
+     *                    is absolute and the other value is a {@link #isWidthAsPercentage() percentage},
+     *                    or if the width is {@link #AUTO}; otherwise
+     *                    <a href="../../animation/Interpolatable.html#linear">linear</a>
      */
     public final double getWidth() { return width; }
     final double width;
@@ -93,8 +102,14 @@ public final class BackgroundSize {
      * render. If set to AUTO, then {@code heightAsPercentage} is ignored. This value has
      * no meaning if either {@code contain} or {@code cover} are specified. This value
      * cannot be negative, except when set to the value of AUTO.
+     *
      * @return the height of the area within the Region where the associated
-     * BackgroundImage should render
+     *         BackgroundImage should render
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
+     *                    if {@link #isCover() cover} or {@link #isContain() contain} is set, if one value
+     *                    is absolute and the other value is a {@link #isHeightAsPercentage() percentage},
+     *                    or if the height is {@link #AUTO}; otherwise
+     *                    <a href="../../animation/Interpolatable.html#linear">linear</a>
      */
     public final double getHeight() { return height; }
     final double height;
@@ -102,7 +117,9 @@ public final class BackgroundSize {
     /**
      * Specifies whether the value contained in {@code width} should be interpreted
      * as a percentage or as a normal value.
+     *
      * @return true if width should be interpreted as a percentage
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final boolean isWidthAsPercentage() { return widthAsPercentage; }
     final boolean widthAsPercentage;
@@ -110,7 +127,9 @@ public final class BackgroundSize {
     /**
      * Specifies whether the value contained in {@code height} should be interpreted
      * as a percentage or as a normal value.
+     *
      * @return true if height should be interpreted as a percentage
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final boolean isHeightAsPercentage() { return heightAsPercentage; }
     final boolean heightAsPercentage;
@@ -119,7 +138,9 @@ public final class BackgroundSize {
      * If true, scale the image, while preserving its intrinsic aspect ratio (if any), to the
      * largest size such that both its width and its height can fit inside the background
      * positioning area.
+     *
      * @return true if the image can fit inside the background positioning area
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final boolean isContain() { return contain; }
     final boolean contain;
@@ -128,7 +149,9 @@ public final class BackgroundSize {
      * If true, scale the image, while preserving its intrinsic aspect ratio (if any), to the
      * smallest size such that both its width and its height can completely cover the background
      * positioning area.
+     *
      * @return true if image can completely cover the background positioning area
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final boolean isCover() { return cover; }
     final boolean cover;
@@ -180,6 +203,70 @@ public BackgroundSize(@NamedArg("width") double width, @NamedArg("height") doubl
         hash = result;
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @throws NullPointerException {@inheritDoc}
+     * @since 24
+     */
+    @Override
+    public BackgroundSize interpolate(BackgroundSize endValue, double t) {
+        Objects.requireNonNull(endValue, "endValue cannot be null");
+
+        if (t <= 0) {
+            return this;
+        }
+
+        if (t >= 1) {
+            return endValue;
+        }
+
+        if (cover || contain || endValue.cover || endValue.contain) {
+            return t < 0.5 ? this : endValue;
+        }
+
+        double newWidth = interpolate(
+            this.width, endValue.width, this.widthAsPercentage, endValue.widthAsPercentage, t);
+
+        double newHeight = interpolate(
+            this.height, endValue.height, this.heightAsPercentage, endValue.heightAsPercentage, t);
+
+        boolean newWidthAsPercentage, newHeightAsPercentage;
+
+        if (t < 0.5) {
+            newWidthAsPercentage = this.widthAsPercentage;
+            newHeightAsPercentage = this.heightAsPercentage;
+        } else {
+            newWidthAsPercentage = endValue.widthAsPercentage;
+            newHeightAsPercentage = endValue.heightAsPercentage;
+        }
+
+        if (isSame(newWidth, newHeight, newWidthAsPercentage, newHeightAsPercentage)) {
+            return this;
+        }
+
+        if (endValue.isSame(newWidth, newHeight, newWidthAsPercentage, newHeightAsPercentage)) {
+            return endValue;
+        }
+
+        return new BackgroundSize(newWidth, newHeight, newWidthAsPercentage, newHeightAsPercentage, false, false);
+    }
+
+    private boolean isSame(double width, double height, boolean widthAsPercentage, boolean heightAsPercentage) {
+        return this.width == width
+            && this.height == height
+            && this.widthAsPercentage == widthAsPercentage
+            && this.heightAsPercentage == heightAsPercentage;
+    }
+
+    private static double interpolate(double start, double end,
+                                      boolean startIsPercentage, boolean endIsPercentage,
+                                      double t) {
+        return startIsPercentage == endIsPercentage && start != AUTO && end != AUTO ?
+            InterpolationUtils.interpolate(start, end, t) :
+            InterpolationUtils.interpolateDiscrete(start, end, t);
+    }
+
     /**
      * {@inheritDoc}
      */
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/layout/Border.java b/modules/javafx.graphics/src/main/java/javafx/scene/layout/Border.java
index 7d3139edbb1..223814836cc 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/layout/Border.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/layout/Border.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,14 +28,16 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
+import java.util.Objects;
+import javafx.animation.Interpolatable;
 import javafx.beans.NamedArg;
 import javafx.geometry.Insets;
 import javafx.scene.Node;
 import javafx.scene.paint.Paint;
 import com.sun.javafx.UnmodifiableArrayList;
-import javafx.css.CssMetaData;
 import com.sun.javafx.css.SubCssMetaData;
+import javafx.css.CssMetaData;
+import javafx.css.Styleable;
 import javafx.css.converter.InsetsConverter;
 import javafx.css.converter.URLConverter;
 import com.sun.javafx.scene.layout.region.BorderImageSlices;
@@ -47,7 +49,7 @@
 import com.sun.javafx.scene.layout.region.RepeatStruct;
 import com.sun.javafx.scene.layout.region.RepeatStructConverter;
 import com.sun.javafx.scene.layout.region.SliceSequenceConverter;
-import javafx.css.Styleable;
+import com.sun.javafx.util.InterpolationUtils;
 
 /**
  * The border of a {@link Region}. A {@code Border} is an immutable object which
@@ -87,7 +89,7 @@
  * @since JavaFX 8.0
  */
 @SuppressWarnings("unchecked")
-public final class Border {
+public final class Border implements Interpolatable<Border> {
     static final CssMetaData<Node,Paint[]> BORDER_COLOR =
             new SubCssMetaData<>("-fx-border-color",
                     LayeredBorderPaintConverter.getInstance());
@@ -165,8 +167,9 @@ public final class Border {
      * The list of BorderStrokes which together define the stroked portion
      * of this Border. This List is unmodifiable and immutable. It
      * will never be null. It will never contain any null elements.
-     * @return the list of BorderStrokes which together define the stroked
-     * portion of this Border
+     *
+     * @return the list of BorderStrokes which together define the stroked portion of this Border
+     * @interpolationType <a href="../../animation/Interpolatable.html#pairwise">pairwise</a>
      */
     public final List<BorderStroke> getStrokes() { return strokes; }
     final List<BorderStroke> strokes;
@@ -180,8 +183,10 @@ public final class Border {
      * <p>
      * This List is unmodifiable and immutable. It will never be null.
      * It will never contain any null elements.
+     *
      * @return the list of BorderImages which together define the images to use
-     * instead of stroke for this Border
+     *         instead of stroke for this Border
+     * @interpolationType <a href="../../animation/Interpolatable.html#pairwise">pairwise</a>
      */
     public final List<BorderImage> getImages() { return images; }
     final List<BorderImage> images;
@@ -277,8 +282,8 @@ public Border(@NamedArg("strokes") List<BorderStroke> strokes, @NamedArg("images
         // properties didn't match the types of the array based constructor parameters.
         // So a Builder will use this constructor, while the CSS engine uses the
         // array based constructor (for speed).
-        this(strokes == null ? null : strokes.toArray(new BorderStroke[strokes.size()]),
-             images == null ? null : images.toArray(new BorderImage[images.size()]));
+        this(strokes != null ? UnmodifiableArrayList.copyOfNullFiltered(strokes) : List.of(),
+             images != null ? UnmodifiableArrayList.copyOfNullFiltered(images) : List.of(), 0);
     }
 
     /**
@@ -300,83 +305,85 @@ public Border(@NamedArg("strokes") List<BorderStroke> strokes, @NamedArg("images
      *                  final List of images. A null array becomes an empty List.
      */
     public Border(@NamedArg("strokes") BorderStroke[] strokes, @NamedArg("images") BorderImage[] images) {
+        this(strokes != null ? UnmodifiableArrayList.copyOfNullFiltered(strokes) : List.of(),
+             images != null ? UnmodifiableArrayList.copyOfNullFiltered(images) : List.of(), 0);
+    }
+
+    /**
+     * Creates a new Border with the specified strokes and images.
+     * This constructor requires that both lists do not contain null values, and that the lists
+     * are immutable. The purpose of this constructor is to prevent an unnecessary array creation
+     * when the caller already knows that the specified lists satisfy the non-null precondition
+     * and preserve the immutability invariant.
+     *
+     * @param strokes the strokes, not {@code null}
+     * @param images the images, not {@code null}
+     */
+    private Border(List<BorderStroke> strokes, List<BorderImage> images, int ignored) {
+        Objects.requireNonNull(strokes, "strokes cannot be null");
+        Objects.requireNonNull(images, "images cannot be null");
+
         double innerTop = 0, innerRight = 0, innerBottom = 0, innerLeft = 0;
         double outerTop = 0, outerRight = 0, outerBottom = 0, outerLeft = 0;
 
-        if (strokes == null || strokes.length == 0) {
-            this.strokes = Collections.emptyList();
-        } else {
-            final BorderStroke[] noNulls = new BorderStroke[strokes.length];
-            int size = 0;
-            for (int i=0; i<strokes.length; i++) {
-                final BorderStroke stroke = strokes[i];
-                if (stroke != null) {
-                    noNulls[size++] = stroke;
-
-                    // Calculate the insets and outsets. "insets" are the distance
-                    // from the edge of the region to the inmost edge of the inmost border.
-                    // Outsets are the distance from the edge of the region out towards the
-                    // outer-most edge of the outer-most border.
-                    final double strokeInnerTop = stroke.innerEdge.getTop();
-                    final double strokeInnerRight = stroke.innerEdge.getRight();
-                    final double strokeInnerBottom = stroke.innerEdge.getBottom();
-                    final double strokeInnerLeft = stroke.innerEdge.getLeft();
-
-                    innerTop = innerTop >= strokeInnerTop ? innerTop : strokeInnerTop;
-                    innerRight = innerRight >= strokeInnerRight? innerRight : strokeInnerRight;
-                    innerBottom = innerBottom >= strokeInnerBottom ? innerBottom : strokeInnerBottom;
-                    innerLeft = innerLeft >= strokeInnerLeft ? innerLeft : strokeInnerLeft;
-
-                    final double strokeOuterTop = stroke.outerEdge.getTop();
-                    final double strokeOuterRight = stroke.outerEdge.getRight();
-                    final double strokeOuterBottom = stroke.outerEdge.getBottom();
-                    final double strokeOuterLeft = stroke.outerEdge.getLeft();
-
-                    outerTop = outerTop >= strokeOuterTop ? outerTop : strokeOuterTop;
-                    outerRight = outerRight >= strokeOuterRight? outerRight : strokeOuterRight;
-                    outerBottom = outerBottom >= strokeOuterBottom ? outerBottom : strokeOuterBottom;
-                    outerLeft = outerLeft >= strokeOuterLeft ? outerLeft : strokeOuterLeft;
-                }
-            }
-            this.strokes = new UnmodifiableArrayList<>(noNulls, size);
+        for (int i = 0, max = strokes.size(); i < max; i++) {
+            final BorderStroke stroke = strokes.get(i);
+
+            // Calculate the insets and outsets. "insets" are the distance
+            // from the edge of the region to the inmost edge of the inmost border.
+            // Outsets are the distance from the edge of the region out towards the
+            // outer-most edge of the outer-most border.
+            final double strokeInnerTop = stroke.innerEdge.getTop();
+            final double strokeInnerRight = stroke.innerEdge.getRight();
+            final double strokeInnerBottom = stroke.innerEdge.getBottom();
+            final double strokeInnerLeft = stroke.innerEdge.getLeft();
+
+            innerTop = innerTop >= strokeInnerTop ? innerTop : strokeInnerTop;
+            innerRight = innerRight >= strokeInnerRight? innerRight : strokeInnerRight;
+            innerBottom = innerBottom >= strokeInnerBottom ? innerBottom : strokeInnerBottom;
+            innerLeft = innerLeft >= strokeInnerLeft ? innerLeft : strokeInnerLeft;
+
+            final double strokeOuterTop = stroke.outerEdge.getTop();
+            final double strokeOuterRight = stroke.outerEdge.getRight();
+            final double strokeOuterBottom = stroke.outerEdge.getBottom();
+            final double strokeOuterLeft = stroke.outerEdge.getLeft();
+
+            outerTop = outerTop >= strokeOuterTop ? outerTop : strokeOuterTop;
+            outerRight = outerRight >= strokeOuterRight? outerRight : strokeOuterRight;
+            outerBottom = outerBottom >= strokeOuterBottom ? outerBottom : strokeOuterBottom;
+            outerLeft = outerLeft >= strokeOuterLeft ? outerLeft : strokeOuterLeft;
         }
 
-        if (images == null || images.length == 0) {
-            this.images = Collections.emptyList();
-        } else {
-            final BorderImage[] noNulls = new BorderImage[images.length];
-            int size = 0;
-            for (int i=0; i<images.length; i++) {
-                final BorderImage image = images[i];
-                if (image != null){
-                    noNulls[size++] = image;
-
-                    // The Image width + insets may contribute to the insets / outsets of
-                    // this border.
-                    final double imageInnerTop = image.innerEdge.getTop();
-                    final double imageInnerRight = image.innerEdge.getRight();
-                    final double imageInnerBottom = image.innerEdge.getBottom();
-                    final double imageInnerLeft = image.innerEdge.getLeft();
-
-                    innerTop = innerTop >= imageInnerTop ? innerTop : imageInnerTop;
-                    innerRight = innerRight >= imageInnerRight? innerRight : imageInnerRight;
-                    innerBottom = innerBottom >= imageInnerBottom ? innerBottom : imageInnerBottom;
-                    innerLeft = innerLeft >= imageInnerLeft ? innerLeft : imageInnerLeft;
-
-                    final double imageOuterTop = image.outerEdge.getTop();
-                    final double imageOuterRight = image.outerEdge.getRight();
-                    final double imageOuterBottom = image.outerEdge.getBottom();
-                    final double imageOuterLeft = image.outerEdge.getLeft();
-
-                    outerTop = outerTop >= imageOuterTop ? outerTop : imageOuterTop;
-                    outerRight = outerRight >= imageOuterRight? outerRight : imageOuterRight;
-                    outerBottom = outerBottom >= imageOuterBottom ? outerBottom : imageOuterBottom;
-                    outerLeft = outerLeft >= imageOuterLeft ? outerLeft : imageOuterLeft;
-                }
-            }
-            this.images = new UnmodifiableArrayList<>(noNulls, size);
+        this.strokes = strokes;
+
+        for (int i = 0, max = images.size(); i < max; i++) {
+            final BorderImage image = images.get(i);
+
+            // The Image width + insets may contribute to the insets / outsets of
+            // this border.
+            final double imageInnerTop = image.innerEdge.getTop();
+            final double imageInnerRight = image.innerEdge.getRight();
+            final double imageInnerBottom = image.innerEdge.getBottom();
+            final double imageInnerLeft = image.innerEdge.getLeft();
+
+            innerTop = innerTop >= imageInnerTop ? innerTop : imageInnerTop;
+            innerRight = innerRight >= imageInnerRight? innerRight : imageInnerRight;
+            innerBottom = innerBottom >= imageInnerBottom ? innerBottom : imageInnerBottom;
+            innerLeft = innerLeft >= imageInnerLeft ? innerLeft : imageInnerLeft;
+
+            final double imageOuterTop = image.outerEdge.getTop();
+            final double imageOuterRight = image.outerEdge.getRight();
+            final double imageOuterBottom = image.outerEdge.getBottom();
+            final double imageOuterLeft = image.outerEdge.getLeft();
+
+            outerTop = outerTop >= imageOuterTop ? outerTop : imageOuterTop;
+            outerRight = outerRight >= imageOuterRight? outerRight : imageOuterRight;
+            outerBottom = outerBottom >= imageOuterBottom ? outerBottom : imageOuterBottom;
+            outerLeft = outerLeft >= imageOuterLeft ? outerLeft : imageOuterLeft;
         }
 
+        this.images = images;
+
         // Both the BorderStroke and BorderImage class make sure to return the outsets
         // and insets in the right way, such that we don't have to worry about adjusting
         // the sign, etc, unlike in the Background implementation.
@@ -405,6 +412,45 @@ public static Border stroke(Paint stroke) {
         return new Border(new BorderStroke(stroke, BorderStrokeStyle.SOLID, null, null));
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @throws NullPointerException {@inheritDoc}
+     * @since 24
+     */
+    @Override
+    public Border interpolate(Border endValue, double t) {
+        Objects.requireNonNull(endValue, "endValue cannot be null");
+
+        if (t <= 0) {
+            return this;
+        }
+
+        if (t >= 1) {
+            return endValue;
+        }
+
+        // interpolateListsPairwise() is implemented such that it returns existing list instances
+        // (i.e. the 'this.images' or 'endValue.images' arguments) as an indication that the result
+        // is shallow-equal to either of the input arguments. This allows us to very quickly detect
+        // if we can return 'this' or 'endValue' without allocating a new Border instance.
+        List<BorderImage> newImages = images == endValue.images ?
+            images : InterpolationUtils.interpolateListsPairwise(images, endValue.images, t);
+
+        List<BorderStroke> newStrokes = strokes == endValue.strokes ?
+            strokes : InterpolationUtils.interpolateListsPairwise(strokes, endValue.strokes, t);
+
+        if (images == newImages && strokes == newStrokes) {
+            return this;
+        }
+
+        if (endValue.images == newImages && endValue.strokes == newStrokes) {
+            return endValue;
+        }
+
+        return new Border(newStrokes, newImages);
+    }
+
     /**
      * {@inheritDoc}
      */
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/layout/BorderConverter.java b/modules/javafx.graphics/src/main/java/javafx/scene/layout/BorderConverter.java
index 39cfef5ce55..8b897dff091 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/layout/BorderConverter.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/layout/BorderConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,9 +26,11 @@
 package javafx.scene.layout;
 
 import com.sun.javafx.css.StyleManager;
+import com.sun.javafx.css.SubPropertyConverter;
 import com.sun.javafx.scene.layout.region.BorderImageSlices;
 import com.sun.javafx.scene.layout.region.Margins;
 import com.sun.javafx.scene.layout.region.RepeatStruct;
+import java.util.List;
 import java.util.Map;
 import javafx.css.CssMetaData;
 import javafx.css.ParsedValue;
@@ -40,8 +42,10 @@
 import javafx.scene.paint.Paint;
 
 /**
+ * Converts -fx-border components into a {@link Border}.
  */
-class BorderConverter extends StyleConverter<ParsedValue[], Border> {
+class BorderConverter extends StyleConverter<ParsedValue[], Border>
+                      implements SubPropertyConverter<Border> {
 
     private static final BorderConverter BORDER_IMAGE_CONVERTER =
             new BorderConverter();
@@ -53,11 +57,16 @@ public static BorderConverter getInstance() {
     // Disallow instantiation
     private BorderConverter() { }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @throws NullPointerException if {@code convertedValues} is {@code null}
+     */
     @Override
     public Border convert(Map<CssMetaData<? extends Styleable, ?>, Object> convertedValues) {
         final Paint[][] strokeFills = (Paint[][])convertedValues.get(Border.BORDER_COLOR);
         final BorderStrokeStyle[][] strokeStyles = (BorderStrokeStyle[][]) convertedValues.get(Border.BORDER_STYLE);
-        final String[] imageUrls = (String[]) convertedValues.get(Border.BORDER_IMAGE_SOURCE);
+        final Object[] images = (Object[]) convertedValues.get(Border.BORDER_IMAGE_SOURCE);
         //
         // In W3C CSS, border colors and border images are not layered. In javafx, they are. We've taken the position
         // that there is one layer per -fx-border-color or -fx-border-image-source. This is consistent with
@@ -70,7 +79,7 @@ public Border convert(Map<CssMetaData<? extends Styleable, ?>, Object> converted
         // as the default stroke is solid.
         //
         final boolean hasStrokes = (strokeFills != null && strokeFills.length > 0) || (strokeStyles != null && strokeStyles.length > 0);
-        final boolean hasImages = imageUrls != null && imageUrls.length > 0;
+        final boolean hasImages = images != null && images.length > 0;
 
         // If there are neither background fills nor images, then there is nothing for us to construct.
         if (!hasStrokes && !hasImages) return null;
@@ -145,7 +154,7 @@ public Border convert(Map<CssMetaData<? extends Styleable, ?>, Object> converted
 
         BorderImage[] borderImages = null;
         if (hasImages) {
-            borderImages = new BorderImage[imageUrls.length];
+            borderImages = new BorderImage[images.length];
             Object tmp = convertedValues.get(Border.BORDER_IMAGE_REPEAT);
             final RepeatStruct[] repeats = tmp == null ? new RepeatStruct[0] : (RepeatStruct[]) tmp;
             final int lastRepeatIndex = repeats.length - 1;
@@ -162,36 +171,123 @@ public Border convert(Map<CssMetaData<? extends Styleable, ?>, Object> converted
             final Insets[] insets = tmp == null ? new Insets[0] : (Insets[]) tmp;
             final int lastInsetsIndex = insets.length - 1;
 
-            for (int i=0; i<imageUrls.length; i++) {
-                if (imageUrls[i] == null) continue;
+            for (int i=0; i<images.length; i++) {
+                if (images[i] == null) continue;
                 BorderRepeat repeatX = BorderRepeat.STRETCH, repeatY = BorderRepeat.STRETCH;
                 if (repeats.length > 0) {
                     final RepeatStruct repeat = repeats[i <= lastRepeatIndex ? i : lastRepeatIndex];
-                    switch (repeat.repeatX) {
-                        case SPACE: repeatX = BorderRepeat.SPACE; break;
-                        case ROUND: repeatX = BorderRepeat.ROUND; break;
-                        case REPEAT: repeatX = BorderRepeat.REPEAT; break;
-                        case NO_REPEAT: repeatX = BorderRepeat.STRETCH; break;
-                    }
-                    switch (repeat.repeatY) {
-                        case SPACE: repeatY = BorderRepeat.SPACE; break;
-                        case ROUND: repeatY = BorderRepeat.ROUND; break;
-                        case REPEAT: repeatY = BorderRepeat.REPEAT; break;
-                        case NO_REPEAT: repeatY = BorderRepeat.STRETCH; break;
-                    }
+                    repeatX = convertToBorderRepeat(repeat.repeatX);
+                    repeatY = convertToBorderRepeat(repeat.repeatY);
                 }
 
                 final BorderImageSlices slice = slices.length > 0 ? slices[i <= lastSlicesIndex ? i : lastSlicesIndex] : BorderImageSlices.DEFAULT;
                 final Insets inset = insets.length > 0 ? insets[i <= lastInsetsIndex ? i : lastInsetsIndex] : Insets.EMPTY;
                 final BorderWidths width = widths.length > 0 ? widths[i <= lastWidthsIndex ? i : lastWidthsIndex] : BorderWidths.DEFAULT;
-                final Image img = StyleManager.getInstance().getCachedImage(imageUrls[i]);
-                borderImages[i] = new BorderImage(img, width, inset, slice.widths, slice.filled, repeatX, repeatY);
+                final Image image;
+
+                // The images are either URLs (when they come from CSS) or the actual Image
+                // instances (when they come from the convertBack operation).
+                if (images[i] instanceof String url) {
+                    image = StyleManager.getInstance().getCachedImage(url);
+                } else if (images[i] instanceof Image img) {
+                    image = img;
+                } else {
+                    throw new IllegalArgumentException("Unexpected type: " + images[i].getClass().getName());
+                }
+
+                borderImages[i] = new BorderImage(image, width, inset, slice.widths, slice.filled, repeatX, repeatY);
             }
         }
 
         return borderStrokes == null && borderImages == null ? null : new Border(borderStrokes, borderImages);
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @throws NullPointerException if {@code border} is {@code null}
+     */
+    @Override
+    public Map<CssMetaData<? extends Styleable, ?>, Object> convertBack(Border border) {
+        List<BorderStroke> strokes = border.getStrokes();
+        int strokesCount = strokes.size();
+        Paint[][] borderStrokeFills = new Paint[strokesCount][];
+        BorderStrokeStyle[][] borderStrokeStyles = new BorderStrokeStyle[strokesCount][];
+        Margins[] borderWidths = new Margins[strokesCount];
+        CornerRadii[] borderRadius = new CornerRadii[strokesCount];
+        Insets[] borderInsets = new Insets[strokesCount];
+
+        for (int i = 0; i < strokesCount; ++i) {
+            BorderStroke stroke = strokes.get(i);
+            borderStrokeFills[i] = new Paint[4];
+            borderStrokeFills[i][0] = stroke.getTopStroke();
+            borderStrokeFills[i][1] = stroke.getRightStroke();
+            borderStrokeFills[i][2] = stroke.getBottomStroke();
+            borderStrokeFills[i][3] = stroke.getLeftStroke();
+
+            borderStrokeStyles[i] = new BorderStrokeStyle[4];
+            borderStrokeStyles[i][0] = stroke.getTopStyle();
+            borderStrokeStyles[i][1] = stroke.getRightStyle();
+            borderStrokeStyles[i][2] = stroke.getBottomStyle();
+            borderStrokeStyles[i][3] = stroke.getLeftStyle();
+
+            BorderWidths widths = stroke.getWidths();
+            borderWidths[i] = new Margins(widths.getTop(), widths.getRight(), widths.getBottom(), widths.getLeft(), false);
+
+            borderRadius[i] = stroke.getRadii();
+            borderInsets[i] = stroke.getInsets();
+        }
+
+        List<BorderImage> borderImages = border.getImages();
+        int imagesCount = borderImages.size();
+        Image[] images = new Image[imagesCount];
+        RepeatStruct[] imageRepeats = new RepeatStruct[imagesCount];
+        BorderImageSlices[] imageSlices = new BorderImageSlices[imagesCount];
+        BorderWidths[] imageWidths = new BorderWidths[imagesCount];
+        Insets[] imageInsets = new Insets[imagesCount];
+
+        for (int i = 0; i < imagesCount; ++i) {
+            BorderImage image = borderImages.get(i);
+            images[i] = image.getImage();
+            imageRepeats[i] = new RepeatStruct(
+                convertToBackgroundRepeat(image.getRepeatX()),
+                convertToBackgroundRepeat(image.getRepeatY()));
+            imageSlices[i] = new BorderImageSlices(image.getSlices(), image.isFilled());
+            imageWidths[i] = image.getWidths();
+            imageInsets[i] = image.getInsets();
+        }
+
+        return Map.of(
+            Border.BORDER_COLOR, borderStrokeFills,
+            Border.BORDER_STYLE, borderStrokeStyles,
+            Border.BORDER_WIDTH, borderWidths,
+            Border.BORDER_RADIUS, borderRadius,
+            Border.BORDER_INSETS, borderInsets,
+            Border.BORDER_IMAGE_SOURCE, images,
+            Border.BORDER_IMAGE_REPEAT, imageRepeats,
+            Border.BORDER_IMAGE_SLICE, imageSlices,
+            Border.BORDER_IMAGE_WIDTH, imageWidths,
+            Border.BORDER_IMAGE_INSETS, imageInsets);
+    }
+
+    private BackgroundRepeat convertToBackgroundRepeat(BorderRepeat repeat) {
+        return switch (repeat) {
+            case REPEAT -> BackgroundRepeat.REPEAT;
+            case ROUND -> BackgroundRepeat.ROUND;
+            case SPACE -> BackgroundRepeat.SPACE;
+            case STRETCH -> BackgroundRepeat.NO_REPEAT;
+        };
+    }
+
+    private BorderRepeat convertToBorderRepeat(BackgroundRepeat repeat) {
+        return switch (repeat) {
+            case REPEAT -> BorderRepeat.REPEAT;
+            case ROUND -> BorderRepeat.ROUND;
+            case SPACE -> BorderRepeat.SPACE;
+            case NO_REPEAT -> BorderRepeat.STRETCH;
+        };
+    }
+
     /**
      * @inheritDoc
      */
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/layout/BorderImage.java b/modules/javafx.graphics/src/main/java/javafx/scene/layout/BorderImage.java
index 6cc7e2dc052..5da650caaaa 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/layout/BorderImage.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/layout/BorderImage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,9 +26,11 @@
 package javafx.scene.layout;
 
 import com.sun.javafx.scene.layout.region.BorderImageSlices;
+import javafx.animation.Interpolatable;
 import javafx.beans.NamedArg;
 import javafx.geometry.Insets;
 import javafx.scene.image.Image;
+import java.util.Objects;
 
 /**
  * Defines properties describing how to render an image as the border of
@@ -48,13 +50,15 @@
  * When applied to a Region with a defined shape, a BorderImage is ignored.
  * @since JavaFX 8.0
  */
-public class BorderImage {
+public class BorderImage implements Interpolatable<BorderImage> {
     /**
      * The image to be used. This will never be null. If this
      * image fails to load, then the entire BorderImage will
      * be skipped at rendering time and will not contribute to
      * any bounds or other computations.
+     *
      * @return the image to be used
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final Image getImage() { return image; }
     final Image image;
@@ -63,8 +67,10 @@ public class BorderImage {
      * Indicates in what manner (if at all) the border image
      * is to be repeated along the x-axis of the region. If not specified,
      * the default value is STRETCH.
+     *
      * @return the BorderRepeat that indicates if the border image
-     * is to be repeated along the x-axis of the region
+     *         is to be repeated along the x-axis of the region
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final BorderRepeat getRepeatX() { return repeatX; }
     final BorderRepeat repeatX;
@@ -73,8 +79,10 @@ public class BorderImage {
      * Indicates in what manner (if at all) the border image
      * is to be repeated along the y-axis of the region. If not specified,
      * the default value is STRETCH.
+     *
      * @return the BorderRepeat that indicates if the border image
-     * is to be repeated along the y-axis of the region
+     *         is to be repeated along the y-axis of the region
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final BorderRepeat getRepeatY() { return repeatY; }
     final BorderRepeat repeatY;
@@ -84,7 +92,9 @@ public class BorderImage {
      * as either to be absolute widths or percentages of the size of
      * the Region, {@link BorderWidths} for more details. If null,
      * this will default to being 1 pixel wide.
+     *
      * @return the BorderWidths of the border on each side
+     * @interpolationType <a href="../../animation/Interpolatable.html#default">default</a>
      */
     public final BorderWidths getWidths() { return widths; }
     final BorderWidths widths;
@@ -103,7 +113,9 @@ public class BorderImage {
      * for the {@code filled} property will cause the center to be drawn. A
      * default value for this property will result in BorderImageSlices.DEFAULT, which
      * is a border-image-slice of 100%
+     *
      * @return the BorderWidths that defines the slices of the image
+     * @interpolationType <a href="../../animation/Interpolatable.html#default">default</a>
      * @see <a href="http://www.w3.org/TR/css3-background/#the-border-image-slice">border-image-slice</a>
      */
     public final BorderWidths getSlices() { return slices; }
@@ -112,7 +124,9 @@ public class BorderImage {
     /**
      * Specifies whether or not the center patch (as defined by the left, right, top, and bottom slices)
      * should be drawn.
+     *
      * @return true if the center patch should be drawn
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final boolean isFilled() { return filled; }
     final boolean filled;
@@ -120,7 +134,9 @@ public class BorderImage {
     /**
      * The insets of the BorderImage define where the border should be positioned
      * relative to the edge of the Region. This value will never be null.
+     *
      * @return the insets of the BorderImage
+     * @interpolationType <a href="../../animation/Interpolatable.html#default">default</a>
      */
     public final Insets getInsets() { return insets; }
     final Insets insets;
@@ -186,6 +202,70 @@ public BorderImage(
         hash = result;
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @throws NullPointerException {@inheritDoc}
+     * @since 24
+     */
+    @Override
+    public BorderImage interpolate(BorderImage endValue, double t) {
+        Objects.requireNonNull(endValue, "endValue cannot be null");
+
+        // We don't check equals(endValue) here to prevent unnecessary equality checks,
+        // and only check for equality with 'this' or 'endValue' after interpolation.
+        if (t <= 0) {
+            return this;
+        }
+
+        if (t >= 1) {
+            return endValue;
+        }
+
+        // BorderWidths and Insets are implemented such that interpolate() always returns the existing
+        // instance if the intermediate value is equal to the start value or the end value, which allows
+        // us to use an identity comparison in place of a value comparison to determine equality.
+        BorderWidths newWidths = widths.interpolate(endValue.widths, t);
+        BorderWidths newSlices = slices.interpolate(endValue.slices, t);
+        Insets newInsets = insets.interpolate(endValue.insets, t);
+        Image newImage;
+        BorderRepeat newRepeatX, newRepeatY;
+        boolean newFilled;
+
+        if (t < 0.5) {
+            newImage = this.image;
+            newRepeatX = this.repeatX;
+            newRepeatY = this.repeatY;
+            newFilled = this.filled;
+        } else {
+            newImage = endValue.image;
+            newRepeatX = endValue.repeatX;
+            newRepeatY = endValue.repeatY;
+            newFilled = endValue.filled;
+        }
+
+        if (isSame(newImage, newWidths, newSlices, newFilled, newRepeatX, newRepeatY)) {
+            return this;
+        }
+
+        if (endValue.isSame(newImage, newWidths, newSlices, newFilled, newRepeatX, newRepeatY)) {
+            return endValue;
+        }
+
+        return new BorderImage(endValue.image, newWidths, newInsets, newSlices,
+                               endValue.filled, endValue.repeatX, endValue.repeatY);
+    }
+
+    private boolean isSame(Image image, BorderWidths widths, BorderWidths slices, boolean filled,
+                           BorderRepeat repeatX, BorderRepeat repeatY) {
+        return this.image == image
+            && this.widths == widths
+            && this.slices == slices
+            && this.filled == filled
+            && this.repeatX == repeatX
+            && this.repeatY == repeatY;
+    }
+
     /**
      * {@inheritDoc}
      */
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/layout/BorderStroke.java b/modules/javafx.graphics/src/main/java/javafx/scene/layout/BorderStroke.java
index ec7d22cc169..c6ce7a07f6f 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/layout/BorderStroke.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/layout/BorderStroke.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,14 @@
 
 package javafx.scene.layout;
 
+import com.sun.javafx.util.InterpolationUtils;
+import javafx.animation.Interpolatable;
 import javafx.beans.NamedArg;
 import javafx.geometry.Insets;
 import javafx.scene.paint.Color;
 import javafx.scene.paint.Paint;
 import javafx.scene.shape.StrokeType;
+import java.util.Objects;
 
 /**
  * Defines the stroke to use on a {@link Border} for styling a {@code Region}.
@@ -45,7 +48,7 @@
  *
  * @since JavaFX 8.0
  */
-public class BorderStroke {
+public class BorderStroke implements Interpolatable<BorderStroke> {
     /**
      * The default insets when "thin" is specified.
      */
@@ -72,6 +75,7 @@ public class BorderStroke {
      *
      * @return the fill of top side of this border
      * @defaultValue {@code Color.BLACK}
+     * @interpolationType see {@link Paint}
      */
     public final Paint getTopStroke() { return topStroke; }
     final Paint topStroke;
@@ -85,6 +89,7 @@ public class BorderStroke {
      *
      * @return the fill of right side of this border
      * @defaultValue {@code null} (same as {@code topFill})
+     * @interpolationType see {@link Paint}
      */
     public final Paint getRightStroke() { return rightStroke; }
     final Paint rightStroke;
@@ -95,6 +100,7 @@ public class BorderStroke {
      *
      * @return the fill of bottom side of this border
      * @defaultValue {@code null} (same as {@code topFill})
+     * @interpolationType see {@link Paint}
      */
     public final Paint getBottomStroke() { return bottomStroke; }
     final Paint bottomStroke;
@@ -105,6 +111,7 @@ public class BorderStroke {
      *
      * @return the fill of left side of this border
      * @defaultValue {@code null} (same as {@code rightFill})
+     * @interpolationType see {@link Paint}
      */
     public final Paint getLeftStroke() { return leftStroke; }
     final Paint leftStroke;
@@ -114,6 +121,7 @@ public class BorderStroke {
      *
      * @return the style of top side of this border
      * @defaultValue {@code BorderStrokeStyle.NONE}
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final BorderStrokeStyle getTopStyle() { return topStyle; }
     final BorderStrokeStyle topStyle;
@@ -124,6 +132,7 @@ public class BorderStroke {
      *
      * @return the style of right side of this border
      * @defaultValue {@code null} (same as {@code topStyle})
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final BorderStrokeStyle getRightStyle() { return rightStyle; }
     final BorderStrokeStyle rightStyle;
@@ -135,6 +144,7 @@ public class BorderStroke {
      *
      * @return the style of bottom side of this border
      * @defaultValue {@code null} (same as {@code topStyle})
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final BorderStrokeStyle getBottomStyle() { return bottomStyle; }
     final BorderStrokeStyle bottomStyle;
@@ -146,6 +156,7 @@ public class BorderStroke {
      *
      * @return the style of left side of this border
      * @defaultValue {@code null} (same as {@code rightStyle})
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final BorderStrokeStyle getLeftStyle() { return leftStyle; }
     final BorderStrokeStyle leftStyle;
@@ -153,7 +164,9 @@ public class BorderStroke {
     /**
      * Defines the thickness of each side of the {@code BorderStroke}. This will never
      * be {@code null}, and defaults to {@code DEFAULT_WIDTHS}.
+     *
      * @return the thickness of each side of the {@code BorderStroke}
+     * @interpolationType <a href="../../animation/Interpolatable.html#default">default</a>
      */
     public final BorderWidths getWidths() { return widths; }
     final BorderWidths widths;
@@ -161,7 +174,9 @@ public class BorderStroke {
     /**
      * Defines the insets of each side of the {@code BorderStroke}. This will never
      * be {@code null}, and defaults to {@code Insets.EMPTY}.
+     *
      * @return the insets of each side of the {@code BorderStroke}
+     * @interpolationType <a href="../../animation/Interpolatable.html#default">default</a>
      */
     public final Insets getInsets() { return insets; }
     final Insets insets;
@@ -173,7 +188,9 @@ public class BorderStroke {
     /**
      * Defines the radii for each corner of this {@code BorderStroke}. This will never
      * be {@code null}, and defaults to {@code CornerRadii.EMPTY}.
+     *
      * @return the radii for each corner of this {@code BorderStroke}
+     * @interpolationType <a href="../../animation/Interpolatable.html#default">default</a>
      */
     public final CornerRadii getRadii() { return radii; }
      /* TODO I should change CornerRadii to be 4 properties, one for each corner,
@@ -358,6 +375,84 @@ private double computeOutside(StrokeType type, double width) {
         }
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @throws NullPointerException {@inheritDoc}
+     * @since 24
+     */
+    @Override
+    public BorderStroke interpolate(BorderStroke endValue, double t) {
+        Objects.requireNonNull(endValue, "endValue cannot be null");
+
+        // We don't check equals(endValue) here to prevent unnecessary equality checks,
+        // and only check for equality with 'this' or 'endValue' after interpolation.
+        if (t <= 0) {
+            return this;
+        }
+
+        if (t >= 1) {
+            return endValue;
+        }
+
+        // CornerRadii, BorderWidths, Insets and Paint are implemented such that interpolate() always returns
+        // the existing instance if the intermediate value is equal to the start value or the end value,
+        // which allows us to use an identity comparison in place of a value comparison to determine equality.
+        CornerRadii newRadii = this.radii.interpolate(endValue.radii, t);
+        BorderWidths newWidths = this.widths.interpolate(endValue.widths, t);
+        Insets newInsets = this.insets.interpolate(endValue.insets, t);
+        Paint newTopStroke = InterpolationUtils.interpolatePaint(this.topStroke, endValue.topStroke, t);
+        Paint newRightStroke = InterpolationUtils.interpolatePaint(this.rightStroke, endValue.rightStroke, t);
+        Paint newBottomStroke = InterpolationUtils.interpolatePaint(this.bottomStroke, endValue.bottomStroke, t);
+        Paint newLeftStroke = InterpolationUtils.interpolatePaint(this.leftStroke, endValue.leftStroke, t);
+        BorderStrokeStyle newTopStyle, newRightStyle, newBottomStyle, newLeftStyle;
+
+        if (t < 0.5) {
+            newTopStyle = this.topStyle;
+            newRightStyle = this.rightStyle;
+            newBottomStyle = this.bottomStyle;
+            newLeftStyle = this.leftStyle;
+        } else {
+            newTopStyle = endValue.topStyle;
+            newRightStyle = endValue.rightStyle;
+            newBottomStyle = endValue.bottomStyle;
+            newLeftStyle = endValue.leftStyle;
+        }
+
+        if (isSame(newTopStroke, newRightStroke, newBottomStroke, newLeftStroke,
+                   newTopStyle, newRightStyle, newBottomStyle, newLeftStyle,
+                   newRadii, newWidths, newInsets)) {
+            return this;
+        }
+
+        if (endValue.isSame(newTopStroke, newRightStroke, newBottomStroke, newLeftStroke,
+                            newTopStyle, newRightStyle, newBottomStyle, newLeftStyle,
+                            newRadii, newWidths, newInsets)) {
+            return endValue;
+        }
+
+        return new BorderStroke(newTopStroke, newRightStroke, newBottomStroke, newLeftStroke,
+                                newTopStyle, newRightStyle, newBottomStyle, newLeftStyle,
+                                newRadii, newWidths, newInsets);
+    }
+
+    private boolean isSame(Paint topStroke, Paint rightStroke, Paint bottomStroke, Paint leftStroke,
+                           BorderStrokeStyle topStyle, BorderStrokeStyle rightStyle,
+                           BorderStrokeStyle bottomStyle, BorderStrokeStyle leftStyle,
+                           CornerRadii radii, BorderWidths widths, Insets insets) {
+        return this.topStroke == topStroke
+            && this.rightStroke == rightStroke
+            && this.bottomStroke == bottomStroke
+            && this.leftStroke == leftStroke
+            && this.topStyle == topStyle
+            && this.rightStyle == rightStyle
+            && this.bottomStyle == bottomStyle
+            && this.leftStyle == leftStyle
+            && this.radii == radii
+            && this.widths == widths
+            && this.insets == insets;
+    }
+
     /**
      * {@inheritDoc}
      */
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/layout/BorderWidths.java b/modules/javafx.graphics/src/main/java/javafx/scene/layout/BorderWidths.java
index 77b6c8c7738..3ee8066497d 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/layout/BorderWidths.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/layout/BorderWidths.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,10 @@
 
 package javafx.scene.layout;
 
+import com.sun.javafx.util.InterpolationUtils;
+import javafx.animation.Interpolatable;
 import javafx.beans.NamedArg;
-
+import java.util.Objects;
 
 /**
  * Defines widths for four components (top, right, bottom, and left).
@@ -41,7 +43,7 @@
  * cache, and can safely be reused among multiple Regions.
  * @since JavaFX 8.0
  */
-public final class BorderWidths {
+public final class BorderWidths implements Interpolatable<BorderWidths> {
     /**
      * When used by a BorderStroke, the value of AUTO is interpreted as the
      * value of {@link BorderStroke#MEDIUM} for the corresponding side. When
@@ -72,7 +74,12 @@ public final class BorderWidths {
      * thickness on the top of the border. This value can be a literal value, or can be
      * treated as a percentage, based on the value of the
      * {@link #isTopAsPercentage() topAsPercentage} property.
+     *
      * @return the border thickness on the top of the border
+     * @interpolationType <a href="../../animation/Interpolatable.html#linear">linear</a> if both values are
+     *                    absolute or both values are {@link #isTopAsPercentage() percentages}, and both
+     *                    values are not the special value {@link #AUTO};
+     *                    <a href="../../animation/Interpolatable.html#discrete">discrete</a> otherwise
      */
     public final double getTop() { return top; }
     final double top;
@@ -82,7 +89,12 @@ public final class BorderWidths {
      * thickness on the right of the border. This value can be a literal value, or can be
      * treated as a percentage, based on the value of the
      * {@link #isRightAsPercentage() rightAsPercentage} property.
+     *
      * @return the border thickness on the right of the border
+     * @interpolationType <a href="../../animation/Interpolatable.html#linear">linear</a> if both values are
+     *                    absolute or both values are {@link #isRightAsPercentage() percentages}, and both
+     *                    values are not the special value {@link #AUTO};
+     *                    <a href="../../animation/Interpolatable.html#discrete">discrete</a> otherwise
      */
     public final double getRight() { return right; }
     final double right;
@@ -92,7 +104,12 @@ public final class BorderWidths {
      * thickness on the bottom of the border. This value can be a literal value, or can be
      * treated as a percentage, based on the value of the
      * {@link #isBottomAsPercentage() bottomAsPercentage} property.
+     *
      * @return the border thickness on the bottom of the border
+     * @interpolationType <a href="../../animation/Interpolatable.html#linear">linear</a> if both values are
+     *                    absolute or both values are {@link #isBottomAsPercentage() percentages}, and both
+     *                    values are not the special value {@link #AUTO};
+     *                    <a href="../../animation/Interpolatable.html#discrete">discrete</a> otherwise
      */
     public final double getBottom() { return bottom; }
     final double bottom;
@@ -102,7 +119,12 @@ public final class BorderWidths {
      * thickness on the left of the border. This value can be an literal value, or can be
      * treated as a percentage, based on the value of the
      * {@link #isLeftAsPercentage() leftAsPercentage} property.
+     *
      * @return the border thickness on the left of the border
+     * @interpolationType <a href="../../animation/Interpolatable.html#linear">linear</a> if both values are
+     *                    absolute or both values are {@link #isLeftAsPercentage() percentages}, and both
+     *                    values are not the special value {@link #AUTO};
+     *                    <a href="../../animation/Interpolatable.html#discrete">discrete</a> otherwise
      */
     public final double getLeft() { return left; }
     final double left;
@@ -110,7 +132,9 @@ public final class BorderWidths {
     /**
      * Specifies whether the {@link #getTop() top} property should be interpreted as a percentage ({@code true})
      * of the region height or not ({@code false}).
+     *
      * @return true if top should be interpreted as a percentage of the region height, otherwise false
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final boolean isTopAsPercentage() { return topAsPercentage; }
     final boolean topAsPercentage;
@@ -118,7 +142,9 @@ public final class BorderWidths {
     /**
      * Specifies whether the {@link #getRight() right} property should be interpreted as a percentage ({@code true})
      * of the region width or not ({@code false}).
+     *
      * @return true if right should be interpreted as a percentage of the region width, otherwise false
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final boolean isRightAsPercentage() { return rightAsPercentage; }
     final boolean rightAsPercentage;
@@ -126,7 +152,9 @@ public final class BorderWidths {
     /**
      * Specifies whether the {@link #getBottom() bottom} property should be interpreted as a percentage ({@code true})
      * of the region height or not ({@code false}).
+     *
      * @return true if bottom should be interpreted as a percentage of the region height, otherwise false
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final boolean isBottomAsPercentage() { return bottomAsPercentage; }
     final boolean bottomAsPercentage;
@@ -134,7 +162,9 @@ public final class BorderWidths {
     /**
      * Specifies whether the {@link #getLeft() left} property should be interpreted as a percentage ({@code true})
      * of the region width or not ({@code false}).
+     *
      * @return true if left should be interpreted as a percentage of the region width, otherwise false
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final boolean isLeftAsPercentage() { return leftAsPercentage; }
     final boolean leftAsPercentage;
@@ -223,6 +253,107 @@ public BorderWidths(
         hash = result;
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @throws NullPointerException {@inheritDoc}
+     * @since 24
+     */
+    @Override
+    public BorderWidths interpolate(BorderWidths endValue, double t) {
+        Objects.requireNonNull(endValue, "endValue cannot be null");
+
+        if (t <= 0 || equals(endValue)) {
+            return this;
+        }
+
+        if (t >= 1) {
+            return endValue;
+        }
+
+        double newTop, newRight, newBottom, newLeft;
+        boolean newTopAsPercentage, newRightAsPercentage, newBottomAsPercentage, newLeftAsPercentage;
+
+        if (this.topAsPercentage == endValue.topAsPercentage) {
+            newTop = interpolate(this.top, endValue.top, t);
+            newTopAsPercentage = this.topAsPercentage;
+        } else if (t < 0.5) {
+            newTop = this.top;
+            newTopAsPercentage = this.topAsPercentage;
+        } else {
+            newTop = endValue.top;
+            newTopAsPercentage = endValue.topAsPercentage;
+        }
+
+        if (this.rightAsPercentage == endValue.rightAsPercentage) {
+            newRight = interpolate(this.right, endValue.right, t);
+            newRightAsPercentage = this.rightAsPercentage;
+        } else if (t < 0.5) {
+            newRight = this.right;
+            newRightAsPercentage = this.rightAsPercentage;
+        } else {
+            newRight = endValue.right;
+            newRightAsPercentage = endValue.rightAsPercentage;
+        }
+
+        if (this.bottomAsPercentage == endValue.bottomAsPercentage) {
+            newBottom = interpolate(this.bottom, endValue.bottom, t);
+            newBottomAsPercentage = this.bottomAsPercentage;
+        } else if (t < 0.5) {
+            newBottom = this.bottom;
+            newBottomAsPercentage = this.bottomAsPercentage;
+        } else {
+            newBottom = endValue.bottom;
+            newBottomAsPercentage = endValue.bottomAsPercentage;
+        }
+
+        if (this.leftAsPercentage == endValue.leftAsPercentage) {
+            newLeft = interpolate(this.left, endValue.left, t);
+            newLeftAsPercentage = this.leftAsPercentage;
+        } else if (t < 0.5) {
+            newLeft = this.left;
+            newLeftAsPercentage = this.leftAsPercentage;
+        } else {
+            newLeft = endValue.left;
+            newLeftAsPercentage = endValue.leftAsPercentage;
+        }
+
+        if (isSame(newTop, newRight, newBottom, newLeft,
+                   newTopAsPercentage, newRightAsPercentage,
+                   newBottomAsPercentage, newLeftAsPercentage)) {
+            return this;
+        }
+
+        if (endValue.isSame(newTop, newRight, newBottom, newLeft,
+                            newTopAsPercentage, newRightAsPercentage,
+                            newBottomAsPercentage, newLeftAsPercentage)) {
+            return endValue;
+        }
+
+        return new BorderWidths(
+            newTop, newRight, newBottom, newLeft,
+            newTopAsPercentage, newRightAsPercentage, newBottomAsPercentage, newLeftAsPercentage);
+    }
+
+    private static double interpolate(double start, double end, double t) {
+        return start != AUTO && end != AUTO ?
+            InterpolationUtils.interpolate(start, end, t) :
+            InterpolationUtils.interpolateDiscrete(start, end, t);
+    }
+
+    private boolean isSame(double top, double right, double bottom, double left,
+                           boolean topAsPercentage, boolean rightAsPercentage,
+                           boolean bottomAsPercentage, boolean leftAsPercentage) {
+        return this.top == top
+            && this.right == right
+            && this.bottom == bottom
+            && this.left == left
+            && this.topAsPercentage == topAsPercentage
+            && this.rightAsPercentage == rightAsPercentage
+            && this.bottomAsPercentage == bottomAsPercentage
+            && this.leftAsPercentage == leftAsPercentage;
+    }
+
     /**
      * {@inheritDoc}
      */
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/layout/CornerRadii.java b/modules/javafx.graphics/src/main/java/javafx/scene/layout/CornerRadii.java
index 54fb510b4b8..70c86480c0f 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/layout/CornerRadii.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/layout/CornerRadii.java
@@ -25,8 +25,10 @@
 
 package javafx.scene.layout;
 
+import com.sun.javafx.util.InterpolationUtils;
+import javafx.animation.Interpolatable;
 import javafx.beans.NamedArg;
-
+import java.util.Objects;
 
 /**
  * Defines the radii of each of the four corners of a BorderStroke. The
@@ -37,7 +39,7 @@
  *
  * @since JavaFX 8.0
  */
-public class CornerRadii {
+public class CornerRadii implements Interpolatable<CornerRadii> {
     /**
      * A CornerRadii which is entirely empty, indicating squared corners.
      * This is the default value for a BorderStroke's radii.
@@ -49,112 +51,160 @@ public class CornerRadii {
 
     /**
      * The length of the horizontal radii of the top-left corner.
+     *
      * @return the length of the horizontal radii of the top-left corner
+     * @interpolationType <a href="../../animation/Interpolatable.html#linear">linear</a> if both values are
+     *                    absolute or both values are {@link #isTopLeftHorizontalRadiusAsPercentage() percentages},
+     *                    <a href="../../animation/Interpolatable.html#discrete">discrete</a> otherwise
      */
     public final double getTopLeftHorizontalRadius() { return topLeftHorizontalRadius; }
     private double topLeftHorizontalRadius;
 
     /**
      * The length of the vertical radii of the top-left corner.
+     *
      * @return the length of the vertical radii of the top-left corner
+     * @interpolationType <a href="../../animation/Interpolatable.html#linear">linear</a> if both values are
+     *                    absolute or both values are {@link #isTopLeftVerticalRadiusAsPercentage() percentages},
+     *                    <a href="../../animation/Interpolatable.html#discrete">discrete</a> otherwise
      */
     public final double getTopLeftVerticalRadius() { return topLeftVerticalRadius; }
     private double topLeftVerticalRadius;
 
     /**
      * The length of the vertical radii of the top-right corner.
+     *
      * @return the length of the vertical radii of the top-right corner
+     * @interpolationType <a href="../../animation/Interpolatable.html#linear">linear</a> if both values are
+     *                    absolute or both values are {@link #isTopRightVerticalRadiusAsPercentage() percentages},
+     *                    <a href="../../animation/Interpolatable.html#discrete">discrete</a> otherwise
      */
     public final double getTopRightVerticalRadius() { return topRightVerticalRadius; }
     private double topRightVerticalRadius;
 
     /**
      * The length of the horizontal radii of the top-right corner.
+     *
      * @return the length of the horizontal radii of the top-right corner
+     * @interpolationType <a href="../../animation/Interpolatable.html#linear">linear</a> if both values are
+     *                    absolute or both values are {@link #isTopRightHorizontalRadiusAsPercentage() percentages},
+     *                    <a href="../../animation/Interpolatable.html#discrete">discrete</a> otherwise
      */
     public final double getTopRightHorizontalRadius() { return topRightHorizontalRadius; }
     private double topRightHorizontalRadius;
 
     /**
      * The length of the horizontal radii of the bottom-right corner.
+     *
      * @return the length of the horizontal radii of the bottom-right corner
+     * @interpolationType <a href="../../animation/Interpolatable.html#linear">linear</a> if both values are
+     *                    absolute or both values are {@link #isBottomRightHorizontalRadiusAsPercentage() percentages},
+     *                    <a href="../../animation/Interpolatable.html#discrete">discrete</a> otherwise
      */
     public final double getBottomRightHorizontalRadius() { return bottomRightHorizontalRadius; }
     private double bottomRightHorizontalRadius;
 
     /**
      * The length of the vertical radii of the bottom-right corner.
+     *
      * @return the length of the vertical radii of the bottom-right corner
+     * @interpolationType <a href="../../animation/Interpolatable.html#linear">linear</a> if both values are
+     *                    absolute or both values are {@link #isBottomRightVerticalRadiusAsPercentage() percentages},
+     *                    <a href="../../animation/Interpolatable.html#discrete">discrete</a> otherwise
      */
     public final double getBottomRightVerticalRadius() { return bottomRightVerticalRadius; }
     private double bottomRightVerticalRadius;
 
     /**
      * The length of the vertical radii of the bottom-left corner.
+     *
      * @return the length of the vertical radii of the bottom-left corner
+     * @interpolationType <a href="../../animation/Interpolatable.html#linear">linear</a> if both values are
+     *                    absolute or both values are {@link #isBottomLeftVerticalRadiusAsPercentage() percentages},
+     *                    <a href="../../animation/Interpolatable.html#discrete">discrete</a> otherwise
      */
     public final double getBottomLeftVerticalRadius() { return bottomLeftVerticalRadius; }
     private double bottomLeftVerticalRadius;
 
     /**
      * The length of the horizontal radii of the bottom-left corner.
+     *
      * @return the length of the horizontal radii of the bottom-left corner
+     * @interpolationType <a href="../../animation/Interpolatable.html#linear">linear</a> if both values are
+     *                    absolute or both values are {@link #isBottomLeftHorizontalRadiusAsPercentage() percentages},
+     *                    <a href="../../animation/Interpolatable.html#discrete">discrete</a> otherwise
      */
     public final double getBottomLeftHorizontalRadius() { return bottomLeftHorizontalRadius; }
     private double bottomLeftHorizontalRadius;
 
     /**
-     * indicates whether {@code topLeftHorizontalRadius} is interpreted as a value or a percentage.
+     * Indicates whether {@code topLeftHorizontalRadius} is interpreted as a value or a percentage.
+     *
      * @return if true topLeftHorizontalRadius is in percentage, otherwise a value
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final boolean isTopLeftHorizontalRadiusAsPercentage() { return topLeftHorizontalRadiusAsPercentage; }
     private final boolean topLeftHorizontalRadiusAsPercentage;
 
     /**
-     * indicates whether {@code topLeftVerticalRadius} is interpreted as a value or a percentage.
+     * Indicates whether {@code topLeftVerticalRadius} is interpreted as a value or a percentage.
+     *
      * @return if true topLeftVerticalRadius is in percentage, otherwise a value
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final boolean isTopLeftVerticalRadiusAsPercentage() { return topLeftVerticalRadiusAsPercentage; }
     private final boolean topLeftVerticalRadiusAsPercentage;
 
     /**
-     * indicates whether {@code topRightVerticalRadius} is interpreted as a value or a percentage.
+     * Indicates whether {@code topRightVerticalRadius} is interpreted as a value or a percentage.
+     *
      * @return if true topRightVerticalRadius is in percentage, otherwise a value
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final boolean isTopRightVerticalRadiusAsPercentage() { return topRightVerticalRadiusAsPercentage; }
     private final boolean topRightVerticalRadiusAsPercentage;
 
     /**
-     * indicates whether {@code topRightHorizontalRadius} is interpreted as a value or a percentage.
+     * Indicates whether {@code topRightHorizontalRadius} is interpreted as a value or a percentage.
+     *
      * @return if true topRightHorizontalRadius is in percentage, otherwise a value
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final boolean isTopRightHorizontalRadiusAsPercentage() { return topRightHorizontalRadiusAsPercentage; }
     private final boolean topRightHorizontalRadiusAsPercentage;
 
     /**
-     * indicates whether {@code bottomRightHorizontalRadius} is interpreted as a value or a percentage.
+     * Indicates whether {@code bottomRightHorizontalRadius} is interpreted as a value or a percentage.
+     *
      * @return if true bottomRightHorizontalRadius is in percentage, otherwise a value
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final boolean isBottomRightHorizontalRadiusAsPercentage() { return bottomRightHorizontalRadiusAsPercentage; }
     private final boolean bottomRightHorizontalRadiusAsPercentage;
 
     /**
-     * indicates whether {@code bottomRightVerticalRadius} is interpreted as a value or a percentage.
+     * Indicates whether {@code bottomRightVerticalRadius} is interpreted as a value or a percentage.
+     *
      * @return if true bottomRightVerticalRadius is in percentage, otherwise a value
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final boolean isBottomRightVerticalRadiusAsPercentage() { return bottomRightVerticalRadiusAsPercentage; }
     private final boolean bottomRightVerticalRadiusAsPercentage;
 
     /**
-     * indicates whether {@code bottomLeftVerticalRadius} is interpreted as a value or a percentage.
+     * Indicates whether {@code bottomLeftVerticalRadius} is interpreted as a value or a percentage.
+     *
      * @return if true bottomLeftVerticalRadius is in percentage, otherwise a value
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final boolean isBottomLeftVerticalRadiusAsPercentage() { return bottomLeftVerticalRadiusAsPercentage; }
     private final boolean bottomLeftVerticalRadiusAsPercentage;
 
     /**
-     * indicates whether {@code bottomLeftHorizontalRadius} is interpreted as a value or a percentage.
+     * Indicates whether {@code bottomLeftHorizontalRadius} is interpreted as a value or a percentage.
+     *
      * @return if true bottomLeftHorizontalRadius is in percentage, otherwise a value
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final boolean isBottomLeftHorizontalRadiusAsPercentage() { return bottomLeftHorizontalRadiusAsPercentage; }
     private final boolean bottomLeftHorizontalRadiusAsPercentage;
@@ -359,6 +409,174 @@ private int preComputeHash() {
         return result;
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @throws NullPointerException {@inheritDoc}
+     * @since 24
+     */
+    @Override
+    public CornerRadii interpolate(CornerRadii endValue, double t) {
+        Objects.requireNonNull(endValue, "endValue cannot be null");
+
+        if (t <= 0) {
+            return this;
+        }
+
+        if (t >= 1) {
+            return endValue;
+        }
+
+        if (uniform && endValue.uniform) {
+            double newRadius = interpolate(
+                this.topLeftHorizontalRadius, endValue.topLeftHorizontalRadius,
+                this.topLeftHorizontalRadiusAsPercentage, endValue.topLeftHorizontalRadiusAsPercentage, t);
+
+            boolean newRadiusAsPercentage = t < 0.5 ?
+                this.topLeftHorizontalRadiusAsPercentage :
+                endValue.topLeftHorizontalRadiusAsPercentage;
+
+            if (topLeftHorizontalRadius == newRadius
+                    && topLeftHorizontalRadiusAsPercentage == newRadiusAsPercentage) {
+                return this;
+            }
+
+            if (endValue.topLeftHorizontalRadius == newRadius
+                    && endValue.topLeftHorizontalRadiusAsPercentage == newRadiusAsPercentage) {
+                return endValue;
+            }
+
+            return new CornerRadii(newRadius, newRadiusAsPercentage);
+        }
+
+        boolean newTopLeftHorizontalRadiusAsPercentage,
+                newTopLeftVerticalRadiusAsPercentage,
+                newTopRightVerticalRadiusAsPercentage,
+                newTopRightHorizontalRadiusAsPercentage,
+                newBottomRightHorizontalRadiusAsPercentage,
+                newBottomRightVerticalRadiusAsPercentage,
+                newBottomLeftVerticalRadiusAsPercentage,
+                newBottomLeftHorizontalRadiusAsPercentage;
+
+        if (t < 0.5) {
+            newTopLeftHorizontalRadiusAsPercentage = this.topLeftHorizontalRadiusAsPercentage;
+            newTopLeftVerticalRadiusAsPercentage = this.topLeftVerticalRadiusAsPercentage;
+            newTopRightVerticalRadiusAsPercentage = this.topRightVerticalRadiusAsPercentage;
+            newTopRightHorizontalRadiusAsPercentage = this.topRightHorizontalRadiusAsPercentage;
+            newBottomRightHorizontalRadiusAsPercentage = this.bottomRightHorizontalRadiusAsPercentage;
+            newBottomRightVerticalRadiusAsPercentage = this.bottomRightVerticalRadiusAsPercentage;
+            newBottomLeftVerticalRadiusAsPercentage = this.bottomLeftVerticalRadiusAsPercentage;
+            newBottomLeftHorizontalRadiusAsPercentage = this.bottomLeftHorizontalRadiusAsPercentage;
+        } else {
+            newTopLeftHorizontalRadiusAsPercentage = endValue.topLeftHorizontalRadiusAsPercentage;
+            newTopLeftVerticalRadiusAsPercentage = endValue.topLeftVerticalRadiusAsPercentage;
+            newTopRightVerticalRadiusAsPercentage = endValue.topRightVerticalRadiusAsPercentage;
+            newTopRightHorizontalRadiusAsPercentage = endValue.topRightHorizontalRadiusAsPercentage;
+            newBottomRightHorizontalRadiusAsPercentage = endValue.bottomRightHorizontalRadiusAsPercentage;
+            newBottomRightVerticalRadiusAsPercentage = endValue.bottomRightVerticalRadiusAsPercentage;
+            newBottomLeftVerticalRadiusAsPercentage = endValue.bottomLeftVerticalRadiusAsPercentage;
+            newBottomLeftHorizontalRadiusAsPercentage = endValue.bottomLeftHorizontalRadiusAsPercentage;
+        }
+
+        double newTopLeftHorizontalRadius = interpolate(
+            this.topLeftHorizontalRadius, endValue.topLeftHorizontalRadius,
+            this.topLeftHorizontalRadiusAsPercentage, endValue.topLeftHorizontalRadiusAsPercentage, t);
+
+        double newTopLeftVerticalRadius = interpolate(
+            this.topLeftVerticalRadius, endValue.topLeftVerticalRadius,
+            this.topLeftVerticalRadiusAsPercentage, endValue.topLeftVerticalRadiusAsPercentage, t);
+
+        double newTopRightVerticalRadius = interpolate(
+            this.topRightVerticalRadius, endValue.topRightVerticalRadius,
+            this.topRightVerticalRadiusAsPercentage, endValue.topRightVerticalRadiusAsPercentage, t);
+
+        double newTopRightHorizontalRadius = interpolate(
+            this.topRightHorizontalRadius, endValue.topRightHorizontalRadius,
+            this.topRightHorizontalRadiusAsPercentage, endValue.topRightHorizontalRadiusAsPercentage, t);
+
+        double newBottomRightHorizontalRadius = interpolate(
+            this.bottomRightHorizontalRadius, endValue.bottomRightHorizontalRadius,
+            this.bottomRightHorizontalRadiusAsPercentage, endValue.bottomRightHorizontalRadiusAsPercentage, t);
+
+        double newBottomRightVerticalRadius = interpolate(
+            this.bottomRightVerticalRadius, endValue.bottomRightVerticalRadius,
+            this.bottomRightVerticalRadiusAsPercentage, endValue.bottomRightVerticalRadiusAsPercentage, t);
+
+        double newBottomLeftVerticalRadius = interpolate(
+            this.bottomLeftVerticalRadius, endValue.bottomLeftVerticalRadius,
+            this.bottomLeftVerticalRadiusAsPercentage, endValue.bottomLeftVerticalRadiusAsPercentage, t);
+
+        double newBottomLeftHorizontalRadius = interpolate(
+            this.bottomLeftHorizontalRadius, endValue.bottomLeftHorizontalRadius,
+            this.bottomLeftHorizontalRadiusAsPercentage, endValue.bottomLeftHorizontalRadiusAsPercentage, t);
+
+        if (isSame(newTopLeftHorizontalRadius, newTopLeftVerticalRadius,
+                   newTopRightVerticalRadius, newTopRightHorizontalRadius,
+                   newBottomRightHorizontalRadius, newBottomRightVerticalRadius,
+                   newBottomLeftVerticalRadius, newBottomLeftHorizontalRadius,
+                   newTopLeftHorizontalRadiusAsPercentage, newTopLeftVerticalRadiusAsPercentage,
+                   newTopRightVerticalRadiusAsPercentage, newTopRightHorizontalRadiusAsPercentage,
+                   newBottomRightHorizontalRadiusAsPercentage, newBottomRightVerticalRadiusAsPercentage,
+                   newBottomLeftVerticalRadiusAsPercentage, newBottomLeftHorizontalRadiusAsPercentage)) {
+            return this;
+        }
+
+        if (endValue.isSame(newTopLeftHorizontalRadius, newTopLeftVerticalRadius,
+                            newTopRightVerticalRadius, newTopRightHorizontalRadius,
+                            newBottomRightHorizontalRadius, newBottomRightVerticalRadius,
+                            newBottomLeftVerticalRadius, newBottomLeftHorizontalRadius,
+                            newTopLeftHorizontalRadiusAsPercentage, newTopLeftVerticalRadiusAsPercentage,
+                            newTopRightVerticalRadiusAsPercentage, newTopRightHorizontalRadiusAsPercentage,
+                            newBottomRightHorizontalRadiusAsPercentage, newBottomRightVerticalRadiusAsPercentage,
+                            newBottomLeftVerticalRadiusAsPercentage, newBottomLeftHorizontalRadiusAsPercentage)) {
+            return endValue;
+        }
+
+        return new CornerRadii(
+            newTopLeftHorizontalRadius, newTopLeftVerticalRadius,
+            newTopRightVerticalRadius, newTopRightHorizontalRadius,
+            newBottomRightHorizontalRadius, newBottomRightVerticalRadius,
+            newBottomLeftVerticalRadius, newBottomLeftHorizontalRadius,
+            newTopLeftHorizontalRadiusAsPercentage, newTopLeftVerticalRadiusAsPercentage,
+            newTopRightVerticalRadiusAsPercentage, newTopRightHorizontalRadiusAsPercentage,
+            newBottomRightHorizontalRadiusAsPercentage, newBottomRightVerticalRadiusAsPercentage,
+            newBottomLeftVerticalRadiusAsPercentage, newBottomLeftHorizontalRadiusAsPercentage);
+    }
+
+    private static double interpolate(double start, double end,
+                                      boolean startIsPercentage, boolean endIsPercentage,
+                                      double t) {
+        return startIsPercentage == endIsPercentage ?
+            InterpolationUtils.interpolate(start, end, t) :
+            InterpolationUtils.interpolateDiscrete(start, end, t);
+    }
+
+    private boolean isSame(double topLeftHorizontalRadius, double topLeftVerticalRadius,
+                           double topRightVerticalRadius, double topRightHorizontalRadius,
+                           double bottomRightHorizontalRadius, double bottomRightVerticalRadius,
+                           double bottomLeftVerticalRadius, double bottomLeftHorizontalRadius,
+                           boolean topLeftHorizontalRadiusAsPercentage, boolean topLeftVerticalRadiusAsPercentage,
+                           boolean topRightVerticalRadiusAsPercentage, boolean topRightHorizontalRadiusAsPercentage,
+                           boolean bottomRightHorizontalRadiusAsPercentage, boolean bottomRightVerticalRadiusAsPercentage,
+                           boolean bottomLeftVerticalRadiusAsPercentage, boolean bottomLeftHorizontalRadiusAsPercentage) {
+        return this.topLeftHorizontalRadius == topLeftHorizontalRadius
+            && this.topLeftVerticalRadius == topLeftVerticalRadius
+            && this.topRightVerticalRadius == topRightVerticalRadius
+            && this.topRightHorizontalRadius == topRightHorizontalRadius
+            && this.bottomRightHorizontalRadius == bottomRightHorizontalRadius
+            && this.bottomRightVerticalRadius == bottomRightVerticalRadius
+            && this.bottomLeftVerticalRadius == bottomLeftVerticalRadius
+            && this.bottomLeftHorizontalRadius == bottomLeftHorizontalRadius
+            && this.topLeftHorizontalRadiusAsPercentage == topLeftHorizontalRadiusAsPercentage
+            && this.topLeftVerticalRadiusAsPercentage == topLeftVerticalRadiusAsPercentage
+            && this.topRightVerticalRadiusAsPercentage == topRightVerticalRadiusAsPercentage
+            && this.topRightHorizontalRadiusAsPercentage == topRightHorizontalRadiusAsPercentage
+            && this.bottomRightHorizontalRadiusAsPercentage == bottomRightHorizontalRadiusAsPercentage
+            && this.bottomRightVerticalRadiusAsPercentage == bottomRightVerticalRadiusAsPercentage
+            && this.bottomLeftVerticalRadiusAsPercentage == bottomLeftVerticalRadiusAsPercentage
+            && this.bottomLeftHorizontalRadiusAsPercentage == bottomLeftHorizontalRadiusAsPercentage;
+    }
+
     /**
      * {@inheritDoc}
      */
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/paint/Color.java b/modules/javafx.graphics/src/main/java/javafx/scene/paint/Color.java
index 8533b7b8375..f3688b393c2 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/paint/Color.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/paint/Color.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,10 @@
 
 package javafx.scene.paint;
 
-import javafx.animation.Interpolatable;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
+import com.sun.javafx.util.InterpolationUtils;
 import com.sun.javafx.util.Utils;
 import com.sun.javafx.tk.Toolkit;
 import javafx.beans.NamedArg;
@@ -105,7 +106,7 @@
  *
  * @since JavaFX 2.0
  */
-public final class Color extends Paint implements Interpolatable<Color> {
+public final class Color extends Paint {
 
     /**
      * Brightness change factor for darker() and brighter() methods.
@@ -1841,6 +1842,7 @@ private static Color get(String name) {
      *
      * @return the red component of the {@code Color}, in the range {@code 0.0-1.0}
      * @defaultValue 0.0
+     * @interpolationType <a href="../../animation/Interpolatable.html#linear">linear</a>
      */
     public final double getRed() { return red; }
     private final float red;
@@ -1850,6 +1852,7 @@ private static Color get(String name) {
      *
      * @return the green component of the {@code Color}, in the range {@code 0.0-1.0}
      * @defaultValue 0.0
+     * @interpolationType <a href="../../animation/Interpolatable.html#linear">linear</a>
      */
     public final double getGreen() { return green; }
     private final float green;
@@ -1859,6 +1862,7 @@ private static Color get(String name) {
      *
      * @return the blue component of the {@code Color}, in the range {@code 0.0-1.0}
      * @defaultValue 0.0
+     * @interpolationType <a href="../../animation/Interpolatable.html#linear">linear</a>
      */
     public final double getBlue() { return blue; }
     private final float blue;
@@ -1868,6 +1872,7 @@ private static Color get(String name) {
      *
      * @return the opacity of the {@code Color}, in the range {@code 0.0-1.0}
      * @defaultValue 1.0
+     * @interpolationType <a href="../../animation/Interpolatable.html#linear">linear</a>
      */
     public final double getOpacity() { return opacity; }
     private final float opacity;
@@ -1935,10 +1940,20 @@ Object acc_getPlatformPaint() {
     }
 
     /**
-     * {@inheritDoc}
+     * Returns an intermediate value between the value of this {@code Color} and the specified
+     * {@code endValue} using the linear interpolation factor {@code t}, ranging from 0 (inclusive)
+     * to 1 (inclusive).
+     *
+     * @param endValue the target value
+     * @param t the interpolation factor
+     * @throws NullPointerException if {@code endValue} is {@code null}
+     * @return the intermediate value
      */
-    @Override public Color interpolate(Color endValue, double t) {
-        if (t <= 0.0) return this;
+    public Color interpolate(Color endValue, double t) {
+        Objects.requireNonNull(endValue, "endValue cannot be null");
+
+        // If both instances are equal, return this instance to prevent the creation of numerous small objects.
+        if (t <= 0.0 || equals(endValue)) return this;
         if (t >= 1.0) return endValue;
         float ft = (float) t;
         return new Color(
@@ -1949,6 +1964,17 @@ Object acc_getPlatformPaint() {
         );
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @throws NullPointerException {@inheritDoc}
+     * @since 24
+     */
+    @Override
+    public Paint interpolate(Paint endValue, double t) {
+        return InterpolationUtils.interpolatePaint(this, endValue, t);
+    }
+
     /**
      * Indicates whether some other object is "equal to" this one.
      * @param obj the reference object with which to compare.
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/paint/ImagePattern.java b/modules/javafx.graphics/src/main/java/javafx/scene/paint/ImagePattern.java
index f32d81cd21f..8b896766343 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/paint/ImagePattern.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/paint/ImagePattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,8 @@
 import javafx.scene.image.Image;
 import com.sun.javafx.beans.event.AbstractNotifyListener;
 import com.sun.javafx.tk.Toolkit;
+import com.sun.javafx.util.InterpolationUtils;
+import java.util.Objects;
 
 /**
  * <p>The {@code ImagePattern} class fills a shape with an image pattern. The
@@ -137,6 +139,7 @@ public final class ImagePattern extends Paint {
     /**
      * Gets the image to be used as a paint.
      *
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      * @return Image to be used as a paint.
      */
     public final Image getImage() {
@@ -150,6 +153,9 @@ public final Image getImage() {
      * Gets the x origin of the anchor rectangle.
      *
      * @defaultValue 0.0
+     * @interpolationType <a href="../../animation/Interpolatable.html#linear">linear</a>
+     *                    if both values are absolute or both values are {@link #isProportional() proportional},
+     *                    <a href="../../animation/Interpolatable.html#discrete">discrete</a> otherwise
      * @return The x origin of the anchor rectangle.
      */
     public final double getX() {
@@ -162,6 +168,9 @@ public final double getX() {
      * Gets the y origin of the anchor rectangle.
      *
      * @defaultValue 0.0
+     * @interpolationType <a href="../../animation/Interpolatable.html#linear">linear</a>
+     *                    if both values are absolute or both values are {@link #isProportional() proportional},
+     *                    <a href="../../animation/Interpolatable.html#discrete">discrete</a> otherwise
      * @return The y origin of the anchor rectangle.
      */
     public final double getY() {
@@ -175,6 +184,9 @@ public final double getY() {
      * Gets the width of the anchor rectangle.
      *
      * @defaultValue 1.0
+     * @interpolationType <a href="../../animation/Interpolatable.html#linear">linear</a>
+     *                    if both values are absolute or both values are {@link #isProportional() proportional},
+     *                    <a href="../../animation/Interpolatable.html#discrete">discrete</a> otherwise
      * @return The width of the anchor rectangle.
      */
     public final double getWidth() {
@@ -188,6 +200,9 @@ public final double getWidth() {
      * Gets the height of the anchor rectangle.
      *
      * @defaultValue 1.0
+     * @interpolationType <a href="../../animation/Interpolatable.html#linear">linear</a>
+     *                    if both values are absolute or both values are {@link #isProportional() proportional},
+     *                    <a href="../../animation/Interpolatable.html#discrete">discrete</a> otherwise
      * @return The height of the anchor rectangle.
      */
     public final double getHeight() {
@@ -206,6 +221,7 @@ public final double getHeight() {
      * in the local coordinate system of the node.
      *
      * @defaultValue true
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      * @return boolean that is true if this paint is proportional.
      */
     public final boolean isProportional() {
@@ -221,6 +237,7 @@ public final boolean isProportional() {
     }
 
     private Object platformPaint;
+    private int hash;
 
     /**
      * Creates a new instance of ImagePattern from the specified image. Default
@@ -270,6 +287,82 @@ public ImagePattern(@NamedArg("image") Image image, @NamedArg("x") double x, @Na
         this.proportional = proportional;
     }
 
+    /**
+     * Returns an intermediate value between the value of this {@code ImagePattern} and the specified
+     * {@code endValue} using the linear interpolation factor {@code t}, ranging from 0 (inclusive)
+     * to 1 (inclusive).
+     *
+     * @param endValue the target value
+     * @param t the interpolation factor
+     * @throws NullPointerException if {@code endValue} is {@code null}
+     * @return the intermediate value
+     * @since 24
+     */
+    public ImagePattern interpolate(ImagePattern endValue, double t) {
+        Objects.requireNonNull(endValue, "endValue cannot be null");
+
+        if (t <= 0 || equals(endValue)) {
+            return this;
+        }
+
+        if (t >= 1) {
+            return endValue;
+        }
+
+        if (proportional != endValue.proportional) {
+            return InterpolationUtils.interpolateDiscrete(this, endValue, t);
+        }
+
+        return new ImagePattern(
+            InterpolationUtils.interpolateDiscrete(image, endValue.image, t),
+            InterpolationUtils.interpolate(x, endValue.x, t),
+            InterpolationUtils.interpolate(y, endValue.y, t),
+            InterpolationUtils.interpolate(width, endValue.width, t),
+            InterpolationUtils.interpolate(height, endValue.height, t),
+            proportional);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @throws NullPointerException {@inheritDoc}
+     * @since 24
+     */
+    @Override
+    public Paint interpolate(Paint endValue, double t) {
+        return InterpolationUtils.interpolatePaint(this, endValue, t);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof ImagePattern other) {
+            return proportional == other.proportional
+                && x == other.x
+                && y == other.y
+                && width == other.width
+                && height == other.height
+                && image.equals(other.image);
+        }
+
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        if (hash == 0) {
+            long bits = 17L;
+            bits = 37L * bits + Double.doubleToLongBits(x);
+            bits = 37L * bits + Double.doubleToLongBits(y);
+            bits = 37L * bits + Double.doubleToLongBits(width);
+            bits = 37L * bits + Double.doubleToLongBits(height);
+            bits = 37L * bits + ((proportional) ? 1231L : 1237L);
+            bits = 37L * bits + image.hashCode();
+            hash = (int) (bits ^ (bits >> 32));
+        }
+
+        return hash;
+    }
+
     @Override
     boolean acc_isMutable() {
         return Toolkit.getImageAccessor().isAnimation(image);
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/paint/LinearGradient.java b/modules/javafx.graphics/src/main/java/javafx/scene/paint/LinearGradient.java
index 8226b121aee..c07ec30bd73 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/paint/LinearGradient.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/paint/LinearGradient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,9 +26,10 @@
 package javafx.scene.paint;
 
 import java.util.List;
-
+import java.util.Objects;
 import com.sun.javafx.scene.paint.GradientUtils;
 import com.sun.javafx.tk.Toolkit;
+import com.sun.javafx.util.InterpolationUtils;
 import javafx.beans.NamedArg;
 
 /**
@@ -78,11 +79,14 @@ public final class LinearGradient extends Paint {
     /**
      * Defines the X coordinate of the gradient axis start point.
      * If proportional is true (the default), this value specifies a
-     * point on a unit square that will be scaled to match the size of the
+     * point on a unit square that will be scaled to match the size of
      * the shape that the gradient fills.
-     (
+     *
      * @return the X coordinate of the gradient axis start point
      * @defaultValue 0.0
+     * @interpolationType <a href="../../animation/Interpolatable.html#linear">linear</a>
+     *                    if both values are absolute or both values are {@link #isProportional() proportional},
+     *                    <a href="../../animation/Interpolatable.html#discrete">discrete</a> otherwise
      */
     public final double getStartX() {
         return startX;
@@ -93,11 +97,14 @@ public final double getStartX() {
     /**
      * Defines the Y coordinate of the gradient axis start point.
      * If proportional is true (the default), this value specifies a
-     * point on a unit square that will be scaled to match the size of the
+     * point on a unit square that will be scaled to match the size of
      * the shape that the gradient fills.
      *
      * @return the Y coordinate of the gradient axis start point
      * @defaultValue 0.0
+     * @interpolationType <a href="../../animation/Interpolatable.html#linear">linear</a>
+     *                    if both values are absolute or both values are {@link #isProportional() proportional},
+     *                    <a href="../../animation/Interpolatable.html#discrete">discrete</a> otherwise
      */
     public final double getStartY() {
         return startY;
@@ -108,11 +115,14 @@ public final double getStartY() {
     /**
      * Defines the X coordinate of the gradient axis end point.
      * If proportional is true (the default), this value specifies a
-     * point on a unit square that will be scaled to match the size of the
+     * point on a unit square that will be scaled to match the size of
      * the shape that the gradient fills.
      *
      * @return the X coordinate of the gradient axis end point
      * @defaultValue 1.0
+     * @interpolationType <a href="../../animation/Interpolatable.html#linear">linear</a>
+     *                    if both values are absolute or both values are {@link #isProportional() proportional},
+     *                    <a href="../../animation/Interpolatable.html#discrete">discrete</a> otherwise
      */
     public final double getEndX() {
         return endX;
@@ -123,11 +133,14 @@ public final double getEndX() {
     /**
      * Defines the Y coordinate of the gradient axis end point.
      * If proportional is true (the default), this value specifies a
-     * point on a unit square that will be scaled to match the size of the
+     * point on a unit square that will be scaled to match the size of
      * the shape that the gradient fills.
      *
      * @return the Y coordinate of the gradient axis end point
      * @defaultValue 1.0
+     * @interpolationType <a href="../../animation/Interpolatable.html#linear">linear</a>
+     *                    if both values are absolute or both values are {@link #isProportional() proportional},
+     *                    <a href="../../animation/Interpolatable.html#discrete">discrete</a> otherwise
      */
     public final double getEndY() {
         return endY;
@@ -145,6 +158,7 @@ public final double getEndY() {
      *
      * @return if true start and end locations are proportional, otherwise absolute
      * @defaultValue true
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final boolean isProportional() {
         return proportional;
@@ -159,6 +173,7 @@ public final boolean isProportional() {
      *
      * @return the cycle method applied to this linear gradient
      * @defaultValue NO_CYCLE
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final CycleMethod getCycleMethod() {
         return cycleMethod;
@@ -180,6 +195,9 @@ public final CycleMethod getCycleMethod() {
      *
      * @return the list of stop values
      * @defaultValue empty
+     * @interpolationType Stop list interpolation produces smooth transitions of gradient stops by allowing
+     *                    the insertion of new stops along the gradient. At most, the intermediate stop list
+     *                    has the combined number of gradient stops of both the start list and the target list.
      */
     public final List<Stop> getStops() {
         return stops;
@@ -264,6 +282,24 @@ public LinearGradient(
         this.opaque = determineOpacity();
     }
 
+    /**
+     * Private constructor accepting a stop list that is already normalized.
+     * This constructor is only called from the {@link #interpolate} method.
+     */
+    private LinearGradient(
+            double startX, double startY, double endX, double endY,
+            boolean proportional, CycleMethod cycleMethod, List<Stop> stops,
+            int ignored) {
+        this.startX = startX;
+        this.startY = startY;
+        this.endX = endX;
+        this.endY = endY;
+        this.proportional = proportional;
+        this.cycleMethod = cycleMethod;
+        this.stops = stops;
+        this.opaque = determineOpacity();
+    }
+
     /**
      * Iterate over all the stops. If any one of them has a transparent
      * color, then we return false. If there are no stops, we return false.
@@ -290,6 +326,96 @@ Object acc_getPlatformPaint() {
         return platformPaint;
     }
 
+    /**
+     * Returns an intermediate value between the value of this {@code LinearGradient} and the specified
+     * {@code endValue} using the linear interpolation factor {@code t}, ranging from 0 (inclusive)
+     * to 1 (inclusive).
+     *
+     * @param endValue the target value
+     * @param t the interpolation factor
+     * @throws NullPointerException if {@code endValue} is {@code null}
+     * @return the intermediate value
+     * @since 24
+     */
+    public LinearGradient interpolate(LinearGradient endValue, double t) {
+        Objects.requireNonNull(endValue, "endValue cannot be null");
+
+        // We don't check equals(endValue) here to prevent unnecessary equality checks,
+        // and only check for equality with 'this' or 'endValue' after interpolation.
+        if (t <= 0.0) {
+            return this;
+        }
+
+        if (t >= 1.0) {
+            return endValue;
+        }
+
+        double newStartX, newStartY, newEndX, newEndY;
+        boolean newProportional;
+
+        if (this.proportional == endValue.proportional) {
+            newStartX = InterpolationUtils.interpolate(this.startX, endValue.startX, t);
+            newStartY = InterpolationUtils.interpolate(this.startY, endValue.startY, t);
+            newEndX = InterpolationUtils.interpolate(this.endX, endValue.endX, t);
+            newEndY = InterpolationUtils.interpolate(this.endY, endValue.endY, t);
+            newProportional = this.proportional;
+        } else if (t < 0.5) {
+            newStartX = this.startX;
+            newStartY = this.startY;
+            newEndX = this.endX;
+            newEndY = this.endY;
+            newProportional = this.proportional;
+        } else {
+            newStartX = endValue.startX;
+            newStartY = endValue.startY;
+            newEndX = endValue.endX;
+            newEndY = endValue.endY;
+            newProportional = endValue.proportional;
+        }
+
+        CycleMethod newCycleMethod = InterpolationUtils.interpolateDiscrete(this.cycleMethod, endValue.cycleMethod, t);
+
+        // Optimization: if both lists are equal, we don't compute a new intermediate list.
+        List<Stop> newStops = this.stops.equals(endValue.stops) ?
+            null : Stop.interpolateLists(this.stops, endValue.stops, t);
+
+        if (isSame(newStartX, newStartY, newEndX, newEndY, newProportional,
+                   newCycleMethod, Objects.requireNonNullElse(newStops, this.stops))) {
+            return this;
+        }
+
+        if (endValue.isSame(newStartX, newStartY, newEndX, newEndY, newProportional,
+                            newCycleMethod, Objects.requireNonNullElse(newStops, endValue.stops))) {
+            return endValue;
+        }
+
+        return new LinearGradient(newStartX, newStartY, newEndX, newEndY,
+                                  newProportional, newCycleMethod,
+                                  Objects.requireNonNullElse(newStops, this.stops), 0);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @throws NullPointerException {@inheritDoc}
+     * @since 24
+     */
+    @Override
+    public Paint interpolate(Paint endValue, double t) {
+        return InterpolationUtils.interpolatePaint(this, endValue, t);
+    }
+
+    private boolean isSame(double startX, double startY, double endX, double endY,
+                           boolean proportional, CycleMethod cycleMethod, List<Stop> stops) {
+        return this.startX == startX
+            && this.startY == startY
+            && this.endX == endX
+            && this.endY == endY
+            && this.proportional == proportional
+            && this.cycleMethod == cycleMethod
+            && this.stops == stops;
+    }
+
     /**
      * Indicates whether some other object is "equal to" this one.
      * @param obj the reference object with which to compare.
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/paint/Paint.java b/modules/javafx.graphics/src/main/java/javafx/scene/paint/Paint.java
index eccc3e716ea..709ba3c6975 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/paint/Paint.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/paint/Paint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,13 +27,25 @@
 
 import com.sun.javafx.beans.event.AbstractNotifyListener;
 import com.sun.javafx.tk.Toolkit;
+import javafx.animation.Interpolatable;
 
 /**
  * Base class for a color or gradients used to fill shapes and backgrounds when
  * rendering the scene graph.
+ * <p>
+ * Linear interpolation is supported between the following heterogeneous paint combinations:
+ * <ul>
+ *     <li>{@link Color} ↔ {@link LinearGradient}
+ *     <li>{@link Color} ↔ {@link RadialGradient}
+ * </ul>
+ * Heterogeneous paint interpolation converts the {@code Color} to a visually identical gradient
+ * paint, and then performs a linear interpolation between the two gradient paints.
+ * If heterogeneous paints cannot be interpolated as described, the paints are interpolated
+ * <a href="../../animation/Interpolatable.html#discrete">as discrete</a>.
+ *
  * @since JavaFX 2.0
  */
-public abstract class Paint {
+public abstract class Paint implements Interpolatable<Paint> {
 
     static {
         Toolkit.setPaintAccessor(new Toolkit.PaintAccessor() {
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/paint/RadialGradient.java b/modules/javafx.graphics/src/main/java/javafx/scene/paint/RadialGradient.java
index a4244aa561d..c1db3d08e69 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/paint/RadialGradient.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/paint/RadialGradient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,9 +26,10 @@
 package javafx.scene.paint;
 
 import java.util.List;
-
+import java.util.Objects;
 import com.sun.javafx.scene.paint.GradientUtils;
 import com.sun.javafx.tk.Toolkit;
+import com.sun.javafx.util.InterpolationUtils;
 import javafx.beans.NamedArg;
 
 /**
@@ -71,8 +72,10 @@ public final class RadialGradient extends Paint {
     /**
      * Defines the angle in degrees from the center of the gradient
      * to the focus point to which the first color is mapped.
-     * @return the angle in degrees from the center of the gradient
-     * to the focus point to which the first color is mapped
+     *
+     * @return the angle in degrees from the center of the gradient to the focus point
+     *         to which the first color is mapped
+     * @interpolationType <a href="../../animation/Interpolatable.html#linear">linear</a>
      */
     public final double getFocusAngle() {
         return focusAngle;
@@ -85,8 +88,10 @@ public final double getFocusAngle() {
      * focus point to which the first color is mapped.
      * A distance of 0.0 will be at the center of the gradient circle.
      * A distance of 1.0 will be on the circumference of the gradient circle.
-     * @return the distance from the center of the gradient to the
-     * focus point to which the first color is mapped
+     *
+     * @return the distance from the center of the gradient to the focus point to which
+     *         the first color is mapped
+     * @interpolationType <a href="../../animation/Interpolatable.html#linear">linear</a>
      */
     public final double getFocusDistance() {
         return focusDistance;
@@ -97,13 +102,15 @@ public final double getFocusDistance() {
     /**
      * Defines the X coordinate of the center point of the circle defining the gradient.
      * If proportional is true (the default), this value specifies a
-     * point on a unit square that will be scaled to match the size of the
+     * point on a unit square that will be scaled to match the size of
      * the shape that the gradient fills.
      * The last color of the gradient is mapped to the perimeter of this circle.
      *
-     * @return the X coordinate of the center point of the circle defining the
-     * gradient
+     * @return the X coordinate of the center point of the circle defining the gradient
      * @defaultValue 0.0
+     * @interpolationType <a href="../../animation/Interpolatable.html#linear">linear</a>
+     *                    if both values are absolute or both values are {@link #isProportional() proportional},
+     *                    <a href="../../animation/Interpolatable.html#discrete">discrete</a> otherwise
      */
     public final double getCenterX() {
         return centerX;
@@ -118,9 +125,11 @@ public final double getCenterX() {
      * the shape that the gradient fills.
      * The last color of the gradient is mapped to the perimeter of this circle.
      *
-     * @return the X coordinate of the center point of the circle defining the
-     * gradient
+     * @return the X coordinate of the center point of the circle defining the gradient
      * @defaultValue 0.0
+     * @interpolationType <a href="../../animation/Interpolatable.html#linear">linear</a>
+     *                    if both values are absolute or both values are {@link #isProportional() proportional},
+     *                    <a href="../../animation/Interpolatable.html#discrete">discrete</a> otherwise
      */
     public final double getCenterY() {
         return centerY;
@@ -134,9 +143,11 @@ public final double getCenterY() {
      * size relative to  unit square that will be scaled to match the size of the
      * the shape that the gradient fills.
      *
-     * @return the radius of the circle defining the extents of the color
-     * gradient
+     * @return the radius of the circle defining the extents of the color gradient
      * @defaultValue 1.0
+     * @interpolationType <a href="../../animation/Interpolatable.html#linear">linear</a>
+     *                    if both values are absolute or both values are {@link #isProportional() proportional},
+     *                    <a href="../../animation/Interpolatable.html#discrete">discrete</a> otherwise
      */
     public final double getRadius() {
         return radius;
@@ -153,9 +164,9 @@ public final double getRadius() {
      * If this flag is false, then the center coordinates and the radius are
      * specified in the local coordinate system of the node.
      *
-     * @return true if the center and radius values are proportional, otherwise
-     * absolute
+     * @return true if the center and radius values are proportional, otherwise absolute
      * @defaultValue true
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final boolean isProportional() {
         return proportional;
@@ -170,6 +181,7 @@ public final boolean isProportional() {
      *
      * @return the cycle method applied to this radial gradient
      * @defaultValue NO_CYCLE
+     * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final CycleMethod getCycleMethod() {
         return cycleMethod;
@@ -191,6 +203,9 @@ public final CycleMethod getCycleMethod() {
      *
      * @return the list of Stop values
      * @defaultValue empty
+     * @interpolationType Stop list interpolation produces smooth transitions of gradient stops by allowing
+     *                    the insertion of new stops along the gradient. At most, the intermediate stop list
+     *                    has the combined number of gradient stops of both the start list and the target list.
      */
     public final List<Stop> getStops() {
         return stops;
@@ -285,6 +300,24 @@ public RadialGradient(
         this.opaque = determineOpacity();
     }
 
+    /**
+     * Private constructor accepting a stop list that is already normalized.
+     * This constructor is only called from the {@link #interpolate} method.
+     */
+    private RadialGradient(
+            double focusAngle, double focusDistance, double centerX, double centerY, double radius,
+            boolean proportional, CycleMethod cycleMethod, List<Stop> stops, int ignored) {
+        this.focusAngle = focusAngle;
+        this.focusDistance = focusDistance;
+        this.centerX = centerX;
+        this.centerY = centerY;
+        this.radius = radius;
+        this.proportional = proportional;
+        this.cycleMethod = cycleMethod;
+        this.stops = stops;
+        this.opaque = determineOpacity();
+    }
+
     /**
      * Iterate over all the stops. If any one of them has a transparent
      * color, then we return false. If there are no stops, we return false.
@@ -311,6 +344,95 @@ Object acc_getPlatformPaint() {
         return platformPaint;
     }
 
+    /**
+     * Returns an intermediate value between the value of this {@code RadialGradient} and the specified
+     * {@code endValue} using the linear interpolation factor {@code t}, ranging from 0 (inclusive)
+     * to 1 (inclusive).
+     *
+     * @param endValue the target value
+     * @param t the interpolation factor
+     * @throws NullPointerException if {@code endValue} is {@code null}
+     * @return the intermediate value
+     * @since 24
+     */
+    public RadialGradient interpolate(RadialGradient endValue, double t) {
+        Objects.requireNonNull(endValue, "endValue cannot be null");
+
+        // We don't check equals(endValue) here to prevent unnecessary equality checks,
+        // and only check for equality with 'this' or 'endValue' after interpolation.
+        if (t <= 0.0) {
+            return this;
+        }
+
+        if (t >= 1.0) {
+            return endValue;
+        }
+
+        double newCenterX, newCenterY, newRadius;
+        boolean newProportional;
+
+        if (this.proportional == endValue.proportional) {
+            newCenterX = InterpolationUtils.interpolate(this.centerX, endValue.centerX, t);
+            newCenterY = InterpolationUtils.interpolate(this.centerY, endValue.centerY, t);
+            newRadius = InterpolationUtils.interpolate(this.radius, endValue.radius, t);
+            newProportional = this.proportional;
+        } else if (t < 0.5) {
+            newCenterX = this.centerX;
+            newCenterY = this.centerY;
+            newRadius = this.radius;
+            newProportional = this.proportional;
+        } else {
+            newCenterX = endValue.centerX;
+            newCenterY = endValue.centerY;
+            newRadius = endValue.radius;
+            newProportional = endValue.proportional;
+        }
+
+        double newFocusAngle = InterpolationUtils.interpolate(this.focusAngle, endValue.focusAngle, t);
+        double newFocusDistance = InterpolationUtils.interpolate(this.focusDistance, endValue.focusDistance, t);
+        CycleMethod newCycleMethod = InterpolationUtils.interpolateDiscrete(this.cycleMethod, endValue.cycleMethod, t);
+
+        // Optimization: if both lists are equal, we don't compute a new intermediate list.
+        List<Stop> newStops = this.stops.equals(endValue.stops) ?
+            null : Stop.interpolateLists(this.stops, endValue.stops, t);
+
+        if (isSame(newFocusAngle, newFocusDistance, newCenterX, newCenterY, newRadius, newProportional,
+                   newCycleMethod, Objects.requireNonNullElse(newStops, this.stops))) {
+            return this;
+        }
+
+        if (endValue.isSame(newFocusAngle, newFocusDistance, newCenterX, newCenterY, newRadius, newProportional,
+                            newCycleMethod, Objects.requireNonNullElse(newStops, endValue.stops))) {
+            return endValue;
+        }
+
+        return new RadialGradient(newFocusAngle, newFocusDistance, newCenterX, newCenterY, newRadius, newProportional,
+                                  newCycleMethod, Objects.requireNonNullElse(newStops, this.stops), 0);
+    }
+
+    private boolean isSame(double focusAngle, double focusDistance, double centerX, double centerY,
+                           double radius, boolean proportional, CycleMethod cycleMethod, List<Stop> stops) {
+        return this.focusAngle == focusAngle
+            && this.focusDistance == focusDistance
+            && this.centerX == centerX
+            && this.centerY == centerY
+            && this.radius == radius
+            && this.proportional == proportional
+            && this.cycleMethod == cycleMethod
+            && this.stops == stops;
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @throws NullPointerException {@inheritDoc}
+     * @since 24
+     */
+    @Override
+    public Paint interpolate(Paint endValue, double t) {
+        return InterpolationUtils.interpolatePaint(this, endValue, t);
+    }
+
     /**
      * Indicates whether some other object is "equal to" this one.
      * @param obj the reference object with which to compare.
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/paint/Stop.java b/modules/javafx.graphics/src/main/java/javafx/scene/paint/Stop.java
index c17ecaa4f97..ca7e8ebc331 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/paint/Stop.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/paint/Stop.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,10 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
+import com.sun.javafx.UnmodifiableArrayList;
+import com.sun.javafx.util.InterpolationUtils;
+import javafx.animation.Interpolatable;
 import javafx.beans.NamedArg;
 
 /**
@@ -46,7 +50,7 @@
  * }</pre>
  * @since JavaFX 2.0
  */
-public final class Stop {
+public final class Stop implements Interpolatable<Stop> {
 
     static final List<Stop> NO_STOPS = List.of(
         new Stop(0.0, Color.TRANSPARENT),
@@ -65,7 +69,7 @@ static List<Stop> normalize(List<Stop> stops) {
         Stop onestop = null;
         List<Stop> newlist = new ArrayList<>(stops.size());
         for (Stop s : stops) {
-            if (s == null || s.getColor() == null) continue;
+            if (s == null) continue;
             double off = s.getOffset();
             if (off <= 0.0) {
                 if (zerostop == null || off >= zerostop.getOffset()) {
@@ -131,6 +135,84 @@ static List<Stop> normalize(List<Stop> stops) {
         return Collections.unmodifiableList(newlist);
     }
 
+    /**
+     * Interpolates between two normalized lists of stops.
+     *
+     * @param firstList the first list, not {@code null}
+     * @param secondList the second list, not {@code null}
+     * @return the interpolated list, which may also be {@code firstList} or {@code secondList};
+     *         if a new list is returned, it is unmodifiable
+     */
+    static List<Stop> interpolateLists(List<Stop> firstList, List<Stop> secondList, double t) {
+        Objects.requireNonNull(firstList, "firstList cannot be null");
+        Objects.requireNonNull(secondList, "secondList cannot be null");
+
+        if (!firstList.isEmpty() && firstList.get(0).getOffset() > 0) {
+            throw new IllegalArgumentException("firstList is not normalized");
+        }
+
+        if (!secondList.isEmpty() && secondList.get(0).getOffset() > 0) {
+            throw new IllegalArgumentException("secondList is not normalized");
+        }
+
+        if (t <= 0) {
+            return firstList;
+        }
+
+        if (t >= 1) {
+            return secondList;
+        }
+
+        // We need a new list that is at most the combined size of firstList and secondList.
+        // In many cases we don't need all of that capacity, but allocating once is better than
+        // re-allocating when we run out of space. In general, we expect the size of stop lists
+        // to be quite small (a single-digit number of stops at most).
+        Stop[] stops = new Stop[firstList.size() + secondList.size()];
+        int size = 0;
+
+        for (int i = 0, j = 0, imax = firstList.size(), jmax = secondList.size(); i < imax && j < jmax; ++size) {
+            Stop first = firstList.get(i);
+            Stop second = secondList.get(j);
+
+            if (first.offset == second.offset) {
+                stops[size] = first.color.equals(second.color) ?
+                    first : new Stop(first.offset, first.color.interpolate(second.color, t));
+                ++i;
+                ++j;
+            } else if (first.offset < second.offset) {
+                stops[size] = interpolateVirtualStop(first, second, secondList.get(j - 1), 1 - t);
+                ++i;
+            } else {
+                stops[size] = interpolateVirtualStop(second, first, firstList.get(i - 1), t);
+                ++j;
+            }
+        }
+
+        return new UnmodifiableArrayList<>(stops, size);
+    }
+
+    /**
+     * Consider two lists A and B, where A contains three stops, and B contains two stops:
+     * <pre>{@code
+     *               A2
+     *             /   \
+     *           /      \
+     *    B1---/----[X]--\--B2
+     *       /            \
+     *     /               \
+     *   A1                 A3
+     * }</pre>
+     *
+     * Given the stops A{1,2,3} and B{1,2} in the diagram above, this method computes a new virtual
+     * stop X that matches the offset of A2, and then interpolates between X and A2.
+     */
+    private static Stop interpolateVirtualStop(Stop A2, Stop B2, Stop B1, double t) {
+        double u = (A2.offset - B1.offset) / (B2.offset - B1.offset);
+        Color colorX = B1.color.interpolate(B2.color, u);
+        Color colorR = colorX.interpolate(A2.color, t);
+        return colorR.equals(A2.color) ? A2 : new Stop(A2.offset, colorR);
+    }
+
     /**
      * The {@code offset} variable is a number ranging from {@code 0} to {@code 1}
      * that indicates where this gradient stop is placed. For linear gradients,
@@ -149,8 +231,8 @@ static List<Stop> normalize(List<Stop> stops) {
      * For radial gradients, it represents a percentage distance from
      * the focus point to the edge of the outermost/largest circle.
      *
-     * @return position of the Stop within the gradient
-     *         (ranging from {@code 0} to {@code 1})
+     * @interpolationType <a href="../../animation/Interpolatable.html#linear">linear</a>
+     * @return position of the Stop within the gradient (ranging from {@code 0} to {@code 1})
      */
     public final double getOffset() {
         return offset;
@@ -165,6 +247,8 @@ public final double getOffset() {
 
     /**
      * Gets the color of the gradient at this offset.
+     *
+     * @interpolationType <a href="../../animation/Interpolatable.html#linear">linear</a>
      * @return the color of the gradient at this offset
      */
     public final Color getColor() {
@@ -184,7 +268,44 @@ public final Color getColor() {
      */
     public Stop(@NamedArg("offset") double offset, @NamedArg(value="color", defaultValue="BLACK") Color color) {
         this.offset = offset;
-        this.color = color;
+        this.color = Objects.requireNonNullElse(color, Color.TRANSPARENT);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @throws NullPointerException {@inheritDoc}
+     * @since 24
+     */
+    @Override
+    public Stop interpolate(Stop endValue, double t) {
+        Objects.requireNonNull(endValue, "endValue cannot be null");
+
+        // We don't check equals(endValue) here to prevent unnecessary equality checks,
+        // and only check for equality with 'this' or 'endValue' after interpolation.
+        if (t <= 0.0) {
+            return this;
+        }
+
+        if (t >= 1.0) {
+            return endValue;
+        }
+
+        // Color is implemented such that interpolate() always returns the existing instance if the
+        // intermediate value is equal to the start value or the end value, which allows us to use an
+        // identity comparison in place of a value comparison to determine equality.
+        Color color = this.color.interpolate(endValue.color, t);
+        double offset = InterpolationUtils.interpolate(this.offset, endValue.offset, t);
+
+        if (offset == this.offset && color == this.color) {
+            return this;
+        }
+
+        if (offset == endValue.offset && color == endValue.color) {
+            return endValue;
+        }
+
+        return new Stop(offset, color);
     }
 
     /**
@@ -195,10 +316,8 @@ public Stop(@NamedArg("offset") double offset, @NamedArg(value="color", defaultV
     @Override public boolean equals(Object obj) {
         if (obj == null) return false;
         if (obj == this) return true;
-        if (obj instanceof Stop) {
-            Stop other = (Stop) obj;
-            return offset == other.offset &&
-              (color == null ? other.color == null : color.equals(other.color));
+        if (obj instanceof Stop other) {
+            return offset == other.offset && color.equals(other.color);
         } else return false;
     }
 
diff --git a/modules/javafx.graphics/src/shims/java/javafx/scene/NodeShim.java b/modules/javafx.graphics/src/shims/java/javafx/scene/NodeShim.java
index 8fe8c3a0486..651608d9375 100644
--- a/modules/javafx.graphics/src/shims/java/javafx/scene/NodeShim.java
+++ b/modules/javafx.graphics/src/shims/java/javafx/scene/NodeShim.java
@@ -34,6 +34,7 @@
 import javafx.css.PseudoClass;
 import javafx.scene.transform.Transform;
 import java.util.List;
+import java.util.Map;
 
 public class NodeShim {
 
@@ -93,7 +94,7 @@ public static List<TransitionDefinition> getTransitionDefinitions(Node n) {
         return n.getTransitionDefinitions();
     }
 
-    public static List<TransitionTimer> getTransitionTimers(Node n) {
+    public static Map<String, TransitionTimer> getTransitionTimers(Node n) {
         return n.getTransitionTimers();
     }
 
diff --git a/modules/javafx.graphics/src/shims/java/javafx/scene/layout/BackgroundShim.java b/modules/javafx.graphics/src/shims/java/javafx/scene/layout/BackgroundShim.java
index 507accab6b5..b1ea9729ac1 100644
--- a/modules/javafx.graphics/src/shims/java/javafx/scene/layout/BackgroundShim.java
+++ b/modules/javafx.graphics/src/shims/java/javafx/scene/layout/BackgroundShim.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,20 @@
 
 package javafx.scene.layout;
 
+import javafx.css.CssMetaData;
+import javafx.css.ParsedValue;
+import javafx.css.StyleConverter;
+import javafx.scene.Node;
+import javafx.scene.image.Image;
+
 public class BackgroundShim {
 
+    public static final CssMetaData<Node, Image[]> BACKGROUND_IMAGE = Background.BACKGROUND_IMAGE;
+
+    public static StyleConverter<ParsedValue[], Background> getConverter() {
+        return BackgroundConverter.INSTANCE;
+    }
+
     public static void computeOpaqueInsets(Background bg,
             double width, double height, double[] trbl) {
         bg.computeOpaqueInsets(width, height, trbl);
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/animation/AnimationTimerHelper.java b/modules/javafx.graphics/src/shims/java/javafx/scene/layout/BorderShim.java
similarity index 64%
rename from modules/javafx.graphics/src/main/java/com/sun/javafx/animation/AnimationTimerHelper.java
rename to modules/javafx.graphics/src/shims/java/javafx/scene/layout/BorderShim.java
index 8c74449d3e0..1ce20e569bd 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/javafx/animation/AnimationTimerHelper.java
+++ b/modules/javafx.graphics/src/shims/java/javafx/scene/layout/BorderShim.java
@@ -23,29 +23,18 @@
  * questions.
  */
 
-package com.sun.javafx.animation;
+package javafx.scene.layout;
 
-import com.sun.javafx.util.Utils;
-import com.sun.scenario.animation.AbstractPrimaryTimer;
-import javafx.animation.AnimationTimer;
+import javafx.css.CssMetaData;
+import javafx.css.ParsedValue;
+import javafx.css.StyleConverter;
+import javafx.scene.Node;
 
-public final class AnimationTimerHelper {
+public class BorderShim {
 
-    static {
-        Utils.forceInit(AnimationTimer.class);
-    }
-
-    private static Accessor accessor;
-
-    public static void setAccessor(Accessor accessor) {
-        AnimationTimerHelper.accessor = accessor;
-    }
-
-    public static AbstractPrimaryTimer getPrimaryTimer(AnimationTimer timer) {
-        return accessor.getPrimaryTimer(timer);
-    }
+    public static final CssMetaData<Node, String[]> BORDER_IMAGE_SOURCE = Border.BORDER_IMAGE_SOURCE;
 
-    public interface Accessor {
-        AbstractPrimaryTimer getPrimaryTimer(AnimationTimer timer);
+    public static StyleConverter<ParsedValue[], Border> getConverter() {
+        return BorderConverter.getInstance();
     }
 }
diff --git a/modules/javafx.graphics/src/shims/java/javafx/scene/paint/StopShim.java b/modules/javafx.graphics/src/shims/java/javafx/scene/paint/StopShim.java
new file mode 100644
index 00000000000..a451de4e3db
--- /dev/null
+++ b/modules/javafx.graphics/src/shims/java/javafx/scene/paint/StopShim.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+
+package javafx.scene.paint;
+
+import java.util.List;
+
+public final class StopShim {
+
+    private StopShim() {}
+
+    public static List<Stop> interpolateLists(List<Stop> firstList, List<Stop> secondList, double t) {
+        return Stop.interpolateLists(firstList, secondList, t);
+    }
+}
diff --git a/modules/javafx.graphics/src/test/addExports b/modules/javafx.graphics/src/test/addExports
index f44f72f8b4f..b34406f8919 100644
--- a/modules/javafx.graphics/src/test/addExports
+++ b/modules/javafx.graphics/src/test/addExports
@@ -29,6 +29,7 @@
 --add-exports javafx.graphics/com.sun.javafx.scene.input=ALL-UNNAMED
 --add-exports javafx.graphics/com.sun.javafx.scene.layout=ALL-UNNAMED
 --add-exports javafx.graphics/com.sun.javafx.scene.layout.region=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.scene.paint=ALL-UNNAMED
 --add-exports javafx.graphics/com.sun.javafx.scene.shape=ALL-UNNAMED
 --add-exports javafx.graphics/com.sun.javafx.scene.text=ALL-UNNAMED
 --add-exports javafx.graphics/com.sun.javafx.scene.transform=ALL-UNNAMED
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/TransitionTimerTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/TransitionTimerTest.java
index e7e0d1b67f1..79981552266 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/TransitionTimerTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/TransitionTimerTest.java
@@ -28,10 +28,12 @@
 import com.sun.javafx.css.TransitionMediator;
 import com.sun.javafx.css.TransitionDefinition;
 import com.sun.javafx.css.TransitionTimer;
+import com.sun.javafx.scene.NodeHelper;
 import com.sun.javafx.tk.Toolkit;
 import javafx.css.StyleableProperty;
 import javafx.css.TransitionEvent;
 import javafx.scene.Group;
+import javafx.scene.Node;
 import javafx.scene.NodeShim;
 import javafx.scene.Scene;
 import javafx.scene.shape.Rectangle;
@@ -60,10 +62,10 @@ private static class TimerWrapper {
             this.mediator = mediator;
         }
 
-        void run(TransitionDefinition definition) {
-            mediator.run(definition);
-            timer = mediator.getTimer();
+        void run(TransitionDefinition definition, Node node) {
             now = Toolkit.getToolkit().getPrimaryTimer().nanos();
+            mediator.run(definition, definition.propertyName(), now);
+            timer = NodeHelper.findTransitionTimer(node, definition.propertyName());
         }
 
         void fire(Duration elapsedTime) {
@@ -83,6 +85,11 @@ public void onStop() {}
         public StyleableProperty<?> getStyleableProperty() {
             return (StyleableProperty<?>)node.opacityProperty();
         }
+
+        @Override
+        public boolean updateReversingAdjustedStartValue(TransitionMediator existingMediator) {
+            return true;
+        }
     }
 
     @BeforeEach
@@ -109,7 +116,7 @@ public void testTimerEndsWithProgressExactlyOne() {
             }
         });
 
-        timer.run(transition);
+        timer.run(transition, node);
         timer.fire(seconds(0.4));
         assertEquals(1, trace.size());
         assertTrue(trace.get(0) > 0.3 && trace.get(0) < 0.5);
@@ -129,7 +136,7 @@ public void testTimerStopsWhenProgressIsOne() {
             }
         });
 
-        timer.run(transition);
+        timer.run(transition, node);
         timer.fire(seconds(0.9));
         assertFalse(flag[0]);
         timer.fire(seconds(0.2));
@@ -141,26 +148,11 @@ public void testRunningTimerCanBeCancelled() {
         var transition = new TransitionDefinition("-fx-opacity", seconds(1), ZERO, LINEAR);
         var timer = new TimerWrapper(new TestTransitionMediator());
 
-        timer.run(transition);
+        timer.run(transition, node);
         timer.fire(seconds(0.2));
         assertEquals(1, NodeShim.getTransitionTimers(node).size());
-        assertTrue(timer.mediator.cancel(false));
-        assertEquals(0, NodeShim.getTransitionTimers(node).size());
-    }
-
-    @Test
-    public void testTimerDoesNotStopItselfWhenSettingValue() {
-        var flag = new boolean[1];
-        var transition = new TransitionDefinition("-fx-opacity", seconds(1), ZERO, LINEAR);
-        var timer = new TimerWrapper(new TestTransitionMediator() {
-            @Override public void onUpdate(double progress) {
-                flag[0] = cancel(false);
-            }
-        });
-
-        timer.run(transition);
-        timer.fire(seconds(0.2));
-        assertFalse(flag[0]);
+        timer.mediator.cancel();
+        assertNull(NodeShim.getTransitionTimers(node));
     }
 
     @Test
@@ -175,7 +167,7 @@ public void testTimerFollowsExpectedOutputProgressCurve() {
             }
         });
 
-        timer.run(transition);
+        timer.run(transition, node);
 
         for (int i = 0; i < steps; ++i) {
             double elapsed = 1D / (double)steps;
@@ -197,7 +189,7 @@ public void testInterruptingTransitionIsShortened() {
         node.addEventHandler(TransitionEvent.ANY, trace::add);
 
         // Start timer1 and advance 0.25s into the first transition.
-        timer1.run(transition);
+        timer1.run(transition, node);
         timer1.fire(seconds(0.25));
         assertEquals(2, trace.size());
         assertSame(TransitionEvent.RUN, trace.get(0).getEventType());
@@ -205,7 +197,7 @@ public void testInterruptingTransitionIsShortened() {
 
         // Now we start timer2. This immediately cancels timer1 and adjusts the duration
         // of timer2 so that it completes in less time than specified.
-        timer2.run(transition);
+        timer2.run(transition, node);
         assertEquals(4, trace.size());
         assertSame(TransitionEvent.CANCEL, trace.get(2).getEventType());
         assertSame(TransitionEvent.RUN, trace.get(3).getEventType());
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/layout/region/BorderImageSlicesTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/layout/region/BorderImageSlicesTest.java
new file mode 100644
index 00000000000..699ad75a9f9
--- /dev/null
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/layout/region/BorderImageSlicesTest.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+
+package test.com.sun.javafx.scene.layout.region;
+
+import com.sun.javafx.scene.layout.region.BorderImageSlices;
+import javafx.scene.layout.BorderWidths;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class BorderImageSlicesTest {
+
+    @Test
+    void testEquals() {
+        var a = new BorderImageSlices(new BorderWidths(1, 2, 3, 4), true);
+        var b = new BorderImageSlices(new BorderWidths(1, 2, 3, 4), true);
+        assertTrue(a.equals(b));
+        assertTrue(b.equals(a));
+
+        a = new BorderImageSlices(new BorderWidths(1, 2, 3, 4), true);
+        b = new BorderImageSlices(new BorderWidths(1, 2, 3, 4), false);
+        assertFalse(a.equals(b));
+        assertFalse(b.equals(a));
+
+        a = new BorderImageSlices(new BorderWidths(1, 2, 3, 4), true);
+        b = new BorderImageSlices(new BorderWidths(5, 2, 3, 4), true);
+        assertFalse(a.equals(b));
+        assertFalse(b.equals(a));
+    }
+
+    @Test
+    void testHashCode() {
+        var a = new BorderImageSlices(new BorderWidths(1, 2, 3, 4), true);
+        var b = new BorderImageSlices(new BorderWidths(1, 2, 3, 4), true);
+        assertEquals(a.hashCode(), b.hashCode());
+
+        a = new BorderImageSlices(new BorderWidths(1, 2, 3, 4), true);
+        b = new BorderImageSlices(new BorderWidths(1, 2, 3, 4), false);
+        assertNotEquals(a.hashCode(), b.hashCode());
+
+        a = new BorderImageSlices(new BorderWidths(1, 2, 3, 4), true);
+        b = new BorderImageSlices(new BorderWidths(5, 2, 3, 4), true);
+        assertNotEquals(a.hashCode(), b.hashCode());
+    }
+
+    @Nested
+    class InterpolationTest {
+        @Test
+        public void interpolateBetweenTwoDifferentValuesReturnsNewInstance() {
+            var startValue = new BorderImageSlices(new BorderWidths(0), true);
+            var endValue = new BorderImageSlices(new BorderWidths(1), false);
+
+            assertEquals(new BorderImageSlices(new BorderWidths(0.4), true),
+                         startValue.interpolate(endValue, 0.4));
+
+            assertEquals(new BorderImageSlices(new BorderWidths(0.5), false),
+                         startValue.interpolate(endValue, 0.5));
+        }
+
+        @Test
+        public void interpolateBetweenTwoEqualValuesReturnsStartInstance() {
+            var startValue = new BorderImageSlices(new BorderWidths(1), true);
+            var endValue = new BorderImageSlices(new BorderWidths(1), true);
+            assertSame(startValue, startValue.interpolate(endValue, 0.5));
+        }
+
+        @Test
+        public void interpolationFactorSmallerThanOrEqualToZeroReturnsStartInstance() {
+            var startValue = new BorderImageSlices(BorderWidths.EMPTY, true);
+            var endValue = new BorderImageSlices(BorderWidths.FULL, true);
+            assertSame(startValue, startValue.interpolate(endValue, 0));
+            assertSame(startValue, startValue.interpolate(endValue, -1));
+        }
+
+        @Test
+        public void interpolationFactorGreaterThanOrEqualToOneReturnsEndInstance() {
+            var startValue = new BorderImageSlices(BorderWidths.EMPTY, true);
+            var endValue = new BorderImageSlices(BorderWidths.FULL, true);
+            assertSame(endValue, startValue.interpolate(endValue, 1));
+            assertSame(endValue, startValue.interpolate(endValue, 1.5));
+        }
+    }
+}
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/layout/region/MarginsTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/layout/region/MarginsTest.java
new file mode 100644
index 00000000000..d6fa5a2f004
--- /dev/null
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/layout/region/MarginsTest.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+
+package test.com.sun.javafx.scene.layout.region;
+
+import com.sun.javafx.scene.layout.region.Margins;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class MarginsTest {
+
+    @Test
+    void testEquals() {
+        var a = new Margins(1, 2, 3, 4, false);
+        var b = new Margins(1, 2, 3, 4, false);
+        assertTrue(a.equals(b));
+        assertTrue(b.equals(a));
+
+        a = new Margins(1, 2, 3, 4, false);
+        b = new Margins(1, 2, 3, 4, true);
+        assertFalse(a.equals(b));
+        assertFalse(b.equals(a));
+
+        a = new Margins(1, 2, 3, 4, false);
+        b = new Margins(5, 2, 3, 4, false);
+        assertFalse(a.equals(b));
+        assertFalse(b.equals(a));
+
+        a = new Margins(1, 2, 3, 4, false);
+        b = new Margins(1, 5, 3, 4, false);
+        assertFalse(a.equals(b));
+        assertFalse(b.equals(a));
+
+        a = new Margins(1, 2, 3, 4, false);
+        b = new Margins(1, 2, 5, 4, false);
+        assertFalse(a.equals(b));
+        assertFalse(b.equals(a));
+
+        a = new Margins(1, 2, 3, 4, false);
+        b = new Margins(1, 2, 3, 5, false);
+        assertFalse(a.equals(b));
+        assertFalse(b.equals(a));
+    }
+
+    @Test
+    void testHashCode() {
+        var a = new Margins(1, 2, 3, 4, false);
+        var b = new Margins(1, 2, 3, 4, false);
+        assertEquals(a.hashCode(), b.hashCode());
+
+        a = new Margins(1, 2, 3, 4, false);
+        b = new Margins(5, 2, 3, 4, false);
+        assertNotEquals(a.hashCode(), b.hashCode());
+    }
+
+    @Nested
+    class InterpolationTest {
+        @Test
+        public void interpolateBetweenTwoDifferentValuesReturnsNewInstance() {
+            var startValue = new Margins(2, 4, 6, 8, false);
+            var endValue = new Margins(4, 8, 12, 16, false);
+            var expected = new Margins(3, 6, 9, 12, false);
+            assertEquals(expected, startValue.interpolate(endValue, 0.5));
+        }
+
+        @Test
+        public void interpolateBetweenProportionalAndNonProportionalValuesReturnsStartOrEndInstance() {
+            var startValue = new Margins(2, 4, 6, 8, true);
+            var endValue = new Margins(4, 8, 12, 16, false);
+            assertEquals(startValue, startValue.interpolate(endValue, 0.4));
+            assertEquals(endValue, startValue.interpolate(endValue, 0.5));
+        }
+
+        @Test
+        public void interpolateBetweenTwoEqualValuesReturnsStartInstance() {
+            var startValue = new Margins(2, 4, 6, 8, false);
+            var endValue = new Margins(2, 4, 6, 8, false);
+            assertSame(startValue, startValue.interpolate(endValue, 0.5));
+        }
+
+        @Test
+        public void interpolationFactorSmallerThanOrEqualToZeroReturnsStartInstance() {
+            var startValue = new Margins(2, 4, 6, 8, false);
+            var endValue = new Margins(4, 8, 12, 16, false);
+            assertSame(startValue, startValue.interpolate(endValue, 0));
+            assertSame(startValue, startValue.interpolate(endValue, -1));
+        }
+
+        @Test
+        public void interpolationFactorGreaterThanOrEqualToOneReturnsEndInstance() {
+            var startValue = new Margins(2, 4, 6, 8, false);
+            var endValue = new Margins(4, 8, 12, 16, false);
+            assertSame(endValue, startValue.interpolate(endValue, 1));
+            assertSame(endValue, startValue.interpolate(endValue, 1.5));
+        }
+    }
+}
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/util/InterpolationUtilsTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/util/InterpolationUtilsTest.java
new file mode 100644
index 00000000000..d61f30bc04e
--- /dev/null
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/util/InterpolationUtilsTest.java
@@ -0,0 +1,225 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+
+package test.com.sun.javafx.util;
+
+import com.sun.javafx.util.InterpolationUtils;
+import javafx.scene.paint.CycleMethod;
+import javafx.scene.paint.LinearGradient;
+import javafx.scene.paint.Paint;
+import javafx.scene.paint.RadialGradient;
+import javafx.scene.paint.Stop;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import java.util.List;
+
+import static javafx.scene.paint.Color.*;
+import static org.junit.jupiter.api.Assertions.*;
+
+public class InterpolationUtilsTest {
+
+    @Nested
+    class PairwiseListInterpolationTest {
+        @Test
+        void differentValuesReturnsNewInstance() {
+            var startValue = List.<Paint>of(RED, BLUE);
+            var endValue = List.<Paint>of(GREEN, YELLOW);
+            var expected = List.of(RED.interpolate(GREEN, 0.5), BLUE.interpolate(YELLOW, 0.5));
+            var actual = InterpolationUtils.interpolateListsPairwise(startValue, endValue, 0.5);
+            assertEquals(expected, actual);
+            assertNotSame(expected, startValue);
+            assertNotSame(expected, endValue);
+            assertThrows(UnsupportedOperationException.class, () -> actual.add(RED));
+        }
+
+        @Test
+        void sameValuesReturnsStartInstance() {
+            var startValue = List.<Paint>of(RED, BLUE);
+            var endValue = List.<Paint>of(RED, BLUE);
+            var actual = InterpolationUtils.interpolateListsPairwise(startValue, endValue, 0.5);
+            assertSame(startValue, actual);
+        }
+
+        @Test
+        void secondListHasMoreElements() {
+            var startValue = List.<Paint>of(RED, BLUE);
+            var endValue = List.<Paint>of(GREEN, YELLOW, PURPLE);
+            var expected = List.of(RED.interpolate(GREEN, 0.5), BLUE.interpolate(YELLOW, 0.5), PURPLE);
+            var actual = InterpolationUtils.interpolateListsPairwise(startValue, endValue, 0.5);
+            assertEquals(expected, actual);
+        }
+
+        @Test
+        void secondListHasLessElements() {
+            var startValue = List.<Paint>of(RED, BLUE);
+            var endValue = List.<Paint>of(GREEN);
+            var expected = List.of(RED.interpolate(GREEN, 0.5));
+            var actual = InterpolationUtils.interpolateListsPairwise(startValue, endValue, 0.5);
+            assertEquals(expected, actual);
+        }
+    }
+
+    @Nested
+    class PairwiseArrayInterpolationTest {
+        @Test
+        void differentValuesReturnsNewInstance() {
+            var startValue = arrayOf(RED, BLUE);
+            var endValue = arrayOf(GREEN, YELLOW);
+            var expected = arrayOf(RED.interpolate(GREEN, 0.5), BLUE.interpolate(YELLOW, 0.5));
+            var actual = InterpolationUtils.interpolateArraysPairwise(startValue, endValue, 0.5);
+            assertArrayEquals(expected, actual);
+            assertNotSame(expected, startValue);
+            assertNotSame(expected, endValue);
+        }
+
+        @Test
+        void sameValuesReturnsStartInstance() {
+            var startValue = arrayOf(RED, BLUE);
+            var endValue = arrayOf(RED, BLUE);
+            var actual = InterpolationUtils.interpolateArraysPairwise(startValue, endValue, 0.5);
+            assertSame(startValue, actual);
+        }
+
+        @Test
+        void secondArrayHasMoreElements() {
+            var startValue = arrayOf(RED, BLUE);
+            var endValue = arrayOf(GREEN, YELLOW, PURPLE);
+            var expected = arrayOf(RED.interpolate(GREEN, 0.5), BLUE.interpolate(YELLOW, 0.5), PURPLE);
+            var actual = InterpolationUtils.interpolateArraysPairwise(startValue, endValue, 0.5);
+            assertArrayEquals(expected, actual);
+        }
+
+        @Test
+        void secondArrayHasLessElements() {
+            var startValue = arrayOf(RED, BLUE);
+            var endValue = arrayOf(GREEN);
+            var expected = arrayOf(RED.interpolate(GREEN, 0.5));
+            var actual = InterpolationUtils.interpolateArraysPairwise(startValue, endValue, 0.5);
+            assertArrayEquals(expected, actual);
+        }
+    }
+
+    @Nested
+    class InterpolateColorTest {
+        @Test
+        void toLinearGradient() {
+            var paint = InterpolationUtils.interpolatePaint(
+                BLUE,
+                new LinearGradient(0, 0, 1, 1, false, CycleMethod.NO_CYCLE,
+                                   new Stop(0, RED), new Stop(1, GREEN)),
+                0.5);
+
+            var expected = new LinearGradient(0, 0, 1, 1, false, CycleMethod.NO_CYCLE,
+                                              new Stop(0, BLUE.interpolate(RED, 0.5)),
+                                              new Stop(1, BLUE.interpolate(GREEN, 0.5)));
+
+            assertEquals(expected, paint);
+        }
+
+        @Test
+        void toRadialGradient() {
+            var paint = InterpolationUtils.interpolatePaint(
+                BLUE,
+                new RadialGradient(0, 0, 0, 0, 10, false, CycleMethod.NO_CYCLE,
+                                   new Stop(0, RED), new Stop(1, GREEN)),
+                0.5);
+
+            var expected = new RadialGradient(0, 0, 0, 0, 10, false, CycleMethod.NO_CYCLE,
+                                              new Stop(0, BLUE.interpolate(RED, 0.5)),
+                                              new Stop(1, BLUE.interpolate(GREEN, 0.5)));
+
+            assertEquals(expected, paint);
+        }
+    }
+
+    @Nested
+    class InterpolateLinearGradientTest {
+        @Test
+        void toColor() {
+            var paint = InterpolationUtils.interpolatePaint(
+                new LinearGradient(0, 0, 1, 1, false, CycleMethod.NO_CYCLE,
+                                   new Stop(0, RED), new Stop(1, GREEN)),
+                BLUE,
+                0.5);
+
+            var expected = new LinearGradient(0, 0, 1, 1, false, CycleMethod.NO_CYCLE,
+                                              new Stop(0, RED.interpolate(BLUE, 0.5)),
+                                              new Stop(1, GREEN.interpolate(BLUE, 0.5)));
+
+            assertEquals(expected, paint);
+        }
+
+        @Test
+        void toRadialGradient() {
+            var toPaint = new RadialGradient(0, 0, 0, 0, 10, false, CycleMethod.NO_CYCLE,
+                                             new Stop(0, RED), new Stop(1, GREEN));
+
+            var actual = InterpolationUtils.interpolatePaint(
+                new LinearGradient(0, 0, 1, 1, false, CycleMethod.NO_CYCLE,
+                                   new Stop(0, RED), new Stop(1, GREEN)),
+                toPaint,
+                0.5);
+
+            assertSame(actual, toPaint);
+        }
+    }
+
+    @Nested
+    class InterpolateRadialGradientTest {
+        @Test
+        void toColor() {
+            var paint = InterpolationUtils.interpolatePaint(
+                new RadialGradient(0, 0, 0, 0, 10, false, CycleMethod.NO_CYCLE,
+                                   new Stop(0, RED), new Stop(1, GREEN)),
+                BLUE,
+                0.5);
+
+            var expected = new RadialGradient(0, 0, 0, 0, 10, false, CycleMethod.NO_CYCLE,
+                                              new Stop(0, RED.interpolate(BLUE, 0.5)),
+                                              new Stop(1, GREEN.interpolate(BLUE, 0.5)));
+
+            assertEquals(expected, paint);
+        }
+
+        @Test
+        void toLinearGradient() {
+            var toPaint = new LinearGradient(0, 0, 1, 1, false, CycleMethod.NO_CYCLE,
+                                             new Stop(0, RED), new Stop(1, GREEN));
+
+            var actual = InterpolationUtils.interpolatePaint(
+                new RadialGradient(0, 0, 0, 0, 10, false, CycleMethod.NO_CYCLE,
+                                   new Stop(0, RED), new Stop(1, GREEN)),
+                toPaint,
+                0.5);
+
+            assertSame(actual, toPaint);
+        }
+    }
+
+    @SafeVarargs
+    private static <T> T[] arrayOf(T... values) {
+        return values;
+    }
+}
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/css/StyleableProperty_transition_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/css/StyleableProperty_transition_Test.java
index b19b23f28ef..36c35e399e8 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/css/StyleableProperty_transition_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/css/StyleableProperty_transition_Test.java
@@ -26,8 +26,8 @@
 package test.javafx.css;
 
 import com.sun.javafx.css.TransitionDefinition;
-import com.sun.javafx.css.TransitionMediator;
 import com.sun.javafx.scene.NodeHelper;
+import com.sun.javafx.tk.Toolkit;
 import javafx.animation.Interpolator;
 import javafx.css.CssMetaData;
 import javafx.css.SimpleStyleableBooleanProperty;
@@ -36,6 +36,8 @@
 import javafx.css.SimpleStyleableIntegerProperty;
 import javafx.css.SimpleStyleableLongProperty;
 import javafx.css.SimpleStyleableObjectProperty;
+import javafx.css.SimpleStyleableStringProperty;
+import javafx.css.StyleConverter;
 import javafx.css.StyleOrigin;
 import javafx.css.Styleable;
 import javafx.css.StyleableBooleanProperty;
@@ -45,23 +47,32 @@
 import javafx.css.StyleableLongProperty;
 import javafx.css.StyleableObjectProperty;
 import javafx.css.StyleableProperty;
+import javafx.css.StyleableStringProperty;
 import javafx.css.converter.BooleanConverter;
 import javafx.css.converter.ColorConverter;
 import javafx.css.converter.SizeConverter;
+import javafx.css.converter.StringConverter;
+import javafx.geometry.Insets;
 import javafx.scene.Group;
 import javafx.scene.Scene;
+import javafx.scene.layout.Background;
+import javafx.scene.layout.BackgroundFill;
+import javafx.scene.layout.BackgroundShim;
+import javafx.scene.layout.CornerRadii;
 import javafx.scene.paint.Color;
 import javafx.stage.Stage;
 import javafx.util.Duration;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
-import java.lang.reflect.Field;
-import java.util.function.Function;
+import test.com.sun.javafx.pgstub.StubToolkit;
+import java.util.List;
 import java.util.stream.Stream;
 
 import static org.junit.jupiter.api.Assertions.*;
+import static test.util.ReflectionUtils.*;
 
 public class StyleableProperty_transition_Test {
 
@@ -95,21 +106,42 @@ public class StyleableProperty_transition_Test {
         @Override public StyleableProperty<Number> getStyleableProperty(Styleable styleable) { return longProperty; }
     };
 
-    static final CssMetaData<Styleable, Color> objectPropertyMetadata = new CssMetaData<>(
-            "-fx-object-property", ColorConverter.getInstance(), Color.RED) {
+    static final CssMetaData<Styleable, String> stringPropertyMetadata = new CssMetaData<>(
+            "-fx-string-property", StringConverter.getInstance(), null) {
         @Override public boolean isSettable(Styleable styleable) { return true; }
-        @Override public StyleableProperty<Color> getStyleableProperty(Styleable styleable) { return objectProperty; }
+        @Override public StyleableProperty<String> getStyleableProperty(Styleable styleable) { return stringProperty; }
     };
 
+    static final CssMetaData<Styleable, Color> interpolatableObjectPropertyMetadata = new CssMetaData<>(
+            "-fx-interpolatable-property", ColorConverter.getInstance(), Color.RED) {
+        @Override public boolean isSettable(Styleable styleable) { return true; }
+        @Override public StyleableProperty<Color> getStyleableProperty(Styleable styleable) {
+            return interpolatableObjectProperty;
+        }
+    };
+
+    static final CssMetaData<Styleable, Background> componentTransitionableObjectPropertyMetadata = new CssMetaData<>(
+            "-fx-component-transitionable-property", BackgroundShim.getConverter(),
+            Background.fill(Color.RED), false, Background.getClassCssMetaData()) {
+        @Override public boolean isSettable(Styleable styleable) { return true; }
+        @Override public StyleableProperty<Background> getStyleableProperty(Styleable styleable) {
+            return componentTransitionableObjectProperty;
+        }
+    };
+
+    static final Duration ONE_SECOND = Duration.seconds(1);
+
     static final Group testBean = new Group() {
         {
             NodeHelper.getTransitionProperty(this).setValue(new TransitionDefinition[] {
-                new TransitionDefinition("-fx-boolean-property", Duration.ONE, Duration.ZERO, Interpolator.LINEAR),
-                new TransitionDefinition("-fx-double-property", Duration.ONE, Duration.ZERO, Interpolator.LINEAR),
-                new TransitionDefinition("-fx-float-property", Duration.ONE, Duration.ZERO, Interpolator.LINEAR),
-                new TransitionDefinition("-fx-integer-property", Duration.ONE, Duration.ZERO, Interpolator.LINEAR),
-                new TransitionDefinition("-fx-long-property", Duration.ONE, Duration.ZERO, Interpolator.LINEAR),
-                new TransitionDefinition("-fx-object-property", Duration.ONE, Duration.ZERO, Interpolator.LINEAR)
+                new TransitionDefinition("-fx-boolean-property", ONE_SECOND, Duration.ZERO, Interpolator.LINEAR),
+                new TransitionDefinition("-fx-double-property", ONE_SECOND, Duration.ZERO, Interpolator.LINEAR),
+                new TransitionDefinition("-fx-float-property", ONE_SECOND, Duration.ZERO, Interpolator.LINEAR),
+                new TransitionDefinition("-fx-integer-property", ONE_SECOND, Duration.ZERO, Interpolator.LINEAR),
+                new TransitionDefinition("-fx-long-property", ONE_SECOND, Duration.ZERO, Interpolator.LINEAR),
+                new TransitionDefinition("-fx-string-property", ONE_SECOND, Duration.ZERO, Interpolator.LINEAR),
+                new TransitionDefinition("-fx-interpolatable-property", ONE_SECOND, Duration.ZERO, Interpolator.LINEAR),
+                new TransitionDefinition("-fx-component-transitionable-property", ONE_SECOND, Duration.ZERO, Interpolator.LINEAR)
             });
         }
     };
@@ -119,38 +151,12 @@ public class StyleableProperty_transition_Test {
     static StyleableFloatProperty floatProperty;
     static StyleableIntegerProperty integerProperty;
     static StyleableLongProperty longProperty;
-    static StyleableObjectProperty<Color> objectProperty;
-
-    static TransitionMediator getTransitionMediator(StyleableProperty<?> property) {
-        Function<Class<?>, Field> getField = cls -> {
-            try {
-                var field = cls.getDeclaredField("mediator");
-                field.setAccessible(true);
-                return field;
-            } catch (NoSuchFieldException e) {
-                return null;
-            }
-        };
-
-        Class<?> cls = property.getClass();
-        while (cls != null) {
-            Field field = getField.apply(cls);
-            if (field != null) {
-                try {
-                    return (TransitionMediator)field.get(property);
-                } catch (IllegalAccessException e) {
-                    throw new AssertionError(e);
-                }
-            }
-
-            cls = cls.getSuperclass();
-        }
-
-        throw new AssertionError();
-    }
+    static StyleableStringProperty stringProperty;
+    static StyleableObjectProperty<Color> interpolatableObjectProperty;
+    static StyleableObjectProperty<Background> componentTransitionableObjectProperty;
 
     @SuppressWarnings("rawtypes")
-    record TestRun(StyleableProperty property, Object defaultValue, Object newValue) {}
+    record TestRun(StyleableProperty property, String fieldName, Object defaultValue, Object newValue) {}
 
     static Stream<TestRun> transitionParameters() {
         booleanProperty = new SimpleStyleableBooleanProperty(booleanPropertyMetadata, testBean, null);
@@ -158,24 +164,38 @@ static Stream<TestRun> transitionParameters() {
         floatProperty = new SimpleStyleableFloatProperty(floatPropertyMetadata, testBean, null);
         integerProperty = new SimpleStyleableIntegerProperty(integerPropertyMetadata, testBean, null);
         longProperty = new SimpleStyleableLongProperty(longPropertyMetadata, testBean, null);
-        objectProperty = new SimpleStyleableObjectProperty<>(objectPropertyMetadata, testBean, null, Color.RED);
+        stringProperty = new SimpleStyleableStringProperty(stringPropertyMetadata, testBean, null);
+        interpolatableObjectProperty = new SimpleStyleableObjectProperty<>(
+            interpolatableObjectPropertyMetadata, testBean, null, Color.RED);
+        componentTransitionableObjectProperty = new SimpleStyleableObjectProperty<>(
+            componentTransitionableObjectPropertyMetadata, testBean, null, Background.fill(Color.RED));
 
         return Stream.of(
-            new TestRun(booleanProperty, false, true),
-            new TestRun(doubleProperty, 0, 1),
-            new TestRun(floatProperty, 0, 1),
-            new TestRun(integerProperty, 0, 1),
-            new TestRun(longProperty, 0, 1),
-            new TestRun(objectProperty, Color.RED, Color.GREEN)
+            new TestRun(booleanProperty, "mediator", false, true),
+            new TestRun(doubleProperty, "mediator", 0, 1),
+            new TestRun(floatProperty, "mediator", 0, 1),
+            new TestRun(integerProperty, "mediator", 0, 1),
+            new TestRun(longProperty, "mediator", 0, 1),
+            new TestRun(stringProperty, "mediator", "foo", "bar"),
+            new TestRun(interpolatableObjectProperty, "controller", Color.RED, Color.GREEN),
+            new TestRun(componentTransitionableObjectProperty, "controller",
+                        Background.fill(Color.RED), Background.fill(Color.GREEN))
         );
     }
 
+    StubToolkit toolkit;
     Scene scene;
     Stage stage;
 
+    void setAnimationTime(long time) {
+        toolkit.setCurrentTime(time);
+        toolkit.handleAnimation();
+    }
+
     @BeforeEach
     void setup() {
-        scene = new Scene(new Group(testBean));
+        toolkit = (StubToolkit)Toolkit.getToolkit();
+        scene = new Scene(new Group());
         stage = new Stage();
         stage.setScene(scene);
         stage.show();
@@ -191,20 +211,22 @@ void teardown() {
     @MethodSource("transitionParameters")
     @SuppressWarnings("unchecked")
     void testRedundantTransitionIsDiscarded(TestRun testRun) {
+        ((Group)scene.getRoot()).getChildren().setAll(testBean);
+
         // Setting a value for the first time doesn't start a transition.
         testRun.property.applyStyle(StyleOrigin.USER, testRun.defaultValue);
-        var mediator1 = getTransitionMediator(testRun.property);
+        var mediator1 = getFieldValue(testRun.property, testRun.fieldName);
         assertNull(mediator1);
 
         // Start the transition. This adds it to the list of running transitions.
         testRun.property.applyStyle(StyleOrigin.USER, testRun.newValue);
-        var mediator2 = getTransitionMediator(testRun.property);
+        var mediator2 = getFieldValue(testRun.property, testRun.fieldName);
         assertNotNull(mediator2);
 
         // The next call to applyStyle() has the same target value as the last one,
         // making it redundant. No new transition is started.
         testRun.property.applyStyle(StyleOrigin.USER, testRun.newValue);
-        var mediator3 = getTransitionMediator(testRun.property);
+        var mediator3 = getFieldValue(testRun.property, testRun.fieldName);
         assertSame(mediator2, mediator3);
     }
 
@@ -212,21 +234,236 @@ void testRedundantTransitionIsDiscarded(TestRun testRun) {
     @MethodSource("transitionParameters")
     @SuppressWarnings("unchecked")
     void testReversingTransitionIsNotDiscarded(TestRun testRun) {
+        ((Group)scene.getRoot()).getChildren().setAll(testBean);
+
         // Setting a value for the first time doesn't start a transition.
         testRun.property.applyStyle(StyleOrigin.USER, testRun.defaultValue);
-        var mediator1 = getTransitionMediator(testRun.property);
+        var mediator1 = getFieldValue(testRun.property, testRun.fieldName);
         assertNull(mediator1);
 
         // Start the transition. This adds it to the list of running transitions.
         testRun.property.applyStyle(StyleOrigin.USER, testRun.newValue);
-        var mediator2 = getTransitionMediator(testRun.property);
+        var mediator2 = getFieldValue(testRun.property, testRun.fieldName);
         assertNotNull(mediator2);
 
         // The next call to applyStyle() has a different target value as the last one,
         // which makes this a reversing transition.
         testRun.property.applyStyle(StyleOrigin.USER, testRun.defaultValue);
-        var mediator3 = getTransitionMediator(testRun.property);
+        var mediator3 = getFieldValue(testRun.property, testRun.fieldName);
         assertNotNull(mediator3);
         assertNotSame(mediator2, mediator3);
     }
+
+    @Test
+    void testExistingTransitionOfComponentTransitionableIsPreserved() {
+        var bean = new Group();
+        ((Group)scene.getRoot()).getChildren().setAll(bean);
+        var border1 = new Background(new BackgroundFill(Color.RED, new CornerRadii(5), Insets.EMPTY));
+        var border2 = new Background(new BackgroundFill(Color.GREEN, new CornerRadii(10), Insets.EMPTY));
+        var border3 = new Background(new BackgroundFill(Color.BLUE, new CornerRadii(10), Insets.EMPTY));
+        var property = new SimpleStyleableObjectProperty<>(componentTransitionableObjectPropertyMetadata, bean, null);
+
+        NodeHelper.getTransitionProperty(bean).setValue(new TransitionDefinition[] {
+            new TransitionDefinition("-fx-background-color", Duration.seconds(1), Duration.ZERO, Interpolator.LINEAR),
+            new TransitionDefinition("-fx-background-radius", Duration.seconds(1), Duration.ZERO, Interpolator.LINEAR)
+        });
+
+        // Setting a value for the first time doesn't start a transition.
+        setAnimationTime(0);
+        property.applyStyle(StyleOrigin.USER, border1);
+
+        // Start the transition and capture a copy of the sub-property mediator list.
+        // -fx-background-color will transition from RED to GREEN
+        // -fx-background-radius will transition rom 5 to 10
+        property.applyStyle(StyleOrigin.USER, border2);
+        var oldMediators = List.copyOf((List<?>)getFieldValue(getFieldValue(property, "controller"), "mediators"));
+
+        // Advance the animation time and start the second transition.
+        // -fx-background-color will transition from (mix of RED/GREEN) to BLUE
+        // -fx-background-radius will pick up the previous transition, because its target value is the same (10)
+        setAnimationTime(500);
+        property.applyStyle(StyleOrigin.USER, border3);
+        var newMediators = (List<?>)getFieldValue(getFieldValue(property, "controller"), "mediators");
+
+        // The result is that now we have a new mediator for -fx-background-color, but the same
+        // mediator as in the previous transition for -fx-background-radius.
+        assertEquals(2, oldMediators.size());
+        assertEquals(2, newMediators.size());
+        assertNotSame(oldMediators.get(0), newMediators.get(0)); // -fx-background-color
+        assertSame(oldMediators.get(1), newMediators.get(1));    // -fx-background-radius
+    }
+
+    @Test
+    void testIntegerTransitionsInRealNumberSpace() {
+        ((Group)scene.getRoot()).getChildren().setAll(testBean);
+        var property = new SimpleStyleableIntegerProperty(integerPropertyMetadata, testBean, null);
+
+        // Setting a value for the first time doesn't start a transition.
+        setAnimationTime(0);
+        property.applyStyle(StyleOrigin.USER, 0);
+
+        // Start the transition and sample the outputs.
+        property.applyStyle(StyleOrigin.USER, 2);
+        setAnimationTime(249);
+        assertEquals(0, property.get());
+        setAnimationTime(250);
+        assertEquals(1, property.get());
+        setAnimationTime(500);
+        assertEquals(1, property.get());
+        setAnimationTime(749);
+        assertEquals(1, property.get());
+        setAnimationTime(750);
+        assertEquals(2, property.get());
+    }
+
+    @Test
+    void testLongTransitionsInRealNumberSpace() {
+        ((Group)scene.getRoot()).getChildren().setAll(testBean);
+        var property = new SimpleStyleableLongProperty(longPropertyMetadata, testBean, null);
+
+        // Setting a value for the first time doesn't start a transition.
+        setAnimationTime(0);
+        property.applyStyle(StyleOrigin.USER, 0);
+
+        // Start the transition and sample the outputs.
+        property.applyStyle(StyleOrigin.USER, 2);
+        setAnimationTime(249);
+        assertEquals(0, property.get());
+        setAnimationTime(250);
+        assertEquals(1, property.get());
+        setAnimationTime(500);
+        assertEquals(1, property.get());
+        setAnimationTime(749);
+        assertEquals(1, property.get());
+        setAnimationTime(750);
+        assertEquals(2, property.get());
+    }
+
+    @Test
+    void testBooleanTransitionsAsDiscrete() {
+        ((Group)scene.getRoot()).getChildren().setAll(testBean);
+        var property = new SimpleStyleableBooleanProperty(booleanPropertyMetadata, testBean, null);
+
+        // Setting a value for the first time doesn't start a transition.
+        setAnimationTime(0);
+        property.applyStyle(StyleOrigin.USER, false);
+
+        // Start the transition and sample the outputs.
+        property.applyStyle(StyleOrigin.USER, true);
+        setAnimationTime(499);
+        assertFalse(property.get());
+        setAnimationTime(500);
+        assertTrue(property.get());
+    }
+
+    @Test
+    void testStringTransitionsAsDiscrete() {
+        ((Group)scene.getRoot()).getChildren().setAll(testBean);
+        var property = new SimpleStyleableStringProperty(stringPropertyMetadata, testBean, null);
+
+        // Setting a value for the first time doesn't start a transition.
+        setAnimationTime(0);
+        property.applyStyle(StyleOrigin.USER, "foo");
+
+        // Start the transition and sample the outputs.
+        property.applyStyle(StyleOrigin.USER, "bar");
+        setAnimationTime(499);
+        assertEquals("foo", property.get());
+        setAnimationTime(500);
+        assertEquals("bar", property.get());
+
+        // This is a reversing transition, so it only needs half the time to flip the value.
+        property.applyStyle(StyleOrigin.USER, "foo");
+        setAnimationTime(749);
+        assertEquals("bar", property.get());
+        setAnimationTime(750);
+        assertEquals("foo", property.get());
+    }
+
+    @Test
+    void testNonInterpolatableObjectTransitionsAsDiscrete() {
+        enum Fruit { APPLE, ORANGE }
+
+        CssMetaData<Styleable, Fruit> metadata = new CssMetaData<>(
+                "-fx-fruit", StyleConverter.getEnumConverter(Fruit.class), Fruit.APPLE) {
+            @Override public boolean isSettable(Styleable styleable) { return true; }
+            @Override public StyleableProperty<Fruit> getStyleableProperty(Styleable styleable) {
+                throw new UnsupportedOperationException();
+            }
+        };
+
+        var bean = new Group();
+        NodeHelper.getTransitionProperty(bean).setValue(new TransitionDefinition[] {
+            new TransitionDefinition("-fx-fruit", ONE_SECOND, Duration.ZERO, Interpolator.LINEAR)
+        });
+
+        ((Group)scene.getRoot()).getChildren().setAll(bean);
+        var property = new SimpleStyleableObjectProperty<Fruit>(metadata, bean, null);
+
+        // Setting a value for the first time doesn't start a transition.
+        setAnimationTime(0);
+        property.applyStyle(StyleOrigin.USER, Fruit.APPLE);
+
+        // Start the transition and sample the outputs.
+        property.applyStyle(StyleOrigin.USER, Fruit.ORANGE);
+        setAnimationTime(499);
+        assertSame(Fruit.APPLE, property.get());
+        setAnimationTime(500);
+        assertSame(Fruit.ORANGE, property.get());
+
+        // This is a reversing transition, so it only needs half the time to flip the value.
+        property.applyStyle(StyleOrigin.USER, Fruit.APPLE);
+        setAnimationTime(749);
+        assertSame(Fruit.ORANGE, property.get());
+        setAnimationTime(750);
+        assertSame(Fruit.APPLE, property.get());
+    }
+
+    @Test
+    void testNullObjectTransitionsAsDiscrete_withInterpolatableValue() {
+        ((Group)scene.getRoot()).getChildren().setAll(testBean);
+        var property = new SimpleStyleableObjectProperty<>(interpolatableObjectPropertyMetadata, testBean, null);
+
+        // Setting a value for the first time doesn't start a transition.
+        setAnimationTime(0);
+        property.applyStyle(StyleOrigin.USER, Color.RED);
+
+        // Start the transition and sample the outputs.
+        property.applyStyle(StyleOrigin.USER, null);
+        setAnimationTime(499);
+        assertSame(Color.RED, property.get());
+        setAnimationTime(500);
+        assertNull(property.get());
+
+        // This is a reversing transition, so it only needs half the time to flip the value.
+        property.applyStyle(StyleOrigin.USER, Color.RED);
+        setAnimationTime(749);
+        assertNull(property.get());
+        setAnimationTime(750);
+        assertSame(Color.RED, property.get());
+    }
+
+    @Test
+    void testNullObjectTransitionsAsDiscrete_withComponentTransitionableValue() {
+        ((Group)scene.getRoot()).getChildren().setAll(testBean);
+        var property = new SimpleStyleableObjectProperty<>(componentTransitionableObjectPropertyMetadata, testBean, null);
+
+        // Setting a value for the first time doesn't start a transition.
+        setAnimationTime(0);
+        property.applyStyle(StyleOrigin.USER, Background.fill(Color.RED));
+
+        // Start the transition and sample the outputs.
+        property.applyStyle(StyleOrigin.USER, null);
+        setAnimationTime(499);
+        assertEquals(Background.fill(Color.RED), property.get());
+        setAnimationTime(500);
+        assertNull(property.get());
+
+        // This is a reversing transition, so it only needs half the time to flip the value.
+        property.applyStyle(StyleOrigin.USER, Background.fill(Color.RED));
+        setAnimationTime(749);
+        assertNull(property.get());
+        setAnimationTime(750);
+        assertEquals(Background.fill(Color.RED), property.get());
+    }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/geometry/InsetsTest.java b/modules/javafx.graphics/src/test/java/test/javafx/geometry/InsetsTest.java
index 5e4c387089b..2d8ab1820f1 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/geometry/InsetsTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/geometry/InsetsTest.java
@@ -26,12 +26,10 @@
 package test.javafx.geometry;
 
 import javafx.geometry.Insets;
-
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class InsetsTest {
     @Test
@@ -62,6 +60,39 @@ public void testHash() {
     public void testToString() {
         Insets p1 = new Insets(0, 0, 0, 0);
         assertNotNull(p1.toString());
+    }
+
+    @Nested
+    class InterpolationTest {
+        @Test
+        public void interpolateBetweenTwoDifferentValuesReturnsNewInstance() {
+            var startValue = new Insets(2, 4, 6, 8);
+            var endValue = new Insets(4, 8, 12, 16);
+            var expected = new Insets(3, 6, 9, 12);
+            assertEquals(expected, startValue.interpolate(endValue, 0.5));
+        }
+
+        @Test
+        public void interpolateBetweenTwoEqualValuesReturnsStartInstance() {
+            var startValue = new Insets(2, 4, 6, 8);
+            var endValue = new Insets(2, 4, 6, 8);
+            assertSame(startValue, startValue.interpolate(endValue, 0.5));
+        }
+
+        @Test
+        public void interpolationFactorSmallerThanOrEqualToZeroReturnsStartInstance() {
+            var startValue = new Insets(2, 4, 6, 8);
+            var endValue = new Insets(4, 8, 12, 16);
+            assertSame(startValue, startValue.interpolate(endValue, 0));
+            assertSame(startValue, startValue.interpolate(endValue, -1));
+        }
 
+        @Test
+        public void interpolationFactorGreaterThanOrEqualToOneReturnsEndInstance() {
+            var startValue = new Insets(2, 4, 6, 8);
+            var endValue = new Insets(4, 8, 12, 16);
+            assertSame(endValue, startValue.interpolate(endValue, 1));
+            assertSame(endValue, startValue.interpolate(endValue, 1.5));
+        }
     }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_transition_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_transition_Test.java
index b430585e9ae..da4df862b34 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_transition_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_transition_Test.java
@@ -43,6 +43,8 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 import java.util.List;
+import java.util.Map;
+
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -183,7 +185,7 @@ public void testRunningTimersAreTrackedInNode() {
         node.getStyleClass().add("testClass");
         node.applyCss();
 
-        List<TransitionTimer> timers = NodeShim.getTransitionTimers(node);
+        Map<String, TransitionTimer> timers = NodeShim.getTransitionTimers(node);
         assertNull(timers);
 
         // The hover state starts the timer.
@@ -191,7 +193,7 @@ public void testRunningTimersAreTrackedInNode() {
         node.applyCss();
         timers = NodeShim.getTransitionTimers(node);
         assertEquals(1, timers.size());
-        assertNotNull(timers.get(0));
+        assertNotNull(timers.values().iterator().next());
 
         // Complete the timer, which removes it from the list.
         toolkit.setCurrentTime(2000);
@@ -220,7 +222,7 @@ public void testRunningTimerIsCompletedWhenNodeIsRemovedFromSceneGraph() {
         // The original node is removed from the scene graph, causing the timer to complete early
         // with the target value of the transition.
         scene.setRoot(new Group());
-        assertEquals(0, NodeShim.getTransitionTimers(node).size());
+        assertNull(NodeShim.getTransitionTimers(node));
         assertEquals(1, node.getOpacity(), 0.001);
     }
 
@@ -245,7 +247,7 @@ public void testRunningTimerIsCompletedWhenNodeBecomesInvisible() {
         // The node is made invisible, causing the timer to complete early with the
         // target value of the transition.
         node.setVisible(false);
-        assertEquals(0, NodeShim.getTransitionTimers(node).size());
+        assertNull(NodeShim.getTransitionTimers(node));
         assertEquals(1, node.getOpacity(), 0.001);
     }
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundConverterTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundConverterTest.java
new file mode 100644
index 00000000000..d4ef55425cb
--- /dev/null
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundConverterTest.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+
+package test.javafx.scene.layout;
+
+import com.sun.javafx.css.SubPropertyConverter;
+import com.sun.javafx.tk.Toolkit;
+import javafx.geometry.Insets;
+import javafx.scene.image.Image;
+import javafx.scene.layout.Background;
+import javafx.scene.layout.BackgroundFill;
+import javafx.scene.layout.BackgroundImage;
+import javafx.scene.layout.BackgroundPosition;
+import javafx.scene.layout.BackgroundRepeat;
+import javafx.scene.layout.BackgroundShim;
+import javafx.scene.layout.BackgroundSize;
+import javafx.scene.layout.CornerRadii;
+import javafx.scene.paint.Color;
+import org.junit.jupiter.api.Test;
+import test.com.sun.javafx.pgstub.StubImageLoaderFactory;
+import test.com.sun.javafx.pgstub.StubPlatformImageInfo;
+import test.com.sun.javafx.pgstub.StubToolkit;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class BackgroundConverterTest {
+
+    private static final String IMAGE_URL = "file:red.png";
+
+    @SuppressWarnings("unchecked")
+    private final SubPropertyConverter<Background> converter = (SubPropertyConverter<Background>)BackgroundShim.getConverter();
+    private final StubImageLoaderFactory imageLoaderFactory = ((StubToolkit)Toolkit.getToolkit()).getImageLoaderFactory();
+    private final Image image;
+
+    BackgroundConverterTest() {
+        imageLoaderFactory.reset();
+        imageLoaderFactory.registerImage(IMAGE_URL, new StubPlatformImageInfo(57, 41));
+        image = new Image(IMAGE_URL);
+    }
+
+    @Test
+    void convertBackgroundImageFromURL() {
+        var background = converter.convert(Map.of(BackgroundShim.BACKGROUND_IMAGE, new String[] {IMAGE_URL}));
+        assertEquals(1, background.getImages().size());
+        assertEquals(IMAGE_URL, background.getImages().get(0).getImage().getUrl());
+    }
+
+    @Test
+    void convertBackgroundImageFromImage() {
+        var background = converter.convert(Map.of(BackgroundShim.BACKGROUND_IMAGE, new Image[] { image }));
+        assertEquals(1, background.getImages().size());
+        assertSame(image, background.getImages().get(0).getImage());
+    }
+
+    @Test
+    void convertBackgroundImageFromUnexpectedObjectFails() {
+        assertThrows(IllegalArgumentException.class, () ->
+            converter.convert(Map.of(BackgroundShim.BACKGROUND_IMAGE, new Object[] { 1.0 })));
+    }
+
+    @Test
+    void convertBackDoesNotAcceptNull() {
+        assertThrows(NullPointerException.class, () -> converter.convertBack(null));
+    }
+
+    @Test
+    void reconstructedObjectMustBeEqual() {
+        var expected = new Background(
+            List.of(new BackgroundFill(Color.RED, new CornerRadii(5, true), new Insets(2)),
+                    new BackgroundFill(Color.GREEN, new CornerRadii(10, false), new Insets(1, 2, 3, 4))),
+            List.of(new BackgroundImage(image, BackgroundRepeat.REPEAT, BackgroundRepeat.ROUND,
+                                        BackgroundPosition.CENTER, BackgroundSize.DEFAULT))
+        );
+
+        var actual = converter.convert(converter.convertBack(expected));
+        assertEquals(expected, actual);
+    }
+}
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundFillTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundFillTest.java
index 8328d6fd622..0e3e993820e 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundFillTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundFillTest.java
@@ -26,13 +26,19 @@
 package test.javafx.scene.layout;
 
 import javafx.geometry.Insets;
+import javafx.scene.image.Image;
 import javafx.scene.layout.BackgroundFill;
 import javafx.scene.layout.CornerRadii;
 import javafx.scene.paint.Color;
-
+import javafx.scene.paint.ImagePattern;
+import javafx.scene.paint.LinearGradient;
+import javafx.scene.paint.RadialGradient;
+import java.io.ByteArrayInputStream;
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
+
+import static com.sun.javafx.util.InterpolationUtils.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * Simple tests for BackgroundFill
@@ -109,4 +115,121 @@ public void toStringCausesNoError() {
         BackgroundFill f = new BackgroundFill(null, null, null);
         f.toString();
     }
+
+    @Nested
+    class InterpolationTests {
+        @Test
+        public void twoColorFills() {
+            BackgroundFill startValue = new BackgroundFill(Color.ORANGE, new CornerRadii(2), new Insets(2));
+            BackgroundFill endValue = new BackgroundFill(Color.RED, new CornerRadii(4), new Insets(6));
+            BackgroundFill actual = startValue.interpolate(endValue, 0.5);
+            assertEquals(Color.ORANGE.interpolate(Color.RED, 0.5), actual.getFill());
+            assertEquals(new CornerRadii(3), actual.getRadii());
+            assertEquals(new Insets(4), actual.getInsets());
+        }
+
+        @Test
+        public void twoLinearGradientFills() {
+            var gradient1 = LinearGradient.valueOf("linear-gradient(to left top, red, blue)");
+            var gradient2 = LinearGradient.valueOf("linear-gradient(to left top, yellow, white)");
+            BackgroundFill startValue = new BackgroundFill(gradient1, new CornerRadii(2), new Insets(2));
+            BackgroundFill endValue = new BackgroundFill(gradient2, new CornerRadii(4), new Insets(6));
+            BackgroundFill actual = startValue.interpolate(endValue, 0.5);
+            assertEquals(gradient1.interpolate(gradient2, 0.5), actual.getFill());
+            assertEquals(new CornerRadii(3), actual.getRadii());
+            assertEquals(new Insets(4), actual.getInsets());
+        }
+
+        @Test
+        public void linearGradientAndColorFills() {
+            var gradient = LinearGradient.valueOf("linear-gradient(to left top, red, blue)");
+            BackgroundFill startValue = new BackgroundFill(gradient, new CornerRadii(2), new Insets(2));
+            BackgroundFill endValue = new BackgroundFill(Color.ORANGE, new CornerRadii(4), new Insets(6));
+
+            BackgroundFill actual = startValue.interpolate(endValue, 0.5);
+            assertEquals(gradient.interpolate(newSolidGradient(gradient, Color.ORANGE), 0.5), actual.getFill());
+            assertEquals(new CornerRadii(3), actual.getRadii());
+            assertEquals(new Insets(4), actual.getInsets());
+
+            actual = endValue.interpolate(startValue, 0.5);
+            assertEquals(newSolidGradient(gradient, Color.ORANGE).interpolate(gradient, 0.5), actual.getFill());
+            assertEquals(new CornerRadii(3), actual.getRadii());
+            assertEquals(new Insets(4), actual.getInsets());
+        }
+
+        @Test
+        public void twoRadialGradientFills() {
+            var gradient1 = RadialGradient.valueOf("radial-gradient(radius 100%, red, blue)");
+            var gradient2 = RadialGradient.valueOf("radial-gradient(radius 50%, yellow, white)");
+            BackgroundFill startValue = new BackgroundFill(gradient1, new CornerRadii(2), new Insets(2));
+            BackgroundFill endValue = new BackgroundFill(gradient2, new CornerRadii(4), new Insets(6));
+            BackgroundFill actual = startValue.interpolate(endValue, 0.5);
+            assertEquals(gradient1.interpolate(gradient2, 0.5), actual.getFill());
+            assertEquals(new CornerRadii(3), actual.getRadii());
+            assertEquals(new Insets(4), actual.getInsets());
+        }
+
+        @Test
+        public void radialGradientAndColorFills() {
+            var gradient = RadialGradient.valueOf("radial-gradient(radius 100%, red, blue)");
+            BackgroundFill startValue = new BackgroundFill(gradient, new CornerRadii(2), new Insets(2));
+            BackgroundFill endValue = new BackgroundFill(Color.ORANGE, new CornerRadii(4), new Insets(6));
+
+            BackgroundFill actual = startValue.interpolate(endValue, 0.5);
+            assertEquals(gradient.interpolate(newSolidGradient(gradient, Color.ORANGE), 0.5), actual.getFill());
+            assertEquals(new CornerRadii(3), actual.getRadii());
+            assertEquals(new Insets(4), actual.getInsets());
+
+            actual = endValue.interpolate(startValue, 0.5);
+            assertEquals(newSolidGradient(gradient, Color.ORANGE).interpolate(gradient, 0.5), actual.getFill());
+            assertEquals(new CornerRadii(3), actual.getRadii());
+            assertEquals(new Insets(4), actual.getInsets());
+        }
+
+        @Test
+        public void incompatibleFillsReturnsStartFillOrEndFill() {
+            var imagePattern = new ImagePattern(new Image(new ByteArrayInputStream(new byte[] {})));
+            BackgroundFill startValue = new BackgroundFill(imagePattern, new CornerRadii(2), new Insets(2));
+            BackgroundFill endValue = new BackgroundFill(Color.RED, new CornerRadii(4), new Insets(6));
+            BackgroundFill actual;
+
+            actual = startValue.interpolate(endValue, 0.25);
+            assertEquals(startValue.getFill(), actual.getFill());
+            assertEquals(new CornerRadii(2.5), actual.getRadii());
+            assertEquals(new Insets(3), actual.getInsets());
+
+            actual = startValue.interpolate(endValue, 0.5);
+            assertEquals(endValue.getFill(), actual.getFill());
+            assertEquals(new CornerRadii(3), actual.getRadii());
+            assertEquals(new Insets(4), actual.getInsets());
+
+            actual = startValue.interpolate(endValue, 0.75);
+            assertEquals(endValue.getFill(), actual.getFill());
+            assertEquals(new CornerRadii(3.5), actual.getRadii());
+            assertEquals(new Insets(5), actual.getInsets());
+        }
+
+        @Test
+        public void twoEqualFillsReturnsExistingInstance() {
+            BackgroundFill startValue = new BackgroundFill(Color.ORANGE, new CornerRadii(2), new Insets(2));
+            BackgroundFill endValue = new BackgroundFill(Color.ORANGE, new CornerRadii(2), new Insets(2));
+            assertSame(startValue, startValue.interpolate(endValue, 0.5));
+        }
+
+        @Test
+        public void interpolationFactorSmallerThanOrEqualToZeroReturnsStartInstance() {
+            BackgroundFill startValue = new BackgroundFill(Color.ORANGE, new CornerRadii(2), new Insets(2));
+            BackgroundFill endValue = new BackgroundFill(Color.RED, new CornerRadii(4), new Insets(6));
+            assertSame(startValue, startValue.interpolate(endValue, 0));
+            assertSame(startValue, startValue.interpolate(endValue, -1));
+        }
+
+        @Test
+        public void interpolationFactorGreaterThanOrEqualToOneReturnsEndInstance() {
+            BackgroundFill startValue = new BackgroundFill(Color.ORANGE, new CornerRadii(2), new Insets(2));
+            BackgroundFill endValue = new BackgroundFill(Color.RED, new CornerRadii(4), new Insets(6));
+            assertSame(endValue, startValue.interpolate(endValue, 1));
+            assertSame(endValue, startValue.interpolate(endValue, 1.5));
+        }
+    }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundImageTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundImageTest.java
index 74d6f7c89d2..ddd2bf4efce 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundImageTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundImageTest.java
@@ -30,13 +30,11 @@
 import javafx.scene.layout.BackgroundImage;
 import javafx.scene.layout.BackgroundPosition;
 import javafx.scene.layout.BackgroundSize;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
 
 import static javafx.scene.layout.BackgroundRepeat.*;
-
-import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  */
@@ -248,4 +246,57 @@ public void notEquivalentWithRandom() {
         BackgroundImage a = new BackgroundImage(IMAGE_1, REPEAT, REPEAT, POS_2, SIZE_2);
         assertFalse(a.equals("Some random string"));
     }
+
+    @Nested
+    class InterpolationTests {
+        final BackgroundImage BACKGROUND_IMAGE_A = new BackgroundImage(
+            IMAGE_1, NO_REPEAT, NO_REPEAT,
+            new BackgroundPosition(Side.LEFT, 0, false, Side.TOP, 0, false),
+            new BackgroundSize(50, 100, false, false, false, false));
+
+        final BackgroundImage BACKGROUND_IMAGE_B = new BackgroundImage(
+            IMAGE_2, REPEAT, SPACE,
+            new BackgroundPosition(Side.LEFT, 10, false, Side.TOP, 20, false),
+            new BackgroundSize(100, 200, false, false, false, false));
+
+        @Test
+        public void interpolateBetweenDifferentValuesReturnsNewInstance() {
+            var expect = new BackgroundImage(
+                IMAGE_2, REPEAT, SPACE,
+                new BackgroundPosition(Side.LEFT, 5, false, Side.TOP, 10, false),
+                new BackgroundSize(75, 150, false, false, false, false));
+
+            var actual = BACKGROUND_IMAGE_A.interpolate(BACKGROUND_IMAGE_B, 0.5);
+
+            assertEquals(expect, actual);
+            assertNotSame(expect, actual);
+        }
+
+        @Test
+        public void interpolateBetweenEqualValuesReturnsStartInstance() {
+            var startValue = new BackgroundImage(
+                IMAGE_1, NO_REPEAT, NO_REPEAT,
+                new BackgroundPosition(Side.LEFT, 0, false, Side.TOP, 0, false),
+                new BackgroundSize(50, 100, false, false, false, false));
+
+            var endValue = new BackgroundImage(
+                IMAGE_1, NO_REPEAT, NO_REPEAT,
+                new BackgroundPosition(Side.LEFT, 0, false, Side.TOP, 0, false),
+                new BackgroundSize(50, 100, false, false, false, false));
+
+            assertSame(startValue, startValue.interpolate(endValue, 0.5));
+        }
+
+        @Test
+        public void interpolationFactorSmallerThanOrEqualToZeroReturnsStartInstance() {
+            assertSame(BACKGROUND_IMAGE_A, BACKGROUND_IMAGE_A.interpolate(BACKGROUND_IMAGE_B, 0));
+            assertSame(BACKGROUND_IMAGE_A, BACKGROUND_IMAGE_A.interpolate(BACKGROUND_IMAGE_B, -0.5));
+        }
+
+        @Test
+        public void interpolationFactorGreaterThanOrEqualToOneReturnsEndInstance() {
+            assertSame(BACKGROUND_IMAGE_B, BACKGROUND_IMAGE_A.interpolate(BACKGROUND_IMAGE_B, 1));
+            assertSame(BACKGROUND_IMAGE_B, BACKGROUND_IMAGE_A.interpolate(BACKGROUND_IMAGE_B, 1.5));
+        }
+    }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundPositionTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundPositionTest.java
index cf559fd7286..bcecc2b9365 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundPositionTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundPositionTest.java
@@ -27,17 +27,16 @@
 
 import javafx.geometry.Side;
 import javafx.scene.layout.BackgroundPosition;
-
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  */
 public class BackgroundPositionTest {
-    @Test public void valuesAreCorrectAfterConstruction() {
+    @Test
+    public void valuesAreCorrectAfterConstruction() {
         BackgroundPosition pos = new BackgroundPosition(Side.LEFT, 10, false, Side.TOP, 20, false);
 
         assertEquals(Side.LEFT, pos.getHorizontalSide());
@@ -178,4 +177,99 @@ public void RIGHTVerticalSideFails() {
         assertEquals(.5, BackgroundPosition.CENTER.getVerticalPosition(), 0);
         assertTrue(BackgroundPosition.CENTER.isVerticalAsPercentage());
     }
+
+    @Nested
+    class InterpolationTests {
+        @Test
+        public void interpolateComponentWithAbsoluteAndPercentageMismatch() {
+            record TestCase(BackgroundPosition endValue, BackgroundPosition expected) {}
+
+            final double v0 = 0, v25 = 10, v50 = 20, v100 = 40;
+            final var startValue = new BackgroundPosition(Side.LEFT, v0, false, Side.TOP, v0, false);
+
+            // For each component: interpolation with t=0.25 returns start value on absolute/percentage mismatch.
+            for (var testCase : new TestCase[] {
+                new TestCase(
+                    new BackgroundPosition(Side.LEFT, v100, false, Side.TOP, v100, false),
+                    new BackgroundPosition(Side.LEFT, v25, false, Side.TOP, v25, false)),
+                new TestCase(
+                    new BackgroundPosition(Side.LEFT, v100, true, Side.TOP, v100, false),
+                    new BackgroundPosition(Side.LEFT, v0, false, Side.TOP, v25, false)),
+                new TestCase(
+                    new BackgroundPosition(Side.LEFT, v100, false, Side.TOP, v100, true),
+                    new BackgroundPosition(Side.LEFT, v25, false, Side.TOP, v0, false))
+            }) {
+                assertEquals(testCase.expected, startValue.interpolate(testCase.endValue, 0.25));
+            }
+
+            // For each component: interpolation with t=0.5 returns end value on absolute/percentage mismatch.
+            for (var testCase : new TestCase[] {
+                new TestCase(
+                    new BackgroundPosition(Side.LEFT, v100, false, Side.TOP, v100, false),
+                    new BackgroundPosition(Side.LEFT, v50, false, Side.TOP, v50, false)),
+                new TestCase(
+                    new BackgroundPosition(Side.LEFT, v100, true, Side.TOP, v100, false),
+                    new BackgroundPosition(Side.LEFT, v100, true, Side.TOP, v50, false)),
+                new TestCase(
+                    new BackgroundPosition(Side.LEFT, v100, false, Side.TOP, v100, true),
+                    new BackgroundPosition(Side.LEFT, v50, false, Side.TOP, v100, true))
+            }) {
+                assertEquals(testCase.expected, startValue.interpolate(testCase.endValue, 0.5));
+            }
+        }
+
+        @Test
+        public void interpolateBetweenDifferentValuesReturnsNewInstance() {
+            var startValue = new BackgroundPosition(Side.LEFT, 0, false, Side.TOP, 0, false);
+            var endValue = new BackgroundPosition(Side.LEFT, 10, false, Side.TOP, 20, false);
+            var expected = new BackgroundPosition(Side.LEFT, 5, false, Side.TOP, 10, false);
+            assertEquals(expected, startValue.interpolate(endValue, 0.5));
+        }
+
+        @Test
+        public void interpolateBetweenEqualValuesReturnsStartInstance() {
+            var startValue = new BackgroundPosition(Side.LEFT, 10, false, Side.TOP, 20, false);
+            var endValue = new BackgroundPosition(Side.LEFT, 10, false, Side.TOP, 20, false);
+            assertSame(startValue, startValue.interpolate(endValue, 0.25));
+            assertSame(startValue, startValue.interpolate(endValue, 0.5));
+            assertSame(startValue, startValue.interpolate(endValue, 0.75));
+        }
+
+        @Test
+        public void interpolationFactorSmallerThanOrEqualToZeroReturnsStartInstance() {
+            var startValue = new BackgroundPosition(Side.LEFT, 0, false, Side.TOP, 0, false);
+            var endValue = new BackgroundPosition(Side.LEFT, 10, false, Side.TOP, 20, false);
+            assertSame(startValue, startValue.interpolate(endValue, 0));
+            assertSame(startValue, startValue.interpolate(endValue, -0.5));
+        }
+
+        @Test
+        public void interpolationFactorGreaterThanOrEqualToOneReturnsEndInstance() {
+            var startValue = new BackgroundPosition(Side.LEFT, 0, false, Side.TOP, 0, false);
+            var endValue = new BackgroundPosition(Side.LEFT, 10, false, Side.TOP, 20, false);
+            assertSame(endValue, startValue.interpolate(endValue, 1));
+            assertSame(endValue, startValue.interpolate(endValue, 1.5));
+        }
+
+        @Test
+        public void percentageAndAbsolutePositionsCannotBeInterpolated() {
+            var startValue = new BackgroundPosition(Side.LEFT, 0, false, Side.TOP, 0, false);
+            var endValue = new BackgroundPosition(Side.LEFT, 10, true, Side.TOP, 20, true);
+            assertEquals(startValue, startValue.interpolate(endValue, 0.25)); // equal to 'startValue' for t < 0.5
+            assertEquals(endValue, startValue.interpolate(endValue, 0.5)); // equal to 'endValue' otherwise
+        }
+
+        @Test
+        public void differentSidesCannotBeInterpolated() {
+            var startValue = new BackgroundPosition(Side.LEFT, 0, false, Side.TOP, 0, false);
+            var endValue = new BackgroundPosition(Side.RIGHT, 10, false, Side.TOP, 20, false);
+            var expect = new BackgroundPosition(Side.RIGHT, 10, false, Side.TOP, 10, false);
+            assertEquals(expect, startValue.interpolate(endValue, 0.5));
+
+            startValue = new BackgroundPosition(Side.LEFT, 0, false, Side.TOP, 0, false);
+            endValue = new BackgroundPosition(Side.LEFT, 10, false, Side.BOTTOM, 20, false);
+            expect = new BackgroundPosition(Side.LEFT, 5, false, Side.BOTTOM, 20, false);
+            assertEquals(expect, startValue.interpolate(endValue, 0.5));
+        }
+    }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundSizeTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundSizeTest.java
index f9efa3f0c2a..34a8e26e5c5 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundSizeTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundSizeTest.java
@@ -26,13 +26,12 @@
 package test.javafx.scene.layout;
 
 import javafx.scene.layout.BackgroundSize;
-
 import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import static javafx.scene.layout.BackgroundSize.AUTO;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  */
@@ -117,7 +116,7 @@ public void negativeZeroWidthIsOK() {
     @Test
     public void autoWidthIsOK() {
         BackgroundSize size = new BackgroundSize(-1, 1, true, true, false, false);
-        assertEquals(BackgroundSize.AUTO, size.getWidth(), 0);
+        assertEquals(AUTO, size.getWidth(), 0);
     }
 
     @Test
@@ -167,7 +166,7 @@ public void negativeZeroHeightIsOK() {
     @Test
     public void autoHeightIsOK() {
         BackgroundSize size = new BackgroundSize(1, -1, true, true, false, false);
-        assertEquals(BackgroundSize.AUTO, size.getHeight(), 0);
+        assertEquals(AUTO, size.getHeight(), 0);
     }
 
     @Test
@@ -294,4 +293,109 @@ public void notEqualToRandom() {
         BackgroundSize a = new BackgroundSize(1, .5, true, true, true, false);
         assertFalse(a.equals("Some random object"));
     }
+
+    @Nested
+    class InterpolationTests {
+        @Test
+        public void interpolateComponentWithAbsoluteAndPercentageMismatch() {
+            record TestCase(BackgroundSize endValue, BackgroundSize expected) {}
+
+            final double v0 = 0, v25 = 10, v50 = 20, v100 = 40;
+            final var startValue = new BackgroundSize(v0, v0, false, false, false, false);
+
+            // For each component: interpolation with t=0.25 returns start value on absolute/percentage mismatch.
+            for (var testCase : new TestCase[] {
+                new TestCase(
+                    new BackgroundSize(v100, v100, false, false, false, false),
+                    new BackgroundSize(v25, v25, false, false, false, false)),
+                new TestCase(
+                    new BackgroundSize(v100, v100, true, false, false, false),
+                    new BackgroundSize(v0, v25, false, false, false, false)),
+                new TestCase(
+                    new BackgroundSize(v100, v100, false, true, false, false),
+                    new BackgroundSize(v25, v0, false, false, false, false))
+            }) {
+                assertEquals(testCase.expected, startValue.interpolate(testCase.endValue, 0.25));
+            }
+
+            // For each component: interpolation with t=0.5 returns end value on absolute/percentage mismatch.
+            for (var testCase : new TestCase[] {
+                new TestCase(
+                    new BackgroundSize(v100, v100, false, false, false, false),
+                    new BackgroundSize(v50, v50, false, false, false, false)),
+                new TestCase(
+                    new BackgroundSize(v100, v100, true, false, false, false),
+                    new BackgroundSize(v100, v50, true, false, false, false)),
+                new TestCase(
+                    new BackgroundSize(v100, v100, false, true, false, false),
+                    new BackgroundSize(v50, v100, false, true, false, false))
+            }) {
+                assertEquals(testCase.expected, startValue.interpolate(testCase.endValue, 0.5));
+            }
+        }
+
+        @Test
+        public void interpolateBetweenDifferentValuesReturnsNewInstance() {
+            var startValue = new BackgroundSize(10, 20, false, false, false, false);
+            var endValue = new BackgroundSize(20, 40, false, false, false, false);
+            var expect = new BackgroundSize(15, 30, false, false, false, false);
+            assertEquals(expect, startValue.interpolate(endValue, 0.5));
+        }
+
+        @Test
+        public void interpolateBetweenEqualValuesReturnsStartInstance() {
+            var startValue = new BackgroundSize(10, 20, false, false, false, false);
+            var endValue = new BackgroundSize(10, 20, false, false, false, false);
+            assertSame(startValue, startValue.interpolate(endValue, 0.25));
+            assertSame(startValue, startValue.interpolate(endValue, 0.5));
+            assertSame(startValue, startValue.interpolate(endValue, 0.75));
+        }
+
+        @Test
+        public void interpolationFactorSmallerThanOrEqualToZeroReturnsStartInstance() {
+            var startValue = new BackgroundSize(10, 20, false, false, false, false);
+            var endValue = new BackgroundSize(20, 40, false, false, false, false);
+            assertSame(startValue, startValue.interpolate(endValue, 0));
+            assertSame(startValue, startValue.interpolate(endValue, -0.5));
+        }
+
+        @Test
+        public void interpolationFactorGreaterThanOrEqualToOneReturnsEndInstance() {
+            var startValue = new BackgroundSize(10, 20, false, false, false, false);
+            var endValue = new BackgroundSize(20, 40, false, false, false, false);
+            assertSame(endValue, startValue.interpolate(endValue, 1));
+            assertSame(endValue, startValue.interpolate(endValue, 1.5));
+        }
+
+        @Test
+        public void widthOrHeightLessThanZeroCannotBeInterpolated() {
+            var startValue = new BackgroundSize(10, 20, false, false, false, false);
+            var endValue = new BackgroundSize(AUTO, 40, false, false, false, false);
+            var expect = new BackgroundSize(AUTO, 30, false, false, false, false);
+            assertEquals(expect, startValue.interpolate(endValue, 0.5));
+
+            startValue = new BackgroundSize(20, 10, false, false, false, false);
+            endValue = new BackgroundSize(40, AUTO, false, false, false, false);
+            expect = new BackgroundSize(30, AUTO, false, false, false, false);
+            assertEquals(expect, startValue.interpolate(endValue, 0.5));
+        }
+
+        @Test
+        public void notInterpolatableReturnsStartOrEndInstance() {
+            var startValue = new BackgroundSize(10, 10, false, false, false, true);
+            var endValue = new BackgroundSize(20, 20, false, false, false, false);
+            assertSame(startValue, startValue.interpolate(endValue, 0.25));
+            assertSame(endValue, startValue.interpolate(endValue, 0.5));
+
+            startValue = new BackgroundSize(10, 10, false, false, false, false);
+            endValue = new BackgroundSize(20, 20, false, false, true, false);
+            assertSame(startValue, startValue.interpolate(endValue, 0.25));
+            assertSame(endValue, startValue.interpolate(endValue, 0.5));
+
+            startValue = new BackgroundSize(AUTO, AUTO, false, false, false, false);
+            endValue = new BackgroundSize(20, 20, false, false, false, false);
+            assertSame(startValue, startValue.interpolate(endValue, 0.25));
+            assertSame(endValue, startValue.interpolate(endValue, 0.5));
+        }
+    }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundTest.java
index 4a5230de5ab..cf0e2e4a86f 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundTest.java
@@ -33,17 +33,15 @@
 import javafx.scene.layout.BackgroundImage;
 import javafx.scene.layout.BackgroundPosition;
 import javafx.scene.layout.BackgroundShim;
+import javafx.scene.layout.BackgroundSize;
 import javafx.scene.layout.CornerRadii;
 import javafx.scene.paint.Color;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import java.util.List;
 
 import static javafx.scene.layout.BackgroundRepeat.*;
-
-import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  */
@@ -799,6 +797,92 @@ public void testSingleFillWithNullPaint() {
         assertEquals(background1, background2, "The factory method should give the same result as the constructor");
     }
 
+    @Nested
+    class InterpolationTest {
+        @Test
+        public void interpolateBetweenDifferentValuesReturnsNewInstance() {
+            var startValue = new Background(
+                List.of(new BackgroundFill(Color.RED, new CornerRadii(10), new Insets(10)),
+                        new BackgroundFill(Color.BLUE, new CornerRadii(2), new Insets(2))),
+                List.of(new BackgroundImage(IMAGE_1, REPEAT, REPEAT,
+                                            new BackgroundPosition(Side.LEFT, 10, false, Side.TOP, 5, false),
+                                            new BackgroundSize(10, 10, false, false, false, false))));
+
+            var endValue = new Background(
+                List.of(new BackgroundFill(Color.GREEN, new CornerRadii(20), new Insets(20)),
+                        new BackgroundFill(Color.YELLOW, new CornerRadii(6), new Insets(6))),
+                List.of(new BackgroundImage(IMAGE_1, REPEAT, REPEAT,
+                                            new BackgroundPosition(Side.LEFT, 20, false, Side.TOP, 15, false),
+                                            new BackgroundSize(20, 30, false, false, false, false))));
+
+            var expect = new Background(
+                List.of(new BackgroundFill(Color.RED.interpolate(Color.GREEN, 0.5), new CornerRadii(15), new Insets(15)),
+                        new BackgroundFill(Color.BLUE.interpolate(Color.YELLOW, 0.5), new CornerRadii(4), new Insets(4))),
+                List.of(new BackgroundImage(IMAGE_1, REPEAT, REPEAT,
+                                            new BackgroundPosition(Side.LEFT, 15, false, Side.TOP, 10, false),
+                                            new BackgroundSize(15, 20, false, false, false, false))));
+
+            var actual = startValue.interpolate(endValue, 0.5);
+
+            assertEquals(expect, actual);
+            assertNotSame(expect, actual);
+        }
+
+        @Test
+        public void interpolateBetweenDifferentNumberOfFillsAndImages() {
+            var startValue = new Background(
+                List.of(new BackgroundFill(Color.RED, new CornerRadii(10), new Insets(10))),
+                List.of(new BackgroundImage(IMAGE_1, REPEAT, REPEAT,
+                                            new BackgroundPosition(Side.LEFT, 10, false, Side.TOP, 5, false),
+                                            new BackgroundSize(10, 10, false, false, false, false))));
+
+            var endValue = new Background(
+                List.of(new BackgroundFill(Color.GREEN, new CornerRadii(20), new Insets(20)),
+                        new BackgroundFill(Color.BLUE, new CornerRadii(2), new Insets(2))),
+                List.of(new BackgroundImage(IMAGE_1, REPEAT, REPEAT,
+                                            new BackgroundPosition(Side.LEFT, 20, false, Side.TOP, 15, false),
+                                            new BackgroundSize(20, 30, false, false, false, false)),
+                        new BackgroundImage(IMAGE_1, REPEAT, REPEAT,
+                                            new BackgroundPosition(Side.LEFT, 30, false, Side.TOP, 40, false),
+                                            new BackgroundSize(50, 60, false, false, false, false))));
+
+            var expect = new Background(
+                List.of(new BackgroundFill(Color.RED.interpolate(Color.GREEN, 0.5), new CornerRadii(15), new Insets(15)),
+                        new BackgroundFill(Color.BLUE, new CornerRadii(2), new Insets(2))),
+                List.of(new BackgroundImage(IMAGE_1, REPEAT, REPEAT,
+                                            new BackgroundPosition(Side.LEFT, 15, false, Side.TOP, 10, false),
+                                            new BackgroundSize(15, 20, false, false, false, false)),
+                        new BackgroundImage(IMAGE_1, REPEAT, REPEAT,
+                                            new BackgroundPosition(Side.LEFT, 30, false, Side.TOP, 40, false),
+                                            new BackgroundSize(50, 60, false, false, false, false))));
+
+            assertEquals(expect, startValue.interpolate(endValue, 0.5));
+        }
+
+        @Test
+        public void interpolateBetweenEqualValuesReturnsStartInstance() {
+            var startValue = new Background(new BackgroundFill(Color.RED, new CornerRadii(10), new Insets(10)));
+            var endValue = new Background(new BackgroundFill(Color.RED, new CornerRadii(10), new Insets(10)));
+            assertSame(startValue, startValue.interpolate(endValue, 0.5));
+        }
+
+        @Test
+        public void interpolationFactorSmallerThanOrEqualToZeroReturnsStartInstance() {
+            var startValue = new Background(new BackgroundFill(Color.RED, new CornerRadii(10), new Insets(10)));
+            var endValue = new Background(new BackgroundFill(Color.GREEN, new CornerRadii(15), new Insets(20)));
+            assertSame(startValue, startValue.interpolate(endValue, 0));
+            assertSame(startValue, startValue.interpolate(endValue, -0.5));
+        }
+
+        @Test
+        public void interpolationFactorGreaterThanOrEqualToOneReturnsEndInstance() {
+            var startValue = new Background(new BackgroundFill(Color.RED, new CornerRadii(10), new Insets(10)));
+            var endValue = new Background(new BackgroundFill(Color.GREEN, new CornerRadii(15), new Insets(20)));
+            assertSame(endValue, startValue.interpolate(endValue, 1));
+            assertSame(endValue, startValue.interpolate(endValue, 1.5));
+        }
+    }
+
     // TODO: What happens if the corner radii become so big that we would end up with a negative opaque
     // inset in one dimension?
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderConverterTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderConverterTest.java
new file mode 100644
index 00000000000..3c5d515e4a3
--- /dev/null
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderConverterTest.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+
+package test.javafx.scene.layout;
+
+import com.sun.javafx.css.SubPropertyConverter;
+import com.sun.javafx.tk.Toolkit;
+import javafx.geometry.Insets;
+import javafx.scene.image.Image;
+import javafx.scene.layout.Border;
+import javafx.scene.layout.BorderImage;
+import javafx.scene.layout.BorderRepeat;
+import javafx.scene.layout.BorderShim;
+import javafx.scene.layout.BorderStroke;
+import javafx.scene.layout.BorderStrokeStyle;
+import javafx.scene.layout.BorderWidths;
+import javafx.scene.layout.CornerRadii;
+import javafx.scene.paint.Color;
+import javafx.scene.paint.CycleMethod;
+import javafx.scene.paint.LinearGradient;
+import javafx.scene.paint.Stop;
+import org.junit.jupiter.api.Test;
+import test.com.sun.javafx.pgstub.StubImageLoaderFactory;
+import test.com.sun.javafx.pgstub.StubPlatformImageInfo;
+import test.com.sun.javafx.pgstub.StubToolkit;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class BorderConverterTest {
+
+    private static final String IMAGE_URL = "file:red.png";
+
+    @SuppressWarnings("unchecked")
+    private final SubPropertyConverter<Border> converter = (SubPropertyConverter<Border>)BorderShim.getConverter();
+    private final StubImageLoaderFactory imageLoaderFactory = ((StubToolkit)Toolkit.getToolkit()).getImageLoaderFactory();
+    private final Image image;
+
+    BorderConverterTest() {
+        imageLoaderFactory.reset();
+        imageLoaderFactory.registerImage(IMAGE_URL, new StubPlatformImageInfo(57, 41));
+        image = new Image(IMAGE_URL);
+    }
+
+    @Test
+    void convertBorderImageFromURL() {
+        var border = converter.convert(Map.of(BorderShim.BORDER_IMAGE_SOURCE, new String[] {IMAGE_URL}));
+        assertEquals(1, border.getImages().size());
+        assertEquals(IMAGE_URL, border.getImages().get(0).getImage().getUrl());
+    }
+
+    @Test
+    void convertBorderImageFromImage() {
+        var border = converter.convert(Map.of(BorderShim.BORDER_IMAGE_SOURCE, new Image[] { image }));
+        assertEquals(1, border.getImages().size());
+        assertSame(image, border.getImages().get(0).getImage());
+    }
+
+    @Test
+    void convertBorderImageFromUnexpectedObjectFails() {
+        assertThrows(IllegalArgumentException.class, () ->
+            converter.convert(Map.of(BorderShim.BORDER_IMAGE_SOURCE, new Object[] { 1.0 })));
+    }
+
+    @Test
+    void convertBackDoesNotAcceptNull() {
+        assertThrows(NullPointerException.class, () -> converter.convertBack(null));
+    }
+
+    @Test
+    void reconstructedObjectMustBeEqual() {
+        var expected = new Border(
+            List.of(new BorderStroke(Color.RED, BorderStrokeStyle.SOLID, CornerRadii.EMPTY, BorderWidths.EMPTY),
+                    new BorderStroke(new LinearGradient(0.1, 0.2, 0.3, 0.4, true, CycleMethod.REPEAT,
+                                                        new Stop(0, Color.BLUE), new Stop(0.5, Color.YELLOW)),
+                                     BorderStrokeStyle.SOLID, CornerRadii.EMPTY, BorderWidths.EMPTY)),
+            List.of(new BorderImage(image, BorderWidths.FULL, Insets.EMPTY, BorderWidths.DEFAULT,
+                                    false, BorderRepeat.STRETCH, BorderRepeat.REPEAT))
+        );
+
+        var actual = converter.convert(converter.convertBack(expected));
+        assertEquals(expected, actual);
+    }
+}
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderImageTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderImageTest.java
new file mode 100644
index 00000000000..95d91733cc7
--- /dev/null
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderImageTest.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+
+package test.javafx.scene.layout;
+
+import javafx.geometry.Insets;
+import javafx.scene.image.Image;
+import javafx.scene.layout.BorderImage;
+import javafx.scene.layout.BorderRepeat;
+import javafx.scene.layout.BorderWidths;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class BorderImageTest {
+
+    private static final Image IMAGE_1 = new Image("test/javafx/scene/layout/red.png");
+    private static final Image IMAGE_2 = new Image("test/javafx/scene/layout/blue.png");
+
+    @Nested
+    class InterpolationTests {
+        final BorderImage BORDER_IMAGE_A = new BorderImage(
+            IMAGE_1, new BorderWidths(10), new Insets(8), new BorderWidths(6),
+            false, BorderRepeat.REPEAT, BorderRepeat.REPEAT);
+
+        final BorderImage BORDER_IMAGE_B = new BorderImage(
+            IMAGE_2, new BorderWidths(20), new Insets(4), new BorderWidths(12),
+            false, BorderRepeat.REPEAT, BorderRepeat.REPEAT);
+
+        @Test
+        public void interpolateBetweenDifferentValuesReturnsNewInstance() {
+            var image = new BorderImage(
+                IMAGE_2, new BorderWidths(15), new Insets(6), new BorderWidths(9),
+                false, BorderRepeat.REPEAT, BorderRepeat.REPEAT);
+
+            assertEquals(image, BORDER_IMAGE_A.interpolate(BORDER_IMAGE_B, 0.5));
+        }
+
+        @Test
+        public void interpolateBetweenEqualValuesReturnsStartInstance() {
+            var image = new BorderImage(
+                IMAGE_1, new BorderWidths(10), new Insets(8), new BorderWidths(6),
+                false, BorderRepeat.REPEAT, BorderRepeat.REPEAT);
+
+            assertSame(image, image.interpolate(BORDER_IMAGE_A, 0.5));
+        }
+
+        @Test
+        public void interpolationFactorSmallerThanOrEqualToZeroReturnsStartInstance() {
+            assertSame(BORDER_IMAGE_A, BORDER_IMAGE_A.interpolate(BORDER_IMAGE_B, 0));
+            assertSame(BORDER_IMAGE_A, BORDER_IMAGE_A.interpolate(BORDER_IMAGE_B, -0.5));
+        }
+
+        @Test
+        public void interpolationFactorGreaterThanOrEqualToOneReturnsEndInstance() {
+            assertSame(BORDER_IMAGE_B, BORDER_IMAGE_A.interpolate(BORDER_IMAGE_B, 1));
+            assertSame(BORDER_IMAGE_B, BORDER_IMAGE_A.interpolate(BORDER_IMAGE_B, 1.5));
+        }
+    }
+}
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderStrokeTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderStrokeTest.java
index bf28171e622..6a205655376 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderStrokeTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderStrokeTest.java
@@ -25,8 +25,17 @@
 
 package test.javafx.scene.layout;
 
+import javafx.geometry.Insets;
+import javafx.scene.layout.BorderStroke;
+import javafx.scene.layout.BorderWidths;
+import javafx.scene.layout.CornerRadii;
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
+import static javafx.scene.layout.BorderStrokeStyle.*;
+import static javafx.scene.paint.Color.*;
+import static org.junit.jupiter.api.Assertions.*;
+
 /**
  * Tests for BorderStroke.
  */
@@ -34,4 +43,38 @@ public class BorderStrokeTest {
     // be sure to test the innerEdge and outerEdge, I had bugs there!
     @Test
     public void dummy() { }
+
+    @Nested
+    class InterpolationTests {
+        @Test
+        public void interpolateBetweenDifferentValuesReturnsNewInstance() {
+            var startValue = new BorderStroke(RED, SOLID, new CornerRadii(10), new BorderWidths(5), new Insets(2));
+            var endValue = new BorderStroke(GREEN, DOTTED, new CornerRadii(20), new BorderWidths(15), new Insets(6));
+            var expect = new BorderStroke(RED.interpolate(GREEN, 0.5), DOTTED, new CornerRadii(15), new BorderWidths(10), new Insets(4));
+            assertEquals(expect, startValue.interpolate(endValue, 0.5));
+        }
+
+        @Test
+        public void interpolateBetweenEqualValuesReturnsStartInstance() {
+            var startValue = new BorderStroke(RED, SOLID, new CornerRadii(10), new BorderWidths(5), new Insets(2));
+            var endValue = new BorderStroke(RED, SOLID, new CornerRadii(10), new BorderWidths(5), new Insets(2));
+            assertSame(startValue, startValue.interpolate(endValue, 0.5));
+        }
+
+        @Test
+        public void interpolationFactorSmallerThanOrEqualToZeroReturnsStartInstance() {
+            var startValue = new BorderStroke(RED, SOLID, new CornerRadii(10), new BorderWidths(5), new Insets(2));
+            var endValue = new BorderStroke(GREEN, SOLID, new CornerRadii(20), new BorderWidths(15), new Insets(6));
+            assertSame(startValue, startValue.interpolate(endValue, 0));
+            assertSame(startValue, startValue.interpolate(endValue, -0.5));
+        }
+
+        @Test
+        public void interpolationFactorGreaterThanOrEqualToOneReturnsEndInstance() {
+            var startValue = new BorderStroke(RED, SOLID, new CornerRadii(10), new BorderWidths(5), new Insets(2));
+            var endValue = new BorderStroke(GREEN, SOLID, new CornerRadii(20), new BorderWidths(15), new Insets(6));
+            assertSame(endValue, startValue.interpolate(endValue, 1));
+            assertSame(endValue, startValue.interpolate(endValue, 1.5));
+        }
+    }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderTest.java
index d6f3801d950..a6d505c5bb6 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderTest.java
@@ -26,6 +26,7 @@
 package test.javafx.scene.layout;
 
 import java.lang.reflect.Field;
+import java.util.List;
 import javafx.geometry.Insets;
 import javafx.scene.image.Image;
 import javafx.scene.layout.Border;
@@ -36,14 +37,11 @@
 import javafx.scene.layout.CornerRadii;
 import javafx.scene.paint.Color;
 import javafx.scene.shape.StrokeType;
-import static javafx.scene.layout.BorderRepeat.*;
-
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import static javafx.scene.layout.BorderRepeat.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * Tests for Border.
@@ -638,4 +636,74 @@ public void testSingleStrokeWithNullPaint() {
         var border2 = new Border(new BorderStroke(null, BorderStrokeStyle.SOLID, null, null));
         assertEquals(border2, border1, "The factory method should give the same result as the constructor");
     }
+
+    @Nested
+    class InterpolationTest {
+        @Test
+        public void interpolateBetweenDifferentValuesReturnsNewInstance() {
+            var startValue = new Border(
+                List.of(new BorderStroke(Color.RED, BorderStrokeStyle.SOLID, new CornerRadii(10), new BorderWidths(10)),
+                        new BorderStroke(Color.BLUE, BorderStrokeStyle.SOLID, new CornerRadii(20), new BorderWidths(20))),
+                List.of(new BorderImage(IMAGE_1, new BorderWidths(10), new Insets(5), new BorderWidths(10), false, REPEAT, REPEAT)));
+
+            var endValue = new Border(
+                List.of(new BorderStroke(Color.GREEN, BorderStrokeStyle.SOLID, new CornerRadii(20), new BorderWidths(20)),
+                        new BorderStroke(Color.YELLOW, BorderStrokeStyle.SOLID, new CornerRadii(40), new BorderWidths(40))),
+                List.of(new BorderImage(IMAGE_2, new BorderWidths(30), new Insets(15), new BorderWidths(30), false, REPEAT, REPEAT)));
+
+            var expect = new Border(
+                List.of(new BorderStroke(Color.RED.interpolate(Color.GREEN, 0.5), BorderStrokeStyle.SOLID, new CornerRadii(15), new BorderWidths(15)),
+                        new BorderStroke(Color.BLUE.interpolate(Color.YELLOW, 0.5), BorderStrokeStyle.SOLID, new CornerRadii(30), new BorderWidths(30))),
+                List.of(new BorderImage(IMAGE_2, new BorderWidths(20), new Insets(10), new BorderWidths(20), false, REPEAT, REPEAT)));
+
+            assertEquals(expect, startValue.interpolate(endValue, 0.5));
+        }
+
+        @Test
+        public void interpolateBetweenDifferentNumberOfStrokesAndImages() {
+            var startValue = new Border(
+                List.of(new BorderStroke(Color.RED, BorderStrokeStyle.SOLID, new CornerRadii(10), new BorderWidths(10))),
+                List.of(new BorderImage(IMAGE_1, new BorderWidths(10), new Insets(5), new BorderWidths(10), false, REPEAT, REPEAT)));
+
+            var endValue = new Border(
+                List.of(new BorderStroke(Color.GREEN, BorderStrokeStyle.SOLID, new CornerRadii(20), new BorderWidths(20)),
+                        new BorderStroke(Color.YELLOW, BorderStrokeStyle.SOLID, new CornerRadii(40), new BorderWidths(40))),
+                List.of(new BorderImage(IMAGE_1, new BorderWidths(30), new Insets(15), new BorderWidths(30), false, REPEAT, REPEAT),
+                        new BorderImage(IMAGE_2, new BorderWidths(30), new Insets(15), new BorderWidths(30), false, REPEAT, REPEAT)));
+
+            var expect = new Border(
+                List.of(new BorderStroke(Color.RED.interpolate(Color.GREEN, 0.5), BorderStrokeStyle.SOLID, new CornerRadii(15), new BorderWidths(15)),
+                        new BorderStroke(Color.YELLOW, BorderStrokeStyle.SOLID, new CornerRadii(40), new BorderWidths(40))),
+                List.of(new BorderImage(IMAGE_1, new BorderWidths(20), new Insets(10), new BorderWidths(20), false, REPEAT, REPEAT),
+                        new BorderImage(IMAGE_2, new BorderWidths(30), new Insets(15), new BorderWidths(30), false, REPEAT, REPEAT)));
+
+            var actual = startValue.interpolate(endValue, 0.5);
+
+            assertEquals(expect, actual);
+            assertNotSame(expect, actual);
+        }
+
+        @Test
+        public void interpolateBetweenEqualValuesReturnsStartInstance() {
+            var startValue = new Border(new BorderStroke(Color.RED, BorderStrokeStyle.SOLID, new CornerRadii(10), new BorderWidths(10)));
+            var endValue = new Border(new BorderStroke(Color.RED, BorderStrokeStyle.SOLID, new CornerRadii(10), new BorderWidths(10)));
+            assertSame(startValue, startValue.interpolate(endValue, 0.5));
+        }
+
+        @Test
+        public void interpolationFactorSmallerThanOrEqualToZeroReturnsStartInstance() {
+            var startValue = new Border(new BorderStroke(Color.RED, BorderStrokeStyle.SOLID, new CornerRadii(10), new BorderWidths(10)));
+            var endValue = new Border(new BorderStroke(Color.GREEN, BorderStrokeStyle.SOLID, new CornerRadii(20), new BorderWidths(20)));
+            assertSame(startValue, startValue.interpolate(endValue, 0));
+            assertSame(startValue, startValue.interpolate(endValue, -0.5));
+        }
+
+        @Test
+        public void interpolationFactorGreaterThanOrEqualToOneReturnsEndInstance() {
+            var startValue = new Border(new BorderStroke(Color.RED, BorderStrokeStyle.SOLID, new CornerRadii(10), new BorderWidths(10)));
+            var endValue = new Border(new BorderStroke(Color.GREEN, BorderStrokeStyle.SOLID, new CornerRadii(20), new BorderWidths(20)));
+            assertSame(endValue, startValue.interpolate(endValue, 1));
+            assertSame(endValue, startValue.interpolate(endValue, 1.5));
+        }
+    }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderWidthsTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderWidthsTest.java
index 84a5410c146..686e483bff6 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderWidthsTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderWidthsTest.java
@@ -26,12 +26,10 @@
 package test.javafx.scene.layout;
 
 import javafx.scene.layout.BorderWidths;
-
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * TODO The spec doesn't seem to indicate, but what do we do (if anything) with percentages
@@ -244,4 +242,101 @@ public void noEqualToNull() {
     public void noEqualToRandom() {
         assertFalse(BorderWidths.DEFAULT.equals("Some random value"));
     }
+
+    @Nested
+    class InterpolationTests {
+        @Test
+        public void interpolateComponentWithAbsoluteAndPercentageMismatch() {
+            record TestCase(BorderWidths endValue, BorderWidths expected) {}
+
+            final double v0 = 10, v25 = 12.5, v50 = 15, v100 = 20;
+            final var startValue = new BorderWidths(v0, v0, v0, v0, false, false, false, false);
+
+            // For each component: interpolation with t=0.25 returns start value on absolute/percentage mismatch
+            for (var testCase : new TestCase[] {
+                new TestCase(
+                    new BorderWidths(v100, v100, v100, v100, false, false, false, false),
+                    new BorderWidths(v25, v25, v25, v25, false, false, false, false)),
+                new TestCase(
+                    new BorderWidths(v100, v100, v100, v100, true, false, false, false),
+                    new BorderWidths(v0, v25, v25, v25, false, false, false, false)),
+                new TestCase(
+                    new BorderWidths(v100, v100, v100, v100, false, true, false, false),
+                    new BorderWidths(v25, v0, v25, v25, false, false, false, false)),
+                new TestCase(
+                    new BorderWidths(v100, v100, v100, v100, false, false, true, false),
+                    new BorderWidths(v25, v25, v0, v25, false, false, false, false)),
+                new TestCase(
+                    new BorderWidths(v100, v100, v100, v100, false, false, false, true),
+                    new BorderWidths(v25, v25, v25, v0, false, false, false, false))
+            }) {
+                assertEquals(testCase.expected, startValue.interpolate(testCase.endValue, 0.25));
+            }
+
+            // For each component: interpolation with t=0.5 returns end value on absolute/percentage mismatch
+            for (var testCase : new TestCase[] {
+                new TestCase(
+                    new BorderWidths(v100, v100, v100, v100, false, false, false, false),
+                    new BorderWidths(v50, v50, v50, v50, false, false, false, false)),
+                new TestCase(
+                    new BorderWidths(v100, v100, v100, v100, true, false, false, false),
+                    new BorderWidths(v100, v50, v50, v50, true, false, false, false)),
+                new TestCase(
+                    new BorderWidths(v100, v100, v100, v100, false, true, false, false),
+                    new BorderWidths(v50, v100, v50, v50, false, true, false, false)),
+                new TestCase(
+                    new BorderWidths(v100, v100, v100, v100, false, false, true, false),
+                    new BorderWidths(v50, v50, v100, v50, false, false, true, false)),
+                new TestCase(
+                    new BorderWidths(v100, v100, v100, v100, false, false, false, true),
+                    new BorderWidths(v50, v50, v50, v100, false, false, false, true))
+            }) {
+                assertEquals(testCase.expected, startValue.interpolate(testCase.endValue, 0.5));
+            }
+        }
+
+        @Test
+        public void interpolateReturnsStartOrEndInstanceWhenResultIsEqual() {
+            var startValue = new BorderWidths(10, 20, 30, 40, true, true, true, true);
+            var endValue = new BorderWidths(20, 40, 60, 80, false, false, false, false);
+            assertSame(startValue, startValue.interpolate(endValue, 0.25));
+            assertSame(endValue, startValue.interpolate(endValue, 0.5));
+        }
+
+        @Test
+        public void interpolateBetweenDifferentValuesReturnsNewInstance() {
+            var startValue = new BorderWidths(10, 20, 30, 40, true, false, true, false);
+            var endValue = new BorderWidths(20, 40, 60, 80, true, false, true, false);
+            var expect = new BorderWidths(15, 30, 45, 60, true, false, true, false);
+            var actual = startValue.interpolate(endValue, 0.5);
+            assertEquals(expect, actual);
+            assertNotSame(startValue, actual);
+            assertNotSame(endValue, actual);
+        }
+
+        @Test
+        public void interpolateBetweenEqualValuesReturnsStartInstance() {
+            var startValue = new BorderWidths(10, 20, 30, 40, true, false, true, false);
+            var endValue = new BorderWidths(10, 20, 30, 40, true, false, true, false);
+            assertSame(startValue, startValue.interpolate(endValue, 0.25));
+            assertSame(startValue, startValue.interpolate(endValue, 0.5));
+            assertSame(startValue, startValue.interpolate(endValue, 0.75));
+        }
+
+        @Test
+        public void interpolationFactorSmallerThanOrEqualToZeroReturnsStartInstance() {
+            var startValue = new BorderWidths(10, 20, 30, 40, true, false, true, false);
+            var endValue = new BorderWidths(20, 40, 60, 80, true, false, true, false);
+            assertSame(startValue, startValue.interpolate(endValue, 0));
+            assertSame(startValue, startValue.interpolate(endValue, -1));
+        }
+
+        @Test
+        public void interpolationFactorGreaterThanOrEqualToOneReturnsEndInstance() {
+            var startValue = new BorderWidths(10, 20, 30, 40, true, false, true, false);
+            var endValue = new BorderWidths(20, 40, 60, 80, true, false, true, false);
+            assertSame(endValue, startValue.interpolate(endValue, 1));
+            assertSame(endValue, startValue.interpolate(endValue, 1.5));
+        }
+    }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/CornerRadiiTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/CornerRadiiTest.java
index d14ef889d82..e360255b99f 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/CornerRadiiTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/CornerRadiiTest.java
@@ -61,6 +61,37 @@ public void negativeRadiusNotAllowed_singleConstructor() {
         assertThrows(IllegalArgumentException.class, () -> new CornerRadii(-1));
     }
 
+    @Test
+    public void equality() {
+        for (int i = 0; i < 8; ++i) {
+            double[] r = new double[8];
+            boolean[] p = new boolean[8];
+
+            r[i] = 1;
+            p[i] = true;
+
+            var expected = new CornerRadii(
+                r[0], r[1], r[2], r[3], r[4], r[5], r[6], r[7],
+                p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]);
+
+            var a = new CornerRadii(
+                r[0], r[1], r[2], r[3], r[4], r[5], r[6], r[7],
+                p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]);
+
+            assertEquals(expected, a);
+
+            // change one radius at a time
+            r[i] = 0;
+            p[i] = false;
+
+            var b = new CornerRadii(
+                r[0], r[1], r[2], r[3], r[4], r[5], r[6], r[7],
+                p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]);
+
+            assertNotEquals(expected, b);
+        }
+    }
+
     @Nested
     class IsUniformTests {
         @Test
@@ -123,4 +154,145 @@ public void isUniform_16ArgConstructor() {
             }
         }
     }
+
+    @Nested
+    class InterpolationTests {
+        @Test
+        public void interpolateComponentWithAbsoluteAndPercentageMismatch() {
+            record TestCase(CornerRadii endValue, CornerRadii expected) {}
+
+            final double v0 = 10, v25 = 12.5, v50 = 15, v100 = 20;
+            final var startValue = new CornerRadii(
+                v0, v0, v0, v0, v0, v0, v0, v0, false, false, false, false, false, false, false, false);
+
+            // For each component: interpolation with t=0.25 returns start value on absolute/percentage mismatch.
+            for (var testCase : new TestCase[] {
+                new TestCase(
+                    new CornerRadii(v100, v100, v100, v100, v100, v100, v100, v100, false, false, false, false, false, false, false, false),
+                    new CornerRadii(v25, v25, v25, v25, v25, v25, v25, v25, false, false, false, false, false, false, false, false)),
+                new TestCase(
+                    new CornerRadii(v100, v100, v100, v100, v100, v100, v100, v100, true, false, false, false, false, false, false, false),
+                    new CornerRadii(v0, v25, v25, v25, v25, v25, v25, v25, false, false, false, false, false, false, false, false)),
+                new TestCase(
+                    new CornerRadii(v100, v100, v100, v100, v100, v100, v100, v100, false, true, false, false, false, false, false, false),
+                    new CornerRadii(v25, v0, v25, v25, v25, v25, v25, v25, false, false, false, false, false, false, false, false)),
+                new TestCase(
+                    new CornerRadii(v100, v100, v100, v100, v100, v100, v100, v100, false, false, true, false, false, false, false, false),
+                    new CornerRadii(v25, v25, v0, v25, v25, v25, v25, v25, false, false, false, false, false, false, false, false)),
+                new TestCase(
+                    new CornerRadii(v100, v100, v100, v100, v100, v100, v100, v100, false, false, false, true, false, false, false, false),
+                    new CornerRadii(v25, v25, v25, v0, v25, v25, v25, v25, false, false, false, false, false, false, false, false)),
+                new TestCase(
+                    new CornerRadii(v100, v100, v100, v100, v100, v100, v100, v100, false, false, false, false, true, false, false, false),
+                    new CornerRadii(v25, v25, v25, v25, v0, v25, v25, v25, false, false, false, false, false, false, false, false)),
+                new TestCase(
+                    new CornerRadii(v100, v100, v100, v100, v100, v100, v100, v100, false, false, false, false, false, true, false, false),
+                    new CornerRadii(v25, v25, v25, v25, v25, v0, v25, v25, false, false, false, false, false, false, false, false)),
+                new TestCase(
+                    new CornerRadii(v100, v100, v100, v100, v100, v100, v100, v100, false, false, false, false, false, false, true, false),
+                    new CornerRadii(v25, v25, v25, v25, v25, v25, v0, v25, false, false, false, false, false, false, false, false)),
+                new TestCase(
+                    new CornerRadii(v100, v100, v100, v100, v100, v100, v100, v100, false, false, false, false, false, false, false, true),
+                    new CornerRadii(v25, v25, v25, v25, v25, v25, v25, v0, false, false, false, false, false, false, false, false)),
+            }) {
+                assertEquals(testCase.expected, startValue.interpolate(testCase.endValue, 0.25));
+            }
+
+            // For each component: interpolation with t=0.5 returns end value on absolute/percentage mismatch
+            for (var testCase : new TestCase[] {
+                new TestCase(
+                    new CornerRadii(v100, v100, v100, v100, v100, v100, v100, v100, false, false, false, false, false, false, false, false),
+                    new CornerRadii(v50, v50, v50, v50, v50, v50, v50, v50, false, false, false, false, false, false, false, false)),
+                new TestCase(
+                    new CornerRadii(v100, v100, v100, v100, v100, v100, v100, v100, true, false, false, false, false, false, false, false),
+                    new CornerRadii(v100, v50, v50, v50, v50, v50, v50, v50, true, false, false, false, false, false, false, false)),
+                new TestCase(
+                    new CornerRadii(v100, v100, v100, v100, v100, v100, v100, v100, false, true, false, false, false, false, false, false),
+                    new CornerRadii(v50, v100, v50, v50, v50, v50, v50, v50, false, true, false, false, false, false, false, false)),
+                new TestCase(
+                    new CornerRadii(v100, v100, v100, v100, v100, v100, v100, v100, false, false, true, false, false, false, false, false),
+                    new CornerRadii(v50, v50, v100, v50, v50, v50, v50, v50, false, false, true, false, false, false, false, false)),
+                new TestCase(
+                    new CornerRadii(v100, v100, v100, v100, v100, v100, v100, v100, false, false, false, true, false, false, false, false),
+                    new CornerRadii(v50, v50, v50, v100, v50, v50, v50, v50, false, false, false, true, false, false, false, false)),
+                new TestCase(
+                    new CornerRadii(v100, v100, v100, v100, v100, v100, v100, v100, false, false, false, false, true, false, false, false),
+                    new CornerRadii(v50, v50, v50, v50, v100, v50, v50, v50, false, false, false, false, true, false, false, false)),
+                new TestCase(
+                    new CornerRadii(v100, v100, v100, v100, v100, v100, v100, v100, false, false, false, false, false, true, false, false),
+                    new CornerRadii(v50, v50, v50, v50, v50, v100, v50, v50, false, false, false, false, false, true, false, false)),
+                new TestCase(
+                    new CornerRadii(v100, v100, v100, v100, v100, v100, v100, v100, false, false, false, false, false, false, true, false),
+                    new CornerRadii(v50, v50, v50, v50, v50, v50, v100, v50, false, false, false, false, false, false, true, false)),
+                new TestCase(
+                    new CornerRadii(v100, v100, v100, v100, v100, v100, v100, v100, false, false, false, false, false, false, false, true),
+                    new CornerRadii(v50, v50, v50, v50, v50, v50, v50, v100, false, false, false, false, false, false, false, true)),
+            }) {
+                assertEquals(testCase.expected, startValue.interpolate(testCase.endValue, 0.5));
+            }
+        }
+
+        @Test
+        public void interpolateReturnsStartOrEndInstanceWhenResultIsEqual() {
+            // non-uniform values
+            var startValue = new CornerRadii(10, 20, 30, 40, true);
+            var endValue = new CornerRadii(20, 40, 60, 80, false);
+            assertSame(startValue, startValue.interpolate(endValue, 0.25));
+            assertSame(endValue, startValue.interpolate(endValue, 0.5));
+
+            // uniform values
+            startValue = new CornerRadii(10, true);
+            endValue = new CornerRadii(20, false);
+            assertSame(startValue, startValue.interpolate(endValue, 0.25));
+            assertSame(endValue, startValue.interpolate(endValue, 0.5));
+        }
+
+        @Test
+        public void interpolateBetweenDifferentValuesReturnsNewInstance() {
+            // non-uniform values
+            var startValue = new CornerRadii(10, 20, 30, 40, false);
+            var endValue = new CornerRadii(20, 40, 60, 80, false);
+            var expect = new CornerRadii(15, 30, 45, 60, false);
+            assertEquals(expect, startValue.interpolate(endValue, 0.5));
+
+            // uniform values
+            startValue = new CornerRadii(10, 10, 10, 10, false);
+            endValue = new CornerRadii(20, 20, 20, 20, false);
+            expect = new CornerRadii(15, 15, 15, 15, false);
+            assertEquals(expect, startValue.interpolate(endValue, 0.5));
+        }
+
+        @Test
+        public void interpolateBetweenEqualValuesReturnsStartInstance() {
+            // non-uniform values
+            var startValue = new CornerRadii(10, 20, 30, 40, false);
+            var endValue = new CornerRadii(10, 20, 30, 40, false);
+            assertSame(startValue, startValue.interpolate(endValue, 0.25));
+            assertSame(startValue, startValue.interpolate(endValue, 0.5));
+            assertSame(startValue, startValue.interpolate(endValue, 0.75));
+
+            // uniform values
+            startValue = new CornerRadii(10, 10, 10, 10, false);
+            endValue = new CornerRadii(10, 10, 10, 10, false);
+            assertSame(startValue, startValue.interpolate(endValue, 0.25));
+            assertSame(startValue, startValue.interpolate(endValue, 0.5));
+            assertSame(startValue, startValue.interpolate(endValue, 0.75));
+        }
+
+        @Test
+        public void interpolationFactorSmallerThanOrEqualToZeroReturnsStartInstance() {
+            var startValue = new CornerRadii(10, 20, 30, 40, false);
+            var endValue = new CornerRadii(20, 30, 40, 50, false);
+            assertSame(startValue, startValue.interpolate(endValue, 0));
+            assertSame(startValue, startValue.interpolate(endValue, -1));
+        }
+
+        @Test
+        public void interpolationFactorGreaterThanOrEqualToOneReturnsEndInstance() {
+            var startValue = new CornerRadii(10, 20, 30, 40, false);
+            var endValue = new CornerRadii(20, 30, 40, 50, false);
+            assertSame(endValue, startValue.interpolate(endValue, 1));
+            assertSame(endValue, startValue.interpolate(endValue, 1.5));
+        }
+    }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/ColorTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/ColorTest.java
index 5e72d6121ca..cda1aa2fd2f 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/ColorTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/ColorTest.java
@@ -31,13 +31,11 @@
 import java.util.ArrayList;
 import com.sun.javafx.util.Utils;
 import javafx.scene.paint.Color;
-
+import javafx.scene.paint.Paint;
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class ColorTest {
 
@@ -130,9 +128,9 @@ public void testOfTheWayAll()
 
     @Test
     public void testOfTheWayIndirect() {
-        Interpolatable<Color> start = new Color(0, 0, 0, 0);
+        Interpolatable<Paint> start = new Color(0, 0, 0, 0);
         Color end = new Color(1, 1, 1, 1);
-        Color mid = start.interpolate(end, .5);
+        Color mid = (Color)start.interpolate(end, .5);
         assertEquals(mid.getRed(), .5, 0.0001);
         assertEquals(mid.getGreen(),.5, 0.0001);
         assertEquals(mid.getBlue(), .5, 0.0001);
@@ -1004,6 +1002,39 @@ public void testToStringEquals() {
         assertEquals(color, Color.valueOf(color.toString()));
     }
 
+    @Nested
+    class InterpolationTest {
+        @Test
+        public void interpolateBetweenTwoDifferentValuesReturnsNewInstance() {
+            var startValue = new Color(0.2, 0.4, 0.6, 0.8);
+            var endValue = new Color(0.3, 0.5, 0.7, 0.9);
+            assertEquals(new Color(0.25, 0.45, 0.65, 0.85), startValue.interpolate(endValue, 0.5));
+        }
+
+        @Test
+        public void interpolateBetweenTwoEqualValuesReturnsSameInstance() {
+            var startValue = new Color(0.2, 0.4, 0.6, 0.8);
+            var endValue = new Color(0.2, 0.4, 0.6, 0.8);
+            assertSame(startValue, startValue.interpolate(endValue, 0.5));
+        }
+
+        @Test
+        public void interpolationFactorSmallerThanOrEqualToZeroReturnsStartInstance() {
+            var startValue = new Color(0.2, 0.4, 0.6, 0.8);
+            var endValue = new Color(0.3, 0.5, 0.7, 0.9);
+            assertSame(startValue, startValue.interpolate(endValue, 0));
+            assertSame(startValue, startValue.interpolate(endValue, -1));
+        }
+
+        @Test
+        public void interpolationFactorGreaterThanOrEqualToOneReturnsEndInstance() {
+            var startValue = new Color(0.2, 0.4, 0.6, 0.8);
+            var endValue = new Color(0.3, 0.5, 0.7, 0.9);
+            assertSame(endValue, startValue.interpolate(endValue, 1));
+            assertSame(endValue, startValue.interpolate(endValue, 1.5));
+        }
+    }
+
     //function testOfTheWayHandlesNegatives() {
         // TODO should this be tested? What does it mean?
     //}
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/ImagePatternTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/ImagePatternTest.java
index 88553ea31b8..7218b3827c1 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/ImagePatternTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/ImagePatternTest.java
@@ -27,18 +27,14 @@
 
 import javafx.scene.image.Image;
 import javafx.scene.paint.ImagePattern;
-
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
 import test.com.sun.javafx.pgstub.StubImageLoaderFactory;
 import test.com.sun.javafx.pgstub.StubPlatformImageInfo;
 import test.com.sun.javafx.pgstub.StubToolkit;
 import com.sun.javafx.tk.Toolkit;
 
-import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class ImagePatternTest {
 
@@ -90,5 +86,50 @@ public void testImpl_getPlatformPaint() {
         assertSame(paint, Toolkit.getPaintAccessor().getPlatformPaint(pattern));
     }
 
-
+    @Nested
+    class InterpolationTest {
+        @Test
+        public void interpolateBetweenDifferentValuesReturnsNewInstance() {
+            var image = createImage();
+            var startValue = new ImagePattern(image, 10, 20, 30, 40, false);
+            var endValue = new ImagePattern(image, 20, 30, 40, 50, false);
+            var expected = new ImagePattern(image, 15, 25, 35, 45, false);
+            assertEquals(expected, startValue.interpolate(endValue, 0.5));
+        }
+
+        @Test
+        public void interpolateBetweenProportionalAndNonProportionalReturnsStartInstanceOrEndInstance() {
+            var image = createImage();
+            var startValue = new ImagePattern(image, 10, 20, 30, 40, false);
+            var endValue = new ImagePattern(image, 20, 30, 40, 50, true);
+            assertSame(startValue, startValue.interpolate(endValue, 0));
+            assertSame(endValue, startValue.interpolate(endValue, 0.5));
+        }
+
+        @Test
+        public void interpolateBetweenTwoEqualValuesReturnsStartInstance() {
+            var image = createImage();
+            var startValue = new ImagePattern(image, 10, 20, 30, 40, false);
+            var endValue = new ImagePattern(image, 10, 20, 30, 40, false);
+            assertSame(startValue, startValue.interpolate(endValue, 0.5));
+        }
+
+        @Test
+        public void interpolationFactorSmallerThanOrEqualToZeroReturnsStartInstance() {
+            var image = createImage();
+            var startValue = new ImagePattern(image, 10, 20, 30, 40, false);
+            var endValue = new ImagePattern(image, 20, 30, 40, 50, false);
+            assertSame(startValue, startValue.interpolate(endValue, 0));
+            assertSame(startValue, startValue.interpolate(endValue, -0.5));
+        }
+
+        @Test
+        public void interpolationFactorGreaterThanOrEqualToOneReturnsEndInstance() {
+            var image = createImage();
+            var startValue = new ImagePattern(image, 10, 20, 30, 40, false);
+            var endValue = new ImagePattern(image, 20, 30, 40, 50, false);
+            assertSame(endValue, startValue.interpolate(endValue, 1));
+            assertSame(endValue, startValue.interpolate(endValue, 1.5));
+        }
+    }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/LinearGradientTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/LinearGradientTest.java
index 1933750c571..548297830ea 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/LinearGradientTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/LinearGradientTest.java
@@ -34,15 +34,10 @@
 import javafx.scene.paint.LinearGradient;
 import javafx.scene.paint.Stop;
 import javafx.scene.Scene;
-
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class LinearGradientTest {
 
@@ -468,4 +463,91 @@ public void testCycleMethodCSSStyle() {
         lGradient = (LinearGradient) region.backgroundProperty().get().getFills().get(0).getFill();
         assertEquals(CycleMethod.REPEAT, lGradient.getCycleMethod());
     }
+
+    @Nested
+    class InterpolationTest {
+        @Test
+        public void interpolateBetweenDifferentValuesReturnsNewInstance() {
+            var startValue = new LinearGradient(
+                10, 20, 30, 40,
+                true, CycleMethod.NO_CYCLE,
+                List.of(new Stop(0, Color.BLACK), new Stop(1, Color.WHITE)));
+
+            var endValue = new LinearGradient(
+                20, 40, 60, 80,
+                true, CycleMethod.NO_CYCLE,
+                List.of(new Stop(0, Color.WHITE), new Stop(1, Color.BLACK)));
+
+            var expected = new LinearGradient(
+                15, 30, 45, 60,
+                true, CycleMethod.NO_CYCLE,
+                List.of(new Stop(0, Color.gray(0.5)), new Stop(1, Color.gray(0.5))));
+
+            assertEquals(expected, startValue.interpolate(endValue, 0.5));
+        }
+
+        @Test
+        public void interpolateBetweenProportionalAndNonProportionalReturnsStartValuesOrEndValues() {
+            var startValue = new LinearGradient(
+                10, 20, 30, 40,
+                true, CycleMethod.NO_CYCLE,
+                List.of(new Stop(0, Color.BLUE)));
+
+            var endValue = new LinearGradient(
+                10, 20, 30, 40,
+                false, CycleMethod.NO_CYCLE,
+                List.of(new Stop(0, Color.BLUE)));
+
+            assertSame(startValue, startValue.interpolate(endValue, 0.25));
+            assertSame(endValue, startValue.interpolate(endValue, 0.5));
+            assertSame(endValue, startValue.interpolate(endValue, 0.75));
+        }
+
+        @Test
+        public void interpolateBetweenTwoEqualValuesReturnsStartInstance() {
+            var startValue = new LinearGradient(
+                10, 20, 30, 40,
+                true, CycleMethod.NO_CYCLE,
+                List.of(new Stop(0, Color.BLUE)));
+
+            var endValue = new LinearGradient(
+                10, 20, 30, 40,
+                true, CycleMethod.NO_CYCLE,
+                List.of(new Stop(0, Color.BLUE)));
+
+            assertSame(startValue, startValue.interpolate(endValue, 0.5));
+        }
+
+        @Test
+        public void interpolationFactorSmallerThanOrEqualToZeroReturnsStartInstance() {
+            var startValue = new LinearGradient(
+                10, 20, 30, 40,
+                true, CycleMethod.NO_CYCLE,
+                List.of(new Stop(0, Color.BLUE)));
+
+            var endValue = new LinearGradient(
+                20, 40, 60, 80,
+                true, CycleMethod.NO_CYCLE,
+                List.of(new Stop(0, Color.RED)));
+
+            assertSame(startValue, startValue.interpolate(endValue, 0));
+            assertSame(startValue, startValue.interpolate(endValue, -1));
+        }
+
+        @Test
+        public void interpolationFactorGreaterThanOrEqualToOneReturnsEndInstance() {
+            var startValue = new LinearGradient(
+                10, 20, 30, 40,
+                true, CycleMethod.NO_CYCLE,
+                List.of(new Stop(0, Color.BLUE)));
+
+            var endValue = new LinearGradient(
+                20, 40, 60, 80,
+                true, CycleMethod.NO_CYCLE,
+                List.of(new Stop(0, Color.RED)));
+
+            assertSame(endValue, startValue.interpolate(endValue, 1));
+            assertSame(endValue, startValue.interpolate(endValue, 1.5));
+        }
+    }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/RadialGradientTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/RadialGradientTest.java
index 3ced9380127..c6b9447bcee 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/RadialGradientTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/RadialGradientTest.java
@@ -34,15 +34,10 @@
 import javafx.scene.paint.RadialGradient;
 import javafx.scene.paint.Stop;
 import javafx.scene.Scene;
-
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class RadialGradientTest {
 
@@ -496,4 +491,91 @@ public void testCycleMethodCSSStyle() {
         rGradient = (RadialGradient) region.backgroundProperty().get().getFills().get(0).getFill();
         assertEquals(CycleMethod.REPEAT, rGradient.getCycleMethod());
     }
+
+    @Nested
+    class InterpolationTest {
+        @Test
+        public void interpolateBetweenDifferentValuesReturnsNewInstance() {
+            var startValue = new RadialGradient(
+                10, 20, 30, 40, 50,
+                true, CycleMethod.NO_CYCLE,
+                List.of(new Stop(0, Color.BLACK), new Stop(1, Color.WHITE)));
+
+            var endValue = new RadialGradient(
+                20, 40, 60, 80, 100,
+                true, CycleMethod.NO_CYCLE,
+                List.of(new Stop(0, Color.WHITE), new Stop(1, Color.BLACK)));
+
+            var expected = new RadialGradient(
+                15, 30, 45, 60, 75,
+                true, CycleMethod.NO_CYCLE,
+                List.of(new Stop(0, Color.gray(0.5)), new Stop(1, Color.gray(0.5))));
+
+            assertEquals(expected, startValue.interpolate(endValue, 0.5));
+        }
+
+        @Test
+        public void interpolateBetweenProportionalAndNonProportionalReturnsStartInstanceOrEndInstance() {
+            var startValue = new RadialGradient(
+                10, 20, 30, 40, 50,
+                true, CycleMethod.NO_CYCLE,
+                List.of(new Stop(0, Color.BLUE)));
+
+            var endValue = new RadialGradient(
+                10, 20, 30, 40, 50,
+                false, CycleMethod.NO_CYCLE,
+                List.of(new Stop(0, Color.BLUE)));
+
+            assertSame(startValue, startValue.interpolate(endValue, 0.25));
+            assertSame(endValue, startValue.interpolate(endValue, 0.5));
+            assertSame(endValue, startValue.interpolate(endValue, 0.75));
+        }
+
+        @Test
+        public void interpolateBetweenTwoEqualValuesReturnsStartInstance() {
+            var startValue = new RadialGradient(
+                10, 20, 30, 40, 50,
+                true, CycleMethod.NO_CYCLE,
+                List.of(new Stop(0, Color.BLUE)));
+
+            var endValue = new RadialGradient(
+                10, 20, 30, 40, 50,
+                true, CycleMethod.NO_CYCLE,
+                List.of(new Stop(0, Color.BLUE)));
+
+            assertSame(startValue, startValue.interpolate(endValue, 0.5));
+        }
+
+        @Test
+        public void interpolationFactorSmallerThanOrEqualToZeroReturnsStartInstance() {
+            var startValue = new RadialGradient(
+                10, 20, 30, 40, 50,
+                true, CycleMethod.NO_CYCLE,
+                List.of(new Stop(0, Color.BLUE)));
+
+            var endValue = new RadialGradient(
+                10, 20, 30, 40, 50,
+                true, CycleMethod.NO_CYCLE,
+                List.of(new Stop(0, Color.RED)));
+
+            assertSame(startValue, startValue.interpolate(endValue, 0));
+            assertSame(startValue, startValue.interpolate(endValue, -1));
+        }
+
+        @Test
+        public void interpolationFactorGreaterThanOrEqualToOneReturnsEndInstance() {
+            var startValue = new RadialGradient(
+                10, 20, 30, 40, 50,
+                true, CycleMethod.NO_CYCLE,
+                List.of(new Stop(0, Color.BLUE)));
+
+            var endValue = new RadialGradient(
+                10, 20, 30, 40, 50,
+                true, CycleMethod.NO_CYCLE,
+                List.of(new Stop(0, Color.RED)));
+
+            assertSame(endValue, startValue.interpolate(endValue, 1));
+            assertSame(endValue, startValue.interpolate(endValue, 1.5));
+        }
+    }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/StopListTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/StopListTest.java
index ccd67472184..580bf20d330 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/StopListTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/StopListTest.java
@@ -32,9 +32,11 @@
 import javafx.scene.paint.LinearGradient;
 import javafx.scene.paint.RadialGradient;
 import javafx.scene.paint.Stop;
-
+import javafx.scene.paint.StopShim;
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class StopListTest {
 
@@ -150,4 +152,147 @@ public void testNormalizeStopsNonUnsorted() {
         assertEquals(sortedList, normalize(unordered));
         assertEquals(dupSortedList, normalize(unordereddups));
     }
+
+    @Test
+    public void testInterpolateStop() {
+        assertSame(zerostop, zerostop.interpolate(onestop, -0.5));
+        assertSame(zerostop, zerostop.interpolate(onestop, 0));
+        assertSame(onestop, zerostop.interpolate(onestop, 1));
+        assertSame(onestop, zerostop.interpolate(onestop, 1.5));
+        assertEquals(new Stop(0.5, color2), zerostop.interpolate(onestop, 0.5));
+    }
+
+    @Nested
+    class ListInterpolationTest {
+        @Test
+        public void returnFirstListBeforeInterval() {
+            var firstList = List.of(new Stop(0, color1), new Stop(1, color3));
+            var secondList = List.of(new Stop(0, color3), new Stop(1, color1));
+            assertSame(firstList, StopShim.interpolateLists(firstList, secondList, 0));
+            assertSame(firstList, StopShim.interpolateLists(firstList, secondList, -0.5));
+        }
+
+        @Test
+        public void returnSecondListAfterInterval() {
+            var firstList = List.of(new Stop(0, color1), new Stop(1, color3));
+            var secondList = List.of(new Stop(0, color3), new Stop(1, color1));
+            assertSame(secondList, StopShim.interpolateLists(firstList, secondList, 1));
+            assertSame(secondList, StopShim.interpolateLists(firstList, secondList, 1.5));
+        }
+
+        @Test
+        public void sameSize_sameOffsets() {
+            var firstList = List.of(new Stop(0, color1), new Stop(1, color3));
+            var secondList = List.of(new Stop(0, color3), new Stop(1, color1));
+            var res = StopShim.interpolateLists(firstList, secondList, 0.5);
+            assertEquals(List.of(
+                new Stop(0, color2),
+                new Stop(1, color2)),
+            res);
+        }
+
+        @Test
+        public void sameSize_differentOffsets() {
+            double t = 0.5;
+            var firstList = normalize(List.of(new Stop(0.1, color1), new Stop(0.9, color3)));
+            var secondList = normalize(List.of(new Stop(0.2, color3), new Stop(0.8, color1)));
+            var res = StopShim.interpolateLists(firstList, secondList, t);
+            assertEquals(List.of(
+                new Stop(0, color2),
+                new Stop(0.1, color2),
+                new Stop(0.2, color1.interpolate(color3, 0.125).interpolate(color3, t)),
+                new Stop(0.8, color1.interpolate(color3, 0.875).interpolate(color1, t)),
+                new Stop(0.9, color2),
+                new Stop(1, color2)),
+            res);
+        }
+
+        @Test
+        public void firstListLargerThanSecondList_sameFirstAndLastOffset() {
+            var firstList = normalize(List.of(new Stop(0, color1), new Stop(0.5, color3), new Stop(1, color1)));
+            var secondList = normalize(List.of(new Stop(0, color1), new Stop(1, color3)));
+
+            var expected = List.of(
+                new Stop(0, color1),
+                new Stop(0.5, color2.interpolate(color3, 0.5)),
+                new Stop(1, color2));
+            assertEquals(expected, StopShim.interpolateLists(firstList, secondList, 0.5));
+
+            // An interpolation factor close to zero should yield a stop list very similar to the first list
+            expected = firstList;
+            assertSimilar(expected, StopShim.interpolateLists(firstList, secondList, 0.001));
+
+            // An interpolation factor close to one should yield a stop list very similar to the second list,
+            // but with a different number of stops (3 instead of 2).
+            expected = List.of(new Stop(0, color1), new Stop(0.5, color2), new Stop(1, color3));
+            assertSimilar(expected, StopShim.interpolateLists(firstList, secondList, 0.999));
+        }
+
+        @Test
+        public void firstListSmallerThanSecondList_sameFirstAndLastOffset() {
+            var firstList = normalize(List.of(new Stop(0, color1), new Stop(1, color3)));
+            var secondList = normalize(List.of(new Stop(0, color1), new Stop(0.5, color3), new Stop(1, color1)));
+
+            var expected = List.of(
+                new Stop(0, color1),
+                new Stop(0.5, color2.interpolate(color3, 0.5)),
+                new Stop(1, color2));
+            assertEquals(expected, StopShim.interpolateLists(firstList, secondList, 0.5));
+
+            // An interpolation factor close to zero should yield a stop list very similar to the first list,
+            // but with a different number of stops (3 instead of 2).
+            expected = List.of( new Stop(0, color1), new Stop(0.5, color2), new Stop(1, color3));
+            assertSimilar(expected, StopShim.interpolateLists(firstList, secondList, 0.001));
+
+            // An interpolation factor close to one should yield a stop list very similar to the second list.
+            expected = secondList;
+            assertSimilar(expected, StopShim.interpolateLists(firstList, secondList, 0.999));
+        }
+
+        @Test
+        public void differentSize_differentOffsets() {
+            double t = 0.5;
+            var firstList = normalize(List.of(new Stop(0, color1), new Stop(1, color3)));
+            var secondList = normalize(List.of(new Stop(0.25, color3), new Stop(0.75, color1)));
+            var res = StopShim.interpolateLists(firstList, secondList, t);
+            assertEquals(List.of(
+                new Stop(0, color2),
+                new Stop(0.25, color1.interpolate(color3, 0.25).interpolate(color3, t)),
+                new Stop(0.75, color1.interpolate(color3, 0.75).interpolate(color1, t)),
+                new Stop(1, color2)),
+            res);
+        }
+
+        @Test
+        public void interpolatedVirtualStopIsEqualToExistingStop() {
+            double t = 0.5;
+            var firstList = normalize(List.of(new Stop(0, color1), new Stop(1, color3)));
+            var secondList = normalize(List.of(new Stop(0, color3), new Stop(0.5, color2), new Stop(1, color1)));
+            var res = StopShim.interpolateLists(firstList, secondList, t);
+            assertEquals(List.of(
+                new Stop(0, color2),
+                new Stop(0.5, color2),
+                new Stop(1, color2)),
+            res);
+        }
+
+        private void assertSimilar(List<Stop> a, List<Stop> b) {
+            assertEquals(a.size(), b.size());
+            for (int i = 0; i < a.size(); ++i) {
+                assertSimilar(a.get(i), b.get(i));
+            }
+        }
+
+        private void assertSimilar(Stop a, Stop b) {
+            assertSimilar(a.getColor(), b.getColor());
+            assertTrue(Math.abs(a.getOffset() - b.getOffset()) < 0.1);
+        }
+
+        private void assertSimilar(Color a, Color b) {
+            assertTrue(Math.abs(a.getRed() - b.getRed()) < 0.01);
+            assertTrue(Math.abs(a.getGreen() - b.getGreen()) < 0.01);
+            assertTrue(Math.abs(a.getBlue() - b.getBlue()) < 0.01);
+            assertTrue(Math.abs(a.getOpacity() - b.getOpacity()) < 0.01);
+        }
+    }
 }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/StopTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/StopTest.java
index c2c48e51945..32822c44707 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/StopTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/paint/StopTest.java
@@ -27,12 +27,11 @@
 
 import javafx.scene.paint.Color;
 import javafx.scene.paint.Stop;
-
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import static javafx.scene.paint.Color.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class StopTest {
 
@@ -47,6 +46,12 @@ public void testStop() {
         assertEquals(0.5f, stop.getOffset(), 0.0001);
     }
 
+    @Test
+    public void testNullColorIsTransparent() {
+        var stop = new Stop(0.2f, null);
+        assertEquals(TRANSPARENT, stop.getColor());
+    }
+
     @Test
     public void testEquals() {
         Color color1 = Color.rgb(0xAA, 0xBB, 0xCC);
@@ -56,8 +61,6 @@ public void testEquals() {
         Stop equal = new Stop(0.2f, color1);
         Stop diffColor = new Stop(0.2f, color2);
         Stop diffOffset = new Stop(0.4f, color1);
-        Stop nullColor = new Stop(0.2f, null);
-        Stop nullColor2 = new Stop(0.2f, null);
 
         assertFalse(basic.equals(null));
         assertFalse(basic.equals(new Object()));
@@ -65,8 +68,6 @@ public void testEquals() {
         assertTrue(basic.equals(equal));
         assertFalse(basic.equals(diffColor));
         assertFalse(basic.equals(diffOffset));
-        assertTrue(nullColor.equals(nullColor2));
-        assertFalse(nullColor.equals(basic));
     }
 
     @Test
@@ -101,4 +102,37 @@ public void testToString() {
         assertNotNull(s);
         assertFalse(s.isEmpty());
     }
+
+    @Nested
+    class InterpolationTest {
+        @Test
+        public void interpolateBetweenTwoDifferentValuesReturnsNewInstance() {
+            var startValue = new Stop(0, RED);
+            var endValue = new Stop(1, GREEN);
+            assertEquals(new Stop(0.5, RED.interpolate(GREEN, 0.5)), startValue.interpolate(endValue, 0.5));
+        }
+
+        @Test
+        public void interpolateBetweenTwoEqualValuesReturnsSameInstance() {
+            var startValue = new Stop(0.25, RED);
+            var endValue = new Stop(0.25, RED);
+            assertSame(startValue, startValue.interpolate(endValue, 0.5));
+        }
+
+        @Test
+        public void interpolationFactorSmallerThanOrEqualToZeroReturnsStartInstance() {
+            var startValue = new Stop(0.25, RED);
+            var endValue = new Stop(0.75, GREEN);
+            assertSame(startValue, startValue.interpolate(endValue, 0));
+            assertSame(startValue, startValue.interpolate(endValue, -1));
+        }
+
+        @Test
+        public void interpolationFactorGreaterThanOrEqualToOneReturnsEndInstance() {
+            var startValue = new Stop(0.25, RED);
+            var endValue = new Stop(0.75, GREEN);
+            assertSame(endValue, startValue.interpolate(endValue, 1));
+            assertSame(endValue, startValue.interpolate(endValue, 1.5));
+        }
+    }
 }
diff --git a/tests/manual/graphics/CssTransitionsTest.java b/tests/manual/graphics/CssTransitionsTest.java
index 881f593fc67..5d46c8e6421 100644
--- a/tests/manual/graphics/CssTransitionsTest.java
+++ b/tests/manual/graphics/CssTransitionsTest.java
@@ -47,8 +47,10 @@ public void start(Stage stage) {
         var tab1 = new Tab("transition", new ScrollPane(createTransitionTab()));
         var tab2 = new Tab("transition-delay", new ScrollPane(createTransitionDelayTab()));
         var tab3 = new Tab("transition-timing-function", new ScrollPane(createTransitionTimingFunctionTab()));
+        var tab4 = new Tab("backgrounds", new ScrollPane(createBackgroundTransitionsTab()));
+        var tab5 = new Tab("borders", new ScrollPane(createBorderTransitionsTab()));
 
-        var tabPane = new TabPane(tab1, tab2, tab3);
+        var tabPane = new TabPane(tab1, tab2, tab3, tab4, tab5);
         stage.setScene(new Scene(tabPane));
         stage.setTitle("CSS Transitions");
         stage.show();
@@ -116,6 +118,75 @@ private Region createTransitionTimingFunctionTab() {
             new RectInfo("#rect5", "rect5"));
     }
 
+    private Region createBackgroundTransitionsTab() {
+        return createContent("""
+            .rect {
+              -fx-min-width: 100;
+              -fx-min-height: 50;
+              transition: all 2s;
+            }
+
+            .rect:hover {
+              -fx-min-width: 300;
+            }
+
+            // Color transition
+            #rect1 { -fx-background-color: red; }
+            #rect1:hover { -fx-background-color: blue; }
+
+            // LinearGradient transition
+            #rect2 { -fx-background-color: linear-gradient(to right, red, blue); }
+            #rect2:hover { -fx-background-color: linear-gradient(to right, purple, yellow); }
+
+            // LinearGradient transition with different number of stops
+            #rect3 { -fx-background-color: linear-gradient(to right, red, green); }
+            #rect3:hover { -fx-background-color: linear-gradient(to right, red, yellow, blue); }
+
+            // RadialGradient transition with different number of stops
+            #rect4 { -fx-background-color: radial-gradient(radius 100%, red, green); }
+            #rect4:hover { -fx-background-color: radial-gradient(radius 100%, red, yellow, blue); }
+            """,
+            new RectInfo("#rect1", "rect1"),
+            new RectInfo("#rect2", "rect2"),
+            new RectInfo("#rect3", "rect3"),
+            new RectInfo("#rect4", "rect4"));
+    }
+
+    private Region createBorderTransitionsTab() {
+        return createContent("""
+            .rect {
+              -fx-min-width: 100;
+              -fx-min-height: 50;
+              -fx-border-width: 10;
+              transition: all 2s;
+            }
+
+            .rect:hover {
+              -fx-min-width: 300;
+            }
+
+            // Color transition
+            #rect1 { -fx-border-color: red; }
+            #rect1:hover { -fx-border-color: blue; }
+
+            // LinearGradient transition
+            #rect2 { -fx-border-color: linear-gradient(to right, red, blue); }
+            #rect2:hover { -fx-border-color: linear-gradient(to right, purple, yellow); }
+
+            // LinearGradient transition with different number of stops
+            #rect3 { -fx-border-color: linear-gradient(to right, red, green); }
+            #rect3:hover { -fx-border-color: linear-gradient(to right, red, yellow, blue); }
+
+            // RadialGradient transition with different number of stops
+            #rect4 { -fx-border-color: radial-gradient(radius 100%, red, green); }
+            #rect4:hover { -fx-border-color: radial-gradient(radius 100%, red, yellow, blue); }
+            """,
+            new RectInfo("#rect1", "rect1"),
+            new RectInfo("#rect2", "rect2"),
+            new RectInfo("#rect3", "rect3"),
+            new RectInfo("#rect4", "rect4"));
+    }
+
     private Region createContent(String stylesheet, RectInfo... rects) {
         var text = new Label(stylesheet);
         text.setFont(Font.font("monospace", FontWeight.BOLD, 12));

From 4d3c3661d3d64bf06c3772e3b35b7e2b09fc3f99 Mon Sep 17 00:00:00 2001
From: Kevin Rushforth <kcr@openjdk.org>
Date: Wed, 2 Oct 2024 10:53:25 +0000
Subject: [PATCH 57/75] 8340829: Generated API docs should clearly identify EA
 builds

Reviewed-by: iris, arapte
---
 UPDATING-VERSION.md |  2 --
 build.gradle        | 19 ++++++++++++++++---
 build.properties    |  7 ++++---
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/UPDATING-VERSION.md b/UPDATING-VERSION.md
index 469709e1deb..710b40c3adc 100644
--- a/UPDATING-VERSION.md
+++ b/UPDATING-VERSION.md
@@ -18,8 +18,6 @@ feature version number from `N` to `N+1`:
 
 ```
     jfx.release.major.version
-    javadoc.title
-    javadoc.header
 ```
 
 * In
diff --git a/build.gradle b/build.gradle
index 3020d823788..cde5d1431f6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4464,9 +4464,22 @@ task javadoc(type: Javadoc, dependsOn: createMSPfile) {
     options.addStringOption("Xmaxwarns").setValue("1000")
     options.addStringOption("Xmaxerrs").setValue("1000")
 
-    options.windowTitle("${javadocTitle}")
-    options.header("${javadocHeader}")
-    options.bottom("${javadocBottom}")
+    String draftMsg = IS_MILESTONE_FCS ? "" : "<br><b>DRAFT ${RELEASE_VERSION_LONG}</b>"
+    String javadocTitleImpl = javadocTitle
+            .replaceAll("@JAVADOC_VERSION@", jfxReleaseMajorVersion)
+    String javadocHeaderImpl = javadocHeader
+            .replaceAll("@JAVADOC_VERSION@", jfxReleaseMajorVersion)
+            .replaceAll("@DRAFT_UNLESS_FCS@", draftMsg)
+    String javadocBottomImpl = javadocBottom
+            .replaceAll("@DRAFT_UNLESS_FCS@", draftMsg)
+            .replaceAll("@FULL_VERSION@", RELEASE_VERSION_LONG)
+    options.windowTitle(javadocTitleImpl)
+    options.header(javadocHeaderImpl)
+    options.bottom(javadocBottomImpl)
+    if (!IS_MILESTONE_FCS) {
+        options.addStringOption("top").setValue(javadocTop)
+    }
+
     options.locale("en");
     if (JDK_DOCS_LINK != "") {
         options.linksOffline(JDK_DOCS, JDK_DOCS_LINK);
diff --git a/build.properties b/build.properties
index e99856ab1c0..970bba15201 100644
--- a/build.properties
+++ b/build.properties
@@ -54,10 +54,11 @@ jfx.release.patch.version=0
 #
 ##############################################################################
 
-javadoc.bottom=<small><a href="http://bugreport.java.com/bugreport/">Report a bug or suggest an enhancement</a><br> Copyright &copy; 2008, 2024, Oracle and/or its affiliates. All rights reserved.</small>
+javadoc.bottom=<small><a href="http://bugreport.java.com/bugreport/">Report a bug or suggest an enhancement</a><br> Copyright &copy; 2008, 2024, Oracle and/or its affiliates. All rights reserved.@DRAFT_UNLESS_FCS@<!-- Version @FULL_VERSION@ --></small>
 
-javadoc.title=JavaFX 24
-javadoc.header=JavaFX&nbsp;24
+javadoc.title=JavaFX @JAVADOC_VERSION@
+javadoc.header=<div><strong>JavaFX @JAVADOC_VERSION@@DRAFT_UNLESS_FCS@</strong></div>
+javadoc.top=<div style="padding: 6px; text-align: center; font-size: 80%;">This specification is not final and is subject to change. Use is subject to license terms.</div>
 
 ##############################################################################
 #

From d5432c3e14b06445bc45e34e4aa63ec415c03595 Mon Sep 17 00:00:00 2001
From: Martin Fox <mfox@openjdk.org>
Date: Wed, 2 Oct 2024 18:16:26 +0000
Subject: [PATCH 58/75] 8183521: Unable to type characters with tilde with
 swiss german keyboard layout

Reviewed-by: kcr, angorya
---
 .../src/main/native-glass/win/ViewContainer.cpp               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/javafx.graphics/src/main/native-glass/win/ViewContainer.cpp b/modules/javafx.graphics/src/main/native-glass/win/ViewContainer.cpp
index a20eb9e34b4..97fdce3cfec 100644
--- a/modules/javafx.graphics/src/main/native-glass/win/ViewContainer.cpp
+++ b/modules/javafx.graphics/src/main/native-glass/win/ViewContainer.cpp
@@ -547,8 +547,8 @@ void ViewContainer::HandleViewDeadKeyEvent(HWND hwnd, UINT msg, WPARAM wParam, L
     }
 
     // Since we handle dead keys ourselves, reset the keyboard dead key status (if any)
-    static BYTE kbState[256];
-    ::GetKeyboardState(kbState);
+    BYTE kbState[256] = {};
+    kbState[VK_SPACE] = 0x80;
     WORD ignored;
     ::ToAsciiEx(VK_SPACE, ::MapVirtualKey(VK_SPACE, 0),
             kbState, &ignored, 0, m_kbLayout);

From 6e4d41b61b7efaafdfd9ea3f93cab9b7acb48de9 Mon Sep 17 00:00:00 2001
From: Ambarish Rapte <arapte@openjdk.org>
Date: Fri, 4 Oct 2024 00:19:39 +0000
Subject: [PATCH 59/75] 8341164: Update boot JDK to 23 8341167: Update Gradle
 to 8.10.2

Reviewed-by: kcr, sykora
---
 .github/workflows/submit.yml             |  24 +++++++++++------------
 build.properties                         |   6 +++---
 gradle/wrapper/gradle-wrapper.jar        | Bin 43504 -> 43583 bytes
 gradle/wrapper/gradle-wrapper.properties |   4 ++--
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/submit.yml b/.github/workflows/submit.yml
index 2b2067b6f5c..51c82fc9b40 100644
--- a/.github/workflows/submit.yml
+++ b/.github/workflows/submit.yml
@@ -73,9 +73,9 @@ jobs:
       # BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_FILENAME }}"
       # BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_URL }}"
       # BOOT_JDK_SHA256: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_SHA256 }}"
-      BOOT_JDK_VERSION: "22.0.2"
-      BOOT_JDK_FILENAME: "jdk-22.0.2_linux-x64_bin.tar.gz"
-      BOOT_JDK_URL: "https://download.oracle.com/java/22/archive/jdk-22.0.2_linux-x64_bin.tar.gz"
+      BOOT_JDK_VERSION: "23"
+      BOOT_JDK_FILENAME: "jdk-23_linux-x64_bin.tar.gz"
+      BOOT_JDK_URL: "https://download.oracle.com/java/23/archive/jdk-23_linux-x64_bin.tar.gz"
       ANT_DIR: "apache-ant-1.10.5"
       ANT_FILENAME: "apache-ant-1.10.5.tar.gz"
       ANT_URL: "https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.5-bin.tar.gz"
@@ -155,9 +155,9 @@ jobs:
       # BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_FILENAME }}"
       # BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_URL }}"
       # BOOT_JDK_SHA256: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_SHA256 }}"
-      BOOT_JDK_VERSION: "22.0.2"
-      BOOT_JDK_FILENAME: "jdk-22.0.2_macos-x64_bin.tar.gz"
-      BOOT_JDK_URL: "https://download.oracle.com/java/22/archive/jdk-22.0.2_macos-x64_bin.tar.gz"
+      BOOT_JDK_VERSION: "23"
+      BOOT_JDK_FILENAME: "jdk-23_macos-x64_bin.tar.gz"
+      BOOT_JDK_URL: "https://download.oracle.com/java/23/archive/jdk-23_macos-x64_bin.tar.gz"
       # Disabled due to timeout downloading ant; use ant installed on system
       #ANT_DIR: "apache-ant-1.10.5"
       #ANT_FILENAME: "apache-ant-1.10.5.tar.gz"
@@ -241,9 +241,9 @@ jobs:
       # BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_FILENAME }}"
       # BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_URL }}"
       # BOOT_JDK_SHA256: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_SHA256 }}"
-      BOOT_JDK_VERSION: "22.0.2"
-      BOOT_JDK_FILENAME: "jdk-22.0.2_macos-aarch64_bin.tar.gz"
-      BOOT_JDK_URL: "https://download.oracle.com/java/22/archive/jdk-22.0.2_macos-aarch64_bin.tar.gz"
+      BOOT_JDK_VERSION: "23"
+      BOOT_JDK_FILENAME: "jdk-23_macos-aarch64_bin.tar.gz"
+      BOOT_JDK_URL: "https://download.oracle.com/java/23/archive/jdk-23_macos-aarch64_bin.tar.gz"
       # Disabled due to timeout downloading ant; use ant installed on system
       #ANT_DIR: "apache-ant-1.10.5"
       #ANT_FILENAME: "apache-ant-1.10.5.tar.gz"
@@ -327,9 +327,9 @@ jobs:
       # BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_FILENAME }}"
       # BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_URL }}"
       # BOOT_JDK_SHA256: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_SHA256 }}"
-      BOOT_JDK_VERSION: "22.0.2"
-      BOOT_JDK_FILENAME: "jdk-22.0.2_windows-x64_bin.zip"
-      BOOT_JDK_URL: "https://download.oracle.com/java/22/archive/jdk-22.0.2_windows-x64_bin.zip"
+      BOOT_JDK_VERSION: "23"
+      BOOT_JDK_FILENAME: "jdk-23_windows-x64_bin.zip"
+      BOOT_JDK_URL: "https://download.oracle.com/java/23/archive/jdk-23_windows-x64_bin.zip"
       ANT_DIR: "apache-ant-1.10.5"
       ANT_FILENAME: "apache-ant-1.10.5.tar.gz"
       ANT_URL: "https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.5-bin.tar.gz"
diff --git a/build.properties b/build.properties
index 970bba15201..e4b5a59188f 100644
--- a/build.properties
+++ b/build.properties
@@ -78,8 +78,8 @@ javadoc.top=<div style="padding: 6px; text-align: center; font-size: 80%;">This
 ##############################################################################
 
 # JDK
-jfx.build.jdk.version=22.0.2
-jfx.build.jdk.buildnum=9
+jfx.build.jdk.version=23
+jfx.build.jdk.buildnum=37
 jfx.build.jdk.version.min=21
 jfx.build.jdk.buildnum.min=35
 jfx.jdk.target.version=21
@@ -89,7 +89,7 @@ jfx.jdk.target.version=21
 # gradle/wrapper/gradle-wrapper.properties and should also be recorded in
 # The jfx.gradle.version.min property defines the minimum version of gradle
 # that is supported. It must be <= jfx.gradle.version.
-jfx.gradle.version=8.9
+jfx.gradle.version=8.10.2
 jfx.gradle.version.min=8.5
 
 # Toolchains
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 2c3521197d7c4586c843d1d3e9090525f1898cde..a4b76b9530d66f5e68d973ea569d8e19de379189 100644
GIT binary patch
delta 3990
zcmV;H4{7l5(*nQL0<imge+hUS$8~-~00g*#4w9l|=&;w6Xn{CL9Tq7;wj5rzDMCj?
z9f2iVUIGhpC197?T}Yx`D`_kDO4~Gv(?m*Rxo&H^t&>Kr1kzC=_KMxQY0|W5(lc#i
zH*M1^P4B}|{x<+fkObwl)u#`$GxKKV&3pg*-y6R6txw)0qU|Clf9Uds3x{_-**c=7
z&*)~RHPM>Rw#Hi1R({;bX|7?J@w}DMF>dQQU2}9yj%iLjJ*KD6IEB2^n#gK7M~}6R
zkH+)bc--JU^pV~7W=3{E*4|ZFpDpBa7;wh4_%;?XM-5ZgZNnVJ=vm!%a2CdQb?oTa
z70>8rTb~M$5Tp!Se+4_OKWOB1LF+7gv~$$fGC95ToUM(I>vrd$>9|@h=O?eARj0MH
zT4zo(M>`LWoYvE>pXvqG=d96D-4?VySz~=tPVNyD$XMshoTX(1ZLB5OU!I2OI{kb)
zS8$B8Qm>wLT6diNnyJZC?yp{Kn67S{TCOt-!OonOK7$K)e-13U9GlnQXPAb&SJ0#3
z+vs~+4Qovv(%i8g$I<g6IV^8KCdd<RKNh4Fv`QgAH457E|Iph{%?hoi#vlc0c?0=q
zO^^cAz+ZO+Nug!@wGQso<f_eEw{8_QTJwTshwe#AXBt)~A6D*3*ABaknmz5eS-iR2
z_AyM^x1+k-f0xr7M^JOPy=pHxxF<+=(p_u?RZy_{SU<JGA^Lg4aUE%}M}oAO+7#ME
z_Xui{q6OE;b@o}g9PkDVJAMiaYS8oJ?nDyn1T|Gol#)D#10xhwsGVXE&0&NO!wHSy
z_7n5(9i$HG<nv&!=DA&ZY+IAt`)RvEJJ@~845#0)f1!kBPXuXaNy{#1tz`h|mT+=m
zaO~mR?4sSgJ|Squd>#FCpCG^C4DdyQw3phJ(f#y*pvNDQCRZ~MvW<}fUs~PL=4??j
zmhPyg<*I4RbTz|NHFE-DC7lf2=}-sGkE5e!RM%3ohM7_I^IF=?O{m*u<t91;)H5%X
zOaAs#e;-_twd}kGo9+%T2E>UPH(V?gqyc(Rp?-Qu(3bBIL4Fz(v?=_Sh?L<pq|iP}
z3i3L}6S@S=V2}>bK{nqZMD>#9D_hNhaV$0ef3@9V90|0u#|PUNTO>$F=qRhg1duaE
z0`v~X3G{8RVT@kOa-pU+z8{JWyP6GF*u2e8e<u_=$(U=OZxd6?Gc~wOFg0-e7@u@X
z(7v}u5FfAEeAQVjsWn#NzM7ylNFPRaqC$Ut<=iA_XAP9RwG#pR;fH(T+jn*a2o78?
zMI1d{unl*jb3f<{jMs0B>Kr7a2t1fuqQy)@d|Qn(%YLZ62TWtoX@$n<jG(pE+6|iH
ze+3s?=vv-Sd1i<C%9rqFDP+=kg&i<AZy6Gj7hhliU-(2XL(!#zLJplpG!@1(nhTx%
zm>L}9?atE#Yw`rd(>cr0gY;dT9~^oL;u)zgHUvxc2I*b&ZkGM-iq=&(?kyO(3}=P!
zRp=rErEyMT5UE9GjPHZ#T<c-|d}+-hf5grP><`cnD)jyIL!8P{H@IU#`e8cAG5jMK
zVyKw7--dAC;?-qEu*rMr$5@y535qZ6p(R#+fLA_)G~!wnT~~)|s`}&fA(s6xXN`9j
zP#Fd3GBa#HeS{5&8p?%DKUyN^X9cYUc6vq}D_3xJ&d@=6j(6BZKPl?!k1?!`f3z&a
zR4ZF60Mx7oBxLSxGuzA*Dy5n-d2K=+)6VMZh_0KetK|{e;E{8NJJ!)=_E~1uu=A=r
zrn&gh)h*SFhsQJo!f+wKMIE;-EOaMSMB@aXRU(UcnJhZW^B^mgs|M9@5WF@s6B0p&
zm#CTz)yiQCgURE{%hjxH<q_qse_e2x<s4b}b@0Xdt1olZ&Lz|~2czYE)TC81QE7OV
zCMzXsLQ+ec*^_qRkg8#|JaNo$3|Ad<-Ek+;S!TcvCc|>cJ6G&>G9i`7MyftL!QQd5
z@RflRs?7)99?X`kHNt>W3l7YqscBpi*R2+fsgABor>KVOu(i(`03aytf2UA!&SC9v
z!E}whj#^9~=XHMinFZ;6UOJjo=mmNaWkv~nC=qH9$s-8roGeyaW-E~Sz<!B7#<2W&
zkbaJSUO_SU2~b4Ae8K?p+*LC(&au?IN(n1EA2G&D)zvkHt}}P}b<^c6Cnz+pSQ;=3
zdEJ)Yg$`3R&GIkL+pkK*e@{0MQFxy0w`_eNr{}RN0`SvZx_pXmf^JOxyjz}F7{asp
z@t5gWSo~L!R~BhK05vE4^y|<VfqMYyE=aF%z<!2a1+gqyKyzpxu{D0?Xr+>Z3Gg>j
zZ8}<320rg4=$`M0nxN!w(PtHUjeeU?MvYgWKZ6<ocm16bvwQ(`e^_xsZy}rIct2Qh
ztMbC{3A&@&P4j1eU!gCtUqW-9trjRl>kkzABK;vMN0|U;X9abJleJA(xy<}5h5P(5
z{RzAFPvMnX2m0yH0Jn2Uo-p`daE|(O`YQiC#jB8;6bVIUf?SY(k$#C0`d6qT`>X<j
zjw=c&pa$q~n4b|3e_oE|0R5dHfe`x#+;z#vmY=@C#ga7|q;GOO{S*B&a=~G61CvgG
z{<V^PrH_t`+15F2gyH?~Pz<&yr~4rNCqv~w=)bCy^}(t@{vXJr!o_n}chh4_1(vD1
zoktH3%D`HV?GJ%fO}F$yUKMU%P<P>e0+0}Oj0=F&*D;PVe=Z<=0AGI<6$gYLwa#r`
zm449x*fU;_+J>Mz!wa;T-wldoBB%&OEMJgtm#oaI60TSYCy7;+$5?q!zi5K`u66Wq
zvg)Fx$s`V3Em{=OEY{3lmh_7|08ykS&U9w!kp@Ctuzqe1JFOGz6%i5}Kmm9>^=gih
z?kRxqLA<3@e=}G4R_?phW{4DVr?`tPfyZSN@R=^;P;?!2bh~F1I|fB7P=V=9a6XU5
z<#0f>RS0O&rhc&nTRFOW7&QhevP0#>j0eq<1@D5yAlgMl5n&O9X|Vq}%RX}iNyRFF
z7sX&u#6?E~bm~N|z&YikXC=I0E*8Z$v7PtWfjy)$e_Ez25fnR1Q=q1`;U!~U>|&YS
zaOS8y!^ORmr2<dvL4k+K`{um_5n4I}aW8<6Qkr338d^x^rBQhDZK6jJ4~SkYFdVKt
zZM!gz>L4ik!IYR8@Dcx8MTC=(b4P6iE5CnrbI~7j7DmM8em$!da&D!6Xu)!vKPdLG
z9f#)se|6=5yOCe)N6xDhPI!m81*dNe7u985zi%IV<DfXChy&v7V6xfL=$z)L#@wwt
z0%BO9H|a&_M2HFsh~r=~TRz;5SV58E+`dVm9B8cO23eW~#7Us8TyQ2-x8!Oy91xFj
z@m-^Iua4-)Iim4a^W>fOfJh69+#ag4ELzGne?o`eA`42K4T)h3S+s)5IT97%O>du-
z0U54L8m4}rkRQ?QBfJ%DLssy^+a7A<zfR$+k^eR&+aN7R>jw;0&`NOTY4o;0-ivm9
zBz1C%nr_hQ)X)^QM6T1?=yeLkuG9Lf5<U&Ifi{*FiHESH9__Mdq)2xkFVdFFq)bzM
ze`t~(h!$yEYUov}pS<;r$PL<&N>0(eH}`tFye;01&(p?8i+6h};VV-2B~qdxeC#=X
z(JLlzy&fHkyi9Ksbcs~&r^%lh^2COldLz^H@X!s~mr9Dr6z!j+4?zkD@Ls7F8(t(f
z9`U?P$Lmn*Y{K}aR4N&1N=?xtQ1%jqf1~pJyQ4SgBrEtR`j4lQuh7cqP49Em5cO=I
zB(He2`iPN5M=Y0}h(IU$37ANTGx&|b-u1BYA*#dE(L-lptoOpo&th~E)_)y-`6kSH
z3vvyVrcBwW^_XYReJ=JYd9OBQrzv;f2AQdZH#$Y{Y+Oa33M70XFI((fs;mB4e`<<{
ze4dv2B0V_?Ytsi>>g%qs*}oDGd5d(RNZ*6?7qNbdp7wP4T72=F&r?Ud#kZr8Ze5tB
z_oNb7{G+(<vXFPx)*`+CIJU>o2ajL$!69FW@jjPQ2a5C)m!MKKRirC$_VY<U8zprz
z;q^p@z0qM`Y`8u?-1O5SZ^=S0f23fapPi9f%)kOIw2pS-W*d;6xoyYq&RKh{fP@eB
zdLQid8onF2{4S%j7c(BTT@mT8IGSHzH*NOZzafg-Y+%nuq8qluvD0+*GWk3&U95xd
zZ$R?OOJ(4qSSs7Ns~jEA-=OQM)PAU0EYc?#cQcH;i}?680mytNb%1w<f9c~z`i*J&
zoCMD2FVRZA)bAdjy!H7>IuVQCpf9rIms0GRDf)8AH${I`q^~5rjot<R`UtJ8`0Mq_
zTVIc-%1(L%|0i#~dnkgF-k6CM=`XMH&kQ0|LA>@#3$2#zT2f`(N^P<YQ<rRa(_YyQ
z&_3BF>7Z;6(@EK$q*Jgif00I6*^ZGV+XB5uw*1R-@23yTw&WKD{s1;HTL<p=TE&JK
z^Gn7!6pc;OUtdifh@`Gjh>;dO)%5i#`dc6b7;5@^{KU%N|A-$zsYw4)7LA{3`Zp>1
z-?K9_IE&z)dayUM)wd8K^29m-l$lFhi$zj0l!u~4;VGR6Y!?MAfBC^?QD53hy6VdD
z@<Fjv%_4x4rp1b)Xsqb4{s5aB%q2YRPLc46gingBMNqI;6Ml9p0P<z_sMyG8M_lp$
z6vu_QyC^m{i+fHLMeLf`S`_!n-|nJFBz%owIDdap+~4JG=ngb=D<NM@q9BL}b*DvN
zQ9O8=9$%xZ3A6;Ce?HkA(7N%d;bXOUDBtkRM=7{QY4JY&%w<{|U&DiXci@^xVrY$0
z6o*6pn5QKOAn^{}N_SxL)^kH4f5JOSPPt9opf^*^;>eUZIui}~L%#SmajaRq1J|#>
z4m=o$vZ*34=ZWK2!QMNEcp2Lbc5N1q!lEDq(bz0b;WI9;e>l=CG9^n#ro`w>_0F$Q
zfZ={2<mE4T<&DS;g=mycixFYS_A&T2Pv>QyTkfByC&gy;x!r*NyXXbk=a%~~(#K?<
zTke0HuF5{Q+~?@!KDXR|g+43$+;ab`^flS%miup_0OUTm=nIc%<i2dV9~0fO&n@@U
z;u)!DDK46TA^x`mtB+BgNRmgS(HD}X>d5nLP)i308PIjl_YMF6cpQ__6&$n6it8K-
z8PIjl_YMF6cpQ_!r)L8IivW`WdK8mBs6PXdjR2DYdK8nCs73=4j{uVadK8oNjwX|E
wpAeHLsTu<llK_+9k~foZpAeIasTu=imH?CCk{gpwmKT%SsSpMiod5s;0F!ULw*UYD

delta 3889
zcmV-156<wv)B^C+0<imge+zt5=XE~^NtS#O58D_b9*JUbkR{9J5ipp9)HWnB7LQ^G
zRUjeP(zSg-y4St;3UIQ}ZX?^;ZtL2n4`>^*Y>Trk?aBtSQ(D-o$(D8Px^?ZI-PUB?
z*1fv!{YdHme3Fc8%cR@*@zc5A_nq&2=R4<r9-m+R&Zn;t(I(C@e_c3x_TaWBT88w@
zNyEyvbhl)NTiRPPc7Dvv>7Hp@$-JF4Fz*;SLw5}<j_PhQGiqc`x`n*k(mkx_T%)~Z
zY$Tc2$C9SVFow3@ogLZ?UT0fn|8OCf!-PAkCpQX<HDX$Z;h5G4W=|Q8i?cAltz&b?
zwq({g)$(MBm`NM7e+y2=xZlhfOe<|?q;tg4vpJ*lw4;xW8BS-v<$8K97bHK^(i8eA
zy)&m<Bc1z)P8b<4NOeqgIeTQpaF|x5YV1#`#T`tctbN+b*?N{~O)bV<<z=w0G|psl
z1=l>K^y<lE4A<SOTe>>s-s;V!<r$8p=Q@YM*qO64CvoA<f8FzLhw!?4Ow06kGCdNz
zg}%4cu-4)M-5c$3T_Zn~!}hj^n0&Fehr+a&mTDBF2BsbV550rbq|q{J2ve9A)l-0$
zhbct$@^xF7G+HQME8$LE?OL~C!v?02niniPbVo`#)3iI~u<}T`cF+^l>}b2i=5=M-
zComP?ju>8Fe@=H@rlwe1l`J*6BTTo`9b$zjQ@HxrAhp0D#u?M~TxGC_!?ccCHCjt|
zF*PgJf@kJB`|Ml}cmsyrAjO#Kjr^E5p29w+#>$C`Q|54BoDv$fQ9D?3n32P9LPM<W
z=*)YEse?M@JlL!0rj#DX(UtfhZPIA7xNo89?lK)He_=c0VcJsCax1jfvw(DSEHyhg
zcF1kE(RSJ2&9r!?jzPMIDQLR8<sxC)Nv#X%Ub>Izu?LjNqggOH=1@T{9bMn*u8(GI
z!;M<D7tPp~r<+z(x5mL%(#bU3j_B?)V;C6OsAorqO)DEU&gdC0Hy+(M%{Sf=qMjL{
zT=I92fBN8xVcW^;u<7>LTtFPHal^S>VcJdiYqX0VU|Rn@A}C1xOlxCribxes0~+n2
z6qDaIA2$?e`opx3_KW!rAgbpzU)gFdjAKXh|5w``#F0R|c)Y)Du0_Ihhz^S?k^pk%
zP>9|pIDx)xHH^_~+aA=^$M!<8K~Hy(71nJGf6`HnjtS=4X4=Hk^O71oNia2V{HUCC
zoN3RSBS?<d9l7c>mZCLw;l4W4a+D8qc)XJS`pUJ5X-f^1ytxwr`@si$lAE?{4G|o;
zO0l>`rr?;~c;{ZEFJ!!3=7=FdGJ?Q^xfNQh4A?i;IJ4}B+A?4olTK(fN++3CRBP97
ze~lG9h%oegkn)lpW-4F8o2`*WW0mZHwHez`ko@>U1_;EC_6ig|Drn@=DMV9YEUSCa
zIf$kHei3(u#zm9I!Jf(4t`Vm1lltJ&lVHy(eIXE8sy9sUpmz%I_gA#8x^Zv8%w?r2
z{GdkX1SkzRIr>prRK@rqn9j2wG|rUvf6PJbbin=yy-TAXrguvzN8jL$hUrIXzr^s5
zVM?H4;eM-QeRFr06@ifV(ocvk?_)~N@1c2ien56UjWXid6<wFbYO4An`mpeRM5@Ny
z3+Rl(bU`xgF8Zh#5IvL!n|{2MoS$J@0_^k*xpuDL8B(Fc^sGo&OFzjx`jEidf6S;h
zENTze3V`Ua4kTpnY_(dgG&-f4Jb8UQI;x*CqC<vZMLj)_&_*6PZF-{}tyZ6H4Vz9r
z>W%6ievIh)>dk|rIs##^kY67ib8Kw%#-oVFaXG7$ERyA9(NSJUvWiOA5H(!{uOpcW
zg&-?iqPhds%3%tFspHDqqr;A!e@B#iPQjHd=c>N1LoOEGRehVoPOdxJ>b6>yc#o#+
zl8s8!(|NMeqjsy@0x{8^j0d00SqRZjp{Kj)&4UHYGxG+z9b-)72I*&J70?+8e?p_@
z=>-(>l6z5vYlP~<2%DU02b!mA{7mS)NS_eLe=<xzM?bHjUHTM)uwXrIe<HT;s9Ae%
z=7AZ#2zGQnY>t)sm&+Pmk?asOEKlkPQ)EUvvfC=;4M&*|I!w}(@V_)eUKLA_t^%`o
z0PM9LV|UKTLn<KtS!oVFL)Q?{mT|@_FU$^-=?e7A^ee*ttH|7QwB8Lh$Ak3i&={ey
z4+SMmFH1;#j$T3N&fB6&fAAb~ba_bVrJ^k<<~PyLx%#jQEs@1^*Y_0sQ1Z9v^BTQM
zzbz-Di>k|?M3u!|f2S0?UqZsEIH9*NJS-8lzu;A6-rr-ot=dg9SASoluZUkFH$7X;
zP=?kYX!K?JL-b~<#7wU;b;eS)O;@?h%sPPk{4xEBxb{!sm0AY|f9cNvx6>$3F!*0c
z75H=dy8JvTyO8}g1w{$9T$p~5en}AeSLoCF>_RT9YPMpChUjl310o*$Qocj<cT9{r
z{SUb7yw8~+eM{OAdn8QXmU#Ln`e$U@gLrUCREOwaE9Fi3=+LNRpVo&2-v188V4HG5
z4by)LRQ`khtGXQSf3FJU{{cUGNIWPFFEct{U|ELOdH7(z3amvCe*k&Q@=9;erLneI
zoel2CfCMiPTmYnjjxjV!Ar1h1yQ-31h=b@RZt-play?)#cs=ZxOt;5oX)|*e=7k*A
zSmQ;rO4_`=Z&gX-C2$fitvq+iGK1U*^*#IW!Bo{nON%KSf4GdBHE!bNGq<IJd>bH&
z<S(_vDm{acP-pGGxdurqd6mWyUX2uh=Si>bnwg#gssR#jDVN{uEi3n(PZ%PFZ|6J2
z5_rBf0-u>e4sFe0*Km49ATi7>Kn0f9!uc|rRMR1Dtt6m1LW8^>qFlo}h$@br=Rmpi
z;mI&>OF64Be{dVeHI8utrh)v^wsZ0jii%x8UgZ8TC%K~@I(4E};GFW&(;WVov}3%H
zH;IhRkfD^(vt^DjZz(MyHLZxv8}qzPc(%itBkBwf_fC~sDBgh<3XAv5cxxfF3<2U!
z03Xe&z`is!JDHbe;mNmfkH+_LFE*I2^mdL@7(@9DfAcP6O04V-ko;Rpgp<%Cj5r8Z
zd0`sXoIjV$j)--;jA6Zy^D5&5v$o^>e%>Q?9GLm{i~p^lAn!%ZtF$I~>39XVZxk0b
zROh^Bk9cE0AJBLozZIEmy7xG(yHWGztvf<IsL>nr0(2ro1%>zsGMS^EMu+S$r=_;9
zWwZkgf7Q7`H9sLf2Go^Xy6&h~a&<Ho;zy;ut<fA;NAzP7(RdB{@@`v*GfeSYLv=cf
zmTC<f(3^*m5~o9A&_)%lVDe@XW#mnNpPfZAT#_;^V_zXZWH^UJ6m3LR2*TSwYLLJG
z;HyFY`lD!=7J&u<gT=H2Ir9WY>%s2_T@_Csf19MntF$aVFiFkvE3_hUg(B@&Xw@YJ
zpL$wNYf78=0c@!QU6_a$>CPiXT7QAGDM}7Z(0z#_ZA=fmLUj{2z7@Ypo71UDy8GHr
z-&TLKf6a5WCf@Adl<p1`sp~vxi3mP+969Ibi5ssa2I4Q#TbRyM)c;uurU!iOgN?oM
ze<^x!;41A&r#L=Idnf3_-~s~t7pvI@=dg{%eJ|0G1?Y9wVt#Epor*W6C+T4*d!Awm
zb^e`+t8`2hd<5gi(y5neN#dISS*lO?HcgP9U#UJ~XwDIf)F93nBt8WbF`vY59QLk*
zjStWQJkES{3dVXbto#gSCt&^8;FoX1f1EeKS5FzrmW^76b@AL6+Fv36rN-eY%I&*K
zR=V4tn54HiETzwcx&slvSnPCqYuz){n2ZE`&2>e3VglBt4>Z>;xF}}-S~B7<(%B;Y
z0QR55{z-buw>8ilNM3u6I+D$S%?)(p>=eBx-HpvZj{7c*_?K=d()*7<Jf=Q)f8<;M
z4*62M$T^?hSEP@fhf0ZbkuJj7&!vK5l=QJ~zb`)MPYedy2kVl9jXxdnmn`&r8ut0w
z>q?93us}1dq%FAFYLsW8ZTQ_XZLh`P2*6(NgS}qGcfGXVWpwsp#Rs}IuKbk*`2}&)
zI^Vsk6S&Q4@oYS?dJ`NwMVBs6f57+RxdqVub#PvMu?$=^OJy5xEl0<5SLsSRy%%a0
zi}Y#1-F3m;Ieh#Y12UgW?-R)|eX>ZuF-2cc!1>~NS|XSF-6In>zBoZg+ml!6%fk7U
zw0LHcz8VQk(jOJ+Yu)|^|15ufl$KQd_1eUZZzj`aC%umU6F1&D5XVWce_wAe(qCSZ
zpX-QF4e{EmEVN9~6%<vpg<2Jj(N;yb(@sTq(;h`rv|rJKbWG7>bR5<t(rH-HQL+^+
z(0de>U*UT{eMHfcUo`jw*u?4r<c@DtY>2s_$`}U{?NjvEm(u&<>B|%mq$Q3weshxk
z76<``8vh<Y?d9)(#1EiUf24mYvnG!>{+nX`@9CB6IE&z)I%IFjR^LH{s1p|eppv=x
za(g_jLU|xjWMAn-V7th$<OiF$t|Usi>f({|LG8zzIE0g?cyW;%Dmtv%C+0@xVxPE^
zyZzi9P%JAD6ynwHptuzP`Kox7*9h7XSMonCalv;Md0i9Vb-c*!f0ubfk?&T&T}AHh
z4m8Bz{JllKcdNg?D^%a5MFQ;#1z|*}H^qHLzW)L}wp?2tY7RejtSh8<;Zw)QGJYUm
z|MbTxyj*McKlStlT9I5XlSWtQGN&-LTr2XyNU+`490rg?LYLMRnz-@oKqT1hpCGqP
zyRXt4=_Woj$%n5ee<Hz1AbFV|YT~!y`W4tA4~7zAsyNJf^vES-?=1teP3#7{Ht{2{
zC=voUH1TnKCe;;(nmAjsbbOLWu2)NbnL+~hvk||1!7H!FuTz9Z=mZb3spzBdZJy4k
zu}~SGp(l79#zI$P{0@3vjfKki1^R><3zhLF>5>`?m9a#xQH+Jk_+|RM8Vi;2*XbK-
zEL6sCpaGPzP>k8f4Kh|##_imt#zJMB;ir|JrMPGW`rityK1vHXMLy18%qmMQAm4WZ
zP)i30KR&5vs15)C+8dM66&$k~i|ZT;KR&5vs15)C+8dJ(sAmGPijyIz6_bsqKLSFH
zlOd=TljEpH0>h4zA*dCTK&emy#FCRCs1=i^sZ9bFmXjf<6_X39E(XY)00000#N437

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1f3327fc638..61b1ee3a0ae 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From c0757a2ea5977c062b350335c09dd59671f88df5 Mon Sep 17 00:00:00 2001
From: Martin Fox <mfox@openjdk.org>
Date: Fri, 4 Oct 2024 14:03:46 +0000
Subject: [PATCH 60/75] 8273743: KeyCharacterCombination for "+" does not work
 on US QWERTY keyboard layout

Reviewed-by: angorya, kcr
---
 .../src/main/native-glass/gtk/GlassRobot.cpp  |  11 +-
 .../src/main/native-glass/gtk/glass_key.cpp   | 206 +++++++++++++++++-
 .../src/main/native-glass/gtk/glass_key.h     |   3 +-
 tests/manual/events/KeyboardTest.java         |  16 +-
 4 files changed, 218 insertions(+), 18 deletions(-)

diff --git a/modules/javafx.graphics/src/main/native-glass/gtk/GlassRobot.cpp b/modules/javafx.graphics/src/main/native-glass/gtk/GlassRobot.cpp
index 0ceed46ffa2..d8102485761 100644
--- a/modules/javafx.graphics/src/main/native-glass/gtk/GlassRobot.cpp
+++ b/modules/javafx.graphics/src/main/native-glass/gtk/GlassRobot.cpp
@@ -71,22 +71,17 @@ static void keyButton(jint code, gboolean press)
 {
     Display *xdisplay = gdk_x11_get_default_xdisplay();
     gint gdk_keyval = find_gdk_keyval_for_glass_keycode(code);
-    GdkKeymapKey *keys;
-    gint n_keys;
     if (gdk_keyval == -1) {
         return;
     }
-    gdk_keymap_get_entries_for_keyval(gdk_keymap_get_default(),
-            gdk_keyval, &keys, &n_keys);
-    if (n_keys < 1) {
+    int keycode = find_gdk_keycode_for_keyval(gdk_keyval);
+    if (keycode == -1) {
         return;
     }
-
     XTestFakeKeyEvent(xdisplay,
-                      keys[0].keycode,
+                      keycode,
                       press ? True : False,
                       CurrentTime);
-    g_free(keys);
     XSync(xdisplay, False);
 }
 
diff --git a/modules/javafx.graphics/src/main/native-glass/gtk/glass_key.cpp b/modules/javafx.graphics/src/main/native-glass/gtk/glass_key.cpp
index 832db81899f..a6f1e54b904 100644
--- a/modules/javafx.graphics/src/main/native-glass/gtk/glass_key.cpp
+++ b/modules/javafx.graphics/src/main/native-glass/gtk/glass_key.cpp
@@ -31,9 +31,26 @@
 #include <gdk/gdkkeysyms.h>
 #include <X11/XKBlib.h>
 
+#include <map>
+
 static gboolean key_initialized = FALSE;
+
+// Map from keyval to Java KeyCode
 static GHashTable *keymap;
 
+// There may be more than one mapping from a keyvalue to a Java KeyCode in the
+// keymap. That can produce unpredictable results when a Robot tries to work
+// backward from KeyCode to keyvalue. This map is consulted first to resolve
+// the ambiguity.
+static std::map<jint, guint32> robot_java_to_keyval;
+
+// As the user types we build a map from character to Java KeyCode. We use
+// this map in getKeyCodeForChar which ensures we only reference keys that
+// are on the user's keyboard. GDK calls that query the GdkKeymap are slow
+// (they scan all the maps each time) and can return keys not present on the
+// keyboard.
+static std::map<guint32, jint> char_to_java_code;
+
 static void glass_g_hash_table_insert_int(GHashTable *table, gint key, gint value)
 {
     g_hash_table_insert(table, GINT_TO_POINTER(key), GINT_TO_POINTER(value));
@@ -224,12 +241,42 @@ static void initialize_key()
     glass_g_hash_table_insert_int(keymap, GLASS_GDK_KEY_CONSTANT(F10), com_sun_glass_events_KeyEvent_VK_F10);
     glass_g_hash_table_insert_int(keymap, GLASS_GDK_KEY_CONSTANT(F11), com_sun_glass_events_KeyEvent_VK_F11);
     glass_g_hash_table_insert_int(keymap, GLASS_GDK_KEY_CONSTANT(F12), com_sun_glass_events_KeyEvent_VK_F12);
+
+    // Used by ISO keyboards
+    glass_g_hash_table_insert_int(keymap, GLASS_GDK_KEY_CONSTANT(ISO_Level3_Shift), com_sun_glass_events_KeyEvent_VK_ALT_GRAPH);
+
+    robot_java_to_keyval[com_sun_glass_events_KeyEvent_VK_ENTER]   = GLASS_GDK_KEY_CONSTANT(Return);
+    robot_java_to_keyval[com_sun_glass_events_KeyEvent_VK_CLEAR]   = GLASS_GDK_KEY_CONSTANT(Clear);
+    robot_java_to_keyval[com_sun_glass_events_KeyEvent_VK_PAGE_UP] = GLASS_GDK_KEY_CONSTANT(Page_Up);
+    robot_java_to_keyval[com_sun_glass_events_KeyEvent_VK_END]     = GLASS_GDK_KEY_CONSTANT(End);
+    robot_java_to_keyval[com_sun_glass_events_KeyEvent_VK_HOME]    = GLASS_GDK_KEY_CONSTANT(Home);
+    robot_java_to_keyval[com_sun_glass_events_KeyEvent_VK_LEFT]    = GLASS_GDK_KEY_CONSTANT(Left);
+    robot_java_to_keyval[com_sun_glass_events_KeyEvent_VK_UP]      = GLASS_GDK_KEY_CONSTANT(Up);
+    robot_java_to_keyval[com_sun_glass_events_KeyEvent_VK_RIGHT]   = GLASS_GDK_KEY_CONSTANT(Right);
+    robot_java_to_keyval[com_sun_glass_events_KeyEvent_VK_DOWN]    = GLASS_GDK_KEY_CONSTANT(Down);
+    robot_java_to_keyval[com_sun_glass_events_KeyEvent_VK_DELETE]  = GLASS_GDK_KEY_CONSTANT(Delete);
+    robot_java_to_keyval[com_sun_glass_events_KeyEvent_VK_BACK_SLASH] = GLASS_GDK_KEY_CONSTANT(backslash);
+    // This works on all keyboards, both ISO and ANSI.
+    robot_java_to_keyval[com_sun_glass_events_KeyEvent_VK_ALT_GRAPH]  = GLASS_GDK_KEY_CONSTANT(ISO_Level3_Shift);
+}
+
+static void keys_changed_signal(GdkKeymap* k, gpointer data) {
+    char_to_java_code.clear();
 }
 
 static void init_keymap() {
     if (!key_initialized) {
         initialize_key();
         key_initialized = TRUE;
+
+        GdkKeymap* gdk_keymap = gdk_keymap_get_for_display(gdk_display_get_default());
+
+        // The documented signal emitted when the keyboard layout changes
+        g_signal_connect(G_OBJECT(gdk_keymap), "keys-changed",
+                         G_CALLBACK(keys_changed_signal), nullptr);
+        // On some versions of X11 this is the actual signal emitted
+        g_signal_connect(G_OBJECT(gdk_keymap), "keys_changed",
+                         G_CALLBACK(keys_changed_signal), nullptr);
     }
 }
 
@@ -239,13 +286,29 @@ jint gdk_keyval_to_glass(guint keyval)
     return GPOINTER_TO_INT(g_hash_table_lookup(keymap, GINT_TO_POINTER(keyval)));
 }
 
+// For a given keypress event we update the char => KeyCode map multiple times
+// each with a different shift level encoded in the state argument.
+static void record_character(GdkKeymap *keymap, GdkEventKey *e, guint state, jint javaKeyCode) {
+    guint keyValue;
+
+    if (gdk_keymap_translate_keyboard_state(keymap, e->hardware_keycode,
+                                            static_cast<GdkModifierType>(state), e->group,
+                                            &keyValue, NULL, NULL, NULL)) {
+        guint32 ucs = gdk_keyval_to_unicode(keyValue);
+        if (ucs) {
+            char_to_java_code[ucs] = javaKeyCode;
+        }
+    };
+}
+
 jint get_glass_key(GdkEventKey* e) {
     init_keymap();
 
     guint keyValue;
     guint state = e->state & GDK_MOD2_MASK; //NumLock test
+    GdkKeymap* gdk_keymap = gdk_keymap_get_for_display(gdk_display_get_default());
 
-    gdk_keymap_translate_keyboard_state(gdk_keymap_get_default(),
+    gdk_keymap_translate_keyboard_state(gdk_keymap,
             e->hardware_keycode, static_cast<GdkModifierType>(state), e->group,
             &keyValue, NULL, NULL, NULL);
 
@@ -260,17 +323,34 @@ jint get_glass_key(GdkEventKey* e) {
         kk.keycode = e->hardware_keycode;
         kk.group = kk.level = 0;
 
-        keyValue = gdk_keymap_lookup_key(gdk_keymap_get_default(), &kk);
+        keyValue = gdk_keymap_lookup_key(gdk_keymap, &kk);
 
         key = GPOINTER_TO_INT(g_hash_table_lookup(keymap,
                 GINT_TO_POINTER(keyValue)));
     }
 
+    // If this mapped to a Java code record which characters are
+    // generated at different shift levels.
+    if (key) {
+        // Unshifted and Shift
+        record_character(gdk_keymap, e, state, key);
+        record_character(gdk_keymap, e, (state | GDK_SHIFT_MASK), key);
+        // AltGr and Shift+AltGr
+        record_character(gdk_keymap, e, (state | GDK_MOD5_MASK), key);
+        record_character(gdk_keymap, e, (state | GDK_MOD5_MASK | GDK_SHIFT_MASK), key);
+    }
+
     return key;
 }
 
 gint find_gdk_keyval_for_glass_keycode(jint code) {
     gint result = -1;
+
+    auto i = robot_java_to_keyval.find(code);
+    if (i != robot_java_to_keyval.end()) {
+        return i->second;
+    }
+
     GHashTableIter iter;
     gpointer key, value;
     init_keymap();
@@ -284,6 +364,103 @@ gint find_gdk_keyval_for_glass_keycode(jint code) {
     return result;
 }
 
+static bool keyval_requires_numlock(gint keyval) {
+    switch (keyval) {
+        case GDK_KEY_KP_Equal:
+        case GDK_KEY_KP_Multiply:
+        case GDK_KEY_KP_Add:
+        case GDK_KEY_KP_Subtract:
+        case GDK_KEY_KP_Decimal:
+        case GDK_KEY_KP_Separator:
+        case GDK_KEY_KP_Divide:
+        case GDK_KEY_KP_0:
+        case GDK_KEY_KP_1:
+        case GDK_KEY_KP_2:
+        case GDK_KEY_KP_3:
+        case GDK_KEY_KP_4:
+        case GDK_KEY_KP_5:
+        case GDK_KEY_KP_6:
+        case GDK_KEY_KP_7:
+        case GDK_KEY_KP_8:
+        case GDK_KEY_KP_9:
+            return true;
+        default:
+            return false;
+    }
+}
+
+// This routine is given a set of GdkKeymap entries which can generate a specific keyval
+// and finds the entry that generates that keyval on the correct layout (group) at shift
+// level 0.
+static gint search_keys(GdkKeymap *keymap, GdkKeymapKey *keys, gint n_keys, guint search_keyval, int search_group, bool requires_num_lock) {
+    gint result = -1;
+
+    GdkModifierType state = (GdkModifierType)0;
+    if (requires_num_lock) {
+        state = GDK_MOD2_MASK;
+    }
+    for (gint i = 0; i < n_keys; ++i)
+    {
+        guint keyval = 0;
+        if (gdk_keymap_translate_keyboard_state(keymap, keys[i].keycode, state, search_group,
+                                                &keyval, nullptr, nullptr, nullptr)) {
+            if (keyval == search_keyval) {
+                result = keys[i].keycode;
+                break;
+            }
+        }
+    }
+    return result;
+}
+
+extern "C" {
+    static gint get_current_keyboard_group();
+}
+
+gint find_gdk_keycode_for_keyval(gint keyval) {
+    GdkKeymapKey *keys = nullptr;
+    gint n_keys = 0;
+    GdkKeymap* keymap = gdk_keymap_get_for_display(gdk_display_get_default());
+
+    // The routine get_glass_key assigns a Java KeyCode to a key event. For
+    // the Robot we need to reverse that process.
+    //
+    // GDK assigns different keyvals to upper and lower case letters.
+    // get_glass_key turns off the Shift modifier and uses the lower-case
+    // letter.
+    keyval = gdk_keyval_to_lower(keyval);
+
+    // When looking for a key code on the numeric keypad we have to manually
+    // apply the correct modifier.
+    bool requires_num_lock = keyval_requires_numlock(keyval);
+
+    // Retrieve all the keymap entries that can generate this keyval. This
+    // includes entries on all layouts (groups) and shift levels. It is up
+    // to us to find an entry that's on the current group and at shift level
+    // 0 (which is what get_glass_key uses).
+    if (!gdk_keymap_get_entries_for_keyval(keymap, keyval, &keys, &n_keys)) {
+        return -1;
+    }
+
+    gint group = get_current_keyboard_group();
+    gint result = search_keys(keymap, keys, n_keys, keyval, group, requires_num_lock);
+    if (result < 0 && group != 0) {
+        // Accelerators involving the characters A-Z must work even on
+        // non-Latin layouts. If get_glass_key can't map to a Java key code
+        // on the current layout it switches to layout 0 seeking a Latin
+        // mapping. This is wrong in two ways: layout 0 might not be Latin
+        // and even if it is Latin it should only be used for finding
+        // KeyCodes A-Z. For compatibility this routine continues to use
+        // group 0 but does impose the A-Z restriction.
+        if (keyval >= GDK_KEY_a && keyval <= GDK_KEY_z) {
+            result = search_keys(keymap, keys, n_keys, keyval, 0, requires_num_lock);
+        }
+    }
+
+    g_free(keys);
+    return result;
+}
+
 jint gdk_modifier_mask_to_glass(guint mask)
 {
     jint glass_mask = 0;
@@ -334,6 +511,16 @@ JNIEXPORT jint JNICALL Java_com_sun_glass_ui_gtk_GtkApplication__1getKeyCodeForC
         return com_sun_glass_events_KeyEvent_VK_UNDEFINED;
     }
 
+    auto i = char_to_java_code.find(*ucs_char);
+    if (i != char_to_java_code.end()) {
+        g_free(ucs_char);
+        return i->second;
+    }
+
+    // If we don't find the character in the map fall back to the old logic
+    // for compatibility. It is incorrect because it ignores the keyboard
+    // layout but it can handle characters like space and A-Z on Latin
+    // layouts.
     guint keyval = gdk_unicode_to_keyval(*ucs_char);
 
     if (keyval == (*ucs_char | 0x01000000)) {
@@ -365,6 +552,21 @@ static Bool isXkbAvailable(Display *display) {
     return xkbAvailable;
 }
 
+/*
+  * Determine which keyboard layout is active. This is the group
+  * number in the Xkb state. There is no direct way to query this
+  * in Gdk.
+  */
+ static gint get_current_keyboard_group() {
+     Display* display = gdk_x11_display_get_xdisplay(gdk_display_get_default());
+     if (isXkbAvailable(display)) {
+         XkbStateRec xkbState;
+         XkbGetState(display, XkbUseCoreKbd, &xkbState);
+         return xkbState.group;
+     }
+     return -1;
+ }
+
 /*
  * Class:     com_sun_glass_ui_gtk_GtkApplication
  * Method:    _isKeyLocked
diff --git a/modules/javafx.graphics/src/main/native-glass/gtk/glass_key.h b/modules/javafx.graphics/src/main/native-glass/gtk/glass_key.h
index 1de90ebabe8..9334fa5495c 100644
--- a/modules/javafx.graphics/src/main/native-glass/gtk/glass_key.h
+++ b/modules/javafx.graphics/src/main/native-glass/gtk/glass_key.h
@@ -34,6 +34,5 @@ jint get_glass_key(GdkEventKey* e);
 jint glass_key_to_modifier(jint glassKey);
 jint gdk_modifier_mask_to_glass(guint mask);
 gint find_gdk_keyval_for_glass_keycode(jint code);
-
+gint find_gdk_keycode_for_keyval(gint keyval);
 #endif        /* GLASS_KEY_H */
-
diff --git a/tests/manual/events/KeyboardTest.java b/tests/manual/events/KeyboardTest.java
index aa2ef24a5b3..5f3c6b85b4c 100644
--- a/tests/manual/events/KeyboardTest.java
+++ b/tests/manual/events/KeyboardTest.java
@@ -263,6 +263,7 @@ private void addMiscellaneous() {
                 add(KeyCode.DELETE,     "\u007F");
                 add(KeyCode.ESCAPE,     "\u001B");
                 add(KeyCode.INSERT);
+                add(KeyCode.ALT_GRAPH);
 
                 // Sent twice to toggle off and back on
                 add(KeyCode.NUM_LOCK);
@@ -399,10 +400,6 @@ public static KeyList germanKeys() {
             builder.addCommon();
             builder.addLetters();
 
-            /* Include one combination that involves Option/AltGr */
-            final String altGrSeven = (onMac ? "|" : "{");
-            final String decimalCharacter = (onLinux ? "." : ",");
-
             builder.add(KeyCode.DIGIT0, "0", "=");
             builder.add(KeyCode.DIGIT1, "1", "!");
             builder.add(KeyCode.DIGIT2, "2", DOUBLE_QUOTE);
@@ -428,7 +425,14 @@ public static KeyList germanKeys() {
             builder.add(KeyCode.PERIOD,      ".", ":");
             builder.add(KeyCode.MINUS,       "-", "_");
 
-            builder.add(KeyCode.DECIMAL,     decimalCharacter);
+            // On Linux the German keypad produces a comma and is encoded by
+            // both the OS and JavaFX as SEPARATOR. There is a DECIMAL key but
+            // it doesn't correspond to the physical key on the keyboard.
+            if (onLinux) {
+                builder.add(KeyCode.SEPARATOR, ",");
+            } else {
+                builder.add(KeyCode.DECIMAL, ",");
+            }
 
             builder.addAbsent(KeyCode.COLON);
 
@@ -706,7 +710,7 @@ private void keyTimedOut() {
 
         private static boolean isOnKeypad(KeyCode code) {
             switch (code) {
-                case DIVIDE, MULTIPLY, SUBTRACT, ADD, DECIMAL:
+                case DIVIDE, MULTIPLY, SUBTRACT, ADD, DECIMAL, SEPARATOR:
                 case NUMPAD0, NUMPAD1, NUMPAD2, NUMPAD3, NUMPAD4:
                 case NUMPAD5, NUMPAD6, NUMPAD7, NUMPAD8, NUMPAD9:
                     return true;

From f681302926af291d64982f92f6caf1ead5dd266b Mon Sep 17 00:00:00 2001
From: Kevin Rushforth <kcr@openjdk.org>
Date: Fri, 4 Oct 2024 20:09:20 +0000
Subject: [PATCH 61/75] 8341532: [testbug] Mark QPathTest as unstable on Linux

Reviewed-by: angorya
---
 .../system/src/test/java/test/com/sun/marlin/QPathTest.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/system/src/test/java/test/com/sun/marlin/QPathTest.java b/tests/system/src/test/java/test/com/sun/marlin/QPathTest.java
index 9e8059881bb..0c0f971b1dc 100644
--- a/tests/system/src/test/java/test/com/sun/marlin/QPathTest.java
+++ b/tests/system/src/test/java/test/com/sun/marlin/QPathTest.java
@@ -28,6 +28,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import com.sun.javafx.PlatformUtil;
 import java.util.Locale;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -150,6 +152,10 @@ public static void teardownOnce() {
     @Test
     @Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
     public void TestBug() {
+        if (PlatformUtil.isLinux()) {
+            assumeTrue(Boolean.getBoolean("unstable.test")); // JDK-8328222
+        }
+
         Platform.runLater(() -> {
             SVGPath path = new SVGPath();
             String svgpath = readPath();

From 23e25954f2cbd8dda9afea7f257d22156233894e Mon Sep 17 00:00:00 2001
From: Jose Pereda <jpereda@openjdk.org>
Date: Wed, 9 Oct 2024 08:04:48 +0000
Subject: [PATCH 62/75] 8339068: [Linux] NPE: Cannot read field "firstFont"
 because "<local4>" is null

Reviewed-by: prr
---
 .../java/com/sun/javafx/font/LogicalFont.java |  6 ++++--
 .../sun/javafx/font/freetype/FTFactory.java   | 20 +++++++++++--------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/LogicalFont.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/LogicalFont.java
index 1942e0eeaf0..06916e59928 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/LogicalFont.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/LogicalFont.java
@@ -174,8 +174,10 @@ private LogicalFont(String family, boolean bold, boolean italic) {
         if (PrismFontFactory.isLinux) {
             FontConfigManager.FcCompFont fcCompFont =
                 FontConfigManager.getFontConfigFont(family, bold, italic);
-            physicalFullName = fcCompFont.firstFont.fullName;
-            physicalFileName = fcCompFont.firstFont.fontFile;
+            if (fcCompFont != null) {
+                physicalFullName = fcCompFont.firstFont.fullName;
+                physicalFileName = fcCompFont.firstFont.fontFile;
+            }
         } else {
             physicalFamily = PrismFontFactory.getSystemFont(familyName);
         }
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/freetype/FTFactory.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/freetype/FTFactory.java
index f3e09cbee9d..32063c0f64a 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/freetype/FTFactory.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/freetype/FTFactory.java
@@ -27,6 +27,7 @@
 
 import java.util.ArrayList;
 
+import com.sun.javafx.PlatformUtil;
 import com.sun.javafx.font.FontConfigManager;
 import com.sun.javafx.font.FontFallbackInfo;
 import com.sun.javafx.font.FontResource;
@@ -40,6 +41,7 @@
 public class FTFactory extends PrismFontFactory {
 
     static boolean LCD_SUPPORT;
+    static boolean isLinux = PlatformUtil.isLinux();
 
     public static PrismFontFactory getFactory() {
         PrismFontFactory factory = null;
@@ -129,15 +131,17 @@ public void layout(TextRun run, PGFont font, FontStrike strike, char[] text) {
 
     @Override
     public FontFallbackInfo getFallbacks(FontResource primaryResource) {
-        boolean isBold = primaryResource.isBold();
-        boolean isItalic = primaryResource.isItalic();
-        FontConfigManager.FcCompFont font =
-            FontConfigManager.getFontConfigFont("sans", isBold, isItalic);
-        ArrayList<String> linkedFontFiles = FontConfigManager.getFileNames(font, false);
-        ArrayList<String> linkedFontNames = FontConfigManager.getFontNames(font, false);
         FontFallbackInfo info = new FontFallbackInfo();
-        for (int i=0; i<linkedFontNames.size(); i++)  {
-            info.add(linkedFontNames.get(i), linkedFontFiles.get(i), null);
+        if (isLinux) {
+            boolean isBold = primaryResource.isBold();
+            boolean isItalic = primaryResource.isItalic();
+            FontConfigManager.FcCompFont font =
+                    FontConfigManager.getFontConfigFont("sans", isBold, isItalic);
+            ArrayList<String> linkedFontFiles = FontConfigManager.getFileNames(font, false);
+            ArrayList<String> linkedFontNames = FontConfigManager.getFontNames(font, false);
+            for (int i=0; i<linkedFontNames.size(); i++)  {
+                info.add(linkedFontNames.get(i), linkedFontFiles.get(i), null);
+            }
         }
         return info;
     }

From 1637f77533c11c435a7013e2ad940481beaf8d9e Mon Sep 17 00:00:00 2001
From: Thiago Milczarek Sayao <tsayao@openjdk.org>
Date: Wed, 9 Oct 2024 08:19:26 +0000
Subject: [PATCH 63/75] 8341418: Prism/es2 DrawableInfo is never freed (leak)

Reviewed-by: mstrauss, lkostyra, arapte
---
 .../sun/javafx/tk/quantum/WindowStage.java    | 11 +++-
 .../java/com/sun/prism/es2/ES2SwapChain.java  |  5 ++
 .../java/com/sun/prism/es2/GLDrawable.java    |  4 +-
 .../java/com/sun/prism/es2/IOSGLDrawable.java |  7 +-
 .../java/com/sun/prism/es2/MacGLDrawable.java |  7 ++
 .../com/sun/prism/es2/MonocleGLDrawable.java  |  5 ++
 .../java/com/sun/prism/es2/WinGLDrawable.java |  7 ++
 .../java/com/sun/prism/es2/X11GLDrawable.java |  7 ++
 .../src/main/native-prism-es2/GLDrawable.c    | 66 -------------------
 .../main/native-prism-es2/ios/IOSGLDrawable.c | 22 +++++--
 .../native-prism-es2/macosx/MacGLDrawable.c   | 21 ++++--
 .../native-prism-es2/windows/WinGLDrawable.c  | 25 ++++++-
 .../main/native-prism-es2/x11/X11GLDrawable.c | 23 +++++--
 13 files changed, 123 insertions(+), 87 deletions(-)
 delete mode 100644 modules/javafx.graphics/src/main/native-prism-es2/GLDrawable.c

diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/WindowStage.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/WindowStage.java
index 72afbe26fb3..eef1ce1742b 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/WindowStage.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/WindowStage.java
@@ -287,11 +287,15 @@ StageStyle getStyle() {
             });
         }
         if (oldScene != null) {
-            ViewPainter painter = ((ViewScene)oldScene).getPainter();
-            QuantumRenderer.getInstance().disposePresentable(painter.presentable);   // latched on RT
+            disposeScenePainter((ViewScene) oldScene);
         }
     }
 
+    private static void disposeScenePainter(ViewScene oldScene) {
+        ViewPainter painter = oldScene.getPainter();
+        QuantumRenderer.getInstance().disposePresentable(painter.presentable);   // latched on RT
+    }
+
     @Override public void setBounds(float x, float y, boolean xSet, boolean ySet,
                                     float w, float h, float cw, float ch,
                                     float xGravity, float yGravity,
@@ -792,9 +796,10 @@ public void closePostponed() {
                 }
                 platformWindow = null;
             }
-            GlassScene oldScene = getViewScene();
+            ViewScene oldScene = getViewScene();
             if (oldScene != null) {
                 oldScene.updateSceneState();
+                disposeScenePainter(oldScene);
             }
             return null;
         });
diff --git a/modules/javafx.graphics/src/main/java/com/sun/prism/es2/ES2SwapChain.java b/modules/javafx.graphics/src/main/java/com/sun/prism/es2/ES2SwapChain.java
index c90baec3127..d3142682289 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/prism/es2/ES2SwapChain.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/prism/es2/ES2SwapChain.java
@@ -304,6 +304,11 @@ public void dispose() {
             stableBackbuffer.dispose();
             stableBackbuffer = null;
         }
+
+        if (drawable != null) {
+            drawable.dispose();
+            drawable = null;
+        }
     }
 
     @Override
diff --git a/modules/javafx.graphics/src/main/java/com/sun/prism/es2/GLDrawable.java b/modules/javafx.graphics/src/main/java/com/sun/prism/es2/GLDrawable.java
index 615688c5852..1bae0b55c84 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/prism/es2/GLDrawable.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/prism/es2/GLDrawable.java
@@ -25,7 +25,9 @@
 
 package com.sun.prism.es2;
 
-abstract class GLDrawable {
+import com.sun.prism.GraphicsResource;
+
+abstract class GLDrawable implements GraphicsResource {
 
     final private long nativeWindow;
     final private GLPixelFormat pixelFormat;
diff --git a/modules/javafx.graphics/src/main/java/com/sun/prism/es2/IOSGLDrawable.java b/modules/javafx.graphics/src/main/java/com/sun/prism/es2/IOSGLDrawable.java
index d98a17ab4b7..4c2e1872667 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/prism/es2/IOSGLDrawable.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/prism/es2/IOSGLDrawable.java
@@ -29,10 +29,10 @@
 class IOSGLDrawable extends GLDrawable {
 
     private static native long nCreateDrawable(long nativeWindow, long nativeCtxInfo);
+    private static native void nReleaseDrawable(long nativeCtxInfo);
     private static native long nGetDummyDrawable(long nativeCtxInfo);
     private static native boolean nSwapBuffers(long nativeCtxInfo, long nativeDInfo);
 
-
     IOSGLDrawable(GLPixelFormat pixelFormat) {
 
         super(0L, pixelFormat);
@@ -51,4 +51,9 @@ boolean swapBuffers(GLContext glCtx) {
         return nSwapBuffers(glCtx.getNativeCtxInfo(), getNativeDrawableInfo());
     }
 
+    @Override
+    public void dispose() {
+        nReleaseDrawable(nativeDrawableInfo);
+        nativeDrawableInfo = 0;
+    }
 }
diff --git a/modules/javafx.graphics/src/main/java/com/sun/prism/es2/MacGLDrawable.java b/modules/javafx.graphics/src/main/java/com/sun/prism/es2/MacGLDrawable.java
index 55457ed23b7..fc95f0e105f 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/prism/es2/MacGLDrawable.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/prism/es2/MacGLDrawable.java
@@ -29,6 +29,7 @@
 class MacGLDrawable extends GLDrawable {
 
     private static native long nCreateDrawable(long nativeWindow, long nativeCtxInfo);
+    private static native void nReleaseDrawable(long nativeCtxInfo);
     private static native long nGetDummyDrawable(long nativeCtxInfo);
     private static native boolean nSwapBuffers(long nativeCtxInfo, long nativeDInfo);
 
@@ -49,4 +50,10 @@ class MacGLDrawable extends GLDrawable {
     boolean swapBuffers(GLContext glCtx) {
         return nSwapBuffers(glCtx.getNativeCtxInfo(), getNativeDrawableInfo());
     }
+
+    @Override
+    public void dispose() {
+        nReleaseDrawable(nativeDrawableInfo);
+        nativeDrawableInfo = 0;
+    }
 }
diff --git a/modules/javafx.graphics/src/main/java/com/sun/prism/es2/MonocleGLDrawable.java b/modules/javafx.graphics/src/main/java/com/sun/prism/es2/MonocleGLDrawable.java
index b4f5d880767..d105bbbe0ec 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/prism/es2/MonocleGLDrawable.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/prism/es2/MonocleGLDrawable.java
@@ -67,4 +67,9 @@ boolean swapBuffers(GLContext glCtx) {
         return retval;
 
     }
+
+    @Override
+    public void dispose() {
+        //empty
+    }
 }
diff --git a/modules/javafx.graphics/src/main/java/com/sun/prism/es2/WinGLDrawable.java b/modules/javafx.graphics/src/main/java/com/sun/prism/es2/WinGLDrawable.java
index 742cfafbb6b..d5f5f9c8e59 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/prism/es2/WinGLDrawable.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/prism/es2/WinGLDrawable.java
@@ -29,6 +29,7 @@
 class WinGLDrawable extends GLDrawable {
 
     private static native long nCreateDrawable(long nativeWindow, long nativeCtxInfo);
+    private static native void nReleaseDrawable(long nativeCtxInfo);
     private static native long nGetDummyDrawable(long nativeCtxInfo);
     private static native boolean nSwapBuffers(long nativeDInfo);
 
@@ -50,4 +51,10 @@ class WinGLDrawable extends GLDrawable {
     boolean swapBuffers(GLContext glCtx) {
         return nSwapBuffers(getNativeDrawableInfo());
     }
+
+    @Override
+    public void dispose() {
+        nReleaseDrawable(nativeDrawableInfo);
+        nativeDrawableInfo = 0;
+    }
 }
diff --git a/modules/javafx.graphics/src/main/java/com/sun/prism/es2/X11GLDrawable.java b/modules/javafx.graphics/src/main/java/com/sun/prism/es2/X11GLDrawable.java
index b238b13b773..7413dcd2461 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/prism/es2/X11GLDrawable.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/prism/es2/X11GLDrawable.java
@@ -29,6 +29,7 @@
 class X11GLDrawable extends GLDrawable {
 
     private static native long nCreateDrawable(long nativeWindow, long nativeCtxInfo);
+    private static native void nReleaseDrawable(long nativeCtxInfo);
     private static native long nGetDummyDrawable(long nativeCtxInfo);
     private static native boolean nSwapBuffers(long nativeDInfo);
 
@@ -49,4 +50,10 @@ class X11GLDrawable extends GLDrawable {
     boolean swapBuffers(GLContext glCtx) {
         return nSwapBuffers(getNativeDrawableInfo());
     }
+
+    @Override
+    public void dispose() {
+        nReleaseDrawable(nativeDrawableInfo);
+        nativeDrawableInfo = 0;
+    }
 }
diff --git a/modules/javafx.graphics/src/main/native-prism-es2/GLDrawable.c b/modules/javafx.graphics/src/main/native-prism-es2/GLDrawable.c
deleted file mode 100644
index 20b489f05a3..00000000000
--- a/modules/javafx.graphics/src/main/native-prism-es2/GLDrawable.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * 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.
- */
-
-#include <jni.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-#include <math.h>
-
-#include "PrismES2Defs.h"
-
-void initializeDrawableInfo(DrawableInfo *dInfo)
-{
-    if (dInfo == NULL) {
-        return;
-    }
-    // Initialize structure to all zeros
-    memset(dInfo, 0, sizeof(DrawableInfo));
-}
-
-void deleteDrawableInfo(DrawableInfo *dInfo)
-{
-    if (dInfo == NULL) {
-        return;
-    }
-#ifdef WIN32 /* WIN32 */
-    if ((dInfo->hdc != NULL) && (dInfo->hwnd != NULL)) {
-        ReleaseDC(dInfo->hwnd, dInfo->hdc);
-    }
-#endif
-#ifdef UNIX
-    // This win is pass in from Glass so we most likely don't destroy it
-    /*
-            if (dInfo->display == NULL) {
-                if (dInfo->win != None) {
-                    XDestroyWindow(dInfo->display, dInfo->win);
-                }
-            }
-     */
-#endif
-    // Initialize structure to all zeros
-    memset(dInfo, 0, sizeof (DrawableInfo));
-}
diff --git a/modules/javafx.graphics/src/main/native-prism-es2/ios/IOSGLDrawable.c b/modules/javafx.graphics/src/main/native-prism-es2/ios/IOSGLDrawable.c
index 3a0aa80a9c4..00e2ccb8e3b 100644
--- a/modules/javafx.graphics/src/main/native-prism-es2/ios/IOSGLDrawable.c
+++ b/modules/javafx.graphics/src/main/native-prism-es2/ios/IOSGLDrawable.c
@@ -32,8 +32,6 @@
 #include "PrismES2Defs.h"
 #include "com_sun_prism_es2_IOSGLDrawable.h"
 
-extern void initializeDrawableInfo(DrawableInfo* dInfo);
-
 /*
  * Class:     com_sun_prism_es2_IOSGLDrawable
  * Method:    nCreateDrawable
@@ -52,7 +50,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_prism_es2_IOSGLDrawable_nCreateDrawable
     }
 
     /* initialize the structure */
-    initializeDrawableInfo(dInfo);
+    memset(dInfo, 0, sizeof(DrawableInfo));
 
     dInfo->win = nativeWindow;
     dInfo->onScreen = JNI_TRUE;
@@ -84,7 +82,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_prism_es2_IOSGLDrawable_nGetDummyDrawable
     }
 
     /* initialize the structure */
-    initializeDrawableInfo(dInfo);
+    memset(dInfo, 0, sizeof(DrawableInfo));
 
     dInfo->win = win;
     dInfo->onScreen = JNI_FALSE;
@@ -108,3 +106,19 @@ JNIEXPORT jboolean JNICALL Java_com_sun_prism_es2_IOSGLDrawable_nSwapBuffers
     flushBuffer((void *) (intptr_t) ctxInfo->context);
     return JNI_TRUE;
 }
+
+
+/*
+ * Class:     com_sun_prism_es2_IOSGLDrawable
+ * Method:    nReleaseDrawable
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_com_sun_prism_es2_IOSGLDrawable_nReleaseDrawable
+(JNIEnv *env, jclass class, jlong nativeDInfo) {
+    DrawableInfo *dInfo = (DrawableInfo *) jlong_to_ptr(nativeDInfo);
+    if (dInfo == NULL) {
+        return;
+    }
+
+    free(dInfo);
+}
diff --git a/modules/javafx.graphics/src/main/native-prism-es2/macosx/MacGLDrawable.c b/modules/javafx.graphics/src/main/native-prism-es2/macosx/MacGLDrawable.c
index 48162b55739..bd6002d8945 100644
--- a/modules/javafx.graphics/src/main/native-prism-es2/macosx/MacGLDrawable.c
+++ b/modules/javafx.graphics/src/main/native-prism-es2/macosx/MacGLDrawable.c
@@ -32,8 +32,6 @@
 #include "../PrismES2Defs.h"
 #include "com_sun_prism_es2_MacGLDrawable.h"
 
-extern void initializeDrawableInfo(DrawableInfo *dInfo);
-
 /*
  * Class:     com_sun_prism_es2_MacGLDrawable
  * Method:    nCreateDrawable
@@ -51,7 +49,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_prism_es2_MacGLDrawable_nCreateDrawable
     }
 
     /* initialize the structure */
-    initializeDrawableInfo(dInfo);
+    memset(dInfo, 0, sizeof(DrawableInfo));
 
     dInfo->win = nativeWindow;
     dInfo->onScreen = JNI_TRUE;
@@ -82,7 +80,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_prism_es2_MacGLDrawable_nGetDummyDrawable
     }
 
     /* initialize the structure */
-    initializeDrawableInfo(dInfo);
+    memset(dInfo, 0, sizeof(DrawableInfo));
 
     dInfo->win = win;
     dInfo->onScreen = JNI_FALSE;
@@ -105,3 +103,18 @@ JNIEXPORT jboolean JNICALL Java_com_sun_prism_es2_MacGLDrawable_nSwapBuffers
     flushBuffer((void *) (intptr_t) ctxInfo->context);
     return JNI_TRUE;
 }
+
+/*
+ * Class:     com_sun_prism_es2_MacGLDrawable
+ * Method:    nReleaseDrawable
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_com_sun_prism_es2_MacGLDrawable_nReleaseDrawable
+(JNIEnv *env, jclass class, jlong nativeDInfo) {
+    DrawableInfo *dInfo = (DrawableInfo *) jlong_to_ptr(nativeDInfo);
+    if (dInfo == NULL) {
+        return;
+    }
+
+    free(dInfo);
+}
diff --git a/modules/javafx.graphics/src/main/native-prism-es2/windows/WinGLDrawable.c b/modules/javafx.graphics/src/main/native-prism-es2/windows/WinGLDrawable.c
index cb933c62ef4..28c291ef39b 100644
--- a/modules/javafx.graphics/src/main/native-prism-es2/windows/WinGLDrawable.c
+++ b/modules/javafx.graphics/src/main/native-prism-es2/windows/WinGLDrawable.c
@@ -35,7 +35,6 @@
 
 extern void printAndReleaseResources(HWND hwnd, HGLRC hglrc,
         HDC hdc, LPCTSTR szAppName, char *message);
-extern void initializeDrawableInfo(DrawableInfo *dInfo);
 
 /*
  * Class:     com_sun_prism_es2_WinGLDrawable
@@ -73,7 +72,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_prism_es2_WinGLDrawable_nCreateDrawable
     }
 
     /* initialize the structure */
-    initializeDrawableInfo(dInfo);
+    memset(dInfo, 0, sizeof(DrawableInfo));
 
     dInfo->hdc = hdc;
     dInfo->hwnd = hwnd;
@@ -102,7 +101,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_prism_es2_WinGLDrawable_nGetDummyDrawable
     }
 
     /* initialize the structure */
-    initializeDrawableInfo(dInfo);
+    memset(dInfo, 0, sizeof(DrawableInfo));
 
     // Use the dummyHdc that was already created in the pfInfo
     // since this is an non-onscreen drawable.
@@ -126,3 +125,23 @@ JNIEXPORT jboolean JNICALL Java_com_sun_prism_es2_WinGLDrawable_nSwapBuffers
     }
     return SwapBuffers(dInfo->hdc) ? JNI_TRUE : JNI_FALSE;
 }
+
+
+/*
+ * Class:     com_sun_prism_es2_WinGLDrawable
+ * Method:    nReleaseDrawable
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_com_sun_prism_es2_WinGLDrawable_nReleaseDrawable
+(JNIEnv *env, jclass class, jlong nativeDInfo) {
+    DrawableInfo *dInfo = (DrawableInfo *) jlong_to_ptr(nativeDInfo);
+    if (dInfo == NULL) {
+        return;
+    }
+
+    if ((dInfo->hdc != NULL) && (dInfo->hwnd != NULL)) {
+        ReleaseDC(dInfo->hwnd, dInfo->hdc);
+    }
+
+    free(dInfo);
+}
diff --git a/modules/javafx.graphics/src/main/native-prism-es2/x11/X11GLDrawable.c b/modules/javafx.graphics/src/main/native-prism-es2/x11/X11GLDrawable.c
index 00abb26dd10..4fdba9104af 100644
--- a/modules/javafx.graphics/src/main/native-prism-es2/x11/X11GLDrawable.c
+++ b/modules/javafx.graphics/src/main/native-prism-es2/x11/X11GLDrawable.c
@@ -33,9 +33,6 @@
 #include "../PrismES2Defs.h"
 #include "com_sun_prism_es2_X11GLDrawable.h"
 
-extern void initializeDrawableInfo(DrawableInfo *dInfo);
-extern void deleteDrawableInfo(DrawableInfo *dInfo);
-
 /*
  * Class:     com_sun_prism_es2_X11GLDrawable
  * Method:    nCreateDrawable
@@ -48,6 +45,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_prism_es2_X11GLDrawable_nCreateDrawable
     if (pfInfo == NULL) {
         return 0;
     }
+
     /* allocate the structure */
     dInfo = (DrawableInfo *) malloc(sizeof (DrawableInfo));
     if (dInfo == NULL) {
@@ -56,7 +54,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_prism_es2_X11GLDrawable_nCreateDrawable
     }
 
     /* initialize the structure */
-    initializeDrawableInfo(dInfo);
+    memset(dInfo, 0, sizeof(DrawableInfo));
 
     // Use the dummyWin that was already created in the pfInfo
     // since this is an non-onscreen drawable.
@@ -88,7 +86,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_prism_es2_X11GLDrawable_nGetDummyDrawable
     }
 
     /* initialize the structure */
-    initializeDrawableInfo(dInfo);
+    memset(dInfo, 0, sizeof(DrawableInfo));
 
     // Use the dummyWin that was already created in the pfInfo
     // since this is an non-onscreen drawable.
@@ -113,3 +111,18 @@ JNIEXPORT jboolean JNICALL Java_com_sun_prism_es2_X11GLDrawable_nSwapBuffers
     glXSwapBuffers(dInfo->display, dInfo->win);
     return JNI_TRUE;
 }
+
+/*
+ * Class:     com_sun_prism_es2_X11GLDrawable
+ * Method:    nReleaseDrawable
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_com_sun_prism_es2_X11GLDrawable_nReleaseDrawable
+(JNIEnv *env, jclass class, jlong nativeDInfo) {
+    DrawableInfo *dInfo = (DrawableInfo *) jlong_to_ptr(nativeDInfo);
+    if (dInfo == NULL) {
+        return;
+    }
+
+    free(dInfo);
+}

From ec60af479b824da521b14522c07d814e08dea3e5 Mon Sep 17 00:00:00 2001
From: Martin Fox <mfox@openjdk.org>
Date: Wed, 9 Oct 2024 19:44:24 +0000
Subject: [PATCH 64/75] 8087863: Mac: "Select All" within ListView/TreeView is
 handled differently depending on the useSystemMenuBar value

Reviewed-by: kcr, angorya
---
 .../src/main/java/com/sun/glass/ui/View.java  |  12 +-
 .../com/sun/javafx/scene/SceneHelper.java     |   6 +-
 .../com/sun/javafx/tk/TKSceneListener.java    |   2 +-
 .../tk/quantum/GlassViewEventHandler.java     |  17 +-
 .../src/main/java/javafx/scene/Scene.java     |  15 +-
 .../src/main/native-glass/mac/GlassStatics.h  |   2 +-
 .../src/main/native-glass/mac/GlassStatics.m  |   2 +-
 .../src/main/native-glass/mac/GlassView.m     |   4 +-
 .../src/main/native-glass/mac/GlassView3D.h   |   2 +
 .../src/main/native-glass/mac/GlassView3D.m   |  46 ++--
 .../main/native-glass/mac/GlassViewDelegate.h |   5 +-
 .../main/native-glass/mac/GlassViewDelegate.m |  22 +-
 .../javafx/scene/MenuDoubleShortcutTest.java  | 221 ++++++++++++++++++
 13 files changed, 305 insertions(+), 51 deletions(-)
 create mode 100644 tests/system/src/test/java/test/robot/javafx/scene/MenuDoubleShortcutTest.java

diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/View.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/View.java
index 742cb685e95..5ee833e479b 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/View.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/View.java
@@ -65,8 +65,9 @@ public abstract class View {
     public static class EventHandler {
         public void handleViewEvent(View view, long time, int type) {
         }
-        public void handleKeyEvent(View view, long time, int action,
+        public boolean handleKeyEvent(View view, long time, int action,
                 int keyCode, char[] keyChars, int modifiers) {
+            return false;
         }
         public void handleMenuEvent(View view, int x, int y, int xAbs,
                 int yAbs, boolean isKeyboardTrigger) {
@@ -545,11 +546,12 @@ private void handleViewEvent(long time, int type) {
         }
     }
 
-    private void handleKeyEvent(long time, int action,
+    private boolean handleKeyEvent(long time, int action,
             int keyCode, char[] keyChars, int modifiers) {
         if (shouldHandleEvent()) {
-            this.eventHandler.handleKeyEvent(this, time, action, keyCode, keyChars, modifiers);
+            return this.eventHandler.handleKeyEvent(this, time, action, keyCode, keyChars, modifiers);
         }
+        return false;
     }
 
     private void handleMouseEvent(long time, int type, int button, int x, int y,
@@ -975,6 +977,10 @@ protected void notifyKey(int type, int keyCode, char[] keyChars, int modifiers)
         handleKeyEvent(System.nanoTime(), type, keyCode, keyChars, modifiers);
     }
 
+    protected boolean notifyKeyAndReturnConsumed(int type, int keyCode, char[] keyChars, int modifiers) {
+        return handleKeyEvent(System.nanoTime(), type, keyCode, keyChars, modifiers);
+    }
+
     protected void notifyInputMethod(String text, int[] clauseBoundary,
         int[] attrBoundary, byte[] attrValue,
         int committedTextLength, int caretPos, int visiblePos) {
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/SceneHelper.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/SceneHelper.java
index 3303d1826f8..e2a44a1dce1 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/SceneHelper.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/SceneHelper.java
@@ -53,8 +53,8 @@ public static void enableInputMethodEvents(Scene scene, boolean enable) {
         sceneAccessor.enableInputMethodEvents(scene, enable);
     }
 
-    public static void processKeyEvent(Scene scene, KeyEvent e) {
-        sceneAccessor.processKeyEvent(scene, e);
+    public static boolean processKeyEvent(Scene scene, KeyEvent e) {
+        return sceneAccessor.processKeyEvent(scene, e);
     }
 
     public static void processMouseEvent(Scene scene, MouseEvent e) {
@@ -118,7 +118,7 @@ public static SceneAccessor getSceneAccessor() {
     public interface SceneAccessor {
         void enableInputMethodEvents(Scene scene, boolean enable);
 
-        void processKeyEvent(Scene scene, KeyEvent e);
+        boolean processKeyEvent(Scene scene, KeyEvent e);
 
         void processMouseEvent(Scene scene, MouseEvent e);
 
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/TKSceneListener.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/TKSceneListener.java
index 348cc8527a8..116bff3d590 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/TKSceneListener.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/TKSceneListener.java
@@ -64,7 +64,7 @@ public void mouseEvent(EventType<MouseEvent> type, double x, double y, double sc
     /**
      * Pass a key event to the scene to handle
      */
-    public void keyEvent(KeyEvent keyEvent);
+    public boolean keyEvent(KeyEvent keyEvent);
 
     /**
      * Pass an input method event to the scene to handle
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/GlassViewEventHandler.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/GlassViewEventHandler.java
index 66003b735ab..a263853789e 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/GlassViewEventHandler.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/GlassViewEventHandler.java
@@ -147,7 +147,7 @@ private static EventType<javafx.scene.input.KeyEvent> keyEventType(int glassType
     }
 
     private final KeyEventNotification keyNotification = new KeyEventNotification();
-    private class KeyEventNotification implements PrivilegedAction<Void> {
+    private class KeyEventNotification implements PrivilegedAction<Boolean> {
         View view;
         long time;
         int type;
@@ -158,11 +158,12 @@ private class KeyEventNotification implements PrivilegedAction<Void> {
         private KeyCode lastKeyCode;
 
         @Override
-        public Void run() {
+        public Boolean run() {
             if (PULSE_LOGGING_ENABLED) {
                 PulseLogger.newInput(keyEventType(type).toString());
             }
             WindowStage stage = scene.getWindowStage();
+            Boolean consumed = false;
             try {
                 boolean shiftDown = (modifiers & KeyEvent.MODIFIER_SHIFT) != 0;
                 boolean controlDown = (modifiers & KeyEvent.MODIFIER_CONTROL) != 0;
@@ -215,7 +216,7 @@ public Void run() {
                             }
                         }
                         if (scene.sceneListener != null) {
-                            scene.sceneListener.keyEvent(keyEvent);
+                            consumed = scene.sceneListener.keyEvent(keyEvent);
                         }
                         break;
                     default:
@@ -231,13 +232,14 @@ public Void run() {
                     PulseLogger.newInput(null);
                 }
             }
-            return null;
+            return consumed;
         }
     }
 
     @SuppressWarnings("removal")
-    @Override public void handleKeyEvent(View view, long time, int type, int key,
-                                         char[] chars, int modifiers)
+    @Override
+    public boolean handleKeyEvent(View view, long time, int type, int key,
+                                  char[] chars, int modifiers)
     {
         keyNotification.view = view;
         keyNotification.time = time;
@@ -246,9 +248,10 @@ public Void run() {
         keyNotification.chars = chars;
         keyNotification.modifiers = modifiers;
 
-        QuantumToolkit.runWithoutRenderLock(() -> {
+        boolean consumed = QuantumToolkit.runWithoutRenderLock(() -> {
             return AccessController.doPrivileged(keyNotification, scene.getAccessControlContext());
         });
+        return consumed;
     }
 
     private static EventType<javafx.scene.input.MouseEvent> mouseEventType(int glassType) {
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java b/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java
index 94ddcda3563..d9f2a0acd9a 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java
@@ -35,6 +35,7 @@
 import com.sun.javafx.css.StyleManager;
 import com.sun.javafx.cursor.CursorFrame;
 import com.sun.javafx.event.EventQueue;
+import com.sun.javafx.event.EventUtil;
 import com.sun.javafx.geom.PickRay;
 import com.sun.javafx.geom.Vec3d;
 import com.sun.javafx.geom.transform.BaseTransform;
@@ -399,8 +400,8 @@ public void enableInputMethodEvents(Scene scene, boolean enable) {
                         }
 
                         @Override
-                        public void processKeyEvent(Scene scene, KeyEvent e) {
-                            scene.processKeyEvent(e);
+                        public boolean processKeyEvent(Scene scene, KeyEvent e) {
+                            return scene.processKeyEvent(e);
                         }
 
                         @Override
@@ -2181,7 +2182,7 @@ private void focusIneligible(Node node) {
         traverse(node, Direction.NEXT, TraversalMethod.DEFAULT);
     }
 
-    void processKeyEvent(KeyEvent e) {
+    boolean processKeyEvent(KeyEvent e) {
         if (dndGesture != null) {
             if (!dndGesture.processKey(e)) {
                 dndGesture = null;
@@ -2192,9 +2193,11 @@ void processKeyEvent(KeyEvent e) {
         final EventTarget eventTarget =
                 (sceneFocusOwner != null && sceneFocusOwner.getScene() == Scene.this) ? sceneFocusOwner : Scene.this;
 
+        if (eventTarget == null) return false;
+
         // send the key event to the current focus owner or to scene if
         // the focus owner is not set
-        Event.fireEvent(eventTarget, e);
+        return EventUtil.fireEvent(eventTarget, e) == null;
     }
 
     void requestFocus(Node node, boolean focusVisible) {
@@ -2713,9 +2716,9 @@ public void mouseEvent(EventType<MouseEvent> type, double x, double y, double sc
 
 
         @Override
-        public void keyEvent(KeyEvent keyEvent)
+        public boolean keyEvent(KeyEvent keyEvent)
         {
-            processKeyEvent(keyEvent);
+            return processKeyEvent(keyEvent);
         }
 
         @Override
diff --git a/modules/javafx.graphics/src/main/native-glass/mac/GlassStatics.h b/modules/javafx.graphics/src/main/native-glass/mac/GlassStatics.h
index 8cd59c221b8..ab56a787a5f 100644
--- a/modules/javafx.graphics/src/main/native-glass/mac/GlassStatics.h
+++ b/modules/javafx.graphics/src/main/native-glass/mac/GlassStatics.h
@@ -61,7 +61,7 @@ extern jmethodID jWindowNotifyDelegatePtr;
 extern jmethodID jViewNotifyEvent;
 extern jmethodID jViewNotifyRepaint;
 extern jmethodID jViewNotifyResize;
-extern jmethodID jViewNotifyKey;
+extern jmethodID jViewNotifyKeyAndReturnConsumed;
 extern jmethodID jViewNotifyMouse;
 extern jmethodID jViewNotifyMenu;
 extern jmethodID jViewNotifyInputMethod;
diff --git a/modules/javafx.graphics/src/main/native-glass/mac/GlassStatics.m b/modules/javafx.graphics/src/main/native-glass/mac/GlassStatics.m
index 740ec0c98b1..e5d0a4765bb 100644
--- a/modules/javafx.graphics/src/main/native-glass/mac/GlassStatics.m
+++ b/modules/javafx.graphics/src/main/native-glass/mac/GlassStatics.m
@@ -63,7 +63,7 @@
 jmethodID jViewNotifyEvent = NULL;
 jmethodID jViewNotifyRepaint = NULL;
 jmethodID jViewNotifyResize = NULL;
-jmethodID jViewNotifyKey = NULL;
+jmethodID jViewNotifyKeyAndReturnConsumed= NULL;
 jmethodID jViewNotifyMouse = NULL;
 jmethodID jViewNotifyMenu = NULL;
 jmethodID jViewNotifyInputMethod = NULL;
diff --git a/modules/javafx.graphics/src/main/native-glass/mac/GlassView.m b/modules/javafx.graphics/src/main/native-glass/mac/GlassView.m
index b89e5586218..b514872db8b 100644
--- a/modules/javafx.graphics/src/main/native-glass/mac/GlassView.m
+++ b/modules/javafx.graphics/src/main/native-glass/mac/GlassView.m
@@ -106,9 +106,9 @@
         if ((*env)->ExceptionCheck(env)) return;
     }
 
-    if (jViewNotifyKey == NULL)
+    if (jViewNotifyKeyAndReturnConsumed == NULL)
     {
-        jViewNotifyKey = (*env)->GetMethodID(env, jViewClass, "notifyKey", "(II[CI)V");
+        jViewNotifyKeyAndReturnConsumed = (*env)->GetMethodID(env, jViewClass, "notifyKeyAndReturnConsumed", "(II[CI)Z");
         if ((*env)->ExceptionCheck(env)) return;
     }
 
diff --git a/modules/javafx.graphics/src/main/native-glass/mac/GlassView3D.h b/modules/javafx.graphics/src/main/native-glass/mac/GlassView3D.h
index 4db98785d9a..317c90c9bdc 100644
--- a/modules/javafx.graphics/src/main/native-glass/mac/GlassView3D.h
+++ b/modules/javafx.graphics/src/main/native-glass/mac/GlassView3D.h
@@ -53,6 +53,8 @@
     BOOL handlingKeyEvent;
     BOOL didCommitText;
     BOOL isHiDPIAware;
+
+    NSEvent *lastKeyEvent;
 }
 
 - (id)initWithFrame:(NSRect)frame withJview:(jobject)jView withJproperties:(jobject)jproperties;
diff --git a/modules/javafx.graphics/src/main/native-glass/mac/GlassView3D.m b/modules/javafx.graphics/src/main/native-glass/mac/GlassView3D.m
index 3d3b4584c92..0d2f98185c8 100644
--- a/modules/javafx.graphics/src/main/native-glass/mac/GlassView3D.m
+++ b/modules/javafx.graphics/src/main/native-glass/mac/GlassView3D.m
@@ -247,6 +247,8 @@ - (id)initWithFrame:(NSRect)frame withJview:(jobject)jView withJproperties:(jobj
         self->imEnabled = NO;
         self->handlingKeyEvent = NO;
         self->didCommitText = NO;
+
+        lastKeyEvent = nil;
     }
     return self;
 }
@@ -274,6 +276,9 @@ - (void)dealloc
     [self->nsAttrBuffer release];
     self->nsAttrBuffer = nil;
 
+    [lastKeyEvent release];
+    lastKeyEvent = nil;
+
     [super dealloc];
 }
 
@@ -461,7 +466,6 @@ - (void)scrollWheel:(NSEvent *)theEvent
 - (BOOL)performKeyEquivalent:(NSEvent *)theEvent
 {
     KEYLOG("performKeyEquivalent");
-    [GlassApplication registerKeyEvent:theEvent];
 
     // Crash if the FS window is released while performing a key equivalent
     // Local copy of the id keeps the retain/release calls balanced.
@@ -484,13 +488,13 @@ - (BOOL)performKeyEquivalent:(NSEvent *)theEvent
             jcharArray jKeyChars = GetJavaKeyChars(env, theEvent);
             jint jModifiers = GetJavaModifiers(theEvent);
 
-            (*env)->CallVoidMethod(env, self->_delegate->jView, jViewNotifyKey,
-                                   com_sun_glass_events_KeyEvent_PRESS,
-                                   uch, jKeyChars, jModifiers);
-            (*env)->CallVoidMethod(env, self->_delegate->jView, jViewNotifyKey,
-                                   com_sun_glass_events_KeyEvent_TYPED,
-                                   uch, jKeyChars, jModifiers);
-            (*env)->CallVoidMethod(env, self->_delegate->jView, jViewNotifyKey,
+            (*env)->CallBooleanMethod(env, self->_delegate->jView, jViewNotifyKeyAndReturnConsumed,
+                                      com_sun_glass_events_KeyEvent_PRESS,
+                                      uch, jKeyChars, jModifiers);
+            (*env)->CallBooleanMethod(env, self->_delegate->jView, jViewNotifyKeyAndReturnConsumed,
+                                      com_sun_glass_events_KeyEvent_TYPED,
+                                      uch, jKeyChars, jModifiers);
+            (*env)->CallBooleanMethod(env, self->_delegate->jView, jViewNotifyKeyAndReturnConsumed,
                                    com_sun_glass_events_KeyEvent_RELEASE,
                                    uch, jKeyChars, jModifiers);
             (*env)->DeleteLocalRef(env, jKeyChars);
@@ -500,14 +504,18 @@ - (BOOL)performKeyEquivalent:(NSEvent *)theEvent
             return YES;
         }
     }
-    [self->_delegate sendJavaKeyEvent:theEvent isDown:YES];
+
+    BOOL result = [self handleKeyDown: theEvent];
     [fsWindow release];
-    return NO; // return NO to allow system-default processing of Cmd+Q, etc.
+    return result;
 }
 
-- (void)keyDown:(NSEvent *)theEvent
+- (BOOL)handleKeyDown:(NSEvent *)theEvent
 {
-    KEYLOG("keyDown");
+    if (theEvent == lastKeyEvent) return NO;
+
+    [lastKeyEvent release];
+    lastKeyEvent = [theEvent retain];
 
     handlingKeyEvent = YES;
     didCommitText = NO;
@@ -515,6 +523,10 @@ - (void)keyDown:(NSEvent *)theEvent
     BOOL inputContextHandledEvent = (imEnabled && [self.inputContext handleEvent:theEvent]);
     handlingKeyEvent = NO;
 
+    // Returns YES if the event triggered some sort of InputMethod action or
+    // if the PRESSED event was consumed by the scene graph.
+    BOOL wasConsumed = YES;
+
     if (didCommitText) {
         // Exit composition mode
         didCommitText = NO;
@@ -526,8 +538,16 @@ - (void)keyDown:(NSEvent *)theEvent
         ;
     } else if (!inputContextHandledEvent || (nsAttrBuffer.length == 0)) {
         [GlassApplication registerKeyEvent:theEvent];
-        [self->_delegate sendJavaKeyEvent:theEvent isDown:YES];
+        wasConsumed = [self->_delegate sendJavaKeyEvent:theEvent isDown:YES];
     }
+
+    return wasConsumed;
+}
+
+- (void)keyDown:(NSEvent*)theEvent
+{
+    KEYLOG("keyDown");
+    [self handleKeyDown: theEvent];
 }
 
 - (void)keyUp:(NSEvent *)theEvent
diff --git a/modules/javafx.graphics/src/main/native-glass/mac/GlassViewDelegate.h b/modules/javafx.graphics/src/main/native-glass/mac/GlassViewDelegate.h
index ccd02f1f639..e8cbfc2be57 100644
--- a/modules/javafx.graphics/src/main/native-glass/mac/GlassViewDelegate.h
+++ b/modules/javafx.graphics/src/main/native-glass/mac/GlassViewDelegate.h
@@ -64,9 +64,6 @@ typedef enum GestureMaskType {
 
     NSEvent                 *lastEvent;
 
-    // The last processed key event
-    NSEvent                 *s_lastKeyEvent;
-
     GlassDraggingSource     *draggingSource;
     NSInteger               lastTrackingNumber;
 
@@ -89,7 +86,7 @@ typedef enum GestureMaskType {
 - (void)sendJavaMouseEvent:(NSEvent *)theEvent;
 - (void)resetMouseTracking;
 - (void)sendJavaMenuEvent:(NSEvent *)theEvent;
-- (void)sendJavaKeyEvent:(NSEvent *)event isDown:(BOOL)isDown;
+- (BOOL)sendJavaKeyEvent:(NSEvent *)event isDown:(BOOL)isDown;
 - (void)sendJavaModifierKeyEvent:(NSEvent *)theEvent;
 - (void)sendJavaGestureEvent:(NSEvent *)theEvent type:(int)type;
 - (void)sendJavaGestureBeginEvent:(NSEvent *)theEvent;
diff --git a/modules/javafx.graphics/src/main/native-glass/mac/GlassViewDelegate.m b/modules/javafx.graphics/src/main/native-glass/mac/GlassViewDelegate.m
index cf9075005a2..1b84e04fdba 100644
--- a/modules/javafx.graphics/src/main/native-glass/mac/GlassViewDelegate.m
+++ b/modules/javafx.graphics/src/main/native-glass/mac/GlassViewDelegate.m
@@ -674,33 +674,33 @@ - (void)resetMouseTracking
 
 // RT-11707: zero out the keycode for TYPED events
 #define SEND_KEY_EVENT(type) \
-    (*env)->CallVoidMethod(env, self->jView, jViewNotifyKey, (type), \
+    jboolean thisEventWasConsumed = (*env)->CallBooleanMethod(env, self->jView, jViewNotifyKeyAndReturnConsumed, (type), \
             (type) == com_sun_glass_events_KeyEvent_TYPED ? 0 : jKeyCode, \
             jKeyChars, jModifiers); \
     GLASS_CHECK_EXCEPTION(env);
 
-- (void)sendJavaKeyEvent:(NSEvent *)theEvent isDown:(BOOL)isDown
+- (BOOL)sendJavaKeyEvent:(NSEvent *)theEvent isDown:(BOOL)isDown
 {
-    if (theEvent == s_lastKeyEvent) {
-        // this must be a keyDown: generated by performKeyEquivalent: which returns NO by design
-        return;
-    }
-    [s_lastKeyEvent release];
-    s_lastKeyEvent = [theEvent retain];
-
     GET_MAIN_JENV;
 
     jint jKeyCode = GetJavaKeyCode(theEvent);
     jcharArray jKeyChars = GetJavaKeyChars(env, theEvent);
     jint jModifiers = GetJavaModifiers(theEvent);
 
+    // This routine returns YES if the PRESS event was consumed. This is
+    // used to ensure that performKeyEquivalent doesn't allow an event
+    // to be processed by both JavaFX and the system menus.
+    jboolean wasConsumed = false;
     if (!isDown)
     {
         SEND_KEY_EVENT(com_sun_glass_events_KeyEvent_RELEASE);
     }
     else
     {
+        // We only return YES if the PRESSED event was consumed. The TextInput
+        // control consumes any TYPED event that looks like a shortcut.
         SEND_KEY_EVENT(com_sun_glass_events_KeyEvent_PRESS);
+        wasConsumed = thisEventWasConsumed;
 
         // TYPED events should only be sent for printable characters. Thus we avoid
         // sending them for navigation keys. Perhaps this logic could be enhanced.
@@ -720,10 +720,12 @@ - (void)sendJavaKeyEvent:(NSEvent *)theEvent isDown:(BOOL)isDown
 
     (*env)->DeleteLocalRef(env, jKeyChars);
     GLASS_CHECK_EXCEPTION(env);
+
+    return wasConsumed ? YES : NO;
 }
 
 #define SEND_MODIFIER_KEY_EVENT_WITH_TYPE(type, vkCode) \
-        (*env)->CallVoidMethod(env, self->jView, jViewNotifyKey, \
+        (*env)->CallBooleanMethod(env, self->jView, jViewNotifyKeyAndReturnConsumed, \
                 (type), \
                 (vkCode), \
                 jKeyChars, jModifiers);
diff --git a/tests/system/src/test/java/test/robot/javafx/scene/MenuDoubleShortcutTest.java b/tests/system/src/test/java/test/robot/javafx/scene/MenuDoubleShortcutTest.java
new file mode 100644
index 00000000000..e94b491610c
--- /dev/null
+++ b/tests/system/src/test/java/test/robot/javafx/scene/MenuDoubleShortcutTest.java
@@ -0,0 +1,221 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+
+package test.robot.javafx.scene;
+
+import java.util.concurrent.CountDownLatch;
+
+import javafx.application.Application;
+import javafx.application.Platform;
+import javafx.scene.Scene;
+import javafx.scene.control.Label;
+import javafx.scene.control.Menu;
+import javafx.scene.control.MenuBar;
+import javafx.scene.control.MenuItem;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyCodeCombination;
+import javafx.scene.input.KeyCombination;
+import javafx.scene.layout.VBox;
+import javafx.scene.robot.Robot;
+import javafx.stage.Stage;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import com.sun.javafx.PlatformUtil;
+
+import test.util.Util;
+
+public class MenuDoubleShortcutTest {
+
+    static CountDownLatch startupLatch = new CountDownLatch(1);
+
+    static volatile TestApp testApp;
+    static private final int delayMilliseconds = 100;
+
+    private enum TestResult {
+        // We provide an explanation of what happened. Since we only see this
+        // explanation on failure it is worded accordingly.
+        IGNORED("Key press event triggered no actions"),
+        FIREDTWICE("Key press event fired scene action and also a menu bar item"),
+        FIREDMENUITEM("Key press event fired menu bar item instead of scene action"),
+        FIREDSCENE("Key press event fired scene action instead of menu bar item");
+
+        private String explanation;
+        TestResult(String e) {
+            explanation = e;
+        }
+
+        public String errorExplanation() {
+            return explanation;
+        }
+    };
+
+    // KeyCode.A will be added to the menu bar and the scene
+    // KeyCode.B will be added to the menu bar only
+    // KeyCode.C will be added to the scene only.
+    private static final KeyCode menuBarAndSceneKeyCode = KeyCode.A;
+    private static final KeyCode menuBarOnlyKeyCode = KeyCode.B;
+    private static final KeyCode sceneOnlyKeyCode = KeyCode.C;
+    private static final KeyCode noAcceleratorKeyCode = KeyCode.D;
+
+    private static final KeyCombination menuBarAndSceneAccelerator = new KeyCodeCombination(menuBarAndSceneKeyCode, KeyCombination.SHORTCUT_DOWN);
+    private static final KeyCombination menuBarOnlyAccelerator = new KeyCodeCombination(menuBarOnlyKeyCode, KeyCombination.SHORTCUT_DOWN);
+    private static final KeyCombination sceneOnlyAccelerator = new KeyCodeCombination(sceneOnlyKeyCode, KeyCombination.SHORTCUT_DOWN);
+
+    // On Mac the scene should process the event and it should
+    // not trigger a system menu bar item.
+    //
+    // https://bugs.openjdk.org/browse/JDK-8087863
+    // https://bugs.openjdk.org/browse/JDK-8088897
+    @Test
+    void macSceneComesBeforeMenuBar() {
+        Assumptions.assumeTrue(PlatformUtil.isMac());
+        testApp.testKey(menuBarAndSceneKeyCode);
+        Util.sleep(delayMilliseconds);
+        TestResult result = testApp.testResult();
+        Assertions.assertEquals(TestResult.FIREDSCENE, result, result.errorExplanation());
+    }
+
+    // On platforms other than Mac the menu bar should process the event
+    // and the scene should not.
+    @Test
+    void nonMacMenuBarComesBeforeScene() {
+        Assumptions.assumeFalse(PlatformUtil.isMac());
+        testApp.testKey(menuBarAndSceneKeyCode);
+        Util.sleep(delayMilliseconds);
+        TestResult result = testApp.testResult();
+        Assertions.assertEquals(TestResult.FIREDMENUITEM, result, result.errorExplanation());
+    }
+
+    @Test
+    void acceleratorOnlyInMenuBar() {
+        testApp.testKey(menuBarOnlyKeyCode);
+        Util.sleep(delayMilliseconds);
+        TestResult result = testApp.testResult();
+        Assertions.assertEquals(TestResult.FIREDMENUITEM, result, result.errorExplanation());
+    }
+
+    @Test
+    void acceleratorOnlyInScene() {
+        testApp.testKey(sceneOnlyKeyCode);
+        Util.sleep(delayMilliseconds);
+        TestResult result = testApp.testResult();
+        Assertions.assertEquals(TestResult.FIREDSCENE, result, result.errorExplanation());
+    }
+
+    @Test
+    void acceleratorAbsent() {
+        testApp.testKey(noAcceleratorKeyCode);
+        Util.sleep(delayMilliseconds);
+        TestResult result = testApp.testResult();
+        Assertions.assertEquals(TestResult.IGNORED, result, result.errorExplanation());
+    }
+
+    @BeforeAll
+    static void initFX() throws Exception {
+        Util.launch(startupLatch, TestApp.class);
+    }
+
+    @AfterAll
+    static void exit() {
+        Util.shutdown();
+    }
+
+    public static class TestApp extends Application {
+
+        private boolean sceneAcceleratorFired = false;
+        private boolean menuBarItemFired = false;
+
+        private MenuItem createMenuItem(KeyCombination accelerator) {
+            MenuItem menuItem = new MenuItem(accelerator.getName() + " menu item");
+            menuItem.setAccelerator(accelerator);
+            menuItem.setOnAction(e -> {
+                menuBarItemFired = true;
+                e.consume();
+            });
+            return menuItem;
+        }
+
+        @Override
+        public void start(Stage stage) {
+
+            testApp = this;
+
+            Label label = new Label("Testing accelerator double processing");
+
+            MenuBar menuBar = new MenuBar();
+            menuBar.setUseSystemMenuBar(true);
+
+            Menu menu = new Menu("Top menu");
+            menu.getItems().add(createMenuItem(menuBarAndSceneAccelerator));
+            menu.getItems().add(createMenuItem(menuBarOnlyAccelerator));
+            menuBar.getMenus().add(menu);
+
+            Scene scene = new Scene(new VBox(menuBar, label), 200, 200);
+            scene.getAccelerators().put(menuBarAndSceneAccelerator, () -> {
+                sceneAcceleratorFired = true;
+            });
+            scene.getAccelerators().put(sceneOnlyAccelerator, () -> {
+                sceneAcceleratorFired = true;
+            });
+
+            stage.setScene(scene);
+            stage.setOnShown(e -> {
+                Platform.runLater(() -> {
+                    startupLatch.countDown();
+                });
+            });
+            stage.show();
+        }
+
+        public void testKey(KeyCode code) {
+            sceneAcceleratorFired = false;
+            menuBarItemFired = false;
+            Platform.runLater(() -> {
+                KeyCode shortcutCode = (PlatformUtil.isMac() ? KeyCode.COMMAND : KeyCode.CONTROL);
+                Robot robot = new Robot();
+                robot.keyPress(shortcutCode);
+                robot.keyPress(code);
+                robot.keyRelease(code);
+                robot.keyRelease(shortcutCode);
+            });
+        }
+
+        public TestResult testResult() {
+            if (sceneAcceleratorFired && menuBarItemFired) {
+                return TestResult.FIREDTWICE;
+            } else if (sceneAcceleratorFired) {
+                return TestResult.FIREDSCENE;
+            } else if (menuBarItemFired) {
+                return TestResult.FIREDMENUITEM;
+            }
+            return TestResult.IGNORED;
+        }
+    }
+}

From fb06b1f8e88d1c09cc8109ad3cb0ef5a5a754934 Mon Sep 17 00:00:00 2001
From: Lukasz Kostyra <lkostyra@openjdk.org>
Date: Thu, 10 Oct 2024 06:44:52 +0000
Subject: [PATCH 65/75] 8333374: Cannot invoke
 "com.sun.prism.RTTexture.contentsUseful()" because "this.txt" is null

Reviewed-by: kcr, jpereda, hmeda
---
 .../src/main/java/com/sun/javafx/webkit/prism/RTImage.java   | 4 ++++
 .../com/sun/javafx/webkit/prism/WCGraphicsPrismContext.java  | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/modules/javafx.web/src/main/java/com/sun/javafx/webkit/prism/RTImage.java b/modules/javafx.web/src/main/java/com/sun/javafx/webkit/prism/RTImage.java
index 0d4efff4cdb..598b8c2d32a 100644
--- a/modules/javafx.web/src/main/java/com/sun/javafx/webkit/prism/RTImage.java
+++ b/modules/javafx.web/src/main/java/com/sun/javafx/webkit/prism/RTImage.java
@@ -115,6 +115,10 @@ private RTTexture getTexture() {
                     (int) Math.ceil(width * pixelScale),
                     (int) Math.ceil(height * pixelScale),
                     Texture.WrapMode.CLAMP_NOT_NEEDED);
+            if (txt == null) {
+                log.fine("RTImage::getTexture : return null because rt texture not allocated");
+                return null;
+            }
             txt.contentsUseful();
             txt.makePermanent();
             if (registeredWithFactory == null || registeredWithFactory.get() != f) {
diff --git a/modules/javafx.web/src/main/java/com/sun/javafx/webkit/prism/WCGraphicsPrismContext.java b/modules/javafx.web/src/main/java/com/sun/javafx/webkit/prism/WCGraphicsPrismContext.java
index a44a57dec36..20118b72212 100644
--- a/modules/javafx.web/src/main/java/com/sun/javafx/webkit/prism/WCGraphicsPrismContext.java
+++ b/modules/javafx.web/src/main/java/com/sun/javafx/webkit/prism/WCGraphicsPrismContext.java
@@ -146,6 +146,11 @@ Graphics getGraphics(boolean checkClip) {
                     ? l.getGraphics()
                     : baseGraphics;
 
+            if (cachedGraphics == null) {
+                log.fine("getGraphics failed - couldn't acquire cachedGraphics");
+                return null;
+            }
+
             ResourceFactory rf = cachedGraphics.getResourceFactory();
             if (!rf.isDisposed()) {
                 state.apply(cachedGraphics);

From fbcbc9803f418a3f4fa1a591ad170cd52146cac9 Mon Sep 17 00:00:00 2001
From: Florian Kirmaier <fkirmaier@openjdk.org>
Date: Fri, 11 Oct 2024 14:15:49 +0000
Subject: [PATCH 66/75] 8341010: TriangleMesh.vertexFormat Property default
 value is wrong

Reviewed-by: kcr, angorya
---
 .../src/main/java/javafx/scene/shape/TriangleMesh.java   | 2 +-
 .../java/test/javafx/scene/shape/TriangleMeshTest.java   | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/shape/TriangleMesh.java b/modules/javafx.graphics/src/main/java/javafx/scene/shape/TriangleMesh.java
index 824060d0713..e2904f63e42 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/shape/TriangleMesh.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/shape/TriangleMesh.java
@@ -212,7 +212,7 @@ public final VertexFormat getVertexFormat() {
 
     public final ObjectProperty<VertexFormat> vertexFormatProperty() {
         if (vertexFormat == null) {
-            vertexFormat = new SimpleObjectProperty<>(TriangleMesh.this, "vertexFormat") {
+            vertexFormat = new SimpleObjectProperty<>(TriangleMesh.this, "vertexFormat", VertexFormat.POINT_TEXCOORD) {
 
                 @Override
                 protected void invalidated() {
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/TriangleMeshTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/TriangleMeshTest.java
index 02725459fdc..43a8720efc2 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/TriangleMeshTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/shape/TriangleMeshTest.java
@@ -26,6 +26,7 @@
 
 import java.util.Arrays;
 import javafx.scene.shape.TriangleMesh;
+import javafx.scene.shape.VertexFormat;
 
 import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -458,6 +459,14 @@ public void testVertexFormatOfDefaultTriangleMesh() {
         assertEquals(6, triMesh.getFaceElementSize());
     }
 
+    @Test
+    public void testVertexFormatProperty() {
+        TriangleMesh triMesh = new TriangleMesh();
+        VertexFormat vf1 = triMesh.getVertexFormat();
+        VertexFormat vf2 = triMesh.vertexFormatProperty().get();
+        assertEquals(vf1, vf2);
+    }
+
     TriangleMesh buildTriangleMesh(int subDivX, int subDivY) {
         TriangleMesh triangleMesh = new TriangleMesh();
         final int pointSize = triangleMesh.getPointElementSize();

From cf559843d165e79167949718c15d458064ec9d2b Mon Sep 17 00:00:00 2001
From: Andy Goryachev <angorya@openjdk.org>
Date: Fri, 11 Oct 2024 18:13:39 +0000
Subject: [PATCH 67/75] 8341440: ScrollPane: no immediate effect changing
 fitWidth/fitHeight

Reviewed-by: kcr, jhendrikx
---
 .../scene/control/skin/ScrollPaneSkin.java    |  3 +-
 .../control/skin/ScrollPaneSkinTest.java      | 61 +++++++++++++++++++
 2 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/modules/javafx.controls/src/main/java/javafx/scene/control/skin/ScrollPaneSkin.java b/modules/javafx.controls/src/main/java/javafx/scene/control/skin/ScrollPaneSkin.java
index 343da9d22c8..2c828f17424 100644
--- a/modules/javafx.controls/src/main/java/javafx/scene/control/skin/ScrollPaneSkin.java
+++ b/modules/javafx.controls/src/main/java/javafx/scene/control/skin/ScrollPaneSkin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -294,6 +294,7 @@ public ScrollPaneSkin(final ScrollPane control) {
             () -> {
                 getSkinnable().requestLayout();
                 viewRect.requestLayout();
+                viewContent.requestLayout();
             },
             control.fitToWidthProperty(),
             control.fitToHeightProperty()
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ScrollPaneSkinTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ScrollPaneSkinTest.java
index 6e4dea763fd..8ce2ee0ea26 100644
--- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ScrollPaneSkinTest.java
+++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/ScrollPaneSkinTest.java
@@ -144,6 +144,67 @@ public void setup() {
         assertTrue(originalValue < scrollPane.getVvalue());
     }
 
+    @Test
+    public void fitToHeight() {
+        StackPane content = new StackPane();
+        content.setPrefWidth(100);
+        content.setPrefHeight(100);
+
+        scrollPane.setContent(content);
+        scrollPane.setPrefWidth(200);
+        scrollPane.setPrefHeight(200);
+        scrollPane.setFitToHeight(false);
+
+        Scene scene = new Scene(new Group(), 400, 400);
+        ((Group) scene.getRoot()).getChildren().clear();
+        ((Group) scene.getRoot()).getChildren().add(scrollPane);
+        Stage stage = new Stage();
+        stage.setScene(scene);
+        stage.show();
+
+        assertTrue(content.getHeight() == 100);
+
+        scrollPane.setFitToHeight(true);
+        Toolkit.getToolkit().firePulse();
+
+        assertTrue(content.getHeight() > 150);
+
+        scrollPane.setFitToHeight(false);
+        Toolkit.getToolkit().firePulse();
+
+        assertTrue(content.getHeight() == 100);
+    }
+
+    @Test
+    public void fitToWidth() {
+        StackPane content = new StackPane();
+        content.setPrefWidth(100);
+        content.setPrefHeight(100);
+
+        scrollPane.setContent(content);
+        scrollPane.setPrefWidth(200);
+        scrollPane.setPrefHeight(200);
+        scrollPane.setFitToWidth(false);
+
+        Scene scene = new Scene(new Group(), 400, 400);
+        ((Group) scene.getRoot()).getChildren().clear();
+        ((Group) scene.getRoot()).getChildren().add(scrollPane);
+        Stage stage = new Stage();
+        stage.setScene(scene);
+        stage.show();
+
+        assertTrue(content.getWidth() == 100);
+
+        scrollPane.setFitToWidth(true);
+        Toolkit.getToolkit().firePulse();
+
+        assertTrue(content.getWidth() > 150);
+
+        scrollPane.setFitToWidth(false);
+        Toolkit.getToolkit().firePulse();
+
+        assertTrue(content.getWidth() == 100);
+    }
 
     boolean continueTest;
     class myPane extends Pane {

From 0cafd8011b218162259b81872b1672a1a0649eef Mon Sep 17 00:00:00 2001
From: Hima Bindu Meda <hmeda@openjdk.org>
Date: Mon, 14 Oct 2024 05:08:28 +0000
Subject: [PATCH 68/75] 8341920: Intermittent WebKit build failure on Windows
 generating PDB files in 619.1

Reviewed-by: kcr, sykora
---
 .../src/main/native/Source/cmake/OptionsMSVC.cmake    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/modules/javafx.web/src/main/native/Source/cmake/OptionsMSVC.cmake b/modules/javafx.web/src/main/native/Source/cmake/OptionsMSVC.cmake
index 3f986d590de..9493a96cf8b 100644
--- a/modules/javafx.web/src/main/native/Source/cmake/OptionsMSVC.cmake
+++ b/modules/javafx.web/src/main/native/Source/cmake/OptionsMSVC.cmake
@@ -117,8 +117,15 @@ if (NOT COMPILER_IS_CLANG_CL)
     )
 endif ()
 
-# Create pdb files for debugging purposes, also for Release builds
-add_compile_options(/Zi /GS)
+if (PORT STREQUAL "Java")
+    # Suppress creation of pdb files for Release builds
+    # FIXME: Need to re-enable the flag for Debug builds
+    #add_compile_options(/Zi /GS)
+
+else()
+    # Create pdb files for debugging purposes, also for Release builds
+    add_compile_options(/Zi /GS)
+endif()
 
 # Disable ICF (identical code folding) optimization,
 # as it makes it unsafe to pointer-compare functions with identical definitions.

From 9c31cb0c696c9ec8bf71038f8f5f53633c457d04 Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Thu, 17 Oct 2024 06:08:05 +0000
Subject: [PATCH 69/75] 8340005: Eliminate native access calls from
 javafx.swing

Reviewed-by: angorya, kcr
---
 .../src/main/java/com/sun/glass/ui/Application.java   |  9 +++++++++
 .../src/main/native-prism/SwingInterop.c              | 11 ++++++-----
 .../javafx/embed/swing/newimpl/SwingNodeInteropN.java |  9 ++++-----
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Application.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Application.java
index 1f0e6644d2a..8d5f981030c 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Application.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Application.java
@@ -811,4 +811,13 @@ public Map<String, Class<?>> getPlatformKeys() {
      * and if so, emits a warning.
      */
     public void checkPlatformPreferencesSupport() {}
+
+    private static native void _overrideNativeWindowHandle(Class lwFrameWrapperClass,
+                                                           Object frame,
+                                                           long handle, Runnable closeWindow);
+
+    public static void overrideNativeWindowHandle(Class lwFrameWrapperClass, Object frame,
+                                                  long handle, Runnable closeWindow) {
+        _overrideNativeWindowHandle(lwFrameWrapperClass, frame, handle, closeWindow);
+    }
 }
diff --git a/modules/javafx.graphics/src/main/native-prism/SwingInterop.c b/modules/javafx.graphics/src/main/native-prism/SwingInterop.c
index 42b16f0e00e..e36fc5d0c78 100644
--- a/modules/javafx.graphics/src/main/native-prism/SwingInterop.c
+++ b/modules/javafx.graphics/src/main/native-prism/SwingInterop.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,14 +24,15 @@
  */
 
 #include <jni.h>
+#include "com_sun_glass_ui_Application.h"
 
 /*
- * Class com_sun_javafx_embed_swing_newimpl_SwingNodeInteropN
- * Method: overrideNativeWindowHandle
- * Signature (Ljava/lang/Class;JLjava/lang/Runnable)Ljdk.swing.interop.LightweightFrameWrapper;
+ * Class com_sun_glass_ui_Application
+ * Method: _overrideNativeWindowHandle
+ * Signature (Ljava/lang/Class;Ljava/lang/Object;JLjava/lang/Runnable;)V
  */
 JNIEXPORT void JNICALL
-Java_com_sun_javafx_embed_swing_newimpl_SwingNodeInteropN_overrideNativeWindowHandle(
+Java_com_sun_glass_ui_Application__1overrideNativeWindowHandle(
  JNIEnv *env, jclass cls, jclass lwFrameClass, jobject lwFrame, jlong id, jobject runnable) {
 
     jmethodID cons;
diff --git a/modules/javafx.swing/src/main/java/com/sun/javafx/embed/swing/newimpl/SwingNodeInteropN.java b/modules/javafx.swing/src/main/java/com/sun/javafx/embed/swing/newimpl/SwingNodeInteropN.java
index 5b258624aa4..04d3f6a122e 100644
--- a/modules/javafx.swing/src/main/java/com/sun/javafx/embed/swing/newimpl/SwingNodeInteropN.java
+++ b/modules/javafx.swing/src/main/java/com/sun/javafx/embed/swing/newimpl/SwingNodeInteropN.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 
 package com.sun.javafx.embed.swing.newimpl;
 
+import com.sun.glass.ui.Application;
 import com.sun.javafx.PlatformUtil;
 import com.sun.javafx.embed.swing.DisposerRecord;
 import com.sun.javafx.embed.swing.FXDnD;
@@ -65,9 +66,7 @@ public class SwingNodeInteropN {
      */
     private static OptionalMethod<LightweightFrameWrapper> jlfNotifyDisplayChanged;
     private static Class lwFrameWrapperClass = null;
-    private static native void overrideNativeWindowHandle(Class lwFrameWrapperClass,
-                                  LightweightFrameWrapper lwFrame, long handle,
-                                                    Runnable closeWindow);
+
     static {
         jlfNotifyDisplayChanged = new OptionalMethod<>(LightweightFrameWrapper.class,
                 "notifyDisplayChanged", Double.TYPE, Double.TYPE);
@@ -125,7 +124,7 @@ public AWTEvent createUngrabEvent(Object frame) {
 
     public void overrideNativeWindowHandle(Object frame, long handle, Runnable closeWindow) {
         LightweightFrameWrapper lwFrame = (LightweightFrameWrapper)frame;
-        overrideNativeWindowHandle(lwFrameWrapperClass, lwFrame, handle, closeWindow);
+        Application.overrideNativeWindowHandle(lwFrameWrapperClass, lwFrame, handle, closeWindow);
     }
 
     public void notifyDisplayChanged(Object frame, double scaleX, double scaleY) {

From 1c86d3b089bec1ade1e9e986ef71ec77cae7b533 Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Thu, 17 Oct 2024 11:49:13 +0000
Subject: [PATCH 70/75] 8340850: Wrong bug ID listed as reason for skipping
 SwingNodePlatformExitCrashTest

Reviewed-by: kcr
---
 .../javafx/embed/swing/SwingNodePlatformExitCrashTest.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/system/src/test/java/test/robot/javafx/embed/swing/SwingNodePlatformExitCrashTest.java b/tests/system/src/test/java/test/robot/javafx/embed/swing/SwingNodePlatformExitCrashTest.java
index 78023de5210..bca2d7aba7a 100644
--- a/tests/system/src/test/java/test/robot/javafx/embed/swing/SwingNodePlatformExitCrashTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/embed/swing/SwingNodePlatformExitCrashTest.java
@@ -36,7 +36,7 @@
 public class SwingNodePlatformExitCrashTest extends SwingNodeBase {
 
     @Test
-    @Disabled("JDK-8190329")
+    @Disabled("JDK-8340849")
     public void testPlatformExitBeforeShowHoldEDT() throws InvocationTargetException, InterruptedException {
         myApp.createAndShowStage();
         CountDownLatch latch = new CountDownLatch(1);

From c4b1e1c019c98e97c64df8b11ee2f9635c67256d Mon Sep 17 00:00:00 2001
From: Ambarish Rapte <arapte@openjdk.org>
Date: Thu, 17 Oct 2024 12:32:02 +0000
Subject: [PATCH 71/75] 8341686: FX: Update copyright year in docs, readme
 files to 2025

Reviewed-by: kcr
---
 build.properties                                                | 2 +-
 .../main/docs/javafx/fxml/doc-files/introduction_to_fxml.html   | 2 +-
 .../src/main/docs/javafx/scene/doc-files/cssref.html            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.properties b/build.properties
index e4b5a59188f..f477d44c3b4 100644
--- a/build.properties
+++ b/build.properties
@@ -54,7 +54,7 @@ jfx.release.patch.version=0
 #
 ##############################################################################
 
-javadoc.bottom=<small><a href="http://bugreport.java.com/bugreport/">Report a bug or suggest an enhancement</a><br> Copyright &copy; 2008, 2024, Oracle and/or its affiliates. All rights reserved.@DRAFT_UNLESS_FCS@<!-- Version @FULL_VERSION@ --></small>
+javadoc.bottom=<small><a href="http://bugreport.java.com/bugreport/">Report a bug or suggest an enhancement</a><br> Copyright &copy; 2008, 2025, Oracle and/or its affiliates. All rights reserved.@DRAFT_UNLESS_FCS@<!-- Version @FULL_VERSION@ --></small>
 
 javadoc.title=JavaFX @JAVADOC_VERSION@
 javadoc.header=<div><strong>JavaFX @JAVADOC_VERSION@@DRAFT_UNLESS_FCS@</strong></div>
diff --git a/modules/javafx.fxml/src/main/docs/javafx/fxml/doc-files/introduction_to_fxml.html b/modules/javafx.fxml/src/main/docs/javafx/fxml/doc-files/introduction_to_fxml.html
index 7a7dab359c0..c0f966e496c 100644
--- a/modules/javafx.fxml/src/main/docs/javafx/fxml/doc-files/introduction_to_fxml.html
+++ b/modules/javafx.fxml/src/main/docs/javafx/fxml/doc-files/introduction_to_fxml.html
@@ -1111,7 +1111,7 @@ <h2><a id="deploy_as_module">Deploying an Application as a Module</a></h2>
 </p>
 <hr>
 <p>
-<small><a href="http://bugreport.java.com/bugreport/">Report a bug or suggest an enhancement</a><br> Copyright &copy; 2008, 2024, Oracle and/or its affiliates. All rights reserved.</small>
+<small><a href="http://bugreport.java.com/bugreport/">Report a bug or suggest an enhancement</a><br> Copyright &copy; 2008, 2025, Oracle and/or its affiliates. All rights reserved.</small>
 </p>
 </body>
 </html>
diff --git a/modules/javafx.graphics/src/main/docs/javafx/scene/doc-files/cssref.html b/modules/javafx.graphics/src/main/docs/javafx/scene/doc-files/cssref.html
index d82793fd380..11ae849727b 100644
--- a/modules/javafx.graphics/src/main/docs/javafx/scene/doc-files/cssref.html
+++ b/modules/javafx.graphics/src/main/docs/javafx/scene/doc-files/cssref.html
@@ -6386,7 +6386,7 @@ <h2><a id="references">References</a></h2>
     <p>[5] Uniform Resource Identifier (URI): Generic Syntax <a href="http://www.ietf.org/rfc/rfc3986">RFC-3986</a></p>
     <hr>
     <p>
-<small><a href="http://bugreport.java.com/bugreport/">Report a bug or suggest an enhancement</a><br> Copyright &copy; 2008, 2024, Oracle and/or its affiliates. All rights reserved.</small>
+<small><a href="http://bugreport.java.com/bugreport/">Report a bug or suggest an enhancement</a><br> Copyright &copy; 2008, 2025, Oracle and/or its affiliates. All rights reserved.</small>
     </p>
     <br>
   </body>

From 77482debff0b6e550b451516b4d4d1466895fed8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Strau=C3=9F?= <mstrauss@openjdk.org>
Date: Thu, 17 Oct 2024 18:11:39 +0000
Subject: [PATCH 72/75] 8341372: BackgroundPosition, BorderImage, BorderStroke,
 CornerRadii should be final

Reviewed-by: angorya, jhendrikx, kcr
---
 .../java/javafx/scene/layout/Background.java  | 37 +++++++++----------
 .../javafx/scene/layout/BackgroundFill.java   |  6 +--
 .../javafx/scene/layout/BackgroundImage.java  |  2 +-
 .../scene/layout/BackgroundPosition.java      | 14 +++----
 .../javafx/scene/layout/BackgroundSize.java   | 12 +++---
 .../main/java/javafx/scene/layout/Border.java |  8 ++--
 .../java/javafx/scene/layout/BorderImage.java | 16 ++++----
 .../javafx/scene/layout/BorderStroke.java     | 34 ++++++++---------
 .../javafx/scene/layout/BorderWidths.java     | 16 ++++----
 .../java/javafx/scene/layout/CornerRadii.java | 20 +++++-----
 .../main/java/javafx/scene/layout/Region.java | 10 ++---
 11 files changed, 87 insertions(+), 88 deletions(-)

diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/layout/Background.java b/modules/javafx.graphics/src/main/java/javafx/scene/layout/Background.java
index 3d0de802cb1..76acf4e6b7d 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/layout/Background.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/layout/Background.java
@@ -144,7 +144,7 @@ public final class Background implements Interpolatable<Background> {
      * @interpolationType <a href="../../animation/Interpolatable.html#pairwise">pairwise</a>
      */
     public final List<BackgroundFill> getFills() { return fills; }
-    final List<BackgroundFill> fills;
+    private final List<BackgroundFill> fills;
 
     /**
      * The list of BackgroundImages which together define the image portion
@@ -155,7 +155,7 @@ public final class Background implements Interpolatable<Background> {
      * @interpolationType <a href="../../animation/Interpolatable.html#pairwise">pairwise</a>
      */
     public final List<BackgroundImage> getImages() { return images; }
-    final List<BackgroundImage> images;
+    private final List<BackgroundImage> images;
 
     /**
      * The outsets of this Background. This represents the largest
@@ -169,7 +169,7 @@ public final class Background implements Interpolatable<Background> {
      * @interpolationType the intermediate value is derived from {@link #getFills() fills}
      */
     public final Insets getOutsets() { return outsets; }
-    final Insets outsets;
+    private final Insets outsets;
 
     /**
      * Gets whether the background is empty. It is empty if there are no fills or images.
@@ -185,18 +185,17 @@ public final boolean isEmpty() {
     private final boolean hasOpaqueFill;
 
     /**
-     * Package-private immutable fields referring to the opaque insets
-     * of this Background.
+     * The opaque insets of this Background.
      */
     private final double opaqueFillTop, opaqueFillRight, opaqueFillBottom, opaqueFillLeft;
-    final boolean hasPercentageBasedOpaqueFills;
+    private final boolean hasPercentageBasedOpaqueFills;
 
     /**
      * True if there are any fills that are in some way based on the size of the region.
      * For example, if a CornerRadii on the fill is percentage based in either or both
      * dimensions.
      */
-    final boolean hasPercentageBasedFills;
+    private final boolean hasPercentageBasedFills;
 
     /**
      * The cached hash code computation for the Background. One very big
@@ -314,7 +313,7 @@ private Background(List<BackgroundFill> fills, List<BackgroundImage> images, int
             // The common case is to NOT have percent based radii
             final boolean b = fill.getRadii().hasPercentBasedRadii;
             hasPercentFillRadii |= b;
-            if (fill.fill.isOpaque()) {
+            if (fill.getFill().isOpaque()) {
                 opaqueFill = true;
                 if (b) {
                     hasPercentOpaqueInsets = true;
@@ -452,7 +451,7 @@ private void computeOpaqueInsets(double width, double height, boolean firstTime,
                     final double fillBottom = fillInsets.getBottom();
                     final double fillLeft = fillInsets.getLeft();
 
-                    if (fill.fill.isOpaque()) {
+                    if (fill.getFill().isOpaque()) {
                         // Some possible configurations:
                         //     (a) rect1 is completely contained by rect2
                         //     (b) rect2 is completely contained by rect1
@@ -532,7 +531,7 @@ private void computeOpaqueInsets(double width, double height, boolean firstTime,
             if (bi.opaque == null) {
                 // If the image is not yet loaded, just skip it
                 // Note: Unit test wants this to be com.sun.javafx.tk.PlatformImage, not com.sun.prism.Image
-                final com.sun.javafx.tk.PlatformImage platformImage = acc.getImageProperty(bi.image).get();
+                final com.sun.javafx.tk.PlatformImage platformImage = acc.getImageProperty(bi.getImage()).get();
                 if (platformImage == null) continue;
 
                 // The image has been loaded, so update the opaque flag
@@ -547,9 +546,9 @@ private void computeOpaqueInsets(double width, double height, boolean firstTime,
             // and we know whether it is opaque or not. Of course, we only care about processing
             // opaque images.
             if (bi.opaque) {
-                if (bi.size.cover ||
-                        (bi.size.height == BackgroundSize.AUTO && bi.size.width == BackgroundSize.AUTO &&
-                        bi.size.widthAsPercentage && bi.size.heightAsPercentage)) {
+                if (bi.size.isCover() ||
+                        (bi.size.getHeight() == BackgroundSize.AUTO && bi.size.getWidth() == BackgroundSize.AUTO &&
+                        bi.size.isWidthAsPercentage() && bi.size.isHeightAsPercentage())) {
                     // If the size mode is "cover" or AUTO, AUTO, and percentage based, then we're done -- we can simply
                     // accumulate insets of "0"
                     opaqueRegionTop = Double.isNaN(opaqueRegionTop) ? 0 : Math.min(0, opaqueRegionTop);
@@ -585,16 +584,16 @@ private void computeOpaqueInsets(double width, double height, boolean firstTime,
 
                     // We know that one or the other dimension is not filled, so we have to compute the right
                     // width / height. This is basically a big copy/paste from NGRegion! Blah!
-                    final double w = bi.size.widthAsPercentage ? bi.size.width * width : bi.size.width;
-                    final double h = bi.size.heightAsPercentage ? bi.size.height * height : bi.size.height;
-                    final double imgUnscaledWidth = bi.image.getWidth();
-                    final double imgUnscaledHeight = bi.image.getHeight();
+                    final double w = bi.size.isWidthAsPercentage() ? bi.size.getWidth() * width : bi.size.getWidth();
+                    final double h = bi.size.isHeightAsPercentage() ? bi.size.getHeight() * height : bi.size.getHeight();
+                    final double imgUnscaledWidth = bi.getImage().getWidth();
+                    final double imgUnscaledHeight = bi.getImage().getHeight();
 
                     // Now figure out the width and height of each tile to be drawn. The actual image
                     // dimensions may be one thing, but we need to figure out what the size of the image
                     // in the destination is going to be.
                     final double tileWidth, tileHeight;
-                    if (bi.size.contain) {
+                    if (bi.size.isContain()) {
                         // In the case of "contain", we compute the destination size based on the largest
                         // possible scale such that the aspect ratio is maintained, yet one side of the
                         // region is completely filled.
@@ -603,7 +602,7 @@ private void computeOpaqueInsets(double width, double height, boolean firstTime,
                         final double scale = Math.min(scaleX, scaleY);
                         tileWidth = Math.ceil(scale * imgUnscaledWidth);
                         tileHeight = Math.ceil(scale * imgUnscaledHeight);
-                    } else if (bi.size.width >= 0 && bi.size.height >= 0) {
+                    } else if (bi.size.getWidth() >= 0 && bi.size.getHeight() >= 0) {
                         // The width and height have been expressly defined. Note that AUTO is -1,
                         // and all other negative values are disallowed, so by checking >= 0, we
                         // are essentially saying "if neither is AUTO"
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/layout/BackgroundFill.java b/modules/javafx.graphics/src/main/java/javafx/scene/layout/BackgroundFill.java
index e4cd7a3d0f4..4c79c8acef3 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/layout/BackgroundFill.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/layout/BackgroundFill.java
@@ -53,7 +53,7 @@ public final class BackgroundFill implements Interpolatable<BackgroundFill> {
      * @interpolationType see {@link Paint}
      */
     public final Paint getFill() { return fill; }
-    final Paint fill;
+    private final Paint fill;
 
     /**
      * The Radii to use for representing the four radii of the
@@ -65,7 +65,7 @@ public final class BackgroundFill implements Interpolatable<BackgroundFill> {
      * @interpolationType <a href="../../animation/Interpolatable.html#default">default</a>
      */
     public final CornerRadii getRadii() { return radii; }
-    final CornerRadii radii;
+    private final CornerRadii radii;
 
     /**
      * The Insets to use for this fill. Each inset indicates at what
@@ -78,7 +78,7 @@ public final class BackgroundFill implements Interpolatable<BackgroundFill> {
      * @interpolationType <a href="../../animation/Interpolatable.html#default">default</a>
      */
     public final Insets getInsets() { return insets; }
-    final Insets insets;
+    private final Insets insets;
 
     /**
      * A cached hash for improved performance on subsequent hash or
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/layout/BackgroundImage.java b/modules/javafx.graphics/src/main/java/javafx/scene/layout/BackgroundImage.java
index b06755925a0..e9a5adc0efd 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/layout/BackgroundImage.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/layout/BackgroundImage.java
@@ -59,7 +59,7 @@ public final class BackgroundImage implements Interpolatable<BackgroundImage> {
      * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final Image getImage() { return image; }
-    final Image image;
+    private final Image image;
 
     /**
      * Indicates in what manner (if at all) the background image
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/layout/BackgroundPosition.java b/modules/javafx.graphics/src/main/java/javafx/scene/layout/BackgroundPosition.java
index b19839de0ae..6ef5e7e41bb 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/layout/BackgroundPosition.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/layout/BackgroundPosition.java
@@ -52,7 +52,7 @@
  * the Region's right edge.
  * @since JavaFX 8.0
  */
-public class BackgroundPosition implements Interpolatable<BackgroundPosition> {
+public final class BackgroundPosition implements Interpolatable<BackgroundPosition> {
     /**
      * The default BackgroundPosition for any BackgroundImage. The default
      * is to have no insets and to be defined as 0% and 0%. That is, the
@@ -76,7 +76,7 @@ public class BackgroundPosition implements Interpolatable<BackgroundPosition> {
      * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final Side getHorizontalSide() { return horizontalSide; }
-    final Side horizontalSide;
+    private final Side horizontalSide;
 
     /**
      * The side along the vertical axis to which the BackgroundImage is
@@ -85,7 +85,7 @@ public class BackgroundPosition implements Interpolatable<BackgroundPosition> {
      * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final Side getVerticalSide() { return verticalSide; }
-    final Side verticalSide;
+    private final Side verticalSide;
 
     /**
      * The value indicating the position of the BackgroundImage relative
@@ -102,7 +102,7 @@ public class BackgroundPosition implements Interpolatable<BackgroundPosition> {
      *                    otherwise <a href="../../animation/Interpolatable.html#linear">linear</a>
      */
     public final double getHorizontalPosition() { return horizontalPosition; }
-    final double horizontalPosition;
+    private final double horizontalPosition;
 
     /**
      * The value indicating the position of the BackgroundImage relative
@@ -118,7 +118,7 @@ public class BackgroundPosition implements Interpolatable<BackgroundPosition> {
      *                    otherwise <a href="../../animation/Interpolatable.html#linear">linear</a>
      */
     public final double getVerticalPosition() { return verticalPosition; }
-    final double verticalPosition;
+    private final double verticalPosition;
 
     /**
      * Specifies whether the {@link #getHorizontalPosition() horizontalPosition} should
@@ -128,7 +128,7 @@ public class BackgroundPosition implements Interpolatable<BackgroundPosition> {
      * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final boolean isHorizontalAsPercentage() { return horizontalAsPercentage; }
-    final boolean horizontalAsPercentage;
+    private final boolean horizontalAsPercentage;
 
     /**
      * Specifies whether the {@link #getVerticalPosition() verticalPosition} should
@@ -138,7 +138,7 @@ public class BackgroundPosition implements Interpolatable<BackgroundPosition> {
      * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final boolean isVerticalAsPercentage() { return verticalAsPercentage; }
-    final boolean verticalAsPercentage;
+    private final boolean verticalAsPercentage;
 
     /**
      * A cached has code value.
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/layout/BackgroundSize.java b/modules/javafx.graphics/src/main/java/javafx/scene/layout/BackgroundSize.java
index a1e9e526484..45e2dbd5f08 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/layout/BackgroundSize.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/layout/BackgroundSize.java
@@ -95,7 +95,7 @@ public final class BackgroundSize implements Interpolatable<BackgroundSize> {
      *                    <a href="../../animation/Interpolatable.html#linear">linear</a>
      */
     public final double getWidth() { return width; }
-    final double width;
+    private final double width;
 
     /**
      * The height of the area within the Region where the associated BackgroundImage should
@@ -112,7 +112,7 @@ public final class BackgroundSize implements Interpolatable<BackgroundSize> {
      *                    <a href="../../animation/Interpolatable.html#linear">linear</a>
      */
     public final double getHeight() { return height; }
-    final double height;
+    private final double height;
 
     /**
      * Specifies whether the value contained in {@code width} should be interpreted
@@ -122,7 +122,7 @@ public final class BackgroundSize implements Interpolatable<BackgroundSize> {
      * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final boolean isWidthAsPercentage() { return widthAsPercentage; }
-    final boolean widthAsPercentage;
+    private final boolean widthAsPercentage;
 
     /**
      * Specifies whether the value contained in {@code height} should be interpreted
@@ -132,7 +132,7 @@ public final class BackgroundSize implements Interpolatable<BackgroundSize> {
      * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final boolean isHeightAsPercentage() { return heightAsPercentage; }
-    final boolean heightAsPercentage;
+    private final boolean heightAsPercentage;
 
     /**
      * If true, scale the image, while preserving its intrinsic aspect ratio (if any), to the
@@ -143,7 +143,7 @@ public final class BackgroundSize implements Interpolatable<BackgroundSize> {
      * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final boolean isContain() { return contain; }
-    final boolean contain;
+    private final boolean contain;
 
     /**
      * If true, scale the image, while preserving its intrinsic aspect ratio (if any), to the
@@ -154,7 +154,7 @@ public final class BackgroundSize implements Interpolatable<BackgroundSize> {
      * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final boolean isCover() { return cover; }
-    final boolean cover;
+    private final boolean cover;
 
     /**
      * A cached hash code value
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/layout/Border.java b/modules/javafx.graphics/src/main/java/javafx/scene/layout/Border.java
index 223814836cc..78261eb7542 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/layout/Border.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/layout/Border.java
@@ -172,7 +172,7 @@ public final class Border implements Interpolatable<Border> {
      * @interpolationType <a href="../../animation/Interpolatable.html#pairwise">pairwise</a>
      */
     public final List<BorderStroke> getStrokes() { return strokes; }
-    final List<BorderStroke> strokes;
+    private final List<BorderStroke> strokes;
 
     /**
      * The list of BorderImages which together define the images to use
@@ -189,7 +189,7 @@ public final class Border implements Interpolatable<Border> {
      * @interpolationType <a href="../../animation/Interpolatable.html#pairwise">pairwise</a>
      */
     public final List<BorderImage> getImages() { return images; }
-    final List<BorderImage> images;
+    private final List<BorderImage> images;
 
     /**
      * The outsets of the border define the outer-most edge of the border to be drawn.
@@ -198,7 +198,7 @@ public final class Border implements Interpolatable<Border> {
      * border to be drawn
      */
     public final Insets getOutsets() { return outsets; }
-    final Insets outsets;
+    private final Insets outsets;
 
     /**
      * The insets define the distance from the edge of the Region to the inner-most edge
@@ -208,7 +208,7 @@ public final class Border implements Interpolatable<Border> {
      * inner-most edge of the border
      */
     public final Insets getInsets() { return insets; }
-    final Insets insets;
+    private final Insets insets;
 
     /**
      * Gets whether the Border is empty. It is empty if there are no strokes or images.
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/layout/BorderImage.java b/modules/javafx.graphics/src/main/java/javafx/scene/layout/BorderImage.java
index 5da650caaaa..7d38cb0e835 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/layout/BorderImage.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/layout/BorderImage.java
@@ -50,7 +50,7 @@
  * When applied to a Region with a defined shape, a BorderImage is ignored.
  * @since JavaFX 8.0
  */
-public class BorderImage implements Interpolatable<BorderImage> {
+public final class BorderImage implements Interpolatable<BorderImage> {
     /**
      * The image to be used. This will never be null. If this
      * image fails to load, then the entire BorderImage will
@@ -61,7 +61,7 @@ public class BorderImage implements Interpolatable<BorderImage> {
      * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final Image getImage() { return image; }
-    final Image image;
+    private final Image image;
 
     /**
      * Indicates in what manner (if at all) the border image
@@ -73,7 +73,7 @@ public class BorderImage implements Interpolatable<BorderImage> {
      * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final BorderRepeat getRepeatX() { return repeatX; }
-    final BorderRepeat repeatX;
+    private final BorderRepeat repeatX;
 
     /**
      * Indicates in what manner (if at all) the border image
@@ -85,7 +85,7 @@ public class BorderImage implements Interpolatable<BorderImage> {
      * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final BorderRepeat getRepeatY() { return repeatY; }
-    final BorderRepeat repeatY;
+    private final BorderRepeat repeatY;
 
     /**
      * The widths of the border on each side. These can be defined
@@ -97,7 +97,7 @@ public class BorderImage implements Interpolatable<BorderImage> {
      * @interpolationType <a href="../../animation/Interpolatable.html#default">default</a>
      */
     public final BorderWidths getWidths() { return widths; }
-    final BorderWidths widths;
+    private final BorderWidths widths;
 
     /**
      * Defines the slices of the image. JavaFX uses a 4-slice scheme where
@@ -119,7 +119,7 @@ public class BorderImage implements Interpolatable<BorderImage> {
      * @see <a href="http://www.w3.org/TR/css3-background/#the-border-image-slice">border-image-slice</a>
      */
     public final BorderWidths getSlices() { return slices; }
-    final BorderWidths slices;
+    private final BorderWidths slices;
 
     /**
      * Specifies whether or not the center patch (as defined by the left, right, top, and bottom slices)
@@ -129,7 +129,7 @@ public class BorderImage implements Interpolatable<BorderImage> {
      * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final boolean isFilled() { return filled; }
-    final boolean filled;
+    private final boolean filled;
 
     /**
      * The insets of the BorderImage define where the border should be positioned
@@ -139,7 +139,7 @@ public class BorderImage implements Interpolatable<BorderImage> {
      * @interpolationType <a href="../../animation/Interpolatable.html#default">default</a>
      */
     public final Insets getInsets() { return insets; }
-    final Insets insets;
+    private final Insets insets;
 
     // These two are used by Border to compute the insets and outsets of the border
     final Insets innerEdge;
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/layout/BorderStroke.java b/modules/javafx.graphics/src/main/java/javafx/scene/layout/BorderStroke.java
index c6ce7a07f6f..ffaaf229fec 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/layout/BorderStroke.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/layout/BorderStroke.java
@@ -48,7 +48,7 @@
  *
  * @since JavaFX 8.0
  */
-public class BorderStroke implements Interpolatable<BorderStroke> {
+public final class BorderStroke implements Interpolatable<BorderStroke> {
     /**
      * The default insets when "thin" is specified.
      */
@@ -78,7 +78,7 @@ public class BorderStroke implements Interpolatable<BorderStroke> {
      * @interpolationType see {@link Paint}
      */
     public final Paint getTopStroke() { return topStroke; }
-    final Paint topStroke;
+    private final Paint topStroke;
     // TODO: The spec says the default color is "currentColor", which appears to mean
     // by default the color is "inherit". So we should file a JIRA on this so that
     // we use inherit. But first I'd like a performance analysis.
@@ -92,7 +92,7 @@ public class BorderStroke implements Interpolatable<BorderStroke> {
      * @interpolationType see {@link Paint}
      */
     public final Paint getRightStroke() { return rightStroke; }
-    final Paint rightStroke;
+    private final Paint rightStroke;
 
     /**
      * Defines the fill of bottom side of this border. If {@code null}, then the
@@ -103,7 +103,7 @@ public class BorderStroke implements Interpolatable<BorderStroke> {
      * @interpolationType see {@link Paint}
      */
     public final Paint getBottomStroke() { return bottomStroke; }
-    final Paint bottomStroke;
+    private final Paint bottomStroke;
 
     /**
      * Defines the fill of left side of this border. If {@code null}, then the
@@ -114,7 +114,7 @@ public class BorderStroke implements Interpolatable<BorderStroke> {
      * @interpolationType see {@link Paint}
      */
     public final Paint getLeftStroke() { return leftStroke; }
-    final Paint leftStroke;
+    private final Paint leftStroke;
 
     /**
      * Defines the style of top side of this border.
@@ -124,7 +124,7 @@ public class BorderStroke implements Interpolatable<BorderStroke> {
      * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final BorderStrokeStyle getTopStyle() { return topStyle; }
-    final BorderStrokeStyle topStyle;
+    private final BorderStrokeStyle topStyle;
 
     /**
      * Defines the style of right side of this border. If {@code null}, then
@@ -135,7 +135,7 @@ public class BorderStroke implements Interpolatable<BorderStroke> {
      * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final BorderStrokeStyle getRightStyle() { return rightStyle; }
-    final BorderStrokeStyle rightStyle;
+    private final BorderStrokeStyle rightStyle;
 
     /**
      * Defines the style of bottom side of this border. If {@code null}, then
@@ -147,7 +147,7 @@ public class BorderStroke implements Interpolatable<BorderStroke> {
      * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final BorderStrokeStyle getBottomStyle() { return bottomStyle; }
-    final BorderStrokeStyle bottomStyle;
+    private final BorderStrokeStyle bottomStyle;
 
     /**
      * Defines the style of left side of this border. If {@code null}, then
@@ -159,7 +159,7 @@ public class BorderStroke implements Interpolatable<BorderStroke> {
      * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final BorderStrokeStyle getLeftStyle() { return leftStyle; }
-    final BorderStrokeStyle leftStyle;
+    private final BorderStrokeStyle leftStyle;
 
     /**
      * Defines the thickness of each side of the {@code BorderStroke}. This will never
@@ -169,7 +169,7 @@ public class BorderStroke implements Interpolatable<BorderStroke> {
      * @interpolationType <a href="../../animation/Interpolatable.html#default">default</a>
      */
     public final BorderWidths getWidths() { return widths; }
-    final BorderWidths widths;
+    private final BorderWidths widths;
 
     /**
      * Defines the insets of each side of the {@code BorderStroke}. This will never
@@ -179,7 +179,7 @@ public class BorderStroke implements Interpolatable<BorderStroke> {
      * @interpolationType <a href="../../animation/Interpolatable.html#default">default</a>
      */
     public final Insets getInsets() { return insets; }
-    final Insets insets;
+    private final Insets insets;
 
     // These two are used by Border to compute the insets and outsets of the border
     final Insets innerEdge;
@@ -233,9 +233,9 @@ public BorderStroke(@NamedArg("stroke") Paint stroke, @NamedArg("style") BorderS
         // widths, you get 0 instead of whatever was specified. See 4.3 of the CSS Spec.
 
         // Strokes can only differ in width
-        strokeUniform = this.widths.left == this.widths.top &&
-                        this.widths.left == this.widths.right &&
-                        this.widths.left == this.widths.bottom;
+        strokeUniform = this.widths.getLeft() == this.widths.getTop() &&
+                        this.widths.getLeft() == this.widths.getRight() &&
+                        this.widths.getLeft() == this.widths.getBottom();
 
         // Since insets are empty, don't have to worry about it
         innerEdge = new Insets(
@@ -307,9 +307,9 @@ public BorderStroke(
                 this.leftStroke.equals(this.rightStroke) &&
                 this.leftStroke.equals(this.bottomStroke);
         final boolean widthsSame =
-                this.widths.left == this.widths.top &&
-                this.widths.left == this.widths.right &&
-                this.widths.left == this.widths.bottom;
+                this.widths.getLeft() == this.widths.getTop() &&
+                this.widths.getLeft() == this.widths.getRight() &&
+                this.widths.getLeft() == this.widths.getBottom();
         final boolean stylesSame =
                 this.leftStyle.equals(this.topStyle) &&
                 this.leftStyle.equals(this.rightStyle) &&
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/layout/BorderWidths.java b/modules/javafx.graphics/src/main/java/javafx/scene/layout/BorderWidths.java
index 3ee8066497d..93b5ed36a85 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/layout/BorderWidths.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/layout/BorderWidths.java
@@ -82,7 +82,7 @@ public final class BorderWidths implements Interpolatable<BorderWidths> {
      *                    <a href="../../animation/Interpolatable.html#discrete">discrete</a> otherwise
      */
     public final double getTop() { return top; }
-    final double top;
+    private final double top;
 
     /**
      * The non-negative value (with the exception of {@link #AUTO}) indicating the border
@@ -97,7 +97,7 @@ public final class BorderWidths implements Interpolatable<BorderWidths> {
      *                    <a href="../../animation/Interpolatable.html#discrete">discrete</a> otherwise
      */
     public final double getRight() { return right; }
-    final double right;
+    private final double right;
 
     /**
      * The non-negative value (with the exception of {@link #AUTO}) indicating the border
@@ -112,7 +112,7 @@ public final class BorderWidths implements Interpolatable<BorderWidths> {
      *                    <a href="../../animation/Interpolatable.html#discrete">discrete</a> otherwise
      */
     public final double getBottom() { return bottom; }
-    final double bottom;
+    private final double bottom;
 
     /**
      * The non-negative value (with the exception of {@link #AUTO}) indicating the border
@@ -127,7 +127,7 @@ public final class BorderWidths implements Interpolatable<BorderWidths> {
      *                    <a href="../../animation/Interpolatable.html#discrete">discrete</a> otherwise
      */
     public final double getLeft() { return left; }
-    final double left;
+    private final double left;
 
     /**
      * Specifies whether the {@link #getTop() top} property should be interpreted as a percentage ({@code true})
@@ -137,7 +137,7 @@ public final class BorderWidths implements Interpolatable<BorderWidths> {
      * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final boolean isTopAsPercentage() { return topAsPercentage; }
-    final boolean topAsPercentage;
+    private final boolean topAsPercentage;
 
     /**
      * Specifies whether the {@link #getRight() right} property should be interpreted as a percentage ({@code true})
@@ -147,7 +147,7 @@ public final class BorderWidths implements Interpolatable<BorderWidths> {
      * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final boolean isRightAsPercentage() { return rightAsPercentage; }
-    final boolean rightAsPercentage;
+    private final boolean rightAsPercentage;
 
     /**
      * Specifies whether the {@link #getBottom() bottom} property should be interpreted as a percentage ({@code true})
@@ -157,7 +157,7 @@ public final class BorderWidths implements Interpolatable<BorderWidths> {
      * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final boolean isBottomAsPercentage() { return bottomAsPercentage; }
-    final boolean bottomAsPercentage;
+    private final boolean bottomAsPercentage;
 
     /**
      * Specifies whether the {@link #getLeft() left} property should be interpreted as a percentage ({@code true})
@@ -167,7 +167,7 @@ public final class BorderWidths implements Interpolatable<BorderWidths> {
      * @interpolationType <a href="../../animation/Interpolatable.html#discrete">discrete</a>
      */
     public final boolean isLeftAsPercentage() { return leftAsPercentage; }
-    final boolean leftAsPercentage;
+    private final boolean leftAsPercentage;
 
     /**
      * A cached hash code for faster secondary usage. It is expected
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/layout/CornerRadii.java b/modules/javafx.graphics/src/main/java/javafx/scene/layout/CornerRadii.java
index 70c86480c0f..364f7ed010f 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/layout/CornerRadii.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/layout/CornerRadii.java
@@ -39,7 +39,7 @@
  *
  * @since JavaFX 8.0
  */
-public class CornerRadii implements Interpolatable<CornerRadii> {
+public final class CornerRadii implements Interpolatable<CornerRadii> {
     /**
      * A CornerRadii which is entirely empty, indicating squared corners.
      * This is the default value for a BorderStroke's radii.
@@ -58,7 +58,7 @@ public class CornerRadii implements Interpolatable<CornerRadii> {
      *                    <a href="../../animation/Interpolatable.html#discrete">discrete</a> otherwise
      */
     public final double getTopLeftHorizontalRadius() { return topLeftHorizontalRadius; }
-    private double topLeftHorizontalRadius;
+    private final double topLeftHorizontalRadius;
 
     /**
      * The length of the vertical radii of the top-left corner.
@@ -69,7 +69,7 @@ public class CornerRadii implements Interpolatable<CornerRadii> {
      *                    <a href="../../animation/Interpolatable.html#discrete">discrete</a> otherwise
      */
     public final double getTopLeftVerticalRadius() { return topLeftVerticalRadius; }
-    private double topLeftVerticalRadius;
+    private final double topLeftVerticalRadius;
 
     /**
      * The length of the vertical radii of the top-right corner.
@@ -80,7 +80,7 @@ public class CornerRadii implements Interpolatable<CornerRadii> {
      *                    <a href="../../animation/Interpolatable.html#discrete">discrete</a> otherwise
      */
     public final double getTopRightVerticalRadius() { return topRightVerticalRadius; }
-    private double topRightVerticalRadius;
+    private final double topRightVerticalRadius;
 
     /**
      * The length of the horizontal radii of the top-right corner.
@@ -91,7 +91,7 @@ public class CornerRadii implements Interpolatable<CornerRadii> {
      *                    <a href="../../animation/Interpolatable.html#discrete">discrete</a> otherwise
      */
     public final double getTopRightHorizontalRadius() { return topRightHorizontalRadius; }
-    private double topRightHorizontalRadius;
+    private final double topRightHorizontalRadius;
 
     /**
      * The length of the horizontal radii of the bottom-right corner.
@@ -102,7 +102,7 @@ public class CornerRadii implements Interpolatable<CornerRadii> {
      *                    <a href="../../animation/Interpolatable.html#discrete">discrete</a> otherwise
      */
     public final double getBottomRightHorizontalRadius() { return bottomRightHorizontalRadius; }
-    private double bottomRightHorizontalRadius;
+    private final double bottomRightHorizontalRadius;
 
     /**
      * The length of the vertical radii of the bottom-right corner.
@@ -113,7 +113,7 @@ public class CornerRadii implements Interpolatable<CornerRadii> {
      *                    <a href="../../animation/Interpolatable.html#discrete">discrete</a> otherwise
      */
     public final double getBottomRightVerticalRadius() { return bottomRightVerticalRadius; }
-    private double bottomRightVerticalRadius;
+    private final double bottomRightVerticalRadius;
 
     /**
      * The length of the vertical radii of the bottom-left corner.
@@ -124,7 +124,7 @@ public class CornerRadii implements Interpolatable<CornerRadii> {
      *                    <a href="../../animation/Interpolatable.html#discrete">discrete</a> otherwise
      */
     public final double getBottomLeftVerticalRadius() { return bottomLeftVerticalRadius; }
-    private double bottomLeftVerticalRadius;
+    private final double bottomLeftVerticalRadius;
 
     /**
      * The length of the horizontal radii of the bottom-left corner.
@@ -135,7 +135,7 @@ public class CornerRadii implements Interpolatable<CornerRadii> {
      *                    <a href="../../animation/Interpolatable.html#discrete">discrete</a> otherwise
      */
     public final double getBottomLeftHorizontalRadius() { return bottomLeftHorizontalRadius; }
-    private double bottomLeftHorizontalRadius;
+    private final double bottomLeftHorizontalRadius;
 
     /**
      * Indicates whether {@code topLeftHorizontalRadius} is interpreted as a value or a percentage.
@@ -217,7 +217,7 @@ public class CornerRadii implements Interpolatable<CornerRadii> {
      * @return if true each corner radius is uniformly percentage-based, otherwise not
      */
     public final boolean isUniform() { return uniform; }
-    final boolean uniform;
+    private final boolean uniform;
 
     /**
      * The cached hash code.
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/layout/Region.java b/modules/javafx.graphics/src/main/java/javafx/scene/layout/Region.java
index f01d488ff7f..a3d555a6e35 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/layout/Region.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/layout/Region.java
@@ -726,7 +726,7 @@ public final BooleanProperty snapToPixelProperty() {
                 // we can repaint the region.
                 if (b != null) {
                     for (BackgroundImage i : b.getImages()) {
-                        final Image image = i.image;
+                        final Image image = i.getImage();
                         final Toolkit.ImageAccessor acc = Toolkit.getImageAccessor();
                         if (acc.isAnimation(image) || image.getProgress() < 1) {
                             addImageListener(image);
@@ -737,7 +737,7 @@ public final BooleanProperty snapToPixelProperty() {
                 // And we must remove this listener from any old images
                 if (old != null) {
                     for (BackgroundImage i : old.getImages()) {
-                        removeImageListener(i.image);
+                        removeImageListener(i.getImage());
                     }
                 }
 
@@ -785,7 +785,7 @@ public final BooleanProperty snapToPixelProperty() {
                 // we can repaint the region.
                 if (b != null) {
                     for (BorderImage i : b.getImages()) {
-                        final Image image = i.image;
+                        final Image image = i.getImage();
                         final Toolkit.ImageAccessor acc = Toolkit.getImageAccessor();
                         if (acc.isAnimation(image) || image.getProgress() < 1) {
                             addImageListener(image);
@@ -796,7 +796,7 @@ public final BooleanProperty snapToPixelProperty() {
                 // And we must remove this listener from any old images
                 if (old != null) {
                     for (BorderImage i : old.getImages()) {
-                        removeImageListener(i.image);
+                        removeImageListener(i.getImage());
                     }
                 }
 
@@ -3229,7 +3229,7 @@ private BaseBounds computeShapeBounds(BaseBounds bounds)
                 }
 
                 final StrokeType type = bss.getType();
-                double sw = Math.max(bs.getWidths().top, 0d);
+                double sw = Math.max(bs.getWidths().getTop(), 0d);
                 StrokeLineCap cap = bss.getLineCap();
                 StrokeLineJoin join = bss.getLineJoin();
                 float miterlimit = (float) Math.max(bss.getMiterLimit(), 1d);

From f71c3906d5da83adb69bf55d1e2854b8891dbefe Mon Sep 17 00:00:00 2001
From: Kevin Rushforth <kcr@openjdk.org>
Date: Fri, 18 Oct 2024 16:10:22 +0000
Subject: [PATCH 73/75] 8340003: Bump minimum JDK version for JavaFX to JDK 22

Reviewed-by: angorya, arapte
---
 CONTRIBUTING.md  | 2 +-
 build.properties | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 31a4f5e8a1e..4867274046c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -234,7 +234,7 @@ New code should be formatted consistently in accordance with the above guideline
 
 ### Building and testing
 
-JDK 21 (at a minimum) is required to build OpenJFX. You must have the JDK
+JDK 22 (at a minimum) is required to build OpenJFX. You must have the JDK
 installed on your system
 with the environment variable `JAVA_HOME` referencing the path to Java home for
 your JDK installation. By default, tests use the same runtime as `JAVA_HOME`.
diff --git a/build.properties b/build.properties
index f477d44c3b4..448740f4f29 100644
--- a/build.properties
+++ b/build.properties
@@ -80,9 +80,9 @@ javadoc.top=<div style="padding: 6px; text-align: center; font-size: 80%;">This
 # JDK
 jfx.build.jdk.version=23
 jfx.build.jdk.buildnum=37
-jfx.build.jdk.version.min=21
-jfx.build.jdk.buildnum.min=35
-jfx.jdk.target.version=21
+jfx.build.jdk.version.min=22
+jfx.build.jdk.buildnum.min=36
+jfx.jdk.target.version=22
 
 # The jfx.gradle.version property defines the version of gradle that is
 # used in the build. It must match the version number in

From f5b18adfa4151a7760b146a95ecea08b2b407d39 Mon Sep 17 00:00:00 2001
From: Kevin Rushforth <kcr@openjdk.org>
Date: Fri, 18 Oct 2024 16:37:55 +0000
Subject: [PATCH 74/75] 8337280: Include jdk.jsobject module with JavaFX

Reviewed-by: arapte, jbhaskar
---
 build.gradle                                  |  74 +++++++---
 modules/jdk.jsobject/make/build.properties    |  32 +++++
 .../src/main/java/module-info.java            |  34 +++++
 .../java/netscape/javascript/JSException.java |  61 ++++++++
 .../java/netscape/javascript/JSObject.java    | 134 ++++++++++++++++++
 .../netscape/javascript/package-info.java     |  40 ++++++
 settings.gradle                               |   5 +-
 7 files changed, 361 insertions(+), 19 deletions(-)
 create mode 100644 modules/jdk.jsobject/make/build.properties
 create mode 100644 modules/jdk.jsobject/src/main/java/module-info.java
 create mode 100644 modules/jdk.jsobject/src/main/java/netscape/javascript/JSException.java
 create mode 100644 modules/jdk.jsobject/src/main/java/netscape/javascript/JSObject.java
 create mode 100644 modules/jdk.jsobject/src/main/java/netscape/javascript/package-info.java

diff --git a/build.gradle b/build.gradle
index cde5d1431f6..58ceeb5d267 100644
--- a/build.gradle
+++ b/build.gradle
@@ -786,6 +786,9 @@ try {
             // should the need arise.
 //            def status = compareJdkVersion(jdkVersion, "18")
 //            ext.jdk18OrLater = (status >= 0)
+
+            def status = compareJdkVersion(jdkVersion, "24")
+            ext.jdk24OrLater = (status >= 0)
         }
     }
 } finally {
@@ -793,6 +796,13 @@ try {
 }
 if (!project.hasProperty("jdkRuntimeVersion")) throw new Exception("Unable to determine the version of Java in JDK_HOME at $JDK_HOME");
 
+// Use --upgrade-module-path instead of --module-path when compiling and
+// running tests if we are using a JDK that includes an upgradable
+// jdk.jsobject module.  Currently, this is JDK 24 or later. Once
+// jdk.jsobject is removed from the JDK, we can stop doing it. For example,
+// if jdk.jsobject is removed from the JDK in JDK 26, the logic will then be
+// changed to: "jdk24OrLater && !jdk26OrLater"
+ext.USE_UPGRADE_MODULE_PATH = jdk24OrLater
 
 // Determine whether the javafx.* modules are present in the JDK. To do this,
 // we will execute "java --list-modules" and search for javafx.base.
@@ -1014,8 +1024,9 @@ List<String> computeLibraryPath(boolean working) {
     return lp
 }
 
-// Return list with the arguments needed for --patch-module or --module-path
-// for the provided projects. Used with Java executables ie. tests
+// Return list with the arguments needed for --patch-module, --module-path,
+// or --upgrade-module-path for the provided projects.
+// Used with Java executables ie. tests
 List<String> computePatchModuleArgs(List<String> deps, boolean test, boolean includeJLP) {
     List<String> pma = []
 
@@ -1060,7 +1071,7 @@ List<String> computePatchModuleArgs(List<String> deps, boolean test, boolean inc
             return null
         }
 
-        pma += '--module-path'
+        pma += (test && USE_UPGRADE_MODULE_PATH) ? '--upgrade-module-path' : '--module-path'
         pma += mp
 
         String addm = null
@@ -1089,7 +1100,7 @@ List<String> computePatchModuleArgs(List<String> deps, boolean test, boolean inc
 // Return a list containing the --upgrade-module-path or --module-path
 // used with Javac
 List<String> computeModulePathArgs(String  pname, List<String> deps, boolean test) {
-    List<String> mpa = HAS_JAVAFX_MODULES ? [ '--upgrade-module-path' ] : [ '--module-path' ]
+    List<String> mpa = (HAS_JAVAFX_MODULES || (test && USE_UPGRADE_MODULE_PATH)) ? [ '--upgrade-module-path' ] : [ '--module-path' ]
     String mp = null
     deps.each { String projname ->
         def proj = project(projname)
@@ -1173,12 +1184,14 @@ void writeArgsFile(boolean isCompile, File dest, List<String> libpath, List<Stri
             dest << "\"\n"
         }
     } else {
+        def modulePathArgName = USE_UPGRADE_MODULE_PATH ? '--upgrade-module-path' : '--module-path'
+
         if (modpath.size() == 1) {
-            dest <<  "--module-path=\""
+            dest <<  "${modulePathArgName}=\""
             dest << modpath[0]
             dest << "\"\n"
         } else {
-            dest <<  "--module-path=\"\\\n"
+            dest <<  "${modulePathArgName}=\"\\\n"
             modpath.each() { e->
                 dest << "  "
                 dest << e
@@ -3647,6 +3660,30 @@ project(":media") {
     addValidateSourceSets(project, sourceSets)
 }
 
+project(":jsobject") {
+    project.ext.buildModule = true
+    project.ext.includeSources = true
+    project.ext.moduleRuntime = true
+    project.ext.moduleName = "jdk.jsobject"
+
+    sourceSets {
+        main
+    }
+
+    project.ext.moduleSourcePath = defaultModuleSourcePath
+    project.ext.moduleSourcePathShim = defaultModuleSourcePathShim
+
+    commonModuleSetup(project, [ 'jsobject' ])
+
+
+    dependencies {
+    }
+
+    addMavenPublication(project, [])
+
+    addValidateSourceSets(project, sourceSets)
+}
+
 project(":web") {
     configurations {
         webkit
@@ -3677,7 +3714,7 @@ project(":web") {
     project.ext.moduleSourcePath = defaultModuleSourcePath
     project.ext.moduleSourcePathShim = defaultModuleSourcePathShim
 
-    commonModuleSetup(project, [ 'base', 'graphics', 'controls', 'media', 'web' ])
+    commonModuleSetup(project, [ 'base', 'graphics', 'controls', 'media', 'jsobject', 'web' ])
 
     dependencies {
         if (IS_COMPILE_WEBKIT) {
@@ -3931,7 +3968,7 @@ project(":web") {
         assemble.dependsOn compileJavaDOMBinding, drtJar
     }
 
-    addMavenPublication(project, [ 'controls', 'media' ])
+    addMavenPublication(project, [ 'controls', 'media', 'jsobject' ])
 
     addValidateSourceSets(project, sourceSets)
 }
@@ -3993,7 +4030,7 @@ project(":systemTests") {
         testImplementation project(":swing").sourceSets.test.output
     }
 
-    def dependentProjects = [ 'base', 'graphics', 'controls', 'media', 'web', 'swing', 'fxml' ]
+    def dependentProjects = [ 'base', 'graphics', 'controls', 'media', 'jsobject', 'web', 'swing', 'fxml' ]
     commonModuleSetup(project, dependentProjects)
 
     File testJavaPolicyFile = new File(rootProject.buildDir, TESTJAVAPOLICYFILE);
@@ -4122,14 +4159,14 @@ project(":systemTests") {
         // enable native access for all modules with native code
         jvmArgs enableNativeAll
 
-        // Parse testPatchModuleArgs looking for "--module-path".
+        // Parse testPatchModuleArgs looking for "*module-path".
         // Save path if found so we can pass it to the module launcher tests
         def pendingModulePath = false
         testPatchModuleArgs.each { str ->
             if (pendingModulePath) {
                 project.ext.launcherModulePath = str;
                 pendingModulePath = false
-            } else if (str == "--module-path") {
+            } else if (str.endsWith("module-path")) {
                 pendingModulePath = true
             }
         }
@@ -4204,12 +4241,15 @@ allprojects {
             compile.options.incremental = IS_INCREMENTAL
         }
 
-        if (project.hasProperty('skipJavaCompilerOptionRelease') &&
-                project.ext.skipJavaCompilerOptionRelease) {
+        def isCompileTestTask = compile.name.startsWith("compileTest")
+        if (!isCompileTestTask) {
+            if (project.hasProperty('skipJavaCompilerOptionRelease') &&
+                    project.ext.skipJavaCompilerOptionRelease) {
 
-            logger.info "Using 'javac -source/-target' for ${compile}"
-        } else {
-            compile.options.release = JAVA_TARGET_VERSION
+                logger.info "Using 'javac -source/-target' for ${compile}"
+            } else {
+                compile.options.release = JAVA_TARGET_VERSION
+            }
         }
 
         compile.options.debug = true // we always generate debugging info in the class files
@@ -4437,7 +4477,7 @@ task javadoc(type: Javadoc, dependsOn: createMSPfile) {
     executable = JAVADOC
     def projectsToDocument = [
             project(":base"), project(":graphics"), project(":controls"), project(":media"),
-            project(":swing"), /*project(":swt"),*/ project(":fxml"), project(":web")]
+            project(":swing"), /*project(":swt"),*/ project(":fxml"), project(":jsobject"), project(":web")]
     source(projectsToDocument.collect({
         [it.sourceSets.main.java]
     }));
diff --git a/modules/jdk.jsobject/make/build.properties b/modules/jdk.jsobject/make/build.properties
new file mode 100644
index 00000000000..4ccfd2da4ec
--- /dev/null
+++ b/modules/jdk.jsobject/make/build.properties
@@ -0,0 +1,32 @@
+#
+# Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# 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.
+#
+
+# Build properties for this module
+
+include_in_jre=true
+include_in_jdk=true
+include_in_jdk_server=false
+include_in_docs=true
+classloader=ext
diff --git a/modules/jdk.jsobject/src/main/java/module-info.java b/modules/jdk.jsobject/src/main/java/module-info.java
new file mode 100644
index 00000000000..5acd229dfa1
--- /dev/null
+++ b/modules/jdk.jsobject/src/main/java/module-info.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+
+/**
+ * Defines the API for the JavaScript Object.
+ *
+ * @moduleGraph
+ * @since 9
+ */
+module jdk.jsobject {
+    exports netscape.javascript;
+}
diff --git a/modules/jdk.jsobject/src/main/java/netscape/javascript/JSException.java b/modules/jdk.jsobject/src/main/java/netscape/javascript/JSException.java
new file mode 100644
index 00000000000..7aca10f4e9b
--- /dev/null
+++ b/modules/jdk.jsobject/src/main/java/netscape/javascript/JSException.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+
+package netscape.javascript;
+
+/**
+ * Thrown when an exception is raised in the JavaScript engine. This is merely
+ * a marker class to indicate an exception relating to the JavaScript
+ * interface.
+ * @since 1.5
+ */
+public class JSException extends RuntimeException {
+    private static final long serialVersionUID = 2778103758223661489L;
+
+    /**
+     * Constructs a new JavaScript exception with null as it's detail message.
+     */
+    public JSException() {
+        super();
+    }
+
+    /**
+     * Construct a new JavaScript exception with the specified detail message.
+     *
+     * @param s The detail message
+     */
+    public JSException(String s) {
+        super(s);
+    }
+
+    /**
+     * Construct a new JavaScript exception with the specified cause.
+     *
+     * @param t Throwable cause
+     */
+    public JSException(Throwable t) {
+        super(t);
+    }
+}
diff --git a/modules/jdk.jsobject/src/main/java/netscape/javascript/JSObject.java b/modules/jdk.jsobject/src/main/java/netscape/javascript/JSObject.java
new file mode 100644
index 00000000000..23e3e1b2064
--- /dev/null
+++ b/modules/jdk.jsobject/src/main/java/netscape/javascript/JSObject.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+
+package netscape.javascript;
+
+/**
+ * <p>
+ * Allows Java code to manipulate JavaScript objects.
+ * </p>
+ *
+ * <p>
+ * When a JavaScript object is passed or returned to Java code, it
+ * is wrapped in an instance of {@code JSObject}. When a
+ * {@code JSObject} instance is passed to the JavaScript engine,
+ * it is unwrapped back to its original JavaScript object. The
+ * {@code JSObject} class provides a way to invoke JavaScript
+ * methods and examine JavaScript properties.
+ * </p>
+ *
+ * <p> Any data returned from the JavaScript engine to Java is
+ * converted to Java data types. Certain data passed to the JavaScript
+ * engine is converted to JavaScript data types.
+ * </p>
+ * @since 1.5
+ */
+public abstract class JSObject {
+    /**
+     * Constructs a new JSObject. Users should neither call this method nor
+     * subclass JSObject.
+     */
+    protected JSObject()  {
+    }
+
+    /**
+     * Calls a JavaScript method. Equivalent to
+     * "this.methodName(args[0], args[1], ...)" in JavaScript.
+     *
+     * @param methodName The name of the JavaScript method to be invoked.
+     * @param args the Java objects passed as arguments to the method.
+     * @return Result of the method.
+     * @throws JSException when an error is reported from the browser or
+     * JavaScript engine.
+     */
+    public abstract Object call(String methodName, Object... args) throws JSException;
+
+    /**
+     * Evaluates a JavaScript expression. The expression is a string of
+     * JavaScript source code which will be evaluated in the context given by
+     * "this".
+     *
+     * @param s The JavaScript expression.
+     * @return Result of the JavaScript evaluation.
+     * @throws JSException when an error is reported from the browser or
+     * JavaScript engine.
+     */
+    public abstract Object eval(String s) throws JSException;
+
+    /**
+     * Retrieves a named member of a JavaScript object. Equivalent to
+     * "this.name" in JavaScript.
+     *
+     * @param name The name of the JavaScript property to be accessed.
+     * @return The value of the property.
+     * @throws JSException when an error is reported from the browser or
+     * JavaScript engine.
+     */
+    public abstract Object getMember(String name) throws JSException;
+
+    /**
+     * Sets a named member of a JavaScript object. Equivalent to
+     * "this.name = value" in JavaScript.
+     *
+     * @param name The name of the JavaScript property to be accessed.
+     * @param value The value of the property.
+     * @throws JSException when an error is reported from the browser or
+     * JavaScript engine.
+     */
+    public abstract void setMember(String name, Object value) throws JSException;
+
+    /**
+     * Removes a named member of a JavaScript object. Equivalent
+     * to "delete this.name" in JavaScript.
+     *
+     * @param name The name of the JavaScript property to be removed.
+     * @throws JSException when an error is reported from the browser or
+     * JavaScript engine.
+     */
+    public abstract void removeMember(String name) throws JSException;
+
+    /**
+     * Retrieves an indexed member of a JavaScript object. Equivalent to
+     * "this[index]" in JavaScript.
+     *
+     * @param index The index of the array to be accessed.
+     * @return The value of the indexed member.
+     * @throws JSException when an error is reported from the browser or
+     * JavaScript engine.
+     */
+    public abstract Object getSlot(int index) throws JSException;
+
+    /**
+     * Sets an indexed member of a JavaScript object. Equivalent to
+     * "this[index] = value" in JavaScript.
+     *
+     * @param index The index of the array to be accessed.
+     * @param value The value to set
+     * @throws JSException when an error is reported from the browser or
+     * JavaScript engine.
+     */
+    public abstract void setSlot(int index, Object value) throws JSException;
+
+}
diff --git a/modules/jdk.jsobject/src/main/java/netscape/javascript/package-info.java b/modules/jdk.jsobject/src/main/java/netscape/javascript/package-info.java
new file mode 100644
index 00000000000..fcc97132a50
--- /dev/null
+++ b/modules/jdk.jsobject/src/main/java/netscape/javascript/package-info.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+
+/**
+ * <p>
+ * Provides Java code the ability to access the JavaScript engine and the
+ * HTML DOM in the web browser.
+ * </p>
+ *
+ * <p>
+ * The classes in this package were initially specified by Netscape, and are the
+ * de facto standard mechanism for calling JavaScript from the Java runtime.
+ * </p>
+ *
+ * @since 1.5
+ */
+
+package netscape.javascript;
diff --git a/settings.gradle b/settings.gradle
index e372c0e48e9..bbbbd5f45ed 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
  * questions.
  */
 
-include "base", "graphics", "controls", "swing", "swt", "fxml", "web", "media", "systemTests"
+include "base", "graphics", "controls", "swing", "swt", "fxml", "jsobject", "web", "media", "systemTests"
 
 project(":base").projectDir = file("modules/javafx.base")
 project(":graphics").projectDir = file("modules/javafx.graphics")
@@ -31,6 +31,7 @@ project(":controls").projectDir = file("modules/javafx.controls")
 project(":swing").projectDir = file("modules/javafx.swing")
 project(":swt").projectDir = file("modules/javafx.swt")
 project(":fxml").projectDir = file("modules/javafx.fxml")
+project(":jsobject").projectDir = file("modules/jdk.jsobject")
 project(":web").projectDir = file("modules/javafx.web")
 project(":media").projectDir = file("modules/javafx.media")
 project(":systemTests").projectDir = file("tests/system")

From 6ac2dd3ee0d175053442fb5de1bd0e3f92175874 Mon Sep 17 00:00:00 2001
From: Alexander Zuev <kizune@openjdk.org>
Date: Fri, 18 Oct 2024 18:30:52 +0000
Subject: [PATCH 75/75] 8336031: Create implementation of
 NSAccessibilityStaticText protocol

Reviewed-by: angorya, arapte
---
 .../native-glass/mac/a11y/AccessibleBase.m    |  7 ++-
 .../mac/a11y/JFXStaticTextAccessibility.h     | 35 ++++++++++++
 .../mac/a11y/JFXStaticTextAccessibility.m     | 55 +++++++++++++++++++
 3 files changed, 95 insertions(+), 2 deletions(-)
 create mode 100644 modules/javafx.graphics/src/main/native-glass/mac/a11y/JFXStaticTextAccessibility.h
 create mode 100644 modules/javafx.graphics/src/main/native-glass/mac/a11y/JFXStaticTextAccessibility.m

diff --git a/modules/javafx.graphics/src/main/native-glass/mac/a11y/AccessibleBase.m b/modules/javafx.graphics/src/main/native-glass/mac/a11y/AccessibleBase.m
index f25efde420f..5d559c453c5 100644
--- a/modules/javafx.graphics/src/main/native-glass/mac/a11y/AccessibleBase.m
+++ b/modules/javafx.graphics/src/main/native-glass/mac/a11y/AccessibleBase.m
@@ -36,9 +36,11 @@ @implementation AccessibleBase
 
 + (void) initializeRolesMap {
     /*
-     * Here we should keep all the mapping between the accessibility roles and implementing classes
+     * Here we should keep all the mapping between the accessibility roles and implementing classes.
+     * All JavaFX roles and corresponding available properties are defined in
+     * enum javafx.scene.AccessibleRole
      */
-    rolesMap = [[NSMutableDictionary alloc] initWithCapacity:8];
+    rolesMap = [[NSMutableDictionary alloc] initWithCapacity:9];
 
     [rolesMap setObject:@"JFXButtonAccessibility" forKey:@"BUTTON"];
     [rolesMap setObject:@"JFXButtonAccessibility" forKey:@"DECREMENT_BUTTON"];
@@ -50,6 +52,7 @@ + (void) initializeRolesMap {
     [rolesMap setObject:@"JFXRadiobuttonAccessibility" forKey:@"PAGE_ITEM"];
     [rolesMap setObject:@"JFXCheckboxAccessibility" forKey:@"CHECK_BOX"];
     [rolesMap setObject:@"JFXCheckboxAccessibility" forKey:@"TOGGLE_BUTTON"];
+    [rolesMap setObject:@"JFXStaticTextAccessibility" forKey:@"TEXT"];
 
 }
 
diff --git a/modules/javafx.graphics/src/main/native-glass/mac/a11y/JFXStaticTextAccessibility.h b/modules/javafx.graphics/src/main/native-glass/mac/a11y/JFXStaticTextAccessibility.h
new file mode 100644
index 00000000000..8e6164e1a5f
--- /dev/null
+++ b/modules/javafx.graphics/src/main/native-glass/mac/a11y/JFXStaticTextAccessibility.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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 "AccessibleBase.h"
+#import <AppKit/NSAccessibility.h>
+
+@interface JFXStaticTextAccessibility : AccessibleBase<NSAccessibilityStaticText> {
+
+};
+- (NSAccessibilityRole)accessibilityRole;
+- (NSString *)accessibilityValue;
+@end
+
diff --git a/modules/javafx.graphics/src/main/native-glass/mac/a11y/JFXStaticTextAccessibility.m b/modules/javafx.graphics/src/main/native-glass/mac/a11y/JFXStaticTextAccessibility.m
new file mode 100644
index 00000000000..56044f92aa8
--- /dev/null
+++ b/modules/javafx.graphics/src/main/native-glass/mac/a11y/JFXStaticTextAccessibility.m
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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 "JFXStaticTextAccessibility.h"
+#import "GlassMacros.h"
+#import "GlassAccessible.h"
+#import "com_sun_glass_ui_mac_MacAccessible.h"
+#import "com_sun_glass_ui_mac_MacVariant.h"
+#import "common.h"
+
+@implementation JFXStaticTextAccessibility
+- (NSAccessibilityRole)accessibilityRole
+{
+    return NSAccessibilityStaticTextRole;
+}
+
+- (id)accessibilityParent
+{
+    return [super accessibilityParent];
+}
+
+- (NSRect)accessibilityFrame
+{
+    return [super accessibilityFrame];
+}
+
+- (NSString *)accessibilityValue
+{
+    return [super accessibilityValue];
+}
+
+@end
+